puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Fixup docs

Browse source
This commit is contained in:
Robert Hensing 2023-11-09 07:08:56 +01:00 committed by GitHub
parent f0adb72c23
commit 12953b942c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@
- `nix-shell` shebang lines now support single-quoted arguments.
- `builtins.fetchTree` is now unstable under its own experimental feature, [`fetch-tree`](@docroot@/contributing/experimental-features.md#xp-fetch-tree).
- `builtins.fetchTree` is now its own experimental feature, [`fetch-tree`](@docroot@/contributing/experimental-features.md#xp-fetch-tree).
As described in the document for that feature, this is because we anticipate polishing it and then stabilizing it before the rest of Flakes.
- The interface for creating and updating lock files has been overhauled:

2
src/libutil/config.cc
View file

@ -332,8 +332,6 @@ template<> std::set<ExperimentalFeature> BaseSetting<std::set<ExperimentalFeatur
for (auto & s : tokenizeString<StringSet>(str)) {
if (auto thisXpFeature = parseExperimentalFeature(s); thisXpFeature) {
res.insert(thisXpFeature.value());
// FIXME: Replace this hack with a proper notion of
// experimental feature implications/dependencies.
if (thisXpFeature.value() == Xp::Flakes)
res.insert(Xp::FetchTree);
} else

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

@ -80,9 +80,8 @@ constexpr std::array<ExperimentalFeatureDetails, numXpFeatures> xpFeatureDetails
.description = R"(
Enable the use of the [`fetchTree`](@docroot@/language/builtins.md#builtins-fetchTree) built-in function in the Nix language.
`fetchTree` exposes a larger suite of fetching functionality in a more systematic way.
The same fetching functionality is always used for for
[`flakes`](#xp-feature-flakes).
`fetchTree` exposes a large suite of fetching functionality in a more systematic way.
The [`flakes`](#xp-feature-flakes) feature flag always enables `fetch-tree`.
This built-in was previously guarded by the `flakes` experimental feature because of that overlap,
but since the plan is to work on stabilizing this first (due 2024 Q1), we are putting it underneath a separate feature.