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: fee1acad35c6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 58f02f269f72
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 22, 2018

  1. ammonite: 1.1.0 -> 1.1.2 

    (cherry picked from commit d4aa6b626947f10e93b6e236d5709451fa9e72d1)
    @NeQuissimus
    NeQuissimus committed May 22, 2018
    Copy the full SHA
    58f02f2 View commit details
Showing with 7 additions and 7 deletions.
  1. +7 −7 pkgs/development/tools/ammonite/default.nix
14 changes: 7 additions & 7 deletions pkgs/development/tools/ammonite/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
{ stdenv, lib, fetchurl, makeWrapper, jre
{ stdenv, lib, fetchurl, makeWrapper, jre, gnused
, disableRemoteLogging ? true
}:

with stdenv.lib;
stdenv.mkDerivation rec {
name = "ammonite-${version}";
version = "1.1.0";
version = "1.1.2";
scalaVersion = "2.12";

src = fetchurl {
url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
sha256 = "0dx5w1ffnqazsyp6zxrmfcn7yhkkd81h7njwbqqv1pbchj5znj6l";
sha256 = "1balr7ya7xlyq32jwb0w9c4klnw13mdn2c5azkwngq5cp29yrfrc";
};

propagatedBuildInputs = [ jre ] ;
buildInputs = [ makeWrapper ] ;
buildInputs = [ makeWrapper gnused ] ;

phases = "installPhase";

installPhase = ''
mkdir -p $out/bin
cp ${src} $out/bin/amm
chmod +x $out/bin/amm
wrapProgram $out/bin/amm \
${optionalString disableRemoteLogging "--add-flags --no-remote-logging"} \
--prefix PATH ":" ${jre}/bin ;
${gnused}/bin/sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm
'' + optionalString (disableRemoteLogging) ''
${gnused}/bin/sed -i '0,/ammonite.Main/{s|ammonite.Main|ammonite.Main --no-remote-logging|}' $out/bin/amm
'';

meta = {