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/nix
base: fd98fca7bbce
Choose a base ref
...
head repository: NixOS/nix
compare: 745938844827
Choose a head ref
  • 4 commits
  • 4 files changed
  • 2 contributors

Commits on Apr 8, 2018

  1. nix-shell: Fixes use with ruby shebangs.

    The ported code in 80ebc55 was incorrectly ported.
    
    ```
    -            $envCommand = "exec $execArgs $interpreter -e 'load(\"$script\")' -- ${\(join ' ', (map shellEscape, @savedArgs))}";
    ...
    +                    envCommand = (format("exec %1% %2% -e 'load(\"%3%\") -- %4%") % execArgs % interpreter % script % joined.str()).str();
    ```
    
    The single-quote finishing the small ruby snippet was lost in
    translation.
    samueldr committed Apr 8, 2018
    Copy the full SHA
    399f43c View commit details
    Browse the repository at this point in the history
  2. Adds nix-shell test for special-cased ruby interpreter.

    The test fakes the interpreter only to verify the arguments it would be
    given.
    samueldr committed Apr 8, 2018
    Copy the full SHA
    9478f88 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2018

  1. Hardcodes nix-shell instead of /usr/bin/env nix-shell...

    ... in the ruby shebang test.
    samueldr committed Apr 9, 2018
    Copy the full SHA
    a4c9b25 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    7459388 View commit details
    Browse the repository at this point in the history