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
..
dlj-bundle-builder.sh	Change occurrences of gcc to the more general cc	2014-12-26 11:06:21 -06:00
jdk6-construct.sh	Move jdk -> oraclejdk	2014-07-16 18:35:35 +02:00
jdk6-linux.nix	Change occurrences of gcc to the more general cc	2014-12-26 11:06:21 -06:00
jdk7-linux.nix	oraclejdk: bump to 8u31, 7u75, and 7u76	2015-01-23 15:44:22 +09:00
jdk7psu-linux.nix	oraclejdk: bump to 8u31, 7u75, and 7u76	2015-01-23 15:44:22 +09:00
jdk8-linux.nix	oraclejdk: bump to 8u31, 7u75, and 7u76	2015-01-23 15:44:22 +09:00
jdk-linux-base.nix	rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc	2015-01-14 20:27:55 -08:00