projects: don't apply nixosTest with empty pkgs

ngi-nix · May 16, 2024 · 52ef767 · 52ef767
1 parent 84712ff
commit 52ef767
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/helpers.nix b/helpers.nix
@@ -33,7 +33,7 @@
 
       ngiPackages = import ./pkgs/by-name {
         inherit (pkgs) lib;
-        inherit callPackage dream2nix pkgs;
+        inherit dream2nix callPackage pkgs;
       };
     in
       ngiPackages;
@@ -42,7 +42,7 @@
     # Each project includes packages, and optionally, modules, configurations and tests.
     importNgiProjects = {pkgs ? {}}: let
       ngiProjects = import ./projects {
-        inherit pkgs;
+        inherit nixpkgs dream2nix sops-nix pkgs;
       };
     in
       ngiProjects;

diff --git a/projects/default.nix b/projects/default.nix
@@ -19,6 +19,7 @@
   inherit
     (lib.attrsets)
     mapAttrs
+    optionalAttrs
     recursiveUpdate
     filterAttrs
     ;
@@ -72,7 +73,9 @@
   hydrate = project:
     recursiveUpdate
     project
-    {nixos.tests = mapAttrs (_: nixosTest) project.nixos.tests or {};};
+    (optionalAttrs (pkgs ? nixosTest) {
+      nixos.tests = mapAttrs (_: nixosTest pkgs) project.nixos.tests or {};
+    });
 in
   mapAttrs (
     name: type: let