Skip to content

Commit 15e16b3

Browse files
Use hydraPackages to get the right version (#1771)
Some nice hacking with @ffakenz to tidy up which binaries we get in the `exes` shell :) We did this so that the versions that come through in the `nix develop .#exes` shell have the revision (or `dirty`) correctly embedded.
2 parents e51a0d9 + 46829d0 commit 15e16b3

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

flake.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189

190190
devShells = import ./nix/hydra/shell.nix {
191191
inherit (inputs) aiken;
192-
inherit inputs pkgs hsPkgs system pkgsLatest;
192+
inherit inputs pkgs hsPkgs system pkgsLatest hydraPackages;
193193
ghc = pkgs.buildPackages.haskell-nix.compiler.${compiler};
194194
};
195195
};

nix/hydra/shell.nix

+5-4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
, ghc
1010
, pkgsLatest
1111
, aiken
12+
, hydraPackages
1213
}:
1314
let
1415

@@ -119,8 +120,8 @@ let
119120
name = "hydra-node-exe-shell";
120121

121122
buildInputs = [
122-
hsPkgs.hydra-node.components.exes.hydra-node
123-
hsPkgs.hydra-cluster.components.exes.hydra-cluster
123+
hydraPackages.hydra-node
124+
hydraPackages.hydra-cluster
124125
inputs.cardano-node.packages.${system}.cardano-node
125126
inputs.cardano-node.packages.${system}.cardano-cli
126127
pkgs.mithril-client-cli
@@ -132,8 +133,8 @@ let
132133
demoShell = pkgs.mkShell {
133134
name = "hydra-demo-shell";
134135
buildInputs = [
135-
hsPkgs.hydra-node.components.exes.hydra-node
136-
hsPkgs.hydra-tui.components.exes.hydra-tui
136+
hydraPackages.hydra-node
137+
hydraPackages.hydra-tui
137138
run-tmux
138139
inputs.cardano-node.packages.${system}.cardano-node
139140
inputs.cardano-node.packages.${system}.cardano-cli

0 commit comments

Comments
 (0)