admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(guix): fix overcomplicated Guix step (#1290)

Browse Source
This commit is contained in:
Gideon
2025-11-06 11:05:38 +01:00
committed by GitHub
parent 79f65981a5
commit 5b5dd27834
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/steps/os/unix.rs
View File

@@ -410,17 +410,12 @@ pub fn run_brew_cask(ctx: &ExecutionContext, variant: BrewVariant) -> Result<()>
pub fn run_guix(ctx: &ExecutionContext) -> Result<()> { pub fn run_guix(ctx: &ExecutionContext) -> Result<()> {
let guix = require("guix")?; 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"); print_separator("Guix");
if should_upgrade { ctx.execute(&guix).arg("pull").status_checked()?;
return ctx.execute(&guix).args(["package", "-u"]).status_checked(); ctx.execute(&guix).args(["package", "-u"]).status_checked()?;
}
Err(SkipStep(t!("Guix Pull Failed, Skipping").to_string()).into()) Ok(())
} }
pub fn run_nix(ctx: &ExecutionContext) -> Result<()> { pub fn run_nix(ctx: &ExecutionContext) -> Result<()> {