From 6580b18d3fca8803777cbc1c22d34c469e8027d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 3 Feb 2018 22:30:45 +0000
Subject: [PATCH] cargo-vendor: move to all-packages

---
 pkgs/build-support/rust/default.nix | 6 ++----
 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 efb376b382d0..63d08e1d0311 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 d1bc39902e80..7e076dd7e1f5 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 { };