movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

Merge pull request #79371 from jtojnar/hughsie-pkgs

Browse source 
fwupd: split daemon again
This commit is contained in:
Jan Tojnar 2020-02-07 00:35:27 +01:00 • committed by GitHub
commit 07281f23b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 64 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
nixos/modules/services/hardware/fwupd.nix
View file

@ -53,7 +53,7 @@ in {
blacklistPlugins = mkOption {
type = types.listOf types.str;
default = [ "test" ];
default = [];
example = [ "udev" ];
description = ''
Allow blacklisting specific plugins
@ -91,6 +91,9 @@ in {
###### implementation
config = mkIf cfg.enable {
# Disable test related plug-ins implicitly so that users do not have to care about them.
services.fwupd.blacklistPlugins = cfg.package.defaultBlacklistedPlugins;
environment.systemPackages = [ cfg.package ];
environment.etc = {

4
nixos/tests/installed-tests/fwupd.nix
View file

@ -1,11 +1,11 @@
{ pkgs, makeInstalledTest, ... }:
{ pkgs, lib, makeInstalledTest, ... }:
makeInstalledTest {
tested = pkgs.fwupd;
testConfig = {
services.fwupd.enable = true;
services.fwupd.blacklistPlugins = []; # don't blacklist test plugin
services.fwupd.blacklistPlugins = lib.mkForce []; # don't blacklist test plugin
services.fwupd.enableTestRemote = true;
virtualisation.memorySize = 768;
};