diff --git a/lix/libexpr/eval.cc b/lix/libexpr/eval.cc index 6042b9ef3..3beec65d3 100644 --- a/lix/libexpr/eval.cc +++ b/lix/libexpr/eval.cc @@ -892,8 +892,7 @@ std::string EvalState::mkOutputStringRaw( std::optional 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 diff --git a/lix/libstore/build/derivation-goal.cc b/lix/libstore/build/derivation-goal.cc index 3b321472a..48b1d6f7c 100644 --- a/lix/libstore/build/derivation-goal.cc +++ b/lix/libstore/build/derivation-goal.cc @@ -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))) { diff --git a/lix/libutil/config.cc b/lix/libutil/config.cc index d284cda5a..7600df038 100644 --- a/lix/libutil/config.cc +++ b/lix/libutil/config.cc @@ -360,8 +360,6 @@ template<> ExperimentalFeatures BaseSetting::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 diff --git a/lix/libutil/experimental-features/dynamic-derivations.md b/lix/libutil/experimental-features/dynamic-derivations.md deleted file mode 100644 index 79201bcc3..000000000 --- a/lix/libutil/experimental-features/dynamic-derivations.md +++ /dev/null @@ -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. diff --git a/lix/libutil/meson.build b/lix/libutil/meson.build index dee473972..007c197aa 100644 --- a/lix/libutil/meson.build +++ b/lix/libutil/meson.build @@ -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',