Merge #194845: Update socket2 in packages for Rust 1.64 compat

...into staging-next
2022-10-08 12:41:45 +02:00 · 2022-10-08 12:41:45 +02:00 · 0d24f164c9
parent 6565abc264 425ccd7c84
commit 0d24f164c9
13 changed files with 829 additions and 46 deletions
--- a/pkgs/applications/audio/spotify-tui/default.nix
+++ b/pkgs/applications/audio/spotify-tui/default.nix
@ -1,4 +1,17 @@
-{ lib, stdenv, fetchFromGitHub, fetchCrate, rustPlatform, installShellFiles, pkg-config, openssl, python3, libxcb, AppKit, Security }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchCrate
+, fetchpatch
+, rustPlatform
+, installShellFiles
+, pkg-config
+, openssl
+, python3
+, libxcb
+, AppKit
+, Security
+}:

 rustPlatform.buildRustPackage rec {
  pname = "spotify-tui";
@ -8,14 +21,30 @@ rustPlatform.buildRustPackage rec {
    owner = "Rigellute";
    repo = "spotify-tui";
    rev = "v${version}";
-    sha256 = "sha256-L5gg6tjQuYoAC89XfKE38KCFONwSAwfNoFEUPH4jNAI=";
+    hash = "sha256-L5gg6tjQuYoAC89XfKE38KCFONwSAwfNoFEUPH4jNAI=";
  };

-  # Use patched rspotify
  cargoPatches = [
+    # Use patched rspotify
    ./Cargo.lock.patch
+
+    # Needed so that the patch below it applies.
+    (fetchpatch {
+      name = "update-dirs.patch";
+      url = "https://github.com/Rigellute/spotify-tui/commit/3881defc1ed0bcf79df1aef4836b857f64be657c.patch";
+      hash = "sha256-OGqiYLFojMwR3RgKbddXxPDiAdzPySnscVVsVmTT7t4=";
+    })
+
+    # https://github.com/Rigellute/spotify-tui/pull/990
+    (fetchpatch {
+      name = "update-socket2-for-rust-1.64.patch";
+      url = "https://github.com/Rigellute/spotify-tui/commit/14df9419cf72da13f3b55654686a95647ea9dfea.patch";
+      hash = "sha256-craY6UwmHDdxih3nZBdPkNJtQ6wvVgf09Ovqdxi0JZo=";
+    })
  ];
+
  patches = [
+    # Use patched rspotify
    ./Cargo.toml.patch
  ];

@ -44,7 +73,7 @@ rustPlatform.buildRustPackage rec {
    ln -s ${rspotify} ./rspotify-${rspotify.version}
  '';

-  cargoSha256 = "sha256-S8zuVYcyYvrwggIvlpxNydhoN9kx6xLBwYJSHcbEK40=";
+  cargoHash = "sha256-aZJ6Q/rvqrv+wvQw2eKFPnSROhI5vXPvr5pu1hwtZKA=";

  nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config python3 ];
  buildInputs = [ ]
--- a/pkgs/applications/networking/instant-messengers/fractal/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
    owner = "GNOME";
    repo = "fractal";
    rev = version;
-    sha256 = "DSNVd9YvI7Dd3s3+M0+wE594tmL1yPNMnD1W9wLhSuw=";
+    hash = "sha256-To6lr2I+JVrxvuK++2gLWntFGnEBm+B6KTRuOvjASek=";
  };

  patches = [
@ -40,14 +40,17 @@ stdenv.mkDerivation rec {
    # fractal-gtk/res/meson.build:5:0: ERROR: Function does not take positional arguments.
    (fetchpatch {
      url = "https://gitlab.gnome.org/GNOME/fractal/-/commit/6fa1a23596d65d94aa889efe725174e6cd2903f0.patch";
-      sha256 = "3OzU9XL2V1VNOkvL1j677K3HNoBqPMQudQDmiDxYfAc=";
+      hash = "sha256-3OzU9XL2V1VNOkvL1j677K3HNoBqPMQudQDmiDxYfAc=";
    })
+
+    # This is in fractal v4.4.1b1+ so can be removed when fractal is updated.
+    ./update-socket2-for-rust-1.64.diff
  ];

  cargoDeps = rustPlatform.fetchCargoTarball {
-    inherit src;
+    inherit src patches;
    name = "${pname}-${version}";
-    hash = "sha256-xim5sOzeXJjRXbTOg2Gk/LHU0LioiyMK5nSr1LwMPjc=";
+    hash = "sha256-d99zSaxp22YyLP3Wckgcm7wlz7nFrLJDHq2xPJmZFf0=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/networking/instant-messengers/fractal/update-socket2-for-rust-1.64.diff
+++ b/pkgs/applications/networking/instant-messengers/fractal/update-socket2-for-rust-1.64.diff
@ -0,0 +1,195 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index c0b5e5e2..3009f183 100644
+--- a/Cargo.lock
+++ b/Cargo.lock
+@@ -1,5 +1,7 @@
+ # This file is automatically @generated by Cargo.
+ # It is not intended for manual editing.
+version = 3
+
+ [[package]]
+ name = "addr2line"
+ version = "0.13.0"
+@@ -169,7 +171,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293"
+ dependencies = [
+  "addr2line",
+- "cfg-if",
+ "cfg-if 0.1.10",
+  "libc",
+  "miniz_oxide",
+  "object",
+@@ -326,6 +328,12 @@ version = "0.1.10"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+ 
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+ [[package]]
+ name = "chrono"
+ version = "0.4.13"
+@@ -407,7 +415,7 @@ version = "1.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 0.1.10",
+ ]
+ 
+ [[package]]
+@@ -417,7 +425,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
+ dependencies = [
+  "autocfg 1.0.0",
+- "cfg-if",
+ "cfg-if 0.1.10",
+  "lazy_static",
+ ]
+ 
+@@ -455,7 +463,7 @@ version = "2.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 0.1.10",
+  "dirs-sys",
+ ]
+ 
+@@ -465,7 +473,7 @@ version = "2.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 0.1.10",
+  "dirs-sys",
+ ]
+ 
+@@ -506,7 +514,7 @@ version = "0.8.23"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "e8ac63f94732332f44fe654443c46f6375d1939684c17b0afb6cb56b0456e171"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 0.1.10",
+ ]
+ 
+ [[package]]
+@@ -549,7 +557,7 @@ version = "1.0.16"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 0.1.10",
+  "crc32fast",
+  "libc",
+  "miniz_oxide",
+@@ -842,7 +850,7 @@ version = "0.1.14"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 0.1.10",
+  "libc",
+  "wasi",
+ ]
+@@ -979,7 +987,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "ce8664a114cd6ec16bece783d5eee59496919915b1f6884400ba4a953274a163"
+ dependencies = [
+  "bitflags",
+- "cfg-if",
+ "cfg-if 0.1.10",
+  "futures-channel",
+  "futures-core",
+  "futures-util",
+@@ -1543,7 +1551,7 @@ version = "0.4.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 0.1.10",
+ ]
+ 
+ [[package]]
+@@ -1648,7 +1656,7 @@ version = "0.6.22"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 0.1.10",
+  "fuchsia-zircon",
+  "fuchsia-zircon-sys",
+  "iovec",
+@@ -1703,7 +1711,7 @@ version = "0.2.34"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 0.1.10",
+  "libc",
+  "winapi 0.3.9",
+ ]
+@@ -1826,7 +1834,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4"
+ dependencies = [
+  "bitflags",
+- "cfg-if",
+ "cfg-if 0.1.10",
+  "foreign-types",
+  "lazy_static",
+  "libc",
+@@ -2523,13 +2531,12 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+ 
+ [[package]]
+ name = "socket2"
+-version = "0.3.12"
+version = "0.3.19"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918"
+checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 1.0.0",
+  "libc",
+- "redox_syscall",
+  "winapi 0.3.9",
+ ]
+ 
+@@ -2678,7 +2685,7 @@ version = "3.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 0.1.10",
+  "libc",
+  "rand 0.7.3",
+  "redox_syscall",
+@@ -2818,7 +2825,7 @@ version = "0.1.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "f0aae59226cf195d8e74d4b34beae1859257efb4e5fed3f147d2dc2c7d372178"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 0.1.10",
+  "log",
+  "tracing-core",
+ ]
+@@ -2998,7 +3005,7 @@ version = "0.2.67"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 0.1.10",
+  "serde",
+  "serde_json",
+  "wasm-bindgen-macro",
+@@ -3025,7 +3032,7 @@ version = "0.4.17"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "95f8d235a77f880bcef268d379810ea6c0af2eacfa90b1ad5af731776e0c4699"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 0.1.10",
+  "js-sys",
+  "wasm-bindgen",
+  "web-sys",
--- a/pkgs/development/tools/fundoc/default.nix
+++ b/pkgs/development/tools/fundoc/default.nix
@ -1,4 +1,4 @@
-{ lib, rustPlatform, fetchFromGitHub }:
+{ lib, rustPlatform, fetchFromGitHub, fetchpatch }:

 rustPlatform.buildRustPackage rec {
  pname = "fundoc";
@ -8,10 +8,19 @@ rustPlatform.buildRustPackage rec {
    owner = "csssr";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-qmsr4bhErpMzS71NhLep0EWimZb/S3aEhMbeBNa5y8E=";
+    hash = "sha256-qmsr4bhErpMzS71NhLep0EWimZb/S3aEhMbeBNa5y8E=";
  };

-  cargoSha256 = "sha256-G2KRjkccS/rfrb7BtotbG6L4WaVnfwY1UEXLnVBLSzM=";
+  cargoPatches = [
+    # https://github.com/CSSSR/fundoc/pull/36
+    (fetchpatch {
+      name = "update-dependencies-for-rust-1.64.patch";
+      url = "https://github.com/CSSSR/fundoc/commit/9e0c5f747088467b70bd385fcb8888950351143f.patch";
+      hash = "sha256-JUTwMdxxt+2jst9DyqgkblZodBSYJzaDtjiLRQ8mJFU=";
+    })
+  ];
+
+  cargoHash = "sha256-1gKxFznoGYGme0UicP73FQt8CnI9IeyHJxLgRcLffm0=";

  meta = with lib; {
    description = "Language agnostic documentation generator";
--- a/pkgs/development/tools/rust/cargo-bisect-rustc/0001-dynamically-patchelf-binaries.patch
+++ b/pkgs/development/tools/rust/cargo-bisect-rustc/0001-dynamically-patchelf-binaries.patch
@ -1,22 +1,22 @@
 diff --git a/src/toolchains.rs b/src/toolchains.rs
-index 4d85e7c..b1353c6 100644
+index 53a7ddb..795a711 100644
 --- a/src/toolchains.rs
 +++ b/src/toolchains.rs
-@@ -259,6 +259,8 @@ impl Toolchain {
-             .map_err(InstallError::Download)?;
+@@ -206,6 +206,8 @@ impl Toolchain {
+             })?;
         }
-
+ 
 +        nix_patchelf(tmpdir.path().to_path_buf())
 +            .expect("failed to patch toolchain for NixOS");
-         fs::rename(tmpdir.into_path(), dest).map_err(InstallError::Move)?;
-
-         Ok(())
-@@ -557,3 +559,42 @@ pub(crate) fn download_tarball(
+         fs::rename(tmpdir.into_path(), dest).map_err(InstallError::Move)
+     }
+ 
+@@ -533,3 +535,42 @@ fn download_tarball(
+         res => res,
     }
-     download_tar_gz(client, name, &format!("{}.gz", url,), strip_prefix, dest)
 }
 +
