Skip to content

Commit

Permalink
bandwhich: 0.17.0 -> 0.18.1
Browse files Browse the repository at this point in the history
ChangeLogs:

* https://github.com/imsnif/bandwhich/releases/tag/0.18.1
* https://github.com/imsnif/bandwhich/releases/tag/0.18.0

Also applied a fix[1] for rDNS support which broke with `systemd-v246`
because the `resolv-conf` crate didn't support the `options
trust_ad`-declaration in systemd's `/etc/resolv.conf`[2].

[1] imsnif/bandwhich#184
[2] imsnif/bandwhich#166 (comment)

(cherry picked from commit 8149ab1)
  • Loading branch information
Ma27 committed Sep 11, 2020
1 parent 3f99424 commit 3fdb6b8
Showing 1 changed file with 16 additions and 4 deletions.
20 changes: 16 additions & 4 deletions pkgs/tools/networking/bandwhich/default.nix
@@ -1,17 +1,29 @@
{ stdenv, fetchFromGitHub, rustPlatform, Security }:
{ stdenv, fetchFromGitHub, rustPlatform, Security, fetchpatch }:

rustPlatform.buildRustPackage rec {
pname = "bandwhich";
version = "0.17.0";
version = "0.18.1";

src = fetchFromGitHub {
owner = "imsnif";
repo = pname;
rev = version;
sha256 = "0fhy3zys41bkpjmvhkxf413004hvv2kngcgf4819mw22w14zfvgr";
sha256 = "0qzmkhrg7pqgblmva7xcww6zc4rryba6kkfkhj05mvd31z3c1rz8";
};

cargoSha256 = "015ff049xb699gig0cwr5i7n8hgw1316dkdpnqd4843h54x7bp5y";
cargoSha256 = "0iakw42nip0vxq50jjk73r0xl7xp426szb091ap4isad3zxq6saj";
cargoPatches = [
# Fixes rDNS support for systems using `systemd-networkd` from v246.
# See https://github.com/imsnif/bandwhich/pull/184 for context
(fetchpatch {
url = "https://github.com/imsnif/bandwhich/commit/19e485a1ce9f749c121d235147e3117cc847379e.patch";
sha256 = "03hg73gwlfq0l36k3aq7cfak3js7j05ssfpdbfiiwqq7lynm83jr";
})
(fetchpatch {
url = "https://github.com/imsnif/bandwhich/commit/35f03b716832fba9a735628d1c728d3e305f75c8.patch";
sha256 = "1bv837wc1dgg26s640f3lfya28ypnjs0675dykzxxxv5y9ns58l3";
})
];

buildInputs = stdenv.lib.optional stdenv.isDarwin Security;

Expand Down

0 comments on commit 3fdb6b8

Please sign in to comment.