From a383f3e408b37aadf78ac5d0086a03e09ac322dc Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Mon, 5 Feb 2024 12:33:31 -0800 Subject: [PATCH 1/4] Add release notes for "Nix no longer attempts to `git add` files that are `.gitignore`d" (cherry picked from commit 9a5d52262fd83ab11cb36ba2ba91ea27b2389670) --- doc/manual/src/release-notes/rl-2.20.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/manual/src/release-notes/rl-2.20.md b/doc/manual/src/release-notes/rl-2.20.md index 26869e90a..5152926e7 100644 --- a/doc/manual/src/release-notes/rl-2.20.md +++ b/doc/manual/src/release-notes/rl-2.20.md @@ -167,3 +167,7 @@ error: expected a set but found an integer ``` +- Flake operations like `nix develop` will no longer fail when run in a Git + repository where the `flake.lock` file is `.gitignore`d + [#8854](https://github.com/NixOS/nix/issues/8854) + [#9324](https://github.com/NixOS/nix/pull/9324) From 7c6bd8b25fd74559ce1d1b5cb59c7d3ac69c33cb Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Mon, 5 Feb 2024 12:33:58 -0800 Subject: [PATCH 2/4] Add release notes for "Functions are printed with more detail" (cherry picked from commit abb5fef355afc14819c96de08a3687c2257bd10c) --- doc/manual/src/release-notes/rl-2.20.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/doc/manual/src/release-notes/rl-2.20.md b/doc/manual/src/release-notes/rl-2.20.md index 5152926e7..666d0b4db 100644 --- a/doc/manual/src/release-notes/rl-2.20.md +++ b/doc/manual/src/release-notes/rl-2.20.md @@ -167,6 +167,25 @@ error: expected a set but found an integer ``` + +- Functions are printed with more detail [#7145](https://github.com/NixOS/nix/issues/7145) [#9606](https://github.com/NixOS/nix/pull/9606) + + `nix repl`, `nix eval`, `builtins.trace`, and most other places values are + printed will now include function names and source location information: + + ``` + $ nix repl nixpkgs + nix-repl> builtins.map + «primop map» + + nix-repl> builtins.map lib.id + «partially applied primop map» + + nix-repl> builtins.trace lib.id "my-value" + trace: «lambda id @ /nix/store/8rrzq23h2zq7sv5l2vhw44kls5w0f654-source/lib/trivial.nix:26:5» + "my-value" + ``` + - Flake operations like `nix develop` will no longer fail when run in a Git repository where the `flake.lock` file is `.gitignore`d [#8854](https://github.com/NixOS/nix/issues/8854) From 9e077b2d4708dd78123ddcf8aecba0d36792fbba Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 9 Apr 2024 21:27:00 +0200 Subject: [PATCH 3/4] doc/rl-2.20: add missing entry about `nix copy --to ssh-ng://...` This requires `--substitute-on-destination` if you want the remote side to substitute instead of copying if possible. For completeness sake, document it here. Also, the stable Nix from nixpkgs is still 2.18, so more folks may stumble upon this when this is bumped, so I'd expect this to be actually useful. Closes #10182 (cherry picked from commit f34b8de5b2ba9f5ed92924e30661b70ed427a123) --- doc/manual/src/release-notes/rl-2.20.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/manual/src/release-notes/rl-2.20.md b/doc/manual/src/release-notes/rl-2.20.md index 666d0b4db..ae4911180 100644 --- a/doc/manual/src/release-notes/rl-2.20.md +++ b/doc/manual/src/release-notes/rl-2.20.md @@ -190,3 +190,8 @@ repository where the `flake.lock` file is `.gitignore`d [#8854](https://github.com/NixOS/nix/issues/8854) [#9324](https://github.com/NixOS/nix/pull/9324) + +- `nix copy` to a `ssh-ng` store now needs `--substitute-on-destination` (a.k.a. `-s`) + in order to substitute paths on the remote store instead of copying them. + The behavior is consistent with `nix copy` to a different kind of remote store. + Previously this behavior was controlled by `--builders-use-substitutes`. From 077bc08f9a6852d4f416ea06c5d952a4023bd912 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 10 Apr 2024 17:26:58 +0200 Subject: [PATCH 4/4] doc/rl-2.20: clarify builders-use-substitutes vs. substitute-on-destination ...as this lead to confusion before. (cherry picked from commit 50557adb3b58445f1ca176bc6f653afa5151567c) --- doc/manual/src/release-notes/rl-2.20.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/manual/src/release-notes/rl-2.20.md b/doc/manual/src/release-notes/rl-2.20.md index ae4911180..78b1c235d 100644 --- a/doc/manual/src/release-notes/rl-2.20.md +++ b/doc/manual/src/release-notes/rl-2.20.md @@ -194,4 +194,5 @@ - `nix copy` to a `ssh-ng` store now needs `--substitute-on-destination` (a.k.a. `-s`) in order to substitute paths on the remote store instead of copying them. The behavior is consistent with `nix copy` to a different kind of remote store. - Previously this behavior was controlled by `--builders-use-substitutes`. + Previously this behavior was controlled by the + `builders-use-substitutes` setting and `--substitute-on-destination` was ignored.