Fixup docs

NixOS · Nov 9, 2023 · 12953b9 · 12953b9
1 parent f0adb72
commit 12953b9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/doc/manual/src/release-notes/rl-next.md b/doc/manual/src/release-notes/rl-next.md
@@ -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:

diff --git a/src/libutil/config.cc b/src/libutil/config.cc
@@ -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

diff --git a/src/libutil/experimental-features.cc b/src/libutil/experimental-features.cc
@@ -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.