Frederik Rietdijk
866c5aa090
Merge master into staging-next
2020-04-05 08:33:39 +02:00
Peter Simons
996c95b08f
all-cabal-hashes: update to Hackage at 2020-04-03T06:25:45Z
2020-04-03 22:00:30 +02:00
Frederik Rietdijk
92124ed660
Merge master into staging-next
2020-04-03 21:54:40 +02:00
Konrad Borowski
e69e48a1e4
lib.licenses: Add Unicode License Agreement for Data Files and Software
2020-04-01 13:43:41 +00:00
Frederik Rietdijk
a36be028f5
Merge staging-next into staging
2020-03-28 21:15:15 +01:00
Peter Simons
743747999e
all-cabal-hashes: update to Hackage at 2020-03-27T01:22:37Z
2020-03-27 20:58:34 +01:00
Tor Hedin Brønner
f3b309224d
osinfo-db: fix homepage
...
Changed homepage to gitlab, as prior seems outdated.
2020-03-24 07:11:20 +01:00
Orivej Desh
1b89aa3f7a
Merge branch 'master' into staging
2020-03-23 00:53:16 +00:00
Matthew Bauer
67b0ddf3f3
Merge remote-tracking branch 'origin/staging' into mb-cross-fixes-march-2020
2020-03-16 14:34:03 -04:00
R. RyanTM
8cdfd69bb6
unicode-character-database: 12.1.0 -> 13.0.0
2020-03-16 11:10:22 +00:00
R. RyanTM
4615b8b4c3
osinfo-db: 20200203 -> 20200214
2020-03-14 14:28:31 +01:00
Peter Simons
4c791cb15a
all-cabal-hashes: update to Hackage at 2020-03-06T12:35:04Z
2020-03-06 22:15:13 +01:00
Matthew Bauer
d1e58be703
nixos-artwork: make imagemagick a native build input
...
This is only needed on the builder, no need to cross compile it.
2020-03-06 00:45:47 -05:00
Peter Simons
dcf76c729a
all-cabal-hashes: update to Hackage at 2020-02-28T12:23:03Z
2020-02-28 20:42:31 +01:00
Mario Rodas
59e0025ec8
spdx-license-list-data: add platforms
2020-02-11 18:18:18 -05:00
R. RyanTM
44fb48ecd5
spdx-license-list-data: 3.7 -> 3.8
2020-02-11 21:12:47 +00:00
R. RyanTM
6ec453251e
osinfo-db: 20191125 -> 20200203
2020-02-09 12:10:19 +01:00
Franz Pletz
c5d06b022b
spdx-license-list-data: init at 3.7
2020-01-27 11:46:10 +01:00
Peter Simons
d17666f923
all-cabal-hashes: update to Hackage at 2020-01-23T17:44:54Z
2020-01-24 21:02:43 +01:00
Peter Simons
ff84bdcf69
all-cabal-hashes: update to Hackage at 2020-01-17T18:23:06Z
2020-01-17 21:14:35 +01:00
Jan Tojnar
480fc1856a
Merge branch 'master' into staging-next
2019-12-30 05:22:23 +01:00
Robin Gloster
c9c03c00de
media-player-info: fix build
2019-12-30 04:50:38 +01:00
Jan Tojnar
ca39dd3a8a
Merge branch 'master' into staging-next
2019-12-25 05:15:06 +01:00
Mario Rodas
e615edeb20
Merge pull request #75295 from r-ryantm/auto-update/osinfo-db
...
osinfo-db: 20190920 -> 20191125
2019-12-22 18:00:59 -05:00
Jan Tojnar
3a8d826723
cacert: switch to python3
2019-12-15 01:50:34 +01:00
R. RyanTM
7b431fd487
osinfo-db: 20190920 -> 20191125
2019-12-08 12:55:44 -08:00
Jan Tojnar
808082f6b6
unicode-emoji: init at 12.1
2019-12-07 00:58:29 +01:00
Jan Tojnar
523f0dd754
cldr-emoji-annotation: init at 36.12.120191002_0
2019-12-07 00:58:28 +01:00
Jan Tojnar
fe59567e08
unihan-database: init at 12.1.0
2019-12-07 00:58:28 +01:00
Jan Tojnar
2d405f9078
unicode-character-database: init at 12.1.0
2019-12-07 00:58:28 +01:00
Will Dietz
525c54c7ef
tzdata: 2019b -> 2019c
...
https://github.com/eggert/tz/blob/2019c/NEWS
2019-11-24 10:04:17 +01:00
Peter Simons
a83ece64ca
all-cabal-hashes: update to Hackage at 2019-11-08T16:49:51Z
2019-11-08 18:52:37 +01:00
Peter Simons
327f135c46
all-cabal-hashes: update to Hackage at 2019-11-01T17:31:41Z
2019-11-01 21:34:11 +01:00
Peter Simons
b712543128
all-cabal-hashes: update to Hackage at 2019-10-17T23:44:51Z
2019-10-18 22:50:37 +02:00
Jan Tojnar
6c8aed6391
Merge branch 'master' into staging-next
2019-10-12 00:50:21 +02:00
Milan Pässler
ff0148d868
nixos/nginx: use mailcap mime.types
...
The mime type definitions included with nginx are very incomplete, so
we use a list of mime types from the mailcap package, which is also
used by most other Linux distributions by default.
2019-10-09 14:20:40 +00:00
Frederik Rietdijk
503081fa5b
Merge staging into staging-next
2019-09-29 11:05:22 +02:00
R. RyanTM
2026c28743
osinfo-db: 20190805 -> 20190920
...
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-09-29 00:19:04 +02:00
Matthew Bauer
f7e4eeda6c
Merge pull request #68614 from nspin/pr/simplify-cacert-setup-hook
...
cacert: simplify setupHook
2019-09-20 17:59:34 -04:00
worldofpeace
3b48814e8d
Merge pull request #68732 from dtzWill/update/shared-mime-info-1.13.1
...
shared-mime-info: 1.12 -> 1.13.1
2019-09-18 15:46:52 -04:00
Will Dietz
a8303d2494
shared-mime-info: 1.12 -> 1.13.1
...
https://gitlab.freedesktop.org/xdg/shared-mime-info/-/tags/Release-1-13
https://gitlab.freedesktop.org/xdg/shared-mime-info/-/tags/Release-1-13-1
2019-09-18 15:45:54 -04:00
Miguel Madrid Mencía
148c82e07e
maintainer: mimadrid: update github username and personal data
2019-09-14 12:15:46 +02:00
Nick Spinale
e7ede726ba
cacert: simplify setupHook
...
Triggering this setupHook for dependencies at targetOffset does not work
in cross-compilation cases where such a dependency is lacking. This
simplified setupHook is more robust.
2019-09-12 20:14:47 +00:00
Vladimír Čunát
4aad2947f8
Merge branch 'master' into staging-next
2019-09-04 11:00:56 +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
Averell Dalton
d8be742844
tzdata: 2019a -> 2019b
2019-08-31 12:43:34 +02:00
volth
08f68313a4
treewide: remove redundant rec
2019-08-28 11:07:32 +00: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
Jonathan Ringer
2e7613b3a0
osinfo-db: 20190726 -> 20190805
2019-08-20 18:21:18 -07:00
volth
c814d72b51
treewide: name -> pname
2019-08-17 10:54:38 +00:00
