Skip to content

Commit

Permalink
pkgs/config: remove uses of lib.mdDoc
Browse files Browse the repository at this point in the history
this commit is a no-op, as lib.mdDoc was already defined as id.
  • Loading branch information
stuebinm committed Apr 13, 2024
1 parent 1a24330 commit acd0e38
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions pkgs/top-level/config.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ let
inherit (lib)
literalExpression
mapAttrsToList
mdDoc
mkOption
optionals
types
Expand All @@ -15,7 +14,7 @@ let
mkMassRebuild = args: mkOption (builtins.removeAttrs args [ "feature" ] // {
type = args.type or (types.uniq types.bool);
default = args.default or false;
description = mdDoc ((args.description or ''
description = ((args.description or ''
Whether to ${args.feature} while building nixpkgs packages.
'') + ''
Changing the default may cause a mass rebuild.
Expand All @@ -40,7 +39,7 @@ let
/* Config options */

warnUndeclaredOptions = mkOption {
description = mdDoc "Whether to warn when `config` contains an unrecognized attribute.";
description = "Whether to warn when `config` contains an unrecognized attribute.";
type = types.bool;
default = false;
};
Expand Down Expand Up @@ -72,7 +71,7 @@ let
allowAliases = mkOption {
type = types.bool;
default = true;
description = mdDoc ''
description = ''
Whether to expose old attribute names for compatibility.
The recommended setting is to enable this, as it
Expand All @@ -92,7 +91,7 @@ let
default = false;
# getEnv part is in check-meta.nix
defaultText = literalExpression ''false || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1"'';
description = mdDoc ''
description = ''
Whether to allow unfree packages.
See [Installing unfree packages](https://nixos.org/manual/nixpkgs/stable/#sec-allow-unfree) in the NixOS manual.
Expand All @@ -104,7 +103,7 @@ let
default = false;
# getEnv part is in check-meta.nix
defaultText = literalExpression ''false || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1"'';
description = mdDoc ''
description = ''
Whether to allow broken packages.
See [Installing broken packages](https://nixos.org/manual/nixpkgs/stable/#sec-allow-broken) in the NixOS manual.
Expand All @@ -116,7 +115,7 @@ let
default = false;
# getEnv part is in check-meta.nix
defaultText = literalExpression ''false || builtins.getEnv "NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM" == "1"'';
description = mdDoc ''
description = ''
Whether to allow unsupported packages.
See [Installing packages on unsupported systems](https://nixos.org/manual/nixpkgs/stable/#sec-allow-unsupported-system) in the NixOS manual.
Expand All @@ -138,7 +137,7 @@ let
showDerivationWarnings = mkOption {
type = types.listOf (types.enum [ "maintainerless" ]);
default = [];
description = mdDoc ''
description = ''
Which warnings to display for potentially dangerous
or deprecated values passed into `stdenv.mkDerivation`.
Expand All @@ -153,7 +152,7 @@ let
checkMeta = mkOption {
type = types.bool;
default = false;
description = mdDoc ''
description = ''
Whether to check that the `meta` attribute of derivations are correct during evaluation time.
'';
};
Expand Down

0 comments on commit acd0e38

Please sign in to comment.