rustfmt: drop separate nightly alias
If you really want it, override it.
This commit is contained in:
parent
e5f5ad71ac
commit
af7c34be0b
|
@ -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;
|
||||
|
|
|
@ -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 = ''
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue