Skip to content

Commit

Permalink
Reverted back to meta.release
Browse files Browse the repository at this point in the history
  • Loading branch information
guillemcordoba committed Aug 21, 2024
1 parent ce22f3a commit 566eac8
Show file tree
Hide file tree
Showing 6 changed files with 147 additions and 147 deletions.
12 changes: 6 additions & 6 deletions nix/dna.nix
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,21 @@ let
dnaManifestYaml = runCommandLocal "json-to-yaml" { }
" ${json2yaml}/bin/json2yaml ${dnaManifestJson} $out\n"; # Recurse over the zomes, and add the correct bundled zome package by name
release = runCommandLocal manifest.name {
srcs = builtins.map (zome: zome.release) zomeSrcs;
srcs = builtins.map (zome: zome.meta.release) zomeSrcs;
meta = { holochainPackageType = "dna"; };
} ''
mkdir workdir
cp ${dnaManifestYaml} workdir/dna.yaml
${
builtins.toString (builtins.map (zome: ''
cp ${zomes.${zome.name}.release} ./workdir/${zome.name}.wasm
cp ${zomes.${zome.name}.meta.release} ./workdir/${zome.name}.wasm
'') manifest'.integrity.zomes)
}
${
builtins.toString (builtins.map (zome: ''
cp ${zomes.${zome.name}.release} ./workdir/${zome.name}.wasm
cp ${zomes.${zome.name}.meta.release} ./workdir/${zome.name}.wasm
'') manifest'.coordinator.zomes)
}
Expand All @@ -54,18 +54,18 @@ let
'';

guardedRelease = if matchingIntegrityDna != null then runCommandLocal "check-match-dna-${manifest.name}-integrity" {
srcs = [ release matchingIntegrityDna.release ];
srcs = [ release matchingIntegrityDna.meta.release ];
buildInputs = [ compare-dnas-integrity ];
} ''
${compare-dnas-integrity}/bin/compare-dnas-integrity ${matchingIntegrityDna.release} ${release}
${compare-dnas-integrity}/bin/compare-dnas-integrity ${matchingIntegrityDna.meta.release} ${release}
cp ${release} $out
'' else release;

# Debug package
debug = runCommandLocal manifest.name {
srcs = zomeSrcs;
release = guardedRelease;
meta = {
release = guardedRelease;
holochainPackageType = "dna";
};
} ''
Expand Down
118 changes: 59 additions & 59 deletions nix/fixtures/app-repo/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 566eac8

Please sign in to comment.