Merge remote-tracking branch 'nixpkgs/nixos-unstable-small'

Conflicts:
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/pkgs/build-support/go/module.nix

1 files changed, 8 insertions, 8 deletions

diff --git a/nixpkgs/nixos/modules/services/misc/errbot.nix b/nixpkgs/nixos/modules/services/misc/errbot.nix
index a650bc5bbd92..b447ba5d438d 100644
--- a/nixpkgs/nixos/modules/services/misc/errbot.nix
+++ b/nixpkgs/nixos/modules/services/misc/errbot.nix
@@ -27,48 +27,48 @@ in {
   options = {
     services.errbot.instances = mkOption {
       default = {};
-      description = lib.mdDoc "Errbot instance configs";
+      description = "Errbot instance configs";
       type = types.attrsOf (types.submodule {
         options = {
           dataDir = mkOption {
             type = types.nullOr types.path;
             default = null;
-            description = lib.mdDoc "Data directory for errbot instance.";
+            description = "Data directory for errbot instance.";
           };
 
           plugins = mkOption {
             type = types.listOf types.package;
             default = [];
-            description = lib.mdDoc "List of errbot plugin derivations.";
+            description = "List of errbot plugin derivations.";
           };
 
           logLevel = mkOption {
             type = types.str;
             default = "INFO";
-            description = lib.mdDoc "Errbot log level";
+            description = "Errbot log level";
           };
 
           admins = mkOption {
             type = types.listOf types.str;
             default = [];
-            description = lib.mdDoc "List of identifiers of errbot admins.";
+            description = "List of identifiers of errbot admins.";
           };
 
           backend = mkOption {
             type = types.str;
             default = "XMPP";
-            description = lib.mdDoc "Errbot backend name.";
+            description = "Errbot backend name.";
           };
 
           identity = mkOption {
             type = types.attrs;
-            description = lib.mdDoc "Errbot identity configuration";
+            description = "Errbot identity configuration";
           };
 
           extraConfig = mkOption {
             type = types.lines;
             default = "";
-            description = lib.mdDoc "String to be appended to the config verbatim";
+            description = "String to be appended to the config verbatim";
           };
         };
       });