diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 12:16:33 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 12:16:33 +0100 |
commit | 889351af8b8a9e8bb39dbd09dc56691a28b9d823 (patch) | |
tree | 0a8ca0a76ed8c8df86b6071f7fc50004a3a26f62 /nixos/release.nix | |
parent | 69ec09f38aa1f1d37baec73ebdf9cf5f21050f94 (diff) |
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.
Diffstat (limited to 'nixos/release.nix')
-rw-r--r-- | nixos/release.nix | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/nixos/release.nix b/nixos/release.nix index 71317c32b98d6..d9f3e46b27c05 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); |