diff options
| author | r-vdp <ramses@well-founded.dev> | 2024-01-24 19:29:37 +0100 |
|---|---|---|
| committer | r-vdp <ramses@well-founded.dev> | 2024-01-24 20:29:01 +0100 |
| commit | 28ea07d4e33c63447e699562d0085f6eeefd6ee0 (patch) | |
| tree | cfb89d5068c056a3dd95d00d77db3e26ed39390b | |
| parent | 5cd2baa57a9ff2d84f2615700434fa04f3067fdb (diff) | |
fwupd: 1.9.11 -> 1.9.12
The fwupd daemon refuses to start when there is an uefi_capsule key without any values in the config file, so I modified the module to only include this key when there are actually values that go inside.
| -rw-r--r-- | nixos/modules/services/hardware/fwupd.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/firmware/fwupd/default.nix | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix index 6b3a109ed6f7f..6fbcbe6764600 100644 --- a/nixos/modules/services/hardware/fwupd.nix +++ b/nixos/modules/services/hardware/fwupd.nix @@ -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 diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index ac1605f979e72..45b3ed333c6a7 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -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 |