Update flake

Fix updater to follow redirects on latest
Switch updater to rust toolchain flake
2023-05-15 17:14:09 -04:00 · 2023-05-15 17:10:18 -04:00 · 2023-05-15 16:55:30 -04:00
6 changed files with 223 additions and 309 deletions
--- a/flake.nix
+++ b/flake.nix
@ -100,6 +100,6 @@
        packages.semeru-stable = self.packages.${system}.semeru.stable;
        packages.semeru-lts = self.packages.${system}.semeru.lts;

-        defaultPackage = self.packages.${system}.stable;
+        defaultPackage = self.packages.${system}.temurin.stable;
      });
 }
--- a/sources.json
+++ b/sources.json
@ -9,10 +9,10 @@
          "java_version": "10.0.2+13.1"
        },
        "jdk11": {
-          "link": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.16.1_1.tar.gz",
+          "link": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.19_7.tar.gz",
          "major_version": 11,
-          "sha256": "5f6b513757d386352cf91514ed5859d1ab59364b4453e1f1c57152ba2039b8e2",
-          "java_version": "11.0.16.1+1"
+          "sha256": "5f19fb28aea3e28fcc402b73ce72f62b602992d48769502effe81c52ca39a581",
+          "java_version": "11.0.19+7"
        },
        "jdk12": {
          "link": "https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.2%2B10/OpenJDK12U-jdk_x64_linux_hotspot_12.0.2_10.tar.gz",
@ -45,10 +45,10 @@
          "java_version": "16.0.2+7"
        },
        "jdk17": {
-          "link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_linux_hotspot_17.0.4.1_1.tar.gz",
+          "link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz",
          "major_version": 17,
-          "sha256": "5fbf8b62c44f10be2efab97c5f5dbf15b74fae31e451ec10abbc74e54a04ff44",
-          "java_version": "17.0.4.1+1"
+          "sha256": "e9458b38e97358850902c2936a1bb5f35f6cffc59da9fcd28c63eab8dbbfbc3b",
+          "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_linux_hotspot_18.0.2.1_1.tar.gz",
@ -57,16 +57,16 @@
          "java_version": "18.0.2.1+1"
        },
        "jdk19": {
-          "link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19%2B36/OpenJDK19U-jdk_x64_linux_hotspot_19_36.tar.gz",
+          "link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_linux_hotspot_19.0.2_7.tar.gz",
          "major_version": 19,
-          "sha256": "d10becfc1ea6586180246455ee8d462875f97655416a7d7c5a1c60d0570dbc8f",
-          "java_version": "19+36"
+          "sha256": "3a3ba7a3f8c3a5999e2c91ea1dca843435a0d1c43737bd2f6822b2f02fc52165",
+          "java_version": "19.0.2+7"
        },
        "jdk8": {
-          "link": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u352b08.tar.gz",
+          "link": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_linux_hotspot_8u372b07.tar.gz",
          "major_version": 8,
-          "sha256": "1633bd7590cb1cd72f5a1378ae8294451028b274d798e2a4ac672059a2f00fee",
-          "java_version": "1.8.0_352-b08"
+          "sha256": "78a0b3547d6f3d46227f2ad8c774248425f20f1cd63f399b713f0cdde2cc376c",
+          "java_version": "1.8.0_372-b07"
        },
        "jdk9": {
          "link": "https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk-9%2B181/OpenJDK9U-jdk_x64_linux_hotspot_9_181.tar.gz",
@ -76,31 +76,31 @@
        }
      },
      "latest": {
-        "link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk19u-2022-11-26-09-40-beta/OpenJDK19U-jdk_x64_linux_hotspot_2022-11-26-09-40.tar.gz",
+        "link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk19u-2023-02-28-13-32-beta/OpenJDK19U-jdk_x64_linux_hotspot_2023-02-28-13-32.tar.gz",
        "major_version": 19,
-        "sha256": "065146884aaf051f4e5fff6f2bd615865124c4db5ca1cd7c97c68b93ef9265ae",
-        "java_version": "19.0.1-beta+10-202211260350"
+        "sha256": "fb78a338b97688cb9a72ff49779636afb9c38882e6275df0760da74239b45313",
+        "java_version": "19.0.2-beta+7-202302280337"
      },
      "stable": {
-        "link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk19-2022-10-06-09-10-beta/OpenJDK19U-jdk_x64_linux_hotspot_2022-10-06-09-10.tar.gz",
+        "link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk19u-2023-02-28-13-32-beta/OpenJDK19U-jdk_x64_linux_hotspot_2023-02-28-13-32.tar.gz",
        "major_version": 19,
-        "sha256": "e3b9b64914d20fe56b881eee98e9372cf8517ec52b3c1b1f68babdd294d31182",
-        "java_version": "19-beta+36-202210060344"
+        "sha256": "fb78a338b97688cb9a72ff49779636afb9c38882e6275df0760da74239b45313",
+        "java_version": "19.0.2-beta+7-202302280337"
      },
      "lts": {
-        "link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk17u-2022-11-25-15-05-beta/OpenJDK17U-jdk_x64_linux_hotspot_2022-11-25-15-05.tar.gz",
+        "link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk17u-2023-05-12-05-40-beta/OpenJDK17U-jdk_x64_linux_hotspot_2023-05-12-05-40.tar.gz",
        "major_version": 17,
-        "sha256": "a20bb727ca8477a3f1375982ebd7052c74b3e6e858f523392d0cbfba1d2b2b89",
-        "java_version": "17.0.6-beta+4-202211250013"
+        "sha256": "004fe3df67c575b3b89eae9a1230fd0c53439e37427481a06f55bb845bf39f80",
+        "java_version": "17.0.8-beta+2-202305120032"
      }
    },
    "temurin": {
      "versions": {
        "jdk11": {
-          "link": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_x64_linux_hotspot_11.0.17_8.tar.gz",
+          "link": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.19_7.tar.gz",
          "major_version": 11,
-          "sha256": "b8d46ed08ef4859476fe6421a7690d899ed83dce63f13fd894f994043177ef3c",
-          "java_version": "11.0.17+8"
+          "sha256": "5f19fb28aea3e28fcc402b73ce72f62b602992d48769502effe81c52ca39a581",
+          "java_version": "11.0.19+7"
        },
        "jdk16": {
          "link": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz",
@ -109,10 +109,10 @@
          "java_version": "16.0.2+7"
        },
        "jdk17": {
-          "link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.5_8.tar.gz",
+          "link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz",
          "major_version": 17,
-          "sha256": "482180725ceca472e12a8e6d1a4af23d608d78287a77d963335e2a0156a020af",
-          "java_version": "17.0.5+8"
+          "sha256": "e9458b38e97358850902c2936a1bb5f35f6cffc59da9fcd28c63eab8dbbfbc3b",
+          "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_linux_hotspot_18.0.2.1_1.tar.gz",
@ -121,35 +121,41 @@
          "java_version": "18.0.2.1+1"
        },
        "jdk19": {
-          "link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_x64_linux_hotspot_19.0.1_10.tar.gz",
+          "link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_linux_hotspot_19.0.2_7.tar.gz",
          "major_version": 19,
-          "sha256": "163da7ea140210bae97c6a4590c757858ab4520a78af0e3e33129863d4087552",
-          "java_version": "19.0.1+10"
+          "sha256": "3a3ba7a3f8c3a5999e2c91ea1dca843435a0d1c43737bd2f6822b2f02fc52165",
+          "java_version": "19.0.2+7"
+        },
+        "jdk20": {
+          "link": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_x64_linux_hotspot_20.0.1_9.tar.gz",
+          "major_version": 20,
+          "sha256": "43ad054f135a7894dc87ad5d10ad45d8e82846186515892acdbc17c2c5cd27e4",
+          "java_version": "20.0.1+9"
        },
        "jdk8": {
-          "link": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u352b08.tar.gz",
+          "link": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_linux_hotspot_8u372b07.tar.gz",
          "major_version": 8,
-          "sha256": "1633bd7590cb1cd72f5a1378ae8294451028b274d798e2a4ac672059a2f00fee",
-          "java_version": "1.8.0_352-b08"
+          "sha256": "78a0b3547d6f3d46227f2ad8c774248425f20f1cd63f399b713f0cdde2cc376c",
+          "java_version": "1.8.0_372-b07"
        }
      },
      "latest": {
-        "link": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-2022-11-25-14-40-beta/OpenJDK-jdk_x64_linux_hotspot_2022-11-25-03-30.tar.gz",
+        "link": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk20u-2023-05-10-08-56-beta/OpenJDK20U-jdk_x64_linux_hotspot_2023-05-10-08-56.tar.gz",
        "major_version": 20,
-        "sha256": "c94c0062160350d3a595337f3b7bd3e4e8b55e037a262317185d11c3b4ecaf66",
-        "java_version": "20-beta+25-202211250348"
+        "sha256": "d73db1554c637bf1619cd0e23f27e3e236ab505359934afbf7abe0cd357288c9",
+        "java_version": "20.0.1-beta+9-202305100346"
      },
      "stable": {
-        "link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk19u-2022-11-26-09-40-beta/OpenJDK19U-jdk_x64_linux_hotspot_2022-11-26-09-40.tar.gz",
-        "major_version": 19,
-        "sha256": "065146884aaf051f4e5fff6f2bd615865124c4db5ca1cd7c97c68b93ef9265ae",
-        "java_version": "19.0.1-beta+10-202211260350"
+        "link": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk20u-2023-05-10-08-56-beta/OpenJDK20U-jdk_x64_linux_hotspot_2023-05-10-08-56.tar.gz",
+        "major_version": 20,
+        "sha256": "d73db1554c637bf1619cd0e23f27e3e236ab505359934afbf7abe0cd357288c9",
+        "java_version": "20.0.1-beta+9-202305100346"
      },
      "lts": {
-        "link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk17u-2022-11-25-15-05-beta/OpenJDK17U-jdk_x64_linux_hotspot_2022-11-25-15-05.tar.gz",
+        "link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk17u-2023-05-12-05-40-beta/OpenJDK17U-jdk_x64_linux_hotspot_2023-05-12-05-40.tar.gz",
        "major_version": 17,
-        "sha256": "a20bb727ca8477a3f1375982ebd7052c74b3e6e858f523392d0cbfba1d2b2b89",
-        "java_version": "17.0.6-beta+4-202211250013"
+        "sha256": "004fe3df67c575b3b89eae9a1230fd0c53439e37427481a06f55bb845bf39f80",
+        "java_version": "17.0.8-beta+2-202305120032"
      }
    }
  },
