diff --git a/crates/compare_dnas_integrity/default.nix b/crates/compare_dnas_integrity/default.nix index 835a1db..45359f6 100644 --- 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 index 0659e25..9bdb771 100644 --- 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 index a712d02..b366cf0 100644 --- 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 index ad9d5fd..63e1399 100644 --- 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 index 757c7f8..6f98321 100644 --- 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 index 76275ca..bf39761 100644 --- 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 index c7984b6..c0dc631 100644 --- a/nix/fixtures/app-repo/flake.lock +++ b/nix/fixtures/app-repo/flake.lock @@ -322,7 +322,7 @@ }, "locked": { "lastModified": 0, - "narHash": "sha256-zF976UOF8lZoqSC1UKGFSkGRfu2cZJ+c5/Y3x9RZDBc=", + "narHash": "sha256-7Edgh+DiAGrYKV8/4nD7QnyYbHgARRYM3ikFeM2FkxE=", "path": "./../../..", "type": "path" },