From c4d9b39a175b5a72554b8fe184c84ab318c4c7ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 14 Aug 2025 17:54:00 +0200 Subject: [PATCH] tests_secrets_generate: mark as pure --- pkgs/clan-cli/clan_cli/tests/test_secrets_generate.py | 2 +- pkgs/clan-cli/default.nix | 5 +++++ pkgs/clan-cli/flake-module.nix | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/clan-cli/clan_cli/tests/test_secrets_generate.py b/pkgs/clan-cli/clan_cli/tests/test_secrets_generate.py index 10829f66e..bdd410c43 100644 --- a/pkgs/clan-cli/clan_cli/tests/test_secrets_generate.py +++ b/pkgs/clan-cli/clan_cli/tests/test_secrets_generate.py @@ -14,7 +14,7 @@ if TYPE_CHECKING: from .age_keys import KeyPair -@pytest.mark.impure +@pytest.mark.with_core def test_generate_secret( monkeypatch: pytest.MonkeyPatch, test_flake_with_core: FlakeForTest, diff --git a/pkgs/clan-cli/default.nix b/pkgs/clan-cli/default.nix index 1ca80d6df..425076dd6 100644 --- a/pkgs/clan-cli/default.nix +++ b/pkgs/clan-cli/default.nix @@ -17,6 +17,8 @@ pythonRuntime, setupNixInNix, templateDerivation, + zerotierone, + minifakeroot, }: let pyDeps = ps: [ @@ -215,7 +217,10 @@ pythonRuntime.pkgs.buildPythonApplication { pkgs.mkpasswd pkgs.xkcdpass pkgs.pass + zerotierone + minifakeroot nix-select + ../../nixosModules/clanCore/zerotier/generate.py # needed by flash list tests nixpkgs.legacyPackages.x86_64-linux.kbd diff --git a/pkgs/clan-cli/flake-module.nix b/pkgs/clan-cli/flake-module.nix index a71771ad3..fd73e20d0 100644 --- a/pkgs/clan-cli/flake-module.nix +++ b/pkgs/clan-cli/flake-module.nix @@ -23,6 +23,8 @@ "flake.lock" "templates" "clanServices" + "pkgs/zerotierone" + "pkgs/minifakeroot" ]; }; }; @@ -44,6 +46,7 @@ clan-cli = pkgs.callPackage ./default.nix { inherit (inputs) nixpkgs nix-select; inherit (self.legacyPackages.${system}) setupNixInNix; + inherit (self'.packages) zerotierone minifakeroot; templateDerivation = templateDerivation; pythonRuntime = pkgs.python3; clan-core-path = clanCoreWithVendoredDeps; @@ -55,6 +58,7 @@ clan-cli-full = pkgs.callPackage ./default.nix { inherit (inputs) nixpkgs nix-select; inherit (self.legacyPackages.${system}) setupNixInNix; + inherit (self'.packages) zerotierone minifakeroot; clan-core-path = clanCoreWithVendoredDeps; templateDerivation = templateDerivation; pythonRuntime = pkgs.python3;