hcInfra to hc-infra

holochain-open-dev · Apr 4, 2024 · aa72a59 · aa72a59
1 parent 6dde306
commit aa72a59
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 33 deletions.
diff --git a/...dinator-zome/dnas/{{dna_role_name}}/zomes/coordinator/{{zome_manifest.name}}/zome.nix.hbs b/...dinator-zome/dnas/{{dna_role_name}}/zomes/coordinator/{{zome_manifest.name}}/zome.nix.hbs
@@ -6,17 +6,17 @@
     , self'
     , ...
     }: {
-      packages.{{zome_manifest.name}} = inputs.hcInfra.outputs.lib.rustZome {
+      packages.{{zome_manifest.name}} = inputs.hc-infra.outputs.lib.rustZome {
         workspacePath = rootPath;
         holochain = inputs'.holochain;
         crateCargoToml = ./Cargo.toml;
       };
 
       # Test only this zome and its integrity in isolation
-      checks.{{zome_manifest.name }}= inputs.hcInfra.outputs.lib.sweettest {
+      checks.{{zome_manifest.name }}= inputs.hc-infra.outputs.lib.sweettest {
         workspacePath = rootPath;
         holochain = inputs'.holochain;
-        dna = (inputs.hcInfra.outputs.lib.dna {
+        dna = (inputs.hc-infra.outputs.lib.dna {
           dnaManifest = builtins.toFile "dna.yaml" ''
             ---
             manifest_version: "1"
@@ -35,7 +35,7 @@
                     - name: {{zome_manifest.name}}_integrity
                   dylib: ~
           '';
-          zomes = inputs.hcInfra.outputs.lib.filterZomes self'.packages;
+          zomes = inputs.hc-infra.outputs.lib.filterZomes self'.packages;
           holochain = inputs'.holochain;
         }).meta.debug;
         crateCargoToml = ./Cargo.toml;

diff --git a/templates/app/dna/dnas/{{dna_name}}/dna.nix.hbs b/templates/app/dna/dnas/{{dna_name}}/dna.nix.hbs
@@ -18,7 +18,7 @@
     , lib
     , ...
     }: {
-  	  packages.{{dna_name}} = inputs.hcInfra.outputs.lib.dna {
+  	  packages.{{dna_name}} = inputs.hc-infra.outputs.lib.dna {
         dnaManifest = ./workdir/dna.yaml;
         holochain = inputs'.holochain;
         zomes = (allZomes { inherit inputs' self'; }) // {

diff --git a/..._role_name}}/zomes/integrity/{{replace zome_manifest.name "_integrity" "" }}/zome.nix.hbs b/..._role_name}}/zomes/integrity/{{replace zome_manifest.name "_integrity" "" }}/zome.nix.hbs
@@ -5,7 +5,7 @@
     { inputs'
     , ...
     }: {
-      packages.{{zome_manifest.name}} = inputs.hcInfra.outputs.lib.rustZome {
+      packages.{{zome_manifest.name}} = inputs.hc-infra.outputs.lib.rustZome {
         workspacePath = rootPath;
         holochain = inputs'.holochain;
         crateCargoToml = ./Cargo.toml;

diff --git a/templates/app/web-app/flake.nix.hbs b/templates/app/web-app/flake.nix.hbs
@@ -41,9 +41,9 @@
             [ self'.packages ] 
             ++ builtins.map (s: s.packages) (holochainSources inputs')
           );
-          allZomes = { inputs', self' }: inputs.hcInfra.outputs.lib.filterZomes (allHolochainPackages { inherit inputs' self'; });
-          allDnas = { inputs', self' }: inputs.hcInfra.outputs.lib.filterDnas (allHolochainPackages { inherit inputs' self'; });
-          allHapps = { inputs', self' }: inputs.hcInfra.outputs.lib.filterHapps (allHolochainPackages { inherit inputs' self'; });
+          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'; });
         };
       }
       {
@@ -64,6 +64,9 @@
                 inputs'.holochain.devShells.holonix
                 inputs'.hc-infra-synchronized-pnpm
               ];
+              packages = [
+                inputs'.scaffolding.packages.hc-scaffold-app-template
+              ];
             };
           };
       };

diff --git a/templates/app/web-app/happ.nix.hbs b/templates/app/web-app/happ.nix.hbs
@@ -13,7 +13,7 @@
     , self'
     , ...
     }: {
-  	  packages.{{app_name}} = inputs.hcInfra.outputs.lib.happ {
+  	  packages.{{app_name}} = inputs.hc-infra.outputs.lib.happ {
         holochain = inputs'.holochain;
         happManifest = ./workdir/happ.yaml;
         dnas = (allDnas { inherit self' inputs'; }) // {

diff --git a/templates/module/web-app/flake.nix.hbs b/templates/module/web-app/flake.nix.hbs
@@ -11,7 +11,7 @@
     flake-parts.follows = "holochain/flake-parts";
 
     scaffolding.url = "github:holochain-open-dev/templates";
-    hcInfra.url = "github:holochain-open-dev/infrastructure";
+    hc-infra.url = "github:holochain-open-dev/infrastructure";
 
     # Holochain dependencies (zomes, DNAs and hApps)
     profiles.url = "github:holochain-open-dev/profiles/nixify";
@@ -51,9 +51,9 @@
             [ self'.packages ] 
             ++ builtins.map (s: s.packages) (holochainSources inputs')
           );
-          allZomes = { inputs', self' }: inputs.hcInfra.outputs.lib.filterZomes (allHolochainPackages { inherit inputs' self'; });
-          allDnas = { inputs', self' }: inputs.hcInfra.outputs.lib.filterDnas (allHolochainPackages { inherit inputs' self'; });
-          allHapps = { inputs', self' }: inputs.hcInfra.outputs.lib.filterHapps (allHolochainPackages { inherit inputs' self'; });
+          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'; });
         };
       }
       {
@@ -74,21 +74,14 @@
           , ...
           }: {
             devShells.default = pkgs.mkShell {
-              inputsFrom = [ inputs'.holochain.devShells.holonix ];
+              inputsFrom = [ 
+                inputs'.hc-infra.devShells.synchronized-pnpm
+                inputs'.holochain.devShells.holonix 
+              ];
 
-              packages = with pkgs; [
-                nodejs_20
-                cargo-nextest
-              ] ++ [
+              packages = [
                 inputs'.scaffolding.packages.hc-scaffold-module-template
-                inputs'.hcInfra.packages.pnpm
-                inputs'.hcInfra.packages.sync-npm-git-dependencies-with-nix
               ];
-
-              shellHook = ''
-                sync-npm-git-dependencies-with-nix
-              '';
-
             };
           };
       };

diff --git a/templates/module/web-app/workdir/dna.nix.hbs b/templates/module/web-app/workdir/dna.nix.hbs
@@ -7,7 +7,7 @@
     , lib
     , ...
     }: {
-  	  packages.{{dna_name}}_test = inputs.hcInfra.outputs.lib.dna {
+  	  packages.{{dna_name}}_test = inputs.hc-infra.outputs.lib.dna {
         dnaManifest = ./dna.yaml;
         holochain = inputs'.holochain;
         zomes = (allZomes { inherit inputs' self'; }) // {

diff --git a/templates/module/web-app/workdir/happ.nix.hbs b/templates/module/web-app/workdir/happ.nix.hbs
@@ -7,7 +7,7 @@
     , self'
     , ...
     }: {
-  	  packages.{{app_name}}_test = inputs.hcInfra.outputs.lib.happ {
+  	  packages.{{app_name}}_test = inputs.hc-infra.outputs.lib.happ {
         holochain = inputs'.holochain;
         happManifest = ./happ.yaml;
 

diff --git a/templates/module/web-app/zomes/coordinator/{{snake_case app_name}}/zome.nix.hbs b/templates/module/web-app/zomes/coordinator/{{snake_case app_name}}/zome.nix.hbs
@@ -6,17 +6,17 @@
     , self'
     , ...
     }: {
-      packages.{{snake_case app_name}} = inputs.hcInfra.outputs.lib.rustZome {
+      packages.{{snake_case app_name}} = inputs.hc-infra.outputs.lib.rustZome {
         workspacePath = rootPath;
         holochain = inputs'.holochain;
         crateCargoToml = ./Cargo.toml;
       };
 
       # Test only this zome and its integrity in isolation
-      checks.{{snake_case app_name}} = inputs.hcInfra.outputs.lib.sweettest {
+      checks.{{snake_case app_name}} = inputs.hc-infra.outputs.lib.sweettest {
         workspacePath = rootPath;
         holochain = inputs'.holochain;
-        dna = (inputs.hcInfra.outputs.lib.dna {
+        dna = (inputs.hc-infra.outputs.lib.dna {
           dnaManifest = builtins.toFile "dna.yaml" ''
             ---
             manifest_version: "1"
@@ -35,7 +35,7 @@
                     - name: {{snake_case app_name}}_integrity
                   dylib: ~
           '';
-          zomes = inputs.hcInfra.outputs.lib.filterZomes self'.packages;
+          zomes = inputs.hc-infra.outputs.lib.filterZomes self'.packages;
           holochain = inputs'.holochain;
         }).meta.debug;
         crateCargoToml = ./Cargo.toml;

diff --git a/templates/module/web-app/zomes/integrity/{{snake_case app_name}}/zome.nix.hbs b/templates/module/web-app/zomes/integrity/{{snake_case app_name}}/zome.nix.hbs
@@ -5,7 +5,7 @@
     { inputs'
     , ...
     }: {
-      packages.{{snake_case app_name}}_integrity = inputs.hcInfra.outputs.lib.rustZome {
+      packages.{{snake_case app_name}}_integrity = inputs.hc-infra.outputs.lib.rustZome {
         workspacePath = rootPath;
         holochain = inputs'.holochain;
         crateCargoToml = ./Cargo.toml;