commit e01e92f12f5e768e5bd5ef84a969b978fb501186 · pyrox.dev/nixpkgs

+7 -3

lib/modules.nix

···

       105
       105
        
         /* Massage a module into canonical form, that is, a set consisting

     

       106
       106
        
            of ‘options’, ‘config’ and ‘imports’ attributes. */

     

       107
       107
        
         unifyModuleSyntax = file: key: m:

     

       108
       108
       +
           let metaSet = if m ? meta 

     

       109
       109
       +
             then { meta = m.meta; }

     

       110
       110
       +
             else {};

     

       111
       111
       +
           in

     

       108
       112
        
           if m ? config || m ? options then

     

       109
       109
       -
             let badAttrs = removeAttrs m ["imports" "options" "config" "key" "_file"]; in

     

       113
       113
       +
             let badAttrs = removeAttrs m ["imports" "options" "config" "key" "_file" "meta"]; in

     

       110
       114
        
             if badAttrs != {} then

     

       111
       115
        
               throw "Module `${key}' has an unsupported attribute `${head (attrNames badAttrs)}'. This is caused by assignments to the top-level attributes `config' or `options'."

     

       112
       116
        
             else

     
···

       114
       118
        
                 key = toString m.key or key;

     

       115
       119
        
                 imports = m.imports or [];

     

       116
       120
        
                 options = m.options or {};

     

       117
       117
       -
                 config = m.config or {};

     

       121
       121
       +
                 config = mkMerge [ (m.config or {}) metaSet ];

     

       118
       122
        
               }

     

       119
       123
        
           else

     

       120
       124
        
             { file = m._file or file;

     

       121
       125
        
               key = toString m.key or key;

     

       122
       126
        
               imports = m.require or [] ++ m.imports or [];

     

       123
       127
        
               options = {};

     

       124
       124
       -
               config = removeAttrs m ["key" "_file" "require" "imports"];

     

       128
       128
       +
               config = mkMerge [ (removeAttrs m ["key" "_file" "require" "imports"]) metaSet ];

     

       125
       129
        
             };

     

       126
       130
        
       

     

       127
       131
        
         applyIfFunction = key: f: args@{ config, options, lib, ... }: if isFunction f then

+2 -6

nixos/doc/manual/configuration/configuration.xml

···

       25
       25
        
       <xi:include href="linux-kernel.xml" />

     

       26
       26
        
       <xi:include href="grsecurity.xml" />

     

       27
       27
        
       

     

       28
       28
       -
       <!-- FIXME: auto-include NixOS module docs -->

     

       29
       29
       -
       <xi:include href="postgresql.xml" />

     

       30
       30
       -
       <xi:include href="gitlab.xml" />

     

       31
       31
       -
       <xi:include href="taskserver.xml" />

     

       32
       32
       -
       <xi:include href="acme.xml" />

     

       33
       33
       -
       <xi:include href="input-methods.xml" />

     

       34
       28
        
       <xi:include href="emacs.xml" />

     

       29
       29
       +
       <xi:include href="modules.xml" xpointer="xpointer(//section[@id='modules']/*)" />

     

       35
       30
        
       

     

       36
       31
        
       <!-- Apache; libvirtd virtualisation -->

     

       37
       32
        
       

     

       38
       33
        
       </part>

     

       34
       34
       +

+10 -1

nixos/doc/manual/default.nix

···

       1
       1
       -
       { pkgs, options, version, revision, extraSources ? [] }:

     

       1
       1
       +
       { pkgs, options, config, version, revision, extraSources ? [] }:

     

       2
       2
        
       

     

       3
       3
        
       with pkgs;

     

       4
       4
        
       

     
···

       51
       51
        
       

     

       52
       52
        
         sources = lib.sourceFilesBySuffices ./. [".xml"];

     

       53
       53
        
       

     

       54
       54
       +
         modulesDoc = builtins.toFile "modules.xml" ''

     

       55
       55
       +
           <section xmlns:xi="http://www.w3.org/2001/XInclude" id="modules">

     

       56
       56
       +
           ${(lib.concatMapStrings (path: ''

     

       57
       57
       +
             <xi:include href="${path}" />

     

       58
       58
       +
           '') (lib.catAttrs "value" config.meta.doc))}

     

       59
       59
       +
           </section>

     

       60
       60
       +
         '';

     

       61
       61
       +
       

     

       54
       62
        
         copySources =

     

       55
       63
        
           ''

     

       56
       64
        
             cp -prd $sources/* . # */

     
