Mettre à jour 'vbox/release.nix'

master
Jean-Pierre PRUNARET 8 years ago
parent e86b06ff81
commit 47cd643b01

@ -72,7 +72,7 @@ let
in { in {
/*
tarball = tarball =
pkgs.releaseTools.makeSourceTarball { pkgs.releaseTools.makeSourceTarball {
name = "nixos-tarball"; name = "nixos-tarball";
@ -122,7 +122,7 @@ in {
tar cfJ $out/tarballs/$releaseName.tar.xz $releaseName tar cfJ $out/tarballs/$releaseName.tar.xz $releaseName
''; # */ ''; # */
}; };
*/
manual = manual =
(import "${nixosSrc}/doc/manual" { (import "${nixosSrc}/doc/manual" {
@ -144,6 +144,7 @@ in {
inherit system; inherit system;
}); });
/*
iso_minimal_new_kernel = pkgs.lib.genAttrs systems (system: makeIso { iso_minimal_new_kernel = pkgs.lib.genAttrs systems (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";
@ -172,6 +173,7 @@ in {
maintainers = [ "shlevy" ]; maintainers = [ "shlevy" ];
inherit system; inherit system;
}); });
*/
# 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).
@ -206,7 +208,7 @@ in {
); );
/*
# Provide a tarball that can be unpacked into an SD card, and easily # Provide a tarball that can be unpacked into an SD card, and easily
# 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
@ -215,7 +217,7 @@ in {
module = ./modules/installer/cd-dvd/system-tarball-pc.nix; module = ./modules/installer/cd-dvd/system-tarball-pc.nix;
inherit system; inherit system;
}); });
*/
/* /*
system_tarball_fuloong2f = system_tarball_fuloong2f =
assert builtins.currentSystem == "mips64-linux"; assert builtins.currentSystem == "mips64-linux";
@ -232,7 +234,7 @@ in {
}; };
*/ */
/*
# 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 =
@ -242,7 +244,8 @@ in {
mapAttrsRecursiveCond (x: !x ? test) (n: v: listToAttrs [(nameValuePair system v.test)]) mapAttrsRecursiveCond (x: !x ? test) (n: v: listToAttrs [(nameValuePair system v.test)])
(import ./tests { inherit nixpkgs system; }); (import ./tests { inherit nixpkgs system; });
in fold recursiveUpdate {} (map testsFor systems); in fold recursiveUpdate {} (map testsFor systems);
*/
/*
run-in-machine-tests = pkgs.lib.genAttrs systems (system: import ./tests/run-in-machine.nix { inherit nixpkgs system; }); run-in-machine-tests = pkgs.lib.genAttrs systems (system: import ./tests/run-in-machine.nix { inherit nixpkgs system; });
*/
} }
Loading…
Cancel
Save