wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-29 10:31:15 +02:00
Code Activity

Merge pull request #9546 from NixOS/nixos-23.11

Browse source 
Update to nixos-23.11
This commit is contained in:
Robert Hensing 2024-02-28 17:51:16 +01:00 • committed by GitHub
commit 587c7dcb2b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 20 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/local-store.cc
View file

@ -1202,7 +1202,7 @@ StorePath LocalStore::addToStoreFromDump(
Path tempDir;
AutoCloseFD tempDirFd;
bool methodsMatch = (FileIngestionMethod) dumpMethod == hashMethod;
bool methodsMatch = ContentAddressMethod(FileIngestionMethod(dumpMethod)) == hashMethod;
/* If the methods don't match, our streaming hash of the dump is the
wrong sort, and we need to rehash. */