From 9095520b781c9e91e305a136eec3c59344e600e5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 12 May 2025 22:31:39 +0000 Subject: [PATCH 1/4] Prepare release v3.5.2 From 2e8f1052ccc8b33f4da646f4bc722209f712435c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 12 May 2025 22:31:42 +0000 Subject: [PATCH 2/4] Set .version-determinate to 3.5.2 --- .version-determinate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.version-determinate b/.version-determinate index d5c0c9914..87ce49290 100644 --- a/.version-determinate +++ b/.version-determinate @@ -1 +1 @@ -3.5.1 +3.5.2 From 8dab2737329912261c8d0eb73622eeba1eb3d29f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 12 May 2025 22:31:47 +0000 Subject: [PATCH 3/4] Generare release notes for 3.5.2 --- doc/manual/source/SUMMARY.md.in | 1 + doc/manual/source/release-notes-determinate/changes.md | 8 +++++++- .../source/release-notes-determinate/rl-3.5.2.md | 10 ++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 doc/manual/source/release-notes-determinate/rl-3.5.2.md diff --git a/doc/manual/source/SUMMARY.md.in b/doc/manual/source/SUMMARY.md.in index ecdcebcf4..a7ed52a23 100644 --- a/doc/manual/source/SUMMARY.md.in +++ b/doc/manual/source/SUMMARY.md.in @@ -128,6 +128,7 @@ - [Contributing](development/contributing.md) - [Determinate Nix Release Notes](release-notes-determinate/index.md) - [Changes between Nix and Determinate Nix](release-notes-determinate/changes.md) + - [Release 3.5.2 (2025-05-12)](release-notes-determinate/rl-3.5.2.md) - [Release 3.5.1 (2025-05-09)](release-notes-determinate/rl-3.5.1.md) - [~~Release 3.5.0 (2025-05-09)~~](release-notes-determinate/rl-3.5.0.md) - [Release 3.4.2 (2025-05-05)](release-notes-determinate/rl-3.4.2.md) diff --git a/doc/manual/source/release-notes-determinate/changes.md b/doc/manual/source/release-notes-determinate/changes.md index a54852443..023e506e6 100644 --- a/doc/manual/source/release-notes-determinate/changes.md +++ b/doc/manual/source/release-notes-determinate/changes.md @@ -1,6 +1,6 @@ # Changes between Nix and Determinate Nix -This section lists the differences between upstream Nix 2.28 and Determinate Nix 3.5.1. +This section lists the differences between upstream Nix 2.28 and Determinate Nix 3.5.2. * In Determinate Nix, flakes are stable. You no longer need to enable the `flakes` experimental feature. @@ -25,3 +25,9 @@ This section lists the differences between upstream Nix 2.28 and Determinate Nix * `nix upgrade-nix` is now inert, and suggests using `determinate-nixd upgrade` -- [DeterminateSystems/nix-src#55](https://github.com/DeterminateSystems/nix-src/pull/55) * Initial Lazy Trees support has been merged, but remains off by default. ([DeterminateSystems/nix-src#27](https://github.com/DeterminateSystems/nix-src/pull/27), [DeterminateSystems/nix-src#56](https://github.com/DeterminateSystems/nix-src/pull/56)) + + + +* Fix emitting narHash in lock files when lazy trees are disabled by @edolstra in [DeterminateSystems/nix-src#63](https://github.com/DeterminateSystems/nix-src/pull/63) + +* Improve 'cannot read file from tarball' error by @edolstra in [DeterminateSystems/nix-src#64](https://github.com/DeterminateSystems/nix-src/pull/64) \ No newline at end of file diff --git a/doc/manual/source/release-notes-determinate/rl-3.5.2.md b/doc/manual/source/release-notes-determinate/rl-3.5.2.md new file mode 100644 index 000000000..108a270df --- /dev/null +++ b/doc/manual/source/release-notes-determinate/rl-3.5.2.md @@ -0,0 +1,10 @@ +# Release 3.5.2 (2025-05-12) + +* Based on [upstream Nix 2.28.3](../release-notes/rl-2.28.md). + +## What's Changed +* Fix emitting narHash in lock files when lazy trees are disabled by @edolstra in [DeterminateSystems/nix-src#63](https://github.com/DeterminateSystems/nix-src/pull/63) +* Improve 'cannot read file from tarball' error by @edolstra in [DeterminateSystems/nix-src#64](https://github.com/DeterminateSystems/nix-src/pull/64) + + +**Full Changelog**: [v3.5.1...v3.5.2](https://github.com/DeterminateSystems/nix-src/compare/v3.5.1...v3.5.2) From deb57afda40aed54c43d27f1046b7998b19f6fcc Mon Sep 17 00:00:00 2001 From: gustavderdrache Date: Mon, 12 May 2025 18:56:59 -0400 Subject: [PATCH 4/4] Apply suggestions from code review Co-authored-by: Graham Christensen --- doc/manual/source/release-notes-determinate/changes.md | 4 +--- doc/manual/source/release-notes-determinate/rl-3.5.2.md | 5 +++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/doc/manual/source/release-notes-determinate/changes.md b/doc/manual/source/release-notes-determinate/changes.md index 023e506e6..757fcbbb0 100644 --- a/doc/manual/source/release-notes-determinate/changes.md +++ b/doc/manual/source/release-notes-determinate/changes.md @@ -28,6 +28,4 @@ This section lists the differences between upstream Nix 2.28 and Determinate Nix -* Fix emitting narHash in lock files when lazy trees are disabled by @edolstra in [DeterminateSystems/nix-src#63](https://github.com/DeterminateSystems/nix-src/pull/63) - -* Improve 'cannot read file from tarball' error by @edolstra in [DeterminateSystems/nix-src#64](https://github.com/DeterminateSystems/nix-src/pull/64) \ No newline at end of file +* Tell users a source is corrupted ("cannot read file from tarball: Truncated tar archive detected while reading data"), improving over the previous 'cannot read file from tarball' error by @edolstra in [DeterminateSystems/nix-src#64](https://github.com/DeterminateSystems/nix-src/pull/64) \ No newline at end of file diff --git a/doc/manual/source/release-notes-determinate/rl-3.5.2.md b/doc/manual/source/release-notes-determinate/rl-3.5.2.md index 108a270df..bc5396c25 100644 --- a/doc/manual/source/release-notes-determinate/rl-3.5.2.md +++ b/doc/manual/source/release-notes-determinate/rl-3.5.2.md @@ -3,8 +3,9 @@ * Based on [upstream Nix 2.28.3](../release-notes/rl-2.28.md). ## What's Changed -* Fix emitting narHash in lock files when lazy trees are disabled by @edolstra in [DeterminateSystems/nix-src#63](https://github.com/DeterminateSystems/nix-src/pull/63) -* Improve 'cannot read file from tarball' error by @edolstra in [DeterminateSystems/nix-src#64](https://github.com/DeterminateSystems/nix-src/pull/64) +* Fix a regression where narHash was not added to lock files when lazy trees were disabled by @edolstra in [DeterminateSystems/nix-src#63](https://github.com/DeterminateSystems/nix-src/pull/63) + +* Tell users a source is corrupted ("cannot read file from tarball: Truncated tar archive detected while reading data"), improving over the previous 'cannot read file from tarball' error by @edolstra in [DeterminateSystems/nix-src#64](https://github.com/DeterminateSystems/nix-src/pull/64) **Full Changelog**: [v3.5.1...v3.5.2](https://github.com/DeterminateSystems/nix-src/compare/v3.5.1...v3.5.2)