summary refs log tree commit diff
path: root/pkgs/os-specific/linux/firmware/fwupd
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-02-06 19:31:59 +0100
committerJan Tojnar <jtojnar@gmail.com>2020-02-06 22:32:13 +0100
commite5f7dacc93ef3657baf7ddeccceaa6a8617c8b2a (patch)
treed1908010f9bfe7d8672ef2950539c402fa78c35d /pkgs/os-specific/linux/firmware/fwupd
parentc942013dbc270cdeb3f36c8d36d9b0c29b57c057 (diff)
downloadnixpkgs-e5f7dacc93ef3657baf7ddeccceaa6a8617c8b2a.tar
nixpkgs-e5f7dacc93ef3657baf7ddeccceaa6a8617c8b2a.tar.gz
nixpkgs-e5f7dacc93ef3657baf7ddeccceaa6a8617c8b2a.tar.bz2
nixpkgs-e5f7dacc93ef3657baf7ddeccceaa6a8617c8b2a.tar.lz
nixpkgs-e5f7dacc93ef3657baf7ddeccceaa6a8617c8b2a.tar.xz
nixpkgs-e5f7dacc93ef3657baf7ddeccceaa6a8617c8b2a.tar.zst
nixpkgs-e5f7dacc93ef3657baf7ddeccceaa6a8617c8b2a.zip
nixos/fwupd: disable test plugins implicitly
invalid test was introduced in https://github.com/fwupd/fwupd/commit/297d1598ef0739dc27c6cc884697bfd2ca03f2f5
and it is disabled in the shipped daemon.conf.

I forgot to reflect that in the module, which caused the daemon to print the following on start-up:

    FuEngine             invalid has incorrect built version invalid

and the command to warn:

    WARNING: The daemon has loaded 3rd party code and is no longer supported by the upstream developers!

To reduce the change of this happening in the future, I moved the list of default disabled plug-ins to the package expression.

I also set the value of the NixOS module option in the config section of the module instead of the default value used previously,
which will allow users to not care about these plug-ins.
Diffstat (limited to 'pkgs/os-specific/linux/firmware/fwupd')
-rw-r--r--pkgs/os-specific/linux/firmware/fwupd/default.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index ee5e9fe5a64..eac2ed4acd0 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -1,4 +1,4 @@
-# Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc
+# Updating? Keep $out/etc synchronized with passthru keys
 
 { stdenv
 , fetchurl
@@ -274,6 +274,12 @@ stdenv.mkDerivation rec {
       "pki/fwupd-metadata/LVFS-CA.pem"
     ];
 
+    # BlacklistPlugins key in fwupd/daemon.conf
+    defaultBlacklistedPlugins = [
+      "test"
+      "invalid"
+    ];
+
     tests = {
       installedTests = nixosTests.installed-tests.fwupd;
     };