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

Commits on Oct 9, 2020

  1. nix develop: Source ~/.bashrc 

    Fixes #4104.
    @edolstra
    edolstra committed Oct 9, 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
    4434906 View commit details

  2. nix develop: Unset $HOSTNAME 

    This is set to "localhost" by stdenv which is probably not what you
want.
    @edolstra
    edolstra committed Oct 9, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 6371839BF51BA5DA
    Learn about vigilant mode
    Copy the full SHA
    725488b View commit details
Showing with 5 additions and 0 deletions.
  1. +5 −0 src/nix/develop.cc
5 changes: 5 additions & 0 deletions src/nix/develop.cc
View file
Original file line number Diff line number Diff line change
@@ -164,6 +164,7 @@ struct Common : InstallableCommand, MixProfile
"BASHOPTS",
"EUID",
"HOME", // FIXME: don't ignore in pure mode?
"HOSTNAME",
"NIX_BUILD_TOP",
"NIX_ENFORCE_PURITY",
"NIX_LOG_FD",
@@ -377,6 +378,10 @@ struct CmdDevelop : Common, MixEnvironment
script += fmt("exec %s\n", concatStringsSep(" ", args));
}

else {
script += "[ -n \"$PS1\" ] && [ -e ~/.bashrc ] && source ~/.bashrc;\n";
}

writeFull(rcFileFd.get(), script);

stopProgressBar();