Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' ... Partial staging merge, including cc-wrapper fixes Conflicts: pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix		2015-02-02 21:14:28 -05:00
..
bootstrap.nix	openjdk-bootstrap: Don't depend on the length of the Glibc version	2015-01-19 23:24:47 +01:00
cppflags-include-fix.patch
currency-date-range-jdk8.patch	Add openjdk8	2015-01-20 09:02:07 +01:00
currency-date-range.patch
default.nix	java: Add home passthru	2015-01-07 14:55:41 -08:00
fix-java-home.patch
generate-cacerts.pl
make-bootstrap.nix
openjdk8.nix	Add cocreature as maintainer of openjdk8	2015-01-20 19:07:54 +01:00
paxctl.patch
read-truststore-from-env-jdk8.patch	Add openjdk8	2015-01-20 09:02:07 +01:00
read-truststore-from-env.patch