diff --git a/.github/release-notes.sh b/.github/release-notes.sh index 9937c18cf..198361161 100755 --- a/.github/release-notes.sh +++ b/.github/release-notes.sh @@ -45,6 +45,7 @@ linkify_gh() { | trim_trailing_newlines \ | sed -e 's/^\* /\n* /' \ | linkify_gh + echo "" # final newline ) > "$scratch/changes.md" ( diff --git a/.github/workflows/propose-release.yml b/.github/workflows/propose-release.yml index 82407abe7..ea01e4b7a 100644 --- a/.github/workflows/propose-release.yml +++ b/.github/workflows/propose-release.yml @@ -29,4 +29,4 @@ jobs: git commit -m "Set .version-determinate to ${{ inputs.version }}" || true ./.github/release-notes.sh git add doc - git commit -m "Generare release notes for ${{ inputs.version }}" || true + git commit -m "Generate release notes for ${{ inputs.version }}" || true diff --git a/.version-determinate b/.version-determinate index 0f44168a4..d15b8b06f 100644 --- a/.version-determinate +++ b/.version-determinate @@ -1 +1 @@ -3.6.4 +3.6.5 diff --git a/doc/manual/source/SUMMARY.md.in b/doc/manual/source/SUMMARY.md.in index 781dba88c..374aacb59 100644 --- a/doc/manual/source/SUMMARY.md.in +++ b/doc/manual/source/SUMMARY.md.in @@ -129,7 +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) - - [Release 3.6.4 (2025-06-12)](release-notes-determinate/rl-3.6.4.md) + - [Release 3.6.5 (2025-06-16)](release-notes-determinate/rl-3.6.5.md) - [Release 3.6.2 (2025-06-02)](release-notes-determinate/rl-3.6.2.md) - [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) diff --git a/doc/manual/source/release-notes-determinate/changes.md b/doc/manual/source/release-notes-determinate/changes.md index 37ff16592..30a68f6e9 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.29 and Determinate Nix 3.6.4. +This section lists the differences between upstream Nix 2.29 and Determinate Nix 3.6.5. * In Determinate Nix, flakes are stable. You no longer need to enable the `flakes` experimental feature. @@ -47,8 +47,9 @@ This section lists the differences between upstream Nix 2.29 and Determinate Nix * Call out that `--keep-failed` with remote builders will keep the failed build directory on that builder by @cole-h in [DeterminateSystems/nix-src#85](https://github.com/DeterminateSystems/nix-src/pull/85) - + + * When remote building with --keep-failed, only show "you can rerun" message if the derivation's platform is supported on this machine by @cole-h in [DeterminateSystems/nix-src#87](https://github.com/DeterminateSystems/nix-src/pull/87) diff --git a/doc/manual/source/release-notes-determinate/rl-3.6.4.md b/doc/manual/source/release-notes-determinate/rl-3.6.5.md similarity index 82% rename from doc/manual/source/release-notes-determinate/rl-3.6.4.md rename to doc/manual/source/release-notes-determinate/rl-3.6.5.md index 64086bfba..8ef5be0fd 100644 --- a/doc/manual/source/release-notes-determinate/rl-3.6.4.md +++ b/doc/manual/source/release-notes-determinate/rl-3.6.5.md @@ -1,4 +1,4 @@ -# Release 3.6.4 (2025-06-12) +# Release 3.6.5 (2025-06-12) * Based on [upstream Nix 2.29.0](../release-notes/rl-2.29.md). @@ -14,7 +14,6 @@ * Make the `nix repl` test more stable by @edolstra in [DeterminateSystems/nix-src#103](https://github.com/DeterminateSystems/nix-src/pull/103) * Run nixpkgsLibTests against lazy trees by @edolstra in [DeterminateSystems/nix-src#100](https://github.com/DeterminateSystems/nix-src/pull/100) * Run the Nix test suite against lazy trees by @edolstra in [DeterminateSystems/nix-src#105](https://github.com/DeterminateSystems/nix-src/pull/105) -* Improve caching of inputs in dry-run mode by @edolstra in [DeterminateSystems/nix-src#98](https://github.com/DeterminateSystems/nix-src/pull/98) +* Improve caching of inputs by @edolstra in [DeterminateSystems/nix-src#98](https://github.com/DeterminateSystems/nix-src/pull/98), [DeterminateSystems/nix-src#110](https://github.com/DeterminateSystems/nix-src/pull/110), and [DeterminateSystems/nix-src#115](https://github.com/DeterminateSystems/nix-src/pull/115) - -**Full Changelog**: [v3.6.2...v3.6.4](https://github.com/DeterminateSystems/nix-src/compare/v3.6.2...v3.6.4) +**Full Changelog**: [v3.6.2...v3.6.5](https://github.com/DeterminateSystems/nix-src/compare/v3.6.2...v3.6.4)