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

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

11 files changed, 0 insertions, 60 deletions

diff --git a/pkgs/build-support/vm/rpm/fedora-2-packages.list b/pkgs/build-support/vm/rpm/fedora-2-i386.list
index e4e52cdd05be..e4e52cdd05be 100644
--- a/pkgs/build-support/vm/rpm/fedora-2-packages.list
+++ b/pkgs/build-support/vm/rpm/fedora-2-i386.list
diff --git a/pkgs/build-support/vm/rpm/fedora-2-packages.nix b/pkgs/build-support/vm/rpm/fedora-2-i386.nix
index 7be643535b19..7be643535b19 100644
--- a/pkgs/build-support/vm/rpm/fedora-2-packages.nix
+++ b/pkgs/build-support/vm/rpm/fedora-2-i386.nix
diff --git a/pkgs/build-support/vm/rpm/fedora-3-packages.list b/pkgs/build-support/vm/rpm/fedora-3-i386.list
index 37fc2657f341..37fc2657f341 100644
--- a/pkgs/build-support/vm/rpm/fedora-3-packages.list
+++ b/pkgs/build-support/vm/rpm/fedora-3-i386.list
diff --git a/pkgs/build-support/vm/rpm/fedora-3-packages.nix b/pkgs/build-support/vm/rpm/fedora-3-i386.nix
index 3e8e8cb817c4..3e8e8cb817c4 100644
--- a/pkgs/build-support/vm/rpm/fedora-3-packages.nix
+++ b/pkgs/build-support/vm/rpm/fedora-3-i386.nix
diff --git a/pkgs/build-support/vm/rpm/fedora-5-packages.list b/pkgs/build-support/vm/rpm/fedora-5-i386.list
index abdf154011f8..abdf154011f8 100644
--- a/pkgs/build-support/vm/rpm/fedora-5-packages.list
+++ b/pkgs/build-support/vm/rpm/fedora-5-i386.list
diff --git a/pkgs/build-support/vm/rpm/fedora-5-packages.nix b/pkgs/build-support/vm/rpm/fedora-5-i386.nix
index e5ee2972b7e8..e5ee2972b7e8 100644
--- a/pkgs/build-support/vm/rpm/fedora-5-packages.nix
+++ b/pkgs/build-support/vm/rpm/fedora-5-i386.nix
diff --git a/pkgs/build-support/vm/rpm/redhat-9-packages.list b/pkgs/build-support/vm/rpm/redhat-9-i386.list
index ac8e24e61af8..ac8e24e61af8 100644
--- a/pkgs/build-support/vm/rpm/redhat-9-packages.list
+++ b/pkgs/build-support/vm/rpm/redhat-9-i386.list
diff --git a/pkgs/build-support/vm/rpm/redhat-9-packages.nix b/pkgs/build-support/vm/rpm/redhat-9-i386.nix
index 8454f617374b..8454f617374b 100644
--- a/pkgs/build-support/vm/rpm/redhat-9-packages.nix
+++ b/pkgs/build-support/vm/rpm/redhat-9-i386.nix
diff --git a/pkgs/build-support/vm/rpm/rpm.nix b/pkgs/build-support/vm/rpm/rpm.nix
deleted file mode 100644
index 624e3b387a5f..000000000000
--- a/pkgs/build-support/vm/rpm/rpm.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-pkgs:
-
-rec {
-
-  stdenv = pkgs.stdenv;
-
-  
-  fillDiskWithRPMs = {size ? 1024, rpms, name, fullName, postInstall ? null}:
-  stdenv.mkDerivation {
-    builder = ./fill-disk-with-rpms.sh;
-    worker = ./fill-disk-worker.sh;
-    buildInputs = [pkgs.uml pkgs.utillinux];
-    inherit (pkgs) sysvinit e2fsprogs rpm;
-    inherit rpms size name fullName postInstall;
-  };
-
-
-  runInUML = args: stdenv.mkDerivation (args // {
-    inherit (args) name image;
-    builder = ./run-in-uml.sh;
-    actualBuilder = args.builder;
-    boot = ./run-in-uml-boot.sh;
-    buildInputs = [pkgs.uml pkgs.utillinux];
-    inherit (pkgs) sysvinit utillinux;
-  });
-
-    
-  redhat90Image = fillDiskWithRPMs {
-    rpms = (import ./redhat-9-packages.nix) {inherit (pkgs) fetchurl;};
-    name = "redhat-9.0";
-    fullName = "Red Hat 9.0";
-    postInstall = ./redhat-postinstall.sh;
-  };
-
-  suse90Image = fillDiskWithRPMs {
-    rpms = (import ./suse-9-packages.nix) {inherit (pkgs) fetchurl;};
-    name = "suse-9.0";
-    fullName = "SuSE 9.0";
-  };
-
-  fedora2Image = fillDiskWithRPMs {
-    rpms = (import ./fedora-2-packages.nix) {inherit (pkgs) fetchurl;};
-    name = "fedora-core-2";
-    fullName = "Fedora Core 2";
-    postInstall = ./fedora-postinstall.sh;
-  };
-
-  fedora3Image = fillDiskWithRPMs {
-    rpms = (import ./fedora-3-packages.nix) {inherit (pkgs) fetchurl;};
-    name = "fedora-core-3";
-    fullName = "Fedora Core 3";
-    postInstall = ./fedora-postinstall.sh;
-  };
-
-  fedora5Image = fillDiskWithRPMs {
-    rpms = (import ./fedora-5-packages.nix) {inherit (pkgs) fetchurl;};
-    name = "fedora-core-5";
-    fullName = "Fedora Core 5";
-  };
-}
diff --git a/pkgs/build-support/vm/rpm/suse-9-packages.list b/pkgs/build-support/vm/rpm/suse-9-i386.list
index edd42986ad97..edd42986ad97 100644
--- a/pkgs/build-support/vm/rpm/suse-9-packages.list
+++ b/pkgs/build-support/vm/rpm/suse-9-i386.list
diff --git a/pkgs/build-support/vm/rpm/suse-9-packages.nix b/pkgs/build-support/vm/rpm/suse-9-i386.nix
index 08463684e8b2..08463684e8b2 100644
--- a/pkgs/build-support/vm/rpm/suse-9-packages.nix
+++ b/pkgs/build-support/vm/rpm/suse-9-i386.nix