Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3b1e189f409b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bd282ba93da6
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 24, 2020

  1. babashka: 0.0.78 -> 0.0.89

    @bennyandresen
    bennyandresen committed Apr 24, 2020
    Copy the full SHA
    07f69d4 View commit details

  2. babashka: utf8 + nativeBuildinputs fix 

    utf8: see babashka/babashka/issues/359
nativeBuildinputs: this PR's review
    @bennyandresen
    bennyandresen committed Apr 24, 2020
    Copy the full SHA
    a7f59a5 View commit details

Commits on Apr 26, 2020

  1. 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:
babashka/babashka@7fc33dc
    @bennyandresen
    bennyandresen committed Apr 26, 2020
    Copy the full SHA
    f6ee88f View commit details

Commits on Apr 27, 2020

  1. Merge pull request #84350 from bandresen/babashka_0.0.78->0.0.79 

    babashka: 0.0.78 -> 0.0.89
    @Mic92
    Mic92 authored Apr 27, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bd282ba View commit details
Showing with 8 additions and 6 deletions.
  1. +8 −6 pkgs/development/interpreters/clojure/babashka.nix
14 changes: 8 additions & 6 deletions pkgs/development/interpreters/clojure/babashka.nix
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
{ stdenv, fetchurl, graalvm8 }:
{ stdenv, fetchurl, graalvm8, glibcLocales }:

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;

buildInputs = [ graalvm8 ];
LC_ALL = "en_US.UTF-8";
nativeBuildInputs = [ graalvm8 glibcLocales ];

buildPhase = ''
native-image \
@@ -40,7 +41,8 @@ stdenv.mkDerivation rec {
--no-fallback \
--no-server \
--report-unsupported-elements-at-runtime \
"-J-Xmx3g"
"--initialize-at-run-time=org.postgresql.sspi.SSPIClient" \
"-J-Xmx4500m"
'';

installPhase = ''