WIP

flake.nix

@@ -52,7 +52,6 @@
               inherit pkgs system;
               customTemplatePath = ./templates/module;
             };
-
           };
       };
 }

templates/app/coordinator-zome/dnas/{{dna_role_name}}/dna.nix.hbs

@@ -0,0 +1,6 @@
+{{#merge previous_file_content}}
+  {{#match_scope "zomes = {"}}
+    {{previous_scope_content}}
+    {{zome_manifest.name}} = self'.packages.{{zome_manifest.name}};
+  {{/match_scope}}
+{{/merge}}

templates/app/dna/dnas/{{dna_name}}/dna.nix.hbs

@@ -1,4 +1,4 @@
-{ inputs, allZomes, ... }:
+{ inputs, ... }:
 
 {
   # Import all ./zomes/coordinator/*/zome.nix and ./zomes/integrity/*/zome.nix  
@@ -21,9 +21,10 @@
   	  packages.{{dna_name}} = inputs.hc-infra.outputs.lib.dna {
         dnaManifest = ./workdir/dna.yaml;
         holochain = inputs'.holochain;
-        zomes = (allZomes { inherit inputs' self'; }) // {
-          # Override specific zomes here, e.g.:
+        zomes = {
+          # Include here the zome packages for this DNA, e.g.:
           # profiles_integrity = inputs'.profiles.packages.profiles_integrity;
+          # This overrides all the "bundled" properties for the DNA manifest
         };
       };
   	};

templates/app/dna/happ.nix.hbs

@@ -0,0 +1,6 @@
+{{#merge previous_file_content}}
+  {{#match_scope "dnas = {"}}
+    {{previous_scope_content}}
+    {{dna_name}} = self'.packages.{{dna_name}};
+  {{/match_scope}}
+{{/merge}}

templates/app/web-app/flake.nix.hbs

@@ -11,7 +11,7 @@
     flake-parts.follows = "holochain/flake-parts";
 
     scaffolding.url = "github:holochain-open-dev/templates";
-    hc-infra.url = "github:holochain-open-dev/infrastructure";
+    hc-infra.url = "github:holochain-open-dev/infrastructure/0.300.0-dev";
 
     # Holochain dependencies (zomes, DNAs and hApps)
     profiles.url = "github:holochain-open-dev/profiles/nixify";
@@ -24,26 +24,9 @@
       {
         inherit inputs;
         specialArgs = rec {
-          # All the upstream repositories that output zomes, dnas or happs packages
-          holochainSources = inputs': with inputs'; [ 
-            profiles
-            file-storage
-            # ... and add the name of the repository here as well
-          ];
-
           ## Special arguments for the flake parts of this repository
 
           rootPath = ./.;
-
-          # 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.hc-infra.outputs.lib.filterZomes (allHolochainPackages { inherit inputs' self'; });
-          allDnas = { inputs', self' }: inputs.hc-infra.outputs.lib.filterDnas (allHolochainPackages { inherit inputs' self'; });
-          allHapps = { inputs', self' }: inputs.hc-infra.outputs.lib.filterHapps (allHolochainPackages { inherit inputs' self'; });
         };
       }
       {
@@ -61,8 +44,8 @@
           }: {
             devShells.default = pkgs.mkShell {
               inputsFrom = [ 
+                inputs'.hc-infra.devShells.synchronized-pnpm
                 inputs'.holochain.devShells.holonix
-                inputs'.hc-infra-synchronized-pnpm
               ];
               packages = [
                 inputs'.scaffolding.packages.hc-scaffold-app-template

templates/app/web-app/happ.nix.hbs

@@ -1,4 +1,4 @@
-{ inputs, allDnas, ... }:
+{ inputs, ... }:
 
 {
   # Import all `dnas/*/dna.nix` files
@@ -16,9 +16,10 @@
   	  packages.{{app_name}} = inputs.hc-infra.outputs.lib.happ {
         holochain = inputs'.holochain;
         happManifest = ./workdir/happ.yaml;
-        dnas = (allDnas { inherit self' inputs'; }) // {
-          # Override specific dnas here, e.g.:
+        dnas = {
+          # Include here the DNA packages for this hApp, e.g.:
           # my_dna = inputs'.some_input.packages.my_dna;
+          # This overrides all the "bundled" properties for the hApp manifest 
         };
       };
   	};

templates/app/web-app/tests/vitest.config.ts.hbs

@@ -9,5 +9,5 @@ export default defineConfig({
     },
     testTimeout: 60*1000*3 // 3  mins
   },
-})
+});
 

templates/module/web-app/flake.nix.hbs

@@ -34,26 +34,9 @@
       {
         inherit inputs;
         specialArgs = rec {
-          # All the upstream repositories that output zomes, dnas or happs packages
-          holochainSources = inputs': with inputs'; [ 
-            profiles
-            file-storage
-            # ... and add the name of the repository here as well
-          ];
-
           ## Special arguments for the flake parts of this repository
 
           rootPath = ./.;
-
-          # 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.hc-infra.outputs.lib.filterZomes (allHolochainPackages { inherit inputs' self'; });
-          allDnas = { inputs', self' }: inputs.hc-infra.outputs.lib.filterDnas (allHolochainPackages { inherit inputs' self'; });
-          allHapps = { inputs', self' }: inputs.hc-infra.outputs.lib.filterHapps (allHolochainPackages { inherit inputs' self'; });
         };
       }
       {

templates/module/web-app/workdir/dna.nix.hbs

@@ -1,4 +1,4 @@
-{ inputs, allZomes, ... }:
+{ inputs, ... }:
 
 {
   perSystem =
@@ -10,9 +10,10 @@
   	  packages.{{dna_name}}_test = inputs.hc-infra.outputs.lib.dna {
         dnaManifest = ./dna.yaml;
         holochain = inputs'.holochain;
-        zomes = (allZomes { inherit inputs' self'; }) // {
-          # Override specific zomes here, e.g.:
+        zomes = {
+          # Include here the zome packages for this DNA, e.g.:
           # profiles_integrity = inputs'.profiles.packages.profiles_integrity;
+          # This overrides all the "bundled" properties for the DNA manifest
         };
       };
   	};

templates/module/web-app/workdir/happ.nix.hbs

@@ -1,4 +1,4 @@
-{ inputs, allDnas, ... }:
+{ inputs, ... }:
 
 {
   perSystem =
@@ -11,9 +11,10 @@
         holochain = inputs'.holochain;
         happManifest = ./happ.yaml;
 
-        dnas = (allDnas { inherit self' inputs'; }) // {
-          # Override specific dnas here, e.g.:
+        dnas = {
+          # Include here the DNA packages for this hApp, e.g.:
           # my_dna = inputs'.some_input.packages.my_dna;
+          # This overrides all the "bundled" properties for the hApp manifest 
         };
       };
   	};