alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

makeRustPlatform: Remove self argument

Browse source
This commit is contained in:
John Ericson 2016-07-09 00:01:49 -07:00 committed by Moritz Ulrich
parent 0ad8d0b127
commit bed2a14afa
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@
targets ? [], targetToolchains ? [], targetPatches ? [] }: targets ? [], targetToolchains ? [], targetPatches ? [] }:
let let
rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}) rustPlatform); rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
in in
rec { rec {

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

@ -5428,9 +5428,9 @@ in
cargo = rust.cargo; cargo = rust.cargo;
rustc = rust.rustc; rustc = rust.rustc;
rustPlatform = recurseIntoAttrs (makeRustPlatform rust rustPlatform); rustPlatform = recurseIntoAttrs (makeRustPlatform rust);
makeRustPlatform = rust: self: makeRustPlatform = rust: lib.fix (self:
let let
callPackage = newScope self; callPackage = newScope self;
in { in {
@ -5441,7 +5441,7 @@ in
buildRustPackage = callPackage ../build-support/rust { buildRustPackage = callPackage ../build-support/rust {
inherit rust; inherit rust;
}; };
}; });
rustfmt = callPackage ../development/tools/rust/rustfmt { }; rustfmt = callPackage ../development/tools/rust/rustfmt { };
rustracer = callPackage ../development/tools/rust/racer { }; rustracer = callPackage ../development/tools/rust/racer { };