@ -163,10 +169,10 @@
          "java_version": "10.0.2+13.1"
        },
        "jdk11": {
-          "link": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.16.1_1.tar.gz",
+          "link": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.19_7.tar.gz",
          "major_version": 11,
-          "sha256": "5f6b513757d386352cf91514ed5859d1ab59364b4453e1f1c57152ba2039b8e2",
-          "java_version": "11.0.16.1+1"
+          "sha256": "5f19fb28aea3e28fcc402b73ce72f62b602992d48769502effe81c52ca39a581",
+          "java_version": "11.0.19+7"
        },
        "jdk12": {
          "link": "https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.2%2B10/OpenJDK12U-jdk_x64_linux_hotspot_12.0.2_10.tar.gz",
@ -199,10 +205,10 @@
          "java_version": "16.0.2+7"
        },
        "jdk17": {
-          "link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_linux_hotspot_17.0.4.1_1.tar.gz",
+          "link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz",
          "major_version": 17,
-          "sha256": "5fbf8b62c44f10be2efab97c5f5dbf15b74fae31e451ec10abbc74e54a04ff44",
-          "java_version": "17.0.4.1+1"
+          "sha256": "e9458b38e97358850902c2936a1bb5f35f6cffc59da9fcd28c63eab8dbbfbc3b",
+          "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_linux_hotspot_18.0.2.1_1.tar.gz",
@ -211,16 +217,16 @@
          "java_version": "18.0.2.1+1"
        },
        "jdk19": {
-          "link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19%2B36/OpenJDK19U-jdk_x64_linux_hotspot_19_36.tar.gz",
+          "link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_linux_hotspot_19.0.2_7.tar.gz",
          "major_version": 19,
-          "sha256": "d10becfc1ea6586180246455ee8d462875f97655416a7d7c5a1c60d0570dbc8f",
-          "java_version": "19+36"
+          "sha256": "3a3ba7a3f8c3a5999e2c91ea1dca843435a0d1c43737bd2f6822b2f02fc52165",
+          "java_version": "19.0.2+7"
        },
        "jdk8": {
-          "link": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u352b08.tar.gz",
+          "link": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_linux_hotspot_8u372b07.tar.gz",
          "major_version": 8,
-          "sha256": "1633bd7590cb1cd72f5a1378ae8294451028b274d798e2a4ac672059a2f00fee",
-          "java_version": "1.8.0_352-b08"
+          "sha256": "78a0b3547d6f3d46227f2ad8c774248425f20f1cd63f399b713f0cdde2cc376c",
+          "java_version": "1.8.0_372-b07"
        },
        "jdk9": {
          "link": "https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk-9%2B181/OpenJDK9U-jdk_x64_linux_hotspot_9_181.tar.gz",
@ -230,31 +236,31 @@
        }
      },
      "latest": {
-        "link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk19u-2022-11-26-09-40-beta/OpenJDK19U-jdk_x64_linux_hotspot_2022-11-26-09-40.tar.gz",
+        "link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk19u-2023-02-28-13-32-beta/OpenJDK19U-jdk_x64_linux_hotspot_2023-02-28-13-32.tar.gz",
        "major_version": 19,
-        "sha256": "065146884aaf051f4e5fff6f2bd615865124c4db5ca1cd7c97c68b93ef9265ae",
-        "java_version": "19.0.1-beta+10-202211260350"
+        "sha256": "fb78a338b97688cb9a72ff49779636afb9c38882e6275df0760da74239b45313",
+        "java_version": "19.0.2-beta+7-202302280337"
      },
      "stable": {
-        "link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk19-2022-10-06-09-10-beta/OpenJDK19U-jdk_x64_linux_hotspot_2022-10-06-09-10.tar.gz",
+        "link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk19u-2023-02-28-13-32-beta/OpenJDK19U-jdk_x64_linux_hotspot_2023-02-28-13-32.tar.gz",
        "major_version": 19,
-        "sha256": "e3b9b64914d20fe56b881eee98e9372cf8517ec52b3c1b1f68babdd294d31182",
-        "java_version": "19-beta+36-202210060344"
+        "sha256": "fb78a338b97688cb9a72ff49779636afb9c38882e6275df0760da74239b45313",
+        "java_version": "19.0.2-beta+7-202302280337"
      },
      "lts": {
-        "link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk17u-2022-11-25-15-05-beta/OpenJDK17U-jdk_x64_linux_hotspot_2022-11-25-15-05.tar.gz",
+        "link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk17u-2023-05-12-05-40-beta/OpenJDK17U-jdk_x64_linux_hotspot_2023-05-12-05-40.tar.gz",
        "major_version": 17,
-        "sha256": "a20bb727ca8477a3f1375982ebd7052c74b3e6e858f523392d0cbfba1d2b2b89",
-        "java_version": "17.0.6-beta+4-202211250013"
+        "sha256": "004fe3df67c575b3b89eae9a1230fd0c53439e37427481a06f55bb845bf39f80",
+        "java_version": "17.0.8-beta+2-202305120032"
      }
    },
    "temurin": {
      "versions": {
        "jdk11": {
-          "link": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_x64_linux_hotspot_11.0.17_8.tar.gz",
+          "link": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.19_7.tar.gz",
          "major_version": 11,
-          "sha256": "b8d46ed08ef4859476fe6421a7690d899ed83dce63f13fd894f994043177ef3c",
-          "java_version": "11.0.17+8"
+          "sha256": "5f19fb28aea3e28fcc402b73ce72f62b602992d48769502effe81c52ca39a581",
+          "java_version": "11.0.19+7"
        },
        "jdk16": {
          "link": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz",
@ -263,10 +269,10 @@
          "java_version": "16.0.2+7"
        },
        "jdk17": {
-          "link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.5_8.tar.gz",
+          "link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz",
          "major_version": 17,
-          "sha256": "482180725ceca472e12a8e6d1a4af23d608d78287a77d963335e2a0156a020af",
-          "java_version": "17.0.5+8"
+          "sha256": "e9458b38e97358850902c2936a1bb5f35f6cffc59da9fcd28c63eab8dbbfbc3b",
+          "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_linux_hotspot_18.0.2.1_1.tar.gz",
@ -275,35 +281,41 @@
          "java_version": "18.0.2.1+1"
        },
        "jdk19": {
-          "link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_x64_linux_hotspot_19.0.1_10.tar.gz",
+          "link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_linux_hotspot_19.0.2_7.tar.gz",
          "major_version": 19,
-          "sha256": "163da7ea140210bae97c6a4590c757858ab4520a78af0e3e33129863d4087552",
-          "java_version": "19.0.1+10"
+          "sha256": "3a3ba7a3f8c3a5999e2c91ea1dca843435a0d1c43737bd2f6822b2f02fc52165",
+          "java_version": "19.0.2+7"
+        },
+        "jdk20": {
+          "link": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_x64_linux_hotspot_20.0.1_9.tar.gz",
+          "major_version": 20,
+          "sha256": "43ad054f135a7894dc87ad5d10ad45d8e82846186515892acdbc17c2c5cd27e4",
+          "java_version": "20.0.1+9"
        },
        "jdk8": {
-          "link": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u352b08.tar.gz",
+          "link": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_linux_hotspot_8u372b07.tar.gz",
          "major_version": 8,
-          "sha256": "1633bd7590cb1cd72f5a1378ae8294451028b274d798e2a4ac672059a2f00fee",
-          "java_version": "1.8.0_352-b08"
+          "sha256": "78a0b3547d6f3d46227f2ad8c774248425f20f1cd63f399b713f0cdde2cc376c",
+          "java_version": "1.8.0_372-b07"
        }
      },
      "latest": {
-        "link": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-2022-11-25-14-40-beta/OpenJDK-jdk_x64_linux_hotspot_2022-11-25-03-30.tar.gz",
+        "link": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk20u-2023-05-10-08-56-beta/OpenJDK20U-jdk_x64_linux_hotspot_2023-05-10-08-56.tar.gz",
        "major_version": 20,
-        "sha256": "c94c0062160350d3a595337f3b7bd3e4e8b55e037a262317185d11c3b4ecaf66",
-        "java_version": "20-beta+25-202211250348"
+        "sha256": "d73db1554c637bf1619cd0e23f27e3e236ab505359934afbf7abe0cd357288c9",
+        "java_version": "20.0.1-beta+9-202305100346"
      },
      "stable": {
-        "link": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk19u-2022-11-26-09-40-beta/OpenJDK19U-jdk_x64_linux_hotspot_2022-11-26-09-40.tar.gz",
-        "major_version": 19,
-        "sha256": "065146884aaf051f4e5fff6f2bd615865124c4db5ca1cd7c97c68b93ef9265ae",
-        "java_version": "19.0.1-beta+10-202211260350"
+        "link": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk20u-2023-05-10-08-56-beta/OpenJDK20U-jdk_x64_linux_hotspot_2023-05-10-08-56.tar.gz",
+        "major_version": 20,
+        "sha256": "d73db1554c637bf1619cd0e23f27e3e236ab505359934afbf7abe0cd357288c9",
+        "java_version": "20.0.1-beta+9-202305100346"
      },
      "lts": {
-        "link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk17u-2022-11-25-15-05-beta/OpenJDK17U-jdk_x64_linux_hotspot_2022-11-25-15-05.tar.gz",
+        "link": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk17u-2023-05-12-05-40-beta/OpenJDK17U-jdk_x64_linux_hotspot_2023-05-12-05-40.tar.gz",
        "major_version": 17,
-        "sha256": "a20bb727ca8477a3f1375982ebd7052c74b3e6e858f523392d0cbfba1d2b2b89",
-        "java_version": "17.0.6-beta+4-202211250013"
+        "sha256": "004fe3df67c575b3b89eae9a1230fd0c53439e37427481a06f55bb845bf39f80",
+        "java_version": "17.0.8-beta+2-202305120032"
      }
    }
  }
