Merge pull request #57017 from akru/cargo-vendor-update

cargo-vendor: 0.1.13 -> 0.1.23
This commit is contained in:
Andreas Rammhold 2019-04-22 00:02:26 +02:00 committed by GitHub
commit ee3b96cf9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4644 additions and 1494 deletions

File diff suppressed because it is too large Load diff

View file

@ -1,10 +1,10 @@
{ callPackage, fetchFromGitHub }:
(callPackage ./cargo-vendor.nix {}).cargo_vendor_0_1_13.overrideAttrs (attrs: {
((callPackage ./cargo-vendor.nix {}).cargo_vendor {}).overrideAttrs (attrs: {
src = fetchFromGitHub {
owner = "alexcrichton";
repo = "cargo-vendor";
rev = "0.1.13";
sha256 = "0ljh2d65zpxp26a95b3czy5ai2z2dm87x7ndfdc1s0v1fsy69kn4";
rev = "9355661303ce2870d68a69d99953fce22581e31e";
sha256 = "0d4j3r09am3ynwhczimzv39264f5xz37jxa9js123y46w5by3wd2";
};
})

File diff suppressed because it is too large Load diff

View file

@ -12,16 +12,17 @@ in
cargo = attrs: {
buildInputs = [ openssl zlib curl ]
++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ];
# TODO: buildRustCrate seems to use incorrect default inference
crateBin = [ { name = "cargo"; path = "src/bin/cargo.rs"; } ];
++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
};
cargo-vendor = attrs: {
buildInputs = [ openssl zlib curl ];
# TODO: this defaults to cargo_vendor; needs to be cargo-vendor to
# be considered a cargo subcommand.
crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ];
buildInputs = [ openssl zlib curl ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
};
libz-sys = attrs: {
buildInputs = [ pkgconfig zlib ];
extraLinkFlags = ["-L${zlib.out}/lib"];
};
curl-sys = attrs: {