public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cargo-vendor: move to all-packages

Browse Source
This commit is contained in:
Jörg Thalheim 2018-02-03 22:30:45 +00:00
parent 8f20e7ce3a
commit 6580b18d3f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/build-support/rust/default.nix
View File

@ -1,9 +1,7 @@
{ callPackage, fetchurl, stdenv, path, cacert, git, rust }: { callPackage, fetchurl, stdenv, path, cacert, git, rust, cargo-vendor }:
let let
cargoVendor = callPackage ./cargo-vendor {};
fetchcargo = import ./fetchcargo.nix { fetchcargo = import ./fetchcargo.nix {
inherit stdenv cacert git rust cargoVendor; inherit stdenv cacert git rust cargo-vendor;
}; };
in in
{ name, cargoSha256 { name, cargoSha256

2
pkgs/top-level/all-packages.nix
View File

@ -6488,6 +6488,8 @@ with pkgs;
buildRustCrate = callPackage ../build-support/rust/build-rust-crate.nix { }; buildRustCrate = callPackage ../build-support/rust/build-rust-crate.nix { };
cargo-vendor = callPackage ../build-support/rust/cargo-vendor {};
carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { }; carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { };
defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { }; defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { };