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

4 files changed, 10 insertions, 10 deletions

diff --git a/nixpkgs/nixos/modules/hardware/keyboard/qmk.nix b/nixpkgs/nixos/modules/hardware/keyboard/qmk.nix
index d95d36dedb44..b3e752ad66c5 100644
--- a/nixpkgs/nixos/modules/hardware/keyboard/qmk.nix
+++ b/nixpkgs/nixos/modules/hardware/keyboard/qmk.nix
@@ -2,12 +2,12 @@
 
 let
   cfg = config.hardware.keyboard.qmk;
-  inherit (lib) mdDoc mkEnableOption mkIf;
+  inherit (lib) mkEnableOption mkIf;
 
 in
 {
   options.hardware.keyboard.qmk = {
-    enable = mkEnableOption (mdDoc "non-root access to the firmware of QMK keyboards");
+    enable = mkEnableOption "non-root access to the firmware of QMK keyboards";
   };
 
   config = mkIf cfg.enable {
diff --git a/nixpkgs/nixos/modules/hardware/keyboard/teck.nix b/nixpkgs/nixos/modules/hardware/keyboard/teck.nix
index 8376c6b9c50b..8cb736dedac4 100644
--- a/nixpkgs/nixos/modules/hardware/keyboard/teck.nix
+++ b/nixpkgs/nixos/modules/hardware/keyboard/teck.nix
@@ -2,12 +2,12 @@
 
 let
   cfg = config.hardware.keyboard.teck;
-  inherit (lib) mdDoc mkEnableOption mkIf;
+  inherit (lib) mkEnableOption mkIf;
 
 in
 {
   options.hardware.keyboard.teck = {
-    enable = mkEnableOption (mdDoc "non-root access to the firmware of TECK keyboards");
+    enable = mkEnableOption "non-root access to the firmware of TECK keyboards";
   };
 
   config = mkIf cfg.enable {
diff --git a/nixpkgs/nixos/modules/hardware/keyboard/uhk.nix b/nixpkgs/nixos/modules/hardware/keyboard/uhk.nix
index ff984fa5daa6..a5bd35c2a550 100644
--- a/nixpkgs/nixos/modules/hardware/keyboard/uhk.nix
+++ b/nixpkgs/nixos/modules/hardware/keyboard/uhk.nix
@@ -2,17 +2,17 @@
 
 let
   cfg = config.hardware.keyboard.uhk;
-  inherit (lib) mdDoc mkEnableOption mkIf;
+  inherit (lib) mkEnableOption mkIf;
 
 in
 {
   options.hardware.keyboard.uhk = {
-    enable = mkEnableOption (mdDoc ''
+    enable = mkEnableOption ''
       non-root access to the firmware of UHK keyboards.
       You need it when you want to flash a new firmware on the keyboard.
       Access to the keyboard is granted to users in the "input" group.
       You may want to install the uhk-agent package
-    '');
+    '';
 
   };
 
diff --git a/nixpkgs/nixos/modules/hardware/keyboard/zsa.nix b/nixpkgs/nixos/modules/hardware/keyboard/zsa.nix
index 191fb12cca4f..42fac3b45bb9 100644
--- a/nixpkgs/nixos/modules/hardware/keyboard/zsa.nix
+++ b/nixpkgs/nixos/modules/hardware/keyboard/zsa.nix
@@ -2,17 +2,17 @@
 
 let
   cfg = config.hardware.keyboard.zsa;
-  inherit (lib) mkEnableOption mkIf mdDoc;
+  inherit (lib) mkEnableOption mkIf;
 
 in
 {
   options.hardware.keyboard.zsa = {
-    enable = mkEnableOption (mdDoc ''
+    enable = mkEnableOption ''
       udev rules for keyboards from ZSA like the ErgoDox EZ, Planck EZ and Moonlander Mark I.
       You need it when you want to flash a new configuration on the keyboard
       or use their live training in the browser.
       You may want to install the wally-cli package
-    '');
+    '';
   };
 
   config = mkIf cfg.enable {