* Clean up indentation (expanded tabs etc.).
svn path=/nixpkgs/trunk/; revision=11150
This commit is contained in:
Eelco Dolstra
parent
7698f380a0
commit
84d55847d2
@ -517,8 +517,7 @@ rec {
|
||||
gnused groff libxml2 libxslt makeWrapper;
|
||||
};
|
||||
|
||||
dosfstoolsFun = lib.sumArgs (selectVersion ../tools/misc/dosfstools "2.11deb")
|
||||
{
|
||||
dosfstoolsFun = lib.sumArgs (selectVersion ../tools/misc/dosfstools "2.11deb") {
|
||||
inherit builderDefs;
|
||||
};
|
||||
|
||||
@ -549,8 +548,7 @@ rec {
|
||||
};
|
||||
|
||||
filelight = import ../tools/system/filelight {
|
||||
inherit fetchurl stdenv kdelibs x11 zlib
|
||||
perl libpng;
|
||||
inherit fetchurl stdenv kdelibs x11 zlib perl libpng;
|
||||
qt = qt3;
|
||||
};
|
||||
|
||||
@ -589,8 +587,7 @@ rec {
|
||||
});
|
||||
|
||||
gdmapFun = lib.sumArgs (selectVersion ../tools/system/gdmap "0.7.5") {
|
||||
inherit stdenv fetchurl builderDefs pkgconfig libxml2
|
||||
intltool;
|
||||
inherit stdenv fetchurl builderDefs pkgconfig libxml2 intltool;
|
||||
inherit (gtkLibs) gtk;
|
||||
};
|
||||
|
||||
@ -687,13 +684,15 @@ rec {
|
||||
inherit fetchurl stdenv ocaml;
|
||||
};
|
||||
|
||||
/*hyppocampusFun = lib.sumArgs ( selectVersion ../tools/misc/hyppocampus "0.3rc1") {
|
||||
/*
|
||||
hyppocampusFun = lib.sumArgs ( selectVersion ../tools/misc/hyppocampus "0.3rc1") {
|
||||
inherit builderDefs stdenv fetchurl libdbi libdbiDrivers fuse
|
||||
pkgconfig perl gettext dbus dbus_glib pcre libscd;
|
||||
inherit (gtkLibs) glib;
|
||||
bison = bison23;
|
||||
flex = flex2533;
|
||||
};*/
|
||||
};
|
||||
*/
|
||||
|
||||
inetutils = import ../tools/networking/inetutils {
|
||||
inherit fetchurl stdenv;
|
||||
@ -1009,8 +1008,7 @@ rec {
|
||||
};
|
||||
|
||||
ttmkfdirFun = import ../tools/misc/ttmkfdir {
|
||||
inherit debPackage freetype fontconfig libunwind
|
||||
libtool;
|
||||
inherit debPackage freetype fontconfig libunwind libtool;
|
||||
bison = bison23;
|
||||
flex = flex2534;
|
||||
};
|
||||
@ -1506,7 +1504,7 @@ rec {
|
||||
inherit fetchurl stdenv x11 ncurses;
|
||||
};
|
||||
|
||||
/*
|
||||
/*
|
||||
gcj = import ../build-support/gcc-wrapper/default2.nix {
|
||||
name = "gcj";
|
||||
nativeTools = false;
|
||||
@ -1521,7 +1519,7 @@ rec {
|
||||
inherit (stdenv.gcc) binutils libc;
|
||||
inherit stdenv;
|
||||
};
|
||||
*/
|
||||
*/
|
||||
|
||||
opencxx = import ../development/compilers/opencxx {
|
||||
inherit fetchurl stdenv libtool;
|
||||
@ -1626,6 +1624,7 @@ rec {
|
||||
inherit fetchurl stdenv;
|
||||
};
|
||||
|
||||
|
||||
### DEVELOPMENT / INTERPRETERS
|
||||
|
||||
|
||||
@ -1913,9 +1912,11 @@ rec {
|
||||
inherit fetchurl stdenv guile;
|
||||
};
|
||||
|
||||
# happy = import ../development/tools/parsing/happy {
|
||||
# inherit fetchurl stdenv perl ghc;
|
||||
# };
|
||||
/*
|
||||
happy = import ../development/tools/parsing/happy {
|
||||
inherit fetchurl stdenv perl ghc;
|
||||
};
|
||||
*/
|
||||
|
||||
happy = import ../development/tools/parsing/happy/happy-1.17.nix {
|
||||
inherit cabal perl;
|
||||
@ -2603,14 +2604,12 @@ rec {
|
||||
inherit fetchurl stdenv pkgconfig libusb libtool libexif libjpeg gettext;
|
||||
};
|
||||
|
||||
# commented out because it's using the new configuration style proposal which is unstable
|
||||
libsamplerate = if builtins ? listToAttrs then (import ../development/libraries/libsamplerate) {
|
||||
libsamplerate = import ../development/libraries/libsamplerate {
|
||||
inherit fetchurl stdenv mkDerivationByConfiguration pkgconfig lib;
|
||||
} else null;
|
||||
};
|
||||
|
||||
libgsf = import ../development/libraries/libgsf {
|
||||
inherit fetchurl stdenv perl perlXMLParser pkgconfig libxml2 gettext bzip2
|
||||
python;
|
||||
inherit fetchurl stdenv perl perlXMLParser pkgconfig libxml2 gettext bzip2 python;
|
||||
inherit (gnome) glib gnomevfs libbonobo;
|
||||
};
|
||||
|
||||
@ -2888,6 +2887,7 @@ rec {
|
||||
# optional features:
|
||||
inherit ctl;
|
||||
};
|
||||
|
||||
# This older version is needed by blender (it complains about missing half.h )
|
||||
openexr_1_4_0 = import ../development/libraries/openexr {
|
||||
inherit fetchurl stdenv ilmbase zlib pkgconfig lib;
|
||||
@ -2930,7 +2930,6 @@ rec {
|
||||
inherit fetchurl stdenv gettext libtool autoconf automake;
|
||||
};
|
||||
|
||||
|
||||
proj = import ../development/libraries/proj.4 {
|
||||
inherit fetchurl stdenv;
|
||||
};
|
||||
@ -2948,6 +2947,7 @@ rec {
|
||||
};
|
||||
|
||||
qt4 = getVersion "qt4" qt4_alts;
|
||||
|
||||
qt4_alts = import ../development/libraries/qt-4 {
|
||||
inherit fetchurl stdenv fetchsvn zlib libjpeg libpng which mysql mesa openssl cups dbus
|
||||
fontconfig freetype pkgconfig libtiff;
|
||||
@ -2969,7 +2969,7 @@ rec {
|
||||
inherit fetchurl stdenv ncurses;
|
||||
};
|
||||
|
||||
# Also known as librdf, includes raptor and rasqal
|
||||
# Also known as librdf, includes raptor and rasqal
|
||||
redland = import ../development/libraries/redland {
|
||||
inherit fetchurl stdenv openssl libxml2 pkgconfig perl postgresql sqlite
|
||||
mysql libxslt curl pcre;
|
||||
@ -3223,6 +3223,7 @@ rec {
|
||||
inherit stdenv fetchurl;
|
||||
ghc = ghc68;
|
||||
};
|
||||
|
||||
cabal = cabal68;
|
||||
|
||||
Crypto = import ../development/libraries/haskell/Crypto {
|
||||
@ -3258,10 +3259,12 @@ rec {
|
||||
inherit stdenv fetchurl unzip wxGTK ghc;
|
||||
};
|
||||
|
||||
# wxHaskell68 = lowPrio (appendToName "ghc68" (import ../development/libraries/haskell/wxHaskell {
|
||||
# inherit stdenv fetchurl unzip wxGTK;
|
||||
# ghc = ghc68;
|
||||
# }));
|
||||
/*
|
||||
wxHaskell68 = lowPrio (appendToName "ghc68" (import ../development/libraries/haskell/wxHaskell {
|
||||
inherit stdenv fetchurl unzip wxGTK;
|
||||
ghc = ghc68;
|
||||
}));
|
||||
*/
|
||||
|
||||
X11 = import ../development/libraries/haskell/X11 {
|
||||
inherit cabal;
|
||||
@ -3277,6 +3280,7 @@ rec {
|
||||
inherit cabal zlib;
|
||||
};
|
||||
|
||||
|
||||
### DEVELOPMENT / PERL MODULES
|
||||
|
||||
|
||||
@ -3448,7 +3452,7 @@ rec {
|
||||
url = mirror://cpan/authors/id/T/TJ/TJMATHER/XML-DOM-1.44.tar.gz;
|
||||
sha256 = "1r0ampc88ni3sjpzr583k86076qg399arfm9xirv3cw49k3k5bzn";
|
||||
};
|
||||
# buildInputs = [libxml2];
|
||||
#buildInputs = [libxml2];
|
||||
propagatedBuildInputs = [perlXMLRegExp perlXMLParser perlLWP];
|
||||
};
|
||||
|
||||
@ -3945,9 +3949,10 @@ rec {
|
||||
|
||||
kernel = kernel_2_6_23;
|
||||
|
||||
systemKernel = (if (getConfig ["kernel" "version"] "2.6.21") == "2.6.22" then
|
||||
kernel_2_6_22 else if (getConfig ["kernel" "version"] "2.6.21") == "2.6.23" then
|
||||
kernel_2_6_23 else kernel);
|
||||
systemKernel =
|
||||
if getConfig ["kernel" "version"] "2.6.21" == "2.6.22" then kernel_2_6_22 else
|
||||
if getConfig ["kernel" "version"] "2.6.21" == "2.6.23" then kernel_2_6_23 else
|
||||
kernel;
|
||||
|
||||
kernel_2_6_20 = import ../os-specific/linux/kernel/linux-2.6.20.nix {
|
||||
inherit fetchurl stdenv perl mktemp module_init_tools;
|
||||
@ -3985,7 +3990,7 @@ rec {
|
||||
"CONFIG_EXT3COW_FS_POSIX_ACL=y\n" +
|
||||
"CONFIG_EXT3COW_FS_SECURITY=y\n";
|
||||
}
|
||||
/* commented out because only acer users have need for it..
|
||||
/* Commented out because only acer users have need for it..
|
||||
It takes quite a while to create the patch when unpacking the kernel sources only for that task
|
||||
{ name = "acerhk";
|
||||
patch = kernel_module_acerhk + "/acerhk-patch.tar.bz2" ;
|
||||
@ -4151,7 +4156,6 @@ rec {
|
||||
inherit fetchurl stdenv;
|
||||
};
|
||||
|
||||
|
||||
libsexy = import ../development/libraries/libsexy {
|
||||
inherit stdenv fetchurl pkgconfig libxml2;
|
||||
inherit (gtkLibs) glib gtk pango;
|
||||
@ -5229,7 +5233,6 @@ rec {
|
||||
};
|
||||
*/
|
||||
|
||||
|
||||
MPlayerPlugin = import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in {
|
||||
inherit fetchurl stdenv pkgconfig firefox gettext;
|
||||
inherit (xlibs) libXpm;
|
||||
@ -5237,10 +5240,12 @@ rec {
|
||||
};
|
||||
|
||||
# commented out because it's using the new configuration style proposal which is unstable
|
||||
#mrxvt = import ../applications/misc/mrxvt {
|
||||
#inherit lib fetchurl stdenv;
|
||||
#inherit (xlibs) libXaw xproto libXt libX11 libSM libICE;
|
||||
#};
|
||||
/*
|
||||
mrxvt = import ../applications/misc/mrxvt {
|
||||
inherit lib fetchurl stdenv;
|
||||
inherit (xlibs) libXaw xproto libXt libX11 libSM libICE;
|
||||
};
|
||||
*/
|
||||
|
||||
mutt = import ../applications/networking/mailreaders/mutt {
|
||||
inherit fetchurl stdenv ncurses which openssl;
|
||||
@ -5402,9 +5407,7 @@ rec {
|
||||
inherit guile mesa libtool;
|
||||
} null;
|
||||
|
||||
# commented out because it's using the new configuration style proposal which is unstable
|
||||
|
||||
sox = if builtins ? listToAttrs then import ../applications/misc/audio/sox {
|
||||
sox = import ../applications/misc/audio/sox {
|
||||
inherit fetchurl stdenv lib mkDerivationByConfiguration;
|
||||
# optional features
|
||||
inherit alsaLib; # libao
|
||||
@ -5414,8 +5417,7 @@ rec {
|
||||
# /tmp/nix-7957-1/sox-14.0.0/src/ffmpeg.c:130: undefined reference to `avcodec_decode_audio2
|
||||
# That's why I'v added ffmpeg_svn
|
||||
ffmpeg = ffmpeg_svn;
|
||||
} else null;
|
||||
|
||||
};
|
||||
|
||||
spoofax = import ../applications/editors/eclipse/plugins/spoofax {
|
||||
inherit fetchurl stdenv;
|
||||
@ -5443,6 +5445,7 @@ rec {
|
||||
compressionSupport = getConfig ["subversion" "compressionSupport"] true;
|
||||
httpd = apacheHttpd;
|
||||
};
|
||||
|
||||
subversion14svnmerge = svnmergeFun subversion14;
|
||||
|
||||
subversionWithJava = import ../applications/version-management/subversion-1.2.x {
|
||||
@ -5592,8 +5595,8 @@ rec {
|
||||
wrapFirefox = firefox: nameSuffix: import ../applications/networking/browsers/firefox-wrapper {
|
||||
inherit stdenv firefox nameSuffix;
|
||||
plugins =
|
||||
let enableAdobeFlash = ((getConfig [ "firefox" "enableAdobeFlash" ] false)
|
||||
&& (system == "i686-linux"));
|
||||
let enableAdobeFlash = getConfig [ "firefox" "enableAdobeFlash" ] false
|
||||
&& system == "i686-linux";
|
||||
in
|
||||
([]
|
||||
++ lib.optional (!enableAdobeFlash) gnash
|
||||
@ -5601,7 +5604,8 @@ rec {
|
||||
# RealPlayer is disabled by default for legal reasons.
|
||||
++ lib.optional (system != "i686-linux" && getConfig ["firefox" "enableRealPlayer"] false) RealPlayer
|
||||
++ lib.optional (getConfig ["firefox" "enableMPlayer"] true) MPlayerPlugin
|
||||
++ lib.optional (supportsJDK && getConfig ["firefox" "jre"] true && jrePlugin ? mozillaPlugin) jrePlugin);
|
||||
++ lib.optional (supportsJDK && getConfig ["firefox" "jre"] true && jrePlugin ? mozillaPlugin) jrePlugin
|
||||
);
|
||||
};
|
||||
|
||||
x11vncFun = lib.sumArgs (selectVersion ../tools/X11/x11vnc "0.9.3") {
|
||||
@ -5802,8 +5806,7 @@ rec {
|
||||
|
||||
# You still can override by passing more arguments.
|
||||
spaceOrbitFun = lib.sumArgs (selectVersion ../games/orbit "1.01") {
|
||||
inherit fetchurl stdenv builderDefs
|
||||
mesa freeglut;
|
||||
inherit fetchurl stdenv builderDefs mesa freeglut;
|
||||
inherit (gnome) esound;
|
||||
inherit (xlibs) libXt libX11 libXmu libXi libXext;
|
||||
};
|
||||
@ -5932,10 +5935,12 @@ rec {
|
||||
}));
|
||||
|
||||
# commented out because it's using the new configuration style proposal which is unstable
|
||||
#gxemul = (import ../misc/gxemul) {
|
||||
#inherit lib stdenv fetchurl;
|
||||
#inherit (xlibs) libX11;
|
||||
#};
|
||||
/*
|
||||
gxemul = (import ../misc/gxemul) {
|
||||
inherit lib stdenv fetchurl;
|
||||
inherit (xlibs) libX11;
|
||||
};
|
||||
*/
|
||||
|
||||
# using the new configuration style proposal which is unstable
|
||||
/*
|
||||
@ -6047,13 +6052,11 @@ rec {
|
||||
|
||||
saneBackends = import ../misc/sane-backends {
|
||||
inherit fetchurl stdenv libusb;
|
||||
gt68xxFirmware =
|
||||
getConfig ["sane" "gt68xxFirmware"] null;
|
||||
gt68xxFirmware = getConfig ["sane" "gt68xxFirmware"] null;
|
||||
};
|
||||
|
||||
saneFrontends = import ../misc/sane-front {
|
||||
inherit fetchurl stdenv pkgconfig libusb
|
||||
saneBackends;
|
||||
inherit fetchurl stdenv pkgconfig libusb saneBackends;
|
||||
inherit (gtkLibs) gtk;
|
||||
inherit (xlibs) libX11;
|
||||
};
|
||||
@ -6083,12 +6086,14 @@ rec {
|
||||
inherit fetchurl stdenv flex bison zlib libpng ncurses ed;
|
||||
};
|
||||
|
||||
/*tetexX11 = import ../misc/tex/tetex {
|
||||
/*
|
||||
tetexX11 = import ../misc/tex/tetex {
|
||||
inherit fetchurl stdenv flex bison zlib libpng ncurses ed;
|
||||
inherit (xlibs) libX11 libXext libXmu libXaw libXt libXpm;
|
||||
inherit freetype t1lib;
|
||||
builderX11 = true;
|
||||
};*/
|
||||
};
|
||||
*/
|
||||
|
||||
texFunctions = import ../misc/tex/nix {
|
||||
inherit stdenv perl tetex graphviz ghostscript;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user