From 884de18cc60a6abf763f092900fb07c63798a0e1 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Fri, 3 Nov 2023 16:48:20 +0100 Subject: [PATCH 1/2] fwupd: drop unneeded smbios dependency --- pkgs/os-specific/linux/firmware/fwupd/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 3def168d2fa9..d1186e796ee6 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -18,7 +18,6 @@ , curl , libjcat , elfutils -, libsmbios , efivar , valgrind , meson @@ -202,8 +201,6 @@ stdenv.mkDerivation (finalAttrs: { libcbor libqmi xz # for liblzma - ] ++ lib.optionals haveDell [ - libsmbios ] ++ lib.optionals haveFlashrom [ flashrom ]; From 21ef15cc55ec43c4a5f8d952f58e87d964480b0a Mon Sep 17 00:00:00 2001 From: r-vdp Date: Fri, 3 Nov 2023 16:47:56 +0100 Subject: [PATCH 2/2] fwupd: 1.9.6 -> 1.9.7 Release notes: https://github.com/fwupd/fwupd/releases/tag/1.9.7 --- pkgs/os-specific/linux/firmware/fwupd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index d1186e796ee6..f4914d843272 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -8,6 +8,7 @@ , gobject-introspection , gettext , libgudev +, libdrm , polkit , libxmlb , glib @@ -24,7 +25,6 @@ , libuuid , colord , ninja -, gcab , gnutls , protobufc , python3 @@ -123,7 +123,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "1.9.6"; + version = "1.9.7"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; rev = finalAttrs.version; - hash = "sha256-9mA6gETnOmmkI+cdF0kP1moPV6DDvASq1JXarupM/tU="; + hash = "sha256-NhVCIjkwoTZptctIrkU9HgXzjr+KCUZfEKcjoYgAEdM="; }; patches = [ @@ -168,7 +168,6 @@ stdenv.mkDerivation (finalAttrs: { gettext shared-mime-info valgrind - gcab gnutls protobufc # for protoc python @@ -182,6 +181,7 @@ stdenv.mkDerivation (finalAttrs: { gusb sqlite libarchive + libdrm curl elfutils libgudev