From 0f1269243b242be033ff031ab1993e05cf25d857 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rbt@sent.as>
Date: Thu, 8 Feb 2024 10:09:47 -0800
Subject: [PATCH] Revert "Add release notes for "Stack traces are more
 compact""

This reverts commit b2868acbdc125bf3638f21dd8c5684cc56d4b739.
---
 .../rl-next/stack-traces-are-more-compact.md  | 51 -------------------
 doc/manual/src/release-notes/rl-2.20.md       | 19 -------
 2 files changed, 70 deletions(-)
 delete mode 100644 doc/manual/rl-next/stack-traces-are-more-compact.md

diff --git a/doc/manual/rl-next/stack-traces-are-more-compact.md b/doc/manual/rl-next/stack-traces-are-more-compact.md
deleted file mode 100644
index 751465da1..000000000
--- a/doc/manual/rl-next/stack-traces-are-more-compact.md
+++ /dev/null
@@ -1,51 +0,0 @@
----
-synopsis: Stack traces are more compact
-prs: 9619
----
-
-Stack traces printed with `--show-trace` are more compact.
-
-Before:
-
-```
-error:
-       … while evaluating the attribute 'body'
-
-         at /Users/wiggles/nix/tests/functional/lang/eval-fail-assert.nix:4:3:
-
-            3|
-            4|   body = x "x";
-             |   ^
-            5| }
-
-       error: assertion '(arg == "y")' failed
-
-       at /Users/wiggles/nix/tests/functional/lang/eval-fail-assert.nix:2:12:
-
-            1| let {
-            2|   x = arg: assert arg == "y"; 123;
-             |            ^
-            3|
-```
-
-After:
-
-```
-error:
-       … while evaluating the attribute 'body'
-         at /Users/wiggles/nix/tests/functional/lang/eval-fail-assert.nix:4:3:
-            3|
-            4|   body = x "x";
-             |   ^
-            5| }
-
-       error: assertion '(arg == "y")' failed
-       at /Users/wiggles/nix/tests/functional/lang/eval-fail-assert.nix:2:12:
-            1| let {
-            2|   x = arg: assert arg == "y"; 123;
-             |            ^
-            3|
-```
-
-This was actually released in Nix 2.20, but wasn't added to the release notes
-so we're announcing it here. The historical release notes have been updated as well.
diff --git a/doc/manual/src/release-notes/rl-2.20.md b/doc/manual/src/release-notes/rl-2.20.md
index 4dd49c5ea..8ede168a4 100644
--- a/doc/manual/src/release-notes/rl-2.20.md
+++ b/doc/manual/src/release-notes/rl-2.20.md
@@ -200,22 +200,3 @@
   while performing various operations (including `nix develop`, `nix flake
   update`, and so on). With several fixes to Nix's signal handlers, Nix
   commands will now exit quickly after Ctrl-C is pressed.
-
-- Blank lines have been removed from stack traces, rendering them more compact [#9619](https://github.com/NixOS/nix/pull/9619)
-
-  ```
-  error:
-         … while evaluating the attribute 'body'
-           at /Users/wiggles/nix/tests/functional/lang/eval-fail-assert.nix:4:3:
-              3|
-              4|   body = x "x";
-               |   ^
-              5| }
-
-         error: assertion '(arg == "y")' failed
-         at /Users/wiggles/nix/tests/functional/lang/eval-fail-assert.nix:2:12:
-              1| let {
-              2|   x = arg: assert arg == "y"; 123;
-               |            ^
-              3|
-  ```