aboutsummaryrefslogtreecommitdiff
path: root/src/libstore
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2020-07-27 17:56:36 +0000
committerJohn Ericson <John.Ericson@Obsidian.Systems>2020-07-27 17:56:36 +0000
commit951415b5685fe52d31770eadabd66d95ea75cfae (patch)
treeedaa3519b3f21f5bb4436e498d6c1a0a1ab3f69b /src/libstore
parente32a9e124bfdaea1475a3884510ed524976b504f (diff)
Require `ca-derivations` everywhere we create a CA derivation
"create" as in read one in from a serialized form, or build one from scratch in memory.
Diffstat (limited to 'src/libstore')
-rw-r--r--src/libstore/derivations.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index c88bb3c6d..6a12e8734 100644
--- a/src/libstore/derivations.cc
+++ b/src/libstore/derivations.cc
@@ -163,12 +163,13 @@ static DerivationOutput parseDerivationOutput(const Store & store, std::istrings
},
}
}
- : DerivationOutput {
- .output = DerivationOutputFloating {
+ : (settings.requireExperimentalFeature("ca-derivations"),
+ DerivationOutput {
+ .output = DerivationOutputFloating {
.method = std::move(method),
.hashType = std::move(hashType),
},
- };
+ });
} else
return DerivationOutput {
.output = DerivationOutputInputAddressed {
@@ -559,12 +560,13 @@ static DerivationOutput readDerivationOutput(Source & in, const Store & store)
},
}
}
- : DerivationOutput {
+ : (settings.requireExperimentalFeature("ca-derivations"),
+ DerivationOutput {
.output = DerivationOutputFloating {
.method = std::move(method),
.hashType = std::move(hashType),
},
- };
+ });
} else
return DerivationOutput {
.output = DerivationOutputInputAddressed {