remove need for intermediary file

2023-11-07 20:26:34 -08:00 · 2023-11-07 20:26:34 -08:00 · 9a758fb86e
commit 9a758fb86e
parent 853a79d9b2
2 changed files with 11 additions and 5 deletions
--- a/flake.nix
+++ b/flake.nix
@ -38,9 +38,17 @@
        checks = {
          tests = nix-flake-tests.lib.check {
            inherit pkgs;
-            tests = import ./test/default.nix {
-              inherit (pkgs) lib;
-            };
+            tests =
+              let
+                importFiles = files:
+                  map (m: import m {
+                    inherit (pkgs) lib;
+                  }) files;
+
+                mergeTests = pkgs.lib.lists.foldl pkgs.lib.trivial.mergeAttrs {};
+              in mergeTests (importFiles [
+                ./test/modules/postgresql.nix
+              ]);
          };
        };
        # templates.default = {};  Would be nice to have a template
--- a/test/default.nix
+++ b/test/default.nix
@ -1,2 +0,0 @@
-{ lib }:
-import ./modules/postgresql.nix { inherit lib; }