summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nixos/modules/services/cluster/k3s/default.nix1
-rw-r--r--nixos/modules/services/mail/postfix.nix2
-rw-r--r--nixos/modules/services/misc/rippled.nix1
-rw-r--r--nixos/modules/services/misc/svnserve.nix1
-rw-r--r--nixos/modules/services/misc/weechat.nix1
-rw-r--r--nixos/modules/services/network-filesystems/netatalk.nix3
-rw-r--r--nixos/modules/services/network-filesystems/openafs/server.nix1
-rw-r--r--nixos/modules/services/networking/bind.nix36
-rw-r--r--nixos/modules/services/networking/ircd-hybrid/default.nix8
-rw-r--r--nixos/modules/services/networking/mailpile.nix4
-rw-r--r--nixos/modules/services/networking/prayer.nix3
-rw-r--r--nixos/modules/services/networking/quassel.nix4
-rw-r--r--nixos/modules/services/networking/radvd.nix1
-rw-r--r--nixos/modules/services/networking/shairport-sync.nix2
-rw-r--r--nixos/modules/services/networking/ssh/lshd.nix6
-rw-r--r--nixos/modules/services/web-apps/mediawiki.nix1
-rw-r--r--nixos/modules/services/web-servers/nginx/default.nix1
-rw-r--r--nixos/modules/services/web-servers/unit/default.nix2
-rw-r--r--nixos/modules/services/x11/desktop-managers/cinnamon.nix1
-rw-r--r--nixos/modules/tasks/filesystems.nix9
-rw-r--r--pkgs/applications/misc/obsidian/default.nix4
-rw-r--r--pkgs/applications/misc/pdfsam-basic/default.nix4
-rw-r--r--pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix (renamed from pkgs/desktops/xfce/art/xfce4-icon-theme.nix)0
-rw-r--r--pkgs/desktops/xfce/art/xfwm4-themes/default.nix (renamed from pkgs/desktops/xfce/art/xfwm4-themes.nix)0
-rw-r--r--pkgs/desktops/xfce/default.nix38
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix (renamed from pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix)28
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix (renamed from pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix)0
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix (renamed from pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix)21
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix (renamed from pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix)19
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix (renamed from pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix)23
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix (renamed from pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix)22
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix (renamed from pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix)0
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix (renamed from pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin.nix)0
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix (renamed from pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix)0
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix (renamed from pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix)0
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix (renamed from pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix)0
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix (renamed from pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix)25
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix (renamed from pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix)0
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix (renamed from pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix)22
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix (renamed from pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix)0
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix18
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix (renamed from pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix)0
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix (renamed from pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix)0
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix31
-rw-r--r--pkgs/development/compilers/crystal/default.nix8
-rw-r--r--pkgs/development/compilers/swift/default.nix5
-rw-r--r--pkgs/development/libraries/librelp/default.nix4
-rw-r--r--pkgs/development/libraries/opendkim/default.nix14
-rw-r--r--pkgs/development/libraries/opendkim/openssl-1.1.patch81
-rw-r--r--pkgs/development/ocaml-modules/elpi/default.nix4
-rw-r--r--pkgs/development/ocaml-modules/jingoo/default.nix4
-rw-r--r--pkgs/development/ocaml-modules/jwto/default.nix3
-rw-r--r--pkgs/development/ocaml-modules/lens/default.nix1
-rw-r--r--pkgs/development/ocaml-modules/mirage-nat/default.nix7
-rw-r--r--pkgs/development/ocaml-modules/nocrypto/default.nix4
-rw-r--r--pkgs/development/ocaml-modules/pgocaml/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/ppx_deriving/default.nix30
-rw-r--r--pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix1
-rw-r--r--pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix15
-rw-r--r--pkgs/development/ocaml-modules/ppx_tools/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/visitors/default.nix12
-rw-r--r--pkgs/development/php-packages/pdo_sqlsrv/default.nix4
-rw-r--r--pkgs/development/php-packages/sqlsrv/default.nix4
-rw-r--r--pkgs/development/python-modules/adafruit-platformdetect/default.nix4
-rw-r--r--pkgs/development/python-modules/awesomeversion/default.nix4
-rw-r--r--pkgs/development/python-modules/deprecated/default.nix4
-rw-r--r--pkgs/development/python-modules/dj-email-url/default.nix4
-rw-r--r--pkgs/development/python-modules/django_reversion/default.nix4
-rw-r--r--pkgs/development/python-modules/dogpile.cache/default.nix4
-rw-r--r--pkgs/development/python-modules/duecredit/default.nix4
-rw-r--r--pkgs/development/python-modules/dufte/default.nix8
-rw-r--r--pkgs/development/python-modules/elementpath/default.nix4
-rw-r--r--pkgs/development/python-modules/fire/default.nix4
-rw-r--r--pkgs/development/python-modules/flask-migrate/default.nix4
-rw-r--r--pkgs/development/python-modules/flask-paginate/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-vision/default.nix4
-rw-r--r--pkgs/development/python-modules/icecream/default.nix4
-rw-r--r--pkgs/development/python-modules/lazr/config.nix4
-rw-r--r--pkgs/development/python-modules/mautrix/default.nix4
-rw-r--r--pkgs/development/tools/delve/default.nix4
-rw-r--r--pkgs/os-specific/linux/batman-adv/default.nix2
-rw-r--r--pkgs/os-specific/linux/batman-adv/version.nix8
-rw-r--r--pkgs/servers/dns/nsd/default.nix4
-rw-r--r--pkgs/servers/monitoring/telegraf/default.nix6
-rw-r--r--pkgs/shells/elvish/default.nix6
-rw-r--r--pkgs/tools/misc/gparted/default.nix4
-rw-r--r--pkgs/tools/misc/os-prober/default.nix4
-rw-r--r--pkgs/tools/networking/privoxy/default.nix4
-rw-r--r--pkgs/tools/security/ccid/default.nix4
-rw-r--r--pkgs/tools/system/bottom/default.nix6
-rw-r--r--pkgs/top-level/all-packages.nix1
-rw-r--r--pkgs/top-level/ocaml-packages.nix5
-rw-r--r--pkgs/top-level/perl-packages.nix2
93 files changed, 398 insertions, 278 deletions
diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix
index f0317fdbd160..e62fbc94415c 100644
--- a/nixos/modules/services/cluster/k3s/default.nix
+++ b/nixos/modules/services/cluster/k3s/default.nix
@@ -47,6 +47,7 @@ in
extraFlags = mkOption {
description = "Extra flags to pass to the k3s command.";
+ type = types.str;
default = "";
example = "--no-deploy traefik --cluster-cidr 10.24.0.0/16";
};
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 1dcdcab8d481..63c0961b7568 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -560,6 +560,7 @@ in
transport = mkOption {
default = "";
+ type = types.lines;
description = "
Entries for the transport map, cf. man-page transport(8).
";
@@ -573,6 +574,7 @@ in
dnsBlacklistOverrides = mkOption {
default = "";
+ type = types.lines;
description = "contents of check_client_access for overriding dnsBlacklists";
};
diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix
index ef34e3a779f0..2fce3b9dc94c 100644
--- a/nixos/modules/services/misc/rippled.nix
+++ b/nixos/modules/services/misc/rippled.nix
@@ -389,6 +389,7 @@ in
extraConfig = mkOption {
default = "";
+ type = types.lines;
description = ''
Extra lines to be added verbatim to the rippled.cfg configuration file.
'';
diff --git a/nixos/modules/services/misc/svnserve.nix b/nixos/modules/services/misc/svnserve.nix
index f70e3ca7fef0..5fa262ca3b94 100644
--- a/nixos/modules/services/misc/svnserve.nix
+++ b/nixos/modules/services/misc/svnserve.nix
@@ -24,6 +24,7 @@ in
};
svnBaseDir = mkOption {
+ type = types.str;
default = "/repos";
description = "Base directory from which Subversion repositories are accessed.";
};
diff --git a/nixos/modules/services/misc/weechat.nix b/nixos/modules/services/misc/weechat.nix
index c6ff540ea12f..b71250f62e0f 100644
--- a/nixos/modules/services/misc/weechat.nix
+++ b/nixos/modules/services/misc/weechat.nix
@@ -20,6 +20,7 @@ in
type = types.str;
};
binary = mkOption {
+ type = types.path;
description = "Binary to execute (by default \${weechat}/bin/weechat).";
example = literalExample ''
''${pkgs.weechat}/bin/weechat-headless
diff --git a/nixos/modules/services/network-filesystems/netatalk.nix b/nixos/modules/services/network-filesystems/netatalk.nix
index ca9d32311f5f..33e851210bc6 100644
--- a/nixos/modules/services/network-filesystems/netatalk.nix
+++ b/nixos/modules/services/network-filesystems/netatalk.nix
@@ -46,6 +46,7 @@ in
enable = mkEnableOption "the Netatalk AFP fileserver";
port = mkOption {
+ type = types.port;
default = 548;
description = "TCP port to be used for AFP.";
};
@@ -68,6 +69,7 @@ in
};
path = mkOption {
+ type = types.str;
default = "";
example = "afp-data";
description = "Share not the whole user home but