From 46cb0eb1a950a3032fa1236cd747137e623ca936 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 12 May 2023 14:17:32 +0000 Subject: [PATCH] rustPlatform.rust: deprecate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is almost never correct to use these attributes, because they don't work correctly with splicing. Compare: % nix repl -f . --argstr crossSystem aarch64-linux Welcome to Nix 2.10.3. Type :? for help. Loading installable ''... Added 18988 variables. nix-repl> callPackage ({ stdenv, rustc }: (stdenv.mkDerivation { name = ""; nativeBuildInputs = [ rustc ]; }).nativeBuildInputs) {} «derivation /nix/store/bjrkg8kcq3hvg5kb03ivb856zy91qpbk-aarch64-unknown-linux-gnu-rustc-1.69.0.drv» ] nix-repl> callPackage ({ stdenv, rustPlatform }: (stdenv.mkDerivation { name = ""; nativeBuildInputs = [ rustPlatform.rust.rustc ]; }).nativeBuildInputs) {} «derivation /nix/store/ra5r07j52y7akclr827r3dzxzvqnvfbl-rustc-1.69.0.drv» ] I'm not sure this is fixable. I don't think it's worth keeping them around considering we have top level attributes. It makes overriding slightly more annoying, but only slightly. --- pkgs/development/compilers/rust/make-rust-platform.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix index d4f3e4b08fbfa..e22cb6d594afd 100644 --- a/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/pkgs/development/compilers/rust/make-rust-platform.nix @@ -1,4 +1,4 @@ -{ buildPackages, callPackage, cargo-auditable, stdenv, runCommand }@prev: +{ lib, buildPackages, callPackage, cargo-auditable, stdenv, runCommand }@prev: { rustc , cargo @@ -9,7 +9,8 @@ rec { rust = { - inherit rustc cargo; + rustc = lib.warn "rustPlatform.rust.rustc is deprecated. Use rustc instead." rustc; + cargo = lib.warn "rustPlatform.rust.cargo is deprecated. Use cargo instead." cargo; }; fetchCargoTarball = buildPackages.callPackage ../../../build-support/rust/fetch-cargo-tarball {