From 34c5346e98a6f35f17172caad3b67a99e7f5b854 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 23 Apr 2024 10:19:32 +0200
Subject: [PATCH 1/2] release notes: 2.22.0

---
 doc/manual/rl-next/nix-eval-derivations.md | 13 -------------
 doc/manual/rl-next/remove-repl-flake.md    |  8 --------
 doc/manual/src/SUMMARY.md.in               |  1 +
 doc/manual/src/release-notes/rl-2.22.md    | 21 +++++++++++++++++++++
 4 files changed, 22 insertions(+), 21 deletions(-)
 delete mode 100644 doc/manual/rl-next/nix-eval-derivations.md
 delete mode 100644 doc/manual/rl-next/remove-repl-flake.md
 create mode 100644 doc/manual/src/release-notes/rl-2.22.md

diff --git a/doc/manual/rl-next/nix-eval-derivations.md b/doc/manual/rl-next/nix-eval-derivations.md
deleted file mode 100644
index ed0a73384..000000000
--- a/doc/manual/rl-next/nix-eval-derivations.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-synopsis: "`nix eval` prints derivations as `.drv` paths"
-prs: 10200
----
-
-`nix eval` will now print derivations as their `.drv` paths, rather than as
-attribute sets. This makes commands like `nix eval nixpkgs#bash` terminate
-instead of infinitely looping into recursive self-referential attributes:
-
-```ShellSession
-$ nix eval nixpkgs#bash
-«derivation /nix/store/m32cbgbd598f4w299g0hwyv7gbw6rqcg-bash-5.2p26.drv»
-```
diff --git a/doc/manual/rl-next/remove-repl-flake.md b/doc/manual/rl-next/remove-repl-flake.md
deleted file mode 100644
index 23298e2ed..000000000
--- a/doc/manual/rl-next/remove-repl-flake.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-synopsis: Remove experimental repl-flake
-significance: significant
-issues: 10103
-prs: 10299
----
-
-The `repl-flake` experimental feature has been removed. The `nix repl` command now works like the rest of the new CLI in that `nix repl {path}` now tries to load a flake at `{path}` (or fails if the `flakes` experimental feature isn't enabled).*
diff --git a/doc/manual/src/SUMMARY.md.in b/doc/manual/src/SUMMARY.md.in
index d9044fbda..77531d665 100644
--- a/doc/manual/src/SUMMARY.md.in
+++ b/doc/manual/src/SUMMARY.md.in
@@ -122,6 +122,7 @@
   - [C++ style guide](contributing/cxx.md)
 - [Releases](release-notes/index.md)
 {{#include ./SUMMARY-rl-next.md}}
+  - [Release 2.22 (2024-04-23)](release-notes/rl-2.22.md)
   - [Release 2.21 (2024-03-11)](release-notes/rl-2.21.md)
   - [Release 2.20 (2024-01-29)](release-notes/rl-2.20.md)
   - [Release 2.19 (2023-11-17)](release-notes/rl-2.19.md)
diff --git a/doc/manual/src/release-notes/rl-2.22.md b/doc/manual/src/release-notes/rl-2.22.md
new file mode 100644
index 000000000..e916cb8a3
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-2.22.md
@@ -0,0 +1,21 @@
+# Release 2.22.0 (2024-04-23)
+
+### Significant changes
+
+- Remove experimental repl-flake [#10103](https://github.com/NixOS/nix/issues/10103) [#10299](https://github.com/NixOS/nix/pull/10299)
+
+  The `repl-flake` experimental feature has been removed. The `nix repl` command now works like the rest of the new CLI in that `nix repl {path}` now tries to load a flake at `{path}` (or fails if the `flakes` experimental feature isn't enabled).*
+
+### Other changes
+
+- `nix eval` prints derivations as `.drv` paths [#10200](https://github.com/NixOS/nix/pull/10200)
+
+  `nix eval` will now print derivations as their `.drv` paths, rather than as
+  attribute sets. This makes commands like `nix eval nixpkgs#bash` terminate
+  instead of infinitely looping into recursive self-referential attributes:
+
+  ```ShellSession
+  $ nix eval nixpkgs#bash
+  «derivation /nix/store/m32cbgbd598f4w299g0hwyv7gbw6rqcg-bash-5.2p26.drv»
+  ```
+

From b219017b8882055cc959474946a586d6e8307ea7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 23 Apr 2024 10:21:45 +0200
Subject: [PATCH 2/2] Typo

---
 doc/manual/src/release-notes/rl-2.22.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual/src/release-notes/rl-2.22.md b/doc/manual/src/release-notes/rl-2.22.md
index e916cb8a3..c78d3d692 100644
--- a/doc/manual/src/release-notes/rl-2.22.md
+++ b/doc/manual/src/release-notes/rl-2.22.md
@@ -4,7 +4,7 @@
 
 - Remove experimental repl-flake [#10103](https://github.com/NixOS/nix/issues/10103) [#10299](https://github.com/NixOS/nix/pull/10299)
 
-  The `repl-flake` experimental feature has been removed. The `nix repl` command now works like the rest of the new CLI in that `nix repl {path}` now tries to load a flake at `{path}` (or fails if the `flakes` experimental feature isn't enabled).*
+  The `repl-flake` experimental feature has been removed. The `nix repl` command now works like the rest of the new CLI in that `nix repl {path}` now tries to load a flake at `{path}` (or fails if the `flakes` experimental feature isn't enabled).
 
 ### Other changes