Author: eelco
Date: Fri May 11 02:04:14 2012
New Revision: 34055
URL: https://nixos.org/websvn/nix/?rev=34055&sc=1
Log:
* Added Ubuntu 12.04.
Modified:
nixpkgs/trunk/pkgs/build-support/vm/default.nix
nixpkgs/trunk/pkgs/build-support/vm/test.nix
Modified: nixpkgs/trunk/pkgs/build-support/vm/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/vm/default.nix Thu May 10 23:51:40
2012 (r34054)
+++ nixpkgs/trunk/pkgs/build-support/vm/default.nix Fri May 11 02:04:14
2012 (r34055)
@@ -1229,6 +1229,28 @@
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)";
Modified: nixpkgs/trunk/pkgs/build-support/vm/test.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/vm/test.nix Thu May 10 23:51:40
2012 (r34054)
+++ nixpkgs/trunk/pkgs/build-support/vm/test.nix Fri May 11 02:04:14
2012 (r34055)
@@ -24,7 +24,7 @@
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 = ''
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
