mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2025-02-07 18:57:19 +02:00
Merge pull request #9799 from obsidiansystems/push-add-to-store-from-dump-unsupported-down
Push `addToStoreFromDump` `unsupported(...)` down `Store` class hierarchy
This commit is contained in:
commit
e652322a61
3 changed files with 19 additions and 2 deletions
|
@ -58,6 +58,15 @@ struct DummyStore : public virtual DummyStoreConfig, public virtual Store
|
||||||
RepairFlag repair, CheckSigsFlag checkSigs) override
|
RepairFlag repair, CheckSigsFlag checkSigs) override
|
||||||
{ unsupported("addToStore"); }
|
{ unsupported("addToStore"); }
|
||||||
|
|
||||||
|
virtual StorePath addToStoreFromDump(
|
||||||
|
Source & dump,
|
||||||
|
std::string_view name,
|
||||||
|
ContentAddressMethod method = FileIngestionMethod::Recursive,
|
||||||
|
HashAlgorithm hashAlgo = HashAlgorithm::SHA256,
|
||||||
|
const StorePathSet & references = StorePathSet(),
|
||||||
|
RepairFlag repair = NoRepair) override
|
||||||
|
{ unsupported("addToStore"); }
|
||||||
|
|
||||||
void narFromPath(const StorePath & path, Sink & sink) override
|
void narFromPath(const StorePath & path, Sink & sink) override
|
||||||
{ unsupported("narFromPath"); }
|
{ unsupported("narFromPath"); }
|
||||||
|
|
||||||
|
|
|
@ -69,6 +69,15 @@ struct LegacySSHStore : public virtual LegacySSHStoreConfig, public virtual Stor
|
||||||
RepairFlag repair) override
|
RepairFlag repair) override
|
||||||
{ unsupported("addToStore"); }
|
{ unsupported("addToStore"); }
|
||||||
|
|
||||||
|
virtual StorePath addToStoreFromDump(
|
||||||
|
Source & dump,
|
||||||
|
std::string_view name,
|
||||||
|
ContentAddressMethod method = FileIngestionMethod::Recursive,
|
||||||
|
HashAlgorithm hashAlgo = HashAlgorithm::SHA256,
|
||||||
|
const StorePathSet & references = StorePathSet(),
|
||||||
|
RepairFlag repair = NoRepair) override
|
||||||
|
{ unsupported("addToStore"); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
void putBuildSettings(Connection & conn);
|
void putBuildSettings(Connection & conn);
|
||||||
|
|
|
@ -466,8 +466,7 @@ public:
|
||||||
ContentAddressMethod method = FileIngestionMethod::Recursive,
|
ContentAddressMethod method = FileIngestionMethod::Recursive,
|
||||||
HashAlgorithm hashAlgo = HashAlgorithm::SHA256,
|
HashAlgorithm hashAlgo = HashAlgorithm::SHA256,
|
||||||
const StorePathSet & references = StorePathSet(),
|
const StorePathSet & references = StorePathSet(),
|
||||||
RepairFlag repair = NoRepair)
|
RepairFlag repair = NoRepair) = 0;
|
||||||
{ unsupported("addToStoreFromDump"); }
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add a mapping indicating that `deriver!outputName` maps to the output path
|
* Add a mapping indicating that `deriver!outputName` maps to the output path
|
||||||
|
|
Loading…
Add table
Reference in a new issue