commit 4ee3e8b21dfeaf236b86a0c109953dd809a77e64 · pyrox.dev/nixpkgs

+10

nixos/modules/config/fonts/fontconfig.nix

···

       264
       264
        
         };

     

       265
       265
        
       in

     

       266
       266
        
       {

     

       267
       267
       +
         imports = [

     

       268
       268
       +
           (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowBitmaps" ] [ "fonts" "fontconfig" "allowBitmaps" ])

     

       269
       269
       +
           (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowType1" ] [ "fonts" "fontconfig" "allowType1" ])

     

       270
       270
       +
           (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "useEmbeddedBitmaps" ] [ "fonts" "fontconfig" "useEmbeddedBitmaps" ])

     

       271
       271
       +
           (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "fonts" "fontconfig" "forceAutohint" ])

     

       272
       272
       +
           (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ])

     

       273
       273
       +
           (mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "")

     

       274
       274
       +
           (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")

     

       275
       275
       +
           (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")

     

       276
       276
       +
         ];

     

       267
       277
        
       

     

       268
       278
        
         options = {

     

       269
       279

+3

nixos/modules/config/fonts/fonts.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       {

     

       6
       6
       +
         imports = [

     

       7
       7
       +
           (mkRemovedOptionModule [ "fonts" "enableCoreFonts" ] "Use fonts.fonts = [ pkgs.corefonts ]; instead.")

     

       8
       8
       +
         ];

     

       6
       9
        
       

     

       7
       10
        
         options = {

     

       8
       11

+3

nixos/modules/config/networking.nix

···

       16
       16
        
       in

     

       17
       17
        
       

     

       18
       18
        
       {

     

       19
       19
       +
         imports = [

     

       20
       20
       +
           (mkRemovedOptionModule [ "networking" "hostConf" ] "Use environment.etc.\"host.conf\" instead.")

     

       21
       21
       +
         ];

     

       19
       22
        
       

     

       20
       23
        
         options = {

     

       21
       24

+6

nixos/modules/config/resolvconf.nix

···

       33
       33
        
       in

     

       34
       34
        
       

     

       35
       35
        
       {

     

       36
       36
       +
         imports = [

     

       37
       37
       +
           (mkRenamedOptionModule [ "networking" "dnsSingleRequest" ] [ "networking" "resolvconf" "dnsSingleRequest" ])

     

       38
       38
       +
           (mkRenamedOptionModule [ "networking" "dnsExtensionMechanism" ] [ "networking" "resolvconf" "dnsExtensionMechanism" ])

     

       39
       39
       +
           (mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ])

     

       40
       40
       +
           (mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ])

     

       41
       41
       +
         ];

     

       36
       42
        
       

     

       37
       43
        
         options = {

     

       38
       44

+4

nixos/modules/config/users-groups.nix

···

       403
       403
        
             filter types.shellPackage.check shells;

     

       404
       404
        
       

     

       405
       405
        
       in {

     

       406
       406
       +
         imports = [

     

       407
       407
       +
           (mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ])

     

       408
       408
       +
           (mkAliasOptionModule [ "users" "extraGroups" ] [ "users" "groups" ])

     

       409
       409
       +
         ];

     

       406
       410
        
       

     

       407
       411
        
         ###### interface

     

       408
       412

+4

nixos/modules/config/xdg/portal.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       {

     

       6
       6
       +
         imports = [

     

       7
       7
       +
           (mkRenamedOptionModule [ "services" "flatpak" "extraPortals" ] [ "xdg" "portal" "extraPortals" ])

     

       8
       8
       +
         ];

     

       9
       9
       +
       

     

       6
       10
        
         options.xdg.portal = {

     

       7
       11
        
           enable =

     

       8
       12
        
             mkEnableOption "<link xlink:href='https://github.com/flatpak/xdg-desktop-portal'>xdg desktop integration</link>"//{

+8

nixos/modules/hardware/all-firmware.nix

···

       6
       6
        
         cfg = config.hardware;

     

       7
       7
        
       in {

     

       8
       8
        
       

     

       9
       9
       +
         imports = [

     

       10
       10
       +
           (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "hardware" "enableRedistributableFirmware" ])

     

       11
       11
       +
           (mkRenamedOptionModule [ "networking" "enableIntel3945ABGFirmware" ] [ "hardware" "enableRedistributableFirmware" ])

     

       12
       12
       +
           (mkRenamedOptionModule [ "networking" "enableIntel2100BGFirmware" ] [ "hardware" "enableRedistributableFirmware" ])

     

       13
       13
       +
           (mkRenamedOptionModule [ "networking" "enableRalinkFirmware" ] [ "hardware" "enableRedistributableFirmware" ])

     

       14
       14
       +
           (mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ])

     

       15
       15
       +
         ];

     

       16
       16
       +
       

     

       9
       17
        
         ###### interface

     

       10
       18
        
       

     

       11
       19
        
         options = {

+5

nixos/modules/hardware/ckb-next.nix

···

       7
       7
        
       

     

       8
       8
        
       in

     

       9
       9
        
         {

     

       10
       10
       +
           imports = [

     

       11
       11
       +
             (mkRenamedOptionModule [ "hardware" "ckb" "enable" ] [ "hardware" "ckb-next" "enable" ])

     

       12
       12
       +
             (mkRenamedOptionModule [ "hardware" "ckb" "package" ] [ "hardware" "ckb-next" "package" ])

     

       13
       13
       +
           ];

     

       14
       14
       +
       

     

       10
       15
        
           options.hardware.ckb-next = {

     

       11
       16
        
             enable = mkEnableOption "the Corsair keyboard/mouse driver";

     

       12
       17

+4

nixos/modules/hardware/ksm.nix

···

       6
       6
        
         cfg = config.hardware.ksm;

     

       7
       7
        
       

     

       8
       8
        
       in {

     

       9
       9
       +
         imports = [

     

       10
       10
       +
           (mkRenamedOptionModule [ "hardware" "enableKSM" ] [ "hardware" "ksm" "enable" ])

     

       11
       11
       +
         ];

     

       12
       12
       +
       

     

       9
       13
        
         options.hardware.ksm = {

     

       10
       14
        
           enable = mkEnableOption "Kernel Same-Page Merging";

     

       11
       15
        
           sleep = mkOption {

+5

nixos/modules/hardware/opengl.nix

···

       31
       31
        
       in

     

       32
       32
        
       

     

       33
       33
        
       {

     

       34
       34
       +
       

     

       35
       35
       +
         imports = [

     

       36
       36
       +
           (mkRenamedOptionModule [ "services" "xserver" "vaapiDrivers" ] [ "hardware" "opengl" "extraPackages" ])

     

       37
       37
       +
         ];

     

       38
       38
       +
       

     

       34
       39
        
         options = {

     

       35
       40
        
       

     

       36
       41
        
           hardware.opengl = {

+4

nixos/modules/i18n/input-method/ibus.nix

···

       27
       27
        
         };

     

       28
       28
        
       in

     

       29
       29
        
       {

     

       30
       30
       +
         imports = [

     

       31
       31
       +
           (mkRenamedOptionModule [ "programs" "ibus" "plugins" ] [ "i18n" "inputMethod" "ibus" "engines" ])

     

       32
       32
       +
         ];

     

       33
       33
       +
       

     

       30
       34
        
         options = {

     

       31
       35
        
           i18n.inputMethod.ibus = {

     

       32
       36
        
             engines = mkOption {

+5

nixos/modules/misc/documentation.nix

···

       67
       67
        
       in

     

       68
       68
        
       

     

       69
       69
        
       {

     

       70
       70
       +
         imports = [

     

       71
       71
       +
           (mkRenamedOptionModule [ "programs" "info" "enable" ] [ "documentation" "info" "enable" ])

     

       72
       72
       +
           (mkRenamedOptionModule [ "programs" "man"  "enable" ] [ "documentation" "man"  "enable" ])

     

       73
       73
       +
           (mkRenamedOptionModule [ "services" "nixosManual" "enable" ] [ "documentation" "nixos" "enable" ])

     

       74
       74
       +
         ];

     

       70
       75
        
       

     

       71
       76
        
         options = {

     

       72
       77

+5

nixos/modules/misc/locate.nix

···

       7
       7
        
         isMLocate = hasPrefix "mlocate" cfg.locate.name;

     

       8
       8
        
         isFindutils = hasPrefix "findutils" cfg.locate.name;

     

       9
       9
        
       in {

     

       10
       10
       +
         imports = [

     

       11
       11
       +
           (mkRenamedOptionModule [ "services" "locate" "period" ] [ "services" "locate" "interval" ])

     

       12
       12
       +
           (mkRemovedOptionModule [ "services" "locate" "includeStore" ] "Use services.locate.prunePaths" )

     

       13
       13
       +
         ];

     

       14
       14
       +
       

     

       10
       15
        
         options.services.locate = with types; {

     

       11
       16
        
           enable = mkOption {

     

       12
       17
        
             type = bool;

+6

nixos/modules/misc/version.nix

···

       10
       10
        
       in

     

       11
       11
        
       

     

       12
       12
        
       {

     

       13
       13
       +
         imports = [

     

       14
       14
       +
           (mkRenamedOptionModule [ "system" "nixosVersion" ] [ "system" "nixos" "version" ])

     

       15
       15
       +
           (mkRenamedOptionModule [ "system" "nixosVersionSuffix" ] [ "system" "nixos" "versionSuffix" ])

     

       16
       16
       +
           (mkRenamedOptionModule [ "system" "nixosRevision" ] [ "system" "nixos" "revision" ])

     

       17
       17
       +
           (mkRenamedOptionModule [ "system" "nixosLabel" ] [ "system" "nixos" "label" ])

     

       18
       18
       +
         ];

     

       13
       19
        
       

     

       14
       20
        
         options.system = {

     

       15
       21

+4

nixos/modules/programs/bash/bash.nix

···

       40
       40
        
       in

     

       41
       41
        
       

     

       42
       42
        
       {

     

       43
       43
       +
         imports = [

     

       44
       44
       +
           (mkRemovedOptionModule [ "programs" "bash" "enable" ] "")

     

       45
       45
       +
         ];

     

       46
       46
       +
       

     

       43
       47
        
         options = {

     

       44
       48
        
       

     

       45
       49
        
           programs.bash = {

+5

nixos/modules/programs/ssmtp.nix

···

       13
       13
        
       in

     

       14
       14
        
       {

     

       15
       15
        
       

     

       16
       16
       +
         imports = [

     

       17
       17
       +
           (mkRenamedOptionModule [ "networking" "defaultMailServer" ] [ "services" "ssmtp" ])

     

       18
       18
       +
           (mkRenamedOptionModule [ "services" "ssmtp" "directDelivery" ] [ "services" "ssmtp" "enable" ])

     

       19
       19
       +
         ];

     

       20
       20
       +
       

     

       16
       21
        
         options = {

     

       17
       22
        
       

     

       18
       23
        
           services.ssmtp = {

+7

nixos/modules/programs/zsh/oh-my-zsh.nix

···

       29
       29
        
       

     

       30
       30
        
       in

     

       31
       31
        
         {

     

       32
       32
       +
           imports = [

     

       33
       33
       +
             (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "enable" ] [ "programs" "zsh" "ohMyZsh" "enable" ])

     

       34
       34
       +
             (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "theme" ] [ "programs" "zsh" "ohMyZsh" "theme" ])

     

       35
       35
       +
             (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "custom" ] [ "programs" "zsh" "ohMyZsh" "custom" ])

     

       36
       36
       +
             (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "plugins" ] [ "programs" "zsh" "ohMyZsh" "plugins" ])

     

       37
       37
       +
           ];

     

       38
       38
       +
       

     

       32
       39
        
           options = {

     

       33
       40
        
             programs.zsh.ohMyZsh = {

     

       34
       41
        
               enable = mkOption {

+4

nixos/modules/programs/zsh/zsh-autosuggestions.nix

···

       6
       6
        
         cfg = config.programs.zsh.autosuggestions;

     

       7
       7
        
       in

     

       8
       8
        
       {

     

       9
       9
       +
         imports = [

     

       10
       10
       +
           (mkRenamedOptionModule [ "programs" "zsh" "enableAutosuggestions" ] [ "programs" "zsh" "autosuggestions" "enable" ])

     

       11
       11
       +
         ];

     

       12
       12
       +
       

     

       9
       13
        
         options.programs.zsh.autosuggestions = {

     

       10
       14
        
       

     

       11
       15
        
           enable = mkEnableOption "zsh-autosuggestions";

+7

nixos/modules/programs/zsh/zsh-syntax-highlighting.nix

···

       6
       6
        
         cfg = config.programs.zsh.syntaxHighlighting;

     

       7
       7
        
       in

     

       8
       8
        
       {

     

       9
       9
       +
         imports = [

     

       10
       10
       +
           (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])

     

       11
       11
       +
           (mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "enable" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])

     

       12
       12
       +
           (mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "highlighters" ] [ "programs" "zsh" "syntaxHighlighting" "highlighters" ])

     

       13
       13
       +
           (mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "patterns" ] [ "programs" "zsh" "syntaxHighlighting" "patterns" ])

     

       14
       14
       +
         ];

     

       15
       15
       +
       

     

       9
       16
        
         options = {

     

       10
       17
        
           programs.zsh.syntaxHighlighting = {

     

       11
       18
        
             enable = mkEnableOption "zsh-syntax-highlighting";

+11 -297

nixos/modules/rename.nix

···

       4
       4
        
       

     

       5
       5
        
       {

     

       6
       6
        
         imports = [

     

       7
       7
       -
           (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "hardware" "enableRedistributableFirmware" ])

     

       8
       8
       -
           (mkRenamedOptionModule [ "networking" "enableIntel3945ABGFirmware" ] [ "hardware" "enableRedistributableFirmware" ])

     

       9
       9
       -
           (mkRenamedOptionModule [ "networking" "enableIntel2100BGFirmware" ] [ "hardware" "enableRedistributableFirmware" ])

     

       10
       10
       -
           (mkRenamedOptionModule [ "networking" "enableRalinkFirmware" ] [ "hardware" "enableRedistributableFirmware" ])

     

       11
       11
       -
           (mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ])

     

       12
       12
       -
           (mkRenamedOptionModule [ "networking" "networkmanager" "useDnsmasq" ] [ "networking" "networkmanager" "dns" ])

     

       13
       13
       -
           (mkRenamedOptionModule [ "networking" "connman" ] [ "services" "connman" ])

     

       14
       14
       -
           (mkRenamedOptionModule [ "networking" "defaultMailServer" ] [ "services" "ssmtp" ])

     

       15
       15
       -
           (mkRenamedOptionModule [ "services" "ssmtp" "directDelivery" ] [ "services" "ssmtp" "enable" ])

     

       16
       16
       -
           (mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ]

     

       17
       17
       -
             (config:

     

       18
       18
       -
               let enabled = getAttrFromPath [ "services" "printing" "gutenprint" ] config;

     

       19
       19
       -
               in if enabled then [ pkgs.gutenprint ] else [ ]))

     

       20
       20
       -
           (mkChangedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ]

     

       21
       21
       -
             (config:

     

       22
       22
       -
               let value = getAttrFromPath [ "services" "ddclient" "domain" ] config;

     

       23
       23
       -
               in if value != "" then [ value ] else []))

     

       24
       24
       -
           (mkRemovedOptionModule [ "services" "ddclient" "homeDir" ] "")

     

       25
       25
       -
           (mkRenamedOptionModule [ "services" "flatpak" "extraPortals" ] [ "xdg" "portal" "extraPortals" ])

     

       26
       26
       -
           (mkRenamedOptionModule [ "services" "i2pd" "extIp" ] [ "services" "i2pd" "address" ])

     

       27
       27
       -
           (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "admissionControl" ] [ "services" "kubernetes" "apiserver" "enableAdmissionPlugins" ])

     

       28
       28
       -
           (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"])

     

       29
       29
       -
           (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "port" ] ["services" "kubernetes" "apiserver" "insecurePort"])

     

       30
       30
       -
           (mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "publicAddress" ] "")

     

       31
       31
       -
           (mkRenamedOptionModule [ "services" "kubernetes" "addons" "dashboard" "enableRBAC" ] [ "services" "kubernetes" "addons" "dashboard" "rbac" "enable" ])

     

       32
       32
       -
           (mkRenamedOptionModule [ "services" "kubernetes" "controllerManager" "address" ] ["services" "kubernetes" "controllerManager" "bindAddress"])

     

       33
       33
       -
           (mkRenamedOptionModule [ "services" "kubernetes" "controllerManager" "port" ] ["services" "kubernetes" "controllerManager" "insecurePort"])

     

       34
       34
       -
           (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "servers" ] [ "services" "kubernetes" "apiserver" "etcd" "servers" ])

     

       35
       35
       -
           (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "keyFile" ] [ "services" "kubernetes" "apiserver" "etcd" "keyFile" ])

     

       36
       36
       -
           (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "certFile" ] [ "services" "kubernetes" "apiserver" "etcd" "certFile" ])

     

       37
       37
       -
           (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "caFile" ] [ "services" "kubernetes" "apiserver" "etcd" "caFile" ])

     

       38
       38
       -
           (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "applyManifests" ] "")

     

       39
       39
       -
           (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "cadvisorPort" ] "")

     

       40
       40
       -
           (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "allowPrivileged" ] "")

     

       41
       41
       -
           (mkRenamedOptionModule [ "services" "kubernetes" "proxy" "address" ] ["services" "kubernetes" "proxy" "bindAddress"])

     

       42
       42
       -
           (mkRemovedOptionModule [ "services" "kubernetes" "verbose" ] "")

     

       43
       43
       -
           (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ])

     

       44
       44
       -
           (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "defaultListenAddress" ])

     

       45
       45
       -
           (mkRenamedOptionModule [ "services" "neo4j" "listenAddress" ] [ "services" "neo4j" "defaultListenAddress" ])

     

       46
       46
       -
           (mkRenamedOptionModule [ "services" "neo4j" "enableBolt" ] [ "services" "neo4j" "bolt" "enable" ])

     

       47
       47
       -
           (mkRenamedOptionModule [ "services" "neo4j" "enableHttps" ] [ "services" "neo4j" "https" "enable" ])

     

       48
       48
       -
           (mkRenamedOptionModule [ "services" "neo4j" "certDir" ] [ "services" "neo4j" "directories" "certificates" ])

     

       49
       49
       -
           (mkRenamedOptionModule [ "services" "neo4j" "dataDir" ] [ "services" "neo4j" "directories" "home" ])

     

       50
       50
       -
           (mkRemovedOptionModule [ "services" "neo4j" "port" ] "Use services.neo4j.http.listenAddress instead.")

     

       51
       51
       -
           (mkRemovedOptionModule [ "services" "neo4j" "boltPort" ] "Use services.neo4j.bolt.listenAddress instead.")

     

       52
       52
       -
           (mkRemovedOptionModule [ "services" "neo4j" "httpsPort" ] "Use services.neo4j.https.listenAddress instead.")

     

       53
       53
       -
           (mkRemovedOptionModule [ "services" "misc" "nzbget" "configFile" ] "The configuration of nzbget is now managed by users through the web interface.")

     

       54
       54
       -
           (mkRemovedOptionModule [ "services" "misc" "nzbget" "dataDir" ] "The data directory for nzbget is now /var/lib/nzbget.")

     

       55
       55
       -
           (mkRemovedOptionModule [ "services" "misc" "nzbget" "openFirewall" ] "The port used by nzbget is managed through the web interface so you should adjust your firewall rules accordingly.")

     

       56
       56
       -
           (mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "user" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a user setting.")

     

       57
       57
       -
           (mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "group" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a group setting.")

     

       58
       58
       -
           (mkRemovedOptionModule [ "services" "prometheus" "alertmanagerURL" ] ''

     

       59
       59
       -
             Due to incompatibility, the alertmanagerURL option has been removed,

     

       60
       60
       -
             please use 'services.prometheus2.alertmanagers' instead.

     

       61
       61
       -
           '')

     

       62
       62
       -
           (mkRenamedOptionModule [ "services" "prometheus2" ] [ "services" "prometheus" ])

     

       63
       63
       -
           (mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ])

     

       64
       64
       -
           (mkRenamedOptionModule [ "services" "vmwareGuest" ] [ "virtualisation" "vmware" "guest" ])

     

       65
       65
       -
           (mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ])

     

       66
       66
       -
       

     

       67
       67
       -
           (mkRenamedOptionModule [ "services" "gitlab" "stateDir" ] [ "services" "gitlab" "statePath" ])

     

       68
       68
       -
           (mkRemovedOptionModule [ "services" "gitlab" "satelliteDir" ] "")

     

       69
       69
       -
       

     

       70
       70
       -
           (mkRenamedOptionModule [ "services" "clamav" "updater" "config" ] [ "services" "clamav" "updater" "extraConfig" ])

     

       71
       71
       -
       

     

       72
       72
       -
           (mkRemovedOptionModule [ "services" "pykms" "verbose" ] "Use services.pykms.logLevel instead")

     

       73
       73
       -
       

     

       74
       74
       -
           (mkRemovedOptionModule [ "security" "setuidOwners" ] "Use security.wrappers instead")

     

       75
       75
       -
           (mkRemovedOptionModule [ "security" "setuidPrograms" ] "Use security.wrappers instead")

     

       76
       76
       -
       

     

       77
       77
       -
           (mkRenamedOptionModule [ "security" "virtualization" "flushL1DataCache" ] [ "security" "virtualisation" "flushL1DataCache" ])

     

       78
       78
       -
       

     

       79
       79
       -
           # PAM

     

       80
       80
       -
           (mkRenamedOptionModule [ "security" "pam" "enableU2F" ] [ "security" "pam" "u2f" "enable" ])

     

       81
       81
       -
       

     

       82
       82
       -
           # rmilter/rspamd

     

       83
       83
       -
           (mkRemovedOptionModule [ "services" "rmilter" ] "Use services.rspamd.* instead to set up milter service")

     

       84
       84
       -
       

     

       85
       85
       -
           # Xsession script

     

       86
       86
       -
           (mkRenamedOptionModule [ "services" "xserver" "displayManager" "job" "logsXsession" ] [ "services" "xserver" "displayManager" "job" "logToFile" ])

     

       87
       87
       -
           (mkRenamedOptionModule [ "services" "xserver" "displayManager" "logToJournal" ] [ "services" "xserver" "displayManager" "job" "logToJournal" ])

     

       88
       88
       -
       

     

       89
       89
       -
           # Old Grub-related options.

     

       90
       90
       -
           (mkRenamedOptionModule [ "boot" "loader" "grub" "timeout" ] [ "boot" "loader" "timeout" ])

     

       91
       91
       -
           (mkRenamedOptionModule [ "boot" "loader" "gummiboot" "timeout" ] [ "boot" "loader" "timeout" ])

     

       7
       7
       +
           /*

     

       8
       8
       +
           This file defines some renaming/removing options for backwards compatibility

     

       92
       9
        
       

     

       93
       93
       -
           # OpenSSH

     

       94
       94
       -
           (mkAliasOptionModule [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ])

     

       95
       95
       -
           (mkAliasOptionModule [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ])

     

       10
       10
       +
           It should ONLY be used when the relevant module can't define these imports

     

       11
       11
       +
           itself, such as when the module was removed completely.

     

       12
       12
       +
           See https://github.com/NixOS/nixpkgs/pull/61570 for explanation

     

       13
       13
       +
           */

     

       96
       14
        
       

     

       97
       97
       -
           # libvirtd

     

       98
       98
       -
           (mkRemovedOptionModule [ "virtualisation" "libvirtd" "enableKVM" ]

     

       99
       99
       -
             "Set the option `virtualisation.libvirtd.qemuPackage' instead.")

     

       100
       100
       -
       

     

       101
       101
       -
           # ibus

     

       102
       102
       -
           (mkRenamedOptionModule [ "programs" "ibus" "plugins" ] [ "i18n" "inputMethod" "ibus" "engines" ])

     

       103
       103
       -
       

     

       104
       104
       -
           # sandboxing

     

       105
       105
       -
           (mkRenamedOptionModule [ "nix" "useChroot" ] [ "nix" "useSandbox" ])

     

       106
       106
       -
           (mkRenamedOptionModule [ "nix" "chrootDirs" ] [ "nix" "sandboxPaths" ])

     

       107
       107
       -
       

     

       108
       108
       -
           (mkRenamedOptionModule [ "services" "xserver" "vaapiDrivers" ] [ "hardware" "opengl" "extraPackages" ])

     

       109
       109
       -
       

     

       15
       15
       +
           # This alias module can't be where _module.check is defined because it would

     

       16
       16
       +
           # be added to submodules as well there

     

       110
       17
        
           (mkAliasOptionModule [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ])

     

       111
       18
        
       

     

       112
       112
       -
           # opendkim

     

       113
       113
       -
           (mkRenamedOptionModule [ "services" "opendkim" "keyFile" ] [ "services" "opendkim" "keyPath" ])

     

       114
       114
       -
       

     

       115
       115
       -
           # Enlightenment

     

       116
       116
       -
           (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "e19" "enable" ] [ "services" "xserver" "desktopManager" "enlightenment" "enable" ])

     

       117
       117
       -
       

     

       118
       118
       -
           # Iodine

     

       119
       119
       -
           (mkRenamedOptionModule [ "services" "iodined" "enable" ] [ "services" "iodine" "server" "enable" ])

     

       120
       120
       -
           (mkRenamedOptionModule [ "services" "iodined" "domain" ] [ "services" "iodine" "server" "domain" ])

     

       121
       121
       -
           (mkRenamedOptionModule [ "services" "iodined" "ip" ] [ "services" "iodine" "server" "ip" ])

     

       122
       122
       -
           (mkRenamedOptionModule [ "services" "iodined" "extraConfig" ] [ "services" "iodine" "server" "extraConfig" ])

     

       123
       123
       -
           (mkRemovedOptionModule [ "services" "iodined" "client" ] "")

     

       124
       124
       -
       

     

       125
       125
       -
           # Unity3D

     

       126
       126
       -
           (mkRenamedOptionModule [ "programs" "unity3d" "enable" ] [ "security" "chromiumSuidSandbox" "enable" ])

     

       127
       127
       -
       

     

       128
       128
       -
           # murmur

     

       129
       129
       -
           (mkRenamedOptionModule [ "services" "murmur" "welcome" ] [ "services" "murmur" "welcometext" ])

     

       130
       130
       -
           (mkRemovedOptionModule [ "services" "murmur" "pidfile" ] "Hardcoded to /run/murmur/murmurd.pid now")

     

       131
       131
       -
       

     

       132
       132
       -
           # parsoid

     

       133
       133
       -
           (mkRemovedOptionModule [ "services" "parsoid" "interwikis" ] "Use services.parsoid.wikis instead")

     

       134
       134
       -
       

     

       135
       135
       -
           # plexpy / tautulli

     

       136
       136
       -
           (mkRenamedOptionModule [ "services" "plexpy" ] [ "services" "tautulli" ])

     

       137
       137
       -
       

     

       138
       138
       -
           # piwik was renamed to matomo

     

       139
       139
       -
           (mkRenamedOptionModule [ "services" "piwik" "enable" ] [ "services" "matomo" "enable" ])

     

       140
       140
       -
           (mkRenamedOptionModule [ "services" "piwik" "webServerUser" ] [ "services" "matomo" "webServerUser" ])

     

       141
       141
       -
           (mkRemovedOptionModule [ "services" "piwik" "phpfpmProcessManagerConfig" ] "Use services.phpfpm.pools.<name>.settings")

     

       142
       142
       -
           (mkRemovedOptionModule [ "services" "matomo" "phpfpmProcessManagerConfig" ] "Use services.phpfpm.pools.<name>.settings")

     

       143
       143
       -
           (mkRenamedOptionModule [ "services" "piwik" "nginx" ] [ "services" "matomo" "nginx" ])

     

       144
       144
       -
       

     

       145
       145
       -
           # tarsnap

     

       146
       146
       -
           (mkRemovedOptionModule [ "services" "tarsnap" "cachedir" ] "Use services.tarsnap.archives.<name>.cachedir")

     

       147
       147
       -
       

     

       148
       148
       -
           # alsa

     

       149
       149
       -
           (mkRenamedOptionModule [ "sound" "enableMediaKeys" ] [ "sound" "mediaKeys" "enable" ])

     

       150
       150
       -
       

     

       151
       151
       -
           # postgrey

     

       152
       152
       -
           (mkMergedOptionModule [ [ "services" "postgrey" "inetAddr" ] [ "services" "postgrey" "inetPort" ] ] [ "services" "postgrey" "socket" ] (config: let

     

       153
       153
       -
               value = p: getAttrFromPath p config;

     

       154
       154
       -
               inetAddr = [ "services" "postgrey" "inetAddr" ];

     

       155
       155
       -
               inetPort = [ "services" "postgrey" "inetPort" ];

     

       156
       156
       -
             in

     

       157
       157
       -
               if value inetAddr == null

     

       158
       158
       -
               then { path = "/run/postgrey.sock"; }

     

       159
       159
       -
               else { addr = value inetAddr; port = value inetPort; }

     

       160
       160
       -
           ))

     

       161
       161
       -
       

     

       162
       162
       -
           # dhcpd

     

       163
       163
       -
           (mkRenamedOptionModule [ "services" "dhcpd" ] [ "services" "dhcpd4" ])

     

       164
       164
       -
       

     

       165
       165
       -
           # locate

     

       166
       166
       -
           (mkRenamedOptionModule [ "services" "locate" "period" ] [ "services" "locate" "interval" ])

     

       167
       167
       -
           (mkRemovedOptionModule [ "services" "locate" "includeStore" ] "Use services.locate.prunePaths" )

     

       168
       168
       -
       

     

       169
       169
       -
           # nfs

     

       170
       170
       -
           (mkRenamedOptionModule [ "services" "nfs" "lockdPort" ] [ "services" "nfs" "server" "lockdPort" ])

     

       171
       171
       -
           (mkRenamedOptionModule [ "services" "nfs" "statdPort" ] [ "services" "nfs" "server" "statdPort" ])

     

       172
       172
       -
       

     

       173
       173
       -
           # KDE Plasma 5

     

       174
       174
       -
           (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "kde5" ] [ "services" "xserver" "desktopManager" "plasma5" ])

     

       175
       175
       -
       

     

       176
       176
       -
           # Fontconfig

     

       177
       177
       -
           (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowBitmaps" ] [ "fonts" "fontconfig" "allowBitmaps" ])

     

       178
       178
       -
           (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowType1" ] [ "fonts" "fontconfig" "allowType1" ])

     

       179
       179
       -
           (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "useEmbeddedBitmaps" ] [ "fonts" "fontconfig" "useEmbeddedBitmaps" ])

     

       180
       180
       -
           (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "fonts" "fontconfig" "forceAutohint" ])

     

       181
       181
       -
           (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ])

     

       182
       182
       -
       

     

       183
       183
       -
           # postgresqlBackup

     

       184
       184
       -
           (mkRemovedOptionModule [ "services" "postgresqlBackup" "period" ] ''

     

       185
       185
       -
              A systemd timer is now used instead of cron.

     

       186
       186
       -
              The starting time can be configured via <literal>services.postgresqlBackup.startAt</literal>.

     

       187
       187
       -
           '')

     

       188
       188
       -
       

     

       189
       189
       -
           # phpfpm

     

       190
       190
       -
           (mkRemovedOptionModule [ "services" "phpfpm" "poolConfigs" ] "Use services.phpfpm.pools instead.")

     

       191
       191
       -
       

     

       192
       192
       -
           # zabbixServer

     

       193
       193
       -
           (mkRenamedOptionModule [ "services" "zabbixServer" "dbServer" ] [ "services" "zabbixServer" "database" "host" ])

     

       194
       194
       -
       

     

       195
       195
       -
           # Profile splitting

     

       196
       196
       -
           (mkRenamedOptionModule [ "virtualisation" "growPartition" ] [ "boot" "growPartition" ])

     

       197
       197
       -
       

     

       198
       198
       -
           # misc/version.nix

     

       199
       199
       -
           (mkRenamedOptionModule [ "system" "nixosVersion" ] [ "system" "nixos" "version" ])

     

       200
       200
       -
           (mkRenamedOptionModule [ "system" "nixosVersionSuffix" ] [ "system" "nixos" "versionSuffix" ])

     

       201
       201
       -
           (mkRenamedOptionModule [ "system" "nixosRevision" ] [ "system" "nixos" "revision" ])

     

       202
       202
       -
           (mkRenamedOptionModule [ "system" "nixosLabel" ] [ "system" "nixos" "label" ])

     

       203
       203
       -
       

     

       204
       204
       -
           # Users

     

       205
       205
       -
           (mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ])

     

       206
       206
       -
           (mkAliasOptionModule [ "users" "extraGroups" ] [ "users" "groups" ])

     

       207
       207
       -
       

     

       208
       208
       -
           # Options that are obsolete and have no replacement.

     

       209
       209
       -
           (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "")

     

       210
       210
       -
           (mkRemovedOptionModule [ "programs" "bash" "enable" ] "")

     

       211
       211
       -
           (mkRemovedOptionModule [ "services" "samba" "defaultShare" ] "")

     

       212
       212
       -
           (mkRemovedOptionModule [ "services" "syslog-ng" "serviceName" ] "")

     

       213
       213
       -
           (mkRemovedOptionModule [ "services" "syslog-ng" "listenToJournal" ] "")

     

       214
       214
       -
           (mkRemovedOptionModule [ "ec2" "metadata" ] "")

     

       215
       215
       -
           (mkRemovedOptionModule [ "services" "openvpn" "enable" ] "")

     

       216
       216
       -
           (mkRemovedOptionModule [ "services" "printing" "cupsFilesConf" ] "")

     

       217
       217
       -
           (mkRemovedOptionModule [ "services" "printing" "cupsdConf" ] "")

     

       218
       218
       -
           (mkRemovedOptionModule [ "services" "tor" "relay" "isBridge" ] "Use services.tor.relay.role instead.")

     

       219
       219
       -
           (mkRemovedOptionModule [ "services" "tor" "relay" "isExit" ] "Use services.tor.relay.role instead.")

     

       220
       220
       -
           (mkRemovedOptionModule [ "services" "xserver" "startGnuPGAgent" ]

     

       221
       221
       -
             "See the 16.09 release notes for more information.")

     

       222
       222
       -
           (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "")

     

       223
       223
       -
           (mkRemovedOptionModule [ "services" "dovecot2" "package" ] "")

     

       19
       19
       +
           # Completely removed modules

     

       224
       20
        
           (mkRemovedOptionModule [ "services" "firefox" "syncserver" "user" ] "")

     

       225
       21
        
           (mkRemovedOptionModule [ "services" "firefox" "syncserver" "group" ] "")

     

       226
       226
       -
           (mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "")

     

       227
       227
       -
           (mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ]

     

       228
       228
       -
             "Set the option `services.xserver.displayManager.sddm.package' instead.")

     

       229
       229
       -
           (mkRemovedOptionModule [ "services" "xserver" "desktopManager" "xfce" "screenLock" ] "")

     

       230
       230
       -
           (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")

     

       231
       231
       -
           (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")

     

       232
       232
       -
           (mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.")

     

       233
       233
       -
           (mkRemovedOptionModule [ "services" "logstash" "enableWeb" ] "The web interface was removed from logstash")

     

       234
       234
       -
           (mkRemovedOptionModule [ "boot" "zfs" "enableLegacyCrypto" ] "The corresponding package was removed from nixpkgs.")

     

       235
       22
        
           (mkRemovedOptionModule [ "services" "winstone" ] "The corresponding package was removed from nixpkgs.")

     

       236
       236
       -
           (mkRemovedOptionModule [ "services" "mysql" "pidDir" ] "Don't wait for pidfiles, describe dependencies through systemd")

     

       237
       237
       -
           (mkRemovedOptionModule [ "services" "mysql" "rootPassword" ] "Use socket authentication or set the password outside of the nix store.")

     

       238
       238
       -
           (mkRemovedOptionModule [ "services" "zabbixServer" "dbPassword" ] "Use services.zabbixServer.database.passwordFile instead.")

     

       239
       239
       -
           (mkRemovedOptionModule [ "systemd" "generator-packages" ] "Use systemd.packages instead.")

     

       240
       240
       -
           (mkRemovedOptionModule [ "fonts" "enableCoreFonts" ] "Use fonts.fonts = [ pkgs.corefonts ]; instead.")

     

       241
       23
        
           (mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.")

     

       242
       242
       -
           (mkRemovedOptionModule [ "networking" "hostConf" ] "Use environment.etc.\"host.conf\" instead.")

     

       243
       243
       -
       

     

       244
       244
       -
           # ZSH

     

       245
       245
       -
           (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])

     

       246
       246
       -
           (mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "enable" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])

     

       247
       247
       -
           (mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "highlighters" ] [ "programs" "zsh" "syntaxHighlighting" "highlighters" ])

     

       248
       248
       -
           (mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "patterns" ] [ "programs" "zsh" "syntaxHighlighting" "patterns" ])

     

       249
       249
       -
           (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "enable" ] [ "programs" "zsh" "ohMyZsh" "enable" ])

     

       250
       250
       -
           (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "theme" ] [ "programs" "zsh" "ohMyZsh" "theme" ])

     

       251
       251
       -
           (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "custom" ] [ "programs" "zsh" "ohMyZsh" "custom" ])

     

       252
       252
       -
           (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "plugins" ] [ "programs" "zsh" "ohMyZsh" "plugins" ])

     

       253
       253
       -
       

     

       254
       254
       -
           (mkRenamedOptionModule [ "programs" "zsh" "enableAutosuggestions" ] [ "programs" "zsh" "autosuggestions" "enable" ])

     

       255
       255
       -
       

     

       256
       256
       -
           # Xen

     

       257
       257
       -
           (mkRenamedOptionModule [ "virtualisation" "xen" "qemu-package" ] [ "virtualisation" "xen" "package-qemu" ])

     

       258
       258
       -
       

     

       259
       259
       -
           (mkRenamedOptionModule [ "programs" "info" "enable" ] [ "documentation" "info" "enable" ])

     

       260
       260
       -
           (mkRenamedOptionModule [ "programs" "man"  "enable" ] [ "documentation" "man"  "enable" ])

     

       261
       261
       -
           (mkRenamedOptionModule [ "services" "nixosManual" "enable" ] [ "documentation" "nixos" "enable" ])

     

       262
       262
       -
       

     

       263
       263
       -
           # ckb

     

       264
       264
       -
           (mkRenamedOptionModule [ "hardware" "ckb" "enable" ] [ "hardware" "ckb-next" "enable" ])

     

       265
       265
       -
           (mkRenamedOptionModule [ "hardware" "ckb" "package" ] [ "hardware" "ckb-next" "package" ])

     

       266
       266
       -
       

     

       267
       267
       -
           # binfmt

     

       268
       268
       -
           (mkRenamedOptionModule [ "boot" "binfmtMiscRegistrations" ] [ "boot" "binfmt" "registrations" ])

     

       269
       269
       -
       

     

       270
       270
       -
           # ACME

     

       271
       271
       -
           (mkRemovedOptionModule [ "security" "acme" "directory"] "ACME Directory is now hardcoded to /var/lib/acme and its permisisons are managed by systemd. See https://github.com/NixOS/nixpkgs/issues/53852 for more info.")

     

       272
       272
       -
           (mkRemovedOptionModule [ "security" "acme" "preDelay"] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal")

     

       273
       273
       -
           (mkRemovedOptionModule [ "security" "acme" "activationDelay"] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal")

     

       274
       274
       -
       

     

       275
       275
       -
           # KSM

     

       276
       276
       -
           (mkRenamedOptionModule [ "hardware" "enableKSM" ] [ "hardware" "ksm" "enable" ])

     

       277
       277
       -
       

     

       278
       278
       -
           # resolvconf

     

       279
       279
       -
           (mkRenamedOptionModule [ "networking" "dnsSingleRequest" ] [ "networking" "resolvconf" "dnsSingleRequest" ])

     

       280
       280
       -
           (mkRenamedOptionModule [ "networking" "dnsExtensionMechanism" ] [ "networking" "resolvconf" "dnsExtensionMechanism" ])

     

       281
       281
       -
           (mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ])

     

       282
       282
       -
           (mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ])

     

       283
       283
       -
       

     

       284
       284
       -
           # BLCR

     

       285
       24
        
           (mkRemovedOptionModule [ "environment.blcr.enable" ] "The BLCR module has been removed")

     

       286
       286
       -
       

     

       287
       287
       -
           # beegfs

     

       288
       25
        
           (mkRemovedOptionModule [ "services.beegfsEnable" ] "The BeeGFS module has been removed")

     

       289
       26
        
           (mkRemovedOptionModule [ "services.beegfs" ] "The BeeGFS module has been removed")

     

       290
       290
       -
       

     

       291
       291
       -
           # osquery

     

       292
       27
        
           (mkRemovedOptionModule [ "services.osquery" ] "The osquery module has been removed")

     

       293
       28
        
       

     

       294
       294
       -
           # Redis

     

       295
       295
       -
           (mkRemovedOptionModule [ "services" "redis" "user" ] "The redis module now is hardcoded to the redis user.")

     

       296
       296
       -
           (mkRemovedOptionModule [ "services" "redis" "dbpath" ] "The redis module now uses /var/lib/redis as data directory.")

     

       297
       297
       -
           (mkRemovedOptionModule [ "services" "redis" "dbFilename" ] "The redis module now uses /var/lib/redis/dump.rdb as database dump location.")

     

       298
       298
       -
           (mkRemovedOptionModule [ "services" "redis" "appendOnlyFilename" ] "This option was never used.")

     

       299
       299
       -
           (mkRemovedOptionModule [ "services" "redis" "pidFile" ] "This option was removed.")

     

       300
       300
       -
       

     

       301
       301
       -
         ] ++ (forEach [ "blackboxExporter" "collectdExporter" "fritzboxExporter"

     

       302
       302
       -
                          "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"

     

       303
       303
       -
                          "snmpExporter" "unifiExporter" "varnishExporter" ]

     

       304
       304
       -
              (opt: mkRemovedOptionModule [ "services" "prometheus" "${opt}" ] ''

     

       305
       305
       -
                The prometheus exporters are now configured using `services.prometheus.exporters'.

     

       306
       306
       -
                See the 18.03 release notes for more information.

     

       307
       307
       -
              '' ))

     

       308
       308
       -
       

     

       309
       309
       -
           ++ (forEach [ "enable" "substitutions" "preset" ]

     

       310
       310
       -
              (opt: mkRemovedOptionModule [ "fonts" "fontconfig" "ultimate" "${opt}" ] ''

     

       311
       311
       -
                The fonts.fontconfig.ultimate module and configuration is obsolete.

     

       312
       312
       -
                The repository has since been archived and activity has ceased.

     

       313
       313
       -
                https://github.com/bohoomil/fontconfig-ultimate/issues/171.

     

       314
       314
       -
                No action should be needed for font configuration, as the fonts.fontconfig

     

       315
       315
       -
                module is already used by default.

     

       316
       316
       -
              '' ));

     

       29
       29
       +
           # Do NOT add any option renames here, see top of the file

     

       30
       30
       +
         ];

     

       317
       31
        
       }

+3

nixos/modules/security/acme.nix

···

       127
       127
        
             "https://acme-staging-v02.api.letsencrypt.org/directory".

     

       128
       128
        
           ''

     

       129
       129
        
           )

     

       130
       130
       +
           (mkRemovedOptionModule [ "security" "acme" "directory"] "ACME Directory is now hardcoded to /var/lib/acme and its permisisons are managed by systemd. See https://github.com/NixOS/nixpkgs/issues/53852 for more info.")

     

       131
       131
       +
           (mkRemovedOptionModule [ "security" "acme" "preDelay"] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal")

     

       132
       132
       +
           (mkRemovedOptionModule [ "security" "acme" "activationDelay"] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal")

     

       130
       133
        
         ];

     

       131
       134
        
         options = {

     

       132
       135
        
           security.acme = {

+3

nixos/modules/security/apparmor-suid.nix

···

       4
       4
        
       in

     

       5
       5
        
       with lib;

     

       6
       6
        
       {

     

       7
       7
       +
         imports = [

     

       8
       8
       +
           (mkRenamedOptionModule [ "security" "virtualization" "flushL1DataCache" ] [ "security" "virtualisation" "flushL1DataCache" ])

     

       9
       9
       +
         ];

     

       7
       10
        
       

     

       8
       11
        
         options.security.apparmor.confineSUIDApplications = mkOption {

     

       9
       12
        
           default = true;

+4

nixos/modules/security/chromium-suid-sandbox.nix

···

       7
       7
        
         sandbox = pkgs.chromium.sandbox;

     

       8
       8
        
       in

     

       9
       9
        
       {

     

       10
       10
       +
         imports = [

     

       11
       11
       +
           (mkRenamedOptionModule [ "programs" "unity3d" "enable" ] [ "security" "chromiumSuidSandbox" "enable" ])

     

       12
       12
       +
         ];

     

       13
       13
       +
       

     

       10
       14
        
         options.security.chromiumSuidSandbox.enable = mkOption {

     

       11
       15
        
           type = types.bool;

     

       12
       16
        
           default = false;

+5 -1

nixos/modules/security/pam.nix

···

       484
       484
        
       

     

       485
       485
        
       {

     

       486
       486
        
       

     

       487
       487
       +
         imports = [

     

       488
       488
       +
           (mkRenamedOptionModule [ "security" "pam" "enableU2F" ] [ "security" "pam" "u2f" "enable" ])

     

       489
       489
       +
         ];

     

       490
       490
       +
       

     

       487
       491
        
         ###### interface

     

       488
       492
        
       

     

       489
       493
        
         options = {

     
···

       707
       711
        
       

     

       708
       712
        
                 Use "challenge-response" for offline validation using YubiKeys with HMAC-SHA-1

     

       709
       713
        
                 Challenge-Response configurations. See the man-page ykpamcfg(1) for further

     

       710
       710
       -
                 details on how to configure offline Challenge-Response validation. 

     

       714
       714
       +
                 details on how to configure offline Challenge-Response validation.

     

       711
       715
        
       

     

       712
       716
        
                 More information can be found <link

     

       713
       717
        
                 xlink:href="https://developers.yubico.com/yubico-pam/Authentication_Using_Challenge-Response.html">here</link>.

+4

nixos/modules/security/wrappers/default.nix

···

       94
       94
        
             ) programs;

     

       95
       95
        
       in

     

       96
       96
        
       {

     

       97
       97
       +
         imports = [

     

       98
       98
       +
           (lib.mkRemovedOptionModule [ "security" "setuidOwners" ] "Use security.wrappers instead")

     

       99
       99
       +
           (lib.mkRemovedOptionModule [ "security" "setuidPrograms" ] "Use security.wrappers instead")

     

       100
       100
       +
         ];

     

       97
       101
        
       

     

       98
       102
        
         ###### interface

     

       99
       103

+3

nixos/modules/services/audio/alsa.nix

···

       12
       12
        
       in

     

       13
       13
        
       

     

       14
       14
        
       {

     

       15
       15
       +
         imports = [

     

       16
       16
       +
           (mkRenamedOptionModule [ "sound" "enableMediaKeys" ] [ "sound" "mediaKeys" "enable" ])

     

       17
       17
       +
         ];

     

       15
       18
        
       

     

       16
       19
        
         ###### interface

     

       17
       20

+7

nixos/modules/services/backup/postgresql-backup.nix

···

       35
       35
        
       

     

       36
       36
        
       in {

     

       37
       37
        
       

     

       38
       38
       +
         imports = [

     

       39
       39
       +
           (mkRemovedOptionModule [ "services" "postgresqlBackup" "period" ] ''

     

       40
       40
       +
              A systemd timer is now used instead of cron.

     

       41
       41
       +
              The starting time can be configured via <literal>services.postgresqlBackup.startAt</literal>.

     

       42
       42
       +
           '')

     

       43
       43
       +
         ];

     

       44
       44
       +
       

     

       38
       45
        
         options = {

     

       39
       46
        
           services.postgresqlBackup = {

     

       40
       47
        
             enable = mkOption {

+4

nixos/modules/services/backup/tarsnap.nix

···

       23
       23
        
         '';

     

       24
       24
        
       in

     

       25
       25
        
       {

     

       26
       26
       +
         imports = [

     

       27
       27
       +
           (mkRemovedOptionModule [ "services" "tarsnap" "cachedir" ] "Use services.tarsnap.archives.<name>.cachedir")

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       26
       30
        
         options = {

     

       27
       31
        
           services.tarsnap = {

     

       28
       32
        
             enable = mkOption {

+4

nixos/modules/services/cluster/kubernetes/addons/dashboard.nix

···

       5
       5
        
       let

     

       6
       6
        
         cfg = config.services.kubernetes.addons.dashboard;

     

       7
       7
        
       in {

     

       8
       8
       +
         imports = [

     

       9
       9
       +
           (mkRenamedOptionModule [ "services" "kubernetes" "addons" "dashboard" "enableRBAC" ] [ "services" "kubernetes" "addons" "dashboard" "rbac" "enable" ])

     

       10
       10
       +
         ];

     

       11
       11
       +
       

     

       8
       12
        
         options.services.kubernetes.addons.dashboard = {

     

       9
       13
        
           enable = mkEnableOption "kubernetes dashboard addon";

     

       10
       14

+12

nixos/modules/services/cluster/kubernetes/apiserver.nix

···

       13
       13
        
         )) + ".1");

     

       14
       14
        
       in

     

       15
       15
        
       {

     

       16
       16
       +
       

     

       17
       17
       +
         imports = [

     

       18
       18
       +
           (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "admissionControl" ] [ "services" "kubernetes" "apiserver" "enableAdmissionPlugins" ])

     

       19
       19
       +
           (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"])

     

       20
       20
       +
           (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "port" ] ["services" "kubernetes" "apiserver" "insecurePort"])

     

       21
       21
       +
           (mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "publicAddress" ] "")

     

       22
       22
       +
           (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "servers" ] [ "services" "kubernetes" "apiserver" "etcd" "servers" ])

     

       23
       23
       +
           (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "keyFile" ] [ "services" "kubernetes" "apiserver" "etcd" "keyFile" ])

     

       24
       24
       +
           (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "certFile" ] [ "services" "kubernetes" "apiserver" "etcd" "certFile" ])

     

       25
       25
       +
           (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "caFile" ] [ "services" "kubernetes" "apiserver" "etcd" "caFile" ])

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       16
       28
        
         ###### interface

     

       17
       29
        
         options.services.kubernetes.apiserver = with lib.types; {

     

       18
       30

+5

nixos/modules/services/cluster/kubernetes/controller-manager.nix

···

       7
       7
        
         cfg = top.controllerManager;

     

       8
       8
        
       in

     

       9
       9
        
       {

     

       10
       10
       +
         imports = [

     

       11
       11
       +
           (mkRenamedOptionModule [ "services" "kubernetes" "controllerManager" "address" ] ["services" "kubernetes" "controllerManager" "bindAddress"])

     

       12
       12
       +
           (mkRenamedOptionModule [ "services" "kubernetes" "controllerManager" "port" ] ["services" "kubernetes" "controllerManager" "insecurePort"])

     

       13
       13
       +
         ];

     

       14
       14
       +
       

     

       10
       15
        
         ###### interface

     

       11
       16
        
         options.services.kubernetes.controllerManager = with lib.types; {

     

       12
       17

+4

nixos/modules/services/cluster/kubernetes/default.nix

···

       74
       74
        
         };

     

       75
       75
        
       in {

     

       76
       76
        
       

     

       77
       77
       +
         imports = [

     

       78
       78
       +
           (mkRemovedOptionModule [ "services" "kubernetes" "verbose" ] "")

     

       79
       79
       +
         ];

     

       80
       80
       +
       

     

       77
       81
        
         ###### interface

     

       78
       82
        
       

     

       79
       83
        
         options.services.kubernetes = {

+6

nixos/modules/services/cluster/kubernetes/kubelet.nix

···

       52
       52
        
         taints = concatMapStringsSep "," (v: "${v.key}=${v.value}:${v.effect}") (mapAttrsToList (n: v: v) cfg.taints);

     

       53
       53
        
       in

     

       54
       54
        
       {

     

       55
       55
       +
         imports = [

     

       56
       56
       +
           (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "applyManifests" ] "")

     

       57
       57
       +
           (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "cadvisorPort" ] "")

     

       58
       58
       +
           (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "allowPrivileged" ] "")

     

       59
       59
       +
         ];

     

       60
       60
       +
       

     

       55
       61
        
         ###### interface

     

       56
       62
        
         options.services.kubernetes.kubelet = with lib.types; {

     

       57
       63

+3

nixos/modules/services/cluster/kubernetes/proxy.nix

···

       7
       7
        
         cfg = top.proxy;

     

       8
       8
        
       in

     

       9
       9
        
       {

     

       10
       10
       +
         imports = [

     

       11
       11
       +
           (mkRenamedOptionModule [ "services" "kubernetes" "proxy" "address" ] ["services" "kubernetes" "proxy" "bindAddress"])

     

       12
       12
       +
         ];

     

       10
       13
        
       

     

       11
       14
        
         ###### interface

     

       12
       15
        
         options.services.kubernetes.proxy = with lib.types; {

+4

nixos/modules/services/databases/mysql.nix

···

       24
       24
        
       in

     

       25
       25
        
       

     

       26
       26
        
       {

     

       27
       27
       +
         imports = [

     

       28
       28
       +
           (mkRemovedOptionModule [ "services" "mysql" "pidDir" ] "Don't wait for pidfiles, describe dependencies through systemd")

     

       29
       29
       +
           (mkRemovedOptionModule [ "services" "mysql" "rootPassword" ] "Use socket authentication or set the password outside of the nix store.")

     

       30
       30
       +
         ];

     

       27
       31
        
       

     

       28
       32
        
         ###### interface

     

       29
       33

+12

nixos/modules/services/databases/neo4j.nix

···

       103
       103
        
       

     

       104
       104
        
       in {

     

       105
       105
        
       

     

       106
       106
       +
         imports = [

     

       107
       107
       +
           (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "defaultListenAddress" ])

     

       108
       108
       +
           (mkRenamedOptionModule [ "services" "neo4j" "listenAddress" ] [ "services" "neo4j" "defaultListenAddress" ])

     

       109
       109
       +
           (mkRenamedOptionModule [ "services" "neo4j" "enableBolt" ] [ "services" "neo4j" "bolt" "enable" ])

     

       110
       110
       +
           (mkRenamedOptionModule [ "services" "neo4j" "enableHttps" ] [ "services" "neo4j" "https" "enable" ])

     

       111
       111
       +
           (mkRenamedOptionModule [ "services" "neo4j" "certDir" ] [ "services" "neo4j" "directories" "certificates" ])

     

       112
       112
       +
           (mkRenamedOptionModule [ "services" "neo4j" "dataDir" ] [ "services" "neo4j" "directories" "home" ])

     

       113
       113
       +
           (mkRemovedOptionModule [ "services" "neo4j" "port" ] "Use services.neo4j.http.listenAddress instead.")

     

       114
       114
       +
           (mkRemovedOptionModule [ "services" "neo4j" "boltPort" ] "Use services.neo4j.bolt.listenAddress instead.")

     

       115
       115
       +
           (mkRemovedOptionModule [ "services" "neo4j" "httpsPort" ] "Use services.neo4j.https.listenAddress instead.")

     

       116
       116
       +
         ];

     

       117
       117
       +
       

     

       106
       118
        
         ###### interface

     

       107
       119
        
       

     

       108
       120
        
         options.services.neo4j = {

+7

nixos/modules/services/databases/redis.nix

···

       32
       32
        
         '';

     

       33
       33
        
       in

     

       34
       34
        
       {

     

       35
       35
       +
         imports = [

     

       36
       36
       +
           (mkRemovedOptionModule [ "services" "redis" "user" ] "The redis module now is hardcoded to the redis user.")

     

       37
       37
       +
           (mkRemovedOptionModule [ "services" "redis" "dbpath" ] "The redis module now uses /var/lib/redis as data directory.")

     

       38
       38
       +
           (mkRemovedOptionModule [ "services" "redis" "dbFilename" ] "The redis module now uses /var/lib/redis/dump.rdb as database dump location.")

     

       39
       39
       +
           (mkRemovedOptionModule [ "services" "redis" "appendOnlyFilename" ] "This option was never used.")

     

       40
       40
       +
           (mkRemovedOptionModule [ "services" "redis" "pidFile" ] "This option was removed.")

     

       41
       41
       +
         ];

     

       35
       42
        
       

     

       36
       43
        
         ###### interface

     

       37
       44

+5

nixos/modules/services/logging/logstash.nix

···

       37
       37
        
       in

     

       38
       38
        
       

     

       39
       39
        
       {

     

       40
       40
       +
         imports = [

     

       41
       41
       +
           (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ])

     

       42
       42
       +
           (mkRemovedOptionModule [ "services" "logstash" "enableWeb" ] "The web interface was removed from logstash")

     

       43
       43
       +
         ];

     

       44
       44
       +
       

     

       40
       45
        
         ###### interface

     

       41
       46
        
       

     

       42
       47
        
         options = {

+4

nixos/modules/services/logging/syslog-ng.nix

···

       25
       25
        
         ];

     

       26
       26
        
       

     

       27
       27
        
       in {

     

       28
       28
       +
         imports = [

     

       29
       29
       +
           (mkRemovedOptionModule [ "services" "syslog-ng" "serviceName" ] "")

     

       30
       30
       +
           (mkRemovedOptionModule [ "services" "syslog-ng" "listenToJournal" ] "")

     

       31
       31
       +
         ];

     

       28
       32
        
       

     

       29
       33
        
         options = {

     

       30
       34

+4 -1

nixos/modules/services/mail/dovecot.nix

···

       86
       86
        
             }

     

       87
       87
        
       

     

       88
       88
        
             plugin {

     

       89
       89
       -
               quota_rule = *:storage=${cfg.quotaGlobalPerUser} 

     

       89
       89
       +
               quota_rule = *:storage=${cfg.quotaGlobalPerUser}

     

       90
       90
        
               quota = maildir:User quota # per virtual mail user quota # BUG/FIXME broken, we couldn't get this working

     

       91
       91
        
               quota_status_success = DUNNO

     

       92
       92
        
               quota_status_nouser = DUNNO

     
···

       133
       133
        
         };

     

       134
       134
        
       in

     

       135
       135
        
       {

     

       136
       136
       +
         imports = [

     

       137
       137
       +
           (mkRemovedOptionModule [ "services" "dovecot2" "package" ] "")

     

       138
       138
       +
         ];

     

       136
       139
        
       

     

       137
       140
        
         options.services.dovecot2 = {

     

       138
       141
        
           enable = mkEnableOption "Dovecot 2.x POP3/IMAP server";

+3

nixos/modules/services/mail/opendkim.nix

···

       18
       18
        
                ] ++ optionals (cfg.configFile != null) [ "-x" cfg.configFile ];

     

       19
       19
        
       

     

       20
       20
        
       in {

     

       21
       21
       +
         imports = [

     

       22
       22
       +
           (mkRenamedOptionModule [ "services" "opendkim" "keyFile" ] [ "services" "opendkim" "keyPath" ])

     

       23
       23
       +
         ];

     

       21
       24
        
       

     

       22
       25
        
         ###### interface

     

       23
       26

+11

nixos/modules/services/mail/postgrey.nix

···

       42
       42
        
         };

     

       43
       43
        
       

     

       44
       44
        
       in {

     

       45
       45
       +
         imports = [

     

       46
       46
       +
           (mkMergedOptionModule [ [ "services" "postgrey" "inetAddr" ] [ "services" "postgrey" "inetPort" ] ] [ "services" "postgrey" "socket" ] (config: let

     

       47
       47
       +
               value = p: getAttrFromPath p config;

     

       48
       48
       +
               inetAddr = [ "services" "postgrey" "inetAddr" ];

     

       49
       49
       +
               inetPort = [ "services" "postgrey" "inetPort" ];

     

       50
       50
       +
             in

     

       51
       51
       +
               if value inetAddr == null

     

       52
       52
       +
               then { path = "/run/postgrey.sock"; }

     

       53
       53
       +
               else { addr = value inetAddr; port = value inetPort; }

     

       54
       54
       +
           ))

     

       55
       55
       +
         ];

     

       45
       56
        
       

     

       46
       57
        
         options = {

     

       47
       58
        
           services.postgrey = with types; {

+1 -1

nixos/modules/services/mail/rspamd.nix

···

       220
       220
        
       in

     

       221
       221
        
       

     

       222
       222
        
       {

     

       223
       223
       -
       

     

       224
       223
        
         ###### interface

     

       225
       224
        
       

     

       226
       225
        
         options = {

     
···

       414
       413
        
       	     "Socket activation never worked correctly and could at this time not be fixed and so was removed")

     

       415
       414
        
           (mkRenamedOptionModule [ "services" "rspamd" "bindSocket" ] [ "services" "rspamd" "workers" "normal" "bindSockets" ])

     

       416
       415
        
           (mkRenamedOptionModule [ "services" "rspamd" "bindUISocket" ] [ "services" "rspamd" "workers" "controller" "bindSockets" ])

     

       416
       416
       +
           (mkRemovedOptionModule [ "services" "rmilter" ] "Use services.rspamd.* instead to set up milter service")

     

       417
       417
        
         ];

     

       418
       418
        
       }

+5

nixos/modules/services/misc/gitlab.nix

···

       189
       189
        
       

     

       190
       190
        
       in {

     

       191
       191
        
       

     

       192
       192
       +
         imports = [

     

       193
       193
       +
           (mkRenamedOptionModule [ "services" "gitlab" "stateDir" ] [ "services" "gitlab" "statePath" ])

     

       194
       194
       +
           (mkRemovedOptionModule [ "services" "gitlab" "satelliteDir" ] "")

     

       195
       195
       +
         ];

     

       196
       196
       +
       

     

       192
       197
        
         options = {

     

       193
       198
        
           services.gitlab = {

     

       194
       199
        
             enable = mkOption {

+4

nixos/modules/services/misc/nix-daemon.nix

···

       68
       68
        
       in

     

       69
       69
        
       

     

       70
       70
        
       {

     

       71
       71
       +
         imports = [

     

       72
       72
       +
           (mkRenamedOptionModule [ "nix" "useChroot" ] [ "nix" "useSandbox" ])

     

       73
       73
       +
           (mkRenamedOptionModule [ "nix" "chrootDirs" ] [ "nix" "sandboxPaths" ])

     

       74
       74
       +
         ];

     

       71
       75
        
       

     

       72
       76
        
         ###### interface

     

       73
       77

+6

nixos/modules/services/misc/nzbget.nix

···

       27
       27
        
       

     

       28
       28
        
       in

     

       29
       29
        
       {

     

       30
       30
       +
         imports = [

     

       31
       31
       +
           (mkRemovedOptionModule [ "services" "misc" "nzbget" "configFile" ] "The configuration of nzbget is now managed by users through the web interface.")

     

       32
       32
       +
           (mkRemovedOptionModule [ "services" "misc" "nzbget" "dataDir" ] "The data directory for nzbget is now /var/lib/nzbget.")

     

       33
       33
       +
           (mkRemovedOptionModule [ "services" "misc" "nzbget" "openFirewall" ] "The port used by nzbget is managed through the web interface so you should adjust your firewall rules accordingly.")

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       30
       36
        
         # interface

     

       31
       37
        
       

     

       32
       38
        
         options = {

+4

nixos/modules/services/misc/parsoid.nix

···

       26
       26
        
       

     

       27
       27
        
       in

     

       28
       28
        
       {

     

       29
       29
       +
         imports = [

     

       30
       30
       +
           (mkRemovedOptionModule [ "services" "parsoid" "interwikis" ] "Use services.parsoid.wikis instead")

     

       31
       31
       +
         ];

     

       32
       32
       +
       

     

       29
       33
        
         ##### interface

     

       30
       34
        
       

     

       31
       35
        
         options = {

+4

nixos/modules/services/misc/pykms.nix

···

       9
       9
        
       in {

     

       10
       10
        
         meta.maintainers = with lib.maintainers; [ peterhoeg ];

     

       11
       11
        
       

     

       12
       12
       +
         imports = [

     

       13
       13
       +
           (mkRemovedOptionModule [ "services" "pykms" "verbose" ] "Use services.pykms.logLevel instead")

     

       14
       14
       +
         ];

     

       15
       15
       +
       

     

       12
       16
        
         options = {

     

       13
       17
        
           services.pykms = {

     

       14
       18
        
             enable = mkOption {

+4

nixos/modules/services/misc/tautulli.nix

···

       6
       6
        
         cfg = config.services.tautulli;

     

       7
       7
        
       in

     

       8
       8
        
       {

     

       9
       9
       +
         imports = [

     

       10
       10
       +
           (mkRenamedOptionModule [ "services" "plexpy" ] [ "services" "tautulli" ])

     

       11
       11
       +
         ];

     

       12
       12
       +
       

     

       9
       13
        
         options = {

     

       10
       14
        
           services.tautulli = {

     

       11
       15
        
             enable = mkEnableOption "Tautulli Plex Monitor";

+9

nixos/modules/services/monitoring/prometheus/alertmanager.nix

···

       27
       27
        
             "--log.format ${cfg.logFormat}"

     

       28
       28
        
         );

     

       29
       29
        
       in {

     

       30
       30
       +
         imports = [

     

       31
       31
       +
           (mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "user" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a user setting.")

     

       32
       32
       +
           (mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "group" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a group setting.")

     

       33
       33
       +
           (mkRemovedOptionModule [ "services" "prometheus" "alertmanagerURL" ] ''

     

       34
       34
       +
             Due to incompatibility, the alertmanagerURL option has been removed,

     

       35
       35
       +
             please use 'services.prometheus2.alertmanagers' instead.

     

       36
       36
       +
           '')

     

       37
       37
       +
         ];

     

       38
       38
       +
       

     

       30
       39
        
         options = {

     

       31
       40
        
           services.prometheus.alertmanager = {

     

       32
       41
        
             enable = mkEnableOption "Prometheus Alertmanager";

+5

nixos/modules/services/monitoring/prometheus/default.nix

···

       464
       464
        
         };

     

       465
       465
        
       

     

       466
       466
        
       in {

     

       467
       467
       +
       

     

       468
       468
       +
         imports = [

     

       469
       469
       +
           (mkRenamedOptionModule [ "services" "prometheus2" ] [ "services" "prometheus" ])

     

       470
       470
       +
         ];

     

       471
       471
       +
       

     

       467
       472
        
         options.services.prometheus = {

     

       468
       473
        
       

     

       469
       474
        
           enable = mkOption {

+18

nixos/modules/services/monitoring/prometheus/exporters.nix

···

       160
       160
        
         };

     

       161
       161
        
       in

     

       162
       162
        
       {

     

       163
       163
       +
       

     

       164
       164
       +
         imports = (lib.forEach [ "blackboxExporter" "collectdExporter" "fritzboxExporter"

     

       165
       165
       +
                          "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"

     

       166
       166
       +
                          "snmpExporter" "unifiExporter" "varnishExporter" ]

     

       167
       167
       +
              (opt: lib.mkRemovedOptionModule [ "services" "prometheus" "${opt}" ] ''

     

       168
       168
       +
                The prometheus exporters are now configured using `services.prometheus.exporters'.

     

       169
       169
       +
                See the 18.03 release notes for more information.

     

       170
       170
       +
              '' ))

     

       171
       171
       +
       

     

       172
       172
       +
           ++ (lib.forEach [ "enable" "substitutions" "preset" ]

     

       173
       173
       +
              (opt: lib.mkRemovedOptionModule [ "fonts" "fontconfig" "ultimate" "${opt}" ] ''

     

       174
       174
       +
                The fonts.fontconfig.ultimate module and configuration is obsolete.

     

       175
       175
       +
                The repository has since been archived and activity has ceased.

     

       176
       176
       +
                https://github.com/bohoomil/fontconfig-ultimate/issues/171.

     

       177
       177
       +
                No action should be needed for font configuration, as the fonts.fontconfig

     

       178
       178
       +
                module is already used by default.

     

       179
       179
       +
              '' ));

     

       180
       180
       +
       

     

       163
       181
        
         options.services.prometheus.exporters = mkOption {

     

       164
       182
        
           type = types.submodule {

     

       165
       183
        
             options = (mkSubModules);

+5

nixos/modules/services/monitoring/zabbix-server.nix

···

       44
       44
        
       in

     

       45
       45
        
       

     

       46
       46
        
       {

     

       47
       47
       +
         imports = [

     

       48
       48
       +
           (lib.mkRenamedOptionModule [ "services" "zabbixServer" "dbServer" ] [ "services" "zabbixServer" "database" "host" ])

     

       49
       49
       +
           (lib.mkRemovedOptionModule [ "services" "zabbixServer" "dbPassword" ] "Use services.zabbixServer.database.passwordFile instead.")

     

       50
       50
       +
         ];

     

       51
       51
       +
       

     

       47
       52
        
         # interface

     

       48
       53
        
       

     

       49
       54
        
         options = {

+4

nixos/modules/services/network-filesystems/nfsd.nix

···

       11
       11
        
       in

     

       12
       12
        
       

     

       13
       13
        
       {

     

       14
       14
       +
         imports = [

     

       15
       15
       +
           (mkRenamedOptionModule [ "services" "nfs" "lockdPort" ] [ "services" "nfs" "server" "lockdPort" ])

     

       16
       16
       +
           (mkRenamedOptionModule [ "services" "nfs" "statdPort" ] [ "services" "nfs" "server" "statdPort" ])

     

       17
       17
       +
         ];

     

       14
       18
        
       

     

       15
       19
        
         ###### interface

     

       16
       20

+3

nixos/modules/services/network-filesystems/samba.nix

···

       65
       65
        
       in

     

       66
       66
        
       

     

       67
       67
        
       {

     

       68
       68
       +
         imports = [

     

       69
       69
       +
           (mkRemovedOptionModule [ "services" "samba" "defaultShare" ] "")

     

       70
       70
       +
         ];

     

       68
       71
        
       

     

       69
       72
        
         ###### interface

     

       70
       73

+4

nixos/modules/services/networking/connman.nix

···

       13
       13
        
         '';

     

       14
       14
        
       in {

     

       15
       15
        
       

     

       16
       16
       +
         imports = [

     

       17
       17
       +
           (mkRenamedOptionModule [ "networking" "connman" ] [ "services" "connman" ])

     

       18
       18
       +
         ];

     

       19
       19
       +
       

     

       16
       20
        
         ###### interface

     

       17
       21
        
       

     

       18
       22
        
         options = {

+8

nixos/modules/services/networking/ddclient.nix

···

       30
       30
        
       

     

       31
       31
        
       {

     

       32
       32
        
       

     

       33
       33
       +
         imports = [

     

       34
       34
       +
           (mkChangedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ]

     

       35
       35
       +
             (config:

     

       36
       36
       +
               let value = getAttrFromPath [ "services" "ddclient" "domain" ] config;

     

       37
       37
       +
               in if value != "" then [ value ] else []))

     

       38
       38
       +
           (mkRemovedOptionModule [ "services" "ddclient" "homeDir" ] "")

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       33
       41
        
         ###### interface

     

       34
       42
        
       

     

       35
       43
        
         options = {

+4

nixos/modules/services/networking/dhcpd.nix

···

       182
       182
        
       

     

       183
       183
        
       {

     

       184
       184
        
       

     

       185
       185
       +
         imports = [

     

       186
       186
       +
           (mkRenamedOptionModule [ "services" "dhcpd" ] [ "services" "dhcpd4" ])

     

       187
       187
       +
         ];

     

       188
       188
       +
       

     

       185
       189
        
         ###### interface

     

       186
       190
        
       

     

       187
       191
        
         options = {

+4

nixos/modules/services/networking/i2pd.nix

···

       235
       235
        
       

     

       236
       236
        
       {

     

       237
       237
        
       

     

       238
       238
       +
         imports = [

     

       239
       239
       +
           (mkRenamedOptionModule [ "services" "i2pd" "extIp" ] [ "services" "i2pd" "address" ])

     

       240
       240
       +
         ];

     

       241
       241
       +
       

     

       238
       242
        
         ###### interface

     

       239
       243
        
       

     

       240
       244
        
         options = {

+7

nixos/modules/services/networking/iodine.nix

···

       11
       11
        
       

     

       12
       12
        
       in

     

       13
       13
        
       {

     

       14
       14
       +
         imports = [

     

       15
       15
       +
           (mkRenamedOptionModule [ "services" "iodined" "enable" ] [ "services" "iodine" "server" "enable" ])

     

       16
       16
       +
           (mkRenamedOptionModule [ "services" "iodined" "domain" ] [ "services" "iodine" "server" "domain" ])

     

       17
       17
       +
           (mkRenamedOptionModule [ "services" "iodined" "ip" ] [ "services" "iodine" "server" "ip" ])

     

       18
       18
       +
           (mkRenamedOptionModule [ "services" "iodined" "extraConfig" ] [ "services" "iodine" "server" "extraConfig" ])

     

       19
       19
       +
           (mkRemovedOptionModule [ "services" "iodined" "client" ] "")

     

       20
       20
       +
         ];

     

       14
       21
        
       

     

       15
       22
        
         ### configuration

     

       16
       23

+5

nixos/modules/services/networking/murmur.nix

···

       46
       46
        
         '';

     

       47
       47
        
       in

     

       48
       48
        
       {

     

       49
       49
       +
         imports = [

     

       50
       50
       +
           (mkRenamedOptionModule [ "services" "murmur" "welcome" ] [ "services" "murmur" "welcometext" ])

     

       51
       51
       +
           (mkRemovedOptionModule [ "services" "murmur" "pidfile" ] "Hardcoded to /run/murmur/murmurd.pid now")

     

       52
       52
       +
         ];

     

       53
       53
       +
       

     

       49
       54
        
         options = {

     

       50
       55
        
           services.murmur = {

     

       51
       56
        
             enable = mkOption {

+1

nixos/modules/services/networking/networkmanager.nix

···

       336
       336
        
         };

     

       337
       337
        
       

     

       338
       338
        
         imports = [

     

       339
       339
       +
           (mkRenamedOptionModule [ "networking" "networkmanager" "useDnsmasq" ] [ "networking" "networkmanager" "dns" ])

     

       339
       340
        
           (mkRemovedOptionModule ["networking" "networkmanager" "dynamicHosts"] ''

     

       340
       341
        
             This option was removed because allowing (multiple) regular users to

     

       341
       342
        
             override host entries affecting the whole system opens up a huge attack

+3

nixos/modules/services/networking/openvpn.nix

···

       73
       73
        
       in

     

       74
       74
        
       

     

       75
       75
        
       {

     

       76
       76
       +
         imports = [

     

       77
       77
       +
           (mkRemovedOptionModule [ "services" "openvpn" "enable" ] "")

     

       78
       78
       +
         ];

     

       76
       79
        
       

     

       77
       80
        
         ###### interface

     

       78
       81

+4

nixos/modules/services/networking/ssh/sshd.nix

···

       74
       74
        
       in

     

       75
       75
        
       

     

       76
       76
        
       {

     

       77
       77
       +
         imports = [

     

       78
       78
       +
           (mkAliasOptionModule [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ])

     

       79
       79
       +
           (mkAliasOptionModule [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ])

     

       80
       80
       +
         ];

     

       77
       81
        
       

     

       78
       82
        
         ###### interface

     

       79
       83

+9

nixos/modules/services/printing/cupsd.nix

···

       112
       112
        
       

     

       113
       113
        
       {

     

       114
       114
        
       

     

       115
       115
       +
         imports = [

     

       116
       116
       +
           (mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ]

     

       117
       117
       +
             (config:

     

       118
       118
       +
               let enabled = getAttrFromPath [ "services" "printing" "gutenprint" ] config;

     

       119
       119
       +
               in if enabled then [ pkgs.gutenprint ] else [ ]))

     

       120
       120
       +
           (mkRemovedOptionModule [ "services" "printing" "cupsFilesConf" ] "")

     

       121
       121
       +
           (mkRemovedOptionModule [ "services" "printing" "cupsdConf" ] "")

     

       122
       122
       +
         ];

     

       123
       123
       +
       

     

       115
       124
        
         ###### interface

     

       116
       125
        
       

     

       117
       126
        
         options = {

+4

nixos/modules/services/security/clamav.nix

···

       30
       30
        
         '';

     

       31
       31
        
       in

     

       32
       32
        
       {

     

       33
       33
       +
         imports = [

     

       34
       34
       +
           (mkRenamedOptionModule [ "services" "clamav" "updater" "config" ] [ "services" "clamav" "updater" "extraConfig" ])

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       33
       37
        
         options = {

     

       34
       38
        
           services.clamav = {

     

       35
       39
        
             daemon = {

+6

nixos/modules/services/security/tor.nix

···

       106
       106
        
       

     

       107
       107
        
       in

     

       108
       108
        
       {

     

       109
       109
       +
         imports = [

     

       110
       110
       +
           (mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ])

     

       111
       111
       +
           (mkRemovedOptionModule [ "services" "tor" "relay" "isBridge" ] "Use services.tor.relay.role instead.")

     

       112
       112
       +
           (mkRemovedOptionModule [ "services" "tor" "relay" "isExit" ] "Use services.tor.relay.role instead.")

     

       113
       113
       +
         ];

     

       114
       114
       +
       

     

       109
       115
        
         options = {

     

       110
       116
        
           services.tor = {

     

       111
       117
        
             enable = mkOption {

+8

nixos/modules/services/web-apps/matomo.nix

···

       18
       18
        
            in join config.networking.hostName config.networking.domain;

     

       19
       19
        
       

     

       20
       20
        
       in {

     

       21
       21
       +
         imports = [

     

       22
       22
       +
           (mkRenamedOptionModule [ "services" "piwik" "enable" ] [ "services" "matomo" "enable" ])

     

       23
       23
       +
           (mkRenamedOptionModule [ "services" "piwik" "webServerUser" ] [ "services" "matomo" "webServerUser" ])

     

       24
       24
       +
           (mkRemovedOptionModule [ "services" "piwik" "phpfpmProcessManagerConfig" ] "Use services.phpfpm.pools.<name>.settings")

     

       25
       25
       +
           (mkRemovedOptionModule [ "services" "matomo" "phpfpmProcessManagerConfig" ] "Use services.phpfpm.pools.<name>.settings")

     

       26
       26
       +
           (mkRenamedOptionModule [ "services" "piwik" "nginx" ] [ "services" "matomo" "nginx" ])

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       21
       29
        
         options = {

     

       22
       30
        
           services.matomo = {

     

       23
       31
        
             # NixOS PR for database setup: https://github.com/NixOS/nixpkgs/pull/6963

+4

nixos/modules/services/web-servers/phpfpm/default.nix

···

       146
       146
        
           };

     

       147
       147
        
       

     

       148
       148
        
       in {

     

       149
       149
       +
         imports = [

     

       150
       150
       +
           (mkRemovedOptionModule [ "services" "phpfpm" "poolConfigs" ] "Use services.phpfpm.pools instead.")

     

       151
       151
       +
           (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "")

     

       152
       152
       +
         ];

     

       149
       153
        
       

     

       150
       154
        
         options = {

     

       151
       155
        
           services.phpfpm = {

+4

nixos/modules/services/x11/desktop-managers/enlightenment.nix

···

       16
       16
        
       in

     

       17
       17
        
       

     

       18
       18
        
       {

     

       19
       19
       +
         imports = [

     

       20
       20
       +
           (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "e19" "enable" ] [ "services" "xserver" "desktopManager" "enlightenment" "enable" ])

     

       21
       21
       +
         ];

     

       22
       22
       +
       

     

       19
       23
        
         options = {

     

       20
       24
        
       

     

       21
       25
        
           services.xserver.desktopManager.enlightenment.enable = mkOption {

+1

nixos/modules/services/x11/desktop-managers/plasma5.nix

···

       33
       33
        
       

     

       34
       34
        
         imports = [

     

       35
       35
        
           (mkRemovedOptionModule [ "services" "xserver" "desktopManager" "plasma5" "enableQt4Support" ] "Phonon no longer supports Qt 4.")

     

       36
       36
       +
           (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "kde5" ] [ "services" "xserver" "desktopManager" "plasma5" ])

     

       36
       37
        
         ];

     

       37
       38
        
       

     

       38
       39
        
         config = mkMerge [

+1

nixos/modules/services/x11/desktop-managers/xfce.nix

···

       31
       31
        
           (mkRenamedOptionModule

     

       32
       32
        
             [ "services" "xserver" "desktopManager" "xfce" "extraSessionCommands" ]

     

       33
       33
        
             [ "services" "xserver" "displayManager" "sessionCommands" ])

     

       34
       34
       +
           (mkRemovedOptionModule [ "services" "xserver" "desktopManager" "xfce" "screenLock" ] "")

     

       34
       35
        
         ];

     

       35
       36
        
       

     

       36
       37
        
         options = {

+3 -2

nixos/modules/services/x11/display-managers/default.nix

···

       207
       207
        
       in

     

       208
       208
        
       

     

       209
       209
        
       {

     

       210
       210
       -
       

     

       211
       210
        
         options = {

     

       212
       211
        
       

     

       213
       212
        
           services.xserver.displayManager = {

     
···

       368
       367
        
         };

     

       369
       368
        
       

     

       370
       369
        
         imports = [

     

       371
       371
       -
          (mkRemovedOptionModule [ "services" "xserver" "displayManager" "desktopManagerHandlesLidAndPower" ]

     

       370
       370
       +
           (mkRemovedOptionModule [ "services" "xserver" "displayManager" "desktopManagerHandlesLidAndPower" ]

     

       372
       371
        
            "The option is no longer necessary because all display managers have already delegated lid management to systemd.")

     

       372
       372
       +
           (mkRenamedOptionModule [ "services" "xserver" "displayManager" "job" "logsXsession" ] [ "services" "xserver" "displayManager" "job" "logToFile" ])

     

       373
       373
       +
           (mkRenamedOptionModule [ "services" "xserver" "displayManager" "logToJournal" ] [ "services" "xserver" "displayManager" "job" "logToJournal" ])

     

       373
       374
        
         ];

     

       374
       375
        
       

     

       375
       376
        
       }

+5

nixos/modules/services/x11/display-managers/sddm.nix

···

       79
       79
        
       

     

       80
       80
        
       in

     

       81
       81
        
       {

     

       82
       82
       +
         imports = [

     

       83
       83
       +
           (mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ]

     

       84
       84
       +
             "Set the option `services.xserver.displayManager.sddm.package' instead.")

     

       85
       85
       +
         ];

     

       86
       86
       +
       

     

       82
       87
        
         options = {

     

       83
       88
        
       

     

       84
       89
        
           services.xserver.displayManager.sddm = {

+2

nixos/modules/services/x11/xserver.nix

···

       149
       149
        
           [ ./display-managers/default.nix

     

       150
       150
        
             ./window-managers/default.nix

     

       151
       151
        
             ./desktop-managers/default.nix

     

       152
       152
       +
             (mkRemovedOptionModule [ "services" "xserver" "startGnuPGAgent" ]

     

       153
       153
       +
               "See the 16.09 release notes for more information.")

     

       152
       154
        
           ];

     

       153
       155
        
       

     

       154
       156

+4

nixos/modules/system/boot/binfmt.nix

···

       134
       134
        
         };

     

       135
       135
        
       

     

       136
       136
        
       in {

     

       137
       137
       +
         imports = [

     

       138
       138
       +
           (lib.mkRenamedOptionModule [ "boot" "binfmtMiscRegistrations" ] [ "boot" "binfmt" "registrations" ])

     

       139
       139
       +
         ];

     

       140
       140
       +
       

     

       137
       141
        
         options = {

     

       138
       142
        
           boot.binfmt = {

     

       139
       143
        
             registrations = mkOption {

+3

nixos/modules/system/boot/grow-partition.nix

···

       7
       7
        
       with lib;

     

       8
       8
        
       

     

       9
       9
        
       {

     

       10
       10
       +
         imports = [

     

       11
       11
       +
           (mkRenamedOptionModule [ "virtualisation" "growPartition" ] [ "boot" "growPartition" ])

     

       12
       12
       +
         ];

     

       10
       13
        
       

     

       11
       14
        
         options = {

     

       12
       15
        
           boot.growPartition = mkEnableOption "grow the root partition on boot";

+6 -1

nixos/modules/system/boot/loader/loader.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       {

     

       6
       6
       +
         imports = [

     

       7
       7
       +
           (mkRenamedOptionModule [ "boot" "loader" "grub" "timeout" ] [ "boot" "loader" "timeout" ])

     

       8
       8
       +
           (mkRenamedOptionModule [ "boot" "loader" "gummiboot" "timeout" ] [ "boot" "loader" "timeout" ])

     

       9
       9
       +
         ];

     

       10
       10
       +
       

     

       6
       11
        
           options = {

     

       7
       12
        
               boot.loader.timeout =  mkOption {

     

       8
       13
        
                   default = 5;

     
···

       12
       17
        
                   '';

     

       13
       18
        
               };

     

       14
       19
        
           };

     

       15
       15
       -
       }
     

       20
       20
       +
       }

+4 -1

nixos/modules/system/boot/luksroot.nix

···

       126
       126
        
       

     

       127
       127
        
           gpg-agent --daemon --scdaemon-program $out/bin/scdaemon > /dev/null 2> /dev/null

     

       128
       128
        
           ''}

     

       129
       129
       -
               

     

       129
       129
       +
       

     

       130
       130
        
           # Disable all input echo for the whole stage. We could use read -s

     

       131
       131
        
           # instead but that would ocasionally leak characters between read

     

       132
       132
        
           # invocations.

     
···

       417
       417
        
       

     

       418
       418
        
       in

     

       419
       419
        
       {

     

       420
       420
       +
         imports = [

     

       421
       421
       +
           (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "")

     

       422
       422
       +
         ];

     

       420
       423
        
       

     

       421
       424
        
         options = {

     

       422
       425

+2 -1

nixos/modules/system/boot/systemd.nix

···

       408
       408
        
       in

     

       409
       409
        
       

     

       410
       410
        
       {

     

       411
       411
       -
       

     

       412
       411
        
         ###### interface

     

       413
       412
        
       

     

       414
       413
        
         options = {

     
···

       1006
       1005
        
           [ (mkRenamedOptionModule [ "boot" "systemd" "sockets" ] [ "systemd" "sockets" ])

     

       1007
       1006
        
             (mkRenamedOptionModule [ "boot" "systemd" "targets" ] [ "systemd" "targets" ])

     

       1008
       1007
        
             (mkRenamedOptionModule [ "boot" "systemd" "services" ] [ "systemd" "services" ])

     

       1008
       1008
       +
             (mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ])

     

       1009
       1009
       +
             (mkRemovedOptionModule [ "systemd" "generator-packages" ] "Use systemd.packages instead.")

     

       1009
       1010
        
           ];

     

       1010
       1011
        
       }

+4

nixos/modules/tasks/filesystems/zfs.nix

···

       103
       103
        
       

     

       104
       104
        
       {

     

       105
       105
        
       

     

       106
       106
       +
         imports = [

     

       107
       107
       +
           (mkRemovedOptionModule [ "boot" "zfs" "enableLegacyCrypto" ] "The corresponding package was removed from nixpkgs.")

     

       108
       108
       +
         ];

     

       109
       109
       +
       

     

       106
       110
        
         ###### interface

     

       107
       111
        
       

     

       108
       112
        
         options = {

+4

nixos/modules/virtualisation/ec2-data.nix

···

       7
       7
        
       with lib;

     

       8
       8
        
       

     

       9
       9
        
       {

     

       10
       10
       +
         imports = [

     

       11
       11
       +
           (mkRemovedOptionModule [ "ec2" "metadata" ] "")

     

       12
       12
       +
         ];

     

       13
       13
       +
       

     

       10
       14
        
         config = {

     

       11
       15
        
       

     

       12
       16
        
           systemd.services.apply-ec2-data =

+5

nixos/modules/virtualisation/libvirtd.nix

···

       28
       28
        
       

     

       29
       29
        
       in {

     

       30
       30
        
       

     

       31
       31
       +
         imports = [

     

       32
       32
       +
           (mkRemovedOptionModule [ "virtualisation" "libvirtd" "enableKVM" ]

     

       33
       33
       +
             "Set the option `virtualisation.libvirtd.qemuPackage' instead.")

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       31
       36
        
         ###### interface

     

       32
       37
        
       

     

       33
       38
        
         options.virtualisation.libvirtd = {

+4

nixos/modules/virtualisation/vmware-guest.nix

···

       8
       8
        
         xf86inputvmmouse = pkgs.xorg.xf86inputvmmouse;

     

       9
       9
        
       in

     

       10
       10
        
       {

     

       11
       11
       +
         imports = [

     

       12
       12
       +
           (mkRenamedOptionModule [ "services" "vmwareGuest" ] [ "virtualisation" "vmware" "guest" ])

     

       13
       13
       +
         ];

     

       14
       14
       +
       

     

       11
       15
        
         options.virtualisation.vmware.guest = {

     

       12
       16
        
           enable = mkEnableOption "VMWare Guest Support";

     

       13
       17
        
           headless = mkOption {

+5

nixos/modules/virtualisation/xen-dom0.nix

···

       9
       9
        
       in

     

       10
       10
        
       

     

       11
       11
        
       {

     

       12
       12
       +
         imports = [

     

       13
       13
       +
           (mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.")

     

       14
       14
       +
           (mkRenamedOptionModule [ "virtualisation" "xen" "qemu-package" ] [ "virtualisation" "xen" "package-qemu" ])

     

       15
       15
       +
         ];

     

       16
       16
       +
       

     

       12
       17
        
         ###### interface

     

       13
       18
        
       

     

       14
       19
        
         options = {