diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-28 23:28:30 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-29 10:01:22 +0100 |
| commit | e740b565cf01082be314dff8833c4a65a834bcff (patch) | |
| tree | 59e8ce4fd4ecf004581e1f1eed533970fd6eba69 /pkgs/development/compilers/openjdk | |
| parent | cb639302df235bc1a9a3f1c14901c021813ee6b5 (diff) | |
| parent | 9f735bdf5784ef1d93122036d5add9ad35c19a35 (diff) | |
| download | nixlib-e740b565cf01082be314dff8833c4a65a834bcff.tar nixlib-e740b565cf01082be314dff8833c4a65a834bcff.tar.gz nixlib-e740b565cf01082be314dff8833c4a65a834bcff.tar.bz2 nixlib-e740b565cf01082be314dff8833c4a65a834bcff.tar.lz nixlib-e740b565cf01082be314dff8833c4a65a834bcff.tar.xz nixlib-e740b565cf01082be314dff8833c4a65a834bcff.tar.zst nixlib-e740b565cf01082be314dff8833c4a65a834bcff.zip | |
Merge master into stdenv-updates
Conflicts (easy): pkgs/development/compilers/llvm/default.nix pkgs/development/compilers/openjdk/default.nix pkgs/development/libraries/icu/default.nix pkgs/development/libraries/libssh/default.nix pkgs/development/libraries/libxslt/default.nix pkgs/development/tools/parsing/bison/3.x.nix
Diffstat (limited to 'pkgs/development/compilers/openjdk')
| -rw-r--r-- | pkgs/development/compilers/openjdk/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/development/compilers/openjdk/no-crypto-restrictions.patch | 12 |
2 files changed, 15 insertions, 21 deletions
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index d7e42d38948f..4d4a129d573a 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -39,9 +39,9 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - update = "6"; + update = "40"; - build = "24"; + build = "43"; in @@ -49,11 +49,11 @@ stdenv.mkDerivation rec { name = "openj${if jreOnly then "re" else "dk"}-7u${update}b${build}"; src = fetchurl { - url = "http://www.java.net/download/openjdk/jdk7u6/promoted/b24/openjdk-7u6-fcs-src-b24-28_aug_2012.zip"; - sha256 = "1x1iq8ga0hqqh0bpcmydzzy19757hknn2yvgzib85p7b7dx0vfx9"; + url = http://www.java.net/download/openjdk/jdk7u40/promoted/b43/openjdk-7u40-fcs-src-b43-26_aug_2013.zip; + sha256 = "15h5nmbw6yn5596ccakqdbs0vd8hmslsfg5sfk8wmjvn31bfmy00"; }; -# outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ]; + # outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ]; buildInputs = [ unzip @@ -90,10 +90,7 @@ stdenv.mkDerivation rec { openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c ''; - patches = [ - ./cppflags-include-fix.patch - ./no-crypto-restrictions.patch - ]; + patches = [ ./cppflags-include-fix.patch ]; makeFlags = [ "SORT=${coreutils}/bin/sort" @@ -109,6 +106,7 @@ stdenv.mkDerivation rec { "UNIXCOMMAND_PATH=" "BOOTDIR=${jdk}" "STATIC_CXX=false" + "UNLIMITED_CRYPTO=1" ]; configurePhase = '' @@ -118,6 +116,14 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out + + # Remove some broken manpages. + rm -rf $out/share/man/ja* + + # Remove crap from the installation. + rm -rf $out/demo $out/sample + + # Generate certificates. pushd $out/${if ! jreOnly then "jre/" else ""}lib/security rm cacerts perl ${./generate-cacerts.pl} $out/bin/keytool ${cacert}/etc/ca-bundle.crt diff --git a/pkgs/development/compilers/openjdk/no-crypto-restrictions.patch b/pkgs/development/compilers/openjdk/no-crypto-restrictions.patch deleted file mode 100644 index 427ef3534668..000000000000 --- a/pkgs/development/compilers/openjdk/no-crypto-restrictions.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur openjdk-orig/jdk/make/javax/crypto/Makefile openjdk/jdk/make/javax/crypto/Makefile ---- openjdk-orig/jdk/make/javax/crypto/Makefile 2011-06-27 13:18:45.000000000 -0400 -+++ openjdk/jdk/make/javax/crypto/Makefile 2012-11-08 14:12:01.360718616 -0500 -@@ -156,7 +156,7 @@ - # - - ifdef OPENJDK --all: build-jar install-jar build-policy install-limited -+all: build-jar install-jar build-policy install-unlimited - else # OPENJDK - ifeq ($(strip $(FILES_java)),) - all: |