openjdk: move bootstrap tarballs to tarballs.nixos.org

Many thanks to @shlevy for doing this migration of the old and new tarballs.

Closes #38097.

Signed-off-by: Austin Seipp <aseipp@pobox.com>

1 files changed, 10 insertions, 21 deletions

diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix
index 4e1f85d10a8..3c29df7ec78 100644
--- a/pkgs/development/compilers/openjdk/bootstrap.nix
+++ b/pkgs/development/compilers/openjdk/bootstrap.nix
@@ -7,30 +7,19 @@
 assert stdenv.hostPlatform.libc == "glibc";
 
 let
-  # !!! These should be on nixos.org
+  fetchboot = version: arch: sha256: fetchurl {
+    name = "openjdk${version}-bootstrap-${arch}-linux.tar.xz";
+    url  = "http://tarballs.nixos.org/openjdk/2018-03-31/${version}/${arch}-linux.tar.xz";
+    inherit sha256;
+  };
+
   src = if stdenv.hostPlatform.system == "x86_64-linux" then
-    (if version == "10" then
-      fetchurl {
-        url    = "https://inner-haven.net/~aseipp/nix/openjdk10-bootstrap-x86_64-linux.tar.xz";
-        sha256 = "08085fsxc1qhqiv3yi38w8lrg3vm7s0m2yvnwr1c92v019806yq2";
-      }
-    else if version == "8" then
-      fetchurl {
-        url = "https://www.dropbox.com/s/a0lsq2ig4uguky5/openjdk8-bootstrap-x86_64-linux.tar.xz?dl=1";
-        sha256 = "18zqx6jhm3lizn9hh6ryyqc9dz3i96pwaz8f6nxfllk70qi5gvks";
-      }
+    (if version == "10"    then fetchboot "10" "x86_64" "08085fsxc1qhqiv3yi38w8lrg3vm7s0m2yvnwr1c92v019806yq2"
+    else if version == "8" then fetchboot "8"  "x86_64" "18zqx6jhm3lizn9hh6ryyqc9dz3i96pwaz8f6nxfllk70qi5gvks"
     else throw "No bootstrap for version")
   else if stdenv.hostPlatform.system == "i686-linux" then
-    (if version == "10" then
-      fetchurl {
-        url    = "https://inner-haven.net/~aseipp/nix/openjdk10-bootstrap-i686-linux.tar.xz";
-        sha256 = "1blb9gyzp8gfyggxvggqgpcgfcyi00ndnnskipwgdm031qva94p7";
-      }
-    else if version == "8" then
-      fetchurl {
-        url = "https://www.dropbox.com/s/rneqjhlerijsw74/openjdk8-bootstrap-i686-linux.tar.xz?dl=1";
-        sha256 = "1yx04xh8bqz7amg12d13rw5vwa008rav59mxjw1b9s6ynkvfgqq9";
-      }
+    (if version == "10"    then fetchboot "10" "i686" "1blb9gyzp8gfyggxvggqgpcgfcyi00ndnnskipwgdm031qva94p7"
+    else if version == "8" then fetchboot "8"  "i686" "1yx04xh8bqz7amg12d13rw5vwa008rav59mxjw1b9s6ynkvfgqq9"
     else throw "No bootstrap for version")
   else throw "No bootstrap for system";