@@ -9,13 +9,6 @@ let
99 inherit Foundation;
1010 };
1111
12− commonProducts = [
13− "graalvm-ce"
14− "native-image-installable-svm"
15− "ruby-installable-svm"
16− "wasm-installable-svm"
17− ];
18−
1912 /*
2013 Looks a bit ugly but makes version update in the update script using sed
2114 much easier
@@ -25,35 +18,45 @@ let
2518 graalvm11-ce-dev-version = "22.2.0-dev-20220331_1955";
2619 graalvm17-ce-dev-version = "22.2.0-dev-20220331_1955";
2720
21+ commonProducts = [
22+ "graalvm-ce"
23+ "native-image-installable-svm"
24+ "ruby-installable-svm"
25+ "wasm-installable-svm"
26+ ];
27+
28+ baseConfig = {
29+ x86_64-darwin = {
30+ arch = "darwin-amd64";
31+ products = commonProducts ++ [ "python-installable-svm" ];
32+ version = graalvm17-ce-release-version;
33+ };
34+ x86_64-linux = {
35+ arch = "linux-amd64";
36+ products = commonProducts ++ [ "python-installable-svm" ];
37+ version = graalvm17-ce-release-version;
38+ };
39+ aarch64-darwin = {
40+ arch = "darwin-aarch64";
41+ products = [
42+ "graalvm-ce"
43+ "native-image-installable-svm"
44+ ];
45+ version = graalvm17-ce-dev-version;
46+ };
47+ };
48+
2849in
2950{
3051 inherit mkGraal;
3152
3253 graalvm11-ce = mkGraal rec {
33− config = {
34− x86_64-darwin = {
35− arch = "darwin-amd64";
36− products = commonProducts ++ [ "python-installable-svm" ];
37− version = graalvm11-ce-release-version;
38− };
39− x86_64-linux = {
40− arch = "linux-amd64";
41− products = commonProducts ++ [ "python-installable-svm" ];
42− version = graalvm11-ce-release-version;
43− };
54+ config = baseConfig // {
4455 aarch64-linux = {
4556 arch = "linux-aarch64";
4657 products = commonProducts;
4758 version = graalvm11-ce-release-version;
4859 };
49− aarch64-darwin = {
50− arch = "darwin-aarch64";
51− products = [
52− "graalvm-ce"
53− "native-image-installable-svm"
54− ];
55− version = graalvm11-ce-dev-version;
56− };
5760 };
5861 javaVersion = "11";
5962 platforms = builtins.attrNames config;
@@ -65,26 +68,7 @@ in
6568 # directory"/tmp/SVM-4194439592488143713"): error=0, Failed to exec spawn
6669 # helper: pid: 19865, exit value: 1"
6770 graalvm17-ce = mkGraal rec {
68− config = {
69− x86_64-darwin = {
70− arch = "darwin-amd64";
71− products = commonProducts ++ [ "python-installable-svm" ];
72− version = graalvm17-ce-release-version;
73− };
74− x86_64-linux = {
75− arch = "linux-amd64";
76− products = commonProducts ++ [ "python-installable-svm" ];
77− version = graalvm17-ce-release-version;
78− };
79− aarch64-darwin = {
80− arch = "darwin-aarch64";
81− products = [
82− "graalvm-ce"
83− "native-image-installable-svm"
84− ];
85− version = graalvm17-ce-dev-version;
86− };
87− };
71+ config = baseConfig;
8872 javaVersion = "17";
8973 platforms = builtins.attrNames config;
9074 };