Unverified Commit 6ad2a24f authored by Silvan Mosberger's avatar Silvan Mosberger Committed by GitHub
Browse files

various: lib usage improvements - prefer `attrNames`/`attrValues` over `mapAttrsToList` (#455791)

parents 5754cad8 f27d0fdf

nixos/modules/services/cluster/kubernetes/kubelet.nix

+1 −3
Original line number Diff line number Diff line
@@ -108,9 +108,7 @@ let 
      };

    };



  taints = concatMapStringsSep "," (v: "${v.key}=${v.value}:${v.effect}") (

    mapAttrsToList (n: v: v) cfg.taints

  );

  taints = concatMapStringsSep "," (v: "${v.key}=${v.value}:${v.effect}") (attrValues cfg.taints);

in

{

  imports = [

nixos/modules/services/network-filesystems/orangefs/server.nix

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
let

  cfg = config.services.orangefs.server;



  aliases = lib.mapAttrsToList (alias: url: alias) cfg.servers;

  aliases = lib.attrNames cfg.servers;



  # Maximum handle number is 2^63

  maxHandle = 9223372036854775806;

nixos/modules/services/networking/dhcpcd.nix

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ let 
    map (i: i.name) (

      lib.filter (i: if i.useDHCP != null then !i.useDHCP else i.ipv4.addresses != [ ]) interfaces

    )

    ++ lib.mapAttrsToList (i: _: i) config.networking.sits

    ++ lib.attrNames config.networking.sits

    ++ lib.concatLists (lib.attrValues (lib.mapAttrs (n: v: v.interfaces) config.networking.bridges))

    ++ lib.flatten (

      lib.concatMap (

nixos/modules/services/web-servers/nginx/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ with lib; 
let

  cfg = config.services.nginx;

  inherit (config.security.acme) certs;

  vhostsConfigs = mapAttrsToList (vhostName: vhostConfig: vhostConfig) virtualHosts;

  vhostsConfigs = attrValues virtualHosts;

  acmeEnabledVhosts = filter (

    vhostConfig: vhostConfig.enableACME || vhostConfig.useACMEHost != null

  ) vhostsConfigs;

nixos/modules/tasks/network-interfaces-systemd.nix

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ in 
                        driverOpt:

                        assertTrace (elem driverOpt (knownOptions ++ unknownOptions))

                          "The bond.driverOption `${driverOpt}` cannot be mapped to the list of known networkd bond options. Please add it to the mapping above the assert or to `unknownOptions` should it not exist in networkd."

                      ) (mapAttrsToList (k: _: k) do);

                      ) (attrNames do);

                      "";

                    # get those driverOptions that have been set

                    filterSystemdOptions = filterAttrs (sysDOpt: kOpts: any (kOpt: do ? ${kOpt}) kOpts.optNames);