From df1de458e0a18f1f3bde8b95c1910d4ccf216348 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 13 Dec 2024 20:43:19 +0000
Subject: [PATCH] nixos-rebuild-ng: remove --verbose flag hack

---
 .../ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py        | 4 ++--
 pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py  | 5 ++++-
 pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py      | 4 ++--
 pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_utils.py     | 5 ++++-
 4 files changed, 12 insertions(+), 6 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 59e563a7ae22..b2f9cf22dfe5 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
@@ -20,7 +20,7 @@ logger.setLevel(logging.INFO)
 
 def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentParser]]:
     common_flags = argparse.ArgumentParser(add_help=False)
-    common_flags.add_argument("--verbose", "-v", action="count", default=0)
+    common_flags.add_argument("--verbose", "-v", action="count", dest="v", default=0)
     common_flags.add_argument("--max-jobs", "-j")
     common_flags.add_argument("--cores")
     common_flags.add_argument("--log-format")
@@ -202,7 +202,7 @@ def parse_args(
         print(f"{parser.prog}: warning: {msg}", file=sys.stderr)
 
     # verbose affects both nix commands and this script, debug only this script
-    if args.verbose or args.debug:
+    if args.v or args.debug:
         logger.setLevel(logging.DEBUG)
 
     # https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh#L56
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py
index b1d94114fa51..87d3f21596a3 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py
@@ -29,8 +29,11 @@ def dict_to_flags(d: dict[str, Args]) -> list[str]:
                 flags.append(f"-{key}")
             case True:
                 flags.append(flag)
+            case int() if len(key) == 1:
+                flags.append(f"-{key * value}")
             case int():
-                flags.append(f"-{key[0] * value}")
+                for i in range(value):
+                    flags.append(flag)
             case str():
                 flags.append(flag)
                 flags.append(value)
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
index 2c06b128da86..dff9c24fb1d2 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
@@ -67,12 +67,12 @@ def test_parse_args() -> None:
         ]
     )
     assert nr.logger.level == logging.DEBUG
-    assert r2.verbose == 3
+    assert r2.v == 3
     assert r2.flake is False
     assert r2.action == "dry-build"
     assert r2.file == "foo"
     assert r2.attr == "bar"
-    assert g2["common_flags"].verbose == 3
+    assert g2["common_flags"].v == 3
 
 
 @patch.dict(nr.process.os.environ, {}, clear=True)
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_utils.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_utils.py
index 36b8024a4e56..5f73c33acf98 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_utils.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_utils.py
@@ -10,7 +10,8 @@ def test_dict_to_flags() -> None:
             "test_flag_4": ["v1", "v2"],
             "test_flag_5": None,
             "t": True,
-            "verbose": 5,
+            "v": 5,
+            "verbose": 2,
         }
     )
     assert r1 == [
@@ -22,6 +23,8 @@ def test_dict_to_flags() -> None:
         "v2",
         "-t",
         "-vvvvv",
+        "--verbose",
+        "--verbose",
     ]
     r2 = u.dict_to_flags({"verbose": 0, "empty_list": []})
     assert r2 == []