wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 21:01:16 +02:00
Code Activity

Make the flakes experimental feature stable

Browse source
This commit is contained in:
Graham Christensen 2023-10-29 21:50:35 +00:00 • committed by Eelco Dolstra
parent 7747a501db
commit 590920eed2
27 changed files with 59 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libcmd/common-eval-args.cc
View file

@ -22,7 +22,6 @@ EvalSettings evalSettings {
{
"flake",
[](ref<Store> store, std::string_view rest) {
experimentalFeatureSettings.require(Xp::Flakes);
// FIXME `parseFlakeRef` should take a `std::string_view`.
auto flakeRef = parseFlakeRef(std::string { rest }, {}, true, false);
debug("fetching flake search path element '%s''", rest);
@ -229,7 +228,6 @@ SourcePath lookupFileArg(EvalState & state, std::string_view s, const Path * bas
}
else if (hasPrefix(s, "flake:")) {
experimentalFeatureSettings.require(Xp::Flakes);
auto flakeRef = parseFlakeRef(std::string(s.substr(6)), {}, true, false);
auto storePath = flakeRef.resolve(state.store).fetchTree(state.store).first;
return state.rootPath(CanonPath(state.store->toRealPath(storePath)));