diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 82579db0e47a..6dfc8a49063f 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -77,7 +77,6 @@ in pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; }; }); rustfmt = self.callPackage ./rustfmt.nix { inherit Security; }; - rustfmt-nightly = self.callPackage ./rustfmt.nix { inherit Security; asNightly = true; }; cargo = self.callPackage ./cargo.nix { # Use boot package set to break cycle rustPlatform = bootRustPlatform; diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index 5e52c851eab4..f77e2feb4ff3 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -1,9 +1,11 @@ -{ lib, fetchFromGitHub, rustPlatform, clang, rustfmt-nightly +{ lib, fetchFromGitHub, rustPlatform, clang, rustfmt , runtimeShell , bash }: - -rustPlatform.buildRustPackage rec { +let + # bindgen hardcodes rustfmt outputs that use nightly features + rustfmt-nightly = rustfmt.override { asNightly = true; }; +in rustPlatform.buildRustPackage rec { pname = "rust-bindgen-unwrapped"; version = "0.59.2"; @@ -27,7 +29,6 @@ rustPlatform.buildRustPackage rec { doCheck = true; checkInputs = [ clang ]; - # bindgen hardcodes rustfmt outputs that use nightly features RUSTFMT = "${rustfmt-nightly}/bin/rustfmt"; preCheck = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 851c26182130..227cdccaec1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13471,10 +13471,7 @@ with pkgs; rhack = callPackage ../development/tools/rust/rhack { }; inherit (rustPackages) rls; roogle = callPackage ../development/tools/rust/roogle { }; - rustfmt = rustPackages.rustfmt; - rustfmt-nightly = rustPackages.rustfmt-nightly; - rustracer = callPackage ../development/tools/rust/racer { inherit (darwin.apple_sdk.frameworks) Security; };