Unverified Commit 28ea07d4 authored by r-vdp's avatar r-vdp
Browse files

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.
parent 5cd2baa5

nixos/modules/services/hardware/fwupd.nix

+1 −0
Original line number Diff line number Diff line
@@ -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

pkgs/os-specific/linux/firmware/fwupd/default.nix

+2 −5
Original line number Diff line number Diff line
@@ -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