From fa8b39b0fd050b0f617122dba4378eb604dcf611 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Apr 2026 19:27:21 +0000 Subject: [PATCH 1/4] Prepare release v3.18.1 From dcac0adce1f2582a88764b0d6f0cd7a2c490a854 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Apr 2026 19:27:24 +0000 Subject: [PATCH 2/4] Set .version-determinate to 3.18.1 --- .version-determinate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.version-determinate b/.version-determinate index c5b45eb7b122..d21858b119b1 100644 --- a/.version-determinate +++ b/.version-determinate @@ -1 +1 @@ -3.18.0 +3.18.1 From bb40c611670fe13c6e794883e02aebb569f2d043 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Apr 2026 19:27:29 +0000 Subject: [PATCH 3/4] Generate release notes for 3.18.1 --- doc/manual/source/SUMMARY.md.in | 1 + .../source/release-notes-determinate/changes.md | 14 +++++++++++++- .../source/release-notes-determinate/v3.18.1.md | 13 +++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 doc/manual/source/release-notes-determinate/v3.18.1.md diff --git a/doc/manual/source/SUMMARY.md.in b/doc/manual/source/SUMMARY.md.in index 60982d7ba954..4b4d48eac775 100644 --- a/doc/manual/source/SUMMARY.md.in +++ b/doc/manual/source/SUMMARY.md.in @@ -146,6 +146,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.18.1 (2026-04-23)](release-notes-determinate/v3.18.1.md) - [Release 3.18.0 (2026-04-20)](release-notes-determinate/v3.18.0.md) - [Release 3.17.3 (2026-04-07)](release-notes-determinate/v3.17.3.md) - [Release 3.17.2 (2026-03-27)](release-notes-determinate/v3.17.2.md) diff --git a/doc/manual/source/release-notes-determinate/changes.md b/doc/manual/source/release-notes-determinate/changes.md index f9f2b71f83b0..4b8fe5e94ea6 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.33 and Determinate Nix 3.18.0. +This section lists the differences between upstream Nix 2.33 and Determinate Nix 3.18.1. * In Determinate Nix, flakes are stable. You no longer need to enable the `flakes` experimental feature. @@ -183,3 +183,15 @@ This section lists the differences between upstream Nix 2.33 and Determinate Nix * Determinate Nix can upload crash info to Sentry. [DeterminateSystems/nix-src#418](https://github.com/DeterminateSystems/nix-src/pull/418) * Determinate Nix provides the pre-build hook with a JSON serialization of the derivation. [DeterminateSystems/nix-src#424](https://github.com/DeterminateSystems/nix-src/pull/424) + + + +* Fix chroot helper with Sentry by @edolstra in [DeterminateSystems/nix-src#433](https://github.com/DeterminateSystems/nix-src/pull/433) + +* upload-debug-info-to-sentry.py: Add missing dependencies by @edolstra in [DeterminateSystems/nix-src#434](https://github.com/DeterminateSystems/nix-src/pull/434) + +* restoreProcessContext(): Reset Mach exception ports by @edolstra in [DeterminateSystems/nix-src#432](https://github.com/DeterminateSystems/nix-src/pull/432) + +* Sync with upstream 2.33.4 by @edolstra in [DeterminateSystems/nix-src#435](https://github.com/DeterminateSystems/nix-src/pull/435) + +* sentry: Log the Nix command / subcommand by @edolstra in [DeterminateSystems/nix-src#436](https://github.com/DeterminateSystems/nix-src/pull/436) diff --git a/doc/manual/source/release-notes-determinate/v3.18.1.md b/doc/manual/source/release-notes-determinate/v3.18.1.md new file mode 100644 index 000000000000..c10c6b177429 --- /dev/null +++ b/doc/manual/source/release-notes-determinate/v3.18.1.md @@ -0,0 +1,13 @@ +# Release 3.18.1 (2026-04-23) + +* Based on [upstream Nix 2.33.4](../release-notes/rl-2.33.md). + +## What's Changed +* Fix chroot helper with Sentry by @edolstra in [DeterminateSystems/nix-src#433](https://github.com/DeterminateSystems/nix-src/pull/433) +* upload-debug-info-to-sentry.py: Add missing dependencies by @edolstra in [DeterminateSystems/nix-src#434](https://github.com/DeterminateSystems/nix-src/pull/434) +* restoreProcessContext(): Reset Mach exception ports by @edolstra in [DeterminateSystems/nix-src#432](https://github.com/DeterminateSystems/nix-src/pull/432) +* Sync with upstream 2.33.4 by @edolstra in [DeterminateSystems/nix-src#435](https://github.com/DeterminateSystems/nix-src/pull/435) +* sentry: Log the Nix command / subcommand by @edolstra in [DeterminateSystems/nix-src#436](https://github.com/DeterminateSystems/nix-src/pull/436) + + +**Full Changelog**: [v3.18.0...v3.18.1](https://github.com/DeterminateSystems/nix-src/compare/v3.18.0...v3.18.1) From c0e6cf2ff5975cd1b7137944a1252e7beda0896b Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 23 Apr 2026 12:38:27 -0700 Subject: [PATCH 4/4] Release notes --- .../release-notes-determinate/changes.md | 9 --------- .../release-notes-determinate/v3.18.1.md | 20 ++++++++++++++----- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/doc/manual/source/release-notes-determinate/changes.md b/doc/manual/source/release-notes-determinate/changes.md index 4b8fe5e94ea6..5f795f31d5d8 100644 --- a/doc/manual/source/release-notes-determinate/changes.md +++ b/doc/manual/source/release-notes-determinate/changes.md @@ -186,12 +186,3 @@ This section lists the differences between upstream Nix 2.33 and Determinate Nix -* Fix chroot helper with Sentry by @edolstra in [DeterminateSystems/nix-src#433](https://github.com/DeterminateSystems/nix-src/pull/433) - -* upload-debug-info-to-sentry.py: Add missing dependencies by @edolstra in [DeterminateSystems/nix-src#434](https://github.com/DeterminateSystems/nix-src/pull/434) - -* restoreProcessContext(): Reset Mach exception ports by @edolstra in [DeterminateSystems/nix-src#432](https://github.com/DeterminateSystems/nix-src/pull/432) - -* Sync with upstream 2.33.4 by @edolstra in [DeterminateSystems/nix-src#435](https://github.com/DeterminateSystems/nix-src/pull/435) - -* sentry: Log the Nix command / subcommand by @edolstra in [DeterminateSystems/nix-src#436](https://github.com/DeterminateSystems/nix-src/pull/436) diff --git a/doc/manual/source/release-notes-determinate/v3.18.1.md b/doc/manual/source/release-notes-determinate/v3.18.1.md index c10c6b177429..26c9592561ad 100644 --- a/doc/manual/source/release-notes-determinate/v3.18.1.md +++ b/doc/manual/source/release-notes-determinate/v3.18.1.md @@ -3,11 +3,21 @@ * Based on [upstream Nix 2.33.4](../release-notes/rl-2.33.md). ## What's Changed -* Fix chroot helper with Sentry by @edolstra in [DeterminateSystems/nix-src#433](https://github.com/DeterminateSystems/nix-src/pull/433) -* upload-debug-info-to-sentry.py: Add missing dependencies by @edolstra in [DeterminateSystems/nix-src#434](https://github.com/DeterminateSystems/nix-src/pull/434) -* restoreProcessContext(): Reset Mach exception ports by @edolstra in [DeterminateSystems/nix-src#432](https://github.com/DeterminateSystems/nix-src/pull/432) -* Sync with upstream 2.33.4 by @edolstra in [DeterminateSystems/nix-src#435](https://github.com/DeterminateSystems/nix-src/pull/435) -* sentry: Log the Nix command / subcommand by @edolstra in [DeterminateSystems/nix-src#436](https://github.com/DeterminateSystems/nix-src/pull/436) + +### Sentry integration improvements + +This release includes fixes for a couple of issues with the Sentry integration: + +* Ensures the chroot helper starts before the Sentry thread, allowing chroot stores to work again +* Resets Mach exception ports on macOS, so that exec'd programs do not communicate with Determinate Nix's `crashpad_handler` + +Additionally, Determinate Nix now includes the Nix command and subcommand to Sentry reports to make it easier to discern where an issue happened. +Not that this does _not_ include any command-line arguments other than the command (such as `nix-daemon` and `nix`) and subcommand (such as `flake show`). + +PRs: +* [DeterminateSystems/nix-src#433](https://github.com/DeterminateSystems/nix-src/pull/433) +* [DeterminateSystems/nix-src#432](https://github.com/DeterminateSystems/nix-src/pull/432) +* [DeterminateSystems/nix-src#436](https://github.com/DeterminateSystems/nix-src/pull/436) **Full Changelog**: [v3.18.0...v3.18.1](https://github.com/DeterminateSystems/nix-src/compare/v3.18.0...v3.18.1)