From 5e294925aa66baa952d46035bac34ae4b181a101 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Aug 2026 15:26:03 +0000 Subject: [PATCH 1/5] Prepare release v3.22.0 From 3bc9027ac7f96cf16487266235b1b13196b13a9a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Aug 2026 15:26:06 +0000 Subject: [PATCH 2/5] packaging/secure-packages/flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nix': 'path:../..' → 'path:../..' • Updated input 'nix/nixpkgs': 'https://api.flakehub.com/f/pinned/DeterminateSystems/secure-packages-26.05/0.1.1006668%2Brev-e87516da91e53b694a46eda0de22b782eb008d82/019fb45e-7a22-75f0-a9f9-a895378372a0/source.tar.gz' (2026-07-30) → 'https://api.flakehub.com/f/pinned/DeterminateSystems/secure-packages-26.05/0.1.1011423%2Brev-11bcae4108b62d9423d6eebc4b2bde45286d9fd2/019fd38f-01a2-7781-872d-a64af7252926/source.tar.gz' (2026-08-05) --- packaging/secure-packages/flake.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packaging/secure-packages/flake.lock b/packaging/secure-packages/flake.lock index 651372b84652..77288f9b41fc 100644 --- a/packaging/secure-packages/flake.lock +++ b/packaging/secure-packages/flake.lock @@ -77,12 +77,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1785435372, - "narHash": "sha256-veAo2hsRG1Off47F+1HHgwarJVo/FjXUFv3A40ZUViY=", - "rev": "e87516da91e53b694a46eda0de22b782eb008d82", - "revCount": 1006668, + "lastModified": 1785959040, + "narHash": "sha256-XqYoFGaP8eGRiRRzAtfHFRUMDrN4sPdXXsdmdLKEDvc=", + "rev": "11bcae4108b62d9423d6eebc4b2bde45286d9fd2", + "revCount": 1011423, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/secure-packages-26.05/0.1.1006668%2Brev-e87516da91e53b694a46eda0de22b782eb008d82/019fb45e-7a22-75f0-a9f9-a895378372a0/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/secure-packages-26.05/0.1.1011423%2Brev-11bcae4108b62d9423d6eebc4b2bde45286d9fd2/019fd38f-01a2-7781-872d-a64af7252926/source.tar.gz" }, "original": { "type": "tarball", From c21985d928aa4dc594a98268c58068f52dae37c5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Aug 2026 15:26:09 +0000 Subject: [PATCH 3/5] Set .version-determinate to 3.22.0 --- .version-determinate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.version-determinate b/.version-determinate index ac3a4bd51e63..a7e7070f80db 100644 --- a/.version-determinate +++ b/.version-determinate @@ -1 +1 @@ -3.21.9 +3.22.0 From 1547b0b277f7cd25e6b329b914c37d752e1fbc19 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Aug 2026 15:26:14 +0000 Subject: [PATCH 4/5] Generate release notes for 3.22.0 --- doc/manual/source/SUMMARY.md.in | 1 + .../release-notes-determinate/changes.md | 21 ++++++++++++++++++- .../release-notes-determinate/v3.22.0.md | 17 +++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 doc/manual/source/release-notes-determinate/v3.22.0.md diff --git a/doc/manual/source/SUMMARY.md.in b/doc/manual/source/SUMMARY.md.in index 5b16561a04aa..783dcb12b586 100644 --- a/doc/manual/source/SUMMARY.md.in +++ b/doc/manual/source/SUMMARY.md.in @@ -154,6 +154,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.22.0 (2026-08-06)](release-notes-determinate/v3.22.0.md) - [Release 3.21.9 (2026-07-30)](release-notes-determinate/v3.21.9.md) - [Release 3.21.8 (2026-07-20)](release-notes-determinate/v3.21.8.md) - [Release 3.21.7 (2026-07-15)](release-notes-determinate/v3.21.7.md) diff --git a/doc/manual/source/release-notes-determinate/changes.md b/doc/manual/source/release-notes-determinate/changes.md index f557e8f7fc65..97eea8a024e5 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.34 and Determinate Nix 3.21.9. +This section lists the differences between upstream Nix 2.35 and Determinate Nix 3.22.0. * In Determinate Nix, flakes are stable. You no longer need to enable the `flakes` experimental feature. @@ -224,3 +224,22 @@ This section lists the differences between upstream Nix 2.34 and Determinate Nix + + + +* Sync with upstream 2.35.1 by @edolstra in [DeterminateSystems/nix-src#530](https://github.com/DeterminateSystems/nix-src/pull/530) + +* LocalStore: Reduce number of SQLite calls by @edolstra in [DeterminateSystems/nix-src#574](https://github.com/DeterminateSystems/nix-src/pull/574) + +* Fixes from upstream 2.35-maintenance by @edolstra in [DeterminateSystems/nix-src#584](https://github.com/DeterminateSystems/nix-src/pull/584) + +* Use std::move_only_function for parallel evel work items by @edolstra in [DeterminateSystems/nix-src#585](https://github.com/DeterminateSystems/nix-src/pull/585) + +* Fix randomly failing build.sh test by @edolstra in [DeterminateSystems/nix-src#587](https://github.com/DeterminateSystems/nix-src/pull/587) + +* Progress bar signal handling improvements by @edolstra in [DeterminateSystems/nix-src#586](https://github.com/DeterminateSystems/nix-src/pull/586) + +* Prevent LocalCommand 'started' leak on stale SSH master socket by @DarthPJB in [DeterminateSystems/nix-src#569](https://github.com/DeterminateSystems/nix-src/pull/569) + + +* @DarthPJB made their first contribution in [DeterminateSystems/nix-src#569](https://github.com/DeterminateSystems/nix-src/pull/569) diff --git a/doc/manual/source/release-notes-determinate/v3.22.0.md b/doc/manual/source/release-notes-determinate/v3.22.0.md new file mode 100644 index 000000000000..ec814286cf94 --- /dev/null +++ b/doc/manual/source/release-notes-determinate/v3.22.0.md @@ -0,0 +1,17 @@ +# Release 3.22.0 (2026-08-06) + +* Based on [upstream Nix 2.35.1](../release-notes/rl-2.35.md). + +## What's Changed +* Sync with upstream 2.35.1 by @edolstra in [DeterminateSystems/nix-src#530](https://github.com/DeterminateSystems/nix-src/pull/530) +* LocalStore: Reduce number of SQLite calls by @edolstra in [DeterminateSystems/nix-src#574](https://github.com/DeterminateSystems/nix-src/pull/574) +* Fixes from upstream 2.35-maintenance by @edolstra in [DeterminateSystems/nix-src#584](https://github.com/DeterminateSystems/nix-src/pull/584) +* Use std::move_only_function for parallel evel work items by @edolstra in [DeterminateSystems/nix-src#585](https://github.com/DeterminateSystems/nix-src/pull/585) +* Fix randomly failing build.sh test by @edolstra in [DeterminateSystems/nix-src#587](https://github.com/DeterminateSystems/nix-src/pull/587) +* Progress bar signal handling improvements by @edolstra in [DeterminateSystems/nix-src#586](https://github.com/DeterminateSystems/nix-src/pull/586) +* Prevent LocalCommand 'started' leak on stale SSH master socket by @DarthPJB in [DeterminateSystems/nix-src#569](https://github.com/DeterminateSystems/nix-src/pull/569) + +## New Contributors +* @DarthPJB made their first contribution in [DeterminateSystems/nix-src#569](https://github.com/DeterminateSystems/nix-src/pull/569) + +**Full Changelog**: [v3.21.9...v3.22.0](https://github.com/DeterminateSystems/nix-src/compare/v3.21.9...v3.22.0) From 09cfbb56f727e06a1596f54cab4fa6473ffc966c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 6 Aug 2026 21:33:41 +0200 Subject: [PATCH 5/5] Tweak release notes --- .../release-notes-determinate/changes.md | 17 ----------------- .../release-notes-determinate/v3.22.0.md | 18 +++++++++++++----- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/doc/manual/source/release-notes-determinate/changes.md b/doc/manual/source/release-notes-determinate/changes.md index 97eea8a024e5..b157d9c603b0 100644 --- a/doc/manual/source/release-notes-determinate/changes.md +++ b/doc/manual/source/release-notes-determinate/changes.md @@ -226,20 +226,3 @@ This section lists the differences between upstream Nix 2.35 and Determinate Nix - -* Sync with upstream 2.35.1 by @edolstra in [DeterminateSystems/nix-src#530](https://github.com/DeterminateSystems/nix-src/pull/530) - -* LocalStore: Reduce number of SQLite calls by @edolstra in [DeterminateSystems/nix-src#574](https://github.com/DeterminateSystems/nix-src/pull/574) - -* Fixes from upstream 2.35-maintenance by @edolstra in [DeterminateSystems/nix-src#584](https://github.com/DeterminateSystems/nix-src/pull/584) - -* Use std::move_only_function for parallel evel work items by @edolstra in [DeterminateSystems/nix-src#585](https://github.com/DeterminateSystems/nix-src/pull/585) - -* Fix randomly failing build.sh test by @edolstra in [DeterminateSystems/nix-src#587](https://github.com/DeterminateSystems/nix-src/pull/587) - -* Progress bar signal handling improvements by @edolstra in [DeterminateSystems/nix-src#586](https://github.com/DeterminateSystems/nix-src/pull/586) - -* Prevent LocalCommand 'started' leak on stale SSH master socket by @DarthPJB in [DeterminateSystems/nix-src#569](https://github.com/DeterminateSystems/nix-src/pull/569) - - -* @DarthPJB made their first contribution in [DeterminateSystems/nix-src#569](https://github.com/DeterminateSystems/nix-src/pull/569) diff --git a/doc/manual/source/release-notes-determinate/v3.22.0.md b/doc/manual/source/release-notes-determinate/v3.22.0.md index ec814286cf94..c7a0580bddca 100644 --- a/doc/manual/source/release-notes-determinate/v3.22.0.md +++ b/doc/manual/source/release-notes-determinate/v3.22.0.md @@ -2,14 +2,22 @@ * Based on [upstream Nix 2.35.1](../release-notes/rl-2.35.md). -## What's Changed -* Sync with upstream 2.35.1 by @edolstra in [DeterminateSystems/nix-src#530](https://github.com/DeterminateSystems/nix-src/pull/530) +## Upstream Nix 2.35 + +This release is based on upstream Nix 2.35.1, which includes numerous new features and performance improvements. See the [upstream release notes](../release-notes/rl-2.35.md) for more details. + +PRs: [DeterminateSystems/nix-src#530](https://github.com/DeterminateSystems/nix-src/pull/530), [DeterminateSystems/nix-src#584](https://github.com/DeterminateSystems/nix-src/pull/584) + +## Performance improvements + * LocalStore: Reduce number of SQLite calls by @edolstra in [DeterminateSystems/nix-src#574](https://github.com/DeterminateSystems/nix-src/pull/574) -* Fixes from upstream 2.35-maintenance by @edolstra in [DeterminateSystems/nix-src#584](https://github.com/DeterminateSystems/nix-src/pull/584) -* Use std::move_only_function for parallel evel work items by @edolstra in [DeterminateSystems/nix-src#585](https://github.com/DeterminateSystems/nix-src/pull/585) -* Fix randomly failing build.sh test by @edolstra in [DeterminateSystems/nix-src#587](https://github.com/DeterminateSystems/nix-src/pull/587) +* Use std::move_only_function for parallel eval work items by @edolstra in [DeterminateSystems/nix-src#585](https://github.com/DeterminateSystems/nix-src/pull/585) + +## Bug fixes + * Progress bar signal handling improvements by @edolstra in [DeterminateSystems/nix-src#586](https://github.com/DeterminateSystems/nix-src/pull/586) * Prevent LocalCommand 'started' leak on stale SSH master socket by @DarthPJB in [DeterminateSystems/nix-src#569](https://github.com/DeterminateSystems/nix-src/pull/569) +* Fix randomly failing build.sh test by @edolstra in [DeterminateSystems/nix-src#587](https://github.com/DeterminateSystems/nix-src/pull/587) ## New Contributors * @DarthPJB made their first contribution in [DeterminateSystems/nix-src#569](https://github.com/DeterminateSystems/nix-src/pull/569)