From 970161ad3d08c0173e0d4db4725bf1bd944f32ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Oct 2024 10:12:48 +0000 Subject: [PATCH 1/2] hwinfo: 23.2 -> 23.3 --- pkgs/by-name/hw/hwinfo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hw/hwinfo/package.nix b/pkgs/by-name/hw/hwinfo/package.nix index 14e922df1533..e097c86af316 100644 --- a/pkgs/by-name/hw/hwinfo/package.nix +++ b/pkgs/by-name/hw/hwinfo/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hwinfo"; - version = "23.2"; + version = "23.3"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = finalAttrs.version; - hash = "sha256-YAhsnE1DJ5UlYAuhDxS/5IpfIJB6DrhCT3E0YiKENjU="; + hash = "sha256-TOW6jD7ZTA32H4oByaVkDAjUSwo9JSID7WSBYj7ZzBs="; }; nativeBuildInputs = [ From 7ad1f4f4556ad364be00c2e40cd62662a67b80db Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Fri, 25 Oct 2024 21:40:07 +0200 Subject: [PATCH 2/2] hwinfo: patch shebangs for perl --- pkgs/by-name/hw/hwinfo/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/hw/hwinfo/package.nix b/pkgs/by-name/hw/hwinfo/package.nix index e097c86af316..cfb940d66cd1 100644 --- a/pkgs/by-name/hw/hwinfo/package.nix +++ b/pkgs/by-name/hw/hwinfo/package.nix @@ -65,6 +65,8 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "/usr/bin/udevinfo" "${systemdMinimal}/bin/udevinfo" \ --replace-fail "/usr/bin/udevadm" "${systemdMinimal}/bin/udevadm" + # Replace /usr/bin/perl + patchShebangs src/ids/convert_hd ''; # The pci/usb ids in hwinfo are ancient. We can get a more up-to-date list simply by copying from systemd