From af30e6b4b12e1e671337af0f52b3827bbeae8634 Mon Sep 17 00:00:00 2001 From: Reese Date: Tue, 7 Jul 2026 23:05:51 +1200 Subject: [PATCH 1/3] nixos-rebuild-ng: prevent Man for opening --- .../ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index db0fe7a4ec5c..ce5dd41514fb 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -240,7 +240,7 @@ def parse_args( } ) - if args.help or args.action is None: + if args.help: if WITH_SHELL_FILES: r = run(["man", "8", EXECUTABLE], check=False) parser.exit(r.returncode) @@ -248,6 +248,12 @@ def parse_args( parser.print_help() parser.exit() + if args.action is None and len(sys.argv) > 1: + parser.error(f"No valid subcommand (Eg: nixos-rebuild switch). Type {parser.prog} --help for more information") + + if args.action is None: + parser.error(f"No valid args or subcommands. Type {parser.prog} --help for more information") + def parser_warn(msg: str) -> None: print(f"{parser.prog}: warning: {msg}", file=sys.stderr) From 99178dc67f8634a4c7f541c26bd3f8db005d853f Mon Sep 17 00:00:00 2001 From: Reese Date: Wed, 8 Jul 2026 07:23:56 +1200 Subject: [PATCH 2/3] nixos-rebuild-ng: Validate Once --- .../ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index ce5dd41514fb..4bca0cc03678 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -248,11 +248,8 @@ def parse_args( parser.print_help() parser.exit() - if args.action is None and len(sys.argv) > 1: - parser.error(f"No valid subcommand (Eg: nixos-rebuild switch). Type {parser.prog} --help for more information") - if args.action is None: - parser.error(f"No valid args or subcommands. Type {parser.prog} --help for more information") + parser.error(f"No valid subcommands. Type {parser.prog} --help for more information") def parser_warn(msg: str) -> None: print(f"{parser.prog}: warning: {msg}", file=sys.stderr) From 172e2f3a36bbadc02cdabfa52c3637858e06a12f Mon Sep 17 00:00:00 2001 From: Reese Date: Sat, 11 Jul 2026 06:04:00 +1200 Subject: [PATCH 3/3] nixos-rebuild-ng: run ruff format --- .../by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 4bca0cc03678..230e51c56e44 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -249,7 +249,9 @@ def parse_args( parser.exit() if args.action is None: - parser.error(f"No valid subcommands. Type {parser.prog} --help for more information") + parser.error( + f"No valid subcommands. Type {parser.prog} --help for more information" + ) def parser_warn(msg: str) -> None: print(f"{parser.prog}: warning: {msg}", file=sys.stderr)