From d5af9bc5831b73b87c2d20b014f03b416a981327 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Oct 2013 19:31:51 +0200 Subject: [PATCH] Simplify manual generation --- nixos/release.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/nixos/release.nix b/nixos/release.nix index d6135a6e1e9..8e87fbf8e5f 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -73,7 +73,7 @@ let }; -in { +in rec { channel = pkgs.releaseTools.makeSourceTarball { @@ -107,18 +107,7 @@ in { }; - manual = - (import ./doc/manual { - inherit pkgs; - options = - (import lib/eval-config.nix { - modules = [ - { fileSystems = []; - boot.loader.grub.device = "/dev/sda"; - } ]; - }).options; - revision = toString (nixpkgs.rev or nixpkgs.shortRev); - }).manual; + manual = iso_minimal.x86_64-linux.config.system.build.manual.manual; iso_minimal = pkgs.lib.genAttrs systems (system: makeIso {