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: e012384fe99b
Choose a base ref
...
head repository: NixOS/nix
compare: 3913afdd69a5
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Oct 27, 2019

  1. Add inNixShell = true to nix-shell auto-call 

    This is an alternative to the IN_NIX_SHELL environment variable,
allowing the expression to adapt itself to nix-shell without
triggering those adaptations when used as a dependency of another
shell.

Closes #3147
    @roberth
    roberth committed Oct 27, 2019
    Copy the full SHA
    9d612c3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'issue-3147-inNixShell-arg' of https://github.com/hercul… 

    …es-ci/nix
    @edolstra
    edolstra committed Oct 27, 2019
    Copy the full SHA
    0e459d7 View commit details
    Browse the repository at this point in the history

  3. Simplification

    @edolstra
    edolstra committed Oct 27, 2019
    Copy the full SHA
    3913afd View commit details
    Browse the repository at this point in the history