From 2a1a3ccc39075099513693912bacbdf3920ea0f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= Date: Thu, 11 Jun 2026 01:39:30 +0200 Subject: [PATCH 1/2] fwupd: move patch descriptions --- .../fw/fwupd/0001-Install-fwupdplugin-to-out.patch | 2 ++ .../fwupd/0002-Add-output-for-installed-tests.patch | 2 ++ ...003-Add-option-for-installation-sysconfdir.patch | 4 ++++ .../fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch | 1 + pkgs/by-name/fw/fwupd/package.nix | 13 ------------- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/fw/fwupd/0001-Install-fwupdplugin-to-out.patch b/pkgs/by-name/fw/fwupd/0001-Install-fwupdplugin-to-out.patch index f68d082afd54..184a6f9a825a 100644 --- a/pkgs/by-name/fw/fwupd/0001-Install-fwupdplugin-to-out.patch +++ b/pkgs/by-name/fw/fwupd/0001-Install-fwupdplugin-to-out.patch @@ -3,6 +3,8 @@ From: r-vdp Date: Mon, 28 Oct 2024 12:07:51 +0100 Subject: [PATCH] Install fwupdplugin to out +Install plug-ins and libfwupdplugin to $out output, they are not really +part of the library. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fw/fwupd/0002-Add-output-for-installed-tests.patch b/pkgs/by-name/fw/fwupd/0002-Add-output-for-installed-tests.patch index 1c1ce14a4b9b..c56be1a1d28e 100644 --- a/pkgs/by-name/fw/fwupd/0002-Add-output-for-installed-tests.patch +++ b/pkgs/by-name/fw/fwupd/0002-Add-output-for-installed-tests.patch @@ -3,6 +3,8 @@ From: r-vdp Date: Tue, 15 Oct 2024 14:49:53 +0200 Subject: [PATCH] Add output for installed tests +Installed tests are installed to different output we also cannot have +fwupd-tests.conf in $out/etc since it would form a cycle. --- data/tests/meson.build | 2 +- meson.build | 5 +++-- diff --git a/pkgs/by-name/fw/fwupd/0003-Add-option-for-installation-sysconfdir.patch b/pkgs/by-name/fw/fwupd/0003-Add-option-for-installation-sysconfdir.patch index 999acdd4e874..e0f0a52f61fa 100644 --- a/pkgs/by-name/fw/fwupd/0003-Add-option-for-installation-sysconfdir.patch +++ b/pkgs/by-name/fw/fwupd/0003-Add-option-for-installation-sysconfdir.patch @@ -3,6 +3,10 @@ From: r-vdp Date: Tue, 15 Oct 2024 11:46:38 +0200 Subject: [PATCH] Add option for installation sysconfdir +Since /etc is the domain of NixOS, not Nix, we cannot install files +there. Let's install the files to $prefix/etc while still reading them +from /etc. NixOS module for fwupd will take care of copying the files +appropriately. --- data/bios-settings.d/meson.build | 2 +- data/meson.build | 2 +- diff --git a/pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch b/pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch index 8f044f425216..b2876ca37a6d 100644 --- a/pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch +++ b/pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch @@ -3,6 +3,7 @@ From: r-vdp Date: Mon, 28 Oct 2024 12:08:49 +0100 Subject: [PATCH] Get the efi app from fwupd-efi +EFI capsule is located in fwupd-efi now. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix index 8e9d9f3f1ae2..d8af64f12d32 100644 --- a/pkgs/by-name/fw/fwupd/package.nix +++ b/pkgs/by-name/fw/fwupd/package.nix @@ -144,22 +144,9 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - # Install plug-ins and libfwupdplugin to $out output, - # they are not really part of the library. ./0001-Install-fwupdplugin-to-out.patch - - # Installed tests are installed to different output - # we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle. ./0002-Add-output-for-installed-tests.patch - - # Since /etc is the domain of NixOS, not Nix, - # we cannot install files there. - # Let’s install the files to $prefix/etc - # while still reading them from /etc. - # NixOS module for fwupd will take take care of copying the files appropriately. ./0003-Add-option-for-installation-sysconfdir.patch - - # EFI capsule is located in fwupd-efi now. ./0004-Get-the-efi-app-from-fwupd-efi.patch ]; From 7bce8db1d7502e36019dd28b71a2dc9554dcef81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= Date: Thu, 11 Jun 2026 01:40:57 +0200 Subject: [PATCH 2/2] fwupd: 2.1.4 -> 2.1.5 Diff: https://github.com/fwupd/fwupd/compare/2.1.4...2.1.5 Changelog: https://github.com/fwupd/fwupd/releases/tag/2.1.5 --- pkgs/by-name/fw/fwupd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix index d8af64f12d32..0025fb8d550a 100644 --- a/pkgs/by-name/fw/fwupd/package.nix +++ b/pkgs/by-name/fw/fwupd/package.nix @@ -122,7 +122,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "2.1.4"; + version = "2.1.5"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -140,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; tag = finalAttrs.version; - hash = "sha256-bKBEZR7Wzi9nZYH+KAzh1q+sh2t2Gl3puQmeogNdIsE="; + hash = "sha256-DzQ+N99ZmFRqZc2rN6PSqmoIMXUyrE8Kkn+KnT/AWPc="; }; patches = [