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: 9640bed87457
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f5edf8aedb94
Choose a head ref
  • 3 commits
  • 1 file changed
  • 3 contributors

Commits on Nov 27, 2020

  1. ammonite: 2.2.0 -> 2.3.8

    @JesusMtnez
    JesusMtnez committed Nov 27, 2020
    Copy the full SHA
    8f46b51 View commit details

  2. ammonite: Fix arguments

    @NeQuissimus
    NeQuissimus committed Nov 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
    34d2819 View commit details

  3. Merge pull request #105115 from JesusMtnez/ammonite 

    ammonite: 2.2.0 -> 2.3.8
    @NeQuissimus
    NeQuissimus authored Nov 27, 2020
    Copy the full SHA
    f5edf8a View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/development/tools/ammonite/default.nix
8 changes: 4 additions & 4 deletions pkgs/development/tools/ammonite/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ let
common = { scalaVersion, sha256 }:
stdenv.mkDerivation rec {
pname = "ammonite";
version = "2.2.0";
version = "2.3.8";

src = fetchurl {
url =
@@ -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
'';

@@ -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";
};
}