JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #282901 from Sohalt/update-babashka

Browse Source 
babashka: 1.3.186 -> 1.3.188, buildGraalNativeImage: remove NATIVE_IMAGE_DEPRECATED_BUILDER_SANITATION
This commit is contained in:
Thiago Kenji Okada 2024-01-22 17:56:03 +00:00 committed by GitHub
commit df318b860b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/build-support/build-graalvm-native-image/default.nix
View File

@ -49,17 +49,10 @@ stdenv.mkDerivation ({
nativeImageBuildArgs = nativeImageBuildArgs ++ extraNativeImageBuildArgs ++ [ graalvmXmx ];
# Workaround GraalVM issue where the builder does not have access to the
# environment variables since 21.0.0
# https://github.com/oracle/graal/pull/6095
# https://github.com/oracle/graal/pull/6095
# https://github.com/oracle/graal/issues/7502
env.NATIVE_IMAGE_DEPRECATED_BUILDER_SANITATION = "true";
buildPhase = args.buildPhase or ''
runHook preBuild
native-image -jar "$jar" ''${nativeImageBuildArgs[@]}
native-image -jar "$jar" $(export -p | sed -n 's/^declare -x \([^=]\+\)=.*$/ -E\1/p' | tr -d \\n) ''${nativeImageBuildArgs[@]}
runHook postBuild
'';

4
pkgs/development/interpreters/babashka/clojure-tools.nix
View File

@ -6,10 +6,10 @@
}:
clojure.overrideAttrs (previousAttrs: {
pname = "babashka-clojure-tools";
version = "1.11.1.1413";
version = "1.11.1.1435";
src = fetchurl {
url = previousAttrs.src.url;
hash = "sha256-k8Olo63KUcWFgGNBmr9myD2/JOoV4f2S95v35mI4H+A=";
hash = "sha256-RS/FebIED8RYYXRXBKXZPRROO0HqyDo0zhb+p4Q5m8A=";
};
})

4
pkgs/development/interpreters/babashka/default.nix
View File

@ -9,11 +9,11 @@
let
babashka-unwrapped = buildGraalvmNativeImage rec {
pname = "babashka-unwrapped";
version = "1.3.186";
version = "1.3.188";
src = fetchurl {
url = "https://github.com/babashka/babashka/releases/download/v${version}/babashka-${version}-standalone.jar";
sha256 = "sha256-T7inTJHSnUySituU0fcgZ0xWjIY3yb8BlSakqym67ew=";
sha256 = "sha256-EjsSUPWiLQcCos2oyVXt3VzLlGEfiXK5CqJZ1NMvF/E=";
};
graalvmDrv = graalvmCEPackages.graalvm-ce;