* Sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15065
This commit is contained in:
Eelco Dolstra
2009-04-15 13:25:01 +00:00
55 changed files with 1128 additions and 133 deletions

View File

@@ -1,20 +1,13 @@
{stdenv, fetchurl, kernel}:
stdenv.mkDerivation {
name = "aufs-20080508-${kernel.version}";
name = "aufs-20090414-${kernel.version}";
src = fetchurl {
url = http://nixos.org/tarballs/aufs-20080508.tar.bz2;
sha256 = "1b7y6klk2fc6hf8w2la4k3yvxdvjibsnhv7d6mb12a7h13msjci6";
url = http://nixos.org/tarballs/aufs-20090414.tar.bz2;
sha256 = "1jhf3kccx0m84frlgx2d0ysn1c4272dgci59dsk7vsfrf7yik526";
};
patches = [
(fetchurl {
url = http://www.mail-archive.com/aufs-users@lists.sourceforge.net/msg01091/04_sec_perm.dpatch;
sha256 = "0b51dpks4d5qgysrakv2c1v076d9hc8ln2cbh012zi75b45gn4ir";
})
];
buildPhase = ''
kernelVersion=$(cd ${kernel}/lib/modules && ls)
kernelBuild=$(echo ${kernel}/lib/modules/$kernelVersion/source)

View File

@@ -2,7 +2,7 @@ args : with args;
rec {
name = "kqemu-"+version;
src = fetchurl {
url = http://bellard.org/qemu/kqemu-1.3.0pre11.tar.gz;
url = http://www.nongnu.org/qemu/kqemu-1.3.0pre11.tar.gz;
sha256 = "03svg2x52ziglf9r9irf6ziiz8iwa731fk1mdskwdip5jxbyy6jl";
};