diff --git a/doc/language-support.xml b/doc/language-support.xml index d1a85974d67..2e88a5ad9a5 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -13,7 +13,7 @@ in Nixpkgs to easily build packages for other programming languages, such as Perl or Haskell. These are described in this chapter. -
Perl +
Perl Nixpkgs provides a function buildPerlPackage, a generic package builder function for any Perl package that has a @@ -156,7 +156,42 @@ ClassC3Componentised = buildPerlPackage rec {
Python -TODO + + Python packages that + use setuptools, + which many Python packages do nowadays, can be built very simply using + the buildPythonPackage function. This function is + implemented + in pkgs/development/python-modules/generic/default.nix + and works similarly to buildPerlPackage. (See + for details.) + + + + Python packages that use buildPythonPackage are + defined + in pkgs/python-packages.nix. + Most of them are simple. For example: + + +twisted = buildPythonPackage { + name = "twisted-8.1.0"; + + src = fetchurl { + url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2; + sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl"; + }; + + propagatedBuildInputs = [ pkgs.ZopeInterface ]; + + meta = { + homepage = http://twistedmatrix.com/; + description = "Twisted, an event-driven networking engine written in Python"; + license = "MIT"; + }; +}; + +
@@ -182,4 +217,4 @@ ClassC3Componentised = buildPerlPackage rec {
- \ No newline at end of file + diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index e4a3874de41..8d72402866f 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib }: +{ stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib, perl, intltool, + libogg, libvorbis, libmad + }: stdenv.mkDerivation { name = "audacity-1.3.7"; @@ -7,9 +9,10 @@ stdenv.mkDerivation { src = fetchurl { url = mirror://sourceforge/audacity/audacity-fullsrc-1.3.7.tar.bz2; - sha256 = "1kashc6cc6d5g6i59nqcrl795x1jqdh0lpg3msa1wckfj3hpljmy"; + sha256 = "0b4arafpdyjjk52l6n7aw518hzm65iv9w5g39jqr2bmvn6a9qivi"; }; - buildInputs = [ wxGTK pkgconfig gettext gtk glib zlib ]; + buildInputs = [ wxGTK pkgconfig gettext gtk glib zlib intltool perl + libogg libvorbis libmad]; meta = { description = "Sound editor with graphical UI"; diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix index 6a0dfe020d0..17174fbebbf 100644 --- a/pkgs/applications/audio/ladspa-plugins/default.nix +++ b/pkgs/applications/audio/ladspa-plugins/default.nix @@ -10,7 +10,7 @@ args: with args; }; in with localDefs; let - postInstall = FullDepEntry (" + postInstall = fullDepEntry (" ensureDir \$out/share/ladspa/ ln -s \$out/lib/ladspa \$out/share/ladspa/lib ") [minInit defEnsureDir]; diff --git a/pkgs/applications/audio/ladspa-plugins/ladspah.nix b/pkgs/applications/audio/ladspa-plugins/ladspah.nix index 1e29eadcada..12ea91714a3 100644 --- a/pkgs/applications/audio/ladspa-plugins/ladspah.nix +++ b/pkgs/applications/audio/ladspa-plugins/ladspah.nix @@ -12,7 +12,7 @@ in }; in with localDefs; let - copyFile = FullDepEntry (" + copyFile = fullDepEntry (" ensureDir \$out/include cp ${src} \$out/include/ladspa.h ") [minInit defEnsureDir]; diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index a8eb2de8e1a..8d937afeec7 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -2,9 +2,9 @@ args : let lib = args.lib; fetchurl = args.fetchurl; - FullDepEntry = args.FullDepEntry; + fullDepEntry = args.fullDepEntry; - version = lib.getAttr ["version"] "9.4" args; + version = lib.attrByPath ["version"] "9.4" args; buildInputs = with args; [gtk glib pkgconfig libXpm gmp gettext libX11 fftw] ++ (lib.optional (args ? ruby) args.ruby) @@ -38,14 +38,14 @@ rec { phaseNames = ["doConfigure" "preBuild" "makeDocsWork" "doMakeInstall" "doForceShare"]; - makeDocsWork = FullDepEntry '' + makeDocsWork = fullDepEntry '' # hackish way to make html docs work h="$out/share/snd/html"; ensureDir "$h"; cp *.html "$h" patch -p1 < ${./doc.patch} sed "s@HTML-DIR@$h@" -i index.scm snd-help.c '' ["defEnsureDir"]; - preBuild = FullDepEntry ('' + preBuild = fullDepEntry ('' cp config.log /tmp/snd-config.log export NIX_LDFLAGS="$NIX_LDFLAGS -L${args.libX11}/lib -lX11" diff --git a/pkgs/applications/editors/eclipse-classic/default.nix b/pkgs/applications/editors/eclipse-classic/default.nix new file mode 100644 index 00000000000..f2783409f35 --- /dev/null +++ b/pkgs/applications/editors/eclipse-classic/default.nix @@ -0,0 +1,69 @@ +{ stdenv, fetchurl, patchelf, makeDesktopItem +, freetype, fontconfig, libX11, libXext, libXrender +, glib, gtk, libXtst +, jre +}: + +assert stdenv ? glibc; + +stdenv.mkDerivation rec { + name = "eclipse-3.4.2"; + src = if stdenv.system == "x86_64-linux" then + fetchurl { + url = http://ftp.heanet.ie/pub/eclipse/eclipse/downloads/drops/R-3.4.2-200902111700/eclipse-SDK-3.4.2-linux-gtk-x86_64.tar.gz; + sha256 = "33e4e88347acd7f2f9243a8b887bd012cf5aec06c2d0f64da1349444bbd6876b"; + } + else + fetchurl { + url = http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/eclipse/downloads/drops/R-3.4.2-200902111700/eclipse-SDK-3.4.2-linux-gtk.tar.gz; + sha256 = "4518992b0d7bafeaa2338017ebc7048b09a227f056f576b2b077a435110ef9dd"; + } + ; + + desktopItem = makeDesktopItem { + name = "Eclipse"; + exec = "eclipse"; + icon = "eclipse"; + comment = "Integrated Development Environment"; + desktopName = "Eclipse IDE"; + genericName = "Integrated Development Environment"; + categories = "Application;Development;"; + }; + + buildInputs = [ patchelf ]; + buildCommand = '' + # Unpack tarball + + tar xfvz $src + + # Patch binaries + cd eclipse + ${if stdenv.system == "x86_64-linux" then + "patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 ./eclipse" + else + "patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 ./eclipse" + } + patchelf --set-rpath ${freetype}/lib:${fontconfig}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib ./libcairo-swt.so + + # Create wrapper script + cd .. + ensureDir $out/bin + cp -av eclipse $out + + cat > $out/bin/eclipse <> $out/bin/eclipse << EOF #! /bin/sh -e export PATH=${jdk}/bin\${PATH:+:}\$PATH export LD_LIBRARY_PATH=$rpath\${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH -exec \$(dirname $0)/../eclipse/eclipse $@ +exec \$(dirname \$0)/../eclipse/eclipse $@ EOF chmod +x $out/bin/eclipse diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 1cbfff91986..97b582075c4 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -9,25 +9,29 @@ # Why use a local copy? This way it's easier to use the update manager to get plugins :-) -{fetchurl, stdenv, jdk, gtk, glib, libXtst, plugins ? []}: +{fetchurl, stdenv, jdk, gtk, glib, libXtst, makeOverridable, plugins ? [], unzip}: -let { - body = +let eclipseFun = + makeOverridable ({name, bindist} : stdenv.mkDerivation { - name = "eclipse-sdk-3.5M6"; + inherit name; builder = ./builder.sh; src = bindist; - buildInputs = []; + buildInputs = [ unzip /* unzip required by eclipseCDT */ ]; inherit jdk plugins; libraries = [gtk glib libXtst]; - }; + }); in - bindist = - if (stdenv.system == "x86_64-linux") then fetchurl { - url = ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/eclipse/S-3.5M6-200903130100/eclipse-SDK-3.5M6-linux-gtk-x86_64.tar.gz; - sha256 = "10p4idp5rcdf7xqwfk3kvmjxhi8x1v835m0y4pn9q4nhfb5643pi"; - } else fetchurl { - url = ftp://mirror.micromata.de/eclipse/eclipse/downloads/drops/S-3.5M6-200903130100/eclipse-SDK-3.5M6-linux-gtk.tar.gz; - sha256 = "1z8j26b632ydhqrmwgbcqgiq7f1a542jam06z2h62mcbqazrcyah"; - }; -} + eclipseFun { + # you can override these settings usnig .override {...} + name = "eclipse-sdk-3.5M6"; + + bindist = + if (stdenv.system == "x86_64-linux") then fetchurl { + url = ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/eclipse/S-3.5M6-200903130100/eclipse-SDK-3.5M6-linux-gtk-x86_64.tar.gz; + sha256 = "10p4idp5rcdf7xqwfk3kvmjxhi8x1v835m0y4pn9q4nhfb5643pi"; + } else fetchurl { + url = ftp://mirror.micromata.de/eclipse/eclipse/downloads/drops/S-3.5M6-200903130100/eclipse-SDK-3.5M6-linux-gtk.tar.gz; + sha256 = "1z8j26b632ydhqrmwgbcqgiq7f1a542jam06z2h62mcbqazrcyah"; + }; + } diff --git a/pkgs/applications/editors/eclipse/plugins/spoofax/default.nix b/pkgs/applications/editors/eclipse/plugins/spoofax/default.nix deleted file mode 100644 index 649619e487e..00000000000 --- a/pkgs/applications/editors/eclipse/plugins/spoofax/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{stdenv, fetchurl}: - -fetchurl { - url = http://www.ii.uib.no/~karltk/spoofax/plugins/org.spoofax.editor_0.3.11.jar; - md5 = "c36941afcb0e538e16fafd594eae128e"; -} diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index b43af4e4e59..90f58279697 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -1,10 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "ed-1.2"; + name = "ed-1.3"; + src = fetchurl { url = "mirror://gnu/ed/${name}.tar.gz"; - sha256 = "1jhw050fzaffjf5qdj1ccn7alngam7yhd5zpzyxvrjphwmkd46kx"; + sha256 = "11xyrzm21l2hhvbc0yanx2acsg1dp3ckmcwq2yl6cbymzvzzfrim"; }; doCheck = true; diff --git a/pkgs/applications/editors/emacs-unicode/builder.sh b/pkgs/applications/editors/emacs-23-snapshot/builder.sh similarity index 100% rename from pkgs/applications/editors/emacs-unicode/builder.sh rename to pkgs/applications/editors/emacs-23-snapshot/builder.sh diff --git a/pkgs/applications/editors/emacs-unicode/default.nix b/pkgs/applications/editors/emacs-23-snapshot/default.nix similarity index 93% rename from pkgs/applications/editors/emacs-unicode/default.nix rename to pkgs/applications/editors/emacs-23-snapshot/default.nix index 84a9cae816e..925dec7343c 100644 --- a/pkgs/applications/editors/emacs-unicode/default.nix +++ b/pkgs/applications/editors/emacs-23-snapshot/default.nix @@ -17,7 +17,7 @@ assert xaw3dSupport -> Xaw3d != null; assert gtkGUI -> pkgconfig != null && gtk != null; assert xftSupport -> libXft != null && libpng != null; # libpng = probably a bug -let date = "2009-02-16"; in +let date = "2009-06-26"; in stdenv.mkDerivation { name = "emacs-snapshot-23-${date}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { inherit date; cvsRoot = ":pserver:anonymous@cvs.savannah.gnu.org:/sources/emacs"; module = "emacs"; - sha256 = "6ec63da94a199c5f95bf4a9aa578cf14b3d85800fd37b3562d9a446b144b0d47"; + sha256 = "bf9b21a0634f45474a1ce91e6153ced69194f1e9c0acd6626a931198f4a5972f"; }; preConfigure = "autoreconf -vfi"; diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix new file mode 100644 index 00000000000..de555632f52 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/magit/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, emacs, texinfo}: + +stdenv.mkDerivation { + name = "magit-0.7"; + + src = fetchurl { + url = "http://zagadka.vm.bytemark.co.uk/magit/magit-0.7.tar.gz"; + sha256 = "0qry1vj41pycwkf71sqrz3zgzh85zdg5acq26asscq4s7jksrjiz"; + }; + + buildInputs = [emacs texinfo]; + + meta = { + description = "An an interface to Git, implemented as an extension to Emacs."; + + longDescription = '' + With Magit, you can inspect and modify your Git repositories with + Emacs. You can review and commit the changes you have made to the + tracked files, for example, and you can browse the history of past + changes. There is support for cherry picking, reverting, merging, + rebasing, and other common Git operations. + + Magit is not a complete interface to Git; it just aims to make the + most common Git operations convenient. Thus, Magit will likely not + save you from learning Git itself. + ''; + + license = "GPLv3+"; + homepage = "http://zagadka.vm.bytemark.co.uk/magit/"; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/quack/default.nix b/pkgs/applications/editors/emacs-modes/quack/default.nix index 943359086e7..bfb3b3efe24 100644 --- a/pkgs/applications/editors/emacs-modes/quack/default.nix +++ b/pkgs/applications/editors/emacs-modes/quack/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, emacs }: stdenv.mkDerivation { - name = "quack-0.30"; + name = "quack-0.36"; src = fetchurl { # XXX: Upstream URL is not versioned, which might eventually break this. url = "http://www.neilvandyke.org/quack/quack.el"; - sha256 = "1xmpbdb064s3l3cv4agf03ir1g7xfzyvlqayr3yy5f8z3i6pf7mi"; + sha256 = "0y9l35a8v56ldy4dap0816i80q9lnfpp27pl2a12d5hzb84hq8nr"; }; buildInputs = [ emacs ]; diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix index f3a2c980ab7..df0fb5b971e 100644 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -1,36 +1,36 @@ -{ stdenv, fetchurl, pkgconfig, gtk, freetype, fontconfig, lcms, fltk, +{ stdenv, fetchcvs, cmake, pkgconfig, gtk, freetype, fontconfig, lcms, fltk, flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11, perlXMLParser, python, pygtk, gettext, intltool, babl, gegl, glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr, - mesa, libXext, libXpm, libXxf86vm } : + mesa, libXext, libXpm, libXxf86vm, automake, autoconf, libtool } : stdenv.mkDerivation { - name = "cinepaint-0.22-1"; + name = "cinepaint-0.25.0"; - src = fetchurl { - url = mirror://sourceforge/cinepaint/cinepaint-0.22-1.tar.gz; - sha256 = "bb08a9210658959772df12408769d660999ede168b7431514e1f3cead07c0fea"; + # The developer told me this cvs fetch is 0.25.0 + src = fetchcvs { + cvsRoot = ":pserver:anonymous@cinepaint.cvs.sourceforge.net:/cvsroot/cinepaint"; + module = "cinepaint-project"; + date = "2004-03-01"; + sha256 = "bf6dc04f3ea2094b7ef6f87f40f2c90d75a557e40a773f8eb76e8a71f14362cf"; }; - buildInputs = [ pkgconfig gtk freetype fontconfig lcms fltk flex libtiff + buildInputs = [ cmake pkgconfig gtk freetype fontconfig lcms fltk flex libtiff libjpeg libpng libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl gegl glib makedepend xf86vidmodeproto xineramaproto libXmu - openexr mesa libXext libXpm libXxf86vm ]; + openexr mesa libXext libXpm libXxf86vm automake autoconf libtool ]; - patches = [ ./fltk.patch ]; + dontUseCmakeConfigure = 1; - prePatch = '' - sed -i -e s@/usr/X11R6/bin/makedepend@${makedepend}/bin/makedepend@ \ - -e s@/usr/X11R6/include/X11/extensions/xf86vmode@${xf86vidmodeproto}/include/X11/extensions/xf86vmode@ \ - -e s@/usr/X11R6/include/X11/Xlib.h@${libX11}/include/X11/Xlib.h@ \ - -e s@/usr/X11R6/include/X11/extensions/Xinerama.h@${xineramaproto}/include/X11/extensions/Xinerama.h@ \ - -e s@/usr/X11R6/lib/libfreetype.a@${freetype}/lib/libfreetype.a@ \ - plug-ins/icc_examin/icc_examin/configure \ - plug-ins/icc_examin/icc_examin/configure.sh + NIX_CFLAGS_COMPILE = "-I."; + + configurePhase = '' + cd cinepaint + chmod 0777 autogen.sh + ./autogen.sh + ./configure --prefix=$out ''; - configureFlags = [ "--disable-print" "--enable-gtk2" ]; - meta = { homepage = http://www.cinepaint.org/; license = "free"; diff --git a/pkgs/applications/graphics/cinepaint/fltk.patch b/pkgs/applications/graphics/cinepaint/fltk.patch deleted file mode 100644 index 2b007a7a65a..00000000000 --- a/pkgs/applications/graphics/cinepaint/fltk.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp b/plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp -index b507454..85f4441 100644 ---- a/plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp -+++ b/plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp -@@ -226,7 +226,7 @@ namespace icc_examin_ns { - - int awake(void) - { -- Fl::awake(0); -+ Fl::awake((void *)0); - return 0; - } - int leerWait(void) { return 0; } diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix new file mode 100644 index 00000000000..afbab962cf9 --- /dev/null +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -0,0 +1,182 @@ +# install these packages into your profile. Then add +# ~/.nix-profile/gimp-version-plugins to your plugin list you can find at +# preferences -> Folders -> Plug-ins +# same applies for the scripts + +{ pkgs, gimp }: +let + inherit (pkgs) stdenv fetchurl pkgconfig gtkLibs; + inherit (gtkLibs) glib; + targetPluginDir = "$out/${gimp.name}-plugins"; + targetScriptDir = "$out/${gimp.name}-scripts"; + prefix = "plugin-gimp-"; + + pluginDerivation = a: stdenv.mkDerivation ({ + prePhases = "extraLib"; + extraLib = '' + installScripts(){ + ensureDir ${targetScriptDir}; + for p in "$@"; do cp "$p" ${targetScriptDir}; done + } + installPlugins(){ + ensureDir ${targetPluginDir}; + for p in "$@"; do cp "$p" ${targetPluginDir}; done + } + ''; + } + // a + # don't call this gimp-* unless you want nix replace gimp by a plugin :-) + // { name = "${a.name}-${gimp.name}-plugin"; } + ); + + scriptDerivation = {name, src} : pluginDerivation { + inherit name; phases = "extraLib installPhase"; + installPhase = "installScripts ${src}"; + }; + + libLQR = pluginDerivation { + name = "liblqr-1-0.4.1"; + # required by lqrPlugin, you don't havet to install this lib explicitely + buildInputs = [ gimp ] ++ gimp.buildInputs; + src = fetchurl { + url = http://registry.gimp.org/files/liblqr-1-0.4.1.tar.bz2; + sha256 = "02g90wag7xi5rjlmwq8h0qs666b1i2sa90s4303hmym40il33nlz"; + }; + }; + +in +rec { + fourier = pluginDerivation { + /* menu: + Filters/Generic/FFT Forward + Filters/Generic/FFT Inverse + */ + name = "fourier-0.3.3"; + buildInputs = [ gimp pkgs.fftwSinglePrec pkgconfig glib] ++ gimp.buildInputs; + postInstall = "fail"; + installPhase = "installPlugins fourier"; + src = fetchurl { + url = http://people.via.ecp.fr/~remi/soft/gimp/fourier-0.3.3.tar.gz; + sha256 = "0xxgp0lrjxsj54sgygi31c7q41jkqzn0v18qyznrviv8r099v29p"; + }; + }; + + resynthesizer = pluginDerivation { + /* menu: + Filters/Map/Resynthesize + Filters/Enhance/Smart enlarge + Filters/Enhance/Smart sharpen + Filters/Enhance/Smart remove selection + */ + name = "resynthesizer-0.16"; + buildInputs = [ gimp pkgs.fftw ] ++ gimp.buildInputs; + src = fetchurl { + url = http://www.logarithmic.net/pfh-files/resynthesizer/resynthesizer-0.16.tar.gz; + sha256 = "1k90a1jzswxmajn56rdxa4r60v9v34fmqsiwfdxqcvx3yf4yq96x"; + }; + + installPhase = " + installPlugins resynth + installScripts smart-{enlarge,remove}.scm + "; + }; + + texturize = pluginDerivation { + name = "texturize-2.1"; + buildInputs = [ gimp ] ++ gimp.buildInputs; + src = fetchurl { + url = http://prdownloads.sourceforge.net/gimp-texturize/texturize-2.1_src.tgz; + sha256 = "0cdjq25g3yfxx6bzx6nid21kq659s1vl9id4wxyjs2dhcv229cg3"; + }; + installPhase = "installPlugins src/texturize"; + }; + + waveletSharpen = pluginDerivation { + /* menu: + Filters/Enhance/Wavelet sharpen + */ + name = "wavelet-sharpen-0.1.2"; + buildInputs = [ gimp ] ++ gimp.buildInputs; + src = fetchurl { + url = http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz; + sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw"; + }; + installPhase = "installPlugins src/wavelet-sharpen"; # TODO translations are not copied .. How to do this on nix? + }; + + lqrPlugin = pluginDerivation { + /* menu: + Layer/Liquid Rescale + */ + name = "lqr-plugin-0.6.1"; + buildInputs = [ pkgconfig libLQR gimp ] ++ gimp.buildInputs; + src = fetchurl { + url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2; + sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9"; + }; + #postInstall = ''ensureDir $out/nix-support; echo "${libLQR}" > "$out/nix-support/propagated-user-env-packages"''; + installPhase = "installPlugins src/gimp-lqr-plugin"; + }; + + # this is more than a gimp plugin ! + # it can be made to compile the gimp plugin only though.. + gmic = + let imagemagick = pkgs.imagemagickBig; # maybe the non big version is enough? + in pluginDerivation { + name = "gmic-1.3.2.0"; + buildInputs = [ imagemagick pkgconfig gimp pkgs.fftwSinglePrec ] ++ gimp.buildInputs; + src = fetchurl { + url = http://dfn.dl.sourceforge.net/sourceforge/gmic/gmic_1.3.2.0.tar.gz; + sha256 = "0mxq664vzzc2l6k6sqm9syp34mihhi262i6fixk1g12lmc28797h"; + }; + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${imagemagick}/include/ImageMagick" + ''; + installPhase = "installPlugins src/gmic4gimp"; + meta = { + description = "script language for image processing which comes with its open-source interpreter"; + homepage = http://gmic.sourceforge.net/repository.shtml; + license = "CeCILL FREE SOFTWARE LICENSE AGREEMENT"; + /* + The purpose of this Free Software license agreement is to grant users + the right to modify and redistribute the software governed by this + license within the framework of an open source distribution model. + [ ... ] */ + }; + }; + + /* =============== simple script files ==================== */ + + lightning = scriptDerivation { + name = "Lightning"; + src = fetchurl { + url = http://registry.gimp.org/files/Lightning.scm; + sha256 = "c14a8f4f709695ede3f77348728a25b3f3ded420da60f3f8de3944b7eae98a49"; + }; + }; + + /* space in name trouble ? + + rainbowPlasma = scriptDerivation { + # http://registry.gimp.org/node/164 + name = "rainbow-plasma"; + src = fetchurl { + url = "http://registry.gimp.org/files/Rainbow Plasma.scm"; + sha256 = "34308d4c9441f9e7bafa118af7ec9540f10ea0df75e812e2f3aa3fd7b5344c23"; + name = "Rainbow-Plasma.scm"; # nix doesn't like spaces, does it? + }; + }; + */ + + /* doesn't seem to be working :-( + lightningGate = scriptDerivation { + # http://registry.gimp.org/node/153 + name = "lightning-gate"; + src = fetchurl { + url = http://registry.gimp.org/files/LightningGate.scm; + sha256 = "181w1zi9a99kn2mfxjp43wkwcgw5vbb6iqjas7a9mhm8p04csys2"; + }; + }; + */ + +} diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 9f74f1702fc..c0ce7f15c90 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost, pkgconfig, exiv2, gettext, ilmbase }: +{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost, + pkgconfig, exiv2, gettext, ilmbase, enblendenfuse, autopanosiftc }: stdenv.mkDerivation { name = "hugin-0.7.0"; @@ -35,6 +36,10 @@ stdenv.mkDerivation { eval -- "cmake .. $cmakeFlags" set +x ''; + postInstall = '' + ensureDir $out/nix-support + echo ${enblendenfuse} ${autopanosiftc} > $out/nix-support/$out/nix-support/propagated-user-env-packages + ''; meta = { homepage = http://hugin.sourceforge.net/; diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix new file mode 100644 index 00000000000..10b48b06325 --- /dev/null +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -0,0 +1,38 @@ +{stdenv, fetchurl, qt, bzip2}: + +stdenv.mkDerivation { + name = "meshlab-1.2.0"; + + src = fetchurl { + url = mirror://sourceforge/meshlab/MeshLabSrc_v120.tgz; + sha256 = "0iidp2pzwq96v8zbm8gc67wi1f41anpkncp17ajkv1rrh653nila"; + }; + + + setSourceRoot = "sourceRoot=`pwd`/meshlab/src"; + + buildPhase = '' + pushd external + qmake -recursive external.pro + make + popd + qmake -recursive meshlabv12.pro + make + ''; + + installPhase = '' + ensureDir $out/opt/meshlab $out/bin + pushd meshlab + cp -R meshlab plugins shaders* textures images $out/opt/meshlab + popd + ln -s $out/opt/meshlab/meshlab $out/bin/meshlab + ''; + + buildInputs = [ qt bzip2 ]; + + meta = { + description = "System for the processing and editing of unstructured 3D triangular meshes"; + homepage = http://meshlab.sourceforge.net/; + license = "GPLv2+"; + }; +} diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 0ecb7289f71..a2dfaabe86d 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -7,6 +7,8 @@ stdenv.mkDerivation { sha256 = "27544f442e957e9aa60b32c674f2dcd84fffeecc9a40071ef6e305333413187d"; }; + patches = [ ./include-qobject.patch ]; + # I added these flags to get all the rpaths right, which I guess they are # taken from the qt4 sources. Not very nice. cmakeFlags = "-DCMAKE_SHARED_LINKER_FLAGS=\"-Wl,-rpath,$out/lib/paraview-3.4\"" + diff --git a/pkgs/applications/graphics/paraview/include-qobject.patch b/pkgs/applications/graphics/paraview/include-qobject.patch new file mode 100644 index 00000000000..bdb95c752e4 --- /dev/null +++ b/pkgs/applications/graphics/paraview/include-qobject.patch @@ -0,0 +1,38 @@ +diff --git a/VTK/GUISupport/Qt/CMakeLists.txt b/VTK/GUISupport/Qt/CMakeLists.txt +index 2c35be7..866f1aa 100644 +--- a/VTK/GUISupport/Qt/CMakeLists.txt ++++ b/VTK/GUISupport/Qt/CMakeLists.txt +@@ -166,6 +166,7 @@ IF(DESIRED_QT_VERSION MATCHES 4) + ) + ENDIF(QT_QTGUI_LIBRARY) + INCLUDE_DIRECTORIES(${QT_QTDESIGNER_INCLUDE_DIR}) ++ INCLUDE_DIRECTORIES(${QT_QTCORE_INCLUDE_DIR}) + QT4_WRAP_CPP ( PluginMocSrcs ${PluginMocHeaders} ) + ELSE(DESIRED_QT_VERSION MATCHES 4) + QT_WRAP_CPP ( QVTKWidgetPlugin PluginMocSrcs ${PluginMocHeaders} ) +diff --git a/VTK/GUISupport/Qt/vtkEventQtSlotConnect.h b/VTK/GUISupport/Qt/vtkEventQtSlotConnect.h +index 6782b90..ced3a67 100644 +--- a/VTK/GUISupport/Qt/vtkEventQtSlotConnect.h ++++ b/VTK/GUISupport/Qt/vtkEventQtSlotConnect.h +@@ -43,7 +43,7 @@ + #include "vtkObject.h" + #include "vtkCommand.h" // for event defines + #include "QVTKWin32Header.h" // for export define +-#include "qobject.h" // for version info ++#include // for version info + + class QObject; + class vtkQtConnections; +diff --git a/VTK/GUISupport/Qt/vtkQtConnection.h b/VTK/GUISupport/Qt/vtkQtConnection.h +index 923ec2e..b189ddc 100644 +--- a/VTK/GUISupport/Qt/vtkQtConnection.h ++++ b/VTK/GUISupport/Qt/vtkQtConnection.h +@@ -33,7 +33,7 @@ + + #include "vtkObject.h" + #include "vtkCommand.h" // for event defines +-#include "qobject.h" ++#include + + class QObject; + class vtkCallbackCommand; diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index 3ee0ba8db06..adf64cdb0d3 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "3.4" a; + version = a.lib.attrByPath ["version"] "3.4" a; buildInputs = with a; [ aalib gsl libpng libX11 xproto libXext xextproto libXt zlib gettext intltool perl @@ -20,7 +20,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"]; - preConfigure = a.FullDepEntry ('' + preConfigure = a.fullDepEntry ('' sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*') ensureDir $out/share/locale '') ["doUnpack" "minInit" "defEnsureDir"]; diff --git a/pkgs/applications/graphics/xfig/builder.sh b/pkgs/applications/graphics/xfig/builder.sh index 3f3f2d7649a..4d3cc6335bf 100644 --- a/pkgs/applications/graphics/xfig/builder.sh +++ b/pkgs/applications/graphics/xfig/builder.sh @@ -8,6 +8,8 @@ preBuild() { cat Imakefile >> Imakefile.tmp mv Imakefile.tmp Imakefile xmkmf + + sed -e 's@[$][$]m@-- &@g' -i Makefile } installPhase() { diff --git a/pkgs/applications/graphics/xscreensaver/default.nix b/pkgs/applications/graphics/xscreensaver/default.nix index bcef30ddc5a..3c335994a76 100644 --- a/pkgs/applications/graphics/xscreensaver/default.nix +++ b/pkgs/applications/graphics/xscreensaver/default.nix @@ -1,5 +1,5 @@ args : with args; let localDefs = builderDefs.passthru.function (args // rec { - version = lib.getAttr ["version"] "5.07" args; + version = lib.attrByPath ["version"] "5.07" args; src = /* put a fetchurl here */ fetchurl { url = "http://www.jwz.org/xscreensaver/xscreensaver-${version}.tar.gz"; @@ -7,7 +7,7 @@ args : with args; let localDefs = builderDefs.passthru.function (args // rec { }; useConfig = true; reqsList = [ - ["true" "libX11" "gtk" "pkgconfig" "bc" "perl" "intltool" "libXmu"] + ["true" "libX11" "pkgconfig" "bc" "perl" "intltool" "libXmu"] ["GL" "mesa"] ["GUI" "gtk" "libxml2" "libglade"] ["jpeg" "libjpeg"] @@ -23,15 +23,15 @@ args : with args; let localDefs = builderDefs.passthru.function (args // rec { }); in with localDefs; let - preConfigure = FullDepEntry (" + preConfigure = fullDepEntry (" sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' "+ "-i driver/Makefile.in po/Makefile.in.in; - ") [minInit doUnpack]; + ") ["minInit" "doUnpack"]; in stdenv.mkDerivation rec { name = "xscreensaver-5.07"; - builder = writeScript (name + "-builder") - (textClosure localDefs [preConfigure doConfigure doMakeInstall doForceShare doPropagate]); + buildCommand = textClosure localDefs + [preConfigure doConfigure doMakeInstall doForceShare doPropagate]; meta = { description = "A set of screensavers"; inherit src; diff --git a/pkgs/applications/misc/acrobat-reader/builder.sh b/pkgs/applications/misc/acrobat-reader/builder.sh deleted file mode 100644 index 2efdd78beae..00000000000 --- a/pkgs/applications/misc/acrobat-reader/builder.sh +++ /dev/null @@ -1,29 +0,0 @@ -source $stdenv/setup - -echo "unpacking $src..." -tar xvfz $src - -mkdir $out - -echo "unpacking reader..." -tar xvf AdobeReader/COMMON.TAR -C $out -tar xvf AdobeReader/ILINXR.TAR -C $out - -# Disable this plugin for now (it needs LDAP, and I'm too lazy to add it). -rm $out/Reader/intellinux/plug_ins/PPKLite.api - -if test -n "$fastStart"; then - echo "removing plugins..." - rm -v $(ls $out/Reader/intellinux/plug_ins/*.api | grep -v SearchFind) -fi - -fullPath= -for i in $libPath; do - fullPath=$fullPath${fullPath:+:}$i/lib -done - -patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath $fullPath \ - $out/Reader/intellinux/bin/acroread - -substituteInPlace $out/bin/acroread --replace /lib:/usr/lib /no-such-path --replace /bin/pwd pwd diff --git a/pkgs/applications/misc/acrobat-reader/default.nix b/pkgs/applications/misc/acrobat-reader/default.nix deleted file mode 100644 index bc14b0cb45d..00000000000 --- a/pkgs/applications/misc/acrobat-reader/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ xineramaSupport ? false -, stdenv, fetchurl, libXt, libXp, libXext, libX11, libXinerama ? null -, glib, pango, atk, gtk, libstdcpp5, zlib -, fastStart ? false -}: - -assert stdenv.system == "i686-linux"; - -stdenv.mkDerivation { - name = "acrobat-reader-7.0.9"; - - builder = ./builder.sh; - - src = fetchurl { - url = http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.9/enu/AdobeReader_enu-7.0.9-1.i386.tar.gz; - sha256 = "0qs8v57gamkk243f44yqxic93izf0bn2d9l4wwbqqy1jv5s125hy"; - }; - - libPath = [ - libXt libXp libXext libX11 glib pango atk gtk libstdcpp5 zlib - (if xineramaSupport then libXinerama else null) - ]; - - inherit fastStart; - - meta = { - description = "Adobe Reader, a viewer for PDF documents"; - homepage = http://www.adobe.com/products/reader; - }; -} diff --git a/pkgs/applications/misc/adobe-reader/builder.sh b/pkgs/applications/misc/adobe-reader/builder.sh new file mode 100644 index 00000000000..0b5ed4a4029 --- /dev/null +++ b/pkgs/applications/misc/adobe-reader/builder.sh @@ -0,0 +1,26 @@ +source $stdenv/setup + +echo "unpacking $src..." +tar xvfa $src + +ensureDir $out + +echo "unpacking reader..." +tar xvf AdobeReader/COMMON.TAR -C $out +tar xvf AdobeReader/ILINXR.TAR -C $out + +# Disable this plugin for now (it needs LDAP, and I'm too lazy to add it). +rm $out/Adobe/Reader*/Reader/intellinux/plug_ins/PPKLite.api + +patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath $libPath \ + $out/Adobe/Reader*/Reader/intellinux/bin/acroread + +# The "xargs -r" is to shut up a warning when Mozilla can't be found. +substituteInPlace $out/Adobe/Reader*/bin/acroread \ + --replace /bin/pwd $(type -P pwd) \ + --replace /bin/ls $(type -P ls) \ + --replace xargs "xargs -r" + +ensureDir $out/bin +ln -s $out/Adobe/Reader*/bin/acroread $out/bin/acroread diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix new file mode 100644 index 00000000000..7f9f2b422d3 --- /dev/null +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, libX11, cups, glib, pango, atk, gtk, zlib, libxml2 }: + +assert stdenv.system == "i686-linux"; + +stdenv.mkDerivation { + name = "adobe-reader-9.1.1-1"; + + builder = ./builder.sh; + + src = fetchurl { + url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.1.1/enu/AdbeRdr9.1.1-1_i486linux_enu.tar.bz2; + sha256 = "1j3f7d5s7yfm6vg1628f6as462sbm1ika79v0flq0zgljc111vna"; + }; + + # !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu. + # We should probably remove those and use the regular Nixpkgs + # versions. + + libPath = stdenv.lib.makeLibraryPath + [ stdenv.gcc.gcc libX11 glib pango atk gtk zlib libxml2 cups ]; + + meta = { + description = "Adobe Reader, a viewer for PDF documents"; + homepage = http://www.adobe.com/products/reader; + }; +} diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 9833540ca26..7ab744f6a36 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,10 +1,10 @@ args: with args; stdenv.mkDerivation { - name = "blender-2.46"; + name = "blender-2.48"; src = fetchurl { - url = http://download.blender.org/source/blender-2.46.tar.gz; - sha256 = "1l95lcrp5snmvzabw46qpnkxmqls3fc24b2qjkghfasvaq7km7rr"; + url = http://download.blender.org/source/blender-2.48a.tar.gz; + sha256 = "0ijfpy510ls8xq1i8fb6j6wd0vac1jvnzmpiga4g7x1j4fg4s7bq"; }; phases="unpackPhase buildPhase"; @@ -12,7 +12,8 @@ stdenv.mkDerivation { inherit scons SDL freetype openal python openexr mesa; buildInputs = [python scons - gettext libjpeg libpng zlib freetype /* fmod smpeg */ freealut openal x11 mesa inputproto libtiff libXi ]; + gettext libjpeg libpng zlib freetype /* fmod smpeg */ freealut openal x11 mesa inputproto libtiff libXi + ]; # patch SConstruct so that we can pass on additional include. Either blender # or openEXR is broken. I think OpenEXR should use include "" isntead of <> to diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix new file mode 100644 index 00000000000..a8ccb1c0fef --- /dev/null +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -0,0 +1,48 @@ +{ fetchurl, stdenv, zlib, expat }: + +stdenv.mkDerivation rec { + name = "gpsbabel-1.3.6"; + + src = fetchurl { + url = "http://www.gpsbabel.org/plan9.php?dl=${name}.tar.gz"; + name = "${name}.tar.gz"; + sha256 = "1dm9lpcdsj0vz699zz932xc1vphvap627wl0qp61izlkzh25vg88"; + }; + + buildInputs = [ zlib expat ]; + + /* FIXME: Building the documentation, with "make doc", requires this: + + [ libxml2 libxslt perl docbook_xml_dtd_412 docbook_xsl fop ] + + But FOP isn't packaged yet. */ + + configureFlags = "--with-zlib=system"; + + meta = { + description = "GPSBabel, a tool to convert, upload and download data from GPS and Map programs"; + + longDescription = '' + GPSBabel converts waypoints, tracks, and routes between popular + GPS receivers and mapping programs. It also has powerful + manipulation tools for such data. + + By flattening the Tower of Babel that the authors of various + programs for manipulating GPS data have imposed upon us, it + returns to us the ability to freely move our own waypoint data + between the programs and hardware we choose to use. + + It contains extensive data manipulation abilities making it a + convenient for server-side processing or as the backend for + other tools. + + It does not convert, transfer, send, or manipulate maps. We + process data that may (or may not be) placed on a map, such as + waypoints, tracks, and routes. + ''; + + homepage = http://www.gpsbabel.org/; + + license = "GPLv2+"; + }; +} diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix new file mode 100644 index 00000000000..141476a6b40 --- /dev/null +++ b/pkgs/applications/misc/gpscorrelate/default.nix @@ -0,0 +1,45 @@ +{ fetchurl, stdenv, pkgconfig, exiv2, libxml2, gtk +, libxslt, docbook_xsl, docbook_xml_dtd_42 }: + +stdenv.mkDerivation rec { + name = "gpscorrelate-1.6.0"; + + src = fetchurl { + url = "http://freefoote.dview.net/linux/${name}.tar.gz"; + sha256 = "1j0b244xkvvf0i4iivp4dw9k4xgyasx4sapd91mnwki35fy49sp0"; + }; + + buildInputs = [ + pkgconfig exiv2 libxml2 gtk + libxslt docbook_xsl docbook_xml_dtd_42 + ]; + + patchPhase = '' + sed -i "Makefile" \ + -es",^[[:blank:]]*prefix[[:blank:]]*=.*$,prefix = $out,g" + ''; + + meta = { + description = "A GPS photo correlation tool, to add EXIF geotags"; + + longDescription = '' + Digital cameras are cool. So is GPS. And, EXIF tags are really + cool too. + + What happens when you merge the three? You end up with a set of + photos taken with a digital camera that are "stamped" with the + location at which they were taken. + + The EXIF standard defines a number of tags that are for use with GPS. + + A variety of programs exist around the place to match GPS data + with digital camera photos, but most of them are Windows or + MacOS only. Which doesn't really suit me that much. Also, each + one takes the GPS data in a different format. + ''; + + license = "GPLv2+"; + + homepage = http://freefoote.dview.net/linux_gpscorr.html; + }; +} diff --git a/pkgs/applications/misc/kiwixbuilder/default.nix b/pkgs/applications/misc/kiwixbuilder/default.nix index cf10ca58c4b..cec8513e4c7 100644 --- a/pkgs/applications/misc/kiwixbuilder/default.nix +++ b/pkgs/applications/misc/kiwixbuilder/default.nix @@ -7,7 +7,7 @@ args : with args; with builderDefs {src="";} null; }; buildInputs = [glib zlib]; configureFlags = [" --prefix=$out "]; - preConfigure = FullDepEntry ('' + preConfigure = fullDepEntry ('' export NIX_CFLAGS_COMPILE=$NIX_CFLAGS_COMPILE' -I${glib}/include/glib-2.0/ -I${glib}/lib/glib-2.0/include/ ' export NIX_LDFLAGS=$NIX_LDFLAGS' -lglib-2.0 ' sed -e 's@/usr/local/lib/libz\.a@${zlib}/lib/libz.a@' -i configure diff --git a/pkgs/applications/misc/qgis/0.11.0.nix b/pkgs/applications/misc/qgis/1.0.1-2.nix similarity index 71% rename from pkgs/applications/misc/qgis/0.11.0.nix rename to pkgs/applications/misc/qgis/1.0.1-2.nix index ed8bb6063c3..142e3b65013 100644 --- a/pkgs/applications/misc/qgis/0.11.0.nix +++ b/pkgs/applications/misc/qgis/1.0.1-2.nix @@ -1,7 +1,8 @@ args: with args; -let edf = composableDerivation.edf; - optionIncLib = name : attr : " -D${name}_INCLUDE_DIR=${__getAttr attr args}/incclude" - + " -D${name}_LIBRARY=${__getAttr attr args}/lib "; # lib 64? +let inherit (builtins) getAttr; + edf = composableDerivation.edf; + optionIncLib = name : attr : " -D${name}_INCLUDE_DIR=${getAttr attr args}/incclude" + + " -D${name}_LIBRARY=${getAttr attr args}/lib "; # lib 64? in composableDerivation.composableDerivation {} { @@ -17,18 +18,18 @@ composableDerivation.composableDerivation {} { # md5="ac0560e0a2d4e6258c8639f1e9b56df3"; rev="7704"; }; src = fetchurl { url = "http://download.osgeo.org/qgis/src/qgis_${version}.tar.gz"; - sha256 = "17vqbld4wr9jyn1s5n0bkpaminsgc2dzcgdfk8ic168xydnwa7b3"; + sha256 = "07yyic9sn1pz20wjk7k560jwqz6b19rhf2gawybz38xq1f8rjwd4"; }; meta = { description = "user friendly Open Source Geographic Information System"; - homepage = http://www.qgis.org; + homepage = ttp://www.qgis.org; # you can choose one of the following licenses: license = [ "GPL" ]; }; phases = "unpackPhase buildPhase installPhase"; - buildPhase = ''pwd;echo XXXXXXXXX; VERBOSE=1 cmake -DCMAKE_INSTALL_PREFIX=$out ''${cfgOption} ..''; + buildPhase = ''pwd; mkdir build; cd build; VERBOSE=1 cmake -DCMAKE_INSTALL_PREFIX=$out ''${cfgOption} ..''; postUnpack = '' export CMAKE_SYSTEM_LIBRARY_PATH= diff --git a/pkgs/applications/misc/tangogps/default.nix b/pkgs/applications/misc/tangogps/default.nix new file mode 100644 index 00000000000..0f47c471c58 --- /dev/null +++ b/pkgs/applications/misc/tangogps/default.nix @@ -0,0 +1,37 @@ +{ fetchurl, stdenv, pkgconfig, gettext, gtk, gconf +, curl, libexif, sqlite }: + +stdenv.mkDerivation rec { + name = "tangogps-0.9.6"; + + src = fetchurl { + url = "http://www.tangogps.org/downloads/${name}.tar.gz"; + sha256 = "04vfbr7skjcfadv9206q2pxbm74i8yypkjwzldsc5a6ybhr7fsp5"; + }; + + buildInputs = [ pkgconfig gettext gtk gconf curl libexif sqlite ]; + + meta = { + description = "tangoGPS, a user friendly map and GPS user interface"; + + longDescription = '' + tangoGPS is an easy to use, fast and lightweight mapping + application for use with or without GPS. + + It runs on any Linux platform from the desktop over eeePC down + to phones like the Openmoko Neo. + + By default tangoGPS uses map data from the OpenStreetMap + project. Additionally a variety of other repositories can be + easily added. + + The maps are automagically downloaded and cached for offline use + while you drag or zoom the map. Furthermore you can + conveniently pre-cache areas with tangoGPS. + ''; + + homepage = http://www.tangogps.org/; + + license = "GPLv2+"; + }; +} diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix new file mode 100644 index 00000000000..a98ed2aa5ff --- /dev/null +++ b/pkgs/applications/misc/viking/default.nix @@ -0,0 +1,35 @@ +{ fetchurl, stdenv, pkgconfig, intltool, gettext, gtk, expat, curl +, gpsd, bc, file }: + +stdenv.mkDerivation rec { + name = "viking-0.9.8"; + + src = fetchurl { + url = "mirror://sourceforge/viking/${name}.tar.gz"; + sha256 = "1is8g6ld5pd13iiv9qm8526q1cblg01pqyakg52sd6k7fys7dz2d"; + }; + + patches = [ + ./test-bc.patch ./gpsdclient.patch ./implicit-declaration.patch + ]; + + buildInputs = [ pkgconfig intltool gettext gtk expat curl gpsd bc file ]; + + doCheck = true; + + meta = { + description = "Viking, a GPS data editor and analyzer"; + + longDescription = '' + Viking is a free/open source program to manage GPS data. You + can import and plot tracks and waypoints, show Openstreetmaps + and/or Terraserver maps under it, download geocaches for an area + on the map, make new tracks and waypoints, see real-time GPS + position, etc. + ''; + + homepage = http://viking.sourceforge.net/; + + license = "GPLv2+"; + }; +} diff --git a/pkgs/applications/misc/viking/gpsdclient.patch b/pkgs/applications/misc/viking/gpsdclient.patch new file mode 100644 index 00000000000..41722632260 --- /dev/null +++ b/pkgs/applications/misc/viking/gpsdclient.patch @@ -0,0 +1,51 @@ +Debian patch that allows compilation with libgps (from `gpsd'). +Failing to apply this patch, we get the following error: + + vikgpslayer.c:237: error: field 'realtime_gpsd_unit' has incomplete type + vikgpslayer.c: In function 'vik_gps_layer_new': + vikgpslayer.c:473: warning: implicit declaration of function 'gpsd_units' + vikgpslayer.c: In function 'rt_gpsd_try_connect': + vikgpslayer.c:1321: warning: passing argument 2 of 'gps_set_raw_hook' from incompatible pointer type + +diff -urNad trunk~/src/gpsdclient.h trunk/src/gpsdclient.h +--- trunk~/src/gpsdclient.h 1970-01-01 01:00:00.000000000 +0100 ++++ trunk/src/gpsdclient.h 2009-04-15 14:30:22.000000000 +0200 +@@ -0,0 +1,25 @@ ++/* $Id: gpsdclient.h 5330 2009-03-03 04:05:42Z ckuethe $ */ ++/* gpsdclient.h -- common functions for GPSD clients */ ++ ++#ifndef _GPSD_GPSDCLIENT_H_ ++#define _GPSD_GPSDCLIENT_H_ ++struct fixsource_t ++/* describe a data source */ ++{ ++ char *spec; /* pointer to actual storage */ ++ char *server; ++ char *port; ++ char *device; ++}; ++ ++enum unit {unspecified, imperial, nautical, metric}; ++enum unit gpsd_units(void); ++enum deg_str_type { deg_dd, deg_ddmm, deg_ddmmss }; ++ ++extern /*@observer@*/ char *deg_to_str( enum deg_str_type type, double f); ++ ++extern void gpsd_source_spec(/*@null@*/const char *fromstring, ++ /*@out@*/struct fixsource_t *source); ++ ++#endif /* _GPSDCLIENT_H_ */ ++/* gpsdclient.h ends here */ +diff -urNad trunk~/src/vikgpslayer.c trunk/src/vikgpslayer.c +--- trunk~/src/vikgpslayer.c 2009-02-08 14:47:01.000000000 +0100 ++++ trunk/src/vikgpslayer.c 2009-04-15 14:30:55.000000000 +0200 +@@ -39,6 +39,9 @@ + #include + #ifdef VIK_CONFIG_REALTIME_GPS_TRACKING + #include ++#ifndef gpsd_units ++#include "gpsdclient.h" ++#endif + #endif + + #if ! GLIB_CHECK_VERSION(2,14,0) diff --git a/pkgs/applications/misc/viking/implicit-declaration.patch b/pkgs/applications/misc/viking/implicit-declaration.patch new file mode 100644 index 00000000000..60f8ad1177f --- /dev/null +++ b/pkgs/applications/misc/viking/implicit-declaration.patch @@ -0,0 +1,13 @@ +Debian patch that fixes an implicat declaration. + +diff -urNad trunk~/src/util.c trunk/src/util.c +--- trunk~/src/util.c 2009-02-08 14:47:01.000000000 +0100 ++++ trunk/src/util.c 2009-04-15 17:23:44.000000000 +0200 +@@ -26,6 +26,7 @@ + #endif + + #include ++#include + + #include "dialog.h" + diff --git a/pkgs/applications/misc/viking/test-bc.patch b/pkgs/applications/misc/viking/test-bc.patch new file mode 100644 index 00000000000..fc0c91eec52 --- /dev/null +++ b/pkgs/applications/misc/viking/test-bc.patch @@ -0,0 +1,22 @@ +For some reason, `bc -l' yields no output. + +--- viking-0.9.8/test/check_degrees_conversions.sh 2008-03-15 23:01:48.000000000 +0100 ++++ viking-0.9.8/test/check_degrees_conversions.sh 2009-05-30 23:23:27.000000000 +0200 +@@ -7,7 +7,7 @@ function check_success() + for value in "$@" + do + result=`./degrees_converter "$value" | cut -d' ' -f3` +- diff=`echo "$result - $expected" | bc -l` ++ diff=`echo "$result - $expected" | bc` + if [ $diff != 0 ] + then + echo "$value -> $result != $expected" +@@ -23,7 +23,7 @@ function check_failure() + for value in "$@" + do + result=`./degrees_converter "$value" | cut -d' ' -f3` +- diff=`echo "$result - $expected" | bc -l` ++ diff=`echo "$result - $expected" | bc` + if [ $diff = 0 ] + then + echo "$value -> $result = $expected" diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix index f67482ae5f0..adbb6f371eb 100644 --- a/pkgs/applications/misc/xchm/default.nix +++ b/pkgs/applications/misc/xchm/default.nix @@ -8,6 +8,11 @@ stdenv.mkDerivation { }; buildInputs = [wxGTK chmlib]; + postConfigure = '' + export NIX_LDFLAGS="$NIX_LDFLAGS $(${wxGTK}/lib/wx/config/* --libs | sed -e s@-pthread@@)" + echo $NIX_LDFLAGS + ''; + meta = { description = "A viewer for Microsoft HTML Help files"; homepage = http://xchm.sourceforge.net; diff --git a/pkgs/applications/networking/browsers/firefox-3/3.5.nix b/pkgs/applications/networking/browsers/firefox-3/3.5.nix index 336a631e1e2..09f2eabe541 100644 --- a/pkgs/applications/networking/browsers/firefox-3/3.5.nix +++ b/pkgs/applications/networking/browsers/firefox-3/3.5.nix @@ -10,15 +10,12 @@ }: -let version = "3.5b4"; in +let version = xulrunner.ffversion; in stdenv.mkDerivation { name = "firefox-${version}"; - src = fetchurl { - url = "ftp://ftp.mozilla.org/pub/firefox/releases/${version}/source/firefox-${version}-source.tar.bz2"; - sha256 = "0pfrcqbsa88p6nfqx7xhlr603ycwf5lnfmwcdd5abl7xipxg4lxn"; - }; + src = xulrunner.src; buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 diff --git a/pkgs/applications/networking/browsers/firefox-3/default.nix b/pkgs/applications/networking/browsers/firefox-3/default.nix index 4eff865a01e..4743d71ef50 100644 --- a/pkgs/applications/networking/browsers/firefox-3/default.nix +++ b/pkgs/applications/networking/browsers/firefox-3/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { name = "firefox-${version}"; - version = "3.0.8"; + version = "3.0.11"; src = fetchurl { # Don't forget to update xulrunner.nix as well! url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}-source.tar.bz2"; - sha1 = "93f82c64ae9c805964fb6459223a1061e2d328fd"; + sha1 = "ca792dcdb67af40c91a4fcece25d6adfb6fef2c3"; }; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/firefox-3/xulrunner-3.5.nix b/pkgs/applications/networking/browsers/firefox-3/xulrunner-3.5.nix index 1192c01bfb8..d21451a66ea 100644 --- a/pkgs/applications/networking/browsers/firefox-3/xulrunner-3.5.nix +++ b/pkgs/applications/networking/browsers/firefox-3/xulrunner-3.5.nix @@ -11,17 +11,19 @@ let - version = "1.9.1b4"; # this attribute is used by other packages - ffversion = "3.5b4"; + version = "1.9.1rc1"; + shownVersion = "1.9.1"; # this attribute is used by other packages + # _usually_ it is the same as version + ffversion = "3.5rc1"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "xulrunner-${version}"; src = fetchurl { url = "ftp://ftp.mozilla.org/pub/firefox/releases/${ffversion}/source/firefox-${ffversion}-source.tar.bz2"; - sha256 = "0pfrcqbsa88p6nfqx7xhlr603ycwf5lnfmwcdd5abl7xipxg4lxn"; + sha256 = "14yrkvk0kibfpkcvbb44ww89plhm8iikbqmnc0jbkjr4k70a7gcl"; }; buildInputs = [ @@ -91,7 +93,10 @@ stdenv.mkDerivation { homepage = http://www.mozilla.com/en-US/firefox/; }; - passthru = { inherit gtk version; }; + passthru = { + inherit gtk ffversion src; + version = shownVersion; + }; } diff --git a/pkgs/applications/networking/browsers/firefox-3/xulrunner.nix b/pkgs/applications/networking/browsers/firefox-3/xulrunner.nix index b3951a59b1e..3b345fe84df 100644 --- a/pkgs/applications/networking/browsers/firefox-3/xulrunner.nix +++ b/pkgs/applications/networking/browsers/firefox-3/xulrunner.nix @@ -11,7 +11,7 @@ let - version = "1.9.0.8"; # this attribute is used by other packages + version = "1.9.0.11"; # this attribute is used by other packages in @@ -19,8 +19,8 @@ stdenv.mkDerivation { name = "xulrunner-${version}"; src = fetchurl { - url = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.8/source/firefox-3.0.8-source.tar.bz2; - sha1 = "93f82c64ae9c805964fb6459223a1061e2d328fd"; + url = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.11/source/firefox-3.0.11-source.tar.bz2; + sha1 = "ca792dcdb67af40c91a4fcece25d6adfb6fef2c3"; }; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/firefox-wrapper/default.nix b/pkgs/applications/networking/browsers/firefox-wrapper/default.nix index c201d30e13f..f68f0f92e28 100644 --- a/pkgs/applications/networking/browsers/firefox-wrapper/default.nix +++ b/pkgs/applications/networking/browsers/firefox-wrapper/default.nix @@ -1,8 +1,18 @@ -{stdenv, browser, browserName ? "firefox", nameSuffix ? "", makeWrapper, plugins}: +{stdenv, browser, browserName ? "firefox", nameSuffix ? "", makeDesktopItem, makeWrapper, plugins}: stdenv.mkDerivation { name = browser.name + "-with-plugins"; + desktopItem = makeDesktopItem { + name = browserName; + exec = browserName; + icon = "${browser}/lib/${browser.name}/icons/mozicon128.png"; + comment = ""; + desktopName = browserName; + genericName = "Web Browser"; + categories = "Application;Network;"; + }; + buildInputs = [makeWrapper]; buildCommand = '' @@ -16,6 +26,9 @@ stdenv.mkDerivation { "$out/bin/${browserName}${nameSuffix}" \ --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \ --suffix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" + + ensureDir $out/share/applications + cp $desktopItem/share/applications/* $out/share/applications ''; # Let each plugin tell us (through its `mozillaPlugin') attribute diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix index 0c4570e024e..07c27ec1a97 100644 --- a/pkgs/applications/networking/browsers/icecat-3/default.nix +++ b/pkgs/applications/networking/browsers/icecat-3/default.nix @@ -4,13 +4,13 @@ , freetype, fontconfig , application ? "browser" }: -let version = "3.0.9-g1"; in +let version = "3.0.11-g1"; in stdenv.mkDerivation { name = "icecat-${version}"; src = fetchurl { url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.bz2"; - sha256 = "1xmkyiz9ccmm0n9ving2za3lczxqrlcc7ipbg0jx4w9l1hhj13hq"; + sha256 = "1kzsjlyi41lglsfnfsqdbs75b279pwi742cp19h6c2410gvsb9km"; }; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index fd2b90805f5..242a66b2b95 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -5,18 +5,18 @@ let doPatchShebangs = args.doPatchShebangs; makeManyWrappers = args.makeManyWrappers; - version = lib.getAttr ["version"] "0.0.21" args; + version = lib.attrByPath ["version"] "0.1.7" args; buildInputs = with args; [ intltool python imagemagick gtk glib webkit libxml2 gtksourceview pkgconfig which gettext makeWrapper - file + file libidn sqlite docutils libnotify libsoup ]; in rec { src = fetchurl { url = "http://goodies.xfce.org/releases/midori/midori-${version}.tar.bz2"; - sha256 = if version == "0.0.21" then - "0cbpvjdfzgbqwn8rfkp3l35scfvz9cc8hip8v35vkxpac9igcqg5" + sha256 = if version == "0.1.7" then + "1bxs4nlwvhzwiq73lf1gvx7qqdm1hm4x1hym1b0q0dhwhdvafx4v" else null; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix index 80a95e07535..890021b33d6 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "1.12.0" a; + version = a.lib.attrByPath ["version"] "1.12.0" a; buildInputs = with a; [ firefox libX11 xproto ]; @@ -17,11 +17,11 @@ rec { configureFlags = []; makeFlags = ["linux" "prefix=" "root=$out"]; - preBuild = a.FullDepEntry('' + preBuild = a.fullDepEntry('' sed -e s@/usr/@"$out/"@g -i mozplugger.c '') ["doUnpack" "minInit"]; - postInstall = a.FullDepEntry('' + postInstall = a.fullDepEntry('' ensureDir $out/share/${name}/plugin ln -s $out/lib/mozilla/plugins/mozplugger.so $out/share/${name}/plugin '') ["doMakeInstall" "minInit" "defEnsureDir"]; diff --git a/pkgs/applications/networking/browsers/opera/builder.sh b/pkgs/applications/networking/browsers/opera/builder.sh index e9efbe06829..2d1b0cc9648 100644 --- a/pkgs/applications/networking/browsers/opera/builder.sh +++ b/pkgs/applications/networking/browsers/opera/builder.sh @@ -33,6 +33,10 @@ installPhase() { done # substitute pwd as late as possible so that the md5 checkusm check of opera passes sed -i 's=/bin/pwd=pwd=' $out/bin/opera + + ensureDir $out/share/applications + cp $desktopItem/share/applications/* $out/share/applications + } genericBuild diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index d432debc3ee..bb35e878f9d 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, qt, zlib, libX11, libXext, libSM, libICE, libstdcpp5, glibc -, motif ? null, libXt ? null}: +, motif ? null, libXt ? null +, makeDesktopItem +}: assert motif != null -> libXt != null; @@ -8,7 +10,7 @@ assert motif != null -> libXt != null; # Hm, does Opera 9.x still use Motif for anything? stdenv.mkDerivation rec { - version = "9.62-20081029"; + version = "9.64"; name = "opera-${version}"; inherit libstdcpp5; @@ -16,17 +18,12 @@ stdenv.mkDerivation rec { builder = ./builder.sh; src = if (stdenv.system == "i686-linux") then fetchurl { - url = ftp://ftp.task.gda.pl/pub/opera/linux/962/final/en/i386/shared/opera-9.62.gcc3-shared-qt3.i386.tar.gz; - sha256 = "9b204cce912450886cbc49d1cadc3f5907b044626b100c05e07c6bfec74c56f4"; + url = ftp://mirror.liteserver.nl/pub/opera/linux/964/final/en/i386/static/opera-9.64.gcc295-static-qt3.i386.tar.gz; + sha256 = "0ryza8wrqhlcs9hs3vs38ig3pjwifymxi8jsx83kvxg963p2k825"; } else if (stdenv.system == "x86_64-linux") then fetchurl { - url = http://snapshot.opera.com/unix/snapshot-1754/x86_64-linux/opera-9.50-20080110.2-shared-qt.x86_64-1754.tar.bz2; - sha256 = "08y1ajjncdvbhvcq2izmpgc4fi37bwn43zsw7rz41jf8qhvb5ywv"; - #url = ftp://ftp.task.gda.pl/pub/opera/linux/950b/final/en/x86_64/opera-9.50-20071024.2-shared-qt.x86_64-1643.tar.bz2; - #sha256 = "1gv1r18ar3vz1l24nf8qixjlba1yb5d3xvg3by41i4dy0vlznqn6"; - #name = opera-9.25-20071214.6-shared-qt.i386-en.tar.gz; - #url = http://www.opera.com/download/get.pl?id=30462&location=225¬hanks=yes&sub=marine; - #sha256 = "1wnc1s4r5gz73mxs8pgsi9a1msz7x8a8pb1ykb1xgdfn21h69p2p"; + url = http://mirror.liteserver.nl/pub/opera/linux/964/final/en/x86_64/opera-9.64.gcc4-shared-qt3.x86_64.tar.gz ; + sha256 = "1zmj8lr1mx3d98adyd93kw2ldxxb13wzi6xzlgmb3dr4pn9j85n2"; } else throw "unsupported platform ${stdenv.system} (only i686-linux and x86_64 linux supported yet)"; dontStrip = 1; @@ -36,6 +33,17 @@ stdenv.mkDerivation rec { [glibc qt motif zlib libX11 libXt libXext libSM libICE libstdcpp5] ++ (if motif != null then [motif ] else []); + desktopItem = makeDesktopItem { + name = "Opera"; + exec = "opera"; + icon = "opera"; + comment = "Opera Web Browser"; + desktopName = "Opera"; + genericName = "Web Browser"; + categories = "Application;Network;"; + }; + + meta = { homepage = http://www.opera.com; }; diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix new file mode 100644 index 00000000000..45b1f069d7a --- /dev/null +++ b/pkgs/applications/networking/browsers/uzbl/default.nix @@ -0,0 +1,29 @@ +a : +let + fetchurl = a.fetchurl; + + version = a.lib.attrByPath ["version"] "2009.06.06" a; + buildInputs = with a; [ + pkgconfig webkit libsoup gtk + ]; +in +rec { + src = fetchurl { + url = "http://github.com/Dieterbe/uzbl/tarball/${version}"; + sha256 = "1bgajpcsv0a8nmliqkrk99d3k5s60acjgvh0sx7znsnjajbfv3yz"; + name = "uzbl-master-${version}.tar.gz"; + }; + + inherit buildInputs; + configureFlags = []; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doMakeInstall"]; + + installFlags = "PREFIX=$out"; + + name = "uzbl-" + version; + meta = { + description = "Tiny externally controllable webkit browser"; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix index a27c89afc6b..7728f7abcfc 100644 --- a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix +++ b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix @@ -5,7 +5,7 @@ args : with args; (to use a fresher pidgin build) */ let - externalPurple2 = (lib.getAttr ["purple2Source"] null args) != null; + externalPurple2 = lib.attrByPath ["purple2Source"] null args) != null; in rec { src = fetchurl { @@ -30,7 +30,7 @@ rec { + " --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include" + " --enable-screensaver --disable-meanwhile --disable-nm --disable-tcl"; - preBuild = FullDepEntry ('' + preBuild = fullDepEntry ('' export echo=echo '') []; @@ -45,7 +45,7 @@ rec { homepage = http://funpidgin.sf.net; }; } // (if externalPurple2 then { - postInstall = FullDepEntry ('' + postInstall = fullDepEntry ('' ensureDir $out/lib/purple-2 cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/ '') ["minInit" "defEnsureDir"]; } diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix index db120924a9c..257d3d09f71 100644 --- a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix +++ b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix @@ -5,7 +5,7 @@ args : with args; (to use a fresher pidgin build) */ let - externalPurple2 = (lib.getAttr ["purple2Source"] null args) != null; + externalPurple2 = (lib.attrByPath ["purple2Source"] null args) != null; in rec { src = fetchurl { @@ -30,7 +30,7 @@ rec { + " --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include" + " --enable-screensaver --disable-meanwhile --disable-nm --disable-tcl"; - preBuild = FullDepEntry ('' + preBuild = fullDepEntry ('' export echo=echo '') []; @@ -45,7 +45,7 @@ rec { homepage = http://funpidgin.sf.net; }; } // (if externalPurple2 then { - postInstall = FullDepEntry ('' + postInstall = fullDepEntry ('' ensureDir $out/lib/purple-2 cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/ '') ["minInit" "defEnsureDir"]; } diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index d9f19a375a0..f5b1d344574 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "0.12.1" a; + version = a.lib.attrByPath ["version"] "0.12.1" a; buildInputs = with a; [ python pyGtkGlade gtk perl intltool dbus gettext pkgconfig makeWrapper libglade pyopenssl libXScrnSaver @@ -20,7 +20,7 @@ rec { inherit buildInputs; configureFlags = []; - preConfigure = a.FullDepEntry ('' + preConfigure = a.fullDepEntry ('' export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath ${a.pyGtkGlade})/gtk-2.0" export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath ${a.pygobject})/gtk-2.0" sed -e '/-L[$]x_libraries/d' -i configure diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix index aebede6301f..cc6901c0384 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix @@ -11,7 +11,7 @@ rec { "PREFIX=$out" ]; - preBuild = FullDepEntry ('' + preBuild = fullDepEntry ('' ensureDir $out/bin ln -s $(which convert) $out/bin ln -s $(which xelatex) $out/bin @@ -25,7 +25,7 @@ rec { sed -e 's/\(#define HEADER ".*\)12pt\(.*\)"/\116pt\2\\\\usepackage{fontspec}\\\\usepackage{xunicode}"/' -i LaTeX.h '') ["minInit" "addInputs" "defEnsureDir" "doUnpack"]; - postInstall = FullDepEntry ('' + postInstall = fullDepEntry ('' ensureDir $out/lib ensureDir $out/share/pidgin-latex ln -s ../../lib/pidgin/LaTeX.so $out/share/pidgin-latex diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 146eb7f13b0..b66680a147b 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -20,10 +20,10 @@ } : stdenv.mkDerivation { - name = "pidgin-2.5.5"; + name = "pidgin-2.5.6"; src = fetchurl { - url = mirror://sourceforge/pidgin/pidgin-2.5.5.tar.bz2; - sha256 = "1s13fzxa62mrxah6khsnpywmw1fknghph1krgwfvcs18kjwi6nnb"; + url = mirror://sourceforge/pidgin/pidgin-2.5.6.tar.bz2; + sha256 = "00lsb0pmz1zn37xzwji91izzklr9famm100al612m4hy0i37yh4v"; }; inherit nss ncurses; diff --git a/pkgs/applications/networking/instant-messengers/psi/0.11.nix b/pkgs/applications/networking/instant-messengers/psi/0.11.nix deleted file mode 100644 index 2f9d9e3b3b7..00000000000 --- a/pkgs/applications/networking/instant-messengers/psi/0.11.nix +++ /dev/null @@ -1,20 +0,0 @@ -args : with args; -rec { - src = fetchurl { - url = ftp://ftp.ru.debian.org/debian/pool/main/p/psi/psi_0.11.orig.tar.gz; - sha256 = "1rgjahngari4pwhi0zz9mricaaqxkk8ry8w6s1vgsq3zwa2l5x57"; - }; - - buildInputs = [aspell qt zlib sox openssl libX11 xproto - libSM libICE]; - configureFlags = [" --with-zlib-inc=${zlib}/include " - " --with-openssl-inc=${openssl}/include " - ]; - - phaseNames = ["doConfigure" "doMakeInstall"]; - - name = "psi-" + version; - meta = { - description = "Psi, an XMPP (Jabber) client"; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/psi/0.12.1.nix b/pkgs/applications/networking/instant-messengers/psi/0.12.1.nix new file mode 100644 index 00000000000..110189598f6 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/psi/0.12.1.nix @@ -0,0 +1,20 @@ +args : with args; +stdenv.mkDerivation rec { + src = fetchurl { + url = mirror://sourceforge/psi/psi-0.12.1.tar.bz2; + sha256 = "0zi71fcia9amcasa6zrvfyghdpqa821iv2rkj53bq5dyvfm2y0m8"; + }; + + buildInputs = [aspell qt4 zlib sox libX11 xproto libSM libICE qca2]; + + NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; + NIX_LDFLAGS="-lqca"; + + configureFlags = [ " --with-zlib-inc=${zlib}/include " + " --disable-bundled-qca" ]; + + name = "psi-" + version; + meta = { + description = "Psi, an XMPP (Jabber) client"; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/psi/0.12.nix b/pkgs/applications/networking/instant-messengers/psi/0.12.nix deleted file mode 100644 index a9af276661f..00000000000 --- a/pkgs/applications/networking/instant-messengers/psi/0.12.nix +++ /dev/null @@ -1,20 +0,0 @@ -args : with args; -rec { - src = fetchurl { - url = mirror://sourceforge/psi/psi-0.12.tar.gz; - sha256 = "6afbb3b017009bf4d8d275ec1481e92831b0618ecb58f1372cd9189140a316af"; - }; - - buildInputs = [aspell qt zlib sox openssl libX11 xproto - libSM libICE]; - configureFlags = [" --with-zlib-inc=${zlib}/include " - " --with-openssl-inc=${openssl}/include " - ]; - - phaseNames = ["doConfigure" "doMakeInstall"]; - - name = "psi-" + version; - meta = { - description = "Psi, an XMPP (Jabber) client"; - }; -} diff --git a/pkgs/applications/networking/p2p/ldcpp/1.0.1.nix b/pkgs/applications/networking/p2p/ldcpp/1.0.3.nix similarity index 76% rename from pkgs/applications/networking/p2p/ldcpp/1.0.1.nix rename to pkgs/applications/networking/p2p/ldcpp/1.0.3.nix index e4b1b0a1e17..52491aa29fb 100644 --- a/pkgs/applications/networking/p2p/ldcpp/1.0.1.nix +++ b/pkgs/applications/networking/p2p/ldcpp/1.0.3.nix @@ -2,14 +2,14 @@ args : with args; with builderDefs; let localDefs = builderDefs.passthru.function ((rec { src = /* put a fetchurl here */ fetchurl { - url = http://download2.berlios.de/linuxdcpp/linuxdcpp-1.0.1.tar.bz2; - sha256 = "0f0vvsa3x3nirqnf2lagpmbbj3pgdcp6wa2gvadj294b3va4hx34"; + url = http://launchpad.net/linuxdcpp/1.0/1.0.3/+download/linuxdcpp-1.0.3.tar.bz2; + sha256 = "0w9c8k13cl85y4v4av8ic6w4zkdivcj6p5q86llfh3sz077vckiv"; }; buildInputs = [scons pkgconfig gtk bzip2 pkgconfig libglade openssl libX11]; configureFlags = []; - doScons = FullDepEntry ('' + doScons = fullDepEntry ('' ensureDir $out export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"; scons PREFIX=$out @@ -18,7 +18,7 @@ args : with args; with builderDefs; }) // args); in with localDefs; stdenv.mkDerivation rec { - name = "ldcpp-"+version; + name = "ldcpp-1.0.3"; builder = writeScript (name + "-builder") (textClosure localDefs [doScons doForceShare doPropagate]); diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 4d284c5ebe7..6e950df0a75 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ocaml, zlib, ncurses}: stdenv.mkDerivation { - name = "mldonkey-2.9.6"; + name = "mldonkey-3.0.0"; src = fetchurl { - url = mirror://sourceforge/mldonkey/mldonkey-2.9.6.tar.bz2; - sha256 = "27cc8ae95aa7a2934b6cc9b077d10ca6a776496c051d8f35d60f1e73d38fd505"; + url = mirror://sourceforge/mldonkey/mldonkey-3.0.0.tar.bz2; + sha256 = "0zzvcfnbhxk8axfch5fbkd9j2ks67nbb1ndjjarxvrza78g5y8r7"; }; meta = { diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 7f22187793e..a7d53896301 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -4,10 +4,10 @@ enchant, wv }: stdenv.mkDerivation { - name = "abiword-2.6.6"; + name = "abiword-2.6.8"; src = fetchurl { - url = http://www.abisource.org/downloads/abiword/2.6.6/source/abiword-2.6.6.tar.gz; - sha256 = "1cgi6l3wd82vgni4wcqasyl2rvxwffliyqgbwvzv0nn99wasg5gx"; + url = http://www.abisource.org/downloads/abiword/2.6.8/source/abiword-2.6.8.tar.gz; + sha256 = "14vfp668srjgy6wd22h4a93safp1iyfwhdr6y0sb751xl46nlrdn"; }; buildInputs = [pkgconfig gtk libglade libgnomeprint libgnomeprintui diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh index dbfbbb47496..1f215831ca9 100644 --- a/pkgs/applications/office/openoffice/builder.sh +++ b/pkgs/applications/office/openoffice/builder.sh @@ -74,6 +74,14 @@ installPhase() { # Create some wrappers to start individual OpenOffice components. for i in writer calc draw impress base math web; do wrapSOffice oo$i -$i; done + + # Create symlinks to desktop files, so that openoffice.org apps can be picked from + # the application menu in KDE and GNOME + ensureDir $out/share + ln -s $out/lib/openoffice/openoffice.org3/share/xdg $out/share/applications + + # The desktop files expect a openoffice.org3 executable in the PATH, which is a symlink to soffice + ln -s $out/bin/soffice $out/bin/openoffice.org3 } genericBuild diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix index b254601a3d6..ff52d366765 100644 --- a/pkgs/applications/science/geometry/drgeo/default.nix +++ b/pkgs/applications/science/geometry/drgeo/default.nix @@ -1,5 +1,5 @@ args : with args; -let version = lib.getAttr ["version"] "1.1.0" args; in +let version = lib.attrByPath ["version"] "1.1.0" args; in rec { src = fetchurl { url = http://downloads.sourceforge.net/ofset/drgeo-1.1.0.tar.gz; @@ -13,7 +13,7 @@ rec { /* doConfigure should be specified separately */ phaseNames = ["doConfigure" "doPreBuild" "doMakeInstall"]; - doPreBuild = FullDepEntry ('' + doPreBuild = fullDepEntry ('' cp drgeo.desktop.in drgeo.desktop '') ["minInit" "doUnpack"]; diff --git a/pkgs/applications/version-management/monotone-viz/1.0.1.nix b/pkgs/applications/version-management/monotone-viz/1.0.1.nix index 7f0b4e72724..dc4816cee51 100644 --- a/pkgs/applications/version-management/monotone-viz/1.0.1.nix +++ b/pkgs/applications/version-management/monotone-viz/1.0.1.nix @@ -1,8 +1,12 @@ args : with args; rec { src = fetchurl { - url = http://oandrieu.nerim.net/monotone-viz/monotone-viz-1.0.1-nolablgtk.tar.gz; - sha256 = "0aqz65mlqplj5ccr8czcr6hvliclf9y1xi1rrs2z2s3fvahasxnp"; + name = "monotone-viz-1.0.1-nolablgtk.tar.gz"; + urls = [ + http://ftp.debian.org/debian/pool/main/m/monotone-viz/monotone-viz_1.0.1.orig.tar.gz + #http://oandrieu.nerim.net/monotone-viz/monotone-viz-1.0.1-nolablgtk.tar.gz + ]; + sha256 = "066qwrknjk5hwk9jblnf0bzvbmfbabq0zhsxkd3nzk469zkpvhl2"; }; buildInputs = [ocaml lablgtk libgnomecanvas gtk graphviz glib pkgconfig]; diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 78b3107c95b..46ac9575a48 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -2,12 +2,12 @@ lua, pcre, sqlite}: let - version = "0.43"; + version = "0.44"; in stdenv.mkDerivation { name = "monotone-${version}"; src = fetchurl { url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.gz"; - sha256 = "1vfvvk4flv6n7x1nrizjpwpsfhf3dv3b60h7cs4ysgvzb76s41mz"; + sha256 = "1d1jck5dw210q99km5akz1bsk447sybypdwwi07v1836jkgk0wll"; }; buildInputs = [boost zlib botan libidn lua pcre sqlite]; preConfigure = '' diff --git a/pkgs/applications/version-management/subversion/1.5.nix b/pkgs/applications/version-management/subversion/1.5.nix index e2b85bf1d49..c892ac8652b 100644 --- a/pkgs/applications/version-management/subversion/1.5.nix +++ b/pkgs/applications/version-management/subversion/1.5.nix @@ -12,7 +12,7 @@ }: assert bdbSupport -> aprutil.bdbSupport; -assert httpServer -> httpd != null && httpd.apr == apr && httpd.aprutil == aprutil; +assert httpServer -> httpd != null; assert pythonBindings -> swig != null && swig.pythonSupport; assert javahlBindings -> jdk != null; assert sslSupport -> neon.sslSupport; diff --git a/pkgs/applications/version-management/subversion/1.6.nix b/pkgs/applications/version-management/subversion/1.6.nix index 625a74b2bd8..e4e425c35ba 100644 --- a/pkgs/applications/version-management/subversion/1.6.nix +++ b/pkgs/applications/version-management/subversion/1.6.nix @@ -12,7 +12,7 @@ }: assert bdbSupport -> aprutil.bdbSupport; -assert httpServer -> httpd != null && httpd.apr == apr && httpd.aprutil == aprutil; +assert httpServer -> httpd != null; assert pythonBindings -> swig != null && swig.pythonSupport; assert javahlBindings -> jdk != null; assert sslSupport -> neon.sslSupport; @@ -20,13 +20,13 @@ assert compressionSupport -> neon.compressionSupport; stdenv.mkDerivation rec { - version = "1.6.1"; + version = "1.6.2"; name = "subversion-${version}"; src = fetchurl { url = "http://subversion.tigris.org/downloads/${name}.tar.bz2"; - sha256 = "1jp6i7vmz0vd1zf4y896f7jzabwv81x8brwzp5kpkrn6wajagm6d"; + sha256 = "0xa07jrbg5jdk6v5scv900ccdq1fnx02yijgnl8pfaq3knhsb24p"; }; buildInputs = [zlib apr aprutil sqlite] diff --git a/pkgs/applications/version-management/tkcvs/default.nix b/pkgs/applications/version-management/tkcvs/default.nix new file mode 100644 index 00000000000..a21501dccad --- /dev/null +++ b/pkgs/applications/version-management/tkcvs/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, tcl, tk}: + +stdenv.mkDerivation +{ + name = "tkcvs-8.2"; + + src = fetchurl { + url = mirror://sourceforge/tkcvs/tkcvs_8_2.tar.gz; + sha256 = "0cr2f8jd6k2h1n8mvfv6frrfv4kxd7k3mhplk3ghl6hrgklr7ywr"; + }; + + buildInputs = [ tcl tk ]; + + patchPhase = '' + sed -e 's@exec wish@exec ${tk}/bin/wish@' -i tkcvs/tkcvs.tcl tkdiff/tkdiff + ''; + + installPhase = '' + ./doinstall.tcl $out + ''; + + meta = { + homepage = http://www.twobarleycorns.net/tkcvs.html; + description = "TCL/TK GUI for cvs and subversion"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/applications/version-management/viewmtn/0.10.nix b/pkgs/applications/version-management/viewmtn/0.10.nix index 82b841f964a..08351ffa91d 100644 --- a/pkgs/applications/version-management/viewmtn/0.10.nix +++ b/pkgs/applications/version-management/viewmtn/0.10.nix @@ -18,7 +18,7 @@ rec { (pythonWrapperArguments + preservePathWrapperArguments)) ]; - doInstall = FullDepEntry ('' + doInstall = fullDepEntry ('' for i in dot mtn highlight; do sed -e "s@/usr/bin/$i@$(which $i)@" -i config.py.example done diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix index cc1306a20a5..f53cd291137 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/MPlayer/default.nix @@ -4,7 +4,7 @@ , alsa ? null, libX11, libXv ? null, libtheora ? null, libcaca ? null , libXinerama ? null, libXrandr ? null, libdvdnav ? null , cdparanoia ? null, cddaSupport ? true -, mesa +, mesa, pkgconfig }: assert alsaSupport -> alsa != null; @@ -37,7 +37,7 @@ stdenv.mkDerivation { }; buildInputs = - [x11 libXv freetype zlib mesa] + [x11 libXv freetype zlib mesa pkgconfig] ++ stdenv.lib.optional alsaSupport alsa ++ stdenv.lib.optional xvSupport libXv ++ stdenv.lib.optional theoraSupport libtheora diff --git a/pkgs/applications/video/gnash/builder.sh b/pkgs/applications/video/gnash/builder.sh index 519007fa55e..c86884d58ef 100644 --- a/pkgs/applications/video/gnash/builder.sh +++ b/pkgs/applications/video/gnash/builder.sh @@ -1,5 +1,5 @@ -source "$stdenv/setup" || exit 1 +source "$stdenv/setup" -configureFlags="--with-sdl-mixer-incl=$SDL_mixer/include/SDL --with-sdl-incl=$SDL/include/SDL --with-npapi-plugindir=$out/plugins --enable-gui=gtk" +configureFlags="--with-sdl-incl=$SDL/include/SDL --with-npapi-plugindir=$out/plugins --enable-gui=gtk" genericBuild diff --git a/pkgs/applications/video/xvidcap/xlib.patch b/pkgs/applications/video/xvidcap/xlib.patch new file mode 100644 index 00000000000..eb97854386b --- /dev/null +++ b/pkgs/applications/video/xvidcap/xlib.patch @@ -0,0 +1,15 @@ +diff --git a/src/app_data.c b/src/app_data.c +index 5a44363..482b115 100644 +--- a/src/app_data.c ++++ b/src/app_data.c +@@ -52,9 +52,9 @@ + #include + #include + ++#include + #ifdef HAVE_LIBXFIXES + #include +-#include + #include + #include + #include diff --git a/pkgs/applications/virtualization/qemu/0.10.3.nix b/pkgs/applications/virtualization/qemu/0.10.3.nix new file mode 100644 index 00000000000..18683a209fb --- /dev/null +++ b/pkgs/applications/virtualization/qemu/0.10.3.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl, SDL, zlib, which}: + +stdenv.mkDerivation { + name = "qemu-0.10.3"; + + src = fetchurl { + url = http://download.savannah.gnu.org/releases/qemu/qemu-0.10.3.tar.gz; + sha256 = "0xxhyxa376vi4drjpqq21g0h6gqgb1fxamca7zinl2l8iix0sm49"; + }; + + patchFlags = "-p2"; + + buildInputs = [SDL zlib which]; + + meta = { + description = "QEmu processor emulator"; + }; +} diff --git a/pkgs/applications/virtualization/qemu/linux-img/0.2.nix b/pkgs/applications/virtualization/qemu/linux-img/0.2.nix index 6c43a941b66..0d5e94ded95 100644 --- a/pkgs/applications/virtualization/qemu/linux-img/0.2.nix +++ b/pkgs/applications/virtualization/qemu/linux-img/0.2.nix @@ -11,7 +11,7 @@ args : with args; }; in with localDefs; let -doCopy = FullDepEntry (" +doCopy = fullDepEntry (" ensureDir \$out/share/qemu-images cp linux-${version}.img \$out/share/qemu-images/ ") [minInit doUnpack defEnsureDir]; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index fa1a0563339..51a2ab99377 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, iasl, dev86, libxslt, libxml2, libX11, xproto, libXext , libXcursor, qt3, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel -, python, which +, python, which, alsaLib }: stdenv.mkDerivation { - name = "virtualbox-2.2.0-${kernel.version}"; + name = "virtualbox-2.2.4-${kernel.version}"; src = fetchurl { - url = http://download.virtualbox.org/virtualbox/2.2.0/VirtualBox-2.2.0-OSE.tar.bz2; - sha256 = "8bf621cfcb61f2b0a71be53f072e58c3fb4f3183324faa3947346ff973314c71"; + url = http://download.virtualbox.org/virtualbox/2.2.4/VirtualBox-2.2.4-OSE.tar.bz2; + sha256 = "b5d52a67b94510275eb3dc8649eb7d3063446da4f3ac038f821d598c62b5d6c5"; }; - buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt3 qt4 libIDL SDL hal libcap glib kernel python]; + buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt3 qt4 libIDL SDL hal libcap glib kernel python alsaLib]; patchPhase = " set -x @@ -27,7 +27,7 @@ stdenv.mkDerivation { configurePhase = '' # It wants the qt utils from qt3, and it takes them from QTDIR export QTDIR=${qt3} - ./configure --with-qt-dir=${qt3} --with-qt4-dir=${qt4} --disable-python --disable-alsa --disable-pulse --disable-hardening + ./configure --with-qt-dir=${qt3} --with-qt4-dir=${qt4} --disable-python --disable-pulse --disable-hardening sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \ -i AutoConfig.kmk sed -e 's@arch/x86/@@' \ @@ -61,7 +61,7 @@ stdenv.mkDerivation { sed -i -e "s|@INSTALL_PATH@|$out/virtualbox|" \ -e "s|@QT4_PATH@|${qt4}/lib|" \ -e "s|which|${which}/bin/which|" \ - -e "s|gawk|${stdenv.gawk}/bin/gawk|" \ + -e "s|awk|${stdenv.gawk}/bin/awk|" \ $out/bin/VBox.sh chmod 755 $out/bin/VBox.sh for file in VirtualBox VBoxManage VBoxSDL diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix index 1bbdedcb4ba..46625436798 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/default.nix @@ -2,9 +2,9 @@ args : let lib = args.lib; fetchurl = args.fetchurl; - FullDepEntry = args.FullDepEntry; + fullDepEntry = args.fullDepEntry; - version = lib.getAttr ["version"] "3.3.0" args; + version = lib.attrByPath ["version"] "3.3.0" args; _buildInputs = with args; [ python e2fsprogs gnutls pkgconfig libjpeg ncurses SDL libvncserver zlib graphviz ghostscript @@ -23,10 +23,10 @@ rec { /* doConfigure should be specified separately */ phaseNames = ["makeTools" "makeXen"]; - makeTools = FullDepEntry (''make -C tools install PREFIX=$out '') + makeTools = fullDepEntry (''make -C tools install PREFIX=$out '') ["minInit" "addInputs" "doUnpack"]; - makeXen = FullDepEntry (''make -C xen install PREFIX=$out '') + makeXen = fullDepEntry (''make -C xen install PREFIX=$out '') ["minInit" "addInputs" "doUnpack"]; name = "xen-" + version; diff --git a/pkgs/applications/window-managers/compiz-fusion/bcop/0.6.0.nix b/pkgs/applications/window-managers/compiz-fusion/bcop/0.6.0.nix index 7dd041941a6..9221d63a6fc 100644 --- a/pkgs/applications/window-managers/compiz-fusion/bcop/0.6.0.nix +++ b/pkgs/applications/window-managers/compiz-fusion/bcop/0.6.0.nix @@ -11,11 +11,11 @@ args : with args; } null; /* null is a terminator for sumArgs */ in with localDefs; let - fixPkgconfig = FullDepEntry (" + fixPkgconfig = fullDepEntry (" ensureDir \$out/lib ln -fs \$out/share/pkgconfig \$out/lib/pkgconfig ") [minInit doMakeInstall defEnsureDir]; - fixInterpreter = FullDepEntry (" + fixInterpreter = fullDepEntry (" sed -e 's@^#!/bin/bash@#! ${stdenv.bash}/bin/bash@' -i \$out/bin/bcop ") [minInit doMakeInstall]; in diff --git a/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.4.nix index 9f516398b45..13928f3db73 100644 --- a/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.4.nix +++ b/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.4.nix @@ -11,11 +11,11 @@ args : with args; } ; in with localDefs; let - fixPkgconfig = FullDepEntry (" + fixPkgconfig = fullDepEntry (" ensureDir \$out/lib ln -fs \$out/share/pkgconfig \$out/lib/pkgconfig ") [minInit doMakeInstall defEnsureDir]; - fixInterpreter = FullDepEntry (" + fixInterpreter = fullDepEntry (" sed -e 's@^#!/bin/bash@#! ${stdenv.bash}/bin/bash@' -i \$out/bin/bcop ") [minInit doMakeInstall]; in diff --git a/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix index e9bede0a287..07ba60cd833 100644 --- a/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix +++ b/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix @@ -11,11 +11,11 @@ args : with args; } ; in with localDefs; let - fixPkgconfig = FullDepEntry (" + fixPkgconfig = fullDepEntry (" ensureDir \$out/lib ln -fs \$out/share/pkgconfig \$out/lib/pkgconfig ") [minInit doMakeInstall defEnsureDir]; - fixInterpreter = FullDepEntry (" + fixInterpreter = fullDepEntry (" sed -e 's@^#!/bin/bash@#! ${stdenv.bash}/bin/bash@' -i \$out/bin/bcop ") [minInit doMakeInstall]; in diff --git a/pkgs/applications/window-managers/compiz-fusion/compiz-manager/0.6.0.nix b/pkgs/applications/window-managers/compiz-fusion/compiz-manager/0.6.0.nix index c53b8586f1c..934c21ba18b 100644 --- a/pkgs/applications/window-managers/compiz-fusion/compiz-manager/0.6.0.nix +++ b/pkgs/applications/window-managers/compiz-fusion/compiz-manager/0.6.0.nix @@ -22,7 +22,7 @@ args : with args; }; in with localDefs; let - install = FullDepEntry (" + install = fullDepEntry (" sed -e '/Checking for texture_from_pixmap:/areturn 0' -i compiz-manager sed -e '/Checking for non power of two support: /areturn 0' -i compiz-manager sed -e '/^\s*$/aPATH=\$PATH:${xvinfo}/bin:${xdpyinfo}/bin' -i compiz-manager diff --git a/pkgs/applications/window-managers/compiz-fusion/extra/0.6.0.nix b/pkgs/applications/window-managers/compiz-fusion/extra/0.6.0.nix index bcd1ec9f0f2..9b091ac7ce4 100644 --- a/pkgs/applications/window-managers/compiz-fusion/extra/0.6.0.nix +++ b/pkgs/applications/window-managers/compiz-fusion/extra/0.6.0.nix @@ -11,11 +11,11 @@ args : with args; } null; /* null is a terminator for sumArgs */ in with localDefs; let - sharePlugins = FullDepEntry (" + sharePlugins = fullDepEntry (" ensureDir \$out/share/compiz-plugins ln -vsf \$out/lib/compiz \$out/share/compiz-plugins ") [minInit doMakeInstall defEnsureDir]; - fixIncludes = FullDepEntry (" + fixIncludes = fullDepEntry (" sed -e 's@#include @#include @' -i src/group/group-internal.h; sed -e 's@#include @#include @' -i src/scalefilter/scalefilter.c; ") [minInit doUnpack]; diff --git a/pkgs/applications/window-managers/compiz-fusion/extra/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/extra/0.7.4.nix index efaec0c8731..8262dd9ce7d 100644 --- a/pkgs/applications/window-managers/compiz-fusion/extra/0.7.4.nix +++ b/pkgs/applications/window-managers/compiz-fusion/extra/0.7.4.nix @@ -11,11 +11,11 @@ args : with args; } ; in with localDefs; let - sharePlugins = FullDepEntry (" + sharePlugins = fullDepEntry (" ensureDir \$out/share/compiz-plugins ln -vsf \$out/lib/compiz \$out/share/compiz-plugins ") [minInit doMakeInstall defEnsureDir]; - fixIncludes = FullDepEntry (" + fixIncludes = fullDepEntry (" sed -e 's@#include @#include @' -i src/group/group-internal.h; sed -e 's@#include @#include @' -i src/scalefilter/scalefilter.c; sed -e 's@#include @#include @' -i src/showmouse/showmouse.c; diff --git a/pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix index 39108fab204..7ea173e1561 100644 --- a/pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix +++ b/pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix @@ -11,11 +11,11 @@ args : with args; } ; in with localDefs; let - sharePlugins = FullDepEntry (" + sharePlugins = fullDepEntry (" ensureDir \$out/share/compiz-plugins ln -vsf \$out/lib/compiz \$out/share/compiz-plugins ") [minInit doMakeInstall defEnsureDir]; - fixIncludes = FullDepEntry ('' + fixIncludes = fullDepEntry ('' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pluginsMain}/include/compiz" '') [minInit doUnpack]; in diff --git a/pkgs/applications/window-managers/compiz-fusion/main/0.6.0.nix b/pkgs/applications/window-managers/compiz-fusion/main/0.6.0.nix index 6e69e9de6df..255ca853e09 100644 --- a/pkgs/applications/window-managers/compiz-fusion/main/0.6.0.nix +++ b/pkgs/applications/window-managers/compiz-fusion/main/0.6.0.nix @@ -11,7 +11,7 @@ args : with args; } null; /* null is a terminator for sumArgs */ in with localDefs; let - sharePlugins = FullDepEntry (" + sharePlugins = fullDepEntry (" ensureDir \$out/share/compiz-plugins ln -vsf \$out/lib/compiz \$out/share/compiz-plugins ") [minInit doMakeInstall defEnsureDir]; diff --git a/pkgs/applications/window-managers/compiz-fusion/main/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/main/0.7.4.nix index a50a4e03c3f..2294fdc776a 100644 --- a/pkgs/applications/window-managers/compiz-fusion/main/0.7.4.nix +++ b/pkgs/applications/window-managers/compiz-fusion/main/0.7.4.nix @@ -11,7 +11,7 @@ args : with args; } ; in with localDefs; let - sharePlugins = FullDepEntry (" + sharePlugins = fullDepEntry (" ensureDir \$out/share/compiz-plugins ln -vsf \$out/lib/compiz \$out/share/compiz-plugins ") [minInit doMakeInstall defEnsureDir]; diff --git a/pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix index 5fae889fd3e..fd4bb896c0c 100644 --- a/pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix +++ b/pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix @@ -11,7 +11,7 @@ args : with args; } ; in with localDefs; let - sharePlugins = FullDepEntry (" + sharePlugins = fullDepEntry (" ensureDir \$out/share/compiz-plugins ln -vsf \$out/lib/compiz \$out/share/compiz-plugins ") [minInit doMakeInstall defEnsureDir]; diff --git a/pkgs/applications/window-managers/compiz/0.6.2.nix b/pkgs/applications/window-managers/compiz/0.6.2.nix index 0c89087d02a..21edc7aaa51 100644 --- a/pkgs/applications/window-managers/compiz/0.6.2.nix +++ b/pkgs/applications/window-managers/compiz/0.6.2.nix @@ -24,7 +24,7 @@ args : with args; }; in with localDefs; let - postAll = FullDepEntry (" + postAll = fullDepEntry (" for i in $out/bin/*; do patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i done diff --git a/pkgs/applications/window-managers/compiz/0.7.8.nix b/pkgs/applications/window-managers/compiz/0.7.8.nix index 0e7cfc2910d..19daa93700b 100644 --- a/pkgs/applications/window-managers/compiz/0.7.8.nix +++ b/pkgs/applications/window-managers/compiz/0.7.8.nix @@ -25,7 +25,7 @@ args : with args; }; in with localDefs; let - postAll = FullDepEntry (" + postAll = fullDepEntry (" for i in $out/bin/*; do patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i done diff --git a/pkgs/applications/window-managers/compiz/0.8.0.nix b/pkgs/applications/window-managers/compiz/0.8.0.nix index d521b2a4fa3..5ce13690991 100644 --- a/pkgs/applications/window-managers/compiz/0.8.0.nix +++ b/pkgs/applications/window-managers/compiz/0.8.0.nix @@ -24,7 +24,7 @@ args : with args; }; in with localDefs; let - postAll = FullDepEntry (" + postAll = fullDepEntry (" for i in $out/bin/*; do patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i done diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index ab123a03559..12d0acb367a 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -3,10 +3,10 @@ let lib = args.lib; fetchurl = args.fetchurl; noDepEntry = args.noDepEntry; - FullDepEntry = args.FullDepEntry; + fullDepEntry = args.fullDepEntry; buildInputs = lib.attrVals ["clisp" "texinfo"] args; - version = lib.getAttr ["version"] "0.9.4.1" args; + version = lib.attrByPath ["version"] "0.9.4.1" args; pkgName = "stumpwm"; in @@ -22,7 +22,7 @@ rec { export HOME="$NIX_BUILD_TOP"; ''); - installation = FullDepEntry ('' + installation = fullDepEntry ('' ensureDir $out/bin ensureDir $out/share/stumpwm/doc ensureDir $out/share/info diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix index 8556c9529a4..17a49b69413 100644 --- a/pkgs/build-support/builder-defs/builder-defs.nix +++ b/pkgs/build-support/builder-defs/builder-defs.nix @@ -1,16 +1,17 @@ args: with args; with stringsWithDeps; with lib; +let inherit (builtins) head tail trace; in (rec { inherit writeScript; - src = getAttr ["src"] "" args; + src = attrByPath ["src"] "" args; - addSbinPath = getAttr ["addSbinPath"] false args; + addSbinPath = attrByPath ["addSbinPath"] false args; forceShare = if args ? forceShare then args.forceShare else ["man" "doc" "info"]; forceCopy = ["COPYING" "LICENSE" "DISTRIBUTION" "LEGAL" "README" "AUTHORS" "ChangeLog" "CHANGES" "LICENCE" "COPYRIGHT"] ++ - (optional (getAttr ["forceCopyDoc"] true args) "doc"); + (optional (attrByPath ["forceCopyDoc"] true args) "doc"); hasSuffixHack = a: b: hasSuffix (a+(substring 0 0 b)) ((substring 0 0 a)+b); @@ -19,6 +20,7 @@ args: with args; with stringsWithDeps; with lib; else if (hasSuffixHack ".tar.gz" s) || (hasSuffixHack ".tgz" s) then "tgz" else if (hasSuffixHack ".tar.bz2" s) || (hasSuffixHack ".tbz2" s) || (hasSuffixHack ".tbz" s) then "tbz2" + else if (hasSuffixHack ".tar.Z" s) then "tZ" else if (hasSuffixHack ".tar.lzma" s) then "tar.lzma" else if (hasSuffixHack ".zip" s) || (hasSuffixHack ".ZIP" s) then "zip" else if (hasSuffixHack "-cvs-export" s) then "cvs-dir" @@ -29,10 +31,11 @@ args: with args; with stringsWithDeps; with lib; # Last block - for single files!! It should be always after .tar.* else if (hasSuffixHack ".bz2" s) then "plain-bz2" + else if (hasSuffixHack ".gz" s) then "plain-gz" else (abort "unknown archive type : ${s}")); - defAddToSearchPath = FullDepEntry (" + defAddToSearchPath = fullDepEntry (" addToSearchPathWithCustomDelimiter() { local delimiter=\$1 local varName=\$2 @@ -83,13 +86,12 @@ args: with args; with stringsWithDeps; with lib; trap \"closeNest\" EXIT "); - minInit = FullDepEntry (" + minInit = fullDepEntry (" set -e NIX_GCC=${stdenv.gcc} export SHELL=${stdenv.shell} PATH_DELIMITER=':' - " + (if ((stdenv ? preHook) && (stdenv.preHook != null) && - ((toString stdenv.preHook) != "")) then + " + (if stdenv ? preHook && stdenv.preHook != null && toString stdenv.preHook != "" then " param1=${stdenv.param1} param2=${stdenv.param2} @@ -112,7 +114,7 @@ args: with args; with stringsWithDeps; with lib; " else "")) ["defNest" "defAddToSearchPath"]; - addInputs = FullDepEntry (" + addInputs = fullDepEntry (" # Recursively find all build inputs. findInputs() { @@ -178,7 +180,7 @@ args: with args; with stringsWithDeps; with lib; PATH=\$_PATH\${_PATH:+\"\${PATH_DELIMITER}\"}\$PATH ") ["minInit"]; - defEnsureDir = FullDepEntry (" + defEnsureDir = fullDepEntry (" # Ensure that the given directories exists. ensureDir() { local dir @@ -188,7 +190,7 @@ args: with args; with stringsWithDeps; with lib; } ") ["minInit"]; - toSrcDir = s : FullDepEntry ((if (archiveType s) == "tar" then " + toSrcDir = s : fullDepEntry ((if (archiveType s) == "tar" then " tar xvf '${s}' cd \"\$(tar tf '${s}' | head -1 | sed -e 's@/.*@@' )\" " else if (archiveType s) == "tgz" then " @@ -197,6 +199,9 @@ args: with args; with stringsWithDeps; with lib; " else if (archiveType s) == "tbz2" then " tar xvjf '${s}' cd \"\$(tar tjf '${s}' | head -1 | sed -e 's@/.*@@' )\" + " else if (archiveType s) == "tZ" then " + uncompress < '${s}' | tar x + cd \"\$(uncompress < '${s}' | tar t | head -1 | sed -e 's@/.*@@' )\" " else if (archiveType s) == "tar.lzma" then " unlzma -d -c <'${s}' | tar xv cd \"\$(unlzma -d -c <'${s}' | tar t | head -1 | sed -e 's@/.*@@' )\" @@ -220,23 +225,28 @@ args: with args; with stringsWithDeps; with lib; NAME=\$(basename ${s} .bz2) bzip2 -d <${s} > \$PWD/\$(basename ${s} .bz2)/\${NAME#*-} cd \$(basename ${s} .bz2) + " else if (archiveType s) == "plain-gz" then " + mkdir \$PWD/\$(basename ${s} .gz) + NAME=\$(basename ${s} .gz) + gzip -d <${s} > \$PWD/\$(basename ${s} .gz)/\${NAME#*-} + cd \$(basename ${s} .gz) " else (abort "unknown archive type : ${s}"))+ # goSrcDir is typically something like "cd mysubdir" .. but can be anything else (if args ? goSrcDir then args.goSrcDir else "") ) ["minInit"]; - configureCommand = getAttr ["configureCommand"] "./configure" args; + configureCommand = attrByPath ["configureCommand"] "./configure" args; - doConfigure = FullDepEntry (" + doConfigure = fullDepEntry (" ${configureCommand} --prefix=\"\$prefix\" ${toString configureFlags} ") ["minInit" "addInputs" "doUnpack"]; - doIntltool = FullDepEntry (" + doIntltool = fullDepEntry (" mkdir -p config intltoolize --copy --force ") ["minInit" "addInputs" "doUnpack"]; - doAutotools = FullDepEntry (" + doAutotools = fullDepEntry (" mkdir -p config libtoolize --copy --force aclocal --force @@ -246,17 +256,17 @@ args: with args; with stringsWithDeps; with lib; autoconf ")["minInit" "addInputs" "doUnpack"]; - doMake = FullDepEntry (" + doMake = fullDepEntry (" make ${toString makeFlags} ") ["minInit" "addInputs" "doUnpack"]; doUnpack = toSrcDir (toString src); - installPythonPackage = FullDepEntry (" + installPythonPackage = fullDepEntry (" python setup.py install --prefix=\"\$prefix\" ") ["minInit" "addInputs" "doUnpack"]; - doPythonConfigure = FullDepEntry ('' + doPythonConfigure = fullDepEntry ('' pythonVersion=$(toPythonPath "$prefix") pythonVersion=''${pythonVersion#*/lib/python} pythonVersion=''${pythonVersion%%/site-packages} @@ -266,11 +276,11 @@ args: with args; with stringsWithDeps; with lib; python configure.py -b "$prefix/bin" -d "$(toPythonPath "$prefix")" -v "$prefix/share/sip" ${toString configureFlags} '') ["minInit" "addInputs" "doUnpack"]; - doMakeInstall = FullDepEntry (" - make ${toString (getAttr ["makeFlags"] "" args)} "+ - "${toString (getAttr ["installFlags"] "" args)} install") ["doMake"]; + doMakeInstall = fullDepEntry (" + make ${toString (attrByPath ["makeFlags"] "" args)} "+ + "${toString (attrByPath ["installFlags"] "" args)} install") ["doMake"]; - doForceShare = FullDepEntry (" + doForceShare = fullDepEntry (" ensureDir \"\$prefix/share\" for d in ${toString forceShare}; do if [ -d \"\$prefix/\$d\" -a ! -d \"\$prefix/share/\$d\" ]; then @@ -280,7 +290,7 @@ args: with args; with stringsWithDeps; with lib; done; ") ["minInit" "defEnsureDir"]; - doForceCopy = FullDepEntry ('' + doForceCopy = fullDepEntry ('' name="$(basename $out)" name="''${name#*-}" ensureDir "$prefix/share/$name" @@ -293,11 +303,11 @@ args: with args; with stringsWithDeps; with lib; patchFlags = if args ? patchFlags then args.patchFlags else "-p1"; - patches = getAttr ["patches"] [] args; + patches = attrByPath ["patches"] [] args; toPatchCommand = s: "cat ${s} | patch ${toString patchFlags}"; - doPatch = FullDepEntry (concatStringsSep ";" + doPatch = fullDepEntry (concatStringsSep ";" (map toPatchCommand patches) ) ["minInit" "doUnpack"]; @@ -307,8 +317,8 @@ args: with args; with stringsWithDeps; with lib; envAdder = envAdderInner ""; envAdderList = l: if l==[] then "" else - "echo export ${__head l}='\"'\"\\\$${__head l}:${__head (__tail l)}\"'\"';\n" + - envAdderList (__tail (__tail l)); + "echo export ${head l}='\"'\"\\\$${head l}:${head (tail l)}\"'\"';\n" + + envAdderList (tail (tail l)); wrapEnv = cmd: env: " mv \"${cmd}\" \"${cmd}-orig\"; @@ -317,9 +327,9 @@ args: with args; with stringsWithDeps; with lib; (${envAdderList env} echo '\"'\"${cmd}-orig\"'\"' '\"'\\\$@'\"' \n) > \"${cmd}\""; - doWrap = cmd: FullDepEntry (wrapEnv cmd (getAttr ["wrappedEnv"] [] args)) ["minInit"]; + doWrap = cmd: fullDepEntry (wrapEnv cmd (attrByPath ["wrappedEnv"] [] args)) ["minInit"]; - makeManyWrappers = wildcard : wrapperFlags : FullDepEntry ('' + makeManyWrappers = wildcard : wrapperFlags : fullDepEntry ('' for i in ${wildcard}; do wrapProgram "$i" ${wrapperFlags} done @@ -336,79 +346,79 @@ args: with args; with stringsWithDeps; with lib; preservePathWrapperArguments = ''''${PATH:+ --prefix PATH : $PATH }''; - doPropagate = FullDepEntry (" + doPropagate = fullDepEntry (" ensureDir \$out/nix-support - echo '${toString (getAttr ["propagatedBuildInputs"] [] args)}' >\$out/nix-support/propagated-build-inputs + echo '${toString (attrByPath ["propagatedBuildInputs"] [] args)}' >\$out/nix-support/propagated-build-inputs ") ["minInit" "defEnsureDir"]; - /*debug = x:(__trace x x); - debugX = x:(__trace (__toXML x) x);*/ + /*debug = x:(trace x x); + debugX = x:(trace (toXML x) x);*/ - replaceScriptVar = file: name: value: ("sed -e 's`^${name}=.*`${name}='\\''${value}'\\''`' -i ${file}"); - replaceInScript = file: l: (concatStringsSep "\n" ((pairMap (replaceScriptVar file) l))); - replaceScripts = l:(concatStringsSep "\n" (pairMap replaceInScript l)); - doReplaceScripts = FullDepEntry (replaceScripts (getAttr ["shellReplacements"] [] args)) [minInit]; - makeNest = x:(if x==defNest.text then x else "startNest\n" + x + "\nstopNest\n"); - textClosure = a : steps : textClosureMapOveridable makeNest a (["defNest"] ++ steps); + replaceScriptVar = file: name: value: "sed -e 's`^${name}=.*`${name}='\\''${value}'\\''`' -i ${file}"; + replaceInScript = file: l: concatStringsSep "\n" ((pairMap (replaceScriptVar file) l)); + replaceScripts = l: concatStringsSep "\n" (pairMap replaceInScript l); + doReplaceScripts = fullDepEntry (replaceScripts (attrByPath ["shellReplacements"] [] args)) ["minInit"]; + makeNest = x: if x == defNest.text then x else "startNest\n" + x + "\nstopNest\n"; + textClosure = a: steps: textClosureMap makeNest a (["defNest"] ++ steps); - inherit noDepEntry FullDepEntry PackEntry; + inherit noDepEntry fullDepEntry packEntry; - defList = (getAttr ["defList"] [] args); + defList = attrByPath ["defList"] [] args; getVal = getValue args defList; check = checkFlag args; - reqsList = getAttr ["reqsList"] [] args; - buildInputsNames = filter (x: (null != getVal x)) + reqsList = attrByPath ["reqsList"] [] args; + buildInputsNames = filter (x: null != getVal x) (uniqList {inputList = - (concatLists (map - (x:(if (x==[]) then [] else builtins.tail x)) - reqsList));}); - configFlags = getAttr ["configFlags"] [] args; - buildFlags = getAttr ["buildFlags"] [] args; - nameSuffixes = getAttr ["nameSuffixes"] [] args; + (concatLists (map + (x: if x==[] then [] else builtins.tail x) + reqsList));}); + configFlags = attrByPath ["configFlags"] [] args; + buildFlags = attrByPath ["buildFlags"] [] args; + nameSuffixes = attrByPath ["nameSuffixes"] [] args; autoBuildInputs = assert (checkReqs args defList reqsList); filter (x: x!=null) (map getVal buildInputsNames); autoConfigureFlags = condConcat "" configFlags check; autoMakeFlags = condConcat "" buildFlags check; - useConfig = getAttr ["useConfig"] false args; + useConfig = attrByPath ["useConfig"] false args; realBuildInputs = lib.closePropagation ((if useConfig then autoBuildInputs else - getAttr ["buildInputs"] [] args)++ - (getAttr ["propagatedBuildInputs"] [] args)); + attrByPath ["buildInputs"] [] args)++ + (attrByPath ["propagatedBuildInputs"] [] args)); configureFlags = if useConfig then autoConfigureFlags else - getAttr ["configureFlags"] "" args; - makeFlags = if useConfig then autoMakeFlags else getAttr ["makeFlags"] "" args; + attrByPath ["configureFlags"] "" args; + makeFlags = if useConfig then autoMakeFlags else attrByPath ["makeFlags"] "" args; inherit lib; surroundWithCommands = x : before : after : {deps=x.deps; text = before + "\n" + x.text + "\n" + after ;}; - createDirs = FullDepEntry (concatStringsSep ";" - (map (x: "ensureDir ${x}") (getAttr ["neededDirs"] [] args)) + createDirs = fullDepEntry (concatStringsSep ";" + (map (x: "ensureDir ${x}") (attrByPath ["neededDirs"] [] args)) ) ["minInit" "defEnsureDir"]; - copyExtraDoc = FullDepEntry ('' + copyExtraDoc = fullDepEntry ('' name="$(basename $out)" name="''${name#*-}" ensureDir "$out/share/doc/$name" '' + (concatStringsSep ";" (map (x: ''cp "${x}" "$out/share/doc/$name" || true;'') - (getAttr ["extraDoc"] [] args)))) ["minInit" "defEnsureDir" "doUnpack"]; + (attrByPath ["extraDoc"] [] args)))) ["minInit" "defEnsureDir" "doUnpack"]; realPhaseNames = - (optional ([] != getAttr ["neededDirs"] [] args) "createDirs") + (optional ([] != attrByPath ["neededDirs"] [] args) "createDirs") ++ args.phaseNames ++ ["doForceShare" "doPropagate" "doForceCopy"] ++ - (optional ([] != getAttr ["extraDoc"] [] args) "copyExtraDoc") + (optional ([] != attrByPath ["extraDoc"] [] args) "copyExtraDoc") ++ - (optional (getAttr ["doCheck"] false args) "doMakeCheck") + (optional (attrByPath ["doCheck"] false args) "doMakeCheck") ++ - (optional (getAttr ["alwaysFail"] false args) "doFail") + (optional (attrByPath ["alwaysFail"] false args) "doFail") ; doFail = noDepEntry " @@ -416,11 +426,11 @@ args: with args; with stringsWithDeps; with lib; a() { return 127; } ; a ; "; - doMakeCheck = FullDepEntry ('' + doMakeCheck = fullDepEntry ('' make check '') ["minInit"]; - extraDerivationAttrs = lib.getAttr ["extraDerivationAttrs"] {} args; + extraDerivationAttrs = lib.attrByPath ["extraDerivationAttrs"] {} args; # for overrides.. builderDefsArgs = args; @@ -430,8 +440,7 @@ args: with args; with stringsWithDeps; with lib; stdenv.mkDerivation ((rec { inherit (localDefs) name; - builder = writeScript (name + "-builder") - (textClosure localDefs localDefs.realPhaseNames); + buildCommand = textClosure localDefs localDefs.realPhaseNames; meta = localDefs.meta; passthru = localDefs.passthru // {inherit (localDefs) src; }; }) // (if localDefs ? propagatedBuildInputs then { @@ -445,25 +454,25 @@ args: with args; with stringsWithDeps; with lib; (innerBuilderDefsPackage bd) {}; - generateFontsFromSFD = FullDepEntry ('' + generateFontsFromSFD = fullDepEntry ('' for i in *.sfd; do fontforge -c \ 'Open($1); ${optionalString (args ? extraFontForgeCommands) args.extraFontForgeCommands }Reencode("unicode"); - ${optionalString (getAttr ["createTTF"] true args) ''Generate($1:r + ".ttf");''} - ${optionalString (getAttr ["createOTF"] true args) ''Generate($1:r + ".otf");''} + ${optionalString (attrByPath ["createTTF"] true args) ''Generate($1:r + ".ttf");''} + ${optionalString (attrByPath ["createOTF"] true args) ''Generate($1:r + ".otf");''} Reencode("TeX-Base-Encoding"); - ${optionalString (getAttr ["createAFM"] true args) ''Generate($1:r + ".afm");''} - ${optionalString (getAttr ["createPFM"] true args) ''Generate($1:r + ".pfm");''} - ${optionalString (getAttr ["createPFB"] true args) ''Generate($1:r + ".pfb");''} - ${optionalString (getAttr ["createMAP"] true args) ''Generate($1:r + ".map");''} - ${optionalString (getAttr ["createENC"] true args) ''Generate($1:r + ".enc");''} + ${optionalString (attrByPath ["createAFM"] true args) ''Generate($1:r + ".afm");''} + ${optionalString (attrByPath ["createPFM"] true args) ''Generate($1:r + ".pfm");''} + ${optionalString (attrByPath ["createPFB"] true args) ''Generate($1:r + ".pfb");''} + ${optionalString (attrByPath ["createMAP"] true args) ''Generate($1:r + ".map");''} + ${optionalString (attrByPath ["createENC"] true args) ''Generate($1:r + ".enc");''} ' $i; done '') ["minInit" "addInputs" "doUnpack"]; - installFonts = FullDepEntry ('' + installFonts = fullDepEntry ('' ensureDir $out/share/fonts/truetype/public/${args.name} ensureDir $out/share/fonts/opentype/public/${args.name} ensureDir $out/share/fonts/type1/public/${args.name} @@ -477,12 +486,12 @@ args: with args; with stringsWithDeps; with lib; cp *.map $out/share/texmf/fonts/map/${args.name} || echo No fontmap data '') ["minInit" "defEnsureDir"]; - simplyShare = shareName: FullDepEntry ('' + simplyShare = shareName: fullDepEntry ('' ensureDir $out/share cp -r . $out/share/${shareName} '') ["doUnpack" "defEnsureDir"]; - doPatchShebangs = dir: FullDepEntry ('' + doPatchShebangs = dir: fullDepEntry ('' patchShebangFun() { # Rewrite all script interpreter file names (`#! /path') under the # specified directory tree to paths found in $PATH. E.g., @@ -504,7 +513,7 @@ args: with args; with stringsWithDeps; with lib; patchShebangFun; '') ["minInit"]; - createPythonInstallationTarget = FullDepEntry ('' + createPythonInstallationTarget = fullDepEntry ('' ensureDir $(toPythonPath $out) export PYTHONPATH=$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath $out) '') ["minInit" "addInputs" "defEnsureDir"]; diff --git a/pkgs/build-support/builder-defs/template-composing-builder.nix b/pkgs/build-support/builder-defs/template-composing-builder.nix index 0efb347d821..988efbfadd2 100644 --- a/pkgs/build-support/builder-defs/template-composing-builder.nix +++ b/pkgs/build-support/builder-defs/template-composing-builder.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "" a; + version = a.lib.attrByPath ["version"] "" a; buildInputs = with a; [ ]; diff --git a/pkgs/build-support/checker/default.nix b/pkgs/build-support/checker/default.nix index ae25493c77c..4f95c3b95ee 100644 --- a/pkgs/build-support/checker/default.nix +++ b/pkgs/build-support/checker/default.nix @@ -16,14 +16,14 @@ let checkAttrInclusion = s: a: b: ( if (! isAttrs b) then s else - if (lib.getAttr ["_type"] "" b) == "option" then "" else + if (lib.attrByPath ["_type"] "" b) == "option" then "" else findInList (x : x != "") ( map (x: if (x == "servicesProposal") # this attr will be checked at another place ( -> upstart-jobs/default.nix ) then "" else checkAttrInclusion (s + "." + x) - (__getAttr x a) - (lib.getAttr [x] null b)) + (builtins.getAttr x a) + (lib.attrByPath [x] null b)) (attrNames a)) "" ); in diff --git a/pkgs/build-support/deb-package/default.nix b/pkgs/build-support/deb-package/default.nix index 4dc53ff0832..f227dd521a6 100644 --- a/pkgs/build-support/deb-package/default.nix +++ b/pkgs/build-support/deb-package/default.nix @@ -2,7 +2,7 @@ args : with args; let localDefs = with (builderDefs.passthru.function {src="";}); let - checkFlag = flag : lib.getAttr [flag] false args; + checkFlag = flag : lib.attrByPath [flag] false args; in builderDefs.passthru.function ({ inherit src; @@ -15,14 +15,14 @@ args : with args; patch = null; meta = {}; doInstall = if args ? Install then - (FullDepEntry + (fullDepEntry args.Install (["doMake"] - ++ (lib.getAttr ["extraInstallDeps"] [] args)) + ++ (lib.attrByPath ["extraInstallDeps"] [] args)) ) - else FullDepEntry "" ["doMakeInstall"]; + else fullDepEntry "" ["doMakeInstall"]; - debPatch = FullDepEntry ((if args ? patch then '' + debPatch = fullDepEntry ((if args ? patch then '' gunzip < ${args.patch} | patch -Np1 '' else "") +'' diff --git a/pkgs/build-support/fetchdarcs/builder.sh b/pkgs/build-support/fetchdarcs/builder.sh index 7214eda4266..a211de42da4 100644 --- a/pkgs/build-support/fetchdarcs/builder.sh +++ b/pkgs/build-support/fetchdarcs/builder.sh @@ -5,11 +5,14 @@ tagflags="" if test -n "$tag"; then tagtext="(tag $tag) " tagflags="--tag=$tag" +elif test -n "$context"; then + tagtext="(context) " + tagflags="--context=$context" fi header "getting $url $partial ${tagtext} into $out" -darcs get --no-pristine-tree $partial $tagflags "$url" "$out" +darcs get --lazy --ephemeral $tagflags "$url" "$out" # remove metadata, because it can change rm -rf "$out/_darcs" diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix index b8dde18aa3e..63e4ecde88a 100644 --- a/pkgs/build-support/fetchdarcs/default.nix +++ b/pkgs/build-support/fetchdarcs/default.nix @@ -1,17 +1,13 @@ -{stdenv, darcs, nix}: {url, tag ? null, md5, partial ? true}: +{stdenv, darcs, nix}: {url, tag ? null, context ? null, md5 ? "", sha256 ? ""}: stdenv.mkDerivation { name = "fetchdarcs"; builder = ./builder.sh; - buildInputs = [darcs nix]; - partial = if partial then "--partial" else ""; + buildInputs = [darcs]; - # Nix <= 0.7 compatibility. - id = md5; - - outputHashAlgo = "md5"; + outputHashAlgo = if sha256 == "" then "md5" else "sha256"; outputHashMode = "recursive"; - outputHash = md5; + outputHash = if sha256 == "" then md5 else sha256; - inherit url tag; + inherit url tag context; } diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh new file mode 100644 index 00000000000..e43a2e37726 --- /dev/null +++ b/pkgs/build-support/fetchgit/builder.sh @@ -0,0 +1,13 @@ +source $stdenv/setup + +header "exporting $url (rev $rev) into $out" + +git clone --depth 1 "$url" $out +if test -n "$rev"; then + cd $out + git checkout $rev +fi +find $out -name .git\* | xargs rm -rf + +stopNest + diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix new file mode 100644 index 00000000000..3193057f321 --- /dev/null +++ b/pkgs/build-support/fetchgit/default.nix @@ -0,0 +1,23 @@ +{stdenv, git}: +{url, rev ? "HEAD", md5 ? "", sha256 ? ""}: + +stdenv.mkDerivation { + name = "git-export"; + builder = ./builder.sh; + buildInputs = [git]; + + outputHashAlgo = if sha256 == "" then "md5" else "sha256"; + outputHashMode = "recursive"; + outputHash = if sha256 == "" then md5 else sha256; + + inherit url rev ; + + impureEnvVars = [ + # We borrow these environment variables from the caller to allow + # easy proxy configuration. This is impure, but a fixed-output + # derivation like fetchurl is allowed to do so since its result is + # by definition pure. + "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" + ]; +} + diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git new file mode 100755 index 00000000000..29b3472596d --- /dev/null +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -0,0 +1,66 @@ +#! /bin/sh -e + +url=$1 +rev=$2 +expHash=$3 + +hashType=$NIX_HASH_ALGO +if test -z "$hashType"; then + hashType=md5 +fi + +if test -z "$url"; then + echo "syntax: nix-prefetch-git URL [REVISION [EXPECTED-HASH]]" >&2 + exit 1 +fi + +# If the hash was given, a file with that hash may already be in the +# store. +if test -n "$expHash"; then + finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" git-export) + if ! nix-store --check-validity "$finalPath" 2> /dev/null; then + finalPath= + fi + hash=$expHash +fi + + +# If we don't know the hash or a path with that hash doesn't exist, +# download the file and add it to the store. +if test -z "$finalPath"; then + + tmpPath=/tmp/git-checkout-tmp-$$ + tmpFile=$tmpPath/git-export + mkdir $tmpPath + + trap "rm -rf $tmpPath" EXIT + + # Perform the checkout. + git clone --depth 1 "$url" $tmpFile + if test -n "$rev"; then + cd $tmpFile + echo $tmpFile + git checkout $rev + fi + find $tmpFile -name .git\* | xargs rm -rf + + # Compute the hash. + hash=$(nix-hash --type $hashType $hashFormat $tmpFile) + if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi + + # Add the downloaded file to the Nix store. + finalPath=$(nix-store --add-fixed --recursive "$hashType" $tmpFile) + + if test -n "$expHash" -a "$expHash" != "$hash"; then + echo "hash mismatch for URL \`$url'" + exit 1 + fi +fi + +if ! test -n "$QUIET"; then echo "path is $finalPath" >&2; fi + +echo $hash + +if test -n "$PRINT_PATH"; then + echo $finalPath +fi diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh index 6ee0e82aca0..09358aa694b 100644 --- a/pkgs/build-support/fetchsvn/builder.sh +++ b/pkgs/build-support/fetchsvn/builder.sh @@ -6,6 +6,18 @@ if test "$sshSupport"; then export SVN_SSH="$openssh/bin/ssh" fi +if test -n "$http_proxy"; then + # Configure proxy + mkdir .subversion + proxy="${http_proxy#*://}" + + echo '[global]' > .subversion/servers + echo "http-proxy-host = ${proxy%:*}" >> .subversion/servers + echo "http-proxy-port = ${proxy##*:}" >> .subversion/servers + + export HOME="$PWD" +fi; + # Pipe the "p" character into Subversion to force it to accept the # server's certificate. This is perfectly safe: we don't care # whether the server is being spoofed --- only the cryptographic diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index 7775e392af4..5a5f7533e7f 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -11,4 +11,12 @@ stdenv.mkDerivation { outputHash = if sha256 == "" then md5 else sha256; inherit url rev sshSupport openssh; + + impureEnvVars = [ + # We borrow these environment variables from the caller to allow + # easy proxy configuration. This is impure, but a fixed-output + # derivation like fetchurl is allowed to do so since its result is + # by definition pure. + "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" + ]; } diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index bbdf5fb7b4e..22ba25e90a4 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -73,6 +73,9 @@ tryHashedMirrors() { } +# URL list may contain ?. No glob expansion for that, please +set -o noglob + urls2= for url in $urls; do if test "${url:0:9}" != "mirror://"; then @@ -102,6 +105,8 @@ for url in $urls; do done urls="$urls2" +# Restore globbing settings +set +o noglob if test -n "$showURLs"; then echo "$urls" > $out @@ -113,12 +118,18 @@ if test -n "$preferHashedMirrors"; then tryHashedMirrors fi +# URL list may contain ?. No glob expansion for that, please +set -o noglob + success= for url in $urls; do tryDownload "$url" if test -n "$success"; then finish; fi done +# Restore globbing settings +set +o noglob + if test -z "$preferHashedMirrors"; then tryHashedMirrors fi diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix index 91b41706099..d517a472d74 100644 --- a/pkgs/build-support/gcc-wrapper/default.nix +++ b/pkgs/build-support/gcc-wrapper/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { let gcc_ = if gcc != null then gcc else {}; in (if gcc_ ? meta then removeAttrs gcc.meta ["priority"] else {}) // { description = - stdenv.lib.getAttr ["meta" "description"] "System C compiler" gcc_ + stdenv.lib.attrByPath ["meta" "description"] "System C compiler" gcc_ + " (wrapper script)"; }; diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix new file mode 100644 index 00000000000..7f3b97a33b7 --- /dev/null +++ b/pkgs/build-support/make-desktopitem/default.nix @@ -0,0 +1,33 @@ +{stdenv}: +{ name +, type ? "Application" +, exec +, icon ? "" +, comment ? "" +, terminal ? "false" +, desktopName +, genericName +, mimeType ? "" +, categories ? "Application;Other;" +, encoding ? "UTF-8" +}: + +stdenv.mkDerivation { + inherit name; + buildCommand = '' + ensureDir $out/share/applications + cat > $out/share/applications/$name.desktop <> $out/nix-support/hydra-build-products stopNest done + + eval "$postInstall" ''; # */ meta = (if args ? meta then args.meta else {}) // { diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 703dc07a6e4..db005dbd052 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -24,6 +24,15 @@ stdenv.mkDerivation ( # Hack - swap checkPhase and installPhase (otherwise Stratego barfs). phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase ${if doCoverageAnalysis then "coverageReportPhase" else ""} finalPhase"; + + finalPhase = + '' + # Propagate the release name of the source tarball. This is + # to get nice package names in channels. + if test -e $origSrc/nix-support/hydra-release-name; then + cp $origSrc/nix-support/hydra-release-name $out/nix-support/hydra-release-name + fi + ''; } // args // @@ -77,16 +86,6 @@ stdenv.mkDerivation ( lcovFilter = ["/nix/store/*"] ++ lcovFilter; - finalPhase = - '' - # Propagate the release name of the source tarball. This is - # to get nice package names in channels. - if test -e $origSrc/nix-support/hydra-release-name; then - cp $origSrc/nix-support/hydra-release-name $out/nix-support/hydra-release-name - fi - ''; - - meta = (if args ? meta then args.meta else {}) // { description = if doCoverageAnalysis then "Coverage analysis" else "Native Nix build on ${stdenv.system}"; }; diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 8cf7c769440..7946a16006b 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -7,6 +7,8 @@ rec { inherit (kernelPackages_2_6_26) kernel; + klibcShrunk = pkgs.klibcShrunk.override { klibc = klibc_15; }; + modulesClosure = makeModulesClosure { inherit kernel; @@ -741,6 +743,28 @@ rec { archs = ["noarch" "x86_64"]; } // args); + fedora11i386 = args: makeImageFromRPMDist ({ + name = "fedora-11-i386"; + fullName = "Fedora 11 (i386)"; + packagesList = fetchurl { + url = mirror://fedora/linux/releases/11/Fedora/i386/os/repodata/36af1d88214b770fd3d814a5126083b8e808510c76acfdc3a234d6f7e43c2425-primary.xml.gz; + sha256 = "09947kjggmillb1zvb3n1i8his5qhdh1598lv39hyxsb4641vbrn"; + }; + urlPrefix = mirror://fedora/linux/releases/11/Fedora/i386/os; + archs = ["noarch" "i386" "i586"]; + } // args); + + fedora11x86_64 = args: makeImageFromRPMDist ({ + name = "fedora-11-x86_64"; + fullName = "Fedora 11 (x86_64)"; + packagesList = fetchurl { + url = mirror://fedora/linux/releases/11/Fedora/x86_64/os/repodata/c792495863f5314329c463d51860fc74c6367f72c3cb1c132f6c3290102d68da-primary.xml.gz; + sha256 = "1nk85l890ckc5w9irjy3f9zkdiklzih1imb3qhll6cgmcdc4k4n7"; + }; + urlPrefix = mirror://fedora/linux/releases/11/Fedora/x86_64/os; + archs = ["noarch" "x86_64"]; + } // args); + opensuse103i386 = args: makeImageFromRPMDist ({ name = "opensuse-10.3-i586"; fullName = "openSUSE 10.3 (i586)"; @@ -833,7 +857,7 @@ rec { fullName = "Ubuntu 9.04 Jaunty (i386)"; packagesList = fetchurl { url = mirror://ubuntu/dists/jaunty/main/binary-i386/Packages.bz2; - sha256 = "6378e8707f9f1324aac8bbc67daf56eee27f2e0a4a4c96792be032d1ca706a38"; + sha256 = "72c95e4901ad56ce8791723e2ae40bce2399f306f9956cac80e964011e1948d0"; }; urlPrefix = mirror://ubuntu; } // args); @@ -1009,6 +1033,8 @@ rec { fedora9x86_64 = diskImageFuns.fedora9x86_64 { packages = commonFedoraPackages; }; fedora10i386 = diskImageFuns.fedora10i386 { packages = commonFedoraPackages; }; fedora10x86_64 = diskImageFuns.fedora10x86_64 { packages = commonFedoraPackages; }; + fedora11i386 = diskImageFuns.fedora11i386 { packages = commonFedoraPackages; }; + fedora11x86_64 = diskImageFuns.fedora11x86_64 { packages = commonFedoraPackages; }; opensuse103i386 = diskImageFuns.opensuse103i386 { packages = commonOpenSUSEPackages ++ ["devs"]; }; opensuse110i386 = diskImageFuns.opensuse110i386 { packages = commonOpenSUSEPackages; }; opensuse110x86_64 = diskImageFuns.opensuse110x86_64 { packages = commonOpenSUSEPackages; }; diff --git a/pkgs/build-support/vm/rpm/rpm-closure.pl b/pkgs/build-support/vm/rpm/rpm-closure.pl index c3e8d52a4c6..5f333fdfe80 100644 --- a/pkgs/build-support/vm/rpm/rpm-closure.pl +++ b/pkgs/build-support/vm/rpm/rpm-closure.pl @@ -103,10 +103,15 @@ print "[\n\n"; foreach my $pkgName (@needed) { my $pkg = $pkgs{$pkgName}; - die if $pkg->{checksum}->{type} ne "sha"; print " (fetchurl {\n"; print " url = $urlPrefix/$pkg->{location}->{href};\n"; - print " sha1 = \"$pkg->{checksum}->{content}\";\n"; + if ($pkg->{checksum}->{type} eq "sha") { + print " sha1 = \"$pkg->{checksum}->{content}\";\n"; + } elsif ($pkg->{checksum}->{type} eq "sha256") { + print " sha256 = \"$pkg->{checksum}->{content}\";\n"; + } else { + die "unsupported hash type"; + } print " })\n"; print "\n"; } diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/data/fonts/arkpandora/default.nix index 02ee3346346..049bc8c911c 100644 --- a/pkgs/data/fonts/arkpandora/default.nix +++ b/pkgs/data/fonts/arkpandora/default.nix @@ -1,5 +1,5 @@ args : with args; -let version = lib.getAttr ["version"] "2.04" args; in +let version = lib.attrByPath ["version"] "2.04" args; in rec { src = fetchurl { url = "http://www.users.bigpond.net.au/gavindi/ttf-arkpandora-${version}.tgz"; diff --git a/pkgs/data/fonts/clearlyU/1.9.nix b/pkgs/data/fonts/clearlyU/1.9.nix index 3ff5db2c60c..6d2b9ffb812 100644 --- a/pkgs/data/fonts/clearlyU/1.9.nix +++ b/pkgs/data/fonts/clearlyU/1.9.nix @@ -7,7 +7,7 @@ args : with args; with builderDefs; }; buildInputs = [mkfontdir mkfontscale]; configureFlags = []; - doInstall = FullDepEntry ('' + doInstall = fullDepEntry ('' tar xf ${src} ensureDir $out/share/fonts/ cp *.bdf $out/share/fonts diff --git a/pkgs/data/fonts/fontWrap/default.nix b/pkgs/data/fonts/fontWrap/default.nix index 2c749ea609e..fdf1a771842 100644 --- a/pkgs/data/fonts/fontWrap/default.nix +++ b/pkgs/data/fonts/fontWrap/default.nix @@ -6,7 +6,7 @@ args : with args; }; in with localDefs; let - doInstall = FullDepEntry (" + doInstall = fullDepEntry (" ensureDir \$out/share/fonts/ cd \$out/share/fonts for i in ${toString paths}; do diff --git a/pkgs/data/fonts/junicode/0.6.15.nix b/pkgs/data/fonts/junicode/0.6.15.nix index b31b04c0f5b..1a8497bebb7 100644 --- a/pkgs/data/fonts/junicode/0.6.15.nix +++ b/pkgs/data/fonts/junicode/0.6.15.nix @@ -8,7 +8,7 @@ args : with args; with builderDefs; buildInputs = [unzip]; configureFlags = []; - doInstall = FullDepEntry ('' + doInstall = fullDepEntry ('' unzip ${src} ensureDir $out/share/fonts/junicode-ttf cp *.ttf $out/share/fonts/junicode-ttf diff --git a/pkgs/data/fonts/lmodern/0.92.nix b/pkgs/data/fonts/lmodern/0.92.nix index 0ac51a0303f..556b9f99876 100644 --- a/pkgs/data/fonts/lmodern/0.92.nix +++ b/pkgs/data/fonts/lmodern/0.92.nix @@ -11,7 +11,7 @@ rec { /* doConfigure should be specified separately */ phaseNames = ["doCopy"]; - doCopy = FullDepEntry('' + doCopy = fullDepEntry('' ensureDir $out/share/texmf/fonts/enc ensureDir $out/share/texmf/fonts/map ensureDir $out/share/texmf/fonts/type1/public/lm diff --git a/pkgs/data/fonts/lmodern/1.010.nix b/pkgs/data/fonts/lmodern/1.010.nix index 9c82b702824..6948fa4cbbe 100644 --- a/pkgs/data/fonts/lmodern/1.010.nix +++ b/pkgs/data/fonts/lmodern/1.010.nix @@ -11,7 +11,7 @@ rec { /* doConfigure should be specified separately */ phaseNames = ["doCopy"]; - doCopy = FullDepEntry('' + doCopy = fullDepEntry('' ensureDir $out/share/texmf/ ensureDir $out/share/fonts/ diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index 0e46ee544b2..fff75f4e5ae 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -3,11 +3,10 @@ stdenv.mkDerivation { name = "redhat-liberation"; src = fetchurl { - url = http://www.redhat.com/f/fonts/liberation-fonts.tar.gz; - sha256 = "5749c27f3deb5da323961e86efed1306fc072bea9065790d0047ad61471be6a5"; + url = https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-1.04.tar.gz; + sha256 = "189i6pc4jqhhmsb9shi8afg9af9crpmz9bnlldhqaxavr1bhj38f"; }; - unpackPhase = ''tar -xvf "$src" && sourceRoot="$PWD/liberation-fonts"''; installPhase = '' ensureDir $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix index 13b95326b2f..4901c7486c3 100644 --- a/pkgs/data/fonts/ucs-fonts/default.nix +++ b/pkgs/data/fonts/ucs-fonts/default.nix @@ -4,12 +4,12 @@ let srcA= fetchurl { url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts.tar.gz; - sha256 = "11vripxw9dgasbgcgs1z4hc1yjdypby2grj6y3c1a0c9w3v40kix"; + sha256 = "12hgizg25fzmk10wjl0c88x97h3pg5r9ga122s3y28wixz6x2bvh"; }; srcB= fetchurl { url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-asian.tar.gz; - sha256 = "0fgka3vy8agbkp6xjq7igilbv88p8m9hh2qyikqhcm2qajdvzc4j"; + sha256 = "0ibjy4xpz5j373hsdr8bx99czfpclqmviwwv768j8n7z12z3wa51"; }; srcC= fetchurl { diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index dd525aa3d78..6a0bb54e516 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -1,23 +1,25 @@ args: with args; with debPackage; debBuild ({ src = fetchurl { - url = mirror://debian/pool/main/u/unifont/unifont_1.0.orig.tar.gz; - sha256 = "0bg8d6c7w51n5409g0n7vqk3aagbzb5aird5r02vw0yz7w6i729l"; + url = mirror://debian/pool/main/u/unifont/unifont_5.1.20080914.orig.tar.gz; + sha256 = "1p8f3dkg0zy9f5hwn1q728hps258ll84xg9a7xqbhj2csvnsyajd"; }; patch = fetchurl { - url = mirror://debian/pool/main/u/unifont/unifont_1.0-4.diff.gz; - sha256 = "08j0rrf7hc05izchmsx9f9hg7vnyqdvbmba4b9jl8wfhvd1b09fd"; + url = mirror://debian/pool/main/u/unifont/unifont_5.1.20080914-1.diff.gz; + sha256 = "0faicwbjlgy78zrc94ffg52f71msll8kxc43bks40z8qb02nr7qx"; }; - name = "unifont-1.0-4"; + name = "unifont-5.1-20080914"; buildInputs = [mkfontscale mkfontdir bdftopcf fontutil perl]; meta = { description = "Unicode font for Base Multilingual Plane."; }; - extraReplacements = ''sed -e s@/usr/bin/perl@${perl}/bin/perl@ -i hex2bdf.unsplit''; + #extraReplacements = ''sed -e s@/usr/bin/perl@${perl}/bin/perl@ -i hex2bdf.unsplit''; omitConfigure = true; Install = '' - ensureDir $out/share/fonts - cp unifont.pcf $out/share/fonts + ensureDir $out/share/fonts $out/share/fonts/truetype + cd font/precompiled + cp unifont.pcf.gz $out/share/fonts + cp unifont.ttf $out/share/fonts/truetype cd $out/share/fonts mkfontdir mkfontscale diff --git a/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix b/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix index 5d4866daf28..edf9f8c40ff 100644 --- a/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix +++ b/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix @@ -8,7 +8,7 @@ args : with args; with builderDefs; buildInputs = []; configureFlags = []; - doInstall = FullDepEntry ('' + doInstall = fullDepEntry ('' ensureDir $out/share/fonts cp *.ttf $out/share/fonts '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index 8c406f35a27..a8935700166 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -1,12 +1,17 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "iana-etc-2.20"; +stdenv.mkDerivation rec { + name = "iana-etc-2.30"; src = fetchurl { - url = http://www.sethwklein.net/projects/iana-etc/downloads/iana-etc-2.20.tar.bz2; - md5 = "51d584b7b6115528c21e8ea32250f2b1"; + url = "http://sethwklein.net/projects/iana-etc/downloads/${name}.tar.bz2"; + sha256 = "03gjlg5zlwsdk6qyw3v85l129rna5bpm4m7pzrp864h0n97qg9mr"; }; preInstall = "installFlags=\"PREFIX=$out\""; + + meta = { + homepage = http://sethwklein.net/projects/iana-etc/; + description = "IANA protocol and port number assignments (/etc/protocols and /etc/services)"; + }; } diff --git a/pkgs/data/misc/xkeyboard-config/default.nix b/pkgs/data/misc/xkeyboard-config/default.nix index 9e5b9f9e4d8..4fb3a68f5d1 100644 --- a/pkgs/data/misc/xkeyboard-config/default.nix +++ b/pkgs/data/misc/xkeyboard-config/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation { buildInputs = [perl perlXMLParser xkbcomp gettext intltool]; + patches = [ ./eo.patch ]; + ICONV = "iconv"; preConfigure = '' diff --git a/pkgs/data/misc/xkeyboard-config/eo.patch b/pkgs/data/misc/xkeyboard-config/eo.patch index 3709d110917..f288a5c0f6d 100644 --- a/pkgs/data/misc/xkeyboard-config/eo.patch +++ b/pkgs/data/misc/xkeyboard-config/eo.patch @@ -1,15 +1,3 @@ -diff --git a/rules/base.lst b/rules/base.lst -index 7004bcd..804f9f0 100644 ---- a/rules/base.lst -+++ b/rules/base.lst -@@ -168,6 +168,7 @@ - nl Netherlands - bt Bhutan - ee Estonia -+ eo Esperanto - ir Iran - iq Iraq - fo Faroe Islands diff --git a/rules/base.xml.in b/rules/base.xml.in index ec321f8..e9c3546 100644 --- a/rules/base.xml.in diff --git a/pkgs/desktops/gnome-2.26/default.nix b/pkgs/desktops/gnome-2.26/default.nix new file mode 100644 index 00000000000..49a113e5b64 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/default.nix @@ -0,0 +1,244 @@ +pkgs: + +rec { +#### PLATFORM + audiofile = import ./platform/audiofile { + inherit (pkgs) stdenv fetchurl; + }; + + esound = import ./platform/esound { + inherit (pkgs) stdenv fetchurl pkgconfig alsaLib; + inherit audiofile; + }; + + libIDL = import ./platform/libIDL { + inherit (pkgs) stdenv fetchurl flex bison pkgconfig; + inherit (pkgs.gtkLibs) glib; + }; + + ORBit2 = import ./platform/ORBit2 { + inherit (pkgs) stdenv fetchurl pkgconfig; + inherit (pkgs.gtkLibs) glib; + inherit libIDL; + }; + + libart_lgpl = import ./platform/libart_lgpl { + inherit (pkgs) stdenv fetchurl; + }; + + libglade = import ./platform/libglade { + inherit (pkgs) stdenv fetchurl pkgconfig libxml2 expat python gettext; + inherit (pkgs.gtkLibs) gtk; + }; + + intltool = import ./platform/intltool { + inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser gettext; + }; + + GConf = import ./platform/GConf { + inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxml2 expat policyKit; + inherit (pkgs.gtkLibs) glib gtk; + inherit intltool ORBit2; + }; + + libgnomecanvas = import ./platform/libgnomecanvas { + inherit (pkgs) stdenv fetchurl pkgconfig cairo; + inherit (pkgs.gtkLibs) glib gtk pango atk; + inherit intltool libart_lgpl libglade; + }; + + gnome_mime_data = import ./platform/gnome-mime-data { + inherit (pkgs) stdenv fetchurl; + inherit intltool; + }; + + gnome_vfs = import ./platform/gnome-vfs { + inherit (pkgs) stdenv fetchurl pkgconfig libxml2 bzip2 openssl samba dbus_glib fam hal cdparanoia; + inherit (pkgs.gtkLibs) glib; + inherit intltool GConf gnome_mime_data; + }; + + gnome_vfs_monikers = import ./platform/gnome-vfs-monikers { + inherit (pkgs) stdenv fetchurl pkgconfig; + inherit (pkgs.gtkLibs) glib; + inherit intltool gnome_vfs libbonobo ORBit2; + }; + + libgnome = import ./platform/libgnome { + inherit (pkgs) stdenv fetchurl pkgconfig popt; + inherit (pkgs.gtkLibs) glib; + inherit intltool esound audiofile libbonobo GConf gnome_vfs ORBit2; + }; + + libgnomeui = import ./platform/libgnomeui { + inherit (pkgs) stdenv fetchurl pkgconfig libxml2 popt cairo; + inherit (pkgs.xlibs) libX11 libICE; + inherit (pkgs.gtkLibs) glib gtk atk pango; + inherit intltool libgnome libgnomecanvas libbonobo libbonoboui GConf; + inherit gnome_vfs gnome_keyring libglade libart_lgpl ORBit2; + }; + + libbonobo = import ./platform/libbonobo { + inherit (pkgs) stdenv fetchurl flex bison pkgconfig dbus_glib libxml2 popt; + inherit (pkgs.gtkLibs) glib; + inherit intltool ORBit2; + }; + + libbonoboui = import ./platform/libbonoboui { + inherit (pkgs) stdenv fetchurl bison pkgconfig popt libxml2 cairo; + inherit (pkgs.gtkLibs) glib gtk atk pango; + inherit intltool libbonobo GConf libgnomecanvas libgnome libglade ORBit2 libart_lgpl; + }; + + at_spi = import ./platform/at-spi { + inherit (pkgs) stdenv fetchurl python pkgconfig popt; + inherit (pkgs.xlibs) libX11 libICE libXtst libXi; + inherit (pkgs.gtkLibs) atk gtk; + inherit intltool libbonobo ORBit2; + }; + + gtk_doc = import ./platform/gtk-doc { + inherit (pkgs) stdenv fetchurl pkgconfig perl python libxml2 libxslt; + inherit (pkgs) docbook_xml_dtd_43 docbook_xsl; + inherit gnome_doc_utils; + }; + + # Freedesktop library + startup_notification = import ./platform/startup-notification { + inherit (pkgs) stdenv fetchurl pkgconfig; + inherit (pkgs.xlibs) libX11 libxcb libICE xcbutil libSM; + }; + + # Required for nautilus + libunique = import ./platform/libunique { + inherit (pkgs) stdenv fetchurl pkgconfig gettext; + inherit (pkgs.gtkLibs) gtk; + }; + +#### DESKTOP + + gnome_keyring = import ./desktop/gnome-keyring { + inherit (pkgs) stdenv fetchurl pkgconfig dbus libgcrypt libtasn1 pam hal python; + inherit (pkgs.gtkLibs) glib gtk; + inherit intltool GConf; + }; + + libsoup = import ./desktop/libsoup { + inherit (pkgs) stdenv fetchurl pkgconfig libxml2 gnutls libproxy sqlite curl; + inherit (pkgs.gtkLibs) glib; + inherit GConf; + }; + + libwnck = import ./desktop/libwnck { + inherit (pkgs) stdenv fetchurl pkgconfig; + inherit (pkgs.xlibs) libX11; + inherit (pkgs.gtkLibs) gtk; + inherit intltool; + }; + + # Not part of GNOME desktop, but provides CSS support for librsvg + libcroco = import ./desktop/libcroco { + inherit (pkgs) stdenv fetchurl pkgconfig libxml2; + inherit (pkgs.gtkLibs) glib; + }; + + librsvg = import ./desktop/librsvg { + inherit (pkgs) stdenv fetchurl pkgconfig libxml2 libgsf bzip2; + inherit (pkgs.gtkLibs) glib gtk; + inherit libcroco; + }; + + libgweather = import ./desktop/libgweather { + inherit (pkgs) stdenv fetchurl pkgconfig libxml2; + inherit (pkgs.gtkLibs) gtk; + inherit intltool GConf libsoup; + }; + + gvfs = import ./desktop/gvfs { + inherit (pkgs) stdenv fetchurl pkgconfig dbus samba hal libarchive fuse libgphoto2 cdparanoia libxml2 libtool; + inherit (pkgs.gtkLibs) glib; + inherit intltool GConf gnome_keyring libsoup; + }; + + libgnomekbd = import ./desktop/libgnomekbd { + inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier; + inherit (pkgs.gtkLibs) glib gtk; + inherit intltool GConf libglade; + }; + + # Removed from recent GNOME releases, but still required + scrollkeeper = import ./desktop/scrollkeeper { + inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser libxml2 libxslt docbook_xml_dtd_42; + }; + + gnome_doc_utils = import ./desktop/gnome-doc-utils { + inherit (pkgs) stdenv fetchurl python pkgconfig libxml2 libxslt; + inherit intltool scrollkeeper; + }; + + zenity = import ./desktop/zenity { + inherit (pkgs) stdenv fetchurl pkgconfig cairo libxml2 libxslt; + inherit (pkgs.gtkLibs) glib gtk pango atk; + inherit gnome_doc_utils intltool libglade; + inherit (pkgs.xlibs) libX11; + }; + + metacity = import ./desktop/metacity { + inherit (pkgs) stdenv fetchurl pkgconfig; + inherit (pkgs.gtkLibs) glib gtk; + inherit (pkgs.xlibs) libXcomposite libXcursor libXdamage; + inherit intltool GConf startup_notification zenity gnome_doc_utils; + }; + + gnome_menus = import ./desktop/gnome-menus { + inherit (pkgs) stdenv fetchurl pkgconfig python; + inherit (pkgs.gtkLibs) glib; + inherit intltool; + }; + + gnome_desktop = import ./desktop/gnome-desktop { + inherit (pkgs) stdenv fetchurl pkgconfig python libxslt which; + libxml2 = pkgs.libxml2Python; + inherit (pkgs.xlibs) libX11; + inherit (pkgs.gtkLibs) gtk; + inherit intltool GConf gnome_doc_utils; + }; + + gnome_panel = import ./desktop/gnome-panel { + inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib dbus cairo popt which bzip2 python libxslt; + libxml2 = pkgs.libxml2Python; + inherit (pkgs.gtkLibs) glib gtk pango atk; + inherit (pkgs.xlibs) libXau; + inherit intltool ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf gnome_menus gnome_desktop; + inherit libwnck librsvg libgweather gnome_doc_utils libgnomecanvas libart_lgpl; + }; + + gnome_session = import ./desktop/gnome-session { + inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib cairo dbus; + inherit (pkgs.gtkLibs) gtk pango atk; + inherit (pkgs.xlibs) libXau libXtst inputproto; + inherit intltool libglade startup_notification GConf; + }; + + gnome_settings_daemon = import ./desktop/gnome-settings-daemon { + inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier; + inherit (pkgs.gtkLibs) gtk; + inherit intltool GConf gnome_desktop libglade libgnomekbd; + }; + + gnome_control_center = import ./desktop/gnome-control-center { + inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier hal; + inherit (pkgs) cairo popt which python libxslt shared_mime_info desktop_file_utils; + inherit (pkgs.gtkLibs) glib gtk pango atk; + inherit gnome_doc_utils intltool GConf libglade libgnome libgnomeui libgnomekbd; + inherit librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon; + inherit libbonobo libbonoboui libgnomecanvas libart_lgpl gnome_vfs ORBit2; + libxml2 = pkgs.libxml2Python; + }; + + nautilus = import ./desktop/nautilus { + inherit (pkgs) stdenv fetchurl pkgconfig libxml2 dbus_glib libexif shared_mime_info; + inherit (pkgs.gtkLibs) gtk; + inherit gnome_desktop libunique intltool GConf; + }; +} diff --git a/pkgs/desktops/gnome-2.26/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2.26/desktop/gnome-control-center/default.nix new file mode 100644 index 00000000000..6a7d54b8f09 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/desktop/gnome-control-center/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, libxklavier, hal, cairo, popt, which, python +, shared_mime_info, desktop_file_utils +, glib, gtk, pango, atk, gnome_doc_utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd +, librsvg, gnome_menus, gnome_desktop, gnome_panel, metacity, gnome_settings_daemon +, libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2}: + +stdenv.mkDerivation { + name = "gnome-control-center-2.26.0"; + src = fetchurl { + url = mirror://gnome/desktop/2.26/2.26.2/sources/gnome-control-center-2.26.0.tar.bz2; + sha256 = "01cwx784whzz9pnn3xvjgwqjyb187bmr56r5qm9im5sk23m89yv2"; + }; + buildInputs = [ pkgconfig dbus_glib libxml2 libxslt libxklavier hal popt which python shared_mime_info desktop_file_utils + gtk gnome_doc_utils intltool GConf libglade libgnomekbd + libgnomeui librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon ]; + configureFlags = "--disable-scrollkeeper"; + # This makes me cry + CPPFLAGS = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include "+ + "-I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${cairo}/include/cairo "+ + "-I${pango}/include/pango-1.0 -I${atk}/include/atk-1.0 "+ + "-I${gnome_desktop}/include/gnome-desktop-2.0 -I${gnome_menus}/include/gnome-menus "+ + "-I${libgnomeui}/include/libgnomeui-2.0 -I${libbonoboui}/include/libbonoboui-2.0 "+ + "-I${libgnomecanvas}/include/libgnomecanvas-2.0 -I${libart_lgpl}/include/libart-2.0 "+ + "-I${libgnome}/include/libgnome-2.0 -I${gnome_vfs}/include/gnome-vfs-2.0 "+ + "-I${libbonobo}/include/libbonobo-2.0 -I${libbonobo}/include/bonobo-activation-2.0 "+ + "-I${ORBit2}/include/orbit-2.0 -I${GConf}/include/gconf/2 -I${librsvg}/include/librsvg-2 "+ + "-I${gnome_panel}/include/panel-2.0"; + LIBS = "-lXft -lglib-2.0 -lgtk-x11-2.0 -lrsvg-2 -lgconf-2 -lgnome-desktop-2 -lgnome-menu -lgnomeui-2"; +} diff --git a/pkgs/desktops/gnome-2.26/desktop/gnome-desktop/default.nix b/pkgs/desktops/gnome-2.26/desktop/gnome-desktop/default.nix new file mode 100644 index 00000000000..ae6651aac32 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/desktop/gnome-desktop/default.nix @@ -0,0 +1,13 @@ +{ stdenv, fetchurl, pkgconfig, python, libxml2, libxslt, which, libX11, gtk +, intltool, GConf, gnome_doc_utils}: + +stdenv.mkDerivation { + name = "gnome-desktop-2.26.2"; + src = fetchurl { + url = mirror://gnome/desktop/2.26/2.26.2/sources/gnome-desktop-2.26.2.tar.bz2; + sha256 = "0aphqbrgczcng1wgkgjkcy5nw88y407d4flcs0bszicqrvzsyl2d"; + }; + configureFlags = "--disable-scrollkeeper"; + buildInputs = [ pkgconfig python libxml2 libxslt which libX11 gtk + intltool GConf gnome_doc_utils ]; +} diff --git a/pkgs/desktops/gnome-2.26/desktop/gnome-doc-utils/default.nix b/pkgs/desktops/gnome-2.26/desktop/gnome-doc-utils/default.nix new file mode 100644 index 00000000000..fae5003519e --- /dev/null +++ b/pkgs/desktops/gnome-2.26/desktop/gnome-doc-utils/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl, python, pkgconfig, libxml2, libxslt, intltool, scrollkeeper}: + +stdenv.mkDerivation { + name = "gnome-doc-utils-0.16.1"; + src = fetchurl { + url = mirror://gnome/desktop/2.26/2.26.2/sources/gnome-doc-utils-0.16.1.tar.bz2; + sha256 = "0j722qk8drib65abbjsva0cq25wzq7adag9m7hxjpi7wdvqcgq3k"; + }; + configureFlags = "--disable-scrollkeeper"; + buildInputs = [ python pkgconfig libxml2 libxslt intltool scrollkeeper ]; +} diff --git a/pkgs/desktops/gnome-2.26/desktop/gnome-keyring/default.nix b/pkgs/desktops/gnome-2.26/desktop/gnome-keyring/default.nix new file mode 100644 index 00000000000..80c5578390d --- /dev/null +++ b/pkgs/desktops/gnome-2.26/desktop/gnome-keyring/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, hal, python, glib, gtk, intltool, GConf}: + +stdenv.mkDerivation { + name = "gnome-keyring-2.26.1"; + src = fetchurl { + url = mirror://gnome/desktop/2.26/2.26.2/sources/gnome-keyring-2.26.1.tar.bz2; + sha256 = "09krpx4nrcrf0ghvfcpg3gxnna6a97drya36ypcijb35cdwrm9s7"; + }; + buildInputs = [ pkgconfig dbus.libs libgcrypt libtasn1 pam hal python glib gtk intltool GConf ]; +} diff --git a/pkgs/desktops/gnome-2.26/desktop/gnome-menus/default.nix b/pkgs/desktops/gnome-2.26/desktop/gnome-menus/default.nix new file mode 100644 index 00000000000..fabd18bf1c0 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/desktop/gnome-menus/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, pkgconfig, python, glib, intltool}: + +stdenv.mkDerivation { + name = "gnome-menus-2.26.1"; + src = fetchurl { + url = mirror://gnome/desktop/2.26/2.26.2/sources/gnome-menus-2.26.1.tar.bz2; + sha256 = "1r44zrmkb2s29f32q8pn06khr50s3b2kcbmkgfl5gvrsczv9cmia"; + }; + buildInputs = [ pkgconfig python glib intltool ]; +} diff --git a/pkgs/desktops/gnome-2.26/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2.26/desktop/gnome-panel/default.nix new file mode 100644 index 00000000000..82dfea538c2 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/desktop/gnome-panel/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, dbus_glib, dbus, cairo, popt, which, libxml2, libxslt, bzip2, python +, glib, gtk, pango, atk, libXau +, intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome_desktop +, libwnck, librsvg, libgweather, gnome_doc_utils, libgnomecanvas, libart_lgpl}: + +stdenv.mkDerivation { + name = "gnome-panel-2.26.2"; + src = fetchurl { + url = mirror://gnome/desktop/2.26/2.26.2/sources/gnome-panel-2.26.2.tar.bz2; + sha256 = "1sghh2jj306ckdh65c73kqrdpx3zx7j4bbw9gj65wsad3hv40hgb"; + }; + buildInputs = [ pkgconfig gtk dbus_glib popt which libxml2 libxslt bzip2 python libXau + intltool ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf gnome_menus gnome_desktop + libwnck librsvg libgweather gnome_doc_utils ]; + configureFlags = "--disable-scrollkeeper"; + CPPFLAGS = "-I${glib}/include/glib-2.0 -I${glib}/include/gio-unix-2.0 -I${glib}/lib/glib-2.0/include -I${dbus_glib}/include/dbus-1.0 -I${dbus.libs}/include/dbus-1.0 "+ + "-I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${cairo}/include/cairo -I${pango}/include/pango-1.0 "+ + "-I${atk}/include/atk-1.0 -I${ORBit2}/include/orbit-2.0 -I${libbonobo}/include/bonobo-activation-2.0 "+ + "-I${libgnomeui}/include/libgnomeui-2.0 -I${libgnome}/include/libgnome-2.0 -I${GConf}/include/gconf/2 "+ + "-I${libglade}/include/libglade-2.0 -I${gnome_menus}/include/gnome-menus -I${gnome_desktop}/include/gnome-desktop-2.0 "+ + "-I${libbonoboui}/include/libbonoboui-2.0 -I${libbonobo}/include/libbonobo-2.0 -I${libgnomecanvas}/include/libgnomecanvas-2.0 "+ + "-I${libart_lgpl}/include/libart-2.0 -I${librsvg}/include/librsvg-2 -I${libwnck}/include/libwnck-1.0"; + LIBS = "-lORBit-2 -lbonobo-2 -lgtk-x11-2.0 -lgconf-2 -lgnomeui-2 -lglade-2.0 -lgnome-menu -lgnome-desktop-2 -lrsvg-2 -lwnck-1"; +} diff --git a/pkgs/desktops/gnome-2.26/desktop/gnome-session/default.nix b/pkgs/desktops/gnome-2.26/desktop/gnome-session/default.nix new file mode 100644 index 00000000000..79f58c64d2f --- /dev/null +++ b/pkgs/desktops/gnome-2.26/desktop/gnome-session/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, pkgconfig, dbus_glib, cairo, dbus, gtk, pango, atk, libXau, libXtst, inputproto +, intltool, libglade, startup_notification, GConf}: + +stdenv.mkDerivation { + name = "gnome-session-2.26.1"; + src = fetchurl { + url = mirror://gnome/desktop/2.26/2.26.2/sources/gnome-session-2.26.1.tar.bz2; + sha256 = "0cmw1p07gw7bjiq31mmm7fjhr84zq7x7rzbphfws4sgd8bn09qrm"; + }; + buildInputs = [ pkgconfig dbus_glib gtk libXau libXtst inputproto intltool libglade startup_notification GConf ]; + CPPFLAGS = "-I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${dbus_glib}/include/dbus-1.0 "+ + "-I${pango}/include/pango-1.0 -I${atk}/include/atk-1.0 -I${cairo}/include/cairo "+ + "-I${dbus.libs}/include/dbus-1.0 -I${dbus.libs}/lib/dbus-1.0/include "+ + "-I${libglade}/include/libglade-2.0"; + LIBS = "-lglade-2.0 -ldbus-glib-1"; +} diff --git a/pkgs/desktops/gnome-2.26/desktop/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-2.26/desktop/gnome-settings-daemon/default.nix new file mode 100644 index 00000000000..d00cada7ea2 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/desktop/gnome-settings-daemon/default.nix @@ -0,0 +1,11 @@ +{ stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, gtk +, intltool, GConf, gnome_desktop, libglade, libgnomekbd}: + +stdenv.mkDerivation { + name = "gnome-settings-daemon-2.26.1"; + src = fetchurl { + url = mirror://gnome/desktop/2.26/2.26.2/sources/gnome-settings-daemon-2.26.1.tar.bz2; + sha256 = "100ax9dfcd0wzfsdv4p75qq950hqvpqnsa315wq5wj7yhjm1vzsd"; + }; + buildInputs = [ pkgconfig intltool dbus_glib libxklavier gtk GConf gnome_desktop libglade libgnomekbd ]; +} diff --git a/pkgs/desktops/gnome-2.26/desktop/gvfs/builder.sh b/pkgs/desktops/gnome-2.26/desktop/gvfs/builder.sh new file mode 100644 index 00000000000..5be453c09a2 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/desktop/gvfs/builder.sh @@ -0,0 +1,9 @@ +source $stdenv/setup + +myPatchPhase() +{ + sed -i -e "/giomodulesdir=/ agiomodulesdir=$out/lib/gio" configure +} + +patchPhase=myPatchPhase +genericBuild diff --git a/pkgs/desktops/gnome-2.26/desktop/gvfs/default.nix b/pkgs/desktops/gnome-2.26/desktop/gvfs/default.nix new file mode 100644 index 00000000000..8ecceda63d5 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/desktop/gvfs/default.nix @@ -0,0 +1,13 @@ +{ stdenv, fetchurl, pkgconfig, dbus, samba, hal, libarchive, fuse, libgphoto2 +, cdparanoia, libxml2, libtool, glib, intltool, GConf, gnome_keyring, libsoup}: + +stdenv.mkDerivation { + name = "gvfs-1.2.3"; + src = fetchurl { + url = mirror://gnome/desktop/2.26/2.26.2/sources/gvfs-1.2.3.tar.bz2; + sha256 = "0yaq7qi9da963ppp7jlgac3zzwlhczpp1swdbaklnl343c64hp9r"; + }; + builder = ./builder.sh; + buildInputs = [ pkgconfig dbus.libs samba hal libarchive fuse libgphoto2 cdparanoia libxml2 libtool + glib intltool GConf gnome_keyring libsoup ]; +} diff --git a/pkgs/desktops/gnome-2.26/desktop/libcroco/default.nix b/pkgs/desktops/gnome-2.26/desktop/libcroco/default.nix new file mode 100644 index 00000000000..e724940e31d --- /dev/null +++ b/pkgs/desktops/gnome-2.26/desktop/libcroco/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, pkgconfig, libxml2, glib}: + +stdenv.mkDerivation { + name = "libcroco-0.6.2"; + src = fetchurl { + url = mirror://gnome/sources/libcroco/0.6/libcroco-0.6.2.tar.bz2; + sha256 = "0j8p6xlpdhhbzjznr7rx7jiy3fi95qib0gsnkv9n76y0chzqa95y"; + }; + buildInputs = [ pkgconfig libxml2 glib ]; +} diff --git a/pkgs/desktops/gnome-2.26/desktop/libgnomekbd/default.nix b/pkgs/desktops/gnome-2.26/desktop/libgnomekbd/default.nix new file mode 100644 index 00000000000..1a0ff9f51b7 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/desktop/libgnomekbd/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, glib, gtk, intltool, GConf, libglade}: + +stdenv.mkDerivation { + name = "libgnomekbd-2.26.0"; + src = fetchurl { + url = mirror://gnome/desktop/2.26/2.26.2/sources/libgnomekbd-2.26.0.tar.bz2; + sha256 = "0krn24c7c207vhsaizz5vybyni2rc2x245p3hv9sivgayd93b996"; + }; + buildInputs = [ pkgconfig dbus_glib libxklavier glib gtk intltool GConf libglade ]; +} diff --git a/pkgs/desktops/gnome-2.26/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2.26/desktop/libgweather/default.nix new file mode 100644 index 00000000000..524e6b415db --- /dev/null +++ b/pkgs/desktops/gnome-2.26/desktop/libgweather/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup}: + +stdenv.mkDerivation { + name = "libgweather-2.26.1"; + src = fetchurl { + url = mirror://gnome/desktop/2.26/2.26.2/sources/libgweather-2.26.1.tar.bz2; + sha256 = "0hhqf4w5n3jxsl2g1a772vawlpkj4k59nikil3a6z1pcw3gygkdc"; + }; + configureFlags = "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo"; + buildInputs = [ pkgconfig libxml2 gtk intltool GConf libsoup ]; +} diff --git a/pkgs/desktops/gnome-2.26/desktop/librsvg/default.nix b/pkgs/desktops/gnome-2.26/desktop/librsvg/default.nix new file mode 100644 index 00000000000..e8b42df29d3 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/desktop/librsvg/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, pkgconfig, libxml2, libgsf, bzip2, glib, gtk, libcroco}: + +stdenv.mkDerivation { + name = "librsvg-2.26.0"; + src = fetchurl { + url = mirror://gnome/desktop/2.26/2.26.2/sources/librsvg-2.26.0.tar.bz2; + sha256 = "1sivagvlyr58hxgazr6pyq3yfxbg0wrv7rgzsk5xi631v3qbbjpx"; + }; + buildInputs = [ pkgconfig libxml2 libgsf bzip2 glib gtk libcroco ]; +} diff --git a/pkgs/desktops/gnome-2.26/desktop/libsoup/default.nix b/pkgs/desktops/gnome-2.26/desktop/libsoup/default.nix new file mode 100644 index 00000000000..9fd2e86cad8 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/desktop/libsoup/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl, glib, GConf}: + +stdenv.mkDerivation { + name = "libsoup-2.26.2"; + src = fetchurl { + url = mirror://gnome/desktop/2.26/2.26.2/sources/libsoup-2.26.2.tar.bz2; + sha256 = "0ywsy30x0sl42m6s3rqk5vm4018shx1s50hsqgg9a8yybfhxvkmg"; + }; + buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl glib GConf ]; +} diff --git a/pkgs/desktops/gnome-2.26/desktop/libwnck/default.nix b/pkgs/desktops/gnome-2.26/desktop/libwnck/default.nix new file mode 100644 index 00000000000..1cd96dd4fdc --- /dev/null +++ b/pkgs/desktops/gnome-2.26/desktop/libwnck/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, pkgconfig, libX11, gtk, intltool}: + +stdenv.mkDerivation { + name = "libwnck-2.26.1"; + src = fetchurl { + url = mirror://gnome/desktop/2.26/2.26.2/sources/libwnck-2.26.1.tar.bz2; + sha256 = "0c7l4p2iarl7vd69nskhqb76j8p5dvnf45rmm3a1c3ajrhmpnwsk"; + }; + buildInputs = [ pkgconfig libX11 gtk intltool ]; +} diff --git a/pkgs/desktops/gnome-2.26/desktop/metacity/default.nix b/pkgs/desktops/gnome-2.26/desktop/metacity/default.nix new file mode 100644 index 00000000000..f4f21b1f108 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/desktop/metacity/default.nix @@ -0,0 +1,12 @@ +{ stdenv, fetchurl, pkgconfig, glib, gtk, libXcomposite, libXcursor, libXdamage +, intltool, GConf, startup_notification, zenity, gnome_doc_utils}: + +stdenv.mkDerivation { + name = "metacity-2.26.0"; + src = fetchurl { + url = mirror://gnome/desktop/2.26/2.26.2/sources/metacity-2.26.0.tar.bz2; + sha256 = "0y4hamalbplpsilyfbs1c8za6f7cgp9p4kcswsx67ncr310idfi9"; + }; + buildInputs = [ pkgconfig glib gtk libXcomposite libXcursor libXdamage + intltool GConf startup_notification zenity gnome_doc_utils ]; +} diff --git a/pkgs/desktops/gnome-2.26/desktop/nautilus/default.nix b/pkgs/desktops/gnome-2.26/desktop/nautilus/default.nix new file mode 100644 index 00000000000..5e25c141271 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/desktop/nautilus/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif, gtk, gnome_desktop, libunique, intltool, GConf}: + +stdenv.mkDerivation { + name = "nautilus-2.26.3"; + src = fetchurl { + url = mirror://gnome/desktop/2.26/2.26.2/sources/nautilus-2.26.3.tar.bz2; + sha256 = "1qfzw3aqyixybvxlj768l3a1knp0f0knpvs5566advpil1i771qx"; + }; + buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk gnome_desktop libunique intltool GConf ]; +} diff --git a/pkgs/desktops/gnome-2.26/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-2.26/desktop/scrollkeeper/default.nix new file mode 100644 index 00000000000..050b0505937 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/desktop/scrollkeeper/default.nix @@ -0,0 +1,14 @@ +{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}: + +stdenv.mkDerivation { + name = "scrollkeeper-0.3.14"; + src = fetchurl { + url = mirror://gnome/desktop/2.16/2.16.3/sources/scrollkeeper-0.3.14.tar.bz2; + sha256 = "08n1xgj1f53zahwm0wpn3jid3rfbhi3iwby0ilaaldnid5qriqgc"; + }; + preConfigure = " + substituteInPlace extract/dtds/Makefile.am --replace /usr/bin/xmlcatalog xmlcatalog + "; + buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt]; + configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; +} diff --git a/pkgs/desktops/gnome-2.26/desktop/zenity/default.nix b/pkgs/desktops/gnome-2.26/desktop/zenity/default.nix new file mode 100644 index 00000000000..0bba8870e39 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/desktop/zenity/default.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, glib, gtk, pango, atk, gnome_doc_utils, intltool, libglade, + libX11}: + +stdenv.mkDerivation { + name = "zenity-2.26.0"; + src = fetchurl { + url = mirror://gnome/desktop/2.26/2.26.2/sources/zenity-2.26.0.tar.bz2; + sha256 = "1882sh83jp3drg5z61rghdshnsfys4jgbgg7za7b9jlhr8ar4qgw"; + }; + configureFlags = "--disable-scrollkeeper"; + buildInputs = [ pkgconfig gtk gnome_doc_utils intltool libglade libxml2 libxslt libX11]; + CPPFLAGS = "-I${cairo}/include/cairo -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include "+ + "-I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${pango}/include/pango-1.0 "+ + "-I${atk}/include/atk-1.0 -I${libglade}/include/libglade-2.0"; + LIBS = "-lgtk-x11-2.0 -lglade-2.0 -lX11"; +} diff --git a/pkgs/desktops/gnome-2.26/platform/GConf/default.nix b/pkgs/desktops/gnome-2.26/platform/GConf/default.nix new file mode 100644 index 00000000000..cf2d12f287a --- /dev/null +++ b/pkgs/desktops/gnome-2.26/platform/GConf/default.nix @@ -0,0 +1,12 @@ +{ stdenv, fetchurl, pkgconfig, dbus_glib, glib, gtk, ORBit2, libxml2 +, expat, policyKit, intltool}: + +stdenv.mkDerivation { + name = "GConf-2.26.2"; + src = fetchurl { + url = mirror://gnome/platform/2.26/2.26.2/sources/GConf-2.26.2.tar.bz2; + sha256 = "1vb7hjxddy54g4vch936621g66n0mhi3wkhm9lwqh449vdqg4yki"; + }; + buildInputs = [ pkgconfig glib gtk dbus_glib ORBit2 libxml2 + expat policyKit intltool ]; +} diff --git a/pkgs/desktops/gnome-2.26/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2.26/platform/ORBit2/default.nix new file mode 100644 index 00000000000..bf0016d2316 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/platform/ORBit2/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, pkgconfig, glib, libIDL}: + +stdenv.mkDerivation { + name = "ORBit2-2.14.17"; + src = fetchurl { + url = mirror://gnome/platform/2.26/2.26.2/sources/ORBit2-2.14.17.tar.bz2; + sha256 = "0k4px2f949ac7vmj7b155g1rpf7pmvl48sbnkjhlg4wgcwzwxgv2"; + }; + buildInputs = [ pkgconfig glib libIDL ]; +} diff --git a/pkgs/desktops/gnome-2.26/platform/at-spi/default.nix b/pkgs/desktops/gnome-2.26/platform/at-spi/default.nix new file mode 100644 index 00000000000..ae92e11874e --- /dev/null +++ b/pkgs/desktops/gnome-2.26/platform/at-spi/default.nix @@ -0,0 +1,12 @@ +{ stdenv, fetchurl, python, pkgconfig, popt, atk, gtk, libX11, libICE, libXtst, libXi +, intltool, libbonobo, ORBit2}: + +stdenv.mkDerivation { + name = "at-spi-1.26.0"; + src = fetchurl { + url = mirror://gnome/platform/2.26/2.26.2/sources/at-spi-1.26.0.tar.bz2; + sha256 = "0kb4n9xi66igg6fgs64q44cskx45v9mgn5psfbqpbykpl9rr935v"; + }; + buildInputs = [ python pkgconfig popt atk gtk libX11 libICE libXtst libXi + intltool libbonobo ORBit2 ]; +} diff --git a/pkgs/desktops/gnome-2.26/platform/audiofile/default.nix b/pkgs/desktops/gnome-2.26/platform/audiofile/default.nix new file mode 100644 index 00000000000..9994b79db53 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/platform/audiofile/default.nix @@ -0,0 +1,9 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "audiofile-0.2.6"; + src = fetchurl { + url = mirror://gnome/platform/2.26/2.26.2/sources/audiofile-0.2.6.tar.bz2; + sha256 = "1d00w9hxx3flfs6cjyja99y8vpj1qwa34zfdj96dpa54drd9da62"; + }; +} diff --git a/pkgs/desktops/gnome-2.26/platform/esound/default.nix b/pkgs/desktops/gnome-2.26/platform/esound/default.nix new file mode 100644 index 00000000000..a1502d3fbbc --- /dev/null +++ b/pkgs/desktops/gnome-2.26/platform/esound/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, pkgconfig, alsaLib, audiofile}: + +stdenv.mkDerivation { + name = "esound-0.2.41"; + src = fetchurl { + url = mirror://gnome/platform/2.26/2.26.2/sources/esound-0.2.41.tar.bz2; + sha256 = "5eb5dd29a64b3462a29a5b20652aba7aa926742cef43577bf0796b787ca34911"; + }; + buildInputs = [ pkgconfig alsaLib audiofile ]; +} diff --git a/pkgs/desktops/gnome-2.26/platform/gnome-mime-data/default.nix b/pkgs/desktops/gnome-2.26/platform/gnome-mime-data/default.nix new file mode 100644 index 00000000000..ec12b310281 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/platform/gnome-mime-data/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, intltool}: + +stdenv.mkDerivation { + name = "gnome-mime-data-2.18.0"; + src = fetchurl { + url = mirror://gnome/platform/2.26/2.26.2/sources/gnome-mime-data-2.18.0.tar.bz2; + sha256 = "1mvg8glb2a40yilmyabmb7fkbzlqd3i3d31kbkabqnq86xdnn69p"; + }; + buildInputs = [ intltool ]; +} diff --git a/pkgs/desktops/gnome-2.26/platform/gnome-vfs-monikers/default.nix b/pkgs/desktops/gnome-2.26/platform/gnome-vfs-monikers/default.nix new file mode 100644 index 00000000000..afe1da84f26 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/platform/gnome-vfs-monikers/default.nix @@ -0,0 +1,13 @@ +{stdenv, fetchurl, pkgconfig, glib, intltool, gnome_vfs, libbonobo, ORBit2}: + +stdenv.mkDerivation { + name = "gnome-vfs-monikers-2.15.3"; + src = fetchurl { + url = mirror://gnome/platform/2.26/2.26.2/sources/gnome-vfs-monikers-2.15.3.tar.bz2; + sha256 = "0gpgk5vwhgqfhrd8pf1314kh7sv3jfqll2xbdbrs5s5sxy3v7b15"; + }; + buildInputs = [ pkgconfig glib intltool gnome_vfs libbonobo ]; + CPPFLAGS = "-I${libbonobo}/include/libbonobo-2.0 -I${libbonobo}/include/bonobo-activation-2.0 "+ + "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${ORBit2}/include/orbit-2.0 "+ + "-I${gnome_vfs}/include/gnome-vfs-2.0"; +} diff --git a/pkgs/desktops/gnome-2.26/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2.26/platform/gnome-vfs/default.nix new file mode 100644 index 00000000000..3e8b78b9a91 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/platform/gnome-vfs/default.nix @@ -0,0 +1,12 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, samba, dbus_glib, glib, fam, hal, cdparanoia +, intltool, GConf, gnome_mime_data}: + +stdenv.mkDerivation { + name = "gnome-vfs-2.24.1"; + src = fetchurl { + url = mirror://gnome/platform/2.26/2.26.2/sources/gnome-vfs-2.24.1.tar.bz2; + sha256 = "1dmyr8nj77717r8dhwkixpar2yp8ld3r683gp222n59v61718ndw"; + }; + buildInputs = [ pkgconfig libxml2 bzip2 openssl samba dbus_glib glib fam hal cdparanoia + intltool GConf gnome_mime_data ]; +} diff --git a/pkgs/desktops/gnome-2.26/platform/gtk-doc/default.nix b/pkgs/desktops/gnome-2.26/platform/gtk-doc/default.nix new file mode 100644 index 00000000000..4017490254f --- /dev/null +++ b/pkgs/desktops/gnome-2.26/platform/gtk-doc/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, pkgconfig, perl, python, libxml2, libxslt, docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils}: + +stdenv.mkDerivation { + name = "gtk-doc-1.11"; + src = fetchurl { + url = mirror://gnome/platform/2.26/2.26.2/sources/gtk-doc-1.11.tar.bz2; + sha256 = "08zz6gn90aqps84hfhdgarsilbdj0bbnj3wjm2x552n4i7gmq4wj"; + }; + + # maybe there is a better way to pass the needed dtd and xsl files + # "-//OASIS//DTD DocBook XML V4.1.2//EN" and "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl" + preConfigure = '' + ensureDir $out/nix-support + cat > $out/nix-support/catalog.xml << EOF + + + + + + + EOF + + configureFlags="--with-xml-catalog=$out/nix-support/catalog.xml --disable-scrollkeeper"; + ''; + + buildInputs = [ pkgconfig perl python libxml2 libxslt docbook_xml_dtd_43 gnome_doc_utils ]; +} diff --git a/pkgs/desktops/gnome-2.26/platform/intltool/default.nix b/pkgs/desktops/gnome-2.26/platform/intltool/default.nix new file mode 100644 index 00000000000..daa0230f983 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/platform/intltool/default.nix @@ -0,0 +1,13 @@ +{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gettext}: + +stdenv.mkDerivation rec { + name = "intltool-0.40.6"; + + src = fetchurl { + url = "mirror://gnome/sources/intltool/0.40/${name}.tar.bz2"; + sha256 = "0r1vkvy5xzqk01yl6a0xlrry39bra24alkrx6279b77hc62my7jd"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ perl perlXMLParser gettext ]; +} diff --git a/pkgs/desktops/gnome-2.26/platform/libIDL/default.nix b/pkgs/desktops/gnome-2.26/platform/libIDL/default.nix new file mode 100644 index 00000000000..54e67c25e50 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/platform/libIDL/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, flex, bison, pkgconfig, glib}: + +stdenv.mkDerivation { + name = "libIDL-0.8.13"; + src = fetchurl { + url = mirror://gnome/platform/2.26/2.26.2/sources/libIDL-0.8.13.tar.bz2; + sha256 = "bccc7e10dae979518ff012f8464e47ec4b3558a5456a94c8679653aa0b262b71"; + }; + buildInputs = [ flex bison pkgconfig glib ]; +} diff --git a/pkgs/desktops/gnome-2.26/platform/libart_lgpl/default.nix b/pkgs/desktops/gnome-2.26/platform/libart_lgpl/default.nix new file mode 100644 index 00000000000..e993c9924a6 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/platform/libart_lgpl/default.nix @@ -0,0 +1,9 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "libart_lgpl-2.3.20"; + src = fetchurl { + url = mirror://gnome/platform/2.26/2.26.2/sources/libart_lgpl-2.3.20.tar.bz2; + sha256 = "0iyqsc517lj8xnidchnk0fxa6aqvss4hv8p9fk6bba86lbiillym"; + }; +} diff --git a/pkgs/desktops/gnome-2.26/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2.26/platform/libbonobo/default.nix new file mode 100644 index 00000000000..54960a0f4af --- /dev/null +++ b/pkgs/desktops/gnome-2.26/platform/libbonobo/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt, intltool, ORBit2}: + +stdenv.mkDerivation { + name = "libbonobo-2.24.1"; + src = fetchurl { + url = mirror://gnome/platform/2.26/2.26.2/sources/libbonobo-2.24.1.tar.bz2; + sha256 = "0x0jx5bf9nrh7djq90vj7zryixgws6ir8py6pczwjb3bp1carcj2"; + }; + buildInputs = [ flex bison pkgconfig glib dbus_glib libxml2 popt intltool ORBit2 ]; +} diff --git a/pkgs/desktops/gnome-2.26/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2.26/platform/libbonoboui/default.nix new file mode 100644 index 00000000000..caf9e54e68d --- /dev/null +++ b/pkgs/desktops/gnome-2.26/platform/libbonoboui/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, bison, pkgconfig, popt, libxml2, cairo, glib, gtk, atk, pango +, intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade, ORBit2, libart_lgpl}: + +stdenv.mkDerivation { + name = "libbonoboui-2.24.1"; + src = fetchurl { + url = mirror://gnome/platform/2.26/2.26.2/sources/libbonoboui-2.24.1.tar.bz2; + sha256 = "0a8cfll25412bshnnqj1a0dnrcx770jsys4i49zjhw1sqaykc99j"; + }; + buildInputs = [ bison pkgconfig popt gtk libxml2 + intltool libbonobo GConf libgnomecanvas libgnome libglade ]; + + # For some reason GNOME maintainers write crappy automake files and they forget to include + # a lot of required headers (the headers may be found if they are in /usr) + + CPPFLAGS = "-I${cairo}/include/cairo -I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include " + + "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${atk}/include/atk-1.0 " + + "-I${pango}/include/pango-1.0 -I${libgnome}/include/libgnome-2.0 -I${libbonobo}/include/libbonobo-2.0 "+ + "-I${libbonobo}/include/bonobo-activation-2.0 -I${ORBit2}/include/orbit-2.0 -I${libxml2}/include/libxml2 "+ + "-I${libgnomecanvas}/include/libgnomecanvas-2.0 -I${libart_lgpl}/include/libart-2.0 "+ + "-I${GConf}/include/gconf/2 -I${libglade}/include/libglade-2.0"; + LIBS = "-lgobject-2.0 -lbonobo-2 -lgtk-x11-2.0 -lgconf-2 -lxml2 -lgnome-2 -lgnomecanvas-2"; +} diff --git a/pkgs/desktops/gnome-2.26/platform/libglade/default.nix b/pkgs/desktops/gnome-2.26/platform/libglade/default.nix new file mode 100644 index 00000000000..a7fce62eda4 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/platform/libglade/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, pkgconfig, gtk, libxml2, expat, python, gettext}: + +stdenv.mkDerivation { + name = "libglade-2.6.4"; + src = fetchurl { + url = mirror://gnome/platform/2.26/2.26.2/sources/libglade-2.6.4.tar.bz2; + sha256 = "1v2x2s04jry4gpabws92i0wq2ghd47yr5n9nhgnkd7c38xv1wdk4"; + }; + buildInputs = [ pkgconfig gtk libxml2 expat python gettext ]; +} diff --git a/pkgs/desktops/gnome-2.26/platform/libgnome/default.nix b/pkgs/desktops/gnome-2.26/platform/libgnome/default.nix new file mode 100644 index 00000000000..d69a3b99219 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/platform/libgnome/default.nix @@ -0,0 +1,13 @@ +{ stdenv, fetchurl, pkgconfig, glib, popt +, intltool, esound, audiofile, libbonobo, GConf, gnome_vfs, ORBit2}: + +stdenv.mkDerivation { + name = "libgnome-2.26.0"; + src = fetchurl { + url = mirror://gnome/platform/2.26/2.26.2/sources/libgnome-2.26.0.tar.bz2; + sha256 = "0673cf0in4p6935nfhs1zhyb2bdjdgwfx2xw41ylmlwzn5x2iw1f"; + }; + buildInputs = [ pkgconfig glib popt intltool esound audiofile libbonobo GConf gnome_vfs ]; + CPPFLAGS = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${ORBit2}/include/orbit-2.0 -I${libbonobo}/include/libbonobo-2.0 -I${libbonobo}/include/bonobo-activation-2.0 -I${GConf}/include/gconf/2 -I${gnome_vfs}/include/gnome-vfs-2.0"; + LIBS = "-lesd -lgconf-2 -lbonobo-activation -lbonobo-2 -lgnomevfs-2"; +} diff --git a/pkgs/desktops/gnome-2.26/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2.26/platform/libgnomecanvas/default.nix new file mode 100644 index 00000000000..13527f7659e --- /dev/null +++ b/pkgs/desktops/gnome-2.26/platform/libgnomecanvas/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl, pkgconfig, glib, gtk, pango, atk, cairo, intltool, libart_lgpl, libglade}: + +stdenv.mkDerivation { + name = "libgnomecanvas-2.26.0"; + src = fetchurl { + url = mirror://gnome/platform/2.26/2.26.2/sources/libgnomecanvas-2.26.0.tar.bz2; + sha256 = "13f5rf5pkp9hnyxzvssrxnlykjaixa7vrig9a7v06wrxqfn81d40"; + }; + buildInputs = [ pkgconfig gtk intltool libart_lgpl libglade ]; + CPPFLAGS = "-I${libglade}/include/libglade-2.0 -I${libart_lgpl}/include/libart-2.0 -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${atk}/include/atk-1.0 -I${cairo}/include/cairo -I${pango}/include/pango-1.0"; +} diff --git a/pkgs/desktops/gnome-2.26/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2.26/platform/libgnomeui/default.nix new file mode 100644 index 00000000000..f592a3c4f6c --- /dev/null +++ b/pkgs/desktops/gnome-2.26/platform/libgnomeui/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, popt, cairo, libX11, libICE, glib, gtk, atk, pango +, intltool, libgnome, libgnomecanvas, libbonobo, libbonoboui, GConf +, gnome_vfs, gnome_keyring, libglade, libart_lgpl, ORBit2}: + +stdenv.mkDerivation { + name = "libgnomeui-2.24.1"; + src = fetchurl { + url = mirror://gnome/platform/2.26/2.26.2/sources/libgnomeui-2.24.1.tar.bz2; + sha256 = "1hcdiqkvhfrfkyb02zaxrdzhl9h74m79ykfxgpznx59mgfdjivd2"; + }; + buildInputs = [ pkgconfig libxml2 popt libX11 libICE glib gtk pango + intltool libgnome libgnomecanvas libbonoboui GConf gnome_vfs gnome_keyring libglade ]; + CPPFLAGS = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${atk}/include/atk-1.0 "+ + "-I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${libbonoboui}/include/libbonoboui-2.0 "+ + "-I${cairo}/include/cairo -I${pango}/include/pango-1.0 -I${libgnomecanvas}/include/libgnomecanvas-2.0 "+ + "-I${libgnome}/include/libgnome-2.0 -I${libart_lgpl}/include/libart-2.0 -I${gnome_vfs}/include/gnome-vfs-2.0 "+ + "-I${libbonobo}/include/libbonobo-2.0 -I${GConf}/include/gconf/2 -I${libxml2}/include/libxml2 "+ + "-I${libbonobo}/include/bonobo-activation-2.0 -I${ORBit2}/include/orbit-2.0 "+ + "-I${gnome_keyring}/include/gnome-keyring-1 -I${libglade}/include/libglade-2.0"; + LIBS = "-lgtk-x11-2.0 -lgnomecanvas-2 -lgconf-2 -lbonoboui-2 -lgnome-keyring"; +} diff --git a/pkgs/desktops/gnome-2.26/platform/libunique/default.nix b/pkgs/desktops/gnome-2.26/platform/libunique/default.nix new file mode 100644 index 00000000000..870e1763bbc --- /dev/null +++ b/pkgs/desktops/gnome-2.26/platform/libunique/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, pkgconfig, gettext, gtk}: + +stdenv.mkDerivation { + name = "libunique-1.0.8"; + src = fetchurl { + url = mirror://gnome/sources/libunique/1.0/libunique-1.0.8.tar.bz2; + sha256 = "1iplvmc41h64kdrsgpvb03mawzvflarvlpk5mng4xw9sa87s29yn"; + }; + buildInputs = [ pkgconfig gettext gtk ]; +} diff --git a/pkgs/desktops/gnome-2.26/platform/startup-notification/default.nix b/pkgs/desktops/gnome-2.26/platform/startup-notification/default.nix new file mode 100644 index 00000000000..0737ed6ba42 --- /dev/null +++ b/pkgs/desktops/gnome-2.26/platform/startup-notification/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, pkgconfig, libX11, libxcb, libICE, xcbutil, libSM}: + +stdenv.mkDerivation { + name = "startup-notification-0.10"; + src = fetchurl { + url = http://freedesktop.org/software/startup-notification/releases/startup-notification-0.10.tar.gz; + sha256 = "0nalaay0yj3gq85insp9l31hsv5zp390m4nn37y235v151ffpfv4"; + }; + buildInputs = [ pkgconfig libX11 libxcb libICE xcbutil libSM ]; +} diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index acbcdc508d9..ce856bdbe31 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -1,6 +1,6 @@ args: with args; -assert dbus_glib.glib == gtkLibs.glib; +#assert dbus_glib.glib == gtkLibs.glib; let gnome = @@ -188,7 +188,8 @@ rec { gtksourceview = import ./gtksourceview.nix { inherit fetchurl stdenv pkgconfig perl perlXMLParser gtk libxml2 gettext libgnomeprint gnomevfs libbonobo /* !!! <- should be propagated in gnomevfs */ - GConf /* idem */ libgnomeprintui libgnomecanvas /* !!! through printui */; + GConf /* idem */ libgnomeprintui libgnomecanvas /* !!! through printui */ + intltool; input = desktop.gtksourceview; }; @@ -274,7 +275,8 @@ rec { }; libsoup = import ./libsoup.nix { - inherit stdenv fetchurl pkgconfig libxml2 glib; + inherit stdenv fetchurl pkgconfig libxml2 glib + libproxy GConf sqlite; input = desktop.libsoup; }; @@ -293,13 +295,27 @@ rec { metacity = import ./metacity.nix { inherit stdenv fetchurl pkgconfig perl perlXMLParser glib gtk - GConf startupnotification gettext libcm intltool; + GConf startupnotification gettext libcm intltool zenity gnomedocutils; inherit (xlibs) libXinerama libXrandr libXcursor libXcomposite libXfixes libXdamage; enableCompositor = true; input = desktop.metacity; }; + zenity = stdenv.mkDerivation { + inherit (desktop.zenity) name src; + + buildInputs = [ + pkgconfig glib gtk + gettext intltool gnomedocutils libglade + libxslt + xlibs.libX11 + ]; + + preConfigure = ''export NIX_LDFLAGS="$NIX_LDFLAGS -lX11";''; + configureFlags = "--disable-scrollkeeper"; + }; + gnomedocutils = import ./gnome-doc-utils.nix { inherit stdenv fetchurl pkgconfig perl perlXMLParser python libxml2 libxslt gettext libxml2Python; @@ -312,6 +328,7 @@ rec { buildInputs = [ pkgconfig perl perlXMLParser GConf gnomedocutils gtk libgnome libgnomeui gettext libxslt intltool + policyKit dbus_glib ]; configureFlags = "--disable-scrollkeeper"; diff --git a/pkgs/desktops/gnome/gtksourceview.nix b/pkgs/desktops/gnome/gtksourceview.nix index 8afafac8cf4..a5e3bd217fd 100644 --- a/pkgs/desktops/gnome/gtksourceview.nix +++ b/pkgs/desktops/gnome/gtksourceview.nix @@ -1,7 +1,7 @@ { input, stdenv, fetchurl, perl, perlXMLParser, pkgconfig , gtk, libxml2, libgnomeprint, gnomevfs, libbonobo, GConf , libgnomeprintui, libgnomecanvas -, gettext +, gettext, intltool }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { buildInputs = [ perl perlXMLParser pkgconfig gnomevfs libbonobo GConf libgnomeprintui libgnomecanvas - gettext + gettext intltool ]; propagatedBuildInputs = [gtk libxml2 libgnomeprint]; } diff --git a/pkgs/desktops/gnome/libsoup.nix b/pkgs/desktops/gnome/libsoup.nix index 0e93c70ae9a..099fa990a2d 100644 --- a/pkgs/desktops/gnome/libsoup.nix +++ b/pkgs/desktops/gnome/libsoup.nix @@ -1,6 +1,8 @@ -{input, stdenv, fetchurl, pkgconfig, libxml2, glib}: +{input, stdenv, fetchurl, pkgconfig, libxml2, glib + , libproxy, GConf, sqlite}: stdenv.mkDerivation { inherit (input) name src; - buildInputs = [pkgconfig libxml2 glib]; + buildInputs = [pkgconfig libxml2 glib libproxy + GConf sqlite]; } diff --git a/pkgs/desktops/gnome/metacity.nix b/pkgs/desktops/gnome/metacity.nix index 184efc2a165..9d22add6af8 100644 --- a/pkgs/desktops/gnome/metacity.nix +++ b/pkgs/desktops/gnome/metacity.nix @@ -1,6 +1,6 @@ { input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, glib, gtk , GConf, startupnotification, libXinerama, libXrandr, libXcursor -, gettext, intltool +, gettext, intltool, zenity, gnomedocutils , enableCompositor ? false , libXcomposite ? null, libXfixes ? null, libXdamage ? null, libcm ? null @@ -15,6 +15,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig perl perlXMLParser glib gtk GConf startupnotification libXinerama libXrandr libXcursor gettext intltool + zenity gnomedocutils ] ++ stdenv.lib.optionals enableCompositor [libXcomposite libXfixes libXdamage libcm]; diff --git a/pkgs/desktops/kde-4.2/admin/default.nix b/pkgs/desktops/kde-4.2/admin/default.nix index b51f6cf5976..f7a2de5c115 100644 --- a/pkgs/desktops/kde-4.2/admin/default.nix +++ b/pkgs/desktops/kde-4.2/admin/default.nix @@ -3,13 +3,14 @@ kdelibs, kdepimlibs, kdebindings, automoc4, phonon}: stdenv.mkDerivation { - name = "kdeadmin-4.2.2"; + name = "kdeadmin-4.2.4"; src = fetchurl { - url = mirror://kde/stable/4.2.2/src/kdeadmin-4.2.2.tar.bz2; - sha1 = "3bf8f689d6fcafcfdfb2bea4c6003e56c80c4601"; + url = mirror://kde/stable/4.2.4/src/kdeadmin-4.2.4.tar.bz2; + sha1 = "72a9bfeaacf6bf70f464923f96b28891ad6b671e"; }; builder = ./builder.sh; inherit system_config_printer; + includeAllQtDirs=true; CMAKE_PREFIX_PATH=kdepimlibs; buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer rhpl kdelibs kdepimlibs kdebindings automoc4 phonon ]; diff --git a/pkgs/desktops/kde-4.2/artwork/default.nix b/pkgs/desktops/kde-4.2/artwork/default.nix index 4fd38cc22c5..8c8b67053b5 100644 --- a/pkgs/desktops/kde-4.2/artwork/default.nix +++ b/pkgs/desktops/kde-4.2/artwork/default.nix @@ -2,11 +2,12 @@ kdelibs, kdebase_workspace, automoc4, phonon, strigi, eigen}: stdenv.mkDerivation { - name = "kdeartwork-4.2.2"; + name = "kdeartwork-4.2.4"; src = fetchurl { - url = mirror://kde/stable/4.2.2/src/kdeartwork-4.2.2.tar.bz2; - sha1 = "306eede44f62fdef0892ad40988ada51f06bfa73"; + url = mirror://kde/stable/4.2.4/src/kdeartwork-4.2.4.tar.bz2; + sha1 = "601fa04bc6fb9bdd5dfa094af04ad204bcc20b14"; }; + includeAllQtDirs=true; buildInputs = [ cmake qt4 perl xscreensaver kdelibs kdebase_workspace automoc4 phonon strigi eigen ]; } diff --git a/pkgs/desktops/kde-4.2/base-runtime/default.nix b/pkgs/desktops/kde-4.2/base-runtime/default.nix index 4cf2c7413bc..3c0200f2168 100644 --- a/pkgs/desktops/kde-4.2/base-runtime/default.nix +++ b/pkgs/desktops/kde-4.2/base-runtime/default.nix @@ -2,12 +2,13 @@ automoc4, phonon, strigi, soprano, cluceneCore}: stdenv.mkDerivation { - name = "kdebase-runtime-4.2.2"; + name = "kdebase-runtime-4.2.4"; src = fetchurl { - url = mirror://kde/stable/4.2.2/src/kdebase-runtime-4.2.2.tar.bz2; - sha1 = "0b100ceb77fa2e8cbe5303f7fea28b02117c7658"; + url = mirror://kde/stable/4.2.4/src/kdebase-runtime-4.2.4.tar.bz2; + sha1 = "dd829270b5fb21e4c24db5e7d16db6e99fe51c1d"; }; /* CLUCENE_HOME=cluceneCore;*/ + includeAllQtDirs=true; buildInputs = [ cmake perl bzip2 qt4 alsaLib xineLib samba stdenv.gcc.libc kdelibs automoc4 phonon strigi soprano cluceneCore ]; } diff --git a/pkgs/desktops/kde-4.2/base-workspace/default.nix b/pkgs/desktops/kde-4.2/base-workspace/default.nix index 1038df9b2c6..19fd20823f1 100644 --- a/pkgs/desktops/kde-4.2/base-workspace/default.nix +++ b/pkgs/desktops/kde-4.2/base-workspace/default.nix @@ -5,11 +5,12 @@ automoc4, phonon, strigi, soprano, qimageblitz}: stdenv.mkDerivation { - name = "kdebase-workspace-4.2.2"; + name = "kdebase-workspace-4.2.4"; src = fetchurl { - url = mirror://kde/stable/4.2.2/src/kdebase-workspace-4.2.2.tar.bz2; - sha1 = "9397220827f378cedf38e800e06e9ca8b1a1235d"; + url = mirror://kde/stable/4.2.4/src/kdebase-workspace-4.2.4.tar.bz2; + sha1 = "31f38436736ff73b6ffb9d8bbb93b8342965e894"; }; + includeAllQtDirs=true; CMAKE_PREFIX_PATH=kdepimlibs; buildInputs = [ cmake perl python qt4 pam /*ConsoleKit sip pyqt4*/ kdelibs kdepimlibs /*kdebindings*/ pthread_stubs boost libusb stdenv.gcc.libc libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver diff --git a/pkgs/desktops/kde-4.2/base/default.nix b/pkgs/desktops/kde-4.2/base/default.nix index 0f6d2e91259..b608667e06d 100644 --- a/pkgs/desktops/kde-4.2/base/default.nix +++ b/pkgs/desktops/kde-4.2/base/default.nix @@ -2,11 +2,12 @@ automoc4, phonon, strigi, qimageblitz, soprano}: stdenv.mkDerivation { - name = "kdebase-4.2.2"; + name = "kdebase-4.2.4"; src = fetchurl { - url = mirror://kde/stable/4.2.2/src/kdebase-4.2.2.tar.bz2; - sha1 = "10309413767b856d303102155911518519e5b57e"; + url = mirror://kde/stable/4.2.4/src/kdebase-4.2.4.tar.bz2; + sha1 = "c08188baa90a5075f18a75640c4dc3e6dc69daa0"; }; + includeAllQtDirs=true; buildInputs = [ cmake perl qt4 kdelibs pciutils stdenv.gcc.libc libraw1394 automoc4 phonon strigi qimageblitz soprano ]; } diff --git a/pkgs/desktops/kde-4.2/bindings/default.nix b/pkgs/desktops/kde-4.2/bindings/default.nix index 7364ba5d415..357d1263df7 100644 --- a/pkgs/desktops/kde-4.2/bindings/default.nix +++ b/pkgs/desktops/kde-4.2/bindings/default.nix @@ -5,12 +5,13 @@ # some bindings are even broken. stdenv.mkDerivation { - name = "kdebindings-4.2.2"; + name = "kdebindings-4.2.4"; src = fetchurl { - url = mirror://kde/stable/4.2.2/src/kdebindings-4.2.2.tar.bz2; - sha1 = "1d5eb1bb92f68172d0a0345070b1120c2601ab8c"; + url = mirror://kde/stable/4.2.4/src/kdebindings-4.2.4.tar.bz2; + sha1 = "5550b690d1c63fc63b3603ad73ba2b911158fe96"; }; builder = ./builder.sh; + includeAllQtDirs=true; buildInputs = [ python sip pyqt4 zlib libpng freetype fontconfig qt4 libSM libXrender libXrandr libXfixes libXcursor libXinerama libXext kdelibs ]; } diff --git a/pkgs/desktops/kde-4.2/default.nix b/pkgs/desktops/kde-4.2/default.nix index 7e059f44855..3901cd71e2f 100644 --- a/pkgs/desktops/kde-4.2/default.nix +++ b/pkgs/desktops/kde-4.2/default.nix @@ -191,15 +191,39 @@ rec { inherit automoc4 phonon; }; + kmplayer = import ./extragear/kmplayer { + inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext dbus_glib; + inherit (pkgs.gtkLibs) pango gtk; + inherit kdelibs; + inherit automoc4 phonon; + }; + krusader = import ./extragear/krusader { inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext; inherit kdelibs; inherit automoc4 phonon; }; + koffice = import ./extragear/koffice { + inherit (pkgs) stdenv fetchurl cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew; + inherit (pkgs) shared_mime_info gsl gmm wv2 libwpd; + inherit kdelibs kdepimlibs; + inherit automoc4 phonon qimageblitz qca2 eigen; + poppler = pkgs.popplerQt4; + }; + ktorrent = import ./extragear/ktorrent { inherit (pkgs) stdenv fetchurl cmake qt4 perl gmp taglib boost gettext; inherit kdelibs kdepimlibs kdebase_workspace; inherit automoc4 phonon qca2; }; + + gtk_qt_engine = import ./extragear/gtk-qt-engine { + inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext; + inherit (pkgs.xlibs) libX11; + inherit (pkgs.gtkLibs) gtk; + inherit (pkgs.gnome) libbonoboui; + inherit kdelibs; + inherit automoc4 phonon; + }; } diff --git a/pkgs/desktops/kde-4.2/edu/default.nix b/pkgs/desktops/kde-4.2/edu/default.nix index b70cf3613ca..5f7b2dc6c3c 100644 --- a/pkgs/desktops/kde-4.2/edu/default.nix +++ b/pkgs/desktops/kde-4.2/edu/default.nix @@ -3,11 +3,12 @@ kdelibs, automoc4, phonon}: stdenv.mkDerivation { - name = "kdeedu-4.2.2"; + name = "kdeedu-4.2.4"; src = fetchurl { - url = mirror://kde/stable/4.2.2/src/kdeedu-4.2.2.tar.bz2; - sha1 = "c6aaf3639188e66d14da0d404a9b5d5fb95e7df5"; + url = mirror://kde/stable/4.2.4/src/kdeedu-4.2.4.tar.bz2; + sha1 = "7b26b946e1981ac57efdd2059eb3bba2808aef4b"; }; + includeAllQtDirs=true; buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile ocaml kdelibs automoc4 phonon ]; } diff --git a/pkgs/desktops/kde-4.2/extragear/amarok/default.nix b/pkgs/desktops/kde-4.2/extragear/amarok/default.nix index a631149beb5..b841c1ed932 100644 --- a/pkgs/desktops/kde-4.2/extragear/amarok/default.nix +++ b/pkgs/desktops/kde-4.2/extragear/amarok/default.nix @@ -7,6 +7,7 @@ stdenv.mkDerivation { url = mirror://kde/stable/amarok/2.0.2/src/amarok-2.0.2.tar.bz2; md5 = "98b78372ec6ea3432faba356c90c6dbe"; }; + includeAllQtDirs=true; inherit mysql loudmouth; builder = ./builder.sh; buildInputs = [ cmake qt4 perl stdenv.gcc.libc gettext curl libxml2 mysql taglib loudmouth diff --git a/pkgs/desktops/kde-4.2/extragear/gtk-qt-engine/builder.sh b/pkgs/desktops/kde-4.2/extragear/gtk-qt-engine/builder.sh new file mode 100644 index 00000000000..259263ca27b --- /dev/null +++ b/pkgs/desktops/kde-4.2/extragear/gtk-qt-engine/builder.sh @@ -0,0 +1,11 @@ +source $stdenv/setup + +cmakeFlags="-DINSTALL_PATH_GTK_ENGINES=$out/lib/gtk-2.0/2.10.0/engines -DINSTALL_PATH_GTK_THEMES=$out/share/themes -DINSTALL_PATH_KCONTROL_MODULES=$out/lib"; + +myPatchPhase() +{ + sed -i -e "s|\${KDE4_INCLUDE_DIR}|\${KDE4_INCLUDE_DIR} ../build/kcm_gtk|" kcm_gtk/CMakeLists.txt + sed -i -e "s|\*.po|../../\*.po|" po/CMakeLists.txt +} +patchPhase=myPatchPhase +genericBuild diff --git a/pkgs/desktops/kde-4.2/extragear/gtk-qt-engine/default.nix b/pkgs/desktops/kde-4.2/extragear/gtk-qt-engine/default.nix new file mode 100644 index 00000000000..8a572ba39fb --- /dev/null +++ b/pkgs/desktops/kde-4.2/extragear/gtk-qt-engine/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl, cmake, qt4, perl, libX11, gtk, libbonoboui, gettext, kdelibs, automoc4, phonon}: + +stdenv.mkDerivation { + name = "gtk-qt-engine-1.1"; + src = fetchurl { + url = http://gtk-qt-engine.googlecode.com/files/gtk-qt-engine-1.1.tar.bz2; + sha256 = "4310f8f179c5ab70cea614a07b0c3e84234d05388dded85596200fa754c290a6"; + }; + buildInputs = [ cmake qt4 perl libX11 gtk libbonoboui gettext kdelibs automoc4 phonon ]; + builder = ./builder.sh; +} diff --git a/pkgs/desktops/kde-4.2/extragear/kdesvn/default.nix b/pkgs/desktops/kde-4.2/extragear/kdesvn/default.nix index 407b84f9989..25e98ec29c4 100644 --- a/pkgs/desktops/kde-4.2/extragear/kdesvn/default.nix +++ b/pkgs/desktops/kde-4.2/extragear/kdesvn/default.nix @@ -2,11 +2,12 @@ kdelibs, automoc4, phonon}: stdenv.mkDerivation { - name = "kdesvn-1.2.4"; + name = "kdesvn-1.3.0"; src = fetchurl { - url = http://kdesvn.alwins-world.de/downloads/kdesvn-1.2.4.tar.bz2; - sha256 = "aa81addf5f86b4c59026debc555d7aac783002331942847c32d2feb277a81620"; + url = http://kdesvn.alwins-world.de/downloads/kdesvn-1.3.0.tar.bz2; + sha256 = "d219c430c98d75d07258057e78c29042777e0368eded7494499361031ac63649"; }; + includeAllQtDirs=true; builder = ./builder.sh; inherit subversion; buildInputs = [ cmake qt4 perl gettext apr aprutil subversion db4 kdelibs automoc4 phonon ]; diff --git a/pkgs/desktops/kde-4.2/extragear/kmplayer/builder.sh b/pkgs/desktops/kde-4.2/extragear/kmplayer/builder.sh new file mode 100644 index 00000000000..92c7515c9a9 --- /dev/null +++ b/pkgs/desktops/kde-4.2/extragear/kmplayer/builder.sh @@ -0,0 +1,9 @@ +source $stdenv/setup + +myPatchPhase() +{ + sed -i -e "s|files.length|files.size|" \ + -e "s|chlds.length|chlds.size|" src/kmplayerapp.cpp +} +patchPhase=myPatchPhase +genericBuild diff --git a/pkgs/desktops/kde-4.2/extragear/kmplayer/default.nix b/pkgs/desktops/kde-4.2/extragear/kmplayer/default.nix new file mode 100644 index 00000000000..74444a32a99 --- /dev/null +++ b/pkgs/desktops/kde-4.2/extragear/kmplayer/default.nix @@ -0,0 +1,12 @@ +{stdenv, fetchurl, cmake, qt4, perl, gettext, pango, gtk, dbus_glib, kdelibs, automoc4, phonon}: + +stdenv.mkDerivation { + name = "kmplayer-0.11.1"; + src = fetchurl { + url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.1.tar.bz2; + sha256 = "d10df9c31f540ab9442b75e0be0ed2cff9313de9004a4a8acbe3dbed79d5fddb"; + }; + includeAllQtDirs=true; + builder = ./builder.sh; + buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc pango gtk dbus_glib kdelibs automoc4 phonon ]; +} diff --git a/pkgs/desktops/kde-4.2/extragear/koffice/default.nix b/pkgs/desktops/kde-4.2/extragear/koffice/default.nix new file mode 100644 index 00000000000..872e2ab7e95 --- /dev/null +++ b/pkgs/desktops/kde-4.2/extragear/koffice/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, cmake, qt4, perl, lcms, exiv2, libxml2, libxslt, boost, glew +, shared_mime_info, poppler, gsl, gmm, wv2, libwpd +, kdelibs, kdepimlibs, automoc4, phonon, qimageblitz, qca2, eigen}: + +stdenv.mkDerivation { + name = "koffice-2.0.0"; + src = fetchurl { + url = mirror://kde/stable/koffice-2.0.0/src/koffice-2.0.0.tar.bz2; + sha256 = "8cfc35acf4b6d306245e7705899167fd1b67a861136551ab02a0cd7542eb72e9"; + }; + includeAllQtDirs=true; + CMAKE_PREFIX_PATH=kdepimlibs; + buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew shared_mime_info + poppler gsl gmm wv2 libwpd + kdelibs kdepimlibs automoc4 phonon qimageblitz qca2 eigen ]; +} diff --git a/pkgs/desktops/kde-4.2/extragear/krusader/default.nix b/pkgs/desktops/kde-4.2/extragear/krusader/default.nix index 35933a01523..d740b4dd3f6 100644 --- a/pkgs/desktops/kde-4.2/extragear/krusader/default.nix +++ b/pkgs/desktops/kde-4.2/extragear/krusader/default.nix @@ -6,5 +6,6 @@ stdenv.mkDerivation { url = mirror://sourceforge/krusader/krusader-2.0.0.tar.gz; sha256 = "dc74c47d6eaf1c28165a74750e5a1b0341fa1c0d436658d0d5f85a6149f4852c"; }; + includeAllQtDirs=true; buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon ]; } diff --git a/pkgs/desktops/kde-4.2/extragear/ktorrent/default.nix b/pkgs/desktops/kde-4.2/extragear/ktorrent/default.nix index fc7a3cbe97d..0a60fa82d29 100644 --- a/pkgs/desktops/kde-4.2/extragear/ktorrent/default.nix +++ b/pkgs/desktops/kde-4.2/extragear/ktorrent/default.nix @@ -7,6 +7,7 @@ stdenv.mkDerivation { url = http://ktorrent.org/downloads/3.2.1/ktorrent-3.2.1.tar.bz2; sha256 = "e37324519fdd04cad2a489fb772cbe628d8ff9f578e2bb913b18a1404dd7c4eb"; }; + includeAllQtDirs=true; CMAKE_PREFIX_PATH=kdepimlibs; cmakeFlags = "-DTASKMANAGER_INCLUDE_DIR=${kdebase_workspace}/include"; buildInputs = [ cmake qt4 perl gmp taglib boost gettext stdenv.gcc.libc diff --git a/pkgs/desktops/kde-4.2/games/default.nix b/pkgs/desktops/kde-4.2/games/default.nix index 29ba3e9a26f..587854eaaa4 100644 --- a/pkgs/desktops/kde-4.2/games/default.nix +++ b/pkgs/desktops/kde-4.2/games/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl, cmake, qt4, perl, kdelibs, automoc4, phonon, qca2}: stdenv.mkDerivation { - name = "kdegames-4.2.2"; + name = "kdegames-4.2.4"; src = fetchurl { - url = mirror://kde/stable/4.2.2/src/kdegames-4.2.2.tar.bz2; - sha1 = "ffd4dde8c10f14de9da4e44d22b2ac19c8bfce9b"; + url = mirror://kde/stable/4.2.4/src/kdegames-4.2.4.tar.bz2; + sha1 = "c940d73616734fabdfcd0c5961459ba168494b16"; }; + includeAllQtDirs=true; buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon qca2 ]; } diff --git a/pkgs/desktops/kde-4.2/graphics/default.nix b/pkgs/desktops/kde-4.2/graphics/default.nix index 678eb67f98e..cd3bce0f85c 100644 --- a/pkgs/desktops/kde-4.2/graphics/default.nix +++ b/pkgs/desktops/kde-4.2/graphics/default.nix @@ -3,11 +3,12 @@ kdelibs, automoc4, phonon, strigi, qimageblitz, soprano, qca2}: stdenv.mkDerivation { - name = "kdegraphics-4.2.2"; + name = "kdegraphics-4.2.4"; src = fetchurl { - url = mirror://kde/stable/4.2.2/src/kdegraphics-4.2.2.tar.bz2; - sha1 = "cb7bda631b6e5b1866b07c622c7dc54771a87760"; + url = mirror://kde/stable/4.2.4/src/kdegraphics-4.2.4.tar.bz2; + sha1 = "032352e87be16ae90f09183a466e61487ef1e738"; }; + includeAllQtDirs=true; buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre poppler chmlib stdenv.gcc.libc libXxf86vm kdelibs automoc4 phonon strigi qimageblitz soprano qca2 ]; diff --git a/pkgs/desktops/kde-4.2/libs/default.nix b/pkgs/desktops/kde-4.2/libs/default.nix index 57893cedcfb..1837f3a32cd 100644 --- a/pkgs/desktops/kde-4.2/libs/default.nix +++ b/pkgs/desktops/kde-4.2/libs/default.nix @@ -5,13 +5,15 @@ }: stdenv.mkDerivation { - name = "kdelibs-4.2.2"; + name = "kdelibs-4.2.4"; src = fetchurl { - url = mirror://kde/stable/4.2.2/src/kdelibs-4.2.2.tar.bz2; - sha1 = "7769bac38b27d8726c27eb3bb0b79f370f77457f"; + url = mirror://kde/stable/4.2.4/src/kdelibs-4.2.4.tar.bz2; + sha1 = "259947ede89daec94475a811a41ae7474bc4fd17"; }; + includeAllQtDirs = true; + buildInputs = [ cmake perl qt4 stdenv.gcc.libc bzip2 pcre fam libxml2 libxslt shared_mime_info giflib jasper /* openexr */ aspell avahi diff --git a/pkgs/desktops/kde-4.2/multimedia/default.nix b/pkgs/desktops/kde-4.2/multimedia/default.nix index d7c78330ff1..328b6aacf93 100644 --- a/pkgs/desktops/kde-4.2/multimedia/default.nix +++ b/pkgs/desktops/kde-4.2/multimedia/default.nix @@ -2,11 +2,12 @@ kdelibs, automoc4, phonon}: stdenv.mkDerivation { - name = "kdemultimedia-4.2.2"; + name = "kdemultimedia-4.2.4"; src = fetchurl { - url = mirror://kde/stable/4.2.2/src/kdemultimedia-4.2.2.tar.bz2; - sha1 = "bacbf584cd38be5234bb5a4419a275c6f4164721"; + url = mirror://kde/stable/4.2.4/src/kdemultimedia-4.2.4.tar.bz2; + sha1 = "ab1f9e38ab38d502aa771a70137ded811f40ad1c"; }; + includeAllQtDirs=true; buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib cdparanoia kdelibs automoc4 phonon ]; } diff --git a/pkgs/desktops/kde-4.2/network/default.nix b/pkgs/desktops/kde-4.2/network/default.nix index bbb90648dd7..fd99c2d2ed4 100644 --- a/pkgs/desktops/kde-4.2/network/default.nix +++ b/pkgs/desktops/kde-4.2/network/default.nix @@ -4,11 +4,12 @@ kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz}: stdenv.mkDerivation { - name = "kdenetwork-4.2.2"; + name = "kdenetwork-4.2.4"; src = fetchurl { - url = mirror://kde/stable/4.2.2/src/kdenetwork-4.2.2.tar.bz2; - sha1 = "335a09012602400318d6e703fdcc390f5a2f7761"; + url = mirror://kde/stable/4.2.4/src/kdenetwork-4.2.4.tar.bz2; + sha1 = "31f3f1c44690339ce523c309a3d2c131563d9f97"; }; + includeAllQtDirs=true; CMAKE_PREFIX_PATH=kdepimlibs; buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn libvncserver tapioca_qt libmsn diff --git a/pkgs/desktops/kde-4.2/pim/default.nix b/pkgs/desktops/kde-4.2/pim/default.nix index b112d3af5ed..f272d82c60b 100644 --- a/pkgs/desktops/kde-4.2/pim/default.nix +++ b/pkgs/desktops/kde-4.2/pim/default.nix @@ -3,11 +3,12 @@ kdelibs, kdepimlibs, automoc4, phonon, akonadi, strigi, soprano, qca2}: stdenv.mkDerivation { - name = "kdepim-4.2.2"; + name = "kdepim-4.2.4"; src = fetchurl { - url = mirror://kde/stable/4.2.2/src/kdepim-4.2.2.tar.bz2; - sha1 = "abd6d9e7777cf192aa7919dce56644e942d8e2e9"; + url = mirror://kde/stable/4.2.4/src/kdepim-4.2.4.tar.bz2; + sha1 = "d2328af104edf6471e3474ccea39710e0e1babc9"; }; + includeAllQtDirs=true; CMAKE_PREFIX_PATH=kdepimlibs; builder = ./builder.sh; buildInputs = [ cmake qt4 perl boost gpgme stdenv.gcc.libc libassuan libgpgerror libxslt diff --git a/pkgs/desktops/kde-4.2/pimlibs/default.nix b/pkgs/desktops/kde-4.2/pimlibs/default.nix index 6231c838f35..38c72a18d0f 100644 --- a/pkgs/desktops/kde-4.2/pimlibs/default.nix +++ b/pkgs/desktops/kde-4.2/pimlibs/default.nix @@ -2,11 +2,12 @@ kdelibs, automoc4, phonon, akonadi}: stdenv.mkDerivation { - name = "kdepimlibs-4.2.2"; + name = "kdepimlibs-4.2.4"; src = fetchurl { - url = mirror://kde/stable/4.2.2/src/kdepimlibs-4.2.2.tar.bz2; - sha1 = "895ae97d393ec47386de71bbe76fb5a685d3850f"; + url = mirror://kde/stable/4.2.4/src/kdepimlibs-4.2.4.tar.bz2; + sha1 = "1deb9298fe935ed1a53fad8e2a060fdc1c3e4ad8"; }; + includeAllQtDirs=true; buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme stdenv.gcc.libc libical openldap kdelibs automoc4 phonon akonadi ]; } diff --git a/pkgs/desktops/kde-4.2/plasma-addons/default.nix b/pkgs/desktops/kde-4.2/plasma-addons/default.nix index 18d2d9e04a1..5fd04f71717 100644 --- a/pkgs/desktops/kde-4.2/plasma-addons/default.nix +++ b/pkgs/desktops/kde-4.2/plasma-addons/default.nix @@ -2,13 +2,14 @@ kdelibs, kdebase_workspace, kdepimlibs, kdegraphics, automoc4, phonon}: stdenv.mkDerivation { - name = "kdeplasma-addons-4.2.2"; + name = "kdeplasma-addons-4.2.4"; src = fetchurl { - url = mirror://kde/stable/4.2.2/src/kdeplasma-addons-4.2.2.tar.bz2; - sha1 = "6b4afe369597b8cdeff05e1b0feda0d48aea59d6"; + url = mirror://kde/stable/4.2.4/src/kdeplasma-addons-4.2.4.tar.bz2; + sha1 = "500d05cc6eeb218b8615b1a49e69e3b9e88f3997"; }; inherit kdebase_workspace; builder = ./builder.sh; + includeAllQtDirs=true; CMAKE_PREFIX_PATH=kdepimlibs; buildInputs = [ cmake qt4 perl python shared_mime_info kdelibs kdebase_workspace kdepimlibs kdegraphics automoc4 phonon ]; diff --git a/pkgs/desktops/kde-4.2/sdk/default.nix b/pkgs/desktops/kde-4.2/sdk/default.nix index 75f22f2ab41..73a50ef44aa 100644 --- a/pkgs/desktops/kde-4.2/sdk/default.nix +++ b/pkgs/desktops/kde-4.2/sdk/default.nix @@ -2,11 +2,12 @@ kdelibs, kdepimlibs, automoc4, phonon, strigi}: stdenv.mkDerivation { - name = "kdesdk-4.2.2"; + name = "kdesdk-4.2.4"; src = fetchurl { - url = mirror://kde/stable/4.2.2/src/kdesdk-4.2.2.tar.bz2; - sha1 = "ea610bc2cf3f5beb37f03ac6ff7822fca5234003"; + url = mirror://kde/stable/4.2.4/src/kdesdk-4.2.4.tar.bz2; + sha1 = "ad5a00f5ee4ae0f627b971b7413edb0550e92db1"; }; + includeAllQtDirs=true; CMAKE_PREFIX_PATH=kdepimlibs; builder=./builder.sh; inherit aprutil; diff --git a/pkgs/desktops/kde-4.2/support/akonadi/default.nix b/pkgs/desktops/kde-4.2/support/akonadi/default.nix index 8d9ba73cc57..760260a6876 100644 --- a/pkgs/desktops/kde-4.2/support/akonadi/default.nix +++ b/pkgs/desktops/kde-4.2/support/akonadi/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4}: stdenv.mkDerivation { - name = "akonadi-1.1.1"; + name = "akonadi-1.1.2"; src = fetchurl { - url = http://akonadi.omat.nl/akonadi-1.1.1.tar.bz2; - md5 = "2e98b42cec9ec4e60a2e3c096f1a3106"; + url = http://download.akonadi-project.org/akonadi-1.1.2.tar.bz2; + sha256 = "1km5mbcsx8xbb327lbva1pm8a8mjai64kqxww1qzbxz9a20w3css"; }; + includeAllQtDirs=true; buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 ]; } diff --git a/pkgs/desktops/kde-4.2/support/phonon/default.nix b/pkgs/desktops/kde-4.2/support/phonon/default.nix index 35bfd838db8..464b4684743 100644 --- a/pkgs/desktops/kde-4.2/support/phonon/default.nix +++ b/pkgs/desktops/kde-4.2/support/phonon/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation { url = mirror://kde/stable/4.2.1/src/phonon-4.3.1.tar.bz2; sha1 = "f7537e5280d0a4cc1348975daa7a7e45d833d45c"; }; + includeAllQtDirs = true; buildInputs = [ cmake libXau libXdmcp qt4 pthread_stubs gst_all.gstreamer gst_all.gstPluginsBase xineLib diff --git a/pkgs/desktops/kde-4.2/support/qimageblitz/default.nix b/pkgs/desktops/kde-4.2/support/qimageblitz/default.nix index 8e3dd70e280..e5fb050ebaa 100644 --- a/pkgs/desktops/kde-4.2/support/qimageblitz/default.nix +++ b/pkgs/desktops/kde-4.2/support/qimageblitz/default.nix @@ -6,5 +6,6 @@ stdenv.mkDerivation { url = mirror://sourceforge/qimageblitz/qimageblitz-0.0.4.tar.bz2; md5 = "cb87c7f1c0455e8984ee4830f1e749cf"; }; + includeAllQtDirs = true; buildInputs = [ cmake qt4 ]; } diff --git a/pkgs/desktops/kde-4.2/support/strigi/default.nix b/pkgs/desktops/kde-4.2/support/strigi/default.nix index 1e50dad9e16..e95556d0eb3 100644 --- a/pkgs/desktops/kde-4.2/support/strigi/default.nix +++ b/pkgs/desktops/kde-4.2/support/strigi/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation { url = mirror://sourceforge/strigi/strigi-0.6.4.tar.bz2; md5 = "324fd9606ac77765501717ff92c04f9a"; }; + + includeAllQtDirs = true; CLUCENE_HOME = cluceneCore; diff --git a/pkgs/desktops/kde-4.2/toys/default.nix b/pkgs/desktops/kde-4.2/toys/default.nix index a5959d92274..3b375f4f8a7 100644 --- a/pkgs/desktops/kde-4.2/toys/default.nix +++ b/pkgs/desktops/kde-4.2/toys/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl, cmake, qt4, perl, kdelibs, kdebase_workspace, automoc4, phonon}: stdenv.mkDerivation { - name = "kdetoys-4.2.2"; + name = "kdetoys-4.2.4"; src = fetchurl { - url = mirror://kde/stable/4.2.2/src/kdetoys-4.2.2.tar.bz2; - sha1 = "5057ae39c77be8792fb1c23fd8cf1e3ac06942cf"; + url = mirror://kde/stable/4.2.4/src/kdetoys-4.2.4.tar.bz2; + sha1 = "3f05154f85d0a01ceb97854e31adff03a7b5fdda"; }; + includeAllQtDirs=true; buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon ]; } diff --git a/pkgs/desktops/kde-4.2/utils/default.nix b/pkgs/desktops/kde-4.2/utils/default.nix index 2458e47b742..ed455013273 100644 --- a/pkgs/desktops/kde-4.2/utils/default.nix +++ b/pkgs/desktops/kde-4.2/utils/default.nix @@ -2,13 +2,14 @@ kdelibs, kdepimlibs, kdebindings, automoc4, phonon, qimageblitz}: stdenv.mkDerivation { - name = "kdeutils-4.2.2"; + name = "kdeutils-4.2.4"; src = fetchurl { - url = mirror://kde/stable/4.2.2/src/kdeutils-4.2.2.tar.bz2; - sha1 = "98e388776b1c270fc6a629c94455024e08bb85b4"; + url = mirror://kde/stable/4.2.4/src/kdeutils-4.2.4.tar.bz2; + sha1 = "59bb17463bec48c77768e50fb0e9ec3c1b0827af"; }; builder = ./builder.sh; inherit system_config_printer; + includeAllQtDirs=true; CMAKE_PREFIX_PATH=kdepimlibs; buildInputs = [ cmake qt4 perl gmp python libzip libarchive sip pyqt4 pycups system_config_printer rhpl kdelibs kdepimlibs kdebindings automoc4 phonon qimageblitz ]; diff --git a/pkgs/desktops/kde-4.2/webdev/default.nix b/pkgs/desktops/kde-4.2/webdev/default.nix index 6e7d0b9bea4..f4a12e6779a 100644 --- a/pkgs/desktops/kde-4.2/webdev/default.nix +++ b/pkgs/desktops/kde-4.2/webdev/default.nix @@ -2,11 +2,12 @@ kdelibs, kdepimlibs, automoc4, phonon}: stdenv.mkDerivation { - name = "kdewebdev-4.2.2"; + name = "kdewebdev-4.2.4"; src = fetchurl { - url = mirror://kde/stable/4.2.2/src/kdewebdev-4.2.2.tar.bz2; - sha1 = "fe43dad60a72bcaaafa0d0384fa5635c6a9c4795"; + url = mirror://kde/stable/4.2.4/src/kdewebdev-4.2.4.tar.bz2; + sha1 = "9e3667c994793232177a70ff0b6fb2caa252757f"; }; + includeAllQtDirs=true; CMAKE_PREFIX_PATH=kdepimlibs; buildInputs = [ cmake qt4 perl libxml2 libxslt boost kdelibs kdepimlibs automoc4 phonon ]; } diff --git a/pkgs/desktops/superkaramba/default.nix b/pkgs/desktops/superkaramba/default.nix index 0f48da9ad8f..e3d9642b4be 100644 --- a/pkgs/desktops/superkaramba/default.nix +++ b/pkgs/desktops/superkaramba/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec{ --with-pythondir=${python} "; - #xlibs2 = map (attrName: builtins.getAttr attrName xlibs) (builtins.attrNames xlibs); + #xlibs2 attrByPath (attrName: builtins.getAttr attrName xlibs) (builtins.attrNames xlibs); #x_libraries_env = concatStringsSep ":" (map (p: "${p}/lib") xlibs2); x_libraries_env = concatStringsSep ":" (map (p: "${p}/lib") xlibs); diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 7186563eafc..8846a82bc7b 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -19,7 +19,7 @@ rec { /* doConfigure should be specified separately */ phaseNames = ["preBuild" "doMakeInstall" "postInstall"]; - preBuild = FullDepEntry ('' + preBuild = fullDepEntry ('' export NIX_LDFLAGS='-lXi -lX11 -lglib -lgtk -lgdk -lgdk_pixbuf -lc -lXext' ensureDir $out/share tar xf ${fpc.src} --strip-components=1 -C $out/share @@ -27,7 +27,7 @@ rec { '') ["minInit" "defEnsureDir" "doUnpack"]; - postInstall = FullDepEntry ('' + postInstall = fullDepEntry ('' wrapProgram $out/bin/startlazarus --prefix NIX_LDFLAGS ' ' "'$NIX_LDFLAGS'" '') ["doMakeInstall" "minInit" "defEnsureDir"]; diff --git a/pkgs/development/compilers/gcc-4.3/default.nix b/pkgs/development/compilers/gcc-4.3/default.nix index df4aca0bf55..a7c3c21fb51 100644 --- a/pkgs/development/compilers/gcc-4.3/default.nix +++ b/pkgs/development/compilers/gcc-4.3/default.nix @@ -1,10 +1,12 @@ { stdenv, fetchurl, noSysDirs , langC ? true, langCC ? true, langFortran ? false, langTreelang ? false +, langJava ? false , profiledCompiler ? false , staticCompiler ? false , texinfo ? null , gmp, mpfr , bison ? null, flex ? null +, zlib ? null, boehmgc ? null , enableMultilib ? false , name ? "gcc" }: @@ -15,7 +17,7 @@ with stdenv.lib; let version = "4.3.3"; in -stdenv.mkDerivation { +stdenv.mkDerivation ({ name = "${name}-${version}"; builder = ./builder.sh; @@ -32,6 +34,10 @@ stdenv.mkDerivation { optional langFortran (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2"; sha256 = "1b2wbysviyh7l9fqbd6zy5y6y89xgysy99gr8wx8xkc1hy2nwdsq"; + }) ++ + optional langJava (fetchurl { + url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2"; + sha256 = "1mlazpydd9qv7zwxkbb5sw3clfawfndhcc3f5lzycminvn6qmfkb"; }); patches = @@ -42,7 +48,10 @@ stdenv.mkDerivation { inherit noSysDirs profiledCompiler staticCompiler; buildInputs = [texinfo gmp mpfr] - ++ optionals langTreelang [bison flex]; + ++ (optionals langTreelang [bison flex]) + ++ (optional (zlib != null) zlib) + ++ (optional (boehmgc != null) boehmgc) + ; configureFlags = " ${if enableMultilib then "" else "--disable-multilib"} @@ -53,6 +62,7 @@ stdenv.mkDerivation { ( optional langC "c" ++ optional langCC "c++" ++ optional langFortran "fortran" + ++ optional langJava "java" ++ optional langTreelang "treelang" ) ) @@ -71,4 +81,10 @@ stdenv.mkDerivation { license = "GPL/LGPL"; description = "GNU Compiler Collection, 4.3.x"; }; -} +} // (if langJava then { + postConfigure = '' + make configure-gcc + sed -i gcc/Makefile -e 's@^CFLAGS = .*@& -I${zlib}/include@ ; s@^LDFLAGS = .*@& -L${zlib}/lib@' + sed -i gcc/Makefile -e 's@^CFLAGS = .*@& -I${boehmgc}/include@ ; s@^LDFLAGS = .*@& -L${boehmgc}/lib -lgc@' + ''; +} else {})) diff --git a/pkgs/development/compilers/gcc-apple/default.nix b/pkgs/development/compilers/gcc-apple/default.nix index a5f89455501..815f97695c5 100644 --- a/pkgs/development/compilers/gcc-apple/default.nix +++ b/pkgs/development/compilers/gcc-apple/default.nix @@ -9,11 +9,11 @@ assert stdenv.isDarwin; assert langF77 -> gmp != null; stdenv.mkDerivation ({ - name = "gcc-4.0.1-apple-5341"; + name = "gcc-4.2.1-apple-5531"; builder = ./builder.sh; src = fetchurl { - url = http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5341.tar.gz; - md5 = "a135f107ddc55b773b40dfff4f049640"; + url = http://www.opensource.apple.com/tarballs/gcc_42/gcc_42-5531.tar.gz ; + sha256 = "0bk37axx202x0ll1f8q00p233n3j8zga09ljxia1g89g17i64j4j"; }; patches = [./pass-cxxcpp.patch] diff --git a/pkgs/development/compilers/ghc/6.10.3.nix b/pkgs/development/compilers/ghc/6.10.3.nix new file mode 100644 index 00000000000..f05306f1bf9 --- /dev/null +++ b/pkgs/development/compilers/ghc/6.10.3.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, libedit, ghc, perl, gmp, ncurses}: + +stdenv.mkDerivation rec { + version = "6.10.3"; + + name = "ghc-${version}"; + + homepage = "http://haskell.org/ghc"; + + src = fetchurl { + url = "${homepage}/dist/${version}/${name}-src.tar.bz2"; + sha256 = "82d104ab8b24f27c3566b5693316c779427794a137237b3df925c55e20905893"; + }; + + buildInputs = [ghc libedit perl gmp]; + + configureFlags=[ + "--with-gmp-libraries=${gmp}/lib" + "--with-gmp-includes=${gmp}/include" + "--with-gcc=${stdenv.gcc}/bin/gcc" + ]; + + meta = { + inherit homepage; + description = "The Glasgow Haskell Compiler"; + }; +} diff --git a/pkgs/development/compilers/ghc/wrapper.nix b/pkgs/development/compilers/ghc/wrapper.nix index 5cacfdf8f89..7d37cba6efe 100644 --- a/pkgs/development/compilers/ghc/wrapper.nix +++ b/pkgs/development/compilers/ghc/wrapper.nix @@ -11,9 +11,12 @@ stdenv.mkDerivation { ensureDir $out/bin cp $GHCGetPackages $out/bin/ghc-get-packages.sh chmod 755 $out/bin/ghc-get-packages.sh - for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version} runghc runhaskell; do + for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\")" done + for prg in runghc runhaskell; do + makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\" \" -package-conf --ghc-arg=\")" + done for prg in ghc-pkg ghc-pkg-${ghc.version}; do makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\" --package-conf=)" done diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix new file mode 100644 index 00000000000..e8afd86463d --- /dev/null +++ b/pkgs/development/compilers/idris/default.nix @@ -0,0 +1,24 @@ +{fetchdarcs, cabal, mtl, parsec, readline, ivor, happy}: + +cabal.mkDerivation (self : { + pname = "idris"; + name = self.fname; + version = "0.1.2"; + src = fetchdarcs { + url = http://www-fp.dcs.st-and.ac.uk/~eb/darcs/Idris; + sha256 = "de50ed4bedacee36d9942bf4db90deca3915cf6c106aa834d11e83972b2b639a"; + context = ./idris.context; + }; + propagatedBuildInputs = [mtl parsec readline ivor]; + extraBuildInputs = [happy]; + preConfigure = '' + echo "module Idris.Prefix where prefix = \"$out\"" > Idris/Prefix.hs + ''; + postInstall = '' + ensureDir $out/lib/idris + install lib/*.idr lib/*.e $out/lib/idris + ''; + meta = { + description = "An experimental language with full dependent types"; + }; +}) diff --git a/pkgs/development/compilers/idris/idris.context b/pkgs/development/compilers/idris/idris.context new file mode 100644 index 00000000000..fad67499883 --- /dev/null +++ b/pkgs/development/compilers/idris/idris.context @@ -0,0 +1,586 @@ + +Context: + +[Missed SCTrans source! +eb@cs.st-andrews.ac.uk**20090511120315] + +[Put RunIO in a more sensible place +eb@cs.st-andrews.ac.uk**20090426144418] + +[Update cabal details +eb@cs.st-andrews.ac.uk**20090426144101] + +[Convert things which look like Nats to Nats for optimisation +eb@cs.st-andrews.ac.uk**20090423220551] + +[Basic Nat optimisation +eb@cs.st-andrews.ac.uk**20090423185609] + +[need to check if arguments are still needed to discriminate on collapsing +eb@cs.st-andrews.ac.uk**20090309174234] + +[Using knowledge of collapsing to help forcing +eb@cs.st-andrews.ac.uk**20090309153744] + +[Make transforms part of state, and display of optimised terms +eb@cs.st-andrews.ac.uk**20090309145419] + +[Prettier time formatting +eb@cs.st-andrews.ac.uk**20090309131334] + +[Don't just crash if the command is invalid... +eb@cs.st-andrews.ac.uk**20090309125424] + +[Added global options +eb@cs.st-andrews.ac.uk**20090309124541 + :o sets, :o f- or :o f+ to turn forcing/collapsing off/on + :o r- or :o r+ to turn display of compile/run times off/on +] + +[Added collapsing optimisation +eb@cs.st-andrews.ac.uk**20090309112238] + +[Added unused argument elimination +eb@cs.st-andrews.ac.uk**20090309004741 + Can fit within the optimisation framework, but you need to remember + the transforms so far at each definition for maximum effect. +] + +[(Failed) effort at argument erasure +eb@cs.st-andrews.ac.uk**20090308222948 + Trying to get it into the same framework as constructor transformations, + but it isn't going to happen that easily. +] + +[Added forcing optimisation +eb@cs.st-andrews.ac.uk**20090308164110] + +[Decide tactic works out its arguments +eb@cs.st-andrews.ac.uk**20090305165743] + +[Allow redefining of do notation +eb@cs.st-andrews.ac.uk**20090228164646] + +[lookupIdx fix +eb@cs.st-andrews.ac.uk**20090227231257] + +[Added 'using' syntax +eb@cs.st-andrews.ac.uk**20090226003439 + For blocks where lots of things use the same implicit arguments, saving + lots of typing and clutter. + (also allowed forward declaration of datatypes) +] + +[Fix conflict +eb@cs.st-andrews.ac.uk**20090107121727] + +[Laziness annotations +eb@cs.st-andrews.ac.uk**20090107121328] + +[Added decide tactic +eb@cs.st-andrews.ac.uk**20081220221809] + +[Add 'collapsible' flag +eb@cs.st-andrews.ac.uk**20081219180742] + +[Add TODO +eb@cs.st-andrews.ac.uk**20081219180726] + +[Some compiler fiddling +eb@cs.st-andrews.ac.uk**20081219155920] + +[Keep track of names which are still to be proved +eb@cs.st-andrews.ac.uk**20081219143302] + +[File operations +eb@cs.st-andrews.ac.uk**20081218233527] + +[Can allow the system to make up names for metavariables +eb@cs.st-andrews.ac.uk**20081218233428] + +[Deal with c includes and external libraries +eb@cs.st-andrews.ac.uk**20081126150921] + +[Fix foreign functions for IO +eb@cs.st-andrews.ac.uk**20081102153832] + +[Added Ptr primitive +eb@cs.st-andrews.ac.uk**20081102134232] + +[Add unsafePerformIO +eb@cs.st-andrews.ac.uk**20081019171546 + Mostly meant for pure foreign functions, but of course you're free to abuse + it as you like... +] + +[Add flags on functions to denote special behaviour +eb@cs.st-andrews.ac.uk**20081019160020 + Specifically, so far: + * %nocg Never generate code when compling + * %eval Evaluate completely before compiling + + This allows some 'meta-programs' to be written, which are fully evaluated + before compiling. We use this for defining foreign functions easily. +] + +[Record paper changes! +eb@cs.st-andrews.ac.uk**20080916170851] + +[Added 'use' tactic +eb@cs.st-andrews.ac.uk**20080916170742 + Like 'believe' but instead of just believing the value, adds subgoals for + each required equality proof. +] + +[More of paper +eb@cs.st-andrews.ac.uk**20080901161738] + +[Added paper macros +eb@cs.st-andrews.ac.uk**20080901094433] + +[Starting on paper +eb@cs.st-andrews.ac.uk**20080829091345] + +[Compiling 'Foreign' constructor (but only when inline) +eb@cs.st-andrews.ac.uk**20080826123458] + +[Generate Idris functions from foreign function descriptions +eb@cs.st-andrews.ac.uk**20080825164523] + +[Some work towards constructor optimisations +eb@cs.st-andrews.ac.uk**20080825094709] + +[Basic foreign function framework +eb@cs.st-andrews.ac.uk**20080825094631] + +[Added test transformation on Vects +eb@cs.st-andrews.ac.uk**20080731155217] + +[Transformation application +eb@cs.st-andrews.ac.uk**20080730125618] + +['noElim' flag to allow big data types not to need elimination rules +eb@cs.st-andrews.ac.uk**20080729125140] + +[Added __toInt and __toString +eb@cs.st-andrews.ac.uk**20080710151313 + Hacky for now, until we work out a nice way of doing coercions between + primitives. But it makes some programs, like those which ask for an int + as input, possible. +] + +[If an operator returns a boolean, the compiler had better make code to build a boolean! +eb@cs.st-andrews.ac.uk**20080710145313] + +[Deal with weird names that Ivor generates in the compiler +eb@cs.st-andrews.ac.uk**20080709112032] + +[Some Nat theorems +eb@cs.st-andrews.ac.uk**20080709014158] + +[Generalise tactic +eb@cs.st-andrews.ac.uk**20080709014121] + +[Need to give all the definitions to addIvor +eb@cs.st-andrews.ac.uk**20080708203624] + +[Don't crash when there's an error in input! +eb@cs.st-andrews.ac.uk**20080708182610] + +[Only allow 'believe' to rewrite values +eb@cs.st-andrews.ac.uk**20080708165140 + This way at least the types have to be right before '?=' defined + programs will run. +] + +[Added 'believe' tactic +eb@cs.st-andrews.ac.uk**20080708160736 + For allowing the testing of programs before a complete proof term + exists. Obviously programs built this way are not trustworthy! They make + use of a "Suspend_Disbelief" function which just invents a rewrite rule + that works, but which doesn't have a proof. +] + +[Added '?=' syntax +eb@cs.st-andrews.ac.uk**20080708140505 + If you have a pattern clause, and don't know the definite type of the + right hand side, use; + foo patterns ?= def; [theoremName] + + This will add a theorem called theoremName which fixes up the type, + and you can prove it later, via :p or with the 'proof' syntax. Useful + if you want to hide details of the proof of a necessary rewriting. +] + +[Catch errors in proofs, and allow abandoning +eb@cs.st-andrews.ac.uk**20080708123202] + +[Identify parameters of data types to make elimination rule properly +eb@cs.st-andrews.ac.uk**20080708105930] + +[Reading of proof scripts +eb@cs.st-andrews.ac.uk**20080707010718] + +[Add Undo, require % before tactics, and output script when done +eb@cs.st-andrews.ac.uk**20080707004642] + +[Rudimentary theorem prover now working +eb@cs.st-andrews.ac.uk**20080706235523] + +[Parsing tactics and proofs +eb@cs.st-andrews.ac.uk**20080706222536] + +[Adding some tactics +eb@cs.st-andrews.ac.uk**20080706211202] + +[Added :e command and call to epic +eb@cs.st-andrews.ac.uk**20080702115125] + +[forking needs the argument to be lazily evaluated +eb@cs.st-andrews.ac.uk**20080630141845] + +[Added threading to compiler +eb@cs.st-andrews.ac.uk**20080630130045] + +[Compiling IORefs +eb@cs.st-andrews.ac.uk**20080630123521] + +[Add Prelude.e, and prepend it to epic output +eb@cs.st-andrews.ac.uk**20080630113450] + +[Added Prover.lhs (not that it does much yet) +eb@cs.st-andrews.ac.uk**20080623231341] + +[Fix constructor expansion +eb@cs.st-andrews.ac.uk**20080623111226] + +[Got the basic compilation working +eb@cs.st-andrews.ac.uk**20080622233141] + +[Added proof token to Lexer +eb@cs.st-andrews.ac.uk**20080516140747 + (not doing anything yet, it needs a separate parser) + Also fix minor lexing error, and added ':i' command to drop into Ivor + for debugging purposes. +] + +[Added 'normalise' command +eb@cs.st-andrews.ac.uk**20080523140332 + Useful if you want to normalise an IO computation without running it. +] + +[Small implicit argument change +eb@cs.st-andrews.ac.uk**20080513231721 + {a,b,c} now allowed (i.e no need for type label as in {a,b,c:_} + Also, implicit arguments can now, syntactically, only appear at the + left of types of top level declarations (since that is the only place they + make sense with our simple way of handling such arguments). +] + +['!' to stop implicit arguments being added to a name +eb@cs.st-andrews.ac.uk**20080513215523] + +[Outputting Epic code +eb@cs.st-andrews.ac.uk**20080511173955 + Still some things to sort out before this runs though +] + +[Removing IO boiler plate for compilation +eb@cs.st-andrews.ac.uk**20080510170038] + +[Lambda lifter +eb@cs.st-andrews.ac.uk**20080509161049] + +[Oops, broke the build *again* +eb@cs.st-andrews.ac.uk**20080508220834] + +[Data type for result of lambda lifting +eb@cs.st-andrews.ac.uk**20080508214635] + +[Compiler part 1 (pattern matching) +eb@cs.st-andrews.ac.uk**20080508200113] + +[partition +eb@cs.st-andrews.ac.uk**20080508132348] + +[Let's try not to apply patches which break the build... +eb@cs.st-andrews.ac.uk**20080508111341] + +[Patterns representation +eb@cs.st-andrews.ac.uk**20080508110025] + +[Added append to library +eb@cs.st-andrews.ac.uk**20080429111614] + +[Begin planning compiler +eb@cs.st-andrews.ac.uk**20080414123534] + +[brief note +eb@cs.st-andrews.ac.uk**20080414103207] + +[Minor LaTeX improvement +eb@cs.st-andrews.ac.uk**20080330151806 + Output placeholders correctly. Can you tell I'm writing a paper ;). +] + +[Even more LaTeX fixes +eb@cs.st-andrews.ac.uk**20080327115445] + +[Fix some LaTeXing +eb@cs.st-andrews.ac.uk**20080327113804] + +[Some latex tidying +eb@cs.st-andrews.ac.uk**20080325114709] + +[Latex of do notating +eb@cs.st-andrews.ac.uk**20080325110051] + +[Add %latex directive to parser +eb@cs.st-andrews.ac.uk**20080325105552] + +[Allow giving latex commands for particular names in :l +eb@cs.st-andrews.ac.uk**20080325103351] + +[Basic LaTeX generation working +eb@cs.st-andrews.ac.uk**20080324185632] + +[Started LaTeX generation +eb@cs.st-andrews.ac.uk**20080324170817] + +[Implement :t in REPL +eb@cs.st-andrews.ac.uk**20080324143135] + +[Use readline for REPL, add :commands +eb@cs.st-andrews.ac.uk**20080324141759] + +[Oops, didn't mean to record the trace +eb@cs.st-andrews.ac.uk**20080322115632] + +[Allow types on bindings in do notation +eb@cs.st-andrews.ac.uk**20080322114909] + +[Fix bug: add placeholders inside infix ops +eb@cs.st-andrews.ac.uk**20080320150127] + +[Pretty print refl +eb@cs.st-andrews.ac.uk**20080320134148] + +[Bind multiple names in one go in type declarations +eb@cs.st-andrews.ac.uk**20080320132941] + +[Locks are semaphores +eb@cs.st-andrews.ac.uk**20080319161532 + So allow them to be initialised with the number of processes allowed to + hold onto then, +] + +[Missed a case in constant show +eb@cs.st-andrews.ac.uk**20080318175442] + +[Add Maybe and Either to prelude +eb@cs.st-andrews.ac.uk**20080318224740] + +[Use 'fastCheck' since we already know our IO programs work +eb@cs.st-andrews.ac.uk**20080318161100] + +[Pretty printing and parsing tweaks +eb@cs.st-andrews.ac.uk**20080318161027] + +[No point in generating elimination rules since we don't use them +eb@cs.st-andrews.ac.uk**20080317162738 + Perhaps later, if linking to a theorem prover, it will be useful, but + it can be done on demand. +] + +[Dump environment for metavars in the right order +eb@cs.st-andrews.ac.uk**20080315230225] + +[Nicer display of metavariables +eb@cs.st-andrews.ac.uk**20080314174637] + +[Added a pretty ugly pretty-printer for terms +eb@cs.st-andrews.ac.uk**20080314154034] + +[Added metavariable syntax +eb@cs.st-andrews.ac.uk**20080314132802] + +[Back in sync with Ivor (addPatternDef type changed) +eb@cs.st-andrews.ac.uk**20080314011920] + +[Add modules to .cabal for executable +eb@cs.st-andrews.ac.uk**20080313134204] + +[imports in RunIO +eb@cs.st-andrews.ac.uk**20080312174755] + +[minor cabal format +gwern0@gmail.com**20080312041116] + +[improve cabal metadata for hackage, split into lib/main +gwern0@gmail.com**20080312041034] + +[fix sdist +gwern0@gmail.com**20080312040218] + +[+Extensions +gwern0@gmail.com**20080312035953] + +[Context.lhs -> Context.hs +gwern0@gmail.com**20080312035926 + Literate files are just wasteful if they aren't literate +] + +[dehaskell98 +gwern0@gmail.com**20080312035905] + +[Update ioref example +eb@cs.st-andrews.ac.uk**20080312125024] + +[Added IORefs +eb@cs.st-andrews.ac.uk**20080312123834] + +[Added some concurrency primitives +eb@cs.st-andrews.ac.uk**20080311205546 + fork, newLock, lock, unlock +] + +[Add simple stateful DSL +eb@cs.st-andrews.ac.uk**20080311151020] + +[Add placeholders in do expressions too! +eb@cs.st-andrews.ac.uk**20080311150824] + +[Be more implicit! +eb@cs.st-andrews.ac.uk**20080310135937] + +[Better if testVect has ints +eb@cs.st-andrews.ac.uk**20080310133325] + +[syntax tinker in partition.idr +eb@cs.st-andrews.ac.uk**20080310132921] + +[Syntax for let bindings +eb@cs.st-andrews.ac.uk**20080310025357] + +[if...then...else syntax +eb@cs.st-andrews.ac.uk**20080310024516] + +[Member predicate +eb@cs.st-andrews.ac.uk**20080310013200] + +[Syntax for _ patterns +eb@cs.st-andrews.ac.uk**20080310012608] + +[Rename List +eb@cs.st-andrews.ac.uk**20080310002023] + +[builtins needs bool +eb@cs.st-andrews.ac.uk**20080310001809] + +[Removed samples which should be in lib +eb@cs.st-andrews.ac.uk**20080309224149] + +[Added io example +eb@cs.st-andrews.ac.uk**20080309223957] + +[More keeping in sync with Ivor +eb@cs.st-andrews.ac.uk**20080309222931] + +[Take advantage of better ivor inference +eb@cs.st-andrews.ac.uk**20080309213603] + +[Added vect lib +eb@cs.st-andrews.ac.uk**20080308185405] + +[Added List to library +eb@cs.st-andrews.ac.uk**20080308185119] + +[Lambdas can take multiple arguments +eb@cs.st-andrews.ac.uk**20080308185050] + +[Added integer comparison operators +eb@cs.st-andrews.ac.uk**20080308134245] + +[Add polymorphic boolean equality +eb@cs.st-andrews.ac.uk**20080308133304] + +[Added library paths and a simple prelude +eb@cs.st-andrews.ac.uk**20080308132011] + +[Some primitive operators, and '=' for JM equality +eb@cs.st-andrews.ac.uk**20080307234257] + +[Use WHNF for evaluation now Ivor has it +eb@cs.st-andrews.ac.uk**20080307195902] + +[Added builtins +eb@cs.st-andrews.ac.uk**20080307173517] + +[add RunIO.hs +eb@cs.st-andrews.ac.uk**20080306114827] + +[Added more samples (IO not quite working yet due to Ivor bug though) +eb@cs.st-andrews.ac.uk**20080305170333] + +[Add do notation +eb@cs.st-andrews.ac.uk**20080305170312] + +['include' files +eb@cs.st-andrews.ac.uk**20080305112534] + +[Latest Ivor allows more implicitness +eb@cs.st-andrews.ac.uk**20080305104707] + +[Enough annotations to make interp work +eb@cs.st-andrews.ac.uk**20080305001951] + +[Allow forward declarations for functions, add quicksort example +eb@cs.st-andrews.ac.uk**20080305000656] + +[Added 'partition' example +eb@cs.st-andrews.ac.uk**20080304224512] + +[Easier to put implicit arguments in pattern clauses +eb@cs.st-andrews.ac.uk**20080304224425] + +[John Major equality syntax +eb@cs.st-andrews.ac.uk**20080304215146] + +[Added interpreter example, fixed simple sample +eb@cs.st-andrews.ac.uk**20080303164114] + +[Changed some syntax +eb@cs.st-andrews.ac.uk**20080303163946 + - Implicit arguments can now be named when applied, so that the parser + knows which argument you mean + - No need for {} around definitions + - Type of types is # + +] + +[make sure constructur arguments get new names generated +eb@cs.st-andrews.ac.uk**20080229003215] + +[Added samples directory +eb@cs.st-andrews.ac.uk**20080228232920] + +[First version which runs code! +eb@cs.st-andrews.ac.uk**20080228232820] + +[Some simple examples +eb@cs.st-andrews.ac.uk**20080228175453] + +[Now building terms and datatypes for Ivor with implicit args added +eb@cs.st-andrews.ac.uk**20080228161136] + +[More work on parser; constants, lambdas, new syntax tree +eb@cs.st-andrews.ac.uk**20080226111951] + +[Parser for datatypes and basic function definitions +eb@cs.st-andrews.ac.uk**20080108171829] + +[Started parser +eb@cs.st-andrews.ac.uk**20071214181416] + +[First chunk of code +eb@cs.st-andrews.ac.uk**20071212114523] diff --git a/pkgs/development/compilers/llvm/llvm-gcc.nix b/pkgs/development/compilers/llvm/llvm-gcc.nix index 20090d4b1c6..a1f5e031eba 100644 --- a/pkgs/development/compilers/llvm/llvm-gcc.nix +++ b/pkgs/development/compilers/llvm/llvm-gcc.nix @@ -14,7 +14,7 @@ rec { patches = [ ./no-sys-dirs.patch ]; - preConfigure = FullDepEntry ('' + preConfigure = fullDepEntry ('' sed -e 's,^LLVMSRCDIR.*,LLVMSRCDIR := dummy,' \ -e 's,\$(LLVMSRCDIR)/include,${llvm}/include,g' \ @@ -53,7 +53,7 @@ rec { '') ["doUnpack" "minInit"]; configureCommand = "$(ls ../llvm-gcc*.*.source/configure)"; - postInstall = FullDepEntry ('' + postInstall = fullDepEntry ('' mv $out/bin/gcc $out/bin/llvm-gcc mv $out/bin/g++ $out/bin/llvm-g++ '')["doMakeInstall" "minInit"]; diff --git a/pkgs/development/compilers/nasm/builder.sh b/pkgs/development/compilers/nasm/builder.sh deleted file mode 100644 index 4109287448d..00000000000 --- a/pkgs/development/compilers/nasm/builder.sh +++ /dev/null @@ -1,6 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/bin -mkdir -p $out/man/man1 - -genericBuild \ No newline at end of file diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index a4444853a5f..b6a09d06984 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -1,10 +1,15 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "nasm-0.98.39"; - builder = ./builder.sh; +stdenv.mkDerivation rec { + name = "nasm-2.05.01"; + src = fetchurl { - url = mirror://sourceforge/nasm/nasm-0.98.39.tar.bz2; - md5 = "2032ad44c7359f7a9a166a40a633e772"; + url = "mirror://sourceforge/nasm/${name}.tar.bz2"; + sha256 = "0p2rlshd68m2h7psyjz4440grxwryxppqzchx7cbmzahqr2yy1lj"; + }; + + meta = { + homepage = http://www.nasm.us/; + description = "An 80x86 and x86-64 assembler designed for portability and modularity"; }; } diff --git a/pkgs/development/compilers/ocaml/3.11.1.nix b/pkgs/development/compilers/ocaml/3.11.1.nix new file mode 100644 index 00000000000..f5955c7c78c --- /dev/null +++ b/pkgs/development/compilers/ocaml/3.11.1.nix @@ -0,0 +1,28 @@ +args: with args; + +stdenv.mkDerivation (rec { + + name = "ocaml-3.11.1"; + + src = fetchurl { + url = "http://caml.inria.fr/pub/distrib/ocaml-3.11/${name}.tar.bz2"; + sha256 = "8c36a28106d4b683a15c547dfe4cb757a53fa9247579d1cc25bd06a22cc62e50"; + }; + + prefixKey = "-prefix "; + configureFlags = ["-no-tk" "-x11lib" x11]; + buildFlags = "world bootstrap world.opt"; + buildInputs = [x11 ncurses]; + installTargets = "install installopt"; + patchPhase = '' + CAT=$(type -tp cat) + sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang + ''; + + meta = { + homepage = http://caml.inria.fr/ocaml; + license = "QPL, LGPL2 (library part)"; + desctiption = "Most popular variant of the Caml language"; + }; + +}) diff --git a/pkgs/development/compilers/ocaml/default.nix b/pkgs/development/compilers/ocaml/default.nix index f3ef70b2a55..57cdfceaa15 100644 --- a/pkgs/development/compilers/ocaml/default.nix +++ b/pkgs/development/compilers/ocaml/default.nix @@ -4,5 +4,6 @@ builtins.listToAttrs [ { name = "3.08.0"; value = import ./3.08.0.nix args; } { name = "3.09.1"; value = import ./3.09.1.nix args; } { name = "3.10.0"; value = import ./3.10.0.nix args; } - { name = "default"; value = import ./3.09.1.nix args; } + { name = "3.11.1"; value = import ./3.11.1.nix args; } + { name = "default"; value = import ./3.11.1.nix args; } ] diff --git a/pkgs/development/compilers/qi/9.1.nix b/pkgs/development/compilers/qi/9.1.nix index a1c9670be84..8b218d499c5 100644 --- a/pkgs/development/compilers/qi/9.1.nix +++ b/pkgs/development/compilers/qi/9.1.nix @@ -13,7 +13,7 @@ let shell=stdenv.shell; in let - allBuild = FullDepEntry (" + allBuild = fullDepEntry (" (sleep 0.1; echo ) | clisp install.txt; (sleep 0.1; echo -e '1\n(quit)\n' ) | sh Qi-Linux-CLisp ensureDir \$out/share diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix new file mode 100644 index 00000000000..d239bfb5630 --- /dev/null +++ b/pkgs/development/compilers/sbcl/default.nix @@ -0,0 +1,61 @@ +a : +let + fetchurl = a.fetchurl; + + version = a.lib.attrByPath ["version"] "1.0.28" a; + buildInputs = with a; [ + clisp makeWrapper + ]; +in +rec { + src = fetchurl { + url = "http://prdownloads.sourceforge.net/sbcl/sbcl-${version}-source.tar.bz2"; + sha256 = "0jzi6zw73pll44fjllamiwvq5dihig2dcw3hl9h5a37948wnn0h4"; + }; + + inherit buildInputs; + configureFlags = []; + + /* doConfigure should be removed if not needed */ + phaseNames = ["setVars" "doFixNewer" "doFixTests" "setVersion" "doBuild" "doInstall" "doWrap"]; + + setVars = a.fullDepEntry ('' + export INSTALL_ROOT=$out + '') ["minInit"]; + + setVersion = a.fullDepEntry ('' + echo '"${version}.nixos"' > version.lisp-expr + echo " + (lambda (features) + (flet ((enable (x) + (pushnew x features)) + (disable (x) + (setf features (remove x features)))) + (enable :sb-thread))) " > customize-target-features.lisp + '') ["minInit" "doUnpack"]; + + doFixNewer = a.fullDepEntry('' + sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp + '') ["minInit" "doUnpack"]; + + doWrap = a.fullDepEntry ('' + wrapProgram "$out/bin/sbcl" --set "SBCL_HOME" "$out/lib/sbcl" + '') ["minInit" "addInputs"]; + + doFixTests = a.fullDepEntry ('' + sed -e 's/"sys"/"wheel"/' -i contrib/sb-posix/posix-tests.lisp + '') ["minInit" "doUnpack"]; + + doBuild = a.fullDepEntry ('' + sh make.sh clisp + '') ["minInit" "doUnpack" "addInputs"]; + + doInstall = a.fullDepEntry ('' + sh install.sh + '') ["doBuild" "minInit" "addInputs"]; + + name = "sbcl-" + version; + meta = { + description = "Lisp compiler"; + }; +} diff --git a/pkgs/development/interpreters/clisp/2.44.1.nix b/pkgs/development/interpreters/clisp/2.44.1.nix new file mode 100644 index 00000000000..9ce38a6ed48 --- /dev/null +++ b/pkgs/development/interpreters/clisp/2.44.1.nix @@ -0,0 +1,44 @@ +args: with args; +stdenv.mkDerivation rec { + v = "2.44.1"; + name = "clisp-${v}"; + src = + fetchurl { + url = "mirror://gnu/clisp/release/${v}/${name}.tar.gz"; + sha256 = "0rkp6j6rih4s5d9acifh7pi4b9xfgcspif512l269dqy9qgyy4j1"; + }; + + inherit libsigsegv gettext coreutils; + buildInputs = [libsigsegv gettext ncurses readline libX11 libXau + libXt pcre zlib libXpm xproto libXext xextproto libffi + libffcall]; + + # First, replace port 9090 (rather low, can be used) + # with 64237 (much higher, IANA private area, not + # anything rememberable). + patchPhase = '' + sed -e 's@9090@64237@g' -i tests/socket.tst + sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in + find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i + ''; + + configureFlags = "--with-readline builddir --with-dynamic-ffi + --with-module=clx/new-clx --with-module=i18n --with-module=bindings/glibc + --with-module=pcre --with-module=rawsock --with-module=readline + --with-module=syscalls --with-module=wildcard --with-module=zlib"; + + preBuild = '' + sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d + cd builddir + ''; + + NIX_CFLAGS_COMPILE="-O0"; + + # TODO : make mod-check fails + doCheck = 1; + + meta = { + description = "ANSI Common Lisp Implementation"; + homepage = http://clisp.cons.org; + }; +} diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index c20ba9b128f..bd074138c4a 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -1,16 +1,17 @@ args: with args; stdenv.mkDerivation rec { - v = "2.43"; + v = "2.47"; name = "clisp-${v}"; src = fetchurl { - url = "mirror://gnu/clisp/release/${v}/${name}.tar.bz2"; - sha256 = "10qyn6wccnayf1cyvrcanay6c6laar6z1r608w7ijp6nb763q8dm"; + url = "mirror://gnu/clisp/release/${v}/${name}.tar.gz"; + sha256 = "0slfx519pk75y5rf7wfna7jgyhkr4qp29z9zd1rcnnrhps11bpn7"; }; inherit libsigsegv gettext coreutils; buildInputs = [libsigsegv gettext ncurses readline libX11 libXau - libXt pcre zlib libXpm xproto libXext xextproto]; + libXt pcre zlib libXpm xproto libXext xextproto libffi + libffcall]; # First, replace port 9090 (rather low, can be used) # with 64237 (much higher, IANA private area, not @@ -26,7 +27,10 @@ stdenv.mkDerivation rec { --with-module=pcre --with-module=rawsock --with-module=readline --with-module=syscalls --with-module=wildcard --with-module=zlib"; - preBuild = "cd builddir"; + preBuild = '' + sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d + cd builddir + ''; NIX_CFLAGS_COMPILE="-O0"; diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index 2ba7c5fb697..3277d0145f9 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -2,10 +2,10 @@ args : let lib = args.lib; fetchurl = args.fetchurl; - FullDepEntry = args.FullDepEntry; + fullDepEntry = args.fullDepEntry; doPatchShebangs = args.doPatchShebangs; - version = lib.getAttr ["version"] "2008.03.30" args; + version = lib.attrByPath ["version"] "2008.03.30" args; buildInputs = with args; [ zlib sqlite gmp libffi cairo ncurses freetype mesa libpng libtiff libjpeg readline libsndfile libxml2 @@ -17,7 +17,7 @@ rec { fetchurl { url = "http://github.com/stevedekorte/io/tarball/${version}"; name = "io-${version}.tar.gz"; - sha256 = "1vdjyqv86l290kzhyw8mwzfqgb279dl9nqmy6bih6g8n4yz36ady"; + sha256 = "0mn7vm2q1r5l3la5k4hdx5cqrp3nhpw01ywnx43k9gfxkdbajn9g"; }; inherit buildInputs; @@ -29,7 +29,7 @@ rec { phaseNames = ["preBuild" "doMakeInstall" "postInstall" (doPatchShebangs "$out/share/io/samples") (doPatchShebangs "$out/lib/io")]; - preBuild = FullDepEntry ('' + preBuild = fullDepEntry ('' for i in $pkgs ${ if args.stdenv ? glibc then args.stdenv.glibc else "" } ${ @@ -41,7 +41,7 @@ rec { done '') ["minInit" "addInputs" "doUnpack"]; - postInstall = FullDepEntry ('' + postInstall = fullDepEntry ('' ensureDir $out/share/io ln -s $out/lib/io/addons $out/share/io diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix new file mode 100644 index 00000000000..3c0db6c6dcc --- /dev/null +++ b/pkgs/development/interpreters/jruby/default.nix @@ -0,0 +1,18 @@ +args: with args; +stdenv.mkDerivation { + name = "jruby-1.1.6"; + + src = fetchurl { + url = http://dist.codehaus.org/jruby/1.1.6RC1/jruby-bin-1.1.6RC1.tar.gz; + sha256 = "1q3cjshxk484i8gqxm682bxcrps7205nl9vlim4s6z827bjlmc4a"; + }; + + buildInputs = []; + installPhase = '' ensureDir $out; cp -r * $out ''; + + meta = { + description = "ruby interpreter written in Java"; + homepage = http://jruby.codehaus.org/; + license = "CPL-1.0 GPL-2 LGPL-2.1"; # one of those + }; +} diff --git a/pkgs/development/interpreters/php_configurable/default.nix b/pkgs/development/interpreters/php_configurable/default.nix index e16f2829f8a..f2b05637858 100644 --- a/pkgs/development/interpreters/php_configurable/default.nix +++ b/pkgs/development/interpreters/php_configurable/default.nix @@ -1,4 +1,4 @@ -let version = "5.2.6"; in +let version = "5.2.9"; in args: with args; @@ -38,6 +38,11 @@ composableDerivation {} ( fixed : { buildInputs = [ libxml2 ]; }; + sqlite = { + configureFlags = ["--with-pdo-sqlite=${sqlite}"]; + buildInputs = [ sqlite ]; + }; + postgresql = { configureFlags = ["--with-pgsql=${postgresql}"]; buildInputs = [ postgresql ]; @@ -73,6 +78,10 @@ composableDerivation {} ( fixed : { buildInputs = [gd]; }; + soap = { + configureFlags = ["--enable-soap"]; + }; + sockets = { configureFlags = ["--enable-sockets"]; }; @@ -115,18 +124,22 @@ composableDerivation {} ( fixed : { curlSupport = true; gettextSupport = true; postgresqlSupport = true; + sqliteSupport = true; + soapSupport = true; zlibSupport = true; - opnesslSupport = true; + opensslSupport = true; xdebugSupport = true; mbstringSupport = true; gdSupport = true; }; + # only -O1 configurePhase = '' iniFile=$out/etc/$name.ini [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags echo configurePhase end + sed -e 's/-O2/-O1/g' -i Makefile # http://bugs.php.net/bug.php?id=47730&edit=3 ''; installPhase = '' @@ -162,7 +175,7 @@ composableDerivation {} ( fixed : { src = args.fetchurl { url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror"; - md5 = "7380ffecebd95c6edb317ef861229ebd"; + md5 = "280d6cda7f72a4fc6de42fda21ac2db7"; name = "php-${version}.tar.bz2"; }; diff --git a/pkgs/development/interpreters/plt-scheme/default.nix b/pkgs/development/interpreters/plt-scheme/default.nix index e78a0fdbb9e..79f76d6d2a8 100644 --- a/pkgs/development/interpreters/plt-scheme/default.nix +++ b/pkgs/development/interpreters/plt-scheme/default.nix @@ -1,5 +1,5 @@ args: with args; -let version = lib.getAttr ["version"] "4.0.1" args; in +let version = lib.attrByPath ["version"] "4.0.1" args; in rec { src = fetchurl { url = "ftp://infogroep.be/pub/plt/bundles/${version}/plt/plt-${version}-src-unix.tgz"; @@ -15,7 +15,7 @@ rec { /* doConfigure should be specified separately */ phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"]; - preConfigure = FullDepEntry ('' + preConfigure = fullDepEntry ('' sed -e 's@/usr/bin/uname@'"$(which uname)"'@g' -i configure '') ["minInit" "addInputs" "doUnpack"]; diff --git a/pkgs/development/interpreters/python-new/2.5/default.nix b/pkgs/development/interpreters/python-new/2.5/default.nix index 1da3b52b84f..76a9317dfae 100644 --- a/pkgs/development/interpreters/python-new/2.5/default.nix +++ b/pkgs/development/interpreters/python-new/2.5/default.nix @@ -12,10 +12,11 @@ p: # p = pkgs let + inherit (builtins) isAttrs hasAttr; inherit (p) lib fetchurl stdenv getConfig; inherit (p.composableDerivation) composableDerivation; # withName prevents nix-env -qa \* from aborting (pythonLibStub is a derivation but hasn't a name) - withName = lib.mapAttrs (n : v : if (__isAttrs v && (!__hasAttr "name" v)) then null else v); + withName = lib.mapAttrs (n : v : if (isAttrs v && (!hasAttr "name" v)) then null else v); in withName ( lib.fix ( t : { # t = this attrs @@ -82,18 +83,7 @@ in pythonLibStub = composableDerivation {} { propagatedBuildInputs = [ t.pythonFull ]; # see [1] postPhases = ["postAll"]; # using new name so that you dno't override this phase by accident - prePhases = ["defineValidatingEval"]; # ensure phases are run or a non zero exit status is caused (if there are any syntax errors such as eval "while") - defineValidatingEval = '' - eval(){ - e="$(type eval | { read; while read line; do echo $line; done })" - unset eval; - local evalSucc="failure" - eval "evalSucc=ok;""$1" - eval "$e" - [ $evalSucc = "failure" ] && { echo "eval failed, snippet:"; echo "$1"; return 1; } - } - ''; postAll = '' ensureDir $out/nix-support echo "export NIX_PYTHON_SITES=\"$out:\$NIX_PYTHON_SITES\"" >> $out/nix-support/setup-hook @@ -113,6 +103,7 @@ in libPython = t.version; # used to find all python libraries fitting this version (-> see name all below) }; mergeAttrBy = { + postPhases = lib.concat; pyCheck = x : y : "${x}\n${y}"; }; }; @@ -496,6 +487,129 @@ in }; }; + # unmantained ? (gentoo/ debian even do have python-3* patches) + pyxml = t.pythonLibSetup.merge { + name = "pyxml-0.8.4"; + src = fetchurl { + url = mirror://sourceforge/pyxml/PyXML-0.8.4.tar.gz; + sha256 = "04wc8i7cdkibhrldy6j65qp5l75zjxf5lx6qxdxfdf2gb3wndawz"; + }; + meta = { + description = "python xml package"; + homepage = http://sourceforge.net/projects/pyxml/; + license = "Python License"; # (CNRI Python License); + }; + }; + + /* + # untested + libxml2dom = t.pythonLibSetup.merge { + name = "libxml2dom-0.4.7"; + buildInputs = [ p.libxml2 ]; + src = fetchurl { + url = http://www.boddie.org.uk/python/downloads/libxml2dom-0.4.7.tar.gz; + sha256 = "0zh68adxn4l4b6q99jl1pi00171ah2marbbs8qfww4wpjavfw844"; + }; + pyCheck = "import libxml2dom.svg"; + meta = { + description = "provides a traditional DOM wrapper around the Python bindings for libxml2"; + homepage = http://www.boddie.org.uk/python/libxml2dom.html; + license = "LGPL3+"; + }; + }; + */ + + fpconst = t.pythonLibSetup.merge { + name = "fpconst-0.7.3"; + pyCheck = "import fpconst"; + src = fetchurl { + url="mirror://sourceforge/rsoap/fpconst-0.7.3.tar.gz"; + sha256 = "1a5c2e4a1ecefd9981988cea15068699eccbc55e350af3471e782083d390c727"; + }; + meta = { + description="Python Module for handling IEEE 754 floating point special values"; + homepage="http://chaco.bst.rochester.edu:8080/statcomp/projects/RStatServer/fpconst/"; + license = "GPLv2"; + }; + }; + + soappy = t.pythonLibSetup.merge { + name = "soappy-0.12"; + pyCheck = "from SOAPpy import WSDL"; + propagatedBuildInputs = [ t.fpconst ]; + src = fetchurl { + url = "http://switch.dl.sourceforge.net/sourceforge/pywebsvcs/SOAPpy-0.12.0.tar.gz"; + sha256 = "02a0wpir0gl0n9cl7a5hxliwsywvcw847i5in7i14i57kk6dl7rd"; + }; + patches = [ ./gentoo-python-2.5-compat.patch ]; + meta = { + description = "SOAP implementation for Python"; + homepage="http://pywebsvcs.sourceforge.net/"; + license = "BSD"; + }; + }; + + sqlalchemy05 = t.pythonLibSetup.merge { + name = "sqlalchemy-0.5.5-svn-trunk"; + pyCheck = '' + import sqlalchemy + import sqlalchemy.orm + import sqlalchemy.orm.collections + ''; + src = p.bleedingEdgeRepos.sourceByName "sqlalchemy05"; + meta = { + description = "sql orm wrapper for python"; + homepage = http://www.sqlalchemy.org; + license = "MIT"; + }; + postPhases = ["installMigration"]; + + buildInputs = [ t.setuptools /* required for migration lib */ ]; + + /* impure ? I don't care right now + Reading http://pypi.python.org/simple/decorator/ + Reading http://www.phyast.pitt.edu/~micheles/python/documentation.html + Best match: decorator 3.0.1 + Downloading http://pypi.python.org/packages/source/d/decorator/decorator-3.0.1.tar.gz#md5=c4130a467be7f71154976c84af4a04c6 + + iElectric: column.alter could be broken .. + */ + installMigration = '' + cd $TMP + mkdir migrate + cd migrate + unpackFile ${p.bleedingEdgeRepos.sourceByName "sqlalchemyMigrate"} + cd * + python setup.py $setupFlags build + python setup.py $setupFlags install --prefix=$out + echo "import migrate.changeset.schema" | python + ''; + + /* + + mv $out/lib/python2.5/site-packages/sqlalchemy_migrate-0.5.5.dev_r0-py2.5.egg/* \ + $out/lib/python2.5/site-packages + */ + }; + + /* doesn't work on its own, its included in sqlalchemy05 for that reason. + sqlalchemyMigrate = t.pythonLibSetup.merge { + name = "sqlalchemy-migrate-svn"; + buildInputs = [ t.setuptools t.sqlalchemy05 ]; + pyCheck = '' + import migrate + import migrate.changeset + import migrate.changeset.schema + ''; + src = p.bleedingEdgeRepos.sourceByName "sqlalchemyMigrate"; + meta = { + description = "sqlalchemy database versioning and scheme migration"; + homepage = http://packages.python.org/sqlalchemy-migrate/download.html; + license = "MIT"; + }; + }; + */ + ### python applications pythonExStub = composableDerivation {} { @@ -557,7 +671,7 @@ in }; all = lib.filter (x: - (__isAttrs x) + (isAttrs x) && ((lib.maybeAttr "libPython" false x) == t.version) && (lib.maybeAttr "name" false x != false) # don't collect pythonLibStub etc ) (lib.flattenAttrs (removeAttrs t ["all"])); # nix is not yet lazy enough, so I've to remove all first diff --git a/pkgs/development/interpreters/python-new/2.5/gentoo-python-2.5-compat.patch b/pkgs/development/interpreters/python-new/2.5/gentoo-python-2.5-compat.patch new file mode 100644 index 00000000000..60c65faf015 --- /dev/null +++ b/pkgs/development/interpreters/python-new/2.5/gentoo-python-2.5-compat.patch @@ -0,0 +1,72 @@ +diff --git a/SOAPpy/Client.py b/SOAPpy/Client.py +index 7437049..13ba160 100644 +--- a/SOAPpy/Client.py ++++ b/SOAPpy/Client.py +@@ -40,11 +40,11 @@ + ################################################################################ + """ + ++from __future__ import nested_scopes ++ + ident = '$Id: Client.py,v 1.27 2005/02/21 20:27:09 warnes Exp $' + from version import __version__ + +-from __future__ import nested_scopes +- + #import xml.sax + import urllib + from types import * +diff --git a/SOAPpy/GSIServer.py b/SOAPpy/GSIServer.py +index 48c1303..c7ad13d 100644 +--- a/SOAPpy/GSIServer.py ++++ b/SOAPpy/GSIServer.py +@@ -43,11 +43,11 @@ GSIServer - Contributed by Ivan R. Judson + ################################################################################ + """ + ++from __future__ import nested_scopes ++ + ident = '$Id: GSIServer.py,v 1.5 2005/02/15 16:32:22 warnes Exp $' + from version import __version__ + +-from __future__ import nested_scopes +- + #import xml.sax + import re + import socket +diff --git a/SOAPpy/Server.py b/SOAPpy/Server.py +index b28153d..76ce0b4 100644 +--- a/SOAPpy/Server.py ++++ b/SOAPpy/Server.py +@@ -40,11 +40,11 @@ + ################################################################################ + """ + ++from __future__ import nested_scopes ++ + ident = '$Id: Server.py,v 1.21 2005/02/15 16:32:22 warnes Exp $' + from version import __version__ + +-from __future__ import nested_scopes +- + #import xml.sax + import re + import socket +diff --git a/SOAPpy/Types.py b/SOAPpy/Types.py +index 6cc5456..62d44b2 100644 +--- a/SOAPpy/Types.py ++++ b/SOAPpy/Types.py +@@ -33,11 +33,11 @@ + ################################################################################ + """ + ++from __future__ import nested_scopes ++ + ident = '$Id: Types.py,v 1.19 2005/02/22 04:29:43 warnes Exp $' + from version import __version__ + +-from __future__ import nested_scopes +- + import UserList + import base64 + import cgi diff --git a/pkgs/development/interpreters/python/2.5/default.nix b/pkgs/development/interpreters/python/2.5/default.nix index dd06e633a71..f41114889d5 100644 --- a/pkgs/development/interpreters/python/2.5/default.nix +++ b/pkgs/development/interpreters/python/2.5/default.nix @@ -34,7 +34,7 @@ let in -stdenv.mkDerivation { +stdenv.mkDerivation ( { name = "python-2.5.4"; src = fetchurl { @@ -50,7 +50,6 @@ stdenv.mkDerivation { inherit buildInputs; C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); - configureFlags = "--enable-shared --with-wctype-functions"; preConfigure = '' @@ -76,5 +75,5 @@ stdenv.mkDerivation { opensslSupport = openssl != null; tkSupport = (tk != null) && (tcl != null); libPrefix = "python2.5"; - }; -} + } ; +} // (if stdenv.system == "i686-darwin" then { NIX_CFLAGS_COMPILE = "-msse2" ; } else {} ) ) diff --git a/pkgs/development/interpreters/ruby/gems.nix b/pkgs/development/interpreters/ruby/gems.nix index 9b24d582c18..d971ee22d65 100644 --- a/pkgs/development/interpreters/ruby/gems.nix +++ b/pkgs/development/interpreters/ruby/gems.nix @@ -9,7 +9,7 @@ rec { buildInputs = [ruby makeWrapper]; configureFlags = []; - doInstall = FullDepEntry ('' + doInstall = fullDepEntry ('' ruby setup.rb --prefix=$out/ wrapProgram $out/bin/gem --prefix RUBYLIB : $out/lib:$out/lib '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index daa77c8090c..75c3a63c0a3 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,9 +1,12 @@ -{ stdenv, fetchurl, x11, libXrandr, openglSupport ? false, mesa ? null +{ stdenv, fetchurl, x11, libXrandr, pkgconfig +, openglSupport ? false, mesa ? null , alsaSupport ? true, alsaLib ? null +, pulseaudioSupport ? true, pulseaudio ? null }: assert openglSupport -> mesa != null; assert alsaSupport -> alsaLib != null; +assert pulseaudioSupport -> pulseaudio != null; stdenv.mkDerivation { name = "SDL-1.2.13"; @@ -13,14 +16,19 @@ stdenv.mkDerivation { sha256 = "0cp155296d6fy3w31jj481jxl9b43fkm01klyibnna8gsvqrvycl"; }; - propagatedBuildInputs = [x11 libXrandr]; - - buildInputs = + # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. + propagatedBuildInputs = [ x11 libXrandr ] ++ + stdenv.lib.optional pulseaudioSupport pulseaudio; + + buildInputs = [ pkgconfig ] ++ stdenv.lib.optional openglSupport mesa ++ stdenv.lib.optional alsaSupport alsaLib; - + + # XXX: By default, SDL wants to dlopen() PulseAudio, in which case + # we must arrange to add it to its RPATH; however, `patchelf' seems + # to fail at doing this, hence `--disable-pulseaudio-shared'. configureFlags = '' - --disable-x11-shared --disable-alsa-shared --enable-rpath + --disable-x11-shared --disable-alsa-shared --enable-rpath --disable-pulseaudio-shared ${if alsaSupport then "--with-alsa-prefix=${alsaLib}/lib" else ""} ''; diff --git a/pkgs/development/libraries/aterm/2.5.nix b/pkgs/development/libraries/aterm/2.5.nix index f30bd7d3d5c..bb9d3e0423e 100644 --- a/pkgs/development/libraries/aterm/2.5.nix +++ b/pkgs/development/libraries/aterm/2.5.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation { doCheck = true; + dontDisableStatic = true; + meta = { homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm; license = "LGPL"; diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index ed4cb09ebc7..10fd49b5d18 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "1.8.1" a; + version = a.lib.attrByPath ["version"] "1.8.1" a; buildInputs = with a; [ perl ]; diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index 84dff00a8b9..f0613834364 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -2,9 +2,9 @@ args : let lib = args.lib; fetchurl = args.fetchurl; - FullDepEntry = args.FullDepEntry; + fullDepEntry = args.fullDepEntry; - version = lib.getAttr ["version"] "4.1.0" args; + version = lib.attrByPath ["version"] "4.1.0" args; buildInputs = with args; [ cmake freeglut mesa libX11 xproto inputproto libXi libXmu @@ -22,11 +22,11 @@ rec { /* doConfigure should be specified separately */ phaseNames = ["genMakefile" "doMakeInstall" "demoInstall"]; - genMakefile = FullDepEntry '' + genMakefile = fullDepEntry '' cmake -D CMAKE_INSTALL_PREFIX=$out . '' ["minInit" "addInputs" "doUnpack"]; - demoInstall = FullDepEntry('' + demoInstall = fullDepEntry('' ensureDir $out/bin cp chipmunk_demos $out/bin '') ["doMakeInstall" "defEnsureDir"]; diff --git a/pkgs/development/libraries/cl-ppcre/default.nix b/pkgs/development/libraries/cl-ppcre/default.nix index 28c7ee0475b..c17fb3f4064 100644 --- a/pkgs/development/libraries/cl-ppcre/default.nix +++ b/pkgs/development/libraries/cl-ppcre/default.nix @@ -4,7 +4,7 @@ let fetchurl = args.fetchurl; simplyShare = args.simplyShare; - version = lib.getAttr ["version"] "2.0.0" args; + version = lib.attrByPath ["version"] "2.0.0" args; buildInputs = with args; [ ]; in rec { diff --git a/pkgs/development/libraries/ctl/default.nix b/pkgs/development/libraries/ctl/default.nix index 6e1c212703c..c30166d015c 100644 --- a/pkgs/development/libraries/ctl/default.nix +++ b/pkgs/development/libraries/ctl/default.nix @@ -20,4 +20,6 @@ stdenv.mkDerivation { homepage = http://ampasctl.sourceforge.net; license = "SOME OPEN SOURCE LICENSE"; # TODO which exactly is this? }; + + patches = [ ./patch.patch ]; } diff --git a/pkgs/development/libraries/ctl/patch.patch b/pkgs/development/libraries/ctl/patch.patch new file mode 100644 index 00000000000..1d441f58fcc --- /dev/null +++ b/pkgs/development/libraries/ctl/patch.patch @@ -0,0 +1,24 @@ +diff --git a/IlmCtl/CtlLex.cpp b/IlmCtl/CtlLex.cpp +index e662d22..a47311a 100644 +--- a/IlmCtl/CtlLex.cpp ++++ b/IlmCtl/CtlLex.cpp +@@ -57,6 +57,7 @@ + #include + #include + #include ++#include + + + #if 0 +diff --git a/IlmCtlSimd/CtlSimdReg.h b/IlmCtlSimd/CtlSimdReg.h +index 6b000b2..8a39f7c 100644 +--- a/IlmCtlSimd/CtlSimdReg.h ++++ b/IlmCtlSimd/CtlSimdReg.h +@@ -52,6 +52,7 @@ + #include + #include + #include ++#include + + //----------------------------------------------------------------------------- + // diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index bcc2ba1d314..752ded6320b 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -1,11 +1,11 @@ args: with args; stdenv.mkDerivation rec { - name = "dbus-glib-0.74"; + name = "dbus-glib-0.80"; src = fetchurl { url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz"; - sha256 = "1qmbnd9xgg7vahlfywd8sfd9yqhx8jdyczz3cshfsd4qc76xhw78"; + sha256 = "0nv4gxcbpa9f0907dmzmfm222w8y45z19cx27l85f5qknf8hncxm"; }; buildInputs = [pkgconfig expat gettext]; diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index aab57859690..d4ce41e699c 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "freeimage-3.11.0"; + name = "freeimage-3.12.0"; src = fetchurl { url = mirror://sourceforge/freeimage/FreeImage3120.zip; sha256 = "1hvcmv8hnv3h24zcl324g3l0ww8aa8fkcfav2lrgs1kwzp5zqcd4"; diff --git a/pkgs/development/libraries/gtk-libs/2.16/gtk+/default.nix b/pkgs/development/libraries/gtk-libs/2.16/gtk+/default.nix index ee2fec4ce0b..ceeec10f958 100644 --- a/pkgs/development/libraries/gtk-libs/2.16/gtk+/default.nix +++ b/pkgs/development/libraries/gtk-libs/2.16/gtk+/default.nix @@ -1,11 +1,11 @@ args: with args; stdenv.mkDerivation rec { - name = "gtk+-2.16.1"; + name = "gtk+-2.16.2"; src = fetchurl { url = "mirror://gnome/sources/gtk+/2.16/${name}.tar.bz2"; - sha256 = "0l3dfznv07nmzavqp0shr5qf66alb6xyzmiq728hgygmnayky7rg"; + sha256 = "07gdsl3ialpwfcd0z3w108r60dn0agj12s21fpkpcx44lzknnbm3"; }; buildInputs = [ pkgconfig perl jasper ]; diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-1.1.4.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-1.1.4.nix deleted file mode 100644 index 429407d25d2..00000000000 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-1.1.4.nix +++ /dev/null @@ -1,10 +0,0 @@ -{cabal}: - -cabal.mkDerivation (self : { - pname = "HDBC"; - version = "1.1.4"; - sha256 = "de03020874b532f7aa734f093caf0709e7d33d0d64c59ce0a003b2269fc85597"; - meta = { - description = "HDBC provides an abstraction layer between Haskell programs and SQL relational databases"; - }; -}) diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql-1.1.4.0.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql-1.1.4.0.nix deleted file mode 100644 index d9a1985839c..00000000000 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql-1.1.4.0.nix +++ /dev/null @@ -1,12 +0,0 @@ -{cabal, HDBC, postgresql}: - -cabal.mkDerivation (self : { - pname = "HDBC-postgresql"; - version = "1.1.4.0"; - sha256 = "039eae03693330fee0e4083e22d502f94865969b243744a939786f598aec34ad"; - meta = { - description = "This package provides a PostgreSQL driver for HDBC"; - }; - propagatedBuildInputs = [HDBC postgresql]; -}) - diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix new file mode 100644 index 00000000000..4877a9fe8cb --- /dev/null +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix @@ -0,0 +1,12 @@ +{cabal, HDBC, postgresql, parsec}: + +cabal.mkDerivation (self : { + pname = "HDBC-postgresql"; + version = "2.1.0.0"; + sha256 = "424b491766410df73f2df87a5cd4b5f4549850cc53a2f1c937b546ff1ef1562b"; + propagatedBuildInputs = [HDBC parsec postgresql]; + meta = { + description = "This package provides a PostgreSQL driver for HDBC"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3-1.1.4.0.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix similarity index 70% rename from pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3-1.1.4.0.nix rename to pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix index b0c7eb27e6a..e6aefbb825a 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3-1.1.4.0.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self : { pname = "HDBC-sqlite3"; - version = "1.1.4.0"; - sha256 = "328fed8d4cdba4311efd50d9d60591a81481317ddba10c58fbaa2ec7f418f788"; + version = "2.1.0.0"; + sha256 = "a95f28fadd67ba1593cf75774308b7cfdde4a78ee5cba0a6aeb6c18723d8d67b"; + propagatedBuildInputs = [HDBC sqlite]; meta = { description = "This is the Sqlite v3 driver for HDBC, the generic database access system for Haskell"; }; - propagatedBuildInputs = [HDBC sqlite]; }) diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC.nix b/pkgs/development/libraries/haskell/HDBC/HDBC.nix new file mode 100644 index 00000000000..abfa0aea85b --- /dev/null +++ b/pkgs/development/libraries/haskell/HDBC/HDBC.nix @@ -0,0 +1,12 @@ +{cabal, HUnit, QuickCheck, mtl, time, utf8String, convertible, testpack}: + +cabal.mkDerivation (self : { + pname = "HDBC"; + version = "2.1.1"; + sha256 = "9a3ab307c006fb9c22089a15d190339c45de0a32e700f2d9eda70423e719197c"; + propagatedBuildInputs = + [HUnit QuickCheck mtl time utf8String convertible testpack]; + meta = { + description = "HDBC provides an abstraction layer between Haskell programs and SQL relational databases"; + }; +}) diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix b/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix new file mode 100644 index 00000000000..9a697b95c91 --- /dev/null +++ b/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix @@ -0,0 +1,12 @@ +{cabal, Shellac, haskeline}: + +cabal.mkDerivation (self : { + pname = "Shellac-haskeline"; + version = "0.2"; + sha256 = "e3024b1915efd9841be9f405503f26c52524e7ea2a9c630ad651a9986e5329e0"; + propagatedBuildInputs = [Shellac haskeline]; + meta = { + description = "Haskeline backend module for Shellac"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix b/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix new file mode 100644 index 00000000000..991126f709b --- /dev/null +++ b/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix @@ -0,0 +1,12 @@ +{cabal, Shellac, readline}: + +cabal.mkDerivation (self : { + pname = "Shellac-readline"; + version = "0.9"; + sha256 = "3edffecf2225c199f0a4df55e3685f7deee47755ae7f8d03f5da7fac3c2ab878"; + propagatedBuildInputs = [Shellac readline]; + meta = { + description = "Readline backend module for Shellac"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac.nix b/pkgs/development/libraries/haskell/Shellac/Shellac.nix new file mode 100644 index 00000000000..8660bd6dc13 --- /dev/null +++ b/pkgs/development/libraries/haskell/Shellac/Shellac.nix @@ -0,0 +1,12 @@ +{cabal, mtl}: + +cabal.mkDerivation (self : { + pname = "Shellac"; + version = "0.9.5"; + sha256 = "a8b07918be23b7e7c3114aed7d929f95ace37fbacd82f185358f05f337f09c70"; + propagatedBuildInputs = [mtl]; + meta = { + description = "A framework for creating shell environments"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/convertible/default.nix b/pkgs/development/libraries/haskell/convertible/default.nix new file mode 100644 index 00000000000..24ed30810de --- /dev/null +++ b/pkgs/development/libraries/haskell/convertible/default.nix @@ -0,0 +1,12 @@ +{cabal, mtl, time}: + +cabal.mkDerivation (self : { + pname = "convertible"; + version = "1.0.5"; + sha256 = "caf75727a35cf249690f3da60fce770642c8a1fad6080f3ba57e924fbe3c9465"; + propagatedBuildInputs = [mtl time]; + meta = { + description = "Typeclasses and instances for converting between types"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/digest/default.nix b/pkgs/development/libraries/haskell/digest/default.nix new file mode 100644 index 00000000000..c2423be8e53 --- /dev/null +++ b/pkgs/development/libraries/haskell/digest/default.nix @@ -0,0 +1,12 @@ +{cabal, zlib}: + +cabal.mkDerivation (self : { + pname = "digest"; + version = "0.0.0.5"; + sha256 = "dddfcdd325dc7d4fb1ce4772c1f5618cb20504b28dba8a78682011cba1341efd"; + propagatedBuildInputs = [zlib]; + meta = { + description = "Various cryptographic hashes for bytestrings: CRC32 and Adler32 for now"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/dotgen/default.nix b/pkgs/development/libraries/haskell/dotgen/default.nix new file mode 100644 index 00000000000..19d0bc07513 --- /dev/null +++ b/pkgs/development/libraries/haskell/dotgen/default.nix @@ -0,0 +1,11 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "dotgen"; + version = "0.3"; + sha256 = "1c486ffa782c4a46e66df12f5acf776a808b654d96fe0d0071d5c41111b1b7ed"; + meta = { + description = "A simple interface for building .dot graph files"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/emgm/default.nix b/pkgs/development/libraries/haskell/emgm/default.nix new file mode 100644 index 00000000000..8082b2f8d91 --- /dev/null +++ b/pkgs/development/libraries/haskell/emgm/default.nix @@ -0,0 +1,11 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "emgm"; + version = "0.3.1"; + sha256 = "956923ec4d51f111ca6091ebccf75a1f6b99d7a173ea673cbb4787bf08f497a8"; + meta = { + description = "Extensible and Modular Generics for the Masses"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/haskell-platform/default.nix b/pkgs/development/libraries/haskell/haskell-platform/default.nix index 89b3e386bf4..cacef59bf85 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/default.nix +++ b/pkgs/development/libraries/haskell/haskell-platform/default.nix @@ -1,16 +1,16 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, +{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, editline, haskellSrc, html, parallel, regexBase, regexCompat, regexPosix, stm, time, xhtml, zlib, cabalInstall, alex, happy, haddock, ghc}: cabal.mkDerivation (self : { pname = "haskell-platform"; - version = "2009.2.0"; + version = "2009.2.0.1"; src = fetchurl { url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz"; - sha256 = "d2b8cad09128ca6ea62ddf0f56dd7874603623aae243411a74d6d1c5be38d38b"; + sha256 = "33a828ed6cd1e6cc32cfec3fd55e6ab4d8026bd7451bab65ec0873880c0f11c5"; }; propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck cgi fgl + GLUT HTTP HUnit OpenGL QuickCheck cgi fgl editline haskellSrc html parallel regexBase regexCompat regexPosix stm time xhtml zlib cabalInstall alex happy ghc ]; diff --git a/pkgs/development/libraries/haskell/ivor/default.nix b/pkgs/development/libraries/haskell/ivor/default.nix new file mode 100644 index 00000000000..d010707ac00 --- /dev/null +++ b/pkgs/development/libraries/haskell/ivor/default.nix @@ -0,0 +1,12 @@ +{cabal, mtl, parsec}: + +cabal.mkDerivation (self : { + pname = "ivor"; + version = "0.1.8"; + sha256 = "e51ad07c78ea0cad6fce9253012258dbf7c740198792aa4a446e1f0269a9186d"; + propagatedBuildInputs = [mtl parsec]; + meta = { + description = "Theorem proving library based on dependent type theory"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix index 6fbfe6d0fbd..b9b62c1763b 100644 --- a/pkgs/development/libraries/haskell/multirec/default.nix +++ b/pkgs/development/libraries/haskell/multirec/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "multirec"; - version = "0.2"; - sha256 = "66f748245020437ad30dbc25e2decae7d49c6d968c014b316c0961539892083c"; + version = "0.4"; + sha256 = "ad7a6ae90e1880b3fd79686ce8012e531b738f8f1d10ba836550fc91cfe3695e"; meta = { description = "Generic programming with systems of recursive datatypes"; }; diff --git a/pkgs/development/libraries/haskell/network/default.nix b/pkgs/development/libraries/haskell/network/default.nix index 16f4ce12d7a..00752d05738 100644 --- a/pkgs/development/libraries/haskell/network/default.nix +++ b/pkgs/development/libraries/haskell/network/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "network"; - version = "2.2.1"; # Haskell Platform 2009.0.0 - sha256 = "111e4963a0a979570993e79511a778b267ef58df35320d1ddda61a869259b63c"; + version = "2.2.1.1"; # Haskell Platform 2009.2.0.1 + sha256 = "2b1fb2a16ed740636871662f2e38dffd9b7c13c61e28d887a1c334da3867da9d"; propagatedBuildInputs = [parsec]; meta = { description = "Networking-related facilities"; diff --git a/pkgs/development/libraries/haskell/non-negative/default.nix b/pkgs/development/libraries/haskell/non-negative/default.nix new file mode 100644 index 00000000000..32d6a629389 --- /dev/null +++ b/pkgs/development/libraries/haskell/non-negative/default.nix @@ -0,0 +1,12 @@ +{cabal, QuickCheck}: + +cabal.mkDerivation (self : { + pname = "non-negative"; + version = "0.0.4"; + sha256 = "0b82b7be086c8d4e493d606098d82c2e5d943fe76d18a5eb6836c449ba19fc6f"; + propagatedBuildInputs = [QuickCheck]; + meta = { + description = "Non-negative numbers"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix new file mode 100644 index 00000000000..409a5b3e268 --- /dev/null +++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix @@ -0,0 +1,12 @@ +{cabal, HUnit, QuickCheck, parsec, nonNegative, utilityHt}: + +cabal.mkDerivation (self : { + pname = "numeric-prelude"; + version = "0.1"; + sha256 = "01de33ea483808704f6d2c635763fcbff3abe12db8035c6640124eb8486b6efb"; + propagatedBuildInputs = [HUnit QuickCheck parsec nonNegative utilityHt]; + meta = { + description = "An experimental alternative hierarchy of numeric type classes"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix new file mode 100644 index 00000000000..1e7ab185bd7 --- /dev/null +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -0,0 +1,12 @@ +{cabal, mtl, network, parsec, utf8String, xhtml, zipArchive}: + +cabal.mkDerivation (self : { + pname = "pandoc"; + version = "1.2"; + sha256 = "e922c8f4765a8d105abf30dbe21a73961357929cd2fb8dfd323f0f62ca0723b4"; + propagatedBuildInputs = [mtl network parsec utf8String xhtml zipArchive]; + meta = { + description = "Conversion between markup formats"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/readline/default.nix b/pkgs/development/libraries/haskell/readline/default.nix index 409d7db27ab..d29df7cefde 100644 --- a/pkgs/development/libraries/haskell/readline/default.nix +++ b/pkgs/development/libraries/haskell/readline/default.nix @@ -1,10 +1,10 @@ -{ cabal, readline } : +{ cabal, readline, ncurses } : cabal.mkDerivation (self : { pname = "readline"; version = "1.0.1.0"; sha256 = "07f2f039f32bf18838a4875d0f3caa3ed9436dd52b962b2061f0bb8a3316fa1d"; - propagatedBuildInputs = [ readline ]; + propagatedBuildInputs = [ readline ncurses ]; # experimentally link with ncursesw because ghci can't interpret ld scripts, # and ncurses sometimes seems to be a script pointing to ncursesw postConfigure = '' diff --git a/pkgs/development/libraries/haskell/storable-complex/default.nix b/pkgs/development/libraries/haskell/storable-complex/default.nix new file mode 100644 index 00000000000..334cada046d --- /dev/null +++ b/pkgs/development/libraries/haskell/storable-complex/default.nix @@ -0,0 +1,11 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "storable-complex"; + version = "0.2"; + sha256 = "4e0e48e641d415b8e549ca3db84468ae18fc74aa3e9848674c48a9024635b8bb"; + meta = { + description = "Storable instance for Complex"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/terminfo/default.nix b/pkgs/development/libraries/haskell/terminfo/default.nix new file mode 100644 index 00000000000..8c12d8d94a9 --- /dev/null +++ b/pkgs/development/libraries/haskell/terminfo/default.nix @@ -0,0 +1,11 @@ +{cabal, ncurses}: + +cabal.mkDerivation (self : { + pname = "terminfo"; + version = "0.3.0.2"; + sha256 = "2303d934fcec0f6413f15887f7f42e8e2e5b27812534a929bf585bfa6f3a9229"; + propagatedBuildInputs = [ncurses]; + meta = { + description = "Haskell bindings for the terminfo library"; + }; +}) diff --git a/pkgs/development/libraries/haskell/testpack/default.nix b/pkgs/development/libraries/haskell/testpack/default.nix new file mode 100644 index 00000000000..fc77c15446d --- /dev/null +++ b/pkgs/development/libraries/haskell/testpack/default.nix @@ -0,0 +1,12 @@ +{cabal, HUnit, QuickCheck, mtl}: + +cabal.mkDerivation (self : { + pname = "testpack"; + version = "1.0.2"; + sha256 = "ff3d24a755aeeb765d5e93aa0189d0d67ac96b2d84e27a29609eb4738a6cdabc"; + propagatedBuildInputs = [HUnit QuickCheck mtl]; + meta = { + description = "Test Utility Pack for HUnit and QuickCheck"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/time/1.1.3.nix b/pkgs/development/libraries/haskell/time/1.1.3.nix new file mode 100644 index 00000000000..025a5faa380 --- /dev/null +++ b/pkgs/development/libraries/haskell/time/1.1.3.nix @@ -0,0 +1,11 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "time"; + version = "1.1.3"; + sha256 = "46d32400bc0099ccef1fb670684c00a31055725403ea15c7a39278ff7dccc65b"; + meta = { + description = "A time library"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/utility-ht/default.nix b/pkgs/development/libraries/haskell/utility-ht/default.nix new file mode 100644 index 00000000000..74671673030 --- /dev/null +++ b/pkgs/development/libraries/haskell/utility-ht/default.nix @@ -0,0 +1,11 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "utility-ht"; + version = "0.0.5.1"; + sha256 = "f15fd1450b31f002e6d4fe3720cff7c899f23f8a68b890ea3854e68e596c97cb"; + meta = { + description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix new file mode 100644 index 00000000000..e070a463150 --- /dev/null +++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix @@ -0,0 +1,11 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "uu-parsinglib"; + version = "2.2.0"; + sha256 = "f66b16d112d8a013eaf14823d2f3d228b476dfd117558a97a949a29961db5290"; + meta = { + description = "New version of the Utrecht University parser combinator library"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/vacuumCairo/default.nix b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/vacuumCairo/default.nix rename to pkgs/development/libraries/haskell/vacuum-cairo/default.nix diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix index 05e1448ddb1..315d2612f13 100644 --- a/pkgs/development/libraries/haskell/vacuum/default.nix +++ b/pkgs/development/libraries/haskell/vacuum/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "vacuum"; - version = "0.0.91"; - sha256 = "9240ec35b39d60928a73469893adf1d2aa742b9a781dbc6dcdaa54e96d9bf1af"; + version = "0.0.94"; + sha256 = "7056dfa38a9f579ee897d2980938fd484ddfa93c472014ad7ea5a5cd9100bfad"; propagatedBuildInputs = [ghcPaths haskellSrcMeta]; meta = { description = "Extract graph representations of ghc heap values"; diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index 930e19ae89c..a38ee70ce34 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -1,13 +1,11 @@ -{cabal}: +{cabal, utf8String, terminfo}: cabal.mkDerivation (self : { pname = "vty"; - version = "3.0.0"; - sha256 = "44ae53d06b8b45c14cd3861e860a38730ed9995ed56b1b3d9aba6641771f1947"; + version = "3.1.8.4"; + sha256 = "9a006e77bb4f032613e059eea7bc4d92cbc7943449fb9c7269a061ddd9b3d82b"; + propagatedBuildInputs = [utf8String terminfo]; meta = { - description = "vty is a *very* simplistic library in the niche of ncurses"; + description = "A simple terminal access library"; }; - preConfigure = '' - sed -i 's|^Build-Depends:.*$|&, bytestring, containers|' ${self.pname}.cabal - ''; }) diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix new file mode 100644 index 00000000000..11a7675c0d2 --- /dev/null +++ b/pkgs/development/libraries/haskell/zip-archive/default.nix @@ -0,0 +1,12 @@ +{cabal, binary, mtl, utf8String, zlib, digest}: + +cabal.mkDerivation (self : { + pname = "zip-archive"; + version = "0.1.1.3"; + sha256 = "2caa3e6020c394c740b942685306c71e91bebf6e499627dc20fdf0ac7925a57a"; + propagatedBuildInputs = [binary mtl utf8String zlib digest]; + meta = { + description = "Library for creating and modifying zip archives"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/zipper/default.nix b/pkgs/development/libraries/haskell/zipper/default.nix new file mode 100644 index 00000000000..6ba3cb2aaa1 --- /dev/null +++ b/pkgs/development/libraries/haskell/zipper/default.nix @@ -0,0 +1,12 @@ +{cabal, multirec}: + +cabal.mkDerivation (self : { + pname = "zipper"; + version = "0.3"; + sha256 = "3f6cc0ea69734d0523f1bf74d14953f88a196e728f89a7cc91f394d9e0c13c15"; + propagatedBuildInputs = [multirec]; + meta = { + description = "Generic zipper for systems of recursive datatypes"; + }; +}) + diff --git a/pkgs/development/libraries/libcv/default.nix b/pkgs/development/libraries/libcv/default.nix index 649d0a5728f..a2035b4cb40 100644 --- a/pkgs/development/libraries/libcv/default.nix +++ b/pkgs/development/libraries/libcv/default.nix @@ -2,9 +2,9 @@ args : let lib = args.lib; fetchurl = args.fetchurl; - FullDepEntry = args.FullDepEntry; + fullDepEntry = args.fullDepEntry; - version = lib.getAttr ["version"] "" args; + version = lib.attrByPath ["version"] "" args; buildInputs = with args; [ libtiff libpng libjpeg pkgconfig gtk glib @@ -22,7 +22,7 @@ rec { /* doConfigure should be specified separately */ phaseNames = ["doConfigure" "doMakeInstall" "postInstall"]; - postInstall = FullDepEntry ('' + postInstall = fullDepEntry ('' ln -s $out/include/opencv/* $out/include '') ["doMakeInstall" "minInit"]; diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix new file mode 100644 index 00000000000..2a3ad8995f5 --- /dev/null +++ b/pkgs/development/libraries/libffcall/default.nix @@ -0,0 +1,38 @@ +a : +let + fetchurl = a.fetchurl; + + version = a.lib.attrByPath ["version"] "2009-05-27" a; + buildInputs = with a; [ + + ]; +in +rec { + src = a.fetchcvs { + cvsRoot = ":pserver:anonymous@cvs.savannah.gnu.org:/sources/libffcall"; + module = "ffcall"; + date = version; + sha256 = "91bcb5a20c85a9ccab45886aae8fdbbcf1f20f995ef898e8bdd2964448daf724"; + }; + + inherit buildInputs; + configureFlags = []; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "doMakeInstall"]; + + doConfigure = a.fullDepEntry ('' + for i in ./configure */configure; do + cwd="$PWD" + cd "$(dirname "$i")"; + ( test -f Makefile && make distclean ) || true + ./configure --prefix=$out + cd "$cwd" + done + '') a.doConfigure.deps; + + name = "libffcall-" + version; + meta = { + description = "Foreign fuction call library"; + }; +} diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix new file mode 100644 index 00000000000..0f5d3b4b24d --- /dev/null +++ b/pkgs/development/libraries/libproxy/default.nix @@ -0,0 +1,9 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "libproxy-0.2.3"; + src = fetchurl { + url = http://libproxy.googlecode.com/files/libproxy-0.2.3.tar.gz; + sha256 = "16ikq42ffrfd60j57r0l488r8zgkyxcn7l69gkijjzalndhd3pjr"; + }; +} diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix new file mode 100644 index 00000000000..3f1f7ba158d --- /dev/null +++ b/pkgs/development/libraries/libunistring/default.nix @@ -0,0 +1,41 @@ +{ fetchurl, stdenv }: + +stdenv.mkDerivation rec { + name = "libunistring-0.9"; + + src = fetchurl { + url = "mirror://gnu/libunistring/${name}.tar.gz"; + sha256 = "0j5f9nd6i5irvc9gk4ffgx3kgii3izhbm9adzv6svvkzwfiqsyrx"; + }; + + doCheck = true; + + meta = { + homepage = http://www.gnu.org/software/libunistring/; + + description = "GNU Libunistring, a Unicode string library"; + + longDescription = '' + This library provides functions for manipulating Unicode strings + and for manipulating C strings according to the Unicode + standard. + + GNU libunistring is for you if your application involves + non-trivial text processing, such as upper/lower case + conversions, line breaking, operations on words, or more + advanced analysis of text. Text provided by the user can, in + general, contain characters of all kinds of scripts. The text + processing functions provided by this library handle all scripts + and all languages. + + libunistring is for you if your application already uses the ISO + C / POSIX , functions and the text it + operates on is provided by the user and can be in any language. + + libunistring is also for you if your application uses Unicode + strings as internal in-memory representation. + ''; + + license = "LGPLv3+"; + }; +} diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index 6f3fbd2df56..755ae1dfca5 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -3,7 +3,7 @@ let lib = args.lib; fetchurl = args.fetchurl; - version = lib.getAttr ["version"] "0.9.1" args; + version = lib.attrByPath ["version"] "0.9.1" args; buildInputs = with args; [ libtool libjpeg openssl libX11 libXdamage xproto damageproto xextproto libXext fixesproto libXfixes xineramaproto libXinerama diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index 973d6246714..94a795d9188 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -1,15 +1,15 @@ args: with args; stdenv.mkDerivation rec { - name = "libxklavier-3.4"; + name = "libxklavier-3.9"; src = fetchurl { - url = "mirror://sf/gswitchit/${name}.tar.gz"; - sha256 = "07pq74ygmnr3vgfp86dbjnqsp3v67fww6d3a1vqbif9wzbk70195"; + url = "mirror://sf/gswitchit/${name}.tar.bz2"; + sha256 = "462a4e427f201a23de194f824dce70c84867464956f2f6c8dd4a5e07f1f4a554"; }; # TODO: enable xmodmap support, needs xmodmap DB - propagatedBuildInputs = [libX11 xkeyboard_config libxml2 libICE glib libxkbfile]; + propagatedBuildInputs = [libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes]; buildInputs = [pkgconfig]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 1b2bb06ac2c..35771c13469 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat}: -if stdenv.system != "i686-linux" && stdenv.system != "x86_64-linux" then +if stdenv.system != "i686-linux" && stdenv.system != "x86_64-linux" && stdenv.system != "i686-darwin" then throw "unsupported platform for Mesa" else diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix new file mode 100644 index 00000000000..5ba196542d0 --- /dev/null +++ b/pkgs/development/libraries/muparser/default.nix @@ -0,0 +1,9 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "muparser-1.30"; + src = fetchurl { + url = mirror://sourceforge/muparser/muparser_v130.tar.gz; + sha256 = "164wak2sva6z9vq3anrciz1npyk2x3wqkz6xwp9ld3gmdqbdn8s4"; + }; +} diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index 35264f2cdf6..2cc240c7ec3 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -3,7 +3,7 @@ let lib = args.lib; fetchurl = args.fetchurl; - version = lib.getAttr ["version"] "0.10.1" args; + version = lib.attrByPath ["version"] "0.10.1" args; buildInputs = with args; [ ]; diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index bfb2c6b998a..de4672ceb5e 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -12,4 +12,5 @@ stdenv.mkDerivation { buildInputs = [pkgconfig zlib] ++ (lib.optional (args ? ctl) (args.ctl)); propagatedBuildInputs = [pkgconfig zlib ilmbase]; configureFlags = "--enable-imfexamples"; + patches = [ ./stringh.patch ]; } diff --git a/pkgs/development/libraries/openexr/stringh.patch b/pkgs/development/libraries/openexr/stringh.patch new file mode 100644 index 00000000000..ef8cf06b24a --- /dev/null +++ b/pkgs/development/libraries/openexr/stringh.patch @@ -0,0 +1,25 @@ +diff --git a/exrenvmap/main.cpp b/exrenvmap/main.cpp +index c5afcc5..5e993b3 100644 +--- a/exrenvmap/main.cpp ++++ b/exrenvmap/main.cpp +@@ -45,6 +45,7 @@ + #include + #include + #include ++#include + + using namespace Imf; + using namespace std; +diff --git a/exrmaketiled/main.cpp b/exrmaketiled/main.cpp +index 5ce4e95..f93ec08 100644 +--- a/exrmaketiled/main.cpp ++++ b/exrmaketiled/main.cpp +@@ -44,7 +44,7 @@ + + #include + #include +-#include ++#include + #include + + using namespace Imf; diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix new file mode 100644 index 00000000000..8c279ab5a3e --- /dev/null +++ b/pkgs/development/libraries/openmpi/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "openmpi-1.3.2"; + src = fetchurl { + url = http://www.open-mpi.org/software/ompi/v1.3/downloads/openmpi-1.3.2.tar.gz ; + sha256 = "1n7c0y4nidm0ha23ic7f872qh3296rh2177r1wqqs83k2ma7xxxb"; + }; +} + diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index f0e4ef83d95..ec761b3c44f 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -5,11 +5,11 @@ assert qt4Support -> (qt4 != null); stdenv.mkDerivation rec { - name = "poppler-0.10.4"; + name = "poppler-0.10.6"; src = fetchurl { url = "http://poppler.freedesktop.org/${name}.tar.gz"; - sha256 = "15c53cn8ljhas0fbirp9s8sbgmaxpzg697c48zsdnz8zwm797gs1"; + sha256 = "bcd78d674c4166af069afdb27af810c012e13cfd2b7b21f9dce63dd3f62bded1"; }; buildInputs = [pkgconfig zlib glib cairo freetype fontconfig libjpeg gtk] diff --git a/pkgs/development/libraries/qt-4/setup-hook.sh b/pkgs/development/libraries/qt-4/setup-hook.sh index 36dfabb942c..f9ecacbbb7d 100644 --- a/pkgs/development/libraries/qt-4/setup-hook.sh +++ b/pkgs/development/libraries/qt-4/setup-hook.sh @@ -1,7 +1,9 @@ export QTDIR=@out@ -if [ -n $qt4BadIncludes ]; then - for d in @out@/include/*; do - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$d"; - done; +if [ -n "$includeAllQtDirs" ]; then + # This helps for g++, but not for moc. And no qt4 package should expect + # having all qt4 header files dirs into -I. + for d in @out@/include/*; do + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$d" + done fi diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index b1025a32ff4..5d9167d00ec 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -1,16 +1,17 @@ args: with args; stdenv.mkDerivation { - name = "atlas-3.9.9"; + name = "atlas-3.9.11"; src = fetchurl { - url = http://kent.dl.sourceforge.net/sourceforge/math-atlas/atlas3.9.9.tar.bz2; - sha256 = "0apbiqr0hlb38mrnlij0szsraxvxqfqainmp59xqj94pndx5s3yk"; + url = mirror://sf/math-atlas/atlas3.9.11.tar.bz2; + sha256 = "d91e593a772cf540ff693f7d8c43d10c3037eb334c5c77572ea1b6a64a0b9677"; }; # configure outside of the source directory preConfigure = '' mkdir build; cd build; configureScript=../configure; ''; - NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; + # the manual says you should pass -fPIC as configure arg .. It works + configureFlags = "-Fa alg -fPIC"; buildInputs = [gfortran]; diff --git a/pkgs/development/libraries/tk/8.4.16.nix b/pkgs/development/libraries/tk/8.4.16.nix index 1f26db83f1b..38b7ec85749 100644 --- a/pkgs/development/libraries/tk/8.4.16.nix +++ b/pkgs/development/libraries/tk/8.4.16.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "0cciavzd05bpm5yfppid0s0vsf8kabwia9620vgvi26sv1gjgwhb"; }; postInstall = '' - echo -e '#! /bin/sh \n $( readlink -f $( type -tP wish${__substring 0 3 version}) ) "$@"' >$out/bin/wish + echo -e '#! /bin/sh \n $( readlink -f $( type -tP wish${builtins.substring 0 3 version}) ) "$@"' >$out/bin/wish chmod a+x $out/bin/wish ''; configureFlags="--with-tcl=${tcl}/lib"; diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index 4d6e2beb7a1..ed7028b7d03 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }: stdenv.mkDerivation { - name = "vxl-1.11.0"; + name = "vxl-1.12.0"; src = fetchurl { url = mirror://sourceforge/vxl/vxl-1.12.0.zip; diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix index df5eaafdf6d..ccb99a4a540 100644 --- a/pkgs/development/libraries/webkit/default.nix +++ b/pkgs/development/libraries/webkit/default.nix @@ -1,34 +1,45 @@ args : with args; -let version = lib.getAttr ["version"] "r34824" args; in +let version = lib.attrByPath ["version"] "r44341" args; in rec { src = fetchurl { url = "http://nightly.webkit.org/files/trunk/src/WebKit-${version}.tar.bz2"; - sha256 = "10h295niz1np0rfjqchvjda8kdxf9z0qrk2r3x8xbrbva1y6dfn6"; + sha256 = "17byp4v47xk6xdxq6adpf0b9vswasrhj4f5pw0y2z80lgd1sxcly"; }; buildInputs = [gtk atk cairo curl fontconfig freetype gettext libjpeg libpng libtiff libxml2 libxslt pango sqlite icu gperf bison flex autoconf automake libtool - perl intltool pkgconfig]; + perl intltool pkgconfig libsoup gtkdoc libXt libproxy + enchant gstreamer gstPluginsBase gstFfmpeg + ]; configureCommand = "./autogen.sh "; configureFlags = []; /* doConfigure should be specified separately */ - phaseNames = ["doConfigure" (doPatchShebangs ".") "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"]; + phaseNames = ["setVars" "paranoidFixComments" "doConfigure" (doPatchShebangs ".") + "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"]; - doReplaceUsrBin = FullDepEntry ('' + setVars = fullDepEntry ('' + export NIX_LDFLAGS="$NIX_LDFLAGS -lXt" + '') ["minInit"]; + + doReplaceUsrBin = fullDepEntry ('' for i in $(find . -name '*.pl') $(find . -name '*.pm'); do sed -e 's@/usr/bin/gcc@gcc@' -i $i done '') ["minInit" "doUnpack"]; - doAddPrograms = FullDepEntry ('' + doAddPrograms = fullDepEntry ('' for i in Programs/.libs/*; do cp $i $out/bin/webkit-program-$(basename $i) done '') ["minInit" "doMake" "defEnsureDir"]; + paranoidFixComments = fullDepEntry ('' + sed -re 's@( |^)//.*@/* & */@' -i $(find . -name '*.c' -o -name '*.h') + '') ["minInit" "doUnpack"]; + name = "webkit-" + version; meta = { description = "WebKit - a fast and correct HTML renderer"; diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix index 621cf5ce3f8..0bdec709e13 100644 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ b/pkgs/development/libraries/wxGTK-2.8/default.nix @@ -34,10 +34,7 @@ stdenv.mkDerivation { SEARCH_INCLUDE = "${libXinerama}/include ${libSM}/include ${libXxf86vm}/include"; - SEARCH_LIB = if (stdenv.system == "x86_64-linux") then - "${mesa}/lib64" - else - "${mesa}/lib"; + SEARCH_LIB = "${mesa}/lib"; # Work around a bug in configure. NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1"; diff --git a/pkgs/development/misc/bleeding-edge-repos/default.nix b/pkgs/development/misc/bleeding-edge-repos/default.nix index 9284c3075d7..552d41f1a1d 100644 --- a/pkgs/development/misc/bleeding-edge-repos/default.nix +++ b/pkgs/development/misc/bleeding-edge-repos/default.nix @@ -68,7 +68,7 @@ args: kdebase = { type="svn"; url="svn://anonsvn.kde.org/home/kde/trunk/KDE/kdebase"; groups = "kde"; }; cinelerra = { type="git"; url="git://git.cinelerra.org/j6t/cinelerra.git"; }; - + ctags = { type = "svn"; url = "https://ctags.svn.sourceforge.net/svnroot/ctags/trunk"; }; autofs = { type="git"; url="http://ftp.riken.go.jp/Linux/kernel.org/scm/linux/storage/autofs/autofs.git"; }; # git repositories diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index 167f1f471ee..fa8b88d0834 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "0.83.0" a; + version = a.lib.attrByPath ["version"] "0.83.0" a; buildInputs = with a; [ pkgconfig ]; diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix deleted file mode 100644 index c52a9be538a..00000000000 --- a/pkgs/development/python-modules/foolscap/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ fetchurl, stdenv, python, setuptools, twisted, pyopenssl }: - -stdenv.mkDerivation rec { - name = "foolscap-0.3.2"; - - src = fetchurl { - url = "http://foolscap.lothar.com/releases/${name}.tar.gz"; - sha256 = "1wkqgm6anlxvz8dnqx7ki008255nm1mlhak5n9xy6g1yf31fn3l0"; - }; - - buildInputs = [ python ]; - propagatedBuildInputs = [ setuptools twisted pyopenssl ]; - - doCheck = true; - - buildPhase = "python setup.py build --build-base $out"; - checkPhase = "python setup.py test"; - - # FIXME: `$out/bin/flogtool' can't find its friends: - # - # $ ./result/bin/flogtool --help - # Traceback (most recent call last): - # File "./result/bin/flogtool", line 4, in - # import pkg_resources - # ImportError: No module named pkg_resources - - installPhase = '' - ensureDir "$out/lib/python2.5/site-packages" - - PYTHONPATH="$out/lib/python2.5/site-packages:$PYTHONPATH" \ - python setup.py install --prefix="$out" - - ensureDir "$out/doc/${name}" - cp -rv "doc/"* "$out/doc/${name}" - ''; - - - meta = { - homepage = http://foolscap.lothar.com/; - - description = "Foolscap, an RPC protocol for Python that follows the distributed object-capability model"; - - longDescription = '' - "Foolscap" is the name for the next-generation RPC protocol, - intended to replace Perspective Broker (part of Twisted). - Foolscap is a protocol to implement a distributed - object-capabilities model in Python. - ''; - - # See http://foolscap.lothar.com/trac/browser/LICENSE. - license = "MIT"; - }; -} diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix new file mode 100644 index 00000000000..33569fef29c --- /dev/null +++ b/pkgs/development/python-modules/generic/default.nix @@ -0,0 +1,97 @@ +/* This function provides a generic Python package builder. It is + intended to work with packages that use `setuptools' + (http://pypi.python.org/pypi/setuptools/), which represents a large + number of Python packages nowadays. */ + +{ python, setuptools, makeWrapper, lib }: + +{ name, namePrefix ? "python-", src, meta, patches ? [] +, doCheck ? true, ... } @ attrs: + +let + # Return the list of recursively propagated build inputs of PKG. + recursiveBuildInputs = + pkg: + [ pkg ] ++ + (if pkg ? propagatedBuildInputs + then lib.concatLists (map recursiveBuildInputs + pkg.propagatedBuildInputs) + else []); + +in + +python.stdenv.mkDerivation ( + # Keep extra attributes from ATTR, e.g., `patchPhase', etc. + attrs + + // + + (rec { + inherit src meta patches doCheck; + + name = namePrefix + attrs.name; + + buildInputs = [ python setuptools makeWrapper ] ++ + (if attrs ? buildInputs then attrs.buildInputs else []); + + propagatedBuildInputs = [ setuptools ] ++ + (if attrs ? propagatedBuildInputs + then attrs.propagatedBuildInputs + else []); + + buildPhase = "true"; + + # Many packages, but not all, support this. + checkPhase = "python setup.py test"; + + # XXX: Should we run `easy_install --always-unzip'? It doesn't seem + # to have a noticeable impact on small scripts. + installPhase = '' + ensureDir "$out/lib/${python.libPrefix}/site-packages" + + echo "installing \`${name}' with \`easy_install'..." + export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + easy_install --prefix="$out" . + ''; + + postFixup = '' + # Wrap scripts that are under `{s,}bin/' so that they get the right + # $PYTHONPATH. + for i in "$out/bin/"* "$out/sbin/"* + do + if head -n1 "$i" | grep -q "${python}" + then + echo "wrapping \`$i'..." + + # Compute a $PATH prefix for the program. + program_PATH="" + ${lib.concatStrings + (map (path: + ''if [ -d "${path}/bin" ] + then + program_PATH="${path}/bin'' + "\$" + ''{program_PATH:+:}$program_PATH" + fi + '') + (lib.concatMap recursiveBuildInputs propagatedBuildInputs))} + + wrapProgram "$i" \ + --prefix PYTHONPATH ":" \ + ${lib.concatStringsSep ":" + ([ "$out/lib/${python.libPrefix}/site-packages" ] ++ + (map (path: path + "/lib/${python.libPrefix}/site-packages") + (lib.concatMap recursiveBuildInputs + propagatedBuildInputs)))} \ + --prefix PATH ":" "$program_PATH" + + fi + done + + # If a user installs a Python package, she probably also wants its + # dependencies in the user environment (since Python modules don't + # have something like an RPATH, so the only way to find the + # dependencies is to have them in the PYTHONPATH variable). + if test -e $out/nix-support/propagated-build-inputs; then + ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages + fi + ''; +})) diff --git a/pkgs/development/python-modules/irclib/default.nix b/pkgs/development/python-modules/irclib/default.nix index c709308b7af..c840e0a1003 100644 --- a/pkgs/development/python-modules/irclib/default.nix +++ b/pkgs/development/python-modules/irclib/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "0.4.8" a; + version = a.lib.attrByPath ["version"] "0.4.8" a; buildInputs = with a; [ python ]; diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix index e6bd1b9e5a1..fa00a7040a0 100644 --- a/pkgs/development/python-modules/libsexy/default.nix +++ b/pkgs/development/python-modules/libsexy/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "0.1.9" a; + version = a.lib.attrByPath ["version"] "0.1.9" a; buildInputs = with a; [ pkgconfig pygtk ]; @@ -21,7 +21,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["doConfigure" "doMakeInstall" "postInstall"]; - postInstall = a.FullDepEntry ('' + postInstall = a.fullDepEntry ('' ln -s $out/lib/python*/site-packages/gtk-2.0/* $out/lib/python*/site-packages/ '') ["minInit"]; diff --git a/pkgs/development/python-modules/nevow/default.nix b/pkgs/development/python-modules/nevow/default.nix deleted file mode 100644 index 2c971b4a86a..00000000000 --- a/pkgs/development/python-modules/nevow/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ fetchurl, stdenv, python, setuptools, twisted, makeWrapper, lib }: - -stdenv.mkDerivation rec { - name = "nevow-0.9.33"; - - src = fetchurl { - url = "http://divmod.org/trac/attachment/wiki/SoftwareReleases/Nevow-0.9.33.tar.gz?format=raw"; - sha256 = "1b6zhfxx247b60n1qi2hrawhiaah88v8igg37pf7rjkmvy2z1c6c"; - name = "${name}.tar.gz"; - }; - - buildInputs = [ python makeWrapper ]; - propagatedBuildInputs = [ setuptools twisted ]; - - doCheck = true; - - buildPhase = "python setup.py build --build-base $out"; - checkPhase = "python runtests"; - - installPhase = '' - ensureDir "$out/lib/python2.5/site-packages" - - PYTHONPATH="$out/lib/python2.5/site-packages:$PYTHONPATH" \ - python setup.py install --prefix="$out" - - ensureDir "$out/doc/${name}" - cp -rv "doc/"* "$out/doc/${name}" - - ${postInstall} - ''; - - /* FIXME: Wrapping programs like this is not enough: - - $ ./result/bin/nit --help - Traceback (most recent call last): - File "/nix/store/p5a9qbdjqcfzqmaya8absvm5279l9wd0-nevow-0.9.33/bin/.wrapped-nit", line 4, in - import pkg_resources - [...] - pkg_resources.DistributionNotFound: Nevow==0.9.33-r17222 - - Ideas welcome. */ - postInstall = '' - for i in "$out/bin/"* - do - wrapProgram "$i" \ - --prefix PYTHONPATH ":" \ - ${lib.concatStringsSep ":" - ([ "$out/lib/python2.5/site-packages/src" ] ++ - (map (path: path + "/lib/python2.5/site-packages") - (propagatedBuildInputs - ++ twisted.propagatedBuildInputs)))} - done - ''; - - meta = { - description = "Nevow, a web application construction kit for Python"; - - longDescription = '' - Nevow - Pronounced as the French "nouveau", or "noo-voh", Nevow - is a web application construction kit written in Python. It is - designed to allow the programmer to express as much of the view - logic as desired in Python, and includes a pure Python XML - expression syntax named stan to facilitate this. However it - also provides rich support for designer-edited templates, using - a very small XML attribute language to provide bi-directional - template manipulation capability. - - Nevow also includes formless, a declarative syntax for - specifying the types of method parameters and exposing these - methods to the web. Forms can be rendered automatically, and - form posts will be validated and input coerced, rendering error - pages if appropriate. Once a form post has validated - successfully, the method will be called with the coerced values. - ''; - - homepage = http://divmod.org/trac/wiki/DivmodNevow; - - license = "BSD-style"; - }; -} diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index b2aedf7c508..86a79f1070e 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "0.8" a; + version = a.lib.attrByPath ["version"] "0.8" a; propagatedBuildInputs = with a; [ openssl python ]; diff --git a/pkgs/development/python-modules/setuptools/0.6c8.nix b/pkgs/development/python-modules/setuptools/0.6c8.nix deleted file mode 100644 index d8149f5514a..00000000000 --- a/pkgs/development/python-modules/setuptools/0.6c8.nix +++ /dev/null @@ -1,19 +0,0 @@ - -args : with args; -rec { - src = fetchurl { - url = http://pypi.python.org/packages/source/s/setuptools/setuptools-0.6c8.tar.gz; - sha256 = "0dry431lkaqqmgvka0rhnw54ljf1yx0npzh7r81z2ylcrn27lrln"; - }; - - buildInputs = [python]; - configureFlags = []; - - /* doConfigure should be specified separately */ - phaseNames = ["createPythonInstallationTarget" "installPythonPackage"]; - - name = "setuptools-" + version; - meta = { - description = "Installation utilities for Python packages"; - }; -} diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix new file mode 100644 index 00000000000..eb0da0264a4 --- /dev/null +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -0,0 +1,52 @@ +a : +let + fetchurl = a.fetchurl; + + version = a.lib.attrByPath ["version"] "0.6c9" a; + buildInputs = with a; [ + python makeWrapper + ]; +in +rec { + name = "setuptools-" + version; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/s/setuptools/${name}.tar.gz"; + sha256 = "1n5k6hf9nn69fnprgsnr9hdxzj2j6ir76qcy9d4b2v0v62bh86g6"; + }; + + inherit buildInputs; + configureFlags = []; + + doCheck = true; + + doMakeCheck = a.fullDepEntry ('' + python setup.py test + '') ["minInit" "doUnpack" "addInputs" "doBuild"]; + + doBuild = a.fullDepEntry('' + python setup.py build --build-base $out + '') ["addInputs" "doUnpack"]; + + doInstall = a.fullDepEntry('' + ensureDir "$out/lib/python2.5/site-packages" + + PYTHONPATH="$out/lib/python2.5/site-packages:$PYTHONPATH" \ + python setup.py install --prefix="$out" + + for i in "$out/bin/"* + do + wrapProgram "$i" \ + --prefix PYTHONPATH ":" \ + "$out/lib/python2.5/site-packages" + done + '') ["doBuild"]; + + phaseNames = ["doBuild" "doInstall"]; + + meta = { + description = "Utilities to facilitate the installation of Python packages"; + homepage = http://pypi.python.org/pypi/setuptools; + licenses = [ "PSF" "ZPL" ]; + }; +} diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix deleted file mode 100644 index 9f53d9364f1..00000000000 --- a/pkgs/development/python-modules/simplejson/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ fetchsvn, stdenv, python, setuptools }: - -stdenv.mkDerivation rec { - name = "simplejson-2.0.9"; - - src = fetchsvn { - url = "http://simplejson.googlecode.com/svn/tags/${name}"; - sha256 = "a48d5256fdb4f258c33da3dda110ecf3c786f086dcb08a01309acde6d1ddb921"; - rev = "172"; # to be on the safe side - }; - - buildInputs = [ python ]; - propagatedBuildInputs = [ setuptools ]; - - doCheck = true; - - buildPhase = "python setup.py build --build-base $out"; - checkPhase = "python setup.py test"; - - installPhase = '' - ensureDir "$out/lib/python2.5/site-packages" - - PYTHONPATH="$out/lib/python2.5/site-packages:$PYTHONPATH" \ - python setup.py install --prefix="$out" - - # Remove irrelevant directories. - rm -rvf "$out/"lib.* "$out/"temp.* - ''; - - meta = { - description = "simplejson is a simple, fast, extensible JSON encoder/decoder for Python"; - - longDescription = '' - simplejson is compatible with Python 2.4 and later with no - external dependencies. It covers the full JSON specification - for both encoding and decoding, with unicode support. By - default, encoding is done in an encoding neutral fashion (plain - ASCII with \uXXXX escapes for unicode characters). - ''; - - homepage = http://code.google.com/p/simplejson/; - - license = "MIT"; - }; -} diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix deleted file mode 100644 index a34907e261c..00000000000 --- a/pkgs/development/python-modules/twisted/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, fetchurl, python, ZopeInterface, makeWrapper}: - -stdenv.mkDerivation { - name = "twisted-8.1.0"; - src = fetchurl { - url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2; - sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl"; - }; - buildInputs = [python]; - - propagatedBuildInputs = [ZopeInterface makeWrapper]; - - installPhase = '' - python ./setup.py install --prefix=$out --install-lib=$(toPythonPath $out) -O1 - for n in $out/bin/*; do wrapProgram $n --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH:\$PYTHONPATH"; done - ''; -} diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix index 9afa28011de..3fc8058dfb2 100644 --- a/pkgs/development/python-modules/xmpppy/default.nix +++ b/pkgs/development/python-modules/xmpppy/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "0.5.0rc1" a; + version = a.lib.attrByPath ["version"] "0.5.0rc1" a; buildInputs = with a; [ python setuptools ]; @@ -18,7 +18,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["mkDirs" "installPythonPackage"]; - mkDirs = a.FullDepEntry('' + mkDirs = a.fullDepEntry('' ensureDir $out/bin $out/lib $out/share $(toPythonPath $out) export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out) '') ["defEnsureDir" "addInputs"]; diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix new file mode 100644 index 00000000000..17fc8de8c95 --- /dev/null +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation { + name = "checkstyle-5.0"; + buildInputs = [unzip] ; + + src = fetchurl { + url = mirror://sourceforge/checkstyle/checkstyle-5.0.zip ; + sha256 = "0972afcxjniz64hlnc89ddnd1d0mcd5hb1sd7lpw5k52h39683nh"; + }; + + installPhase = '' + ensureDir $out/checkstyle + cp -R * $out/checkstyle + ''; + + meta = { + description = "A development tool to help programmers write Java code that adheres to a coding standard. By default it supports the Sun Code Conventions, but is highly configurable." ; + homepage = http://checkstyle.sourceforge.net/; + }; +} + diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix new file mode 100644 index 00000000000..6973fbad9e7 --- /dev/null +++ b/pkgs/development/tools/analysis/jdepend/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation { + name = "jdepend-2.9"; + buildInputs = [unzip] ; + + src = fetchurl { + url = http://www.clarkware.com/software/jdepend-2.9.zip ; + sha256 = "1915fk9w9mjv9i6hlkn2grv2kjqcgn4xa8278v66f1ix5wpfcb90"; + }; + + installPhase = '' + ensureDir $out + cp -R * $out + ''; + + meta = { + description = "Depend traverses Java class file directories and generates design quality metrics for each Java package." ; + homepage = http://www.clarkware.com/software/JDepend.html ; + }; +} + + + diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix new file mode 100644 index 00000000000..7f50431c8d9 --- /dev/null +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation { + name = "pmd-4.2.5"; + buildInputs = [unzip] ; + + src = fetchurl { + url = mirror://sourceforge/pmd/pmd-bin-4.2.5.zip ; + sha256 = "07cb18mv7rplksy3iw3rxyjaav4m7kcjqfhzv20ki73hfkqxa85c"; + }; + + installPhase = '' + ensureDir $out + cp -R * $out + ''; + + meta = { + description = "PMD scans Java source code and looks for potential problems." ; + homepage = http://pmd.sourceforge.net/; + }; +} + diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix index 98f25759f3e..febdc39767c 100644 --- a/pkgs/development/tools/analysis/radare/default.nix +++ b/pkgs/development/tools/analysis/radare/default.nix @@ -2,14 +2,14 @@ python, ruby, libewf, vte, perl}: stdenv.mkDerivation { - name = "radare-1.3"; + name = "radare-1.4.1"; src = fetchurl { - url = http://radare.org/get/radare-1.3.tar.gz; - sha256 = "0r2yl24ywyqzi7wn82hr6rkn3dgf9bl9m662hswszx44pd0cxarx"; + url = http://radare.org/get/radare-1.4.1.tar.gz; + sha256 = "1q5hajhvp7nfyrj83gk7x6cbg520nvg39wbyq21bfncxk28rkmxh"; }; - patches = [ ./lua.patch ]; +# patches = [ ./lua.patch ]; buildInputs = [pkgconfig gtk readline libusb lua gtkdialog python ruby libewf vte perl]; diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index f2a48cc0933..cedd9584414 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -8,9 +8,12 @@ stdenv.mkDerivation { sha256 = "03c6bmar4z13jx7dddb029f0qnmgl8x4hyfwn3qijjyd4dbliiw6"; }; - preConfigure = "cd Src*"; buildInputs = [ flex yacc tk ]; + patchPhase = '' + cd Src* + sed -i -e 's/-DNXT/-DNXT -DCPP="\\"gcc -E -x c\\""/' makefile + ''; installPhase = '' ensureDir $out/bin cp ../Xspin*/xsp* $out/bin/xspin diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index a9e35d5d70b..50f73a42af5 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -11,8 +11,8 @@ let { inherit antContrib jdk; src = fetchurl { - url = http://apache.surfnet.nl/ant/binaries/apache-ant-1.6.5-bin.tar.bz2; - md5 = "26031ee1a2fd248ad0cc2e7f17c44c39"; + url = http://apache.mirror.transip.nl/ant/binaries/apache-ant-1.7.1-bin.tar.bz2 ; + sha256 = "15rgkini0g100jygp7z9hgc3yfb9m62q4nk989rin7dqj2flrr94"; }; }; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 6948215229b..12764e77303 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,7 +1,7 @@ {fetchurl, stdenv, replace, ncurses}: stdenv.mkDerivation rec { - name = "cmake-2.6.3"; + name = "cmake-2.6.4"; # We look for cmake modules in .../share/cmake-${majorVersion}/Modules. majorVersion = "2.6"; @@ -15,9 +15,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.cmake.org/files/v${majorVersion}/${name}.tar.gz"; - sha256 = "3c3af80526a32bc2afed616e8f486b847144f2fa3a8e441908bd39c38b146450"; + sha256 = "1wpxr5x4aggaqrqzjq3kg4hh09f0vyr1njik1pad01bvwd923pcw"; }; + patches = [ ./findqt4.patch ]; + postUnpack = '' dontUseCmakeConfigure=1 source $setupHook diff --git a/pkgs/development/tools/build-managers/cmake/findqt4.patch b/pkgs/development/tools/build-managers/cmake/findqt4.patch new file mode 100644 index 00000000000..43fa5591506 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/findqt4.patch @@ -0,0 +1,13 @@ +diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake +index 3bb77d1..7fdbe4a 100644 +--- a/Modules/FindQt4.cmake ++++ b/Modules/FindQt4.cmake +@@ -579,6 +579,8 @@ IF (QT4_QMAKE_FOUND) + FOREACH(QT_MODULE ${QT_MODULES}) + STRING(TOUPPER ${QT_MODULE} _upper_qt_module) + FIND_PATH(QT_${_upper_qt_module}_INCLUDE_DIR ${QT_MODULE} ++ NO_CMAKE_PATH ++ NO_CMAKE_ENVIRONMENT_PATH + PATHS + ${QT_HEADERS_DIR}/${QT_MODULE} + ${QT_LIBRARY_DIR}/${QT_MODULE}.framework/Headers diff --git a/pkgs/development/tools/documentation/docutils/default.nix b/pkgs/development/tools/documentation/docutils/default.nix index f032a94b153..1630b0f4072 100644 --- a/pkgs/development/tools/documentation/docutils/default.nix +++ b/pkgs/development/tools/documentation/docutils/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "0.5" a; + version = a.lib.attrByPath ["version"] "0.5" a; buildInputs = with a; [ python pil makeWrapper ]; diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix new file mode 100644 index 00000000000..663ce366c48 --- /dev/null +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -0,0 +1,39 @@ +{stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? true}: + +stdenv.mkDerivation rec { + name = "automake-1.11"; + + builder = ./builder.sh; + + setupHook = ./setup-hook.sh; + + src = fetchurl { + url = "mirror://gnu/automake/${name}.tar.bz2"; + sha256 = "1h5a821z4i3dbgqg67igvbxcwn487kkkkx83q0m00n9mw9xz5ai9"; + }; + + buildInputs = [perl autoconf makeWrapper]; + + inherit doCheck; + + # Disable indented log output from Make, otherwise "make.test" will + # fail. + preCheck = "unset NIX_INDENT_MAKE"; + + # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the + # "fixed" path in generated files! + dontPatchShebangs = true; + + meta = { + homepage = http://www.gnu.org/software/automake/; + description = "GNU Automake, a GNU standard-compliant makefile generator"; + + longDescription = '' + GNU Automake is a tool for automatically generating + `Makefile.in' files compliant with the GNU Coding + Standards. Automake requires the use of Autoconf. + ''; + + license = "GPLv2+"; + }; +} diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix index bddb55b035d..ffe45044076 100644 --- a/pkgs/development/tools/misc/ctags/default.nix +++ b/pkgs/development/tools/misc/ctags/default.nix @@ -1,12 +1,15 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, bleedingEdgeRepos, automake, autoconf}: stdenv.mkDerivation rec { - name = "ctags-5.7"; - src = fetchurl { - url = "mirror://sourceforge/ctags/${name}.tar.gz"; - sha256 = "10623bbcc9b0cb60124271ce83111733a1043ab022d51cfcd2c0e0c953bd8b58"; - }; + name = "ctags-svn"; + src = bleedingEdgeRepos.sourceByName "ctags"; + preConfigure = '' + autoheader + autoconf + ''; + + buildInputs = [ automake autoconf ]; meta = { description = "Exuberant Ctags, a tool for fast source code browsing"; diff --git a/pkgs/development/tools/misc/ctags/wrapped.nix b/pkgs/development/tools/misc/ctags/wrapped.nix new file mode 100644 index 00000000000..ff959d94141 --- /dev/null +++ b/pkgs/development/tools/misc/ctags/wrapped.nix @@ -0,0 +1,74 @@ +{pkgs, ctags, writeScriptBin, lib, makeOverridable}: + +# define some ctags wrappers adding support for some not that common languages +# customization: +# a) add stuff here +# b) override asLang, phpLang, ... using packageOverrides +# c) use ctagsWrapped.override {args = [ your liste ];} + +# install using -iA ctagsWrapped.ctagsWrapped + +{ + + # the derivation. use language extensions specified by args + ctagsWrapped = makeOverridable ( {args, name} : pkgs.writeScriptBin name '' + #!/bin/sh + exec ${pkgs.ctags}/bin/ctags ${lib.concatStringsSep " " (map lib.escapeShellArg args)} "$@" + '') { + args = let x = pkgs.ctagsWrapped; in lib.concatLists [ + x.defaultArgs x.phpLang x.jsLang x.nixLang x.asLang x.rubyLang + ]; + name = "${ctags.name}-wrapped"; + }; + + ### language arguments + + # don't scan version control directories + defaultArgs = [ + "--exclude=\.svn" + "--exclude=\.hg" + "--exclude=\.git" + "--exclude=\_darcs" + "--sort=yes" + ]; + + # actionscript + asLang = [ + "--langdef=ActionScript" + "--langmap=ActionScript:.as" + "--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\1/f,function,functions/" + "--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\2/p,property,properties/" + "--regex-ActionScript=/interface[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/i,interface,interfaces/" + "--regex-ActionScript=/package[ \\t]+([^ \\t]*)/\\1/p/" + "--regex-ActionScript=/class[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/c,class,classes/" + ]; + + # PHP + phpLang = [ + "--langmap=PHP:.php" + "--regex-PHP=/abstract class ([^ ]*)/\\1/c/" + "--regex-PHP=/interface ([^ ]*)/\\1/i/" + "--regex-PHP=/function[ \\t]+([^ (]*)/\\1/f/" + ]; + + # Javascript: also find unnamed functions and funtions beeing passed within a dict. + # the dict properties is used to implement duck typing in frameworks + # var foo = function () { ... } + # { + # a : function () {} + jsLang = [ + "--regex-JavaScript=/([^ \\t]*)[ \\t]*:[ \\t]*function[ \\t]*\\(/\\1/f/" + ]; + + # find foo in "foo =", don't think we can do a lot better + nixLang = [ + "--langdef=NIX" + "--langmap=NIX:.nix" + "--regex-NIX=/\([^ \\t*]*\)[ \\t]*=/\\1/f/" + ]; + + rubyLang = [ + "--langmap=RUBY:.rb" + "--regex-RUBY=/class ([^ ]*)/\\1/c/" + ]; +} diff --git a/pkgs/development/tools/misc/indent/2.2.9.nix b/pkgs/development/tools/misc/indent/2.2.9.nix index a3d800c81e9..df5aab7a313 100644 --- a/pkgs/development/tools/misc/indent/2.2.9.nix +++ b/pkgs/development/tools/misc/indent/2.2.9.nix @@ -1,4 +1,5 @@ args : with args; + let bd = builderDefs; in let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { @@ -8,19 +9,17 @@ args : with args; buildInputs = []; configureFlags = []; + preBuild = bd.stringsWithDeps.fullDepEntry (" + sed -e '/extern FILE [*]output/i#ifndef OUTPUT_DEFINED_ELSEWHERE' -i src/indent.h + sed -e '/extern FILE [*]output/a#endif' -i src/indent.h + sed -e '1i#define OUTPUT_DEFINED_ELSEWHERE 1' -i src/output.c + ") ["minInit" "doUnpack"]; }; in with localDefs; -let - preBuild = FullDepEntry (" - sed -e '/extern FILE [*]output/i#ifndef OUTPUT_DEFINED_ELSEWHERE' -i src/indent.h - sed -e '/extern FILE [*]output/a#endif' -i src/indent.h - sed -e '1i#define OUTPUT_DEFINED_ELSEWHERE 1' -i src/output.c - ") [minInit doUnpack]; -in stdenv.mkDerivation rec { name = "indent"; builder = writeScript (name + "-builder") - (textClosure localDefs [doConfigure preBuild doMakeInstall doForceShare doPropagate]); + (textClosure localDefs ["doConfigure" "preBuild" "doMakeInstall" "doForceShare" "doPropagate"]); meta = { description = "GNU Indent - a source text formatter"; inherit src; diff --git a/pkgs/development/tools/misc/ltrace/0.5-3deb.nix b/pkgs/development/tools/misc/ltrace/0.5-3deb.nix index d462cc3ab39..d33f7ac566c 100644 --- a/pkgs/development/tools/misc/ltrace/0.5-3deb.nix +++ b/pkgs/development/tools/misc/ltrace/0.5-3deb.nix @@ -13,14 +13,14 @@ args : with args; let goSrcDir = " cd ltrace-*; "; - preBuild = FullDepEntry ('' + preBuild = fullDepEntry ('' gunzip < ${patch} | patch -Np1 sed -e s@-Werror@@ -i Makefile.in '')["minInit" "doUnpack"]; }; in with localDefs; let - preConfigure = FullDepEntry (" + preConfigure = fullDepEntry (" sed -e 's@-o root -g root@@' -i Makefile.in; ") [doUnpack minInit]; in diff --git a/pkgs/development/tools/misc/patchelf/0.5.nix b/pkgs/development/tools/misc/patchelf/0.5.nix new file mode 100644 index 00000000000..a2b06d7f288 --- /dev/null +++ b/pkgs/development/tools/misc/patchelf/0.5.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "patchelf-0.5pre15975"; + + src = fetchurl { + url = http://hydra.nixos.org/build/35275/download/1/patchelf-0.5pre15975.tar.bz2; + sha256 = "fa945392386c484b670c1182e354f0738b03db54d51ed6cc7ff9ebd645a20ecb"; + }; + + meta = { + homepage = http://nixos.org/patchelf.html; + license = "GPL"; + description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; + }; +} diff --git a/pkgs/development/tools/misc/xxdiff/3.2.nix b/pkgs/development/tools/misc/xxdiff/3.2.nix index f4a0b8bebc4..8100972d6ea 100644 --- a/pkgs/development/tools/misc/xxdiff/3.2.nix +++ b/pkgs/development/tools/misc/xxdiff/3.2.nix @@ -10,7 +10,7 @@ rec { configureFlags = []; /* doConfigure should be specified separately */ - phaseNames = ["prepareMainBuild" + phaseNames = ["prepareMainBuild" "fixInc" "deploy" "installPythonPackage" (makeManyWrappers @@ -18,13 +18,17 @@ rec { ''--prefix PYTHONPATH : $(toPythonPath $out):$PYTHONPATH'') ]; - prepareMainBuild = FullDepEntry ('' + prepareMainBuild = fullDepEntry ('' cd src export QTDIR=${qt}/ make -f Makefile.bootstrap makefile '') ["minInit" "doUnpack"]; - deploy = FullDepEntry ('' + fixInc = fullDepEntry('' + sed -e '1i\#include ' -i resources.inline.h + '') ["minInit" "doUnpack"]; + + deploy = fullDepEntry ('' ensureDir $out/bin/ cp ../bin/xxdiff $out/bin cd .. diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index f25d8e7512c..5d75e6ea152 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -3,15 +3,18 @@ # latest release is newer though args: with args; stdenv.mkDerivation { - name = "yodl-2.13.2"; + name = "yodl-2.14.3"; buildInputs = [perl]; src = fetchurl { - url = "mirror://sourceforge/sourceforge/yodl/yodl_2.13.2.orig.tar.gz"; - sha256 = "07zzyx8vf27y3p549qza0pqrb61hfh0gynxqb8i1cghjmxhrlxj3"; + url = "mirror://sourceforge/yodl/yodl_2.14.3.orig.tar.gz"; + sha256 = "0paypm76p34hap3d18vvks5rrilchcw6q56rvq6pjf9raqw8ynd4"; }; - # maybe apply diff? + patches = [(fetchurl { + url = "mirror://sourceforge/yodl/yodl_2.14.3-1.diff.gz"; + sha256 = "176hlbiidv7p9051f04anzj4sr9dwlp9439f9mjvvgks47ac0qx4"; + })]; # This doesn't isntall docs yet, do you need them? installPhase = '' diff --git a/pkgs/development/tools/parsing/happy/happy-1.18.2.nix b/pkgs/development/tools/parsing/happy/happy-1.18.4.nix similarity index 63% rename from pkgs/development/tools/parsing/happy/happy-1.18.2.nix rename to pkgs/development/tools/parsing/happy/happy-1.18.4.nix index 889630a5e9b..a5cbfc6e21b 100644 --- a/pkgs/development/tools/parsing/happy/happy-1.18.2.nix +++ b/pkgs/development/tools/parsing/happy/happy-1.18.4.nix @@ -2,9 +2,9 @@ cabal.mkDerivation (self : { pname = "happy"; - version = "1.18.2"; # Haskell Platform 2009.0.0 + version = "1.18.4"; # Haskell Platform 2009.2.0.1 name = self.fname; - sha256 = "7515922f3cfd32cd844a0abfefe0b4871f403f0d869b8644bf9cbfc0b67996ae"; + sha256 = "909bec4541a92d3765e74756f752514d2d03ec7a5d3e74c18268a57fe7ffa832"; extraBuildInputs = [perl]; propagatedBuildInputs = [mtl]; meta = { diff --git a/pkgs/games/MazesOfMonad/default.nix b/pkgs/games/MazesOfMonad/default.nix new file mode 100644 index 00000000000..763bc337f70 --- /dev/null +++ b/pkgs/games/MazesOfMonad/default.nix @@ -0,0 +1,13 @@ +{cabal, HUnit, mtl, regexPosix, time}: + +cabal.mkDerivation (self : { + pname = "MazesOfMonad"; + version = "1.0.2"; + name = self.fname; + sha256 = "cb5833d509a96fe7411b5eba981bd939da2942b47595d99b861028b9328a4748"; + propagatedBuildInputs = [HUnit mtl regexPosix time]; + meta = { + description = "Console-based Role Playing Game"; + }; +}) + diff --git a/pkgs/games/construo/0.2.2.nix b/pkgs/games/construo/0.2.2.nix index bd6e95b9cb2..578e233cbd7 100644 --- a/pkgs/games/construo/0.2.2.nix +++ b/pkgs/games/construo/0.2.2.nix @@ -10,18 +10,19 @@ args : with args; ++ (if args ? mesa then [args.mesa args.freeglut] else []) ; configureFlags = [""]; + preConfigure = builderDefs.stringsWithDeps.fullDepEntry ('' + sed -e 's/math[.]h/cmath/' -i vector.cxx + sed -e 's/games/bin/' -i Makefile.in + sed -e '1i\#include ' -i construo_main.cxx -i command_line.cxx -i config.hxx + sed -e '1i\#include ' -i command_line.cxx -i lisp_reader.cxx -i unix_system.cxx \ + -i world.cxx construo_main.cxx + '') ["doUnpack" "minInit"]; }; in with localDefs; -let -preConfigure = FullDepEntry (" - sed -e 's/math[.]h/cmath/' -i vector.cxx - sed -e 's/games/bin/' -i Makefile.in -") [doUnpack minInit]; -in stdenv.mkDerivation rec { name = "construo-"+version; builder = writeScript (name + "-builder") - (textClosure localDefs [preConfigure doConfigure doMakeInstall doForceShare doPropagate]); + (textClosure localDefs ["preConfigure" "doConfigure" "doMakeInstall" "doForceShare" "doPropagate"]); meta = { description = "Construo masses and springs simulation"; inherit src; diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix new file mode 100644 index 00000000000..a73332d62a0 --- /dev/null +++ b/pkgs/games/eduke32/default.nix @@ -0,0 +1,52 @@ +{stdenv, fetchurl, SDL, SDL_mixer, unzip, libvorbis, mesa, gtk, pkgconfig, nasm, makeDesktopItem}: + +stdenv.mkDerivation rec { + name = "eduke32"; + + src = fetchurl { + url = http://wiki.eduke32.com/stuff/source_code/eduke32_src_20090131.zip; + sha256 = "e6b8cc2c7e0c32a6aa5a64359be8b8c494dcae08dda87e1de718c030426ef74d"; + }; + + buildInputs = [ unzip SDL SDL_mixer libvorbis mesa gtk pkgconfig ] + ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm; + + NIX_LDFLAGS = "-lgcc_s"; + + desktopItem = makeDesktopItem { + name = "eduke32"; + exec = "eduke32-wrapper"; + comment = "Duke Nukem 3D port"; + desktopName = "EDuke32"; + genericName = "Duke Nukem 3D port"; + categories = "Application;Game;"; + }; + + installPhase = '' + # Install binaries + ensureDir $out/bin + cp eduke32 mapster32 $out/bin + + # Make wrapper script + cat > $out/bin/eduke32-wrapper <\$out/bin/fsg; diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix index ff86ad26893..cbd905fc33c 100644 --- a/pkgs/games/gnuchess/default.nix +++ b/pkgs/games/gnuchess/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "5.07" a; + version = a.lib.attrByPath ["version"] "5.07" a; buildInputs = with a; [ flex ]; @@ -19,7 +19,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["doConfigure" "preBuild" "doMakeInstall"]; - preBuild = a.FullDepEntry ('' + preBuild = a.fullDepEntry ('' sed -i src/input.c -e 's/static pthread_t/pthread_t/' sed -i "s@gnuchess@$out/bin/gnuchess@" -i src/gnuchessx '') ["minInit" "doUnpack"]; diff --git a/pkgs/games/lincity/default.nix b/pkgs/games/lincity/default.nix index 833db9121cf..b5c78c98b19 100644 --- a/pkgs/games/lincity/default.nix +++ b/pkgs/games/lincity/default.nix @@ -1,7 +1,7 @@ args : with args; let - version = lib.getAttr ["version"] "1.12.1" args; - sha256 = lib.getAttr ["sha256"] + version = lib.attrByPath ["version"] "1.12.1" args; + sha256 = lib.attrByPath ["sha256"] "0xmrp7vkkp1hfblb6nl3rh2651qsbcm21bnncpnma1sf40jaf8wj" args; pkgName = "lincity"; in diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix new file mode 100644 index 00000000000..0d68b681ba5 --- /dev/null +++ b/pkgs/games/nethack/default.nix @@ -0,0 +1,57 @@ +a : +let + fetchurl = a.fetchurl; + + version = a.lib.attrByPath ["version"] "3.4.3" a; + buildInputs = with a; [ + ncurses flex bison + ]; +in +rec { + src = fetchurl { + url = "mirror://sourceforge/nethack/nethack-343-src.tgz"; + sha256 = "1r3ghqj82j0bar62z3b0lx9hhx33pj7p1ppxr2hg8bgfm79c6fdv"; + }; + + inherit buildInputs; + configureFlags = []; + + /* doConfigure should be removed if not needed */ + phaseNames = ["preBuild" "doMakeInstall" "postInstall"]; + + preBuild = a.fullDepEntry ('' + ( cd sys/unix ; sh setup.sh ) + sed -e 's@.*define HACKDIR.*@\#define HACKDIR "/tmp/nethack"@' -i include/config.h + sed -e '/define COMPRESS/d' -i include/config.h + sed -e '1i\#define COMPRESS "/usr/local/bin/gzip"' -i include/config.h + sed -e '1i\#define COMPRESS_EXTENSION ".gz"' -i include/config.h + + sed -e '/extern char [*]tparm/d' -i win/tty/*.c + sed -e 's/-ltermlib/-lncurses/' -i src/Makefile + sed -e 's/^YACC *=.*/YACC = bison -y/' -i util/Makefile + sed -e 's/^LEX *=.*/LEX = flex/' -i util/Makefile + + sed -e 's@GAMEDIR = @GAMEDIR = /tmp/nethack@' -i Makefile + sed -re 's@^(CH...).*@\1 = true@' -i Makefile + '') ["minInit" "doUnpack"]; + + postInstall = a.fullDepEntry ('' + ensureDir $out/bin + ln -s $out/games/nethack $out/bin/nethack + sed -i $out/bin/nethack -e '5aNEWHACKDIR="$HOME/.nethack"' + sed -i $out/bin/nethack -e '6amkdir -p "$NEWHACKDIR/save"' + sed -i $out/bin/nethack -e '7afor i in $(find "$NEWHACKDIR" -type l); do if ! test -e $(readlink "$i"); then rm "$i"; fi; done;' + sed -i $out/bin/nethack -e '8aln -s "$HACKDIR"/* "$NEWHACKDIR" &>/dev/null' + sed -i $out/bin/nethack -e '9atest -L "$NEWHACKDIR/record" && rm "$NEWHACKDIR"/record' + sed -i $out/bin/nethack -e '10aexport HACKDIR="$NEWHACKDIR"' + '') ["minInit" "defEnsureDir"]; + + makeFlags = [ + "PREFIX=$out" + ]; + + name = "nethack-" + version; + meta = { + description = "rogue-like game"; + }; +} diff --git a/pkgs/games/orbit/1.01.nix b/pkgs/games/orbit/1.01.nix index 1d122643f65..a8cd48d99e6 100644 --- a/pkgs/games/orbit/1.01.nix +++ b/pkgs/games/orbit/1.01.nix @@ -13,7 +13,7 @@ args : with args; with builderDefs; url = http://ftp.de.debian.org/debian/pool/main/s/space-orbit/space-orbit_1.01-9.diff.gz; sha256 = "1v3s97day6fhv08l2rn81waiprhi1lfyjjsj55axfh6n6zqfn1w2"; }; - customBuild = FullDepEntry ('' + customBuild = fullDepEntry ('' gunzip < ${debianPatch} | patch -Np1 cd src sed -e 's@/usr/share/games/orbit/@'$out'/dump/@g' -i *.c diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 830db2f117d..26b15f3940d 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "r8419" a; + version = a.lib.attrByPath ["version"] "r8541" a; buildInputs = with a; [ gtk glib pkgconfig libX11 ]; @@ -10,7 +10,7 @@ in rec { src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - sha256 = "0lm6d34i9g8krwvchqkq433gmpy4d7c4423h8855rvd3jxga82qa"; + sha256 = "1m6fybbvlx33786hmgraqxgm1hakfj9bqqszzzpi2ka4spfzj3xl"; }; inherit buildInputs; diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix new file mode 100644 index 00000000000..bdac6cddf2d --- /dev/null +++ b/pkgs/games/trackballs/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, SDL, mesa, SDL_ttf, gettext, zlib, SDL_mixer, SDL_image, guile, + debug ? false } : + +stdenv.mkDerivation rec { + name = "trackballs-1.1.4"; + src = fetchurl { + url = mirror://sourceforge/trackballs/trackballs-1.1.4.tar.gz; + sha256 = "19ilnif59sxa8xmfisk90wngrd11pj8s86ixzypv8krm4znbm7a5"; + }; + + buildInputs = [ zlib mesa SDL SDL_ttf SDL_mixer SDL_image guile gettext ]; + + CFLAGS = if debug then "-g -O0" else null; + CXXFLAGS = CFLAGS; + NIX_STRIP_DEBUG = if debug then "0" else "1"; + dontStrip = if debug then true else false; + postUnpack = if debug then + "ensureDir $out/src; cp -R * $out/src ; cd $out/src" + else null; + + NIX_CFLAGS_COMPILE="-iquote ${SDL}/include/SDL"; + configureFlags = if debug then "--enable-debug" else null; + + patchPhase = '' + sed -i -e 's/images icons music/images music/' share/Makefile.in + ''; + + meta = { + homepage = http://trackballs.sourceforge.net/; + description = "3D Marble Madness clone"; + }; +} diff --git a/pkgs/games/tuxracer/default.nix b/pkgs/games/tuxracer/default.nix index 9194bcdb1d5..98074c42d9b 100644 --- a/pkgs/games/tuxracer/default.nix +++ b/pkgs/games/tuxracer/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "0.61" a; + version = a.lib.attrByPath ["version"] "0.61" a; buildInputs = with a; [ mesa libX11 xproto tcl freeglut ]; @@ -19,7 +19,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"]; - preConfigure = a.FullDepEntry ('' + preConfigure = a.fullDepEntry ('' sed -e '/TCL_LIB_LIST=/atcl8.4' -i configure export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DGLX_GLXEXT_LEGACY=1" '') ["minInit" "doUnpack"]; diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix index b4258c1c14b..1c116f40f30 100644 --- a/pkgs/games/xboard/default.nix +++ b/pkgs/games/xboard/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "4.2.7" a; + version = a.lib.attrByPath ["version"] "4.2.7" a; buildInputs = with a; [ libX11 xproto libXt libXaw libSM libICE libXmu libXext gnuchess @@ -20,7 +20,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["doConfigure" "preBuild" "doMakeInstall"]; - preBuild = a.FullDepEntry('' + preBuild = a.fullDepEntry('' sed -e '/FIRST_CHESS_PROGRAM/s@gnuchessx@${a.gnuchess}/bin/gnuchessx@' -i xboard.h sed -e '/SECOND_CHESS_PROGRAM/s@gnuchessx@${a.gnuchess}/bin/gnuchessx@' -i xboard.h '') ["doUnpack" "minInit"]; diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix index 358d577fc80..b6222c097d0 100644 --- a/pkgs/games/xmoto/default.nix +++ b/pkgs/games/xmoto/default.nix @@ -3,7 +3,7 @@ let lib = args.lib; fetchurl = args.fetchurl; - version = lib.getAttr ["version"] "0.5.1" args; + version = lib.attrByPath ["version"] "0.5.1" args; buildInputs = with args; [ chipmunk sqlite curl zlib bzip2 libjpeg libpng freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix index 733c7646a6e..b3b3954da8c 100644 --- a/pkgs/games/xsokoban/default.nix +++ b/pkgs/games/xsokoban/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "3.3c" a; + version = a.lib.attrByPath ["version"] "3.3c" a; buildInputs = with a; [ a.libX11 a.xproto a.libXpm a.libXt ]; @@ -19,7 +19,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["preConfigure" "doConfigure" "preBuild" "doMakeInstall"]; - preConfigure = a.FullDepEntry ('' + preConfigure = a.fullDepEntry ('' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.libXpm}/include/X11" for i in $NIX_CFLAGS_COMPILE; do echo $i; ls ''${i#-I}; done chmod a+rw config.h @@ -35,7 +35,7 @@ rec { sed -e '/if [(]owner[)]/iowner=1;' -i main.c '') ["minInit" "doUnpack"]; - preBuild = a.FullDepEntry ('' + preBuild = a.fullDepEntry ('' sed -e "s@/usr/local/@$out/@" -i Makefile sed -e "s@ /bin/@ @" -i Makefile ensureDir $out/bin $out/share $out/man/man1 $out/lib diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix new file mode 100644 index 00000000000..dd654edcfe1 --- /dev/null +++ b/pkgs/games/zangband/default.nix @@ -0,0 +1,62 @@ +a : +let + fetchurl = a.fetchurl; + + version = a.lib.attrByPath ["version"] "2.7.3" a; + buildInputs = with a; [ + ncurses flex bison autoconf automake m4 + ]; +in +rec { + src = fetchurl { + url = "ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/zangband-${version}.tar.gz"; + sha256 = "0654m8fzklsc8565sqdad76mxjsm1z9c280srq8863sd10af0bdq"; + }; + + inherit buildInputs; + configureFlags = []; + + preConfigure = a.fullDepEntry ('' + chmod a+rwX -R . + sed -re 's/ch(own|grp|mod)/true/' -i lib/*/makefile.zb makefile.in + sed -e '/FIXED_PATHS/d' -i src/z-config.h + ./bootstrap + ensureDir $out/share/games/zangband + ensureDir $out/share/man + ensureDir $out/bin + '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"]; + + postInstall = a.fullDepEntry ('' + mv $out/bin/zangband $out/bin/.zangband.real + echo '#! /bin/sh + PATH="$PATH:${a.coreutils}/bin" + + ZANGBAND_PATH="$HOME/.zangband" + ORIG_PATH="'$out'"/share/games/zangband + mkdir -p "$ZANGBAND_PATH" + cd "$ZANGBAND_PATH" + for i in $(find "$ORIG_PATH" -type f); do + REL_PATH="''${i#$ORIG_PATH/}" + mkdir -p "$(dirname "$REL_PATH")" + ln -s "$i" "$REL_PATH" &>/dev/null + done + mkdir -p lib/user lib/save + for i in lib/*/*.raw; do + test -L "$i" && rm "$i"; + done + for i in $(find lib -type l); do if ! test -e $(readlink "$i"); then rm "$i"; fi; done; + export ANGBAND_PATH="$PWD" + "'$out'/bin/.zangband.real" "$@" + ' > $out/bin/zangband + chmod +x $out/bin/zangband + '') ["minInit" "doUnpack"]; + + /* doConfigure should be removed if not needed */ + phaseNames = ["preConfigure" "doConfigure" "doMakeInstall" "postInstall"]; + + name = "zangband-" + version; + meta = { + description = "rogue-like game"; + license = "non-free"; # Basically "not for commercial profit" + }; +} diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix index 1348a15bdba..9d10c179afd 100644 --- a/pkgs/lib/attrsets.nix +++ b/pkgs/lib/attrsets.nix @@ -1,9 +1,10 @@ # Operations on attribute sets. with { - inherit (builtins) head tail; + inherit (builtins) head tail isString; inherit (import ./default.nix) fold; inherit (import ./strings.nix) concatStringsSep; + inherit (import ./lists.nix) concatMap; }; rec { @@ -12,21 +13,28 @@ rec { /* Return an attribute from nested attribute sets. For instance ["x" "y"] applied to some set e returns e.x.y, if it exists. The - default value is returned otherwise. !!! there is also - builtins.getAttr (is there a better name for this function?) - */ - getAttr = attrPath: default: e: + default value is returned otherwise. */ + attrByPath = attrPath: default: e: let attr = head attrPath; in if attrPath == [] then e else if builtins ? hasAttr && hasAttr attr e - then getAttr (tail attrPath) default (builtins.getAttr attr e) + then attrByPath (tail attrPath) default (getAttr attr e) else default; + + /* Backwards compatibility hack: lib.attrByPath used to be called + lib.getAttr, which was confusing given that there was also a + builtins.getAttr. Eventually we'll drop this hack and + lib.getAttr will just be an alias for builtins.getAttr. */ + getAttr = a: b: if isString a + then builtins.getAttr a b + else c: builtins.trace "Deprecated use of lib.getAttr!" (attrByPath a b c); + getAttrFromPath = attrPath: set: let errorMsg = "cannot find attribute `" + concatStringsSep "." attrPath + "'"; - in getAttr attrPath (abort errorMsg) set; + in attrByPath attrPath (abort errorMsg) set; /* Return the specified attributes from a set. @@ -36,7 +44,7 @@ rec { => [as.a as.b as.c] */ attrVals = nameList: set: - map (x: builtins.getAttr x set) nameList; + map (x: getAttr x set) nameList; /* Return the values of all attributes in the given set, sorted by @@ -56,7 +64,32 @@ rec { catAttrs "a" [{a = 1;} {b = 0;} {a = 2;}] => [1 2] */ - catAttrs = attr: l: fold (s: l: if hasAttr attr s then [(builtins.getAttr attr s)] ++ l else l) [] l; + catAttrs = attr: l: fold (s: l: if hasAttr attr s then [(getAttr attr s)] ++ l else l) [] l; + + + /* Recursively collect sets that verify a given predicate named `pred' + from the set `attrs'. The recursion is stopped when the predicate is + verified. + + Type: + collect :: + (AttrSet -> Bool) -> AttrSet -> AttrSet + + Example: + collect builtins.isList { a = { b = ["b"]; }; c = [1]; } + => ["b" 1] + + collect (x: x ? outPath) + { a = { outPath = "a/"; }; b = { outPath = "b/"; }; } + => [{ outPath = "a/"; } { outPath = "b/"; }] + */ + collect = pred: attrs: + if pred attrs then + [ attrs ] + else if builtins.isAttrs attrs then + concatMap (collect pred) (attrValues attrs) + else + []; /* Utility function that creates a {name, value} pair as expected by @@ -75,7 +108,7 @@ rec { => {x = "x-foo"; y = "y-bar";} */ mapAttrs = f: set: - listToAttrs (map (attr: nameValuePair attr (f attr (builtins.getAttr attr set))) (attrNames set)); + listToAttrs (map (attr: nameValuePair attr (f attr (getAttr attr set))) (attrNames set)); /* Like `mapAttrs', except that it recursively applies itself to diff --git a/pkgs/lib/debug.nix b/pkgs/lib/debug.nix index a58539ee3c4..c05f540e503 100644 --- a/pkgs/lib/debug.nix +++ b/pkgs/lib/debug.nix @@ -1,4 +1,8 @@ -let lib = import ./default.nix; in +let lib = import ./default.nix; + +inherit (builtins) trace attrNamesToStr isAttrs isFunction isList head substring attrNames; + +in rec { @@ -20,25 +24,27 @@ rec { # this can help debug your code as well - designed to not produce thousands of lines - traceShowVal = x : __trace (showVal x) x; - traceShowValMarked = str: x: __trace (str + showVal x) x; - attrNamesToStr = a : lib.concatStringsSep "; " (map (x : "${x}=") (__attrNames a)); + traceShowVal = x : trace (showVal x) x; + traceShowValMarked = str: x: trace (str + showVal x) x; + attrNamesToStr = a : lib.concatStringsSep "; " (map (x : "${x}=") (attrNames a)); showVal = x : - if __isAttrs x then + if isAttrs x then if x ? outPath then "x is a derivation, name ${if x ? name then x.name else ""}, { ${attrNamesToStr x} }" else "x is attr set { ${attrNamesToStr x} }" - else if __isFunction x then "x is a function" + else if isFunction x then "x is a function" else if x == [] then "x is an empty list" - else if __isList x then "x is a list, first item is : ${showVal (__head x)}" + else if isList x then "x is a list, first item is : ${showVal (head x)}" else if x == true then "x is boolean true" else if x == false then "x is boolean false" else if x == null then "x is null" - else "x is probably a string starting, starting characters: ${__substring 0 50 x}.."; + else "x is probably a string starting, starting characters: ${substring 0 50 x}.."; # trace the arguments passed to function and its result traceCall = n : f : a : let t = n2 : x : traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a)); traceCall2 = n : f : a : b : let t = n2 : x : traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b)); traceCall3 = n : f : a : b : c : let t = n2 : x : traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b) (t "arg 3" c)); + traceValIfNot = c: x: + if c x then true else trace (showVal x) false; /* Evaluate a set of tests. A test is an attribute set {expr, expected}, denoting an expression and its expected result. The diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix index 4777d7fb668..de5c04811c0 100644 --- a/pkgs/lib/default.nix +++ b/pkgs/lib/default.nix @@ -3,16 +3,18 @@ let trivial = import ./trivial.nix; lists = import ./lists.nix; strings = import ./strings.nix; + stringsWithDeps = import ./strings-with-deps.nix; attrsets = import ./attrsets.nix; sources = import ./sources.nix; options = import ./options.nix; + types = import ./types.nix; meta = import ./meta.nix; debug = import ./debug.nix; misc = import ./misc.nix; in - { inherit trivial lists strings attrsets sources options meta debug; } + { inherit trivial lists strings stringsWithDeps attrsets sources options types meta debug; } # !!! don't include everything at top-level; perhaps only the most # commonly used functions. - // trivial // lists // strings // attrsets // sources // options - // meta // debug // misc + // trivial // lists // strings // stringsWithDeps // attrsets // sources + // options // types // meta // debug // misc diff --git a/pkgs/lib/lists.nix b/pkgs/lib/lists.nix index b186e97a55b..8ac93476a53 100644 --- a/pkgs/lib/lists.nix +++ b/pkgs/lib/lists.nix @@ -4,6 +4,12 @@ rec { inherit (builtins) head tail isList; + # Create a list consisting of a single element. `singleton x' is + # sometimes more convenient with respect to indentation than `[x]' + # when x spans multiple lines. + singleton = x: [x]; + + # "Fold" a binary function `op' between successive elements of # `list' with `nul' as the starting value, i.e., `fold op nul [x_1 # x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))'. (This is diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix index 21dd6d6c034..a8f37ec277b 100644 --- a/pkgs/lib/misc.nix +++ b/pkgs/lib/misc.nix @@ -1,4 +1,7 @@ -let lib = import ./default.nix; in +let lib = import ./default.nix; + inherit (builtins) isFunction hasAttr getAttr head tail isList isAttrs attrNames; + +in with import ./lists.nix; with import ./attrsets.nix; @@ -53,7 +56,7 @@ rec { f : # the function applied to the arguments initial : # you pass attrs, the functions below are passing a function taking the fix argument let - takeFixed = if (__isFunction initial) then initial else (fixed : initial); # transform initial to an expression always taking the fixed argument + takeFixed = if (isFunction initial) then initial else (fixed : initial); # transform initial to an expression always taking the fixed argument tidy = args : let # apply all functions given in "applyPreTidy" in sequence applyPreTidyFun = fold ( n : a : x : n ( a x ) ) lib.id (maybeAttr "applyPreTidy" [] args); @@ -61,9 +64,9 @@ rec { fun = n : x : let newArgs = fixed : let args = takeFixed fixed; - mergeFun = __getAttr n args; - in if __isAttrs x then (mergeFun args x) - else assert __isFunction x; + mergeFun = getAttr n args; + in if isAttrs x then (mergeFun args x) + else assert isFunction x; mergeFun args (x ( args // { inherit fixed; })); in overridableDelayableArgs f newArgs; in @@ -111,7 +114,7 @@ rec { pairMap = innerPairMap []; - # shortcut for getAttr ["name"] default attrs + # shortcut for attrByPath ["name"] default attrs maybeAttr = name: default: attrs: if (__hasAttr name attrs) then (__getAttr name attrs) else default; @@ -131,14 +134,14 @@ rec { checkFlag = attrSet: name: if (name == "true") then true else if (name == "false") then false else - if (elem name (getAttr ["flags"] [] attrSet)) then true else - getAttr [name] false attrSet ; + if (elem name (attrByPath ["flags"] [] attrSet)) then true else + attrByPath [name] false attrSet ; # Input : attrSet, [ [name default] ... ], name # Output : its value or default. getValue = attrSet: argList: name: - ( getAttr [name] (if checkFlag attrSet name then true else + ( attrByPath [name] (if checkFlag attrSet name then true else if argList == [] then null else let x = builtins.head argList; in if (head x) == name then @@ -160,7 +163,8 @@ rec { (val!=null) && (val!=false)) (tail x))))) condList)) ; - + + # !!! This function has O(n^2) performance, so you probably don't want to use it! uniqList = {inputList, outputList ? []}: if (inputList == []) then outputList else let x=head inputList; @@ -301,15 +305,15 @@ rec { fold lib.mergeAttrs {} [ x y (mapAttrs ( a : v : # merge special names using given functions - if (__hasAttr a x) - then if (__hasAttr a y) - then v (__getAttr a x) (__getAttr a y) # both have attr, use merge func - else (__getAttr a x) # only x has attr - else (__getAttr a y) # only y has attr) + if (hasAttr a x) + then if (hasAttr a y) + then v (getAttr a x) (getAttr a y) # both have attr, use merge func + else (getAttr a x) # only x has attr + else (getAttr a y) # only y has attr) ) (removeAttrs mergeAttrBy2 # don't merge attrs which are neither in x nor y - (filter (a : (! __hasAttr a x) && (! __hasAttr a y) ) - (__attrNames mergeAttrBy2)) + (filter (a : (! hasAttr a x) && (! hasAttr a y) ) + (attrNames mergeAttrBy2)) ) ) ]; @@ -325,8 +329,8 @@ rec { # pick attrs subset_attr_names and apply f subsetmap = f : attrs : subset_attr_names : - listToAttrs (fold ( attr : r : if __hasAttr attr attrs - then r ++ [ ( nameValuePair attr ( f (__getAttr attr attrs) ) ) ] else r ) [] + listToAttrs (fold ( attr : r : if hasAttr attr attrs + then r ++ [ ( nameValuePair attr ( f (getAttr attr attrs) ) ) ] else r ) [] subset_attr_names ); # prepareDerivationArgs tries to make writing configurable derivations easier @@ -370,7 +374,7 @@ rec { // args2.cfg; opts = flattenAttrs (mapAttrs (a : v : let v2 = if (v ? set || v ? unset) then v else { set = v; }; - n = if (__getAttr (flagName a) cfgWithDefaults) then "set" else "unset"; + n = if (getAttr (flagName a) cfgWithDefaults) then "set" else "unset"; attr = maybeAttr n {} v2; in if (maybeAttr "assertion" true attr) then attr @@ -386,11 +390,11 @@ rec { let eqListStrict = a : b : if (a == []) != (b == []) then false else if a == [] then true - else eqStrict (__head a) (__head b) && eqListStrict (__tail a) (__tail b); + else eqStrict (head a) (head b) && eqListStrict (tail a) (tail b); in - if __isList a && __isList b then eqListStrict a b - else if __isAttrs a && isAttrs b then - (eqListStrict (__attrNames a) (__attrNames b)) + if isList a && isList b then eqListStrict a b + else if isAttrs a && isAttrs b then + (eqListStrict (attrNames a) (attrNames b)) && (eqListStrict (lib.attrValues a) (lib.attrValues b)) else a == b; # FIXME ! } diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix index 6a4d6b4b695..6cf21ec6bcf 100644 --- a/pkgs/lib/options.nix +++ b/pkgs/lib/options.nix @@ -10,14 +10,129 @@ with import ./attrsets.nix; rec { - - mkOption = attrs: attrs // {_type = "option";}; - - hasType = x: __isAttrs x && x ? _type; - typeOf = x: if hasType x then x._type else ""; + inherit (lib) typeOf; + isOption = attrs: (typeOf attrs) == "option"; + mkOption = attrs: attrs // { + _type = "option"; + # name (this is the name of the attributem it is automatically generated by the traversal) + # default (value used when no definition exists) + # example (documentation) + # description (documentation) + # type (option type, provide a default merge function and ensure type correctness) + # merge (function used to merge definitions into one definition: [ /type/ ] -> /type/) + # apply (convert the option value to ease the manipulation of the option result) + # options (set of sub-options declarations & definitions) + }; + # Make the option declaration more user-friendly by adding default + # settings and some verifications based on the declaration content (like + # type correctness). + addOptionMakeUp = {name, recurseInto}: decl: + let + init = { + inherit name; + merge = mergeDefaultOption; + apply = lib.id; + }; + + mergeFromType = opt: + if decl ? type && decl.type ? merge then + opt // { merge = decl.type.merge; } + else + opt; + + addDeclaration = opt: opt // decl; + + ensureMergeInputType = opt: + if decl ? type then + opt // { + merge = list: + if all decl.type.check list then + opt.merge list + else + throw "One of the definitions has a bad type."; + } + else opt; + + ensureDefaultType = opt: + if decl ? type && decl ? default then + opt // { + default = + if decl.type.check decl.default then + decl.default + else + throw "The default value has a bad type."; + } + else opt; + + handleOptionSets = opt: + if decl ? type && decl.type.hasOptions then + let + optionConfig = opts: config: + map (f: applyIfFunction f config) + (decl.options ++ [opts]); + in + opt // { + merge = list: + decl.type.iter + (path: opts: + fixMergeFun (recurseInto path) (optionConfig opts) + ) + opt.name + (opt.merge list); + options = recurseInto (decl.type.docPath opt.name) decl.options; + } + else + opt; + in + foldl (opt: f: f opt) init [ + # default settings + mergeFromType + + # user settings + addDeclaration + + # override settings + ensureMergeInputType + ensureDefaultType + handleOptionSets + ]; + + # Merge a list of options containning different field. This is useful to + # separate the merge & apply fields from the interface. + mergeOptionDecls = opts: + if opts == [] then {} + else if tail opts == [] then + let opt = head opts; in + if opt ? options then + opt // { options = toList opt.options; } + else + opt + else + fold (opt1: opt2: + lib.addErrorContext "opt1 = ${lib.showVal opt1}\nopt2 = ${lib.showVal opt2}" ( + # You cannot merge if two options have the same field. + assert opt1 ? default -> ! opt2 ? default; + assert opt1 ? example -> ! opt2 ? example; + assert opt1 ? description -> ! opt2 ? description; + assert opt1 ? merge -> ! opt2 ? merge; + assert opt1 ? apply -> ! opt2 ? apply; + assert opt1 ? type -> ! opt2 ? type; + if opt1 ? options || opt2 ? options then + opt1 // opt2 // { + options = + (toList (attrByPath ["options"] [] opt1)) + ++ (toList (attrByPath ["options"] [] opt2)); + } + else + opt1 // opt2 + )) {} opts; + + + # !!! This function will be removed because this can be done with the + # multiple option declarations. addDefaultOptionValues = defs: opts: opts // builtins.listToAttrs (map (defName: { name = defName; @@ -29,23 +144,23 @@ rec { if typeOf defValue == "option" then # `defValue' is an option. - if builtins.hasAttr defName opts + if hasAttr defName opts then builtins.getAttr defName opts else defValue.default else # `defValue' is an attribute set containing options. # So recurse. - if builtins.hasAttr defName opts && builtins.isAttrs optValue + if hasAttr defName opts && isAttrs optValue then addDefaultOptionValues defValue optValue else addDefaultOptionValues defValue {}; } - ) (builtins.attrNames defs)); + ) (attrNames defs)); mergeDefaultOption = list: if list != [] && tail list == [] then head list - else if all __isFunction list then x: mergeDefaultOption (map (f: f x) list) - else if all __isList list then concatLists list - else if all __isAttrs list then fold lib.mergeAttrs {} list + else if all builtins.isFunction list then x: mergeDefaultOption (map (f: f x) list) + else if all isList list then concatLists list + else if all isAttrs list then fold lib.mergeAttrs {} list else if all (x: true == x || false == x) list then fold lib.or false list else if all (x: x == toString x) list then lib.concatStrings list else throw "Cannot merge values."; @@ -57,15 +172,14 @@ rec { mergeEnableOption = mergeTypedOption "boolean" (x: true == x || false == x) (fold lib.or false); - mergeListOption = mergeTypedOption "list" - __isList concatLists; + mergeListOption = mergeTypedOption "list" isList concatLists; mergeStringOption = mergeTypedOption "string" (x: if builtins ? isString then builtins.isString x else x + "") lib.concatStrings; mergeOneOption = list: - if list == [] then abort "This case should never happens." + if list == [] then abort "This case should never happen." else if tail list != [] then throw "Multiple definitions. Only one is allowed for this option." else head list; @@ -80,24 +194,26 @@ rec { # - notHandle is a function which takes the list of values are not handle # by this function. handleOptionSets = optionHandler@{export, notHandle, ...}: path: opts: - if all __isAttrs opts then + if all isAttrs opts then lib.zip (attr: opts: let + recurseInto = name: attrs: + handleOptionSets optionHandler name attrs; + # Compute the path to reach the attribute. name = if path == "" then attr else path + "." + attr; # Divide the definitions of the attribute "attr" between # declaration (isOption) and definitions (!isOption). - test = partition isOption opts; - decls = test.right; defs = test.wrong; + test = partition (x: isOption (rmProperties x)) opts; + decls = map rmProperties test.right; defs = test.wrong; - # Return the option declaration and add missing default - # attributes. - opt = { - inherit name; - merge = mergeDefaultOption; - apply = lib.id; - } // (head decls); + # Make the option declaration more user-friendly by adding default + # settings and some verifications based on the declaration content + # (like type correctness). + opt = addOptionMakeUp + { inherit name recurseInto; } + (mergeOptionDecls decls); # Return the list of option sets. optAttrs = map delayProperties defs; @@ -106,10 +222,9 @@ rec { # Remove undefined values that are coming from evalIf. optValues = evalProperties defs; in - if decls == [] then handleOptionSets optionHandler name optAttrs + if decls == [] then recurseInto name optAttrs else lib.addErrorContext "while evaluating the option ${name}:" ( - if tail decls != [] then throw "Multiple options." - else export opt optValues + export opt optValues ) ) opts else lib.addErrorContext "while evaluating ${path}:" (notHandle opts); @@ -118,8 +233,7 @@ rec { # all options declare and defined. If no values are defined for an # option, then the default value is used otherwise it use the merge # function of each option to get the result. - mergeOptionSets = noOption: newMergeOptionSets; # ignore argument - newMergeOptionSets = + mergeOptionSets = handleOptionSets { export = opt: values: opt.apply ( @@ -138,6 +252,67 @@ rec { notHandle = opts: {}; }; + + # Unfortunately this can also be a string. + isPath = x: !( + builtins.isFunction x + || builtins.isAttrs x + || builtins.isInt x + || builtins.isBool x + || builtins.isList x + ); + + applyIfFunction = f: arg: + if builtins.isFunction f then + f arg + else + f; + + moduleClosure = initModules: args: + let + moduleImport = path: + (applyIfFunction (import path) args) // { + # used by generic closure to avoid duplicated imports. + key = path; + }; + in + builtins.genericClosure { + startSet = map moduleImport initModules; + operator = m: + map moduleImport (attrByPath ["imports"] [] m); + }; + + selectDeclsAndDefs = modules: + lib.concatMap (m: + attrByPath ["options"] [] m + ++ attrByPath ["config"] [] m + ) modules; + + fixMergeFun = merge: optFun: + lib.fix (config: + merge ( + # Delay top-level properties like mkIf + map delayProperties ( + # generate the list of option sets. + optFun config + ) + ) + ); + + fixMergeModules = merge: initModules: {...}@args: + fixMergeFun (config: + selectDeclsAndDefs ( + moduleClosure initModules (args // { inherit config; }) + ) + ); + + fixModulesConfig = initModules: {...}@args: + fixMergeModules (mergeOptionSets "") initModules args; + + fixOptionsConfig = initModules: {...}@args: + fixMergeModules (filterOptionSets "") initModules args; + + # Evaluate a list of option sets that would be merged with the # function "merge" which expects two arguments. The attribute named # "require" is used to imports option declarations and bindings. @@ -159,6 +334,10 @@ rec { else cfgSet1; + filenameHandler = cfg: + if isPath cfg then import cfg + else cfg; + # call configuration "files" with one of the existing convention. argumentHandler = cfg: let @@ -169,69 +348,67 @@ rec { # pkgs: config: {..} cfg2 = cfg {} {}; in - if __isFunction cfg0 then - if builtins.isAttrs cfg1 then cfg1 + if builtins.isFunction cfg0 then + if isAttrs cfg1 then cfg1 else builtins.trace "Use '{pkgs, config, ...}:'." cfg2 else cfg0; preprocess = cfg0: - let cfg1 = argumentHandler cfg0; - cfg2 = noImportConditions cfg1; - in cfg2; + let cfg1 = filenameHandler cfg0; + cfg2 = argumentHandler cfg1; + cfg3 = noImportConditions cfg2; + in cfg3; - getRequire = x: - toList (getAttr ["require"] [] (preprocess x)); - getCleanRequire = x: map rmProperties (getRequire x); + getRequire = x: toList (attrByPath ["require"] [] (preprocess x)); + getRecursiveRequire = x: + fold (cfg: l: + if isPath cfg then + [ cfg ] ++ l + else + [ cfg ] ++ (getRecursiveRequire cfg) ++ l + ) [] (getRequire x); + + getRequireSets = x: filter (x: ! isPath x) (getRecursiveRequire x); + getRequirePaths = x: filter isPath (getRecursiveRequire x); rmRequire = x: removeAttrs (preprocess x) ["require"]; - duplicateIncludeProperties = list: - # iterate on all configurations - fold (cfg: l: - # iterate on all imported configuration from cfg - fold (include: l: - # clean up the included cfg to get the same result - let includedCfg = rmProperties include; in - # if the include has properties - if include != includedCfg then - # iterate on all configurations - map (cfg: - # if the imported configuration is seen - if (rmProperties cfg) == includedCfg then - # copy the properties from the import to the configuration. - delayProperties (copyProperties include cfg) - else - cfg - ) l - else - l - ) l (getRequire cfg) - ) list list; + inlineRequiredSets = cfgs: + fold (cfg: l: [ cfg ] ++ (getRequireSets cfg) ++ l) [] cfgs; in merge "" ( map rmRequire ( - duplicateIncludeProperties ( - lib.uniqFlatten getCleanRequire [] [] (toList opts) - ) + inlineRequiredSets ((toList opts) ++ lib.uniqFlatten getRequirePaths [] [] (lib.concatMap getRequirePaths (toList opts))) ) ); fixOptionSets = merge: pkgs: opts: lib.fix (fixOptionSetsFun merge pkgs opts); - optionAttrSetToDocList = l: attrs: - if (getAttr ["_type"] "" attrs) == "option" then - [({ - #inherit (attrs) description; - description = if attrs ? description then attrs.description else - throw ("No description ${toString l} : ${lib.whatis attrs}"); - } - // (if attrs ? example then {inherit(attrs) example;} else {} ) - // (if attrs ? default then {inherit(attrs) default;} else {} ) - // {name = l;} - )] - else (concatLists (map (s: (optionAttrSetToDocList - (l + (if l=="" then "" else ".") + s) (builtins.getAttr s attrs))) - (builtins.attrNames attrs))); + + # Generate documentation template from the list of option declaration like + # the set generated with filterOptionSets. + optionAttrSetToDocList = ignore: newOptionAttrSetToDocList; + newOptionAttrSetToDocList = attrs: + let options = collect isOption attrs; in + fold (opt: rest: + let + docOption = { + inherit (opt) name; + description = if opt ? description then opt.description else + throw "Option ${opt.name}: No description."; + } + // (if opt ? example then {inherit(opt) example;} else {}) + // (if opt ? default then {inherit(opt) default;} else {}); + + subOptions = + if opt ? options then + newOptionAttrSetToDocList opt.options + else + []; + in + [ docOption ] ++ subOptions ++ rest + ) [] options; + /* Option Properties */ # Generalize the problem of delayable properties. Any property can be created @@ -295,7 +472,7 @@ rec { # `onDelay' and `onGlobalDelay'. delayProperties = attrs: let cleanAttrs = rmProperties attrs; in - if cleanAttrs != attrs then + if isProperty attrs then lib.mapAttrs (a: v: lib.addErrorContext "while moving properties on the attribute `${a}'." ( triggerPropertiesGlobalDelay a ( @@ -396,7 +573,7 @@ rec { /* If. ThenElse. Always. */ - # create "if" statement that can be dealyed on sets until a "then-else" or + # create "if" statement that can be delayed on sets until a "then-else" or # "always" set is reached. When an always set is reached the condition # is ignore. @@ -525,8 +702,8 @@ rec { # Otherwise, the property is kept on all sub-attribute definitions. onOverrideDelay = name: p@{property, content, ...}: let inherit (property) template; in - if builtins.isAttrs template && template != {} then - if builtins.hasAttr name template then + if isAttrs template && template != {} then + if hasAttr name template then p // { property = p.property // { template = builtins.getAttr name template; @@ -580,4 +757,4 @@ rec { mkNotdef ) prioValList; -} \ No newline at end of file +} diff --git a/pkgs/lib/strings-with-deps.nix b/pkgs/lib/strings-with-deps.nix index 4fb4fe150a7..7543beddb52 100644 --- a/pkgs/lib/strings-with-deps.nix +++ b/pkgs/lib/strings-with-deps.nix @@ -3,74 +3,78 @@ Usage: You define you custom builder script by adding all build steps to a list. for example: - builder = writeScript "fsg-4.4-builder" - (textClosure [doUnpack addInputs preBuild doMake installPhase doForceShare]); + builder = writeScript "fsg-4.4-builder" + (textClosure [doUnpack addInputs preBuild doMake installPhase doForceShare]); - a step is defined by noDepEntry, FullDepEntry or PackEntry. + a step is defined by noDepEntry, fullDepEntry or packEntry. To ensure that prerequisite are met those are added before the task itself by textClosureDupList. Duplicated items are removed again. See trace/nixpkgs/trunk/pkgs/top-level/builder-defs.nix for some predefined build steps + Attention: + + let + pkgs = (import /etc/nixos/nixpkgs/pkgs/top-level/all-packages.nix) {}; + in let + inherit (pkgs.stringsWithDeps) fullDepEntry packEntry noDepEntry textClosureMap; + inherit (pkgs.lib) id; + + nameA = noDepEntry "Text a"; + nameB = fullDepEntry "Text b" ["nameA"]; + nameC = fullDepEntry "Text c" ["nameA"]; + + stages = { + nameHeader = noDepEntry "#! /bin/sh \n"; + inherit nameA nameB nameC; + }; + in + textClosureMap id stages + [ "nameHeader" "nameA" "nameB" "nameC" + nameC # <- added twice. add a dep entry if you know that it will be added once only [1] + "nameB" # <- this will not be added again because the attr name (reference) is used + ] + + # result: Str("#! /bin/sh \n\nText a\nText b\nText c\nText c",[]) + + [1] maybe this behaviour should be removed to keep things simple (?) */ -args: - with args; - with lib; - let - inherit (builtins) - head tail isList isAttrs; -in + +with import ./lists.nix; +with import ./attrsets.nix; +with import ./strings.nix; + rec { -/* - let shelllib = rec { - a= { - text = "aaaa"; - deps = [b c]; - }; - b = { - text = "b"; - }; - c = { - text = "c"; - deps = []; - }; - }; - in - - [textClosure [shelllib.a] - textclosure shelllib.a]; + /* !!! The interface of this function is kind of messed up, since + it's way too overloaded and almost but not quite computes a + topological sort of the depstrings. */ - -*/ - - textClosureDupList = arg: - ( - if isList arg then - textClosureDupList {text = ""; deps = arg;} - else - (concatLists (map textClosureDupList arg.deps)) ++ [arg] - ); + textClosureList = predefined: arg: + let + f = done: todo: + if todo == [] then {result = []; inherit done;} + else + let entry = head todo; in + if isAttrs entry then + let x = f done entry.deps; + y = f x.done (tail todo); + in { result = x.result ++ [entry.text] ++ y.result; + done = y.done; + } + else if hasAttr entry done then f done (tail todo) + else f (done // listToAttrs [{name = entry; value = 1;}]) ([(builtins.getAttr entry predefined)] ++ tail todo); + in (f {} arg).result; - textClosureDupListOverridable = predefined: arg: - ( - if isList arg then - textClosureDupListOverridable predefined {text = ""; deps = arg;} - else if isAttrs arg then - (concatLists (map (textClosureDupListOverridable predefined) arg.deps)) ++ [arg] - else - textClosureDupListOverridable predefined (getAttr [arg] [] predefined) - ); + textClosureMap = f: predefined: names: + concatStringsSep "\n" (map f (textClosureList predefined names)); - textClosureListOverridable = predefined: arg: - (map (x : x.text) - (uniqList {inputList = textClosureDupListOverridable predefined arg;})); - textClosureOverridable = predefined: arg: concatStringsSep "\n" (textClosureListOverridable predefined arg); - - textClosureMapOveridable = f: predefined: arg: - concatStringsSep "\n" (map f (textClosureListOverridable predefined arg)); + noDepEntry = text: {inherit text; deps = [];}; + fullDepEntry = text: deps: {inherit text deps;}; + packEntry = deps: {inherit deps; text="";}; - noDepEntry = text : {inherit text;deps = [];}; - FullDepEntry = text : deps: {inherit text deps;}; - PackEntry = deps: {inherit deps; text="";}; + # Old names - don't use. Will be removed soon. There are no more occurences in nixpkgs/nixos + FullDepEntry = fullDepEntry; + PackEntry = packEntry; + } diff --git a/pkgs/lib/strings.nix b/pkgs/lib/strings.nix index 263e659f2ec..c1ce5d09757 100644 --- a/pkgs/lib/strings.nix +++ b/pkgs/lib/strings.nix @@ -1,6 +1,10 @@ /* String manipulation functions. */ -let lib = import ./default.nix; in +let lib = import ./default.nix; + +inherit (builtins) substring add sub stringLength; + +in rec { inherit (builtins) stringLength substring head tail lessThan sub; @@ -66,11 +70,14 @@ rec { else [(substring 0 1 s)] ++ stringToCharacters (substring 1 (builtins.sub l 1) s); - # !!! this function seems broken - it doesn't escape all special - # characters, and in any case this should be done in a builder. - escapeShellArg = s: - let escapeChar = x: if x == "'" then "'\"'\"'" else x; - in "'" + concatStrings (map escapeChar (stringToCharacters s)) + "'"; + # same as vim escape function. + # Each character contained in list is prefixed by "\" + escape = list : string : + lib.concatStrings (map (c: if lib.elem c list then "\\${c}" else c) (stringToCharacters string)); + + # still ugly slow. But more correct now + # [] for zsh + escapeShellArg = lib.escape (stringToCharacters "\\ ';$`()|<>\t*[]"); # !!! what is this for? @@ -83,10 +90,10 @@ rec { if s == "" then "" else let takeTillSlash = left : c : s : if left == 0 then s - else if (__substring left 1 s == "/") then - (__substring (__add left 1) (__sub c 1) s) - else takeTillSlash (__sub left 1) (__add c 1) s; in - takeTillSlash (__sub (__stringLength s) 1) 1 s; + else if (substring left 1 s == "/") then + (substring (add left 1) (sub c 1) s) + else takeTillSlash (sub left 1) (add c 1) s; in + takeTillSlash (sub (stringLength s) 1) 1 s; # Compares strings not requiring context equality # Obviously, a workaround but works on all Nix versions diff --git a/pkgs/lib/tests.nix b/pkgs/lib/tests.nix index 395b4b3e17b..95933cbe4b7 100644 --- a/pkgs/lib/tests.nix +++ b/pkgs/lib/tests.nix @@ -1,3 +1,4 @@ +let inherit (builtins) add; in with import ./default.nix; runTests { @@ -69,14 +70,14 @@ runTests { res4 = let x = defaultOverridableDelayableArgs id { a = 7; }; in (x.merge) ( x: { b = 10; }); res5 = let x = defaultOverridableDelayableArgs id { a = 7; }; - in (x.merge) ( x: { a = __add x.a 3; }); - res6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = __add; }; }; + in (x.merge) ( x: { a = add x.a 3; }); + res6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = add; }; }; y = x.merge {}; in (y.merge) { a = 10; }; resRem7 = res6.replace (a : removeAttrs a ["a"]); - resReplace6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = __add; }; }; + resReplace6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = add; }; }; x2 = x.merge { a = 20; }; # now we have 27 in (x2.replace) { a = 10; }; # and override the value by 10 diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix new file mode 100644 index 00000000000..a9fa41ebdd5 --- /dev/null +++ b/pkgs/lib/types.nix @@ -0,0 +1,121 @@ +# Definitions related to run-time type checking. Used in particular +# to type-check NixOS configurations. + +let lib = import ./default.nix; in + +with import ./lists.nix; +with import ./attrsets.nix; +with import ./options.nix; + +rec { + + hasType = x: isAttrs x && x ? _type; + typeOf = x: if hasType x then x._type else ""; + + + # name (name of the type) + # check (boolean function) + # merge (default merge function) + # iter (iterate on all elements contained in this type) + # fold (fold all elements contained in this type) + # hasOptions (boolean: whatever this option contains an option set) + # path (path contatenated to the option name contained contained in the option set) + isOptionType = attrs: typeOf attrs == "option-type"; + mkOptionType = + { name + , check ? (x: true) + , merge ? mergeDefaultOption + # Handle complex structure types. + , iter ? (f: path: v: f path v) + , fold ? (op: nul: v: op v nul) + , docPath ? lib.id + # If the type can contains option sets. + , hasOptions ? false + }: + + { _type = "option-type"; + inherit name check merge iter fold docPath hasOptions; + }; + + + types = { + + inferred = mkOptionType { + name = "inferred type"; + }; + + bool = mkOptionType { + name = "boolean"; + check = lib.traceValIfNot builtins.isBool; + merge = fold lib.or false; + }; + + int = mkOptionType { + name = "integer"; + check = lib.traceValIfNot builtins.isInt; + }; + + string = mkOptionType { + name = "string"; + check = lib.traceValIfNot (x: builtins ? isString -> builtins.isString x); + merge = lib.concatStrings; + }; + + attrs = mkOptionType { + name = "attribute set"; + check = lib.traceValIfNot builtins.isAttrs; + merge = fold lib.mergeAttrs {}; + }; + + # derivation is a reserved keyword. + package = mkOptionType { + name = "derivation"; + check = lib.traceValIfNot isDerivation; + }; + + list = elemType: mkOptionType { + name = "list of ${elemType.name}s"; + check = value: lib.traceValIfNot isList value && all elemType.check value; + merge = concatLists; + iter = f: path: list: map (elemType.iter f (path + ".*")) list; + fold = op: nul: list: lib.fold (e: l: elemType.fold op l e) nul list; + docPath = path: elemType.docPath (path + ".*"); + inherit (elemType) hasOptions; + }; + + attrsOf = elemType: mkOptionType { + name = "attribute set of ${elemType}s"; + check = x: lib.traceValIfNot builtins.isAttrs x + && fold (e: v: v && elemType.check e) true (lib.attrValues x); + merge = fold lib.mergeAttrs {}; + iter = f: path: set: lib.mapAttrs (name: elemType.iter f (path + "." + name)) set; + fold = op: nul: set: fold (e: l: elemType.fold op l e) nul (lib.attrValues set); + docPath = path: elemType.docPath (path + "."); + inherit (elemType) hasOptions; + }; + + uniq = elemType: mkOptionType { + inherit (elemType) name check iter fold docPath hasOptions; + merge = list: + if tail list == [] then + head list + else + throw "Multiple definitions. Only one is allowed for this option."; + }; + + nullOr = elemType: mkOptionType { + inherit (elemType) name merge docPath hasOptions; + check = x: builtins.isNull x || elemType.check x; + iter = f: path: v: if v == null then v else elemType.iter f path v; + fold = op: nul: v: if v == null then nul else elemType.fold op nul v; + }; + + optionSet = mkOptionType { + name = "option set"; + check = x: lib.traceValIfNot builtins.isAttrs x; + hasOptions = true; + }; + + }; + +} diff --git a/pkgs/misc/bleeding-edge-fetch-infos.nix b/pkgs/misc/bleeding-edge-fetch-infos.nix index ed17be9a42d..88cf062f2a0 100644 --- a/pkgs/misc/bleeding-edge-fetch-infos.nix +++ b/pkgs/misc/bleeding-edge-fetch-infos.nix @@ -243,4 +243,16 @@ url = "http://mawercer.de/~nix/repos/autofs-9a77464b8a661d33a6205756955e0047727d5c1f.tar.gz"; sha256 = "0260817c5deb87210a4cea340d0ef0f35577ef14f37bd7da05a2f08be385ac2f"; }; + ctags = args: with args; fetchurl { # Thu May 7 20:12:55 CEST 2009 + url = "http://mawercer.de/~nix/repos/ctags-703.tar.gz"; + sha256 = "3f897b303f446aa8b52832d2aef280d359979bb2cd8768a2e70b6475adc64d61"; + }; + sqlalchemy05 = args: with args; fetchurl { # Fri Jun 26 00:00:40 CEST 2009 + url = "http://mawercer.de/~nix/repos/sqlalchemy05-6076.tar.gz"; + sha256 = "7baad2cda5a61bcbc4093a6026727d69bc7bd7c0399e25e479eaa2e2000f69b1"; + }; + sqlalchemyMigrate = args: with args; fetchurl { # Fri Jun 26 00:22:43 CEST 2009 + url = "http://mawercer.de/~nix/repos/sqlalchemyMigrate-569.tar.gz"; + sha256 = "7775d9bf7e25a8270ac112d9b1d916a36691a73beb9a87a6473d005d3ee0f0bf"; + }; } diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 2b1ff222160..78b159bea9d 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,11 +1,13 @@ {stdenv, fetchurl, zlib, libjpeg, libpng, libtiff, pam, openssl}: +let version = "1.3.10"; in + stdenv.mkDerivation { - name = "cups-1.3.9"; + name = "cups-${version}"; src = fetchurl { - url = http://ftp.easysw.com/pub/cups/1.3.9/cups-1.3.9-source.tar.bz2; - sha256 = "0svb5alfsj9bfraw0yb9i92g5hc9h36m9xfipvi1pxdwp2s6m19q"; + url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2"; + sha256 = "0rmm1dj8ha8d5c9lpdsfpfyw6l6lnkxl36xlxqdrjnm0lr2sa0cp"; }; buildInputs = [zlib libjpeg libpng libtiff pam openssl]; diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index 2a4c66c43b9..a8b98115ed6 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -1,26 +1,27 @@ -{stdenv, fetchurl, SDL}: +{stdenv, fetchurl, SDL, makeDesktopItem}: stdenv.mkDerivation rec { - name = "dosbox-0.72"; + name = "dosbox-0.73"; src = fetchurl { url = "mirror://sourceforge/dosbox/${name}.tar.gz"; - sha256 = "0ydck7jgvdwnpxakg2y83dmk2dnwx146cgidbmdn7h75y7cxfiqp"; + sha256 = "b0a94c46164391a9c32d9571e4d0b61ff238908ff0b77e09157c22dc98a93765"; }; - buildInputs = [SDL]; - - # Add missing includes in order to fix compilation with glibc 2.9 - patchPhase = '' - echo "#include " > tmp.cpp - for i in src/hardware/gameblaster.cpp src/hardware/tandy_sound.cpp - do - cat tmp.cpp $i > $i.new - mv $i.new $i - done - echo "#include " > tmp.cpp - cat tmp.cpp src/shell/shell_cmds.cpp > src/shell/shell_cmds.cpp.new - mv src/shell/shell_cmds.cpp.new src/shell/shell_cmds.cpp + buildInputs = [SDL]; + + desktopItem = makeDesktopItem { + name = "dosbox"; + exec = "dosbox"; + comment = "x86 emulator with internal DOS"; + desktopName = "DOSBox"; + genericName = "DOS emulator"; + categories = "Application;Emulator;"; + }; + + postInstall = '' + ensureDir $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications ''; meta = { diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix new file mode 100644 index 00000000000..3dcee7ef5e1 --- /dev/null +++ b/pkgs/misc/emulators/vice/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, perl, gettext, libpng, giflib, libjpeg, alsaLib, readline, mesa +, pkgconfig, gtk, SDL, autoconf, automake, makeDesktopItem +}: + +stdenv.mkDerivation rec { + name = "vice-2.1"; + src = fetchurl { + url = http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.1.tar.gz; + sha256 = "dc42df924bd4b4ab4af43e372d873a79ea035059f31f2f5c297c234b1c532c66"; + }; + buildInputs = [ perl gettext libpng giflib libjpeg alsaLib readline mesa + pkgconfig gtk SDL autoconf automake ]; + configureFlags = "--with-sdl --enable-fullscreen --enable-gnomeui"; + + desktopItem = makeDesktopItem { + name = "vice"; + exec = "x64"; + comment = "Commodore 64 emulator"; + desktopName = "VICE"; + genericName = "Commodore 64 emulator"; + categories = "Application;Emulator;"; + }; + + patchPhase = '' + # Disable font-cache update + + sed -i -e "s|install: install-data-am|install-no: install-data-am|" data/fonts/Makefile.am + autoreconf -f -i + ''; + + postInstall = '' + ensureDir $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications + ''; + + meta = { + description = "Commodore 64, 128 and other emulators"; + homepage = http://www.viceteam.org; + }; +} diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 3266a912ca8..1978d8ab2e8 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -9,11 +9,11 @@ assert stdenv.gcc.gcc != null; let lib = import ../../../lib/default.nix; in stdenv.mkDerivation rec { - name = "wine-1.1.20"; + name = "wine-1.1.23"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "1g6js3zszn91jz0fb3h612m426ih1132s36ggqldvl37rxx4kfys"; + sha256 = "0fg8s3y8975bwjyfw705q0sjch56vsndw3pc8n0j8dshhcbbrv5p"; }; buildInputs = [ diff --git a/pkgs/misc/ghc68executables/nix-repository-manager.nix b/pkgs/misc/ghc68executables/nix-repository-manager.nix index f72222bb3c3..63dfb12a5c0 100644 --- a/pkgs/misc/ghc68executables/nix-repository-manager.nix +++ b/pkgs/misc/ghc68executables/nix-repository-manager.nix @@ -12,8 +12,9 @@ args: with args; with args.lib; let + inherit (builtins) getAttr attrNames; toConfigLine = name : set : - "[(\"name\",\"${name}\")," + ( concatStringsSep "," (map (a: "(\"${a}\",\"${__getAttr a set}\")" ) (__attrNames set)))+"]"; + "[(\"name\",\"${name}\")," + ( concatStringsSep "," (map (a: "(\"${a}\",\"${getAttr a set}\")" ) (attrNames set)))+"]"; config = pkgs.writeText "nix-repository-manager_config" (bleedingEdgeRepos.managedRepoDir+"\n" + concatStringsSep "\n" (mapRecordFlatten toConfigLine (bleedingEdgeRepos.repos))); diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index c0d489d31f5..14eaa66627d 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fpic"; - patches = [ ./purity.patch ./mkromfs-zlib.patch ]; + patches = [ ./purity.patch ./mkromfs-zlib.patch ./urw-font-files.patch ]; doCheck = true; diff --git a/pkgs/misc/ghostscript/urw-font-files.patch b/pkgs/misc/ghostscript/urw-font-files.patch new file mode 100644 index 00000000000..9a4aab0bbbe --- /dev/null +++ b/pkgs/misc/ghostscript/urw-font-files.patch @@ -0,0 +1,61 @@ +Sometime between 8.62 and 8.64, the fontmap file was changed such that the +`.pfb' files of the URW++ fonts no longer appear in 8.64, making it impossible +to display/render these fonts. + +--- gnu-ghostscript-8.64/Resource/Init/Fontmap.GS 2009-05-27 02:19:02.000000000 +0200 ++++ gnu-ghostscript-8.62/Resource/Init/Fontmap.GS 2009-05-27 02:19:09.000000000 +0200 +@@ -81,6 +81,54 @@ + % Copyright URW Software, Copyright 1994 by URW. + % + ++% Actual fonts ++ ++/URWBookmanL-DemiBold (b018015l.pfb) ; ++/URWBookmanL-DemiBoldItal (b018035l.pfb) ; ++/URWBookmanL-Ligh (b018012l.pfb) ; ++/URWBookmanL-LighItal (b018032l.pfb) ; ++ ++/NimbusMonL-Regu (n022003l.pfb) ; ++/NimbusMonL-ReguObli (n022023l.pfb) ; ++/NimbusMonL-Bold (n022004l.pfb) ; ++/NimbusMonL-BoldObli (n022024l.pfb) ; ++ ++/URWGothicL-Book (a010013l.pfb) ; ++/URWGothicL-BookObli (a010033l.pfb) ; ++/URWGothicL-Demi (a010015l.pfb) ; ++/URWGothicL-DemiObli (a010035l.pfb) ; ++ ++/NimbusSanL-Regu (n019003l.pfb) ; ++/NimbusSanL-ReguItal (n019023l.pfb) ; ++/NimbusSanL-Bold (n019004l.pfb) ; ++/NimbusSanL-BoldItal (n019024l.pfb) ; ++ ++/NimbusSanL-ReguCond (n019043l.pfb) ; ++/NimbusSanL-ReguCondItal (n019063l.pfb) ; ++/NimbusSanL-BoldCond (n019044l.pfb) ; ++/NimbusSanL-BoldCondItal (n019064l.pfb) ; ++ ++/URWPalladioL-Roma (p052003l.pfb) ; ++/URWPalladioL-Ital (p052023l.pfb) ; ++/URWPalladioL-Bold (p052004l.pfb) ; ++/URWPalladioL-BoldItal (p052024l.pfb) ; ++ ++/CenturySchL-Roma (c059013l.pfb) ; ++/CenturySchL-Ital (c059033l.pfb) ; ++/CenturySchL-Bold (c059016l.pfb) ; ++/CenturySchL-BoldItal (c059036l.pfb) ; ++ ++/NimbusRomNo9L-Regu (n021003l.pfb) ; ++/NimbusRomNo9L-ReguItal (n021023l.pfb) ; ++/NimbusRomNo9L-Medi (n021004l.pfb) ; ++/NimbusRomNo9L-MediItal (n021024l.pfb) ; ++ ++/StandardSymL (s050000l.pfb) ; ++ ++/URWChanceryL-MediItal (z003034l.pfb) ; ++ ++/Dingbats (d050000l.pfb) ; ++ + % Aliases + + /Bookman-Demi /URWBookmanL-DemiBold ; diff --git a/pkgs/misc/tex/dblatex/default.nix b/pkgs/misc/tex/dblatex/default.nix index 125826e7558..28e69a14171 100644 --- a/pkgs/misc/tex/dblatex/default.nix +++ b/pkgs/misc/tex/dblatex/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, python, libxslt, tetex}: -stdenv.mkDerivation { - name = "dblatex-0.2.7"; +stdenv.mkDerivation rec { + name = "dblatex-0.2.8"; src = fetchurl { - url = mirror://sourceforge/dblatex/dblatex-0.2.7.tar.bz2; - sha256 = "0wcsfr2arcayq10fp06h2l7zlbn7l4ffrvzc2qs86103q5xismmr"; + url = "mirror://sourceforge/dblatex/${name}.tar.bz2"; + sha256 = "00slxwd1z9sajpxjvrqqgl3fnf9hwh17shg66pg2k2mnbgagxyr0"; }; buildPhase = "true"; diff --git a/pkgs/misc/tex/nix/default.nix b/pkgs/misc/tex/nix/default.nix index 5252e7a11eb..2fb50bf7023 100644 --- a/pkgs/misc/tex/nix/default.nix +++ b/pkgs/misc/tex/nix/default.nix @@ -47,7 +47,7 @@ rec { inherit searchRelativeTo; # Forces rebuilds. - hack = __currentTime; + hack = builtins.currentTime; }; diff --git a/pkgs/misc/tex/polytable/default.nix b/pkgs/misc/tex/polytable/default.nix index 7a2a0929bab..71674d85b04 100644 --- a/pkgs/misc/tex/polytable/default.nix +++ b/pkgs/misc/tex/polytable/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, tetex, lazylist}: -assert tetex == lazylist.tetex; +#assert tetex == lazylist.tetex; stdenv.mkDerivation { name = "polytable-0.8.2"; diff --git a/pkgs/misc/tex/texlive/aggregate.nix b/pkgs/misc/tex/texlive/aggregate.nix index 5a6df800451..0ece514c6fb 100644 --- a/pkgs/misc/tex/texlive/aggregate.nix +++ b/pkgs/misc/tex/texlive/aggregate.nix @@ -5,7 +5,7 @@ rec { buildInputs = lib.closePropagation paths; - doAggregate = FullDepEntry ('' + doAggregate = fullDepEntry ('' for currentPath in ${lib.concatStringsSep " " buildInputs}; do echo Symlinking "$currentPath" diff --git a/pkgs/misc/tex/texlive/beamer.nix b/pkgs/misc/tex/texlive/beamer.nix index abeecffb530..5f4ffd54211 100644 --- a/pkgs/misc/tex/texlive/beamer.nix +++ b/pkgs/misc/tex/texlive/beamer.nix @@ -9,7 +9,7 @@ rec { buildInputs = [texLive]; propagatedBuildInputs = [texLiveLatexXColor texLivePGF]; phaseNames = ["doCopy"]; - doCopy = FullDepEntry ('' + doCopy = fullDepEntry ('' ensureDir $out/share/texmf-dist/tex/latex/beamer cp -r * $out/share/texmf-dist/tex/latex/beamer '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"]; diff --git a/pkgs/misc/tex/texlive/cm-super.nix b/pkgs/misc/tex/texlive/cm-super.nix index 19c8b5566b9..a147d691743 100644 --- a/pkgs/misc/tex/texlive/cm-super.nix +++ b/pkgs/misc/tex/texlive/cm-super.nix @@ -7,7 +7,7 @@ rec { }; phaseNames = ["doCopy"]; - doCopy = FullDepEntry ('' + doCopy = fullDepEntry ('' ensureDir $out/share/texmf/fonts/enc ensureDir $out/share/texmf/fonts/map ensureDir $out/share/texmf/fonts/type1/public/cm-super diff --git a/pkgs/misc/tex/texlive/context.nix b/pkgs/misc/tex/texlive/context.nix index 11b4d15c097..e917cecf41e 100644 --- a/pkgs/misc/tex/texlive/context.nix +++ b/pkgs/misc/tex/texlive/context.nix @@ -8,7 +8,7 @@ rec { buildInputs = [texLive]; phaseNames = ["doCopy"]; - doCopy = FullDepEntry ('' + doCopy = fullDepEntry ('' ensureDir $out/share/texmf cp -r * $out/share/texmf '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"]; diff --git a/pkgs/misc/tex/texlive/default.nix b/pkgs/misc/tex/texlive/default.nix index 2c90e217624..38934facf45 100644 --- a/pkgs/misc/tex/texlive/default.nix +++ b/pkgs/misc/tex/texlive/default.nix @@ -1,13 +1,13 @@ args : with args; rec { src = fetchurl { - url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2007.dfsg.1.orig.tar.gz; - sha256 = "17wdn9vl4pa897046jpzxl6bl2ppr7swwb8x0jafwvbcnmywndag"; + url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2007.dfsg.2.orig.tar.gz; + sha256 = "0gqdz3sxpr6ibmasn847fg7q4m5rs4a370vld57kyl5djfrk33mq"; }; texmfSrc = fetchurl { - url = mirror://debian/pool/main/t/texlive-base/texlive-base_2007.orig.tar.gz; - sha256 = "16a4dyliidk43qj0m4gpsl9ln7nqsdcdx1lkbk4wrm03xpx87zvh"; + url = mirror://debian/pool/main/t/texlive-base/texlive-base_2007.dfsg.2.orig.tar.gz; + sha256 = "0qmwcz7d09ksrq26x4bqy5v3xjc4w2qkzfc1h6y9hs0gds6n8lnq"; }; langTexmfSrc = fetchurl { @@ -17,7 +17,7 @@ rec { setupHook = ./setup-hook.sh; - doPreConfigure = FullDepEntry ('' + doPreConfigure = fullDepEntry ('' ensureDir $out ensureDir $out/nix-support cp ${setupHook} $out/nix-support/setup-hook.sh @@ -29,12 +29,13 @@ rec { sed -e s@/usr/bin/@@g -i $(grep /usr/bin/ -rl . ) sed -e '/ubidi_open/i#include ' -i $(find . -name configure) sed -e s@ncurses/curses.h@curses.h@g -i $(grep ncurses/curses.h -rl . ) + sed -e '1i\#include \n\#include ' -i $( find libs/teckit -name '*.cpp' -o -name '*.c' ) NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2" NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu}/include/layout"; '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"]; - doPostInstall = FullDepEntry('' + doPostInstall = fullDepEntry('' mv $out/bin $out/libexec ensureDir $out/bin for i in $out/libexec/*/*; do diff --git a/pkgs/misc/tex/texlive/extra.nix b/pkgs/misc/tex/texlive/extra.nix index 63592984849..7ad4d9ad3e0 100644 --- a/pkgs/misc/tex/texlive/extra.nix +++ b/pkgs/misc/tex/texlive/extra.nix @@ -2,13 +2,13 @@ args: with args; rec { name = "texlive-extra-2007"; src = fetchurl { - url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2007.dfsg.2.orig.tar.gz; - sha256 = "1sdhidjafv5cls7r9g60qq3cw655kw91ms4may39pcm8wdbhqs77"; + url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2007.dfsg.17.orig.tar.gz; + sha256 = "093i40616vphyxycdi4z55sd2m0qfjypgprm7v182mgf55i2hpzc"; }; buildInputs = [texLive]; phaseNames = ["doCopy"]; - doCopy = FullDepEntry ('' + doCopy = fullDepEntry ('' ensureDir $out/share cp -r texmf* $out/share/ '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"]; diff --git a/pkgs/misc/tex/texlive/pgf.nix b/pkgs/misc/tex/texlive/pgf.nix index 01be99b9501..e23aa7f24df 100644 --- a/pkgs/misc/tex/texlive/pgf.nix +++ b/pkgs/misc/tex/texlive/pgf.nix @@ -11,7 +11,7 @@ rec { propagatedBuildInputs = [texLiveLatexXColor texLive]; phaseNames = ["doCopy"]; - doCopy = FullDepEntry ('' + doCopy = fullDepEntry ('' ensureDir $out/share/texmf/tex/generic/pgf cp -r * $out/share/texmf/tex/generic/pgf '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"]; diff --git a/pkgs/misc/tex/texlive/xcolor.nix b/pkgs/misc/tex/texlive/xcolor.nix index dcbbbcb8af6..d6c8633dd32 100644 --- a/pkgs/misc/tex/texlive/xcolor.nix +++ b/pkgs/misc/tex/texlive/xcolor.nix @@ -8,7 +8,7 @@ rec { buildInputs = [texLive]; phaseNames = ["doCopy"]; - doCopy = FullDepEntry ('' + doCopy = fullDepEntry ('' export HOME=$PWD ensureDir $out/share/texmf/tex/latex/xcolor diff --git a/pkgs/os-specific/linux/atheros/0.9.3.3.nix b/pkgs/os-specific/linux/atheros/0.9.3.3.nix index f34ad16c9ce..bfd130a7610 100644 --- a/pkgs/os-specific/linux/atheros/0.9.3.3.nix +++ b/pkgs/os-specific/linux/atheros/0.9.3.3.nix @@ -18,11 +18,11 @@ args : with args; } null; /* null is a terminator for sumArgs */ in with localDefs; let -doPatch = FullDepEntry (if patchAR2425x86 !="" then '' +doPatch = fullDepEntry (if patchAR2425x86 !="" then '' cd hal patch -Np1 -i ${patchAR2425x86} '' else "") [minInit doUnpack]; -postInstall = FullDepEntry ('' +postInstall = fullDepEntry ('' ln -s $out/usr/local/bin $out/bin '') [minInit doMakeInstall]; in diff --git a/pkgs/os-specific/linux/atheros/0.9.4.nix b/pkgs/os-specific/linux/atheros/0.9.4.nix index b5004110992..c2d39072750 100644 --- a/pkgs/os-specific/linux/atheros/0.9.4.nix +++ b/pkgs/os-specific/linux/atheros/0.9.4.nix @@ -12,7 +12,7 @@ args : with args; }; in with localDefs; let -postInstall = FullDepEntry ('' +postInstall = fullDepEntry ('' ln -s $out/usr/local/bin $out/bin '') [minInit doMakeInstall]; in diff --git a/pkgs/os-specific/linux/atheros/r2756.nix b/pkgs/os-specific/linux/atheros/r2756.nix index e26533738e3..41b06e70552 100644 --- a/pkgs/os-specific/linux/atheros/r2756.nix +++ b/pkgs/os-specific/linux/atheros/r2756.nix @@ -18,12 +18,12 @@ args : with args; } null; /* null is a terminator for sumArgs */ in with localDefs; let -doPatch = FullDepEntry (if patchAR2425x86 !="" then '' +doPatch = fullDepEntry (if patchAR2425x86 !="" then '' cd hal patch -Np1 -i ${patchAR2425x86} cd .. '' else "") [minInit doUnpack]; -postInstall = FullDepEntry ('' +postInstall = fullDepEntry ('' ln -s $out/usr/local/bin $out/bin '') [minInit doMakeInstall]; in diff --git a/pkgs/os-specific/linux/atheros/r3122.nix b/pkgs/os-specific/linux/atheros/r3122.nix index 020dce8a9a4..f40761770b8 100644 --- a/pkgs/os-specific/linux/atheros/r3122.nix +++ b/pkgs/os-specific/linux/atheros/r3122.nix @@ -12,7 +12,7 @@ args : with args; } null; /* null is a terminator for sumArgs */ in with localDefs; let -postInstall = FullDepEntry ('' +postInstall = fullDepEntry ('' ln -s $out/usr/local/bin $out/bin '') [minInit doMakeInstall]; in diff --git a/pkgs/os-specific/linux/atheros/r3574.nix b/pkgs/os-specific/linux/atheros/r3574.nix index c16fc1285ec..7b97a235ae7 100644 --- a/pkgs/os-specific/linux/atheros/r3574.nix +++ b/pkgs/os-specific/linux/atheros/r3574.nix @@ -12,7 +12,7 @@ args : with args; } null; /* null is a terminator for sumArgs */ in with localDefs; let -postInstall = FullDepEntry ('' +postInstall = fullDepEntry ('' ln -s $out/usr/local/bin $out/bin '') [minInit doMakeInstall]; in diff --git a/pkgs/os-specific/linux/atheros/r3693.nix b/pkgs/os-specific/linux/atheros/r3693.nix index bf8456787dd..b6144f81f8d 100644 --- a/pkgs/os-specific/linux/atheros/r3693.nix +++ b/pkgs/os-specific/linux/atheros/r3693.nix @@ -15,13 +15,13 @@ args : with args; }; in with localDefs; let -preBuild = FullDepEntry ('' +preBuild = fullDepEntry ('' echo Replacing HAL. tar xvf ${hal20080528} rm -r hal mv ath_hal-* hal '') ["minInit" "doUnpack"]; -postInstall = FullDepEntry ('' +postInstall = fullDepEntry ('' ln -s $out/usr/local/bin $out/bin '') [minInit doMakeInstall]; in @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { builder = writeScript (name + "-builder") (textClosure localDefs ((lib.optional - (lib.getAttr ["freshHAL"] false args) + (lib.attrByPath ["freshHAL"] false args) preBuild) ++ [doMakeInstall postInstall doForceShare doPropagate])); diff --git a/pkgs/os-specific/linux/atheros/r3837.nix b/pkgs/os-specific/linux/atheros/r3837.nix index d7dbe98893c..39f5488ba6c 100644 --- a/pkgs/os-specific/linux/atheros/r3837.nix +++ b/pkgs/os-specific/linux/atheros/r3837.nix @@ -16,25 +16,25 @@ args : with args; }; in with localDefs; let -preBuild = FullDepEntry ('' +preBuild = fullDepEntry ('' echo Replacing HAL. tar xvf ${hal20080528} rm -r hal mv ath_hal-* hal '') ["minInit" "doUnpack"]; -postInstall = FullDepEntry ('' +postInstall = fullDepEntry ('' ln -s $out/usr/local/bin $out/bin '') [minInit doMakeInstall]; in stdenv.mkDerivation rec { name = "atheros-"+version; patches = lib.optional - (lib.getAttr ["injectionPatch"] false args) + (lib.attrByPath ["injectionPatch"] false args) injectionPatchFile; builder = writeScript (name + "-builder") (textClosure localDefs ((lib.optional - (lib.getAttr ["freshHAL"] false args) + (lib.attrByPath ["freshHAL"] false args) preBuild) ++ [doPatch doMakeInstall postInstall doForceShare doPropagate])); diff --git a/pkgs/os-specific/linux/atheros/r3867.nix b/pkgs/os-specific/linux/atheros/r3867.nix index 62316d38b81..95a834dd67a 100644 --- a/pkgs/os-specific/linux/atheros/r3867.nix +++ b/pkgs/os-specific/linux/atheros/r3867.nix @@ -16,25 +16,25 @@ args : with args; }; in with localDefs; let -preBuild = FullDepEntry ('' +preBuild = fullDepEntry ('' echo Replacing HAL. tar xvf ${hal20080528} rm -r hal mv ath_hal-* hal '') ["minInit" "doUnpack"]; -postInstall = FullDepEntry ('' +postInstall = fullDepEntry ('' ln -s $out/usr/local/bin $out/bin '') [minInit doMakeInstall]; in stdenv.mkDerivation rec { name = "atheros-"+version; patches = lib.optional - (lib.getAttr ["injectionPatch"] false args) + (lib.attrByPath ["injectionPatch"] false args) injectionPatchFile; builder = writeScript (name + "-builder") (textClosure localDefs ((lib.optional - (lib.getAttr ["freshHAL"] false args) + (lib.attrByPath ["freshHAL"] false args) preBuild) ++ [doPatch doMakeInstall postInstall doForceShare doPropagate])); diff --git a/pkgs/os-specific/linux/blcr/0.6.5.nix b/pkgs/os-specific/linux/blcr/0.6.5.nix index c16be4f9c70..236afccf79a 100644 --- a/pkgs/os-specific/linux/blcr/0.6.5.nix +++ b/pkgs/os-specific/linux/blcr/0.6.5.nix @@ -13,7 +13,7 @@ rec { "--with-system-map=${args.kernel}/System.map" ]; - preConfigure = FullDepEntry ('' + preConfigure = fullDepEntry ('' sed -e 's/FASTCALL//' -i configure configure.ac sed -e 's/int (attach_pid/void (attach_pid/' -i configure configure.ac '')["doUnpack" "minInit"]; diff --git a/pkgs/os-specific/linux/btrfsprogs/default.nix b/pkgs/os-specific/linux/btrfsprogs/default.nix index a8f2c7ea46f..62d3b130ca5 100644 --- a/pkgs/os-specific/linux/btrfsprogs/default.nix +++ b/pkgs/os-specific/linux/btrfsprogs/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "0.18" a; + version = a.lib.attrByPath ["version"] "0.18" a; buildInputs = with a; [ zlib e2fsprogs acl ]; diff --git a/pkgs/os-specific/linux/e2fsprogs/1.41.5.nix b/pkgs/os-specific/linux/e2fsprogs/1.41.5.nix new file mode 100644 index 00000000000..8d72e9fc439 --- /dev/null +++ b/pkgs/os-specific/linux/e2fsprogs/1.41.5.nix @@ -0,0 +1,35 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "e2fsprogs-1.41.5"; + + src = fetchurl { + url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; + sha256 = "1611lcfp5vcng7g9sacyxhg1dklxpn2p5m43mvfl0dwa0phx1mxk"; + }; + + configureFlags = + (if stdenv ? isDietLibC + then "--with-diet-libc" + else (if stdenv.system == "i686-darwin" then " --enable-bsd-shlibs" else "--enable-elf-shlibs" ) ) ; + + preBuild = if stdenv ? isDietLibC then '' + sed -e 's/-lpthread//' -i Makefile */Makefile */*/Makefile + '' else ""; + + preInstall = "installFlagsArray=('LN=ln -s')"; + + postInstall = "make install-libs"; + + NIX_CFLAGS_COMPILE = + if stdenv ? isDietLibC then + "-UHAVE_SYS_PRCTL_H " + + (if stdenv.system == "x86_64-linux" then "-DHAVE_LSEEK64_PROTOTYPE=1 -Dstat64=stat" else "") + + " -lcompat -lpthread " + else ""; + + meta = { + homepage = http://e2fsprogs.sourceforge.net/; + description = "Tools for creating and checking ext2/ext3/ext4 filesystems"; + }; +} diff --git a/pkgs/os-specific/linux/e2fsprogs/default.nix b/pkgs/os-specific/linux/e2fsprogs/1.41.6.nix similarity index 80% rename from pkgs/os-specific/linux/e2fsprogs/default.nix rename to pkgs/os-specific/linux/e2fsprogs/1.41.6.nix index c4c0b15818f..37cd9cd17cd 100644 --- a/pkgs/os-specific/linux/e2fsprogs/default.nix +++ b/pkgs/os-specific/linux/e2fsprogs/1.41.6.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "e2fsprogs-1.41.4"; +stdenv.mkDerivation rec { + name = "e2fsprogs-1.41.6"; src = fetchurl { - url = mirror://sourceforge/e2fsprogs/e2fsprogs-1.41.4.tar.gz; - sha256 = "1p10j04gwr286qc2pjpp72k38nqk2d2n7sslwhvxgb995gp0zh9c"; + url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; + sha256 = "0i5ldfgx3rccr4d59fgxc1zcv33i1jm4ggb3nqyvr5wik5qmv5sq"; }; configureFlags = diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index 189272b7d9b..7d6778bca88 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "1.2" a; + version = a.lib.attrByPath ["version"] "1.2" a; buildInputs = with a; [ gpm fontconfig freetype pkgconfig ]; @@ -16,8 +16,12 @@ rec { inherit buildInputs; configureFlags = []; + fixInc = a.fullDepEntry ('' + sed -e '/ifdef SYS_signalfd/atypedef long long loff_t;' -i src/fbterm.cpp + '') ["doUnpack" "minInit"]; + /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; + phaseNames = ["fixInc" "doConfigure" "doMakeInstall"]; name = "fbterm-" + version; meta = { diff --git a/pkgs/os-specific/linux/gw6c/default.nix b/pkgs/os-specific/linux/gw6c/default.nix index a11037c0ebe..af8449f55db 100644 --- a/pkgs/os-specific/linux/gw6c/default.nix +++ b/pkgs/os-specific/linux/gw6c/default.nix @@ -17,7 +17,7 @@ rec { goSrcDir = "cd tspc-advanced"; - preBuild = FullDepEntry ('' + preBuild = fullDepEntry ('' sed -e 's@/dev/net/tun@/dev/tun@' -i platform/linux/tsp_tun.c; sed -e 's@/sbin/ifconfig@${nettools}/sbin/ifconfig@' -i template/linux.sh sed -e 's@/sbin/route@${nettools}/sbin/route@' -i template/linux.sh diff --git a/pkgs/os-specific/linux/jfsrec/svn-7.nix b/pkgs/os-specific/linux/jfsrec/svn-7.nix index bb124bb52e7..4f47d710e75 100644 --- a/pkgs/os-specific/linux/jfsrec/svn-7.nix +++ b/pkgs/os-specific/linux/jfsrec/svn-7.nix @@ -8,12 +8,17 @@ rec { buildInputs = [boost]; configureFlags = []; - doFixBoost = FullDepEntry ('' + doFixBoost = fullDepEntry ('' sed -e 's/-lboost_[a-z_]*/&-mt/g' -i src/Makefile.in '') ["minInit" "doUnpack"]; + doFixInc = fullDepEntry ('' + sed -e '/[#]include [<]config.h[>]/a\#include ' -i src/unicode_to_utf8.cpp + cat src/unicode_to_utf8.cpp + '') ["minInit" "doUnpack"]; + /* doConfigure should be specified separately */ - phaseNames = ["doFixBoost" "doConfigure" "doMakeInstall"]; + phaseNames = ["doFixBoost" "doFixInc" "doConfigure" "doMakeInstall"]; name = "jfsrec-" + version; meta = { diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 5aac73e8586..b7dd81c0378 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, bison, flex}: -stdenv.mkDerivation { - name = "kbd-1.12"; +stdenv.mkDerivation rec { + name = "kbd-1.15"; src = fetchurl { - url = ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd/kbd-1.12.tar.gz; - sha256 = "00z89kscfhvbsd3pxkqiw95p124zcka0pji5s5fa7ld7vd3ngg7k"; + url = "ftp://ftp.altlinux.org/pub/people/legion/kbd/${name}.tar.gz"; + sha256 = "1h2klv4sxf0j08fzlpki2zf7f4k7m0j1d0ca01a1bsd8yza0l39d"; }; buildInputs = [bison flex]; diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh index 696b2f2fbe4..89d46418924 100644 --- a/pkgs/os-specific/linux/kernel/builder.sh +++ b/pkgs/os-specific/linux/kernel/builder.sh @@ -79,7 +79,7 @@ installPhase() { # /lib/modules). The depmod_opts= is to prevent the kernel # from passing `-b PATH' to depmod. export MODULE_DIR=$out/lib/modules/ - substituteInPlace Makefile --replace '-b $(INSTALL_MOD_PATH) -r' '' + substituteInPlace Makefile --replace '-b $(INSTALL_MOD_PATH)' '' make modules_install \ DEPMOD=$module_init_tools/sbin/depmod depmod_opts= \ $makeFlags "${makeFlagsArray[@]}" \ diff --git a/pkgs/os-specific/linux/kernel/config-2.6.29-i686-smp b/pkgs/os-specific/linux/kernel/config-2.6.29-i686-smp new file mode 100644 index 00000000000..43431e7ea30 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/config-2.6.29-i686-smp @@ -0,0 +1,4355 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.29.5 +# Wed Jun 17 14:19:54 2009 +# +# CONFIG_64BIT is not set +CONFIG_X86_32=y +# CONFIG_X86_64 is not set +CONFIG_X86=y +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_FAST_CMPXCHG_LOCAL=y +CONFIG_MMU=y +CONFIG_ZONE_DMA=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +# CONFIG_RWSEM_GENERIC_SPINLOCK is not set +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +# CONFIG_GENERIC_TIME_VSYSCALL is not set +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_DEFAULT_IDLE=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_HAVE_SETUP_PER_CPU_AREA=y +# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +# CONFIG_ZONE_DMA32 is not set +CONFIG_ARCH_POPULATES_NODE_MAP=y +# CONFIG_AUDIT_ARCH is not set +CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_X86_SMP=y +CONFIG_USE_GENERIC_SMP_HELPERS=y +CONFIG_X86_32_SMP=y +CONFIG_X86_HT=y +CONFIG_X86_BIOS_REBOOT=y +CONFIG_X86_TRAMPOLINE=y +CONFIG_KTIME_SCALAR=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="-default" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_TREE=y + +# +# RCU Subsystem +# +CONFIG_CLASSIC_RCU=y +# CONFIG_TREE_RCU is not set +# CONFIG_PREEMPT_RCU is not set +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_PREEMPT_RCU_TRACE is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=17 +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +CONFIG_GROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +# CONFIG_RT_GROUP_SCHED is not set +CONFIG_USER_SCHED=y +# CONFIG_CGROUP_SCHED is not set +# CONFIG_CGROUPS is not set +# CONFIG_SYSFS_DEPRECATED_V2 is not set +CONFIG_RELAY=y +CONFIG_NAMESPACES=y +# CONFIG_UTS_NS is not set +# CONFIG_IPC_NS is not set +# CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set +# CONFIG_NET_NS is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_PCSPKR_PLATFORM=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_PCI_QUIRKS=y +CONFIG_COMPAT_BRK=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y +# CONFIG_MARKERS is not set +CONFIG_OPROFILE=m +CONFIG_OPROFILE_IBS=y +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y +CONFIG_STOP_MACHINE=y +CONFIG_BLOCK=y +CONFIG_LBD=y +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_BLK_DEV_BSG is not set +CONFIG_BLK_DEV_INTEGRITY=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_PREEMPT_NOTIFIERS=y +CONFIG_FREEZER=y + +# +# Processor type and features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_SMP=y +# CONFIG_SPARSE_IRQ is not set +CONFIG_X86_FIND_SMP_CONFIG=y +CONFIG_X86_MPPARSE=y +CONFIG_X86_PC=y +# CONFIG_X86_ELAN is not set +# CONFIG_X86_VOYAGER is not set +# CONFIG_X86_GENERICARCH is not set +# CONFIG_X86_VSMP is not set +# CONFIG_X86_RDC321X is not set +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_PARAVIRT_GUEST=y +CONFIG_XEN=y +CONFIG_XEN_MAX_DOMAIN_MEMORY=8 +CONFIG_XEN_SAVE_RESTORE=y +# CONFIG_XEN_DEBUG_FS is not set +CONFIG_VMI=y +CONFIG_KVM_CLOCK=y +CONFIG_KVM_GUEST=y +CONFIG_PARAVIRT=y +CONFIG_PARAVIRT_CLOCK=y +# CONFIG_PARAVIRT_DEBUG is not set +CONFIG_MEMTEST=y +# CONFIG_M386 is not set +# CONFIG_M486 is not set +# CONFIG_M586 is not set +# CONFIG_M586TSC is not set +# CONFIG_M586MMX is not set +CONFIG_M686=y +# CONFIG_MPENTIUMII is not set +# CONFIG_MPENTIUMIII is not set +# CONFIG_MPENTIUMM is not set +# CONFIG_MPENTIUM4 is not set +# CONFIG_MK6 is not set +# CONFIG_MK7 is not set +# CONFIG_MK8 is not set +# CONFIG_MCRUSOE is not set +# CONFIG_MEFFICEON is not set +# CONFIG_MWINCHIPC6 is not set +# CONFIG_MWINCHIP3D is not set +# CONFIG_MGEODEGX1 is not set +# CONFIG_MGEODE_LX is not set +# CONFIG_MCYRIXIII is not set +# CONFIG_MVIAC3_2 is not set +# CONFIG_MVIAC7 is not set +# CONFIG_MPSC is not set +# CONFIG_MCORE2 is not set +# CONFIG_GENERIC_CPU is not set +CONFIG_X86_GENERIC=y +CONFIG_X86_CPU=y +CONFIG_X86_CMPXCHG=y +CONFIG_X86_L1_CACHE_SHIFT=7 +CONFIG_X86_XADD=y +CONFIG_X86_PPRO_FENCE=y +CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_INVLPG=y +CONFIG_X86_BSWAP=y +CONFIG_X86_POPAD_OK=y +CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_TSC=y +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_CMOV=y +CONFIG_X86_MINIMUM_CPU_FAMILY=4 +CONFIG_X86_DEBUGCTLMSR=y +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_CYRIX_32=y +CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_CENTAUR_32=y +CONFIG_CPU_SUP_TRANSMETA_32=y +CONFIG_CPU_SUP_UMC_32=y +# CONFIG_X86_DS is not set +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_DMI=y +# CONFIG_IOMMU_HELPER is not set +# CONFIG_IOMMU_API is not set +CONFIG_NR_CPUS=8 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PREEMPT is not set +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set +CONFIG_X86_MCE=y +CONFIG_X86_MCE_NONFATAL=y +CONFIG_X86_MCE_P4THERMAL=y +CONFIG_VM86=y +CONFIG_TOSHIBA=m +CONFIG_I8K=m +CONFIG_X86_REBOOTFIXUPS=y +CONFIG_MICROCODE=m +CONFIG_MICROCODE_INTEL=y +CONFIG_MICROCODE_AMD=y +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=m +CONFIG_X86_CPUID=m +# CONFIG_NOHIGHMEM is not set +# CONFIG_HIGHMEM4G is not set +CONFIG_HIGHMEM64G=y +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_HIGHMEM=y +CONFIG_X86_PAE=y +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_SPARSEMEM_STATIC=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_UNEVICTABLE_LRU=y +CONFIG_MMU_NOTIFIER=y +CONFIG_HIGHPTE=y +CONFIG_X86_CHECK_BIOS_CORRUPTION=y +# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set +CONFIG_X86_RESERVE_LOW_64K=y +# CONFIG_MATH_EMULATION is not set +CONFIG_MTRR=y +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 +CONFIG_X86_PAT=y +CONFIG_EFI=y +CONFIG_SECCOMP=y +# CONFIG_HZ_100 is not set +CONFIG_HZ_250=y +# CONFIG_HZ_300 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=250 +CONFIG_SCHED_HRTICK=y +CONFIG_KEXEC=y +# CONFIG_CRASH_DUMP is not set +# CONFIG_KEXEC_JUMP is not set +CONFIG_PHYSICAL_START=0x100000 +# CONFIG_RELOCATABLE is not set +CONFIG_PHYSICAL_ALIGN=0x100000 +CONFIG_HOTPLUG_CPU=y +CONFIG_COMPAT_VDSO=y +# CONFIG_CMDLINE_BOOL is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y + +# +# Power management and ACPI options +# +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set +CONFIG_PM_SLEEP_SMP=y +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_HIBERNATION=y +CONFIG_PM_STD_PARTITION="" +CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_PROCFS=y +CONFIG_ACPI_PROCFS_POWER=y +CONFIG_ACPI_SYSFS_POWER=y +CONFIG_ACPI_PROC_EVENT=y +CONFIG_ACPI_AC=m +CONFIG_ACPI_BATTERY=m +CONFIG_ACPI_BUTTON=m +CONFIG_ACPI_VIDEO=m +CONFIG_ACPI_FAN=m +CONFIG_ACPI_DOCK=y +CONFIG_ACPI_PROCESSOR=m +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_THERMAL=m +CONFIG_ACPI_CUSTOM_DSDT_FILE="" +# CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_BLACKLIST_YEAR=2001 +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_PCI_SLOT=m +CONFIG_X86_PM_TIMER=y +CONFIG_ACPI_CONTAINER=m +# CONFIG_ACPI_SBS is not set +CONFIG_X86_APM_BOOT=y +CONFIG_APM=y +# CONFIG_APM_IGNORE_USER_SUSPEND is not set +CONFIG_APM_DO_ENABLE=y +# CONFIG_APM_CPU_IDLE is not set +CONFIG_APM_DISPLAY_BLANK=y +CONFIG_APM_ALLOW_INTS=y + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=m +# CONFIG_CPU_FREQ_DEBUG is not set +CONFIG_CPU_FREQ_STAT=m +CONFIG_CPU_FREQ_STAT_DETAILS=y +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m + +# +# CPUFreq processor drivers +# +CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_POWERNOW_K6=m +CONFIG_X86_POWERNOW_K7=m +CONFIG_X86_POWERNOW_K7_ACPI=y +CONFIG_X86_POWERNOW_K8=m +CONFIG_X86_POWERNOW_K8_ACPI=y +CONFIG_X86_GX_SUSPMOD=m +CONFIG_X86_SPEEDSTEP_CENTRINO=m +CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y +CONFIG_X86_SPEEDSTEP_ICH=m +CONFIG_X86_SPEEDSTEP_SMI=m +CONFIG_X86_P4_CLOCKMOD=m +CONFIG_X86_CPUFREQ_NFORCE2=m +CONFIG_X86_LONGRUN=m +CONFIG_X86_LONGHAUL=m +CONFIG_X86_E_POWERSAVER=m + +# +# shared options +# +CONFIG_X86_SPEEDSTEP_LIB=m +CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y + +# +# Bus options (PCI etc.) +# +CONFIG_PCI=y +# CONFIG_PCI_GOBIOS is not set +# CONFIG_PCI_GOMMCONFIG is not set +# CONFIG_PCI_GODIRECT is not set +# CONFIG_PCI_GOOLPC is not set +CONFIG_PCI_GOANY=y +CONFIG_PCI_BIOS=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCIEPORTBUS=y +CONFIG_HOTPLUG_PCI_PCIE=m +CONFIG_PCIEAER=y +# CONFIG_PCIEASPM is not set +CONFIG_ARCH_SUPPORTS_MSI=y +CONFIG_PCI_MSI=y +CONFIG_PCI_LEGACY=y +# CONFIG_PCI_DEBUG is not set +# CONFIG_PCI_STUB is not set +CONFIG_HT_IRQ=y +CONFIG_ISA_DMA_API=y +CONFIG_ISA=y +# CONFIG_EISA is not set +# CONFIG_MCA is not set +CONFIG_SCx200=m +CONFIG_SCx200HR_TIMER=m +# CONFIG_OLPC is not set +CONFIG_K8_NB=y +CONFIG_PCCARD=m +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=m +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_PD6729=m +CONFIG_I82092=m +CONFIG_I82365=m +CONFIG_TCIC=m +CONFIG_PCMCIA_PROBE=y +CONFIG_PCCARD_NONSTATIC=m +CONFIG_HOTPLUG_PCI=m +CONFIG_HOTPLUG_PCI_FAKE=m +CONFIG_HOTPLUG_PCI_COMPAQ=m +CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=y +CONFIG_HOTPLUG_PCI_IBM=m +CONFIG_HOTPLUG_PCI_ACPI=m +CONFIG_HOTPLUG_PCI_ACPI_IBM=m +CONFIG_HOTPLUG_PCI_CPCI=y +CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m +CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m +CONFIG_HOTPLUG_PCI_SHPC=m + +# +# Executable file formats / Emulations +# +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y +CONFIG_BINFMT_AOUT=m +CONFIG_BINFMT_MISC=m +CONFIG_HAVE_ATOMIC_IOMAP=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_COMPAT_NET_DEV_OPS=y +CONFIG_PACKET=m +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_USER=m +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_ASK_IP_FIB_HASH=y +# CONFIG_IP_FIB_TRIE is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE=y +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_LRO=m +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=m +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +# CONFIG_TCP_CONG_LP is not set +# CONFIG_TCP_CONG_VENO is not set +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +# CONFIG_DEFAULT_BIC is not set +# CONFIG_DEFAULT_CUBIC is not set +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +CONFIG_DEFAULT_RENO=y +CONFIG_DEFAULT_TCP_CONG="reno" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=m +CONFIG_IPV6_PRIVACY=y +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +# CONFIG_IPV6_MIP6 is not set +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=m +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_IPV6_MROUTE is not set +# CONFIG_NETLABEL is not set +CONFIG_NETWORK_SECMARK=y +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CT_ACCT=y +CONFIG_NF_CONNTRACK_MARK=y +# CONFIG_NF_CONNTRACK_SECMARK is not set +# CONFIG_NF_CONNTRACK_EVENTS is not set +CONFIG_NF_CT_PROTO_DCCP=m +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NETFILTER_TPROXY=m +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_TPROXY=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m +CONFIG_NETFILTER_XT_TARGET_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_SOCKET=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_VS=m +# CONFIG_IP_VS_IPV6 is not set +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_AH_ESP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_SECURITY=m +# CONFIG_IP_NF_ARPTABLES is not set + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_RAW=m +CONFIG_IP6_NF_SECURITY=m + +# +# DECnet: Netfilter Configuration +# +CONFIG_DECNET_NF_GRABULATOR=m +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_IP6=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_ULOG=m +CONFIG_BRIDGE_EBT_NFLOG=m +# CONFIG_IP_DCCP is not set +CONFIG_IP_SCTP=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_HMAC_NONE is not set +# CONFIG_SCTP_HMAC_SHA1 is not set +CONFIG_SCTP_HMAC_MD5=y +# CONFIG_TIPC is not set +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +CONFIG_ATM_CLIP_NO_ICMP=y +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_STP=m +CONFIG_BRIDGE=m +# CONFIG_NET_DSA is not set +CONFIG_VLAN_8021Q=m +# CONFIG_VLAN_8021Q_GVRP is not set +CONFIG_DECNET=m +CONFIG_DECNET_ROUTER=y +CONFIG_LLC=y +CONFIG_LLC2=m +CONFIG_IPX=m +# CONFIG_IPX_INTERN is not set +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_LTPC=m +CONFIG_COPS=m +CONFIG_COPS_DAYNA=y +CONFIG_COPS_TANGENT=y +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +CONFIG_IPDDP_DECAP=y +CONFIG_X25=m +CONFIG_LAPB=m +CONFIG_ECONET=m +# CONFIG_ECONET_AUNUDP is not set +# CONFIG_ECONET_NATIVE is not set +CONFIG_WAN_ROUTER=m +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_INGRESS=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_ROUTE=y +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +CONFIG_CLS_U32_PERF=y +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +# CONFIG_NET_EMATCH is not set +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +CONFIG_NET_ACT_SIMP=m +CONFIG_NET_ACT_SKBEDIT=m +# CONFIG_NET_CLS_IND is not set +CONFIG_NET_SCH_FIFO=y +# CONFIG_DCB is not set + +# +# Network testing +# +CONFIG_NET_PKTGEN=m +CONFIG_HAMRADIO=y + +# +# Packet Radio protocols +# +CONFIG_AX25=m +CONFIG_AX25_DAMA_SLAVE=y +CONFIG_NETROM=m +CONFIG_ROSE=m + +# +# AX.25 network device drivers +# +CONFIG_MKISS=m +CONFIG_6PACK=m +CONFIG_BPQETHER=m +CONFIG_SCC=m +CONFIG_SCC_DELAY=y +CONFIG_SCC_TRXECHO=y +CONFIG_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_BAYCOM_PAR=m +CONFIG_BAYCOM_EPP=m +CONFIG_YAM=m +# CONFIG_CAN is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +# CONFIG_IRDA_FAST_RR is not set +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +# CONFIG_TOIM3232_DONGLE is not set +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +CONFIG_ACT200L_DONGLE=m +CONFIG_KINGSUN_DONGLE=m +# CONFIG_KSDAZZLE_DONGLE is not set +# CONFIG_KS959_DONGLE is not set + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_NSC_FIR=m +CONFIG_WINBOND_FIR=m +CONFIG_TOSHIBA_FIR=m +CONFIG_SMC_IRCC_FIR=m +CONFIG_ALI_FIR=m +CONFIG_VLSI_FIR=m +CONFIG_VIA_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +CONFIG_BT_HCIVHCI=m +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_DEBUG is not set +CONFIG_RXKAD=m +CONFIG_PHONET=m +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_CFG80211=m +# CONFIG_CFG80211_REG_DEBUG is not set +CONFIG_NL80211=y +CONFIG_WIRELESS_OLD_REGULATORY=y +CONFIG_WIRELESS_EXT=y +CONFIG_WIRELESS_EXT_SYSFS=y +CONFIG_LIB80211=m +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m + +# +# Rate control algorithm selection +# +CONFIG_MAC80211_RC_MINSTREL=y +# CONFIG_MAC80211_RC_DEFAULT_PID is not set +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel" +# CONFIG_MAC80211_MESH is not set +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_RFKILL=m +CONFIG_RFKILL_INPUT=m +CONFIG_RFKILL_LEDS=y +CONFIG_NET_9P=m +# CONFIG_NET_9P_VIRTIO is not set +CONFIG_NET_9P_RDMA=m +# CONFIG_NET_9P_DEBUG is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_STANDALONE is not set +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +CONFIG_CONNECTOR=m +CONFIG_MTD=m +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_CONCAT=m +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_TESTS=m +CONFIG_MTD_REDBOOT_PARTS=m +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_AR7_PARTS=m + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_HAVE_MTD_OTP=y +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +# CONFIG_MTD_BLOCK_RO is not set +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +CONFIG_MTD_OOPS=m + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=m +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_NOSWAP=y +# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_GEOMETRY is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_OTP is not set +CONFIG_MTD_CFI_INTELEXT=m +CONFIG_MTD_CFI_AMDSTD=m +CONFIG_MTD_CFI_STAA=m +CONFIG_MTD_CFI_UTIL=m +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +CONFIG_MTD_ABSENT=m + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_PHYSMAP=m +# CONFIG_MTD_PHYSMAP_COMPAT is not set +CONFIG_MTD_SC520CDP=m +CONFIG_MTD_NETSC520=m +CONFIG_MTD_TS5500=m +CONFIG_MTD_SBC_GXX=m +CONFIG_MTD_SCx200_DOCFLASH=m +CONFIG_MTD_AMD76XROM=m +CONFIG_MTD_ICHXROM=m +CONFIG_MTD_ESB2ROM=m +CONFIG_MTD_CK804XROM=m +CONFIG_MTD_SCB2_FLASH=m +CONFIG_MTD_NETtel=m +CONFIG_MTD_DILNETPC=m +CONFIG_MTD_DILNETPC_BOOTSIZE=0x80000 +CONFIG_MTD_L440GX=m +CONFIG_MTD_PCI=m +CONFIG_MTD_INTEL_VR_NOR=m +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_PMC551=m +CONFIG_MTD_PMC551_BUGFIX=y +# CONFIG_MTD_PMC551_DEBUG is not set +CONFIG_MTD_DATAFLASH=m +# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set +CONFIG_MTD_DATAFLASH_OTP=y +CONFIG_MTD_M25P80=m +CONFIG_M25PXX_USE_FAST_READ=y +CONFIG_MTD_SLRAM=m +CONFIG_MTD_PHRAM=m +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 +CONFIG_MTD_BLOCK2MTD=m + +# +# Disk-On-Chip Device Drivers +# +CONFIG_MTD_DOC2000=m +CONFIG_MTD_DOC2001=m +CONFIG_MTD_DOC2001PLUS=m +CONFIG_MTD_DOCPROBE=m +CONFIG_MTD_DOCECC=m +CONFIG_MTD_DOCPROBE_ADVANCED=y +CONFIG_MTD_DOCPROBE_ADDRESS=0x0000 +CONFIG_MTD_DOCPROBE_HIGH=y +CONFIG_MTD_DOCPROBE_55AA=y +CONFIG_MTD_NAND=m +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +CONFIG_MTD_NAND_IDS=m +CONFIG_MTD_NAND_DISKONCHIP=m +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y +CONFIG_MTD_NAND_CAFE=m +# CONFIG_MTD_NAND_CS553X is not set +CONFIG_MTD_NAND_NANDSIM=m +CONFIG_MTD_NAND_PLATFORM=m +CONFIG_MTD_ALAUDA=m +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +CONFIG_MTD_LPDDR=m +CONFIG_MTD_QINFO_PROBE=m + +# +# UBI - Unsorted block images +# +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set + +# +# UBI debugging options +# +# CONFIG_MTD_UBI_DEBUG is not set +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +CONFIG_PARPORT_PC_FIFO=y +CONFIG_PARPORT_PC_SUPERIO=y +CONFIG_PARPORT_PC_PCMCIA=m +# CONFIG_PARPORT_GSC is not set +# CONFIG_PARPORT_AX88796 is not set +CONFIG_PARPORT_1284=y +CONFIG_PARPORT_NOT_PC=y +CONFIG_PNP=y +CONFIG_PNP_DEBUG_MESSAGES=y + +# +# Protocols +# +CONFIG_ISAPNP=y +# CONFIG_PNPBIOS is not set +CONFIG_PNPACPI=y +CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_FD=y +CONFIG_BLK_DEV_XD=m +CONFIG_PARIDE=m + +# +# Parallel IDE high-level drivers +# +CONFIG_PARIDE_PD=m +CONFIG_PARIDE_PCD=m +CONFIG_PARIDE_PF=m +CONFIG_PARIDE_PT=m +CONFIG_PARIDE_PG=m + +# +# Parallel IDE protocol modules +# +CONFIG_PARIDE_ATEN=m +CONFIG_PARIDE_BPCK=m +CONFIG_PARIDE_BPCK6=m +CONFIG_PARIDE_COMM=m +CONFIG_PARIDE_DSTR=m +CONFIG_PARIDE_FIT2=m +CONFIG_PARIDE_FIT3=m +CONFIG_PARIDE_EPAT=m +CONFIG_PARIDE_EPATC8=y +CONFIG_PARIDE_EPIA=m +CONFIG_PARIDE_FRIQ=m +CONFIG_PARIDE_FRPW=m +CONFIG_PARIDE_KBIC=m +CONFIG_PARIDE_KTTI=m +CONFIG_PARIDE_ON20=m +CONFIG_PARIDE_ON26=m +CONFIG_BLK_CPQ_DA=m +CONFIG_BLK_CPQ_CISS_DA=m +CONFIG_CISS_SCSI_TAPE=y +CONFIG_BLK_DEV_DAC960=m +CONFIG_BLK_DEV_UMEM=m +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_SX8=m +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=64000 +# CONFIG_BLK_DEV_XIP is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +CONFIG_CDROM_PKTCDVD_WCACHE=y +CONFIG_ATA_OVER_ETH=m +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_VIRTIO_BLK=m +# CONFIG_BLK_DEV_HD is not set +CONFIG_MISC_DEVICES=y +CONFIG_IBM_ASM=m +CONFIG_PHANTOM=m +# CONFIG_SGI_IOC4 is not set +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m +CONFIG_ICS932S401=m +CONFIG_ENCLOSURE_SERVICES=m +CONFIG_HP_ILO=m +CONFIG_DELL_LAPTOP=m +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +CONFIG_EEPROM_AT25=m +CONFIG_EEPROM_LEGACY=m +CONFIG_EEPROM_93CX6=m +CONFIG_HAVE_IDE=y +CONFIG_IDE=m + +# +# Please see Documentation/ide/ide.txt for help/info on IDE drives +# +CONFIG_IDE_TIMINGS=y +CONFIG_IDE_ATAPI=y +CONFIG_IDE_LEGACY=y +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_IDE_GD=m +CONFIG_IDE_GD_ATA=y +CONFIG_IDE_GD_ATAPI=y +CONFIG_BLK_DEV_IDECS=m +CONFIG_BLK_DEV_DELKIN=m +CONFIG_BLK_DEV_IDECD=m +CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y +CONFIG_BLK_DEV_IDETAPE=m +CONFIG_BLK_DEV_IDEACPI=y +# CONFIG_IDE_TASK_IOCTL is not set +CONFIG_IDE_PROC_FS=y + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=m +CONFIG_BLK_DEV_PLATFORM=m +CONFIG_BLK_DEV_CMD640=m +CONFIG_BLK_DEV_CMD640_ENHANCED=y +CONFIG_BLK_DEV_IDEPNP=m +CONFIG_BLK_DEV_IDEDMA_SFF=y + +# +# PCI IDE chipsets support +# +CONFIG_BLK_DEV_IDEPCI=y +CONFIG_BLK_DEV_OFFBOARD=y +CONFIG_BLK_DEV_GENERIC=m +CONFIG_BLK_DEV_OPTI621=m +CONFIG_BLK_DEV_RZ1000=m +CONFIG_BLK_DEV_IDEDMA_PCI=y +CONFIG_BLK_DEV_AEC62XX=m +CONFIG_BLK_DEV_ALI15X3=m +CONFIG_BLK_DEV_AMD74XX=m +CONFIG_BLK_DEV_ATIIXP=m +CONFIG_BLK_DEV_CMD64X=m +CONFIG_BLK_DEV_TRIFLEX=m +CONFIG_BLK_DEV_CS5520=m +CONFIG_BLK_DEV_CS5530=m +CONFIG_BLK_DEV_CS5535=m +CONFIG_BLK_DEV_CS5536=m +CONFIG_BLK_DEV_HPT366=m +CONFIG_BLK_DEV_JMICRON=m +CONFIG_BLK_DEV_SC1200=m +CONFIG_BLK_DEV_PIIX=m +CONFIG_BLK_DEV_IT8172=m +CONFIG_BLK_DEV_IT8213=m +CONFIG_BLK_DEV_IT821X=m +CONFIG_BLK_DEV_NS87415=m +CONFIG_BLK_DEV_PDC202XX_OLD=m +CONFIG_BLK_DEV_PDC202XX_NEW=m +CONFIG_BLK_DEV_SVWKS=m +CONFIG_BLK_DEV_SIIMAGE=m +CONFIG_BLK_DEV_SIS5513=m +CONFIG_BLK_DEV_SLC90E66=m +CONFIG_BLK_DEV_TRM290=m +CONFIG_BLK_DEV_VIA82CXXX=m +CONFIG_BLK_DEV_TC86C001=m + +# +# Other IDE chipsets support +# + +# +# Note: most of these also require special kernel boot parameters +# +CONFIG_BLK_DEV_4DRIVES=m +CONFIG_BLK_DEV_ALI14XX=m +CONFIG_BLK_DEV_DTC2278=m +CONFIG_BLK_DEV_HT6560B=m +CONFIG_BLK_DEV_QD65XX=m +CONFIG_BLK_DEV_UMC8672=m +CONFIG_BLK_DEV_IDEDMA=y + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +CONFIG_SCSI_TGT=m +CONFIG_SCSI_NETLINK=y +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=m +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_ENCLOSURE=m + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +CONFIG_SCSI_MULTI_LUN=y +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SCSI_FC_ATTRS=m +# CONFIG_SCSI_FC_TGT_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +# CONFIG_SCSI_SAS_ATA is not set +CONFIG_SCSI_SAS_HOST_SMP=y +# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set +# CONFIG_SCSI_SRP_ATTRS is not set +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_7000FASST=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AHA152X=m +CONFIG_SCSI_AHA1542=m +CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_AIC7XXX=m +CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 +CONFIG_AIC7XXX_RESET_DELAY_MS=5000 +# CONFIG_AIC7XXX_DEBUG_ENABLE is not set +CONFIG_AIC7XXX_DEBUG_MASK=0 +CONFIG_AIC7XXX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC7XXX_OLD=m +CONFIG_SCSI_AIC79XX=m +CONFIG_AIC79XX_CMDS_PER_DEVICE=32 +CONFIG_AIC79XX_RESET_DELAY_MS=15000 +# CONFIG_AIC79XX_DEBUG_ENABLE is not set +CONFIG_AIC79XX_DEBUG_MASK=0 +CONFIG_AIC79XX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC94XX=m +# CONFIG_AIC94XX_DEBUG is not set +CONFIG_SCSI_DPT_I2O=m +CONFIG_SCSI_ADVANSYS=m +CONFIG_SCSI_IN2000=m +CONFIG_SCSI_ARCMSR=m +# CONFIG_SCSI_ARCMSR_AER is not set +CONFIG_MEGARAID_NEWGEN=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=m +# CONFIG_SCSI_FLASHPOINT is not set +CONFIG_LIBFC=m +CONFIG_FCOE=m +CONFIG_SCSI_DMX3191D=m +CONFIG_SCSI_DTC3280=m +CONFIG_SCSI_EATA=m +CONFIG_SCSI_EATA_TAGGED_QUEUE=y +CONFIG_SCSI_EATA_LINKED_COMMANDS=y +CONFIG_SCSI_EATA_MAX_TAGS=16 +CONFIG_SCSI_FUTURE_DOMAIN=m +CONFIG_SCSI_GDTH=m +CONFIG_SCSI_GENERIC_NCR5380=m +CONFIG_SCSI_GENERIC_NCR5380_MMIO=m +CONFIG_SCSI_GENERIC_NCR53C400=y +CONFIG_SCSI_IPS=m +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m +CONFIG_SCSI_PPA=m +CONFIG_SCSI_IMM=m +# CONFIG_SCSI_IZIP_EPP16 is not set +# CONFIG_SCSI_IZIP_SLOW_CTR is not set +CONFIG_SCSI_MVSAS=m +CONFIG_SCSI_NCR53C406A=m +CONFIG_SCSI_STEX=m +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +CONFIG_SCSI_IPR=m +# CONFIG_SCSI_IPR_TRACE is not set +# CONFIG_SCSI_IPR_DUMP is not set +CONFIG_SCSI_PAS16=m +CONFIG_SCSI_QLOGIC_FAS=m +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_SCSI_QLA_ISCSI=m +CONFIG_SCSI_LPFC=m +# CONFIG_SCSI_LPFC_DEBUG_FS is not set +CONFIG_SCSI_SYM53C416=m +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_DC390T=m +CONFIG_SCSI_T128=m +CONFIG_SCSI_U14_34F=m +CONFIG_SCSI_U14_34F_TAGGED_QUEUE=y +CONFIG_SCSI_U14_34F_LINKED_COMMANDS=y +CONFIG_SCSI_U14_34F_MAX_TAGS=8 +CONFIG_SCSI_ULTRASTOR=m +CONFIG_SCSI_NSP32=m +CONFIG_SCSI_DEBUG=m +CONFIG_SCSI_SRP=m +CONFIG_SCSI_LOWLEVEL_PCMCIA=y +CONFIG_PCMCIA_AHA152X=m +CONFIG_PCMCIA_FDOMAIN=m +CONFIG_PCMCIA_NINJA_SCSI=m +CONFIG_PCMCIA_QLOGIC=m +CONFIG_PCMCIA_SYM53C500=m +CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m +CONFIG_ATA=m +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_ACPI=y +CONFIG_SATA_PMP=y +CONFIG_SATA_AHCI=m +CONFIG_SATA_SIL24=m +CONFIG_ATA_SFF=y +CONFIG_SATA_SVW=m +CONFIG_ATA_PIIX=m +# CONFIG_SATA_MV is not set +CONFIG_SATA_NV=m +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_PROMISE=m +CONFIG_SATA_SX4=m +CONFIG_SATA_SIL=m +CONFIG_SATA_SIS=m +CONFIG_SATA_ULI=m +CONFIG_SATA_VIA=m +CONFIG_SATA_VITESSE=m +CONFIG_SATA_INIC162X=m +CONFIG_PATA_ACPI=m +CONFIG_PATA_ALI=m +CONFIG_PATA_AMD=m +CONFIG_PATA_ARTOP=m +CONFIG_PATA_ATIIXP=m +# CONFIG_PATA_CMD640_PCI is not set +# CONFIG_PATA_CMD64X is not set +CONFIG_PATA_CS5520=m +CONFIG_PATA_CS5530=m +CONFIG_PATA_CS5535=m +CONFIG_PATA_CS5536=m +# CONFIG_PATA_CYPRESS is not set +CONFIG_PATA_EFAR=m +CONFIG_ATA_GENERIC=m +CONFIG_PATA_HPT366=m +CONFIG_PATA_HPT37X=m +CONFIG_PATA_HPT3X2N=m +CONFIG_PATA_HPT3X3=m +# CONFIG_PATA_HPT3X3_DMA is not set +# CONFIG_PATA_ISAPNP is not set +CONFIG_PATA_IT821X=m +CONFIG_PATA_IT8213=m +CONFIG_PATA_JMICRON=m +# CONFIG_PATA_LEGACY is not set +CONFIG_PATA_TRIFLEX=m +CONFIG_PATA_MARVELL=m +CONFIG_PATA_MPIIX=m +CONFIG_PATA_OLDPIIX=m +CONFIG_PATA_NETCELL=m +CONFIG_PATA_NINJA32=m +CONFIG_PATA_NS87410=m +CONFIG_PATA_NS87415=m +# CONFIG_PATA_OPTI is not set +# CONFIG_PATA_OPTIDMA is not set +CONFIG_PATA_PCMCIA=m +# CONFIG_PATA_PDC_OLD is not set +CONFIG_PATA_QDI=m +# CONFIG_PATA_RADISYS is not set +CONFIG_PATA_RZ1000=m +CONFIG_PATA_SC1200=m +CONFIG_PATA_SERVERWORKS=m +CONFIG_PATA_PDC2027X=m +CONFIG_PATA_SIL680=m +CONFIG_PATA_SIS=m +CONFIG_PATA_VIA=m +CONFIG_PATA_WINBOND=m +CONFIG_PATA_WINBOND_VLB=m +CONFIG_PATA_SCH=m +CONFIG_MD=y +CONFIG_BLK_DEV_MD=y +CONFIG_MD_AUTODETECT=y +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +# CONFIG_MD_RAID5_RESHAPE is not set +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_MIRROR=m +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +# CONFIG_DM_DELAY is not set +CONFIG_DM_UEVENT=y +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m +CONFIG_FUSION_MAX_SGE=128 +CONFIG_FUSION_CTL=m +CONFIG_FUSION_LAN=m +# CONFIG_FUSION_LOGGING is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# Enable only one of the two stacks, unless you know what you are doing +# +# CONFIG_FIREWIRE is not set +CONFIG_IEEE1394=m +CONFIG_IEEE1394_OHCI1394=m +CONFIG_IEEE1394_PCILYNX=m +CONFIG_IEEE1394_SBP2=m +# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set +CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y +CONFIG_IEEE1394_ETH1394=m +CONFIG_IEEE1394_RAWIO=m +CONFIG_IEEE1394_VIDEO1394=m +CONFIG_IEEE1394_DV1394=m +# CONFIG_IEEE1394_VERBOSEDEBUG is not set +CONFIG_I2O=m +CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y +CONFIG_I2O_EXT_ADAPTEC=y +CONFIG_I2O_EXT_ADAPTEC_DMA64=y +CONFIG_I2O_CONFIG=m +CONFIG_I2O_CONFIG_OLD_IOCTL=y +CONFIG_I2O_BUS=m +CONFIG_I2O_BLOCK=m +CONFIG_I2O_SCSI=m +CONFIG_I2O_PROC=m +CONFIG_MACINTOSH_DRIVERS=y +CONFIG_MAC_EMUMOUSEBTN=y +CONFIG_NETDEVICES=y +# CONFIG_IFB is not set +CONFIG_DUMMY=m +CONFIG_BONDING=m +# CONFIG_MACVLAN is not set +CONFIG_EQUALIZER=m +CONFIG_TUN=m +CONFIG_VETH=m +CONFIG_NET_SB1000=m +CONFIG_ARCNET=m +CONFIG_ARCNET_1201=m +CONFIG_ARCNET_1051=m +CONFIG_ARCNET_RAW=m +CONFIG_ARCNET_CAP=m +CONFIG_ARCNET_COM90xx=m +CONFIG_ARCNET_COM90xxIO=m +CONFIG_ARCNET_RIM_I=m +# CONFIG_ARCNET_COM20020 is not set +CONFIG_PHYLIB=m + +# +# MII PHY device drivers +# +CONFIG_MARVELL_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_LXT_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_VITESSE_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_BROADCOM_PHY=m +CONFIG_ICPLUS_PHY=m +CONFIG_REALTEK_PHY=m +CONFIG_NATIONAL_PHY=m +CONFIG_STE10XP=m +CONFIG_LSI_ET1011C_PHY=m +# CONFIG_MDIO_BITBANG is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=m +CONFIG_HAPPYMEAL=m +CONFIG_SUNGEM=m +CONFIG_CASSINI=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_EL1=m +CONFIG_EL2=m +CONFIG_ELPLUS=m +CONFIG_EL16=m +CONFIG_EL3=m +CONFIG_3C515=m +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_LANCE=m +CONFIG_NET_VENDOR_SMC=y +CONFIG_WD80x3=m +CONFIG_ULTRA=m +CONFIG_SMC9194=m +CONFIG_ENC28J60=m +# CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_NET_VENDOR_RACAL=y +CONFIG_NI52=m +CONFIG_NI65=m +CONFIG_DNET=m +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +# CONFIG_TULIP_MMIO is not set +CONFIG_TULIP_NAPI=y +CONFIG_TULIP_NAPI_HW_MITIGATION=y +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +CONFIG_PCMCIA_XIRCOM=m +CONFIG_AT1700=m +CONFIG_DEPCA=m +CONFIG_HP100=m +CONFIG_NET_ISA=y +CONFIG_E2100=m +CONFIG_EWRK3=m +CONFIG_EEXPRESS=m +CONFIG_EEXPRESS_PRO=m +CONFIG_HPLAN_PLUS=m +CONFIG_HPLAN=m +CONFIG_LP486E=m +CONFIG_ETH16I=m +CONFIG_NE2000=m +CONFIG_ZNET=m +CONFIG_SEEQ8005=m +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +CONFIG_NET_PCI=y +CONFIG_PCNET32=m +CONFIG_AMD8111_ETH=m +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_AC3200=m +CONFIG_APRICOT=m +CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +CONFIG_FORCEDETH=m +# CONFIG_FORCEDETH_NAPI is not set +CONFIG_CS89x0=m +CONFIG_E100=m +CONFIG_FEALNX=m +CONFIG_NATSEMI=m +CONFIG_NE2K_PCI=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +# CONFIG_8139TOO_PIO is not set +# CONFIG_8139TOO_TUNE_TWISTER is not set +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_R6040=m +CONFIG_SIS900=m +CONFIG_EPIC100=m +CONFIG_SMSC9420=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_TLAN=m +CONFIG_VIA_RHINE=m +# CONFIG_VIA_RHINE_MMIO is not set +CONFIG_SC92031=m +CONFIG_NET_POCKET=y +CONFIG_ATP=m +CONFIG_DE600=m +CONFIG_DE620=m +CONFIG_ATL2=m +CONFIG_NETDEV_1000=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_DL2K=m +CONFIG_E1000=m +CONFIG_E1000E=m +CONFIG_IP1000=m +CONFIG_IGB=m +# CONFIG_IGB_LRO is not set +CONFIG_NS83820=m +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_R8169=m +CONFIG_R8169_VLAN=y +CONFIG_SIS190=m +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +# CONFIG_SKY2 is not set +CONFIG_VIA_VELOCITY=m +CONFIG_TIGON3=m +CONFIG_BNX2=m +CONFIG_QLA3XXX=m +CONFIG_ATL1=m +CONFIG_ATL1E=m +CONFIG_ATL1C=m +CONFIG_JME=m +CONFIG_NETDEV_10000=y +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T3_DEPENDS=y +CONFIG_CHELSIO_T3=m +CONFIG_ENIC=m +CONFIG_IXGBE=m +CONFIG_IXGB=m +CONFIG_S2IO=m +CONFIG_MYRI10GE=m +CONFIG_NETXEN_NIC=m +CONFIG_NIU=m +CONFIG_MLX4_EN=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_TEHUTI=m +CONFIG_BNX2X=m +CONFIG_QLGE=m +CONFIG_SFC=m +CONFIG_SFC_MTD=y +CONFIG_BE2NET=m +CONFIG_TR=y +CONFIG_IBMTR=m +CONFIG_IBMOL=m +CONFIG_IBMLS=m +CONFIG_3C359=m +CONFIG_TMS380TR=m +CONFIG_TMSPCI=m +CONFIG_SKISA=m +CONFIG_PROTEON=m +CONFIG_ABYSS=m +CONFIG_SMCTR=m + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +CONFIG_WLAN_80211=y +CONFIG_PCMCIA_RAYCS=m +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_CS=m +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_LIBERTAS_THINFIRM=m +CONFIG_LIBERTAS_THINFIRM_USB=m +CONFIG_AIRO=m +CONFIG_HERMES=m +CONFIG_HERMES_CACHE_FW_ON_INIT=y +CONFIG_PLX_HERMES=m +CONFIG_TMD_HERMES=m +CONFIG_NORTEL_HERMES=m +CONFIG_PCI_HERMES=m +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m +CONFIG_PCMCIA_ATMEL=m +CONFIG_AIRO_CS=m +CONFIG_PCMCIA_WL3501=m +CONFIG_PRISM54=m +CONFIG_USB_ZD1201=m +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_ADM8211=m +# CONFIG_MAC80211_HWSIM is not set +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_ATH5K=m +# CONFIG_ATH5K_DEBUG is not set +CONFIG_ATH9K=m +# CONFIG_ATH9K_DEBUG is not set +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBIPW=m +# CONFIG_LIBIPW_DEBUG is not set +CONFIG_IWLWIFI=m +CONFIG_IWLCORE=m +CONFIG_IWLWIFI_LEDS=y +CONFIG_IWLWIFI_RFKILL=y +# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLAGN=m +# CONFIG_IWLAGN_SPECTRUM_MEASUREMENT is not set +CONFIG_IWLAGN_LEDS=y +CONFIG_IWL4965=y +CONFIG_IWL5000=y +CONFIG_IWL3945=m +CONFIG_IWL3945_RFKILL=y +# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set +CONFIG_IWL3945_LEDS=y +# CONFIG_IWL3945_DEBUG is not set +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +CONFIG_HOSTAP_FIRMWARE_NVRAM=y +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +CONFIG_HOSTAP_CS=m +CONFIG_B43=m +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +CONFIG_B43_PCMCIA=y +CONFIG_B43_PIO=y +CONFIG_B43_LEDS=y +CONFIG_B43_RFKILL=y +# CONFIG_B43_DEBUG is not set +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_LEDS=y +CONFIG_B43LEGACY_RFKILL=y +CONFIG_B43LEGACY_DEBUG=y +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_RT2X00=m +CONFIG_RT2400PCI=m +CONFIG_RT2500PCI=m +CONFIG_RT61PCI=m +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_RFKILL=y +CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set + +# +# WiMAX Wireless Broadband devices +# +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_SDIO=m +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SMSC95XX=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +# CONFIG_USB_EPSON2888 is not set +# CONFIG_USB_KC2190 is not set +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_HSO=m +CONFIG_NET_PCMCIA=y +CONFIG_PCMCIA_3C589=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_PCMCIA_PCNET=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_PCMCIA_XIRC2PS=m +CONFIG_PCMCIA_AXNET=m +CONFIG_PCMCIA_IBMTR=m +CONFIG_WAN=y +CONFIG_HOSTESS_SV11=m +# CONFIG_COSA is not set +CONFIG_LANMEDIA=m +CONFIG_SEALEVEL_4021=m +CONFIG_HDLC=m +CONFIG_HDLC_RAW=m +CONFIG_HDLC_RAW_ETH=m +CONFIG_HDLC_CISCO=m +CONFIG_HDLC_FR=m +CONFIG_HDLC_PPP=m +CONFIG_HDLC_X25=m +CONFIG_PCI200SYN=m +CONFIG_WANXL=m +# CONFIG_PC300TOO is not set +CONFIG_N2=m +CONFIG_C101=m +CONFIG_FARSYNC=m +# CONFIG_DSCC4 is not set +CONFIG_DLCI=m +CONFIG_DLCI_MAX=8 +CONFIG_SDLA=m +# CONFIG_WAN_ROUTER_DRIVERS is not set +CONFIG_LAPBETHER=m +CONFIG_X25_ASY=m +# CONFIG_SBNI is not set +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +CONFIG_ATM_TCP=m +CONFIG_ATM_LANAI=m +CONFIG_ATM_ENI=m +# CONFIG_ATM_ENI_DEBUG is not set +# CONFIG_ATM_ENI_TUNE_BURST is not set +CONFIG_ATM_FIRESTREAM=m +CONFIG_ATM_ZATM=m +# CONFIG_ATM_ZATM_DEBUG is not set +CONFIG_ATM_NICSTAR=m +CONFIG_ATM_NICSTAR_USE_SUNI=y +CONFIG_ATM_NICSTAR_USE_IDT77105=y +CONFIG_ATM_IDT77252=m +# CONFIG_ATM_IDT77252_DEBUG is not set +CONFIG_ATM_IDT77252_RCV_ALL=y +CONFIG_ATM_IDT77252_USE_SUNI=y +# CONFIG_ATM_AMBASSADOR is not set +CONFIG_ATM_HORIZON=m +# CONFIG_ATM_HORIZON_DEBUG is not set +CONFIG_ATM_IA=m +# CONFIG_ATM_IA_DEBUG is not set +CONFIG_ATM_FORE200E=m +CONFIG_ATM_FORE200E_USE_TASKLET=y +CONFIG_ATM_FORE200E_TX_RETRY=16 +CONFIG_ATM_FORE200E_DEBUG=0 +CONFIG_ATM_HE=m +CONFIG_ATM_HE_USE_SUNI=y +CONFIG_ATM_SOLOS=m +CONFIG_XEN_NETDEV_FRONTEND=m +CONFIG_FDDI=y +CONFIG_DEFXX=m +# CONFIG_DEFXX_MMIO is not set +CONFIG_SKFP=m +CONFIG_HIPPI=y +CONFIG_ROADRUNNER=m +CONFIG_ROADRUNNER_LARGE_RINGS=y +CONFIG_PLIP=m +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +CONFIG_PPPOATM=m +# CONFIG_PPPOL2TP is not set +CONFIG_SLIP=m +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLHC=m +CONFIG_SLIP_SMART=y +CONFIG_SLIP_MODE_SLIP6=y +CONFIG_NET_FC=y +CONFIG_NETCONSOLE=m +# CONFIG_NETCONSOLE_DYNAMIC is not set +CONFIG_NETPOLL=y +CONFIG_NETPOLL_TRAP=y +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_VIRTIO_NET=m +# CONFIG_ISDN is not set +CONFIG_PHONE=m +CONFIG_PHONE_IXJ=m +CONFIG_PHONE_IXJ_PCMCIA=m + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=m +CONFIG_INPUT_POLLDEV=m + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set +CONFIG_XEN_KBDDEV_FRONTEND=m + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_SUNKBD=m +# CONFIG_KEYBOARD_LKKBD is not set +CONFIG_KEYBOARD_XTKBD=m +CONFIG_KEYBOARD_NEWTON=m +CONFIG_KEYBOARD_STOWAWAY=m +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +CONFIG_MOUSE_PS2_ELANTECH=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_SERIAL=m +CONFIG_MOUSE_APPLETOUCH=m +CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_INPORT=m +CONFIG_MOUSE_ATIXL=y +CONFIG_MOUSE_LOGIBM=m +CONFIG_MOUSE_PC110PAD=m +# CONFIG_MOUSE_VSXXXAA is not set +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_ANALOG=m +CONFIG_JOYSTICK_A3D=m +CONFIG_JOYSTICK_ADI=m +CONFIG_JOYSTICK_COBRA=m +CONFIG_JOYSTICK_GF2K=m +CONFIG_JOYSTICK_GRIP=m +CONFIG_JOYSTICK_GRIP_MP=m +CONFIG_JOYSTICK_GUILLEMOT=m +CONFIG_JOYSTICK_INTERACT=m +CONFIG_JOYSTICK_SIDEWINDER=m +CONFIG_JOYSTICK_TMDC=m +CONFIG_JOYSTICK_IFORCE=m +CONFIG_JOYSTICK_IFORCE_USB=y +CONFIG_JOYSTICK_IFORCE_232=y +CONFIG_JOYSTICK_WARRIOR=m +CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_SPACEORB=m +CONFIG_JOYSTICK_SPACEBALL=m +CONFIG_JOYSTICK_STINGER=m +CONFIG_JOYSTICK_TWIDJOY=m +# CONFIG_JOYSTICK_ZHENHUA is not set +CONFIG_JOYSTICK_DB9=m +CONFIG_JOYSTICK_GAMECON=m +CONFIG_JOYSTICK_TURBOGRAFX=m +CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y +CONFIG_JOYSTICK_WALKERA0701=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_WACOM=m +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_FUJITSU=m +CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_WACOM_W8001=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_INEXIO=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_HTCPEN=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_WM97XX=m +CONFIG_TOUCHSCREEN_WM9705=y +CONFIG_TOUCHSCREEN_WM9712=y +CONFIG_TOUCHSCREEN_WM9713=y +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_TOUCHSCREEN_TOUCHIT213=m +CONFIG_TOUCHSCREEN_TSC2007=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_PCSPKR=m +CONFIG_INPUT_APANEL=m +CONFIG_INPUT_WISTRON_BTNS=m +CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_ATI_REMOTE=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +CONFIG_INPUT_UINPUT=m +CONFIG_INPUT_PCF50633_PMU=m + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=m +CONFIG_SERIO_CT82C710=m +CONFIG_SERIO_PARKBD=m +CONFIG_SERIO_PCIPS2=m +CONFIG_SERIO_LIBPS2=y +CONFIG_SERIO_RAW=m +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_DEVKMEM=y +CONFIG_SERIAL_NONSTANDARD=y +# CONFIG_COMPUTONE is not set +CONFIG_ROCKETPORT=m +CONFIG_CYCLADES=m +# CONFIG_CYZ_INTR is not set +CONFIG_DIGIEPCA=m +# CONFIG_MOXA_INTELLIO is not set +CONFIG_MOXA_SMARTIO=m +# CONFIG_ISI is not set +CONFIG_SYNCLINK=m +CONFIG_SYNCLINKMP=m +CONFIG_SYNCLINK_GT=m +CONFIG_N_HDLC=m +CONFIG_RISCOM8=m +# CONFIG_SPECIALIX is not set +CONFIG_SX=m +CONFIG_RIO=m +CONFIG_RIO_OLDPCI=y +CONFIG_STALDRV=y +CONFIG_STALLION=m +CONFIG_ISTALLION=m +CONFIG_NOZOMI=m + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_PNP=y +CONFIG_SERIAL_8250_CS=m +CONFIG_SERIAL_8250_NR_UARTS=8 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_FOURPORT=m +CONFIG_SERIAL_8250_ACCENT=m +CONFIG_SERIAL_8250_BOCA=m +CONFIG_SERIAL_8250_EXAR_ST16C554=m +CONFIG_SERIAL_8250_HUB6=m +CONFIG_SERIAL_8250_SHARE_IRQ=y +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +CONFIG_SERIAL_8250_RSA=y + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_JSM=m +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +CONFIG_PRINTER=m +# CONFIG_LP_CONSOLE is not set +CONFIG_PPDEV=m +CONFIG_HVC_DRIVER=y +CONFIG_HVC_IRQ=y +CONFIG_HVC_XEN=y +CONFIG_VIRTIO_CONSOLE=m +CONFIG_IPMI_HANDLER=m +CONFIG_IPMI_PANIC_EVENT=y +CONFIG_IPMI_PANIC_STRING=y +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_IPMI_WATCHDOG=m +CONFIG_IPMI_POWEROFF=m +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_AMD=m +CONFIG_HW_RANDOM_GEODE=m +CONFIG_HW_RANDOM_VIA=m +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_NVRAM=m +CONFIG_DTLK=m +CONFIG_R3964=m +CONFIG_APPLICOM=m +CONFIG_SONYPI=m + +# +# PCMCIA character devices +# +CONFIG_SYNCLINK_CS=m +CONFIG_CARDMAN_4000=m +CONFIG_CARDMAN_4040=m +CONFIG_IPWIRELESS=m +CONFIG_MWAVE=m +CONFIG_SCx200_GPIO=m +CONFIG_PC8736x_GPIO=m +CONFIG_NSC_GPIO=m +CONFIG_CS5535_GPIO=m +CONFIG_RAW_DRIVER=m +CONFIG_MAX_RAW_DEVS=4096 +CONFIG_HPET=y +CONFIG_HPET_MMAP=y +CONFIG_HANGCHECK_TIMER=m +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TELCLOCK=m +CONFIG_DEVPORT=y +CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +CONFIG_I2C_ALI1535=m +CONFIG_I2C_ALI1563=m +CONFIG_I2C_ALI15X3=m +CONFIG_I2C_AMD756=m +CONFIG_I2C_AMD756_S4882=m +CONFIG_I2C_AMD8111=m +CONFIG_I2C_I801=m +CONFIG_I2C_ISCH=m +CONFIG_I2C_PIIX4=m +CONFIG_I2C_NFORCE2=m +CONFIG_I2C_NFORCE2_S4985=m +CONFIG_I2C_SIS5595=m +CONFIG_I2C_SIS630=m +CONFIG_I2C_SIS96X=m +CONFIG_I2C_VIA=m +CONFIG_I2C_VIAPRO=m + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_OCORES=m +CONFIG_I2C_SIMTEC=m + +# +# External I2C/SMBus adapter drivers +# +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_TAOS_EVM=m +CONFIG_I2C_TINY_USB=m + +# +# Graphics adapter I2C/DDC channel drivers +# +CONFIG_I2C_VOODOO3=m + +# +# Other I2C/SMBus bus drivers +# +CONFIG_I2C_PCA_ISA=m +CONFIG_I2C_PCA_PLATFORM=m +CONFIG_I2C_STUB=m +CONFIG_SCx200_I2C=m +CONFIG_SCx200_I2C_SCL=12 +CONFIG_SCx200_I2C_SDA=13 +CONFIG_SCx200_ACB=m + +# +# Miscellaneous I2C Chip support +# +CONFIG_DS1682=m +CONFIG_SENSORS_PCF8574=m +CONFIG_PCF8575=m +# CONFIG_SENSORS_PCA9539 is not set +CONFIG_SENSORS_PCF8591=m +CONFIG_SENSORS_MAX6875=m +CONFIG_SENSORS_TSL2550=m +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_BITBANG=m +# CONFIG_SPI_BUTTERFLY is not set +CONFIG_SPI_LM70_LLP=m + +# +# SPI Protocol Masters +# +CONFIG_SPI_SPIDEV=m +CONFIG_SPI_TLE62X0=m +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +# CONFIG_GPIOLIB is not set +CONFIG_W1=m +CONFIG_W1_CON=y + +# +# 1-wire Bus Masters +# +CONFIG_W1_MASTER_MATROX=m +CONFIG_W1_MASTER_DS2490=m +CONFIG_W1_MASTER_DS2482=m + +# +# 1-wire Slaves +# +CONFIG_W1_SLAVE_THERM=m +CONFIG_W1_SLAVE_SMEM=m +CONFIG_W1_SLAVE_DS2431=m +CONFIG_W1_SLAVE_DS2433=m +# CONFIG_W1_SLAVE_DS2433_CRC is not set +CONFIG_W1_SLAVE_DS2760=m +CONFIG_W1_SLAVE_BQ27000=m +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +# CONFIG_PDA_POWER is not set +CONFIG_WM8350_POWER=m +# CONFIG_BATTERY_DS2760 is not set +CONFIG_BATTERY_BQ27x00=m +CONFIG_CHARGER_PCF50633=m +CONFIG_HWMON=m +CONFIG_HWMON_VID=m +CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7414=m +CONFIG_SENSORS_AD7418=m +CONFIG_SENSORS_ADCXX=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7462=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7473=m +CONFIG_SENSORS_ADT7475=m +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m +CONFIG_SENSORS_FSCHER=m +CONFIG_SENSORS_FSCPOS=m +CONFIG_SENSORS_FSCHMD=m +CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IBMAEM=m +CONFIG_SENSORS_IBMPEX=m +CONFIG_SENSORS_IT87=m +CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM70=m +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +CONFIG_SENSORS_LM87=m +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_LTC4245=m +CONFIG_SENSORS_MAX1111=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_DME1737=m +CONFIG_SENSORS_SMSC47M1=m +CONFIG_SENSORS_SMSC47M192=m +CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_THMC50=m +CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m +CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m +CONFIG_SENSORS_W83627HF=m +CONFIG_SENSORS_W83627EHF=m +CONFIG_SENSORS_HDAPS=m +CONFIG_SENSORS_LIS3LV02D=m +CONFIG_SENSORS_APPLESMC=m +# CONFIG_HWMON_DEBUG_CHIP is not set +CONFIG_THERMAL=y +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_WM8350_WATCHDOG=m +CONFIG_ACQUIRE_WDT=m +CONFIG_ADVANTECH_WDT=m +CONFIG_ALIM1535_WDT=m +CONFIG_ALIM7101_WDT=m +CONFIG_SC520_WDT=m +CONFIG_EUROTECH_WDT=m +CONFIG_IB700_WDT=m +CONFIG_IBMASR=m +CONFIG_WAFER_WDT=m +CONFIG_I6300ESB_WDT=m +CONFIG_ITCO_WDT=m +CONFIG_ITCO_VENDOR_SUPPORT=y +CONFIG_IT8712F_WDT=m +CONFIG_IT87_WDT=m +CONFIG_HP_WATCHDOG=m +CONFIG_SC1200_WDT=m +CONFIG_SCx200_WDT=m +CONFIG_PC87413_WDT=m +CONFIG_60XX_WDT=m +CONFIG_SBC8360_WDT=m +CONFIG_SBC7240_WDT=m +CONFIG_CPU5_WDT=m +CONFIG_SMSC_SCH311X_WDT=m +CONFIG_SMSC37B787_WDT=m +CONFIG_W83627HF_WDT=m +CONFIG_W83697HF_WDT=m +CONFIG_W83697UG_WDT=m +CONFIG_W83877F_WDT=m +CONFIG_W83977F_WDT=m +CONFIG_MACHZ_WDT=m +CONFIG_SBC_EPX_C3_WATCHDOG=m + +# +# ISA-based Watchdog Cards +# +CONFIG_PCWATCHDOG=m +CONFIG_MIXCOMWD=m +CONFIG_WDT=m +CONFIG_WDT_501=y + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m +CONFIG_WDT_501_PCI=y + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +CONFIG_SSB=m +CONFIG_SSB_SPROM=y +CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_SSB_PCMCIAHOST_POSSIBLE=y +CONFIG_SSB_PCMCIAHOST=y +# CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y + +# +# Multifunction device drivers +# +CONFIG_MFD_CORE=m +CONFIG_MFD_SM501=m +CONFIG_HTC_PASIC3=m +# CONFIG_MFD_TMIO is not set +CONFIG_MFD_WM8400=m +CONFIG_MFD_WM8350=m +CONFIG_MFD_WM8350_I2C=m +CONFIG_MFD_PCF50633=m +CONFIG_PCF50633_ADC=m +CONFIG_PCF50633_GPIO=m +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +# CONFIG_REGULATOR_FIXED_VOLTAGE is not set +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +CONFIG_REGULATOR_BQ24022=m +CONFIG_REGULATOR_WM8350=m +CONFIG_REGULATOR_WM8400=m +CONFIG_REGULATOR_PCF50633=m + +# +# Multimedia devices +# + +# +# Multimedia core support +# +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L2_COMMON=m +CONFIG_VIDEO_ALLOW_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +CONFIG_DVB_CORE=m +CONFIG_VIDEO_MEDIA=m + +# +# Multimedia drivers +# +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_VIDEO_V4L2=m +CONFIG_VIDEO_V4L1=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_IR=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_TUNER=m +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +CONFIG_VIDEO_IR_I2C=m +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TDA9875=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_M52790=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA7111=m +CONFIG_VIDEO_SAA7114=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_VPX3220=m +CONFIG_VIDEO_CX25840=m +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m +CONFIG_VIDEO_VIVI=m +CONFIG_VIDEO_BT848=m +CONFIG_VIDEO_BT848_DVB=y +CONFIG_VIDEO_SAA6588=m +CONFIG_VIDEO_PMS=m +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_W9966=m +CONFIG_VIDEO_CPIA=m +CONFIG_VIDEO_CPIA_PP=m +CONFIG_VIDEO_CPIA_USB=m +# CONFIG_VIDEO_CPIA2 is not set +CONFIG_VIDEO_SAA5246A=m +CONFIG_VIDEO_SAA5249=m +CONFIG_VIDEO_STRADIS=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +# CONFIG_VIDEO_ZORAN_AVS6EYES is not set +CONFIG_VIDEO_MEYE=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_MPEG=m +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX23885=m +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_CX18=m +CONFIG_VIDEO_CAFE_CCIC=m +CONFIG_SOC_CAMERA=m +CONFIG_SOC_CAMERA_MT9M001=m +CONFIG_SOC_CAMERA_MT9M111=m +CONFIG_SOC_CAMERA_MT9T031=m +CONFIG_SOC_CAMERA_MT9V022=m +CONFIG_SOC_CAMERA_TW9910=m +CONFIG_SOC_CAMERA_PLATFORM=m +CONFIG_SOC_CAMERA_OV772X=m +CONFIG_V4L_USB_DRIVERS=y +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m +CONFIG_USB_GSPCA_CONEX=m +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_MARS=m +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_OV534=m +CONFIG_USB_GSPCA_PAC207=m +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_STK014=m +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DVB=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_USBVIDEO=m +CONFIG_USB_VICAM=m +CONFIG_USB_IBMCAM=m +CONFIG_USB_KONICAWC=m +CONFIG_USB_QUICKCAM_MESSENGER=m +CONFIG_USB_ET61X251=m +CONFIG_VIDEO_OVCAMCHIP=m +CONFIG_USB_W9968CF=m +CONFIG_USB_OV511=m +CONFIG_USB_SE401=m +CONFIG_USB_SN9C102=m +CONFIG_USB_STV680=m +CONFIG_USB_ZC0301=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_CADET=m +CONFIG_RADIO_RTRACK=m +CONFIG_RADIO_RTRACK2=m +CONFIG_RADIO_AZTECH=m +CONFIG_RADIO_GEMTEK=m +CONFIG_RADIO_GEMTEK_PCI=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_MAESTRO=m +CONFIG_RADIO_SF16FMI=m +CONFIG_RADIO_SF16FMR2=m +CONFIG_RADIO_TERRATEC=m +CONFIG_RADIO_TRUST=m +CONFIG_RADIO_TYPHOON=m +CONFIG_RADIO_TYPHOON_PROC_FS=y +CONFIG_RADIO_ZOLTRIX=m +CONFIG_USB_DSBR=m +CONFIG_USB_SI470X=m +CONFIG_USB_MR800=m +CONFIG_RADIO_TEA5764=m +CONFIG_DVB_DYNAMIC_MINORS=y +CONFIG_DVB_CAPTURE_DRIVERS=y + +# +# Supported SAA7146 based PCI Adapters +# +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_AV7110=m +# CONFIG_DVB_AV7110_FIRMWARE is not set +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m + +# +# Supported USB Adapters +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_DVB_SIANO_SMS1XXX=m +CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS=y + +# +# Supported FlexCopII (B2C2) Adapters +# +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set + +# +# Supported BT878 Adapters +# +CONFIG_DVB_BT8XX=m + +# +# Supported Pluto2 Adapters +# +# CONFIG_DVB_PLUTO2 is not set + +# +# Supported SDMC DM1105 Adapters +# +CONFIG_DVB_DM1105=m + +# +# Supported FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_IEEE1394=y +CONFIG_DVB_FIREDTV_INPUT=y + +# +# Supported DVB Frontends +# + +# +# Customise DVB Frontends +# +# CONFIG_DVB_FE_CUSTOMISE is not set + +# +# Multistandard (satellite) frontends +# +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0288=m +CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_TDA8261=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUA6100=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_SI21XX=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_DRX397XD=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +CONFIG_DVB_TDA10048=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LGDT3304=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_S5H1411=m + +# +# ISDB-T (terrestrial) frontends +# +CONFIG_DVB_S921=m + +# +# Digital terrestrial only tuners/PLL +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TUNER_DIB0070=m + +# +# SEC control devices for DVB-S +# +CONFIG_DVB_LNBP21=m +CONFIG_DVB_ISL6405=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_LGS8GL5=m + +# +# Tools to develop new frontends +# +# CONFIG_DVB_DUMMY_FE is not set +CONFIG_DVB_AF9013=m +CONFIG_DAB=y +CONFIG_USB_DABUSB=m + +# +# Graphics support +# +CONFIG_AGP=m +CONFIG_AGP_ALI=m +CONFIG_AGP_ATI=m +CONFIG_AGP_AMD=m +CONFIG_AGP_AMD64=m +CONFIG_AGP_INTEL=m +CONFIG_AGP_NVIDIA=m +CONFIG_AGP_SIS=m +CONFIG_AGP_SWORKS=m +CONFIG_AGP_VIA=m +CONFIG_AGP_EFFICEON=m +CONFIG_DRM=m +CONFIG_DRM_TDFX=m +CONFIG_DRM_R128=m +CONFIG_DRM_RADEON=m +CONFIG_DRM_I810=m +CONFIG_DRM_I830=m +CONFIG_DRM_I915=m +# CONFIG_DRM_I915_KMS is not set +CONFIG_DRM_MGA=m +CONFIG_DRM_SIS=m +CONFIG_DRM_VIA=m +CONFIG_DRM_SAVAGE=m +CONFIG_VGASTATE=m +CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +CONFIG_FB_DDC=m +CONFIG_FB_BOOT_VESA_SUPPORT=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=m +CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_HECUBA=m +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +CONFIG_FB_BACKLIGHT=y +CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +CONFIG_FB_CIRRUS=m +CONFIG_FB_PM2=m +CONFIG_FB_PM2_FIFO_DISCONNECT=y +CONFIG_FB_CYBER2000=m +CONFIG_FB_ARC=m +# CONFIG_FB_ASILIANT is not set +CONFIG_FB_IMSTT=y +CONFIG_FB_VGA16=m +CONFIG_FB_UVESA=m +CONFIG_FB_VESA=y +# CONFIG_FB_EFI is not set +CONFIG_FB_N411=m +CONFIG_FB_HGA=m +CONFIG_FB_HGA_ACCEL=y +CONFIG_FB_S1D13XXX=m +CONFIG_FB_NVIDIA=m +CONFIG_FB_NVIDIA_I2C=y +# CONFIG_FB_NVIDIA_DEBUG is not set +CONFIG_FB_NVIDIA_BACKLIGHT=y +CONFIG_FB_RIVA=m +CONFIG_FB_RIVA_I2C=y +# CONFIG_FB_RIVA_DEBUG is not set +CONFIG_FB_RIVA_BACKLIGHT=y +CONFIG_FB_I810=m +CONFIG_FB_I810_GTF=y +CONFIG_FB_I810_I2C=y +CONFIG_FB_LE80578=m +CONFIG_FB_CARILLO_RANCH=m +CONFIG_FB_INTEL=m +# CONFIG_FB_INTEL_DEBUG is not set +CONFIG_FB_INTEL_I2C=y +# CONFIG_FB_MATROX is not set +CONFIG_FB_RADEON=m +CONFIG_FB_RADEON_I2C=y +CONFIG_FB_RADEON_BACKLIGHT=y +# CONFIG_FB_RADEON_DEBUG is not set +# CONFIG_FB_ATY128 is not set +CONFIG_FB_ATY=m +CONFIG_FB_ATY_CT=y +CONFIG_FB_ATY_GENERIC_LCD=y +CONFIG_FB_ATY_GX=y +CONFIG_FB_ATY_BACKLIGHT=y +# CONFIG_FB_S3 is not set +CONFIG_FB_SAVAGE=m +CONFIG_FB_SAVAGE_I2C=y +CONFIG_FB_SAVAGE_ACCEL=y +CONFIG_FB_SIS=m +CONFIG_FB_SIS_300=y +CONFIG_FB_SIS_315=y +CONFIG_FB_VIA=m +CONFIG_FB_NEOMAGIC=m +CONFIG_FB_KYRO=m +CONFIG_FB_3DFX=m +CONFIG_FB_3DFX_ACCEL=y +CONFIG_FB_VOODOO1=m +# CONFIG_FB_VT8623 is not set +CONFIG_FB_CYBLA=m +CONFIG_FB_TRIDENT=m +CONFIG_FB_TRIDENT_ACCEL=y +# CONFIG_FB_ARK is not set +CONFIG_FB_PM3=m +CONFIG_FB_CARMINE=m +CONFIG_FB_CARMINE_DRAM_EVAL=y +# CONFIG_CARMINE_DRAM_CUSTOM is not set +CONFIG_FB_GEODE=y +CONFIG_FB_GEODE_LX=m +CONFIG_FB_GEODE_GX=m +CONFIG_FB_GEODE_GX1=m +CONFIG_FB_TMIO=m +CONFIG_FB_TMIO_ACCELL=y +CONFIG_FB_SM501=m +# CONFIG_FB_VIRTUAL is not set +CONFIG_XEN_FBDEV_FRONTEND=m +CONFIG_FB_METRONOME=m +CONFIG_FB_MB862XX=m +CONFIG_FB_MB862XX_PCI_GDC=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_LTV350QV=m +CONFIG_LCD_ILI9320=m +CONFIG_LCD_TDO24M=m +CONFIG_LCD_VGG2432A4=m +CONFIG_LCD_PLATFORM=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_GENERIC=m +CONFIG_BACKLIGHT_PROGEAR=m +CONFIG_BACKLIGHT_CARILLO_RANCH=m +CONFIG_BACKLIGHT_MBP_NVIDIA=m +CONFIG_BACKLIGHT_SAHARA=m + +# +# Display device support +# +CONFIG_DISPLAY_SUPPORT=m + +# +# Display hardware drivers +# + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +# CONFIG_VGACON_SOFT_SCROLLBACK is not set +CONFIG_MDA_CONSOLE=m +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_LOGO is not set +CONFIG_SOUND=m +CONFIG_SOUND_OSS_CORE=y +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_HRTIMER=m +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +CONFIG_SND_VERBOSE_PRINTK=y +CONFIG_SND_DEBUG=y +# CONFIG_SND_DEBUG_VERBOSE is not set +# CONFIG_SND_PCM_XRUN_DEBUG is not set +CONFIG_SND_VMASTER=y +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_OPL4_LIB=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DRIVERS=y +CONFIG_SND_PCSP=m +CONFIG_SND_DUMMY=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_MTS64=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m +CONFIG_SND_PORTMAN2X4=m +CONFIG_SND_AC97_POWER_SAVE=y +CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 +CONFIG_SND_WSS_LIB=m +CONFIG_SND_SB_COMMON=m +CONFIG_SND_SB8_DSP=m +CONFIG_SND_SB16_DSP=m +CONFIG_SND_ISA=y +# CONFIG_SND_ADLIB is not set +CONFIG_SND_AD1816A=m +CONFIG_SND_AD1848=m +CONFIG_SND_ALS100=m +CONFIG_SND_AZT2320=m +CONFIG_SND_CMI8330=m +CONFIG_SND_CS4231=m +CONFIG_SND_CS4232=m +CONFIG_SND_CS4236=m +CONFIG_SND_DT019X=m +CONFIG_SND_ES968=m +CONFIG_SND_ES1688=m +CONFIG_SND_ES18XX=m +CONFIG_SND_SC6000=m +CONFIG_SND_GUSCLASSIC=m +CONFIG_SND_GUSEXTREME=m +CONFIG_SND_GUSMAX=m +CONFIG_SND_INTERWAVE=m +CONFIG_SND_INTERWAVE_STB=m +CONFIG_SND_OPL3SA2=m +CONFIG_SND_OPTI92X_AD1848=m +CONFIG_SND_OPTI92X_CS4231=m +CONFIG_SND_OPTI93X=m +CONFIG_SND_MIRO=m +CONFIG_SND_SB8=m +CONFIG_SND_SB16=m +CONFIG_SND_SBAWE=m +CONFIG_SND_SB16_CSP=y +CONFIG_SND_SGALAXY=m +CONFIG_SND_SSCAPE=m +CONFIG_SND_WAVEFRONT=m +CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL=y +CONFIG_SND_PCI=y +CONFIG_SND_AD1889=m +CONFIG_SND_ALS300=m +CONFIG_SND_ALS4000=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +CONFIG_SND_AW2=m +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_OXYGEN_LIB=m +CONFIG_SND_OXYGEN=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CS5530=m +CONFIG_SND_CS5535AUDIO=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_FM801=m +CONFIG_SND_FM801_TEA575X_BOOL=y +CONFIG_SND_FM801_TEA575X=m +CONFIG_SND_HDA_INTEL=m +# CONFIG_SND_HDA_HWDEP is not set +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_CODEC_REALTEK=y +CONFIG_SND_HDA_CODEC_ANALOG=y +CONFIG_SND_HDA_CODEC_SIGMATEL=y +CONFIG_SND_HDA_CODEC_VIA=y +CONFIG_SND_HDA_CODEC_ATIHDMI=y +CONFIG_SND_HDA_CODEC_NVHDMI=y +CONFIG_SND_HDA_CODEC_INTELHDMI=y +CONFIG_SND_HDA_ELD=y +CONFIG_SND_HDA_CODEC_CONEXANT=y +CONFIG_SND_HDA_CODEC_CMEDIA=y +CONFIG_SND_HDA_CODEC_SI3054=y +CONFIG_SND_HDA_GENERIC=y +# CONFIG_SND_HDA_POWER_SAVE is not set +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_HIFIER=m +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +CONFIG_SND_MAESTRO3=m +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SIS7019=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VIRTUOSO=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m +CONFIG_SND_SPI=y +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_USB_US122L=m +CONFIG_SND_PCMCIA=y +CONFIG_SND_VXPOCKET=m +CONFIG_SND_PDAUDIOCF=m +# CONFIG_SND_SOC is not set +CONFIG_SOUND_PRIME=m +# CONFIG_SOUND_MSNDCLAS is not set +# CONFIG_SOUND_MSNDPIN is not set +CONFIG_SOUND_OSS=m +CONFIG_SOUND_TRACEINIT=y +CONFIG_SOUND_DMAP=y +CONFIG_SOUND_SSCAPE=m +CONFIG_SOUND_VMIDI=m +CONFIG_SOUND_TRIX=m +CONFIG_SOUND_MSS=m +CONFIG_SOUND_MPU401=m +CONFIG_SOUND_PAS=m +CONFIG_SOUND_PSS=m +CONFIG_PSS_MIXER=y +# CONFIG_PSS_HAVE_BOOT is not set +CONFIG_SOUND_SB=m +CONFIG_SOUND_YM3812=m +CONFIG_SOUND_UART6850=m +CONFIG_SOUND_AEDSP16=m +CONFIG_SC6600=y +CONFIG_SC6600_JOY=y +CONFIG_SC6600_CDROM=4 +CONFIG_SC6600_CDROMBASE=0x0 +CONFIG_SOUND_KAHLUA=m +CONFIG_AC97_BUS=m +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set +CONFIG_HIDRAW=y + +# +# USB Input Devices +# +CONFIG_USB_HID=m +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y + +# +# Special HID drivers +# +# CONFIG_HID_COMPAT is not set +CONFIG_HID_A4TECH=m +CONFIG_HID_APPLE=m +CONFIG_HID_BELKIN=m +CONFIG_HID_CHERRY=m +CONFIG_HID_CHICONY=m +CONFIG_HID_CYPRESS=m +CONFIG_HID_EZKEY=m +CONFIG_HID_GYRATION=m +CONFIG_HID_LOGITECH=m +CONFIG_LOGITECH_FF=y +CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_HID_MICROSOFT=m +CONFIG_HID_MONTEREY=m +CONFIG_HID_NTRIG=m +CONFIG_HID_PANTHERLORD=m +CONFIG_PANTHERLORD_FF=y +CONFIG_HID_PETALYNX=m +CONFIG_HID_SAMSUNG=m +CONFIG_HID_SONY=m +CONFIG_HID_SUNPLUS=m +CONFIG_GREENASIA_FF=m +CONFIG_HID_TOPSEED=m +CONFIG_THRUSTMASTER_FF=m +CONFIG_ZEROPLUS_FF=m +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +CONFIG_USB_DEVICE_CLASS=y +# CONFIG_USB_DYNAMIC_MINORS is not set +CONFIG_USB_SUSPEND=y +# CONFIG_USB_OTG is not set +CONFIG_USB_MON=m +CONFIG_USB_WUSB=m +CONFIG_USB_WUSB_CBAF=m +# CONFIG_USB_WUSB_CBAF_DEBUG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_C67X00_HCD=m +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_ROOT_HUB_TT=y +# CONFIG_USB_EHCI_TT_NEWSCHED is not set +CONFIG_USB_OXU210HP_HCD=m +CONFIG_USB_ISP116X_HCD=m +CONFIG_USB_ISP1760_HCD=m +CONFIG_USB_OHCI_HCD=m +CONFIG_USB_OHCI_HCD_SSB=y +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_UHCI_HCD=m +CONFIG_USB_U132_HCD=m +CONFIG_USB_SL811_HCD=m +CONFIG_USB_SL811_CS=m +CONFIG_USB_R8A66597_HCD=m +CONFIG_USB_WHCI_HCD=m +CONFIG_USB_HWA_HCD=m + +# +# Enable Host or Gadget support to see Inventra options +# + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; +# + +# +# see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_DATAFAB=y +CONFIG_USB_STORAGE_FREECOM=y +CONFIG_USB_STORAGE_ISD200=y +CONFIG_USB_STORAGE_USBAT=y +CONFIG_USB_STORAGE_SDDR09=y +CONFIG_USB_STORAGE_SDDR55=y +CONFIG_USB_STORAGE_JUMPSHOT=y +# CONFIG_USB_STORAGE_ALAUDA is not set +CONFIG_USB_STORAGE_ONETOUCH=y +CONFIG_USB_STORAGE_KARMA=y +CONFIG_USB_STORAGE_CYPRESS_ATACB=y +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m + +# +# USB port drivers +# +CONFIG_USB_USS720=m +CONFIG_USB_SERIAL=m +CONFIG_USB_EZUSB=y +CONFIG_USB_SERIAL_GENERIC=y +# CONFIG_USB_SERIAL_AIRCABLE is not set +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP2101=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +# CONFIG_USB_SERIAL_FUNSOFT is not set +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MOTOROLA=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +CONFIG_USB_SERIAL_SAFE_PADDED=y +CONFIG_USB_SERIAL_SIEMENS_MPI=m +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +# CONFIG_USB_SERIAL_DEBUG is not set + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_SEVSEG=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_BERRY_CHARGE=m +CONFIG_USB_LED=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_PHIDGET=m +CONFIG_USB_PHIDGETKIT=m +CONFIG_USB_PHIDGETMOTORCONTROL=m +CONFIG_USB_PHIDGETSERVO=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +# CONFIG_USB_SISUSBVGA_CON is not set +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m +# CONFIG_USB_TEST is not set +CONFIG_USB_ISIGHTFW=m +CONFIG_USB_VST=m +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m +# CONFIG_USB_GADGET is not set + +# +# OTG and related infrastructure +# +CONFIG_UWB=m +CONFIG_UWB_HWA=m +CONFIG_UWB_WHCI=m +CONFIG_UWB_WLP=m +CONFIG_UWB_I1480U=m +CONFIG_UWB_I1480U_WLP=m +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=m +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +CONFIG_MMC_SDHCI=m +CONFIG_MMC_SDHCI_PCI=m +CONFIG_MMC_RICOH_MMC=m +CONFIG_MMC_WBSD=m +CONFIG_MMC_TIFM_SD=m +CONFIG_MMC_SDRICOH_CS=m +CONFIG_MEMSTICK=m +# CONFIG_MEMSTICK_DEBUG is not set + +# +# MemoryStick drivers +# +# CONFIG_MEMSTICK_UNSAFE_RESUME is not set +CONFIG_MSPRO_BLOCK=m + +# +# MemoryStick Host Controller Drivers +# +CONFIG_MEMSTICK_TIFM_MS=m +CONFIG_MEMSTICK_JMICRON_38X=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=m + +# +# LED drivers +# +CONFIG_LEDS_NET48XX=m +CONFIG_LEDS_WRAP=m +CONFIG_LEDS_ALIX2=m +CONFIG_LEDS_PCA9532=m +CONFIG_LEDS_CLEVO_MAIL=m +CONFIG_LEDS_PCA955X=m +CONFIG_LEDS_WM8350=m + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_IDE_DISK=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m +CONFIG_ACCESSIBILITY=y +# CONFIG_A11Y_BRAILLE_CONSOLE is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_AMSO1100=m +# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_MLX4_INFINIBAND=m +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_INFINIBAND_IPOIB=m +# CONFIG_INFINIBAND_IPOIB_CM is not set +CONFIG_INFINIBAND_IPOIB_DEBUG=y +# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set +# CONFIG_INFINIBAND_SRP is not set +# CONFIG_INFINIBAND_ISER is not set +# CONFIG_EDAC is not set +CONFIG_RTC_LIB=m +CONFIG_RTC_CLASS=m + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_DS1374=m +CONFIG_RTC_DRV_DS1672=m +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_M41T80=m +CONFIG_RTC_DRV_M41T80_WDT=y +CONFIG_RTC_DRV_S35390A=m +CONFIG_RTC_DRV_FM3130=m +CONFIG_RTC_DRV_RX8581=m + +# +# SPI RTC drivers +# +CONFIG_RTC_DRV_M41T94=m +CONFIG_RTC_DRV_DS1305=m +CONFIG_RTC_DRV_DS1390=m +CONFIG_RTC_DRV_MAX6902=m +CONFIG_RTC_DRV_R9701=m +CONFIG_RTC_DRV_RS5C348=m +CONFIG_RTC_DRV_DS3234=m + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=m +CONFIG_RTC_DRV_DS1286=m +CONFIG_RTC_DRV_DS1511=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_STK17TA8=m +CONFIG_RTC_DRV_M48T86=m +CONFIG_RTC_DRV_M48T35=m +CONFIG_RTC_DRV_M48T59=m +CONFIG_RTC_DRV_BQ4802=m +CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_WM8350=m +CONFIG_RTC_DRV_PCF50633=m + +# +# on-CPU RTC drivers +# +CONFIG_AUXDISPLAY=y +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 +CONFIG_UIO=m +CONFIG_UIO_CIF=m +CONFIG_UIO_PDRV=m +CONFIG_UIO_PDRV_GENIRQ=m +# CONFIG_UIO_SMX is not set +CONFIG_UIO_SERCOS3=m +CONFIG_XEN_BALLOON=y +CONFIG_XEN_SCRUB_PAGES=y +CONFIG_XENFS=m +CONFIG_XEN_COMPAT_XENFS=y +# CONFIG_STAGING is not set +CONFIG_X86_PLATFORM_DEVICES=y +CONFIG_ACER_WMI=m +CONFIG_ASUS_LAPTOP=m +CONFIG_FUJITSU_LAPTOP=m +# CONFIG_FUJITSU_LAPTOP_DEBUG is not set +CONFIG_TC1100_WMI=m +CONFIG_HP_WMI=m +CONFIG_MSI_LAPTOP=m +CONFIG_PANASONIC_LAPTOP=m +CONFIG_COMPAL_LAPTOP=m +CONFIG_SONY_LAPTOP=m +CONFIG_SONYPI_COMPAT=y +CONFIG_THINKPAD_ACPI=m +# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set +# CONFIG_THINKPAD_ACPI_DEBUG is not set +CONFIG_THINKPAD_ACPI_BAY=y +CONFIG_THINKPAD_ACPI_VIDEO=y +CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y +CONFIG_INTEL_MENLOW=m +CONFIG_EEEPC_LAPTOP=m +CONFIG_ACPI_WMI=m +CONFIG_ACPI_ASUS=m +CONFIG_ACPI_TOSHIBA=m + +# +# Firmware Drivers +# +CONFIG_EDD=m +# CONFIG_EDD_OFF is not set +CONFIG_FIRMWARE_MEMMAP=y +CONFIG_EFI_VARS=m +CONFIG_DELL_RBU=m +CONFIG_DCDBAS=m +CONFIG_DMIID=y +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m + +# +# File systems +# +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y +CONFIG_EXT2_FS_XIP=y +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +CONFIG_EXT4_FS=m +# CONFIG_EXT4DEV_COMPAT is not set +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +CONFIG_FS_XIP=y +CONFIG_JBD=m +CONFIG_JBD_DEBUG=y +CONFIG_JBD2=m +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=y +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +CONFIG_JFS_STATISTICS=y +CONFIG_FS_POSIX_ACL=y +CONFIG_FILE_LOCKING=y +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +# CONFIG_XFS_DEBUG is not set +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_DLM=m +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_FS_O2CB=m +CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +CONFIG_OCFS2_FS_STATS=y +# CONFIG_OCFS2_DEBUG_MASKLOG is not set +# CONFIG_OCFS2_DEBUG_FS is not set +CONFIG_OCFS2_FS_POSIX_ACL=y +CONFIG_BTRFS_FS=m +CONFIG_BTRFS_FS_POSIX_ACL=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +CONFIG_PRINT_QUOTA_WARNING=y +CONFIG_QUOTA_TREE=m +CONFIG_QFMT_V1=m +CONFIG_QFMT_V2=m +CONFIG_QUOTACTL=y +CONFIG_AUTOFS_FS=m +CONFIG_AUTOFS4_FS=m +CONFIG_FUSE_FS=m +CONFIG_GENERIC_ACL=y + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=y +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +CONFIG_NTFS_RW=y + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y +CONFIG_CONFIGFS_FS=m +CONFIG_MISC_FILESYSTEMS=y +CONFIG_ADFS_FS=m +# CONFIG_ADFS_FS_RW is not set +CONFIG_AFFS_FS=m +CONFIG_ECRYPT_FS=m +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +CONFIG_BFS_FS=m +CONFIG_EFS_FS=m +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_LZO=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +# CONFIG_JFFS2_CMODE_FAVOURLZO is not set +CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_XATTR=y +CONFIG_UBIFS_FS_ADVANCED_COMPR=y +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_FS_DEBUG is not set +CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +CONFIG_VXFS_FS=m +CONFIG_MINIX_FS=y +CONFIG_OMFS_FS=m +CONFIG_HPFS_FS=m +CONFIG_QNX4FS_FS=m +CONFIG_ROMFS_FS=m +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_ACL_SUPPORT=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_SUNRPC_XPRT_RDMA=m +# CONFIG_SUNRPC_REGISTER_V4 is not set +CONFIG_RPCSEC_GSS_KRB5=y +CONFIG_RPCSEC_GSS_SPKM3=m +CONFIG_SMB_FS=m +CONFIG_SMB_NLS_DEFAULT=y +CONFIG_SMB_NLS_REMOTE="cp850" +CONFIG_CIFS=m +CONFIG_CIFS_STATS=y +# CONFIG_CIFS_STATS2 is not set +CONFIG_CIFS_WEAK_PW_HASH=y +CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_EXPERIMENTAL is not set +CONFIG_NCP_FS=m +CONFIG_NCPFS_PACKET_SIGNING=y +CONFIG_NCPFS_IOCTL_LOCKING=y +CONFIG_NCPFS_STRONG=y +CONFIG_NCPFS_NFS_NS=y +CONFIG_NCPFS_OS2_NS=y +CONFIG_NCPFS_SMALLDOS=y +CONFIG_NCPFS_NLS=y +CONFIG_NCPFS_EXTRAS=y +CONFIG_CODA_FS=m +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set +CONFIG_9P_FS=m + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +CONFIG_OSF_PARTITION=y +# CONFIG_AMIGA_PARTITION is not set +CONFIG_ATARI_PARTITION=y +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +# CONFIG_MINIX_SUBPARTITION is not set +CONFIG_SOLARIS_X86_PARTITION=y +CONFIG_UNIXWARE_DISKLABEL=y +CONFIG_LDM_PARTITION=y +# CONFIG_LDM_DEBUG is not set +CONFIG_SGI_PARTITION=y +CONFIG_ULTRIX_PARTITION=y +CONFIG_SUN_PARTITION=y +CONFIG_KARMA_PARTITION=y +CONFIG_EFI_PARTITION=y +CONFIG_SYSV68_PARTITION=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m +CONFIG_DLM=m +CONFIG_DLM_DEBUG=y + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +CONFIG_MAGIC_SYSRQ=y +CONFIG_UNUSED_SYMBOLS=y +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1 +CONFIG_SCHED_DEBUG=y +# CONFIG_SCHEDSTATS is not set +CONFIG_TIMER_STATS=y +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_DEBUG_SLAB is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +CONFIG_STACKTRACE=y +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_HIGHMEM is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_VIRTUAL is not set +# CONFIG_DEBUG_WRITECOUNT is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +CONFIG_ARCH_WANT_FRAME_POINTERS=y +# CONFIG_FRAME_POINTER is not set +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +CONFIG_SYSCTL_SYSCALL_CHECK=y +CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_NOP_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_RING_BUFFER=y +CONFIG_TRACING=y + +# +# Tracers +# +# CONFIG_FUNCTION_TRACER is not set +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_SYSPROF_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_CONTEXT_SWITCH_TRACER is not set +# CONFIG_BOOT_TRACER is not set +# CONFIG_TRACE_BRANCH_PROFILING is not set +# CONFIG_POWER_TRACER is not set +# CONFIG_STACK_TRACER is not set +# CONFIG_FTRACE_STARTUP_TEST is not set +# CONFIG_MMIOTRACE is not set +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_DYNAMIC_PRINTK_DEBUG is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +CONFIG_STRICT_DEVMEM=y +CONFIG_X86_VERBOSE_BOOTUP=y +CONFIG_EARLY_PRINTK=y +# CONFIG_EARLY_PRINTK_DBGP is not set +CONFIG_DEBUG_STACKOVERFLOW=y +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_PAGEALLOC is not set +# CONFIG_DEBUG_PER_CPU_MAPS is not set +# CONFIG_X86_PTDUMP is not set +# CONFIG_DEBUG_RODATA is not set +# CONFIG_DEBUG_NX_TEST is not set +# CONFIG_4KSTACKS is not set +CONFIG_DOUBLEFAULT=y +CONFIG_HAVE_MMIOTRACE_SUPPORT=y +CONFIG_IO_DELAY_TYPE_0X80=0 +CONFIG_IO_DELAY_TYPE_0XED=1 +CONFIG_IO_DELAY_TYPE_UDELAY=2 +CONFIG_IO_DELAY_TYPE_NONE=3 +CONFIG_IO_DELAY_0X80=y +# CONFIG_IO_DELAY_0XED is not set +# CONFIG_IO_DELAY_UDELAY is not set +# CONFIG_IO_DELAY_NONE is not set +CONFIG_DEFAULT_IO_DELAY_TYPE=0 +# CONFIG_DEBUG_BOOT_PARAMS is not set +# CONFIG_CPA_DEBUG is not set +# CONFIG_OPTIMIZE_INLINING is not set + +# +# Security options +# +CONFIG_KEYS=y +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set +CONFIG_SECURITY=y +CONFIG_SECURITYFS=y +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM is not set +# CONFIG_SECURITY_PATH is not set +CONFIG_SECURITY_FILE_CAPABILITIES=y +CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 +CONFIG_SECURITY_SELINUX=y +CONFIG_SECURITY_SELINUX_BOOTPARAM=y +CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 +CONFIG_SECURITY_SELINUX_DISABLE=y +CONFIG_SECURITY_SELINUX_DEVELOP=y +CONFIG_SECURITY_SELINUX_AVC_STATS=y +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 +# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_FIPS=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_SEQIV=m + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m + +# +# Hash modes +# +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_XCBC=m + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES_586=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SALSA20_586 is not set +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_TWOFISH_586=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_LZO=m + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_PADLOCK=m +CONFIG_CRYPTO_DEV_PADLOCK_AES=m +CONFIG_CRYPTO_DEV_PADLOCK_SHA=m +CONFIG_CRYPTO_DEV_GEODE=m +CONFIG_CRYPTO_DEV_HIFN_795X=m +# CONFIG_CRYPTO_DEV_HIFN_795X_RNG is not set +CONFIG_HAVE_KVM=y +CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m +CONFIG_VIRTIO=m +CONFIG_VIRTIO_RING=m +CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_BALLOON=m + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_GENERIC_FIND_LAST_BIT=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC_T10DIF=m +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_AUDIT_GENERIC=y +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=m +CONFIG_LZO_COMPRESS=m +CONFIG_LZO_DECOMPRESS=m +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_DEC16=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_CHECK_SIGNATURE=y diff --git a/pkgs/os-specific/linux/kernel/config-2.6.29-x86_64-smp b/pkgs/os-specific/linux/kernel/config-2.6.29-x86_64-smp new file mode 100644 index 00000000000..a14568f63e4 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/config-2.6.29-x86_64-smp @@ -0,0 +1,4131 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.29.4 +# Sat Jun 6 23:49:13 2009 +# +CONFIG_64BIT=y +# CONFIG_X86_32 is not set +CONFIG_X86_64=y +CONFIG_X86=y +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_FAST_CMPXCHG_LOCAL=y +CONFIG_MMU=y +CONFIG_ZONE_DMA=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set +CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_DEFAULT_IDLE=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_HAVE_SETUP_PER_CPU_AREA=y +CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ZONE_DMA32=y +CONFIG_ARCH_POPULATES_NODE_MAP=y +CONFIG_AUDIT_ARCH=y +CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_X86_SMP=y +CONFIG_USE_GENERIC_SMP_HELPERS=y +CONFIG_X86_64_SMP=y +CONFIG_X86_HT=y +CONFIG_X86_BIOS_REBOOT=y +CONFIG_X86_TRAMPOLINE=y +# CONFIG_KTIME_SCALAR is not set +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="-default" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_TREE=y + +# +# RCU Subsystem +# +CONFIG_CLASSIC_RCU=y +# CONFIG_TREE_RCU is not set +# CONFIG_PREEMPT_RCU is not set +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_PREEMPT_RCU_TRACE is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=17 +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +CONFIG_GROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +# CONFIG_RT_GROUP_SCHED is not set +CONFIG_USER_SCHED=y +# CONFIG_CGROUP_SCHED is not set +# CONFIG_CGROUPS is not set +# CONFIG_SYSFS_DEPRECATED_V2 is not set +CONFIG_RELAY=y +CONFIG_NAMESPACES=y +# CONFIG_UTS_NS is not set +# CONFIG_IPC_NS is not set +# CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set +# CONFIG_NET_NS is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_PCSPKR_PLATFORM=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_PCI_QUIRKS=y +CONFIG_COMPAT_BRK=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y +# CONFIG_MARKERS is not set +CONFIG_OPROFILE=m +CONFIG_OPROFILE_IBS=y +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y +CONFIG_STOP_MACHINE=y +CONFIG_BLOCK=y +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_BLK_DEV_BSG is not set +CONFIG_BLK_DEV_INTEGRITY=y +CONFIG_BLOCK_COMPAT=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_PREEMPT_NOTIFIERS=y +CONFIG_FREEZER=y + +# +# Processor type and features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_SMP=y +# CONFIG_SPARSE_IRQ is not set +CONFIG_X86_FIND_SMP_CONFIG=y +CONFIG_X86_MPPARSE=y +CONFIG_X86_PC=y +# CONFIG_X86_ELAN is not set +# CONFIG_X86_VOYAGER is not set +# CONFIG_X86_GENERICARCH is not set +# CONFIG_X86_VSMP is not set +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_PARAVIRT_GUEST=y +CONFIG_XEN=y +CONFIG_XEN_MAX_DOMAIN_MEMORY=32 +CONFIG_XEN_SAVE_RESTORE=y +# CONFIG_XEN_DEBUG_FS is not set +CONFIG_KVM_CLOCK=y +CONFIG_KVM_GUEST=y +CONFIG_PARAVIRT=y +CONFIG_PARAVIRT_CLOCK=y +# CONFIG_PARAVIRT_DEBUG is not set +CONFIG_MEMTEST=y +# CONFIG_M386 is not set +# CONFIG_M486 is not set +# CONFIG_M586 is not set +# CONFIG_M586TSC is not set +# CONFIG_M586MMX is not set +# CONFIG_M686 is not set +# CONFIG_MPENTIUMII is not set +# CONFIG_MPENTIUMIII is not set +# CONFIG_MPENTIUMM is not set +# CONFIG_MPENTIUM4 is not set +# CONFIG_MK6 is not set +# CONFIG_MK7 is not set +# CONFIG_MK8 is not set +# CONFIG_MCRUSOE is not set +# CONFIG_MEFFICEON is not set +# CONFIG_MWINCHIPC6 is not set +# CONFIG_MWINCHIP3D is not set +# CONFIG_MGEODEGX1 is not set +# CONFIG_MGEODE_LX is not set +# CONFIG_MCYRIXIII is not set +# CONFIG_MVIAC3_2 is not set +# CONFIG_MVIAC7 is not set +# CONFIG_MPSC is not set +# CONFIG_MCORE2 is not set +CONFIG_GENERIC_CPU=y +CONFIG_X86_CPU=y +CONFIG_X86_L1_CACHE_BYTES=128 +CONFIG_X86_INTERNODE_CACHE_BYTES=128 +CONFIG_X86_CMPXCHG=y +CONFIG_X86_L1_CACHE_SHIFT=7 +CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_TSC=y +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_CMOV=y +CONFIG_X86_MINIMUM_CPU_FAMILY=64 +CONFIG_X86_DEBUGCTLMSR=y +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_CENTAUR_64=y +# CONFIG_X86_DS is not set +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_DMI=y +CONFIG_GART_IOMMU=y +CONFIG_CALGARY_IOMMU=y +CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y +CONFIG_AMD_IOMMU=y +# CONFIG_AMD_IOMMU_STATS is not set +CONFIG_SWIOTLB=y +CONFIG_IOMMU_HELPER=y +CONFIG_IOMMU_API=y +# CONFIG_MAXSMP is not set +CONFIG_NR_CPUS=8 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PREEMPT is not set +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set +CONFIG_X86_MCE=y +CONFIG_X86_MCE_INTEL=y +CONFIG_X86_MCE_AMD=y +CONFIG_I8K=m +CONFIG_MICROCODE=m +CONFIG_MICROCODE_INTEL=y +CONFIG_MICROCODE_AMD=y +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=m +CONFIG_X86_CPUID=m +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y +CONFIG_DIRECT_GBPAGES=y +# CONFIG_NUMA is not set +CONFIG_ARCH_SPARSEMEM_DEFAULT=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_SELECT_MEMORY_MODEL=y +# CONFIG_FLATMEM_MANUAL is not set +# CONFIG_DISCONTIGMEM_MANUAL is not set +CONFIG_SPARSEMEM_MANUAL=y +CONFIG_SPARSEMEM=y +CONFIG_HAVE_MEMORY_PRESENT=y +CONFIG_SPARSEMEM_EXTREME=y +CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y +CONFIG_SPARSEMEM_VMEMMAP=y + +# +# Memory hotplug is currently incompatible with Software Suspend +# +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_UNEVICTABLE_LRU=y +CONFIG_MMU_NOTIFIER=y +CONFIG_X86_CHECK_BIOS_CORRUPTION=y +# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set +CONFIG_X86_RESERVE_LOW_64K=y +CONFIG_MTRR=y +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 +CONFIG_X86_PAT=y +CONFIG_EFI=y +CONFIG_SECCOMP=y +# CONFIG_HZ_100 is not set +CONFIG_HZ_250=y +# CONFIG_HZ_300 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=250 +CONFIG_SCHED_HRTICK=y +CONFIG_KEXEC=y +# CONFIG_CRASH_DUMP is not set +CONFIG_PHYSICAL_START=0x200000 +# CONFIG_RELOCATABLE is not set +CONFIG_PHYSICAL_ALIGN=0x200000 +CONFIG_HOTPLUG_CPU=y +CONFIG_COMPAT_VDSO=y +# CONFIG_CMDLINE_BOOL is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y + +# +# Power management and ACPI options +# +CONFIG_ARCH_HIBERNATION_HEADER=y +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set +CONFIG_PM_SLEEP_SMP=y +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_HIBERNATION=y +CONFIG_PM_STD_PARTITION="" +CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_PROCFS=y +CONFIG_ACPI_PROCFS_POWER=y +CONFIG_ACPI_SYSFS_POWER=y +CONFIG_ACPI_PROC_EVENT=y +CONFIG_ACPI_AC=m +CONFIG_ACPI_BATTERY=m +CONFIG_ACPI_BUTTON=m +CONFIG_ACPI_VIDEO=m +CONFIG_ACPI_FAN=m +CONFIG_ACPI_DOCK=y +CONFIG_ACPI_PROCESSOR=m +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_THERMAL=m +CONFIG_ACPI_CUSTOM_DSDT_FILE="" +# CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_BLACKLIST_YEAR=0 +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_PCI_SLOT=m +CONFIG_X86_PM_TIMER=y +CONFIG_ACPI_CONTAINER=m +# CONFIG_ACPI_SBS is not set + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=m +# CONFIG_CPU_FREQ_DEBUG is not set +CONFIG_CPU_FREQ_STAT=m +CONFIG_CPU_FREQ_STAT_DETAILS=y +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m + +# +# CPUFreq processor drivers +# +CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_POWERNOW_K8=m +CONFIG_X86_POWERNOW_K8_ACPI=y +CONFIG_X86_SPEEDSTEP_CENTRINO=m +CONFIG_X86_P4_CLOCKMOD=m + +# +# shared options +# +CONFIG_X86_SPEEDSTEP_LIB=m +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y + +# +# Memory power savings +# +CONFIG_I7300_IDLE_IOAT_CHANNEL=y +CONFIG_I7300_IDLE=m + +# +# Bus options (PCI etc.) +# +CONFIG_PCI=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_DOMAINS=y +# CONFIG_DMAR is not set +# CONFIG_INTR_REMAP is not set +CONFIG_PCIEPORTBUS=y +CONFIG_HOTPLUG_PCI_PCIE=m +CONFIG_PCIEAER=y +# CONFIG_PCIEASPM is not set +CONFIG_ARCH_SUPPORTS_MSI=y +CONFIG_PCI_MSI=y +CONFIG_PCI_LEGACY=y +# CONFIG_PCI_DEBUG is not set +# CONFIG_PCI_STUB is not set +CONFIG_HT_IRQ=y +CONFIG_ISA_DMA_API=y +CONFIG_K8_NB=y +CONFIG_PCCARD=m +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=m +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_PD6729=m +CONFIG_I82092=m +CONFIG_PCCARD_NONSTATIC=m +CONFIG_HOTPLUG_PCI=m +CONFIG_HOTPLUG_PCI_FAKE=m +CONFIG_HOTPLUG_PCI_ACPI=m +CONFIG_HOTPLUG_PCI_ACPI_IBM=m +CONFIG_HOTPLUG_PCI_CPCI=y +CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m +CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m +CONFIG_HOTPLUG_PCI_SHPC=m + +# +# Executable file formats / Emulations +# +CONFIG_BINFMT_ELF=y +CONFIG_COMPAT_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +# CONFIG_HAVE_AOUT is not set +CONFIG_BINFMT_MISC=m +CONFIG_IA32_EMULATION=y +CONFIG_IA32_AOUT=y +CONFIG_COMPAT=y +CONFIG_COMPAT_FOR_U64_ALIGNMENT=y +CONFIG_SYSVIPC_COMPAT=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_COMPAT_NET_DEV_OPS=y +CONFIG_PACKET=m +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_USER=m +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_ASK_IP_FIB_HASH=y +# CONFIG_IP_FIB_TRIE is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE=y +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_LRO=m +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=m +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +# CONFIG_TCP_CONG_LP is not set +# CONFIG_TCP_CONG_VENO is not set +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +# CONFIG_DEFAULT_BIC is not set +# CONFIG_DEFAULT_CUBIC is not set +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +CONFIG_DEFAULT_RENO=y +CONFIG_DEFAULT_TCP_CONG="reno" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=m +CONFIG_IPV6_PRIVACY=y +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +# CONFIG_IPV6_MIP6 is not set +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=m +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_IPV6_MROUTE is not set +# CONFIG_NETLABEL is not set +CONFIG_NETWORK_SECMARK=y +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CT_ACCT=y +CONFIG_NF_CONNTRACK_MARK=y +# CONFIG_NF_CONNTRACK_SECMARK is not set +# CONFIG_NF_CONNTRACK_EVENTS is not set +# CONFIG_NF_CT_PROTO_DCCP is not set +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NETFILTER_TPROXY=m +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_TPROXY=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m +CONFIG_NETFILTER_XT_TARGET_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_SOCKET=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_VS=m +# CONFIG_IP_VS_IPV6 is not set +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_AH_ESP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_SECURITY=m +# CONFIG_IP_NF_ARPTABLES is not set + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_RAW=m +CONFIG_IP6_NF_SECURITY=m + +# +# DECnet: Netfilter Configuration +# +CONFIG_DECNET_NF_GRABULATOR=m +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_IP6=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_ULOG=m +CONFIG_BRIDGE_EBT_NFLOG=m +# CONFIG_IP_DCCP is not set +CONFIG_IP_SCTP=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_HMAC_NONE is not set +# CONFIG_SCTP_HMAC_SHA1 is not set +CONFIG_SCTP_HMAC_MD5=y +# CONFIG_TIPC is not set +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +CONFIG_ATM_CLIP_NO_ICMP=y +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_STP=m +CONFIG_BRIDGE=m +# CONFIG_NET_DSA is not set +CONFIG_VLAN_8021Q=m +# CONFIG_VLAN_8021Q_GVRP is not set +CONFIG_DECNET=m +CONFIG_DECNET_ROUTER=y +CONFIG_LLC=y +CONFIG_LLC2=m +CONFIG_IPX=m +# CONFIG_IPX_INTERN is not set +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +CONFIG_IPDDP_DECAP=y +CONFIG_X25=m +CONFIG_LAPB=m +CONFIG_ECONET=m +# CONFIG_ECONET_AUNUDP is not set +# CONFIG_ECONET_NATIVE is not set +CONFIG_WAN_ROUTER=m +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_INGRESS=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_ROUTE=y +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +CONFIG_CLS_U32_PERF=y +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +# CONFIG_NET_EMATCH is not set +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +CONFIG_NET_ACT_SIMP=m +CONFIG_NET_ACT_SKBEDIT=m +# CONFIG_NET_CLS_IND is not set +CONFIG_NET_SCH_FIFO=y +# CONFIG_DCB is not set + +# +# Network testing +# +CONFIG_NET_PKTGEN=m +CONFIG_HAMRADIO=y + +# +# Packet Radio protocols +# +CONFIG_AX25=m +CONFIG_AX25_DAMA_SLAVE=y +CONFIG_NETROM=m +CONFIG_ROSE=m + +# +# AX.25 network device drivers +# +CONFIG_MKISS=m +CONFIG_6PACK=m +CONFIG_BPQETHER=m +CONFIG_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_BAYCOM_PAR=m +CONFIG_YAM=m +# CONFIG_CAN is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +# CONFIG_IRDA_FAST_RR is not set +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +# CONFIG_TOIM3232_DONGLE is not set +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +CONFIG_ACT200L_DONGLE=m +CONFIG_KINGSUN_DONGLE=m +# CONFIG_KSDAZZLE_DONGLE is not set +# CONFIG_KS959_DONGLE is not set + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_NSC_FIR=m +CONFIG_WINBOND_FIR=m +CONFIG_SMC_IRCC_FIR=m +CONFIG_ALI_FIR=m +CONFIG_VLSI_FIR=m +CONFIG_VIA_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +CONFIG_BT_HCIVHCI=m +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_DEBUG is not set +CONFIG_RXKAD=m +CONFIG_PHONET=m +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_CFG80211=m +# CONFIG_CFG80211_REG_DEBUG is not set +CONFIG_NL80211=y +CONFIG_WIRELESS_OLD_REGULATORY=y +CONFIG_WIRELESS_EXT=y +CONFIG_WIRELESS_EXT_SYSFS=y +CONFIG_LIB80211=m +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m + +# +# Rate control algorithm selection +# +CONFIG_MAC80211_RC_MINSTREL=y +# CONFIG_MAC80211_RC_DEFAULT_PID is not set +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel" +# CONFIG_MAC80211_MESH is not set +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_RFKILL=m +CONFIG_RFKILL_INPUT=m +CONFIG_RFKILL_LEDS=y +CONFIG_NET_9P=m +# CONFIG_NET_9P_VIRTIO is not set +CONFIG_NET_9P_RDMA=m +# CONFIG_NET_9P_DEBUG is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_STANDALONE is not set +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +CONFIG_CONNECTOR=m +CONFIG_MTD=m +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_CONCAT=m +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_TESTS=m +CONFIG_MTD_REDBOOT_PARTS=m +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_AR7_PARTS=m + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_HAVE_MTD_OTP=y +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +# CONFIG_MTD_BLOCK_RO is not set +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +CONFIG_MTD_OOPS=m + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=m +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_NOSWAP=y +# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_GEOMETRY is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_OTP is not set +CONFIG_MTD_CFI_INTELEXT=m +CONFIG_MTD_CFI_AMDSTD=m +CONFIG_MTD_CFI_STAA=m +CONFIG_MTD_CFI_UTIL=m +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +CONFIG_MTD_ABSENT=m + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_PHYSMAP=m +# CONFIG_MTD_PHYSMAP_COMPAT is not set +CONFIG_MTD_SC520CDP=m +CONFIG_MTD_NETSC520=m +CONFIG_MTD_TS5500=m +CONFIG_MTD_SBC_GXX=m +CONFIG_MTD_AMD76XROM=m +CONFIG_MTD_ICHXROM=m +CONFIG_MTD_ESB2ROM=m +CONFIG_MTD_CK804XROM=m +CONFIG_MTD_SCB2_FLASH=m +CONFIG_MTD_NETtel=m +CONFIG_MTD_DILNETPC=m +CONFIG_MTD_DILNETPC_BOOTSIZE=0x80000 +CONFIG_MTD_L440GX=m +CONFIG_MTD_PCI=m +CONFIG_MTD_INTEL_VR_NOR=m +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_PMC551=m +CONFIG_MTD_PMC551_BUGFIX=y +# CONFIG_MTD_PMC551_DEBUG is not set +CONFIG_MTD_DATAFLASH=m +# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set +CONFIG_MTD_DATAFLASH_OTP=y +CONFIG_MTD_M25P80=m +CONFIG_M25PXX_USE_FAST_READ=y +CONFIG_MTD_SLRAM=m +CONFIG_MTD_PHRAM=m +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 +CONFIG_MTD_BLOCK2MTD=m + +# +# Disk-On-Chip Device Drivers +# +CONFIG_MTD_DOC2000=m +CONFIG_MTD_DOC2001=m +CONFIG_MTD_DOC2001PLUS=m +CONFIG_MTD_DOCPROBE=m +CONFIG_MTD_DOCECC=m +CONFIG_MTD_DOCPROBE_ADVANCED=y +CONFIG_MTD_DOCPROBE_ADDRESS=0x0000 +CONFIG_MTD_DOCPROBE_HIGH=y +CONFIG_MTD_DOCPROBE_55AA=y +CONFIG_MTD_NAND=m +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +CONFIG_MTD_NAND_IDS=m +CONFIG_MTD_NAND_DISKONCHIP=m +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y +CONFIG_MTD_NAND_CAFE=m +CONFIG_MTD_NAND_NANDSIM=m +CONFIG_MTD_NAND_PLATFORM=m +CONFIG_MTD_ALAUDA=m +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +CONFIG_MTD_LPDDR=m +CONFIG_MTD_QINFO_PROBE=m + +# +# UBI - Unsorted block images +# +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set + +# +# UBI debugging options +# +# CONFIG_MTD_UBI_DEBUG is not set +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +CONFIG_PARPORT_PC_FIFO=y +CONFIG_PARPORT_PC_SUPERIO=y +CONFIG_PARPORT_PC_PCMCIA=m +# CONFIG_PARPORT_GSC is not set +# CONFIG_PARPORT_AX88796 is not set +CONFIG_PARPORT_1284=y +CONFIG_PARPORT_NOT_PC=y +CONFIG_PNP=y +CONFIG_PNP_DEBUG_MESSAGES=y + +# +# Protocols +# +CONFIG_PNPACPI=y +CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_FD=y +CONFIG_PARIDE=m + +# +# Parallel IDE high-level drivers +# +CONFIG_PARIDE_PD=m +CONFIG_PARIDE_PCD=m +CONFIG_PARIDE_PF=m +CONFIG_PARIDE_PT=m +CONFIG_PARIDE_PG=m + +# +# Parallel IDE protocol modules +# +CONFIG_PARIDE_ATEN=m +CONFIG_PARIDE_BPCK=m +CONFIG_PARIDE_COMM=m +CONFIG_PARIDE_DSTR=m +CONFIG_PARIDE_FIT2=m +CONFIG_PARIDE_FIT3=m +CONFIG_PARIDE_EPAT=m +CONFIG_PARIDE_EPATC8=y +CONFIG_PARIDE_EPIA=m +CONFIG_PARIDE_FRIQ=m +CONFIG_PARIDE_FRPW=m +CONFIG_PARIDE_KBIC=m +CONFIG_PARIDE_KTTI=m +CONFIG_PARIDE_ON20=m +CONFIG_PARIDE_ON26=m +CONFIG_BLK_CPQ_DA=m +CONFIG_BLK_CPQ_CISS_DA=m +CONFIG_CISS_SCSI_TAPE=y +CONFIG_BLK_DEV_DAC960=m +CONFIG_BLK_DEV_UMEM=m +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_SX8=m +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=64000 +# CONFIG_BLK_DEV_XIP is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +CONFIG_CDROM_PKTCDVD_WCACHE=y +CONFIG_ATA_OVER_ETH=m +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_VIRTIO_BLK=m +# CONFIG_BLK_DEV_HD is not set +CONFIG_MISC_DEVICES=y +CONFIG_IBM_ASM=m +CONFIG_PHANTOM=m +# CONFIG_SGI_IOC4 is not set +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m +CONFIG_ICS932S401=m +CONFIG_ENCLOSURE_SERVICES=m +CONFIG_SGI_XP=m +CONFIG_HP_ILO=m +CONFIG_SGI_GRU=m +# CONFIG_SGI_GRU_DEBUG is not set +CONFIG_DELL_LAPTOP=m +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +CONFIG_EEPROM_AT25=m +CONFIG_EEPROM_LEGACY=m +CONFIG_EEPROM_93CX6=m +CONFIG_HAVE_IDE=y +CONFIG_IDE=m + +# +# Please see Documentation/ide/ide.txt for help/info on IDE drives +# +CONFIG_IDE_TIMINGS=y +CONFIG_IDE_ATAPI=y +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_IDE_GD=m +CONFIG_IDE_GD_ATA=y +CONFIG_IDE_GD_ATAPI=y +CONFIG_BLK_DEV_IDECS=m +CONFIG_BLK_DEV_DELKIN=m +CONFIG_BLK_DEV_IDECD=m +CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y +CONFIG_BLK_DEV_IDETAPE=m +CONFIG_BLK_DEV_IDEACPI=y +# CONFIG_IDE_TASK_IOCTL is not set +CONFIG_IDE_PROC_FS=y + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=m +CONFIG_BLK_DEV_PLATFORM=m +CONFIG_BLK_DEV_CMD640=m +CONFIG_BLK_DEV_CMD640_ENHANCED=y +CONFIG_BLK_DEV_IDEPNP=m +CONFIG_BLK_DEV_IDEDMA_SFF=y + +# +# PCI IDE chipsets support +# +CONFIG_BLK_DEV_IDEPCI=y +CONFIG_BLK_DEV_OFFBOARD=y +CONFIG_BLK_DEV_GENERIC=m +CONFIG_BLK_DEV_OPTI621=m +CONFIG_BLK_DEV_RZ1000=m +CONFIG_BLK_DEV_IDEDMA_PCI=y +CONFIG_BLK_DEV_AEC62XX=m +CONFIG_BLK_DEV_ALI15X3=m +CONFIG_BLK_DEV_AMD74XX=m +CONFIG_BLK_DEV_ATIIXP=m +CONFIG_BLK_DEV_CMD64X=m +CONFIG_BLK_DEV_TRIFLEX=m +CONFIG_BLK_DEV_CS5520=m +CONFIG_BLK_DEV_CS5530=m +CONFIG_BLK_DEV_HPT366=m +CONFIG_BLK_DEV_JMICRON=m +CONFIG_BLK_DEV_SC1200=m +CONFIG_BLK_DEV_PIIX=m +CONFIG_BLK_DEV_IT8172=m +CONFIG_BLK_DEV_IT8213=m +CONFIG_BLK_DEV_IT821X=m +CONFIG_BLK_DEV_NS87415=m +CONFIG_BLK_DEV_PDC202XX_OLD=m +CONFIG_BLK_DEV_PDC202XX_NEW=m +CONFIG_BLK_DEV_SVWKS=m +CONFIG_BLK_DEV_SIIMAGE=m +CONFIG_BLK_DEV_SIS5513=m +CONFIG_BLK_DEV_SLC90E66=m +CONFIG_BLK_DEV_TRM290=m +CONFIG_BLK_DEV_VIA82CXXX=m +CONFIG_BLK_DEV_TC86C001=m +CONFIG_BLK_DEV_IDEDMA=y + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +CONFIG_SCSI_TGT=m +CONFIG_SCSI_NETLINK=y +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=m +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_ENCLOSURE=m + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +CONFIG_SCSI_MULTI_LUN=y +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SCSI_FC_ATTRS=m +# CONFIG_SCSI_FC_TGT_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +# CONFIG_SCSI_SAS_ATA is not set +CONFIG_SCSI_SAS_HOST_SMP=y +# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set +# CONFIG_SCSI_SRP_ATTRS is not set +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_AIC7XXX=m +CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 +CONFIG_AIC7XXX_RESET_DELAY_MS=5000 +# CONFIG_AIC7XXX_DEBUG_ENABLE is not set +CONFIG_AIC7XXX_DEBUG_MASK=0 +CONFIG_AIC7XXX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC7XXX_OLD=m +CONFIG_SCSI_AIC79XX=m +CONFIG_AIC79XX_CMDS_PER_DEVICE=32 +CONFIG_AIC79XX_RESET_DELAY_MS=15000 +# CONFIG_AIC79XX_DEBUG_ENABLE is not set +CONFIG_AIC79XX_DEBUG_MASK=0 +CONFIG_AIC79XX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC94XX=m +# CONFIG_AIC94XX_DEBUG is not set +CONFIG_SCSI_DPT_I2O=m +CONFIG_SCSI_ADVANSYS=m +CONFIG_SCSI_ARCMSR=m +# CONFIG_SCSI_ARCMSR_AER is not set +CONFIG_MEGARAID_NEWGEN=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=m +CONFIG_LIBFC=m +CONFIG_FCOE=m +CONFIG_SCSI_DMX3191D=m +CONFIG_SCSI_EATA=m +CONFIG_SCSI_EATA_TAGGED_QUEUE=y +CONFIG_SCSI_EATA_LINKED_COMMANDS=y +CONFIG_SCSI_EATA_MAX_TAGS=16 +CONFIG_SCSI_FUTURE_DOMAIN=m +CONFIG_SCSI_GDTH=m +CONFIG_SCSI_IPS=m +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m +CONFIG_SCSI_PPA=m +CONFIG_SCSI_IMM=m +# CONFIG_SCSI_IZIP_EPP16 is not set +# CONFIG_SCSI_IZIP_SLOW_CTR is not set +CONFIG_SCSI_MVSAS=m +CONFIG_SCSI_STEX=m +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +CONFIG_SCSI_IPR=m +# CONFIG_SCSI_IPR_TRACE is not set +# CONFIG_SCSI_IPR_DUMP is not set +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_SCSI_QLA_ISCSI=m +CONFIG_SCSI_LPFC=m +# CONFIG_SCSI_LPFC_DEBUG_FS is not set +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_DC390T=m +CONFIG_SCSI_DEBUG=m +CONFIG_SCSI_SRP=m +CONFIG_SCSI_LOWLEVEL_PCMCIA=y +CONFIG_PCMCIA_FDOMAIN=m +CONFIG_PCMCIA_QLOGIC=m +CONFIG_PCMCIA_SYM53C500=m +CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m +CONFIG_ATA=m +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_ACPI=y +CONFIG_SATA_PMP=y +CONFIG_SATA_AHCI=m +CONFIG_SATA_SIL24=m +CONFIG_ATA_SFF=y +CONFIG_SATA_SVW=m +CONFIG_ATA_PIIX=m +# CONFIG_SATA_MV is not set +CONFIG_SATA_NV=m +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_PROMISE=m +CONFIG_SATA_SX4=m +CONFIG_SATA_SIL=m +CONFIG_SATA_SIS=m +CONFIG_SATA_ULI=m +CONFIG_SATA_VIA=m +CONFIG_SATA_VITESSE=m +CONFIG_SATA_INIC162X=m +CONFIG_PATA_ACPI=m +CONFIG_PATA_ALI=m +CONFIG_PATA_AMD=m +CONFIG_PATA_ARTOP=m +CONFIG_PATA_ATIIXP=m +CONFIG_PATA_CMD640_PCI=m +# CONFIG_PATA_CMD64X is not set +CONFIG_PATA_CS5520=m +CONFIG_PATA_CS5530=m +# CONFIG_PATA_CYPRESS is not set +CONFIG_PATA_EFAR=m +CONFIG_ATA_GENERIC=m +CONFIG_PATA_HPT366=m +CONFIG_PATA_HPT37X=m +CONFIG_PATA_HPT3X2N=m +CONFIG_PATA_HPT3X3=m +# CONFIG_PATA_HPT3X3_DMA is not set +CONFIG_PATA_IT821X=m +CONFIG_PATA_IT8213=m +CONFIG_PATA_JMICRON=m +CONFIG_PATA_TRIFLEX=m +CONFIG_PATA_MARVELL=m +CONFIG_PATA_MPIIX=m +CONFIG_PATA_OLDPIIX=m +CONFIG_PATA_NETCELL=m +CONFIG_PATA_NINJA32=m +CONFIG_PATA_NS87410=m +CONFIG_PATA_NS87415=m +# CONFIG_PATA_OPTI is not set +# CONFIG_PATA_OPTIDMA is not set +CONFIG_PATA_PCMCIA=m +# CONFIG_PATA_PDC_OLD is not set +# CONFIG_PATA_RADISYS is not set +CONFIG_PATA_RZ1000=m +CONFIG_PATA_SC1200=m +CONFIG_PATA_SERVERWORKS=m +CONFIG_PATA_PDC2027X=m +CONFIG_PATA_SIL680=m +CONFIG_PATA_SIS=m +CONFIG_PATA_VIA=m +CONFIG_PATA_WINBOND=m +CONFIG_PATA_SCH=m +CONFIG_MD=y +CONFIG_BLK_DEV_MD=y +CONFIG_MD_AUTODETECT=y +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +# CONFIG_MD_RAID5_RESHAPE is not set +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_MIRROR=m +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +# CONFIG_DM_DELAY is not set +CONFIG_DM_UEVENT=y +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m +CONFIG_FUSION_MAX_SGE=128 +CONFIG_FUSION_CTL=m +CONFIG_FUSION_LAN=m +# CONFIG_FUSION_LOGGING is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# Enable only one of the two stacks, unless you know what you are doing +# +# CONFIG_FIREWIRE is not set +CONFIG_IEEE1394=m +CONFIG_IEEE1394_OHCI1394=m +CONFIG_IEEE1394_PCILYNX=m +CONFIG_IEEE1394_SBP2=m +# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set +CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y +CONFIG_IEEE1394_ETH1394=m +CONFIG_IEEE1394_RAWIO=m +CONFIG_IEEE1394_VIDEO1394=m +CONFIG_IEEE1394_DV1394=m +# CONFIG_IEEE1394_VERBOSEDEBUG is not set +CONFIG_I2O=m +CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y +CONFIG_I2O_EXT_ADAPTEC=y +CONFIG_I2O_EXT_ADAPTEC_DMA64=y +CONFIG_I2O_CONFIG=m +CONFIG_I2O_CONFIG_OLD_IOCTL=y +CONFIG_I2O_BUS=m +CONFIG_I2O_BLOCK=m +CONFIG_I2O_SCSI=m +CONFIG_I2O_PROC=m +CONFIG_MACINTOSH_DRIVERS=y +CONFIG_MAC_EMUMOUSEBTN=y +CONFIG_NETDEVICES=y +# CONFIG_IFB is not set +CONFIG_DUMMY=m +CONFIG_BONDING=m +# CONFIG_MACVLAN is not set +CONFIG_EQUALIZER=m +CONFIG_TUN=m +CONFIG_VETH=m +CONFIG_NET_SB1000=m +CONFIG_ARCNET=m +CONFIG_ARCNET_1201=m +CONFIG_ARCNET_1051=m +CONFIG_ARCNET_RAW=m +CONFIG_ARCNET_CAP=m +CONFIG_ARCNET_COM90xx=m +CONFIG_ARCNET_COM90xxIO=m +CONFIG_ARCNET_RIM_I=m +# CONFIG_ARCNET_COM20020 is not set +CONFIG_PHYLIB=m + +# +# MII PHY device drivers +# +CONFIG_MARVELL_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_LXT_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_VITESSE_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_BROADCOM_PHY=m +CONFIG_ICPLUS_PHY=m +CONFIG_REALTEK_PHY=m +CONFIG_NATIONAL_PHY=m +CONFIG_STE10XP=m +CONFIG_LSI_ET1011C_PHY=m +# CONFIG_MDIO_BITBANG is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=m +CONFIG_HAPPYMEAL=m +CONFIG_SUNGEM=m +CONFIG_CASSINI=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_ENC28J60=m +# CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_DNET=m +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +# CONFIG_TULIP_MMIO is not set +CONFIG_TULIP_NAPI=y +CONFIG_TULIP_NAPI_HW_MITIGATION=y +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +CONFIG_PCMCIA_XIRCOM=m +CONFIG_HP100=m +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +CONFIG_NET_PCI=y +CONFIG_PCNET32=m +CONFIG_AMD8111_ETH=m +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +CONFIG_FORCEDETH=m +# CONFIG_FORCEDETH_NAPI is not set +CONFIG_E100=m +CONFIG_FEALNX=m +CONFIG_NATSEMI=m +CONFIG_NE2K_PCI=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +# CONFIG_8139TOO_PIO is not set +# CONFIG_8139TOO_TUNE_TWISTER is not set +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_R6040=m +CONFIG_SIS900=m +CONFIG_EPIC100=m +CONFIG_SMSC9420=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_TLAN=m +CONFIG_VIA_RHINE=m +# CONFIG_VIA_RHINE_MMIO is not set +CONFIG_SC92031=m +CONFIG_NET_POCKET=y +CONFIG_ATP=m +CONFIG_DE600=m +CONFIG_DE620=m +CONFIG_ATL2=m +CONFIG_NETDEV_1000=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_DL2K=m +CONFIG_E1000=m +CONFIG_E1000E=m +CONFIG_IP1000=m +CONFIG_IGB=m +# CONFIG_IGB_LRO is not set +CONFIG_IGB_DCA=y +CONFIG_NS83820=m +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_R8169=m +CONFIG_R8169_VLAN=y +CONFIG_SIS190=m +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +# CONFIG_SKY2 is not set +CONFIG_VIA_VELOCITY=m +CONFIG_TIGON3=m +CONFIG_BNX2=m +CONFIG_QLA3XXX=m +CONFIG_ATL1=m +CONFIG_ATL1E=m +CONFIG_ATL1C=m +CONFIG_JME=m +CONFIG_NETDEV_10000=y +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T3_DEPENDS=y +CONFIG_CHELSIO_T3=m +CONFIG_ENIC=m +CONFIG_IXGBE=m +CONFIG_IXGBE_DCA=y +CONFIG_IXGB=m +CONFIG_S2IO=m +CONFIG_MYRI10GE=m +CONFIG_MYRI10GE_DCA=y +CONFIG_NETXEN_NIC=m +CONFIG_NIU=m +CONFIG_MLX4_EN=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_TEHUTI=m +CONFIG_BNX2X=m +CONFIG_QLGE=m +CONFIG_SFC=m +CONFIG_SFC_MTD=y +CONFIG_BE2NET=m +CONFIG_TR=y +CONFIG_IBMOL=m +CONFIG_3C359=m +CONFIG_TMS380TR=m +CONFIG_TMSPCI=m +CONFIG_ABYSS=m + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +CONFIG_WLAN_80211=y +CONFIG_PCMCIA_RAYCS=m +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_CS=m +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_LIBERTAS_THINFIRM=m +CONFIG_LIBERTAS_THINFIRM_USB=m +CONFIG_AIRO=m +CONFIG_HERMES=m +CONFIG_HERMES_CACHE_FW_ON_INIT=y +CONFIG_PLX_HERMES=m +CONFIG_TMD_HERMES=m +CONFIG_NORTEL_HERMES=m +CONFIG_PCI_HERMES=m +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m +CONFIG_PCMCIA_ATMEL=m +CONFIG_AIRO_CS=m +CONFIG_PCMCIA_WL3501=m +CONFIG_PRISM54=m +CONFIG_USB_ZD1201=m +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_ADM8211=m +# CONFIG_MAC80211_HWSIM is not set +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_ATH5K=m +# CONFIG_ATH5K_DEBUG is not set +CONFIG_ATH9K=m +# CONFIG_ATH9K_DEBUG is not set +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBIPW=m +# CONFIG_LIBIPW_DEBUG is not set +CONFIG_IWLWIFI=m +CONFIG_IWLCORE=m +CONFIG_IWLWIFI_LEDS=y +CONFIG_IWLWIFI_RFKILL=y +# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLAGN=m +CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y +CONFIG_IWLAGN_LEDS=y +CONFIG_IWL4965=y +CONFIG_IWL5000=y +CONFIG_IWL3945=m +CONFIG_IWL3945_RFKILL=y +# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set +CONFIG_IWL3945_LEDS=y +# CONFIG_IWL3945_DEBUG is not set +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +CONFIG_HOSTAP_FIRMWARE_NVRAM=y +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +CONFIG_HOSTAP_CS=m +CONFIG_B43=m +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +CONFIG_B43_PCMCIA=y +CONFIG_B43_PIO=y +CONFIG_B43_LEDS=y +CONFIG_B43_RFKILL=y +# CONFIG_B43_DEBUG is not set +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_LEDS=y +CONFIG_B43LEGACY_RFKILL=y +CONFIG_B43LEGACY_DEBUG=y +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_RT2X00=m +CONFIG_RT2400PCI=m +CONFIG_RT2500PCI=m +CONFIG_RT61PCI=m +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_RFKILL=y +CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set + +# +# WiMAX Wireless Broadband devices +# +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_SDIO=m +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SMSC95XX=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +# CONFIG_USB_EPSON2888 is not set +# CONFIG_USB_KC2190 is not set +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_HSO=m +CONFIG_NET_PCMCIA=y +CONFIG_PCMCIA_3C589=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_PCMCIA_PCNET=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_PCMCIA_XIRC2PS=m +CONFIG_PCMCIA_AXNET=m +CONFIG_PCMCIA_IBMTR=m +CONFIG_WAN=y +CONFIG_LANMEDIA=m +CONFIG_HDLC=m +CONFIG_HDLC_RAW=m +CONFIG_HDLC_RAW_ETH=m +CONFIG_HDLC_CISCO=m +CONFIG_HDLC_FR=m +CONFIG_HDLC_PPP=m +CONFIG_HDLC_X25=m +CONFIG_PCI200SYN=m +CONFIG_WANXL=m +# CONFIG_PC300TOO is not set +CONFIG_FARSYNC=m +# CONFIG_DSCC4 is not set +CONFIG_DLCI=m +CONFIG_DLCI_MAX=8 +# CONFIG_WAN_ROUTER_DRIVERS is not set +CONFIG_LAPBETHER=m +CONFIG_X25_ASY=m +# CONFIG_SBNI is not set +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +CONFIG_ATM_TCP=m +CONFIG_ATM_LANAI=m +CONFIG_ATM_ENI=m +# CONFIG_ATM_ENI_DEBUG is not set +# CONFIG_ATM_ENI_TUNE_BURST is not set +CONFIG_ATM_FIRESTREAM=m +CONFIG_ATM_ZATM=m +# CONFIG_ATM_ZATM_DEBUG is not set +CONFIG_ATM_IDT77252=m +# CONFIG_ATM_IDT77252_DEBUG is not set +CONFIG_ATM_IDT77252_RCV_ALL=y +CONFIG_ATM_IDT77252_USE_SUNI=y +# CONFIG_ATM_AMBASSADOR is not set +CONFIG_ATM_HORIZON=m +# CONFIG_ATM_HORIZON_DEBUG is not set +CONFIG_ATM_IA=m +# CONFIG_ATM_IA_DEBUG is not set +CONFIG_ATM_FORE200E=m +CONFIG_ATM_FORE200E_USE_TASKLET=y +CONFIG_ATM_FORE200E_TX_RETRY=16 +CONFIG_ATM_FORE200E_DEBUG=0 +CONFIG_ATM_HE=m +CONFIG_ATM_HE_USE_SUNI=y +CONFIG_ATM_SOLOS=m +CONFIG_XEN_NETDEV_FRONTEND=m +CONFIG_FDDI=y +CONFIG_DEFXX=m +# CONFIG_DEFXX_MMIO is not set +CONFIG_SKFP=m +CONFIG_HIPPI=y +CONFIG_ROADRUNNER=m +CONFIG_ROADRUNNER_LARGE_RINGS=y +CONFIG_PLIP=m +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +CONFIG_PPPOATM=m +# CONFIG_PPPOL2TP is not set +CONFIG_SLIP=m +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLHC=m +CONFIG_SLIP_SMART=y +CONFIG_SLIP_MODE_SLIP6=y +CONFIG_NET_FC=y +CONFIG_NETCONSOLE=m +# CONFIG_NETCONSOLE_DYNAMIC is not set +CONFIG_NETPOLL=y +CONFIG_NETPOLL_TRAP=y +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_VIRTIO_NET=m +# CONFIG_ISDN is not set +CONFIG_PHONE=m +CONFIG_PHONE_IXJ=m +CONFIG_PHONE_IXJ_PCMCIA=m + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=m +CONFIG_INPUT_POLLDEV=m + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set +CONFIG_XEN_KBDDEV_FRONTEND=m + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_SUNKBD=m +# CONFIG_KEYBOARD_LKKBD is not set +CONFIG_KEYBOARD_XTKBD=m +CONFIG_KEYBOARD_NEWTON=m +CONFIG_KEYBOARD_STOWAWAY=m +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +CONFIG_MOUSE_PS2_ELANTECH=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_SERIAL=m +CONFIG_MOUSE_APPLETOUCH=m +CONFIG_MOUSE_BCM5974=m +# CONFIG_MOUSE_VSXXXAA is not set +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_ANALOG=m +CONFIG_JOYSTICK_A3D=m +CONFIG_JOYSTICK_ADI=m +CONFIG_JOYSTICK_COBRA=m +CONFIG_JOYSTICK_GF2K=m +CONFIG_JOYSTICK_GRIP=m +CONFIG_JOYSTICK_GRIP_MP=m +CONFIG_JOYSTICK_GUILLEMOT=m +CONFIG_JOYSTICK_INTERACT=m +CONFIG_JOYSTICK_SIDEWINDER=m +CONFIG_JOYSTICK_TMDC=m +CONFIG_JOYSTICK_IFORCE=m +CONFIG_JOYSTICK_IFORCE_USB=y +CONFIG_JOYSTICK_IFORCE_232=y +CONFIG_JOYSTICK_WARRIOR=m +CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_SPACEORB=m +CONFIG_JOYSTICK_SPACEBALL=m +CONFIG_JOYSTICK_STINGER=m +CONFIG_JOYSTICK_TWIDJOY=m +# CONFIG_JOYSTICK_ZHENHUA is not set +CONFIG_JOYSTICK_DB9=m +CONFIG_JOYSTICK_GAMECON=m +CONFIG_JOYSTICK_TURBOGRAFX=m +CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y +CONFIG_JOYSTICK_WALKERA0701=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_WACOM=m +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_FUJITSU=m +CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_WACOM_W8001=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_INEXIO=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_WM97XX=m +CONFIG_TOUCHSCREEN_WM9705=y +CONFIG_TOUCHSCREEN_WM9712=y +CONFIG_TOUCHSCREEN_WM9713=y +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_TOUCHSCREEN_TOUCHIT213=m +CONFIG_TOUCHSCREEN_TSC2007=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_PCSPKR=m +CONFIG_INPUT_APANEL=m +CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_ATI_REMOTE=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +CONFIG_INPUT_UINPUT=m +CONFIG_INPUT_PCF50633_PMU=m + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=m +CONFIG_SERIO_CT82C710=m +CONFIG_SERIO_PARKBD=m +CONFIG_SERIO_PCIPS2=m +CONFIG_SERIO_LIBPS2=y +CONFIG_SERIO_RAW=m +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_DEVKMEM=y +CONFIG_SERIAL_NONSTANDARD=y +# CONFIG_COMPUTONE is not set +CONFIG_ROCKETPORT=m +CONFIG_CYCLADES=m +# CONFIG_CYZ_INTR is not set +CONFIG_DIGIEPCA=m +# CONFIG_MOXA_INTELLIO is not set +CONFIG_MOXA_SMARTIO=m +# CONFIG_ISI is not set +CONFIG_SYNCLINK=m +CONFIG_SYNCLINKMP=m +CONFIG_SYNCLINK_GT=m +CONFIG_N_HDLC=m +CONFIG_RISCOM8=m +# CONFIG_SPECIALIX is not set +CONFIG_SX=m +CONFIG_RIO=m +CONFIG_RIO_OLDPCI=y +CONFIG_STALDRV=y +CONFIG_STALLION=m +CONFIG_ISTALLION=m +CONFIG_NOZOMI=m + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_PNP=y +CONFIG_SERIAL_8250_CS=m +CONFIG_SERIAL_8250_NR_UARTS=8 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +CONFIG_SERIAL_8250_RSA=y + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_JSM=m +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +CONFIG_PRINTER=m +# CONFIG_LP_CONSOLE is not set +CONFIG_PPDEV=m +CONFIG_HVC_DRIVER=y +CONFIG_HVC_IRQ=y +CONFIG_HVC_XEN=y +CONFIG_VIRTIO_CONSOLE=m +CONFIG_IPMI_HANDLER=m +CONFIG_IPMI_PANIC_EVENT=y +CONFIG_IPMI_PANIC_STRING=y +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_IPMI_WATCHDOG=m +CONFIG_IPMI_POWEROFF=m +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_AMD=m +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_NVRAM=m +CONFIG_R3964=m +CONFIG_APPLICOM=m + +# +# PCMCIA character devices +# +CONFIG_SYNCLINK_CS=m +CONFIG_CARDMAN_4000=m +CONFIG_CARDMAN_4040=m +CONFIG_IPWIRELESS=m +CONFIG_MWAVE=m +CONFIG_PC8736x_GPIO=m +CONFIG_NSC_GPIO=m +CONFIG_RAW_DRIVER=m +CONFIG_MAX_RAW_DEVS=4096 +CONFIG_HPET=y +CONFIG_HPET_MMAP=y +CONFIG_HANGCHECK_TIMER=m +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TELCLOCK=m +CONFIG_DEVPORT=y +CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +CONFIG_I2C_ALI1535=m +CONFIG_I2C_ALI1563=m +CONFIG_I2C_ALI15X3=m +CONFIG_I2C_AMD756=m +CONFIG_I2C_AMD756_S4882=m +CONFIG_I2C_AMD8111=m +CONFIG_I2C_I801=m +CONFIG_I2C_ISCH=m +CONFIG_I2C_PIIX4=m +CONFIG_I2C_NFORCE2=m +CONFIG_I2C_NFORCE2_S4985=m +CONFIG_I2C_SIS5595=m +CONFIG_I2C_SIS630=m +CONFIG_I2C_SIS96X=m +CONFIG_I2C_VIA=m +CONFIG_I2C_VIAPRO=m + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_OCORES=m +CONFIG_I2C_SIMTEC=m + +# +# External I2C/SMBus adapter drivers +# +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_TAOS_EVM=m +CONFIG_I2C_TINY_USB=m + +# +# Graphics adapter I2C/DDC channel drivers +# +CONFIG_I2C_VOODOO3=m + +# +# Other I2C/SMBus bus drivers +# +CONFIG_I2C_PCA_PLATFORM=m +CONFIG_I2C_STUB=m + +# +# Miscellaneous I2C Chip support +# +CONFIG_DS1682=m +CONFIG_SENSORS_PCF8574=m +CONFIG_PCF8575=m +# CONFIG_SENSORS_PCA9539 is not set +CONFIG_SENSORS_PCF8591=m +CONFIG_SENSORS_MAX6875=m +CONFIG_SENSORS_TSL2550=m +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_BITBANG=m +# CONFIG_SPI_BUTTERFLY is not set +CONFIG_SPI_LM70_LLP=m + +# +# SPI Protocol Masters +# +CONFIG_SPI_SPIDEV=m +CONFIG_SPI_TLE62X0=m +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +# CONFIG_GPIOLIB is not set +CONFIG_W1=m +CONFIG_W1_CON=y + +# +# 1-wire Bus Masters +# +CONFIG_W1_MASTER_MATROX=m +CONFIG_W1_MASTER_DS2490=m +CONFIG_W1_MASTER_DS2482=m + +# +# 1-wire Slaves +# +CONFIG_W1_SLAVE_THERM=m +CONFIG_W1_SLAVE_SMEM=m +CONFIG_W1_SLAVE_DS2431=m +CONFIG_W1_SLAVE_DS2433=m +# CONFIG_W1_SLAVE_DS2433_CRC is not set +CONFIG_W1_SLAVE_DS2760=m +CONFIG_W1_SLAVE_BQ27000=m +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +# CONFIG_PDA_POWER is not set +CONFIG_WM8350_POWER=m +# CONFIG_BATTERY_DS2760 is not set +CONFIG_BATTERY_BQ27x00=m +CONFIG_CHARGER_PCF50633=m +CONFIG_HWMON=m +CONFIG_HWMON_VID=m +CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7414=m +CONFIG_SENSORS_AD7418=m +CONFIG_SENSORS_ADCXX=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7462=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7473=m +CONFIG_SENSORS_ADT7475=m +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m +CONFIG_SENSORS_FSCHER=m +CONFIG_SENSORS_FSCPOS=m +CONFIG_SENSORS_FSCHMD=m +CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IBMAEM=m +CONFIG_SENSORS_IBMPEX=m +CONFIG_SENSORS_IT87=m +CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM70=m +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +CONFIG_SENSORS_LM87=m +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_LTC4245=m +CONFIG_SENSORS_MAX1111=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_DME1737=m +CONFIG_SENSORS_SMSC47M1=m +CONFIG_SENSORS_SMSC47M192=m +CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_THMC50=m +CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m +CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m +CONFIG_SENSORS_W83627HF=m +CONFIG_SENSORS_W83627EHF=m +CONFIG_SENSORS_HDAPS=m +CONFIG_SENSORS_LIS3LV02D=m +CONFIG_SENSORS_APPLESMC=m +# CONFIG_HWMON_DEBUG_CHIP is not set +CONFIG_THERMAL=y +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_WM8350_WATCHDOG=m +CONFIG_ACQUIRE_WDT=m +CONFIG_ADVANTECH_WDT=m +CONFIG_ALIM1535_WDT=m +CONFIG_ALIM7101_WDT=m +CONFIG_SC520_WDT=m +CONFIG_EUROTECH_WDT=m +CONFIG_IB700_WDT=m +CONFIG_IBMASR=m +CONFIG_WAFER_WDT=m +CONFIG_I6300ESB_WDT=m +CONFIG_ITCO_WDT=m +CONFIG_ITCO_VENDOR_SUPPORT=y +CONFIG_IT8712F_WDT=m +CONFIG_IT87_WDT=m +CONFIG_HP_WATCHDOG=m +CONFIG_SC1200_WDT=m +CONFIG_PC87413_WDT=m +CONFIG_60XX_WDT=m +CONFIG_SBC8360_WDT=m +CONFIG_CPU5_WDT=m +CONFIG_SMSC_SCH311X_WDT=m +CONFIG_SMSC37B787_WDT=m +CONFIG_W83627HF_WDT=m +CONFIG_W83697HF_WDT=m +CONFIG_W83697UG_WDT=m +CONFIG_W83877F_WDT=m +CONFIG_W83977F_WDT=m +CONFIG_MACHZ_WDT=m +CONFIG_SBC_EPX_C3_WATCHDOG=m + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m +CONFIG_WDT_501_PCI=y + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +CONFIG_SSB=m +CONFIG_SSB_SPROM=y +CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_SSB_PCMCIAHOST_POSSIBLE=y +CONFIG_SSB_PCMCIAHOST=y +# CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y + +# +# Multifunction device drivers +# +CONFIG_MFD_CORE=m +CONFIG_MFD_SM501=m +CONFIG_HTC_PASIC3=m +# CONFIG_MFD_TMIO is not set +CONFIG_MFD_WM8400=m +CONFIG_MFD_WM8350=m +CONFIG_MFD_WM8350_I2C=m +CONFIG_MFD_PCF50633=m +CONFIG_PCF50633_ADC=m +CONFIG_PCF50633_GPIO=m +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +# CONFIG_REGULATOR_FIXED_VOLTAGE is not set +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +CONFIG_REGULATOR_BQ24022=m +CONFIG_REGULATOR_WM8350=m +CONFIG_REGULATOR_WM8400=m +CONFIG_REGULATOR_PCF50633=m + +# +# Multimedia devices +# + +# +# Multimedia core support +# +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L2_COMMON=m +CONFIG_VIDEO_ALLOW_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +CONFIG_DVB_CORE=m +CONFIG_VIDEO_MEDIA=m + +# +# Multimedia drivers +# +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_VIDEO_V4L2=m +CONFIG_VIDEO_V4L1=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_IR=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_TUNER=m +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +CONFIG_VIDEO_IR_I2C=m +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TDA9875=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_M52790=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA7111=m +CONFIG_VIDEO_SAA7114=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_VPX3220=m +CONFIG_VIDEO_CX25840=m +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m +CONFIG_VIDEO_VIVI=m +CONFIG_VIDEO_BT848=m +CONFIG_VIDEO_BT848_DVB=y +CONFIG_VIDEO_SAA6588=m +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_W9966=m +CONFIG_VIDEO_CPIA=m +CONFIG_VIDEO_CPIA_PP=m +CONFIG_VIDEO_CPIA_USB=m +# CONFIG_VIDEO_CPIA2 is not set +CONFIG_VIDEO_SAA5246A=m +CONFIG_VIDEO_SAA5249=m +CONFIG_VIDEO_STRADIS=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +# CONFIG_VIDEO_ZORAN_AVS6EYES is not set +CONFIG_VIDEO_MEYE=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_MPEG=m +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX23885=m +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_CX18=m +CONFIG_VIDEO_CAFE_CCIC=m +CONFIG_SOC_CAMERA=m +CONFIG_SOC_CAMERA_MT9M001=m +CONFIG_SOC_CAMERA_MT9M111=m +CONFIG_SOC_CAMERA_MT9T031=m +CONFIG_SOC_CAMERA_MT9V022=m +CONFIG_SOC_CAMERA_TW9910=m +CONFIG_SOC_CAMERA_PLATFORM=m +CONFIG_SOC_CAMERA_OV772X=m +CONFIG_V4L_USB_DRIVERS=y +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m +CONFIG_USB_GSPCA_CONEX=m +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_MARS=m +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_OV534=m +CONFIG_USB_GSPCA_PAC207=m +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_STK014=m +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DVB=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_USBVIDEO=m +CONFIG_USB_VICAM=m +CONFIG_USB_IBMCAM=m +CONFIG_USB_KONICAWC=m +CONFIG_USB_QUICKCAM_MESSENGER=m +CONFIG_USB_ET61X251=m +CONFIG_VIDEO_OVCAMCHIP=m +CONFIG_USB_W9968CF=m +CONFIG_USB_OV511=m +CONFIG_USB_SE401=m +CONFIG_USB_SN9C102=m +CONFIG_USB_STV680=m +CONFIG_USB_ZC0301=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_GEMTEK_PCI=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_MAESTRO=m +CONFIG_USB_DSBR=m +CONFIG_USB_SI470X=m +CONFIG_USB_MR800=m +CONFIG_RADIO_TEA5764=m +CONFIG_DVB_DYNAMIC_MINORS=y +CONFIG_DVB_CAPTURE_DRIVERS=y + +# +# Supported SAA7146 based PCI Adapters +# +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_AV7110=m +# CONFIG_DVB_AV7110_FIRMWARE is not set +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m + +# +# Supported USB Adapters +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_DVB_SIANO_SMS1XXX=m +CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS=y + +# +# Supported FlexCopII (B2C2) Adapters +# +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set + +# +# Supported BT878 Adapters +# +CONFIG_DVB_BT8XX=m + +# +# Supported Pluto2 Adapters +# +# CONFIG_DVB_PLUTO2 is not set + +# +# Supported SDMC DM1105 Adapters +# +CONFIG_DVB_DM1105=m + +# +# Supported FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_IEEE1394=y +CONFIG_DVB_FIREDTV_INPUT=y + +# +# Supported DVB Frontends +# + +# +# Customise DVB Frontends +# +# CONFIG_DVB_FE_CUSTOMISE is not set + +# +# Multistandard (satellite) frontends +# +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0288=m +CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_TDA8261=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUA6100=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_SI21XX=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_DRX397XD=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +CONFIG_DVB_TDA10048=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LGDT3304=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_S5H1411=m + +# +# ISDB-T (terrestrial) frontends +# +CONFIG_DVB_S921=m + +# +# Digital terrestrial only tuners/PLL +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TUNER_DIB0070=m + +# +# SEC control devices for DVB-S +# +CONFIG_DVB_LNBP21=m +CONFIG_DVB_ISL6405=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_LGS8GL5=m + +# +# Tools to develop new frontends +# +# CONFIG_DVB_DUMMY_FE is not set +CONFIG_DVB_AF9013=m +CONFIG_DAB=y +CONFIG_USB_DABUSB=m + +# +# Graphics support +# +CONFIG_AGP=y +CONFIG_AGP_AMD64=y +CONFIG_AGP_INTEL=m +CONFIG_AGP_SIS=m +CONFIG_AGP_VIA=m +CONFIG_DRM=m +CONFIG_DRM_TDFX=m +CONFIG_DRM_R128=m +CONFIG_DRM_RADEON=m +CONFIG_DRM_I810=m +CONFIG_DRM_I830=m +CONFIG_DRM_I915=m +# CONFIG_DRM_I915_KMS is not set +CONFIG_DRM_MGA=m +CONFIG_DRM_SIS=m +CONFIG_DRM_VIA=m +CONFIG_DRM_SAVAGE=m +CONFIG_VGASTATE=m +CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +CONFIG_FB_DDC=m +CONFIG_FB_BOOT_VESA_SUPPORT=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=m +CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_HECUBA=m +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +CONFIG_FB_BACKLIGHT=y +CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +CONFIG_FB_CIRRUS=m +CONFIG_FB_PM2=m +CONFIG_FB_PM2_FIFO_DISCONNECT=y +CONFIG_FB_CYBER2000=m +CONFIG_FB_ARC=m +# CONFIG_FB_ASILIANT is not set +CONFIG_FB_IMSTT=y +CONFIG_FB_VGA16=m +CONFIG_FB_UVESA=m +CONFIG_FB_VESA=y +# CONFIG_FB_EFI is not set +CONFIG_FB_N411=m +CONFIG_FB_HGA=m +CONFIG_FB_HGA_ACCEL=y +CONFIG_FB_S1D13XXX=m +CONFIG_FB_NVIDIA=m +CONFIG_FB_NVIDIA_I2C=y +# CONFIG_FB_NVIDIA_DEBUG is not set +CONFIG_FB_NVIDIA_BACKLIGHT=y +CONFIG_FB_RIVA=m +CONFIG_FB_RIVA_I2C=y +# CONFIG_FB_RIVA_DEBUG is not set +CONFIG_FB_RIVA_BACKLIGHT=y +CONFIG_FB_LE80578=m +CONFIG_FB_CARILLO_RANCH=m +CONFIG_FB_INTEL=m +# CONFIG_FB_INTEL_DEBUG is not set +CONFIG_FB_INTEL_I2C=y +# CONFIG_FB_MATROX is not set +CONFIG_FB_RADEON=m +CONFIG_FB_RADEON_I2C=y +CONFIG_FB_RADEON_BACKLIGHT=y +# CONFIG_FB_RADEON_DEBUG is not set +# CONFIG_FB_ATY128 is not set +CONFIG_FB_ATY=m +CONFIG_FB_ATY_CT=y +CONFIG_FB_ATY_GENERIC_LCD=y +CONFIG_FB_ATY_GX=y +CONFIG_FB_ATY_BACKLIGHT=y +# CONFIG_FB_S3 is not set +CONFIG_FB_SAVAGE=m +CONFIG_FB_SAVAGE_I2C=y +CONFIG_FB_SAVAGE_ACCEL=y +CONFIG_FB_SIS=m +CONFIG_FB_SIS_300=y +CONFIG_FB_SIS_315=y +CONFIG_FB_VIA=m +CONFIG_FB_NEOMAGIC=m +CONFIG_FB_KYRO=m +CONFIG_FB_3DFX=m +CONFIG_FB_3DFX_ACCEL=y +CONFIG_FB_VOODOO1=m +# CONFIG_FB_VT8623 is not set +CONFIG_FB_TRIDENT=m +CONFIG_FB_TRIDENT_ACCEL=y +# CONFIG_FB_ARK is not set +CONFIG_FB_PM3=m +CONFIG_FB_CARMINE=m +CONFIG_FB_CARMINE_DRAM_EVAL=y +# CONFIG_CARMINE_DRAM_CUSTOM is not set +CONFIG_FB_GEODE=y +CONFIG_FB_GEODE_LX=m +CONFIG_FB_GEODE_GX=m +CONFIG_FB_GEODE_GX1=m +CONFIG_FB_TMIO=m +CONFIG_FB_TMIO_ACCELL=y +CONFIG_FB_SM501=m +# CONFIG_FB_VIRTUAL is not set +CONFIG_XEN_FBDEV_FRONTEND=m +CONFIG_FB_METRONOME=m +CONFIG_FB_MB862XX=m +CONFIG_FB_MB862XX_PCI_GDC=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_LTV350QV=m +CONFIG_LCD_ILI9320=m +CONFIG_LCD_TDO24M=m +CONFIG_LCD_VGG2432A4=m +CONFIG_LCD_PLATFORM=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_GENERIC=m +CONFIG_BACKLIGHT_PROGEAR=m +CONFIG_BACKLIGHT_CARILLO_RANCH=m +CONFIG_BACKLIGHT_MBP_NVIDIA=m +CONFIG_BACKLIGHT_SAHARA=m + +# +# Display device support +# +CONFIG_DISPLAY_SUPPORT=m + +# +# Display hardware drivers +# + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +# CONFIG_VGACON_SOFT_SCROLLBACK is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_LOGO is not set +CONFIG_SOUND=m +CONFIG_SOUND_OSS_CORE=y +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_HRTIMER=m +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +CONFIG_SND_VERBOSE_PRINTK=y +CONFIG_SND_DEBUG=y +# CONFIG_SND_DEBUG_VERBOSE is not set +# CONFIG_SND_PCM_XRUN_DEBUG is not set +CONFIG_SND_VMASTER=y +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DRIVERS=y +CONFIG_SND_PCSP=m +CONFIG_SND_DUMMY=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_MTS64=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m +CONFIG_SND_PORTMAN2X4=m +CONFIG_SND_AC97_POWER_SAVE=y +CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 +CONFIG_SND_SB_COMMON=m +CONFIG_SND_SB16_DSP=m +CONFIG_SND_PCI=y +CONFIG_SND_AD1889=m +CONFIG_SND_ALS300=m +CONFIG_SND_ALS4000=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +CONFIG_SND_AW2=m +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_OXYGEN_LIB=m +CONFIG_SND_OXYGEN=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CS5530=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_FM801=m +CONFIG_SND_FM801_TEA575X_BOOL=y +CONFIG_SND_FM801_TEA575X=m +CONFIG_SND_HDA_INTEL=m +# CONFIG_SND_HDA_HWDEP is not set +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_CODEC_REALTEK=y +CONFIG_SND_HDA_CODEC_ANALOG=y +CONFIG_SND_HDA_CODEC_SIGMATEL=y +CONFIG_SND_HDA_CODEC_VIA=y +CONFIG_SND_HDA_CODEC_ATIHDMI=y +CONFIG_SND_HDA_CODEC_NVHDMI=y +CONFIG_SND_HDA_CODEC_INTELHDMI=y +CONFIG_SND_HDA_ELD=y +CONFIG_SND_HDA_CODEC_CONEXANT=y +CONFIG_SND_HDA_CODEC_CMEDIA=y +CONFIG_SND_HDA_CODEC_SI3054=y +CONFIG_SND_HDA_GENERIC=y +# CONFIG_SND_HDA_POWER_SAVE is not set +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_HIFIER=m +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +CONFIG_SND_MAESTRO3=m +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VIRTUOSO=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m +CONFIG_SND_SPI=y +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_USB_US122L=m +CONFIG_SND_PCMCIA=y +CONFIG_SND_VXPOCKET=m +CONFIG_SND_PDAUDIOCF=m +# CONFIG_SND_SOC is not set +CONFIG_SOUND_PRIME=m +CONFIG_SOUND_OSS=m +CONFIG_SOUND_TRACEINIT=y +CONFIG_SOUND_DMAP=y +CONFIG_SOUND_SSCAPE=m +CONFIG_SOUND_VMIDI=m +CONFIG_SOUND_TRIX=m +CONFIG_SOUND_MSS=m +CONFIG_SOUND_MPU401=m +CONFIG_SOUND_PAS=m +CONFIG_SOUND_PSS=m +CONFIG_PSS_MIXER=y +# CONFIG_PSS_HAVE_BOOT is not set +CONFIG_SOUND_SB=m +CONFIG_SOUND_YM3812=m +CONFIG_SOUND_UART6850=m +CONFIG_SOUND_AEDSP16=m +CONFIG_SC6600=y +CONFIG_SC6600_JOY=y +CONFIG_SC6600_CDROM=4 +CONFIG_SC6600_CDROMBASE=0x0 +CONFIG_SOUND_KAHLUA=m +CONFIG_AC97_BUS=m +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set +CONFIG_HIDRAW=y + +# +# USB Input Devices +# +CONFIG_USB_HID=m +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y + +# +# Special HID drivers +# +# CONFIG_HID_COMPAT is not set +CONFIG_HID_A4TECH=m +CONFIG_HID_APPLE=m +CONFIG_HID_BELKIN=m +CONFIG_HID_CHERRY=m +CONFIG_HID_CHICONY=m +CONFIG_HID_CYPRESS=m +CONFIG_HID_EZKEY=m +CONFIG_HID_GYRATION=m +CONFIG_HID_LOGITECH=m +CONFIG_LOGITECH_FF=y +CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_HID_MICROSOFT=m +CONFIG_HID_MONTEREY=m +CONFIG_HID_NTRIG=m +CONFIG_HID_PANTHERLORD=m +CONFIG_PANTHERLORD_FF=y +CONFIG_HID_PETALYNX=m +CONFIG_HID_SAMSUNG=m +CONFIG_HID_SONY=m +CONFIG_HID_SUNPLUS=m +CONFIG_GREENASIA_FF=m +CONFIG_HID_TOPSEED=m +CONFIG_THRUSTMASTER_FF=m +CONFIG_ZEROPLUS_FF=m +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +CONFIG_USB_DEVICE_CLASS=y +# CONFIG_USB_DYNAMIC_MINORS is not set +CONFIG_USB_SUSPEND=y +# CONFIG_USB_OTG is not set +CONFIG_USB_MON=m +CONFIG_USB_WUSB=m +CONFIG_USB_WUSB_CBAF=m +# CONFIG_USB_WUSB_CBAF_DEBUG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_C67X00_HCD=m +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_ROOT_HUB_TT=y +# CONFIG_USB_EHCI_TT_NEWSCHED is not set +CONFIG_USB_OXU210HP_HCD=m +CONFIG_USB_ISP116X_HCD=m +CONFIG_USB_ISP1760_HCD=m +CONFIG_USB_OHCI_HCD=m +CONFIG_USB_OHCI_HCD_SSB=y +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_UHCI_HCD=m +CONFIG_USB_U132_HCD=m +CONFIG_USB_SL811_HCD=m +CONFIG_USB_SL811_CS=m +CONFIG_USB_R8A66597_HCD=m +CONFIG_USB_WHCI_HCD=m +CONFIG_USB_HWA_HCD=m + +# +# Enable Host or Gadget support to see Inventra options +# + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; +# + +# +# see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_DATAFAB=y +CONFIG_USB_STORAGE_FREECOM=y +CONFIG_USB_STORAGE_ISD200=y +CONFIG_USB_STORAGE_USBAT=y +CONFIG_USB_STORAGE_SDDR09=y +CONFIG_USB_STORAGE_SDDR55=y +CONFIG_USB_STORAGE_JUMPSHOT=y +# CONFIG_USB_STORAGE_ALAUDA is not set +CONFIG_USB_STORAGE_ONETOUCH=y +CONFIG_USB_STORAGE_KARMA=y +CONFIG_USB_STORAGE_CYPRESS_ATACB=y +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m + +# +# USB port drivers +# +CONFIG_USB_USS720=m +CONFIG_USB_SERIAL=m +CONFIG_USB_EZUSB=y +CONFIG_USB_SERIAL_GENERIC=y +# CONFIG_USB_SERIAL_AIRCABLE is not set +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP2101=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +# CONFIG_USB_SERIAL_FUNSOFT is not set +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MOTOROLA=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +CONFIG_USB_SERIAL_SAFE_PADDED=y +CONFIG_USB_SERIAL_SIEMENS_MPI=m +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +# CONFIG_USB_SERIAL_DEBUG is not set + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_SEVSEG=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_BERRY_CHARGE=m +CONFIG_USB_LED=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_PHIDGET=m +CONFIG_USB_PHIDGETKIT=m +CONFIG_USB_PHIDGETMOTORCONTROL=m +CONFIG_USB_PHIDGETSERVO=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +# CONFIG_USB_SISUSBVGA_CON is not set +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m +# CONFIG_USB_TEST is not set +CONFIG_USB_ISIGHTFW=m +CONFIG_USB_VST=m +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m +# CONFIG_USB_GADGET is not set + +# +# OTG and related infrastructure +# +CONFIG_UWB=m +CONFIG_UWB_HWA=m +CONFIG_UWB_WHCI=m +CONFIG_UWB_WLP=m +CONFIG_UWB_I1480U=m +CONFIG_UWB_I1480U_WLP=m +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=m +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +# CONFIG_MMC_SDHCI is not set +CONFIG_MMC_WBSD=m +CONFIG_MMC_TIFM_SD=m +# CONFIG_MMC_SPI is not set +CONFIG_MMC_SDRICOH_CS=m +CONFIG_MEMSTICK=m +# CONFIG_MEMSTICK_DEBUG is not set + +# +# MemoryStick drivers +# +# CONFIG_MEMSTICK_UNSAFE_RESUME is not set +CONFIG_MSPRO_BLOCK=m + +# +# MemoryStick Host Controller Drivers +# +CONFIG_MEMSTICK_TIFM_MS=m +CONFIG_MEMSTICK_JMICRON_38X=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=m + +# +# LED drivers +# +CONFIG_LEDS_ALIX2=m +CONFIG_LEDS_PCA9532=m +CONFIG_LEDS_CLEVO_MAIL=m +CONFIG_LEDS_PCA955X=m +CONFIG_LEDS_WM8350=m + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_IDE_DISK=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m +CONFIG_ACCESSIBILITY=y +# CONFIG_A11Y_BRAILLE_CONSOLE is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_IPATH=m +CONFIG_INFINIBAND_AMSO1100=m +# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_MLX4_INFINIBAND=m +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_INFINIBAND_IPOIB=m +# CONFIG_INFINIBAND_IPOIB_CM is not set +CONFIG_INFINIBAND_IPOIB_DEBUG=y +# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set +# CONFIG_INFINIBAND_SRP is not set +# CONFIG_INFINIBAND_ISER is not set +# CONFIG_EDAC is not set +CONFIG_RTC_LIB=m +CONFIG_RTC_CLASS=m + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_DS1374=m +CONFIG_RTC_DRV_DS1672=m +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_M41T80=m +CONFIG_RTC_DRV_M41T80_WDT=y +CONFIG_RTC_DRV_S35390A=m +CONFIG_RTC_DRV_FM3130=m +CONFIG_RTC_DRV_RX8581=m + +# +# SPI RTC drivers +# +CONFIG_RTC_DRV_M41T94=m +CONFIG_RTC_DRV_DS1305=m +CONFIG_RTC_DRV_DS1390=m +CONFIG_RTC_DRV_MAX6902=m +CONFIG_RTC_DRV_R9701=m +CONFIG_RTC_DRV_RS5C348=m +CONFIG_RTC_DRV_DS3234=m + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=m +CONFIG_RTC_DRV_DS1286=m +CONFIG_RTC_DRV_DS1511=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_STK17TA8=m +CONFIG_RTC_DRV_M48T86=m +CONFIG_RTC_DRV_M48T35=m +CONFIG_RTC_DRV_M48T59=m +CONFIG_RTC_DRV_BQ4802=m +CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_WM8350=m +CONFIG_RTC_DRV_PCF50633=m + +# +# on-CPU RTC drivers +# +CONFIG_DMADEVICES=y + +# +# DMA Devices +# +CONFIG_INTEL_IOATDMA=m +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +CONFIG_NET_DMA=y +# CONFIG_DMATEST is not set +CONFIG_DCA=m +CONFIG_AUXDISPLAY=y +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +# CONFIG_CFAG12864B is not set +CONFIG_UIO=m +CONFIG_UIO_CIF=m +CONFIG_UIO_PDRV=m +CONFIG_UIO_PDRV_GENIRQ=m +# CONFIG_UIO_SMX is not set +CONFIG_UIO_SERCOS3=m +CONFIG_XEN_BALLOON=y +CONFIG_XEN_SCRUB_PAGES=y +CONFIG_XENFS=m +CONFIG_XEN_COMPAT_XENFS=y +# CONFIG_STAGING is not set +CONFIG_X86_PLATFORM_DEVICES=y +CONFIG_ACER_WMI=m +CONFIG_ASUS_LAPTOP=m +CONFIG_FUJITSU_LAPTOP=m +# CONFIG_FUJITSU_LAPTOP_DEBUG is not set +CONFIG_HP_WMI=m +CONFIG_MSI_LAPTOP=m +CONFIG_PANASONIC_LAPTOP=m +CONFIG_COMPAL_LAPTOP=m +CONFIG_SONY_LAPTOP=m +CONFIG_SONYPI_COMPAT=y +CONFIG_THINKPAD_ACPI=m +# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set +# CONFIG_THINKPAD_ACPI_DEBUG is not set +CONFIG_THINKPAD_ACPI_BAY=y +CONFIG_THINKPAD_ACPI_VIDEO=y +CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y +CONFIG_INTEL_MENLOW=m +CONFIG_EEEPC_LAPTOP=m +CONFIG_ACPI_WMI=m +CONFIG_ACPI_ASUS=m +CONFIG_ACPI_TOSHIBA=m + +# +# Firmware Drivers +# +CONFIG_EDD=m +# CONFIG_EDD_OFF is not set +CONFIG_FIRMWARE_MEMMAP=y +CONFIG_EFI_VARS=m +CONFIG_DELL_RBU=m +CONFIG_DCDBAS=m +CONFIG_DMIID=y +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m + +# +# File systems +# +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y +CONFIG_EXT2_FS_XIP=y +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +CONFIG_EXT4_FS=m +# CONFIG_EXT4DEV_COMPAT is not set +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +CONFIG_FS_XIP=y +CONFIG_JBD=m +CONFIG_JBD_DEBUG=y +CONFIG_JBD2=m +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=y +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +CONFIG_JFS_STATISTICS=y +CONFIG_FS_POSIX_ACL=y +CONFIG_FILE_LOCKING=y +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +# CONFIG_XFS_DEBUG is not set +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_DLM=m +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_FS_O2CB=m +CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +CONFIG_OCFS2_FS_STATS=y +# CONFIG_OCFS2_DEBUG_MASKLOG is not set +# CONFIG_OCFS2_DEBUG_FS is not set +CONFIG_OCFS2_FS_POSIX_ACL=y +CONFIG_BTRFS_FS=m +CONFIG_BTRFS_FS_POSIX_ACL=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +CONFIG_PRINT_QUOTA_WARNING=y +CONFIG_QUOTA_TREE=m +CONFIG_QFMT_V1=m +CONFIG_QFMT_V2=m +CONFIG_QUOTACTL=y +CONFIG_AUTOFS_FS=m +CONFIG_AUTOFS4_FS=m +CONFIG_FUSE_FS=m +CONFIG_GENERIC_ACL=y + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=y +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +CONFIG_NTFS_RW=y + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y +CONFIG_CONFIGFS_FS=m +CONFIG_MISC_FILESYSTEMS=y +CONFIG_ADFS_FS=m +# CONFIG_ADFS_FS_RW is not set +CONFIG_AFFS_FS=m +CONFIG_ECRYPT_FS=m +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +CONFIG_BFS_FS=m +CONFIG_EFS_FS=m +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_LZO=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +# CONFIG_JFFS2_CMODE_FAVOURLZO is not set +CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_XATTR=y +CONFIG_UBIFS_FS_ADVANCED_COMPR=y +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_FS_DEBUG is not set +CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +CONFIG_VXFS_FS=m +CONFIG_MINIX_FS=y +CONFIG_OMFS_FS=m +CONFIG_HPFS_FS=m +CONFIG_QNX4FS_FS=m +CONFIG_ROMFS_FS=m +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_ACL_SUPPORT=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_SUNRPC_XPRT_RDMA=m +# CONFIG_SUNRPC_REGISTER_V4 is not set +CONFIG_RPCSEC_GSS_KRB5=y +CONFIG_RPCSEC_GSS_SPKM3=m +CONFIG_SMB_FS=m +CONFIG_SMB_NLS_DEFAULT=y +CONFIG_SMB_NLS_REMOTE="cp850" +CONFIG_CIFS=m +CONFIG_CIFS_STATS=y +# CONFIG_CIFS_STATS2 is not set +CONFIG_CIFS_WEAK_PW_HASH=y +CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_EXPERIMENTAL is not set +CONFIG_NCP_FS=m +CONFIG_NCPFS_PACKET_SIGNING=y +CONFIG_NCPFS_IOCTL_LOCKING=y +CONFIG_NCPFS_STRONG=y +CONFIG_NCPFS_NFS_NS=y +CONFIG_NCPFS_OS2_NS=y +CONFIG_NCPFS_SMALLDOS=y +CONFIG_NCPFS_NLS=y +CONFIG_NCPFS_EXTRAS=y +CONFIG_CODA_FS=m +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set +CONFIG_9P_FS=m + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +CONFIG_OSF_PARTITION=y +# CONFIG_AMIGA_PARTITION is not set +CONFIG_ATARI_PARTITION=y +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +# CONFIG_MINIX_SUBPARTITION is not set +CONFIG_SOLARIS_X86_PARTITION=y +CONFIG_UNIXWARE_DISKLABEL=y +CONFIG_LDM_PARTITION=y +# CONFIG_LDM_DEBUG is not set +CONFIG_SGI_PARTITION=y +CONFIG_ULTRIX_PARTITION=y +CONFIG_SUN_PARTITION=y +CONFIG_KARMA_PARTITION=y +CONFIG_EFI_PARTITION=y +CONFIG_SYSV68_PARTITION=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m +CONFIG_DLM=m +CONFIG_DLM_DEBUG=y + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=2048 +CONFIG_MAGIC_SYSRQ=y +CONFIG_UNUSED_SYMBOLS=y +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1 +CONFIG_SCHED_DEBUG=y +# CONFIG_SCHEDSTATS is not set +CONFIG_TIMER_STATS=y +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_DEBUG_SLAB is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +CONFIG_STACKTRACE=y +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_VIRTUAL is not set +# CONFIG_DEBUG_WRITECOUNT is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +CONFIG_ARCH_WANT_FRAME_POINTERS=y +# CONFIG_FRAME_POINTER is not set +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +CONFIG_SYSCTL_SYSCALL_CHECK=y +CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_NOP_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_RING_BUFFER=y +CONFIG_TRACING=y + +# +# Tracers +# +# CONFIG_FUNCTION_TRACER is not set +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_SYSPROF_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_CONTEXT_SWITCH_TRACER is not set +# CONFIG_BOOT_TRACER is not set +# CONFIG_TRACE_BRANCH_PROFILING is not set +# CONFIG_POWER_TRACER is not set +# CONFIG_STACK_TRACER is not set +# CONFIG_FTRACE_STARTUP_TEST is not set +# CONFIG_MMIOTRACE is not set +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_DYNAMIC_PRINTK_DEBUG is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +CONFIG_STRICT_DEVMEM=y +CONFIG_X86_VERBOSE_BOOTUP=y +CONFIG_EARLY_PRINTK=y +# CONFIG_EARLY_PRINTK_DBGP is not set +CONFIG_DEBUG_STACKOVERFLOW=y +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_PAGEALLOC is not set +# CONFIG_DEBUG_PER_CPU_MAPS is not set +# CONFIG_X86_PTDUMP is not set +# CONFIG_DEBUG_RODATA is not set +# CONFIG_DEBUG_NX_TEST is not set +# CONFIG_IOMMU_DEBUG is not set +CONFIG_HAVE_MMIOTRACE_SUPPORT=y +CONFIG_IO_DELAY_TYPE_0X80=0 +CONFIG_IO_DELAY_TYPE_0XED=1 +CONFIG_IO_DELAY_TYPE_UDELAY=2 +CONFIG_IO_DELAY_TYPE_NONE=3 +CONFIG_IO_DELAY_0X80=y +# CONFIG_IO_DELAY_0XED is not set +# CONFIG_IO_DELAY_UDELAY is not set +# CONFIG_IO_DELAY_NONE is not set +CONFIG_DEFAULT_IO_DELAY_TYPE=0 +# CONFIG_DEBUG_BOOT_PARAMS is not set +# CONFIG_CPA_DEBUG is not set +# CONFIG_OPTIMIZE_INLINING is not set + +# +# Security options +# +CONFIG_KEYS=y +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set +CONFIG_SECURITY=y +CONFIG_SECURITYFS=y +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM is not set +# CONFIG_SECURITY_PATH is not set +CONFIG_SECURITY_FILE_CAPABILITIES=y +CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 +CONFIG_SECURITY_SELINUX=y +CONFIG_SECURITY_SELINUX_BOOTPARAM=y +CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 +CONFIG_SECURITY_SELINUX_DISABLE=y +CONFIG_SECURITY_SELINUX_DEVELOP=y +CONFIG_SECURITY_SELINUX_AVC_STATS=y +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 +# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_FIPS=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_SEQIV=m + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m + +# +# Hash modes +# +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_XCBC=m + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES_X86_64=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SALSA20_X86_64 is not set +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_TWOFISH_X86_64=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_LZO=m + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_HIFN_795X=m +# CONFIG_CRYPTO_DEV_HIFN_795X_RNG is not set +CONFIG_HAVE_KVM=y +CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m +CONFIG_VIRTIO=m +CONFIG_VIRTIO_RING=m +CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_BALLOON=m + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_GENERIC_FIND_LAST_BIT=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC_T10DIF=m +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=m +CONFIG_LZO_COMPRESS=m +CONFIG_LZO_DECOMPRESS=m +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_DEC16=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_CHECK_SIGNATURE=y diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.27.nix b/pkgs/os-specific/linux/kernel/linux-2.6.27.nix index d7f2246d8c6..ffd06578293 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.27.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.27.nix @@ -5,11 +5,11 @@ assert !userModeLinux; import ./generic.nix ( rec { - version = "2.6.27.21"; + version = "2.6.27.25"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "104lyf7hqmiamkp6qfs42mh186vh97ljvblmhqr06wa91iml93fy"; + sha256 = "1a23513dkv127ql8f14i28p404cyyyfh581m4lvnj6biy38m2k8a"; }; features = { diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.28.nix b/pkgs/os-specific/linux/kernel/linux-2.6.28.nix index b153dc9d33f..8ec7fd0c07b 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.28.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.28.nix @@ -5,11 +5,11 @@ assert !userModeLinux; import ./generic.nix ( rec { - version = "2.6.28.9"; + version = "2.6.28.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "09rpfghjl2h50ccnp1yr9i466kfgh868g3433c0fqwf7kaqlalwc"; + sha256 = "10vryshzpgk7vqmb3f0z981r5nci722kfqbjd274qwjyanxlj60b"; }; features = { diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.29.nix b/pkgs/os-specific/linux/kernel/linux-2.6.29.nix new file mode 100644 index 00000000000..b77761ab556 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-2.6.29.nix @@ -0,0 +1,26 @@ +args @ {stdenv, fetchurl, userModeLinux ? false, ...}: + +assert !userModeLinux; + +import ./generic.nix ( + + rec { + version = "2.6.29.5"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; + sha256 = "1i8q37hg1iak15mryzzcb39pqgyxzhmgw368j28apd01qry21ag1"; + }; + + features = { + iwlwifi = true; + }; + + config = + if stdenv.system == "i686-linux" then ./config-2.6.29-i686-smp else + if stdenv.system == "x86_64-linux" then ./config-2.6.29-x86_64-smp else + abort "No kernel configuration for your platform!"; + } + + // args +) diff --git a/pkgs/os-specific/linux/klibc/1.5.nix b/pkgs/os-specific/linux/klibc/1.5.nix new file mode 100644 index 00000000000..3a92c2f4d29 --- /dev/null +++ b/pkgs/os-specific/linux/klibc/1.5.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl, perl, bison, mktemp, kernelHeaders}: + +assert stdenv.isLinux; + +let version = "1.5"; in + +stdenv.mkDerivation { + name = "klibc-${version}"; + + src = fetchurl { + url = "mirror://kernel/linux/libs/klibc/klibc-${version}.tar.bz2"; + sha256 = "1izhf8kscjymsvsvhcqw9awnmp94vwv70zdj09srg9bkpjj0n017"; + }; + + makeFlags = ["V=1" "prefix=$out" "SHLIBDIR=$out/lib"]; + + preBuild = '' + makeFlags=$(eval "echo $makeFlags") + + mkdir linux + cp -prsd ${kernelHeaders}/include linux/ + chmod -R u+w linux/include/ + ''; # */ + + # Install static binaries as well. + postInstall = '' + dir=$out/lib/klibc/bin.static + mkdir $dir + cp $(find $(find . -name static) -type f ! -name "*.g" -a ! -name ".*") $dir/ + cp usr/dash/sh $dir/ + ''; + + buildInputs = [perl bison mktemp]; +} diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 3a92c2f4d29..7f4229efe85 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -2,14 +2,14 @@ assert stdenv.isLinux; -let version = "1.5"; in +let version = "1.5.15"; in stdenv.mkDerivation { name = "klibc-${version}"; src = fetchurl { - url = "mirror://kernel/linux/libs/klibc/klibc-${version}.tar.bz2"; - sha256 = "1izhf8kscjymsvsvhcqw9awnmp94vwv70zdj09srg9bkpjj0n017"; + url = "mirror://kernel/linux/libs/klibc/Testing/klibc-${version}.tar.bz2"; + sha256 = "1x401wmjca6zkyikf9xz45b3wb1hnj0m2s9in1sg6xdhi3pk8lwb"; }; makeFlags = ["V=1" "prefix=$out" "SHLIBDIR=$out/lib"]; diff --git a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix b/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix index f3bfe1a5c7b..d9dc076d92f 100644 --- a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix +++ b/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix @@ -8,10 +8,10 @@ rec { buildInputs = []; configureFlags = [''--PREFIx=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)'']; - debugStep = FullDepEntry ('' + debugStep = fullDepEntry ('' cat config-host.mak '') ["minInit"]; - preConfigure = FullDepEntry ('' + preConfigure = fullDepEntry ('' sed -e 's/`uname -r`/'"$(basename ${kernel}/lib/modules/*)"'/' -i install.sh sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh sed -e '/depmod/d' -i install.sh diff --git a/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix b/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix index f23418bceea..75bb1e72d48 100644 --- a/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix +++ b/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix @@ -2,16 +2,16 @@ args : with args; rec { name = "kqemu-"+version; src = fetchurl { - url = http://bellard.org/qemu/kqemu-1.4.0pre1.tar.gz; + url = http://www.nongnu.org/qemu/kqemu-1.4.0pre1.tar.gz; sha256 = "14dlmawn3gia1j401ag5si5k1a1vav7jpv86rl37p1hwmr7fihxs"; }; buildInputs = []; configureFlags = [''--PREFIx=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)'']; - debugStep = FullDepEntry ('' + debugStep = fullDepEntry ('' cat config-host.mak '') ["minInit"]; - preConfigure = FullDepEntry ('' + preConfigure = fullDepEntry ('' sed -e 's/`uname -r`/'"$(basename ${kernel}/lib/modules/*)"'/' -i install.sh sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh sed -e '/depmod/d' -i install.sh diff --git a/pkgs/os-specific/linux/kvm/84.nix b/pkgs/os-specific/linux/kvm/84.nix deleted file mode 100644 index a1830e4c203..00000000000 --- a/pkgs/os-specific/linux/kvm/84.nix +++ /dev/null @@ -1,38 +0,0 @@ -{stdenv, fetchurl, kernelHeaders, zlib, e2fsprogs, SDL, alsaLib, pkgconfig, rsync}: - -assert stdenv.isLinux; - -stdenv.mkDerivation rec { - name = "kvm-84"; - - src = fetchurl { - url = "mirror://sourceforge/kvm/${name}.tar.gz"; - sha256 = "13lqhy4lpxqby7qj3l1cdbj73c7jmvkq73bc5wchwn0l0dkjsjlk"; - }; - - patches = [ - # Allow setting the path to Samba through $QEMU_SMBD_COMMAND. - ./smbd-path-r2.patch - # The makefile copies stuff from the kernel directory and then - # tries to modify the copy, but it must be made writable first. - ./readonly-kernel-r3.patch - ]; - - configureFlags = "--with-patched-kernel --kerneldir=${kernelHeaders}"; - - # e2fsprogs is needed for libuuid. - # rsync is a weird dependency used for copying kernel header files. - buildInputs = [zlib e2fsprogs SDL alsaLib pkgconfig rsync]; - - preConfigure = '' - for i in configure user/configure; do - substituteInPlace $i --replace /bin/bash $shell - done - substituteInPlace libkvm/Makefile --replace kvm_para.h kvm.h # !!! quick hack - ''; - - meta = { - homepage = http://kvm.qumranet.com/; - description = "A full virtualization solution for Linux on x86 hardware containing virtualization extensions"; - }; -} diff --git a/pkgs/os-specific/linux/kvm/86.nix b/pkgs/os-specific/linux/kvm/86.nix new file mode 100644 index 00000000000..1b468385f1f --- /dev/null +++ b/pkgs/os-specific/linux/kvm/86.nix @@ -0,0 +1,43 @@ +{stdenv, fetchurl, kernelHeaders, zlib, SDL, alsaLib, pkgconfig, pciutils}: + +assert stdenv.isLinux; + +stdenv.mkDerivation rec { + name = "kvm-86"; + + src = fetchurl { + url = "mirror://sourceforge/kvm/${name}.tar.gz"; + sha256 = "17fq2dyd0qla0yiddyiqvb8kz3sfy6dhy9fi9y7xcbhs26s0wxax"; + }; + + patches = [ + # Allow setting the path to Samba through $QEMU_SMBD_COMMAND. + ./smbd-path-r3.patch + + # Support the "vga" kernel command line option when using the + # -kernel option. + ./x86_boot_vidmode.patch + ]; + + configureFlags = "--enable-io-thread"; + + # e2fsprogs is needed for libuuid. + # rsync is a weird dependency used for copying kernel header files. + buildInputs = [zlib SDL alsaLib pkgconfig pciutils]; + + preConfigure = '' + for i in configure kvm/configure kvm/user/configure; do + substituteInPlace $i --replace /bin/bash $shell + done + + substituteInPlace kvm/libkvm/Makefile --replace kvm_para.h kvm.h # !!! quick hack + + # This prevents the kernel module from being built. + rm kvm/kernel/configure + ''; + + meta = { + homepage = http://kvm.qumranet.com/; + description = "A full virtualization solution for Linux on x86 hardware containing virtualization extensions"; + }; +} diff --git a/pkgs/os-specific/linux/kvm/readonly-kernel.patch b/pkgs/os-specific/linux/kvm/readonly-kernel.patch deleted file mode 100644 index 54e9225d101..00000000000 --- a/pkgs/os-specific/linux/kvm/readonly-kernel.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -rc kvm-69-orig/kernel/Makefile kvm-69/kernel/Makefile -*** kvm-69-orig/kernel/Makefile 2008-05-12 13:30:43.000000000 +0200 ---- kvm-69/kernel/Makefile 2008-06-04 17:23:34.000000000 +0200 -*************** -*** 48,53 **** ---- 48,54 ---- - "$(LINUX)"/./include/linux/kvm*.h \ - "$(LINUX)"/./include/asm-*/kvm*.h \ - $T/ -+ chmod -R u+w $T - - set -e && for i in $(find $T -name '*.h'); do \ - $(call unifdef,$$i); done -Only in kvm-69/kernel: Makefile~ diff --git a/pkgs/os-specific/linux/kvm/smbd-path-r2.patch b/pkgs/os-specific/linux/kvm/smbd-path-r3.patch similarity index 58% rename from pkgs/os-specific/linux/kvm/smbd-path-r2.patch rename to pkgs/os-specific/linux/kvm/smbd-path-r3.patch index 191d4566569..32099ad6930 100644 --- a/pkgs/os-specific/linux/kvm/smbd-path-r2.patch +++ b/pkgs/os-specific/linux/kvm/smbd-path-r3.patch @@ -1,25 +1,25 @@ -diff -rc kvm-82-orig/qemu/net.c kvm-82/qemu/net.c -*** kvm-82-orig/qemu/net.c 2008-12-24 15:24:58.000000000 +0100 ---- kvm-82/qemu/net.c 2009-01-13 12:59:15.000000000 +0100 +diff -rc kvm-86/net.c kvm-86-new/net.c +*** kvm-86/net.c 2009-05-19 18:29:02.000000000 +0200 +--- kvm-86-new/net.c 2009-06-02 17:41:15.000000000 +0200 *************** -*** 560,570 **** - slirp_init(); +*** 684,694 **** + slirp_init(slirp_restrict, slirp_ip); } ! /* XXX: better tmp dir construction */ -! snprintf(smb_dir, sizeof(smb_dir), "/tmp/qemu-smb.%d", getpid()); +! snprintf(smb_dir, sizeof(smb_dir), "/tmp/qemu-smb.%ld", (long)getpid()); ! if (mkdir(smb_dir, 0700) < 0) { ! fprintf(stderr, "qemu: could not create samba server dir '%s'\n", smb_dir); ! exit(1); } snprintf(smb_conf, sizeof(smb_conf), "%s/%s", smb_dir, "smb.conf"); ---- 560,572 ---- - slirp_init(); +--- 684,696 ---- + slirp_init(slirp_restrict, slirp_ip); } ! while (1) { -! snprintf(smb_dir, sizeof(smb_dir), "/tmp/qemu-smb.%d.%d", getpid(), random()); +! snprintf(smb_dir, sizeof(smb_dir), "/tmp/qemu-smb.%ld.%d", (long) getpid(), random()); ! if (mkdir(smb_dir, 0700) == 0) break; ! if (errno != EEXIST) { ! fprintf(stderr, "qemu: could not create samba server dir '%s'\n", smb_dir); @@ -28,11 +28,11 @@ diff -rc kvm-82-orig/qemu/net.c kvm-82/qemu/net.c } snprintf(smb_conf, sizeof(smb_conf), "%s/%s", smb_dir, "smb.conf"); -diff -rc kvm-82-orig/qemu/net.h kvm-82/qemu/net.h -*** kvm-82-orig/qemu/net.h 2008-12-24 15:24:58.000000000 +0100 ---- kvm-82/qemu/net.h 2009-01-13 12:58:28.000000000 +0100 +diff -rc kvm-86/net.h kvm-86-new/net.h +*** kvm-86/net.h 2009-05-19 18:29:02.000000000 +0200 +--- kvm-86-new/net.h 2009-06-02 17:39:17.000000000 +0200 *************** -*** 99,105 **** +*** 129,135 **** #ifdef __sun__ #define SMBD_COMMAND "/usr/sfw/sbin/smbd" #else @@ -40,7 +40,7 @@ diff -rc kvm-82-orig/qemu/net.h kvm-82/qemu/net.h #endif #endif ---- 99,105 ---- +--- 129,135 ---- #ifdef __sun__ #define SMBD_COMMAND "/usr/sfw/sbin/smbd" #else diff --git a/pkgs/os-specific/linux/kvm/x86_boot_vidmode.patch b/pkgs/os-specific/linux/kvm/x86_boot_vidmode.patch new file mode 100644 index 00000000000..2ff6dd566c4 --- /dev/null +++ b/pkgs/os-specific/linux/kvm/x86_boot_vidmode.patch @@ -0,0 +1,105 @@ +Based on http://www.mail-archive.com/qemu-commits@nongnu.org/msg00202/qemu.x86_boot_vidmode.patch. + +diff -Nupr qemu/hw/pc.c qemu-new/hw/pc.c +--- qemu/hw/pc.c 2009-05-26 16:10:44.000000000 +0800 ++++ qemu-new/hw/pc.c 2009-05-26 17:17:25.000000000 +0800 +@@ -593,6 +593,78 @@ static long get_file_size(FILE *f) + return size; + } + ++static uint16_t hato16i(char *hex) ++{ ++ uint16_t integer = 0; ++ if(hex[1] == 'x') ++ hex += 2; ++ ++ while(*hex != '\0'){ ++ integer = (integer<<4); ++ ++ if(*hex >= 0x30 && *hex <= 0x39){ /*0~9*/ ++ integer += *hex - 0x30; ++ }else if(*hex >= 0x61 && *hex <= 0x66){ /*a~f*/ ++ integer += *hex - 0x61 + 0xa; ++ }else if(*hex >= 0x41 && *hex <= 0x46){ /*A~F*/ ++ integer += *hex - 0x41 + 0x1; ++ }else ++ break; ++ ++ hex++; ++ } ++ return integer; ++} ++ ++static uint16_t ato16i(char *dec) ++{ ++ uint16_t integer = 0; ++ ++ while(*dec != '\0'){ ++ integer *= 10; ++ ++ if(*dec >= 0x30 && *dec <= 0x39){ /*0~9*/ ++ integer += *dec - 0x30; ++ }else ++ break; ++ ++ dec++; ++ } ++ return integer; ++} ++ ++static int get_vga_mode(const char* kernel_cmdline, uint16_t *vga_mode) ++{ ++ char mode[7]; ++ int i = 0; ++ char *p = strstr(kernel_cmdline, "vga="); ++ if(p == NULL) ++ return 1; ++ ++ p += 4; ++ ++ while(*p != ' ' && *p != '\0' && i < 6) { ++ mode[i] = *p; ++ i++; ++ p++; ++ } ++ mode[i] = 0; ++ ++ if(!strncmp(mode, "ask", 3)){ ++ *vga_mode = 0xfffd; ++ }else if(!strncmp(mode, "normal",6)){ ++ *vga_mode = 0xffff; ++ }else if(!strncmp(mode, "ext", 3)){ ++ *vga_mode = 0xfffe; ++ }else if(!strncmp(mode, "0x", 2)){//in hexdecimal ++ *vga_mode = hato16i(mode); ++ }else //in decimal ++ *vga_mode = ato16i(mode); ++ ++ return 0; ++} ++ ++ + static void load_linux(target_phys_addr_t option_rom, + const char *kernel_filename, + const char *initrd_filename, +@@ -605,6 +676,7 @@ static void load_linux(target_phys_addr_ + uint16_t real_seg; + int setup_size, kernel_size, initrd_size, cmdline_size; + uint32_t initrd_max; ++ uint16_t vid_mode; + uint8_t header[1024]; + target_phys_addr_t real_addr, prot_addr, cmdline_addr, initrd_addr; + FILE *f, *fi; +@@ -683,6 +755,12 @@ static void load_linux(target_phys_addr_ + if (protocol >= 0x200) + header[0x210] = 0xB0; + ++ /*parse cmdline and set vga mode*/ ++ if(!get_vga_mode(kernel_cmdline, &vid_mode)){ ++ header[0x1fa] = vid_mode&0xff; ++ header[0x1fb] = (vid_mode&0xff00)>>8; ++ } ++ + /* heap */ + if (protocol >= 0x201) { + header[0x211] |= 0x80; /* CAN_USE_HEAP */ diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 7124ded30c3..dde908024d9 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -2,7 +2,7 @@ let - versionNumber = "180.51"; + versionNumber = "185.18.14"; in @@ -15,12 +15,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run"; - sha256 = "1jpdj07pl0yfk2cg3yq9w2gh6yjgz54wamvrxhq43nfqdmn82vr5"; + sha256 = "0q7p7329r8ivsri0ldzrwi08976iqjvz34ximkzksyh60q6xlsf5"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run"; - sha256 = "1nrhajrmr3nj90w27wfajad6xyhrzs6wl9yvmjik65ffq65jpg9r"; + sha256 = "1bz854bhqxdjmhsa3agrgmpddql1xkc5frip1z6pdwmy1sh0754q"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; @@ -28,13 +28,13 @@ stdenv.mkDerivation { dontStrip = true; - glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11]; + glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc]; programPath = stdenv.lib.makeLibraryPath [ gtkLibs.gtk gtkLibs.atk gtkLibs.pango gtkLibs.glib - xlibs.libXv xlibs.libXrandr + xlibs.libXv ]; meta = { diff --git a/pkgs/os-specific/linux/polkit/default.nix b/pkgs/os-specific/linux/polkit/default.nix new file mode 100644 index 00000000000..1314371c564 --- /dev/null +++ b/pkgs/os-specific/linux/polkit/default.nix @@ -0,0 +1,16 @@ +args: with args; + +assert stdenv ? glibc; + +stdenv.mkDerivation rec { + name = "PolicyKit-0.9"; + + src = fetchurl { + url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; + sha256 = "f40c7c6bec19d7dba2335bddcffd0457494409a0dfce11d888c748dc892e80b7"; + }; + + buildInputs = [ + pkgconfig expat intltool glib dbus dbus_glib pam gettext + ]; +} diff --git a/pkgs/os-specific/linux/squashfs/default.nix b/pkgs/os-specific/linux/squashfs/default.nix index 8fdf288d7dd..30cb4b81149 100644 --- a/pkgs/os-specific/linux/squashfs/default.nix +++ b/pkgs/os-specific/linux/squashfs/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, zlib}: -stdenv.mkDerivation { - name = "squashfs-3.3"; +stdenv.mkDerivation rec { + name = "squashfs-4.0"; src = fetchurl { - url = mirror://sourceforge/squashfs/squashfs3.3.tgz; - sha256 = "1j55m26nyvlbld4yxad0r6s1f4rdw9yg89y2gv93ihkx3rx048w4"; + url = mirror://sourceforge/squashfs/squashfs4.0.tar.gz; + sha256 = "089fw543fx2d3dadszjv5swf8hr6jvxrpagf0x1jrb3bw3dqx50q"; }; buildInputs = [zlib]; @@ -14,9 +14,12 @@ stdenv.mkDerivation { cd squashfs-tools ''; - installPhase = '' - ensureDir $out/sbin - cp mksquashfs $out/sbin - cp unsquashfs $out/sbin - ''; + NIX_LDFLAGS = "-lgcc_s"; # for pthread_cancel + + installFlags = "INSTALL_DIR=\${out}/bin"; + + meta = { + homepage = http://squashfs.sourceforge.net/; + description = "Tool for creating and unpacking squashfs filesystems"; + }; } diff --git a/pkgs/os-specific/linux/util-linux-ng/default.nix b/pkgs/os-specific/linux/util-linux-ng/default.nix index aa0b99a2526..857581960a2 100644 --- a/pkgs/os-specific/linux/util-linux-ng/default.nix +++ b/pkgs/os-specific/linux/util-linux-ng/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses ? null , # Util-linux-ng requires libuuid and libblkid. - e2fsprogs + libuuid , # Build mount/umount only. buildMountOnly ? false @@ -24,7 +24,7 @@ stdenv.mkDerivation { ${if ncurses == null then "--without-ncurses" else ""} ''; - buildInputs = [e2fsprogs] + buildInputs = [libuuid] ++ stdenv.lib.optional (ncurses != null) ncurses; inherit mountHelpers; diff --git a/pkgs/os-specific/linux/wpa_supplicant/builder-gui-qt4.sh b/pkgs/os-specific/linux/wpa_supplicant/builder-gui-qt4.sh new file mode 100644 index 00000000000..728b5837b16 --- /dev/null +++ b/pkgs/os-specific/linux/wpa_supplicant/builder-gui-qt4.sh @@ -0,0 +1,17 @@ +source $stdenv/setup + +tar xfvz $src +cd $pkgname-$version/wpa_supplicant +cp defconfig .config +substituteInPlace Makefile --replace /usr/local $out +make wpa_gui-qt4 +cd wpa_gui-qt4 +cd icons +make +ensureDir $out/share/icons +cp -av hicolor $out/share/icons +cd .. +ensureDir $out/bin +cp wpa_gui $out/bin +ensureDir $out/share/applications +cp wpa_gui.desktop $out/share/applications diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 3d3101016ac..dac9188815a 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl}: +{stdenv, fetchurl, openssl, qt4 ? null}: stdenv.mkDerivation rec { name = "wpa_supplicant-0.6.9"; @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { cd wpa_supplicant cp defconfig .config substituteInPlace Makefile --replace /usr/local $out - makeFlagsArray=(ALL="wpa_supplicant wpa_passphrase wpa_cli") + makeFlagsArray=(ALL="wpa_supplicant wpa_passphrase wpa_cli ${if qt4 == null then "" else "wpa_gui-qt4"}") ''; - buildInputs = [openssl]; + buildInputs = [openssl qt4]; postInstall = '' ensureDir $out/share/man/man5 $out/share/man/man8 diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui-qt4.nix b/pkgs/os-specific/linux/wpa_supplicant/gui-qt4.nix new file mode 100644 index 00000000000..7b587cdd623 --- /dev/null +++ b/pkgs/os-specific/linux/wpa_supplicant/gui-qt4.nix @@ -0,0 +1,15 @@ +{stdenv, fetchurl, qt4, imagemagick, inkscape}: + +stdenv.mkDerivation rec { + pkgname = "wpa_supplicant"; + version = "0.6.9"; + name = "${pkgname}-gui-qt4-${version}"; + + src = fetchurl { + url = "http://hostap.epitest.fi/releases/${pkgname}-${version}.tar.gz"; + sha256 = "0w7mf3nyilkjsn5v7p15v5fxnh0klgm8c979z80y0mkw7zx88lkf"; + }; + + buildInputs = [qt4 imagemagick inkscape]; + builder = ./builder-gui-qt4.sh; +} diff --git a/pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix b/pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix index ccb4facc078..a5c55bf98a7 100644 --- a/pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix +++ b/pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix @@ -8,7 +8,7 @@ rec { buildInputs = [libtool gettext e2fsprogs]; configureFlags = []; - preConfigure = FullDepEntry ('' + preConfigure = fullDepEntry ('' sp_path=$(echo $PATH | sed -e 's/:/ /g'); sed -e 's@/usr/bin@'"$PATH: $sp_path"'@g' -i configure sed -e 's@/usr/local/bin@'"$PATH: sp_path"'@g' -i configure diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix index 6b981f0c4de..553b371d24c 100644 --- a/pkgs/servers/dict/dictd-db.nix +++ b/pkgs/servers/dict/dictd-db.nix @@ -4,7 +4,7 @@ let makeDictdDB = _src: _name: _subdir: _locale: with builderDefs; let localDefs = builderDefs.passthru.function (rec { src=_src; - doInstall = FullDepEntry ('' + doInstall = fullDepEntry ('' ensureDir $out/share/dictd tar xf ${src} cp $(ls ./${_subdir}/*.{dict*,index} || true) $out/share/dictd diff --git a/pkgs/servers/gpm/1.20.6.nix b/pkgs/servers/gpm/1.20.6.nix index 6343234803d..6e9e6e64d51 100644 --- a/pkgs/servers/gpm/1.20.6.nix +++ b/pkgs/servers/gpm/1.20.6.nix @@ -11,7 +11,7 @@ rec { /* doConfigure should be specified separately */ phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"]; - preConfigure = FullDepEntry ('' + preConfigure = fullDepEntry ('' sed -e 's/[$](MKDIR)/mkdir -p /' -i doc/Makefile.in '') ["addInputs" "doUnpack" "minInit"]; diff --git a/pkgs/servers/gpm/1.99.6.nix b/pkgs/servers/gpm/1.99.6.nix index bb797730a14..3874e4adfbd 100644 --- a/pkgs/servers/gpm/1.99.6.nix +++ b/pkgs/servers/gpm/1.99.6.nix @@ -11,7 +11,7 @@ rec { /* doConfigure should be specified separately */ phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"]; - preConfigure = FullDepEntry ('' + preConfigure = fullDepEntry ('' sed -e 's/[$](MKDIR)/mkdir -p /' -i doc/Makefile.in sed -e 's/gpm2//' -i Makefile.in '') ["addInputs" "doUnpack" "minInit"]; diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix new file mode 100644 index 00000000000..067e7c4446b --- /dev/null +++ b/pkgs/servers/gpsd/default.nix @@ -0,0 +1,65 @@ +{ fetchurl, stdenv, python, pkgconfig, dbus, dbus_glib +, ncurses, libX11, libXt, libXpm, libXaw, libXext, makeWrapper +, libxslt, xmlto, gpsdUser ? "gpsd" }: + +stdenv.mkDerivation rec { + name = "gpsd-2.39"; + + src = fetchurl { + url = "http://download.berlios.de/gpsd/${name}.tar.gz"; + sha256 = "089ahf97dhws3sk8nc88687h4ny2rlavkzg4wxqkhb0i0fs2yfzf"; + }; + + buildInputs = [ + python pkgconfig dbus dbus_glib ncurses + libX11 libXt libXpm libXaw libXext + makeWrapper libxslt xmlto + ]; + + configureFlags = "--enable-dbus --enable-gpsd-user=${gpsdUser} " + + # Make sure `xgpsspeed' has libXt and libX11 in its RPATH. + + "LDFLAGS=-Wl,--rpath=${libXt}/lib:${libX11}/lib"; + + doCheck = true; + + postInstall = '' + for prog in "$out/bin"/* + do + if grep -q python "$prog" + then + echo "patching \`$prog'..." + wrapProgram "$prog" \ + --prefix PATH ":" "${python}/bin" \ + --prefix PYTHONPATH ":" "$out/lib/${python.libPrefix}/site-packages" + fi + done + ''; + + meta = { + description = "`gpsd', a GPS service daemon"; + + longDescription = '' + gpsd is a service daemon that monitors one or more GPSes + attached to a host computer through serial or USB ports, making + all data on the location/course/velocity of the sensors + available to be queried on TCP port 2947 of the host computer. + With gpsd, multiple GPS client applications (such as + navigational and wardriving software) can share access to GPSes + without contention or loss of data. Also, gpsd responds to + queries with a format that is substantially easier to parse than + the NMEA 0183 emitted by most GPSes. The gpsd distribution + includes a linkable C service library, a C++ wrapper class, and + a Python module that developers of gpsd-aware applications can + use to encapsulate all communication with gpsd. + + Besides gpsd itself, the project provides auxiliary tools for + diagnostic monitoring and profiling of GPSes and feeding + GPS-aware applications GPS logs for diagnostic purposes. + ''; + + homepage = http://gpsd.berlios.de/; + + license = "BSD-style"; + }; +} diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index ca144ff684b..12543830809 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -2,9 +2,9 @@ args : let lib = args.lib; fetchurl = args.fetchurl; - FullDepEntry = args.FullDepEntry; + fullDepEntry = args.fullDepEntry; - version = lib.getAttr ["version"] "0.7.47" args; + version = lib.attrByPath ["version"] "0.7.47" args; buildInputs = with args; [ openssl zlib pcre libxml2 libxslt ]; @@ -25,7 +25,7 @@ rec { "--with-http_secure_link_module" ]; - preConfigure = FullDepEntry '' + preConfigure = fullDepEntry '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${args.libxml2}/include/libxml2" '' []; diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix index 0d9b51c9eaa..6e0cad66e49 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/servers/http/tomcat/axis2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { - name = "axis2-1.4"; + name = "axis2-1.5"; builder = ./builder.sh; src = fetchurl { - url = http://apache.hippo.nl/ws/axis2/1_4/axis2-1.4-bin.zip; - md5 = "5fa104137aec522675aeaa2e6414dc40"; + url = http://apache.mirror.easycolocate.nl/ws/axis2/1_5/axis2-1.5-bin.zip; + sha256 = "0f0a471xfsjx7s3i9awhajl1kli8y8pd8aiki7cwb9n4g467rwmc"; }; inherit apacheAnt jdk unzip; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 2d149949230..2a39571a8ff 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { make makefiles CCARGS='-DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -DHAS_DB -I${cyrus_sasl}/include/sasl' AUXLIBS='-lssl -lcrypto -lsasl2 -ldb' ''; - buildinputs = [db4 openssl cyrus_sasl]; + buildInputs = [db4 openssl cyrus_sasl]; patches = [./postfix-2.2.9-db.patch ./postfix-2.2.9-lib.patch]; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index c99b8d608b6..73e63bebdc0 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -10,8 +10,11 @@ stdenv.mkDerivation rec { sha256 = "0lwd5rcppyvcvy9n2j074k5mydgqszfvw6fnsjlz46gkda9vgydq"; }; + # Since `libpulse*.la' contain `-lgdbm', it must be propagated. + propagatedBuildInputs = [ gdbm ]; + buildInputs = [ - pkgconfig gnum4 gdbm libtool glib dbus hal avahi gconf liboil + pkgconfig gnum4 libtool glib dbus hal avahi gconf liboil libsamplerate libsndfile speex alsaLib libX11 libICE libSM intltool gettext diff --git a/pkgs/servers/sql/mysql5/default.nix b/pkgs/servers/sql/mysql5/default.nix index 812412f3796..114ed37be32 100644 --- a/pkgs/servers/sql/mysql5/default.nix +++ b/pkgs/servers/sql/mysql5/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation { NIX_CFLAGS_CXXFLAGS = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; + NIX_LDFLAGS = if stdenv.system == "x86_64-linux" then "-lgcc_s" else ""; + postInstall = '' ln -s mysqld_safe $out/bin/mysqld diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 1db9f7242f8..74bfc27aae6 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -614,8 +614,8 @@ let url = mirror://xorg/X11R7.4/src/everything/libSM-1.1.0.tar.bz2; sha256 = "10iap6ydxmk0g5qcfnsf9yc30fhvqshgppm0sca21y0z5qwaqdkm"; }; - buildInputs = [pkgconfig libICE e2fsprogs xproto xtrans ]; - })) // {inherit libICE e2fsprogs xproto xtrans ;}; + buildInputs = [pkgconfig libICE libuuid xproto xtrans ]; + })) // {inherit libICE libuuid xproto xtrans ;}; libWindowsWM = (stdenv.mkDerivation ((if overrides ? libWindowsWM then overrides.libWindowsWM else x: x) { name = "libWindowsWM-1.0.0"; @@ -1388,11 +1388,11 @@ let })) // {inherit inputproto randrproto xorgserver xproto ;}; xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) { - name = "xf86-input-evdev-2.2.1"; + name = "xf86-input-evdev-2.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.2.1.tar.bz2; - sha256 = "19z27qikxc8dqxrfz3y6xiaf23hfaa1s79r0x0wvqjb2532bwmy3"; + url = mirror://xorg/individual/driver/xf86-input-evdev-2.2.2.tar.bz2; + sha256 = "156ragzgb67wpkc5vz2mczgiardp91h2njzcsxxv89vcx0cn2q33"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; })) // {inherit inputproto xorgserver xproto ;}; @@ -1498,14 +1498,14 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (stdenv.mkDerivation ((if overrides ? xf86videoati then overrides.xf86videoati else x: x) { - name = "xf86-video-ati-6.9.0"; + name = "xf86-video-ati-6.12.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-ati-6.9.0.tar.bz2; - sha256 = "1hnp2da1asj6ql4a1i2j20mffix255sx08ixv0nijv1qdj8x2b38"; + url = mirror://xorg/individual/driver/xf86-video-ati-6.12.2.tar.bz2; + sha256 = "0l17mv7ljw9cnvfblms62vnjkpd26gf5dqgdpfzvkxqrfyhvpvhv"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ]; - })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ]; + })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ;}; xf86videochips = (stdenv.mkDerivation ((if overrides ? xf86videochips then overrides.xf86videochips else x: x) { name = "xf86-video-chips-1.2.0"; @@ -1608,11 +1608,11 @@ let })) // {inherit xorgserver xproto ;}; xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) { - name = "xf86-video-intel-2.7.0"; + name = "xf86-video-intel-2.7.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.7.0.tar.bz2; - sha256 = "152dd0y120sv6sh9a889isf71901ykansq7jjj7vc5j9a1dg3l0n"; + url = mirror://xorg/individual/driver/xf86-video-intel-2.7.1.tar.bz2; + sha256 = "0hjziri3rkq7dbcqx70knbx9bips44ya8m1jfhpi7h4w4ia0sp15"; }; buildInputs = [pkgconfig fontsproto glproto libdrm libpciaccess randrproto renderproto libX11 libXext xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ]; })) // {inherit fontsproto glproto libdrm libpciaccess randrproto renderproto libX11 libXext xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ;}; @@ -1674,7 +1674,7 @@ let url = mirror://xorg/X11R7.4/src/everything/xf86-video-openchrome-0.2.903.tar.bz2; sha256 = "043lvcvdkhyb5jp2m0ggd0r0gxndjwh2qnj8wbx2hr2wdf6qbr5p"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 xextproto xf86driproto xorgserver xproto libXvMC glproto mesa]; + buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 xextproto xf86driproto xorgserver xproto libXvMC ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 xextproto xf86driproto xorgserver xproto libXvMC ;}; xf86videor128 = (stdenv.mkDerivation ((if overrides ? xf86videor128 then overrides.xf86videor128 else x: x) { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index d67fd73c86a..cbd324c418b 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -26,7 +26,7 @@ $pcMap{$_} = $_ foreach @missingPCs; $pcMap{"freetype2"} = "freetype"; $pcMap{"libpng12"} = "libpng"; $pcMap{"dbus-1"} = "dbus"; -$pcMap{"uuid"} = "e2fsprogs"; +$pcMap{"uuid"} = "libuuid"; $pcMap{"gl"} = "mesa"; $pcMap{"\$PIXMAN"} = "pixman"; $pcMap{"\$RENDERPROTO"} = "renderproto"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 4cfa6260063..bb746439145 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -47,10 +47,10 @@ xf86videoati = attrs: attrs // { buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa]; - src = args.fetchurl { - url = ftp://ftp.x.org/pub/individual/driver/xf86-video-ati-6.12.2.tar.bz2; - sha256 = "0l17mv7ljw9cnvfblms62vnjkpd26gf5dqgdpfzvkxqrfyhvpvhv"; - }; + }; + + xf86videoopenchrome = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa]; }; xkbcomp = attrs: attrs // { diff --git a/pkgs/servers/x11/xorg/tarballs-7.4.list b/pkgs/servers/x11/xorg/tarballs-7.4.list index 6dcd604a728..f7a61b35095 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.4.list +++ b/pkgs/servers/x11/xorg/tarballs-7.4.list @@ -121,7 +121,7 @@ mirror://xorg/X11R7.4/src/everything/xf86dgaproto-2.0.3.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86driproto-2.0.4.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-input-acecad-1.2.2.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-input-aiptek-1.1.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.2.1.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.2.2.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-input-joystick-1.3.2.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-input-keyboard-1.3.1.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-input-mouse-1.3.0.tar.bz2 @@ -132,7 +132,7 @@ mirror://xorg/X11R7.4/src/everything/xf86miscproto-0.9.2.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-video-apm-1.2.0.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-video-ark-0.7.0.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-video-ast-0.85.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-ati-6.9.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-6.12.2.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-video-chips-1.2.0.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-video-cirrus-1.2.1.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-video-dummy-0.3.0.tar.bz2 @@ -143,7 +143,7 @@ mirror://xorg/X11R7.4/src/everything/xf86-video-glint-1.2.1.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-video-i128-1.3.1.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-video-i740-1.2.0.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-video-impact-0.2.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-intel-2.7.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-intel-2.7.1.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-video-mach64-6.8.0.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-video-mga-1.4.9.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-video-neomagic-1.2.1.tar.bz2 diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 7cc13bb8184..93ed0b8f350 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -1,10 +1,15 @@ -{stdenv, fetchurl, expat, erlang, zlib, openssl, pam}: +{stdenv, fetchurl, fetchsvn, expat, erlang, zlib, openssl, pam}: -stdenv.mkDerivation { - name = "ejabberd-2.0.0"; - src = fetchurl { - url = http://www.process-one.net/downloads/ejabberd/2.0.0/ejabberd-2.0.0.tar.gz; - sha256 = "086e105cb402ef868e3187277db1486807e1b34a2e3e3679f0ee6de1e5fd2e54"; +stdenv.mkDerivation rec { + name = "ejabberd-2.0.5"; + #src = fetchurl { + # url = http://www.process-one.net/downloads/ejabberd/2.0.5/ejabberd-2.0.5.tar.gz; + # sha256 = "130rjl93l54c7p4glsfn3j7xwpwdyinhj6pp1di3mdx2mzi91vrp"; + #}; + src = fetchsvn { + url = http://svn.process-one.net/ejabberd/trunk; + rev = "r22196"; + sha256 = "6a9a3e6962e95feffccce2f67485da6e8d92b0cf904bc96fc259c5d0cc4b7659"; }; buildInputs = [ expat erlang zlib openssl pam ]; patchPhase = '' diff --git a/pkgs/servers/xmpp/openfire/default.nix b/pkgs/servers/xmpp/openfire/default.nix index 5319e7ce231..dae058d3292 100644 --- a/pkgs/servers/xmpp/openfire/default.nix +++ b/pkgs/servers/xmpp/openfire/default.nix @@ -11,7 +11,7 @@ args : with args; with builderDefs; buildInputs = [jre]; configureFlags = []; - installPhase = FullDepEntry ('' + installPhase = fullDepEntry ('' sed -e 's@\(common_jvm_locations\)=.*@\1${jre}@' -i bin/openfire cp -r . $out rm -r $out/logs diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix index b8a7379070c..161942519e8 100644 --- a/pkgs/servers/xmpp/pyIRCt/default.nix +++ b/pkgs/servers/xmpp/pyIRCt/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "0.4" a; + version = a.lib.attrByPath ["version"] "0.4" a; buildInputs = with a; [ xmpppy pythonIRClib python makeWrapper ]; @@ -18,7 +18,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)]; - deploy = a.FullDepEntry ('' + deploy = a.fullDepEntry ('' ensureDir $out/bin $out/share/${name} sed -e 's@/usr/bin/@${a.python}/bin/@' -i irc.py sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyIRCt.xml"]' -i config.py diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix index 5a2c4c5484c..a4dcd5a4812 100644 --- a/pkgs/servers/xmpp/pyMAILt/default.nix +++ b/pkgs/servers/xmpp/pyMAILt/default.nix @@ -19,7 +19,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/mail.py" a.pythonWrapperArguments)]; - deploy = a.FullDepEntry ('' + deploy = a.fullDepEntry ('' cd mail-transport ensureDir $out/bin $out/share/${name} sed -e 's@/usr/bin/@${a.python}/bin/@' -i mail.py diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix index 56f446c2e51..9e5fa7dae0f 100644 --- a/pkgs/shells/tcsh/default.nix +++ b/pkgs/shells/tcsh/default.nix @@ -2,9 +2,21 @@ stdenv.mkDerivation { name = "tcsh-6.16.00"; + src = fetchurl { url = ftp://ftp.funet.fi/pub/unix/shells/tcsh/tcsh-6.16.00.tar.gz; sha256 = "1m0p8lqqna3vpf2k4x3hia3rlrz38av67x7hb4qsiq2kfpbbh0vn"; }; + buildInputs = [ncurses]; + + postInstall = + '' + ln -s tcsh $out/bin/csh + ''; + + meta = { + homepage = http://www.tcsh.org/; + description = "An enhanced version of the Berkeley UNIX C shell (csh)"; + }; } diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 5be18ae205a..2cdf95476a5 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -57,7 +57,7 @@ rec { NIX_GCC = import ../build-support/gcc-wrapper { inherit stdenv; libc = dietlibc; - inherit (stdenv.gcc) gcc binutils name nativeTools nativePrefix; + inherit (stdenv.gcc) gcc binutils nativeTools nativePrefix; nativeLibc = false; }; }); diff --git a/pkgs/stdenv/generic/setup-new.sh b/pkgs/stdenv/generic/setup-new.sh new file mode 100644 index 00000000000..cadfeadc6db --- /dev/null +++ b/pkgs/stdenv/generic/setup-new.sh @@ -0,0 +1,782 @@ +# Run the named hook, either by calling the function with that name or +# by evaluating the variable with that name. This allows convenient +# setting of hooks both from Nix expressions (as attributes / +# environment variables) and from shell scripts (as functions). +runHook() { + local hookName="$1" + if test "$(type -t $hookName)" = function; then + $hookName + else + eval "${!hookName}" + fi +} + + +exitHandler() { + exitCode=$? + set +e + + closeNest + + if test -n "$showBuildStats"; then + times > "$NIX_BUILD_TOP/.times" + local -a times=($(cat "$NIX_BUILD_TOP/.times")) + # Print the following statistics: + # - user time for the shell + # - system time for the shell + # - user time for all child processes + # - system time for all child processes + echo "build time elapsed: " ${times[*]} + fi + + if test $exitCode != 0; then + runHook failureHook + + # If the builder had a non-zero exit code and + # $succeedOnFailure is set, create the file + # `$out/nix-support/failed' to signal failure, and exit + # normally. Otherwise, return the original exit code. + if test -n "$succeedOnFailure"; then + echo "build failed with exit code $exitCode (ignored)" + ensureDir "$out/nix-support" + echo -n $exitCode > "$out/nix-support/failed" + exit 0 + fi + + else + runHook exitHook + fi + + exit $exitCode +} + +trap "exitHandler" EXIT + + +###################################################################### +# Helper functions that might be useful in setup hooks. + + +addToSearchPathWithCustomDelimiter() { + local delimiter=$1 + local varName=$2 + local dir=$3 + if [ -d "$dir" ]; then + eval export ${varName}=${!varName}${!varName:+$delimiter}${dir} + fi +} + +PATH_DELIMITER=':' + +addToSearchPath() { + addToSearchPathWithCustomDelimiter "${PATH_DELIMITER}" "$@" +} + + +###################################################################### +# Initialisation. + +set -e + +test -z $NIX_GCC && NIX_GCC=@gcc@ + + +# Wildcard expansions that don't match should expand to an empty list. +# This ensures that, for instance, "for i in *; do ...; done" does the +# right thing. +shopt -s nullglob + + +# Set up the initial path. +PATH= +for i in $NIX_GCC @initialPath@; do + if test "$i" = /; then i=; fi + addToSearchPath PATH $i/bin +done + +if test "$NIX_DEBUG" = "1"; then + echo "initial path: $PATH" +fi + + +# Execute the pre-hook. +export SHELL=@shell@ +if test -z "$shell"; then + export shell=@shell@ +fi +param1=@param1@ +param2=@param2@ +param3=@param3@ +param4=@param4@ +param5=@param5@ +if test -n "@preHook@"; then source @preHook@; fi +runHook preHook + + +# Check that the pre-hook initialised SHELL. +if test -z "$SHELL"; then echo "SHELL not set"; exit 1; fi + + +# Hack: run gcc's setup hook. +envHooks=() +if test -f $NIX_GCC/nix-support/setup-hook; then + source $NIX_GCC/nix-support/setup-hook +fi + + +# Ensure that the given directories exists. +ensureDir() { + local dir + for dir in "$@"; do + if ! test -x "$dir"; then mkdir -p "$dir"; fi + done +} + +installBin() { + ensureDir $out/bin + cp "$@" $out/bin +} + + +# Allow the caller to augment buildInputs (it's not always possible to +# do this before the call to setup.sh, since the PATH is empty at that +# point; here we have a basic Unix environment). +runHook addInputsHook + + +# Recursively find all build inputs. +findInputs() { + local pkg=$1 + + case $pkgs in + *\ $pkg\ *) + return 0 + ;; + esac + + pkgs="$pkgs $pkg " + + if test -f $pkg/nix-support/setup-hook; then + source $pkg/nix-support/setup-hook + fi + + if test -f $pkg/nix-support/propagated-build-inputs; then + for i in $(cat $pkg/nix-support/propagated-build-inputs); do + findInputs $i + done + fi +} + +pkgs="" +for i in $buildInputs $propagatedBuildInputs; do + findInputs $i +done + + +# Set the relevant environment variables to point to the build inputs +# found above. +addToEnv() { + local pkg=$1 + + if test -d $1/bin; then + addToSearchPath _PATH $1/bin + fi + + # Run the package-specific hooks set by the setup-hook scripts. + for i in "${envHooks[@]}"; do + $i $pkg + done +} + +for i in $pkgs; do + addToEnv $i +done + + +# Add the output as an rpath. +if test "$NIX_NO_SELF_RPATH" != "1"; then + export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS" + if test -n "$NIX_LIB64_IN_SELF_RPATH"; then + export NIX_LDFLAGS="-rpath $out/lib64 $NIX_LDFLAGS" + fi +fi + + +# Strip debug information by default. +if test -z "$NIX_STRIP_DEBUG"; then + export NIX_STRIP_DEBUG=1 + export NIX_CFLAGS_STRIP="-g0 -Wl,--strip-debug" +fi + + +# Set the TZ (timezone) environment variable, otherwise commands like +# `date' will complain (e.g., `Tue Mar 9 10:01:47 Local time zone must +# be set--see zic manual page 2004'). +export TZ=UTC + + +# Set the prefix. This is generally $out, but it can be overriden, +# for instance if we just want to perform a test build/install to a +# temporary location and write a build report to $out. +if test -z "$prefix"; then + prefix="$out"; +fi + +if test "$useTempPrefix" = "1"; then + prefix="$NIX_BUILD_TOP/tmp_prefix"; +fi + + +PATH=$_PATH${_PATH:+:}$PATH +if test "$NIX_DEBUG" = "1"; then + echo "final path: $PATH" +fi + + +# Make GNU Make produce nested output. +export NIX_INDENT_MAKE=1 + + +###################################################################### +# Misc. helper functions. + + +stripDirs() { + local dirs="$1" + local stripFlags="$2" + local dirsNew= + + for d in ${dirs}; do + if test -d "$prefix/$d"; then + dirsNew="${dirsNew} $prefix/$d " + fi + done + dirs=${dirsNew} + + if test -n "${dirs}"; then + header "stripping (with flags $stripFlags) in $dirs" + find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $stripFlags || true + stopNest + fi +} + + +###################################################################### +# Textual substitution functions. + + +substitute() { + local input="$1" + local output="$2" + + local -a params=("$@") + local -a args=() + + local n p pattern replacement varName + + for ((n = 2; n < ${#params[*]}; n += 1)); do + p=${params[$n]} + + if test "$p" = "--replace"; then + pattern="${params[$((n + 1))]}" + replacement="${params[$((n + 2))]}" + n=$((n + 2)) + fi + + if test "$p" = "--subst-var"; then + varName="${params[$((n + 1))]}" + pattern="@$varName@" + replacement="${!varName}" + n=$((n + 1)) + fi + + if test "$p" = "--subst-var-by"; then + pattern="@${params[$((n + 1))]}@" + replacement="${params[$((n + 2))]}" + n=$((n + 2)) + fi + + if test ${#args[@]} != 0; then + args[${#args[@]}]="-a" + fi + args[${#args[@]}]="$pattern" + args[${#args[@]}]="$replacement" + done + + replace-literal -e -s -- "${args[@]}" < "$input" > "$output".tmp + if test -x "$output"; then + chmod +x "$output".tmp + fi + mv -f "$output".tmp "$output" +} + + +substituteInPlace() { + local fileName="$1" + shift + substitute "$fileName" "$fileName" "$@" +} + + +substituteAll() { + local input="$1" + local output="$2" + + # Select all environment variables that start with a lowercase character. + for envVar in $(env | sed "s/^[^a-z].*//" | sed "s/^\([^=]*\)=.*/\1/"); do + if test "$NIX_DEBUG" = "1"; then + echo "$envVar -> ${!envVar}" + fi + args="$args --subst-var $envVar" + done + + substitute "$input" "$output" $args +} + + +###################################################################### +# What follows is the generic builder. + + +nestingLevel=0 + +startNest() { + nestingLevel=$(($nestingLevel + 1)) + echo -en "\e[$1p" +} + +stopNest() { + nestingLevel=$(($nestingLevel - 1)) + echo -en "\e[q" +} + +header() { + startNest "$2" + echo "$1" +} + +# Make sure that even when we exit abnormally, the original nesting +# level is properly restored. +closeNest() { + while test $nestingLevel -gt 0; do + stopNest + done +} + + +# This function is useful for debugging broken Nix builds. It dumps +# all environment variables to a file `env-vars' in the build +# directory. If the build fails and the `-K' option is used, you can +# then go to the build directory and source in `env-vars' to reproduce +# the environment used for building. +dumpVars() { + if test "$noDumpEnvVars" != "1"; then + export > "$NIX_BUILD_TOP/env-vars" + fi +} + + +# Utility function: return the base name of the given path, with the +# prefix `HASH-' removed, if present. +stripHash() { + strippedName=$(basename $1); + if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then + strippedName=$(echo "$strippedName" | cut -c34-) + fi +} + + +unpackFile() { + curSrc="$1" + local cmd + + header "unpacking source archive $curSrc" 3 + + case "$curSrc" in + *.tar) + tar xvf $curSrc + ;; + *.tar.gz | *.tgz | *.tar.Z) + gzip -d < $curSrc | tar xvf - + ;; + *.tar.bz2 | *.tbz2) + bzip2 -d < $curSrc | tar xvf - + ;; + *.zip) + unzip $curSrc + ;; + *) + if test -d "$curSrc"; then + stripHash $curSrc + cp -prvd $curSrc $strippedName + else + if test -z "$unpackCmd"; then + echo "source archive $curSrc has unknown type" + exit 1 + fi + runHook unpackCmd + fi + ;; + esac + + stopNest +} + + +unpackPhase() { + runHook preUnpack + + if test -z "$srcs"; then + if test -z "$src"; then + echo 'variable $src or $srcs should point to the source' + exit 1 + fi + srcs="$src" + fi + + # To determine the source directory created by unpacking the + # source archives, we record the contents of the current + # directory, then look below which directory got added. Yeah, + # it's rather hacky. + local dirsBefore="" + for i in *; do + if test -d "$i"; then + dirsBefore="$dirsBefore $i " + fi + done + + # Unpack all source archives. + for i in $srcs; do + unpackFile $i + done + + # Find the source directory. + if test -n "$setSourceRoot"; then + runHook setSourceRoot + elif test -z "$sourceRoot"; then + sourceRoot= + for i in *; do + if test -d "$i"; then + case $dirsBefore in + *\ $i\ *) + ;; + *) + if test -n "$sourceRoot"; then + echo "unpacker produced multiple directories" + exit 1 + fi + sourceRoot="$i" + ;; + esac + fi + done + fi + + if test -z "$sourceRoot"; then + echo "unpacker appears to have produced no directories" + exit 1 + fi + + echo "source root is $sourceRoot" + + # By default, add write permission to the sources. This is often + # necessary when sources have been copied from other store + # locations. + if test "$dontMakeSourcesWritable" != 1; then + chmod -R u+w "$sourceRoot" + fi + + runHook postUnpack +} + + +patchPhase() { + runHook prePatch + + if test -z "$patchPhase" -a -z "$patches"; then return; fi + + for i in $patches; do + header "applying patch $i" 3 + local uncompress=cat + case $i in + *.gz) + uncompress="gzip -d" + ;; + *.bz2) + uncompress="bzip2 -d" + ;; + esac + $uncompress < $i | patch ${patchFlags:--p1} + stopNest + done + + runHook postPatch +} + + +fixLibtool() { + sed -i -e 's^eval sys_lib_.*search_path=.*^^' "$1" +} + + +configurePhase() { + runHook preConfigure + + if test -z "$configureScript"; then + configureScript=./configure + if ! test -x $configureScript; then + echo "no configure script, doing nothing" + return + fi + fi + + if test -z "$dontFixLibtool"; then + for i in $(find . -name "ltmain.sh"); do + echo "fixing libtool script $i" + fixLibtool $i + done + fi + + if test -z "$dontAddPrefix"; then + configureFlags="${prefixKey:---prefix=}$prefix $configureFlags" + fi + + # Add --disable-dependency-tracking to speed up some builds. + if test -z "$dontAddDisableDepTrack"; then + if grep -q dependency-tracking $configureScript; then + configureFlags="--disable-dependency-tracking $configureFlags" + fi + fi + + # By default, disable static builds. + if test -z "$dontDisableStatic"; then + if grep -q enable-static $configureScript; then + configureFlags="--disable-static $configureFlags" + fi + fi + + echo "configure flags: $configureFlags ${configureFlagsArray[@]}" + $configureScript $configureFlags "${configureFlagsArray[@]}" + + runHook postConfigure +} + + +buildPhase() { + runHook preBuild + + if test -z "$makeFlags" && ! test -n "$makefile" -o -e "Makefile" -o -e "makefile" -o -e "GNUmakefile"; then + echo "no Makefile, doing nothing" + return + fi + + echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}" + make ${makefile:+-f $makefile} \ + $makeFlags "${makeFlagsArray[@]}" \ + $buildFlags "${buildFlagsArray[@]}" + + runHook postBuild +} + + +checkPhase() { + runHook preCheck + + echo "check flags: $makeFlags ${makeFlagsArray[@]} $checkFlags ${checkFlagsArray[@]}" + make ${makefile:+-f $makefile} \ + $makeFlags "${makeFlagsArray[@]}" \ + $checkFlags "${checkFlagsArray[@]}" ${checkTarget:-check} + + runHook postCheck +} + + +patchELF() { + # Patch all ELF executables and shared libraries. + header "patching ELF executables and libraries" + if test -e "$prefix"; then + find "$prefix" \( \ + \( -type f -a -name "*.so*" \) -o \ + \( -type f -a -perm +0100 \) \ + \) -print -exec patchelf --shrink-rpath {} \; + fi + stopNest +} + + +patchShebangs() { + # Rewrite all script interpreter file names (`#! /path') under the + # specified directory tree to paths found in $PATH. E.g., + # /bin/sh will be rewritten to /nix/store/-some-bash/bin/sh. + # Interpreters that are already in the store are left untouched. + header "patching script interpreter paths" + local dir="$1" + local f + for f in $(find "$dir" -type f -perm +0100); do + local oldPath=$(sed -ne '1 s,^#![ ]*\([^ ]*\).*$,\1,p' "$f") + if test -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE"; then + local newPath=$(type -P $(basename $oldPath) || true) + if test -n "$newPath" -a "$newPath" != "$oldPath"; then + echo "$f: interpreter changed from $oldPath to $newPath" + sed -i -e "1 s,$oldPath,$newPath," "$f" + fi + fi + done + stopNest +} + + +installPhase() { + runHook preInstall + + ensureDir "$prefix" + + installTargets=${installTargets:-install} + echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}" + make ${makefile:+-f $makefile} $installTargets \ + $makeFlags "${makeFlagsArray[@]}" \ + $installFlags "${installFlagsArray[@]}" + + runHook postInstall +} + + +# The fixup phase performs generic, package-independent, Nix-related +# stuff, like running patchelf and setting the +# propagated-build-inputs. It should rarely be overriden. +fixupPhase() { + runHook preFixup + + # Put man/doc/info under $out/share. + forceShare=${forceShare:=man doc info} + if test -n "$forceShare"; then + for d in $forceShare; do + if test -d "$prefix/$d"; then + if test -d "$prefix/share/$d"; then + echo "both $d/ and share/$d/ exists!" + else + echo "fixing location of $d/ subdirectory" + ensureDir $prefix/share + if test -w $prefix/share; then + mv -v $prefix/$d $prefix/share + ln -sv share/$d $prefix + fi + fi + fi + done; + fi + + # TODO: strip _only_ ELF executables, and return || fail here... + if test -z "$dontStrip"; then + stripDebugList=${stripDebugList:-lib lib64 libexec bin sbin} + if test -n "$stripDebugList"; then + stripDirs "$stripDebugList" "${stripDebugFlags:--S}" + fi + + stripAllList=${stripAllList:-} + if test -n "$stripAllList"; then + stripDirs "$stripAllList" "${stripAllFlags:--s}" + fi + fi + + if test "$havePatchELF" = 1 -a -z "$dontPatchELF"; then + patchELF "$prefix" + fi + + if test -z "$dontPatchShebangs"; then + patchShebangs "$prefix" + fi + + if test -n "$propagatedBuildInputs"; then + ensureDir "$out/nix-support" + echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs" + fi + + if test -n "$setupHook"; then + ensureDir "$out/nix-support" + substituteAll "$setupHook" "$out/nix-support/setup-hook" + fi + + runHook postFixup +} + + +distPhase() { + runHook preDist + + echo "dist flags: $distFlags ${distFlagsArray[@]}" + make ${makefile:+-f $makefile} $distFlags "${distFlagsArray[@]}" ${distTarget:-dist} + + if test "$dontCopyDist" != 1; then + ensureDir "$out/tarballs" + + # Note: don't quote $tarballs, since we explicitly permit + # wildcards in there. + cp -pvd ${tarballs:-*.tar.gz} $out/tarballs + fi + + runHook postDist +} + + +showPhaseHeader() { + local phase="$1" + case $phase in + unpackPhase) header "unpacking sources";; + patchPhase) header "patching sources";; + configurePhase) header "configuring";; + buildPhase) header "building";; + checkPhase) header "running tests";; + installPhase) header "installing";; + fixupPhase) header "post-installation fixup";; + *) header "$phase";; + esac +} + + +genericBuild() { + header "building $out" + + if test -n "$buildCommand"; then + eval "$buildCommand" + return + fi + + if test -z "$phases"; then + phases="$prePhases unpackPhase patchPhase $preConfigurePhases \ + configurePhase $preBuildPhases buildPhase checkPhase \ + $preInstallPhases installPhase fixupPhase \ + $preDistPhases distPhase $postPhases"; + fi + + for curPhase in $phases; do + if test "$curPhase" = buildPhase -a -n "$dontBuild"; then continue; fi + if test "$curPhase" = checkPhase -a -z "$doCheck"; then continue; fi + if test "$curPhase" = installPhase -a -n "$dontInstall"; then continue; fi + if test "$curPhase" = fixupPhase -a -n "$dontFixup"; then continue; fi + if test "$curPhase" = distPhase -a -z "$doDist"; then continue; fi + + showPhaseHeader "$curPhase" + dumpVars + + # Evaluate the variable named $curPhase if it exists, otherwise the + # function named $curPhase. + eval "${!curPhase:-$curPhase}" + + if test "$curPhase" = unpackPhase; then + cd "${sourceRoot:-.}" + fi + + stopNest + done + + stopNest +} + + +# Execute the post-hook. +if test -n "@postHook@"; then source @postHook@; fi +runHook postHook + + +dumpVars diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 2b4c6b812db..de8a25c6f64 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -6,14 +6,11 @@ rec { # We want coreutils without ACL support. - coreutils_ = coreutils.function (args: { + coreutils_ = coreutils.override (args: { aclSupport = false; }); - gcc = gcc43; - - curlDiet = import ../../tools/networking/curl { inherit fetchurl; stdenv = useDietLibC stdenv; @@ -55,6 +52,8 @@ rec { # Hopefully we won't need these. rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video + find $out/include -name .install -exec rm {} \; + find $out/include -name ..install.cmd -exec rm {} \; mv $out/include $out/include-glibc # Copy coreutils, bash, etc. @@ -74,7 +73,7 @@ rec { cp ${bzip2}/bin/bzip2 $out/bin cp -d ${gnumake}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin - cp ${patchelf}/bin/* $out/bin + cp ${patchelf05}/bin/* $out/bin cp ${replace}/bin/* $out/bin cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep @@ -90,6 +89,7 @@ rec { rm -f $out/lib/gcc/*/*/include*/linux rm -f $out/lib/gcc/*/*/include*/sound rm -rf $out/lib/gcc/*/*/include*/root + rm -f $out/lib/gcc/*/*/include-fixed/asm #rm -f $out/lib/gcc/*/*/*.a cp -rd ${gcc.gcc}/libexec/* $out/libexec mkdir $out/include @@ -160,7 +160,7 @@ rec { echo patching $i if ! test -L $i; then LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.2 \ - $out/bin/patchelf --set-interpreter $out/lib/ld-linux*.so.2 --set-rpath $out/lib $i + $out/bin/patchelf --set-interpreter $out/lib/ld-linux*.so.2 --set-rpath $out/lib --force-rpath $i fi done @@ -180,8 +180,6 @@ rec { stdenv.mkDerivation { name = "test"; - LD_LIBRARY_PATH = "${unpack}/lib"; - realBuilder = "${unpack}/bin/bash"; buildCommand = '' diff --git a/pkgs/stdenv/nix/prehook.sh b/pkgs/stdenv/nix/prehook.sh index c72dd6e93a0..fbc3b9a6ef0 100644 --- a/pkgs/stdenv/nix/prehook.sh +++ b/pkgs/stdenv/nix/prehook.sh @@ -7,4 +7,5 @@ if test "$system" = "i686-darwin" -o "$system" = "powerpc-darwin"; then dontFixLibtool=1 NIX_STRIP_DEBUG=0 # !!! do we still need this? stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" + xargsFlags=" " fi diff --git a/pkgs/tools/X11/x2vnc/1.7.2.nix b/pkgs/tools/X11/x2vnc/1.7.2.nix index 0d805b44ac2..9c7e024551d 100644 --- a/pkgs/tools/X11/x2vnc/1.7.2.nix +++ b/pkgs/tools/X11/x2vnc/1.7.2.nix @@ -8,7 +8,7 @@ args : with args; with builderDefs.passthru.function {src="";}; }; buildInputs = [libX11 xproto xextproto libXext libXrandr randrproto]; - doCreatePrefix = FullDepEntry ('' + doCreatePrefix = fullDepEntry ('' ensureDir $out '') ["defEnsureDir"]; configureFlags = []; diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index 9f9fc7345cf..a35812f22a5 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -3,7 +3,7 @@ let fetchurl = args.fetchurl; lib=args.lib; - version = lib.getAttr ["version"] "3.01" args; + version = lib.attrByPath ["version"] "3.01" args; buildInputs = with args; [ libX11 xproto libXext xextproto libXtst gtk libXi inputproto pkgconfig recordproto diff --git a/pkgs/tools/admin/tightvnc/builder.sh b/pkgs/tools/admin/tightvnc/builder.sh index 95a1a6da9b5..05332fb46c2 100644 --- a/pkgs/tools/admin/tightvnc/builder.sh +++ b/pkgs/tools/admin/tightvnc/builder.sh @@ -1,9 +1,22 @@ source $stdenv/setup +patchPhase() { + fontPath= + for i in $fontDirectories; do + for j in $(find $i -name fonts.dir); do + addToSearchPathWithCustomDelimiter "," fontPath $(dirname $j) + done + done +} + buildPhase() { - xmkmf - make World - sed -e 's@/usr/bin/perl@'$perl'/bin/perl@' -i vncserver + + xmkmf + make World + + sed -e 's@/usr/bin/perl@'$perl'/bin/perl@' \ + -e 's@unix/:7100@'$fontPath'@' \ + -i vncserver cd Xvnc sed -e 's@.* CppCmd .*@#define CppCmd '$gcc'/bin/cpp@' -i config/cf/linux.cf diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index edc3e7d51e3..10ed5dc50f2 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11, zlib, libjpeg, imake, gccmakedep, libXmu, libXaw, libXpm, libXp , perl, xauth}: +{stdenv, fetchurl, x11, zlib, libjpeg, imake, gccmakedep, libXmu, libXaw, libXpm, libXp , perl, xauth, fontDirectories}: stdenv.mkDerivation { name = "tightvnc-1.3.10"; @@ -13,6 +13,8 @@ stdenv.mkDerivation { # for the builder script inherit xauth; + inherit fontDirectories; + buildInputs = [x11 zlib libjpeg imake gccmakedep libXmu libXaw libXpm libXp xauth]; } diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index cc00857f33d..1700f03d7bd 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation { patches = [ # Make it compile on GCC 4.3. (fetchurl { + name = "cpio-2.9-gnu-inline.patch"; url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/app-arch/cpio/files/cpio-2.9-gnu-inline.patch?rev=1.1"; sha256 = "1167hrq64h9lh3qhgasm2rivfzkkgx6fik92b017qfa0q61ff8c3"; }) diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index b1060d97a1e..f92fabc380c 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { postInstall = '' # file name compatibility with the old cdrecord (growisofs wants this name) ln -s $out/bin/genisoimage $out/bin/mkisofs - ln -s $out/bin/devdump $out/bin/cdrecord + ln -s $out/bin/wodim $out/bin/cdrecord ''; makeFlags = "PREFIX=\$(out)"; diff --git a/pkgs/tools/compression/lzma/default.nix b/pkgs/tools/compression/lzma/default.nix index bcc649e073d..13de50fafcf 100644 --- a/pkgs/tools/compression/lzma/default.nix +++ b/pkgs/tools/compression/lzma/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "lzma-4.32.7"; src = fetchurl { - url = http://tukaani.org/lzma/lzma-4.32.7.tar.gz; + url = mirror://gentoo/distfiles/lzma-4.32.7.tar.gz; sha256 = "0b03bdvm388kwlcz97aflpr3ir1zpa3m0bq3s6cd3pp5a667lcwz"; }; diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 103178fbb39..e72f96ea85e 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "0.6" a; + version = a.lib.attrByPath ["version"] "0.6" a; buildInputs = with a; [ cmake imagemagick patchelf ]; @@ -21,14 +21,14 @@ rec { libc = if a.stdenv ? glibc then a.stdenv.glibc else ""; - doCmake = a.FullDepEntry('' + doCmake = a.fullDepEntry('' ensureDir $PWD/builddir cd builddir export NIX_LDFLAGS="$NIX_LDFLAGS -ldl -L$out/lib" cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=$out -DDL_LIB=${libc}/lib '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; - postInstall = a.FullDepEntry('' + postInstall = a.fullDepEntry('' patchelf --set-rpath $out/lib${if a.stdenv.gcc.gcc != null then ":${a.stdenv.gcc.gcc}/lib" else ""} $out/bin/cuneiform '') ["minInit" "addInputs" "doMakeInstall"]; diff --git a/pkgs/tools/graphics/dmtx/default.nix b/pkgs/tools/graphics/dmtx/default.nix index d6e7c0a4218..8a06c261c2c 100644 --- a/pkgs/tools/graphics/dmtx/default.nix +++ b/pkgs/tools/graphics/dmtx/default.nix @@ -3,10 +3,10 @@ let lib = args.lib; fetchurl = args.fetchurl; - version = lib.getAttr ["version"] "0.7.0" args; + version = lib.attrByPath ["version"] "0.7.0" args; buildInputs = with args; [ libpng libtiff libjpeg librsvg imagemagick pkgconfig - zlib libX11 bzip2 + zlib libX11 bzip2 libtool ]; in rec { diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 8ec11e7ca9e..042f5befab0 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -5,11 +5,11 @@ assert libpng != null && libjpeg != null && expat != null; stdenv.mkDerivation rec { - name = "graphviz-2.20.3"; + name = "graphviz-2.22.2"; src = fetchurl { url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz"; - sha256 = "0grrijj3ryacnc0qj8l6xp5nqnmff5nvx6ziij1r9lghzb17cdjq"; + sha256 = "1yzda1al32la3wyrxwc1hs83sx9p84zh6xlpcpkx90xvjaav827v"; }; buildInputs = [pkgconfig x11 libpng libjpeg expat libXaw yacc libtool fontconfig pango gd]; diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix new file mode 100644 index 00000000000..12f307ca9de --- /dev/null +++ b/pkgs/tools/graphics/povray/default.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "povray-3.6"; + + src = fetchurl { + url = http://www.povray.org/redirect/www.povray.org/ftp/pub/povray/Official/Unix/povray-3.6.tar.bz2; + sha256 = "0wvsfgkybx28mj2p76nnsq9rdq50192g5qb7d0xk81s8skn7z2jf"; + }; + + # the installPhase wants to put files into $HOME. I let it put the files + # to $TMPDIR, so they don't get into the $out + patchPhase = '' + sed -i -e 's/^povconfuser.*/povconfuser=$(TMPDIR)\/povray/' Makefile.{am,in}; + ''; + # I didn't use configureFlags because I couldn't pass the quotes properly + # for the COMPILED_BY. + configurePhase = "./configure --prefix=$out COMPILED_BY=\"nix\""; + + meta = { + homepage = http://www.povray.org/; + description = "Persistence of Vision Raytracer"; + license = "free"; + }; +} diff --git a/pkgs/tools/graphics/qrdecode/default.nix b/pkgs/tools/graphics/qrdecode/default.nix index bd850a509b4..39e61aba667 100644 --- a/pkgs/tools/graphics/qrdecode/default.nix +++ b/pkgs/tools/graphics/qrdecode/default.nix @@ -2,9 +2,9 @@ args : let lib = args.lib; fetchurl = args.fetchurl; - FullDepEntry = args.FullDepEntry; + fullDepEntry = args.fullDepEntry; - version = lib.getAttr ["version"] "0.9.3" args; + version = lib.attrByPath ["version"] "0.9.3" args; buildInputs = with args; [ libpng libcv ]; @@ -22,15 +22,15 @@ rec { phaseNames = ["preConfigure" "doConfigure" "doMake" "createDirs" "doMakeInstall" "postInstall"]; - preConfigure = FullDepEntry '' + preConfigure = fullDepEntry '' cd src sed -e /LDCONFIG/d -i libdecodeqr/Makefile.in '' ["doUnpack"]; - postInstall = FullDepEntry '' + postInstall = fullDepEntry '' cp sample/simple/simpletest $out/bin/qrdecode cd .. '' ["doMake"]; - createDirs = FullDepEntry '' + createDirs = fullDepEntry '' ensureDir $out/bin $out/lib $out/include $out/share '' ["defEnsureDir"]; diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix index 28f7b579b4d..ae836ec086b 100644 --- a/pkgs/tools/graphics/qrencode/default.nix +++ b/pkgs/tools/graphics/qrencode/default.nix @@ -3,7 +3,7 @@ let lib = args.lib; fetchurl = args.fetchurl; - version = lib.getAttr ["version"] "3.0.3" args; + version = lib.attrByPath ["version"] "3.0.3" args; buildInputs = with args; [ libpng pkgconfig ]; diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix new file mode 100644 index 00000000000..ac3aa5a6b1e --- /dev/null +++ b/pkgs/tools/misc/autojump/default.nix @@ -0,0 +1,64 @@ +{ fetchurl, stdenv, python }: + +let version = "4"; in + stdenv.mkDerivation rec { + name = "autojump-${version}"; + + src = fetchurl { + url = "http://github.com/joelthelion/autojump/tarball/release-v4"; + name = "autojump-${version}.tar.gz"; + sha256 = "06hjkdmfhawi6xksangymf9z85ql8d7q0vlcmgsw45vxq7iq1fnp"; + }; + + # FIXME: Appears to be broken with Bash 4.0: + # http://wiki.github.com/joelthelion/autojump/doesnt-seem-to-be-working-with-bash-40 . + + patchPhase = '' + sed -i "install.sh" \ + -e "s,/usr/,$out/,g ; s,/etc/,/nowhere/,g ; s,sudo,,g" + ''; + + buildInputs = [ python ]; + + installPhase = '' + ensureDir "$out/bin" "$out/share/man/man1" + yes no | sh ./install.sh + + ensureDir "$out/etc/bash_completion.d" + cp -v autojump.bash "$out/etc/bash_completion.d" + + echo "Bash users: Make sure to source \`$out/etc/bash_completion.d/autojump.bash'" + echo "to get the \`j' and \`jumpstat' commands." + + # FIXME: What's the right place for `autojump.zsh'? + ''; + + meta = { + description = "Autojump, a `cd' command that learns"; + + longDescription = '' + One of the most used shell commands is “cd”. A quick survey + among my friends revealed that between 10 and 20% of all + commands they type are actually cd commands! Unfortunately, + jumping from one part of your system to another with cd + requires to enter almost the full path, which isn’t very + practical and requires a lot of keystrokes. + + Autojump is a faster way to navigate your filesystem. It + works by maintaining a database of the directories you use the + most from the command line. The jstat command shows you the + current contents of the database. You need to work a little + bit before the database becomes useable. Once your database + is reasonably complete, you can “jump” to a directory by + typing "j dirspec", where dirspec is a few characters of the + directory you want to jump to. It will jump to the most used + directory whose name matches the pattern given in dirspec. + + Autojump supports tab-completion. + ''; + + homepage = http://wiki.github.com/joelthelion/autojump; + + license = "GPLv3+"; + }; + } diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index f17395b9ece..e11ea87810f 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, tcl}: +{stdenv, fetchurl, tcl, tk, autoconf, xproto, libX11}: stdenv.mkDerivation { - name = "expect-5.43.0"; + name = "expect-5.44.1"; src = fetchurl { - url = http://expect.nist.gov/old/expect-5.43.0.tar.bz2; - sha256 = "1j6vyr8lx1fbl641hkkd6hhh9ifniklskfv00pbvy33h86a3mrvn"; + url = http://expect.nist.gov/old/expect-5.44.1.tar.gz; + sha256 = "13zxqiclzk1paxc0mr2vwp9nhfyr2mkwk9gs73fg0l3iss16n6p4"; }; - buildInputs = [tcl]; + buildInputs = [tcl tk autoconf xproto libX11]; #NIX_CFLAGS_COMPILE = "-DHAVE_UNISTD_H"; @@ -19,9 +19,13 @@ stdenv.mkDerivation { patchPhase = '' substituteInPlace configure --replace /bin/stty "$(type -tP stty)" + sed -e '1i\#include ' -i exp_inter.c ''; - configureFlags = "--with-tcl=${tcl}/lib --with-tclinclude=${tcl}/include"; + configureFlags = ["--with-tcl=${tcl}/lib" + "--with-tclinclude=${tcl}/include" + "--with-tk=${tk}/lib" + "--exec-prefix=$out"]; meta = { description = "A tool for automating interactive applications"; diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 6def99ac4e0..0349661833c 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "file-4.25"; + name = "file-5.03"; src = fetchurl { - url = ftp://ftp.astron.com/pub/file/file-4.25.tar.gz; - sha256 = "abcd5bc7f9a604b5966463eac4a3f54de180a08adb513d902bb44152ebad6c8a"; + url = ftp://ftp.astron.com/pub/file/file-5.03.tar.gz; + sha256 = "1fwmpplwc6h2g89ribq7w8x2np0yn5k7bw042815rv7jkrzv9nhy"; }; meta = { diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix new file mode 100644 index 00000000000..9bf90df414d --- /dev/null +++ b/pkgs/tools/misc/gnokii/default.nix @@ -0,0 +1,26 @@ +a : +let + fetchurl = a.fetchurl; + + version = a.lib.attrByPath ["version"] "0.6.27" a; + buildInputs = with a; [ + perl intltool gettext + ]; +in +rec { + src = fetchurl { + url = "http://www.gnokii.org/download/gnokii/gnokii-${version}.tar.bz2"; + sha256 = "11p8iv5jmlah3ls16a3jkndwlvwxxan8vwkwazlihaasfmgxgwb9"; + }; + + inherit buildInputs; + configureFlags = []; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "doMakeInstall"]; + + name = "gnokii-" + version; + meta = { + description = "Cellphone tool"; + }; +} diff --git a/pkgs/tools/misc/mcrl/default.nix b/pkgs/tools/misc/mcrl/default.nix new file mode 100644 index 00000000000..bf5043e8b63 --- /dev/null +++ b/pkgs/tools/misc/mcrl/default.nix @@ -0,0 +1,14 @@ +{stdenv, fetchurl, coreutils}: + +stdenv.mkDerivation { + name = "mcrl-2.18.4"; + src = fetchurl { + url = http://homepages.cwi.nl/~mcrl/mcrl-2.18.4.tar.gz ; + sha256 = "0gld7x3cv3y0vwjr1snz24xzr818sj1l2dfn8qhirfyhc7dnnqfw"; + }; + + RMPROG = "${coreutils}/bin/rm -f"; +} + + + diff --git a/pkgs/tools/misc/mcrl2/default.nix b/pkgs/tools/misc/mcrl2/default.nix new file mode 100644 index 00000000000..a67081d5ef2 --- /dev/null +++ b/pkgs/tools/misc/mcrl2/default.nix @@ -0,0 +1,14 @@ +{stdenv, fetchurl, mesa, wxGTK, libX11}: + +stdenv.mkDerivation { + name = "mcrl2-200901"; + src = fetchurl { + url = http://www.win.tue.nl/mcrl2/download/release/mcrl2-200901-src.tar.bz2 ; + sha256 = "0lji31d7dv15q8092b8g01j023dd7miq3nw8klgc8jd136xpwdp9"; + }; + + buildInputs = [ mesa wxGTK libX11 ] ; +} + + + diff --git a/pkgs/tools/misc/mdbtools/0.6-pre1.nix b/pkgs/tools/misc/mdbtools/0.6-pre1.nix index 6217a3f7776..9478ef1286b 100644 --- a/pkgs/tools/misc/mdbtools/0.6-pre1.nix +++ b/pkgs/tools/misc/mdbtools/0.6-pre1.nix @@ -8,7 +8,7 @@ rec { buildInputs = [glib readline bison flex pkgconfig]; configureFlags = []; - preConfigure = FullDepEntry ('' + preConfigure = fullDepEntry ('' sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c '') ["doUnpack" "minInit"]; diff --git a/pkgs/tools/misc/psmisc/default.nix b/pkgs/tools/misc/psmisc/default.nix index 64985a8638c..436bbd52a90 100644 --- a/pkgs/tools/misc/psmisc/default.nix +++ b/pkgs/tools/misc/psmisc/default.nix @@ -1,11 +1,13 @@ {stdenv, fetchurl, ncurses}: -stdenv.mkDerivation { - name = "psmisc-22.6"; +stdenv.mkDerivation rec { + name = "psmisc-22.7"; + src = fetchurl { - url = mirror://sourceforge/psmisc/psmisc-22.6.tar.gz; - sha256 = "0qlx4rdcj3igk67gzmdbyy6f54h4c5ya17gw0pkxdcwlgj4q2g51"; + url = "mirror://sourceforge/psmisc/${name}.tar.gz"; + sha256 = "1b8xs4sqf8wljbxn7y1nqdf8mgbn0d2yip93jbz8lyak6d68g704"; }; + buildInputs = [ncurses]; meta = { diff --git a/pkgs/tools/misc/relfs/cvs.2007.12.01.nix b/pkgs/tools/misc/relfs/cvs.2007.12.01.nix index 0638331dbe2..22f9560946a 100644 --- a/pkgs/tools/misc/relfs/cvs.2007.12.01.nix +++ b/pkgs/tools/misc/relfs/cvs.2007.12.01.nix @@ -13,7 +13,7 @@ args : with args; configureFlags = []; } null; /* null is a terminator for sumArgs */ in with localDefs; -let build = FullDepEntry (" +let build = fullDepEntry (" cd deps sed -e 's/^CPP/#&/ ; s/^# CPP=gcc/CPP=gcc/' -i Makefile.camlidl make diff --git a/pkgs/tools/misc/relfs/cvs.2008.03.05.nix b/pkgs/tools/misc/relfs/cvs.2008.03.05.nix index 4f3627f19e3..7180c830395 100644 --- a/pkgs/tools/misc/relfs/cvs.2008.03.05.nix +++ b/pkgs/tools/misc/relfs/cvs.2008.03.05.nix @@ -12,38 +12,37 @@ args : with args; buildInputs = [ocaml fuse postgresql pcre e2fsprogs gnomevfs pkgconfig GConf]; configureFlags = []; + build = builderDefs.stringsWithDeps.fullDepEntry (" + cd deps + sed -e 's/^CPP/#&/ ; s/^# CPP=gcc/CPP=gcc/' -i Makefile.camlidl + make + cd ../src + sed -e 's/NULL\\|FALSE/0/g' -i Mimetype_lib.c + sed -e 's@/usr/local/@'\$out/'@' -i Makefile + sed -e '/install:/a\\\tmkdir -p '\$out'/share' -i Makefile + make + mkdir -p \$out/bin + echo ' + createuser -A -D \$1 + dropdb relfs_\$1 ; + rm -rf /tmp/relfs-\$1-tmp; + mkdir /tmp/relfs-\$1-tmp; + USER=\$1 relfs -f -s /tmp/relfs-\$1-tmp & + sleep 1 && + kill -15 \${!}; + rm -rf /tmp/relfs-\$1-tmp ; + psql -d relfs_\$1 <<< \"ALTER DATABASE relfs_\$1 OWNER TO \$1; + ALTER TABLE obj OWNER TO \$1; + ALTER TABLE obj_mimetype OWNER TO \$1; + ALTER TABLE membership OWNER TO \$1;\"' > \$out/bin/relfs_grant; + chmod a+x \$out/bin/relfs_grant; + ") ["minInit" "doUnpack" "addInputs"]; }; in with localDefs; -let build = FullDepEntry (" - cd deps - sed -e 's/^CPP/#&/ ; s/^# CPP=gcc/CPP=gcc/' -i Makefile.camlidl - make - cd ../src - sed -e 's/NULL\\|FALSE/0/g' -i Mimetype_lib.c - sed -e 's@/usr/local/@'\$out/'@' -i Makefile - sed -e '/install:/a\\\tmkdir -p '\$out'/share' -i Makefile - make - mkdir -p \$out/bin - echo ' - createuser -A -D \$1 - dropdb relfs_\$1 ; - rm -rf /tmp/relfs-\$1-tmp; - mkdir /tmp/relfs-\$1-tmp; - USER=\$1 relfs -f -s /tmp/relfs-\$1-tmp & - sleep 1 && - kill -15 \${!}; - rm -rf /tmp/relfs-\$1-tmp ; - psql -d relfs_\$1 <<< \"ALTER DATABASE relfs_\$1 OWNER TO \$1; - ALTER TABLE obj OWNER TO \$1; - ALTER TABLE obj_mimetype OWNER TO \$1; - ALTER TABLE membership OWNER TO \$1;\"' > \$out/bin/relfs_grant; - chmod a+x \$out/bin/relfs_grant; -") [minInit doUnpack addInputs]; -in stdenv.mkDerivation rec { name = "relfs-"+version; builder = writeScript (name + "-builder") - (textClosure localDefs [build doMakeInstall doForceShare doPropagate]); + (textClosure localDefs ["build" "doMakeInstall" "doForceShare" "doPropagate"]); meta = { description = "A relational filesystem on top of FUSE"; inherit src; diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix new file mode 100644 index 00000000000..7a30d011be2 --- /dev/null +++ b/pkgs/tools/misc/wv2/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, pkgconfig, libgsf, glib, libxml2}: + +stdenv.mkDerivation { + name = "wv2-0.3.1"; + src = fetchurl { + url = mirror://sourceforge/wvware/wv2-0.3.1.tar.bz2; + sha256 = "896ff8ec59e280e8cb1ef9a953b364845dd65de1cdf8e4ed8a7e045a3f81c546"; + }; + buildInputs = [ pkgconfig libgsf glib libxml2 ]; +} diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index fbf148721ca..e751b9aa177 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -1,18 +1,14 @@ args: with args; stdenv.mkDerivation { - name = "xclip-0.08"; + name = "xclip-0.11"; src = fetchurl { - url = http://people.debian.org/~kims/xclip/xclip-0.08.tar.gz; - sha256 = "0py6ijw7ln892gzxxm2w47nn97nb6psb8g6clkpz86gg706yjxpf"; + url = "mirror://sourceforge/xclip/xclip-0.11.tar.gz"; + sha256 = "0ipwxkfqz66fz6jlln1v46sd2kr6bkqzq6j5hkzn6pb3grmzsacg"; }; - patchPhase = "sed -i s=/usr/X11R6/bin=/bin= Makefile"; - buildInputs = [x11 libXmu]; - installPhase="make install DESTDIR=\$out"; - meta = { description = "access X clipboard from this console application"; homepage = http://people.debian.org/~kims/xclip/; diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/tools/networking/imapsync/default.nix new file mode 100644 index 00000000000..c2c1320988a --- /dev/null +++ b/pkgs/tools/networking/imapsync/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, perl, openssl, MailIMAPClient}: + +stdenv.mkDerivation rec { + name = "imapsync-1.267"; + src = fetchurl { + url = http://www.linux-france.org/prj/imapsync/dist/imapsync-1.267.tgz; + sha256 = "0h9np2b4bdfnhn10cqkw66fki26480w0c8m3bxw0p76xkaggywdy"; + }; + patchPhase = '' + sed -i -e s@/usr@$out@ Makefile + ''; + + postInstall = '' + # Add Mail::IMAPClient to the runtime search path. + substituteInPlace $out/bin/imapsync --replace '/bin/perl' '/bin/perl -I${MailIMAPClient}/lib/perl5/site_perl'; + ''; + buildInputs = [perl openssl MailIMAPClient]; + + meta = { + homepage = "http://www.linux-france.org/prj/imapsync/"; + description = "Mail folder synchronizer between IMAP servers"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 96696f8d952..187598d64f8 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { - name = "ntp-4.2.4p6"; + name = "ntp-4.2.4p7"; src = fetchurl { url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; - sha256 = "0rqhcmb9rjdl0hkvxyabnmlrzgvvw2f16k7mi9b4qskwgh340xk4"; + sha256 = "1hq1iz54md8imc4a60jcmljlm5jk8ql7x40v7kbnc1ndwly8i0an"; }; configureFlags = '' diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index f38d72f8be5..69e9d2c849b 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -4,12 +4,12 @@ assert pamSupport -> pam != null; -stdenv.mkDerivation { - name = "openssh-5.1p1"; +stdenv.mkDerivation rec { + name = "openssh-5.2p1"; src = fetchurl { - url = ftp://ftp.nluug.nl/pub/security/OpenSSH/openssh-5.1p1.tar.gz; - sha256 = "0xbdcsjji7i952jfm6wc3xxblp4zbqxfayz5d8w2245f9lb5hlzh"; + url = "ftp://ftp.nluug.nl/pub/security/OpenSSH/${name}.tar.gz"; + sha256 = "1bpc6i07hlakb9vrxr8zb1yxnc9avsv7kjwrcagdgcyh6w6728s0"; }; buildInputs = [zlib openssl perl diff --git a/pkgs/tools/networking/p2p/tahoe/default.nix b/pkgs/tools/networking/p2p/tahoe/default.nix new file mode 100644 index 00000000000..c0646037f57 --- /dev/null +++ b/pkgs/tools/networking/p2p/tahoe/default.nix @@ -0,0 +1,55 @@ +{ fetchurl, unzip, buildPythonPackage, twisted, foolscap, nevow +, simplejson, zfec, pycryptopp, nettools }: + +buildPythonPackage (rec { + name = "tahoe-1.4.1"; + namePrefix = ""; + + src = fetchurl { + url = "http://allmydata.org/source/tahoe/releases/allmydata-${name}.zip"; + sha256 = "1q1fc3cixjqk0agbyiqs4zqdyqsp73nxx0f168djx7yp2q1p8nsm"; + }; + + patchPhase = '' + echo "forcing Tahoe to use \`setuptools' 0.6c9 rather than an unreleased version" + for i in *setup.py + do + sed -i "$i" -es'/0.6c12dev/0.6c9/g' + done + + # `find_exe()' returns a list like ['.../bin/python' + # '.../bin/twistd'], which doesn't work when `twistd' is not a + # Python script (e.g., when it's a script produced by + # `wrapProgram'). + sed -i "src/allmydata/scripts/startstop_node.py" \ + -es"|cmd = find_exe.find_exe('twistd')|cmd = ['${twisted}/bin/twistd']|g" + + sed -i "src/allmydata/util/iputil.py" \ + -es"|_linux_path = '/sbin/ifconfig'|_linux_path = '${nettools}/sbin/ifconfig'|g" + ''; + + buildInputs = [ unzip ]; + propagatedBuildInputs = [ + twisted foolscap nevow simplejson zfec pycryptopp + ]; + + # FIXME: Many tests try to write to the Nix store or to $HOME, which + # fails. Disable tests until we have a reasonable hack to allow + # them to run. + doCheck = false; + + meta = { + description = "Tahoe, a decentralized, fault-tolerant, distributed storage system"; + + longDescription = '' + Tahoe is a secure, decentralized, fault-tolerant filesystem. + This filesystem is encrypted and spread over multiple peers in + such a way that it remains available even when some of the peers + are unavailable, malfunctioning, or malicious. + ''; + + homepage = http://allmydata.org/; + + license = "GPLv2+"; + }; +}) diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index 26580d052a1..08097b4f5b3 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "2.4.4" a; + version = a.lib.attrByPath ["version"] "2.4.4" a; buildInputs = with a; [ ]; @@ -25,7 +25,7 @@ rec { /* We want to run it as far as we can with our current permissions For example, dependent builds would prefer to run --version without ever using setuid pppd. We are not setuid anyway, so.. */ - patchPrivileged = a.FullDepEntry('' + patchPrivileged = a.fullDepEntry('' sed -e '/privileged =/aprivileged = 1;' -i pppd/main.c sed -e '/SH DESCRIPTION/a WARNING: Patched version unsuitable to be setuid root' -i pppd/pppd.8 '') ["minInit" "doUnpack"]; diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix index c0b51992ca8..8a704bb5711 100644 --- a/pkgs/tools/networking/rp-pppoe/default.nix +++ b/pkgs/tools/networking/rp-pppoe/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "3.10" a; + version = a.lib.attrByPath ["version"] "3.10" a; buildInputs = with a; [ ppp ]; @@ -26,12 +26,12 @@ rec { export PPPD=${a.ppp}/sbin/pppd ''); - patchInstall = a.FullDepEntry('' + patchInstall = a.fullDepEntry('' sed -i Makefile -e 's@DESTDIR)/etc/ppp@out)/share/${name}/etc/ppp@' sed -i Makefile -e 's@PPPOESERVER_PPPD_OPTIONS=@&$(out)/share/${name}@' '') ["minInit" "doUnpack"]; - makeDirs = a.FullDepEntry('' + makeDirs = a.fullDepEntry('' ensureDir $out/share/${name}/etc/ppp '') ["minInit" "defEnsureDir"]; diff --git a/pkgs/tools/networking/smbfs-fuse/0.8.7.nix b/pkgs/tools/networking/smbfs-fuse/0.8.7.nix index be25331460a..dbd6bfc2c8c 100644 --- a/pkgs/tools/networking/smbfs-fuse/0.8.7.nix +++ b/pkgs/tools/networking/smbfs-fuse/0.8.7.nix @@ -8,7 +8,7 @@ args : with args; with builderDefs; buildInputs = [samba fuse]; configureFlags = []; - postInstall = FullDepEntry + postInstall = fullDepEntry ('' ensureDir $out/lib ln -fs ${samba}/lib/libsmbclient.so $out/lib/libsmbclient.so.0 diff --git a/pkgs/tools/networking/socat/2.0.0-b1.nix b/pkgs/tools/networking/socat/2.0.0-b3.nix similarity index 86% rename from pkgs/tools/networking/socat/2.0.0-b1.nix rename to pkgs/tools/networking/socat/2.0.0-b3.nix index 4e4b626e8c3..098a2d241df 100644 --- a/pkgs/tools/networking/socat/2.0.0-b1.nix +++ b/pkgs/tools/networking/socat/2.0.0-b3.nix @@ -2,8 +2,8 @@ args : with args; rec { src = /* Here a fetchurl expression goes */ fetchurl { - url = http://www.dest-unreach.org/socat/download/socat-2.0.0-b1.tar.bz2; - sha256 = "0ybd5fw22icl10r33k987rskh9gvysm1jph90a1pfdjj57cy44fk"; + url = http://www.dest-unreach.org/socat/download/socat-2.0.0-b3.tar.bz2; + sha256 = "0p4v8m898dzcardsw02xdda3y3b1rky7v956rm27x43783w5qmsx"; }; buildInputs = [openssl]; diff --git a/pkgs/tools/networking/vtun/default.nix b/pkgs/tools/networking/vtun/default.nix new file mode 100644 index 00000000000..3f3a0dc8993 --- /dev/null +++ b/pkgs/tools/networking/vtun/default.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl, openssl, lzo, zlib, yacc, flex }: +stdenv.mkDerivation { + name = "vtun-3.0.1"; + + src = fetchurl { + url = mirror://sourceforge/vtun/vtun-3.0.1.tar.gz; + sha256 = "1sxf9qq2wlfh1wnrlqkh801v1m9jlqpycxvr2nbyyl7nm2cp8l12"; + }; + + patchPhase = '' + sed -i -e 's/-m 755//' -e 's/-o root -g 0//' Makefile.in + ''; + buildInputs = [ lzo openssl zlib yacc flex ]; + + configureFlags = '' + --with-lzo-headers=${lzo}/include/lzo + --with-ssl-headers=${openssl}/include/openssl + --with-blowfish-headers=${openssl}/include/openssl''; + + meta = { + description="Virtual Tunnels over TCP/IP with traffic shaping, compression and encryption"; + homepage="http://vtun.sourceforge.net/"; + license = "GPLv2"; + }; +} diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix index 7d6f04422f5..216cf1c17d8 100644 --- a/pkgs/tools/security/bmrsa/11.nix +++ b/pkgs/tools/security/bmrsa/11.nix @@ -2,9 +2,9 @@ args : let lib = args.lib; fetchurl = args.fetchurl; - FullDepEntry = args.FullDepEntry; + fullDepEntry = args.fullDepEntry; - version = lib.getAttr ["version"] "" args; + version = lib.attrByPath ["version"] "" args; buildInputs = with args; [ unzip ]; @@ -21,7 +21,7 @@ rec { /* doConfigure should be specified separately */ phaseNames = ["doMakeInstall"]; - doUnpack = FullDepEntry ('' + doUnpack = fullDepEntry ('' mkdir bmrsa cd bmrsa unzip ${src} diff --git a/pkgs/tools/security/metasploit/3.1.nix b/pkgs/tools/security/metasploit/3.1.nix index 815f0026e8e..db4dcf3a835 100644 --- a/pkgs/tools/security/metasploit/3.1.nix +++ b/pkgs/tools/security/metasploit/3.1.nix @@ -8,7 +8,7 @@ rec { buildInputs = [makeWrapper]; configureFlags = []; - doInstall = FullDepEntry('' + doInstall = fullDepEntry('' ensureDir $out/share/msf ensureDir $out/bin diff --git a/pkgs/tools/security/seccure/0.4.nix b/pkgs/tools/security/seccure/0.4.nix index 79be594cee1..0a1452e5355 100644 --- a/pkgs/tools/security/seccure/0.4.nix +++ b/pkgs/tools/security/seccure/0.4.nix @@ -1,26 +1,23 @@ -args : with args; with builderDefs; - let localDefs = builderDefs.passthru.function ((rec { - src = /* put a fetchurl here */ - fetchurl { - url = http://point-at-infinity.org/seccure/seccure-0.4.tar.gz; - sha256 = "33d690a7034ee349bce4911a8b7c73e6e3cd13a140f429e9e628d5cd5a3bb955"; - }; +{stdenv, fetchurl, libgcrypt}: - buildInputs = [libgcrypt]; - configureFlags = []; - doPatch = FullDepEntry ('' - sed -e s@/usr/@$out/@g -i Makefile - ensureDir $out/bin $out/share/man/man1 - '') ["minInit" "doUnpack" "defEnsureDir"]; - }) // args); - in with localDefs; stdenv.mkDerivation rec { - name = "seccure-"+version; - builder = writeScript (name + "-builder") - (textClosure localDefs - ["doPatch" doMakeInstall doForceShare doPropagate]); - meta = { - description = "Zero-configuration elliptic curve cryptography utility"; - inherit src; - }; + name = "seccure-0.4"; + + src = fetchurl { + url = "http://point-at-infinity.org/seccure/${name}.tar.gz"; + sha256 = "33d690a7034ee349bce4911a8b7c73e6e3cd13a140f429e9e628d5cd5a3bb955"; + }; + + buildInputs = [libgcrypt]; + + preConfigure = '' + sed -e s@/usr/@$out/@g -i Makefile + sed -e 's@ln -f@ln -sf@g' -i Makefile + ensureDir $out/bin $out/share/man/man1 + ''; + + meta = { + homepage = http://point-at-infinity.org/seccure/; + description = "Zero-configuration elliptic curve cryptography utility"; + }; } diff --git a/pkgs/tools/security/ssss/0.5.nix b/pkgs/tools/security/ssss/0.5.nix index a6e8429a9df..9b460d0226c 100644 --- a/pkgs/tools/security/ssss/0.5.nix +++ b/pkgs/tools/security/ssss/0.5.nix @@ -8,7 +8,7 @@ args : with args; with builderDefs; buildInputs = [gmp]; configureFlags = []; - doPatch = FullDepEntry ('' + doPatch = fullDepEntry ('' sed -e s@/usr/@$out/@g -i Makefile cp ssss.manpage.xml ssss.1 cp ssss.manpage.xml ssss.1.html diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index be5933ea45e..f1c8e4b0408 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl, coreutils, pam}: +{stdenv, fetchurl, coreutils, pam, groff}: stdenv.mkDerivation rec { - name = "sudo-1.7.0"; + name = "sudo-1.7.1"; src = fetchurl { url = "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"; - sha256 = "0y0r74vvcn1q4c220ha0azs8d4kyjr3x3bl6ilxqp77khx1fjzaz"; + sha256 = "1nz1mgnyrz4ibmywh379vic941qbxy7ca71cn0l1p66a9zmkj775"; }; # `--with-stow' allows /etc/sudoers to be a symlink. Only it @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { installFlags=\"sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc\" "; - buildInputs = [coreutils pam]; + buildInputs = [coreutils pam groff]; meta = { description = "sudo, a command to run commands as root"; diff --git a/pkgs/tools/system/setserial/default.nix b/pkgs/tools/system/setserial/default.nix new file mode 100644 index 00000000000..76bc24c2756 --- /dev/null +++ b/pkgs/tools/system/setserial/default.nix @@ -0,0 +1,34 @@ +a : +let + fetchurl = a.fetchurl; + + version = a.lib.attrByPath ["version"] "2.17" a; + buildInputs = with a; [ + groff + ]; +in +rec { + src = fetchurl { + url = "mirror://sourceforge/setserial/setserial-${version}.tar.gz"; + sha256 = "0jkrnn3i8gbsl48k3civjmvxyv9rbm1qjha2cf2macdc439qfi3y"; + }; + + inherit buildInputs; + configureFlags = []; + + installFlags = "DESTDIR=$out"; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "patchPath" "doMakeInstall"]; + + patchPath = a.fullDepEntry ('' + sed -e s@/usr/man/@/share/man/@ -i Makefile + '') ["minInit" "doUnpack" "doConfigure"]; + + neededDirs = ["$out/bin" "$out/share/man/man8"]; + + name = "setserial-" + version; + meta = { + description = "Serial port configuration utility"; + }; +} diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 4f44d61108e..dc1820c48d3 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [pcre]; - doCheck = true; + doCheck = if stdenv.system == "i686-darwin" then false else true; # On Mac OS X, force use of mkdir -p, since Grep's fallback # (./install-sh) is broken. diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix index 9eab819612f..32a08c5367b 100644 --- a/pkgs/tools/text/namazu/default.nix +++ b/pkgs/tools/text/namazu/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { LIB="$out/lib/perl5/site_perl/5.10.0" \ INSTALLSITEMAN3DIR="$out/man" && \ make && make install ) - export PERL5LIB="$out/lib/site_perl/5.10.0:$PERL5LIB" + export PERL5LIB="$out/lib/perl5/site_perl/5.10.0:$PERL5LIB" ''; doCheck = true; diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix index f5bbb572504..0881591436f 100644 --- a/pkgs/tools/typesetting/lhs2tex/default.nix +++ b/pkgs/tools/typesetting/lhs2tex/default.nix @@ -1,6 +1,6 @@ {cabal, tetex, polytable, regexCompat, utf8String}: -assert tetex == polytable.tetex; +#assert tetex == polytable.tetex; cabal.mkDerivation (self : { pname = "lhs2tex"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 469eb20144f..b364d9928c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -66,7 +66,7 @@ let # Return an attribute from the Nixpkgs configuration file, or # a default value if the attribute doesn't exist. - getConfig = attrPath: default: lib.getAttr attrPath default config; + getConfig = attrPath: default: lib.attrByPath attrPath default config; # Allow packages to be overriden globally via the `packageOverrides' @@ -93,7 +93,7 @@ let # For convenience, allow callers to get the path to Nixpkgs. - path = ./..; + path = ../..; ### Symbolic names. @@ -165,9 +165,7 @@ let builderDefsPackage = builderDefs.builderDefsPackage builderDefs; - stringsWithDeps = import ../lib/strings-with-deps.nix { - inherit stdenv lib; - }; + stringsWithDeps = lib.stringsWithDeps; # Call a specific version of a Nix expression, that is, # `selectVersion ./foo {version = "0.1.2"; args...}' evaluates to @@ -182,6 +180,10 @@ let in import (dir + "/${pVersion}.nix") (args // { version = pVersion; }); + # usage: (you can use override multiple times) + # let d = makeOverridable stdenv.mkDerivation { name = ..; buildInputs; } + # noBuildInputs = d.override { buildInputs = []; } + # additionalBuildInputs = d.override ( args : args // { buildInputs = args.buildInputs ++ [ additional ]; } ) makeOverridable = f: origArgs: f origArgs // { override = newArgs: makeOverridable f (origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs)); @@ -221,6 +223,8 @@ let overrideGCC overrideInStdenv overrideSetup useDietLibC useKlibc makeStaticBinaries; + stdenvNew = overrideSetup stdenv ../stdenv/generic/setup-new.sh; + ### BUILD SUPPORT @@ -248,6 +252,10 @@ let inherit stdenv darcs nix; }; + fetchgit = import ../build-support/fetchgit { + inherit stdenv git; + }; + fetchsvn = import ../build-support/fetchsvn { inherit stdenv subversion openssh; sshSupport = true; @@ -269,7 +277,8 @@ let # from being built. fetchurl = useFromStdenv "fetchurl" (import ../build-support/fetchurl { - inherit stdenv curl; + inherit curl; + stdenv = stdenvNew; }); # fetchurlBoot is used for curl and its dependencies in order to @@ -284,6 +293,10 @@ let inherit url; }; + makeDesktopItem = import ../build-support/make-desktopitem { + inherit stdenv; + }; + makeInitrd = {contents}: import ../build-support/kernel/make-initrd.nix { inherit stdenv perl cpio contents; }; @@ -300,6 +313,8 @@ let inherit stdenv module_init_tools kernel rootModules allowMissing; }; + pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; + # Run the shell command `buildCommand' to produce a store object # named `name'. The attributes in `env' are added to the # environment prior to running the command. @@ -393,6 +408,10 @@ let inherit fetchurl stdenv bison flex pam ssmtp; }; + autojump = import ../tools/misc/autojump { + inherit fetchurl stdenv python; + }; + avahi = let qt4Support = getConfig [ "avahi" "qt4Support" ] false; in @@ -420,6 +439,16 @@ let inherit fetchurl stdenv perl; }; + mcrl = import ../tools/misc/mcrl { + inherit fetchurl stdenv coreutils; + }; + + mcrl2 = import ../tools/misc/mcrl2 { + inherit fetchurl stdenv mesa ; + inherit (xorg) libX11; + wxGTK = wxGTK28 ; + }; + syslogng = import ../tools/misc/syslog-ng { inherit fetchurl stdenv eventlog pkgconfig; inherit (gtkLibs) glib; @@ -625,7 +654,8 @@ let }; expect = import ../tools/misc/expect { - inherit fetchurl stdenv tcl; + inherit fetchurl stdenv tcl tk autoconf; + inherit (xorg) xproto libX11; }; fcron = import ../tools/system/fcron { # see also cron @@ -705,6 +735,10 @@ let inherit fetchurl stdenv x11 mesa; }; + gnokii = builderDefsPackage (import ../tools/misc/gnokii) { + inherit intltool perl gettext; + }; + gnugrep = useFromStdenv "gnugrep" (import ../tools/text/gnugrep { inherit fetchurl stdenv pcre; @@ -833,6 +867,11 @@ let inherit fetchurl stdenv emacs; }; + imapsync = import ../tools/networking/imapsync { + inherit fetchurl stdenv perl openssl; + inherit (perlPackages) MailIMAPClient; + }; + inetutils = import ../tools/networking/inetutils { inherit fetchurl stdenv; }; @@ -911,6 +950,10 @@ let inherit fetchurl stdenv lzo; }; + magit = import ../applications/editors/emacs-modes/magit { + inherit fetchurl stdenv emacs texinfo; + }; + man = import ../tools/misc/man { inherit fetchurl stdenv groff less; }; @@ -1118,6 +1161,10 @@ let inherit (xlibs) libX11; }; + povray = import ../tools/graphics/povray { + inherit fetchurl stdenv; + }; + /* WARNING: this version is unsuitable for using with a setuid wrapper */ ppp = builderDefsPackage (import ../tools/networking/ppp) { }; @@ -1164,6 +1211,10 @@ let inherit (gtkLibs) pango gtk glib; }; + openmpi = import ../development/libraries/openmpi { + inherit fetchurl stdenv; + }; + qhull = import ../development/libraries/qhull { inherit stdenv fetchurl; }; @@ -1243,21 +1294,18 @@ let inherit fetchurl stdenv ncurses; }; - seccure = composedArgsAndFun (selectVersion ../tools/security/seccure "0.4") { - inherit builderDefs libgcrypt; + seccure = import ../tools/security/seccure/0.4.nix { + inherit fetchurl stdenv libgcrypt; }; - # seccure will override it (it is root-only, but - # more secure because of memory locking), but this - # can be added to default system - seccureUser = lowPrio (seccure.passthru.function { - makeFlags = [" CFLAGS+=-DNOMEMLOCK "]; - }); - semantic = import ../applications/editors/emacs-modes/semantic { inherit fetchurl stdenv emacs eieio; }; + setserial = builderDefsPackage (import ../tools/system/setserial) { + inherit groff; + }; + sharutils = selectVersion ../tools/archivers/sharutils "4.6.3" { inherit fetchurl stdenv; }; @@ -1283,7 +1331,7 @@ let }; sudo = import ../tools/security/sudo { - inherit fetchurl stdenv coreutils pam; + inherit fetchurl stdenv coreutils pam groff; }; superkaramba = import ../desktops/superkaramba { @@ -1343,11 +1391,21 @@ let inherit fetchurl stdenv ucl zlib; }; + viking = import ../applications/misc/viking { + inherit fetchurl stdenv pkgconfig intltool gettext expat curl + gpsd bc file; + inherit (gtkLibs) gtk; + }; + vpnc = import ../tools/networking/vpnc { inherit fetchurl stdenv libgcrypt perl gawk nettools makeWrapper; }; + vtun = import ../tools/networking/vtun { + inherit fetchurl stdenv lzo openssl zlib yacc flex; + }; + testdisk = import ../tools/misc/testdisk { inherit fetchurl stdenv ncurses libjpeg e2fsprogs zlib openssl; }; @@ -1355,6 +1413,8 @@ let tightvnc = import ../tools/admin/tightvnc { inherit fetchurl stdenv x11 zlib libjpeg perl; inherit (xlibs) imake gccmakedep libXmu libXaw libXpm libXp xauth; + fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc + xorg.fontbhlucidatypewriter75dpi ]; }; time = import ../tools/misc/time { @@ -1429,6 +1489,11 @@ let inherit (gtkLibs) glib; }; + wv2 = import ../tools/misc/wv2 { + inherit stdenv fetchurl pkgconfig libgsf libxml2; + inherit (gtkLibs) glib; + }; + x11_ssh_askpass = import ../tools/networking/x11-ssh-askpass { inherit fetchurl stdenv x11; inherit (xorg) imake; @@ -1492,7 +1557,7 @@ let }; bashInteractive = appendToName "interactive" (bashReal.override { - inherit readline; + inherit readline texinfo; interactive = true; }); @@ -1585,10 +1650,10 @@ let gcc43 = useFromStdenv "gcc" gcc43_real; - gcc43_real = wrapGCC (makeOverridable (import ../development/compilers/gcc-4.3) { + gcc43_real = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.3) { inherit fetchurl stdenv texinfo gmp mpfr noSysDirs; profiledCompiler = true; - }); + })); gcc43_multi = lowPrio (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc43_real.gcc.override { stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc); @@ -1639,6 +1704,18 @@ let profiledCompiler = false; }); + gcj = gcj43; + + gcj43 = wrapGCC (gcc43_real.gcc.override { + name = "gcj"; + langJava = true; + langFortran = false; + langCC = true; + langC = false; + profiledCompiler = false; + inherit zlib boehmgc; + }); + # This new ghc stuff is under heavy development and will change ! # =============================================================== @@ -1770,11 +1847,11 @@ let libraries = # core_libs distributed with this ghc version (lib.flattenAttrs ghcsAndLibs.ghc68.core_libs) - # (map ( a : __getAttr a ghcsAndLibs.ghc68.core_libs ) [ "cabal" "mtl" "base" ] + # (map ( a : builtins.getAttr a ghcsAndLibs.ghc68.core_libs ) [ "cabal" "mtl" "base" ] # some extra libs ++ (lib.flattenAttrs (ghc68extraLibs ghcsAndLibs.ghc68) ); - # ++ map ( a : __getAttr a (ghc68extraLibs ghcsAndLibs.ghc68 ) ) [ "mtl" "parsec" ... ] + # ++ map ( a : builtins.getAttr a (ghc68extraLibs ghcsAndLibs.ghc68 ) ) [ "mtl" "parsec" ... ] inherit ghc; }; @@ -1794,7 +1871,7 @@ let inherit fetchurl stdenv perl ncurses gmp libedit; }); - haskellPackages = haskellPackages_ghc6102; + haskellPackages = haskellPackages_ghc6103; haskellPackages_ghc642 = import ./haskell-packages.nix { inherit pkgs; @@ -1819,7 +1896,7 @@ let ghc = ghc642Binary; }; }; - + haskellPackages_ghc683 = recurseIntoAttrs (import ./haskell-packages.nix { inherit pkgs; ghc = import ../development/compilers/ghc/6.8.3.nix { @@ -1851,6 +1928,14 @@ let }; }); + haskellPackages_ghc6103 = recurseIntoAttrs (import ./haskell-packages.nix { + inherit pkgs; + ghc = import ../development/compilers/ghc/6.10.3.nix { + inherit fetchurl stdenv perl ncurses gmp libedit; + ghc = ghc6101Binary; + }; + }); + gprolog = import ../development/compilers/gprolog { inherit fetchurl stdenv; }; @@ -1992,6 +2077,11 @@ let inherit mysql libxml2 fcgi; }; + sbcl = builderDefsPackage (import ../development/compilers/sbcl) { + inherit makeWrapper; + clisp = clisp_2_44_1; + }; + scala = import ../development/compilers/scala { inherit stdenv fetchurl; }; @@ -2068,7 +2158,16 @@ let clisp = import ../development/interpreters/clisp { inherit fetchurl stdenv libsigsegv gettext - readline ncurses coreutils pcre zlib; + readline ncurses coreutils pcre zlib libffi libffcall; + inherit (xlibs) libX11 libXau libXt xproto + libXpm libXext xextproto; + }; + + # compatibility issues in 2.47 - at list 2.44.1 is known good + # for sbcl bootstrap + clisp_2_44_1 = import ../development/interpreters/clisp/2.44.1.nix { + inherit fetchurl stdenv libsigsegv gettext + readline ncurses coreutils pcre zlib libffi libffcall; inherit (xlibs) libX11 libXau libXt xproto libXpm libXext xextproto; }; @@ -2140,7 +2239,7 @@ let inherit stdenv fetchurl lib composableDerivation autoconf automake flex bison apacheHttpd mysql libxml2 # gettext - zlib curl gd postgresql openssl pkgconfig; + zlib curl gd postgresql openssl pkgconfig sqlite; }; pltScheme = builderDefsPackage (import ../development/interpreters/plt-scheme) { @@ -2165,6 +2264,7 @@ let }; python25Full = python25Base.passthru.function { + # FIXME: We lack ncurses support, needed, e.g., for `gpsd'. db4 = if getConfig ["python" "db4Support"] true then db4 else null; sqlite = if getConfig ["python" "sqliteSupport"] true then sqlite else null; readline = if getConfig ["python" "readlineSupport"] true then readline else null; @@ -2274,6 +2374,10 @@ let inherit fetchurl stdenv unzip; }; + jruby116 = import ../development/interpreters/jruby { + inherit fetchurl stdenv; + }; + guileLib = import ../development/guile-modules/guile-lib { inherit fetchurl stdenv guile texinfo; }; @@ -2332,6 +2436,10 @@ let inherit fetchurl stdenv perl autoconf makeWrapper; }; + automake111x = import ../development/tools/misc/automake/automake-1.11.x.nix { + inherit fetchurl stdenv perl autoconf makeWrapper; + }; + avrdude = import ../development/tools/misc/avrdude { inherit lib fetchurl stdenv flex yacc composableDerivation texLive; }; @@ -2368,7 +2476,11 @@ let }; ctags = import ../development/tools/misc/ctags { - inherit fetchurl stdenv; + inherit fetchurl stdenv bleedingEdgeRepos automake autoconf; + }; + + ctagsWrapped = import ../development/tools/misc/ctags/wrapped.nix { + inherit pkgs ctags writeScriptBin lib makeOverridable; }; cmake = import ../development/tools/build-managers/cmake { @@ -2422,6 +2534,18 @@ let inherit fetchurl stdenv; }; + pmd = import ../development/tools/analysis/pmd { + inherit fetchurl stdenv unzip; + }; + + jdepend = import ../development/tools/analysis/jdepend { + inherit fetchurl stdenv unzip; + }; + + checkstyle = import ../development/tools/analysis/checkstyle { + inherit fetchurl stdenv unzip; + }; + flex = flex254a; flex2535 = import ../development/tools/parsing/flex/flex-2.5.35.nix { @@ -2545,6 +2669,10 @@ let inherit fetchurl stdenv; }); + patchelf05 = import ../development/tools/misc/patchelf/0.5.nix { + inherit fetchurl stdenv; + }; + pmccabe = import ../development/tools/misc/pmccabe { inherit fetchurl stdenv; }; @@ -2980,7 +3108,8 @@ let }; gav = import ../games/gav { - inherit fetchurl stdenv SDL SDL_image SDL_mixer SDL_net; + inherit fetchurl SDL SDL_image SDL_mixer SDL_net; + stdenv = overrideGCC stdenv gcc41; }; gdbm = import ../development/libraries/gdbm { @@ -3010,10 +3139,10 @@ let }; gdal = stdenv.mkDerivation { - name = "gdal-1.4.2"; + name = "gdal-1.6.1-rc1"; src = fetchurl { - url = http://download.osgeo.org/gdal/gdal-1.4.2.tar.gz; - sha256 = "1vl8ym9y7scm0yd4vghjfqims69b9h1gn9l4zvy2jyglh35p8vpf"; + url = ftp://ftp.remotesensing.org/gdal/gdal-1.6.1-RC1.tar.gz; + sha256 = "0f7da588yvb1d3l3gk5m0hrqlhg8m4gw93aip3dwkmnawz9r0qcw"; }; }; @@ -3242,7 +3371,7 @@ let isocodes = import ../development/libraries/iso-codes { inherit stdenv fetchurl gettext python; }; - + jasper = import ../development/libraries/jasper { inherit fetchurl stdenv unzip xlibs libjpeg; }; @@ -3381,6 +3510,10 @@ let inherit fetchurl stdenv builderDefs zlib; }; + libffcall = builderDefsPackage (import ../development/libraries/libffcall) { + inherit fetchcvs; + }; + libffi = import ../development/libraries/libffi { inherit fetchurl stdenv; }; @@ -3511,6 +3644,10 @@ let inherit fetchurl stdenv zlib; }; + libproxy = import ../development/libraries/libproxy { + inherit stdenv fetchurl; + }; + libpseudo = import ../development/libraries/libpseudo { inherit fetchurl stdenv pkgconfig ncurses; inherit (gtkLibs) glib; @@ -3550,6 +3687,10 @@ let inherit fetchurl stdenv libtool; }; + libunistring = import ../development/libraries/libunistring { + inherit fetchurl stdenv; + }; + libupnp = import ../development/libraries/pupnp { inherit fetchurl stdenv; }; @@ -3602,8 +3743,8 @@ let }; libxklavier = import ../development/libraries/libxklavier { - inherit fetchurl stdenv xkeyboard_config pkgconfig libxml2; - inherit (xorg) libX11 libICE libxkbfile; + inherit fetchurl stdenv xkeyboard_config pkgconfig libxml2 isocodes; + inherit (xorg) libX11 libICE libXi libxkbfile; inherit (gtkLibs) glib; }; @@ -3686,6 +3827,10 @@ let inherit fetchurl stdenv python; }; + muparser = import ../development/libraries/muparser { + inherit fetchurl stdenv; + }; + ncurses = composedArgsAndFun (import ../development/libraries/ncurses) { inherit fetchurl stdenv; unicode = (system != "i686-cygwin"); @@ -3710,6 +3855,10 @@ let sslSupport = true; }; + nethack = builderDefsPackage (import ../games/nethack) { + inherit ncurses flex bison; + }; + nss = import ../development/libraries/nss { inherit fetchurl stdenv perl zip; }; @@ -3869,7 +4018,7 @@ let }; SDL = import ../development/libraries/SDL { - inherit fetchurl stdenv x11 mesa alsaLib; + inherit fetchurl stdenv pkgconfig x11 mesa alsaLib pulseaudio; inherit (xlibs) libXrandr; openglSupport = mesaSupported; alsaSupport = true; @@ -3967,12 +4116,16 @@ let }; webkit = builderDefsPackage (import ../development/libraries/webkit) { + inherit (gnome26) libsoup; + inherit (gnome) gtkdoc; inherit (gtkLibs) gtk atk pango; inherit freetype fontconfig gettext gperf curl libjpeg libtiff libpng libxml2 libxslt sqlite icu cairo perl intltool automake libtool - pkgconfig autoconf bison; + pkgconfig autoconf bison libproxy enchant; + inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg; flex = flex2535; + inherit (xlibs) libXt; }; wxGTK = wxGTK26; @@ -4028,6 +4181,10 @@ let ]; }; + zangband = builderDefsPackage (import ../games/zangband) { + inherit ncurses flex bison autoconf automake m4 coreutils; + }; + zlib = import ../development/libraries/zlib { fetchurl = fetchurlBoot; inherit stdenv; @@ -4156,6 +4313,14 @@ let ### DEVELOPMENT / PYTHON MODULES + buildPythonPackage = + import ../development/python-modules/generic { + inherit python setuptools makeWrapper lib; + }; + + pythonPackages = recurseIntoAttrs (import ./python-packages.nix { + inherit pkgs; + }); foursuite = import ../development/python-modules/4suite { inherit fetchurl stdenv python; @@ -4172,14 +4337,6 @@ let setuptools = setuptools.passthru.function {inherit python;}; }); - foolscap = import ../development/python-modules/foolscap { - inherit fetchurl stdenv python setuptools twisted pyopenssl; - }; - - nevow = import ../development/python-modules/nevow { - inherit fetchurl stdenv python setuptools twisted makeWrapper lib; - }; - numeric = import ../development/python-modules/numeric { inherit fetchurl stdenv python; }; @@ -4268,12 +4425,8 @@ let inherit fetchurl stdenv python makeWrapper; }; - setuptools = builderDefsPackage (selectVersion ../development/python-modules/setuptools "0.6c8") { - inherit python; - }; - - simplejson = import ../development/python-modules/simplejson { - inherit fetchsvn stdenv python setuptools; + setuptools = builderDefsPackage (import ../development/python-modules/setuptools) { + inherit python makeWrapper; }; wxPython = wxPython26; @@ -4288,9 +4441,7 @@ let wxGTK = wxGTK28; }; - twisted = import ../development/python-modules/twisted { - inherit fetchurl stdenv python ZopeInterface makeWrapper; - }; + twisted = pythonPackages.twisted; ZopeInterface = import ../development/python-modules/ZopeInterface { inherit fetchurl stdenv python; @@ -4339,7 +4490,7 @@ let ejabberd = import ../servers/xmpp/ejabberd { inherit fetchurl stdenv expat erlang zlib openssl - pam; + pam fetchsvn; }; fingerd_bsd = import ../servers/fingerd/bsd-fingerd { @@ -4482,7 +4633,7 @@ let xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix { inherit fetchurl stdenv pkgconfig freetype fontconfig libxslt expat libdrm libpng zlib perl mesa mesaHeaders - xkeyboard_config dbus hal e2fsprogs openssl gperf m4; + xkeyboard_config dbus hal libuuid openssl gperf m4; # !!! pythonBase is use instead of python because this cause an infinite # !!! recursion when the flag python.full is set to true. Packages @@ -4524,7 +4675,7 @@ let }; nfsUtils = import ../os-specific/linux/nfs-utils { - inherit fetchurl stdenv tcpWrapper e2fsprogs; + inherit fetchurl stdenv tcpWrapper e2fsprogs; }; acpi = import ../os-specific/linux/acpi { @@ -4542,7 +4693,7 @@ let alsaLib = import ../os-specific/linux/alsa-lib { inherit stdenv fetchurl; }; - + alsaUtils = import ../os-specific/linux/alsa-utils { inherit stdenv fetchurl alsaLib gettext ncurses; }; @@ -4595,11 +4746,18 @@ let stdenv = if stdenv.system == "powerpc-linux" then overrideGCC stdenv gcc34 else stdenv; }; - e2fsprogs = import ../os-specific/linux/e2fsprogs { + # libuuid is used as an (indirect) dependency for lots of other + # packages such as X and KDE, which we don't want to rebuild every + # time we update e2fsprogs. + e2fsprogsOld = import ../os-specific/linux/e2fsprogs/1.41.5.nix { inherit fetchurl stdenv; }; - libuuid = e2fsprogs; + libuuid = e2fsprogsOld; + + e2fsprogs = import ../os-specific/linux/e2fsprogs/1.41.6.nix { + inherit fetchurl stdenv; + }; e3cfsprogs = import ../os-specific/linux/e3cfsprogs { inherit stdenv fetchurl gettext; @@ -4957,6 +5115,24 @@ let [(getConfig ["kernel" "addConfig"] "")]; }; + kernel_2_6_29 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.29.nix) { + inherit fetchurl stdenv perl mktemp module_init_tools; + kernelPatches = [ + { name = "fbcondecor-0.9.5-2.6.28"; + patch = fetchurl { + url = http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.6-2.6.29.2.patch; + sha256 = "1yppvji13sgnql62h4wmskzl9l198pp1pbixpbymji7mr4a0ylx1"; + }; + extraConfig = "CONFIG_FB_CON_DECOR=y"; + features = { fbConDecor = true; }; + } + { name = "sec_perm-2.6.24"; + patch = ../os-specific/linux/kernel/sec_perm-2.6.24.patch; + features = { secPermPatch = true; }; + } + ]; + }; + /* Kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -4998,7 +5174,7 @@ let inherit fetchurl stdenv kernel ncurses fxload; }; - kqemu = builderDefsPackage (selectVersion ../os-specific/linux/kqemu "1.3.0pre11") { + kqemu = builderDefsPackage (selectVersion ../os-specific/linux/kqemu "1.4.0pre1") { inherit kernel; }; @@ -5048,7 +5224,7 @@ let virtualbox = import ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit fetchurl iasl dev86 libxslt libxml2 qt3 qt4 SDL hal - libcap libpng zlib kernel python which; + libcap libpng zlib kernel python which alsaLib; inherit (gtkLibs) glib; inherit (xlibs) xproto libX11 libXext libXcursor; inherit (gnome) libIDL; @@ -5061,6 +5237,7 @@ let kernelPackages_2_6_26 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_26); kernelPackages_2_6_27 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_27); kernelPackages_2_6_28 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_28); + kernelPackages_2_6_29 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_29); # The current default kernel / kernel modules. kernelPackages = kernelPackages_2_6_28; @@ -5096,16 +5273,23 @@ let inherit fetchurl stdenv bison flex perl; }; - klibc = composedArgsAndFun (import ../os-specific/linux/klibc) { + klibc = makeOverridable (import ../os-specific/linux/klibc) { inherit fetchurl stdenv perl bison mktemp; kernelHeaders = glibc.kernelHeaders; }; - klibcShrunk = composedArgsAndFun (import ../os-specific/linux/klibc/shrunk.nix) { + # Old version; needed in vmtools for insmod. Should use + # module_init_tools instead. + klibc_15 = makeOverridable (import ../os-specific/linux/klibc/1.5.nix) { + inherit fetchurl stdenv perl bison mktemp; + kernelHeaders = glibc.kernelHeaders; + }; + + klibcShrunk = makeOverridable (import ../os-specific/linux/klibc/shrunk.nix) { inherit stdenv klibc; }; - kvm = kvm76; + kvm = kvm86; kvm57 = import ../os-specific/linux/kvm/57.nix { inherit fetchurl zlib e2fsprogs SDL alsaLib; @@ -5118,8 +5302,8 @@ let inherit (glibc) kernelHeaders; }; - kvm84 = import ../os-specific/linux/kvm/84.nix { - inherit fetchurl stdenv zlib e2fsprogs SDL alsaLib pkgconfig rsync; + kvm86 = import ../os-specific/linux/kvm/86.nix { + inherit fetchurl stdenv zlib SDL alsaLib pkgconfig pciutils; inherit (glibc) kernelHeaders; }; @@ -5227,6 +5411,12 @@ let inherit lib; }; + policyKit = import ../os-specific/linux/polkit { + inherit fetchurl stdenv pkgconfig intltool expat dbus dbus_glib pam; + inherit gettext; + inherit (gtkLibs) glib; + }; + powertop = import ../os-specific/linux/powertop { inherit fetchurl stdenv ncurses gettext; }; @@ -5310,6 +5500,11 @@ let inherit fetchurl stdenv; }; + trackballs = import ../games/trackballs { + inherit stdenv fetchurl SDL mesa SDL_ttf gettext zlib SDL_mixer SDL_image guile; + debug = false; + }; + tunctl = import ../os-specific/linux/tunctl { inherit stdenv fetchurl; }; @@ -5350,7 +5545,7 @@ let utillinuxCurses = utillinuxngCurses; utillinuxng = makeOverridable (import ../os-specific/linux/util-linux-ng) { - inherit fetchurl stdenv e2fsprogs; + inherit fetchurl stdenv libuuid; }; utillinuxngCurses = utillinuxng.override { @@ -5369,6 +5564,10 @@ let inherit fetchurl stdenv openssl; }; + wpa_supplicant_gui_qt4 = import ../os-specific/linux/wpa_supplicant/gui-qt4.nix { + inherit fetchurl stdenv qt4 imagemagick inkscape; + }; + xfsProgs = builderDefsPackage (selectVersion ../os-specific/linux/xfsprogs "2.9.7-1"){ inherit libtool gettext e2fsprogs; }; @@ -5574,13 +5773,10 @@ let inherit (gnome) libglade libgnomeprint libgnomeprintui libgnomecanvas; }; - acroread = import ../applications/misc/acrobat-reader { - inherit fetchurl stdenv zlib; - inherit (xlibs) libXt libXp libXext libX11 libXinerama; + adobeReader = import ../applications/misc/adobe-reader { + inherit fetchurl stdenv zlib libxml2 cups; + inherit (xlibs) libX11; inherit (gtkLibs) glib pango atk gtk; - libstdcpp5 = gcc33.gcc; - xineramaSupport = true; - fastStart = getConfig ["acroread" "fastStart"] true; }; amsn = import ../applications/networking/instant-messengers/amsn { @@ -5601,7 +5797,8 @@ let }; audacity = import ../applications/audio/audacity { - inherit fetchurl stdenv gettext pkgconfig zlib; + inherit fetchurl stdenv gettext pkgconfig zlib perl intltool libogg + libvorbis libmad; inherit (gtkLibs) gtk glib; wxGTK = wxGTK28; }; @@ -5662,12 +5859,15 @@ let }; blender = import ../applications/misc/blender { - inherit stdenv cmake mesa gettext freetype SDL libtiff fetchurl glibc scons x11 lib + inherit cmake mesa gettext freetype SDL libtiff fetchurl glibc scons x11 lib libjpeg libpng zlib /* smpeg sdl */ python; inherit (xlibs) inputproto libXi; freealut = freealut_soft; openal = openalSoft; openexr = openexr_1_4_0; + # using gcc43 makes blender segfault when pressing p then esc. + # is this related to the PHP bug? I'm to lazy to try recompilng it without optimizations + stdenv = overrideGCC stdenv gcc42; }; bmp = import ../applications/audio/bmp { @@ -5806,9 +6006,9 @@ let }; cinepaint = import ../applications/graphics/cinepaint { - inherit stdenv fetchurl pkgconfig freetype fontconfig lcms flex libtiff + inherit stdenv fetchcvs cmake pkgconfig freetype fontconfig lcms flex libtiff libjpeg libpng libexif zlib perl mesa perlXMLParser python pygtk gettext - intltool babl gegl; + intltool babl gegl automake autoconf libtool; inherit (xlibs) makedepend libX11 xf86vidmodeproto xineramaproto libXmu libXext libXpm libXxf86vm; inherit (gtkLibs) gtk glib; @@ -5879,7 +6079,7 @@ let dmtx = builderDefsPackage (import ../tools/graphics/dmtx) { inherit libpng libtiff libjpeg imagemagick librsvg - pkgconfig bzip2 zlib; + pkgconfig bzip2 zlib libtool; inherit (xlibs) libX11; }; @@ -5912,17 +6112,34 @@ let inherit (xlibs) libXtst; }); + eclipseNewer = import ../applications/editors/eclipse-classic { + inherit stdenv fetchurl patchelf makeDesktopItem freetype fontconfig jre; + inherit (gtkLibs) glib gtk; + inherit (xlibs) libX11 libXext libXrender libXtst; + }; + eclipse = plugins: import ../applications/editors/eclipse { inherit fetchurl stdenv jdk; inherit (gtkLibs) gtk glib; inherit (xlibs) libXtst; - inherit plugins; + inherit plugins makeOverridable unzip; }; eclipsesdk = eclipse []; - eclipseSpoofax = lowPrio (appendToName "with-spoofax" (eclipse [spoofax])); +# eclipseSpoofax = lowPrio (appendToName "with-spoofax" (eclipse [eclipsePlugins.spoofax])); +# eclipseCDT = import ../applications/editors/eclipse/eclipse-cdt.nix { +# inherit fetchurl stdenv eclipse; +# }; +# # quinox p2 installer +# eclipseMinimal = import ../applications/editors/eclipse/eclipse-p2-installer.nix { +# inherit fetchurl stdenv eclipse; +# }; +# +# eclipsePlugins = import ../applications/editors/eclipse/plugins.nix { +# inherit fetchurl stdenv; +# }; ed = import ../applications/editors/ed { inherit fetchurl stdenv; @@ -5953,7 +6170,7 @@ let gtkGUI = getPkgConfig "emacs" "gtkSupport" true; }; - emacsUnicode = lowPrio (import ../applications/editors/emacs-unicode { + emacs23 = lowPrio (import ../applications/editors/emacs-23-snapshot { inherit fetchcvs stdenv ncurses pkgconfig x11 Xaw3d libpng libjpeg libungif libtiff texinfo dbus autoconf automake; @@ -5966,6 +6183,9 @@ let dbusSupport = getPkgConfig "emacs" "dbusSupport" true; }); + # The forthcoming GNU Emacs 23 used to be referred to as `emacsUnicode' here. + emacsUnicode = emacs23; + emms = import ../applications/editors/emacs-modes/emms { inherit fetchurl stdenv emacs texinfo mpg321 vorbisTools taglib alsaUtils; @@ -6144,6 +6364,7 @@ let python pygtk gettext xlibs intltool babl gegl; inherit (gnome) gtk libgtkhtml libart_lgpl; }; + # gimpPlugins = import ../applications/graphics/gimp/plugins { inherit pkgs gimp; }; gitAndTools = recurseIntoAttrs (import ../applications/version-management/git-and-tools { inherit pkgs; @@ -6217,6 +6438,25 @@ let libXcursor libXinerama libXext libX11 ; }; + gpsbabel = import ../applications/misc/gpsbabel { + inherit fetchurl stdenv zlib expat; + }; + + gpscorrelate = import ../applications/misc/gpscorrelate { + inherit fetchurl stdenv pkgconfig exiv2 libxml2 + libxslt docbook_xsl docbook_xml_dtd_42; + inherit (gtkLibs) gtk; + }; + + gpsd = import ../servers/gpsd { + inherit fetchurl stdenv pkgconfig dbus dbus_glib + ncurses makeWrapper libxslt xmlto; + inherit (xlibs) libX11 libXt libXpm libXaw libXext; + + # We need a Python with NCurses bindings. + python = pythonFull; + }; + gv = import ../applications/misc/gv { inherit fetchurl stdenv Xaw3d ghostscriptX; }; @@ -6230,7 +6470,8 @@ let }; hugin = import ../applications/graphics/hugin { - inherit stdenv fetchurl cmake panotools libtiff libpng boost pkgconfig exiv2 gettext ilmbase; + inherit stdenv fetchurl cmake panotools libtiff libpng boost pkgconfig + exiv2 gettext ilmbase enblendenfuse autopanosiftc; wxGTK = wxGTK28; openexr = openexr_1_6_1; }; @@ -6368,7 +6609,7 @@ let inherit fetchurl stdenv builderDefs stringsWithDeps fftw ladspaH pkgconfig; }; - ldcpp = composedArgsAndFun (selectVersion ../applications/networking/p2p/ldcpp "1.0.1") { + ldcpp = composedArgsAndFun (import ../applications/networking/p2p/ldcpp/1.0.3.nix) { inherit builderDefs scons pkgconfig bzip2 openssl; inherit (gtkLibs) gtk; inherit (gnome) libglade; @@ -6397,11 +6638,17 @@ let guiSupport = getConfig ["mercurial" "guiSupport"] false; # for hgk (gitk gui for hg) }; + meshlab = import ../applications/graphics/meshlab { + inherit fetchurl stdenv bzip2; + qt = qt4; + }; + midori = builderDefsPackage (import ../applications/networking/browsers/midori) { inherit imagemagick intltool python pkgconfig webkit libxml2 - which gettext makeWrapper file; + which gettext makeWrapper file libidn sqlite docutils libnotify; inherit (gtkLibs) gtk glib; inherit (gnome) gtksourceview; + inherit (gnome26) libsoup; }; minicom = builderDefsPackage (selectVersion ../tools/misc/minicom "2.3") { @@ -6439,7 +6686,7 @@ let MPlayer = import ../applications/video/MPlayer { inherit fetchurl stdenv freetype x11 zlib libtheora libcaca freefont_ttf libdvdnav - cdparanoia mesa; + cdparanoia mesa pkgconfig; inherit (xlibs) libX11 libXv libXinerama libXrandr; alsaSupport = true; alsa = alsaLib; @@ -6517,7 +6764,7 @@ let }; opera = import ../applications/networking/browsers/opera { - inherit fetchurl zlib glibc stdenv; + inherit fetchurl zlib glibc stdenv makeDesktopItem; # stdenv = overrideGCC stdenv gcc40; inherit (xlibs) libX11 libSM libICE libXt libXext; #33motif = lesstif; @@ -6534,7 +6781,7 @@ let panotools = import ../applications/graphics/panotools { inherit stdenv fetchsvn libpng libjpeg libtiff automake libtool autoconf; }; - + pavucontrol = import ../applications/audio/pavucontrol { inherit fetchurl stdenv pkgconfig pulseaudio libsigcxx libcanberra intltool gettext; @@ -6597,7 +6844,7 @@ let inherit fetchurl stdenv pkgconfig imagemagick boost python; }; - qemu = import ../applications/virtualization/qemu/0.9.1.nix { + qemu = import ../applications/virtualization/qemu/0.10.3.nix { inherit fetchurl SDL zlib which; stdenv = overrideGCC stdenv gcc34; }; @@ -6699,16 +6946,12 @@ let # That's why I'v added ffmpeg_svn }; - spoofax = import ../applications/editors/eclipse/plugins/spoofax { - inherit fetchurl stdenv; - }; - - stumpwm = builderDefsPackage (import ../applications/window-managers/stumpwm) { - inherit clisp texinfo; + inherit texinfo; + clisp = clisp_2_44_1; }; - subversion = subversion15; + subversion = subversion16; subversion15 = makeOverridable (import ../applications/version-management/subversion/1.5.nix) { inherit fetchurl stdenv apr aprutil expat swig zlib jdk; @@ -6782,10 +7025,22 @@ let inherit (xlibs) xextproto libXtst inputproto; }; + tahoe = import ../tools/networking/p2p/tahoe { + inherit fetchurl unzip nettools buildPythonPackage; + inherit (pythonPackages) twisted foolscap simplejson nevow zfec + pycryptopp; + }; + tailor = builderDefsPackage (import ../applications/version-management/tailor) { inherit makeWrapper python; }; + tangogps = import ../applications/misc/tangogps { + inherit fetchurl stdenv pkgconfig gettext curl libexif sqlite; + inherit (gtkLibs) gtk; + gconf = gnome.GConf; + }; + /* does'nt work yet i686-linux only (32bit version) teamspeak_client = import ../applications/networking/instant-messengers/teamspeak/client.nix { inherit fetchurl stdenv; @@ -6836,6 +7091,10 @@ let inherit fetchurl stdenv alsaLib; }; + tkcvs = import ../applications/version-management/tkcvs { + inherit stdenv fetchurl tcl tk; + }; + tla = import ../applications/version-management/arch { inherit fetchurl stdenv diffutils gnutar gnupatch which; }; @@ -6848,6 +7107,12 @@ let uucp = builderDefsPackage (selectVersion ../tools/misc/uucp "1.07") { }; + uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) { + inherit pkgconfig webkit; + inherit (gtkLibs) gtk; + inherit (gnome26) libsoup; + }; + valknut = import ../applications/networking/p2p/valknut { inherit fetchurl stdenv perl x11 libxml2 libjpeg libpng openssl dclib; qt = qt3; @@ -6932,7 +7197,7 @@ let }; wrapFirefox = browser: browserName: nameSuffix: import ../applications/networking/browsers/firefox-wrapper { - inherit stdenv nameSuffix makeWrapper browser browserName; + inherit stdenv nameSuffix makeWrapper makeDesktopItem browser browserName; plugins = let enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true; in @@ -7085,7 +7350,7 @@ let }; # doesn't compile yet - in case someone else want's to continue .. - qgis = (selectVersion ../applications/misc/qgis "0.11.0") { + qgis = (selectVersion ../applications/misc/qgis "1.0.1-2") { inherit composableDerivation fetchsvn stdenv flex lib ncurses fetchurl perl cmake gdal geos proj x11 gsl libpng zlib bison @@ -7131,6 +7396,11 @@ let inherit mesa freeglut; }; + eduke32 = import ../games/eduke32 { + inherit stdenv fetchurl SDL SDL_mixer unzip libvorbis mesa pkgconfig nasm makeDesktopItem; + inherit (gtkLibs) gtk; + }; + exult = import ../games/exult { inherit fetchurl stdenv SDL SDL_mixer zlib libpng unzip; }; @@ -7151,10 +7421,7 @@ let inherit stdenv fetchurl mesa; wxGTK = wxGTK28deps {unicode = false;}; inherit (xlibs) libX11 xproto; - stringsWithDeps = import ../lib/strings-with-deps.nix { - inherit stdenv lib; - }; - inherit builderDefs; + inherit stringsWithDeps builderDefs; }; gemrb = import ../games/gemrb { @@ -7291,9 +7558,12 @@ let gettext x11 libtiff libjpeg libpng gtkLibs xlibs bzip2 libcm python dbus dbus_glib ncurses which libxml2Python iconnamingutils openssl hal samba fam libgcrypt libtasn1 - xmlto docbook2x docbook_xsl intltool enchant isocodes; + xmlto docbook2x docbook_xsl intltool enchant isocodes policyKit + libproxy sqlite; }); + gnome26 = import ../desktops/gnome-2.26 pkgs; + kde3 = { kdelibs = import ../desktops/kde-3/kdelibs { @@ -7448,7 +7718,7 @@ let }; dosbox = import ../misc/emulators/dosbox { - inherit fetchurl stdenv SDL; + inherit fetchurl stdenv SDL makeDesktopItem; }; dpkg = import ../tools/package-management/dpkg { @@ -7601,12 +7871,11 @@ let inherit fetchurl stdenv tetex lazylist; }; - psi = builderDefsPackage - (selectVersion ../applications/networking/instant-messengers/psi "0.12") + psi = (selectVersion ../applications/networking/instant-messengers/psi "0.12.1") { - inherit builderDefs zlib aspell sox openssl; + inherit stdenv fetchurl zlib aspell sox openssl qt4; inherit (xlibs) xproto libX11 libSM libICE; - qt = qt4; + qca2 = kde42.qca2; }; putty = import ../applications/networking/remote/putty { @@ -7648,15 +7917,6 @@ let inherit fetchurl stdenv flex bison zlib libpng ncurses ed; }; - /* - 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 makeFontsConf imagemagick; }; @@ -7719,6 +7979,12 @@ let sqlite subversion pysqlite; }; + vice = import ../misc/emulators/vice { + inherit stdenv fetchurl perl gettext libpng giflib libjpeg alsaLib readline mesa; + inherit pkgconfig SDL makeDesktopItem autoconf automake; + inherit (gtkLibs) gtk; + }; + wine = if system == "x86_64-linux" then # Can't build this in 64-bit; use a 32-bit build instead. diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix index 39e7c4a1ec8..4ae3b0647b8 100644 --- a/pkgs/top-level/build-for-release.nix +++ b/pkgs/top-level/build-for-release.nix @@ -265,6 +265,7 @@ let kdenetwork kdepim kdeplasma_addons + kmplayer ; }; kernelPackages_2_6_23 = pkgs.recurseIntoAttrs { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 69d52433f65..6c65fdd8d8a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -42,6 +42,11 @@ rec { inherit cabal mtl network parsec xhtml; }; + convertible = import ../development/libraries/haskell/convertible { + inherit cabal mtl; + time = time113; + }; + Crypto = import ../development/libraries/haskell/Crypto { inherit cabal; }; @@ -50,11 +55,24 @@ rec { inherit cabal; }; + digest = import ../development/libraries/haskell/digest { + inherit cabal; + inherit (pkgs) zlib; + }; + + dotgen = import ../development/libraries/haskell/dotgen { + inherit cabal; + }; + editline = import ../development/libraries/haskell/editline { inherit (pkgs) libedit; inherit cabal; }; + emgm = import ../development/libraries/haskell/emgm { + inherit cabal; + }; + extensibleExceptions = import ../development/libraries/haskell/extensible-exceptions { inherit cabal; }; @@ -96,7 +114,7 @@ rec { }; haskellPlatform = import ../development/libraries/haskell/haskell-platform { - inherit cabal GLUT HTTP HUnit OpenGL QuickCheck cgi fgl + inherit cabal GLUT HTTP HUnit OpenGL QuickCheck cgi fgl editline haskellSrc html parallel regexBase regexCompat regexPosix stm time xhtml zlib cabalInstall alex happy haddock; ghc = ghcReal; @@ -119,16 +137,16 @@ rec { inherit cabal; }; - HDBC = import ../development/libraries/haskell/HDBC/HDBC-1.1.4.nix { - inherit cabal; + HDBC = import ../development/libraries/haskell/HDBC/HDBC.nix { + inherit cabal HUnit QuickCheck mtl time utf8String convertible testpack; }; - HDBCPostgresql = import ../development/libraries/haskell/HDBC/HDBC-postgresql-1.1.4.0.nix { - inherit cabal HDBC; + HDBCPostgresql = import ../development/libraries/haskell/HDBC/HDBC-postgresql.nix { + inherit cabal HDBC parsec; inherit (pkgs) postgresql; }; - HDBCSqlite = import ../development/libraries/haskell/HDBC/HDBC-sqlite3-1.1.4.0.nix { + HDBCSqlite = import ../development/libraries/haskell/HDBC/HDBC-sqlite3.nix { inherit cabal HDBC; inherit (pkgs) sqlite; }; @@ -149,6 +167,10 @@ rec { inherit cabal; }; + ivor = import ../development/libraries/haskell/ivor { + inherit cabal mtl parsec; + }; + json = import ../development/libraries/haskell/json { inherit cabal mtl; }; @@ -177,6 +199,14 @@ rec { inherit cabal parsec; }; + nonNegative = import ../development/libraries/haskell/non-negative { + inherit cabal QuickCheck; + }; + + numericPrelude = import ../development/libraries/haskell/numeric-prelude { + inherit cabal HUnit QuickCheck parsec nonNegative utilityHt; + }; + OpenAL = import ../development/libraries/haskell/OpenAL { inherit cabal OpenGL; inherit (pkgs) openal; @@ -188,6 +218,10 @@ rec { inherit (pkgs.xlibs) libX11; }; + pandoc = import ../development/libraries/haskell/pandoc { + inherit cabal mtl network parsec utf8String xhtml zipArchive; + }; + parallel = import ../development/libraries/haskell/parallel { inherit cabal; }; @@ -215,7 +249,7 @@ rec { readline = import ../development/libraries/haskell/readline { inherit cabal; - inherit (pkgs) readline; + inherit (pkgs) readline ncurses; }; regexBase = import ../development/libraries/haskell/regex-base { @@ -250,18 +284,48 @@ rec { inherit (pkgs) SDL; }; + Shellac = import ../development/libraries/haskell/Shellac/Shellac.nix { + inherit cabal mtl; + }; + + ShellacHaskeline = import ../development/libraries/haskell/Shellac/Shellac-haskeline.nix { + inherit cabal Shellac haskeline; + }; + + ShellacReadline = import ../development/libraries/haskell/Shellac/Shellac-readline.nix { + inherit cabal Shellac readline; + }; + stm = import ../development/libraries/haskell/stm { inherit cabal; }; + storableComplex = import ../development/libraries/haskell/storable-complex { + inherit cabal; + }; + strictConcurrency = import ../development/libraries/haskell/strictConcurrency { inherit cabal parallel; }; + terminfo = import ../development/libraries/haskell/terminfo { + inherit cabal; + inherit (pkgs) ncurses; + }; + + testpack = import ../development/libraries/haskell/testpack { + inherit cabal HUnit QuickCheck mtl; + }; + + /* time is Haskell Platform default, time113 is more recent but incompatible */ time = import ../development/libraries/haskell/time { inherit cabal; }; + time113 = import ../development/libraries/haskell/time/1.1.3.nix { + inherit cabal; + }; + uniplate = import ../development/libraries/haskell/uniplate { inherit cabal mtl; }; @@ -270,20 +334,28 @@ rec { inherit cabal; }; + utilityHt = import ../development/libraries/haskell/utility-ht { + inherit cabal; + }; + uulib = import ../development/libraries/haskell/uulib { inherit cabal; }; + uuParsingLib = import ../development/libraries/haskell/uu-parsinglib { + inherit cabal; + }; + vacuum = import ../development/libraries/haskell/vacuum { inherit cabal ghcPaths haskellSrcMeta; }; - vacuumCairo = import ../development/libraries/haskell/vacuumCairo { + vacuumCairo = import ../development/libraries/haskell/vacuum-cairo { inherit cabal vacuum gtk2hs parallel strictConcurrency; }; vty = import ../development/libraries/haskell/vty { - inherit cabal; + inherit cabal utf8String terminfo; }; wx = import ../development/libraries/haskell/wxHaskell/wx.nix { @@ -307,6 +379,14 @@ rec { inherit cabal; }; + zipArchive = import ../development/libraries/haskell/zip-archive { + inherit cabal binary mtl utf8String zlib digest; + }; + + zipper = import ../development/libraries/haskell/zipper { + inherit cabal multirec; + }; + zlib = import ../development/libraries/haskell/zlib { inherit cabal; inherit (pkgs) zlib; @@ -325,6 +405,11 @@ rec { inherit (pkgs) fetchurl stdenv; }; + idris = import ../development/compilers/idris { + inherit cabal mtl parsec readline ivor happy; + inherit (pkgs) fetchdarcs; + }; + # Development tools. @@ -359,14 +444,14 @@ rec { inherit (pkgs) libedit; }; - happy = happy1182; + happy = happy1184; happy117 = import ../development/tools/parsing/happy/happy-1.17.nix { inherit cabal; inherit (pkgs) perl; }; - happy1182 = import ../development/tools/parsing/happy/happy-1.18.2.nix { + happy1184 = import ../development/tools/parsing/happy/happy-1.18.4.nix { inherit cabal mtl; inherit (pkgs) perl; }; @@ -416,4 +501,10 @@ rec { inherit (pkgs) tetex polytable; }; + # Games. + + MazesOfMonad = import ../games/MazesOfMonad { + inherit cabal HUnit mtl regexPosix time; + }; + } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 57a453dddcc..a8e56436e44 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1256,6 +1256,15 @@ rec { propagatedBuildInputs = [URI HTMLParser HTMLTagset]; }; + MailIMAPClient = buildPerlPackage { + name = "Mail-IMAPClient-2.2.9"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DJ/DJKERNEN/Mail-IMAPClient-2.2.9.tar.gz; + sha256 = "1jb04mn66d6022xjqmax49cdn55f2fdzp6knfnchmrcmf90a8rzs"; + }; + buildInputs = [ParseRecDescent]; + }; + MailTools = buildPerlPackage { name = "MailTools-2.04"; src = fetchurl { @@ -1396,6 +1405,14 @@ rec { }; }; + ParseRecDescent = buildPerlPackage { + name = "ParseRecDescent-1.96.0"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DC/DCONWAY/Parse-RecDescent-1.96.0.tar.gz; + sha256 = "1hnsnpzdwcwpbnsspaz55gx7x7h1rpxdk7k1ninnqk1jximl3y9n"; + }; + }; + PathClass = buildPerlPackage { name = "Path-Class-0.16"; src = fetchurl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix new file mode 100644 index 00000000000..55a8071ef38 --- /dev/null +++ b/pkgs/top-level/python-packages.nix @@ -0,0 +1,290 @@ +{ pkgs }: + +rec { + inherit (pkgs) buildPythonPackage fetchurl fetchsvn stdenv python; + + argparse = buildPythonPackage (rec { + name = "argparse-0.9.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/a/argparse/${name}.zip"; + sha256 = "00jw32wwccpf9smraywjk869b93w7f99rw8gi63yfhw6379fnq6m"; + }; + + buildInputs = [ pkgs.unzip ]; + + # How do we run the tests? + doCheck = false; + + meta = { + homepage = http://code.google.com/p/argparse/; + + license = "Apache License 2.0"; + + description = "argparse: Python command line parser"; + + longDescription = '' + The argparse module makes writing command line tools in Python + easy. Just briefly describe your command line interface and + argparse will take care of the rest, including: parsing the + arguments and flags from sys.argv, converting arg strings into + objects for your program, formatting and printing any help + messages, and much more. + ''; + }; + }); + + darcsver = buildPythonPackage (rec { + name = "darcsver-1.3.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/d/darcsver/${name}.tar.gz"; + sha256 = "1a5cl2yhnd88a4vkc9r381cbjkcvga87dp9zx5av68857q1nvvvq"; + }; + + buildInputs = [ pkgs.darcs ]; + + meta = { + description = "Darcsver, generate a version number from Darcs history"; + + homepage = http://pypi.python.org/pypi/darcsver; + + license = "BSD-style"; + }; + }); + + foolscap = buildPythonPackage (rec { + name = "foolscap-0.3.2"; + + src = fetchurl { + url = "http://foolscap.lothar.com/releases/${name}.tar.gz"; + sha256 = "1wkqgm6anlxvz8dnqx7ki008255nm1mlhak5n9xy6g1yf31fn3l0"; + }; + + propagatedBuildInputs = [ twisted pkgs.pyopenssl ]; + + meta = { + homepage = http://foolscap.lothar.com/; + + description = "Foolscap, an RPC protocol for Python that follows the distributed object-capability model"; + + longDescription = '' + "Foolscap" is the name for the next-generation RPC protocol, + intended to replace Perspective Broker (part of Twisted). + Foolscap is a protocol to implement a distributed + object-capabilities model in Python. + ''; + + # See http://foolscap.lothar.com/trac/browser/LICENSE. + license = "MIT"; + }; + }); + + nevow = buildPythonPackage (rec { + name = "nevow-0.9.33"; + + src = fetchurl { + url = "http://divmod.org/trac/attachment/wiki/SoftwareReleases/Nevow-0.9.33.tar.gz?format=raw"; + sha256 = "1b6zhfxx247b60n1qi2hrawhiaah88v8igg37pf7rjkmvy2z1c6c"; + name = "${name}.tar.gz"; + }; + + propagatedBuildInputs = [ twisted ]; + + meta = { + description = "Nevow, a web application construction kit for Python"; + + longDescription = '' + Nevow - Pronounced as the French "nouveau", or "noo-voh", Nevow + is a web application construction kit written in Python. It is + designed to allow the programmer to express as much of the view + logic as desired in Python, and includes a pure Python XML + expression syntax named stan to facilitate this. However it + also provides rich support for designer-edited templates, using + a very small XML attribute language to provide bi-directional + template manipulation capability. + + Nevow also includes formless, a declarative syntax for + specifying the types of method parameters and exposing these + methods to the web. Forms can be rendered automatically, and + form posts will be validated and input coerced, rendering error + pages if appropriate. Once a form post has validated + successfully, the method will be called with the coerced values. + ''; + + homepage = http://divmod.org/trac/wiki/DivmodNevow; + + license = "BSD-style"; + }; + }); + + pycryptopp = buildPythonPackage (rec { + name = "pycryptopp-0.5.14"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pycryptopp/${name}.tar.gz"; + sha256 = "1xvxyvqdi1223pkx0d6idzzlprmkk3hp9fr5r8jlib73cl0vh7rl"; + }; + + buildInputs = [ setuptoolsDarcs darcsver pkgs.cryptopp ]; + + meta = { + homepage = http://pypi.python.org/pypi/pycryptopp/0.5.14; + + description = "Python wrappers for the Crypto++ library"; + + license = "GPLv2+"; + }; + }); + + pyutil = buildPythonPackage (rec { + name = "pyutil-1.3.30"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pyutil/${name}.tar.gz"; + sha256 = "1ksb4gn8x53wcyddmjv1ma8cvvhjlmfxc6kpszyhb838i7xzla19"; + }; + + buildInputs = [ setuptoolsDarcs ]; + propagatedBuildInputs = [ zbase32 argparse ]; + + meta = { + description = "Pyutil, a collection of mature utilities for Python programmers"; + + longDescription = '' + These are a few data structures, classes and functions which + we've needed over many years of Python programming and which + seem to be of general use to other Python programmers. Many of + the modules that have existed in pyutil over the years have + subsequently been obsoleted by new features added to the + Python language or its standard library, thus showing that + we're not alone in wanting tools like these. + ''; + + homepage = http://allmydata.org/trac/pyutil; + + license = "GPLv2+"; + }; + }); + + setuptoolsDarcs = buildPythonPackage { + name = "setuptools-darcs-1.2.8"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/s/setuptools_darcs/setuptools_darcs-1.2.8.tar.gz"; + sha256 = "0jg9q9mhsky444mm7lpmmlxai8hmjg4pc71viv4kni8gls0gk9n8"; + }; + + propagatedBuildInputs = [ pkgs.darcs ]; + + meta = { + description = "setuptools plugin for the Darcs version control system"; + + homepage = http://allmydata.org/trac/setuptools_darcs; + + license = "BSD"; + }; + }; + + simplejson = buildPythonPackage (rec { + name = "simplejson-2.0.9"; + + src = fetchsvn { + url = "http://simplejson.googlecode.com/svn/tags/${name}"; + sha256 = "a48d5256fdb4f258c33da3dda110ecf3c786f086dcb08a01309acde6d1ddb921"; + rev = "172"; # to be on the safe side + }; + + meta = { + description = "simplejson is a simple, fast, extensible JSON encoder/decoder for Python"; + + longDescription = '' + simplejson is compatible with Python 2.4 and later with no + external dependencies. It covers the full JSON specification + for both encoding and decoding, with unicode support. By + default, encoding is done in an encoding neutral fashion (plain + ASCII with \uXXXX escapes for unicode characters). + ''; + + homepage = http://code.google.com/p/simplejson/; + + license = "MIT"; + }; + }); + + twisted = buildPythonPackage { + name = "twisted-8.1.0"; + + src = fetchurl { + url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2; + sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl"; + }; + + propagatedBuildInputs = [ pkgs.ZopeInterface ]; + + meta = { + homepage = http://twistedmatrix.com/; + + description = "Twisted, an event-driven networking engine written in Python"; + + longDescription = '' + Twisted is an event-driven networking engine written in Python + and licensed under the MIT license. + ''; + + license = "MIT"; + }; + }; + + zbase32 = buildPythonPackage (rec { + name = "zbase32-1.1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zbase32/${name}.tar.gz"; + sha256 = "0n59l4rs26vrhxpsfrwybjjir68aj23f09k1yjnbxqy5n0khp8gm"; + }; + + # Tests require `pyutil' so disable them to avoid circular references. + doCheck = false; + + buildInputs = [ setuptoolsDarcs ]; + + meta = { + description = "zbase32, a base32 encoder/decoder"; + + homepage = http://pypi.python.org/pypi/zbase32; + + license = "BSD"; + }; + }); + + zfec = buildPythonPackage (rec { + name = "zfec-1.4.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zfec/${name}.tar.gz"; + sha256 = "0rgg7nsvbr4f9xmiclzypc39fnivg23kldv5aa8si0bgsxn6mh6w"; + }; + + buildInputs = [ setuptoolsDarcs ]; + propagatedBuildInputs = [ pyutil argparse ]; + + meta = { + homepage = http://allmydata.org/trac/zfec; + + description = "Zfec, a fast erasure codec which can be used with the command-line, C, Python, or Haskell"; + + longDescription = '' + Fast, portable, programmable erasure coding a.k.a. "forward + error correction": the generation of redundant blocks of + information such that if some blocks are lost then the + original data can be recovered from the remaining blocks. The + zfec package includes command-line tools, C API, Python API, + and Haskell API. + ''; + + license = "GPLv2+"; + }; + }); + +} diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 46ffd914146..f2bf643d79d 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -63,17 +63,20 @@ in { audacious_plugins = linux; autoconf = all; automake110x = all; + automake111x = all; automake19x = all; avahi = allBut "i686-cygwin"; # Cygwin builds fail bash = all; bashInteractive = all; bazaar = linux; # first let sqlite3 work on darwin + bc = all; binutils = linux; bind = linux; bison23 = all; bison24 = all; bitlbee = linux; bittorrent = linux; + blender = linux; boost = all; boostFull = all; bsdiff = all; @@ -100,6 +103,7 @@ in { dico = linux; dietlibc = linux; diffutils = all; + dmtx = all; docbook5 = all; docbook5_xsl = all; docbook_xml_dtd_42 = all; @@ -108,6 +112,7 @@ in { dosbox = linux; dovecot = linux; doxygen = linux; + dpkg = linux; e2fsprogs = linux; ejabberd = linux; elinks = linux; @@ -119,6 +124,7 @@ in { evince = linux; expect = linux; exult = linux; + fbterm = linux; feh = linux; file = all; findutils = all; @@ -158,6 +164,9 @@ in { gphoto2 = linux; gpm = linux; gprolog = linux; + gpsbabel = all; + gpscorrelate = linux; + gpsd = linux; gqview = gtkSupported; graphviz = all; grub = linux; @@ -172,10 +181,9 @@ in { hdparm = linux; hello = all; host = linux; - httpd = linux; hugin = linux; iana_etc = linux; - icecat3Xul = [ "i686-linux" ]; + icecat3Xul = linux; idutils = all; ifplugd = linux; imagemagick = allBut "i686-cygwin"; @@ -198,6 +206,7 @@ in { konversation = linux; ktorrent = linux; kvm = linux; + qemu = linux; less = all; lftp = all; libarchive = linux; @@ -221,7 +230,8 @@ in { mcron = linux; mdadm = linux; mercurial = allBut "i686-cygwin"; - mesa = linux; + mesa = linux ++ darwin; + midori = linux; mingetty = linux; mk = linux; mktemp = all; @@ -232,6 +242,7 @@ in { mpg321 = linux; mutt = linux; mysql = linux; + namazu = all; nano = allBut "i686-cygwin"; ncat = linux; netcat = all; @@ -243,6 +254,7 @@ in { ntfs3g = linux; ntp = linux; nxml = all; + ocaml = linux; octave = linux; openoffice = linux; openssh = linux; @@ -264,6 +276,7 @@ in { pmccabe = linux; portmap = linux; postgresql = all; + postfix = linux; procps = linux; pwdutils = linux; pthreadmanpages = all; @@ -284,10 +297,12 @@ in { screen = linux ++ darwin; sdparm = linux; seccure = linux; - seccureUser = linux; + sgtpuzzles = linux; sharutils = all; slim = linux; sloccount = allBut "i686-cygwin"; + smartmontools = all; + smbfsFuse = linux; socat = linux; spidermonkey = linux; splashutils_13 = linux; @@ -309,6 +324,7 @@ in { syslinux = ["i686-linux"]; sysvinit = linux; sysvtools = linux; + tangogps = linux; tcl = linux; tcpdump = linux; teeworlds = linux; @@ -330,6 +346,7 @@ in { utillinux = linux; utillinuxCurses = linux; valgrind = linux; + viking = linux; vim = linux; vimHugeX = linux; vlc = linux; @@ -356,6 +373,7 @@ in { xscreensaver = linux; xsel = linux; xterm = linux; + xxdiff = linux; zdelta = linux; zile = linux; zip = all; @@ -400,6 +418,10 @@ in { xmonad = linux; }; + haskellPackages_ghc6103 = { + ghc = ghcSupported; + }; + kde3 = { kdebase = linux; kdelibs = linux; @@ -453,6 +475,12 @@ in { virtualbox = linux; }; + kernelPackages_2_6_29 = { + aufs = linux; + kernel = linux; + virtualbox = linux; + }; + strategoPackages = { sdf = all; strategoxt = all; @@ -463,6 +491,10 @@ in { perlPackages = { TaskCatalystTutorial = linux; }; + + pythonPackages = { + zfec = linux; + }; xorg = { fontadobe100dpi = linux; @@ -478,6 +510,7 @@ in { lndir = all; setxkbmap = linux; xauth = linux; + xev = linux; xf86inputkeyboard = linux; xf86inputmouse = linux; xf86inputevdev = linux;