From 35992ca5c5468f45fb1bfa691328305ff230b000 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sat, 2 Dec 2023 04:42:47 +0100 Subject: [PATCH 1/3] usbview: 2.0 -> 3.1 --- pkgs/tools/misc/usbview/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/usbview/default.nix b/pkgs/tools/misc/usbview/default.nix index 2f417ea86de5..ade6366c9715 100644 --- a/pkgs/tools/misc/usbview/default.nix +++ b/pkgs/tools/misc/usbview/default.nix @@ -3,23 +3,25 @@ , fetchFromGitHub , autoreconfHook , pkg-config +, imagemagick , gtk3 }: stdenv.mkDerivation rec { pname = "usbview"; - version = "2.0"; + version = "3.1"; src = fetchFromGitHub { owner = "gregkh"; repo = "usbview"; rev = "v${version}"; - sha256 = "1cw5jjpidjn34rxdjslpdlj99k4dqaq1kz6mplv5hgjdddijvn5p"; + hash = "sha256-h+sB83BYsrB2VxwtatPWNiM0WdTCMY289nh+/0o8GOw="; }; nativeBuildInputs = [ autoreconfHook pkg-config + imagemagick ]; buildInputs = [ From 6259a32b452d693bb5d1892b0d18a93e2d9c876d Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sat, 2 Dec 2023 06:26:32 +0100 Subject: [PATCH 2/3] usbview: add mainProgram --- pkgs/tools/misc/usbview/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/usbview/default.nix b/pkgs/tools/misc/usbview/default.nix index ade6366c9715..5a2f90dda25e 100644 --- a/pkgs/tools/misc/usbview/default.nix +++ b/pkgs/tools/misc/usbview/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { homepage = "http://www.kroah.com/linux-usb/"; maintainers = with maintainers; [ shamilton ]; platforms = platforms.linux; + mainProgram = "usbview"; }; } From 684fa5f4613eedd68620ac825f320e7c03826339 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sat, 2 Dec 2023 06:30:33 +0100 Subject: [PATCH 3/3] usbview: add h7x4 as maintainer --- pkgs/tools/misc/usbview/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/usbview/default.nix b/pkgs/tools/misc/usbview/default.nix index 5a2f90dda25e..17402fe76120 100644 --- a/pkgs/tools/misc/usbview/default.nix +++ b/pkgs/tools/misc/usbview/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "USB viewer for Linux"; license = licenses.gpl2Only; homepage = "http://www.kroah.com/linux-usb/"; - maintainers = with maintainers; [ shamilton ]; + maintainers = with maintainers; [ shamilton h7x4 ]; platforms = platforms.linux; mainProgram = "usbview"; };