Merge "libexpr: Soft-deprecate ancient let syntax" into main

5 files changed, 22 insertions, 0 deletions

diff --git a/doc/manual/rl-next/deprecated-features.md b/doc/manual/rl-next/deprecated-features.md
index 3f9756fc9..97a660da2 100644
--- a/doc/manual/rl-next/deprecated-features.md
+++ b/doc/manual/rl-next/deprecated-features.md
@@ -14,3 +14,4 @@ and can be disabled via the flags for backwards compatibility (opt-out with `--e
   This means that all URLs must be properly put within quotes like all other strings.
 - `rec-set-overrides`: **__overrides** is an old arcane syntax which has not been in use for more than a decade.
   It is soft-deprecated with a warning only, with the plan to turn that into an error in a future release.
+- `ancient-let`: **The old `let` syntax** (`let { body = …; … }`) is soft-deprecated with a warning as well. Use the regular `let … in` instead.
diff --git a/src/libexpr/parser/parser.cc b/src/libexpr/parser/parser.cc
index 6e8ab2fe4..17463056c 100644
--- a/src/libexpr/parser/parser.cc
+++ b/src/libexpr/parser/parser.cc
@@ -668,6 +668,16 @@ template<> struct BuildAST<grammar::expr::uri> {
 
 template<> struct BuildAST<grammar::expr::ancient_let> : change_head<BindingsState> {
     static void success(const auto & in, BindingsState & b, ExprState & s, State & ps) {
+        // Added 2024-09-18. Turn into an error at some point in the future.
+        // See the documentation on deprecated features for more details.
+        if (!ps.featureSettings.isEnabled(Dep::AncientLet))
+            warn(
+                "%s found at %s. This feature is deprecated and will be removed in the future. Use %s to silence this warning.",
+                "let {",
+                ps.positions[ps.at(in)],
+                "--extra-deprecated-features ancient-let"
+            );
+
         b.attrs.pos = ps.at(in);
         b.attrs.recursive = true;
         s.pushExpr<ExprSelect>(b.attrs.pos, b.attrs.pos, std::make_unique<ExprAttrs>(std::move(b.attrs)), ps.s.body);
diff --git a/src/libutil/deprecated-features.cc b/src/libutil/deprecated-features.cc
index de4efd93b..4de4c8ec7 100644
--- a/src/libutil/deprecated-features.cc
+++ b/src/libutil/deprecated-features.cc
@@ -37,6 +37,15 @@ constexpr std::array<DeprecatedFeatureDetails, numDepFeatures> depFeatureDetails
         )",
     },
     {
+        .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 d4d8a57a9..bdff1bcdb 100644
--- a/src/libutil/deprecated-features.hh
+++ b/src/libutil/deprecated-features.hh
@@ -19,6 +19,7 @@ namespace nix {
 enum struct DeprecatedFeature
 {
     RecSetOverrides,
+    AncientLet,
     UrlLiterals,
 };
 
diff --git a/tests/functional/lang/eval-okay-let.flags b/tests/functional/lang/eval-okay-let.flags
new file mode 100644
index 000000000..011db98d8
--- /dev/null
+++ b/tests/functional/lang/eval-okay-let.flags
@@ -0,0 +1 @@
+--extra-deprecated-features ancient-let