gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rust/hooks: replace // optionalAttrs with nullable attr names

Browse Source 
Convert 5 identical optionalAttrs (stdenv.isLinux) for testCross
in cargo{Build,Check,Install,Nextest,Setup}Hook passthru.tests.
This commit is contained in:
Aliaksandr
2026-05-18 03:54:27 +03:00
parent 702420055d
commit fbfe0b610e
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/rust/hooks/default.nix
+10 -15
View File
@@ -26,9 +26,8 @@
};
passthru.tests = {
test = tests.rust-hooks.cargoBuildHook;
}
// lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
testCross = pkgsCross.riscv64.tests.rust-hooks.cargoBuildHook;
${if stdenv.hostPlatform.isLinux then "testCross" else null} =
pkgsCross.riscv64.tests.rust-hooks.cargoBuildHook;
};
} ./cargo-build-hook.sh;
@@ -40,9 +39,8 @@
};
passthru.tests = {
test = tests.rust-hooks.cargoCheckHook;
}
// lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
testCross = pkgsCross.riscv64.tests.rust-hooks.cargoCheckHook;
${if stdenv.hostPlatform.isLinux then "testCross" else null} =
pkgsCross.riscv64.tests.rust-hooks.cargoCheckHook;
};
} ./cargo-check-hook.sh;
@@ -53,9 +51,8 @@
};
passthru.tests = {
test = tests.rust-hooks.cargoInstallHook;
}
// lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
testCross = pkgsCross.riscv64.tests.rust-hooks.cargoInstallHook;
${if stdenv.hostPlatform.isLinux then "testCross" else null} =
pkgsCross.riscv64.tests.rust-hooks.cargoInstallHook;
};
} ./cargo-install-hook.sh;
@@ -67,9 +64,8 @@
};
passthru.tests = {
test = tests.rust-hooks.cargoNextestHook;
}
// lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
testCross = pkgsCross.riscv64.tests.rust-hooks.cargoNextestHook;
${if stdenv.hostPlatform.isLinux then "testCross" else null} =
pkgsCross.riscv64.tests.rust-hooks.cargoNextestHook;
};
} ./cargo-nextest-hook.sh;
@@ -106,9 +102,8 @@
passthru.tests = {
test = tests.rust-hooks.cargoSetupHook;
}
// lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
testCross = pkgsCross.riscv64.tests.rust-hooks.cargoSetupHook;
${if stdenv.hostPlatform.isLinux then "testCross" else null} =
pkgsCross.riscv64.tests.rust-hooks.cargoSetupHook;
};
} ./cargo-setup-hook.sh;