Unverified Commit 4ad85b48 authored by Johannes Kirschbauer's avatar Johannes Kirschbauer Committed by GitHub
Browse files

various: lib usage improvements - prefer `removeAttrs` over `filterAttrs` (#455787)

parents 3d0a54f9 69520698

nixos/modules/config/i18n.nix

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

  ++ lib.pipe config.i18n.extraLocaleSettings [

    # See description of extraLocaleSettings for why is this ignored here.

    (lib.filterAttrs (n: v: n != "LANGUAGE"))

    (x: lib.removeAttrs x [ "LANGUAGE" ])

    (lib.mapAttrs (n: v: (sanitizeUTF8Capitalization v)))

    (lib.mapAttrsToList (LCRole: lang: lang + "/" + (config.i18n.localeCharsets.${LCRole} or "UTF-8")))

  ]

nixos/modules/services/hardware/thinkfan.nix

+4 −6
Original line number Diff line number Diff line
@@ -101,14 +101,12 @@ let 
  # removes NixOS special and unused attributes

  sensorToConf =

    { type, query, ... }@args:

    (lib.filterAttrs (

      k: v:

      v != null

      && !(lib.elem k [

    (lib.filterAttrs (k: v: v != null) (

      lib.removeAttrs args [

        "type"

        "query"

      ])

    ) args)

      ]

    ))

    // {

      "${type}" = query;

    };

nixos/modules/services/mail/public-inbox.nix

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ in 
      }

    ];

    services.public-inbox.settings = filterAttrsRecursive (n: v: v != null) {

      publicinbox = mapAttrs (n: filterAttrs (n: v: n != "description")) cfg.inboxes;

      publicinbox = mapAttrs (n: v: removeAttrs v [ "description" ]) cfg.inboxes;

    };

    users = {

      users.public-inbox = {

nixos/modules/services/monitoring/grafana.nix

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



  # Get a submodule without any embedded metadata:

  _filter = x: filterAttrs (k: v: k != "_module") x;

  _filter = x: removeAttrs x [ "_module" ];



  # https://grafana.com/docs/grafana/latest/administration/provisioning/#datasources

  grafanaTypes.datasourceConfig = types.submodule {

nixos/modules/services/monitoring/prometheus/exporters/mail.nix

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ let 
    nameValuePair

    toLower

    filterAttrs

    removeAttrs

    escapeShellArg

    literalExpression

    mkIf
@@ -41,7 +42,7 @@ let 
          )

        else

          nameValuePair (toLower name) value

      ) (filterAttrs (n: _: !(n == "_module")) cfg.configuration)

      ) (removeAttrs cfg.configuration [ "_module" ])

    )

  );