mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-01 01:57:37 +03:00
Merge pull request #212970 from R-VdP/fwupd_1_8_10
fwupd: 1.8.9 -> 1.8.10
This commit is contained in:
commit
77a77721cd
@ -54,6 +54,7 @@
|
||||
, libmbim
|
||||
, libcbor
|
||||
, xz
|
||||
, enableFlashrom ? false
|
||||
}:
|
||||
|
||||
let
|
||||
@ -76,7 +77,7 @@ let
|
||||
# # Currently broken on Aarch64
|
||||
# haveFlashrom = isx86;
|
||||
# Experimental
|
||||
haveFlashrom = false;
|
||||
haveFlashrom = isx86 && enableFlashrom;
|
||||
|
||||
runPythonCommand = name: buildCommandPython: runCommand name {
|
||||
nativeBuildInputs = [ python3 ];
|
||||
@ -116,7 +117,7 @@ let
|
||||
|
||||
self = stdenv.mkDerivation rec {
|
||||
pname = "fwupd";
|
||||
version = "1.8.9";
|
||||
version = "1.8.10";
|
||||
|
||||
# libfwupd goes to lib
|
||||
# daemon, plug-ins and libfwupdplugin go to out
|
||||
@ -125,7 +126,7 @@ let
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
|
||||
hash = "sha256-cZp5GsS6WYiuuT7EJ3i9ZdM8sHXQwJO1wE5eFoK+Uoo=";
|
||||
hash = "sha256-vvNUidNdhW9xeksjEVnkIR7CZ4oBQizZJRMFtZUq6Ow=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -332,7 +333,6 @@ let
|
||||
"fwupd/remotes.d/lvfs.conf"
|
||||
"fwupd/remotes.d/vendor.conf"
|
||||
"fwupd/remotes.d/vendor-directory.conf"
|
||||
"fwupd/thunderbolt.conf"
|
||||
"fwupd/uefi_capsule.conf"
|
||||
"pki/fwupd/GPG-KEY-Linux-Foundation-Firmware"
|
||||
"pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service"
|
||||
@ -347,6 +347,8 @@ let
|
||||
"fwupd/redfish.conf"
|
||||
] ++ lib.optionals haveMSR [
|
||||
"fwupd/msr.conf"
|
||||
] ++ lib.optionals isx86 [
|
||||
"fwupd/thunderbolt.conf"
|
||||
];
|
||||
|
||||
# DisabledPlugins key in fwupd/daemon.conf
|
||||
|
Loading…
Reference in New Issue
Block a user