public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Added Debian 5.0 (Lenny). Added the "login" package to the base

Browse Source 
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
This commit is contained in:
Eelco Dolstra 2009-02-24 10:56:42 +00:00
parent 370e545be5
commit 7782a3189e
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/build-support/vm/default.nix
View File

@ -822,6 +822,26 @@ rec {
urlPrefix = mirror://debian; urlPrefix = mirror://debian;
} // args); } // 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" "util-linux"
"file" "file"
"dpkg-dev" "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; }; ubuntu810x86_64 = diskImageFuns.ubuntu810x86_64 { packages = commonDebianPackages; };
debian40i386 = diskImageFuns.debian40i386 { packages = commonDebianPackages; }; debian40i386 = diskImageFuns.debian40i386 { packages = commonDebianPackages; };
debian40x86_64 = diskImageFuns.debian40x86_64 { packages = commonDebianPackages; }; debian40x86_64 = diskImageFuns.debian40x86_64 { packages = commonDebianPackages; };
debian50i386 = diskImageFuns.debian50i386 { packages = commonDebianPackages; };
debian50x86_64 = diskImageFuns.debian50x86_64 { packages = commonDebianPackages; };
}; };

2
pkgs/build-support/vm/test.nix
View File

@ -23,7 +23,7 @@ rec {
buildInDebian = runInLinuxImage (stdenv.mkDerivation { buildInDebian = runInLinuxImage (stdenv.mkDerivation {
name = "deb-compile"; name = "deb-compile";
src = nixUnstable.src; src = patchelf.src;
diskImage = diskImages.ubuntu810i386; diskImage = diskImages.ubuntu810i386;
memSize = 512; memSize = 512;
phases = "sysInfoPhase unpackPhase patchPhase configurePhase buildPhase checkPhase installPhase fixupPhase distPhase"; phases = "sysInfoPhase unpackPhase patchPhase configurePhase buildPhase checkPhase installPhase fixupPhase distPhase";