Merge pull request #74 from DeterminateSystems/release-v3.6.1/228e087a-ae02-45c0-8bd9-756a89d31008

Release v3.6.1

.version-determinate

@@ -1 +1 @@
-3.6.0
+3.6.1

doc/manual/source/SUMMARY.md.in

@@ -129,6 +129,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)<!-- next -->
+  - [Release 3.6.1 (2025-05-24)](release-notes-determinate/rl-3.6.1.md)
   - [Release 3.6.0 (2025-05-22)](release-notes-determinate/rl-3.6.0.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)

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.29 and Determinate Nix 3.6.0.<!-- differences -->
+This section lists the differences between upstream Nix 2.29 and Determinate Nix 3.6.1.<!-- differences -->
 
 * In Determinate Nix, flakes are stable. You no longer need to enable the `flakes` experimental feature.
 
@@ -31,4 +31,7 @@ This section lists the differences between upstream Nix 2.29 and Determinate Nix
 * 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)
 <!-- Determinate Nix version 3.6.0 -->
 
-* Emit warnings when using import-from-derivation by setting the `trace-import-from-derivation` option to `true` by @gustavderdrache in [DeterminateSystems/nix-src#70](https://github.com/DeterminateSystems/nix-src/pull/70)
+* Emit warnings when using import-from-derivation by setting the `trace-import-from-derivation` option to `true` by @gustavderdrache in [DeterminateSystems/nix-src#70](https://github.com/DeterminateSystems/nix-src/pull/70)
+<!-- Determinate Nix version 3.6.1 -->
+
+* Fix nlohmann error in fromStructuredAttrs() by @edolstra in [DeterminateSystems/nix-src#73](https://github.com/DeterminateSystems/nix-src/pull/73)

doc/manual/source/release-notes-determinate/rl-3.6.1.md

@@ -0,0 +1,9 @@
+# Release 3.6.1 (2025-05-24)
+
+* Based on [upstream Nix 2.29.0](../release-notes/rl-2.29.md).
+
+## What's Changed
+* Fix nlohmann error in fromStructuredAttrs() by @edolstra in [DeterminateSystems/nix-src#73](https://github.com/DeterminateSystems/nix-src/pull/73)
+
+
+**Full Changelog**: [v3.6.0...v3.6.1](https://github.com/DeterminateSystems/nix-src/compare/v3.6.0...v3.6.1)