diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-02-24 10:56:42 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-02-24 10:56:42 +0000 |
commit | 7782a3189e770396789720be5ca2b17404e104a3 (patch) | |
tree | 7fc03cc287f1631296fd7cd56a533a81f789ec94 | |
parent | 370e545be579a89c7ebb4fc7135b17832a0f7611 (diff) | |
download | nixlib-7782a3189e770396789720be5ca2b17404e104a3.tar nixlib-7782a3189e770396789720be5ca2b17404e104a3.tar.gz nixlib-7782a3189e770396789720be5ca2b17404e104a3.tar.bz2 nixlib-7782a3189e770396789720be5ca2b17404e104a3.tar.lz nixlib-7782a3189e770396789720be5ca2b17404e104a3.tar.xz nixlib-7782a3189e770396789720be5ca2b17404e104a3.tar.zst nixlib-7782a3189e770396789720be5ca2b17404e104a3.zip |
* Added Debian 5.0 (Lenny). Added the "login" package to the base
image, otherwise the post-installs script of the "passwd" package will fail because /etc/login.defs is missing. This also fixes the Ubuntu 8.10 image generation, woohoo! svn path=/nixpkgs/trunk/; revision=14217
-rw-r--r-- | pkgs/build-support/vm/default.nix | 27 | ||||
-rw-r--r-- | pkgs/build-support/vm/test.nix | 2 |
2 files changed, 28 insertions, 1 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index f61ecea1d32c..66d8c47d0f8c 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -822,6 +822,26 @@ rec { urlPrefix = mirror://debian; } // args); + debian50i386 = args: makeImageFromDebDist ({ + name = "debian-5.0-lenny-i386"; + fullName = "Debian 5.0 Lenny (i386)"; + packagesList = fetchurl { + url = mirror://debian/dists/lenny/main/binary-i386/Packages.bz2; + sha256 = "afbead64fb4820e50294686cd3ccdff91026b214aabec3f212f9001482001061"; + }; + urlPrefix = mirror://debian; + } // args); + + debian50x86_64 = args: makeImageFromDebDist ({ + name = "debian-5.0-lenny-amd64"; + fullName = "Debian 5.0 Lenny (amd64)"; + packagesList = fetchurl { + url = mirror://debian/dists/lenny/main/binary-amd64/Packages.bz2; + sha256 = "73d74454d687dfbdfef1abbe4bd9c251119f38ab8d371a593aa271bfa227ed2b"; + }; + urlPrefix = mirror://debian; + } // args); + }; @@ -896,6 +916,11 @@ rec { "util-linux" "file" "dpkg-dev" + # Needed because it provides /etc/login.defs, whose absence causes + # the "passwd" post-installs script to fail. + "login" + # For shutting up some messages during some post-install scripts: + "mktemp" ]; @@ -948,6 +973,8 @@ rec { ubuntu810x86_64 = diskImageFuns.ubuntu810x86_64 { packages = commonDebianPackages; }; debian40i386 = diskImageFuns.debian40i386 { packages = commonDebianPackages; }; debian40x86_64 = diskImageFuns.debian40x86_64 { packages = commonDebianPackages; }; + debian50i386 = diskImageFuns.debian50i386 { packages = commonDebianPackages; }; + debian50x86_64 = diskImageFuns.debian50x86_64 { packages = commonDebianPackages; }; }; diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix index 064fabdd5002..c61469bf2262 100644 --- a/pkgs/build-support/vm/test.nix +++ b/pkgs/build-support/vm/test.nix @@ -23,7 +23,7 @@ rec { buildInDebian = runInLinuxImage (stdenv.mkDerivation { name = "deb-compile"; - src = nixUnstable.src; + src = patchelf.src; diskImage = diskImages.ubuntu810i386; memSize = 512; phases = "sysInfoPhase unpackPhase patchPhase configurePhase buildPhase checkPhase installPhase fixupPhase distPhase"; |