diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2023-04-17 11:22:31 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2023-04-17 17:36:12 -0400 |
commit | aa74c7b0bcd31a6c0f75f5fa09f417bcbef4ad14 (patch) | |
tree | 719c00d6fac1b6c4748749f2e035ff7819210080 /src/libstore/derivations.hh | |
parent | 64ee02890c965bc5d8747f78e6298205c9307335 (diff) |
Gate experimental features in `DerivationOutput::fromJSON`
This is an entry point for outside data, so we need to check enabled
experimental features here.
Diffstat (limited to 'src/libstore/derivations.hh')
-rw-r--r-- | src/libstore/derivations.hh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh index ccdde36ca..d00b23b6d 100644 --- a/src/libstore/derivations.hh +++ b/src/libstore/derivations.hh @@ -136,11 +136,15 @@ struct DerivationOutput : _DerivationOutputRaw const Store & store, std::string_view drvName, std::string_view outputName) const; + /** + * @param xpSettings Stop-gap to avoid globals during unit tests. + */ static DerivationOutput fromJSON( const Store & store, std::string_view drvName, std::string_view outputName, - const nlohmann::json & json); + const nlohmann::json & json, + const ExperimentalFeatureSettings & xpSettings = experimentalFeatureSettings); }; typedef std::map<std::string, DerivationOutput> DerivationOutputs; |