mirror of
https://github.com/NixOS/nix
synced 2025-07-07 06:01:48 +02:00
Fix merge conflict in template
This commit is contained in:
commit
8caa66b492
4 changed files with 6 additions and 0 deletions
|
@ -133,4 +133,5 @@
|
|||
- [Release 1.0 (2024-11-??)](release-notes-determinate/rl-1.0.md)
|
||||
- [Nix Release Notes](release-notes/index.md)
|
||||
{{#include ./SUMMARY-rl-next.md}}
|
||||
- [Release 1.0.0 (2025-??-??)](release-notes-determinate/rl-1.0.0.md)
|
||||
- [Release 2.26 (2025-01-22)](release-notes/rl-2.26.md)
|
||||
|
|
7
doc/manual/source/release-notes-determinate/changes.md
Normal file
7
doc/manual/source/release-notes-determinate/changes.md
Normal file
|
@ -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.
|
3
doc/manual/source/release-notes-determinate/index.md
Normal file
3
doc/manual/source/release-notes-determinate/index.md
Normal file
|
@ -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.
|
5
doc/manual/source/release-notes-determinate/rl-1.0.0.md
Normal file
5
doc/manual/source/release-notes-determinate/rl-1.0.0.md
Normal file
|
@ -0,0 +1,5 @@
|
|||
# Release 1.0.0 (2025-??-??)
|
||||
|
||||
* Initial release of Determinate Nix.
|
||||
|
||||
* Based on [upstream Nix 2.26.2](../release-notes/rl-2.26.md).
|
Loading…
Add table
Add a link
Reference in a new issue