Merge pull request #202221 from sikmir/martin

martin: 0.5.0 → 0.6.1

2 files changed, 7 insertions, 371 deletions

diff --git a/pkgs/servers/geospatial/martin/default.nix b/pkgs/servers/geospatial/martin/default.nix
index b225591a5adc8..8525efe970576 100644
--- a/pkgs/servers/geospatial/martin/default.nix
+++ b/pkgs/servers/geospatial/martin/default.nix
@@ -2,21 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "martin";
-  version = "0.5.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
-    owner = "urbica";
-    repo = pname;
+    owner = "maplibre";
+    repo = "martin";
     rev = "v${version}";
-    hash = "sha256-kygqwbaByse81oc007piXHM6aK6Yi2JB0qTFN2WFP8U=";
+    hash = "sha256-k5PekD+7cmsRa7qRAqQ1gKaX7i07whKTgeU6OM39BBE=";
   };
 
-  cargoPatches = [
-    # Remove after a new release, tracked by https://github.com/maplibre/martin/issues/410.
-    ./update-socket2-for-rust-1.64.patch
-  ];
-
-  cargoHash = "sha256-oevyr1P0uzHbpWCYQ1raqA42HI2KLl2IYcm1D2PeKOo=";
+  cargoHash = "sha256-rcyR1/b9Ap6mQR9yFDdsDJSvGxVNQrpt+t3sRSV4oPU=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
@@ -24,9 +19,8 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     description = "Blazing fast and lightweight PostGIS vector tiles server";
-    homepage = "https://martin.urbica.co/";
-    license = licenses.mit;
+    homepage = "https://martin.maplibre.org/";
+    license = with licenses; [ mit /* or */ asl20 ];
     maintainers = with maintainers; [ sikmir ];
-    platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/servers/geospatial/martin/update-socket2-for-rust-1.64.patch b/pkgs/servers/geospatial/martin/update-socket2-for-rust-1.64.patch
deleted file mode 100644
index c70261a3076cd..0000000000000
--- a/pkgs/servers/geospatial/martin/update-socket2-for-rust-1.64.patch
+++ /dev/null
@@ -1,358 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 8c90ecb..13c3149 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -305,7 +305,7 @@ name = "atty"
- version = "0.2.13"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
-  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
-@@ -343,7 +343,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
-  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
-@@ -353,7 +353,7 @@ version = "0.1.32"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
-@@ -393,7 +393,7 @@ version = "0.3.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
-@@ -402,7 +402,7 @@ version = "0.3.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
-@@ -458,12 +458,17 @@ name = "cfg-if"
- version = "0.1.10"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- 
-+[[package]]
-+name = "cfg-if"
-+version = "1.0.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
- [[package]]
- name = "chrono"
- version = "0.4.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
-  "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
-  "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -734,7 +739,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-  "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
-  "miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
-  "miniz_oxide 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
-@@ -782,7 +787,7 @@ version = "0.1.13"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
-  "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
-@@ -832,7 +837,7 @@ name = "hostname"
- version = "0.1.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
-  "winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
-@@ -892,7 +897,7 @@ name = "iovec"
- version = "0.1.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
-@@ -900,7 +905,7 @@ name = "ipconfig"
- version = "0.2.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-- "socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "socket2 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
-  "widestring 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-  "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -940,7 +945,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- 
- [[package]]
- name = "libc"
--version = "0.2.65"
-+version = "0.2.134"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- 
- [[package]]
-@@ -1019,7 +1024,7 @@ name = "memchr"
- version = "1.0.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
-@@ -1027,7 +1032,7 @@ name = "memchr"
- version = "2.2.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
-@@ -1049,7 +1054,7 @@ version = "0.1.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
-@@ -1069,7 +1074,7 @@ dependencies = [
-  "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-  "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
-  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-  "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -1083,7 +1088,7 @@ version = "0.6.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
-  "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
-@@ -1104,7 +1109,7 @@ version = "0.2.33"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
-  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
-@@ -1135,7 +1140,7 @@ name = "num_cpus"
- version = "1.10.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
-@@ -1165,7 +1170,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-  "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
-  "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -1180,7 +1185,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-  "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
-  "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-  "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -1223,7 +1228,7 @@ dependencies = [
-  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-  "postgres-protocol 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-  "postgres-shared 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-- "socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "socket2 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
-@@ -1325,7 +1330,7 @@ name = "rand"
- version = "0.3.23"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
-@@ -1335,7 +1340,7 @@ version = "0.4.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -1347,7 +1352,7 @@ version = "0.6.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -1365,7 +1370,7 @@ version = "0.7.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -1439,7 +1444,7 @@ name = "rand_jitter"
- version = "0.1.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
-@@ -1451,7 +1456,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
-  "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -1687,7 +1692,7 @@ name = "signal-hook"
- version = "0.1.10"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
-  "signal-hook-registry 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
-@@ -1697,7 +1702,7 @@ version = "1.1.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "arc-swap 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
-@@ -1717,12 +1722,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- 
- [[package]]
- name = "socket2"
--version = "0.3.11"
-+version = "0.3.19"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
-  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
-@@ -1825,7 +1829,7 @@ name = "time"
- version = "0.1.42"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
-  "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
-  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
-@@ -1901,7 +1905,7 @@ version = "0.2.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)",
-  "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)",
-  "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
-  "signal-hook 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -1972,7 +1976,7 @@ dependencies = [
-  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
-  "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
-- "socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "socket2 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -2200,6 +2204,7 @@ dependencies = [
- "checksum cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427"
- "checksum cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)" = "0213d356d3c4ea2c18c40b037c3be23cd639825c18f25ee670ac7813beeef99c"
- "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-+"checksum cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
- "checksum chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68"
- "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
- "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-@@ -2256,7 +2261,7 @@ dependencies = [
- "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
- "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
- "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
--"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8"
-+"checksum libc 0.2.134 (registry+https://github.com/rust-lang/crates.io-index)" = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb"
- "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
- "checksum lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed946d4529956a20f2d63ebe1b69996d5a2137c91913fe3ebbeff957f5bca7ff"
- "checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc"
-@@ -2344,7 +2349,7 @@ dependencies = [
- "checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
- "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
- "checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"
--"checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85"
-+"checksum socket2 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)" = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
- "checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d"
- "checksum stringprep 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1"
- "checksum strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "032c03039aae92b350aad2e3779c352e104d919cb192ba2fabbd7b831ce4f0f6"
-@@ -2393,3 +2398,4 @@ dependencies = [
- "checksum winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7daf138b6b14196e3830a588acf1e86966c694d3e8fb026fb105b8b5dca07e6e"
- "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
- "checksum yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d"
-+