From e5f7dacc93ef3657baf7ddeccceaa6a8617c8b2a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 6 Feb 2020 19:31:59 +0100 Subject: 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. --- pkgs/os-specific/linux/firmware/fwupd/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'pkgs/os-specific/linux/firmware/fwupd') 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; }; -- cgit 1.4.1