Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion crates/nix_rs/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ impl NixCmd {
pub fn command(&self) -> Command {
let mut cmd = Command::new("nix");
cmd.kill_on_drop(true);
cmd.args(self.args.into_iter());
cmd.args(&self.args);
cmd
}

Expand Down
1 change: 0 additions & 1 deletion crates/omnix-ci/src/step/custom.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ impl CustomStep {
override_inputs: subflake.override_inputs.clone(),
current_dir: Some(path.clone()),
no_write_lock_file: false,
..Default::default()
};

match self {
Expand Down
4 changes: 2 additions & 2 deletions crates/omnix-health/src/check/shell.rs
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,9 @@ impl Shell {
OS::MacOS { .. } => "Library/Application Support/nushell",
_ => ".config/nushell",
};
vec!["env.nu", "config.nu", "login.nu"]
["env.nu", "config.nu", "login.nu"]
.iter()
.map(|f| format!("{}/{}", base, f).into())
.map(|f| format!("{}/{}", base, f))
.collect()
}
}
Expand Down
2 changes: 1 addition & 1 deletion crates/omnix-health/src/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ impl HealthEnvInfo {
.context("Unable to gather nix info")?;

Ok(Self {
nix_installer: nix_info.nix_env.installer.clone().into(),
nix_installer: nix_info.nix_env.installer.clone(),
system: nix_info.nix_config.system.value.clone(),
os: nix_info.nix_env.os.clone(),
total_memory: nix_info.nix_env.total_memory,
Expand Down
18 changes: 8 additions & 10 deletions om.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,14 @@ ci:
systems:
- x86_64-linux
- aarch64-darwin
# Disabled until upstream bug is fixed,
# https://github.com/rust-lang/rust-clippy/issues/14045
# cargo-clippy:
# type: devshell
# command:
# - just
# - clippy
# systems:
# - x86_64-linux
# - aarch64-darwin
cargo-clippy:
type: devshell
command:
- just
- clippy
systems:
- x86_64-linux
- aarch64-darwin
cargo-doc:
type: devshell
command:
Expand Down