diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix index 9d95aae487fd..543ffceee8dc 100644 --- a/pkgs/development/compilers/graalvm/default.nix +++ b/pkgs/development/compilers/graalvm/default.nix @@ -1,23 +1,33 @@ -{ lib, pkgs }: +{ + lib, + pkgs, + config, +}: -lib.makeScope pkgs.newScope (self: { - buildGraalvm = self.callPackage ./community-edition/buildGraalvm.nix; +lib.makeScope pkgs.newScope ( + self: + { + buildGraalvm = self.callPackage ./community-edition/buildGraalvm.nix; - buildGraalvmProduct = self.callPackage ./community-edition/buildGraalvmProduct.nix; + buildGraalvmProduct = self.callPackage ./community-edition/buildGraalvmProduct.nix; - graalvm-ce = self.callPackage ./community-edition/graalvm-ce { }; + graalvm-ce = self.callPackage ./community-edition/graalvm-ce { }; - graalvm-ce-musl = self.callPackage ./community-edition/graalvm-ce { useMusl = true; }; + graalvm-ce-musl = self.callPackage ./community-edition/graalvm-ce { useMusl = true; }; - graaljs = self.callPackage ./community-edition/graaljs { }; + graaljs = self.callPackage ./community-edition/graaljs { }; - graalnodejs = self.callPackage ./community-edition/graalnodejs { }; + graalnodejs = self.callPackage ./community-edition/graalnodejs { }; - graalpy = self.callPackage ./community-edition/graalpy { }; + graalpy = self.callPackage ./community-edition/graalpy { }; - truffleruby = self.callPackage ./community-edition/truffleruby { }; + truffleruby = self.callPackage ./community-edition/truffleruby { }; - graalvm-oracle_22 = self.callPackage ./graalvm-oracle { version = "22"; }; - graalvm-oracle_17 = self.callPackage ./graalvm-oracle { version = "17"; }; - graalvm-oracle = self.graalvm-oracle_22; -}) + graalvm-oracle_23 = self.callPackage ./graalvm-oracle { version = "23"; }; + graalvm-oracle_17 = self.callPackage ./graalvm-oracle { version = "17"; }; + graalvm-oracle = self.graalvm-oracle_23; + } + // lib.optionalAttrs config.allowAliases { + graalvm-oracle_22 = throw "GraalVM 22 is EOL, use a newer version instead"; + } +) diff --git a/pkgs/development/compilers/graalvm/graalvm-oracle/default.nix b/pkgs/development/compilers/graalvm/graalvm-oracle/default.nix index d8a9f14e70e3..2f362857a3c9 100644 --- a/pkgs/development/compilers/graalvm/graalvm-oracle/default.nix +++ b/pkgs/development/compilers/graalvm/graalvm-oracle/default.nix @@ -4,7 +4,7 @@ fetchurl, graalvmPackages, useMusl ? false, - version ? "22", + version ? "23", }: graalvmPackages.buildGraalvm { diff --git a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix index bdcbdc0898a4..52d5f2212b1b 100644 --- a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix +++ b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix @@ -4,22 +4,22 @@ # $ rg -No "(https://.+)\"" -r '$1' pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix | \ # parallel -k 'echo {}; nix hash convert --hash-algo sha256 --to sri $(curl -s {}.sha256)' { - "22" = { + "23" = { "aarch64-linux" = { - hash = "sha256-skemwlgUzJzqm2XOyKkjblIwKnHDSqpzdunrMB+Dlvs="; - url = "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22.0.2_linux-aarch64_bin.tar.gz"; + hash = "sha256-VlB664/l7NWFQrPE3vEJvCXkEzKEJ0ck/HNU5pGGTwU="; + url = "https://download.oracle.com/graalvm/23/archive/graalvm-jdk-23.0.2_linux-aarch64_bin.tar.gz"; }; "x86_64-linux" = { - hash = "sha256-GIGqLEMbBQbssXBDmDKwU7dXNo1xCb1CIpjKI+eTnNA="; - url = "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22.0.2_linux-x64_bin.tar.gz"; + hash = "sha256-2wmx/hi4PzOK+bMpFEN3SzFw2euhdTjOLuOcXm1gHfw="; + url = "https://download.oracle.com/graalvm/23/archive/graalvm-jdk-23.0.2_linux-x64_bin.tar.gz"; }; "x86_64-darwin" = { - hash = "sha256-n8vz/5bzjzHi9ZC7Yq3xngZVNcguJ7X9dC3vAFvvNSg="; - url = "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22.0.2_macos-x64_bin.tar.gz"; + hash = "sha256-tFmfv9OUMEqE6UNb98ZzBp1P4MVl0tRNcPD29YBM6jU="; + url = "https://download.oracle.com/graalvm/23/archive/graalvm-jdk-23.0.2_macos-x64_bin.tar.gz"; }; "aarch64-darwin" = { - hash = "sha256-O4IYBkBDJXRrCj3jISgSPVje85W2kd8cQmedlzfVh+c="; - url = "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22.0.2_macos-aarch64_bin.tar.gz"; + hash = "sha256-DmRLktA9Ob30hC43i4sicT+qpO2ujv/w2pkp0eBN0Ms="; + url = "https://download.oracle.com/graalvm/23/archive/graalvm-jdk-23.0.2_macos-aarch64_bin.tar.gz"; }; }; "17" = {