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

Commits on Feb 21, 2020

  1. ammonite: fix source reference to allow dynamic binding

    @uosis
    uosis committed Feb 21, 2020
    Copy the full SHA
    1857059 View commit details

Commits on Mar 7, 2020

  1. Merge pull request #80707 from uosis/ammonite 

    ammonite: fix source reference to allow dynamic binding
    @marsam
    marsam authored Mar 7, 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
    c5e223e View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/development/tools/ammonite/default.nix
2 changes: 1 addition & 1 deletion pkgs/development/tools/ammonite/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
phases = "installPhase";

installPhase = ''
install -Dm755 ${src} $out/bin/amm
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