From dabf8f709e215305884c53211b461a72ca64b895 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Mon, 6 Oct 2025 12:59:50 +0000 Subject: [PATCH] usbtop: modernize --- pkgs/by-name/us/usbtop/package.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/us/usbtop/package.nix b/pkgs/by-name/us/usbtop/package.nix index d169964184d1..bb03b5beec22 100644 --- a/pkgs/by-name/us/usbtop/package.nix +++ b/pkgs/by-name/us/usbtop/package.nix @@ -7,15 +7,15 @@ boost, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "usbtop"; version = "1.0"; src = fetchFromGitHub { owner = "aguinet"; repo = "usbtop"; - rev = "release-${version}"; - sha256 = "0qbad0aq6j4jrh90l6a0akk71wdzhyzmy6q8wl138axyj2bp9kss"; + tag = "release-${finalAttrs.version}"; + hash = "sha256-Ws90l5C+KzQC5QgbX7+Hv/Fw5lRAGQoSzJJIgxVoamE="; }; postPatch = @@ -29,17 +29,19 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ]; + buildInputs = [ libpcap boost ]; - meta = with lib; { + meta = { homepage = "https://github.com/aguinet/usbtop"; + changelog = "https://github.com/aguinet/usbtop/raw/${finalAttrs.src.rev}/CHANGELOG"; description = "Top utility that shows an estimated instantaneous bandwidth on USB buses and devices"; mainProgram = "usbtop"; maintainers = [ ]; - license = licenses.bsd3; - platforms = platforms.linux; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; }; -} +})