aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/manual/src/SUMMARY.md.in1
-rw-r--r--doc/manual/src/release-notes/rl-2.18.md28
-rw-r--r--doc/manual/src/release-notes/rl-next.md29
3 files changed, 29 insertions, 29 deletions
diff --git a/doc/manual/src/SUMMARY.md.in b/doc/manual/src/SUMMARY.md.in
index 701a6ea69..c23186511 100644
--- a/doc/manual/src/SUMMARY.md.in
+++ b/doc/manual/src/SUMMARY.md.in
@@ -110,6 +110,7 @@
- [C++ style guide](contributing/cxx.md)
- [Release Notes](release-notes/release-notes.md)
- [Release X.Y (202?-??-??)](release-notes/rl-next.md)
+ - [Release 2.18 (2023-09-20)](release-notes/rl-2.18.md)
- [Release 2.17 (2023-07-24)](release-notes/rl-2.17.md)
- [Release 2.16 (2023-05-31)](release-notes/rl-2.16.md)
- [Release 2.15 (2023-04-11)](release-notes/rl-2.15.md)
diff --git a/doc/manual/src/release-notes/rl-2.18.md b/doc/manual/src/release-notes/rl-2.18.md
new file mode 100644
index 000000000..4bbc52b50
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-2.18.md
@@ -0,0 +1,28 @@
+# Release 2.18 (2023-09-20)
+
+- Two new builtin functions,
+ [`builtins.parseFlakeRef`](@docroot@/language/builtins.md#builtins-parseFlakeRef)
+ and
+ [`builtins.flakeRefToString`](@docroot@/language/builtins.md#builtins-flakeRefToString),
+ have been added.
+ These functions are useful for converting between flake references encoded as attribute sets and URLs.
+
+- [`builtins.toJSON`](@docroot@/language/builtins.md#builtins-parseFlakeRef) now prints [--show-trace](@docroot@/command-ref/conf-file.html#conf-show-trace) items for the path in which it finds an evaluation error.
+
+- Error messages regarding malformed input to [`nix derivation add`](@docroot@/command-ref/new-cli/nix3-derivation-add.md) are now clearer and more detailed.
+
+- The `discard-references` feature has been stabilized.
+ This means that the
+ [unsafeDiscardReferences](@docroot@/contributing/experimental-features.md#xp-feature-discard-references)
+ attribute is no longer guarded by an experimental flag and can be used
+ freely.
+
+- The JSON output for derived paths which are store paths is now a string, not an object with a single `path` field.
+ This only affects `nix-build --json` when "building" non-derivation things like fetched sources, which is a no-op.
+
+- A new builtin [`outputOf`](@docroot@/language/builtins.md#builtins-outputOf) has been added.
+ It is part of the [`dynamic-derivations`](@docroot@/contributing/experimental-features.md#xp-feature-dynamic-derivations) experimental feature.
+
+- Flake follow paths at depths greater than 2 are now handled correctly, preventing "follows a non-existent input" errors.
+
+- [`nix-store --query`](@docroot@/command-ref/nix-store/query.md) gained a new type of query: `--valid-derivers`. It returns all `.drv` files in the local store that *can be* used to build the output passed in argument. This is in contrast to `--deriver`, which returns the single `.drv` file that *was actually* used to build the output passed in argument. In case the output was substituted from a binary cache, this `.drv` file may only exist on said binary cache and not locally.
diff --git a/doc/manual/src/release-notes/rl-next.md b/doc/manual/src/release-notes/rl-next.md
index 02ad0a661..c869b5e2f 100644
--- a/doc/manual/src/release-notes/rl-next.md
+++ b/doc/manual/src/release-notes/rl-next.md
@@ -1,30 +1 @@
# Release X.Y (202?-??-??)
-
-- Two new builtin functions,
- [`builtins.parseFlakeRef`](@docroot@/language/builtins.md#builtins-parseFlakeRef)
- and
- [`builtins.flakeRefToString`](@docroot@/language/builtins.md#builtins-flakeRefToString),
- have been added.
- These functions are useful for converting between flake references encoded as attribute sets and URLs.
-
-- [`builtins.toJSON`](@docroot@/language/builtins.md#builtins-parseFlakeRef) now prints [--show-trace](@docroot@/command-ref/conf-file.html#conf-show-trace) items for the path in which it finds an evaluation error.
-
-- Error messages regarding malformed input to [`derivation add`](@docroot@/command-ref/new-cli/nix3-derivation-add.md) are now clearer and more detailed.
-
-- The `discard-references` feature has been stabilized.
- This means that the
- [unsafeDiscardReferences](@docroot@/contributing/experimental-features.md#xp-feature-discard-references)
- attribute is no longer guarded by an experimental flag and can be used
- freely.
-
-- The JSON output for derived paths with are store paths is now a string, not an object with a single `path` field.
- This only affects `nix-build --json` when "building" non-derivation things like fetched sources, which is a no-op.
-
-- Introduce a new [`outputOf`](@docroot@/language/builtins.md#builtins-outputOf) builtin.
- It is part of the [`dynamic-derivations`](@docroot@/contributing/experimental-features.md#xp-feature-dynamic-derivations) experimental feature.
-
-- Flake follow paths at depths greater than 2 are now handled correctly, preventing "follows a non-existent input" errors.
-
-- [`nix-store --query`](@docroot@/command-ref/nix-store/query.md) gained a new type of query: `--valid-derivers`. It returns all `.drv` files in the local store that *can be* used to build the output passed in argument.
-This is in contrast to `--deriver`, which returns the single `.drv` file that *was actually* used to build the output passed in argument. In case the output was substituted from a binary cache,
-this `.drv` file may only exist on said binary cache and not locally.