* Put all the RPM/Debian images in an attribute set `diskImage'.

svn path=/nixpkgs/trunk/; revision=11181

1 files changed, 4 insertions, 28 deletions

diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix
index 6c25667a222b..bef100625a7f 100644
--- a/pkgs/build-support/vm/test.nix
+++ b/pkgs/build-support/vm/test.nix
@@ -8,47 +8,23 @@ rec {
   buildPatchelfInVM = runInLinuxVM patchelf;
 
 
-  rpmImage = fillDiskWithRPMs {
-    name = "fedora-image";
-    fullName = "Fedora Core 3";
-    size = 1024;
-    rpms = import ./rpm/fedora-3-packages.nix {inherit fetchurl;};
-  };
-
-
-  testRPMImage = makeImageTestScript rpmImage;
+  testRPMImage = makeImageTestScript diskImages.fedora5i386;
 
 
   buildPatchelfRPM = buildRPM {
     name = "patchelf-rpm";
     src = patchelf.src;
-    diskImage = rpmImage;
+    diskImage = diskImages.fedora5i386;
   };
 
   
-  ubuntuImage = fillDiskWithDebs {
-    name = "ubuntu-image";
-    fullName = "Ubuntu 7.10 Gutsy";
-    size = 256;
-    debs = import ./deb/ubuntu-7.10-gutsy-i386.nix {inherit fetchurl;};
-  };
-  
-
-  debianImage = fillDiskWithDebs {
-    name = "debian-image";
-    fullName = "Debian 4.0r3 Etch";
-    size = 256;
-    debs = import ./deb/debian-4.0r3-etch-i386.nix {inherit fetchurl;};
-  };
-
-
-  testUbuntuImage = makeImageTestScript ubuntuImage;
+  testUbuntuImage = makeImageTestScript diskImages.ubuntu710i386;
 
   
   buildInDebian = runInLinuxImage (stdenv.mkDerivation {
     name = "deb-compile";
     src = nixUnstable.src;
-    diskImage = debianImage;
+    diskImage = diskImages.debian40r3i386;
     memSize = 512;
     phases = "sysInfoPhase unpackPhase patchPhase configurePhase buildPhase checkPhase installPhase fixupPhase distPhase";
     sysInfoPhase = ''