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

Commits on May 10, 2017

  1. nix-shell: use appropriate prompt terminator 

    If running nix-shell as root, the terminator should be # and not $.
    @lheckemann
    lheckemann committed May 10, 2017
    Copy the full SHA
    d48edcc View commit details

Commits on May 24, 2017

  1. Merge branch 'prompt-terminator' of https://github.com/lheckemann/nix

    @edolstra
    edolstra committed May 24, 2017
    Copy the full SHA
    01200d0 View commit details

  2. Fix #1380 

    It lacked a backslash. Use a raw string and single quotes around PS1
to simplify this.
    @edolstra
    edolstra committed May 24, 2017
    Copy the full SHA
    9711524 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
@@ -438,7 +438,7 @@ int main(int argc, char ** argv)
"[ -e $stdenv/setup ] && source $stdenv/setup; "
"%3%"
"set +e; "
"[ -n \"$PS1\" ] && PS1=\"\\n\\[\\033[1;32m\\][nix-shell:\\w]$\\[\\033[0m\\] \"; "
R"s([ -n "$PS1" ] && PS1='\n\[\033[1;32m\][nix-shell:\w]\$\[\033[0m\] '; )s"
"if [ \"$(type -t runHook)\" = function ]; then runHook shellHook; fi; "
"unset NIX_ENFORCE_PURITY; "
"unset NIX_INDENT_MAKE; "