Skip to content

Commit 7a2e13e

Browse files
authored
Merge pull request #12 from mlabs-haskell/szg251/test-ci
2 parents 152cd83 + 26e94d1 commit 7a2e13e

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

flake-lang/flake-rust.nix

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ pkgs:
55
, crateName
66
, rustVersion ? "latest"
77
, nativeBuildInputs ? [ ]
8+
, buildInputs ? [ ]
89
, extraSources ? [ ]
910
, extraSourcesDir ? ".extras"
1011
, data ? [ ]
1112
, dataDir ? "data"
1213
, devShellHook ? ""
1314
, devShellTools ? [ ]
1415
, testTools ? [ ]
16+
, cargoNextestExtraArgs ? ""
1517
}:
1618
let
1719
rustWithTools = pkgs.rust-bin.stable.${rustVersion}.default.override {
@@ -53,7 +55,7 @@ let
5355
};
5456

5557
commonArgs = {
56-
inherit nativeBuildInputs;
58+
inherit nativeBuildInputs buildInputs;
5759
src = buildEnv;
5860
pname = crateName;
5961
strictDeps = true;
@@ -89,7 +91,7 @@ let
8991
in
9092
{
9193
devShells."dev-${crateName}-rust" = craneLib.devShell {
92-
buildInputs = nativeBuildInputs;
94+
buildInputs = buildInputs ++ nativeBuildInputs;
9395
packages = devShellTools ++ testTools;
9496
shellHook = ''
9597
${linkExtraSources}
@@ -112,7 +114,7 @@ in
112114

113115
checks = {
114116
"${crateName}-rust-test" = craneLib.cargoNextest (commonArgs // {
115-
inherit cargoArtifacts;
117+
inherit cargoArtifacts cargoNextestExtraArgs;
116118
nativeBuildInputs = testTools ++ nativeBuildInputs;
117119
});
118120

0 commit comments

Comments
 (0)