From 5b5dd278340d9a7731fe0eed8de307924b39c1ea Mon Sep 17 00:00:00 2001 From: Gideon <87426140+GideonBear@users.noreply.github.com> Date: Thu, 6 Nov 2025 11:05:38 +0100 Subject: [PATCH] fix(guix): fix overcomplicated Guix step (#1290) --- src/steps/os/unix.rs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/steps/os/unix.rs b/src/steps/os/unix.rs index 4fa688dc..932f17c4 100644 --- a/src/steps/os/unix.rs +++ b/src/steps/os/unix.rs @@ -410,17 +410,12 @@ pub fn run_brew_cask(ctx: &ExecutionContext, variant: BrewVariant) -> Result<()> pub fn run_guix(ctx: &ExecutionContext) -> Result<()> { let guix = require("guix")?; - let output = Command::new(&guix).arg("pull").output_checked_utf8(); - debug!("guix pull output: {:?}", output); - let should_upgrade = output.is_ok(); - debug!("Can Upgrade Guix: {:?}", should_upgrade); - print_separator("Guix"); - if should_upgrade { - return ctx.execute(&guix).args(["package", "-u"]).status_checked(); - } - Err(SkipStep(t!("Guix Pull Failed, Skipping").to_string()).into()) + ctx.execute(&guix).arg("pull").status_checked()?; + ctx.execute(&guix).args(["package", "-u"]).status_checked()?; + + Ok(()) } pub fn run_nix(ctx: &ExecutionContext) -> Result<()> {