From 8798aaa22f54ce8007488cec99e8692bd906f4b1 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 26 Aug 2021 16:49:59 +0200 Subject: [PATCH] bandwhich: patch dependency to avoid panics Panic messages rendered the output unreadable, these panics came from a bug in the linked-hash-map dependency. The patch file is huge because Cargo.lock format changed, but the only thing I ran was: cargo update -p linked-hash-map --- pkgs/tools/networking/bandwhich/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index ebb816b1887a..35d342beb1a9 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -11,13 +11,21 @@ rustPlatform.buildRustPackage rec { sha256 = "014blvrv0kk4gzga86mbk7gd5dl1szajfi972da3lrfznck1w24n"; }; - cargoSha256 = "119szaighki565w28la6qg25s3cv8wviqin9f7f9w8x2rif3ipb3"; + cargoSha256 = "sha256-Vrd5DIfhUSb3BONaUG8RypmVF+HWrlM0TodlWjOLa/c="; 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 = [ + (fetchpatch { + url = "https://github.com/imsnif/bandwhich/pull/222/commits/be06905de2c4fb91afc22d50bf3cfe5a1e8003f5.patch"; + sha256 = "sha256-FyZ7jUXK7ebXq7q/lvRSe7YdPnpYWKZE3WrSKLMjJeA="; + }) + ]; + meta = with lib; { description = "A CLI utility for displaying current network utilization"; longDescription = ''