Skip to content

Commit cb40ba1

Browse files
Release v3.8.4 (#1618)
* Prepare release v3.8.4 * Update test fixtures with the new nix-installer version * flake.lock: Update Flake lock file updates: • Updated input 'determinate': 'https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.8.2/0197ff1f-7dee-7ce8-803b-dee90b5d283c/source.tar.gz?narHash=sha256-eRDO93C2dXNVoLbnNECWwGcMErDKVAXNWWy6hFMPoE8%3D' (2025-07-12) → 'https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.8.4/01982b0e-46ed-709c-973b-7096ceb2a596/source.tar.gz?narHash=sha256-jq04XAgT5Rci907wxd69trNwZixpnBLz5tH02h6JcoA%3D' (2025-07-21) • Updated input 'determinate/determinate-nixd-aarch64-darwin': 'https://install.determinate.systems/determinate-nixd/tag/v3.8.2/macOS?narHash=sha256-T/kTCi8rrh1r5XMGQBymB4Hnk/KNNGkgtgma6bXXKy0%3D' → 'https://install.determinate.systems/determinate-nixd/tag/v3.8.4/macOS?narHash=sha256-tEhYb3OWFIPFvWa/orkyBMvS2joRRrqKHpK2cSd20hU%3D' • Updated input 'determinate/determinate-nixd-aarch64-linux': 'https://install.determinate.systems/determinate-nixd/tag/v3.8.2/aarch64-linux?narHash=sha256-C%2BKvOykOIoXCWSsPBM2Hzy1skk2lgiKXQyb9fJdwSdQ%3D' → 'https://install.determinate.systems/determinate-nixd/tag/v3.8.4/aarch64-linux?narHash=sha256-BGDnwwbo30fdSAv26G2MFYKx2%2BqIQ8G40%2BmuwKH9SPM%3D' • Updated input 'determinate/determinate-nixd-x86_64-linux': 'https://install.determinate.systems/determinate-nixd/tag/v3.8.2/x86_64-linux?narHash=sha256-cENobOVn0%2BFtON9bmr/QoUEpNGEyxW4YpFXkLyBTYDs%3D' → 'https://install.determinate.systems/determinate-nixd/tag/v3.8.4/x86_64-linux?narHash=sha256-P4EJCgSsapE5tggKXiLUeS56PNciGLgonWAm7F1xf6E%3D' • Updated input 'nix': 'https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.8.2/0197ff19-42da-7beb-b8cf-902b39687ccf/source.tar.gz?narHash=sha256-%2BPLMYzOLXmYtGUcUxIbJZpadAV/gO73EAhISc1kgvJM%3D' (2025-07-12) → 'https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.8.4/01982aff-6f3f-7bcc-85c8-b0d4e0cb35d8/source.tar.gz?narHash=sha256-/WmweOcc4DfQPfGkNxllsuEVgTwX3RVROOy3e/mAvr0%3D' (2025-07-21) * Update Cargo dependencies * Set Cargo.toml package.version to 3.8.4 * fixup: handle files in the unpacked Nix store --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Cole Helbling <[email protected]>
1 parent 17d04ae commit cb40ba1

File tree

7 files changed

+56
-49
lines changed

7 files changed

+56
-49
lines changed

Cargo.lock

Lines changed: 22 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "nix-installer"
33
description = "The Determinate Nix Installer"
4-
version = "3.8.2"
4+
version = "3.8.4"
55
edition = "2021"
66
resolver = "2"
77
license = "LGPL-2.1"

flake.lock

Lines changed: 19 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/action/base/move_unpacked_nix.rs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,17 @@ impl Action for MoveUnpackedNix {
107107
let entry_dest = dest_store.join(entry.file_name());
108108
if entry_dest.exists() {
109109
tracing::trace!(src = %entry.path().display(), dest = %entry_dest.display(), "Removing already existing package");
110-
crate::util::remove_dir_all(&entry_dest, OnMissing::Ignore)
111-
.await
112-
.map_err(|e| ActionErrorKind::Remove(entry_dest.clone(), e))
113-
.map_err(Self::error)?;
110+
if entry_dest.is_dir() {
111+
crate::util::remove_dir_all(&entry_dest, OnMissing::Ignore)
112+
.await
113+
.map_err(|e| ActionErrorKind::Remove(entry_dest.clone(), e))
114+
.map_err(Self::error)?;
115+
} else {
116+
crate::util::remove_file(&entry_dest, OnMissing::Ignore)
117+
.await
118+
.map_err(|e| ActionErrorKind::Remove(entry_dest.clone(), e))
119+
.map_err(Self::error)?;
120+
}
114121
}
115122
tracing::trace!(src = %entry.path().display(), dest = %entry_dest.display(), "Renaming");
116123
tokio::fs::rename(&entry.path(), &entry_dest)

tests/fixtures/linux/linux.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "3.8.2",
2+
"version": "3.8.4",
33
"actions": [
44
{
55
"action": {

tests/fixtures/linux/steam-deck.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "3.8.2",
2+
"version": "3.8.4",
33
"actions": [
44
{
55
"action": {

tests/fixtures/macos/macos.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "3.8.2",
2+
"version": "3.8.4",
33
"actions": [
44
{
55
"action": {

0 commit comments

Comments
 (0)