git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #108283 from andersk/cargo-download

cargo-download: Fix build by bumping url from 1.6.0 to 1.6.1

commitaabff599947e391b3edc46f8c1972bda65c29f63 authorBernardo Meurer <bernardo@meurer.org> dateSun 3 Jan 2021, 06:39 (6 years ago) parent376b48b74a8ac4
2 files changed+27−27
pkgs/tools/package-management/cargo-download/Cargo.nix+3−3 pkgs/tools/package-management/cargo-download/crates-io.nix+24−24
pkgs/tools/package-management/cargo-download/Cargo.nix+3−3
@@ -427,7 +427,7 @@ rec {
427427 serde_urlencoded = "0.5.1";
428428 tokio = "0.1.7";
429429 tokio_io = "0.1.10";
430− url = "1.6.0";
430+ url = "1.6.1";
431431 uuid = "0.7.1";
432432 };
433433 deps.rustc_version."0.2.3" = {
@@ -464,7 +464,7 @@ rec {
464464 dtoa = "0.4.2";
465465 itoa = "0.3.4";
466466 serde = "1.0.21";
467− url = "1.6.0";
467+ url = "1.6.1";
468468 };
469469 deps.siphasher."0.2.2" = {};
470470 deps.slab."0.4.0" = {};
@@ -639,7 +639,7 @@ rec {
639639 deps.unreachable."1.0.0" = {
640640 void = "1.0.2";
641641 };
642− deps.url."1.6.0" = {
642+ deps.url."1.6.1" = {
643643 idna = "0.1.4";
644644 matches = "0.1.6";
645645 percent_encoding = "1.0.1";
pkgs/tools/package-management/cargo-download/crates-io.nix+24−24
@@ -4926,40 +4926,40 @@ rec {
49264926
49274927
49284928# end
4929−# url-1.6.0
4929+# url-1.6.1
49304930
4931− crates.url."1.6.0" = deps: { features?(features_.url."1.6.0" deps {}) }: buildRustCrate {
4931+ crates.url."1.6.1" = deps: { features?(features_.url."1.6.1" deps {}) }: buildRustCrate {
49324932 crateName = "url";
4933− version = "1.6.0";
4933+ version = "1.6.1";
49344934 description = "URL library for Rust, based on the WHATWG URL Standard";
49354935 authors = [ "The rust-url developers" ];
4936− sha256 = "1bvzl4dvjj84h46ai3x23wyafa2wwhchj08vr2brf25dxwc7mg18";
4936+ sha256 = "1qsnhmxznzaxl068a3ksz69kwcz7ghvl4zflg9qj7lyw4bk9ma38";
49374937 dependencies = mapFeatures features ([
4938− (crates."idna"."${deps."url"."1.6.0"."idna"}" deps)
4939− (crates."matches"."${deps."url"."1.6.0"."matches"}" deps)
4940− (crates."percent_encoding"."${deps."url"."1.6.0"."percent_encoding"}" deps)
4938+ (crates."idna"."${deps."url"."1.6.1"."idna"}" deps)
4939+ (crates."matches"."${deps."url"."1.6.1"."matches"}" deps)
4940+ (crates."percent_encoding"."${deps."url"."1.6.1"."percent_encoding"}" deps)
49414941 ]);
4942− features = mkFeatures (features."url"."1.6.0" or {});
4942+ features = mkFeatures (features."url"."1.6.1" or {});
49434943 };
4944− features_.url."1.6.0" = deps: f: updateFeatures f (rec {
4945− idna."${deps.url."1.6.0".idna}".default = true;
4946− matches."${deps.url."1.6.0".matches}".default = true;
4947− percent_encoding."${deps.url."1.6.0".percent_encoding}".default = true;
4944+ features_.url."1.6.1" = deps: f: updateFeatures f (rec {
4945+ idna."${deps.url."1.6.1".idna}".default = true;
4946+ matches."${deps.url."1.6.1".matches}".default = true;
4947+ percent_encoding."${deps.url."1.6.1".percent_encoding}".default = true;
49484948 url = fold recursiveUpdate {} [
4949− { "1.6.0"."encoding" =
4950− (f.url."1.6.0"."encoding" or false) ||
4951− (f.url."1.6.0".query_encoding or false) ||
4952− (url."1.6.0"."query_encoding" or false); }
4953− { "1.6.0"."heapsize" =
4954− (f.url."1.6.0"."heapsize" or false) ||
4955− (f.url."1.6.0".heap_size or false) ||
4956− (url."1.6.0"."heap_size" or false); }
4957− { "1.6.0".default = (f.url."1.6.0".default or true); }
4949+ { "1.6.1"."encoding" =
4950+ (f.url."1.6.1"."encoding" or false) ||
4951+ (f.url."1.6.1".query_encoding or false) ||
4952+ (url."1.6.1"."query_encoding" or false); }
4953+ { "1.6.1"."heapsize" =
4954+ (f.url."1.6.1"."heapsize" or false) ||
4955+ (f.url."1.6.1".heap_size or false) ||
4956+ (url."1.6.1"."heap_size" or false); }
4957+ { "1.6.1".default = (f.url."1.6.1".default or true); }
49584958 ];
49594959 }) [
4960− (features_.idna."${deps."url"."1.6.0"."idna"}" deps)
4961− (features_.matches."${deps."url"."1.6.0"."matches"}" deps)
4962− (features_.percent_encoding."${deps."url"."1.6.0"."percent_encoding"}" deps)
4960+ (features_.idna."${deps."url"."1.6.1"."idna"}" deps)
4961+ (features_.matches."${deps."url"."1.6.1"."matches"}" deps)
4962+ (features_.percent_encoding."${deps."url"."1.6.1"."percent_encoding"}" deps)
49634963 ];
49644964
49654965