From 40c35a8a7aa15ad064be0987e2ff669c54f9b65e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 18 Jun 2025 13:00:01 +0200 Subject: [PATCH] rustPlatform: remove useless callPackage from hooks Also removes a few unused arguments. --- pkgs/build-support/rust/hooks/default.nix | 224 ++++++++---------- .../compilers/rust/make-rust-platform.nix | 3 - 2 files changed, 100 insertions(+), 127 deletions(-) diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index d66804b07ab7..1499380e728b 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -1,16 +1,12 @@ { - buildPackages, - callPackage, - cargo, cargo-nextest, clang, diffutils, lib, makeSetupHook, - maturin, rust, - rustc, stdenv, + pkgsHostTarget, pkgsTargetTarget, # This confusingly-named parameter indicates the *subdirectory of @@ -21,138 +17,118 @@ pkgsCross, }: { - cargoBuildHook = callPackage ( - { }: - makeSetupHook { - name = "cargo-build-hook.sh"; - substitutions = { - inherit (stdenv.targetPlatform.rust) rustcTarget; - inherit (rust.envVars) setEnv; + cargoBuildHook = makeSetupHook { + name = "cargo-build-hook.sh"; + substitutions = { + inherit (stdenv.targetPlatform.rust) rustcTarget; + inherit (rust.envVars) setEnv; + }; + passthru.tests = + { + test = tests.rust-hooks.cargoBuildHook; + } + // lib.optionalAttrs (stdenv.isLinux) { + testCross = pkgsCross.riscv64.tests.rust-hooks.cargoBuildHook; }; - passthru.tests = - { - test = tests.rust-hooks.cargoBuildHook; - } - // lib.optionalAttrs (stdenv.isLinux) { - testCross = pkgsCross.riscv64.tests.rust-hooks.cargoBuildHook; - }; - } ./cargo-build-hook.sh - ) { }; + } ./cargo-build-hook.sh; - cargoCheckHook = callPackage ( - { }: - makeSetupHook { - name = "cargo-check-hook.sh"; - substitutions = { - inherit (stdenv.targetPlatform.rust) rustcTarget; - inherit (rust.envVars) setEnv; + cargoCheckHook = makeSetupHook { + name = "cargo-check-hook.sh"; + substitutions = { + inherit (stdenv.targetPlatform.rust) rustcTarget; + inherit (rust.envVars) setEnv; + }; + passthru.tests = + { + test = tests.rust-hooks.cargoCheckHook; + } + // lib.optionalAttrs (stdenv.isLinux) { + testCross = pkgsCross.riscv64.tests.rust-hooks.cargoCheckHook; }; - passthru.tests = - { - test = tests.rust-hooks.cargoCheckHook; - } - // lib.optionalAttrs (stdenv.isLinux) { - testCross = pkgsCross.riscv64.tests.rust-hooks.cargoCheckHook; - }; - } ./cargo-check-hook.sh - ) { }; + } ./cargo-check-hook.sh; - cargoInstallHook = callPackage ( - { }: - makeSetupHook { - name = "cargo-install-hook.sh"; - substitutions = { - targetSubdirectory = target; + cargoInstallHook = makeSetupHook { + name = "cargo-install-hook.sh"; + substitutions = { + targetSubdirectory = target; + }; + passthru.tests = + { + test = tests.rust-hooks.cargoInstallHook; + } + // lib.optionalAttrs (stdenv.isLinux) { + testCross = pkgsCross.riscv64.tests.rust-hooks.cargoInstallHook; }; - passthru.tests = - { - test = tests.rust-hooks.cargoInstallHook; - } - // lib.optionalAttrs (stdenv.isLinux) { - testCross = pkgsCross.riscv64.tests.rust-hooks.cargoInstallHook; - }; - } ./cargo-install-hook.sh - ) { }; + } ./cargo-install-hook.sh; - cargoNextestHook = callPackage ( - { }: - makeSetupHook { - name = "cargo-nextest-hook.sh"; - propagatedBuildInputs = [ cargo-nextest ]; - substitutions = { - inherit (stdenv.targetPlatform.rust) rustcTarget; + cargoNextestHook = makeSetupHook { + name = "cargo-nextest-hook.sh"; + propagatedBuildInputs = [ cargo-nextest ]; + substitutions = { + inherit (stdenv.targetPlatform.rust) rustcTarget; + }; + passthru.tests = + { + test = tests.rust-hooks.cargoNextestHook; + } + // lib.optionalAttrs (stdenv.isLinux) { + testCross = pkgsCross.riscv64.tests.rust-hooks.cargoNextestHook; }; - passthru.tests = - { - test = tests.rust-hooks.cargoNextestHook; - } - // lib.optionalAttrs (stdenv.isLinux) { - testCross = pkgsCross.riscv64.tests.rust-hooks.cargoNextestHook; - }; - } ./cargo-nextest-hook.sh - ) { }; + } ./cargo-nextest-hook.sh; - cargoSetupHook = callPackage ( - { }: - makeSetupHook { - name = "cargo-setup-hook.sh"; - propagatedBuildInputs = [ ]; - substitutions = { - defaultConfig = ../fetchcargo-default-config.toml; + cargoSetupHook = makeSetupHook { + name = "cargo-setup-hook.sh"; + propagatedBuildInputs = [ ]; + substitutions = { + defaultConfig = ../fetchcargo-default-config.toml; - # Specify the stdenv's `diff` by abspath to ensure that the user's build - # inputs do not cause us to find the wrong `diff`. - diff = "${lib.getBin diffutils}/bin/diff"; + # Specify the stdenv's `diff` by abspath to ensure that the user's build + # inputs do not cause us to find the wrong `diff`. + diff = "${lib.getBin diffutils}/bin/diff"; - cargoConfig = - lib.optionalString (stdenv.hostPlatform.config != stdenv.targetPlatform.config) '' - [target."${stdenv.targetPlatform.rust.rustcTarget}"] - "linker" = "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" - "rustflags" = [ "-C", "target-feature=${ - if pkgsTargetTarget.stdenv.targetPlatform.isStatic then "+" else "-" - }crt-static" ] - '' - + '' - [target."${stdenv.hostPlatform.rust.rustcTarget}"] - "linker" = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" - ''; + cargoConfig = + lib.optionalString (stdenv.hostPlatform.config != stdenv.targetPlatform.config) '' + [target."${stdenv.targetPlatform.rust.rustcTarget}"] + "linker" = "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" + "rustflags" = [ "-C", "target-feature=${ + if pkgsTargetTarget.stdenv.targetPlatform.isStatic then "+" else "-" + }crt-static" ] + '' + + '' + [target."${stdenv.hostPlatform.rust.rustcTarget}"] + "linker" = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + ''; + }; + + passthru.tests = + { + test = tests.rust-hooks.cargoSetupHook; + } + // lib.optionalAttrs (stdenv.isLinux) { + testCross = pkgsCross.riscv64.tests.rust-hooks.cargoSetupHook; }; - passthru.tests = - { - test = tests.rust-hooks.cargoSetupHook; - } - // lib.optionalAttrs (stdenv.isLinux) { - testCross = pkgsCross.riscv64.tests.rust-hooks.cargoSetupHook; - }; - } ./cargo-setup-hook.sh - ) { }; + } ./cargo-setup-hook.sh; - maturinBuildHook = callPackage ( - { pkgsHostTarget }: - makeSetupHook { - name = "maturin-build-hook.sh"; - propagatedBuildInputs = [ - pkgsHostTarget.maturin - pkgsHostTarget.cargo - pkgsHostTarget.rustc - ]; - substitutions = { - inherit (stdenv.targetPlatform.rust) rustcTarget; - inherit (rust.envVars) setEnv; + maturinBuildHook = makeSetupHook { + name = "maturin-build-hook.sh"; + propagatedBuildInputs = [ + pkgsHostTarget.maturin + pkgsHostTarget.cargo + pkgsHostTarget.rustc + ]; + substitutions = { + inherit (stdenv.targetPlatform.rust) rustcTarget; + inherit (rust.envVars) setEnv; - }; - } ./maturin-build-hook.sh - ) { }; + }; + } ./maturin-build-hook.sh; - bindgenHook = callPackage ( - { }: - makeSetupHook { - name = "rust-bindgen-hook"; - substitutions = { - libclang = (lib.getLib clang.cc); - inherit clang; - }; - } ./rust-bindgen-hook.sh - ) { }; + bindgenHook = makeSetupHook { + name = "rust-bindgen-hook"; + substitutions = { + libclang = (lib.getLib clang.cc); + inherit clang; + }; + } ./rust-bindgen-hook.sh; } diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix index 03564bc068f7..29a7e5f95194 100644 --- a/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/pkgs/development/compilers/rust/make-rust-platform.nix @@ -56,9 +56,6 @@ (callPackages ../../../build-support/rust/hooks { inherit stdenv - cargo - rustc - callPackage ; }) cargoBuildHook