diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2018-02-03 22:30:45 +0000 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2018-02-03 22:35:27 +0000 |
| commit | 6580b18d3fca8803777cbc1c22d34c469e8027d2 (patch) | |
| tree | 1c36e1904f96d44662dd1449890f3531fd720279 /pkgs | |
| parent | 8f20e7ce3a5b1972c316345f594cdc0243bc178c (diff) | |
| download | nixpkgs-6580b18d3fca8803777cbc1c22d34c469e8027d2.tar nixpkgs-6580b18d3fca8803777cbc1c22d34c469e8027d2.tar.gz nixpkgs-6580b18d3fca8803777cbc1c22d34c469e8027d2.tar.bz2 nixpkgs-6580b18d3fca8803777cbc1c22d34c469e8027d2.tar.lz nixpkgs-6580b18d3fca8803777cbc1c22d34c469e8027d2.tar.xz nixpkgs-6580b18d3fca8803777cbc1c22d34c469e8027d2.tar.zst nixpkgs-6580b18d3fca8803777cbc1c22d34c469e8027d2.zip | |
cargo-vendor: move to all-packages
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/rust/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index efb376b382d..63d08e1d031 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,9 +1,7 @@ -{ callPackage, fetchurl, stdenv, path, cacert, git, rust }: +{ callPackage, fetchurl, stdenv, path, cacert, git, rust, cargo-vendor }: let - cargoVendor = callPackage ./cargo-vendor {}; - fetchcargo = import ./fetchcargo.nix { - inherit stdenv cacert git rust cargoVendor; + inherit stdenv cacert git rust cargo-vendor; }; in { name, cargoSha256 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1bc39902e8..7e076dd7e1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6488,6 +6488,8 @@ with pkgs; 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 { }; defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { }; |