From def1e23be848848400d1d097d4f044e3c401f9dd Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 14 Apr 2024 23:02:32 +0200 Subject: treewide: remove lib.mdDoc --- modules/documentation/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/documentation/default.nix') diff --git a/modules/documentation/default.nix b/modules/documentation/default.nix index 2f3bb9a..10bcbd3 100644 --- a/modules/documentation/default.nix +++ b/modules/documentation/default.nix @@ -88,7 +88,7 @@ in documentation.enable = mkOption { type = types.bool; default = true; - description = lib.mdDoc '' + description = '' Whether to install documentation of packages from {option}`environment.systemPackages` into the generated system path. @@ -100,7 +100,7 @@ in documentation.man.enable = mkOption { type = types.bool; default = true; - description = lib.mdDoc '' + description = '' Whether to install manual pages and the {command}`man` command. This also includes "man" outputs. ''; @@ -109,7 +109,7 @@ in documentation.info.enable = mkOption { type = types.bool; default = true; - description = lib.mdDoc '' + description = '' Whether to install info pages and the {command}`info` command. This also includes "info" outputs. ''; @@ -118,7 +118,7 @@ in documentation.doc.enable = mkOption { type = types.bool; default = true; - description = lib.mdDoc '' + description = '' Whether to install documentation distributed in packages' `/share/doc`. Usually plain text and/or HTML. This also includes "doc" outputs. -- cgit v1.2.3 From 5399270903f6e95e5a5b083391e910dfed226f3a Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 13 Jun 2024 13:48:07 +0100 Subject: =?UTF-8?q?treewide:=20remove=20shims=20for=20Nixpkgs=20=E2=89=A4?= =?UTF-8?q?=2023.05?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These deprecated versions were already made unsupported by #932. --- modules/documentation/default.nix | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) (limited to 'modules/documentation/default.nix') diff --git a/modules/documentation/default.nix b/modules/documentation/default.nix index 10bcbd3..3259cfd 100644 --- a/modules/documentation/default.nix +++ b/modules/documentation/default.nix @@ -21,7 +21,7 @@ let It isn't perfect, but it seems to cover a vast majority of use cases. Caveat: even if the package is reached by a different means, the path above will be shown and not e.g. `${config.services.foo.package}`. */ - realManual = import ../../doc/manual { + manual = import ../../doc/manual { inherit pkgs config; version = config.system.darwinVersion; revision = config.system.darwinRevision; @@ -44,38 +44,6 @@ let in scrubbedEval.options; }; - # TODO: Remove this when dropping 22.11 support. - manual = realManual // - lib.optionalAttrs (!pkgs.buildPackages ? nixos-render-docs) rec { - optionsJSON = pkgs.writeTextFile { - name = "options.json-stub"; - destination = "/share/doc/darwin/options.json"; - text = "{}"; - }; - manpages = pkgs.writeTextFile { - name = "darwin-manpages-stub"; - destination = "/share/man/man5/configuration.nix.5"; - text = '' - .TH "CONFIGURATION\&.NIX" "5" "01/01/1980" "Darwin" "Darwin Reference Pages" - .SH "NAME" - \fIconfiguration\&.nix\fP \- Darwin system configuration specification - .SH "DESCRIPTION" - .PP - The nix\-darwin documentation now requires nixpkgs 23.05 to build. - ''; - }; - manualHTML = pkgs.writeTextFile { - name = "darwin-manual-html-stub"; - destination = "/share/doc/darwin/index.html"; - text = '' - - Darwin Configuration Options - The nix-darwin documentation now requires nixpkgs 23.05 to build. - ''; - }; - manualHTMLIndex = "${manualHTML}/share/doc/darwin/index.html"; - }; - helpScript = pkgs.writeScriptBin "darwin-help" '' #! ${pkgs.stdenv.shell} -e -- cgit v1.2.3 From 2406909d7a2aa50f907a82e553d6e923814e978a Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 13 Jun 2024 13:52:29 +0100 Subject: Reapply "eval-config: set `class`" All supported Nixpkgs versions now support this. This reverts commit a5b09580e2d0bbc52b338afe4f1f1d46178e6bbf. --- modules/documentation/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'modules/documentation/default.nix') diff --git a/modules/documentation/default.nix b/modules/documentation/default.nix index 3259cfd..395e6e6 100644 --- a/modules/documentation/default.nix +++ b/modules/documentation/default.nix @@ -11,9 +11,9 @@ let regularConfig = config; argsModule = { - config._module.args = regularConfig._module.args // { + config._module.args = lib.mkForce (regularConfig._module.args // { modules = [ ]; - }; + }); }; /* For the purpose of generating docs, evaluate options with each derivation @@ -28,8 +28,9 @@ let inherit (config.system) nixpkgsRevision; options = let - scrubbedEval = evalModules { - modules = baseModules ++ [ argsModule ]; + scrubbedEval = import ../../eval-config.nix { + inherit lib; + modules = [ argsModule ]; specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; }; }; scrubDerivations = namePrefix: pkgSet: mapAttrs -- cgit v1.2.3