···

       61
       69
        
             cp ${../../modules/security/acme.xml} configuration/acme.xml

     

       62
       70
        
             cp ${../../modules/i18n/input-method/default.xml} configuration/input-methods.xml

     

       63
       71
        
             cp ${../../modules/services/editors/emacs.xml} configuration/emacs.xml

     

       72
       72
       +
             ln -s ${modulesDoc} configuration/modules.xml

     

       64
       73
        
             ln -s ${optionsDocBook} options-db.xml

     

       65
       74
        
             echo "${version}" > version

     

       66
       75
        
           '';

+5

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

···

       62
       62
        
           environment.systemPackages = [ cfg.package gtk2_cache gtk3_cache ];

     

       63
       63
        
         };

     

       64
       64
        
       

     

       65
       65
       +
         meta = {

     

       66
       66
       +
           maintainers = with lib.maintainers; [ ericsagnes ];

     

       67
       67
       +
           doc = ./default.xml;

     

       68
       68
       +
         };

     

       69
       69
       +
       

     

       65
       70
        
       }

+3 -5

nixos/modules/misc/meta.nix

···

       39
       39
        
               default = [];

     

       40
       40
        
               example = [ lib.maintainers.all ];

     

       41
       41
        
               description = ''

     

       42
       42
       -
       	  List of maintainers of each module.  This option should be defined at

     

       42
       42
       +
                 List of maintainers of each module.  This option should be defined at

     

       43
       43
        
                 most once per module.

     

       44
       44
        
               '';

     

       45
       45
        
             };

     
···

       49
       49
        
               internal = true;

     

       50
       50
        
               example = "./meta.xml";

     

       51
       51
        
               description = ''

     

       52
       52
       -
       	  Documentation prologe for the set of options of each module.  This

     

       52
       52
       +
                 Documentation prologe for the set of options of each module.  This

     

       53
       53
        
                 option should be defined at most once per module.

     

       54
       54
        
               '';

     

       55
       55
        
             };

     
···

       57
       57
        
           };

     

       58
       58
        
         };

     

       59
       59
        
       

     

       60
       60
       -
         config = {

     

       61
       61
       -
           meta.maintainers = singleton lib.maintainers.pierron;

     

       62
       62
       -
         };

     

       60
       60
       +
         meta.maintainers = singleton lib.maintainers.pierron;

     

       63
       61
        
       }

+4 -3

nixos/modules/security/acme.nix

···

       290
       290
        
             systemd.targets."acme-certificates" = {};

     

       291
       291
        
           })

     

       292
       292
        
       

     

       293
       293
       -
           { meta.maintainers = with lib.maintainers; [ abbradar fpletz globin ];

     

       294
       294
       -
             meta.doc = ./acme.xml;

     

       295
       295
       -
           }

     

       296
       293
        
         ];

     

       297
       294
        
       

     

       295
       295
       +
         meta = {

     

       296
       296
       +
           maintainers = with lib.maintainers; [ abbradar fpletz globin ];

     

       297
       297
       +
           doc = ./acme.xml;

     

       298
       298
       +
         };

     

       298
       299
        
       }

+2

nixos/modules/services/databases/postgresql.nix

···

       253
       253
        
       

     

       254
       254
        
         };

     

       255
       255
        
       

     

       256
       256
       +
         meta.doc = ./postgresql.xml;

     

       257
       257
       +
       

     

       256
       258
        
       }

+3

nixos/modules/services/misc/gitlab.nix

···

       556
       556
        
           };

     

       557
       557
        
       

     

       558
       558
        
         };

     

       559
       559
       +
       

     

       560
       560
       +
         meta.doc = ./gitlab.xml;

     

       561
       561
       +
       

     

       559
       562
        
       }

+1 -1

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

