8 commits

Author	SHA1	Message	Date
Franz Pletz	de85797565	Merge remote-tracking branch 'origin/master' into gcc-8	2019-09-03 22:15:07 +02:00
Robin Gloster	b98e4c0516	getxbook: fix merge	2019-08-25 19:30:17 +02:00
Robin Gloster	616b8343c4	Merge remote-tracking branch 'upstream/master' into gcc-8	2019-08-25 18:55:46 +02: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
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
Robin Gloster	bf03f44ddf	getxbook: fix build with openssl 1.1	2019-07-30 02:15:47 +02:00
Franz Pletz	75a91f685c	getxbook: fix build with gcc8	2019-06-17 07:05:56 +02:00
obadz	feb8a692a1	getxbook: init at 1.2	2016-11-13 17:36:05 +00:00