From 28ea07d4e33c63447e699562d0085f6eeefd6ee0 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Wed, 24 Jan 2024 19:29:37 +0100 Subject: [PATCH 1/2] 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. --- nixos/modules/services/hardware/fwupd.nix | 1 + 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 6b3a109ed6f7..6fbcbe676460 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 ac1605f979e7..45b3ed333c6a 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 From 643b6647fbc3a5103ee3eb526c177aa9b6194cff Mon Sep 17 00:00:00 2001 From: r-vdp Date: Wed, 24 Jan 2024 20:27:04 +0100 Subject: [PATCH 2/2] fwupd: move to by-name --- .../fw}/fwupd/add-option-for-installation-sysconfdir.patch | 0 .../linux/firmware => by-name/fw}/fwupd/efi-app-path.patch | 0 .../fw}/fwupd/install-fwupdplugin-to-out.patch | 0 .../firmware => by-name/fw}/fwupd/installed-tests-path.patch | 0 .../firmware/fwupd/default.nix => by-name/fw/fwupd/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 6 files changed, 2 deletions(-) rename pkgs/{os-specific/linux/firmware => by-name/fw}/fwupd/add-option-for-installation-sysconfdir.patch (100%) rename pkgs/{os-specific/linux/firmware => by-name/fw}/fwupd/efi-app-path.patch (100%) rename pkgs/{os-specific/linux/firmware => by-name/fw}/fwupd/install-fwupdplugin-to-out.patch (100%) rename pkgs/{os-specific/linux/firmware => by-name/fw}/fwupd/installed-tests-path.patch (100%) rename pkgs/{os-specific/linux/firmware/fwupd/default.nix => by-name/fw/fwupd/package.nix} (100%) diff --git a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/pkgs/by-name/fw/fwupd/add-option-for-installation-sysconfdir.patch similarity index 100% rename from pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch rename to pkgs/by-name/fw/fwupd/add-option-for-installation-sysconfdir.patch diff --git a/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch b/pkgs/by-name/fw/fwupd/efi-app-path.patch similarity index 100% rename from pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch rename to pkgs/by-name/fw/fwupd/efi-app-path.patch diff --git a/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch b/pkgs/by-name/fw/fwupd/install-fwupdplugin-to-out.patch similarity index 100% rename from pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch rename to pkgs/by-name/fw/fwupd/install-fwupdplugin-to-out.patch diff --git a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch b/pkgs/by-name/fw/fwupd/installed-tests-path.patch similarity index 100% rename from pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch rename to pkgs/by-name/fw/fwupd/installed-tests-path.patch diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/by-name/fw/fwupd/package.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/fwupd/default.nix rename to pkgs/by-name/fw/fwupd/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70421bfffb60..3afb06992757 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27776,8 +27776,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 { };