git.iko.soy/typeable/nixpkgs
on master help sign in
graalvmXX-ce: use the release version as `defaultVersion`
commit2d7d3692c125cc07954b342f84c797019c37633c authorThibault Gagnaux <tgagnaux@gmail.com> dateSat 2 Apr 2022, 11:33 (5 years ago) parentbfc5014
5 files changed+62−47
pkgs/development/compilers/graalvm/community-edition/default.nix+39−26 pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json+6−6 pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json+6−6 pkgs/development/compilers/graalvm/community-edition/mkGraal.nix+3−2 pkgs/development/compilers/graalvm/community-edition/update.nix+8−7
pkgs/development/compilers/graalvm/community-edition/default.nix+39−26
@@ -15,8 +15,8 @@ let
1515 */
1616 graalvm11-ce-release-version = "22.0.0.2";
1717 graalvm17-ce-release-version = "22.0.0.2";
18− graalvm11-ce-dev-version = "22.2.0-dev-20220331_1955";
19− graalvm17-ce-dev-version = "22.2.0-dev-20220331_1955";
18+ graalvm11-ce-dev-version = "22.2.0-dev-20220401_1942";
19+ graalvm17-ce-dev-version = "22.2.0-dev-20220401_1942";
2020
2121 commonProducts = [
2222 "graalvm-ce"
@@ -25,39 +25,34 @@ let
2525 "wasm-installable-svm"
2626 ];
2727
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−
4928in
5029{
5130 inherit mkGraal;
5231
5332 graalvm11-ce = mkGraal rec {
54− config = baseConfig // {
33+ config = {
34+ x86_64-darwin = {
35+ arch = "darwin-amd64";
36+ products = commonProducts ++ [ "python-installable-svm" ];
37+ };
38+ x86_64-linux = {
39+ arch = "linux-amd64";
40+ products = commonProducts ++ [ "python-installable-svm" ];
41+ };
42+ aarch64-darwin = {
43+ arch = "darwin-aarch64";
44+ products = [
45+ "graalvm-ce"
46+ "native-image-installable-svm"
47+ ];
48+ version = graalvm11-ce-dev-version;
49+ };
5550 aarch64-linux = {
5651 arch = "linux-aarch64";
5752 products = commonProducts;
58− version = graalvm11-ce-release-version;
5953 };
6054 };
55+ defaultVersion = graalvm11-ce-release-version;
6156 javaVersion = "11";
6257 platforms = builtins.attrNames config;
6358 };
@@ -68,7 +63,25 @@ in
6863 # directory"/tmp/SVM-4194439592488143713"): error=0, Failed to exec spawn
6964 # helper: pid: 19865, exit value: 1"
7065 graalvm17-ce = mkGraal rec {
71− config = baseConfig;
66+ config = {
67+ x86_64-darwin = {
68+ arch = "darwin-amd64";
69+ products = commonProducts ++ [ "python-installable-svm" ];
70+ };
71+ x86_64-linux = {
72+ arch = "linux-amd64";
73+ products = commonProducts ++ [ "python-installable-svm" ];
74+ };
75+ aarch64-darwin = {
76+ arch = "darwin-aarch64";
77+ products = [
78+ "graalvm-ce"
79+ "native-image-installable-svm"
80+ ];
81+ version = graalvm17-ce-dev-version;
82+ };
83+ };
84+ defaultVersion = graalvm17-ce-release-version;
7285 javaVersion = "17";
7386 platforms = builtins.attrNames config;
7487 };
pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json+6−6
@@ -1,12 +1,12 @@
11{
22 "darwin-aarch64": {
3− "graalvm-ce|java11|22.2.0-dev-20220331_1955": {
4− "sha256": "a1229931575bd90256f5453ce9c880cf2286db117d4cbfec92c033813b017035",
5− "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220331_1955/graalvm-ce-java11-darwin-aarch64-dev.tar.gz"
3+ "graalvm-ce|java11|22.2.0-dev-20220401_1942": {
4+ "sha256": "c83dee740ae148486598759e44a717b09d8124e4ea50f9da1e7d49d016572b89",
5+ "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220401_1942/graalvm-ce-java11-darwin-aarch64-dev.tar.gz"
66 },
7− "native-image-installable-svm|java11|22.2.0-dev-20220331_1955": {
8− "sha256": "813f9cc417415801e3d7d6468bb06e45487c76fe35b56202b66b6c9fa3ce3456",
9− "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220331_1955/native-image-installable-svm-java11-darwin-aarch64-dev.jar"
7+ "native-image-installable-svm|java11|22.2.0-dev-20220401_1942": {
8+ "sha256": "661311ae26bfd6c46360b9e65aabe9361dc5cd05878a404343adf16925ae78fa",
9+ "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220401_1942/native-image-installable-svm-java11-darwin-aarch64-dev.jar"
1010 }
1111 },
1212 "darwin-amd64": {
pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json+6−6
@@ -1,12 +1,12 @@
11{
22 "darwin-aarch64": {
3− "graalvm-ce|java17|22.2.0-dev-20220331_1955": {
4− "sha256": "bb217a3bd53a488ef3672920fd47b9a0d800243eb385a7ceae9ddbd4350c0b27",
5− "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220331_1955/graalvm-ce-java17-darwin-aarch64-dev.tar.gz"
3+ "graalvm-ce|java17|22.2.0-dev-20220401_1942": {
4+ "sha256": "f0409c59adbce62da7be46ab7d0e01abe5c080ef97d0b555e6c773f94dbfdecf",
5+ "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220401_1942/graalvm-ce-java17-darwin-aarch64-dev.tar.gz"
66 },
7− "native-image-installable-svm|java17|22.2.0-dev-20220331_1955": {
8− "sha256": "eee405e704792794f45e619372e72e0343ba2caf8ace0e4c7abd8baa69e56bcf",
9− "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220331_1955/native-image-installable-svm-java17-darwin-aarch64-dev.jar"
7+ "native-image-installable-svm|java17|22.2.0-dev-20220401_1942": {
8+ "sha256": "3770dc4810d7ebae8f9ca2212e91112629096a964d3caea1667b0aaf5f70c1e0",
9+ "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220401_1942/native-image-installable-svm-java17-darwin-aarch64-dev.jar"
1010 }
1111 },
1212 "darwin-amd64": {
pkgs/development/compilers/graalvm/community-edition/mkGraal.nix+3−2
@@ -1,4 +1,5 @@
11{ javaVersion
2+, defaultVersion
23, platforms
34, config
45, useMusl ? false
@@ -41,7 +42,7 @@ assert useMusl -> stdenv.isLinux;
4142
4243let
4344 platform = config.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
44− version = platform.version;
45+ version = platform.version or defaultVersion;
4546 name = "graalvm${javaVersion}-ce";
4647 sourcesFilename = "${name}-sources.json";
4748 sources = builtins.fromJSON (builtins.readFile (./${sourcesFilename}));
@@ -284,7 +285,7 @@ let
284285 passthru = {
285286 home = graalvmXXX-ce;
286287 updateScript = import ./update.nix {
287− inherit lib writeShellScript jq sourcesFilename name config gnused;
288+ inherit lib writeShellScript jq sourcesFilename name config gnused defaultVersion;
288289 graalVersion = version;
289290 javaVersion = "java${javaVersion}";
290291 };
pkgs/development/compilers/graalvm/community-edition/update.nix+8−7
@@ -1,5 +1,6 @@
11{ javaVersion
22, graalVersion
3+, defaultVersion
34, config
45, sourcesFilename
56, name
@@ -151,12 +152,12 @@ let
151152 };
152153 };
153154
154− # genArchProductVersionPairs :: String -> AttrSet -> [AttrSet]
155− genArchProductVersionList = javaVersion: archProducts:
155+ # genArchProductVersionPairs :: String -> -> String -> AttrSet -> [AttrSet]
156+ genArchProductVersionList = javaVersion: graalVersion: archProducts:
156157 let
157158 arch = archProducts.arch;
158159 products = archProducts.products;
159− javaGraalVersion = javaVersion + separator + (getLatestVersion archProducts.version);
160+ javaGraalVersion = javaVersion + separator + (getLatestVersion (archProducts.version or graalVersion));
160161 productJavaGraalVersionList =
161162 cartesianZipListsWith (a: b: a + separator + b)
162163 products [ javaGraalVersion ];
@@ -164,11 +165,11 @@ let
164165 cartesianZipListsWith (genUrlAndSha256) [ arch ] productJavaGraalVersionList;
165166
166167
167− # genSources :: String -> AttrSet -> Path String
168− genSources = javaVersion: config:
168+ # genSources :: String -> String -> AttrSet -> Path String
169+ genSources = javaVersion: defaultVersion: config:
169170 let
170171 archProducts = builtins.attrValues config;
171− sourcesList = builtins.concatMap (genArchProductVersionList javaVersion) archProducts;
172+ sourcesList = builtins.concatMap (genArchProductVersionList javaVersion defaultVersion) archProducts;
172173 sourcesAttr = builtins.foldl' (lib.recursiveUpdate) { } sourcesList;
173174 in
174175 builtins.toFile "sources.json" (builtins.toJSON sourcesAttr);
@@ -182,7 +183,7 @@ let
182183 }.${builtins.toString (builtins.compareVersions newVersion currentVersion)};
183184
184185 newVersion = getLatestVersion graalVersion;
185− sourcesJson = genSources javaVersion config;
186+ sourcesJson = genSources javaVersion defaultVersion config;
186187 sourcesJsonPath = lib.strings.escapeShellArg ./${sourcesFilename};
187188
188189 # versionKeyInDefaultNix String -> String