3 files changed, 21 insertions, 1 deletions
diff --git a/src/libutil/deprecated-features.cc b/src/libutil/deprecated-features.cc
index 877d69da0..4de4c8ec7 100644
--- a/src/libutil/deprecated-features.cc
+++ b/src/libutil/deprecated-features.cc
@@ -28,6 +28,24 @@ constexpr size_t numDepFeatures = 1 + static_cast<size_t>(Dep::UrlLiterals);
 
 constexpr std::array<DeprecatedFeatureDetails, numDepFeatures> depFeatureDetails = {{
     {
+        .tag = Dep::RecSetOverrides,
+        .name = "rec-set-overrides",
+        .description = R"(
+            Allow `__overrides` in recursive attribute sets.
+
+            Use fix point functions (e.g. `lib.fix` in Nixpkgs) instead.
+        )",
+    },
+    {
+        .tag = Dep::AncientLet,
+        .name = "ancient-let",
+        .description = R"(
+            Allow the ancient `let { body = …; … }` syntax.
+
+            Use the `let … in` syntax instead.
+        )",
+    },
+    {
         .tag = Dep::UrlLiterals,
         .name = "url-literals",
         .description = R"(
diff --git a/src/libutil/deprecated-features.hh b/src/libutil/deprecated-features.hh
index 3776e6c29..bdff1bcdb 100644
--- a/src/libutil/deprecated-features.hh
+++ b/src/libutil/deprecated-features.hh
@@ -18,6 +18,8 @@ namespace nix {
  */
 enum struct DeprecatedFeature
 {
+    RecSetOverrides,
+    AncientLet,
     UrlLiterals,
 };
 
diff --git a/src/libutil/file-descriptor.cc b/src/libutil/file-descriptor.cc
index f95d7b321..8385ea402 100644
--- a/src/libutil/file-descriptor.cc
+++ b/src/libutil/file-descriptor.cc
@@ -228,7 +228,7 @@ void closeExtraFDs()
     auto closeRange = [](unsigned int first, unsigned int last, int flags) -> int {
       // musl does not have close_range as of 2024-08-10
       // patch: https://www.openwall.com/lists/musl/2024/08/01/9
-#ifdef HAVE_CLOSE_RANGE
+#if HAVE_CLOSE_RANGE
         return close_range(first, last, flags);
 #else
         return syscall(SYS_close_range, first, last, flags);