diff --git a/flake-parts/packages.nix b/flake-parts/packages.nix index f8ce8a7a7..8ae436a66 100644 --- a/flake-parts/packages.nix +++ b/flake-parts/packages.nix @@ -1,8 +1,11 @@ -{ self, ... }: { +{ self, lib, ... }: { flake.packages.x86_64-linux = { - inherit - (self.nixosConfigurations.installer.config.formats) - install-iso - ; + install-iso = (lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + self.nixosModules.installer + self.inputs.nixos-generators.nixosModules.all-formats + ]; + }).config.formats.install-iso; }; } diff --git a/flake.nix b/flake.nix index 8e4ddfe1f..888582adf 100644 --- a/flake.nix +++ b/flake.nix @@ -12,8 +12,13 @@ }; outputs = inputs @ { flake-parts, ... }: - flake-parts.lib.mkFlake { inherit inputs; } ({ lib, config, ... }: { - systems = lib.systems.flakeExposed; + flake-parts.lib.mkFlake { inherit inputs; } ({ ... }: { + 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 = [ diff --git a/pkgs/clan-cli/tests/test_cli.py b/pkgs/clan-cli/tests/test_cli.py index 4d6a4404e..2028602a1 100644 --- a/pkgs/clan-cli/tests/test_cli.py +++ b/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() diff --git a/templates/python-project/tests/test_cli.py b/templates/python-project/tests/test_cli.py index 8855774af..6c6f124c6 100644 --- a/templates/python-project/tests/test_cli.py +++ b/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()