at 18.09-beta 19 kB view raw
1{ lib, pkgs, ... }: 2 3with lib; 4 5{ 6 imports = [ 7 # !!! These were renamed the other way, but got reverted later. 8 # !!! Drop these before 18.09 is released. 9 (mkRenamedOptionModule [ "system" "nixos" "stateVersion" ] [ "system" "stateVersion" ]) 10 (mkRenamedOptionModule [ "system" "nixos" "defaultChannel" ] [ "system" "defaultChannel" ]) 11 12 (mkRenamedOptionModule [ "environment" "x11Packages" ] [ "environment" "systemPackages" ]) 13 (mkRenamedOptionModule [ "environment" "enableBashCompletion" ] [ "programs" "bash" "enableCompletion" ]) 14 (mkRenamedOptionModule [ "environment" "nix" ] [ "nix" "package" ]) 15 (mkRenamedOptionModule [ "fonts" "enableFontConfig" ] [ "fonts" "fontconfig" "enable" ]) 16 (mkRenamedOptionModule [ "fonts" "extraFonts" ] [ "fonts" "fonts" ]) 17 18 (mkRenamedOptionModule [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ]) 19 (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "hardware" "enableRedistributableFirmware" ]) 20 (mkRenamedOptionModule [ "networking" "enableIntel3945ABGFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) 21 (mkRenamedOptionModule [ "networking" "enableIntel2100BGFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) 22 (mkRenamedOptionModule [ "networking" "enableRalinkFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) 23 (mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) 24 (mkRenamedOptionModule [ "networking" "networkmanager" "useDnsmasq" ] [ "networking" "networkmanager" "dns" ]) 25 26 (mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ]) 27 (mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ] 28 (config: 29 let enabled = getAttrFromPath [ "services" "printing" "gutenprint" ] config; 30 in if enabled then [ pkgs.gutenprint ] else [ ])) 31 (mkRenamedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ]) 32 (mkRemovedOptionModule [ "services" "ddclient" "homeDir" ] "") 33 (mkRenamedOptionModule [ "services" "elasticsearch" "host" ] [ "services" "elasticsearch" "listenAddress" ]) 34 (mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ]) 35 (mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ]) 36 (mkRenamedOptionModule [ "services" "i2pd" "extIp" ] [ "services" "i2pd" "address" ]) 37 (mkRenamedOptionModule [ "services" "kibana" "host" ] [ "services" "kibana" "listenAddress" ]) 38 (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "admissionControl" ] [ "services" "kubernetes" "apiserver" "enableAdmissionPlugins" ]) 39 (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"]) 40 (mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "publicAddress" ] "") 41 (mkRenamedOptionModule [ "services" "kubernetes" "addons" "dashboard" "enableRBAC" ] [ "services" "kubernetes" "addons" "dashboard" "rbac" "enable" ]) 42 (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ]) 43 (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ]) 44 (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "defaultListenAddress" ]) 45 (mkRenamedOptionModule [ "services" "neo4j" "listenAddress" ] [ "services" "neo4j" "defaultListenAddress" ]) 46 (mkRenamedOptionModule [ "services" "neo4j" "enableBolt" ] [ "services" "neo4j" "bolt" "enable" ]) 47 (mkRenamedOptionModule [ "services" "neo4j" "enableHttps" ] [ "services" "neo4j" "https" "enable" ]) 48 (mkRenamedOptionModule [ "services" "neo4j" "certDir" ] [ "services" "neo4j" "directories" "certificates" ]) 49 (mkRenamedOptionModule [ "services" "neo4j" "dataDir" ] [ "services" "neo4j" "directories" "home" ]) 50 (mkRemovedOptionModule [ "services" "neo4j" "port" ] "Use services.neo4j.http.listenAddress instead.") 51 (mkRemovedOptionModule [ "services" "neo4j" "boltPort" ] "Use services.neo4j.bolt.listenAddress instead.") 52 (mkRemovedOptionModule [ "services" "neo4j" "httpsPort" ] "Use services.neo4j.https.listenAddress instead.") 53 (mkRenamedOptionModule [ "services" "shout" "host" ] [ "services" "shout" "listenAddress" ]) 54 (mkRenamedOptionModule [ "services" "sslh" "host" ] [ "services" "sslh" "listenAddress" ]) 55 (mkRenamedOptionModule [ "services" "statsd" "host" ] [ "services" "statsd" "listenAddress" ]) 56 (mkRenamedOptionModule [ "services" "subsonic" "host" ] [ "services" "subsonic" "listenAddress" ]) 57 (mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ]) 58 (mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ]) 59 60 (mkRenamedOptionModule [ "services" "gitlab" "stateDir" ] [ "services" "gitlab" "statePath" ]) 61 (mkRemovedOptionModule [ "services" "gitlab" "satelliteDir" ] "") 62 63 (mkRenamedOptionModule [ "services" "clamav" "updater" "config" ] [ "services" "clamav" "updater" "extraConfig" ]) 64 65 (mkRemovedOptionModule [ "security" "setuidOwners" ] "Use security.wrappers instead") 66 (mkRemovedOptionModule [ "security" "setuidPrograms" ] "Use security.wrappers instead") 67 68 (mkRemovedOptionModule [ "services" "rmilter" "bindInetSockets" ] "Use services.rmilter.bindSocket.* instead") 69 (mkRemovedOptionModule [ "services" "rmilter" "bindUnixSockets" ] "Use services.rmilter.bindSocket.* instead") 70 71 # Xsession script 72 (mkRenamedOptionModule [ "services" "xserver" "displayManager" "job" "logsXsession" ] [ "services" "xserver" "displayManager" "job" "logToFile" ]) 73 (mkRenamedOptionModule [ "services" "xserver" "displayManager" "logToJournal" ] [ "services" "xserver" "displayManager" "job" "logToJournal" ]) 74 75 # Old Grub-related options. 76 (mkRenamedOptionModule [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ]) 77 (mkRenamedOptionModule [ "boot" "extraKernelParams" ] [ "boot" "kernelParams" ]) 78 (mkRenamedOptionModule [ "boot" "loader" "grub" "timeout" ] [ "boot" "loader" "timeout" ]) 79 (mkRenamedOptionModule [ "boot" "loader" "gummiboot" "timeout" ] [ "boot" "loader" "timeout" ]) 80 81 # smartd 82 (mkRenamedOptionModule [ "services" "smartd" "deviceOpts" ] [ "services" "smartd" "defaults" "monitored" ]) 83 84 # OpenSSH 85 (mkRenamedOptionModule [ "services" "sshd" "ports" ] [ "services" "openssh" "ports" ]) 86 (mkAliasOptionModule [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ]) 87 (mkRenamedOptionModule [ "services" "sshd" "allowSFTP" ] [ "services" "openssh" "allowSFTP" ]) 88 (mkRenamedOptionModule [ "services" "sshd" "forwardX11" ] [ "services" "openssh" "forwardX11" ]) 89 (mkRenamedOptionModule [ "services" "sshd" "gatewayPorts" ] [ "services" "openssh" "gatewayPorts" ]) 90 (mkRenamedOptionModule [ "services" "sshd" "permitRootLogin" ] [ "services" "openssh" "permitRootLogin" ]) 91 (mkRenamedOptionModule [ "services" "xserver" "startSSHAgent" ] [ "services" "xserver" "startOpenSSHAgent" ]) 92 (mkRenamedOptionModule [ "services" "xserver" "startOpenSSHAgent" ] [ "programs" "ssh" "startAgent" ]) 93 (mkAliasOptionModule [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ]) 94 95 # VirtualBox 96 (mkRenamedOptionModule [ "services" "virtualbox" "enable" ] [ "virtualisation" "virtualbox" "guest" "enable" ]) 97 (mkRenamedOptionModule [ "services" "virtualboxGuest" "enable" ] [ "virtualisation" "virtualbox" "guest" "enable" ]) 98 (mkRenamedOptionModule [ "programs" "virtualbox" "enable" ] [ "virtualisation" "virtualbox" "host" "enable" ]) 99 (mkRenamedOptionModule [ "programs" "virtualbox" "addNetworkInterface" ] [ "virtualisation" "virtualbox" "host" "addNetworkInterface" ]) 100 (mkRenamedOptionModule [ "programs" "virtualbox" "enableHardening" ] [ "virtualisation" "virtualbox" "host" "enableHardening" ]) 101 (mkRenamedOptionModule [ "services" "virtualboxHost" "enable" ] [ "virtualisation" "virtualbox" "host" "enable" ]) 102 (mkRenamedOptionModule [ "services" "virtualboxHost" "addNetworkInterface" ] [ "virtualisation" "virtualbox" "host" "addNetworkInterface" ]) 103 (mkRenamedOptionModule [ "services" "virtualboxHost" "enableHardening" ] [ "virtualisation" "virtualbox" "host" "enableHardening" ]) 104 105 # libvirtd 106 (mkRemovedOptionModule [ "virtualisation" "libvirtd" "enableKVM" ] 107 "Set the option `virtualisation.libvirtd.qemuPackage' instead.") 108 109 # Tarsnap 110 (mkRenamedOptionModule [ "services" "tarsnap" "config" ] [ "services" "tarsnap" "archives" ]) 111 112 # ibus 113 (mkRenamedOptionModule [ "programs" "ibus" "plugins" ] [ "i18n" "inputMethod" "ibus" "engines" ]) 114 115 # proxy 116 (mkRenamedOptionModule [ "nix" "proxy" ] [ "networking" "proxy" "default" ]) 117 118 # sandboxing 119 (mkRenamedOptionModule [ "nix" "useChroot" ] [ "nix" "useSandbox" ]) 120 (mkRenamedOptionModule [ "nix" "chrootDirs" ] [ "nix" "sandboxPaths" ]) 121 122 # KDE 123 (mkRenamedOptionModule [ "kde" "extraPackages" ] [ "environment" "systemPackages" ]) 124 (mkRenamedOptionModule [ "environment" "kdePackages" ] [ "environment" "systemPackages" ]) 125 126 # Multiple efi bootloaders now 127 (mkRenamedOptionModule [ "boot" "loader" "efi" "efibootmgr" "enable" ] [ "boot" "loader" "efi" "canTouchEfiVariables" ]) 128 129 # NixOS environment changes 130 # !!! this hardcodes bash, could we detect from config which shell is actually used? 131 (mkRenamedOptionModule [ "environment" "promptInit" ] [ "programs" "bash" "promptInit" ]) 132 133 (mkRenamedOptionModule [ "services" "xserver" "driSupport" ] [ "hardware" "opengl" "driSupport" ]) 134 (mkRenamedOptionModule [ "services" "xserver" "driSupport32Bit" ] [ "hardware" "opengl" "driSupport32Bit" ]) 135 (mkRenamedOptionModule [ "services" "xserver" "s3tcSupport" ] [ "hardware" "opengl" "s3tcSupport" ]) 136 (mkRenamedOptionModule [ "hardware" "opengl" "videoDrivers" ] [ "services" "xserver" "videoDrivers" ]) 137 (mkRenamedOptionModule [ "services" "xserver" "vaapiDrivers" ] [ "hardware" "opengl" "extraPackages" ]) 138 139 (mkRenamedOptionModule [ "services" "mysql55" ] [ "services" "mysql" ]) 140 141 (mkAliasOptionModule [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ]) 142 143 # opendkim 144 (mkRenamedOptionModule [ "services" "opendkim" "keyFile" ] [ "services" "opendkim" "keyPath" ]) 145 146 # XBMC 147 (mkRenamedOptionModule [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ]) 148 (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ]) 149 150 (mkRenamedOptionModule [ "services" "hostapd" "extraCfg" ] [ "services" "hostapd" "extraConfig" ]) 151 152 # Enlightenment 153 (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "e19" "enable" ] [ "services" "xserver" "desktopManager" "enlightenment" "enable" ]) 154 155 # Iodine 156 (mkRenamedOptionModule [ "services" "iodined" "enable" ] [ "services" "iodine" "server" "enable" ]) 157 (mkRenamedOptionModule [ "services" "iodined" "domain" ] [ "services" "iodine" "server" "domain" ]) 158 (mkRenamedOptionModule [ "services" "iodined" "ip" ] [ "services" "iodine" "server" "ip" ]) 159 (mkRenamedOptionModule [ "services" "iodined" "extraConfig" ] [ "services" "iodine" "server" "extraConfig" ]) 160 (mkRemovedOptionModule [ "services" "iodined" "client" ] "") 161 162 # Unity3D 163 (mkRenamedOptionModule [ "programs" "unity3d" "enable" ] [ "security" "chromiumSuidSandbox" "enable" ]) 164 165 # murmur 166 (mkRenamedOptionModule [ "services" "murmur" "welcome" ] [ "services" "murmur" "welcometext" ]) 167 168 # parsoid 169 (mkRemovedOptionModule [ "services" "parsoid" "interwikis" ] [ "services" "parsoid" "wikis" ]) 170 171 # piwik was renamed to matomo 172 (mkRenamedOptionModule [ "services" "piwik" "enable" ] [ "services" "matomo" "enable" ]) 173 (mkRenamedOptionModule [ "services" "piwik" "webServerUser" ] [ "services" "matomo" "webServerUser" ]) 174 (mkRenamedOptionModule [ "services" "piwik" "phpfpmProcessManagerConfig" ] [ "services" "matomo" "phpfpmProcessManagerConfig" ]) 175 (mkRenamedOptionModule [ "services" "piwik" "nginx" ] [ "services" "matomo" "nginx" ]) 176 177 # tarsnap 178 (mkRemovedOptionModule [ "services" "tarsnap" "cachedir" ] "Use services.tarsnap.archives.<name>.cachedir") 179 180 # alsa 181 (mkRenamedOptionModule [ "sound" "enableMediaKeys" ] [ "sound" "mediaKeys" "enable" ]) 182 183 # postgrey 184 (mkMergedOptionModule [ [ "services" "postgrey" "inetAddr" ] [ "services" "postgrey" "inetPort" ] ] [ "services" "postgrey" "socket" ] (config: let 185 value = p: getAttrFromPath p config; 186 inetAddr = [ "services" "postgrey" "inetAddr" ]; 187 inetPort = [ "services" "postgrey" "inetPort" ]; 188 in 189 if value inetAddr == null 190 then { path = "/var/run/postgrey.sock"; } 191 else { addr = value inetAddr; port = value inetPort; } 192 )) 193 194 # dhcpd 195 (mkRenamedOptionModule [ "services" "dhcpd" ] [ "services" "dhcpd4" ]) 196 197 # locate 198 (mkRenamedOptionModule [ "services" "locate" "period" ] [ "services" "locate" "interval" ]) 199 (mkRemovedOptionModule [ "services" "locate" "includeStore" ] "Use services.locate.prunePaths" ) 200 201 # nfs 202 (mkRenamedOptionModule [ "services" "nfs" "lockdPort" ] [ "services" "nfs" "server" "lockdPort" ]) 203 (mkRenamedOptionModule [ "services" "nfs" "statdPort" ] [ "services" "nfs" "server" "statdPort" ]) 204 205 # KDE Plasma 5 206 (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "kde5" ] [ "services" "xserver" "desktopManager" "plasma5" ]) 207 208 # Fontconfig 209 (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowBitmaps" ] [ "fonts" "fontconfig" "allowBitmaps" ]) 210 (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowType1" ] [ "fonts" "fontconfig" "allowType1" ]) 211 (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "useEmbeddedBitmaps" ] [ "fonts" "fontconfig" "useEmbeddedBitmaps" ]) 212 (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "fonts" "fontconfig" "forceAutohint" ]) 213 (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ]) 214 215 # postgresqlBackup 216 (mkRemovedOptionModule [ "services" "postgresqlBackup" "period" ] '' 217 A systemd timer is now used instead of cron. 218 The starting time can be configured via <literal>services.postgresqlBackup.startAt</literal>. 219 '') 220 221 # Profile splitting 222 (mkRenamedOptionModule [ "virtualisation" "growPartition" ] [ "boot" "growPartition" ]) 223 224 # misc/version.nix 225 (mkRenamedOptionModule [ "system" "nixosVersion" ] [ "system" "nixos" "version" ]) 226 (mkRenamedOptionModule [ "system" "nixosVersionSuffix" ] [ "system" "nixos" "versionSuffix" ]) 227 (mkRenamedOptionModule [ "system" "nixosRevision" ] [ "system" "nixos" "revision" ]) 228 (mkRenamedOptionModule [ "system" "nixosLabel" ] [ "system" "nixos" "label" ]) 229 230 # Users 231 (mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ]) 232 (mkAliasOptionModule [ "users" "extraGroups" ] [ "users" "groups" ]) 233 234 # Options that are obsolete and have no replacement. 235 (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "") 236 (mkRemovedOptionModule [ "programs" "bash" "enable" ] "") 237 (mkRemovedOptionModule [ "services" "samba" "defaultShare" ] "") 238 (mkRemovedOptionModule [ "services" "syslog-ng" "serviceName" ] "") 239 (mkRemovedOptionModule [ "services" "syslog-ng" "listenToJournal" ] "") 240 (mkRemovedOptionModule [ "ec2" "metadata" ] "") 241 (mkRemovedOptionModule [ "services" "openvpn" "enable" ] "") 242 (mkRemovedOptionModule [ "services" "printing" "cupsFilesConf" ] "") 243 (mkRemovedOptionModule [ "services" "printing" "cupsdConf" ] "") 244 (mkRemovedOptionModule [ "services" "tor" "relay" "isBridge" ] "Use services.tor.relay.role instead.") 245 (mkRemovedOptionModule [ "services" "tor" "relay" "isExit" ] "Use services.tor.relay.role instead.") 246 (mkRemovedOptionModule [ "services" "xserver" "startGnuPGAgent" ] 247 "See the 16.09 release notes for more information.") 248 (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "") 249 (mkRemovedOptionModule [ "services" "dovecot2" "package" ] "") 250 (mkRemovedOptionModule [ "services" "firefox" "syncserver" "user" ] "") 251 (mkRemovedOptionModule [ "services" "firefox" "syncserver" "group" ] "") 252 (mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "") 253 (mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ] 254 "Set the option `services.xserver.displayManager.sddm.package' instead.") 255 (mkRemovedOptionModule [ "services" "xserver" "desktopManager" "xfce" "screenLock" ] "") 256 (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "") 257 (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "") 258 (mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.") 259 (mkRemovedOptionModule [ "services" "logstash" "enableWeb" ] "The web interface was removed from logstash") 260 (mkRemovedOptionModule [ "boot" "zfs" "enableLegacyCrypto" ] "The corresponding package was removed from nixpkgs.") 261 262 # ZSH 263 (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) 264 (mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "enable" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) 265 (mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "highlighters" ] [ "programs" "zsh" "syntaxHighlighting" "highlighters" ]) 266 (mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "patterns" ] [ "programs" "zsh" "syntaxHighlighting" "patterns" ]) 267 (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "enable" ] [ "programs" "zsh" "ohMyZsh" "enable" ]) 268 (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "theme" ] [ "programs" "zsh" "ohMyZsh" "theme" ]) 269 (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "custom" ] [ "programs" "zsh" "ohMyZsh" "custom" ]) 270 (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "plugins" ] [ "programs" "zsh" "ohMyZsh" "plugins" ]) 271 272 (mkRenamedOptionModule [ "programs" "zsh" "enableAutosuggestions" ] [ "programs" "zsh" "autosuggestions" "enable" ]) 273 274 # Xen 275 (mkRenamedOptionModule [ "virtualisation" "xen" "qemu-package" ] [ "virtualisation" "xen" "package-qemu" ]) 276 277 (mkRenamedOptionModule [ "programs" "info" "enable" ] [ "documentation" "info" "enable" ]) 278 (mkRenamedOptionModule [ "programs" "man" "enable" ] [ "documentation" "man" "enable" ]) 279 280 ] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter" 281 "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter" 282 "snmpExporter" "unifiExporter" "varnishExporter" ] 283 (opt: mkRemovedOptionModule [ "services" "prometheus" "${opt}" ] '' 284 The prometheus exporters are now configured using `services.prometheus.exporters'. 285 See the 18.03 release notes for more information. 286 '' )); 287}