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: 03b56e96bfa8
Choose a base ref
...
head repository: NixOS/nix
compare: 4fdec5f61d5e
Choose a head ref
  • 8 commits
  • 6 files changed
  • 2 contributors

Commits on Mar 30, 2020

  1. Remove global -I flags 

    (cherry picked from commit 2c692a3)
    @edolstra
    edolstra committed Mar 30, 2020
    1
    Copy the full SHA
    e322a16 View commit details
    Browse the repository at this point in the history

  2. Fix macOS build

    @edolstra
    edolstra committed Mar 30, 2020
    Copy the full SHA
    367577d View commit details
    Browse the repository at this point in the history

  3. Backport 'nix dev-shell' from the flakes branch 

    This also adds a '--profile' option to 'nix build' (replacing 'nix-env
--set').
    @edolstra
    edolstra committed Mar 30, 2020
    Copy the full SHA
    e1a94ad View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2020

  1. fix placeholder not substituted in passAsFile

    @Ninlives
    Ninlives committed Mar 31, 2020
    Copy the full SHA
    12556e5 View commit details
    Browse the repository at this point in the history

  2. nix shell -> nix dev-shell

    @edolstra
    edolstra committed Mar 31, 2020
    Copy the full SHA
    3166b97 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3463 from Ninlives/placeholder-passAsFile 

    fix placeholder not substituted in passAsFile
    @edolstra
    edolstra committed Mar 31, 2020
    Copy the full SHA
    d4d456c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3460 from NixOS/dev-shell 

    Backport 'nix dev-shell' from the flakes branch
    @edolstra
    edolstra committed Mar 31, 2020
    Copy the full SHA
    a754029 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/master' into flakes

    @edolstra
    edolstra committed Mar 31, 2020
    Copy the full SHA
    4fdec5f View commit details
    Browse the repository at this point in the history