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

Commits on Oct 9, 2019

  1. Don’t source bashrc in pure mode 

    Pure mode should not try to source the user’s bashrc file. These may
have many impurities that the user does not expect to get into their
shell.

Fixes #3090
    @matthewbauer
    matthewbauer committed Oct 9, 2019
    2

    Unverified

    The email in this signature doesn’t match the committer email.
    GPG key ID: 063CCCAD04182D32
    Expired
    Learn about vigilant mode
    Copy the full SHA
    65f6d5d View commit details

  2. Merge pull request #3131 from matthewbauer/dont-source-bashrc-in-pure… 

    …-mode

Don’t source bashrc in pure mode
    @edolstra
    edolstra authored Oct 9, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    GPG key ID: EBB0EA4124809D02
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6b3a6fe View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/nix-build/nix-build.cc
2 changes: 1 addition & 1 deletion src/nix-build/nix-build.cc
View file
Original file line number Diff line number Diff line change
@@ -412,7 +412,7 @@ static void _main(int argc, char * * argv)
auto rcfile = (Path) tmpDir + "/rc";
writeFile(rcfile, fmt(
(keepTmp ? "" : "rm -rf '%1%'; "s) +
"[ -n \"$PS1\" ] && [ -e ~/.bashrc ] && source ~/.bashrc; "
(pure ? "" : "[ -n \"$PS1\" ] && [ -e ~/.bashrc ] && source ~/.bashrc;")
"%2%"
"dontAddDisableDepTrack=1; "
"[ -e $stdenv/setup ] && source $stdenv/setup; "