3
0
Fork 0
forked from mirrors/nixpkgs

* Added AUFS, another Unionfs.

svn path=/nixpkgs/branches/stdenv-updates/; revision=10420
This commit is contained in:
Yury G. Kudryashov 2008-01-31 10:38:37 +00:00
parent c1a512f2a1
commit 54303ac99c
2 changed files with 48 additions and 10 deletions

View file

@ -0,0 +1,35 @@
{stdenv, fetchurl, kernel}:
stdenv.mkDerivation {
name = "aufs-20080128";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/aufs-20080128.tar.bz2;
sha256 = "0732zp6wfss09x9d6n0a3v65rifn739m9nffi5d3952vglg4va6l";
};
buildPhase = ''
mkdir kernelsrc
tar xvf ${kernel.src} -C kernelsrc
kernelVersion=$(cd ${kernel}/lib/modules && ls)
substituteInPlace fs/aufs/Makefile --replace srctree srctree2
make KDIR=${kernel}/lib/modules/$kernelVersion/build srctree2=$(pwd)/kernelsrc/* -f local.mk
'';
installPhase = ''
ensureDir $out/bin
cp util/aulchown $out/bin
ensureDir $out/share/man/man5
cp util/aufs.5 $out/share/man/man5
ensureDir $out/lib/modules/$kernelVersion/misc
cp aufs.ko $out/lib/modules/$kernelVersion/misc
'';
meta = {
description = "Another Unionfs implementation for Linux";
homepage = http://aufs.sourceforge.net/;
};
}

View file

@ -150,9 +150,8 @@ rec {
# The same, another syntax. # The same, another syntax.
# Warning: syntax for configuration.nix changed too # Warning: syntax for configuration.nix changed too
useVersion = name: f: f useVersion = name: f: f {
{ version = getConfig [ "environment" "versions" name ];
version = getConfig [ "environment" "versions" name ];
}; };
# The contents of the configuration file found at $NIXPKGS_CONFIG or # The contents of the configuration file found at $NIXPKGS_CONFIG or
@ -3269,10 +3268,14 @@ rec {
atherosVersion = "r3122"; atherosVersion = "r3122";
atherosFunCurrent = theKernel: (atherosFun { atherosFunCurrent = kernel: atherosFun {
version = atherosVersion; version = atherosVersion;
kernel = theKernel; inherit kernel;
} null); } null;
aufs = import ../os-specific/linux/aufs {
inherit fetchurl stdenv kernel;
};
bridge_utils = import ../os-specific/linux/bridge_utils { bridge_utils = import ../os-specific/linux/bridge_utils {
inherit fetchurl stdenv autoconf automake; inherit fetchurl stdenv autoconf automake;
@ -3351,7 +3354,7 @@ rec {
}; };
htop = import ../os-specific/linux/htop { htop = import ../os-specific/linux/htop {
inherit fetchurl stdenv ncurses; inherit fetchurl stdenv ncurses;
}; };
hwdata = import ../os-specific/linux/hwdata { hwdata = import ../os-specific/linux/hwdata {
@ -3790,8 +3793,8 @@ rec {
}; };
shared_mime_info = import ../data/misc/shared-mime-info { shared_mime_info = import ../data/misc/shared-mime-info {
inherit fetchurl stdenv perl perlXMLParser pkgconfig gettext libxml2; inherit fetchurl stdenv perl perlXMLParser pkgconfig gettext libxml2;
inherit (gtkLibs) glib; inherit (gtkLibs) glib;
}; };
iana_etc = import ../data/misc/iana-etc { iana_etc = import ../data/misc/iana-etc {
@ -3799,7 +3802,7 @@ rec {
}; };
poppler_data = import ../data/misc/poppler-data { poppler_data = import ../data/misc/poppler-data {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
ttf_bitstream_vera = import ../data/fonts/ttf-bitstream-vera { ttf_bitstream_vera = import ../data/fonts/ttf-bitstream-vera {