aboutsummaryrefslogtreecommitdiff
path: root/doc/manual
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2022-01-25 00:11:00 +0100
committerEelco Dolstra <edolstra@gmail.com>2022-01-25 00:11:00 +0100
commit9faad4c5eb1d6dee8eba32fb2242396ffb689ee6 (patch)
treed4f2f0b6ea9a04a58a2d3baef69a0cff9736b80c /doc/manual
parent716a08827e6646ae2e9c7940b3c9090d806ae400 (diff)
Move rl-next.md to rl-2.5.md
Diffstat (limited to 'doc/manual')
-rw-r--r--doc/manual/src/SUMMARY.md.in1
-rw-r--r--doc/manual/src/release-notes/rl-2.6.md21
-rw-r--r--doc/manual/src/release-notes/rl-next.md19
3 files changed, 22 insertions, 19 deletions
diff --git a/doc/manual/src/SUMMARY.md.in b/doc/manual/src/SUMMARY.md.in
index 2876be52a..4e2afa20e 100644
--- a/doc/manual/src/SUMMARY.md.in
+++ b/doc/manual/src/SUMMARY.md.in
@@ -72,6 +72,7 @@
- [CLI guideline](contributing/cli-guideline.md)
- [Release Notes](release-notes/release-notes.md)
- [Release X.Y (202?-??-??)](release-notes/rl-next.md)
+ - [Release 2.6 (2022-01-24)](release-notes/rl-2.6.md)
- [Release 2.5 (2021-12-13)](release-notes/rl-2.5.md)
- [Release 2.4 (2021-11-01)](release-notes/rl-2.4.md)
- [Release 2.3 (2019-09-04)](release-notes/rl-2.3.md)
diff --git a/doc/manual/src/release-notes/rl-2.6.md b/doc/manual/src/release-notes/rl-2.6.md
new file mode 100644
index 000000000..280faead1
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-2.6.md
@@ -0,0 +1,21 @@
+# Release 2.6 (2022-01-24)
+
+* The Nix CLI now searches for a `flake.nix` up until the root of the current
+ Git repository or a filesystem boundary rather than just in the current
+ directory.
+* The TOML parser used by `builtins.fromTOML` has been replaced by [a
+ more compliant one](https://github.com/ToruNiina/toml11).
+* Added `:st`/`:show-trace` commands to `nix repl`, which are used to
+ set or toggle display of error traces.
+* New builtin function `builtins.zipAttrsWith` with the same
+ functionality as `lib.zipAttrsWith` from Nixpkgs, but much more
+ efficient.
+* New command `nix store copy-log` to copy build logs from one store
+ to another.
+* The `commit-lockfile-summary` option can be set to a non-empty
+ string to override the commit summary used when commiting an updated
+ lockfile. This may be used in conjunction with the `nixConfig`
+ attribute in `flake.nix` to better conform to repository
+ conventions.
+* `docker run -ti nixos/nix:master` will place you in the Docker
+ container with the latest version of Nix from the `master` branch.
diff --git a/doc/manual/src/release-notes/rl-next.md b/doc/manual/src/release-notes/rl-next.md
index 86fb89467..78ae99f4b 100644
--- a/doc/manual/src/release-notes/rl-next.md
+++ b/doc/manual/src/release-notes/rl-next.md
@@ -1,21 +1,2 @@
# Release X.Y (202?-??-??)
-* The Nix CLI now searches for a `flake.nix` up until the root of the current
- Git repository or a filesystem boundary rather than just in the current
- directory.
-* The TOML parser used by `builtins.fromTOML` has been replaced by [a
- more compliant one](https://github.com/ToruNiina/toml11).
-* Added `:st`/`:show-trace` commands to `nix repl`, which are used to
- set or toggle display of error traces.
-* New builtin function `builtins.zipAttrsWith` with the same
- functionality as `lib.zipAttrsWith` from Nixpkgs, but much more
- efficient.
-* New command `nix store copy-log` to copy build logs from one store
- to another.
-* The `commit-lockfile-summary` option can be set to a non-empty
- string to override the commit summary used when commiting an updated
- lockfile. This may be used in conjunction with the `nixConfig`
- attribute in `flake.nix` to better conform to repository
- conventions.
-* `docker run -ti nixos/nix:master` will place you in the Docker
- container with the latest version of Nix from the `master` branch.