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

* Added Debian 6.0 and Ubuntu 10.10.

Browse Source 
svn path=/nixpkgs/trunk/; revision=25968
This commit is contained in:
Eelco Dolstra 2011-02-14 16:52:32 +00:00
parent 5526aa13e8
commit 167c520570
2 changed files with 56 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/build-support/release/debian-build.nix
View File

@ -47,6 +47,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
'';
sysInfoPhase = ''
[ ! -f /etc/lsb-release ] || (source /etc/lsb-release; echo "OS release: $DISTRIB_DESCRIPTION")
echo "System/kernel: $(uname -a)"
if test -e /etc/debian_version; then echo "Debian release: $(cat /etc/debian_version)"; fi
header "installed Debian packages"

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

@ -680,7 +680,7 @@ rec {
done
chroot=$(type -tP chroot)
PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \
/usr/bin/dpkg --install --force-all $debs < /dev/null
/usr/bin/dpkg --install --force-all $debs < /dev/null || true
done
echo "running post-install script..."
@ -1105,7 +1105,7 @@ rec {
sha256 = "6e3e813857496f2af6cd7e6ada06b3398fa067a7992c5fd7e8bd8fa92e3548b7";
};
urlPrefix = mirror://ubuntu;
packages = commonDebPackages ++ [ "diff" ];
packages = commonDebPackages ++ [ "diff" "mktemp" ];
};
ubuntu910x86_64 = {
@ -1116,7 +1116,7 @@ rec {
sha256 = "3a604fcb0c135eeb8b95da3e90a8fd4cfeff519b858cd3c9e62ea808cb9fec40";
};
urlPrefix = mirror://ubuntu;
packages = commonDebPackages ++ [ "diff" ];
packages = commonDebPackages ++ [ "diff" "mktemp" ];
};
ubuntu1004i386 = {
@ -1127,7 +1127,7 @@ rec {
sha256 = "0e46596202a68caa754dfe0883f46047525309880c492cdd5e2d0970fcf626aa";
};
urlPrefix = mirror://ubuntu;
packages = commonDebPackages ++ [ "diffutils" ];
packages = commonDebPackages ++ [ "diffutils" "mktemp" ];
};
ubuntu1004x86_64 = {
@ -1138,6 +1138,28 @@ rec {
sha256 = "74a8f3192b0eda397d65316e0fa6cd34d5358dced41639e07d9f1047971bfef0";
};
urlPrefix = mirror://ubuntu;
packages = commonDebPackages ++ [ "diffutils" "mktemp" ];
};
ubuntu1010i386 = {
name = "ubuntu-10.04-maverick-i386";
fullName = "Ubuntu 10.04 Maverick (i386)";
packagesList = fetchurl {
url = mirror://ubuntu/dists/maverick/main/binary-i386/Packages.bz2;
sha256 = "1qjs4042y03bxbxwjs3pgrs99ba6vqvjaaz6zhaxxaqj1r12dwa0";
};
urlPrefix = mirror://ubuntu;
packages = commonDebPackages ++ [ "diffutils" ];
};
ubuntu1010x86_64 = {
name = "ubuntu-10.04-maverick-amd64";
fullName = "Ubuntu 10.04 Maverick (amd64)";
packagesList = fetchurl {
url = mirror://ubuntu/dists/maverick/main/binary-amd64/Packages.bz2;
sha256 = "1p0i4gp1bxd3zvckgnh1hx4vfc23rfgzd19dk5rmi61lzbzzqbgc";
};
urlPrefix = mirror://ubuntu;
packages = commonDebPackages ++ [ "diffutils" ];
};
@ -1164,22 +1186,44 @@ rec {
};
debian50i386 = {
name = "debian-5.0.5-lenny-i386";
fullName = "Debian 5.0.5 Lenny (i386)";
name = "debian-5.0.8-lenny-i386";
fullName = "Debian 5.0.8 Lenny (i386)";
packagesList = fetchurl {
url = mirror://debian/dists/lenny/main/binary-i386/Packages.bz2;
sha256 = "1nzd0r44lnvw2bmshqpbhghs84fxbcr1jkg55d37v4d09gsdmln0";
sha256 = "0dcvd8ivn71dwln7mx5dbqj30v4cqmc61lj21ry05karkglb5scg";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
};
debian50x86_64 = {
name = "debian-5.0.5-lenny-amd64";
fullName = "Debian 5.0.5 Lenny (amd64)";
name = "debian-5.0.8-lenny-amd64";
fullName = "Debian 5.0.8 Lenny (amd64)";
packagesList = fetchurl {
url = mirror://debian/dists/lenny/main/binary-amd64/Packages.bz2;
sha256 = "04hab4ybjilppr1hwnl4k50vr5y88w7zn6v22phfrsrxf23nrlv3";
sha256 = "1wrqjfcqfs7q5i7jnr8115zsjlhzxxm2x41agp546d3wpj68k938";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
};
debian60i386 = {
name = "debian-6.0-squeeze-i386";
fullName = "Debian 6.0 Squeeze (i386)";
packagesList = fetchurl {
url = mirror://debian/dists/squeeze/main/binary-i386/Packages.bz2;
sha256 = "1c1faz7ig9jvx3a2d2crp6fx0gynh5s4xw1vv1mn14rzkx86l59i";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
};
debian60x86_64 = {
name = "debian-6.0-squeeze-amd64";
fullName = "Debian 6.0 Squeeze (amd64)";
packagesList = fetchurl {
url = mirror://debian/dists/squeeze/main/binary-amd64/Packages.bz2;
sha256 = "1c1n16q0hrimrnmv6shrr0z82xjqfjhm17salry8xi984c5fprwd";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
@ -1262,11 +1306,9 @@ rec {
# 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"
];
commonDebianPackages = commonDebPackages ++ [ "sysvinit" "diff" ];
commonDebianPackages = commonDebPackages ++ [ "sysvinit" "diff" "mktemp" ];
/* A set of functions that build the Linux distributions specified