mirror of
https://github.com/CHN-beta/nixpkgs.git
synced 2026-01-11 18:32:23 +08:00
Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
@@ -16,6 +16,7 @@
|
||||
testers,
|
||||
nushell,
|
||||
nix-update-script,
|
||||
curlMinimal,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -58,8 +59,6 @@ rustPlatform.buildRustPackage {
|
||||
buildNoDefaultFeatures = !withDefaultFeatures;
|
||||
buildFeatures = additionalFeatures [ ];
|
||||
|
||||
doCheck = !stdenv.hostPlatform.isDarwin; # Skip checks on darwin. Failing tests since 0.96.0
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
(
|
||||
@@ -76,6 +75,10 @@ rustPlatform.buildRustPackage {
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
checkInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
curlMinimal
|
||||
];
|
||||
|
||||
passthru = {
|
||||
shellPath = "/bin/nu";
|
||||
tests.version = testers.testVersion {
|
||||
|
||||
Reference in New Issue
Block a user