Commit graph

2044 commits

Author SHA1 Message Date
Jan Tojnar
cdf426488b
Merge branch 'master' into staging-next
Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
Jan Tojnar
ed54a5b51d
Merge branch 'gtk-no-plus' 2019-09-06 02:57:51 +02:00
Jan Tojnar
72e7d569a7
tree-wide: s/GTK+/GTK/g
GTK was renamed.
2019-09-06 02:54:53 +02:00
Will Dietz
ef414c2676
Merge pull request #68036 from dtzWill/update/victor-mono-1.2.5
victor-mono: 1.2.1 -> 1.2.5
2019-09-04 21:13:20 -05:00
Vladimír Čunát
4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
Will Dietz
a8b1948aa7
victor-mono: 1.2.1 -> 1.2.5 2019-09-03 18:15:59 -05:00
Will Dietz
a774931282
sudo-font: 0.37 -> 0.40
https://github.com/jenskutilek/sudo-font/releases/tag/v0.38
https://github.com/jenskutilek/sudo-font/releases/tag/v0.39
https://github.com/jenskutilek/sudo-font/releases/tag/v0.40
2019-09-03 18:12:56 -05:00
José Romildo Malaquias
fdd331cceb
Merge pull request #67900 from romildo/upd.materia-theme
materia-theme: 20190315 -> 20190831
2019-09-03 11:00:50 -03:00
Marek Mahut
3775e79ce9
Merge pull request #67918 from tadeokondrak/iosevka-2.3.0
iosevka-bin: 2.2.1 -> 2.3.0
2019-09-03 11:08:40 +02:00
Peter Simons
79cfb44011 all-cabal-hashes: update to Hackage at 2019-09-03T05:02:25Z 2019-09-03 09:23:56 +02:00
Vladimír Čunát
f21211ebfe
Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
Tadeo Kondrak
346f49596b
iosevka-bin: 2.2.1 -> 2.3.0 2019-09-01 22:51:10 -06:00
José Romildo Malaquias
0ad44f80ad materia-theme: 20190315 -> 20190831 2019-09-01 17:00:36 -03:00
José Romildo Malaquias
6f9e18a47d qogir-theme: 2019-05-03 -> 2019-08-31 2019-08-31 18:54:22 -03:00
volth
7bb6b373ab treewide: name -> pname (#67513) 2019-08-31 07:41:22 -04:00
Averell Dalton
d8be742844 tzdata: 2019a -> 2019b 2019-08-31 12:43:34 +02:00
Frederik Rietdijk
ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk
fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
Jan Tojnar
3665a31a4a
Merge pull request #67663 from jtojnar/fc-joypixels
fontconfig: add support for JoyPixels font
2019-08-30 00:30:13 +02:00
worldofpeace
810b2fb4f3
Merge pull request #67701 from jtojnar/twemoji
twitter-color-emoji: init at 12.1.2
2019-08-29 16:37:00 -04:00
Jan Tojnar
4e4d67b79f
twitter-color-emoji: init at 12.1.2 2019-08-29 21:33:26 +02:00
Jan Tojnar
dd7ec2ea97
python2Packages.nototools: 2017-09-25 → 2019-03-20 2019-08-29 17:24:10 +02:00
Jan Tojnar
1a7b8f6817
joypixels: drop fontconfig file
It is now supportedby our fontconfig.
2019-08-29 02:17:49 +02:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk
5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
Frederik Rietdijk
98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
volth
35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
José Romildo Malaquias
86e1452556 theme-obsidian2: 2.8 -> 2.9 (#67501)
* theme-obsidian2: 2.8 -> 2.9

* theme-obsidian2: move to pkgs/data

* theme-obsidian2: use pname

* theme-obsidian2: run hooks preInstall and postInstall in install phase
2019-08-26 23:11:52 +08:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
worldofpeace
eaf95bef86
Merge pull request #63273 from colemickens/nixpkgs-gelasio
gelasio: init at unstable-2018-08-13
2019-08-23 16:12:39 -04:00
Cole Mickens
6039ccef9e gelasio: init at unstable-2018-08-13 2019-08-23 22:01:04 +02:00
xrelkd
54e5878ecd font-awesome: 5.10.1 -> 5.10.2 2019-08-23 15:21:47 +08:00
Jonathan Ringer
2e7613b3a0 osinfo-db: 20190726 -> 20190805 2019-08-20 18:21:18 -07:00
Jan Tojnar
91d627ab0a
Merge pull request #67014 from jtojnar/joypixels
joypixels: init at 5.0.2
2019-08-20 14:52:28 +02:00
worldofpeace
d7a6f57e22
Merge pull request #66952 from tadfisher/plata-theme
plata-theme: 0.8.8 -> 0.8.9
2019-08-20 00:48:56 -04:00
Jan Tojnar
50f2ecf823
joypixels: init at 5.0.2 2019-08-20 05:32:06 +02:00
José Romildo Malaquias
7d3f0203c9
Merge pull request #66013 from r-ryantm/auto-update/papirus-icon-theme
papirus-icon-theme: 20190615 -> 20190802
2019-08-19 18:52:34 -03:00
Tad Fisher
db4049e2cd plata-theme: 0.8.8 -> 0.8.9 2019-08-19 10:29:11 -07:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Frederik Rietdijk
fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +02:00
Frederik Rietdijk
c68f58d95c Merge master into staging-next 2019-08-17 09:30:16 +02:00
Peter Simons
21a9aa0fcc all-cabal-hashes: update to Hackage at 2019-08-10T08:59:19Z 2019-08-16 19:54:42 +02:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Frederik Rietdijk
8d56f2472e Merge master into staging-next 2019-08-14 13:45:54 +02:00
Lancelot SIX
8791afb8e6
unifont_upper: 12.1.02 -> 12.1.03 2019-08-12 14:15:01 +02:00
Lancelot SIX
f14b76634d
unifont: 12.1.01 -> 12.1.03 2019-08-12 14:15:01 +02:00
Frederik Rietdijk
9bd78cb048 Merge master into staging-next 2019-08-09 14:00:27 +02:00
Artem Vorotnikov
d21d6544c3 zeal: use qt5's mkDerivation
ref #65399
2019-08-05 06:28:12 -04:00
R. RyanTM
b3a44e1214 osinfo-db: 20190611 -> 20190726
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/osinfo-db/versions
2019-08-05 08:06:28 +02:00
Peter Simons
4201da90e8 all-cabal-hashes: update to Hackage at 2019-07-07T09:46:56Z 2019-08-05 07:54:35 +02:00