lix-project/lix
20
55
Fork 31
Code Issues 345 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Remove computed-derivations experimental feature

Browse source 
We don't need it yet.
This commit is contained in:
John Ericson 2022-07-15 13:29:15 +00:00
parent 8735f55dec
commit 279ecf7cde
6 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/manual/src/release-notes/rl-next.md
View file

@ -1,4 +1,3 @@
# Release X.Y (202?-??-??) # Release X.Y (202?-??-??)
* Add experimental *indexed store derivations* installable syntax, part of the * Add *indexed store derivations* installable syntax.
the `computed-derivations` experimental feature.

1
src/libcmd/installables.cc
View file

@ -814,7 +814,6 @@ std::vector<std::shared_ptr<Installable>> SourceExprCommand::parseInstallables(
result.push_back(std::make_shared<InstallableStorePath>( result.push_back(std::make_shared<InstallableStorePath>(
store, store,
DerivedPath::Built::parse(*store, s.substr(0, found), s.substr(found + 1)))); DerivedPath::Built::parse(*store, s.substr(0, found), s.substr(found + 1))));
settings.requireExperimentalFeature(Xp::ComputedDerivations);
continue; continue;
} catch (BadStorePath &) { } catch (BadStorePath &) {
} catch (...) { } catch (...) {

1
src/libutil/experimental-features.cc
View file

@ -14,7 +14,6 @@ std::map<ExperimentalFeature, std::string> stringifiedXpFeatures = {
{ Xp::NoUrlLiterals, "no-url-literals" }, { Xp::NoUrlLiterals, "no-url-literals" },
{ Xp::FetchClosure, "fetch-closure" }, { Xp::FetchClosure, "fetch-closure" },
{ Xp::ReplFlake, "repl-flake" }, { Xp::ReplFlake, "repl-flake" },
{ Xp::ComputedDerivations, "computed-derivations" },
}; };
const std::optional<ExperimentalFeature> parseExperimentalFeature(const std::string_view & name) const std::optional<ExperimentalFeature> parseExperimentalFeature(const std::string_view & name)

1
src/libutil/experimental-features.hh
View file

@ -23,7 +23,6 @@ enum struct ExperimentalFeature
NoUrlLiterals, NoUrlLiterals,
FetchClosure, FetchClosure,
ReplFlake, ReplFlake,
ComputedDerivations, // RFC 92
}; };
/** /**

2
src/nix/nix.md
View file

@ -132,8 +132,6 @@ the Nix store. Here are the recognised types of installables:
* **Indexed store derivations**: `/nix/store/p7gp6lxdg32h4ka1q398wd9r2zkbbz2v-hello-2.10.drv^out` * **Indexed store derivations**: `/nix/store/p7gp6lxdg32h4ka1q398wd9r2zkbbz2v-hello-2.10.drv^out`
*(Experimental, part of by the `computed-derivations` experimental feature.)*
Store derivations can be indexed with a non-empty comma-separated list Store derivations can be indexed with a non-empty comma-separated list
of specific output names, or `*` meaning all ouptuts. This allows of specific output names, or `*` meaning all ouptuts. This allows
finer control versus just specifying a derivation (without finer control versus just specifying a derivation (without

3
tests/build-explicit-output.sh
View file

@ -2,9 +2,6 @@ source common.sh
set -o pipefail set -o pipefail
enableFeatures "computed-derivations"
restartDaemon
drv=$(nix eval -f multiple-outputs.nix --raw a.drvPath) drv=$(nix eval -f multiple-outputs.nix --raw a.drvPath)
if nix build "$drv^not-an-output" --no-link --json; then if nix build "$drv^not-an-output" --no-link --json; then
fail "'not-an-output' should fail to build" fail "'not-an-output' should fail to build"