···

       17
       17
        
           Caveat: even if the package is reached by a different means,

     

       18
       18
        
           the path above will be shown and not e.g. `${config.services.foo.package}`. */

     

       19
       19
        
         manual = import ../../../doc/manual {

     

       20
       20
       -
           inherit pkgs;

     

       20
       20
       +
           inherit pkgs config;

     

       21
       21
        
           version = config.system.nixosRelease;

     

       22
       22
        
           revision = "release-${config.system.nixosRelease}";

     

       23
       23
        
           options =

+2 -1

nixos/modules/services/misc/taskserver/default.nix

···

       534
       534
        
           (mkIf (cfg.enable && cfg.listenHost != "localhost") {

     

       535
       535
        
             networking.firewall.allowedTCPPorts = [ cfg.listenPort ];

     

       536
       536
        
           })

     

       537
       537
       -
           { meta.doc = ./taskserver.xml; }

     

       538
       537
        
         ];

     

       538
       538
       +
       

     

       539
       539
       +
         meta.doc = ./doc.xml;

     

       539
       540
        
       }

+35 -38

nixos/modules/services/networking/teamspeak3.nix

···

       95
       95
        
       

     

       96
       96
        
         ###### implementation

     

       97
       97
        
       

     

       98
       98
       -
         config = mkMerge [

     

       99
       99
       -
           (mkIf cfg.enable {

     

       100
       100
       -
             users.users.teamspeak = {

     

       101
       101
       -
               description = "Teamspeak3 voice communication server daemon";

     

       102
       102
       -
               group = group;

     

       103
       103
       -
               uid = config.ids.uids.teamspeak;

     

       104
       104
       -
               home = cfg.dataDir;

     

       105
       105
       -
               createHome = true;

     

       106
       106
       -
             };

     

       98
       98
       +
         config = mkIf cfg.enable {

     

       99
       99
       +
           users.users.teamspeak = {

     

       100
       100
       +
             description = "Teamspeak3 voice communication server daemon";

     

       101
       101
       +
             group = group;

     

       102
       102
       +
             uid = config.ids.uids.teamspeak;

     

       103
       103
       +
             home = cfg.dataDir;

     

       104
       104
       +
             createHome = true;

     

       105
       105
       +
           };

     

       106
       106
       +
       

     

       107
       107
       +
           users.groups.teamspeak = {

     

       108
       108
       +
             gid = config.ids.gids.teamspeak;

     

       109
       109
       +
           };

     

       107
       110
        
       

     

       108
       108
       -
             users.groups.teamspeak = {

     

       109
       109
       -
               gid = config.ids.gids.teamspeak;

     

       110
       110
       -
             };

     

       111
       111
       +
           systemd.services.teamspeak3-server = {

     

       112
       112
       +
             description = "Teamspeak3 voice communication server daemon";

     

       113
       113
       +
             after = [ "network.target" ];

     

       114
       114
       +
             wantedBy = [ "multi-user.target" ];

     

       111
       115
        
       

     

       112
       112
       -
             systemd.services.teamspeak3-server = {

     

       113
       113
       -
               description = "Teamspeak3 voice communication server daemon";

     

       114
       114
       -
               after = [ "network.target" ];

     

       115
       115
       -
               wantedBy = [ "multi-user.target" ];

     

       116
       116
       +
             preStart = ''

     

       117
       117
       +
               mkdir -p ${cfg.logPath}

     

       118
       118
       +
               chown ${user}:${group} ${cfg.logPath}

     

       119
       119
       +
             '';

     

       116
       120
        
       

     

       117
       117
       -
               preStart = ''

     

       118
       118
       -
                 mkdir -p ${cfg.logPath}

     

       119
       119
       -
                 chown ${user}:${group} ${cfg.logPath}

     

       121
       121
       +
             serviceConfig = {

     

       122
       122
       +
               ExecStart = ''

     

       123
       123
       +
                 ${ts3}/bin/ts3server \

     

       124
       124
       +
                   dbsqlpath=${ts3}/lib/teamspeak/sql/ logpath=${cfg.logPath} \

     

       125
       125
       +
                   voice_ip=${cfg.voiceIP} default_voice_port=${toString cfg.defaultVoicePort} \

     

       126
       126
       +
                   filetransfer_ip=${cfg.fileTransferIP} filetransfer_port=${toString cfg.fileTransferPort} \

     

       127
       127
       +
                   query_ip=${cfg.queryIP} query_port=${toString cfg.queryPort}

     

       120
       128
        
               '';

     

       121
       121
       -
       

     

       122
       122
       -
               serviceConfig = {

     

       123
       123
       -
                 ExecStart = ''

     

       124
       124
       -
                   ${ts3}/bin/ts3server \

     

       125
       125
       -
                     dbsqlpath=${ts3}/lib/teamspeak/sql/ logpath=${cfg.logPath} \

     

       126
       126
       -
                     voice_ip=${cfg.voiceIP} default_voice_port=${toString cfg.defaultVoicePort} \

     

       127
       127
       -
                     filetransfer_ip=${cfg.fileTransferIP} filetransfer_port=${toString cfg.fileTransferPort} \

     

       128
       128
       -
                     query_ip=${cfg.queryIP} query_port=${toString cfg.queryPort}

     

       129
       129
       -
                 '';

     

       130
       130
       -
                 WorkingDirectory = cfg.dataDir;

     

       131
       131
       -
                 User = user;

     

       132
       132
       -
                 Group = group;

     

       133
       133
       -
                 PermissionsStartOnly = true;

     

       134
       134
       -
               };

     

       129
       129
       +
               WorkingDirectory = cfg.dataDir;

     

       130
       130
       +
               User = user;

     

       131
       131
       +
               Group = group;

     

       132
       132
       +
               PermissionsStartOnly = true;

     

       135
       133
        
             };

     

       136
       136
       -
           })

     

       137
       137
       -
           {

     

       138
       138
       -
             meta.maintainers = with lib.maintainers; [ arobyn ];

     

       139
       139
       -
           }

     

       140
       140
       -
         ];

     

       134
       134
       +
           };

     

       135
       135
       +
         };

     

       136
       136
       +
       

     

       137
       137
       +
         meta.maintainers = with lib.maintainers; [ arobyn ];

     

       141
       138
        
       }

