diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-16 17:52:46 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-16 17:52:46 +0200 |
| commit | 396a55ac180828a3d6f6bedd87f0c9907e9baa8a (patch) | |
| tree | adf0c233bc3450311cf48c8a4fb89c8619d30ecb /pkgs | |
| parent | 29c8fdc94171848a500c7be3299398a7d6ca88bd (diff) | |
| download | nixlib-396a55ac180828a3d6f6bedd87f0c9907e9baa8a.tar nixlib-396a55ac180828a3d6f6bedd87f0c9907e9baa8a.tar.gz nixlib-396a55ac180828a3d6f6bedd87f0c9907e9baa8a.tar.bz2 nixlib-396a55ac180828a3d6f6bedd87f0c9907e9baa8a.tar.lz nixlib-396a55ac180828a3d6f6bedd87f0c9907e9baa8a.tar.xz nixlib-396a55ac180828a3d6f6bedd87f0c9907e9baa8a.tar.zst nixlib-396a55ac180828a3d6f6bedd87f0c9907e9baa8a.zip | |
oraclejdk: Update to 7u65
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/jdk/jdk-linux-base.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/jdk/jdk7-linux.nix | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/development/compilers/jdk/jdk-linux-base.nix b/pkgs/development/compilers/jdk/jdk-linux-base.nix index b29ae826d888..5ebc99e9f53b 100644 --- a/pkgs/development/compilers/jdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/jdk/jdk-linux-base.nix @@ -71,7 +71,6 @@ stdenv.mkDerivation rec { sha256 = sha256_i686; } else if stdenv.system == "x86_64-linux" then - requireFile { name = "jdk-${productVersion}u${patchVersion}-linux-x64.tar.gz"; url = downloadUrl; @@ -85,7 +84,7 @@ stdenv.mkDerivation rec { # See: https://github.com/NixOS/patchelf/issues/10 dontStrip = 1; - + installPhase = '' cd .. @@ -140,7 +139,7 @@ stdenv.mkDerivation rec { rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/server rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/xawt rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture} - + # set all the dynamic linkers find $out -type f -perm +100 \ -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ @@ -172,4 +171,3 @@ stdenv.mkDerivation rec { meta.license = "unfree"; } - diff --git a/pkgs/development/compilers/jdk/jdk7-linux.nix b/pkgs/development/compilers/jdk/jdk7-linux.nix index 46544dc390f2..55e8ad45085f 100644 --- a/pkgs/development/compilers/jdk/jdk7-linux.nix +++ b/pkgs/development/compilers/jdk/jdk7-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "7"; - patchVersion = "60"; + patchVersion = "65"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html; - sha256_i686 = "d736fb4fd7c8ef50b76411daa640c6feeb48a5c275d29a90ffeb916a78d47a48"; - sha256_x86_64 = "c7232b717573b057dbe828d937ee406b7a75fbc6aba7f1de98a049cbd42c6ae8"; + sha256_i686 = "e3032c561deb237c033b485a358cc429ec83b621303bc6b31768855778a9eaa0"; + sha256_x86_64 = "33fac9630ca8c2d374247abc5c010ac8d2875a3384968aa3e74448361808e4b7"; jceName = "UnlimitedJCEPolicyJDK7.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html; sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d"; |