Merge pull request #283568 from r-vdp/fwupd_1_9_12
fwupd: 1.9.11 -> 1.9.12
This commit is contained in:
commit
c62395c96d
@ -16,6 +16,7 @@ let
|
||||
"fwupd/fwupd.conf" = {
|
||||
source = format.generate "fwupd.conf" {
|
||||
fwupd = cfg.daemonSettings;
|
||||
} // lib.optionalAttrs (lib.length (lib.attrNames cfg.uefiCapsuleSettings) != 0) {
|
||||
uefi_capsule = cfg.uefiCapsuleSettings;
|
||||
};
|
||||
# fwupd tries to chmod the file if it doesn't have the right permissions
|
||||
|
@ -121,7 +121,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fwupd";
|
||||
version = "1.9.11";
|
||||
version = "1.9.12";
|
||||
|
||||
# libfwupd goes to lib
|
||||
# daemon, plug-ins and libfwupdplugin go to out
|
||||
@ -132,7 +132,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "fwupd";
|
||||
repo = "fwupd";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-chPZ9nGhFcaExoJDJvFy8terIGZRU6S90RKBYkoWyGQ=";
|
||||
hash = "sha256-hPRp61m/XTXFacYkBOb4SsG4fcFvWrdMfc+sxLk5/sQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -256,9 +256,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
contrib/generate-man.py \
|
||||
po/test-deps
|
||||
|
||||
substituteInPlace data/installed-tests/fwupdmgr-p2p.sh \
|
||||
--replace "gdbus" ${glib.bin}/bin/gdbus
|
||||
|
||||
# tests fail with: Failed to load SMBIOS: neither SMBIOS or DT found
|
||||
sed -i 's/test(.*)//' plugins/lenovo-thinklmi/meson.build
|
||||
sed -i 's/test(.*)//' plugins/mtd/meson.build
|
@ -27782,8 +27782,6 @@ with pkgs;
|
||||
|
||||
fwanalyzer = callPackage ../tools/filesystems/fwanalyzer { };
|
||||
|
||||
fwupd = callPackage ../os-specific/linux/firmware/fwupd { };
|
||||
|
||||
fwupd-efi = callPackage ../os-specific/linux/firmware/fwupd-efi { };
|
||||
|
||||
firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { };
|
||||
|
Loading…
Reference in New Issue
Block a user