Cannot set cargoExtraArgs in craneLib.cargoNextest (#675)

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+### Changed
+* Removed invalid `cargoExtraArgs` input attribute from `craneLib.cargoNextest`
+  in favor of `cargoNextestExtraArgs`.
+
 ### Fixed
 * Fixed vendoring dependencies from an alternative registry which they
   themselves have dependencies on crates from _other_ registries.

docs/API.md

@@ -615,15 +615,13 @@ Except where noted below, all derivation attributes are delegated to
 
 #### Optional attributes
 * `buildPhaseCargoCommand`, unless specified, will be set to print the nextest version
-* `cargoExtraArgs`: additional flags to be passed in the cargo invocation (e.g.
-  enabling specific features)
-  - Default value: `""`
 * `cargoLlvmCovExtraArgs`: additional flags to be passed in the cargo
   llvm-cov invocation
   - Default value: `"--lcov --output-path $out/coverage"`
 * `cargoNextestExtraArgs`: additional flags to be passed in the nextest invocation
   (e.g. specifying a profile)
   - Default value: `""`
+  - Note that all flags from `cargo test` are supported.
 * `partitions`: The number of separate nextest partitions to run. Useful if the
   test suite takes a long time and can be parallelized across multiple build
   nodes.

lib/cargoNextest.nix

@@ -8,7 +8,6 @@
 }:
 
 { cargoArtifacts
-, cargoExtraArgs ? ""
 , cargoLlvmCovExtraArgs ? "--lcov --output-path $out/coverage"
 , cargoNextestExtraArgs ? ""
 , doInstallCargoArtifacts ? true
@@ -19,15 +18,14 @@
 }@origArgs:
 let
   args = builtins.removeAttrs origArgs [
-    "cargoExtraArgs"
     "cargoLlvmCovExtraArgs"
     "cargoNextestExtraArgs"
     "partitions"
     "partitionType"
     "withLlvmCov"
   ];
 
-  mkUpdatedArgs = { cmd ? lib.optionalString (!withLlvmCov) "run", extraSuffix ? "", moreArgs ? "", withLlvmCov }: args // {
+  mkUpdatedArgs = { cmd ? "run", extraSuffix ? "", moreArgs ? "", withLlvmCov }: args // {
     inherit cargoArtifacts;
     pnameSuffix = "-nextest${extraSuffix}";
     doCheck = args.doCheck or true;
@@ -44,10 +42,8 @@ let
     '';
 
     checkPhaseCargoCommand = ''
-      cargo ${cargoExtraArgs} \
-        ${lib.optionalString withLlvmCov "llvm-cov ${cargoLlvmCovExtraArgs}"} \
-        nextest ${cmd} ''${CARGO_PROFILE:+--cargo-profile $CARGO_PROFILE} \
-          ${cargoNextestExtraArgs} ${moreArgs}
+      ${if withLlvmCov then "cargo llvm-cov nextest ${cargoLlvmCovExtraArgs}" else "cargo nextest ${cmd}"} \
+      ''${CARGO_PROFILE:+--cargo-profile $CARGO_PROFILE} ${cargoNextestExtraArgs} ${moreArgs}
     '';
 
     nativeBuildInputs = (args.nativeBuildInputs or [ ])