diff --git a/pkgs/by-name/cq/cq/package.nix b/pkgs/by-name/cq/cq/package.nix index 82fc31a7bbdd3b1..25c2b9c94656bab 100644 --- a/pkgs/by-name/cq/cq/package.nix +++ b/pkgs/by-name/cq/cq/package.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , fetchurl , buildGraalvmNativeImage -, graalvmCEPackages +, graalvmPackages }: buildGraalvmNativeImage rec { @@ -23,7 +23,7 @@ buildGraalvmNativeImage rec { hash = "sha256-yjAC2obipdmh+JlHzVUTMtTXN2VKe4WKkyJyu2Q93c8="; }; - graalvmDrv = graalvmCEPackages.graalvm-ce; + graalvmDrv = graalvmPackages.graalvm-ce; executable = "cq"; diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/buildGraalvm.nix similarity index 100% rename from pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix rename to pkgs/development/compilers/graalvm/buildGraalvm.nix diff --git a/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix b/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix index ec662e156721c59..a3b47516b0df44c 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix @@ -1,9 +1,9 @@ { stdenv , fetchurl -, graalvmCEPackages +, graalvmPackages }: -graalvmCEPackages.buildGraalvmProduct { +graalvmPackages.buildGraalvmProduct { src = fetchurl (import ./hashes.nix).hashes.${stdenv.system}; version = (import ./hashes.nix).version; diff --git a/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix index d98f4b0e380f4fb..8df0ab5a38e150f 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix @@ -1,9 +1,9 @@ { stdenv , fetchurl -, graalvmCEPackages +, graalvmPackages }: -graalvmCEPackages.buildGraalvmProduct { +graalvmPackages.buildGraalvmProduct { src = fetchurl (import ./hashes.nix).hashes.${stdenv.system}; version = (import ./hashes.nix).version; diff --git a/pkgs/development/compilers/graalvm/community-edition/graalpy/default.nix b/pkgs/development/compilers/graalvm/community-edition/graalpy/default.nix index e2b28500f7fe4f8..ff73a7dde8c6006 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalpy/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalpy/default.nix @@ -1,9 +1,9 @@ { stdenv , fetchurl -, graalvmCEPackages +, graalvmPackages }: -graalvmCEPackages.buildGraalvmProduct { +graalvmPackages.buildGraalvmProduct { src = fetchurl (import ./hashes.nix).hashes.${stdenv.system}; version = (import ./hashes.nix).version; diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/default.nix b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/default.nix index b7f7db61097f2dc..da5b59417e20b40 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/default.nix @@ -1,10 +1,10 @@ { stdenv , fetchurl -, graalvmCEPackages +, graalvmPackages , useMusl ? false }: -graalvmCEPackages.buildGraalvm { +graalvmPackages.buildGraalvm { inherit useMusl; src = fetchurl (import ./hashes.nix).hashes.${stdenv.system}; version = (import ./hashes.nix).version; diff --git a/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix b/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix index 95e9c56fc23ccdb..1a19f767d136f70 100644 --- a/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix @@ -1,12 +1,12 @@ { lib , stdenv , fetchurl -, graalvmCEPackages +, graalvmPackages , libyaml , openssl }: -graalvmCEPackages.buildGraalvmProduct { +graalvmPackages.buildGraalvmProduct { src = fetchurl (import ./hashes.nix).hashes.${stdenv.system}; version = (import ./hashes.nix).version; diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix new file mode 100644 index 000000000000000..6dc0715a7bd8d6b --- /dev/null +++ b/pkgs/development/compilers/graalvm/default.nix @@ -0,0 +1,13 @@ +{ callPackage }: + +let + cePackages = callPackage ./community-edition { }; +in +cePackages +// rec { + buildGraalvm = callPackage ./buildGraalvm.nix; + + graalvm-oracle_22 = callPackage ./graalvm-oracle { version = "22"; }; + graalvm-oracle_17 = callPackage ./graalvm-oracle { version = "17"; }; + graalvm-oracle = graalvm-oracle_22; +} diff --git a/pkgs/development/compilers/graalvm/graalvm-oracle/default.nix b/pkgs/development/compilers/graalvm/graalvm-oracle/default.nix new file mode 100644 index 000000000000000..d8a9f14e70e3f9e --- /dev/null +++ b/pkgs/development/compilers/graalvm/graalvm-oracle/default.nix @@ -0,0 +1,16 @@ +{ + lib, + stdenv, + fetchurl, + graalvmPackages, + useMusl ? false, + version ? "22", +}: + +graalvmPackages.buildGraalvm { + inherit useMusl version; + src = fetchurl (import ./hashes.nix).${version}.${stdenv.system}; + meta.platforms = builtins.attrNames (import ./hashes.nix).${version}; + meta.license = lib.licenses.unfree; + pname = "graalvm-oracle"; +} diff --git a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix new file mode 100644 index 000000000000000..1df3f67dc3e4f0d --- /dev/null +++ b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix @@ -0,0 +1,38 @@ +{ + "22" = { + "aarch64-linux" = { + hash = "sha256-E0Fm6mFB7o39pu7JVWOoXT9BdPWiSXBx2hPvlruD5ls="; + url = "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22.0.1_linux-aarch64_bin.tar.gz"; + }; + "x86_64-linux" = { + hash = "sha256-1YPNsBygI6N+7UXZ0YS2i3qNf1C1jd4TaQQfKUw09KM="; + url = "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22.0.1_linux-x64_bin.tar.gz"; + }; + "x86_64-darwin" = { + hash = "sha256-waR39L44Ew8wznRc67tYD3HGFZ2UUD4+ELerWnxNpms="; + url = "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22.0.1_macos-x64_bin.tar.gz"; + }; + "aarch64-darwin" = { + hash = "sha256-dzUVPih81jopuxAx8sAYdwonNOXHyyirUUOhvStK1F8="; + url = "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22.0.1_macos-aarch64_bin.tar.gz"; + }; + }; + "17" = { + "aarch64-linux" = { + hash = "sha256-0J/XaXGzNyBgxrW1HgUvtBCPPRfAvzwOx67p/QcY4u0="; + url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.11_linux-aarch64_bin.tar.gz"; + }; + "x86_64-linux" = { + hash = "sha256-t0GHR7MGSZDSAGeX7bsI1ziugaP4euRcJq+covDBUYw="; + url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.11_linux-x64_bin.tar.gz"; + }; + "x86_64-darwin" = { + hash = "sha256-q9b6I5hSVt67gkYzUtsJDSi4bPEkzpkoeC5ZyxfqJRc="; + url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.11_macos-x64_bin.tar.gz"; + }; + "aarch64-darwin" = { + hash = "sha256-o4BGCfnD25AVYwG1Ol+2eDVCgiB+mk4I1JBIjyETK6s="; + url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.11_macos-aarch64_bin.tar.gz"; + }; + }; +} diff --git a/pkgs/development/interpreters/babashka/default.nix b/pkgs/development/interpreters/babashka/default.nix index fc54f3e0311d915..ef523c0280568b5 100644 --- a/pkgs/development/interpreters/babashka/default.nix +++ b/pkgs/development/interpreters/babashka/default.nix @@ -1,6 +1,6 @@ { lib , buildGraalvmNativeImage -, graalvmCEPackages +, graalvmPackages , fetchurl , writeScript , installShellFiles @@ -16,7 +16,7 @@ let sha256 = "sha256-xF0u2VO0xdNvRElhUb7atpvy2Y5T9/V1b92ffaOMga8="; }; - graalvmDrv = graalvmCEPackages.graalvm-ce; + graalvmDrv = graalvmPackages.graalvm-ce; executable = "bb"; diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index bfdcdb3ee0873b5..636799190cad7fa 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGraalvmNativeImage, graalvmCEPackages, removeReferencesTo, fetchurl +{ lib, buildGraalvmNativeImage, graalvmPackages, removeReferencesTo, fetchurl }: buildGraalvmNativeImage rec { @@ -11,7 +11,7 @@ buildGraalvmNativeImage rec { sha256 = "sha256-vqdTfsIRPi2VlJLcbesRSqa/KFgqbk13vJBbEYd3heM="; }; - graalvmDrv = graalvmCEPackages.graalvm-ce; + graalvmDrv = graalvmPackages.graalvm-ce; nativeBuildInputs = [ removeReferencesTo ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 99116ed6f1192d7..f403a60d7ef609c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -562,6 +562,8 @@ mapAliases ({ graalvm11-ce = throw "graalvm11-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 graalvm17-ce = throw "graalvm17-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 graalvm19-ce = throw "graalvm19-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 + graalvmCEPackages = graalvmPackages; # Added 2024-08-10 + graalvm-ce = graalvmPackages.graalvm-ce; # Added 2024-08-10 grab-site = throw "grab-site has been removed because it's unmaintained and broken"; # Added 2023-11-12 gradle_4 = throw "gradle_4 has been removed because it's no longer being updated"; # Added 2023-01-17 gradle_5 = throw "gradle_5 has been removed because it's no longer being updated"; # Added 2023-01-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4e1e27ac3d51d9..440d5795965902a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8286,7 +8286,7 @@ with pkgs; }; dapl-native = callPackage ../development/interpreters/dzaima-apl { buildNativeImage = true; - jdk = graalvm-ce; + jdk = graalvmPackages.graalvm-ce; }; gnucap-full = gnucap.withPlugins(p: [ p.verilog ]); @@ -15879,10 +15879,9 @@ with pkgs; openjdk = jdk; openjdk_headless = jdk_headless; - graalvmCEPackages = callPackage ../development/compilers/graalvm/community-edition { }; - graalvm-ce = graalvmCEPackages.graalvm-ce; + graalvmPackages = recurseIntoAttrs (callPackage ../development/compilers/graalvm { }); buildGraalvmNativeImage = (callPackage ../build-support/build-graalvm-native-image { - graalvmDrv = graalvm-ce; + graalvmDrv = graalvmPackages.graalvm-ce; }).override; openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { @@ -16837,7 +16836,7 @@ with pkgs; dbqn-native = dbqn.override { buildNativeImage = true; - jdk = graalvm-ce; + jdk = graalvmPackages.graalvm-ce; }; chibi = callPackage ../development/interpreters/chibi { };