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

Generate manual for i686-linux as well as x86_64-linux

Browse Source
This commit is contained in:
Eelco Dolstra 2013-10-31 08:48:57 +01:00
parent a840dae935
commit 7083607e12
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/release-combined.nix
View File

@ -37,7 +37,7 @@ in rec {
constituents = constituents =
let all = x: [ x.x86_64-linux x.i686-linux ]; in let all = x: [ x.x86_64-linux x.i686-linux ]; in
[ nixos.channel [ nixos.channel
nixos.manual (all nixos.manual)
(all nixos.iso_minimal) (all nixos.iso_minimal)
(all nixos.iso_graphical) (all nixos.iso_graphical)

24
nixos/release.nix
View File

@ -12,8 +12,12 @@ let
systems = [ "x86_64-linux" "i686-linux" ]; systems = [ "x86_64-linux" "i686-linux" ];
forAllSystems = pkgs.lib.genAttrs systems;
pkgs = import nixpkgs { system = "x86_64-linux"; }; pkgs = import nixpkgs { system = "x86_64-linux"; };
lib = pkgs.lib;
versionModule = versionModule =
{ system.nixosVersionSuffix = versionSuffix; { system.nixosVersionSuffix = versionSuffix;
@ -109,23 +113,23 @@ in rec {
}; };
manual = iso_minimal.x86_64-linux.config.system.build.manual.manual; manual = forAllSystems (system: (builtins.getAttr system iso_minimal).config.system.build.manual.manual);
manpages = iso_minimal.x86_64-linux.config.system.build.manual.manpages; manpages = forAllSystems (system: (builtins.getAttr system iso_minimal).config.system.build.manual.manpages);
iso_minimal = pkgs.lib.genAttrs systems (system: makeIso { iso_minimal = forAllSystems (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-minimal.nix; module = ./modules/installer/cd-dvd/installation-cd-minimal.nix;
type = "minimal"; type = "minimal";
inherit system; inherit system;
}); });
iso_minimal_new_kernel = pkgs.lib.genAttrs systems (system: makeIso { iso_minimal_new_kernel = forAllSystems (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix; module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix;
type = "minimal-new-kernel"; type = "minimal-new-kernel";
inherit system; inherit system;
}); });
iso_graphical = pkgs.lib.genAttrs systems (system: makeIso { iso_graphical = forAllSystems (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-graphical.nix; module = ./modules/installer/cd-dvd/installation-cd-graphical.nix;
type = "graphical"; type = "graphical";
inherit system; inherit system;
@ -133,7 +137,7 @@ in rec {
# A variant with a more recent (but possibly less stable) kernel # A variant with a more recent (but possibly less stable) kernel
# that might support more hardware. # that might support more hardware.
iso_new_kernel = pkgs.lib.genAttrs systems (system: makeIso { iso_new_kernel = forAllSystems (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-new-kernel.nix; module = ./modules/installer/cd-dvd/installation-cd-new-kernel.nix;
type = "new-kernel"; type = "new-kernel";
inherit system; inherit system;
@ -141,7 +145,7 @@ in rec {
# A variant with efi booting support. Once cd-minimal has a newer kernel, # A variant with efi booting support. Once cd-minimal has a newer kernel,
# this should be enabled by default. # this should be enabled by default.
iso_efi = pkgs.lib.genAttrs systems (system: makeIso { iso_efi = forAllSystems (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-efi.nix; module = ./modules/installer/cd-dvd/installation-cd-efi.nix;
type = "efi"; type = "efi";
maintainers = [ "shlevy" ]; maintainers = [ "shlevy" ];
@ -150,7 +154,7 @@ in rec {
# A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF). # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).
ova = pkgs.lib.genAttrs systems (system: ova = forAllSystems (system:
with import nixpkgs { inherit system; }; with import nixpkgs { inherit system; };
@ -186,7 +190,7 @@ in rec {
# boot that system from uboot (like for the sheevaplug). # boot that system from uboot (like for the sheevaplug).
# The pc variant helps preparing the expression for the system tarball # The pc variant helps preparing the expression for the system tarball
# in a machine faster than the sheevpalug # in a machine faster than the sheevpalug
system_tarball_pc = pkgs.lib.genAttrs systems (system: makeSystemTarball { system_tarball_pc = forAllSystems (system: makeSystemTarball {
module = ./modules/installer/cd-dvd/system-tarball-pc.nix; module = ./modules/installer/cd-dvd/system-tarball-pc.nix;
inherit system; inherit system;
}); });
@ -211,7 +215,7 @@ in rec {
# Run the tests in ./tests/default.nix for each platform. You can # Run the tests in ./tests/default.nix for each platform. You can
# run a test by doing e.g. "nix-build -A tests.login.x86_64-linux". # run a test by doing e.g. "nix-build -A tests.login.x86_64-linux".
tests = tests =
with pkgs.lib; with lib;
let let
testsFor = system: testsFor = system:
mapAttrsRecursiveCond (x: !x ? test) (n: v: listToAttrs [(nameValuePair system v.test)]) mapAttrsRecursiveCond (x: !x ? test) (n: v: listToAttrs [(nameValuePair system v.test)])