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

Commits on Jun 23, 2017

  1. ammonite: disable remote logging by default

    @markus1189
    markus1189 committed Jun 23, 2017

    Unverified

    The committer email address is not verified.
    Learn about vigilant mode
    Copy the full SHA
    5c2d4ef View commit details

  2. Merge pull request #26784 from markus1189/ammonite-disable-remote-log… 

    …ging

ammonite: disable remote logging by default
    @Mic92
    Mic92 authored Jun 23, 2017

    Unverified

    The committer email address is not verified.
    Learn about vigilant mode
    Copy the full SHA
    69ca7b1 View commit details
Showing with 7 additions and 2 deletions.
  1. +7 −2 pkgs/development/tools/ammonite/default.nix
9 changes: 7 additions & 2 deletions pkgs/development/tools/ammonite/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{ stdenv, lib, fetchurl, makeWrapper, jre }:
{ stdenv, lib, fetchurl, makeWrapper, jre
, disableRemoteLogging ? true
}:

with stdenv.lib;
stdenv.mkDerivation rec {
name = "ammonite-${version}";
version = "0.9.9";
@@ -19,7 +22,9 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
cp ${src} $out/bin/amm
chmod +x $out/bin/amm
wrapProgram $out/bin/amm --prefix PATH ":" ${jre}/bin ;
wrapProgram $out/bin/amm \
${optionalString disableRemoteLogging "--add-flags --no-remote-logging"} \
--prefix PATH ":" ${jre}/bin ;
'';

meta = {