public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #77501 from jtojnar/more-loaof-fxes

Browse Source 
tree-wide: fix more warning related to loaOf deprecation
This commit is contained in:
Jan Tojnar 2020-01-12 18:47:34 +01:00 committed by GitHub
commit 61cf52bc17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 80 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
lib/types.nix
View File

@ -340,18 +340,80 @@ rec {
let let
padWidth = stringLength (toString (length def.value)); padWidth = stringLength (toString (length def.value));
unnamed = i: unnamedPrefix + fixedWidthNumber padWidth i; unnamed = i: unnamedPrefix + fixedWidthNumber padWidth i;
anyString = placeholder "name";
nameAttrs = [
{ path = [ "environment" "etc" ];
name = "target";
}
{ path = [ "containers" anyString "bindMounts" ];
name = "mountPoint";
}
{ path = [ "programs" "ssh" "knownHosts" ];
# hostNames is actually a list so we would need to handle it only when singleton
name = "hostNames";
}
{ path = [ "fileSystems" ];
name = "mountPoint";
}
{ path = [ "boot" "specialFileSystems" ];
name = "mountPoint";
}
{ path = [ "services" "znapzend" "zetup" ];
name = "dataset";
}
{ path = [ "services" "znapzend" "zetup" anyString "destinations" ];
name = "label";
}
{ path = [ "services" "geoclue2" "appConfig" ];
name = "desktopID";
}
{ path = [ "home-manager" "users" anyString "programs" "ssh" "matchBlocks" ];
name = "host"; # https://github.com/rycee/home-manager/blob/e8dbc3561373b68d12decb3c0d7c1ba245f138f7/modules/programs/ssh.nix#L265
}
{ path = [ "home-manager" "users" anyString "home" "file" ];
name = "target"; # https://github.com/rycee/home-manager/blob/0e9b7aab3c6c27bf020402e0e2ef20b65c040552/modules/files.nix#L33
}
{ path = [ "home-manager" "users" anyString "xdg" "configFile" ];
name = "target"; # https://github.com/rycee/home-manager/blob/54de0e1d79a1370e57a8f23bef89f99f9b92ab67/modules/misc/xdg.nix#L41
}
{ path = [ "home-manager" "users" anyString "xdg" "dataFile" ];
name = "target"; # https://github.com/rycee/home-manager/blob/54de0e1d79a1370e57a8f23bef89f99f9b92ab67/modules/misc/xdg.nix#L58
}
];
matched = let
equals = a: b: b == anyString || a == b;
fallback = { name = "name"; };
in findFirst ({ path, ... }: all (v: v == true) (zipListsWith equals loc path)) fallback nameAttrs;
nameAttr = matched.name;
nameValueOld = value:
if isList value then
if length value > 0 then
"[ " + concatMapStringsSep " " escapeNixString value + " ]"
else
"[ ]"
else
escapeNixString value;
nameValueNew = value: unnamed:
if isList value then
if length value > 0 then
head value
else
unnamed
else
value;
res = res =
{ inherit (def) file; { inherit (def) file;
value = listToAttrs ( value = listToAttrs (
imap1 (elemIdx: elem: imap1 (elemIdx: elem:
{ name = elem.name or (unnamed elemIdx); { name = nameValueNew (elem.${nameAttr} or (unnamed elemIdx)) (unnamed elemIdx);
value = elem; value = elem;
}) def.value); }) def.value);
}; };
option = concatStringsSep "." loc; option = concatStringsSep "." loc;
sample = take 3 def.value; sample = take 3 def.value;
list = concatMapStrings (x: ''{ name = "${x.name or "unnamed"}"; ...} '') sample; more = lib.optionalString (length def.value > 3) "... ";
set = concatMapStrings (x: ''${x.name or "unnamed"} = {...}; '') sample; list = concatMapStrings (x: ''{ ${nameAttr} = ${nameValueOld (x.${nameAttr} or "unnamed")}; ...} '') sample;
set = concatMapStrings (x: ''${nameValueNew (x.${nameAttr} or "unnamed") "unnamed"} = {...}; '') sample;
msg = '' msg = ''
In file ${def.file} In file ${def.file}
a list is being assigned to the option config.${option}. a list is being assigned to the option config.${option}.
@ -359,10 +421,10 @@ rec {
See https://git.io/fj2zm for more information. See https://git.io/fj2zm for more information.
Do Do
${option} = ${option} =
{ ${set}...} { ${set}${more}}
instead of instead of
${option} = ${option} =
[ ${list}...] [ ${list}${more}]
''; '';
in in
lib.warn msg res lib.warn msg res

5
nixos/modules/services/mail/postfix.nix
View File

@ -612,10 +612,7 @@ in
{ {
environment = { environment = {
etc = singleton etc.postfix.source = "/var/lib/postfix/conf";
{ source = "/var/lib/postfix/conf";
target = "postfix";
};
# This makes it comfortable to run 'postqueue/postdrop' for example. # This makes it comfortable to run 'postqueue/postdrop' for example.
systemPackages = [ pkgs.postfix ]; systemPackages = [ pkgs.postfix ];

2
nixos/modules/services/mail/spamassassin.nix
View File

@ -124,7 +124,7 @@ in
# Allow users to run 'spamc'. # Allow users to run 'spamc'.
environment = { environment = {
etc = singleton { source = spamdEnv; target = "spamassassin"; }; etc.spamassassin.source = spamdEnv;
systemPackages = [ pkgs.spamassassin ]; systemPackages = [ pkgs.spamassassin ];
}; };

22
pkgs/os-specific/linux/rfkill/udev.nix
View File

@ -8,18 +8,18 @@
# udev.packages = [ pkgs.rfkill_udev ]; # udev.packages = [ pkgs.rfkill_udev ];
# #
# Add a hook script in the managed etc directory, e.g.: # Add a hook script in the managed etc directory, e.g.:
# etc = [ # etc."rfkill.hook" = {
# { source = pkgs.writeScript "rtfkill.hook" '' # mode = "0755";
# #!${pkgs.runtimeShell} # text = ''
# #!${pkgs.runtimeShell}
# #
# if [ "$RFKILL_STATE" -eq "1" ]; then # if [ "$RFKILL_STATE" -eq "1" ]; then
# exec ${config.system.build.upstart}/sbin/initctl emit -n antenna-on # exec ${config.system.build.upstart}/sbin/initctl emit -n antenna-on
# else # else
# exec ${config.system.build.upstart}/sbin/initctl emit -n antenna-off # exec ${config.system.build.upstart}/sbin/initctl emit -n antenna-off
# fi # fi
# ''; # '';
# target = "rfkill.hook"; # }
# }
# Note: this package does not need the binaries # Note: this package does not need the binaries
# in the rfkill package. # in the rfkill package.