From c863a1beecb42dd20dbd69f5e22fbc809aac54e2 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 17 Mar 2023 16:19:26 +0000 Subject: [PATCH] =?UTF-8?q?babashka:=201.1.173=20=E2=86=92=201.2.174?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interpreters/clojure/babashka.nix | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index f8fb244d54c9..04c605f29236 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -1,20 +1,30 @@ -{ lib, buildGraalvmNativeImage, fetchurl, writeScript }: +{ lib +, buildGraalvmNativeImage +, graalvmCEPackages +, removeReferencesTo +, fetchurl +, writeScript }: buildGraalvmNativeImage rec { pname = "babashka"; - version = "1.1.173"; + version = "1.2.174"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-p/KGDCocTksvUwj6x5l1xUEM1OZ4pNHtXL4mTgg7JUI="; + sha256 = "sha256-5ZvqbOU69ZZNIT5Mh7+Cg5s+gLhOnFMSIO4ZI9t6D/8="; }; + graalvmDrv = graalvmCEPackages.graalvm19-ce; + executable = "bb"; + nativeBuildInputs = [ removeReferencesTo ]; + extraNativeImageBuildArgs = [ "-H:+ReportExceptionStackTraces" "--no-fallback" "--native-image-info" + "--enable-preview" ]; installCheckPhase = '' @@ -23,6 +33,13 @@ buildGraalvmNativeImage rec { $out/bin/bb '(vec (dedupe *input*))' <<< '[1 1 1 1 2]' | grep '[1 2]' ''; + # As of v1.2.174, this will remove references to ${graalvmDrv}/conf/chronology, + # not sure the implications of this but this file is not available in + # graalvm19-ce anyway. + postInstall = '' + remove-references-to -t ${graalvmDrv} $out/bin/${executable} + ''; + passthru.updateScript = writeScript "update-babashka" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl common-updater-scripts jq