gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fwupd: 2.1.4 -> 2.1.5 (#530797)

Browse Source
This commit is contained in:
Ramses
2026-06-12 13:00:59 +00:00
committed by GitHub
parent 49a4bd0573 7bce8db1d7
commit 961d458794
5 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/fw/fwupd/0001-Install-fwupdplugin-to-out.patch
+2
View File
@@ -3,6 +3,8 @@ From: r-vdp <ramses@well-founded.dev>
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(-)
pkgs/by-name/fw/fwupd/0002-Add-output-for-installed-tests.patch
+2
View File
@@ -3,6 +3,8 @@ From: r-vdp <ramses@well-founded.dev>
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 +++--
pkgs/by-name/fw/fwupd/0003-Add-option-for-installation-sysconfdir.patch
+4
View File
@@ -3,6 +3,10 @@ From: r-vdp <ramses@well-founded.dev>
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 +-
pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch
+1
View File
@@ -3,6 +3,7 @@ From: r-vdp <ramses@well-founded.dev>
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(-)
pkgs/by-name/fw/fwupd/package.nix
+2 -15
View File
@@ -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,26 +140,13 @@ stdenv.mkDerivation (finalAttrs: {
owner = "fwupd";
repo = "fwupd";
tag = finalAttrs.version;
hash = "sha256-bKBEZR7Wzi9nZYH+KAzh1q+sh2t2Gl3puQmeogNdIsE=";
hash = "sha256-DzQ+N99ZmFRqZc2rN6PSqmoIMXUyrE8Kkn+KnT/AWPc=";
};
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
];