diff options
| -rw-r--r-- | nixos/modules/module-list.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/programs/bandwhich.nix (renamed from nixos/modules/programs/what.nix) | 12 | ||||
| -rw-r--r-- | pkgs/tools/networking/bandwhich/default.nix (renamed from pkgs/tools/networking/what/default.nix) | 16 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
4 files changed, 20 insertions, 16 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2dc3378bf0054..f849278e908dd 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -95,6 +95,7 @@ ./programs/adb.nix ./programs/atop.nix ./programs/autojump.nix + ./programs/bandwhich.nix ./programs/bash/bash.nix ./programs/bcc.nix ./programs/browserpass.nix @@ -159,7 +160,6 @@ ./programs/wavemon.nix ./programs/way-cooler.nix ./programs/waybar.nix - ./programs/what.nix ./programs/wireshark.nix ./programs/x2goserver.nix ./programs/xfs_quota.nix diff --git a/nixos/modules/programs/what.nix b/nixos/modules/programs/bandwhich.nix index 02e4eaba723f8..5413044f46141 100644 --- a/nixos/modules/programs/what.nix +++ b/nixos/modules/programs/bandwhich.nix @@ -2,17 +2,17 @@ with lib; -let cfg = config.programs.what; +let cfg = config.programs.bandwhich; in { meta.maintainers = with maintainers; [ filalex77 ]; options = { - programs.what = { + programs.bandwhich = { enable = mkOption { type = types.bool; default = false; description = '' - Whether to add what to the global environment and configure a + Whether to add bandwhich to the global environment and configure a setcap wrapper for it. ''; }; @@ -20,9 +20,9 @@ in { }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ what ]; - security.wrappers.what = { - source = "${pkgs.what}/bin/what"; + environment.systemPackages = with pkgs; [ bandwhich ]; + security.wrappers.bandwhich = { + source = "${pkgs.bandwhich}/bin/bandwhich"; capabilities = "cap_net_raw,cap_net_admin+ep"; }; }; diff --git a/pkgs/tools/networking/what/default.nix b/pkgs/tools/networking/bandwhich/default.nix index 943ee07fd4216..21253745cb0aa 100644 --- a/pkgs/tools/networking/what/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -1,28 +1,30 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { - pname = "what"; - version = "0.5.1"; + pname = "bandwhich"; + version = "0.6.0"; src = fetchFromGitHub { owner = "imsnif"; repo = pname; rev = version; - sha256 = "1q926w6c4hhf6gim6dn3jfcibgj5zbsgwnf5crmh8wv6a8fg6pxg"; + sha256 = "0jjqc8sysvw63mwy68z9p16vc1pygrm1wxyll6piwvbbnirpys1y"; }; cargoSha256 = "1rixpljqddwhryddzni5l6m4sjyn1krrj0ig0rzc701am7srhg3a"; - meta = with lib; { + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + + meta = with stdenv.lib; { description = "A CLI utility for displaying current network utilization"; longDescription = '' - what sniffs a given network interface and records IP packet size, cross + bandwhich sniffs a given network interface and records IP packet size, cross referencing it with the /proc filesystem on linux or lsof on MacOS. It is responsive to the terminal window size, displaying less info if there is no room for it. It will also attempt to resolve ips to their host name in the background using reverse DNS on a best effort basis. ''; - homepage = "https://github.com/imsnif/what"; + homepage = "https://github.com/imsnif/bandwhich"; license = licenses.mit; maintainers = with maintainers; [ filalex77 ]; platforms = platforms.unix; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ebe7ef61b77e4..58e138063d2ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1085,6 +1085,10 @@ in backblaze-b2 = python.pkgs.callPackage ../development/tools/backblaze-b2 { }; + bandwhich = callPackage ../tools/networking/bandwhich { + inherit (darwin.apple_sdk.frameworks) Security; + }; + bar = callPackage ../tools/system/bar {}; base16-shell-preview = callPackage ../misc/base16-shell-preview { }; @@ -7307,8 +7311,6 @@ in libpsl = null; }; - what = callPackage ../tools/networking/what { }; - which = callPackage ../tools/system/which { }; woeusb = callPackage ../tools/misc/woeusb { }; |