From f0d83495752f5b85a1083810b7bad54de0d0f380 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Thu, 9 Jan 2025 12:01:56 +0100 Subject: [PATCH] Fix: add values prios eval tests --- lib/inventory/build-inventory/default.nix | 2 +- lib/values/flake-module.nix | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/inventory/build-inventory/default.nix b/lib/inventory/build-inventory/default.nix index 8f4ad40a7..63f5e7678 100644 --- a/lib/inventory/build-inventory/default.nix +++ b/lib/inventory/build-inventory/default.nix @@ -31,7 +31,7 @@ let lib.warn '' inventory.services.${serviceName}.${instanceName}: - ${roleName} tags: no machine with tag '${tag}' found. Available tags: ${builtins.toJSON (lib.unique availableTags)} - '' [] + '' [ ] else acc ++ tagMembers ) [ ] members.tags or [ ]); diff --git a/lib/values/flake-module.nix b/lib/values/flake-module.nix index db60f92c5..9d997ccc6 100644 --- a/lib/values/flake-module.nix +++ b/lib/values/flake-module.nix @@ -6,8 +6,17 @@ let in { perSystem = - { pkgs, system, ... }: { + pkgs, + system, + lib, + ... + }: + let + tests = import ./test.nix { inherit lib; }; + in + { + legacyPackages.evalTests-values = tests; checks = { lib-values-eval = pkgs.runCommand "tests" { nativeBuildInputs = [ pkgs.nix-unit ]; } '' export HOME="$(realpath .)" @@ -15,7 +24,7 @@ in nix-unit --eval-store "$HOME" \ --extra-experimental-features flakes \ ${inputOverrides} \ - --flake ${self}#legacyPackages.${system}.evalTests-inventory + --flake ${self}#legacyPackages.${system}.evalTests-values touch $out '';