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

Commits on Oct 28, 2020

  1. Alter "wanted:" to "specified:" in hash mismatch output 

    This makes it even clearer which of the two hashes was specified in the
nix files. Some may think that "wanted" and "got" is obvious, but:
"got" could mean "got in nix file" and "wanted" could mean "want to see in nix file".
    stev committed Oct 28, 2020
    Copy the full SHA
    869c032 View commit details

Commits on Oct 29, 2020

  1. Merge pull request #4199 from stefanjaax/replaceWantedBySpecified 

    Alter "wanted:" to "specified:" in hash mismatch output
    @edolstra
    edolstra authored Oct 29, 2020
    Copy the full SHA
    bb8e837 View commit details
Showing with 4 additions and 4 deletions.
  1. +1 −1 src/libexpr/primops/fetchTree.cc
  2. +1 −1 src/libstore/build/derivation-goal.cc
  3. +2 −2 src/libstore/local-store.cc
2 changes: 1 addition & 1 deletion src/libexpr/primops/fetchTree.cc
View file
Original file line number Diff line number Diff line change
@@ -212,7 +212,7 @@ static void fetch(EvalState & state, const Pos & pos, Value * * args, Value & v,
? state.store->queryPathInfo(storePath)->narHash
: hashFile(htSHA256, path);
if (hash != *expectedHash)
throw Error((unsigned int) 102, "hash mismatch in file downloaded from '%s':\n wanted: %s\n got: %s",
throw Error((unsigned int) 102, "hash mismatch in file downloaded from '%s':\n specified: %s\n got: %s",
*url, expectedHash->to_string(Base32, true), hash.to_string(Base32, true));
}

2 changes: 1 addition & 1 deletion src/libstore/build/derivation-goal.cc
View file
Original file line number Diff line number Diff line change
@@ -3157,7 +3157,7 @@ void DerivationGoal::registerOutputs()
valid. */
worker.hashMismatch = true;
delayedException = std::make_exception_ptr(
BuildError("hash mismatch in fixed-output derivation '%s':\n wanted: %s\n got: %s",
BuildError("hash mismatch in fixed-output derivation '%s':\n specified: %s\n got: %s",
worker.store.printStorePath(drvPath),
wanted.to_string(SRI, true),
got.to_string(SRI, true)));
4 changes: 2 additions & 2 deletions src/libstore/local-store.cc
View file
Original file line number Diff line number Diff line change
@@ -1085,11 +1085,11 @@ void LocalStore::addToStore(const ValidPathInfo & info, Source & source,
auto hashResult = hashSink->finish();

if (hashResult.first != info.narHash)
throw Error("hash mismatch importing path '%s';\n wanted: %s\n got: %s",
throw Error("hash mismatch importing path '%s';\n specified: %s\n got: %s",
printStorePath(info.path), info.narHash.to_string(Base32, true), hashResult.first.to_string(Base32, true));

if (hashResult.second != info.narSize)
throw Error("size mismatch importing path '%s';\n wanted: %s\n got: %s",
throw Error("size mismatch importing path '%s';\n specified: %s\n got: %s",
printStorePath(info.path), info.narSize, hashResult.second);

autoGC();