From 7181b4dddc65a171c747fee348a1c4f3fd05c2af Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 1 Oct 2020 17:51:46 -0400 Subject: makeRustPlatform: Put back in it's own file. We expose it on the top level, but I don't think it makes sense to pull it from a specific version of the rust tools when it is in fact version agnostic. This reverts a tiny portion of 912dca193aee9da77a4d429285db53729d81aa3d. (cherry picked from commit 54b4b470c3a7149a7c459d92859a51c2e7a04cf7) --- nixpkgs/pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nixpkgs/pkgs/top-level/all-packages.nix') diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index 387916ab7756..f60db1f55289 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -9187,7 +9187,8 @@ in rustPackages = rustPackages_1_46; inherit (rustPackages) cargo clippy rustc rustPlatform; - inherit (rust) makeRustPlatform; + + makeRustPlatform = callPackage ../development/compilers/rust/make-rust-platform.nix {}; buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; -- cgit 1.4.1