From 0108d84fe3855f21d987b9d1036ea6be4c5b8963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 6 Sep 2023 16:03:40 +0200 Subject: [PATCH 1/3] speed up machine_flake eval --- pkgs/clan-cli/tests/machine_flake/flake.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/clan-cli/tests/machine_flake/flake.nix b/pkgs/clan-cli/tests/machine_flake/flake.nix index 0f76e47fc..ff220a590 100644 --- a/pkgs/clan-cli/tests/machine_flake/flake.nix +++ b/pkgs/clan-cli/tests/machine_flake/flake.nix @@ -11,7 +11,12 @@ (if builtins.pathExists ./machines/machine1.json then builtins.fromJSON (builtins.readFile ./machines/machine1.json) else { }) - { nixpkgs.hostPlatform = "x86_64-linux"; } + { + nixpkgs.hostPlatform = "x86_64-linux"; + # speed up by not instantiating nixpkgs twice and disable documentation + nixpkgs.pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; + documentation.enable = false; + } ]; }; }; From 4ac91ccdcb5ce04b54c1cfa52f4968071f816480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 6 Sep 2023 16:04:00 +0200 Subject: [PATCH 2/3] drop clan flake monkeypatch --- pkgs/clan-cli/tests/conftest.py | 2 -- pkgs/clan-cli/tests/machine_flake/.clan-flake | 0 2 files changed, 2 deletions(-) create mode 100644 pkgs/clan-cli/tests/machine_flake/.clan-flake diff --git a/pkgs/clan-cli/tests/conftest.py b/pkgs/clan-cli/tests/conftest.py index f7f750ade..f5db6eb26 100644 --- a/pkgs/clan-cli/tests/conftest.py +++ b/pkgs/clan-cli/tests/conftest.py @@ -48,6 +48,4 @@ def machine_flake(monkeymodule: pytest.MonkeyPatch) -> Generator[Path, None, Non ) # check that an empty config is returned if no json file exists monkeymodule.chdir(flake) - # monkeypatch get_clan_flake_toplevel to return the flake - monkeymodule.setattr("clan_cli.dirs.get_clan_flake_toplevel", lambda: flake) yield flake diff --git a/pkgs/clan-cli/tests/machine_flake/.clan-flake b/pkgs/clan-cli/tests/machine_flake/.clan-flake new file mode 100644 index 000000000..e69de29bb From 802a86715d1a3644b5d4ad267fc7f092f1e1d094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 6 Sep 2023 16:04:56 +0200 Subject: [PATCH 3/3] gitignore deps_flake --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7650c9587..296b9b39f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ .direnv result* -pkgs/clan-cli/clan_cli/nixpkgs +pkgs/clan-cli/clan_cli/deps_flake pkgs/clan-cli/clan_cli/webui/assets # python