diff --git a/README.md b/README.md index 1ad2794..73af44b 100644 --- a/README.md +++ b/README.md @@ -38,13 +38,9 @@ nix run github:holochain-open-dev/templates#hc-scaffold-zome-template -- web-app description = "Template for Holochain app development"; inputs = { - versions.url = "github:holochain/holochain?dir=versions/weekly"; - - holochain-flake.url = "github:holochain/holochain"; - holochain-flake.inputs.versions.follows = "versions"; - - nixpkgs.follows = "holochain-flake/nixpkgs"; - flake-parts.follows = "holochain-flake/flake-parts"; + holonix.url = "github:holochain/holonix/main-0.3"; + nixpkgs.follows = "holonix/nixpkgs"; + flake-parts.follows = "holonix/flake-parts"; + scaffolding.url = "github:holochain-open-dev/templates"; }; @@ -55,7 +51,7 @@ nix run github:holochain-open-dev/templates#hc-scaffold-zome-template -- web-app inherit inputs; } { - systems = builtins.attrNames inputs.holochain-flake.devShells; + systems = builtins.attrNames inputs.holonix.devShells; perSystem = { inputs' , config @@ -64,7 +60,7 @@ nix run github:holochain-open-dev/templates#hc-scaffold-zome-template -- web-app , ... }: { devShells.default = pkgs.mkShell { - inputsFrom = [ inputs'.holochain-flake.devShells.holonix ]; + inputsFrom = [ inputs'.holonix.devShells.default ]; packages = [ pkgs.nodejs_20 # more packages go here diff --git a/templates/app/coordinator-zome/dnas/{{dna_role_name}}/zomes/coordinator/{{zome_manifest.name}}/zome.nix.hbs b/templates/app/coordinator-zome/dnas/{{dna_role_name}}/zomes/coordinator/{{zome_manifest.name}}/zome.nix.hbs index ac6e97c..09fbf9e 100644 --- a/templates/app/coordinator-zome/dnas/{{dna_role_name}}/zomes/coordinator/{{zome_manifest.name}}/zome.nix.hbs +++ b/templates/app/coordinator-zome/dnas/{{dna_role_name}}/zomes/coordinator/{{zome_manifest.name}}/zome.nix.hbs @@ -42,7 +42,7 @@ {{zome_manifest.name}}_integrity = self'.packages.{{zome_manifest.name}}_integrity; {{zome_manifest.name}} = self'.packages.{{zome_manifest.name}}; }; - holochain = inputs'.holochain; + inherit system; }); crateCargoToml = ./Cargo.toml; cargoArtifacts = inputs.hc-infra.outputs.lib.holochainCargoArtifacts { diff --git a/templates/zome/web-app/zomes/coordinator/{{snake_case app_name}}/zome.nix.hbs b/templates/zome/web-app/zomes/coordinator/{{snake_case app_name}}/zome.nix.hbs index 7b7ca5e..0f1de62 100644 --- a/templates/zome/web-app/zomes/coordinator/{{snake_case app_name}}/zome.nix.hbs +++ b/templates/zome/web-app/zomes/coordinator/{{snake_case app_name}}/zome.nix.hbs @@ -42,7 +42,7 @@ {{snake_case app_name}}_integrity = self'.packages.{{snake_case app_name}}_integrity; {{snake_case app_name}} = self'.packages.{{snake_case app_name}}; }; - holochain = inputs'.holochain; + inherit system; }); crateCargoToml = ./Cargo.toml; cargoArtifacts = inputs.hc-infra.outputs.lib.holochainCargoArtifacts {