From e17f76f94f2fd9460bbf33eb072a0e0e7d807f4c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 13 Feb 2023 21:19:42 +0000 Subject: [PATCH] graalvmCEPackages.wasm-installable-svm: init at 22.3.1 --- .../community-edition/buildGraalvm.nix | 3 +++ .../graalvm/community-edition/default.nix | 14 ++++++++++++ .../wasm-installable-svm.nix | 22 +++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index f8a1e515db3b..0abc92f6ed25 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -109,6 +109,9 @@ let installCheckPhase = '' runHook preInstallCheck + echo "Testing Jshell" + echo '1 + 1' | $out/bin/jshell + echo ${ lib.escapeShellArg '' public class HelloWorld { diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index d97269536b5f..4008b0b925ba 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -36,6 +36,7 @@ rec { products = [ native-image-installable-svm-java11 python-installable-svm-java11 + wasm-installable-svm-java11 ]; }; @@ -51,6 +52,12 @@ rec { src = fetchurl (source "native-image-installable-svm" javaVersion); }; + wasm-installable-svm-java11 = callPackage ./wasm-installable-svm.nix rec { + javaVersion = "11"; + version = "22.3.1"; + src = fetchurl (source "wasm-installable-svm" javaVersion); + }; + graalvm17-ce = buildGraalvm rec { version = "22.3.1"; javaVersion = "17"; @@ -64,6 +71,7 @@ rec { products = [ native-image-installable-svm-java17 python-installable-svm-java17 + wasm-installable-svm-java17 ]; }; @@ -78,4 +86,10 @@ rec { version = "22.3.1"; src = fetchurl (source "native-image-installable-svm" javaVersion); }; + + wasm-installable-svm-java17 = callPackage ./wasm-installable-svm.nix rec { + javaVersion = "17"; + version = "22.3.1"; + src = fetchurl (source "wasm-installable-svm" javaVersion); + }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix new file mode 100644 index 000000000000..6cf6cdb1d6ed --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix @@ -0,0 +1,22 @@ +{ lib +, stdenv +, graalvm-ce +, graalvmCEPackages +, javaVersion +, src +, version +}: + +graalvmCEPackages.buildGraalvmProduct rec { + inherit src javaVersion version; + product = "wasm-installable-svm"; + + # TODO: improve this test + installCheckPhase = '' + echo "Testing wasm" + $out/bin/wasm --help + ''; + + # Not supported in aarch64-darwin yet as GraalVM 22.3.1 release + meta.platforms = builtins.filter (p: p != "aarch64-darwin") graalvm-ce.meta.platforms; +}