Revert "adoptopenjdk: autogenerate sources + add support for aarch64 (#…

…52454)"

This reverts commit f2dfe8b, reversing
changes made to e116aa1.

The `openj9` attribute is missing for `jre` in case of `mac`. This missing
attribute is now blocking the channels from updating.

cc @bennofs

pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix

@@ -1,17 +1,18 @@
-sourcePerArch:
+{ name
+, url
+, sha256
+}:
 
 { swingSupport ? true # not used for now
 , stdenv
 , fetchurl
 }:
 
 let result = stdenv.mkDerivation rec {
-  name = if sourcePerArch.packageType == "jdk"
-    then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"
-    else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}";
+  inherit name;
 
   src = fetchurl {
-    inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256;
+    inherit url sha256;
   };
 
   # See: https://github.com/NixOS/patchelf/issues/10

pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix

@@ -1,4 +1,7 @@
-sourcePerArch:
+{ name
+, url
+, sha256
+}:
 
 { swingSupport ? true
 , stdenv
@@ -45,12 +48,10 @@ let
 in
 
 let result = stdenv.mkDerivation rec {
-  name = if sourcePerArch.packageType == "jdk"
-    then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"
-    else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}";
+  inherit name;
 
   src = fetchurl {
-    inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256;
+    inherit url sha256;
   };
 
   nativeBuildInputs = [ file ];
@@ -111,7 +112,7 @@ let result = stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     license = licenses.gpl2Classpath;
     description = "AdoptOpenJDK, prebuilt OpenJDK binary";
-    platforms = stdenv.lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms
+    platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms
     maintainers = with stdenv.lib.maintainers; [ taku0 ];
   };
 

pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix

@@ -1,9 +1,43 @@
 let
-  sources = builtins.fromJSON (builtins.readFile ./sources.json);
+  makePackage = { version, buildNumber, packageType, vmType, sha256 }: import ./jdk-darwin-base.nix {
+    name = if packageType == "jdk"
+      then
+        "adoptopenjdk-${vmType}-bin-${version}"
+      else
+        "adoptopenjdk-${packageType}-${vmType}-bin-${version}";
+
+    url = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}/OpenJDK11-${packageType}_x64_mac_${vmType}_${version}_${buildNumber}.tar.gz";
+
+    inherit sha256;
+  };
 in
 {
-  jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.hotspot;
-  jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.hotspot;
-  jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.openj9;
-  jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.openj9;
+  jdk-hotspot = makePackage {
+    version = "11";
+    buildNumber = "28";
+    packageType = "jdk";
+    vmType = "hotspot";
+    sha256 = "ca0ec49548c626904061b491cae0a29b9b4b00fb34d8973dc217e10ab21fb0f3";
+  };
+  jre-hotspot = makePackage {
+    version = "11";
+    buildNumber = "28";
+    packageType = "jre";
+    vmType = "hotspot";
+    sha256 = "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c";
+  };
+  jdk-openj9 = makePackage {
+    version = "11.0.1";
+    buildNumber = "13";
+    packageType = "jdk";
+    vmType = "openj9";
+    sha256 = "c5e9b588b4ac5b0bd5b4edd69d59265d1199bb98af7ca3270e119b264ffb6e3f";
+  };
+  jre-openj9 = makePackage {
+    version = "11.0.1";
+    buildNumber = "13";
+    packageType = "jre";
+    vmType = "openj9";
+    sha256 = "0901dc5946fdf967f92f7b719ddfffdcdde5bd3fef86a83d7a3f2f39ddbef1f8";
+  };
 }

pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix

@@ -1,9 +1,43 @@
 let
-  sources = builtins.fromJSON (builtins.readFile ./sources.json);
+  makePackage = { version, buildNumber, packageType, vmType, sha256 }: import ./jdk-linux-base.nix {
+    name = if packageType == "jdk"
+      then
+        "adoptopenjdk-${vmType}-bin-${version}"
+      else
+        "adoptopenjdk-${packageType}-${vmType}-bin-${version}";
+
+    url = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}/OpenJDK11-${packageType}_x64_linux_${vmType}_${version}_${buildNumber}.tar.gz";
+
+    inherit sha256;
+  };
 in
 {
-  jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk11.linux.jdk.hotspot;
-  jre-hotspot = import ./jdk-linux-base.nix sources.openjdk11.linux.jre.hotspot;
-  jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk11.linux.jdk.openj9;
-  jre-openj9 = import ./jdk-linux-base.nix sources.openjdk11.linux.jre.openj9;
+  jdk-hotspot = makePackage {
+    version = "11";
+    buildNumber = "28";
+    packageType = "jdk";
+    vmType = "hotspot";
+    sha256 = "e1e18fc9ce2917473da3e0acb5a771bc651f600c0195a3cb40ef6f22f21660af";
+  };
+  jre-hotspot = makePackage {
+    version = "11";
+    buildNumber = "28";
+    packageType = "jre";
+    vmType = "hotspot";
+    sha256 = "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c";
+  };
+  jdk-openj9 = makePackage {
+    version = "11.0.1";
+    buildNumber = "13";
+    packageType = "jdk";
+    vmType = "openj9";
+    sha256 = "765947ab9457a29d2aa9d11460a4849611343c1e0ea3b33b9c08409cd4672251";
+  };
+  jre-openj9 = makePackage {
+    version = "11.0.1";
+    buildNumber = "13";
+    packageType = "jre";
+    vmType = "openj9";
+    sha256 = "a016413fd8415429b42e543fed7a1bee5010b1dbaf71d29a26e1c699f334c6ff";
+  };
 }