Revert "Merge #12357: nixos docs: show references to packages"

The PR wasn't good enough yet.
This reverts commit b2a37ceeea8c38ec71447f8dae1e6890a8cf982d, reversing
changes made to 7fa9a1abce623aaf18b22f5dca3fc8a44a494e8d.

1 files changed, 5 insertions, 23 deletions

diff --git a/nixos/release.nix b/nixos/release.nix
index 71317c32b98..d9f3e46b27c 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -92,33 +92,15 @@ let
   }).config));
 
 
-  cleanConfig = import ./lib/eval-config.nix {
-    system = "x86_64-linux";
-    modules = [ ];
-    pkgs = with pkgs.lib;
-      let
-        scrubDerivations = namePrefix: pkgSet: mapAttrs
-          (name: value:
-            let wholeName = "${namePrefix}.${name}"; in
-            if isAttrs value then
-              scrubDerivations wholeName value
-              // (optionalAttrs (isDerivation value) { outPath = "\${${wholeName}}"; })
-            else value
-          )
-          pkgSet;
-      in scrubDerivations "pkgs" pkgs;
-  };
-  docs = (import ./doc/manual) {
-    inherit pkgs version;
-    revision = versionModule.system.nixosRevision;
-    inherit (cleanConfig) options;
-  };
-
 in rec {
 
   channel = import lib/make-channel.nix { inherit pkgs nixpkgs version versionSuffix; };
 
-  inherit (docs) manual manualPDF manpages optionsJSON;
+  manual = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manual);
+  manualPDF = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manualPDF)).x86_64-linux;
+  manpages = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manpages);
+  options = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux;
+
 
   # Build the initial ramdisk so Hydra can keep track of its size over time.
   initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk);