Merge pull request 'nixosModules.installer: move into packages' (#18) from installer-ci-hotfix into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/18

flake-parts/packages.nix

@@ -1,8 +1,11 @@
-{ self, ... }: {
+{ self, lib, ... }: {
   flake.packages.x86_64-linux = {
-    inherit
+    install-iso = (lib.nixosSystem {
-      (self.nixosConfigurations.installer.config.formats)
+      system = "x86_64-linux";
-      install-iso
+      modules = [
-      ;
+        self.nixosModules.installer
+        self.inputs.nixos-generators.nixosModules.all-formats
+      ];
+    }).config.formats.install-iso;
   };
 }

flake.nix

@@ -12,8 +12,13 @@
   };
 
   outputs = inputs @ { flake-parts, ... }:
-    flake-parts.lib.mkFlake { inherit inputs; } ({ lib, config, ... }: {
+    flake-parts.lib.mkFlake { inherit inputs; } ({ ... }: {
-      systems = lib.systems.flakeExposed;
+      systems = [
+        "x86_64-linux"
+        "aarch64-linux"
+        "aarch64-darwin"
+        "x86_64-darwin"
+      ];
       imports = [
         ./flake-parts/packages.nix
         ./flake-parts/formatting.nix
@@ -21,13 +26,6 @@
         ./pkgs/clan-cli/flake-module.nix
       ];
       flake = {
-        nixosConfigurations.installer = lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = [
-            config.flake.nixosModules.installer
-            inputs.nixos-generators.nixosModules.all-formats
-          ];
-        };
         nixosModules = {
           installer = {
             imports = [

pkgs/clan-cli/tests/test_cli.py

@@ -1,10 +1,13 @@
 import sys
 
-import clan_cli
 import pytest
 
+import clan_cli
 
-def test_no_args(capsys: pytest.CaptureFixture, monkeypatch: pytest.MonkeyPatch) -> None:
+
+def test_no_args(
+    capsys: pytest.CaptureFixture, monkeypatch: pytest.MonkeyPatch
+) -> None:
     monkeypatch.setattr(sys, "argv", [""])
     clan_cli.main()
     captured = capsys.readouterr()

templates/python-project/tests/test_cli.py

@@ -11,7 +11,9 @@ def test_no_args(capsys: pytest.CaptureFixture) -> None:
     assert captured.out.startswith("usage:")
 
 
-def test_version(capsys: pytest.CaptureFixture, monkeypatch: pytest.MonkeyPatch) -> None:
+def test_version(
+    capsys: pytest.CaptureFixture, monkeypatch: pytest.MonkeyPatch
+) -> None:
     monkeypatch.setattr(sys, "argv", ["", "--version"])
     my_tool.my_cli()
     captured = capsys.readouterr()