--- a/update.sh
+++ b/update.sh
@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+set -exou pipefail
+
+DIRECTORY=$(realpath $(dirname "$0"))
+pushd $DIRECTORY
+
+nix run ./updater > sources.json
--- a/updater/flake.lock
+++ b/updater/flake.lock
@ -3,11 +3,11 @@
    "advisory-db": {
      "flake": false,
      "locked": {
-        "lastModified": 1669556130,
-        "narHash": "sha256-6qRQVSgpw+Tw17TroiUg8nAte9/KVDH+v30MOOd+pQU=",
+        "lastModified": 1683272394,
+        "narHash": "sha256-4XQZbSZ8XYAeASpr0Er8mNPnjbYLJwvaB+VyH+bt6DE=",
        "owner": "RustSec",
        "repo": "advisory-db",
-        "rev": "a66a3049c98395410a2afadf0382882b0a04d8b1",
+        "rev": "50bed3ba4066e6255dab434dc845e7f655812ce1",
        "type": "github"
      },
      "original": {
@ -16,29 +16,16 @@
        "type": "github"
      }
    },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1668681692,
-        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
      "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
        "type": "github"
      },
      "original": {
@ -50,15 +37,16 @@
    "naersk": {
      "inputs": {
        "nixpkgs": [
+          "rust",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1662220400,
-        "narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=",
+        "lastModified": 1679567394,
+        "narHash": "sha256-ZvLuzPeARDLiQUt6zSZFGOs+HZmE+3g4QURc8mkBsfM=",
        "owner": "nix-community",
        "repo": "naersk",
-        "rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3",
+        "rev": "88cd22380154a2c36799fe8098888f0f59861a15",
        "type": "github"
      },
      "original": {
@ -69,11 +57,25 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1669597967,
-        "narHash": "sha256-R+2NaDkXsYkOpFOhmVR8jBZ77Pq55Z6ilaqwFLLn000=",
+        "lastModified": 1684120848,
+        "narHash": "sha256-gIwJ5ac1FwZEkCRwjY+gLwgD4G1Bw3Xtr2jr2XihMPo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "be9e3762e719211368d186f547f847737baad720",
+        "rev": "0cb867999eec4085e1c9ca61c09b72261fa63bb4",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1684120848,
+        "narHash": "sha256-gIwJ5ac1FwZEkCRwjY+gLwgD4G1Bw3Xtr2jr2XihMPo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "0cb867999eec4085e1c9ca61c09b72261fa63bb4",
        "type": "github"
      },
      "original": {
@ -85,27 +87,46 @@
    },
    "root": {
      "inputs": {
-        "advisory-db": "advisory-db",
-        "flake-compat": "flake-compat",
-        "naersk": "naersk",
        "nixpkgs": "nixpkgs",
+        "rust": "rust"
+      }
+    },
+    "rust": {
+      "inputs": {
+        "advisory-db": "advisory-db",
+        "naersk": "naersk",
+        "nixpkgs": "nixpkgs_2",
        "rust-overlay": "rust-overlay",
        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1684183882,
+        "narHash": "sha256-Ed692aLxADTPRThPE6FdgGXWdKuLWgj84jX7Hsl4zpY=",
+        "ref": "refs/heads/trunk",
+        "rev": "9c6ccfcbc17736559181ca214e711bc493944e8a",
+        "revCount": 12,
+        "type": "git",
+        "url": "https://git.stranger.systems/nix/Rust"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.stranger.systems/nix/Rust"
      }
    },
    "rust-overlay": {
      "inputs": {
        "flake-utils": "flake-utils",
        "nixpkgs": [
+          "rust",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1669689198,
-        "narHash": "sha256-YsWu3C9IGbH3+xguTzEDyQorFe/igr6FGZ+Q5T2ocxE=",
+        "lastModified": 1684117262,
+        "narHash": "sha256-ZSF4CZqeyk6QwTjal73KPMuTWiU6w/p8ygEimrPb7u4=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "4e093ce661a63aca4bcbace33695225eae4ef4e4",
+        "rev": "4679872d2dd3e94ffef75efcbf77ea11549d90a7",
        "type": "github"
      },
      "original": {
@ -114,13 +135,46 @@
        "type": "github"
      }
    },
-    "utils": {
+    "systems": {
      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
        "type": "github"
      },
      "original": {
--- a/updater/flake.nix
+++ b/updater/flake.nix
@ -1,183 +1,10 @@
 {
-  description = "updater";
+  inputs = { rust = { url = "git+https://git.stranger.systems/nix/Rust"; }; };
+  description = "Java Flake Updater";

-  nixConfig = {
-    extra-substituters = [ "https://nix-cache.mccarty.io/" ];
-    extra-trusted-public-keys =
-      [ "nathan-nix-cache:R5/0GiItBM64sNgoFC/aSWuAopOAsObLcb/mwDf335A=" ];
-  };
-
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    utils.url = "github:numtide/flake-utils";
-    flake-compat = {
-      url = "github:edolstra/flake-compat";
-      flake = false;
+  outputs = { self, nixpkgs, rust }:
+    rust.single {
+      crateName = "updater";
+      src = ./.;
    };
-    naersk = {
-      url = "github:nix-community/naersk";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    # Used for rust compiler
-    rust-overlay = {
-      url = "github:oxalica/rust-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    # Advisory db from rust-sec
-    advisory-db = {
-      url = "github:RustSec/advisory-db";
-      flake = false;
-    };
-  };
-
-  outputs =
-    { self, nixpkgs, flake-compat, utils, naersk, rust-overlay, advisory-db }:
-    utils.lib.eachDefaultSystem (system:
-      let
-        crateName = "updater";
-        pkgs = import nixpkgs {
-          inherit system;
-          overlays = [ (import rust-overlay) ];
-
-        };
-        rust = pkgs.rust-bin.stable.latest.default.override {
-          extensions = [ "llvm-tools-preview" ];
-        };
-        naersk-lib = naersk.lib."${system}".override {
-          rustc = rust;
-          cargo = rust;
-        };
-        cargo-llvm-cov = naersk-lib.buildPackage {
-          pname = "cargo-llvm-cov";
-          src = pkgs.fetchzip {
-            url =
-              "https://crates.io/api/v1/crates/cargo-llvm-cov/0.5.0/download";
-            extension = ".tar.gz";
-            sha256 = "sha256-ifnwiOuFnpryYxLgescpxN8CzgFzSZlY+RlbyW7ND6g=";
-          };
-        };
-        cargo-nextest = naersk-lib.buildPackage {
-          pname = "cargo-nextest";
-          src = pkgs.fetchzip {
-            url =
-              "https://crates.io/api/v1/crates/cargo-nextest/0.9.37/download";
-            extension = ".tar.gz";
-            sha256 = "sha256-1tEEZipJ8GqQqESKD9664Pax4evIp+G2tOpZuh6xN3U=";
-          };
-        };
-        devBase = with pkgs; [
-          # Build tools
-          rust-analyzer
-          cmake
-          gnuplot
-          # git tooling
-          gitFull
-          pre-commit
-          git-lfs
-          git-cliff
-          # Cargo addons
-          cargo-llvm-cov
-          cargo-nextest
-          cargo-release
-          cargo-udeps
-          cargo-audit
-          # Formatters
-          nixpkgs-fmt
-          python39Packages.mdformat
-          # for ci reasons
-          bash
-          cacert
-          # Sourcehut
-          hut
-        ];
-        sharedDeps = with pkgs; [ curl openssl pkg-config ];
-        sharedNativeDeps = with pkgs;
-          [
-
-          ];
-      in rec {
-        # Main binary
-        packages.${crateName} = naersk-lib.buildPackage {
-          pname = "${crateName}";
-          buildInputs = sharedDeps;
-          nativeBuildInputs = sharedNativeDeps;
-          root = ./.;
-        };
-        # binary + tests
-        packages.tests.${crateName} = naersk-lib.buildPackage {
-          pname = "${crateName}";
-          buildInputs = sharedDeps;
-          nativeBuildInputs = sharedNativeDeps;
-          root = ./.;
-          doCheck = true;
-        };
-
-        packages.docs.${crateName} = naersk-lib.buildPackage {
-          pname = "${crateName}";
-          buildInputs = sharedDeps;
-          nativeBuildInputs = sharedNativeDeps;
-          root = ./.;
-          dontBuild = true;
-          doDoc = true;
-          doDocFail = true;
-        };
-
-        defaultPackage = packages.${crateName};
-
-        # Make some things eaiser to do in CI
-        packages.lints = {
-          # lint formatting
-          format.${crateName} = with import nixpkgs { inherit system; };
-            stdenv.mkDerivation {
-              name = "format lint";
-              src = self;
-              nativeBuildInputs = with pkgs;
-                [ rust-bin.stable.latest.default ] ++ sharedNativeDeps;
-              buildInputs = sharedDeps;
-              buildPhase = "cargo fmt -- --check";
-              installPhase = "mkdir -p $out; echo 'done'";
-            };
-          # audit against stored advisory db
-          audit.${crateName} = with import nixpkgs { inherit system; };
-            stdenv.mkDerivation {
-              name = "format lint";
-              src = self;
-              nativeBuildInputs = with pkgs;
-                [ rust-bin.stable.latest.default cargo-audit ]
-                ++ sharedNativeDeps;
-              buildInputs = sharedDeps;
-              buildPhase = ''
-                export HOME=$TMP
-                mkdir -p ~/.cargo
-                cp -r ${advisory-db} ~/.cargo/advisory-db
-                cargo audit -n
-              '';
-              installPhase = "mkdir -p $out; echo 'done'";
-            };
-          # Clippy
-          clippy.${crateName} = naersk-lib.buildPackage {
-            pname = "${crateName}";
-            root = ./.;
-            buildInputs = sharedDeps;
-            nativeBuildInputs = sharedNativeDeps;
-            cargoTestCommands = (old: [ "cargo $cargo_options clippy" ]);
-            doCheck = true;
-            dontBuild = true;
-          };
-        };
-
-        devShell = pkgs.mkShell {
-          inputsFrom = builtins.attrValues self.packages.${system};
-          buildInputs = [ rust ] ++ devBase ++ sharedDeps ++ sharedNativeDeps;
-        };
-
-        packages.nightlyRustShell = pkgs.mkShell {
-          buildInputs = [
-            (pkgs.rust-bin.selectLatestNightlyWith (toolchain:
-              toolchain.default.override {
-                extensions = [ "rust-src" "clippy" "llvm-tools-preview" ];
-              }))
-          ] ++ devBase ++ sharedDeps ++ sharedNativeDeps;
-        };
-      });
 }
--- a/updater/src/api.rs
+++ b/updater/src/api.rs
@ -103,8 +103,22 @@ impl AdoptiumAPI {
            .client
            .get_async(url)
            .await
-            .context("Failed to request release")?
-            .into_body();
+            .context("Failed to request release")?;
+        // If we get a 301, respond to it
+        if response.status().as_u16() == 301 {
+            let location = response
+                .headers()
+                .get("location")
+                .context("Failed to get redirect location")?
+                .to_str()
+                .context("Failed to parse redirect location")?;
+            response = self
+                .client
+                .get_async(location)
+                .await
+                .context("Failed to request release")?;
+        }
+        let mut response = response.into_body();
        let mut body = String::new();
        response
            .read_to_string(&mut body)
@ -137,7 +151,7 @@ impl AdoptiumAPI {
        let latest: OutputRelease = self
            .latest(input_versions.most_recent_feature_version, arch, true)
            .await
-            .context("Failed to get version")?
+            .context("Failed to get version - latest")?
            .into();
        let stable: OutputRelease = self
            .latest(
@ -146,7 +160,7 @@ impl AdoptiumAPI {
                true,
            )
            .await
-            .context("Failed to get version")?
+            .context("Failed to get version - stable")?
            .into();
        let lts: OutputRelease = self
            .latest(
@ -156,7 +170,7 @@ impl AdoptiumAPI {
                true,
            )
            .await
-            .context("Failed to get version")?
+            .context("Failed to get version - lts")?
            .into();
        Ok(OutputReleases {
            versions,
Author	SHA1	Message	Date
Nathan McCarty	b2ff2b4de2	Update flake	2023-05-15 17:14:09 -04:00
Nathan McCarty	86e7015528	Fix updater to follow redirects on latest	2023-05-15 17:10:18 -04:00
Nathan McCarty	409fb0a41d	Switch updater to rust toolchain flake	2023-05-15 16:55:30 -04:00