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

Commits on Oct 9, 2019

  1. nix-build: Fix compilation

    @edolstra
    edolstra committed Oct 9, 2019
    Copy the full SHA
    64d8872 View commit details

  2. nix search: Don't quietly ignore errors

    @edolstra
    edolstra committed Oct 9, 2019
    Copy the full SHA
    7c74f07 View commit details
Showing with 2 additions and 1 deletion.
  1. +1 −1 src/nix-build/nix-build.cc
  2. +1 −0 src/nix/search.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) +
(pure ? "" : "[ -n \"$PS1\" ] && [ -e ~/.bashrc ] && source ~/.bashrc;")
(pure ? "" : "[ -n \"$PS1\" ] && [ -e ~/.bashrc ] && source ~/.bashrc;") +
"%2%"
"dontAddDisableDepTrack=1; "
"[ -e $stdenv/setup ] && source $stdenv/setup; "
1 change: 1 addition & 0 deletions src/nix/search.cc
View file
Original file line number Diff line number Diff line change
@@ -261,6 +261,7 @@ struct CmdSearch : SourceExprCommand, MixJSON
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66145 */
if (!jsonCacheFile)
throw Error("error writing to %s", tmpFile);
throw;
}

if (writeCache && rename(tmpFile.c_str(), jsonCacheFileName.c_str()) == -1)