Merge pull request #29 from tsirysndr/fix/nix-installer-no-confirm

fix issue with nix installer --no-confirm option
tsirysndr · Feb 18, 2024 · 54b9fa9 · 54b9fa9
2 parents a06d304 + 2989faa
commit 54b9fa9
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
@@ -8,16 +8,16 @@ license = "MIT"
 name = "envhub"
 readme = "../../README.md"
 repository = "https://github.com/tsirysndr/envhub"
-version = "0.2.5"
+version = "0.2.6"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 anyhow = "1.0.71"
 clap = "3.2.20"
 envhub-ext = {path = "../ext", version = "0.1.0"}
-envhub-hm = {path = "../hm", version = "0.1.3"}
-envhub-pkgs = {path = "../pkgs", version = "0.1.1"}
+envhub-hm = {path = "../hm", version = "0.1.4"}
+envhub-pkgs = {path = "../pkgs", version = "0.1.2"}
 envhub-providers = {path = "../providers", version = "0.2.0"}
 envhub-stow = {path = "../stow", version = "0.1.0"}
 envhub-types = {path = "../types", version = "0.2.0"}

diff --git a/crates/hm/Cargo.toml b/crates/hm/Cargo.toml
@@ -7,7 +7,7 @@ keywords = ["nix", "shell", "environment", "dotfiles"]
 license = "MIT"
 name = "envhub-hm"
 repository = "https://github.com/tsirysndr/envhub"
-version = "0.1.3"
+version = "0.1.4"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/crates/hm/src/nix.rs b/crates/hm/src/nix.rs
@@ -19,7 +19,7 @@ pub fn install() -> Result<(), Error> {
 
     let mut child = Command::new("sh")
         .arg("-c")
-        .arg("type nix > /dev/null || curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- --no-confirm install")
+        .arg("type nix > /dev/null || curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install --no-confirm")
         .spawn()?;
     child.wait()?;
 

diff --git a/crates/pkgs/Cargo.toml b/crates/pkgs/Cargo.toml
@@ -7,7 +7,7 @@ keywords = ["nix", "shell", "environment", "dotfiles"]
 license = "MIT"
 name = "envhub-pkgs"
 repository = "https://github.com/tsirysndr/envhub"
-version = "0.1.1"
+version = "0.1.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/crates/pkgs/src/nix.rs b/crates/pkgs/src/nix.rs
@@ -37,7 +37,7 @@ impl PackageManager for Nix {
 
         let mut child = Command::new("sh")
         .arg("-c")
-        .arg("type nix > /dev/null || curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- --no-confirm install")
+        .arg("type nix > /dev/null || curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install --no-confirm ")
         .spawn()?;
         child.wait()?;