Hyperspace fix ci

.github/workflows/pull_request.yaml

@@ -15,4 +15,4 @@ jobs:
       - uses: DeterminateSystems/magic-nix-cache-action@main
         with:
           upstream-cache: https://ngi.cachix.org/
-      - run: nix flake check
+      - run: nix flake check --print-build-logs

.github/workflows/push.yaml

@@ -16,4 +16,4 @@ jobs:
         with:
           name: ngi
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-      - run: nix flake check
+      - run: nix flake check --print-build-logs

flake.nix

@@ -8,6 +8,8 @@
   # See <https://github.com/ngi-nix/ngipkgs/issues/24> for plans to support Darwin.
   inputs.systems.url = "github:nix-systems/x86_64-linux";
   inputs.flake-utils.inputs.systems.follows = "systems";
+  inputs.dream2nix.url = "github:nix-community/dream2nix";
+  inputs.dream2nix.inputs.nixpkgs.follows = "nixpkgs";
   inputs.treefmt-nix.url = "github:numtide/treefmt-nix";
   inputs.treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
   inputs.sops-nix.url = "github:Mic92/sops-nix";
@@ -17,6 +19,7 @@
     self,
     nixpkgs,
     flake-utils,
+    dream2nix,
     treefmt-nix,
     sops-nix,
     ...
@@ -44,11 +47,14 @@
                 })) (readDir dir)
           );
         callPackage = pkgs.newScope (
-          result // {inherit callPackage nixosTests;}
+          pkgs.lib.attrsets.mergeAttrsList [
+            result
+            {inherit callPackage nixosTests;}
+          ]
         );
         args = {
           inherit (pkgs) lib;
-          inherit callPackage;
+          inherit callPackage dream2nix pkgs;
         };
         result = (import ./pkgs/by-name args) // (import ./pkgs args);
       in
@@ -142,6 +148,6 @@
           };
 
         # Overlays a package set (e.g. nixpkgs) with the packages defined in this flake.
-        overlays.default = final: prev: importPackages prev;
+        overlays.default = final: prev: (importPackages prev);
       };
 }

pkgs/by-name/default.nix

@@ -1,11 +1,14 @@
 {
-  lib,
   callPackage,
+  dream2nix,
+  lib,
+  pkgs,
 }: let
   baseDirectory = ./.;
 
   inherit
     (builtins)
+    pathExists
     readDir
     ;
 
@@ -18,15 +21,38 @@
   names = name: type:
     if type != "directory"
     then assert name == "README.md" || name == "default.nix"; {}
-    else {${name} = baseDirectory + "/${name}/package.nix";};
+    else {${name} = baseDirectory + "/${name}";};
+
+  packageDirectories = concatMapAttrs names (readDir baseDirectory);
 
-  packageFiles = concatMapAttrs names (readDir baseDirectory);
+  callModule = moduleDir: let
+    evaluated = lib.evalModules {
+      specialArgs = {
+        inherit dream2nix;
+        packageSets.nixpkgs = pkgs;
+      };
+      modules = [
+        moduleDir
+        {
+          paths.projectRoot = ../..;
+          paths.projectRootFile = "flake.nix";
+          paths.package = moduleDir;
+          paths.lockFile = "lock.json";
+        }
+      ];
+    };
+  in
+    evaluated.config.public;
 
   self =
     mapAttrs (
-      _: file:
-        callPackage file {}
+      _: directory:
+        if pathExists (directory + "/package.nix")
+        then callPackage (directory + "/package.nix") {}
+        else if pathExists (directory + "/module.nix")
+        then callModule (directory + "/module.nix")
+        else throw "No package.nix or module.nix found in ${directory}"
     )
-    packageFiles;
+    packageDirectories;
 in
   self