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

treewide: remove redundant quotes

Browse Source
This commit is contained in:
volth
2019-08-26 21:40:19 +00:00
parent fe9c9f719d
commit 35d68ef143
293 changed files with 860 additions and 860 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/tasks/filesystems.nix
+2 -2
View File
@@ -12,7 +12,7 @@ let
fileSystems' = toposort fsBefore (attrValues config.fileSystems);
fileSystems = if fileSystems' ? "result"
fileSystems = if fileSystems' ? result
then # use topologically sorted fileSystems everywhere
fileSystems'.result
else # the assertion below will catch this,
@@ -211,7 +211,7 @@ in
ls = sep: concatMapStringsSep sep (x: x.mountPoint);
notAutoResizable = fs: fs.autoResize && !(hasPrefix "ext" fs.fsType || fs.fsType == "f2fs");
in [
{ assertion = ! (fileSystems' ? "cycle");
{ assertion = ! (fileSystems' ? cycle);
message = "The ‘fileSystems’ option can't be topologically sorted: mountpoint dependency path ${ls " -> " fileSystems'.cycle} loops to ${ls ", " fileSystems'.loops}";
}
{ assertion = ! (any notAutoResizable fileSystems);
nixos/modules/tasks/filesystems/zfs.nix
+2 -2
View File
@@ -469,7 +469,7 @@ in
map createSyncService allPools ++
map createZfsService [ "zfs-mount" "zfs-share" "zfs-zed" ]);
systemd.targets."zfs-import" =
systemd.targets.zfs-import =
let
services = map (pool: "zfs-import-${pool}.service") dataPools;
in
@@ -479,7 +479,7 @@ in
wantedBy = [ "zfs.target" ];
};
systemd.targets."zfs".wantedBy = [ "multi-user.target" ];
systemd.targets.zfs.wantedBy = [ "multi-user.target" ];
})
(mkIf enableAutoSnapshots {
nixos/modules/tasks/kbd.nix
+3 -3
View File
@@ -73,7 +73,7 @@ in
config = mkMerge [
(mkIf (!setVconsole) {
systemd.services."systemd-vconsole-setup".enable = false;
systemd.services.systemd-vconsole-setup.enable = false;
})
(mkIf setVconsole (mkMerge [
@@ -83,7 +83,7 @@ in
# virtual consoles.
environment.etc."vconsole.conf".source = vconsoleConf;
# Provide kbd with additional packages.
environment.etc."kbd".source = "${kbdEnv}/share";
environment.etc.kbd.source = "${kbdEnv}/share";
boot.initrd.preLVMCommands = mkBefore ''
kbd_mode ${if isUnicode then "-u" else "-a"} -C /dev/console
@@ -99,7 +99,7 @@ in
'') config.i18n.consoleColors}
'';
systemd.services."systemd-vconsole-setup" =
systemd.services.systemd-vconsole-setup =
{ before = [ "display-manager.service" ];
after = [ "systemd-udev-settle.service" ];
restartTriggers = [ vconsoleConf kbdEnv ];
nixos/modules/tasks/network-interfaces-scripted.nix
+2 -2
View File
@@ -498,8 +498,8 @@ let
// mapAttrs' createSitDevice cfg.sits
// mapAttrs' createVlanDevice cfg.vlans
// {
"network-setup" = networkSetup;
"network-local-commands" = networkLocalCommands;
network-setup = networkSetup;
network-local-commands = networkLocalCommands;
};
services.udev.extraRules =
nixos/modules/tasks/network-interfaces-systemd.nix
+3 -3
View File
@@ -160,14 +160,14 @@ in
(mapAttrsToList (k: _: k) do); "";
# get those driverOptions that have been set
filterSystemdOptions = filterAttrs (sysDOpt: kOpts:
any (kOpt: do ? "${kOpt}") kOpts.optNames);
any (kOpt: do ? ${kOpt}) kOpts.optNames);
# build final set of systemd options to bond values
buildOptionSet = mapAttrs (_: kOpts: with kOpts;
# we simply take the first set kernel bond option
# (one option has multiple names, which is silly)
head (map (optN: valTransform (do."${optN}"))
head (map (optN: valTransform (do.${optN}))
# only map those that exist
(filter (o: do ? "${o}") optNames)));
(filter (o: do ? ${o}) optNames)));
in seq assertNoUnknownOption
(buildOptionSet (filterSystemdOptions driverOptionMapping));
nixos/modules/tasks/network-interfaces.nix
+9 -9
View File
@@ -799,19 +799,19 @@ in
networking.wlanInterfaces = mkOption {
default = { };
example = literalExample {
"wlan-station0" = {
wlan-station0 = {
device = "wlp6s0";
};
"wlan-adhoc0" = {
wlan-adhoc0 = {
type = "ibss";
device = "wlp6s0";
mac = "02:00:00:00:00:01";
};
"wlan-p2p0" = {
wlan-p2p0 = {
device = "wlp6s0";
mac = "02:00:00:00:00:02";
};
"wlan-ap0" = {
wlan-ap0 = {
device = "wlp6s0";
mac = "02:00:00:00:00:03";
};
@@ -994,7 +994,7 @@ in
domainname "${cfg.domain}"
'';
environment.etc."hostid" = mkIf (cfg.hostId != null)
environment.etc.hostid = mkIf (cfg.hostId != null)
{ source = pkgs.runCommand "gen-hostid" { preferLocalBuild = true; } ''
hi="${cfg.hostId}"
${if pkgs.stdenv.isBigEndian then ''
@@ -1007,7 +1007,7 @@ in
# static hostname configuration needed for hostnamectl and the
# org.freedesktop.hostname1 dbus service (both provided by systemd)
environment.etc."hostname" = mkIf (cfg.hostName != "")
environment.etc.hostname = mkIf (cfg.hostName != "")
{
text = cfg.hostName + "\n";
};
@@ -1027,7 +1027,7 @@ in
# The network-interfaces target is kept for backwards compatibility.
# New modules must NOT use it.
systemd.targets."network-interfaces" =
systemd.targets.network-interfaces =
{ description = "All Network Interfaces (deprecated)";
wantedBy = [ "network.target" ];
before = [ "network.target" ];
@@ -1162,13 +1162,13 @@ in
in
flip (concatMapStringsSep "\n") (attrNames wlanDeviceInterfaces) (device:
let
interfaces = wlanListDeviceFirst device wlanDeviceInterfaces."${device}";
interfaces = wlanListDeviceFirst device wlanDeviceInterfaces.${device};
curInterface = elemAt interfaces 0;
newInterfaces = drop 1 interfaces;
in ''
# It is important to have that rule first as overwriting the NAME attribute also prevents the
# next rules from matching.
${flip (concatMapStringsSep "\n") (wlanListDeviceFirst device wlanDeviceInterfaces."${device}") (interface:
${flip (concatMapStringsSep "\n") (wlanListDeviceFirst device wlanDeviceInterfaces.${device}) (interface:
''ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", ENV{INTERFACE}=="${interface._iName}", ${systemdAttrs interface._iName}, RUN+="${newInterfaceScript device interface}"'')}
# Add the required, new WLAN interfaces to the default WLAN interface with the