git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #77783 from volth/oraclejdk8u241

oraclejdk8: 8u211 -> 8u241

commitabb5778c67e0c7eb725b1980289cf58f3a44f140 authorMaximilian Bosch <maximilian@mbosch.me> dateSun 2 Feb 2020, 12:10 (7 years ago) parent0ec03e1619d52a
5 files changed+32−64
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix+21−25 pkgs/development/compilers/oraclejdk/jdk8-linux.nix+10 pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix−14 pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix−14 pkgs/top-level/all-packages.nix+1−11
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix+21−25
@@ -1,15 +1,13 @@
11{ productVersion
22, patchVersion
3−, buildVersion
43, sha256
54, jceName
6−, releaseToken
75, sha256JCE
86}:
97
108{ swingSupport ? true
119, stdenv
12−, fetchurl
10+, requireFile
1311, makeWrapper
1412, unzip
1513, file
@@ -55,14 +53,14 @@ let
5553 x86_64-linux = "amd64";
5654 armv7l-linux = "arm";
5755 aarch64-linux = "aarch64";
58− }.${stdenv.hostPlatform.system};
56+ }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
5957
6058 jce =
6159 if installjce then
62− fetchurl {
63− url = "http://download.oracle.com/otn-pub/java/jce/${productVersion}/${jceName}";
60+ requireFile {
61+ name = jceName;
62+ url = "http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html";
6463 sha256 = sha256JCE;
65− curlOpts = "-b oraclelicense=a";
6664 }
6765 else
6866 "";
@@ -76,25 +74,23 @@ let
7674
7775in
7876
79−assert sha256 ? ${stdenv.hostPlatform.system};
80−
8177let result = stdenv.mkDerivation rec {
82− name =
83− if installjdk then "oraclejdk-${productVersion}u${patchVersion}" else "oraclejre-${productVersion}u${patchVersion}";
84−
85− src = let
86− platformName = {
87− i686-linux = "linux-i586";
88− x86_64-linux = "linux-x64";
89− armv7l-linux = "linux-arm32-vfp-hflt";
90− aarch64-linux = "linux-arm64-vfp-hflt";
91− }.${stdenv.hostPlatform.system};
92− javadlPlatformName = "linux-i586";
93− in fetchurl {
94− url = "http://javadl.oracle.com/webapps/download/GetFile/1.${productVersion}.0_${patchVersion}-b${buildVersion}/${releaseToken}/${javadlPlatformName}/jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz";
95− curlOpts = "-b oraclelicense=a";
96− sha256 = sha256.${stdenv.hostPlatform.system};
97− };
78+ pname = if installjdk then "oraclejdk" else "oraclejre";
79+ version = "${productVersion}u${patchVersion}";
80+
81+ src =
82+ let
83+ platformName = {
84+ i686-linux = "linux-i586";
85+ x86_64-linux = "linux-x64";
86+ armv7l-linux = "linux-arm32-vfp-hflt";
87+ aarch64-linux = "linux-arm64-vfp-hflt";
88+ }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
89+ in requireFile {
90+ name = "jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz";
91+ url = "http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html";
92+ sha256 = sha256.${stdenv.hostPlatform.system};
93+ };
9894
9995 nativeBuildInputs = [ file ]
10096 ++ stdenv.lib.optional installjce unzip;
pkgs/development/compilers/oraclejdk/jdk8-linux.nixnew file+10
@@ -0,0 +1,10 @@
1+import ./jdk-linux-base.nix {
2+ productVersion = "8";
3+ patchVersion = "241";
4+ sha256.i686-linux = "1niiwifby8zqvsh0ccdf3n21vlqfvvms223dc3kw2c2rksch3yg4";
5+ sha256.x86_64-linux = "1jz8d6663jspxgw8yxxx5ca6jaa3g67dbbi5d83pdxjmg1kk57a1";
6+ sha256.armv7l-linux = "1pjzyi1qd4nzfwvh0z5fpwga7j8mksiv5h8wzirv2ccdyy4wqw24";
7+ sha256.aarch64-linux = "1zliv4a0ygrsdpq36b89yl7jf7kidmxqbnp1sk2661y471x02p9l";
8+ jceName = "jce_policy-8.zip";
9+ sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
10+}
pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nixdeleted−14
@@ -1,14 +0,0 @@
1−# http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
2−# jce download url: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
3−import ./jdk-linux-base.nix {
4− productVersion = "8";
5− patchVersion = "211";
6− buildVersion = "12";
7− sha256.i686-linux = "0mdrljs0rw9s4pvaa3sn791nqgdrp8749z3qn80y7hhad74kvsnp";
8− sha256.x86_64-linux = "13b6qk4sn8jdhxa22na9d2aazm4yjh6yxrlxr189gxy3619y9dy0";
9− sha256.armv7l-linux = "1ij1x925k7lyp5f98gy8r0xfr41qhczf2rb74plwwmrccc1k00p5";
10− sha256.aarch64-linux = "041r615qj9qy34a9gxm8968qlmf060ba2as5w97v86mbik4rca05";
11− releaseToken = "478a62b7d4e34b78b671c754eaaf38ab";
12− jceName = "jce_policy-8.zip";
13− sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
14−}
pkgs/development/compilers/oraclejdk/jdk8psu-linux.nixdeleted−14
@@ -1,14 +0,0 @@
1−# http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
2−# jce download url: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
3−import ./jdk-linux-base.nix {
4− productVersion = "8";
5− patchVersion = "212";
6− buildVersion = "10";
7− sha256.i686-linux = "03dj9q0bi3ib731f4zl9hylkrgw417h6qlg2wi7nw71b0fqhijn1";
8− sha256.x86_64-linux = "1yzddxzfh6h14bpzis1abp52x4jjljg8a3zyqz483q6qm05caq1i";
9− sha256.armv7l-linux = "0x333alkqdx8mmiirair7g5iiwif5v9ka4j3qr0f42ilvmk8csnx";
10− sha256.aarch64-linux = "0vcbdvcsl8rm47i07s93jmrrs5laibf937d8vacjqqgh9bbhsr2c";
11− releaseToken = "59066701cf1a433da9770636fbc4c9aa";
12− jceName = "jce_policy-8.zip";
13− sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
14−}
pkgs/top-level/all-packages.nix+1−11
@@ -8456,14 +8456,10 @@ in
84568456
84578457 oraclejdk8 = pkgs.oraclejdk8distro true false;
84588458
8459− oraclejdk8psu = pkgs.oraclejdk8psu_distro true false;
8460−
84618459 oraclejre = lowPrio (pkgs.jdkdistro false false);
84628460
84638461 oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false);
84648462
8465− oraclejre8psu = lowPrio (pkgs.oraclejdk8psu_distro false false);
8466−
84678463 jrePlugin = jre8Plugin;
84688464
84698465 jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true);
@@ -8472,13 +8468,7 @@ in
84728468
84738469 oraclejdk8distro = installjdk: pluginSupport:
84748470 (if pluginSupport then appendToName "with-plugin" else x: x)
8475− (callPackage ../development/compilers/oraclejdk/jdk8cpu-linux.nix {
8476− inherit installjdk pluginSupport;
8477− });
8478−
8479− oraclejdk8psu_distro = installjdk: pluginSupport:
8480− (if pluginSupport then appendToName "with-plugin" else x: x)
8481− (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix {
8471+ (callPackage ../development/compilers/oraclejdk/jdk8-linux.nix {
84828472 inherit installjdk pluginSupport;
84838473 });
84848474