Merge pull request #105115 from JesusMtnez/ammonite

ammonite: 2.2.0 -> 2.3.8
This commit is contained in:
Tim Steinbach 2020-11-27 10:59:49 -05:00 committed by GitHub
commit f5edf8aedb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -9,7 +9,7 @@ let
common = { scalaVersion, sha256 }: common = { scalaVersion, sha256 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ammonite"; pname = "ammonite";
version = "2.2.0"; version = "2.3.8";
src = fetchurl { src = fetchurl {
url = url =
@ -23,7 +23,7 @@ let
install -Dm755 $src $out/bin/amm install -Dm755 $src $out/bin/amm
sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm
'' + optionalString (disableRemoteLogging) '' '' + 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 sed -i '1i #!/bin/sh' $out/bin/amm
''; '';
@ -75,10 +75,10 @@ let
in { in {
ammonite_2_12 = common { ammonite_2_12 = common {
scalaVersion = "2.12"; scalaVersion = "2.12";
sha256 = "9xe4GT5YpVCtDPaZvi9PZwFW/wcNhg+QCdbJ4Tl2lFk="; sha256 = "1kzk0437h2wd9jhwkvjkiaj6mscz4bh85iv266x9zz4zssb355hs";
}; };
ammonite_2_13 = common { ammonite_2_13 = common {
scalaVersion = "2.13"; scalaVersion = "2.13";
sha256 = "KRwh2YOcHpXLA9BlBKzkc9oswdOQbcm3WVqgYaGyi4A="; sha256 = "0js84m6yqjd7d77md38z6nk3qzlm1ms8brzczaw05zq2c90pdbz7";
}; };
} }