+42 -45

nixos/modules/services/networking/wpa_supplicant.nix

···

       111
       111
        
           };

     

       112
       112
        
         };

     

       113
       113
        
       

     

       114
       114
       -
         config = mkMerge [

     

       115
       115
       -
           (mkIf cfg.enable {

     

       116
       116
       -
             assertions = flip mapAttrsToList cfg.networks (name: cfg: {

     

       117
       117
       -
               assertion = cfg.psk == null || cfg.pskRaw == null;

     

       118
       118
       -
               message = ''networking.wireless."${name}".psk and networking.wireless."${name}".pskRaw are mutually exclusive'';

     

       119
       119
       -
             });

     

       114
       114
       +
         config = mkIf cfg.enable {

     

       115
       115
       +
           assertions = flip mapAttrsToList cfg.networks (name: cfg: {

     

       116
       116
       +
             assertion = cfg.psk == null || cfg.pskRaw == null;

     

       117
       117
       +
             message = ''networking.wireless."${name}".psk and networking.wireless."${name}".pskRaw are mutually exclusive'';

     

       118
       118
       +
           });

     

       120
       119
        
       

     

       121
       121
       -
             environment.systemPackages =  [ pkgs.wpa_supplicant ];

     

       120
       120
       +
           environment.systemPackages =  [ pkgs.wpa_supplicant ];

     

       122
       121
        
       

     

       123
       123
       -
             services.dbus.packages = [ pkgs.wpa_supplicant ];

     

       122
       122
       +
           services.dbus.packages = [ pkgs.wpa_supplicant ];

     

       124
       123
        
       

     

       125
       125
       -
             # FIXME: start a separate wpa_supplicant instance per interface.

     

       126
       126
       -
             systemd.services.wpa_supplicant = let

     

       127
       127
       -
               ifaces = cfg.interfaces;

     

       128
       128
       -
               deviceUnit = interface: [ "sys-subsystem-net-devices-${interface}.device" ];

     

       129
       129
       -
             in {

     

       130
       130
       -
               description = "WPA Supplicant";

     

       124
       124
       +
           # FIXME: start a separate wpa_supplicant instance per interface.

     

       125
       125
       +
           systemd.services.wpa_supplicant = let

     

       126
       126
       +
             ifaces = cfg.interfaces;

     

       127
       127
       +
             deviceUnit = interface: [ "sys-subsystem-net-devices-${interface}.device" ];

     

       128
       128
       +
           in {

     

       129
       129
       +
             description = "WPA Supplicant";

     

       131
       130
        
       

     

       132
       132
       -
               after = [ "network-interfaces.target" ] ++ lib.concatMap deviceUnit ifaces;

     

       133
       133
       -
               requires = lib.concatMap deviceUnit ifaces;

     

       134
       134
       -
               wantedBy = [ "network.target" ];

     

       131
       131
       +
             after = [ "network-interfaces.target" ] ++ lib.concatMap deviceUnit ifaces;

     

       132
       132
       +
             requires = lib.concatMap deviceUnit ifaces;

     

       133
       133
       +
             wantedBy = [ "network.target" ];

     

       135
       134
        
       

     

       136
       136
       -
               path = [ pkgs.wpa_supplicant ];

     

       135
       135
       +
             path = [ pkgs.wpa_supplicant ];

     

       136
       136
       +
       

     

       137
       137
       +
             script = ''

     

       138
       138
       +
               ${if ifaces == [] then ''

     

       139
       139
       +
                 for i in $(cd /sys/class/net && echo *); do

     

       140
       140
       +
                   DEVTYPE=

     

       141
       141
       +
                   source /sys/class/net/$i/uevent

     

       142
       142
       +
                   if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then

     

       143
       143
       +
                     ifaces="$ifaces''${ifaces:+ -N} -i$i"

     

       144
       144
       +
                   fi

     

       145
       145
       +
                 done

     

       146
       146
       +
               '' else ''

     

       147
       147
       +
                 ifaces="${concatStringsSep " -N " (map (i: "-i${i}") ifaces)}"

     

       148
       148
       +
               ''}

     

       149
       149
       +
               exec wpa_supplicant -s -u -D${cfg.driver} -c ${configFile} $ifaces

     

       150
       150
       +
             '';

     

       151
       151
       +
           };

     

       137
       152
        
       

     

       138
       138
       -
               script = ''

     

       139
       139
       -
                 ${if ifaces == [] then ''

     

       140
       140
       -
                   for i in $(cd /sys/class/net && echo *); do

     

       141
       141
       -
                     DEVTYPE=

     

       142
       142
       -
                     source /sys/class/net/$i/uevent

     

       143
       143
       -
                     if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then

     

       144
       144
       -
                       ifaces="$ifaces''${ifaces:+ -N} -i$i"

     

       145
       145
       -
                     fi

     

       146
       146
       -
                   done

     

       147
       147
       -
                 '' else ''

     

       148
       148
       -
                   ifaces="${concatStringsSep " -N " (map (i: "-i${i}") ifaces)}"

     

       149
       149
       -
                 ''}

     

       150
       150
       -
                 exec wpa_supplicant -s -u -D${cfg.driver} -c ${configFile} $ifaces

     

       151
       151
       -
               '';

     

       152
       152
       -
             };

     

       153
       153
       +
           powerManagement.resumeCommands = ''

     

       154
       154
       +
             ${config.systemd.package}/bin/systemctl try-restart wpa_supplicant

     

       155
       155
       +
           '';

     

       153
       156
        
       

     

       154
       154
       -
             powerManagement.resumeCommands = ''

     

       155
       155
       -
               ${config.systemd.package}/bin/systemctl try-restart wpa_supplicant

     

       156
       156
       -
             '';

     

       157
       157
       +
           # Restart wpa_supplicant when a wlan device appears or disappears.

     

       158
       158
       +
           services.udev.extraRules = ''

     

       159
       159
       +
             ACTION=="add|remove", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", RUN+="${config.systemd.package}/bin/systemctl try-restart wpa_supplicant.service"

     

       160
       160
       +
           '';

     

       161
       161
       +
         };

     

       157
       162
        
       

     

       158
       158
       -
             # Restart wpa_supplicant when a wlan device appears or disappears.

     

       159
       159
       -
             services.udev.extraRules = ''

     

       160
       160
       -
               ACTION=="add|remove", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", RUN+="${config.systemd.package}/bin/systemctl try-restart wpa_supplicant.service"

     

       161
       161
       -
             '';

     

       162
       162
       -
           })

     

       163
       163
       -
           {

     

       164
       164
       -
             meta.maintainers = with lib.maintainers; [ globin ];

     

       165
       165
       -
           }

     

       166
       166
       -
         ];

     

       163
       163
       +
         meta.maintainers = with lib.maintainers; [ globin ];

     

       167
       164
        
       }