nixos-rebuild-ng: use nom

Mic92 · Feb 18, 2025 · 5cee05d · 5cee05d
1 parent 261517b
commit 5cee05d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
@@ -1,6 +1,7 @@
 import json
 import logging
 import os
+import shutil
 import textwrap
 from concurrent.futures import ThreadPoolExecutor
 from datetime import datetime
@@ -32,6 +33,14 @@
 logger = logging.getLogger(__name__)
 
 
+def nix_nom_tool() -> str:
+    "Return `nom` and `nom-shell` if found in $PATH"
+    if shutil.which("nom") and shutil.which("nom-shell"):
+        return "nom"
+
+    return "nix"
+
+
 def build(
     attr: str,
     build_attr: BuildAttr,
@@ -62,9 +71,9 @@ def build_flake(
     Returns the built attribute as path.
     """
     run_args = [
-        "nix",
-        *FLAKE_FLAGS,
+        nix_nom_tool(),
         "build",
+        *FLAKE_FLAGS,
         "--print-out-paths",
         flake.to_attr(attr),
         *dict_to_flags(flake_build_flags),

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
@@ -64,9 +64,9 @@ def test_build_flake(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) ->
     mock_run.assert_called_with(
         [
             "nix",
+            "build",
             "--extra-experimental-features",
             "nix-command flakes",
-            "build",
             "--print-out-paths",
             ".#nixosConfigurations.hostname.config.system.build.toplevel",
             "--no-link",
@@ -214,9 +214,9 @@ def test_build_remote_flake(
             call(
                 [
                     "nix",
+                    "build",
                     "--extra-experimental-features",
                     "nix-command flakes",
-                    "build",
                     "/path/to/file^*",
                     "--print-out-paths",
                     "--build",