From b6917d3b7336a9f74a6a9837de8067f2dd3f2ce9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 May 2012 02:04:14 +0000
Subject: [PATCH] * Added Ubuntu 12.04.

svn path=/nixpkgs/trunk/; revision=34055
---
 pkgs/build-support/vm/default.nix | 22 ++++++++++++++++++++++
 pkgs/build-support/vm/test.nix    |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index b2fd4db4e75f..b38ae0102165 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1229,6 +1229,28 @@ rec {
       packages = commonDebPackages ++ [ "diffutils" ];
     };
 
+    ubuntu1204i386 = {
+      name = "ubuntu-12.04-oneiric-i386";
+      fullName = "Ubuntu 12.04 Precise (i386)";
+      packagesList = fetchurl {
+        url = mirror://ubuntu/dists/precise/main/binary-i386/Packages.bz2;
+        sha256 = "18ns9h4qhvjfcip9z55grzi371racxavgqkp6b5kfkdq2wwwax2d";
+      };
+      urlPrefix = mirror://ubuntu;
+      packages = commonDebPackages ++ [ "diffutils" ];
+    };
+ 
+    ubuntu1204x86_64 = {
+      name = "ubuntu-12.04-oneiric-amd64";
+      fullName = "Ubuntu 12.04 Precise (amd64)";
+      packagesList = fetchurl {
+        url = mirror://ubuntu/dists/precise/main/binary-amd64/Packages.bz2;
+        sha256 = "1aabpn0hdih6cbabyn87yvhccqj44q9k03mqmjsb920iqlckl3fc";
+      };
+      urlPrefix = mirror://ubuntu;
+      packages = commonDebPackages ++ [ "diffutils" ];
+    };
+
     debian40i386 = {
       name = "debian-4.0r9-etch-i386";
       fullName = "Debian 4.0r9 Etch (i386)";
diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix
index 738a5008882c..e59bc934d4b3 100644
--- a/pkgs/build-support/vm/test.nix
+++ b/pkgs/build-support/vm/test.nix
@@ -24,7 +24,7 @@ rec {
   buildInDebian = runInLinuxImage (stdenv.mkDerivation {
     name = "deb-compile";
     src = patchelf.src;
-    diskImage = diskImages.ubuntu810i386;
+    diskImage = diskImages.ubuntu1204i386;
     memSize = 512;
     phases = "sysInfoPhase unpackPhase patchPhase configurePhase buildPhase checkPhase installPhase fixupPhase distPhase";
     sysInfoPhase = ''