From a3b636aab3f904cf4e6e1410bc6edf9e579ae120 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Sun, 30 Mar 2025 14:42:31 +0200 Subject: [PATCH] fix(tests): include 'lib' always as a whole --- checks/backups/flake-module.nix | 10 +++------- lib/build-clan/flake-module.nix | 5 +---- lib/inventory/flake-module.nix | 6 +----- lib/values/flake-module.nix | 4 +--- 4 files changed, 6 insertions(+), 19 deletions(-) diff --git a/checks/backups/flake-module.nix b/checks/backups/flake-module.nix index 9ad4a1d37..b07b6e513 100644 --- a/checks/backups/flake-module.nix +++ b/checks/backups/flake-module.nix @@ -160,14 +160,10 @@ "flake.lock" "flakeModules" "inventory.json" - "lib/build-clan" - "lib/default.nix" - "lib/select.nix" - "lib/flake-module.nix" - "lib/frontmatter" - "lib/inventory" - "lib/constraints" "nixosModules" + # Just include everything in 'lib' + # If anything changes in /lib that may affect everything + "lib" ]; }; in diff --git a/lib/build-clan/flake-module.nix b/lib/build-clan/flake-module.nix index 894e9cdd0..ed3964171 100644 --- a/lib/build-clan/flake-module.nix +++ b/lib/build-clan/flake-module.nix @@ -43,10 +43,7 @@ in include = [ "flakeModules" "inventory.json" - "lib/build-clan" - "lib/default.nix" - "lib/flake-module.nix" - "lib/inventory" + "lib" "machines" "nixosModules" ]; diff --git a/lib/inventory/flake-module.nix b/lib/inventory/flake-module.nix index 96d007873..8cb751dd1 100644 --- a/lib/inventory/flake-module.nix +++ b/lib/inventory/flake-module.nix @@ -50,11 +50,7 @@ in self.filter { include = [ "flakeModules" - "lib/default.nix" - "lib/flake-module.nix" - "lib/inventory" - "lib/constraints" - "lib/frontmatter" + "lib" "clanModules/flake-module.nix" "clanModules/borgbackup" ]; diff --git a/lib/values/flake-module.nix b/lib/values/flake-module.nix index a0b14dd1f..ee9c2d368 100644 --- a/lib/values/flake-module.nix +++ b/lib/values/flake-module.nix @@ -28,9 +28,7 @@ in self.filter { include = [ "flakeModules" - "lib/default.nix" - "lib/flake-module.nix" - "lib/values" + "lib" ]; } }#legacyPackages.${system}.evalTests-values