Reorganize graalvm packages and add graalvm-oracle_17

NixOS · Aug 7, 2024 · 43d8f95 · 43d8f95
1 parent 4e10a9a
commit 43d8f95
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 3 deletions.
diff --git a/pkgs/by-name/gr/graalvm-ce/package.nix b/pkgs/by-name/gr/graalvm-ce/package.nix
@@ -0,0 +1,2 @@
+{ graalvmPackages }:
+graalvmPackages.graalvm-ce
diff --git a/pkgs/by-name/gr/graalvmCEPackages/package.nix b/pkgs/by-name/gr/graalvmCEPackages/package.nix
@@ -0,0 +1,2 @@
+{ graalvmPackages }:
+graalvmPackages
diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
@@ -5,8 +5,16 @@
   fetchurl,
 }:
 
-{
+let
+  cePackages = callPackage ./community-edition { };
+in
+cePackages
+// {
 
   buildGraalvm = callPackage ./buildGraalvm.nix;
 
+  graalvm-ce = cePackages.graalvm-ce;
+
+  graalvm-oracle = callPackage ./graalvm-oracle { };
+  graalvm-oracle_17 = callPackage ./graalvm-oracle { version = "17"; };
 }
diff --git a/pkgs/development/compilers/graalvm/graalvm-oracle/default.nix 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}.hashes.${stdenv.system};
+  meta.platforms = builtins.attrNames (import ./hashes.nix).${version}.hashes;
+  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
@@ -0,0 +1,42 @@
+{
+  "22" = {
+    "hashes" = {
+      "aarch64-linux" = {
+        sha256 = "d303d30c10764feaab076efe79019df3c981b0487fcac3df7a5313f76f61040e";
+        url = "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22_linux-aarch64_bin.tar.gz";
+      };
+      "x86_64-linux" = {
+        sha256 = "d1860b5b7588310e70b259c891156f6d0cbc34d0d1feec3b37169ed2a415f3c3";
+        url = "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22_linux-x64_bin.tar.gz";
+      };
+      "x86_64-darwin" = {
+        sha256 = "5b83f20dbc4c636ed41f19c3309f09839d4f5c6442dba986f460589c494a476c";
+        url = "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22_macos-x64_bin.tar.gz";
+      };
+      "aarch64-darwin" = {
+        sha256 = "61632065cfcdc4e121362f1fd25a543955836bbacd6c1aadbcbe0d469d5ab8a3";
+        url = "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22_macos-aarch64_bin.tar.gz";
+      };
+    };
+  };
+  "17" = {
+    "hashes" = {
+      "aarch64-linux" = {
+        sha256 = "1s3ma7x22wqg10cqhdgwj0g9qk3n7bqy10dq6x1vgpljdd41v6dx";
+        url = "https://download.oracle.com/graalvm/17/latest/graalvm-jdk-17_linux-aarch64_bin.tar.gz";
+      };
+      "x86_64-linux" = {
+        sha256 = "0gviji4g10k3ixa8nkjfyqyz9m00dz4g85h2g7n606fg4k7dmwxn";
+        url = "https://download.oracle.com/graalvm/17/latest/graalvm-jdk-17_linux-x64_bin.tar.gz";
+      };
+      "x86_64-darwin" = {
+        sha256 = "1mvpx94n0pm9kpmhknkfym8lbb30kvdnap5pqmb5ma9z3x3w3jiy";
+        url = "https://download.oracle.com/graalvm/17/latest/graalvm-jdk-17_macos-x64_bin.tar.gz";
+      };
+      "aarch64-darwin" = {
+        sha256 = "1igzzsij0izkryshm45bg0dqwz0vbxhbd4fizhz7gxlmjdndrpsc";
+        url = "https://download.oracle.com/graalvm/17/latest/graalvm-jdk-17_macos-aarch64_bin.tar.gz";
+      };
+    };
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -15879,9 +15879,7 @@ with pkgs;
   openjdk = jdk;
   openjdk_headless = jdk_headless;
 
-  graalvmCEPackages = callPackage ../development/compilers/graalvm/community-edition { };
   graalvmPackages = recurseIntoAttrs (callPackage ../development/compilers/graalvm { });
-  graalvm-ce = graalvmCEPackages.graalvm-ce;
   buildGraalvmNativeImage = (callPackage ../build-support/build-graalvm-native-image {
     graalvmDrv = graalvm-ce;
   }).override;