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

fix(nix): fix nix upgrade command selection for profiles in XDG_STATE_HOME (#1354)

Browse Source
This commit is contained in:
Chinmay Dalal
2025-10-08 12:45:57 -04:00
committed by GitHub
parent 762a74f5f9
commit e1b5b76d8e
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
use color_eyre::eyre::eyre; use color_eyre::eyre::eyre;
use color_eyre::eyre::Context; use color_eyre::eyre::Context;
use color_eyre::eyre::Result; use color_eyre::eyre::Result;
use etcetera::BaseStrategy;
use home; use home;
use ini::Ini; use ini::Ini;
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
@@ -20,6 +21,7 @@ use tracing::{debug, warn};
use crate::command::CommandExt; use crate::command::CommandExt;
use crate::sudo::SudoExecuteOpts; use crate::sudo::SudoExecuteOpts;
use crate::XDG_DIRS;
use crate::{output_changed_message, HOME_DIR}; use crate::{output_changed_message, HOME_DIR};
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
@@ -427,7 +429,11 @@ pub fn run_nix(ctx: &ExecutionContext) -> Result<()> {
let nix_env = require("nix-env")?; let nix_env = require("nix-env")?;
// TODO: Is None possible here? // TODO: Is None possible here?
let profile_path = match home::home_dir() { let profile_path = match home::home_dir() {
Some(home) => Path::new(&home).join(".nix-profile"), Some(home) => XDG_DIRS
.state_dir()
.map(|d| d.join("nix/profile"))
.filter(|p| p.exists())
.unwrap_or(Path::new(&home).join(".nix-profile")),
None => Path::new("/nix/var/nix/profiles/per-user/default").into(), None => Path::new("/nix/var/nix/profiles/per-user/default").into(),
}; };
debug!("nix profile: {:?}", profile_path); debug!("nix profile: {:?}", profile_path);