diff --git a/.version b/.version index c819688d6b5..c0ac27fe010 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.35.3 +2.35.2 diff --git a/.version-determinate b/.version-determinate index 2fec58b681b..ce070a60eb7 100644 --- a/.version-determinate +++ b/.version-determinate @@ -1 +1 @@ -3.22.2 +3.22.3 diff --git a/doc/manual/source/SUMMARY.md.in b/doc/manual/source/SUMMARY.md.in index 224d901c2eb..308569fb90f 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.3 (2026-09-02)](release-notes-determinate/v3.22.3.md) - [Release 3.22.2 (2026-08-21)](release-notes-determinate/v3.22.2.md) - [Release 3.22.1 (2026-08-18)](release-notes-determinate/v3.22.1.md) - [Release 3.22.0 (2026-08-06)](release-notes-determinate/v3.22.0.md) diff --git a/doc/manual/source/release-notes-determinate/changes.md b/doc/manual/source/release-notes-determinate/changes.md index 4de2651e51e..27aa8517a57 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.35 and Determinate Nix 3.22.2. +This section lists the differences between upstream Nix 2.35 and Determinate Nix 3.22.3. * In Determinate Nix, flakes are stable. You no longer need to enable the `flakes` experimental feature. @@ -232,3 +232,5 @@ This section lists the differences between upstream Nix 2.35 and Determinate Nix * `nix eval --json` has a flag `--drv-link` to create symlinks to top-level derivations. This prevents them from being garbage-collected. [DeterminateSystems/nix-src#599](https://github.com/DeterminateSystems/nix-src/pull/599) + + diff --git a/doc/manual/source/release-notes-determinate/v3.22.3.md b/doc/manual/source/release-notes-determinate/v3.22.3.md new file mode 100644 index 00000000000..db6cab11ffb --- /dev/null +++ b/doc/manual/source/release-notes-determinate/v3.22.3.md @@ -0,0 +1,29 @@ +# Release 3.22.3 (2026-09-02) + +* Based on [upstream Nix 2.35.2](../release-notes/rl-2.35.md). + +## Parallel evaluation performance improvements + +We're continuing to make performance improvements to parallel evaluation, in particular reducing contention on the Boehm-Demers-Weiser garbage collector's global lock by making more use of per-thread freelists and by removing the use of uncollectable allocations in `builtins.fromJSON`. + +PRs: [DeterminateSystems/nix-src#608](https://github.com/DeterminateSystems/nix-src/pull/608), [DeterminateSystems/nix-src#609](https://github.com/DeterminateSystems/nix-src/pull/609) + +## Miscellaneous changes + +* Update Nixpkgs by @edolstra in [DeterminateSystems/nix-src#607](https://github.com/DeterminateSystems/nix-src/pull/607) +* doc: mention that flake metadata's `Path` field is absent with lazy-trees by @edolstra in [DeterminateSystems/nix-src#620](https://github.com/DeterminateSystems/nix-src/pull/620) + +## Bug fixes + +* Fix `dir` attribute handling in nix-219-compat mode by @edolstra in [DeterminateSystems/nix-src#604](https://github.com/DeterminateSystems/nix-src/pull/604) +* Update the schema file atomically by @edolstra in [DeterminateSystems/nix-src#606](https://github.com/DeterminateSystems/nix-src/pull/606) +* nix copy: Don't register temp roots if the remote doesn't have AddTempRoots by @edolstra in [DeterminateSystems/nix-src#610](https://github.com/DeterminateSystems/nix-src/pull/610) +* Fix crash when GC is interrupted by @edolstra in [DeterminateSystems/nix-src#612](https://github.com/DeterminateSystems/nix-src/pull/612) +* Handle out-of-memory crashes better by @edolstra in [DeterminateSystems/nix-src#603](https://github.com/DeterminateSystems/nix-src/pull/603) +* Fix forwarding netrc-file to the daemon by @edolstra in [DeterminateSystems/nix-src#616](https://github.com/DeterminateSystems/nix-src/pull/616) +* Sync with upstream 2.35-maintenance by @edolstra in [DeterminateSystems/nix-src#617](https://github.com/DeterminateSystems/nix-src/pull/617) +* Fix Ctrl-C handling when Sentry is enabled by @edolstra in [DeterminateSystems/nix-src#618](https://github.com/DeterminateSystems/nix-src/pull/618) +* Eval cache: make the second evaluation hit the cache by @roberth in [DeterminateSystems/nix-src#619](https://github.com/DeterminateSystems/nix-src/pull/619) +* Deduplicate `nix build --print-out-paths` output by @edolstra in [DeterminateSystems/nix-src#622](https://github.com/DeterminateSystems/nix-src/pull/622) + +**Full Changelog**: [v3.22.2...v3.22.3](https://github.com/DeterminateSystems/nix-src/compare/v3.22.2...v3.22.3) diff --git a/packaging/secure-packages/flake.lock b/packaging/secure-packages/flake.lock index ed100b9a765..ff01da98612 100644 --- a/packaging/secure-packages/flake.lock +++ b/packaging/secure-packages/flake.lock @@ -77,12 +77,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1788025223, - "narHash": "sha256-TWYxqK6AnH3/AXPSowct3pxzafZ501CjVuJGu1kBUJw=", - "rev": "01649628bfcaf28024737daec63d559fe0463e6c", - "revCount": 1013487, + "lastModified": 1788280191, + "narHash": "sha256-mB3qK5ql+QFtajxSI/qwCPRPaJMuWyqIKnTZvADKwU8=", + "rev": "88369aab48f8d2b0f69126d306c5af06e997849b", + "revCount": 1013502, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/secure-packages-26.05/0.1.1013487%2Brev-01649628bfcaf28024737daec63d559fe0463e6c/01a04eb4-9c90-76b3-a3fb-a92559e04618/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/secure-packages-26.05/0.1.1013502%2Brev-88369aab48f8d2b0f69126d306c5af06e997849b/01a05deb-f862-7c32-a065-599b037b2e53/source.tar.gz" }, "original": { "type": "tarball",