From 89b70ffa6fe25be7cb1e1f99767ffd4a2ce45c69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 12 May 2025 13:52:03 +0200 Subject: [PATCH 1/2] checks/backup: depend on pinned clan core --- checks/backups/flake-module.nix | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/checks/backups/flake-module.nix b/checks/backups/flake-module.nix index bd3e8530d..ea1a65d39 100644 --- a/checks/backups/flake-module.nix +++ b/checks/backups/flake-module.nix @@ -147,25 +147,7 @@ perSystem = { pkgs, ... }: let - clanCore = self.filter { - include = [ - "checks/backups" - "checks/flake-module.nix" - "clanModules/borgbackup" - "clanModules/flake-module.nix" - "clanModules/localbackup" - "clanModules/packages" - "clanModules/single-disk" - "clanModules/zerotier" - "flake.lock" - "flakeModules" - "inventory.json" - "nixosModules" - # Just include everything in 'lib' - # If anything changes in /lib that may affect everything - "lib" - ]; - }; + clanCore = self.checks.x86_64-linux.clan-core-for-checks; in { checks = pkgs.lib.mkIf pkgs.stdenv.isLinux { @@ -182,11 +164,6 @@ # import the inventory generated nixosModules self.clanInternals.inventoryClass.machines.test-backup.machineImports; clan.core.settings.directory = ./.; - environment.systemPackages = [ - (pkgs.writeShellScriptBin "foo" '' - echo ${clanCore} - '') - ]; }; testScript = '' From f788313e97828d615775a1a3febeb83241408f28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 12 May 2025 13:56:10 +0200 Subject: [PATCH 2/2] morph: don't depend on clan-core --- checks/morph/flake-module.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/morph/flake-module.nix b/checks/morph/flake-module.nix index 7c4d03511..e566edf57 100644 --- a/checks/morph/flake-module.nix +++ b/checks/morph/flake-module.nix @@ -32,7 +32,6 @@ { pkgs, ... }: let dependencies = [ - self pkgs.stdenv.drvPath pkgs.stdenvNoCC self.nixosConfigurations.test-morph-machine.config.system.build.toplevel