WIP

flake.nix

@@ -115,14 +115,14 @@
 								pkgs.callPackage ./nix/happ.nix {
 					        inherit dnas holochain happManifest;
 					      };
-						ui-package = { system, workspacePath, rootPath }: 
+						npmPackage = { system, workspacePath, rootPath }: 
 							let 
 							  pkgs = import inputs.nixpkgs {
 							    inherit system;
 							    overlays = [ (import inputs.rust-overlay) ];
 							  };
 							in
-								pkgs.callPackage ./nix/ui-package.nix {
+								pkgs.callPackage ./nix/npm-package.nix {
 					        inherit workspacePath rootPath;
 					      };
 			      };

nix/fixture/flake.nix

@@ -15,57 +15,61 @@
   };
 
   outputs = inputs @ { ... }:
-    inputs.holochain.inputs.flake-parts.lib.mkFlake
-      {
-        inherit inputs;
-        specialArgs = rec {
-          rootPath = ./.;
-          holochainSources = inputs': with inputs'; [ 
-            profiles
-            # ... and add the name of the repository here as well
+    let 
+      holochainSources = inputs': with inputs'; [ 
+        profiles
+        # ... and add the name of the repository here as well
+      ];
+
+      # Aggregators: take all the packages from this repository and the upstream
+      # holochain sources and merge them
+      allHolochainPackages = { inputs', self' }: inputs.nixpkgs.lib.attrsets.mergeAttrsList (
+        [ self'.packages ] 
+        ++ builtins.map (s: s.packages) (holochainSources inputs')
+      );
+      allZomes = { inputs', self' }: inputs.hcUtils.outputs.lib.filterZomes (allHolochainPackages { inherit inputs' self'; });
+      allDnas = { inputs', self' }: inputs.hcUtils.outputs.lib.filterDnas (allHolochainPackages { inherit inputs' self'; });
+      allHapps = { inputs', self' }: inputs.hcUtils.outputs.lib.filterHapps (allHolochainPackages { inherit inputs' self'; });
+      allNpmPackages = { inputs', self' }: inputs.hcUtils.outputs.lib.filterNpmPackages (allHolochainPackages { inherit inputs' self'; });   
+    in
+      inputs.holochain.inputs.flake-parts.lib.mkFlake
+        {
+          inherit inputs;
+          specialArgs = {
+            rootPath = ./.;
+            inherit holochainSources allHolochainPackages allZomes allDnas allHapps allNpmPackages;
+          };
+        }
+        {
+          imports = [
+  					./happ.nix
           ];
 
-          # Aggregators: take all the packages from this repository and the upstream
-          # holochain sources and merge them
-          allHolochainPackages = { inputs', self' }: inputs.nixpkgs.lib.attrsets.mergeAttrsList (
-            [ self'.packages ] 
-            ++ builtins.map (s: s.packages) (holochainSources inputs')
-          );
-          allZomes = { inputs', self' }: inputs.hcUtils.outputs.lib.filterZomes (allHolochainPackages { inherit inputs' self'; });
-          allDnas = { inputs', self' }: inputs.hcUtils.outputs.lib.filterDnas (allHolochainPackages { inherit inputs' self'; });
-          allHapps = { inputs', self' }: inputs.hcUtils.outputs.lib.filterHapps (allHolochainPackages { inherit inputs' self'; });
-          allNpmPackages = { inputs', self' }: inputs.hcUtils.outputs.lib.filterNpmPackages (allHolochainPackages { inherit inputs' self'; });
-        };
-      }
-      {
-        imports = [
-					./happ.nix
-        ];
+          systems = builtins.attrNames inputs.holochain.devShells;
+          perSystem =
+            { inputs'
+            , config
+            , pkgs
+            , system
+            , lib
+            , self'
+            , ...
+            }: {
+              devShells.default = pkgs.mkShell {
+                inputsFrom = [ inputs'.holochain.devShells.holonix ];
+                packages = with pkgs; [
+                  nodejs_20
+                  # more packages go here
+                  cargo-nextest
+                ] ++ [ 
+                  inputs'.hcUtils.packages.sync-npm-dependencies-with-nix 
+                ];
 
-        systems = builtins.attrNames inputs.holochain.devShells;
-        perSystem =
-          { inputs'
-          , config
-          , pkgs
-          , system
-          , lib
-          , ...
-          }: {
-            devShells.default = pkgs.mkShell {
-              inputsFrom = [ inputs'.holochain.devShells.holonix ];
-              packages = with pkgs; [
-                nodejs_20
-                # more packages go here
-                cargo-nextest
-              ] ++ [ 
-                inputs'.hcUtils.packages.sync-npm-dependencies-with-nix 
-              ];
+                shellHook = ''
+                  sync-npm-dependencies-with-nix ${builtins.trace (allNpmPackages {inherit inputs' self';}) "hey"}
+                ''; 
+              };
 
-              shellHook = ''
-                sync-npm-dependencies-with-nix ${builtins.trace config "hey"}
-              ''; 
             };
-
-          };
-      };
+        };
 }