-+fn nix_patchelf(mut toolchain_path: PathBuf) -> Result<(), Error> {
+fn nix_patchelf(mut toolchain_path: PathBuf) -> io::Result<()> {
 +    toolchain_path.push("bin");
 +
 +    for entry in toolchain_path.read_dir()? {
--- a/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix
+++ b/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix
@ -12,13 +12,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-bisect-rustc";
-  version = "0.6.3";
+  version = "0.6.4";

  src = fetchFromGitHub {
    owner = "rust-lang";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-TRcHeA4pOzODyzkQCGkdAWy3Bt2ltrOcpCMDu6n4k3k=";
+    hash = "sha256-dJpdAg+A7TYm6bGq73aA15hIymbJ56ScyygQLiEboak=";
  };

  patches =
@ -46,7 +46,12 @@ rustPlatform.buildRustPackage rec {
    Security
  ];

-  cargoSha256 = "sha256-3I5V/JOxxy1+Cwkq9tuHMgHQ0eCfzAViJ4Gl+l8RHlE=";
+  cargoHash = "sha256-Y/CQcIgdG8dCvPF5bmJDySmgzRi6lFU/aJxkyUjYlAM=";
+
+  checkFlags = [
+    "--skip cli_tests"    # https://github.com/rust-lang/cargo-bisect-rustc/issues/226
+    "--skip test_github"  # requires internet
+  ];

  meta = with lib; {
    description = "Bisects rustc, either nightlies or CI artifacts";
--- a/pkgs/misc/cliscord/default.nix
+++ b/pkgs/misc/cliscord/default.nix
@ -1,21 +1,29 @@
-{ lib, stdenv, rustPlatform, openssl, pkg-config, fetchFromGitHub, Security }:
+{ lib
+, stdenv
+, rustPlatform
+, openssl
+, pkg-config
+, fetchFromGitHub
+, fetchpatch
+, Security
+}:

 rustPlatform.buildRustPackage rec {
  pname = "cliscord";
-  version = "unstable-2020-12-08";
+  version = "unstable-2022-10-07";

  src = fetchFromGitHub {
    owner = "somebody1234";
    repo = pname;
-    rev = "b02fbe5516fd7f153d0b0e3c7d5d11e2ab651b43";
-    sha256 = "sha256-hzZozgOkw8kFppuHiX9TQxHhxKRv8utWWbhEOIzKDLo=";
+    rev = "d62317d55c07ece8c9d042dcd74b62e58c9bfaeb";
+    hash = "sha256-dmR49yyErahOUxR9pGW1oYy8Wq5SWOprK317u+JPBv4=";
  };

  buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;

  nativeBuildInputs = [ pkg-config ];

-  cargoSha256 = "12zfwdssyv0j83bff6s4376d99pv7z8ya8q8adwmf5ayvgmj4xz4";
+  cargoHash = "sha256-Z8ras6W4BnAWjHe6rPd1X1d3US5gq7CxnBAkW//OTsg=";

  meta = with lib; {
    description = "Simple command-line tool to send text and files to discord";
--- a/pkgs/servers/geospatial/martin/default.nix
+++ b/pkgs/servers/geospatial/martin/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub, fetchpatch, Security }:

 rustPlatform.buildRustPackage rec {
  pname = "martin";
@ -8,12 +8,17 @@ rustPlatform.buildRustPackage rec {
    owner = "urbica";
    repo = pname;
    rev = "v${version}";
-    sha256 = "1i9zhmjkgid4s90n52wqmrl3lwswcaxd6d47ssycgjl1nv0jla4k";
+    hash = "sha256-kygqwbaByse81oc007piXHM6aK6Yi2JB0qTFN2WFP8U=";
  };

-  cargoSha256 = "1jgl8s6h4pqhn189swrhn896kw1rkmqpf7dq52ry2rdci80g02nq";
+  cargoPatches = [
+    # Remove after a new release, tracked by https://github.com/maplibre/martin/issues/410.
+    ./update-socket2-for-rust-1.64.patch
+  ];

-  buildInputs = with stdenv; lib.optional isDarwin Security;
+  cargoHash = "sha256-oevyr1P0uzHbpWCYQ1raqA42HI2KLl2IYcm1D2PeKOo=";
+
+  buildInputs = lib.optional stdenv.isDarwin Security;

  doCheck = false;

--- a/pkgs/servers/geospatial/martin/update-socket2-for-rust-1.64.patch
+++ b/pkgs/servers/geospatial/martin/update-socket2-for-rust-1.64.patch
@ -0,0 +1,358 @@
+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"
+
--- a/pkgs/tools/networking/bandwhich/default.nix
+++ b/pkgs/tools/networking/bandwhich/default.nix
@ -8,22 +8,28 @@ rustPlatform.buildRustPackage rec {
    owner = "imsnif";
    repo = pname;
    rev = version;
-    sha256 = "014blvrv0kk4gzga86mbk7gd5dl1szajfi972da3lrfznck1w24n";
+    hash = "sha256-lggeJrPfZTpUEydFJ9XXgbbS3pmrGqTef2ROsPOmiwQ=";
  };

-  cargoSha256 = "sha256-Vrd5DIfhUSb3BONaUG8RypmVF+HWrlM0TodlWjOLa/c=";
+  cargoHash = "sha256-kGRsF+THNQahEoD3vY+XcPrr9cHjchtg86tMvcIdHPk=";

  buildInputs = lib.optional stdenv.isDarwin Security;

  # 10 passed; 47 failed https://hydra.nixos.org/build/148943783/nixlog/1
  doCheck = !stdenv.isDarwin;

-  # FIXME: remove when the linked-hash-map dependency is bumped upstream
  cargoPatches = [
+    # FIXME: remove when the linked-hash-map dependency is bumped upstream
+    # https://github.com/imsnif/bandwhich/pull/222/
    (fetchpatch {
-      url = "https://github.com/imsnif/bandwhich/pull/222/commits/be06905de2c4fb91afc22d50bf3cfe5a1e8003f5.patch";
-      sha256 = "sha256-FyZ7jUXK7ebXq7q/lvRSe7YdPnpYWKZE3WrSKLMjJeA=";
+      name = "update-linked-hash-map.patch";
+      url = "https://github.com/imsnif/bandwhich/commit/be06905de2c4fb91afc22d50bf3cfe5a1e8003f5.patch";
+      hash = "sha256-FyZ7jUXK7ebXq7q/lvRSe7YdPnpYWKZE3WrSKLMjJeA=";
    })
+
+    # Tweaked https://github.com/imsnif/bandwhich/pull/245 so that it merges
+    # cleanly with the earlier patch.
+    ./update-socket2-for-rust-1.64.diff
  ];

  meta = with lib; {
--- a/pkgs/tools/networking/bandwhich/update-socket2-for-rust-1.64.diff
+++ b/pkgs/tools/networking/bandwhich/update-socket2-for-rust-1.64.diff
@ -0,0 +1,160 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index bcaf9da..7d9c97e 100644
+--- a/Cargo.lock
+++ b/Cargo.lock
+@@ -76,7 +76,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
+ dependencies = [
+  "backtrace-sys",
+- "cfg-if",
+ "cfg-if 0.1.9",
+  "libc",
+  "rustc-demangle",
+ ]
+@@ -238,6 +238,12 @@ version = "0.1.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
+ 
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+ [[package]]
+ name = "chrono"
+ version = "0.4.9"
+@@ -357,7 +363,7 @@ version = "1.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 0.1.9",
+ ]
+ 
+ [[package]]
+@@ -388,7 +394,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
+ dependencies = [
+  "autocfg 1.0.1",
+- "cfg-if",
+ "cfg-if 0.1.9",
+  "crossbeam-utils",
+  "lazy_static",
+  "maybe-uninit",
+@@ -403,7 +409,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
+ dependencies = [
+  "autocfg 1.0.1",
+- "cfg-if",
+ "cfg-if 0.1.9",
+  "lazy_static",
+ ]
+ 
+@@ -528,7 +534,7 @@ version = "1.0.17"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "766d0e77a2c1502169d4a93ff3b8c15a71fd946cd0126309752104e5f3c46d94"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 0.1.9",
+  "crc32fast",
+  "libc",
+  "miniz_oxide",
+@@ -683,7 +689,7 @@ version = "0.1.13"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 0.1.9",
+  "libc",
+  "wasi",
+ ]
+@@ -894,7 +900,7 @@ version = "0.4.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 0.1.9",
+ ]
+ 
+ [[package]]
+@@ -960,7 +966,7 @@ version = "0.6.21"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 0.1.9",
+  "fuchsia-zircon",
+  "fuchsia-zircon-sys",
+  "iovec",
+@@ -1033,7 +1039,7 @@ version = "0.2.33"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 0.1.9",
+  "libc",
+  "winapi 0.3.8",
+ ]
+@@ -1120,7 +1126,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4"
+ dependencies = [
+  "bitflags 1.2.1",
+- "cfg-if",
+ "cfg-if 0.1.9",
+  "foreign-types",
+  "lazy_static",
+  "libc",
+@@ -1176,7 +1182,7 @@ version = "0.7.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 0.1.9",
+  "cloudabi",
+  "libc",
+  "redox_syscall",
+@@ -1840,13 +1846,12 @@ checksum = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86"
+ 
+ [[package]]
+ name = "socket2"
+-version = "0.3.11"
+version = "0.3.19"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85"
+checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 1.0.0",
+  "libc",
+- "redox_syscall",
+  "winapi 0.3.8",
+ ]
+ 
+@@ -1990,7 +1995,7 @@ version = "0.15.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "13816d558f404113dfdf855ed982f160cf697b3e573a68b2b798062032182212"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 0.1.9",
+  "doc-comment",
+  "libc",
+  "ntapi",
+@@ -2005,7 +2010,7 @@ version = "3.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 0.1.9",
+  "libc",
+  "rand 0.7.2",
+  "redox_syscall",
+@@ -2121,7 +2126,7 @@ version = "0.18.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "72d7df08b45f4d6d124cdae3c303f9908159a17b39e633e524349e91bc798d32"
+ dependencies = [
+- "cfg-if",
+ "cfg-if 0.1.9",
+  "failure",
+  "futures",
+  "ipconfig",
--- a/pkgs/tools/networking/mozwire/default.nix
+++ b/pkgs/tools/networking/mozwire/default.nix
@ -1,19 +1,24 @@
-{ rustPlatform, lib, stdenv, fetchFromGitHub, Security }:
+{ rustPlatform
+, lib
+, stdenv
+, fetchFromGitHub
+, Security
+}:

 rustPlatform.buildRustPackage rec {
  pname = "MozWire";
-  version = "0.7.0";
+  version = "0.8.0";

  src = fetchFromGitHub {
    owner = "NilsIrl";
    repo = pname;
    rev = "v${version}";
-    sha256 = "01bj3c34x9ywxygsz4rdyw5gc9cz8x6zzl5fd7db8qy8bx2lhlr9";
+    hash = "sha256-vC8HmwJCHMKQUsYBwRmr88tmZxPKNvI6hxlcjG2AV3Q=";
  };

  buildInputs = lib.optionals stdenv.isDarwin [ Security ];

-  cargoSha256 = "0q27p2hyw6c1fh5x8kwsrw8a1hk6z90z0z3w86ga8ryz53xg4vdi";
+  cargoHash = "sha256-9qXoMugmL6B9vC/yrMJxZ5p792ZJmrTzk/khRVTkHf4=";

  meta = with lib; {
    description = "MozillaVPN configuration manager giving Linux, macOS users (among others), access to MozillaVPN";
--- a/pkgs/tools/networking/tdns-cli/default.nix
+++ b/pkgs/tools/networking/tdns-cli/default.nix
@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "tdns-cli";
-  version = "0.0.5";
+  version = "unstable-2021-02-19";

  src = fetchFromGitHub {
    owner = "rotty";
    repo = pname;
-    rev = "v${version}";
-    sha256 = "0nn036in5j1h0vxkwif0lf7fn900zy4f4kxlzy6qdx3jakgmxvwh";
+    rev = "9a5455fe8a52f3f14dc55ef81511b479c8cd70ea";
+    hash = "sha256-BGxkqlKg81izq4eOBEZFJ/MPb3UCSOo8ZTYTjtjierk=";
  };

-  cargoSha256 = "sha256-O4n38dla2WgZ4949Ata6AYbZF9LMnXDyuFNoXRrTN7I=";
+  cargoHash = "sha256-uRny+l/LaQPjF5AnbxgKFLdjuAxcez1BqsL4g54KAwU=";

  meta = with lib; {
    description = "DNS tool that aims to replace dig and nsupdate";