public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the manual jobs

Browse Source
This commit is contained in:
Eelco Dolstra 2014-09-18 16:21:00 +02:00
parent ec4f38c56f
commit 9b66e1f7b1
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nixos/release.nix
View File

@ -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; inherit system;
modules = [ module ] ++ lib.singleton modules = [ module versionModule ] ++ lib.singleton
({ config, lib, ... }: ({ config, lib, ... }:
{ fileSystems."/".device = lib.mkDefault "/dev/sda1"; { fileSystems."/".device = lib.mkDefault "/dev/sda1";
boot.loader.grub.device = lib.mkDefault "/dev/sda"; boot.loader.grub.device = lib.mkDefault "/dev/sda";
}); });
}).config.system.build.toplevel); }).config));
in rec { in rec {
@ -124,9 +127,9 @@ in rec {
}; };
manual = forAllSystems (system: (builtins.getAttr system iso_minimal).config.system.build.manual.manual); manual = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manual);
manualPDF = iso_minimal.x86_64-linux.config.system.build.manual.manualPDF; manualPDF = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manualPDF)).x86_64-linux;
manpages = forAllSystems (system: (builtins.getAttr system iso_minimal).config.system.build.manual.manpages); manpages = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manpages);
iso_minimal = forAllSystems (system: makeIso { iso_minimal = forAllSystems (system: makeIso {