diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index 812831c2959c..679e10a3442e 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -9,6 +9,7 @@ , cargoBuildHook , cargoCheckHook , cargoInstallHook +, cargoNextestHook , cargoSetupHook , rustc , libiconv @@ -40,6 +41,7 @@ , checkNoDefaultFeatures ? buildNoDefaultFeatures , buildFeatures ? [ ] , checkFeatures ? buildFeatures +, useNextest ? false , depsExtraArgs ? {} # Toggles whether a custom sysroot is created when the target is a .json file. @@ -117,7 +119,7 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg cacert git cargoBuildHook - cargoCheckHook + (if useNextest then cargoNextestHook else cargoCheckHook) cargoInstallHook cargoSetupHook rustc diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix index b859d01dc085..f61ba57d7b95 100644 --- a/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/pkgs/development/compilers/rust/make-rust-platform.nix @@ -14,7 +14,7 @@ rec { buildRustPackage = callPackage ../../../build-support/rust/build-rust-package { git = buildPackages.gitMinimal; - inherit stdenv cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook + inherit stdenv cargoBuildHook cargoCheckHook cargoInstallHook cargoNextestHook cargoSetupHook fetchCargoTarball importCargoLock rustc; }; @@ -31,5 +31,5 @@ rec { # Hooks inherit (callPackage ../../../build-support/rust/hooks { inherit stdenv cargo rustc; - }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook bindgenHook; + }) cargoBuildHook cargoCheckHook cargoInstallHook cargoNextestHook cargoSetupHook maturinBuildHook bindgenHook; }