Fixes

holochain-open-dev · Sep 23, 2024 · 1679e13 · 1679e13
1 parent 9d0321e
commit 1679e13
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 11 deletions.
diff --git a/crates/compare_dnas_integrity/default.nix b/crates/compare_dnas_integrity/default.nix
@@ -19,7 +19,7 @@
       };
       cargoArtifacts = craneLib.buildDepsOnly (commonArgs // {
         pname = "t-nesh-workspace";
-        version = "0.3.x";
+        version = "0.4.x";
       });
     in craneLib.buildPackage (commonArgs // {
       pname = crate;

diff --git a/crates/dna_hash/default.nix b/crates/dna_hash/default.nix
@@ -18,8 +18,8 @@
         buildInputs = self.lib.holochainDeps { inherit pkgs lib; };
       };
       cargoArtifacts = craneLib.buildDepsOnly (commonArgs // {
-        pname = "workspace";
-        version = "workspace";
+        pname = "t-nesh-workspace";
+        version = "0.4.x";
       });
     in craneLib.buildPackage (commonArgs // {
       pname = crate;

diff --git a/crates/scaffold_remote_zome/default.nix b/crates/scaffold_remote_zome/default.nix
@@ -19,7 +19,7 @@
       };
       cargoArtifacts = craneLib.buildDepsOnly (commonArgs // {
         pname = "t-nesh-workspace";
-        version = "0.3.x";
+        version = "0.4.x";
       });
     in craneLib.buildPackage (commonArgs // {
       pname = crate;

diff --git a/crates/sync_npm_git_dependencies_with_nix/default.nix b/crates/sync_npm_git_dependencies_with_nix/default.nix
@@ -19,7 +19,7 @@
       };
       cargoArtifacts = craneLib.buildDepsOnly (commonArgs // {
         pname = "t-nesh-workspace";
-        version = "0.3.x";
+        version = "0.4.x";
       });
     in craneLib.buildPackage (commonArgs // {
       pname = crate;

diff --git a/crates/zome_wasm_hash/default.nix b/crates/zome_wasm_hash/default.nix
@@ -19,7 +19,7 @@
       };
       cargoArtifacts = craneLib.buildDepsOnly (commonArgs // {
         pname = "t-nesh-workspace";
-        version = "0.3.x";
+        version = "0.4.x";
       });
     in craneLib.buildPackage (commonArgs // {
       pname = crate;

diff --git a/nix/dna.nix b/nix/dna.nix
@@ -62,25 +62,23 @@ let
     	
     	${holochain}/bin/hc dna pack workdir
     	mv workdir/${manifest.name}.dna $out
-      ${dna-hash}/bin/dna-hash $out > $hash
   '';
 
   guardedRelease = if matchingIntegrityDna != null then
     runCommandLocal "check-match-dna-${manifest.name}-integrity" {
       srcs = [ release matchingIntegrityDna ];
       buildInputs = [ compare-dnas-integrity ];
-      outputs = [ "out" "hash" ];
+      outputs = [ "out" ];
     } ''
       ${compare-dnas-integrity}/bin/compare-dnas-integrity ${matchingIntegrityDna} ${release}
       cp ${release} $out
-      cat ${release.hash} > $hash
     ''
   else
     release;
 
 in runCommandLocal manifest.name {
   meta = { inherit debug; };
-  outputs = [ "out" ];
+  outputs = [ "out" "hash" ];
 } ''
   cp ${guardedRelease} $out
   ${dna-hash}/bin/dna-hash $out > $hash

diff --git a/nix/fixtures/app-repo/flake.lock b/nix/fixtures/app-repo/flake.lock