From c75bba822a0feee47da115cd30febb4f4f84c4ed Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 5 Apr 2024 10:54:42 +0200 Subject: Drop mdDoc This is being removed in Nixpkgs. --- modules/server/cgit/default.nix | 12 ++++++------ modules/server/ftp/default.nix | 2 +- modules/server/git-http-backend/default.nix | 14 +++++++------- modules/server/git/default.nix | 16 ++++++++-------- modules/workstation/windowing/sway/default.nix | 6 +++--- nixpkgs/nixos/modules/misc/documentation.nix | 2 +- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/modules/server/cgit/default.nix b/modules/server/cgit/default.nix index aba0d1b54c5d..31bf4766e0d7 100644 --- a/modules/server/cgit/default.nix +++ b/modules/server/cgit/default.nix @@ -3,7 +3,7 @@ let inherit (builtins) split; inherit (lib) flip foldr groupBy head literalExpression mapAttrs - mapAttrs' mapAttrsToList mdDoc mkOption nameValuePair optionalAttrs types; + mapAttrs' mapAttrsToList mkOption nameValuePair optionalAttrs types; cfg = config.services.cgit-qyliss; @@ -51,14 +51,14 @@ in vhost = mkOption { type = types.str; example = "spectrum-os.org"; - description = mdDoc "Nginx vhost for the cgit"; + description = "Nginx vhost for the cgit"; }; path = mkOption { type = types.strMatching "/(.*[^/])?"; default = "/"; example = "/git"; - description = mdDoc '' + description = '' Path to be appended to all cgit URLs. Leading slashes are mandatory; trailing slashes are forbidden. @@ -69,12 +69,12 @@ in type = types.package; default = pkgs.cgit; defaultText = literalExpression "pkgs.cgit"; - description = mdDoc "cgit package to use"; + description = "cgit package to use"; }; config = mkOption { type = types.package; - description = mdDoc '' + description = '' Configuration file for cgit. See cgitrc 5. @@ -83,7 +83,7 @@ in }; }); default = {}; - description = mdDoc "List of cgit instances to run"; + description = "List of cgit instances to run"; }; }; diff --git a/modules/server/ftp/default.nix b/modules/server/ftp/default.nix index 5fbf3f82877c..32b080d3bd8c 100644 --- a/modules/server/ftp/default.nix +++ b/modules/server/ftp/default.nix @@ -12,7 +12,7 @@ in files = mkOption { default = {}; type = with types; attrsOf path; - description = mdDoc '' + description = '' Files to serve on https://ftp.qyliss.net/ ''; example = literalExample '' diff --git a/modules/server/git-http-backend/default.nix b/modules/server/git-http-backend/default.nix index 32e20e603e61..086e32f57db2 100644 --- a/modules/server/git-http-backend/default.nix +++ b/modules/server/git-http-backend/default.nix @@ -3,7 +3,7 @@ let inherit (builtins) split; inherit (lib) flip foldr groupBy head literalExpression mapAttrs mapAttrs' - mapAttrsToList mdDoc mkOption nameValuePair optionalAttrs types; + mapAttrsToList mkOption nameValuePair optionalAttrs types; cfg = config.services.git-http-backend; @@ -36,7 +36,7 @@ in package = mkOption { type = types.package; default = pkgs.gitMinimal; - description = mdDoc "git package to use"; + description = "git package to use"; }; instances = mkOption { @@ -45,14 +45,14 @@ in vhost = mkOption { type = types.str; example = "spectrum-os.org"; - description = mdDoc "Nginx vhost for the git server"; + description = "Nginx vhost for the git server"; }; path = mkOption { type = types.strMatching "/(.*[^/])?"; default = "/"; example = "/git"; - description = mdDoc '' + description = '' Path to be prepended to all clone URLs. Leading slashes are mandatory; trailing slashes are forbidden. @@ -63,13 +63,13 @@ in type = types.package; default = pkgs.cgiserver; defaultText = literalExpression "pkgs.cgiserver"; - description = mdDoc "cgiserver package to use"; + description = "cgiserver package to use"; }; projectRoot = mkOption { type = types.strMatching "/(.*[^/])?"; example = "/var/www/git"; - description = mdDoc '' + description = '' Directory in which to look for git repositories. Leading slashes are mandatory; trailing slashes are forbidden. @@ -78,7 +78,7 @@ in }; }); default = {}; - description = mdDoc "List of git-http-backend instances to run"; + description = "List of git-http-backend instances to run"; }; }; diff --git a/modules/server/git/default.nix b/modules/server/git/default.nix index 523715a363d9..bce947bfd430 100644 --- a/modules/server/git/default.nix +++ b/modules/server/git/default.nix @@ -15,35 +15,35 @@ let options = { branch = mkOption { default = "main"; - description = mdDoc "Branch to be the repository's HEAD"; + description = "Branch to be the repository's HEAD"; type = types.str; }; description = mkOption { - description = mdDoc "Description of the repository."; + description = "Description of the repository."; type = types.str; }; config = mkOption { - description = mdDoc "Git configuration for the repository."; + description = "Git configuration for the repository."; type = types.attrs; default = {}; }; hooks = mkOption { - description = mdDoc "Git hooks for the repository."; + description = "Git hooks for the repository."; type = with types; attrsOf (listOf path); default = {}; }; owner = mkOption { - description = mdDoc "Name of the user to own the git repository."; + description = "Name of the user to own the git repository."; type = types.str; default = "-"; }; group = mkOption { - description = mdDoc "Name of the group for the git repository."; + description = "Name of the group for the git repository."; type = types.str; default = "-"; }; @@ -52,13 +52,13 @@ let in { options.declarative-git = { repositories = mkOption { - description = mdDoc "Repositories to manage declaratively."; + description = "Repositories to manage declaratively."; type = types.attrsOf (types.submodule repoOpts); default = {}; }; hooks = mkOption { - description = mdDoc "Git hooks to apply to all declarative repositories."; + description = "Git hooks to apply to all declarative repositories."; type = with types; attrsOf (listOf path); default = {}; }; diff --git a/modules/workstation/windowing/sway/default.nix b/modules/workstation/windowing/sway/default.nix index 675ef8dbc031..2b5787c0339a 100644 --- a/modules/workstation/windowing/sway/default.nix +++ b/modules/workstation/windowing/sway/default.nix @@ -1,7 +1,7 @@ { pkgs, lib, config, ... }: let - inherit (lib) mdDoc mkOption optionalString; + inherit (lib) mkOption optionalString; inherit (lib.types) lines nullOr path; inherit (pkgs) callPackage substituteAll; @@ -14,13 +14,13 @@ in options = { programs.sway.extraConfig = mkOption { type = lines; - description = mdDoc "Lines to append to sway's config file"; + description = "Lines to append to sway's config file"; default = ""; }; programs.sway.wallpaper = mkOption { type = nullOr path; - description = mdDoc "Path to wallpaper for sway and swaylock"; + description = "Path to wallpaper for sway and swaylock"; default = null; }; }; diff --git a/nixpkgs/nixos/modules/misc/documentation.nix b/nixpkgs/nixos/modules/misc/documentation.nix index 52a3d4e69611..eca8cc0b450d 100644 --- a/nixpkgs/nixos/modules/misc/documentation.nix +++ b/nixpkgs/nixos/modules/misc/documentation.nix @@ -197,7 +197,7 @@ in man.extraConfig = mkOption { type = types.lines; default = ""; - description = mdDoc '' + description = '' Lines to append to {manpage}`manpath(5)`. ''; }; -- cgit 1.4.1