treewide: fix eval related to with lib; removal

NixOS · Sep 4, 2024 · f6306c0 · f6306c0
1 parent af18f59
commit f6306c0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
@@ -13,7 +13,7 @@
         };
         defaultText = lib.literalExpression ''
           pkgs.glibcLocales.override {
-            allLocales = any (x: x == "all") config.i18n.supportedLocales;
+            allLocales = lib.any (x: x == "all") config.i18n.supportedLocales;
             locales = config.i18n.supportedLocales;
           }
         '';

diff --git a/nixos/modules/config/resolvconf.nix b/nixos/modules/config/resolvconf.nix
@@ -35,7 +35,7 @@ in
     (lib.mkRenamedOptionModule [ "networking" "dnsExtensionMechanism" ] [ "networking" "resolvconf" "dnsExtensionMechanism" ])
     (lib.mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ])
     (lib.mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ])
-    (lib.mkRemovedOptionModule [ "networking" "resolvconf" "useHostResolvConf" ] "This option was never used for lib.anything lib.anyways")
+    (lib.mkRemovedOptionModule [ "networking" "resolvconf" "useHostResolvConf" ] "This option was never used for anything anyways")
   ];
 
   options = {

diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -205,13 +205,13 @@ in {
       preStart =
         let replacePlugins =
               lib.optionalString (cfg.plugins != null) (
-                let pluginCmds = lib.attrsets.lib.mapAttrsToList
+                let pluginCmds = lib.mapAttrsToList
                       (n: v: "cp ${v} ${cfg.home}/plugins/${n}.jpi")
                       cfg.plugins;
                 in ''
                   rm -r ${cfg.home}/plugins || true
                   mkdir -p ${cfg.home}/plugins
-                  ${lib.strings.lib.concatStringsSep "\n" pluginCmds}
+                  ${lib.concatStringsSep "\n" pluginCmds}
                 '');
         in ''
           rm -rf ${cfg.home}/war