Skip to content

fix compatibility with nix 2.33+ show-derivation output #359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Sereja313 merged 1 commit into from
Feb 2, 2026
+13 −8
Merged

fix compatibility with nix 2.33+ show-derivation output #359

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions src/push.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// SPDX-License-Identifier: MPL-2.0

use log::{debug, info, warn};
use std::collections::HashMap;
use std::path::Path;
use std::process::Stdio;
use thiserror::Error;
Expand All @@ -19,6 +18,8 @@ pub enum PushProfileError {
ShowDerivationUtf8(std::str::Utf8Error),
#[error("Failed to parse the output of nix show-derivation: {0}")]
ShowDerivationParse(serde_json::Error),
#[error("Nix show derivation output is not an object")]
ShowDerivationInvalid,
#[error("Nix show-derivation output is empty")]
ShowDerivationEmpty,
#[error("Failed to run Nix build command: {0}")]
Expand Down Expand Up @@ -218,13 +219,10 @@ pub async fn build_profile(data: PushProfileData<'_>) -> Result<(), PushProfileE
);

// `nix-store --query --deriver` doesn't work on invalid paths, so we parse output of show-derivation :(
let mut show_derivation_command = Command::new("nix");

show_derivation_command
let show_derivation_output = Command::new("nix")
.arg("--experimental-features").arg("nix-command")
Copy link
Copy Markdown
Contributor Author

@szlend szlend Jan 4, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really a necessary change, but show-derivation is technically part of the nix-command experimental feature, and this is done in other places.

Also nix show-derivation has been deprecated by nix derivation show a while back, but not sure when we actually want to move to it. I left it alone for now as the old command still works.

.arg("show-derivation")
.arg(&data.deploy_data.profile.profile_settings.path);

let show_derivation_output = show_derivation_command
.arg(&data.deploy_data.profile.profile_settings.path)
.output()
.await
.map_err(PushProfileError::ShowDerivation)?;
Expand All @@ -234,12 +232,19 @@ pub async fn build_profile(data: PushProfileData<'_>) -> Result<(), PushProfileE
a => return Err(PushProfileError::ShowDerivationExit(a)),
};

let derivation_info: HashMap<&str, serde_json::value::Value> = serde_json::from_str(
let show_derivation_json: serde_json::value::Value = serde_json::from_str(
std::str::from_utf8(&show_derivation_output.stdout)
.map_err(PushProfileError::ShowDerivationUtf8)?,
)
.map_err(PushProfileError::ShowDerivationParse)?;

// Nix 2.33+ nests derivations under a "derivations" key, so try to get that first
let derivation_info = show_derivation_json
.get("derivations")
.unwrap_or(&show_derivation_json)
.as_object()
.ok_or(PushProfileError::ShowDerivationInvalid)?;

let deriver_key = derivation_info
.keys()
.next()
Expand Down