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

* Added AUFS, another Unionfs.

Browse Source 
svn path=/nixpkgs/trunk/; revision=10387
This commit is contained in:
Eelco Dolstra 2008-01-29 13:24:40 +00:00
parent d3b73db40b
commit 3066e0e8e2
2 changed files with 52 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/os-specific/linux/aufs/default.nix Normal file
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/;
};
}

31
pkgs/top-level/all-packages.nix
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
@ -3276,10 +3275,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;
@ -3358,7 +3361,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 {
@ -3975,8 +3978,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 {
@ -3984,7 +3987,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 {
@ -4036,11 +4039,11 @@ rec {
audacity = import ../applications/audio/audacity { audacity = import ../applications/audio/audacity {
inherit fetchurl libogg libvorbis libsndfile libmad inherit fetchurl libogg libvorbis libsndfile libmad
pkgconfig gettext; pkgconfig gettext;
inherit (gtkLibs) gtk glib; inherit (gtkLibs) gtk glib;
wxGTK = wxGTK28deps; wxGTK = wxGTK28deps;
stdenv = overrideGCC stdenv gcc41NPTL; stdenv = overrideGCC stdenv gcc41NPTL;
inherit builderDefs stringsWithDeps; inherit builderDefs stringsWithDeps;
}; };
batik = import ../applications/graphics/batik { batik = import ../applications/graphics/batik {