From be048d8307f08acb5e3bb28a5ff2de08ce008060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 12 Aug 2025 16:52:44 +0200 Subject: [PATCH] morph/flash: use patched clan-core-for-checks the other one doesn't override flake.lock --- checks/flash/flake-module.nix | 3 +-- checks/installation/flake-module.nix | 4 ++-- checks/morph/flake-module.nix | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/checks/flash/flake-module.nix b/checks/flash/flake-module.nix index fab74e247..539f936be 100644 --- a/checks/flash/flake-module.nix +++ b/checks/flash/flake-module.nix @@ -2,7 +2,6 @@ config, self, lib, - privateInputs, ... }: { @@ -85,7 +84,7 @@ # Some distros like to automount disks with spaces machine.succeed('mkdir -p "/mnt/with spaces" && mkfs.ext4 /dev/vdc && mount /dev/vdc "/mnt/with spaces"') - machine.succeed("clan flash write --debug --flake ${privateInputs.clan-core-for-checks} --yes --disk main /dev/vdc test-flash-machine-${pkgs.hostPlatform.system}") + machine.succeed("clan flash write --debug --flake ${self.checks.x86_64-linux.clan-core-for-checks} --yes --disk main /dev/vdc test-flash-machine-${pkgs.hostPlatform.system}") ''; } { inherit pkgs self; }; }; diff --git a/checks/installation/flake-module.nix b/checks/installation/flake-module.nix index e5349f4b9..0ca17dd02 100644 --- a/checks/installation/flake-module.nix +++ b/checks/installation/flake-module.nix @@ -208,7 +208,7 @@ # Prepare test flake and Nix store flake_dir = prepare_test_flake( temp_dir, - "${privateInputs.clan-core-for-checks}", + "${self.checks.x86_64-linux.clan-core-for-checks}", "${closureInfo}" ) @@ -272,7 +272,7 @@ # Prepare test flake and Nix store flake_dir = prepare_test_flake( temp_dir, - "${privateInputs.clan-core-for-checks}", + "${self.checks.x86_64-linux.clan-core-for-checks}", "${closureInfo}" ) diff --git a/checks/morph/flake-module.nix b/checks/morph/flake-module.nix index b0076b6e8..cd8cfc4b0 100644 --- a/checks/morph/flake-module.nix +++ b/checks/morph/flake-module.nix @@ -1,6 +1,5 @@ { self, - privateInputs, ... }: { @@ -55,7 +54,7 @@ testScript = '' start_all() actual.fail("cat /etc/testfile") - actual.succeed("env CLAN_DIR=${privateInputs.clan-core-for-checks} clan machines morph test-morph-template --i-will-be-fired-for-using-this --debug --name test-morph-machine") + actual.succeed("env CLAN_DIR=${self.checks.x86_64-linux.clan-core-for-checks} clan machines morph test-morph-template --i-will-be-fired-for-using-this --debug --name test-morph-machine") assert actual.succeed("cat /etc/testfile") == "morphed" ''; } { inherit pkgs self; };