diff options
| author | Rok Garbas <rok@garbas.si> | 2022-02-18 00:15:23 +0100 |
|---|---|---|
| committer | Rok Garbas <rok@garbas.si> | 2022-02-18 00:15:23 +0100 |
| commit | bf435664d747e2a69476697011ec9ec1e6dabc8b (patch) | |
| tree | eaf8f6f74dd59950e4a3e12c7e77249ff905eab5 /doc/manual | |
| parent | 50a9c48db4dddd6ba4c81dae74aa60f8ff10bfe5 (diff) | |
| parent | b24d541c34b6c85761c63c19ae847816aecd364b (diff) | |
Merge remote-tracking branch 'origin/master' into script-to-make-docker-release
Diffstat (limited to 'doc/manual')
| -rw-r--r-- | doc/manual/generate-options.nix | 2 | ||||
| -rw-r--r-- | doc/manual/src/release-notes/rl-next.md | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/manual/generate-options.nix b/doc/manual/generate-options.nix index 9a77f4d36..84d90beb6 100644 --- a/doc/manual/generate-options.nix +++ b/doc/manual/generate-options.nix @@ -20,7 +20,7 @@ concatStrings (map # JSON, but that converts to "{ }" here. (if isAttrs option.value then "`\"\"`" else "`" + toString option.value + "`")) + "\n\n" - else " **Default:** *machine-specific*") + else " **Default:** *machine-specific*\n") + (if option.aliases != [] then " **Deprecated alias:** " + (concatStringsSep ", " (map (s: "`${s}`") option.aliases)) + "\n\n" else "") diff --git a/doc/manual/src/release-notes/rl-next.md b/doc/manual/src/release-notes/rl-next.md index 78ae99f4b..ad8c27dbc 100644 --- a/doc/manual/src/release-notes/rl-next.md +++ b/doc/manual/src/release-notes/rl-next.md @@ -1,2 +1,9 @@ # Release X.Y (202?-??-??) +* `nix bundle` breaking API change now supports bundlers of the form + `bundler.<system>.<name>= derivation: another-derivation;`. This supports + additional functionality to inspect evaluation information during bundling. A + new [repository](https://github.com/NixOS/bundlers) has various bundlers + implemented. + +* `nix store ping` now reports the version of the remote Nix daemon. |