Skip to content

Commit

Permalink
change --nom to --no-nom, remove env reading
Browse files Browse the repository at this point in the history
  • Loading branch information
viperML committed Mar 6, 2024
1 parent 6947e6f commit 3f148b0
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "nh"
version = "3.5.3"
version = "3.5.4"
edition = "2021"
license = "EUPL-1.2"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
3 changes: 1 addition & 2 deletions package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ in

postFixup = ''
wrapProgram $out/bin/nh \
--prefix PATH : ${lib.makeBinPath runtimeDeps} \
${lib.optionalString use-nom "--set-default NH_NOM 1"}
--prefix PATH : ${lib.makeBinPath runtimeDeps}
'';

cargoLock.lockFile = ./Cargo.lock;
Expand Down
2 changes: 1 addition & 1 deletion src/home.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ impl HomeRebuildArgs {
.extra_args(["--out-link", out_link_str])
.extra_args(&self.extra_args)
.message("Building home configuration")
.nom(self.common.nom)
.nom(!self.common.no_nom)
.build()?
.exec()?;

Expand Down
10 changes: 3 additions & 7 deletions src/interface.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,9 @@ pub struct CommonRebuildArgs {
#[arg(long, short = 'u')]
pub update: bool,

/// Use nix-output-monitor for the build process
#[arg(
long,
env = "NH_NOM",
value_parser(clap::builder::FalseyValueParser::new())
)]
pub nom: bool,
/// Don't use nix-output-monitor for the build process
#[arg(long)]
pub no_nom: bool,
}

#[derive(Args, Debug)]
Expand Down
2 changes: 1 addition & 1 deletion src/nixos.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ impl OsRebuildArgs {
.message("Building NixOS configuration")
.extra_args(["--out-link", out_link_str])
.extra_args(&self.extra_args)
.nom(self.common.nom)
.nom(!self.common.no_nom)
.build()?
.exec()?;

Expand Down

0 comments on commit 3f148b0

Please sign in to comment.