1 files changed, 39 insertions, 26 deletions

diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix
index 634844a2b20..6f42bfcc453 100644
--- a/pkgs/development/compilers/graalvm/community-edition/default.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/default.nix
@@ -15,8 +15,8 @@ let
   */
   graalvm11-ce-release-version = "22.0.0.2";
   graalvm17-ce-release-version = "22.0.0.2";
-  graalvm11-ce-dev-version = "22.2.0-dev-20220331_1955";
-  graalvm17-ce-dev-version = "22.2.0-dev-20220331_1955";
+  graalvm11-ce-dev-version = "22.2.0-dev-20220401_1942";
+  graalvm17-ce-dev-version = "22.2.0-dev-20220401_1942";
 
   commonProducts = [
     "graalvm-ce"
@@ -25,39 +25,34 @@ let
     "wasm-installable-svm"
   ];
 
-  baseConfig = {
-    x86_64-darwin = {
-      arch = "darwin-amd64";
-      products = commonProducts ++ [ "python-installable-svm" ];
-      version = graalvm17-ce-release-version;
-    };
-    x86_64-linux = {
-      arch = "linux-amd64";
-      products = commonProducts ++ [ "python-installable-svm" ];
-      version = graalvm17-ce-release-version;
-    };
-    aarch64-darwin = {
-      arch = "darwin-aarch64";
-      products = [
-        "graalvm-ce"
-        "native-image-installable-svm"
-      ];
-      version = graalvm17-ce-dev-version;
-    };
-  };
-
 in
 {
   inherit mkGraal;
 
   graalvm11-ce = mkGraal rec {
-    config = baseConfig // {
+    config = {
+      x86_64-darwin = {
+        arch = "darwin-amd64";
+        products = commonProducts ++ [ "python-installable-svm" ];
+      };
+      x86_64-linux = {
+        arch = "linux-amd64";
+        products = commonProducts ++ [ "python-installable-svm" ];
+      };
+      aarch64-darwin = {
+        arch = "darwin-aarch64";
+        products = [
+          "graalvm-ce"
+          "native-image-installable-svm"
+        ];
+        version = graalvm11-ce-dev-version;
+      };
       aarch64-linux = {
         arch = "linux-aarch64";
         products = commonProducts;
-        version = graalvm11-ce-release-version;
       };
     };
+    defaultVersion = graalvm11-ce-release-version;
     javaVersion = "11";
     platforms = builtins.attrNames config;
   };
@@ -68,7 +63,25 @@ in
   # directory"/tmp/SVM-4194439592488143713"): error=0, Failed to exec spawn
   # helper: pid: 19865, exit value: 1"
   graalvm17-ce = mkGraal rec {
-    config = baseConfig;
+    config = {
+      x86_64-darwin = {
+        arch = "darwin-amd64";
+        products = commonProducts ++ [ "python-installable-svm" ];
+      };
+      x86_64-linux = {
+        arch = "linux-amd64";
+        products = commonProducts ++ [ "python-installable-svm" ];
+      };
+      aarch64-darwin = {
+        arch = "darwin-aarch64";
+        products = [
+          "graalvm-ce"
+          "native-image-installable-svm"
+        ];
+        version = graalvm17-ce-dev-version;
+      };
+    };
+    defaultVersion = graalvm17-ce-release-version;
     javaVersion = "17";
     platforms = builtins.attrNames config;
   };