diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-02-23 17:22:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-23 17:22:47 +0100 |
| commit | 3b512ca185edb4f2462000d5ee9b0eb72425db24 (patch) | |
| tree | 028528e060a64c4fe6b08a49d258d2a320fa690c /nixos/modules/services/hardware | |
| parent | 36b0efc12f43da365b8d24db8f6c331edb8c2df2 (diff) | |
| parent | d4075700d65b08279ae623a53128cc3c90d41849 (diff) | |
| download | nixlib-3b512ca185edb4f2462000d5ee9b0eb72425db24.tar nixlib-3b512ca185edb4f2462000d5ee9b0eb72425db24.tar.gz nixlib-3b512ca185edb4f2462000d5ee9b0eb72425db24.tar.bz2 nixlib-3b512ca185edb4f2462000d5ee9b0eb72425db24.tar.lz nixlib-3b512ca185edb4f2462000d5ee9b0eb72425db24.tar.xz nixlib-3b512ca185edb4f2462000d5ee9b0eb72425db24.tar.zst nixlib-3b512ca185edb4f2462000d5ee9b0eb72425db24.zip | |
Merge pull request #35065 from jtojnar/fwupd-1.0.5
fwupd: 1.0.5 update & cleanups
Diffstat (limited to 'nixos/modules/services/hardware')
| -rw-r--r-- | nixos/modules/services/hardware/fwupd.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix index 1f4acd21eccf..d8abde2a600a 100644 --- a/nixos/modules/services/hardware/fwupd.nix +++ b/nixos/modules/services/hardware/fwupd.nix @@ -8,12 +8,8 @@ let cfg = config.services.fwupd; originalEtc = let - isRegular = v: v == "regular"; - listFiles = d: builtins.attrNames (filterAttrs (const isRegular) (builtins.readDir d)); - copiedDirs = [ "fwupd/remotes.d" "pki/fwupd" "pki/fwupd-metadata" ]; - originalFiles = concatMap (d: map (f: "${d}/${f}") (listFiles "${pkgs.fwupd}/etc/${d}")) copiedDirs; mkEtcFile = n: nameValuePair n { source = "${pkgs.fwupd}/etc/${n}"; }; - in listToAttrs (map mkEtcFile originalFiles); + in listToAttrs (map mkEtcFile pkgs.fwupd.filesInstalledToEtc); extraTrustedKeys = let mkName = p: "pki/fwupd/${baseNameOf (toString p)}"; |