Darwin support

Add darwin sources
Update updater flake
2023-05-16 16:48:00 -04:00 · 2023-05-16 16:31:52 -04:00 · 2023-05-16 16:22:17 -04:00
4 changed files with 346 additions and 30 deletions
--- a/flake.nix
+++ b/flake.nix
@ -7,7 +7,12 @@
  };

  outputs = { self, nixpkgs, utils }:
-    utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ] (system:
+    (utils.lib.eachSystem [
+      "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ] (system:
      let
        sources = builtins.fromJSON (builtins.readFile ./sources.json);
        buildAdoptLike = with import nixpkgs { system = system; };
@ -23,22 +28,29 @@
              sha256 = value.sha256;
            };
            version = value.java_version;
-            buildInputs = with pkgs; [
-              alsa-lib
-              fontconfig
-              freetype
-              stdenv.cc.cc.lib
-              xorg.libX11
-              xorg.libXext
-              xorg.libXi
-              xorg.libXrender
-              xorg.libXtst
-              zlib
-            ];
-            nativeBuildInputs = with pkgs; [ autoPatchelfHook makeWrapper ];
+            buildInputs = if pkgs.stdenv.isLinux then
+              with pkgs; [
+                alsa-lib
+                fontconfig
+                freetype
+                stdenv.cc.cc.lib
+                xorg.libX11
+                xorg.libXext
+                xorg.libXi
+                xorg.libXrender
+                xorg.libXtst
+                zlib
+              ]
+            else
+              [ ];
+            nativeBuildInputs = if pkgs.stdenv.isLinux then
+              with pkgs; [ autoPatchelfHook makeWrapper ]
+            else
+              [ ];
            dontStrip = 1;
-            installPhase = ''
+            installPhase = if pkgs.stdenv.isLinux then ''
              cd ..
+
              mv $sourceRoot $out
              # jni.h expects jni_md.h to be in the header search path.
              ln -s $out/include/linux/*_md.h $out/include/
@ -69,11 +81,31 @@
                              }
                fi
              done
-            '';
-            preFixup = ''
+            '' else if pkgs.stdenv.isDarwin then ''
+              cd ..
+              mv $sourceRoot $out
+              # jni.h expects jni_md.h to be in the header search path.
+              ln -s $out/Contents/Home/include/darwin/*_md.h $out/Contents/Home/include/
+              rm -rf $out/Home/demo
+              # Remove some broken manpages.
+              rm -rf $out/Home/man/ja*
+              ln -s $out/Contents/Home/* $out/
+              # Propagate the setJavaClassPath setup hook from the JDK so that
+              # any package that depends on the JDK has $CLASSPATH set up
+              # properly.
+              mkdir -p $out/nix-support
+              printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
+              # Set JAVA_HOME automatically.
+              cat <<EOF >> $out/nix-support/setup-hook
+              if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
+              EOF
+            '' else
+              (throw "Unsupported OS");
+            preFixup = if pkgs.stdenv.isLinux then ''
              find "$out" -name libfontmanager.so -exec \
                patchelf --add-needed libfontconfig.so {} \;
-            '';
+            '' else
+              "";
          };
      in with import nixpkgs { system = system; }; {
        packages = {
@ -92,5 +124,5 @@
        };

        defaultPackage = self.packages.${system}.temurin.stable;
-      });
+      }));
 }
--- a/sources.json
+++ b/sources.json
@ -1,4 +1,104 @@
 {
+  "aarch64-darwin": {
+    "semeru": {
+      "versions": {
+        "jdk11": {
+          "link": "https://github.com/AdoptOpenJDK/semeru11-binaries/releases/download/jdk-11.0.18%2B10_openj9-0.36.1/ibm-semeru-open-jdk_aarch64_mac_11.0.18_10_openj9-0.36.1.tar.gz",
+          "major_version": 11,
+          "sha256": "8f6e4ea6dbb19f605e4acae9b056779aacc2ae483ff1a724f90317da88d8a77e",
+          "java_version": "11.0.18+10"
+        },
+        "jdk17": {
+          "link": "https://github.com/AdoptOpenJDK/semeru17-binaries/releases/download/jdk-17.0.6%2B10_openj9-0.36.0/ibm-semeru-open-jdk_aarch64_mac_17.0.6_10_openj9-0.36.0.tar.gz",
+          "major_version": 17,
+          "sha256": "56637c78f0855ab727e4372955b3bb56b5fe342bd0c7ff6b1a346a0d92daaf56",
+          "java_version": "17.0.6+10"
+        },
+        "jdk18": {
+          "link": "https://github.com/AdoptOpenJDK/semeru18-binaries/releases/download/jdk-18.0.2%2B9_openj9-0.33.1/ibm-semeru-open-jdk_aarch64_mac_18.0.2_9_openj9-0.33.1.tar.gz",
+          "major_version": 18,
+          "sha256": "0330df7979f28e17d193b97c190d7be524888247671206eff467144133d8e115",
+          "java_version": "18.0.2-ea+9"
+        },
+        "jdk19": {
+          "link": "https://github.com/AdoptOpenJDK/semeru19-binaries/releases/download/jdk-19.0.2%2B7_openj9-0.37.0/ibm-semeru-open-jdk_aarch64_mac_19.0.2_7_openj9-0.37.0.tar.gz",
+          "major_version": 19,
+          "sha256": "8f3ad4044689a49cc69873b6ce9136ecdb44b81ef2fa6201c8cf85da038053ec",
+          "java_version": "19.0.2+7"
+        }
+      },
+      "latest": {
+        "link": "https://github.com/AdoptOpenJDK/semeru19-binaries/releases/download/jdk-19.0.2%2B7_openj9-0.37.0/ibm-semeru-open-jdk_aarch64_mac_19.0.2_7_openj9-0.37.0.tar.gz",
+        "major_version": 19,
+        "sha256": "8f3ad4044689a49cc69873b6ce9136ecdb44b81ef2fa6201c8cf85da038053ec",
+        "java_version": "19.0.2+7"
+      },
+      "stable": {
+        "link": "https://github.com/AdoptOpenJDK/semeru19-binaries/releases/download/jdk-19.0.2%2B7_openj9-0.37.0/ibm-semeru-open-jdk_aarch64_mac_19.0.2_7_openj9-0.37.0.tar.gz",
+        "major_version": 19,
+        "sha256": "8f3ad4044689a49cc69873b6ce9136ecdb44b81ef2fa6201c8cf85da038053ec",
+        "java_version": "19.0.2+7"
+      },
+      "lts": {
+        "link": "https://github.com/AdoptOpenJDK/semeru17-binaries/releases/download/jdk-17.0.6%2B10_openj9-0.36.0/ibm-semeru-open-jdk_aarch64_mac_17.0.6_10_openj9-0.36.0.tar.gz",
+        "major_version": 17,
+        "sha256": "56637c78f0855ab727e4372955b3bb56b5fe342bd0c7ff6b1a346a0d92daaf56",
+        "java_version": "17.0.6+10"
+      }
+    },
+    "temurin": {
+      "versions": {
+        "jdk11": {
+          "link": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.19_7.tar.gz",
+          "major_version": 11,
+          "sha256": "f3b416ecccf51f45cc8c986975eb7bd35e7e1ad953656ab0a807125963fcf73b",
+          "java_version": "11.0.19+7"
+        },
+        "jdk17": {
+          "link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.7_7.tar.gz",
+          "major_version": 17,
+          "sha256": "1d6aeb55b47341e8ec33cc1644d58b88dfdcce17aa003a858baa7460550e6ff9",
+          "java_version": "17.0.7+7"
+        },
+        "jdk18": {
+          "link": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_aarch64_mac_hotspot_18.0.2.1_1.tar.gz",
+          "major_version": 18,
+          "sha256": "c5ec423f52d8f3aa632941f29fd289f2e31dce5fe6f3abed9b72bd374f54cd41",
+          "java_version": "18.0.2.1+1"
+        },
+        "jdk19": {
+          "link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_aarch64_mac_hotspot_19.0.2_7.tar.gz",
+          "major_version": 19,
+          "sha256": "c419330cc8d6b9974d3bf1937f8f0e747c34c469afd5c546831d35aa19e03d49",
+          "java_version": "19.0.2+7"
+        },
+        "jdk20": {
+          "link": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_aarch64_mac_hotspot_20.0.1_9.tar.gz",
+          "major_version": 20,
+          "sha256": "e743f7a4aebb46bfb02e164c7aa009a29bcce1d7dd0c4926541893ea6ed21d82",
+          "java_version": "20.0.1+9"
+        }
+      },
+      "latest": {
+        "link": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk20u-2023-05-10-08-56-beta/OpenJDK20U-jdk_aarch64_mac_hotspot_2023-05-10-08-56.tar.gz",
+        "major_version": 20,
+        "sha256": "cd7f69b2450ab162bd818afc36a9fd41db250863f30d7c28b56532698721abd3",
+        "java_version": "20.0.1-beta+9-202305100346"
+      },
+      "stable": {
+        "link": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_aarch64_mac_hotspot_20.0.1_9.tar.gz",
+        "major_version": 20,
+        "sha256": "e743f7a4aebb46bfb02e164c7aa009a29bcce1d7dd0c4926541893ea6ed21d82",
+        "java_version": "20.0.1+9"
+      },
+      "lts": {
+        "link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.7_7.tar.gz",
+        "major_version": 17,
+        "sha256": "1d6aeb55b47341e8ec33cc1644d58b88dfdcce17aa003a858baa7460550e6ff9",
+        "java_version": "17.0.7+7"
+      }
+    }
+  },
  "aarch64-linux": {
    "semeru": {
      "versions": {
@ -129,6 +229,154 @@
      }
    }
  },
+  "x86_64-darwin": {
+    "semeru": {
+      "versions": {
+        "jdk11": {
+          "link": "https://github.com/AdoptOpenJDK/semeru11-binaries/releases/download/jdk-11.0.18%2B10_openj9-0.36.1/ibm-semeru-open-jdk_x64_mac_11.0.18_10_openj9-0.36.1.tar.gz",
+          "major_version": 11,
+          "sha256": "ef18ff9bcd8dc0955fc3f69a43953373d3681aed9465ec561085a034a23f866b",
+          "java_version": "11.0.18+10"
+        },
+        "jdk12": {
+          "link": "https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.2%2B10.3_openj9-0.15.1/OpenJDK12U-jdk_x64_mac_openj9_12.0.2_10.3_openj9_0.15.1.tar.gz",
+          "major_version": 12,
+          "sha256": "b3d5874fb258b277037d04901aa35bef5a685200ad9d2e72e77cd90e48af293b",
+          "java_version": "12.0.2+10"
+        },
+        "jdk13": {
+          "link": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
+          "major_version": 13,
+          "sha256": "dd8d92eec98a3455ec5cd065a0a6672cc1aef280c6a68c507c372ccc1d98fbaa",
+          "java_version": "13.0.2+8"
+        },
+        "jdk14": {
+          "link": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jdk_x64_mac_openj9_14.0.2_12_openj9-0.21.0.tar.gz",
+          "major_version": 14,
+          "sha256": "95e6abcc12dde676ccd5ba65ab86f06ddaa22749dde00e31f4c6d3ea95277359",
+          "java_version": "14.0.2+12"
+        },
+        "jdk15": {
+          "link": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_mac_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
+          "major_version": 15,
+          "sha256": "1336ae5529af3a0e35ae569e4188944831aeed7080a482f2490fc619380cbe53",
+          "java_version": "15.0.2+7"
+        },
+        "jdk16": {
+          "link": "https://github.com/AdoptOpenJDK/semeru16-binaries/releases/download/jdk-16.0.2%2B7_openj9-0.27.0/ibm-semeru-open-jdk_x64_mac_16.0.2_7_openj9-0.27.0.tar.gz",
+          "major_version": 16,
+          "sha256": "89e807261145243a358a2a626f64340944c03622f34eaa35429053e2085d7aef",
+          "java_version": "16.0.2+7"
+        },
+        "jdk17": {
+          "link": "https://github.com/AdoptOpenJDK/semeru17-binaries/releases/download/jdk-17.0.6%2B10_openj9-0.36.0/ibm-semeru-open-jdk_x64_mac_17.0.6_10_openj9-0.36.0.tar.gz",
+          "major_version": 17,
+          "sha256": "37baae44a266c53a90e494be208564c690ed36b7b590f0d75e257efe9173e6c9",
+          "java_version": "17.0.6+10"
+        },
+        "jdk18": {
+          "link": "https://github.com/AdoptOpenJDK/semeru18-binaries/releases/download/jdk-18.0.2%2B9_openj9-0.33.1/ibm-semeru-open-jdk_x64_mac_18.0.2_9_openj9-0.33.1.tar.gz",
+          "major_version": 18,
+          "sha256": "a7ecbcfc57304d28637ab490330da33f55255200d7310ba217e255cbacd321e6",
+          "java_version": "18.0.2+9"
+        },
+        "jdk19": {
+          "link": "https://github.com/AdoptOpenJDK/semeru19-binaries/releases/download/jdk-19.0.2%2B7_openj9-0.37.0/ibm-semeru-open-jdk_x64_mac_19.0.2_7_openj9-0.37.0.tar.gz",
+          "major_version": 19,
+          "sha256": "2eb2ae87c797999c794f54bac19e7f9062a17be2eb8ee1d200f3a2dcba654f4b",
+          "java_version": "19.0.2+7"
+        },
+        "jdk8": {
+          "link": "https://github.com/AdoptOpenJDK/semeru8-binaries/releases/download/jdk8u362-b09_openj9-0.36.0/ibm-semeru-open-jdk_x64_mac_8u362b09_openj9-0.36.0.tar.gz",
+          "major_version": 8,
+          "sha256": "ce4e07b5af6ad236365dde5736ac95965c736415f0ec52ff94d8f90fc664387d",
+          "java_version": "1.8.0_362-b09"
+        }
+      },
+      "latest": {
+        "link": "https://github.com/AdoptOpenJDK/semeru19-binaries/releases/download/jdk-19.0.2%2B7_openj9-0.37.0/ibm-semeru-open-jdk_x64_mac_19.0.2_7_openj9-0.37.0.tar.gz",
+        "major_version": 19,
+        "sha256": "2eb2ae87c797999c794f54bac19e7f9062a17be2eb8ee1d200f3a2dcba654f4b",
+        "java_version": "19.0.2+7"
+      },
+      "stable": {
+        "link": "https://github.com/AdoptOpenJDK/semeru19-binaries/releases/download/jdk-19.0.2%2B7_openj9-0.37.0/ibm-semeru-open-jdk_x64_mac_19.0.2_7_openj9-0.37.0.tar.gz",
+        "major_version": 19,
+        "sha256": "2eb2ae87c797999c794f54bac19e7f9062a17be2eb8ee1d200f3a2dcba654f4b",
+        "java_version": "19.0.2+7"
+      },
+      "lts": {
+        "link": "https://github.com/AdoptOpenJDK/semeru17-binaries/releases/download/jdk-17.0.6%2B10_openj9-0.36.0/ibm-semeru-open-jdk_x64_mac_17.0.6_10_openj9-0.36.0.tar.gz",
+        "major_version": 17,
+        "sha256": "37baae44a266c53a90e494be208564c690ed36b7b590f0d75e257efe9173e6c9",
+        "java_version": "17.0.6+10"
+      }
+    },
+    "temurin": {
+      "versions": {
+        "jdk11": {
+          "link": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_mac_hotspot_11.0.19_7.tar.gz",
+          "major_version": 11,
+          "sha256": "fc34c4f0e590071dcd65a0f93540913466ccac3aa8caa984826713b67afb696d",
+          "java_version": "11.0.19+7"
+        },
+        "jdk16": {
+          "link": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_mac_hotspot_16.0.2_7.tar.gz",
+          "major_version": 16,
+          "sha256": "27975d9e695cfbb93861540926f9f7bcac973a254ceecbee549706a99cbbdf95",
+          "java_version": "16.0.2+7"
+        },
+        "jdk17": {
+          "link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7.tar.gz",
+          "major_version": 17,
+          "sha256": "50d0e9840113c93916418068ba6c845f1a72ed0dab80a8a1f7977b0e658b65fb",
+          "java_version": "17.0.7+7"
+        },
+        "jdk18": {
+          "link": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_x64_mac_hotspot_18.0.2.1_1.tar.gz",
+          "major_version": 18,
+          "sha256": "2ed916b0c9d197a6bf71b76e84d94125023c2609e0a9b22c64553eff5c9c29c1",
+          "java_version": "18.0.2.1+1"
+        },
+        "jdk19": {
+          "link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_mac_hotspot_19.0.2_7.tar.gz",
+          "major_version": 19,
+          "sha256": "f59d4157b3b53a35e72db283659d47f14aecae0ff5936d5f8078000504299da6",
+          "java_version": "19.0.2+7"
+        },
+        "jdk20": {
+          "link": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_x64_mac_hotspot_20.0.1_9.tar.gz",
+          "major_version": 20,
+          "sha256": "7cccfc4fb9f63410b7fdc315fd1c7739cf61888930d7f88f3eee6589d14e861f",
+          "java_version": "20.0.1+9"
+        },
+        "jdk8": {
+          "link": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_mac_hotspot_8u372b07.tar.gz",
+          "major_version": 8,
+          "sha256": "9c33db312cc46b6bfe705770fdc5c08edb7d790ba70be4e8b12a98e79da5f4a1",
+          "java_version": "1.8.0_372-b07"
+        }
+      },
+      "latest": {
+        "link": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk20u-2023-05-10-08-56-beta/OpenJDK20U-jdk_x64_mac_hotspot_2023-05-10-08-56.tar.gz",
+        "major_version": 20,
+        "sha256": "db81a4e793ed28fa7a352c593b2573b779e11431c50e8c84f0c294d176885198",
+        "java_version": "20.0.1-beta+9-202305100346"
+      },
+      "stable": {
+        "link": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_x64_mac_hotspot_20.0.1_9.tar.gz",
+        "major_version": 20,
+        "sha256": "7cccfc4fb9f63410b7fdc315fd1c7739cf61888930d7f88f3eee6589d14e861f",
+        "java_version": "20.0.1+9"
+      },
+      "lts": {
+        "link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7.tar.gz",
+        "major_version": 17,
+        "sha256": "50d0e9840113c93916418068ba6c845f1a72ed0dab80a8a1f7977b0e658b65fb",
+        "java_version": "17.0.7+7"
+      }
+    }
+  },
  "x86_64-linux": {
    "semeru": {
      "versions": {
--- a/updater/flake.lock
+++ b/updater/flake.lock
@ -57,11 +57,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1684212024,
-        "narHash": "sha256-/3ZvkPuIXdyZqPR53qC7aaV5wiwMOY+ddbESOykZ9Vo=",
+        "lastModified": 1684242266,
+        "narHash": "sha256-uaCQ2k1bmojHKjWQngvnnnxQJMY8zi1zq527HdWgQf8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d4825e5e4ac1de7d5bb99381534fd0af3875a26d",
+        "rev": "7e0743a5aea1dc755d4b761daf75b20aa486fdad",
        "type": "github"
      },
      "original": {
@ -100,11 +100,11 @@
        "utils": "utils"
      },
      "locked": {
-        "lastModified": 1684207659,
-        "narHash": "sha256-EVVCm5u/tWPHDVjXPDEKioLsDiQLcrASw9Yo8i4l6dI=",
+        "lastModified": 1684268423,
+        "narHash": "sha256-Br8A921BmENBfPsauY8lbFtZ7LeQPxDPQfGSJm+t83w=",
        "ref": "refs/heads/trunk",
-        "rev": "4cca422b3b3cf2eef688306437eee165abf79687",
-        "revCount": 13,
+        "rev": "2782d18ed2e539816213c9db9c1e4183b715d1aa",
+        "revCount": 15,
        "type": "git",
        "url": "https://git.stranger.systems/nix/Rust"
      },
--- a/updater/src/main.rs
+++ b/updater/src/main.rs
@ -30,14 +30,14 @@ async fn main() -> Result<()> {
            adoptium
                .get_all("x64", "linux")
                .await
-                .context("Failed getting x86_64 adopt releases")?,
+                .context("Failed getting x86_64 temurin releases")?,
        );
        x86_64.insert(
            "semeru".to_string(),
            semeru
                .get_all("x64", "linux")
                .await
-                .context("Failed getting x86_64 adopt releases")?,
+                .context("Failed getting x86_64 semeru releases")?,
        );
    }
    // Then aarch64-linux
@ -48,14 +48,50 @@ async fn main() -> Result<()> {
            adoptium
                .get_all("aarch64", "linux")
                .await
-                .context("Failed getting aarch64 adopt releases")?,
+                .context("Failed getting aarch64 temurin releases")?,
        );
        aarch64.insert(
            "semeru".to_string(),
            semeru
                .get_all("aarch64", "linux")
                .await
-                .context("Failed getting aarch64 adopt releases")?,
+                .context("Failed getting aarch64 semeru releases")?,
+        );
+    }
+    // Then x86_64-darwin
+    {
+        let x86_64 = output.entry("x86_64-darwin".to_string()).or_default();
+        x86_64.insert(
+            "temurin".to_string(),
+            adoptium
+                .get_all("x64", "mac")
+                .await
+                .context("Failed getting x86_64-darwin temurin releases")?,
+        );
+        x86_64.insert(
+            "semeru".to_string(),
+            semeru
+                .get_all("x64", "mac")
+                .await
+                .context("Failed getting x86_64-darwin semeru releases")?,
+        );
+    }
+    // Then aarch64-darwin
+    {
+        let aarch64 = output.entry("aarch64-darwin".to_string()).or_default();
+        aarch64.insert(
+            "temurin".to_string(),
+            adoptium
+                .get_all("aarch64", "mac")
+                .await
+                .context("Failed getting aarch64-darwin temurin releases")?,
+        );
+        aarch64.insert(
+            "semeru".to_string(),
+            semeru
+                .get_all("aarch64", "mac")
+                .await
+                .context("Failed getting aarch64-darwin semeru releases")?,
        );
    }
    let output = serde_json::to_string_pretty(&output).context("Failed to serialize output")?;
Author	SHA1	Message	Date
Nathan McCarty	df64fb851a	Darwin support	2023-05-16 16:48:00 -04:00
Nathan McCarty	d4b3e8f2bb	Add darwin sources	2023-05-16 16:31:52 -04:00
Nathan McCarty	9d4d9b95a7	Update updater flake	2023-05-16 16:22:17 -04:00