12 commits

Author	SHA1	Message	Date
Vladimír Čunát	dbae4f109f	Merge branch 'master' into staging ... Conflicts (relatively simple): pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix	2015-01-31 19:34:57 +01:00
taku0	267ea498b6	oraclejdk: bump to 8u31, 7u75, and 7u76	2015-01-23 15:44:22 +09:00
Eric Seidel	f3c6827373	rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc	2015-01-14 20:27:55 -08:00
William A. Kennington III	bbc4262514	java: Add home passthru	2015-01-07 14:55:41 -08:00
John Wiegley	28b6fb61e6	Change occurrences of gcc to the more general cc ... This is done for the sake of Yosemite, which does not have gcc, and yet this change is also compatible with Linux.	2014-12-26 11:06:21 -06:00
taku0	d019bcf8ec	oraclejdk: bump to 8u25, 7u71, and 7u72	2014-10-28 05:24:33 -07:00
Aristid Breitkreuz	3e707fe5db	update oracle jdk 7	2014-10-22 20:46:44 +02:00
taku0	7175fdcd71	oraclejdk: bump to 8u20 ... Closes #4492	2014-10-12 15:43:44 +01:00
Paul Koerbitz	b8a88ce472	Update oraclejdk-7 patch version from 65 to 67	2014-09-03 21:30:31 +02:00
Mateusz Kowalczyk	7a45996233	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
taku0	c986350bfd	oraclejdk: bump to 8u11	2014-07-17 10:19:51 +09:00
Eelco Dolstra	94db68d283	Move jdk -> oraclejdk	2014-07-16 18:35:35 +02:00