alois31/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

No C++ designated initializers yet with Clang 7

Browse source
This commit is contained in:
John Ericson 2020-06-03 20:35:14 -04:00
parent 3c78ac348c
commit 53bc8ff152
5 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libfetchers/tarball.cc
View file

@ -71,8 +71,8 @@ DownloadFileResult downloadFile(
info.narHash = hashString(HashType::SHA256, *sink.s); info.narHash = hashString(HashType::SHA256, *sink.s);
info.narSize = sink.s->size(); info.narSize = sink.s->size();
info.ca = FileSystemHash { info.ca = FileSystemHash {
.method = FileIngestionMethod::Flat, FileIngestionMethod::Flat,
.hash = hash, hash,
}; };
auto source = StringSource { *sink.s }; auto source = StringSource { *sink.s };
store->addToStore(info, source, NoRepair, NoCheckSigs); store->addToStore(info, source, NoRepair, NoCheckSigs);

5
src/libstore/build.cc
View file

@ -3757,10 +3757,7 @@ void DerivationGoal::registerOutputs()
else else
assert(worker.store.parseStorePath(path) == dest); assert(worker.store.parseStorePath(path) == dest);
ca = FileSystemHash { ca = FileSystemHash { i.second.hash->method, h2 };
.method = i.second.hash->method,
.hash = h2,
};
} }
/* Get rid of all weird permissions. This also checks that /* Get rid of all weird permissions. This also checks that

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

@ -1093,10 +1093,7 @@ StorePath LocalStore::addToStoreFromDump(const string & dump, const string & nam
ValidPathInfo info(dstPath.clone()); ValidPathInfo info(dstPath.clone());
info.narHash = hash.first; info.narHash = hash.first;
info.narSize = hash.second; info.narSize = hash.second;
info.ca = FileSystemHash { info.ca = FileSystemHash { method, h };
.method = method,
.hash = h,
};
registerValidPath(info); registerValidPath(info);
} }

4
src/nix/add-to-store.cc
View file

@ -49,8 +49,8 @@ struct CmdAddToStore : MixDryRun, StoreCommand
info.narHash = narHash; info.narHash = narHash;
info.narSize = sink.s->size(); info.narSize = sink.s->size();
*info.ca = FileSystemHash { *info.ca = FileSystemHash {
.method = FileIngestionMethod::Recursive, FileIngestionMethod::Recursive,
.hash = info.narHash info.narHash,
}; };
if (!dryRun) { if (!dryRun) {

4
src/nix/make-content-addressable.cc
View file

@ -83,8 +83,8 @@ struct CmdMakeContentAddressable : StorePathsCommand, MixJSON
info.narHash = narHash; info.narHash = narHash;
info.narSize = sink.s->size(); info.narSize = sink.s->size();
info.ca = FileSystemHash { info.ca = FileSystemHash {
.method = FileIngestionMethod::Recursive, FileIngestionMethod::Recursive,
.hash = info.narHash, info.narHash,
}; };
if (!json) if (!json)