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

Commits on Jan 6, 2020

  1. Fix use of uninitialized store path 

    Fixes 'building of '/nix/store/00000000000000000000000000000000-': ...'.
    @edolstra
    edolstra committed Jan 6, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    Doctor-wu Doctor Wu
    GPG key ID: 7D1412F015912FB2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bc22a7e View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/libstore/build.cc
6 changes: 3 additions & 3 deletions src/libstore/build.cc
View file
Original file line number Diff line number Diff line change
@@ -1016,7 +1016,7 @@ DerivationGoal::DerivationGoal(StorePath && drvPath, const StringSet & wantedOut
, buildMode(buildMode)
{
state = &DerivationGoal::getDerivation;
name = fmt("building of '%s'", worker.store.printStorePath(drvPath));
name = fmt("building of '%s'", worker.store.printStorePath(this->drvPath));
trace("created");

mcExpectedBuilds = std::make_unique<MaintainCount<uint64_t>>(worker.expectedBuilds);
@@ -1041,7 +1041,7 @@ DerivationGoal::DerivationGoal(StorePath && drvPath, const BasicDerivation & drv

/* Prevent the .chroot directory from being
garbage-collected. (See isActiveTempFile() in gc.cc.) */
worker.store.addTempRoot(drvPath);
worker.store.addTempRoot(this->drvPath);
}


@@ -4259,7 +4259,7 @@ SubstitutionGoal::SubstitutionGoal(StorePath && storePath, Worker & worker, Repa
, repair(repair)
{
state = &SubstitutionGoal::init;
name = fmt("substitution of '%s'", worker.store.printStorePath(storePath));
name = fmt("substitution of '%s'", worker.store.printStorePath(this->storePath));
trace("created");
maintainExpectedSubstitutions = std::make_unique<MaintainCount<uint64_t>>(worker.expectedSubstitutions);
}