From 9b66e1f7b1450adefbe60b7a4bdd7795caae277a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 18 Sep 2014 16:21:00 +0200
Subject: [PATCH] Fix the manual jobs
---
nixos/release.nix | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/nixos/release.nix b/nixos/release.nix
index 243e2b84935..b3039afb18c 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -80,14 +80,17 @@ let
};
- makeClosure = module: forAllSystems (system: scrubDrv (import ./lib/eval-config.nix {
+ makeClosure = module: buildFromConfig module (config: config.system.build.toplevel);
+
+
+ buildFromConfig = module: sel: forAllSystems (system: scrubDrv (sel (import ./lib/eval-config.nix {
inherit system;
- modules = [ module ] ++ lib.singleton
+ modules = [ module versionModule ] ++ lib.singleton
({ config, lib, ... }:
{ fileSystems."/".device = lib.mkDefault "/dev/sda1";
boot.loader.grub.device = lib.mkDefault "/dev/sda";
});
- }).config.system.build.toplevel);
+ }).config));
in rec {
@@ -124,9 +127,9 @@ in rec {
};
- manual = forAllSystems (system: (builtins.getAttr system iso_minimal).config.system.build.manual.manual);
- manualPDF = iso_minimal.x86_64-linux.config.system.build.manual.manualPDF;
- manpages = forAllSystems (system: (builtins.getAttr system iso_minimal).config.system.build.manual.manpages);
+ 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);
iso_minimal = forAllSystems (system: makeIso {