aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/downstream-placeholder.hh
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2023-07-12 23:33:43 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2023-07-13 07:56:33 -0400
commitcaabc4f64889d5a4c47d6102b3aa1d3c80bbc107 (patch)
tree6859d20eec12b628ca77c07dee7e41e2e6a91f00 /src/libstore/downstream-placeholder.hh
parentcafb5e8a1751b2c951347d5d9188b2e0bee357be (diff)
Feature gate `DownstreamPlaceholder::unknownCaOutput`
This is a part of CA derivations that we forgot to put behind the experimental feature. This was caught by @fricklerhandwerk in https://github.com/NixOS/nix/pull/8369#discussion_r1258133719
Diffstat (limited to 'src/libstore/downstream-placeholder.hh')
-rw-r--r--src/libstore/downstream-placeholder.hh5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libstore/downstream-placeholder.hh b/src/libstore/downstream-placeholder.hh
index f0c0dee77..97f77e6b8 100644
--- a/src/libstore/downstream-placeholder.hh
+++ b/src/libstore/downstream-placeholder.hh
@@ -52,10 +52,13 @@ public:
*
* The derivation itself is known (we have a store path for it), but
* the output doesn't yet have a known store path.
+ *
+ * @param xpSettings Stop-gap to avoid globals during unit tests.
*/
static DownstreamPlaceholder unknownCaOutput(
const StorePath & drvPath,
- std::string_view outputName);
+ std::string_view outputName,
+ const ExperimentalFeatureSettings & xpSettings = experimentalFeatureSettings);
/**
* Create a placehold for the output of an unknown derivation.