From 8f46b51e86610892f642ccd51f97a72733d25f54 Mon Sep 17 00:00:00 2001 From: JesusMtnez Date: Fri, 27 Nov 2020 06:38:46 +0100 Subject: [PATCH 1/2] ammonite: 2.2.0 -> 2.3.8 --- pkgs/development/tools/ammonite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index c3a578f18b8..87a7afde5eb 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -9,7 +9,7 @@ let common = { scalaVersion, sha256 }: stdenv.mkDerivation rec { pname = "ammonite"; - version = "2.2.0"; + version = "2.3.8"; src = fetchurl { url = @@ -75,10 +75,10 @@ let in { ammonite_2_12 = common { scalaVersion = "2.12"; - sha256 = "9xe4GT5YpVCtDPaZvi9PZwFW/wcNhg+QCdbJ4Tl2lFk="; + sha256 = "1kzk0437h2wd9jhwkvjkiaj6mscz4bh85iv266x9zz4zssb355hs"; }; ammonite_2_13 = common { scalaVersion = "2.13"; - sha256 = "KRwh2YOcHpXLA9BlBKzkc9oswdOQbcm3WVqgYaGyi4A="; + sha256 = "0js84m6yqjd7d77md38z6nk3qzlm1ms8brzczaw05zq2c90pdbz7"; }; } From 34d2819831d356eb4353658fc7e290d2b0c26eec Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 27 Nov 2020 09:58:00 -0500 Subject: [PATCH 2/2] ammonite: Fix arguments --- pkgs/development/tools/ammonite/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 87a7afde5eb..20b26437e75 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -23,7 +23,7 @@ let install -Dm755 $src $out/bin/amm sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm '' + optionalString (disableRemoteLogging) '' - sed -i '0,/ammonite.Main/{s|ammonite.Main|ammonite.Main --no-remote-logging|}' $out/bin/amm + sed -i "0,/ammonite.Main/{s|ammonite.Main'|ammonite.Main' --no-remote-logging|}" $out/bin/amm sed -i '1i #!/bin/sh' $out/bin/amm '';