Skip to content

Commit 20dc936

Browse files
nothingmuchbenalleng
authored andcommitted
use nix provided bitcoind in flake checks
1 parent c85d0ef commit 20dc936

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

flake.nix

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,8 @@
155155
inherit cargoArtifacts;
156156
partitions = 1;
157157
partitionType = "count";
158-
# TODO also run integration tests
159-
# this needs --all-features to enable io,_manual-tls features
160-
# unfortunately this can't yet work because running docker inside the nix sandbox is not possible,
161-
# which precludes use of the redis test container
162-
# cargoExtraArgs = "--locked --all-features";
163-
# buildInputs = [ pkgs.bitcoind ]; # not verified to work
158+
cargoExtraArgs = "--locked --all-features";
159+
BITCOIND_EXE = nixpkgs.lib.getExe' pkgs.bitcoind "bitcoind";
164160
}
165161
);
166162

@@ -170,6 +166,8 @@
170166
cargoArtifacts = craneLibVersions.msrv.buildDepsOnly commonArgs;
171167
partitions = 1;
172168
partitionType = "count";
169+
cargoExtraArgs = "--locked --all-features";
170+
BITCOIND_EXE = nixpkgs.lib.getExe' pkgs.bitcoind "bitcoind";
173171
}
174172
);
175173

0 commit comments

Comments
 (0)