From 2d61e3c7837e5b054a7ea9eafa862293883dcc91 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Oct 2024 15:50:27 +0100 Subject: [PATCH] Add Determinate Nix release notes to the manual --- doc/manual/book.toml | 2 +- doc/manual/src/SUMMARY.md.in | 5 ++++- doc/manual/src/release-notes-determinate/changes.md | 7 +++++++ doc/manual/src/release-notes-determinate/index.md | 3 +++ 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 doc/manual/src/release-notes-determinate/changes.md create mode 100644 doc/manual/src/release-notes-determinate/index.md diff --git a/doc/manual/book.toml b/doc/manual/book.toml index 73fb7e75e..f1d7c2c06 100644 --- a/doc/manual/book.toml +++ b/doc/manual/book.toml @@ -1,5 +1,5 @@ [book] -title = "Nix Reference Manual" +title = "Determinate Nix Reference Manual" [output.html] additional-css = ["custom.css"] diff --git a/doc/manual/src/SUMMARY.md.in b/doc/manual/src/SUMMARY.md.in index 8739599a0..f4c5dcfbd 100644 --- a/doc/manual/src/SUMMARY.md.in +++ b/doc/manual/src/SUMMARY.md.in @@ -125,7 +125,10 @@ - [C++ style guide](development/cxx.md) - [Experimental Features](development/experimental-features.md) - [Contributing](development/contributing.md) -- [Releases](release-notes/index.md) +- [Determinate Nix Releases Notes](release-notes-determinate/index.md) + - [Changes between Nix and Determinate Nix](release-notes-determinate/changes.md) + - [Release 1.0 (2024-11-??)](release-notes-determinate/rl-1.0.md) +- [Nix Releases Notes](release-notes/index.md) {{#include ./SUMMARY-rl-next.md}} - [Release 2.24 (2024-07-31)](release-notes/rl-2.24.md) - [Release 2.23 (2024-06-03)](release-notes/rl-2.23.md) diff --git a/doc/manual/src/release-notes-determinate/changes.md b/doc/manual/src/release-notes-determinate/changes.md new file mode 100644 index 000000000..a71867ea2 --- /dev/null +++ b/doc/manual/src/release-notes-determinate/changes.md @@ -0,0 +1,7 @@ +# Changes between Nix and Determinate Nix + +This section lists the differences between upstream Nix 2.24 and Determinate Nix 1.0. + +* In Determinate Nix, flakes are stable. You no longer need to enable the `flakes` experimental feature. + +* In Determinate Nix, the new Nix CLI (i.e. the `nix` command) is stable. You no longer need to enable the `nix-command` experimental feature. diff --git a/doc/manual/src/release-notes-determinate/index.md b/doc/manual/src/release-notes-determinate/index.md new file mode 100644 index 000000000..bba330844 --- /dev/null +++ b/doc/manual/src/release-notes-determinate/index.md @@ -0,0 +1,3 @@ +# Determinate Nix Release Notes + +This chapter lists the differences between Nix and Determinate Nix, as well as the release history of Determinate Nix.