cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

rustfmt: drop separate nightly alias

Browse source 
If you really want it, override it.
This commit is contained in:
K900 2022-04-07 19:42:14 +03:00
parent e5f5ad71ac
commit af7c34be0b
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/development/compilers/rust/default.nix
View file

@ -77,7 +77,6 @@ in
pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; }; pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; };
}); });
rustfmt = self.callPackage ./rustfmt.nix { inherit Security; }; rustfmt = self.callPackage ./rustfmt.nix { inherit Security; };
rustfmt-nightly = self.callPackage ./rustfmt.nix { inherit Security; asNightly = true; };
cargo = self.callPackage ./cargo.nix { cargo = self.callPackage ./cargo.nix {
# Use boot package set to break cycle # Use boot package set to break cycle
rustPlatform = bootRustPlatform; rustPlatform = bootRustPlatform;

9
pkgs/development/tools/rust/bindgen/unwrapped.nix
View file

@ -1,9 +1,11 @@
{ lib, fetchFromGitHub, rustPlatform, clang, rustfmt-nightly { lib, fetchFromGitHub, rustPlatform, clang, rustfmt
, runtimeShell , runtimeShell
, bash , bash
}: }:
let
rustPlatform.buildRustPackage rec { # bindgen hardcodes rustfmt outputs that use nightly features
rustfmt-nightly = rustfmt.override { asNightly = true; };
in rustPlatform.buildRustPackage rec {
pname = "rust-bindgen-unwrapped"; pname = "rust-bindgen-unwrapped";
version = "0.59.2"; version = "0.59.2";
@ -27,7 +29,6 @@ rustPlatform.buildRustPackage rec {
doCheck = true; doCheck = true;
checkInputs = [ clang ]; checkInputs = [ clang ];
# bindgen hardcodes rustfmt outputs that use nightly features
RUSTFMT = "${rustfmt-nightly}/bin/rustfmt"; RUSTFMT = "${rustfmt-nightly}/bin/rustfmt";
preCheck = '' preCheck = ''

3
pkgs/top-level/all-packages.nix
View file

@ -13471,10 +13471,7 @@ with pkgs;
rhack = callPackage ../development/tools/rust/rhack { }; rhack = callPackage ../development/tools/rust/rhack { };
inherit (rustPackages) rls; inherit (rustPackages) rls;
roogle = callPackage ../development/tools/rust/roogle { }; roogle = callPackage ../development/tools/rust/roogle { };
rustfmt = rustPackages.rustfmt; rustfmt = rustPackages.rustfmt;
rustfmt-nightly = rustPackages.rustfmt-nightly;
rustracer = callPackage ../development/tools/rust/racer { rustracer = callPackage ../development/tools/rust/racer {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
}; };