From 07f69d4e379d02c2d814afdbde4b839c7339fe91 Mon Sep 17 00:00:00 2001 From: Benjamin Andresen Date: Fri, 24 Apr 2020 19:44:19 +0200 Subject: [PATCH 1/3] babashka: 0.0.78 -> 0.0.89 --- pkgs/development/interpreters/clojure/babashka.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index db849bb542d..6d75ec17a75 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -3,17 +3,17 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "babashka"; - version = "0.0.78"; + version = "0.0.89"; reflectionJson = fetchurl { name = "reflection.json"; url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-reflection.json"; - sha256 = "1m1nwdxjsc6bkdzkbsll316ly0c3qxaimjzyfph1220irjxnm7xf"; + sha256 = "0bc5rbizd2lg7qfh733yiip8m9zqrwgjf5ca09sdibxp7nhhsjby"; }; src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "01w990zk5qjrbnc846snh6na002kdyrlrfnqwg03ibx20g3mr7if"; + sha256 = "11jhqbm3svvikr9glz8wwps1267y25g3384ijw6avn267s7d7l8c"; }; dontUnpack = true; @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { --no-fallback \ --no-server \ --report-unsupported-elements-at-runtime \ + "--initialize-at-run-time=org.postgresql.sspi.SSPIClient" \ "-J-Xmx3g" ''; From a7f59a59469ffc4644db48bd12eade410501f9aa Mon Sep 17 00:00:00 2001 From: Benjamin Andresen Date: Wed, 22 Apr 2020 00:07:41 +0200 Subject: [PATCH 2/3] babashka: utf8 + nativeBuildinputs fix utf8: see borkdude/babashka/issues/359 nativeBuildinputs: this PR's review --- pkgs/development/interpreters/clojure/babashka.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 6d75ec17a75..7f94a0695d4 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, graalvm8 }: +{ stdenv, fetchurl, graalvm8, glibcLocales }: with stdenv.lib; stdenv.mkDerivation rec { @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { dontUnpack = true; - buildInputs = [ graalvm8 ]; + LC_ALL = "en_US.UTF-8"; + nativeBuildInputs = [ graalvm8 glibcLocales ]; buildPhase = '' native-image \ From f6ee88f41e00fb6631e02dcb7153837c0c13b87b Mon Sep 17 00:00:00 2001 From: Benjamin Andresen Date: Sat, 25 Apr 2020 10:00:29 +0200 Subject: [PATCH 3/3] babashka: increase java heap space max to 4500 3g has very long build times and also doesn't build 100% of the time it's also the new default since: https://github.com/borkdude/babashka/commit/7fc33dcb21c067ea8212e07a55e3ac08c284409f --- pkgs/development/interpreters/clojure/babashka.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 7f94a0695d4..130eabbee34 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { --no-server \ --report-unsupported-elements-at-runtime \ "--initialize-at-run-time=org.postgresql.sspi.SSPIClient" \ - "-J-Xmx3g" + "-J-Xmx4500m" ''; installPhase = ''