libutil: remove dynamic derivations feature
Change-Id: Id48c775197e89bfda711c5cb03752980785c3d26
This commit is contained in:
+1
-2
@@ -892,8 +892,7 @@ std::string EvalState::mkOutputStringRaw(
|
||||
std::optional<StorePath> optStaticOutputPath,
|
||||
const ExperimentalFeatureSettings & xpSettings)
|
||||
{
|
||||
/* In practice, this is testing for the case of CA derivations, or
|
||||
dynamic derivations. */
|
||||
/* In practice, this is testing for the case of CA derivations. */
|
||||
return optStaticOutputPath
|
||||
? ctx.store->printStorePath(std::move(*optStaticOutputPath))
|
||||
/* Downstream we would substitute this for an actual path once
|
||||
|
||||
@@ -199,8 +199,6 @@ try {
|
||||
/* Get the derivation. It is probably in the eval store, but it might be inthe main store:
|
||||
|
||||
- Resolved derivation are resolved against main store realisations, and so must be stored there.
|
||||
|
||||
- Dynamic derivations are built, and so are found in the main store.
|
||||
*/
|
||||
for (auto * drvStore : { &worker.evalStore, &worker.store }) {
|
||||
if (TRY_AWAIT(drvStore->isValidPath(drvPath))) {
|
||||
|
||||
@@ -360,8 +360,6 @@ template<> ExperimentalFeatures BaseSetting<ExperimentalFeatures>::parse(const s
|
||||
if (*thisXpFeature == Xp::CaDerivations) {
|
||||
static std::once_flag warned;
|
||||
warnDeprecated294(warned, s);
|
||||
} else if (*thisXpFeature == Xp::DynamicDerivations) {
|
||||
throw Error("dynamic derivations are no longer supported");
|
||||
}
|
||||
res = res | thisXpFeature.value();
|
||||
} else
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
---
|
||||
name: dynamic-derivations
|
||||
internalName: DynamicDerivations
|
||||
---
|
||||
Allow the use of a few things related to dynamic derivations:
|
||||
|
||||
- "text hashing" derivation outputs, so we can build .drv
|
||||
files.
|
||||
|
||||
- dependencies in derivations on the outputs of
|
||||
derivations that are themselves derivations outputs.
|
||||
@@ -144,7 +144,6 @@ experimental_feature_definitions = files(
|
||||
'experimental-features/ca-derivations.md',
|
||||
'experimental-features/cgroups.md',
|
||||
'experimental-features/daemon-trust-override.md',
|
||||
'experimental-features/dynamic-derivations.md',
|
||||
'experimental-features/fetch-closure.md',
|
||||
'experimental-features/flakes.md',
|
||||
'experimental-features/lix-custom-sub-commands.md',
|
||||
|
||||
Reference in New Issue
Block a user