Commit Graph

2016 Commits

Author SHA1 Message Date
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
R. RyanTM
60fbce3122 papirus-icon-theme: 20190615 -> 20190802
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/papirus-icon-theme/versions
2019-08-04 21:30:21 -07:00
Maximilian Bosch
9605318b48
Merge pull request #65983 from r-ryantm/auto-update/man-pages
man-pages: 5.01 -> 5.02
2019-08-05 00:31:49 +02:00
R. RyanTM
58f7d41483 man-pages: 5.01 -> 5.02
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/man-pages/versions
2019-08-04 14:25:09 -07:00
R. RyanTM
bfdca24dd3 terminus_font: 4.47 -> 4.48
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/terminus-font/versions
2019-08-04 05:23:28 -07:00
Frederik Rietdijk
4afe7a7bf3 Merge staging-next into staging 2019-08-03 07:48:19 +02:00
Frederik Rietdijk
53328909da Merge staging-next into master, closes #65497 2019-08-03 07:42:50 +02:00
xrelkd
49f281d287 font-awesome: 5.10.0 -> 5.10.1 2019-08-03 07:13:50 +02:00
Frederik Rietdijk
4ca8e53e1d Merge staging-next into staging 2019-08-01 09:44:06 +02:00
Frederik Rietdijk
55e4555b77 Merge master into staging-next 2019-08-01 09:42:54 +02:00
Jörg Thalheim
59ac7e1634
iana-etc: 20190504 -> 20190731 2019-08-01 08:08:21 +01:00
worldofpeace
76f4626e80
Merge pull request #65579 from tadfisher/plata-theme
plata-theme: 0.8.7 -> 0.8.8
2019-07-31 01:48:40 -04:00
Jörg Thalheim
344f0529ed
font-awesome_4: Readd, font-awesome_5: 5.9.0 -> 5.10.0 (#65240)
font-awesome_4: Readd, font-awesome_5: 5.9.0 -> 5.10.0
2019-07-30 08:31:41 +01:00
Daniel Schaefer
537403769c font-awesome: 5.9.0 -> 5.10.0
https://github.com/FortAwesome/Font-Awesome/releases/tag/5.10.0
2019-07-30 00:08:23 +02:00
Daniel Schaefer
da40bc4449 font-awesome_4: Was removed, add again
Version 5 is incompatible for some icons, so projects that depend on it
need to actively convert the symbols, see:
https://github.com/greshake/i3status-rust/issues/130

Reintroducing the old version lets us use those programs that haven't
been updated.

Was removed in 0a393f53a9
2019-07-30 00:05:52 +02:00
Tad Fisher
363fb1e2af plata-theme: 0.8.7 -> 0.8.8 2019-07-29 14:44:52 -07:00
Frederik Rietdijk
34eebf6844 Merge master into staging-next 2019-07-25 11:52:18 +02:00
Orivej Desh
32fbbc6f9b Merge master into staging 2019-07-25 09:23:21 +00:00
worldofpeace
18cbb76f12
Merge pull request #64743 from spacekookie/google-fonts
google-fonts: 2018-07-13 -> 2019-07-14
2019-07-23 03:19:57 -04:00
worldofpeace
b1bc0645ea gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
Frederik Rietdijk
db6c38a075 Merge master into staging-next 2019-07-22 14:15:32 +02:00
José Romildo Malaquias
a835adc10c
Merge pull request #64186 from tadfisher/plata-theme
plata-theme: 0.8.3 -> 0.8.7
2019-07-20 23:44:17 -03:00
Vladimír Čunát
5e9f1bb343
docbook5: 5.0 -> 5.0.1
Main reason: the previous source would not unpack with patched unzip:
https://github.com/NixOS/nixpkgs/commit/0238946872c1
2019-07-20 12:39:16 +02:00
Tad Fisher
c8442c7f6a plata-theme: 0.8.3 -> 0.8.7 2019-07-19 11:30:16 -07:00
Will Dietz
0cd0869462 victor-mono: improvements from previous PR
Fixes #64465.

Resolves conflicts with earlier merged PR,
notable differences in the result
(by our powers combined!):

* provide both ttf and otf versions
* quote URL, since folks seem to like those
* don't put fonts in ${pname} subdirs
  fontconfig's hashing/cache is mostly geared
  for the many-fonts-in-one-place situation,
  although this may be fixed in more recent versions.
  Anyway minor change and mostly went with not modifying
  what I had ;) so happy to adjust back if that
  better matches your senses/style/use.
* Drop leading 'A' from description,
  I think this is per policy written.. somewhere O:).
* alpha-sort the meta attributes, which is easy to rem
  and generally matches what most expressions do anyway :)

Reviewer feedback:

* use subdirs with fontname, seems preferred
* fix indent, whoops
2019-07-18 18:46:40 -04:00
Robert Helgesson
d7ef88bc38
fira-code: 1.206 -> 1.207 2019-07-18 23:36:51 +02:00
Katharina Fey
64cc2f9ee9
google-fonts: Removing fixed-output derivation 2019-07-14 22:45:54 +01:00
Katharina Fey
38bd8d3185
google-fonts: 2018-07-13 -> 2019-07-14 2019-07-14 22:45:44 +01:00
EEva (JPotier)
5e51a6073e victor-mono: init at 1.2.1 2019-07-13 11:58:34 -04:00