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
..
adapta-backgrounds	adapta-backgrounds: 0.5.2.3 -> 0.5.3.1	2019-07-04 01:49:53 -06:00
brise
cacert	stdenv, cacert: consider $NIX_SSL_CERT_FILE in hooks	2019-05-09 08:46:22 +02:00
combinatorial_designs	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
conway_polynomials	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
ddccontrol-db	treewide: update homepages to https where available	2019-04-15 10:10:05 -04:00
dns-root-data
elliptic_curves	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
freepats
geolite-legacy	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
graphs	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
hackage	all-cabal-hashes: update to Hackage at 2019-08-10T08:59:19Z	2019-08-16 19:54:42 +02:00
iana-etc	iana-etc: 20190504 -> 20190731	2019-08-01 08:08:21 +01:00
libkkc-data	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
mailcap
media-player-info
mime-types
miscfiles
mobile-broadband-provider-info	mobile-broadband-provider-info: add updateScript	2019-04-17 01:47:34 +02:00
nixos-artwork	treewide: use dontUnpack	2019-07-01 04:23:51 -04:00
osinfo-db	osinfo-db: 20190726 -> 20190805	2019-08-20 18:21:18 -07:00
pari-galdata	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
pari-seadata-small	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
polytopes_db	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
poppler-data
publicsuffix-list	publicsuffix-list: init at 2019-05-24	2019-05-26 14:07:20 +02:00
scowl	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
shared-desktop-ontologies
shared-mime-info	treewide: name -> pname	2019-08-17 10:54:38 +00:00
sound-theme-freedesktop	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
tzdata	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
wireless-regdb	wireless-regdb: 2019-03-01 -> 2019-06-03	2019-06-06 22:48:51 -05:00
xorg-rgb	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00