Merge pull request #57017 from akru/cargo-vendor-update
cargo-vendor: 0.1.13 -> 0.1.23
This commit is contained in:
commit
ee3b96cf9b
File diff suppressed because it is too large
Load diff
|
@ -1,10 +1,10 @@
|
||||||
{ callPackage, fetchFromGitHub }:
|
{ callPackage, fetchFromGitHub }:
|
||||||
|
|
||||||
(callPackage ./cargo-vendor.nix {}).cargo_vendor_0_1_13.overrideAttrs (attrs: {
|
((callPackage ./cargo-vendor.nix {}).cargo_vendor {}).overrideAttrs (attrs: {
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "alexcrichton";
|
owner = "alexcrichton";
|
||||||
repo = "cargo-vendor";
|
repo = "cargo-vendor";
|
||||||
rev = "0.1.13";
|
rev = "9355661303ce2870d68a69d99953fce22581e31e";
|
||||||
sha256 = "0ljh2d65zpxp26a95b3czy5ai2z2dm87x7ndfdc1s0v1fsy69kn4";
|
sha256 = "0d4j3r09am3ynwhczimzv39264f5xz37jxa9js123y46w5by3wd2";
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -12,16 +12,17 @@ in
|
||||||
|
|
||||||
cargo = attrs: {
|
cargo = attrs: {
|
||||||
buildInputs = [ openssl zlib curl ]
|
buildInputs = [ openssl zlib curl ]
|
||||||
++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ];
|
++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
|
||||||
# TODO: buildRustCrate seems to use incorrect default inference
|
|
||||||
crateBin = [ { name = "cargo"; path = "src/bin/cargo.rs"; } ];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
cargo-vendor = attrs: {
|
cargo-vendor = attrs: {
|
||||||
buildInputs = [ openssl zlib curl ];
|
buildInputs = [ openssl zlib curl ]
|
||||||
# TODO: this defaults to cargo_vendor; needs to be cargo-vendor to
|
++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
|
||||||
# be considered a cargo subcommand.
|
};
|
||||||
crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ];
|
|
||||||
|
libz-sys = attrs: {
|
||||||
|
buildInputs = [ pkgconfig zlib ];
|
||||||
|
extraLinkFlags = ["-L${zlib.out}/lib"];
|
||||||
};
|
};
|
||||||
|
|
||||||
curl-sys = attrs: {
|
curl-sys = attrs: {
|
||||||
|
|
Loading…
Reference in a new issue