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/games/minetest-server.nix b/nixpkgs/nixos/modules/services/games/minetest-server.nix
index 8dc360153497..7fa687d2c7ed 100644
--- a/nixpkgs/nixos/modules/services/games/minetest-server.nix
+++ b/nixpkgs/nixos/modules/services/games/minetest-server.nix
@@ -56,13 +56,13 @@ in
       enable = mkOption {
         type        = types.bool;
         default     = false;
-        description = lib.mdDoc "If enabled, starts a Minetest Server.";
+        description = "If enabled, starts a Minetest Server.";
       };
 
       gameId = mkOption {
         type        = types.nullOr types.str;
         default     = null;
-        description = lib.mdDoc ''
+        description = ''
           Id of the game to use. To list available games run
           `minetestserver --gameid list`.
 
@@ -73,7 +73,7 @@ in
       world = mkOption {
         type        = types.nullOr types.path;
         default     = null;
-        description = lib.mdDoc ''
+        description = ''
           Name of the world to use. To list available worlds run
           `minetestserver --world list`.
 
@@ -84,7 +84,7 @@ in
       configPath = mkOption {
         type        = types.nullOr types.path;
         default     = null;
-        description = lib.mdDoc ''
+        description = ''
           Path to the config to use.
 
           If set to null, the config of the running user will be used:
@@ -95,7 +95,7 @@ in
       config = mkOption {
         type = types.attrsOf types.anything;
         default = {};
-        description = lib.mdDoc ''
+        description = ''
           Settings to add to the minetest config file.
 
           This option is ignored if `configPath` is set.
@@ -105,7 +105,7 @@ in
       logPath = mkOption {
         type        = types.nullOr types.path;
         default     = null;
-        description = lib.mdDoc ''
+        description = ''
           Path to logfile for logging.
 
           If set to null, logging will be output to stdout which means
@@ -116,7 +116,7 @@ in
       port = mkOption {
         type        = types.nullOr types.int;
         default     = null;
-        description = lib.mdDoc ''
+        description = ''
           Port number to bind to.
 
           If set to null, the default 30000 will be used.
@@ -126,7 +126,7 @@ in
       extraArgs = mkOption {
         type = types.listOf types.str;
         default = [];
-        description = lib.mdDoc ''
+        description = ''
           Additional command line flags to pass to the minetest executable.
         '';
       };