wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 14:51:16 +02:00
Code Activity

Don't add StorePathDescriptor for now

Browse source 
We don't need it yet, we can add it back later.
This commit is contained in:
John Ericson 2023-01-23 12:58:11 -05:00
parent c67e0cc58c
commit 4540e7b940
14 changed files with 126 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/libstore/binary-cache-store.cc
View file

@ -307,17 +307,15 @@ StorePath BinaryCacheStore::addToStoreFromDump(Source & dump, std::string_view n
return addToStoreCommon(dump, repair, CheckSigs, [&](HashResult nar) {
ValidPathInfo info {
*this,
{
.name = std::string { name },
.info = FixedOutputInfo {
{
.method = method,
.hash = nar.first,
},
.references = {
.others = references,
.self = false,
},
name,
FixedOutputInfo {
{
.method = method,
.hash = nar.first,
},
.references = {
.others = references,
.self = false,
},
},
nar.first,
@ -427,17 +425,15 @@ StorePath BinaryCacheStore::addToStore(
return addToStoreCommon(*source, repair, CheckSigs, [&](HashResult nar) {
ValidPathInfo info {
*this,
{
.name = std::string { name },
.info = FixedOutputInfo {
{
.method = method,
.hash = h,
},
.references = {
.others = references,
.self = false,
},
name,
FixedOutputInfo {
{
.method = method,
.hash = h,
},
.references = {
.others = references,
.self = false,
},
},
nar.first,
@ -465,12 +461,10 @@ StorePath BinaryCacheStore::addTextToStore(
return addToStoreCommon(source, repair, CheckSigs, [&](HashResult nar) {
ValidPathInfo info {
*this,
{
.name = std::string { name },
.info = TextInfo {
{ .hash = textHash },
references,
},
std::string { name },
TextInfo {
{ .hash = textHash },
references,
},
nar.first,
};