Commit Graph

545 Commits

Author SHA1 Message Date
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
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
9bd78cb048 Merge master into staging-next 2019-08-09 14:00:27 +02: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
Jörg Thalheim
59ac7e1634
iana-etc: 20190504 -> 20190731 2019-08-01 08:08:21 +01:00
Frederik Rietdijk
74c24385cb Merge master into staging-next 2019-07-09 15:46:00 +02:00
Tadeo Kondrak
cfb340c077
adapta-backgrounds: 0.5.2.3 -> 0.5.3.1 2019-07-04 01:49:53 -06:00
Frederik Rietdijk
25a77b7210 Merge staging-next into staging 2019-07-03 08:59:42 +02:00
R. RyanTM
235bb7febd osinfo-db: 20190504 -> 20190611
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-07-02 17:40:10 +02:00
worldofpeace
3f4a353737 treewide: use dontUnpack 2019-07-01 04:23:51 -04:00
Peter Simons
c2e65c0186 all-cabal-hashes: update to Hackage at 2019-06-14T00:22:02Z 2019-06-14 13:06:35 +00:00
Franz Pletz
c2e440d9d2
Merge pull request #62802 from dtzWill/update/wireless-regdb-2019-06-03
wireless-regdb: 2019-03-01 -> 2019-06-03
2019-06-07 11:25:06 +00:00
Will Dietz
b791d03480
wireless-regdb: 2019-03-01 -> 2019-06-03 2019-06-06 22:48:51 -05:00
c0bw3b
fe154889d7 publicsuffix-list: init at 2019-05-24
Push #62070 to staging
2019-05-26 14:07:20 +02:00
Vladimír Čunát
b4ae841b23
Merge branch 'staging-next' into staging 2019-05-26 09:48:55 +02:00
Peter Simons
b93138e174 all-cabal-hashes: update to Hackage at 2019-05-24T00:09:15Z 2019-05-24 17:44:15 +02:00
Vladimír Čunát
96a604320a
Merge #61179: stdenv, cacert: $NIX_SSL_CERT_FILE changes
... into staging
2019-05-19 10:56:11 +02:00
Vladimír Čunát
e8f4ad0169
Merge branch 'master' into staging-next
~5k rebuilds per platform.
Hydra nixpkgs: ?compare=1518759
2019-05-11 09:41:36 +02:00
Will Dietz
86fba25bb3
Merge pull request #61200 from dtzWill/update/osinfo-1.5.0
libosinfo, osinfo-db-tools: 1.4.0 -> 1.5.0
2019-05-09 20:09:08 -05:00
Will Dietz
a939d063e2
osinfo-db: 20190301 -> 20190504
https://gitlab.com/libosinfo/osinfo-db/tags
2019-05-09 12:55:07 -05:00
Peter Simons
b04b3fd72e all-cabal-hashes: update to Hackage at 2019-05-08T22:18:59 2019-05-09 18:17:54 +02:00
Vladimír Čunát
79bd4ad579
stdenv, cacert: consider $NIX_SSL_CERT_FILE in hooks
Some SSL libs don't react to $SSL_CERT_FILE.
That actually makes sense to me, as we add this behavior
as nixpkgs-specific, so it seems "safer" to use $NIX_*.
2019-05-09 08:46:22 +02:00
Jörg Thalheim
e3b13dfaf3
iana-etc: 20181219 -> 20190504 2019-05-05 17:04:18 +01:00
Peter Simons
7689c69813 all-cabal-hashes: update to Hackage at 2019-05-01T23:17:23Z 2019-05-02 19:29:00 +02:00
Renaud
6932522713
Revert "osinfo-db: 20190301 -> 20190319" (#59958)
It's breaking libosinfo test suite :
---
/isodetect/haiku: **
ERROR:test-isodetect.c:414:test_one: assertion failed (shortid == info->shortid): ("haikur1beta1" == "haikunightly")
FAIL
---
2019-04-21 15:39:39 +02:00
Renaud
2e557dcdf6
Merge pull request #59626 from r-ryantm/auto-update/osinfo-db
osinfo-db: 20190301 -> 20190319
2019-04-21 01:23:54 +02:00
Jan Tojnar
666f581be8
mobile-broadband-provider-info: add updateScript 2019-04-17 01:47:34 +02:00
Matthew Bauer
f475aeaf29
Merge pull request #59535 from matthewbauer/homepage-fixes
treewide: update homepages to https where available
2019-04-15 20:47:30 -04:00
R. RyanTM
e50b7569a8 osinfo-db: 20190301 -> 20190319
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-04-15 11:27:43 -07:00
Matthew Bauer
290a5d916e treewide: update homepages to https where available
Based on "problems" from repology:

https://repology.org/repository/nix_unstable/problems

Mostly simple changes to reflect redirects.
2019-04-15 10:10:05 -04:00
Vladimír Čunát
81a6df8f88
Merge branch 'staging-next' into staging 2019-04-05 21:03:37 +02:00