movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

treewide: fix eval related to with lib; removal (#339356)

Browse source
This commit is contained in:
Philip Taron 2024-09-04 09:42:58 -07:00 • committed by GitHub
commit 271d117596
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/config/i18n.nix
View file

@ -13,7 +13,7 @@
}; };
defaultText = lib.literalExpression '' defaultText = lib.literalExpression ''
pkgs.glibcLocales.override { pkgs.glibcLocales.override {
allLocales = any (x: x == "all") config.i18n.supportedLocales; allLocales = lib.any (x: x == "all") config.i18n.supportedLocales;
locales = config.i18n.supportedLocales; locales = config.i18n.supportedLocales;
} }
''; '';

2
nixos/modules/config/resolvconf.nix
View file

@ -35,7 +35,7 @@ in
(lib.mkRenamedOptionModule [ "networking" "dnsExtensionMechanism" ] [ "networking" "resolvconf" "dnsExtensionMechanism" ]) (lib.mkRenamedOptionModule [ "networking" "dnsExtensionMechanism" ] [ "networking" "resolvconf" "dnsExtensionMechanism" ])
(lib.mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ]) (lib.mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ])
(lib.mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ]) (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 = { options = {

4
nixos/modules/services/continuous-integration/jenkins/default.nix
View file

@ -205,13 +205,13 @@ in {
preStart = preStart =
let replacePlugins = let replacePlugins =
lib.optionalString (cfg.plugins != null) ( lib.optionalString (cfg.plugins != null) (
let pluginCmds = lib.attrsets.lib.mapAttrsToList let pluginCmds = lib.mapAttrsToList
(n: v: "cp ${v} ${cfg.home}/plugins/${n}.jpi") (n: v: "cp ${v} ${cfg.home}/plugins/${n}.jpi")
cfg.plugins; cfg.plugins;
in '' in ''
rm -r ${cfg.home}/plugins || true rm -r ${cfg.home}/plugins || true
mkdir -p ${cfg.home}/plugins mkdir -p ${cfg.home}/plugins
${lib.strings.lib.concatStringsSep "\n" pluginCmds} ${lib.concatStringsSep "\n" pluginCmds}
''); '');
in '' in ''
rm -rf ${cfg.home}/war rm -rf ${cfg.home}/war