Merge pull request 'remove unused nixos-images flake input' (#2274) from nixpkgs-fix into main

flake.lock

@@ -55,27 +55,6 @@
         "type": "github"
       }
     },
-    "nixos-images": {
-      "inputs": {
-        "nixos-stable": [],
-        "nixos-unstable": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1729127036,
-        "narHash": "sha256-NGLgmG+s6jY15TImq8i3GS0IuCCcNSt2McS20q9xRCs=",
-        "owner": "nix-community",
-        "repo": "nixos-images",
-        "rev": "3103f26e0631a543963c03c583f03fd42fd9d51a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixos-images",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1729265718,
@@ -97,7 +76,6 @@
         "disko": "disko",
         "flake-parts": "flake-parts",
         "nixos-facter-modules": "nixos-facter-modules",
-        "nixos-images": "nixos-images",
         "nixpkgs": "nixpkgs",
         "sops-nix": "sops-nix",
         "systems": "systems",

flake.nix

@@ -8,13 +8,10 @@
     sops-nix.url = "github:Mic92/sops-nix";
     sops-nix.inputs.nixpkgs.follows = "nixpkgs";
     sops-nix.inputs.nixpkgs-stable.follows = "";
-    nixos-images.url = "github:nix-community/nixos-images";
-    nixos-images.inputs.nixos-unstable.follows = "nixpkgs";
-    # unused input
-    nixos-images.inputs.nixos-stable.follows = "";
     flake-parts.url = "github:hercules-ci/flake-parts";
     flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
     systems.url = "github:nix-systems/default";
+
     treefmt-nix.url = "github:numtide/treefmt-nix";
     treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
 

pkgs/clan-app/tests/command.py

@@ -49,6 +49,7 @@ class Command:
         for p in reversed(self.processes):
             with contextlib.suppress(OSError):
                 os.killpg(os.getpgid(p.pid), signal.SIGKILL)
+                p.wait()
 
 
 @pytest.fixture

pkgs/clan-cli/tests/test_modules.py

@@ -68,7 +68,7 @@ def test_add_module_to_inventory(
             }
         )
     )
-    subprocess.run(["git", "add", "."], cwd=test_flake_with_core.path)
+    subprocess.run(["git", "add", "."], cwd=test_flake_with_core.path, check=True)
 
     inventory = load_inventory_json(base_path)