b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #193694 from cab404/fwupd-remote-list

Browse source 
nixos.fwupd: add remote list option
This commit is contained in:
Alexander Bantyev 2022-10-07 14:23:19 +04:00 committed by GitHub
parent 1480b43ad1 e03e61f62e
commit 99cc02fe98
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,18 +33,26 @@ let
mkEtcFile = p: nameValuePair (mkName p) { source = p; }; mkEtcFile = p: nameValuePair (mkName p) { source = p; };
in listToAttrs (map mkEtcFile cfg.extraTrustedKeys); in listToAttrs (map mkEtcFile cfg.extraTrustedKeys);
# We cannot include the file in $out and rely on filesInstalledToEtc enableRemote = base: remote: {
# to install it because it would create a cyclic dependency between "fwupd/remotes.d/${remote}.conf" = {
# the outputs. We also need to enable the remote, source = pkgs.runCommand "${remote}-enabled.conf" {} ''
# which should not be done by default.
testRemote = if cfg.enableTestRemote then {
"fwupd/remotes.d/fwupd-tests.conf" = {
source = pkgs.runCommand "fwupd-tests-enabled.conf" {} ''
sed "s,^Enabled=false,Enabled=true," \ sed "s,^Enabled=false,Enabled=true," \
"${cfg.package.installedTests}/etc/fwupd/remotes.d/fwupd-tests.conf" > "$out" "${base}/etc/fwupd/remotes.d/${remote}.conf" > "$out"
''; '';
}; };
} else {}; };
remotes = (foldl'
(configFiles: remote: configFiles // (enableRemote cfg.package remote))
{}
cfg.extraRemotes
) // (
# We cannot include the file in $out and rely on filesInstalledToEtc
# to install it because it would create a cyclic dependency between
# the outputs. We also need to enable the remote,
# which should not be done by default.
mkIf cfg.enableTestRemote (enableRemote cfg.package.installedTests "fwupd-tests")
);
in { in {
###### interface ###### interface
@ -86,6 +94,15 @@ in {
''; '';
}; };
extraRemotes = mkOption {
type = with types; listOf str;
default = [];
example = [ "lvfs-testing" ];
description = lib.mdDoc ''
Enables extra remotes in fwupd. See `/etc/fwupd/remotes.d`.
'';
};
enableTestRemote = mkOption { enableTestRemote = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
@ -119,7 +136,7 @@ in {
environment.systemPackages = [ cfg.package ]; environment.systemPackages = [ cfg.package ];
# customEtc overrides some files from the package # customEtc overrides some files from the package
environment.etc = originalEtc // customEtc // extraTrustedKeys // testRemote; environment.etc = originalEtc // customEtc // extraTrustedKeys // remotes;
services.dbus.packages = [ cfg.package ]; services.dbus.packages = [ cfg.package ];