Skip to content

Commit

Permalink
Fixed downgrade nixpkgs
Browse files Browse the repository at this point in the history
  • Loading branch information
guillemcordoba committed Sep 2, 2024
1 parent 4e152d1 commit 83ee686
Show file tree
Hide file tree
Showing 14 changed files with 1,184 additions and 2,941 deletions.
4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ rec {
pkgs = holochainPkgs { inherit system; };
compare-dnas-integrity =
(outputs inputs).packages.${system}.compare-dnas-integrity;
holochain = inputs.holonix.outputs.${system}.packages.holochain;
holochain = inputs.holonix.outputs.packages.${system}.holochain;

in pkgs.callPackage ./nix/dna.nix {
inherit zomes holochain dnaManifest compare-dnas-integrity
Expand All @@ -165,7 +165,7 @@ rec {
happ = { system, happManifest, dnas }:
let
pkgs = holochainPkgs { inherit system; };
holochain = inputs.holonix.outputs.${system}.packages.holochain;
holochain = inputs.holonix.outputs.packages.${system}.holochain;
in pkgs.callPackage ./nix/happ.nix {
inherit dnas holochain happManifest;
};
Expand Down
4 changes: 2 additions & 2 deletions nix/dna.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build a DNA
{ dnaManifest, json2yaml, runCommandLocal, callPackage, writeText, holochain
{ dnaManifest, json2yaml, runCommandLocal, pkgs, writeText, holochain
# If given a DNA, will check whether the DNA hashes for the given `matchingIntegrityDna` and the DNA to be built match
# If they don't, it will print an error describing which zomes don't match
, matchingIntegrityDna ? null, compare-dnas-integrity, zomes ? { } }:
Expand All @@ -8,7 +8,7 @@ let
zomeSrcs = builtins.attrValues zomes;

# Recurse over the zomes, and add the correct bundled zome package by name
manifest = (callPackage ./import-yaml.nix { }) dnaManifest;
manifest = (pkgs.callPackage ./import-yaml.nix { }) dnaManifest;
zomeToBundled = zome: zome // { bundled = "./${zome.name}.wasm"; };
coordinatorZomes = builtins.map zomeToBundled manifest.coordinator.zomes;
integrityZomes = builtins.map zomeToBundled manifest.integrity.zomes;
Expand Down
Loading

0 comments on commit 83ee686

Please sign in to comment.