Skip to content

Commit 495359d

Browse files
committed
nix use set-git-rev for dmq-node
1 parent 8c0ba35 commit 495359d

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

flake.nix

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,23 @@
4848
# dmq-node depends cardano-crypto-class, so we need crypto overlays
4949
inputs.iohkNix.overlays.crypto
5050
inputs.iohkNix.overlays.haskell-nix-crypto
51+
inputs.iohkNix.overlays.haskell-nix-extra
5152
(import ./nix/tools.nix inputs)
5253
(import ./nix/ouroboros-network.nix inputs)
5354
(import ./nix/network-docs.nix inputs)
5455
];
5556
};
57+
setGitRevs = project:
58+
lib.recursiveUpdate
59+
project
60+
{ packages."dmq-node:exe:dmq-node" = let dmq-node = project.packages."dmq-node:exe:dmq-node";
61+
in lib.recursiveUpdate
62+
(builtins.trace "set-git-rev dmq-node" (pkgs.set-git-rev dmq-node))
63+
{passthru = {noGitRev = dmq-node;};};
64+
};
65+
ouroboros-network = setGitRevs pkgs.ouroboros-network;
5666

57-
flake = pkgs.ouroboros-network.flake { };
67+
flake = ouroboros-network.flake { };
5868
format = pkgs.callPackage ./nix/formatting.nix pkgs;
5969
inherit (pkgs) lib network-docs;
6070

@@ -64,14 +74,12 @@
6474
default = import ./nix/shell.nix {
6575
hls = true;
6676
profiling = false;
67-
inherit inputs pkgs;
68-
ouroboros-network = pkgs.ouroboros-network;
77+
inherit inputs pkgs ouroboros-network;
6978
};
7079
profiling = import ./nix/shell.nix {
7180
hls = true;
7281
profiling = true;
73-
inherit inputs pkgs;
74-
ouroboros-network = pkgs.ouroboros-network;
82+
inherit inputs pkgs ouroboros-network;
7583
};
7684
};
7785

@@ -106,10 +114,10 @@
106114
};
107115
};
108116
};
117+
109118
in
110119
lib.recursiveUpdate flake rec {
111-
project = pkgs.ouroboros-network;
112-
inherit hydraJobs legacyPackages devShells;
120+
inherit ouroboros-network hydraJobs legacyPackages devShells;
113121
}
114122
);
115123
}

0 commit comments

Comments
 (0)