diff --git a/doc/release-notes.xml b/doc/release-notes.xml index f04a674e96b..b68ac515b30 100644 --- a/doc/release-notes.xml +++ b/doc/release-notes.xml @@ -139,12 +139,12 @@ fetchurl { fetchurl will first try to download this file from . + xlink:href="http://nixos.org/tarballs/sha1/eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082"/>. If that file doesn’t exist, it will try the original URL. In general, the “content-addressed” location is mirror/hash-type/hash. There is currently only one content-addressable mirror (), but more can be + xlink:href="http://nixos.org/tarballs"/>), but more can be specified in the hashedMirrors attribute in pkgs/build-support/fetchurl/mirrors.nix, or by setting the NIX_HASHED_MIRRORS environment variable @@ -239,7 +239,7 @@ export NIX_MIRRORS_sourceforge=http://osdn.dl.sourceforge.net/sourceforge/Release 0.10 (October 12, 2006) This release of Nixpkgs requires Nix +xlink:href='http://nixos.org/releases/nix/nix-0.10/'>Nix 0.10 or higher. This release has the following improvements: @@ -445,7 +445,7 @@ some of the more notable changes: Distribution files have been moved to . + xlink:href="http://nixos.org/" />. The C library on Linux, Glibc, has been updated to version 2.3.6. diff --git a/maintainers/scripts/evacuate-urls.sh b/maintainers/scripts/evacuate-urls.sh index 3aa368ec668..21c346e607c 100755 --- a/maintainers/scripts/evacuate-urls.sh +++ b/maintainers/scripts/evacuate-urls.sh @@ -8,7 +8,7 @@ find "$1" -name "*.nix" | while read fn; do if url=$(echo "$line" | sed 's^url = \(.*\);^\1^'); then - if ! echo "$url" | grep -q -E "www.cs.uu.nl|nix.cs.uu.nl|.stratego-language.org|java.sun.com|ut2004|linuxq3a|RealPlayer|Adbe|belastingdienst|microsoft|armijn/.nix|sun.com|archive.eclipse.org"; then + if ! echo "$url" | grep -q -E "www.cs.uu.nl|nixos.org|.stratego-language.org|java.sun.com|ut2004|linuxq3a|RealPlayer|Adbe|belastingdienst|microsoft|armijn/.nix|sun.com|archive.eclipse.org"; then base="$(basename "$url")" newPath="$distDir/$base" @@ -80,4 +80,4 @@ find "$1" -name "*.nix" | while read fn; do done -echo DONE \ No newline at end of file +echo DONE diff --git a/pkgs/applications/audio/abcde/cd-paranoia.patch b/pkgs/applications/audio/abcde/cd-paranoia.patch new file mode 100644 index 00000000000..58cada65fb8 --- /dev/null +++ b/pkgs/applications/audio/abcde/cd-paranoia.patch @@ -0,0 +1,16 @@ +Choose the right CDROM reader syntax for `cd-paranoia'. + +--- abcde-2.3.99.6/abcde 2006-08-05 21:14:00.000000000 +0200 ++++ abcde-2.3.99.6/abcde 2008-10-29 22:55:38.000000000 +0100 +@@ -3184,7 +3184,10 @@ if [ -n "$DISCID" ] || [ "$CDROMREADERSY + if [ "$CDROMREADERSYNTAX" = "" ]; then + for DEFAULT_CDROMREADER in $DEFAULT_CDROMREADERS; do + if new_checkexec $DEFAULT_CDROMREADER; then +- CDROMREADERSYNTAX=$DEFAULT_CDROMREADER ++ case "$DEFAULT_CDROMREADER" in ++ cd-paranoia) CDROMREADERSYNTAX=cdparanoia;; ++ *) CDROMREADERSYNTAX=$DEFAULT_CDROMREADER;; ++ esac + break + fi + done diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index 5cfa72158ba..2b581f7e532 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -6,14 +6,14 @@ in stdenv.mkDerivation { name = "abcde-${version}"; src = fetchurl { - url = "mirror://debian/pool/a/abcde/abcde_${version}.orig.tar.gz"; + url = "mirror://debian/pool/main/a/abcde/abcde_${version}.orig.tar.gz"; sha256 = "1wl4ygj1cf1d6g05gwwygsd5g83l039fzi011r30ma5lnm763lyb"; }; # FIXME: This package does not support MP3 encoding (only Ogg), # nor `distmp3', `eject', etc. - patches = [ ./install.patch ]; + patches = [ ./install.patch ./which.patch ./cd-paranoia.patch ]; configurePhase = '' sed -i "s|^[[:blank:]]*prefix *=.*$|prefix = $out|g ; @@ -23,7 +23,8 @@ in # We use `cd-paranoia' from GNU libcdio, which contains a hyphen # in its name, unlike Xiph's cdparanoia. - sed -i "s|^[[:blank:]]*CDPARANOIA=.*$|CDPARANOIA=cd-paranoia|g" \ + sed -i "s|^[[:blank:]]*CDPARANOIA=.*$|CDPARANOIA=cd-paranoia|g ; + s|^[[:blank:]]*DEFAULT_CDROMREADERS=.*$|DEFAULT_CDROMREADERS=\"cd-paranoia cdda2wav\"|g" \ "abcde" substituteInPlace "abcde" \ diff --git a/pkgs/applications/audio/abcde/which.patch b/pkgs/applications/audio/abcde/which.patch new file mode 100644 index 00000000000..70474000ddd --- /dev/null +++ b/pkgs/applications/audio/abcde/which.patch @@ -0,0 +1,16 @@ +Add an alias for `which'. + +--- abcde-2.3.99.6/abcde 2006-08-05 21:14:00.000000000 +0200 ++++ abcde-2.3.99.6/abcde 2008-10-29 22:49:16.000000000 +0100 +@@ -15,6 +15,11 @@ + + VERSION='2.3.99-$Revision: 222M $' + ++which () ++{ ++ type -P $1 ++} ++ + usage () + { + echo "This is abcde v$VERSION." diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 644996065cd..adb8e170feb 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,5 +1,5 @@ args: with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = fetchurl { url = mirror://sourceforge/audacity/audacity-src-1.3.3.tar.gz; diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix index 230ee1d7de2..8dd783a2d1a 100644 --- a/pkgs/applications/audio/ladspa-plugins/default.nix +++ b/pkgs/applications/audio/ladspa-plugins/default.nix @@ -1,5 +1,5 @@ args: with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = fetchurl { url = http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz; diff --git a/pkgs/applications/audio/ladspa-plugins/ladspah.nix b/pkgs/applications/audio/ladspa-plugins/ladspah.nix index 60ee6fbf457..dd328608155 100644 --- a/pkgs/applications/audio/ladspa-plugins/ladspah.nix +++ b/pkgs/applications/audio/ladspa-plugins/ladspah.nix @@ -6,7 +6,7 @@ let sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67"; }; in - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { buildInputs = []; inherit src; }; diff --git a/pkgs/applications/audio/xmms/default.nix b/pkgs/applications/audio/xmms/default.nix index 8e2650fd7c0..4fe952f4b3d 100644 --- a/pkgs/applications/audio/xmms/default.nix +++ b/pkgs/applications/audio/xmms/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "xmms-1.2.10"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/xmms-1.2.10.tar.bz2; + url = http://nixos.org/tarballs/xmms-1.2.10.tar.bz2; md5 = "03a85cfc5e1877a2e1f7be4fa1d3f63c"; }; diff --git a/pkgs/applications/editors/eclipse-new/3.3.1.1.nix b/pkgs/applications/editors/eclipse-new/3.3.1.1.nix new file mode 100644 index 00000000000..2c039b9213e --- /dev/null +++ b/pkgs/applications/editors/eclipse-new/3.3.1.1.nix @@ -0,0 +1,96 @@ +args: with args; let + + # hint: eclipse -data + + eclipsePlugin = name : src : stdenv.mkDerivation { + inherit src; + name = "${name}-eclipse-plugin"; + phases = "unpackPhase"; + buildInputs = [ args.unzip ]; + unpackPhase = '' + mkdir tmp; cd tmp + unpackFile "$src" + [ -d ./eclipse ] || { # if plugin doesn't contain the eclipse directory itself create it (eg viPlugin) + mkdir "$TMP/eclipse" + mv * "$TMP/eclipse" + cd "$TMP" + } + ensureDir $out; + mv eclipse "$out" + ''; + }; + + eclipseEnv = {name, eclipse, links}: runCommand name { inherit links eclipse; } '' + ensureDir $out/eclipse/links; + cp -r "$eclipse/bin" "$out/bin" + for f in $eclipse/eclipse/*; do + # using ln eclipse doesn't take the correct link folder :-( (TODO) + # ln -s "$f" "$out/eclipse/$(basename "$f")" + cp -r "$f" "$out/eclipse/$(basename "$f")" + done + # create links + for link in $links; do + echo "path=$link" >> "$out/eclipse/links/$(basename "$link").link" + done + ''; + + # mmh, this derivation is superfluous. We could also create them directly + # instead of symlinking them into the final env build by buildEnv + linkFile = deriv : writeTextFile { + name = "${deriv.name}-eclipse-feature-link"; + destination = "/eclipse/links/${deriv.name}.link"; + }; + + attr = rec { + eclipse = import ( ../eclipse-new + "/${version}/eclipse.nix") args; # without any additional plugins, why can't I use ./ instead of ../eclipse-new ? + + plugins = rec { + + viPlugin = { # see its license! + plugin = eclipsePlugin "viPlugin_1.15.6" (fetchurl { + url = http://www.satokar.com/viplugin/files/viPlugin_1.15.6.zip; + sha256 = "0p53q45a754j143pnnp51rjwj7lzawcxfy9xzpjasdic4a2l0f96"; + # license = "Other/Proprietary License with Free Trial"; + }); + }; + + # PHP developement + emfSdoXsdSDK232 = { + plugin = eclipsePlugin "emf-sdo-xsd-SDK-2.3.2" (fetchurl { + url = http://eclipsemirror.yoxos.com/eclipse.org/modeling/emf/emf/downloads/drops/2.3.2/R200802051830/emf-sdo-xsd-SDK-2.3.2.zip; + sha256 = "1k20fn47x1giwhc80rzkqaw3mn0p3861sjp7aw39842lv2hjwn1c"; + }); + }; + gefSDK332 = { + plugin = eclipsePlugin "GEF-SDK-3.3.2" (fetchurl { + url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/tools/gef/downloads/drops/3.3.2/R200802211602/GEF-SDK-3.3.2.zip; + sha256 = "1pk5qlwk0iyvs85s966y96ks8vq1g81fivvbf4lh43155rg0z037"; + }); + }; + wtpSdkR202X = { + plugin = eclipsePlugin "wtp-sdk-R-2.0.2-20080223205547" (fetchurl { + url = http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/webtools/downloads/drops/R2.0/R-2.0.2-20080223205547/wtp-sdk-R-2.0.2-20080223205547.zip; + sha256 = "0hmmmqzcd67jir2gmjd0xri5w2434xb2dk21hpgcv2qp0h9hhx0f"; + }); + }; + pdt = { + deps = [ wtpSdkR202X gefSDK332 emfSdoXsdSDK232 ]; + plugin = eclipsePlugin "pdt-runtime-1.0.3" (fetchurl { + url = http://sunsite.informatik.rwth-aachen.de:3080/eclipse/tools/pdt/downloads/drops/1.0.3/R200806030000/pdt-runtime-1.0.3.zip; + sha256 = "0wd2vc9bqrk5mqj5al2ichm8lxlf7gwifsb9lzv1d896j04ilm96"; + }); + }; + }; + }; + pluginToList = a : [ a.plugin ] ++ lib.optionals (a ? deps ) (lib.concatMap pluginToList a.deps); + in + eclipseEnv { + name = "eclipse-${version}-with-plugins"; + inherit (attr) eclipse; + links = + # example custom config: eclipse = { plugins = {eclipse, version, plugins } : let p = plugins; in [p.pdt]; }; + let userChosenPlugins = (getConfig [ "eclipse" "plugins" ] ( {eclipse, version, plugins} : [] )) + { inherit (attr) eclipse plugins; inherit version; }; + in # concatenate plugins and plugin dependencies + (lib.uniqList { inputList = lib.concatMap pluginToList userChosenPlugins; }); + } diff --git a/pkgs/applications/editors/eclipse-new/3.3.1.1/build-with-jdk-compiler.patch b/pkgs/applications/editors/eclipse-new/3.3.1.1/build-with-jdk-compiler.patch new file mode 100644 index 00000000000..bac6fc035f1 --- /dev/null +++ b/pkgs/applications/editors/eclipse-new/3.3.1.1/build-with-jdk-compiler.patch @@ -0,0 +1,22 @@ +--- a/build.xml 2008-03-02 14:34:05.000000000 +0100 ++++ b/build.xml 2008-03-02 14:34:57.000000000 +0100 +@@ -291,19 +291,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- + + + diff --git a/pkgs/applications/editors/eclipse-new/3.3.1.1/eclipse.nix b/pkgs/applications/editors/eclipse-new/3.3.1.1/eclipse.nix new file mode 100644 index 00000000000..7fc7326a473 --- /dev/null +++ b/pkgs/applications/editors/eclipse-new/3.3.1.1/eclipse.nix @@ -0,0 +1,53 @@ +# Note, if you want to install plugins using the update manager you should +# copy the store path to a local directory and chown -R $USER yourcopy +# Then start your local copy + +args: with args; +let arch = if stdenv.system == "x86_64-linux" then "x86_64" + else if stdenv.system == "i686-linux" then "x86" + else throw "not supported system"; +in +args.stdenv.mkDerivation rec { + name = "eclipse-classic-3.3.1.1"; + + unpackPhase = "unzip \$src; set -x "; + buildInputs = [ unzip jdk gtk glib libXtst ant makeWrapper]; + + + patches=./build-with-jdk-compiler.patch; + + buildPhase = "./build -os linux -ws gtk -arch ${arch}"; + + libraries = [gtk glib libXtst]; + + installPhase = " + t=\$out/share/${name} + ensureDir \$t \$out/bin + cd result + tar xfz linux-gtk-*.tar.gz + mv eclipse \$out + " + #copied from other eclipse expressions + +" rpath= + for i in \$libraries; do + rpath=\$rpath\${rpath:+:}\$i/lib + done + find \$out \\( -type f -a -perm +0100 \\) \\ + -print \\ + -exec patchelf --interpreter \"$(cat \$NIX_GCC/nix-support/dynamic-linker)\" \\ + --set-rpath \"\$rpath\" {} \\; + + # Make a wrapper script so that the proper JDK is found. + makeWrapper \$out/eclipse/eclipse \$out/bin/eclipse \\ + --prefix PATH \":\" \"\$jdk/bin\" \\ + --prefix LD_LIBRARY_PATH \":\" \"\$rpath\" + sed -e 's=exec.*=exec \$(dirname $0)/../eclipse/eclipse $@=' -i \$out/bin/eclipse + "; + # using dirname so that eclipse still runs after copying the whole store + # directory somewhere else (so that you can use the update manager + + src = args.fetchurl { + url = http://mawercer.de/~nix/iyyx4hs1mgh1b1wa78j07pgq9k882m2k-eclipse-sourceBuild-srcIncluded-3.3.1.1.zip; + sha256 = "0n56i7ml816f839704qlkgs5ahl0iqgwc80kjq7n7g5rl9a4vhp4"; + }; +} diff --git a/pkgs/applications/editors/eclipse/plugins/spoofax/0.3.10.nix b/pkgs/applications/editors/eclipse/plugins/spoofax/0.3.10.nix index 4c782525ec7..59fe53c3736 100644 --- a/pkgs/applications/editors/eclipse/plugins/spoofax/0.3.10.nix +++ b/pkgs/applications/editors/eclipse/plugins/spoofax/0.3.10.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl}: fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/org.spoofax.editor_0.3.10.jar; + url = http://nixos.org/tarballs/org.spoofax.editor_0.3.10.jar; md5 = "ff77853e750e19a9b8d380c17ea27f3d"; } diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index 716dad8dde7..cfa366b66ad 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -1,12 +1,14 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "ed-1.0"; + name = "ed-1.1"; src = fetchurl { url = "mirror://gnu/ed/${name}.tar.bz2"; - sha256 = "0mwkbz6qy6hqbdk7hwl6271yjsm5nh1v70aynp51zncj0s0b2r7r"; + sha256 = "0hikn102jywxy86599k0ys4h2r3lshlfihrpjr7dqaxch49pgb56"; }; + doCheck = true; + meta = { description = "GNU ed, an implementation of the standard Unix editor"; diff --git a/pkgs/applications/editors/emacs-21/default.nix b/pkgs/applications/editors/emacs-21/default.nix index 31a685ef717..9fc16594e26 100644 --- a/pkgs/applications/editors/emacs-21/default.nix +++ b/pkgs/applications/editors/emacs-21/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { name = "emacs-21.4a"; builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/emacs-21.4a.tar.gz; + url = http://nixos.org/tarballs/emacs-21.4a.tar.gz; md5 = "8f9d97cbd126121bd5d97e5e31168a87"; }; patches = [./crt.patch]; diff --git a/pkgs/applications/editors/emacs-modes/cua/default.nix b/pkgs/applications/editors/emacs-modes/cua/default.nix index ddc2dca2232..b5348967a3e 100644 --- a/pkgs/applications/editors/emacs-modes/cua/default.nix +++ b/pkgs/applications/editors/emacs-modes/cua/default.nix @@ -2,7 +2,7 @@ name = "cua-mode-2.10"; builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/cua-mode-2.10.el; + url = http://nixos.org/tarballs/cua-mode-2.10.el; md5 = "5bf5e43f5f38c8383868c7c6c5baca09"; }; } diff --git a/pkgs/applications/editors/emacs-modes/nxml/default.nix b/pkgs/applications/editors/emacs-modes/nxml/default.nix index 57583bbfcb6..c8d441475c8 100644 --- a/pkgs/applications/editors/emacs-modes/nxml/default.nix +++ b/pkgs/applications/editors/emacs-modes/nxml/default.nix @@ -2,7 +2,7 @@ name = "nxml-mode-20041004"; builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/nxml-mode-20041004.tar.gz; + url = http://nixos.org/tarballs/nxml-mode-20041004.tar.gz; md5 = "ac137024cf337d6f11d8ab278d39b4db"; }; } diff --git a/pkgs/applications/editors/emacs-modes/quack/default.nix b/pkgs/applications/editors/emacs-modes/quack/default.nix index d95e1109539..3dea3f41fd6 100644 --- a/pkgs/applications/editors/emacs-modes/quack/default.nix +++ b/pkgs/applications/editors/emacs-modes/quack/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = fetchurl { # XXX: Upstream URL is not versioned, which might eventually break this. url = "http://www.neilvandyke.org/quack/quack.el"; - sha256 = "1j68azxbc54hdk3cw9q95qpz99wgj9xxgrzzwmydxh3zafy5faqs"; + sha256 = "1xmpbdb064s3l3cv4agf03ir1g7xfzyvlqayr3yy5f8z3i6pf7mi"; }; buildInputs = [ emacs ]; diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index 050467c4624..23dab206e18 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/monodevelop-0.6-pre2315.tar.bz2; + url = http://nixos.org/tarballs/monodevelop-0.6-pre2315.tar.bz2; md5 = "8c33df5629b0676b7ab552854c1de6fd"; }; diff --git a/pkgs/applications/editors/monodoc/default.nix b/pkgs/applications/editors/monodoc/default.nix index d65302e62ee..db8b2e47884 100644 --- a/pkgs/applications/editors/monodoc/default.nix +++ b/pkgs/applications/editors/monodoc/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/monodoc-1.0.6.tar.gz; + url = http://nixos.org/tarballs/monodoc-1.0.6.tar.gz; md5 = "f2fc27e8e4717d90dc7efa2450625693"; }; diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix index 8b9ac5a9f54..fbe67d1600d 100644 --- a/pkgs/applications/graphics/batik/default.nix +++ b/pkgs/applications/graphics/batik/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "batik-1.6"; builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/batik-1.6.zip; + url = http://nixos.org/tarballs/batik-1.6.zip; md5 = "edff288fc64f968ff96ca49763d50f3c"; }; diff --git a/pkgs/applications/graphics/f-spot/default.nix b/pkgs/applications/graphics/f-spot/default.nix index 40329412449..17a3cd22a5f 100644 --- a/pkgs/applications/graphics/f-spot/default.nix +++ b/pkgs/applications/graphics/f-spot/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/f-spot-0.0.10.tar.bz2; + url = http://nixos.org/tarballs/f-spot-0.0.10.tar.bz2; md5 = "19cc6e067ccc261b0502ff6189b79832"; }; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index d3571793c03..3bd5202c38c 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, pkgconfig, gtk, libgtkhtml, freetype , fontconfig, libart_lgpl, libtiff, libjpeg, libpng, libexif, zlib, perl -, perlXMLParser, python, pygtk, gettext, xlibs +, perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl, gegl }: stdenv.mkDerivation { - name = "gimp-2.4.7"; + name = "gimp-2.6.2"; src = fetchurl { - url = ftp://ftp.gtk.org/pub/gimp/v2.4/gimp-2.4.7.tar.bz2; - sha256 = "1j8904cy5sp021fz7ikh2dxm339a36ihns94qr9i1y7sb3qfx66k"; + url = ftp://ftp.gtk.org/pub/gimp/v2.6/gimp-2.6.2.tar.bz2; + sha256 = "0bdbqn800i6bbyqww01379zlj687dhcnm4hr9qxmv5wgffcgiari"; }; buildInputs = [ pkgconfig gtk libgtkhtml freetype fontconfig libart_lgpl libtiff libjpeg libpng libexif zlib perl - perlXMLParser python pygtk gettext + perlXMLParser python pygtk gettext intltool babl gegl ]; configureFlags = [ "--disable-print" ]; diff --git a/pkgs/applications/graphics/gocr/0.44.nix b/pkgs/applications/graphics/gocr/0.44.nix index 0a3c3869a1c..7273c5d98c3 100644 --- a/pkgs/applications/graphics/gocr/0.44.nix +++ b/pkgs/applications/graphics/gocr/0.44.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://prdownloads.sourceforge.net/jocr/gocr-0.44.tar.gz; diff --git a/pkgs/applications/graphics/xscreensaver/default.nix b/pkgs/applications/graphics/xscreensaver/default.nix index b5981fa6dd0..5c779e5e1b6 100644 --- a/pkgs/applications/graphics/xscreensaver/default.nix +++ b/pkgs/applications/graphics/xscreensaver/default.nix @@ -1,4 +1,4 @@ -args : with args; let localDefs = builderDefs.meta.function (args // rec { +args : with args; let localDefs = builderDefs.passthru.function (args // rec { version = lib.getAttr ["version"] "5.07" args; src = /* put a fetchurl here */ fetchurl { diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix index 17147c5289f..271ed1a7ebb 100644 --- a/pkgs/applications/misc/cdrtools/default.nix +++ b/pkgs/applications/misc/cdrtools/default.nix @@ -3,6 +3,15 @@ stdenv.mkDerivation { name = "cdrtools-2.01"; builder = ./builder.sh; + #hack, I'm getting "chown: invalid user: `bin" error, so replace chown by a nop dummy script + preInstall = '' + mkdir "$TMP/bin" + for i in chown chgrp; do + echo '#!/bin/sh' >> "$TMP/bin/$i" + chmod +x "$TMP/bin/$i" + PATH="$TMP/bin:$PATH" + done + ''; src = fetchurl { url = ftp://ftp.berlios.de/pub/cdrecord/cdrtools-2.01.tar.bz2; md5 = "d44a81460e97ae02931c31188fe8d3fd"; diff --git a/pkgs/applications/misc/multisync/default.nix b/pkgs/applications/misc/multisync/default.nix new file mode 100644 index 00000000000..af6bc072e53 --- /dev/null +++ b/pkgs/applications/misc/multisync/default.nix @@ -0,0 +1,19 @@ +args: with args; + + +stdenv.mkDerivation { + name = "multisync-0.82-1"; + src = fetchurl { + url = mirror://sourceforge/multisync/multisync-0.82-1.tar.bz2; + sha256 = "1azb6zsn3n1rnla2qc3c440gc4vgmbj593k6xj5g1v0xha2vm2y3"; + }; + buildInputs = [ gtk glib ORBit2 libbonobo libtool pkgconfig libgnomeui GConf + automake autoconf + ]; + preConfigure = "./autogen.sh"; # install.sh is not contained in the tar + + meta = { + description = "modular program to synchronize calendars, addressbooks and other PIM data between pcs, mobile devices etc"; + }; +} + diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index 79da06d5083..d69a8334d43 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -3,13 +3,19 @@ args: with args; stdenv.mkDerivation { name="xneur"; src = fetchurl { - url = "http://dists.xneur.ru/release-0.8.0/tgz/xneur-0.8.0.tar.bz2"; - sha256 = "1f05bm4vqdrlm8rxwgqv89k5lhc236xg841aw4snw514g0hi2sl8"; + url = "http://dists.xneur.ru/release-0.9.2/tgz/xneur-0.9.2.tar.bz2"; + sha256 = "1zk13ixd82nq8a2rzmmk53xy2iphydf57mfb2ndfil21rkffr0jq"; }; - buildInputs = [libX11 pkgconfig pcre GStreamer glib libxml2 aspell]; + buildInputs = [libX11 pkgconfig pcre GStreamer glib libxml2 aspell + libXpm]; - preConfigure = "sed -e 's/-Werror//' -i configure"; + inherit aspell; + + preConfigure = '' + sed -e 's/-Werror//' -i configure + sed -e 's/for aspell_dir in/for aspell_dir in $aspell /' -i configure + ''; meta = { description = "xneur is the keyboard layout switcher."; diff --git a/pkgs/applications/networking/browsers/firefox-2/default.nix b/pkgs/applications/networking/browsers/firefox-2/default.nix index a9e97eef857..31da6ea2b46 100644 --- a/pkgs/applications/networking/browsers/firefox-2/default.nix +++ b/pkgs/applications/networking/browsers/firefox-2/default.nix @@ -10,12 +10,12 @@ }: stdenv.mkDerivation { - name = "firefox-2.0.0.16"; + name = "firefox-2.0.0.17"; builder = ./builder.sh; src = fetchurl { - url = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.16/source/firefox-2.0.0.16-source.tar.bz2; - sha1 = "ae1d451ce85a5515b37d73d2c4b7cb1377206d86"; + url = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.17/source/firefox-2.0.0.17-source.tar.bz2; + sha1 = "ba95d9f64f2307b109dbce25d7a17af7e68298ed"; }; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/firefox-3/default.nix b/pkgs/applications/networking/browsers/firefox-3/default.nix index 47a01327740..9874b6df7d1 100644 --- a/pkgs/applications/networking/browsers/firefox-3/default.nix +++ b/pkgs/applications/networking/browsers/firefox-3/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig +, libjpeg, zlib, cairo, dbus, dbus_glib, bzip2 +, freetype, fontconfig, xulrunner , # If you want the resulting program to call itself "Firefox" instead # of "Deer Park", enable this option. However, those binaries may @@ -11,19 +11,20 @@ }: stdenv.mkDerivation { - name = "firefox-3.0.1"; + name = "firefox-3.0.4"; src = fetchurl { - url = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.1/source/firefox-3.0.1-source.tar.bz2; - sha1 = "ba3bb0b02404cf1abfb6189b156b2f4eb02e8975"; + url = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.4/source/firefox-3.0.4-source.tar.bz2; + sha1 = "16715b4af7ca2bad6baa8d450a3fd9cb375ad6d6"; }; buildInputs = [ - pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 + pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python dbus dbus_glib pango freetype fontconfig - xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt ]; + propagatedBuildInputs = [xulrunner]; + configureFlags = [ "--enable-application=browser" "--enable-optimize" @@ -36,35 +37,21 @@ stdenv.mkDerivation { "--enable-system-cairo" #"--enable-system-sqlite" # <-- this seems to be discouraged "--disable-crashreporter" + "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" ]; postInstall = '' - export dontPatchELF=1; - - # Strip some more stuff + # Strip some more stuff. strip -S $out/lib/*/* || true - # Fix some references to /bin paths in the Firefox shell script. - substituteInPlace $out/bin/firefox \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - # This fixes starting Firefox when there already is a running - # instance. The `firefox' wrapper script actually expects to be - # in the same directory as `run-mozilla.sh', apparently. libDir=$(cd $out/lib && ls -d firefox-[0-9]*) test -n "$libDir" - cd $out/bin - mv firefox ../lib/$libDir/ - ln -s ../lib/$libDir/firefox . + + ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $out/lib/$libDir/xulrunner - # Register extensions etc. + # Register extensions etc. !!! is this needed anymore? echo "running firefox -register..." - (cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./firefox-bin -register) || false - - # Put the Firefox icon in the right place. - ensureDir $out/lib/$libDir/chrome/icons/default - ln -s ../../../icons/default.xpm $out/lib/$libDir/chrome/icons/default/ + $out/bin/firefox -register ''; # */ meta = { @@ -72,7 +59,10 @@ stdenv.mkDerivation { homepage = http://www.mozilla.com/en-US/firefox/; }; - passthru = {inherit gtk;}; + passthru = { + inherit gtk; + isFirefox3Like = true; + }; } diff --git a/pkgs/applications/networking/browsers/firefox-3/xulrunner.nix b/pkgs/applications/networking/browsers/firefox-3/xulrunner.nix index e75b40ff780..09798ce02dd 100644 --- a/pkgs/applications/networking/browsers/firefox-3/xulrunner.nix +++ b/pkgs/applications/networking/browsers/firefox-3/xulrunner.nix @@ -9,12 +9,18 @@ enableOfficialBranding ? false }: +let + + version = "1.9.0.4"; # this attribute is used by other packages + +in + stdenv.mkDerivation { - name = "xulrunner-1.9.0.1"; + name = "xulrunner-${version}"; src = fetchurl { - url = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.1/source/firefox-3.0.1-source.tar.bz2; - sha1 = "ba3bb0b02404cf1abfb6189b156b2f4eb02e8975"; + url = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.4/source/firefox-3.0.4-source.tar.bz2; + sha1 = "16715b4af7ca2bad6baa8d450a3fd9cb375ad6d6"; }; buildInputs = [ @@ -75,7 +81,7 @@ stdenv.mkDerivation { homepage = http://www.mozilla.com/en-US/firefox/; }; - passthru = {inherit gtk;}; + passthru = { inherit gtk version; }; } diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix index 95f4f4ab77f..b22fe9b6d80 100644 --- a/pkgs/applications/networking/browsers/icecat-3/default.nix +++ b/pkgs/applications/networking/browsers/icecat-3/default.nix @@ -103,7 +103,10 @@ stdenv.mkDerivation { licenses = [ "GPLv2+" "LGPLv2+" "MPLv1+" ]; }; - passthru = {inherit gtk;}; + passthru = { + inherit gtk; + isFirefox3Like = true; + }; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh new file mode 100644 index 00000000000..551b0e1c03f --- /dev/null +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh @@ -0,0 +1,12 @@ +source $stdenv/setup + +dontStrip=1 +dontPatchELF=1 + +installPhase() { + ensureDir $out/lib/mozilla/plugins + cp -p libflashplayer.so $out/lib/mozilla/plugins + patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so +} + +genericBuild diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix new file mode 100644 index 00000000000..9cb9ef8bb5a --- /dev/null +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, zlib, alsaLib, curl}: + +assert stdenv.system == "i686-linux"; + +stdenv.mkDerivation { + name = "flashplayer-10.0.12.36"; + + builder = ./builder.sh; + + src = fetchurl { + url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz; + sha256 = "0bcn07a3684krqbh6cw08hb8lymm0wijnlcx5bvln44749kzg7wf"; + }; + + inherit zlib alsaLib; + + passthru = { + mozillaPlugin = "/lib/mozilla/plugins"; + }; + + rpath = "${zlib}/lib:${alsaLib}/lib:${curl}/lib"; + + meta = { + description = "Adobe Flash Player browser plugin"; + homepage = http://www.adobe.com/products/flashplayer/; + }; +} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/builder.sh deleted file mode 100644 index 79dbec0340f..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -installPhase() { - mkdir -p $out/lib/mozilla/plugins - cp -p flashplayer.xpt libflashplayer.so $out/lib/mozilla/plugins - echo "$zlib/lib:$libXmu/lib" > $out/lib/mozilla/plugins/extra-library-path -} - -genericBuild diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/default.nix deleted file mode 100644 index 776e926acd5..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, zlib, libXmu}: - -(stdenv.mkDerivation { - name = "flashplayer-7.0r25"; - - builder = ./builder.sh; - src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/install_flash_player_7_linux.tar.gz; - md5 = "79c59a5ea29347e01c8e6575dd054cd1"; - }; - - inherit zlib libXmu; -}) // {mozillaPlugin = "/lib/mozilla/plugins";} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix index e3ac37ba8cc..330fac09862 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, browser, browserName, libXpm, gettext}: +{stdenv, fetchurl, pkgconfig, browser, libXpm, gettext}: stdenv.mkDerivation rec { name = "mplayerplug-in-3.55"; @@ -9,13 +9,10 @@ stdenv.mkDerivation rec { }; patches = - (if browserName == "icecat" # FIXME: Should match Firefox 3 as well. - then [ ./icecat3-idldir.patch ] - else []); + stdenv.lib.optional (browser ? isFirefox3Like) ./icecat3-idldir.patch; postConfigure = - (if browserName == "icecat" # FIXME: Should match Firefox 3 as well. - then '' + (if browser ? isFirefox3Like then '' # Cause a rebuild of these file from the IDL file, needed for GNU IceCat 3 # and Mozilla Firefox 3. # See, e.g., http://article.gmane.org/gmane.comp.mozilla.mplayerplug-in/2104 . diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 2e2ee7fd2ad..d432debc3ee 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -8,7 +8,7 @@ assert motif != null -> libXt != null; # Hm, does Opera 9.x still use Motif for anything? stdenv.mkDerivation rec { - version = "9.24-20071015.5"; + version = "9.62-20081029"; name = "opera-${version}"; inherit libstdcpp5; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { builder = ./builder.sh; src = if (stdenv.system == "i686-linux") then fetchurl { - url = ftp://ftp.task.gda.pl/pub/opera/linux/950b/final/en/i386/shared/opera-9.50b-20071024.5-shared-qt.i386-en.tar.bz2; - sha256 = "0vv1q86is9x6vw8fx92wrnvlyn4x29zgk9zjn66rcx37n6grqqah"; + 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"; } 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; diff --git a/pkgs/applications/networking/browsers/w3m/bsd.patch b/pkgs/applications/networking/browsers/w3m/bsd.patch deleted file mode 100644 index 9ea117187e9..00000000000 --- a/pkgs/applications/networking/browsers/w3m/bsd.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -rc w3m-0.5.1-orig/configure w3m-0.5.1/configure -*** w3m-0.5.1-orig/configure 2004-04-28 20:19:24.000000000 +0200 ---- w3m-0.5.1/configure 2005-09-16 11:33:48.000000000 +0200 -*************** -*** 5642,5648 **** - echo "$as_me:$LINENO: checking for -l$lib" >&5 - echo $ECHO_N "checking for -l$lib... $ECHO_C" >&6 - extlib="not found" -! for dir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib - do - if test -f $dir/lib$lib.a -o -f $dir/lib$lib.so ; then - LIBS="$LIBS -l$lib" ---- 5642,5648 ---- - echo "$as_me:$LINENO: checking for -l$lib" >&5 - echo $ECHO_N "checking for -l$lib... $ECHO_C" >&6 - extlib="not found" -! for dir in /no-such-path - do - if test -f $dir/lib$lib.a -o -f $dir/lib$lib.so ; then - LIBS="$LIBS -l$lib" -*************** -*** 5768,5774 **** - if test x"$enable_ipv6" = xno; then - echo "$as_me:$LINENO: checking for libinet6" >&5 - echo $ECHO_N "checking for libinet6... $ECHO_C" >&6 -! for dir in /usr/local/v6/lib /usr/local/lib /usr/lib - do - if test -f $dir/libinet6.a; then - if test $dir != "/usr/lib"; then ---- 5768,5774 ---- - if test x"$enable_ipv6" = xno; then - echo "$as_me:$LINENO: checking for libinet6" >&5 - echo $ECHO_N "checking for libinet6... $ECHO_C" >&6 -! for dir in /no-such-path - do - if test -f $dir/libinet6.a; then - if test $dir != "/usr/lib"; then diff --git a/pkgs/applications/networking/browsers/w3m/builder.sh b/pkgs/applications/networking/browsers/w3m/builder.sh deleted file mode 100644 index 5a28940f4a6..00000000000 --- a/pkgs/applications/networking/browsers/w3m/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -source $stdenv/setup - -configureFlags="--with-ssl=$openssl --with-gc=$boehmgc $configureFlags" - -genericBuild diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 1cda828cf53..0298ca3d3dc 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -9,20 +9,24 @@ assert graphicsSupport -> gdkpixbuf != null; stdenv.mkDerivation { name = "w3m-0.5.2"; - builder = ./builder.sh; + src = fetchurl { url = mirror://sourceforge/w3m/w3m-0.5.2.tar.gz; md5 = "ba06992d3207666ed1bf2dcf7c72bf58"; }; - inherit openssl boehmgc; - buildInputs = [ - ncurses boehmgc gettext zlib - (if sslSupport then openssl else null) - (if graphicsSupport then gdkpixbuf else null) - ]; - #patches = [./bsd.patch]; + + buildInputs = [ncurses boehmgc gettext zlib] + ++ stdenv.lib.optional sslSupport openssl + ++ stdenv.lib.optional graphicsSupport gdkpixbuf; + + configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}"; + + preConfigure = '' + substituteInPlace ./configure --replace /usr /no-such-path + ''; meta = { - homepage = http://w3m.sourceforge.net; + homepage = http://w3m.sourceforge.net/; + description = "A text-mode web browser"; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index fd01730aa3e..434c1983e03 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.1"; + name = "pidgin-2.5.2"; src = fetchurl { - url = mirror://sourceforge/pidgin/pidgin-2.5.1.tar.bz2; - sha256 = "0xsvwy2d71lxddmyzm5fjripbhy1ljph4r2nz1rbw11qnj47ms0k"; + url = mirror://sourceforge/pidgin/pidgin-2.5.2.tar.bz2; + sha256 = "1p39nvwy3c7wc97a6i88f6rrg5d3a6vv0wdard4vkfmva81l24r0"; }; inherit nss ncurses; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix index 55bc56704f4..6f052936c13 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation { - name = "thunderbird-2.0.0.16"; + name = "thunderbird-2.0.0.18"; builder = ./builder.sh; src = fetchurl { - url = ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.16/source/thunderbird-2.0.0.16-source.tar.bz2; - sha1 = "30092e38d621c30af02653d3bf246d98d2533853"; + url = ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.18/source/thunderbird-2.0.0.18-source.tar.bz2; + sha1 = "4d05300280763e34c7a115835523ed2805f7733c"; }; buildInputs = [ diff --git a/pkgs/applications/networking/p2p/ldcpp/1.0.1.nix b/pkgs/applications/networking/p2p/ldcpp/1.0.1.nix index 00626377e7c..07e4a305060 100644 --- a/pkgs/applications/networking/p2p/ldcpp/1.0.1.nix +++ b/pkgs/applications/networking/p2p/ldcpp/1.0.1.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function ((rec { + let localDefs = builderDefs.passthru.function ((rec { src = /* put a fetchurl here */ fetchurl { url = http://download2.berlios.de/linuxdcpp/linuxdcpp-1.0.1.tar.bz2; diff --git a/pkgs/applications/science/biology/arb/default.nix b/pkgs/applications/science/biology/arb/default.nix index d0feae80393..4a732e7750c 100644 --- a/pkgs/applications/science/biology/arb/default.nix +++ b/pkgs/applications/science/biology/arb/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { patches = [ ./makefile.patch ]; - buildInputs = [ glew mesa libpng libXpm lesstif lynx freeglut libtiff rxp sablotron libXaw perl jdk transfig libX11 libXext libXt gv xfig gnuplot ]; + buildInputs = [ glew mesa libpng libXpm lesstif lynx freeglut libtiff rxp sablotron libXaw perl jdk transfig libX11 libXext libXt gv gnuplot ]; unpackPhase = '' tar xzf $src @@ -34,19 +34,19 @@ stdenv.mkDerivation { cp -vau lib/pts $shareddir/lib rm -vrf lib/pts ln -vs $shareddir/lib/pts $out/lib/pts - chmod a+rwx -R $shareddir/lib/pts + chmod a+rwx $shareddir/lib/pts # link out writable shared location lib/nas/ ensureDir $shareddir/lib/nas cp -vau lib/nas $shareddir/lib rm -vrf lib/nas ln -vs $shareddir/lib/nas $out/lib/nas - chmod a+rwx -R $shareddir/lib/nas + chmod a+rwx $shareddir/lib/nas # link out shared lib/pixmaps (not sure about this, yet): ensureDir $shareddir/lib/pixmaps cp -vau lib/pixmaps $shareddir/lib rm -vrf lib/pixmaps ln -vs $shareddir/lib/pixmaps $out/lib/pixmaps - chmod a+rwx -R $shareddir/lib/pixmaps + chmod a+rwx $shareddir/lib/pixmaps # bulk copy cp -vau * $out # replace arb script diff --git a/pkgs/applications/version-management/darcs/darcs-2.nix b/pkgs/applications/version-management/darcs/darcs-2.nix index b3d18522668..be68791cd2d 100644 --- a/pkgs/applications/version-management/darcs/darcs-2.nix +++ b/pkgs/applications/version-management/darcs/darcs-2.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl, ghc, zlib, ncurses, curl, perl}: stdenv.mkDerivation { - name = "darcs-2.0.2"; + name = "darcs-2.1.0"; src = fetchurl { - url = http://darcs.net/darcs-2.0.2.tar.gz; - sha256 = "17plbfwz2rvzbvr9b90z55lj51ilnq22hhr38hffila1gsxqfk0n"; + url = http://www.darcs.net/darcs-2.1.0.tar.gz; + sha256 = "d5a63e62bceb45905163d508c6b25158dab6aca367015566d8c539ec37107ab4"; }; + buildInputs = [ghc zlib ncurses curl perl]; NIX_LDFLAGS = "-lz"; diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix index fffc20d6295..336d37ad2c8 100644 --- a/pkgs/applications/version-management/darcs/default.nix +++ b/pkgs/applications/version-management/darcs/default.nix @@ -1,4 +1,10 @@ -{stdenv, fetchurl, ghc, zlib, ncurses, curl}: +{stdenv, fetchurl, ghc, zlib, ncurses, curl, getConfig}: + +# you really should consider using darcs2 and updating your darcs-1 repos .. +# many performance improvements have been made if you use the darcs-2 or hashed format +# (darcs-2 is default now when runnig darcs 2.1.0) +# lookup darcs convert and make sure you understand the one way conversion.. +assert getConfig ["darcs" "IreallyWantDarcsOne"] false; stdenv.mkDerivation { name = "darcs-1.0.9"; diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index d7696a1b18b..678f3c80613 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -10,11 +10,11 @@ assert svnSupport -> (subversion != null && perlLibs != [] && subversion.perlBin stdenv.mkDerivation rec { - name = "git-1.6.0.1"; + name = "git-1.6.0.4"; src = fetchurl { url = "mirror://kernel/software/scm/git/${name}.tar.bz2"; - sha256 = "1vpnq5gr6831kywpbwppmqyj7xnlxkzzim8mchy925d0bpmz9l0b"; + sha256 = "0q5jnix65zn58dhd9xc3sjpamli0lh1bnsz1b9riwwicgwssrk7q"; }; patches = [ ./docbook2texi.patch ]; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 408c9d8ebac..836232a688b 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,23 +1,42 @@ args: with args; stdenv.mkDerivation { - name = "mercurial-0.9.5"; + name = "mercurial-1.0.2"; src = fetchurl { - url = http://www.selenic.com/mercurial/release/mercurial-0.9.5.tar.gz; - sha256 = "1n34yl4z7nc3vmsgpkmqc94hsmy846ny86xgpgv3m371ljm2pq6g"; + url = http://www.selenic.com/mercurial/release/mercurial-1.0.2.tar.gz; + sha256 = "0fj2aakband855684q76h7zl328iq8i6l81c2k64hy5m0if9hvgr"; }; + inherit python; # pass it so that the same version can be used in hg2git + buildInputs = [ python makeWrapper ]; makeFlags = "PREFIX=$(out)"; - postInstall = '' - for i in $(cd $out/bin && ls); do - wrapProgram $out/bin/$i \ - --prefix PYTHONPATH : "$(toPythonPath $out)" - done - ''; + postInstall = (if args.guiSupport then + '' + ensureDir $out/etc/mercurial + cp contrib/hgk $out/bin + cat >> $out/etc/mercurial/hgrc << EOF + [extensions] + hgk=$out/lib/python2.5/site-packages/hgext/hgk.py + EOF + # setting HG so that hgk can be run itself as well (not only hg view) + WRAP_TK=" --set TK_LIBRARY \"${tk}/lib/tk8.4\" + --set HG \"$out/bin/hg\" + --prefix PATH : \"${tk}/bin\" " + '' + else "") + + + '' + for i in $(cd $out/bin && ls); do + wrapProgram $out/bin/$i \ + --prefix PYTHONPATH : "$(toPythonPath $out)" \ + $WRAP_TK + done + ''; meta = { description = "A fast, lightweight SCM system for very large distributed projects"; homepage = http://www.selenic.com/mercurial/; + license = "GPLv2"; }; } diff --git a/pkgs/applications/version-management/subversion-1.5.x/default.nix b/pkgs/applications/version-management/subversion-1.5.x/default.nix index 30222fe58b3..bde985a64f0 100644 --- a/pkgs/applications/version-management/subversion-1.5.x/default.nix +++ b/pkgs/applications/version-management/subversion-1.5.x/default.nix @@ -8,6 +8,7 @@ , javahlBindings ? false , stdenv, fetchurl, apr, aprutil, neon, zlib , httpd ? null, expat, swig ? null, jdk ? null +, static ? false }: assert bdbSupport -> aprutil.bdbSupport; @@ -19,13 +20,13 @@ assert compressionSupport -> neon.compressionSupport; stdenv.mkDerivation rec { - version = "1.5.2"; + version = "1.5.4"; name = "subversion-${version}"; src = fetchurl { - url = http://subversion.tigris.org/downloads/subversion-1.5.2.tar.bz2; - sha256 = "1xf7hacidr8wxdf2m64lhv42sjis5hz469yslcpp4xfd6n846k3w"; + url = http://subversion.tigris.org/downloads/subversion-1.5.4.tar.bz2; + sha256 = "0h7v8ngbjmxbcwjxl4y7w6qygs0qc228jdpqf5s2i21rnmbn4jz2"; }; buildInputs = [zlib apr aprutil] @@ -35,8 +36,8 @@ stdenv.mkDerivation rec { ; configureFlags = '' - --disable-static --disable-keychain + ${if static then "--disable-shared --enable-all-static" else "--disable-static"} ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"} ${if httpServer then "--with-apxs=${httpd}/bin/apxs" else "--without-apxs"} ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"} @@ -56,7 +57,7 @@ stdenv.mkDerivation rec { make swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn make install-swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn fi - + if test "$perlBindings"; then make swig-pl-lib make install-swig-pl-lib diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix new file mode 100644 index 00000000000..501c7c33df1 --- /dev/null +++ b/pkgs/applications/video/cinelerra/default.nix @@ -0,0 +1,34 @@ +args: +args.stdenv.mkDerivation { + name = "cinelerra-git"; + + src = args.sourceByName "cinelerra"; + + perl = args.perl; + + preConfigure = '' + find -type f -print0 | xargs --null sed -e "s@/usr/bin/perl@$perl/bin/perl@" -i + ./autogen.sh + ''; + configureOptions = ["--enable-freetype2"]; + + buildInputs =(with args; [ + automake autoconf libtool pkgconfig + X11 faad2 faac + a52dec alsaLib fftw lame libavc1394 libiec61883 + libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype + mjpegtools x264 gettext openexr esound + # + libXxf86vm libXv + libtheora libpng libdv + nasm + perl + e2fsprogs + ]); + + meta = { + description = "Cinelerra - Video Editor"; + homepage = http://www.cinelerra.org; + license = "GPLv2"; + }; +} diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index b7b030ad327..b0151ba4dcb 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl -, SDL, SDL_mixer, GStreamer -, libogg, libxml2, libjpeg, mesa, libpng, libtool -, boost, freetype, agg, dbus, curl, pkgconfig -, glib, gtk, x11 -, lib}: +, SDL, SDL_mixer, gstreamer, gstPluginsBase, gstFfmpeg +, libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool +, boost, freetype, agg, dbus, curl, pkgconfig, gettext +, glib, gtk, x11, ming, dejagnu, python +, lib, makeWrapper }: -let version = "0.8.3"; in +let version = "0.8.4"; in stdenv.mkDerivation rec { name = "gnash-${version}"; src = fetchurl { url = "mirror://gnu/gnash/${version}/${name}.tar.bz2"; - sha256 = "16n32774sd5q4nkd95v2m8r2yfa9fk30jnq1iicarq3j8i2xh7xg"; + sha256 = "094jky77ghdisq17z742cwn3g9ckm937p8h5jbji5rrdqbdlpzkg"; }; builder = ./builder.sh; @@ -34,20 +34,40 @@ stdenv.mkDerivation rec { # XXX: KDE is supported as well so we could make it available optionally. - buildInputs = [x11 SDL SDL_mixer GStreamer libtool - libogg libxml2 libjpeg mesa libpng boost freetype agg - dbus curl pkgconfig glib gtk]; + buildInputs = [ + gettext x11 SDL SDL_mixer gstreamer gstPluginsBase gstFfmpeg libtool + libogg libxml2 libjpeg mesa libpng libungif boost freetype agg + dbus curl pkgconfig glib gtk + makeWrapper + + # For the test suite + ming dejagnu python + ]; + inherit SDL_mixer SDL; # Make sure `gtk-gnash' gets `libXext' in its `RPATH'. NIX_LDFLAGS="-lX11 -lXext"; + #doCheck = true; + preInstall = ''ensureDir $out/plugins''; - postInstall = ''make install-plugins''; + postInstall = '' + make install-plugins + + # Wrap programs so the find the GStreamer plug-ins they need + # (e.g., gst-ffmpeg is needed to watch movies such as YouTube's). + for prog in $out/bin/* + do + wrapProgram "$prog" --prefix \ + GST_PLUGIN_PATH ":" \ + "${gstPluginsBase}/lib/gstreamer-0.10:${gstFfmpeg}/lib/gstreamer-0.10" + done + ''; meta = { homepage = http://www.gnu.org/software/gnash/; - description = ''Gnash is the GNU Flash movie player.''; + description = "GNU Gnash, an SWF movie player"; license = "GPLv3+"; }; } // {mozillaPlugin = "/plugins";} diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index e57c53e29dd..784af50a6ee 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -13,4 +13,10 @@ stdenv.mkDerivation { # !!! don't know why this is necessary NIX_LDFLAGS = "-rpath ${libXext}/lib"; + + meta = { + description = "screencast video catpuring tool"; + homepage = http://xvidcap.sourceforge.net/; + license = "GPLv2"; + }; } diff --git a/pkgs/applications/video/zapping/0.10.nix b/pkgs/applications/video/zapping/0.10.nix index 69c4ce51e46..067917abe77 100644 --- a/pkgs/applications/video/zapping/0.10.nix +++ b/pkgs/applications/video/zapping/0.10.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/zapping-0.10cvs6.tar.bz2; + url = http://nixos.org/tarballs/zapping-0.10cvs6.tar.bz2; md5 = "6aa7614ac3fd5d39c89c2198598ad27b"; }; diff --git a/pkgs/applications/virtualization/qemu/linux-img/0.2.nix b/pkgs/applications/virtualization/qemu/linux-img/0.2.nix index 87e2e114bec..e8532caddd2 100644 --- a/pkgs/applications/virtualization/qemu/linux-img/0.2.nix +++ b/pkgs/applications/virtualization/qemu/linux-img/0.2.nix @@ -1,6 +1,6 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = [ http://fabrice.bellard.free.fr/qemu/linux-0.2.img.bz2 http://bellard.org/qemu/linux-0.2.img.bz2]; 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 c9c8c5c731a..9f516398b45 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 @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.7.4/compiz-bcop-0.7.4.tar.bz2; @@ -8,7 +8,7 @@ args : with args; buildInputs = (import ../general-dependencies.nix args); propagatedBuildInputs = [getopt libxslt]; configureFlags = []; - } null; /* null is a terminator for sumArgs */ + } ; in with localDefs; let fixPkgconfig = FullDepEntry (" 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 new file mode 100644 index 00000000000..e9bede0a287 --- /dev/null +++ b/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix @@ -0,0 +1,34 @@ +args : with args; + let localDefs = builderDefs.passthru.function { + src = /* put a fetchurl here */ + fetchurl { + url = http://releases.compiz-fusion.org/0.7.8/compiz-bcop-0.7.8.tar.bz2; + sha256 ="1rs5r5b6rl39vlw68i8bwm5izs5dm666kygmg1c8dy2dab0xsnkq"; + }; + buildInputs = (import ../general-dependencies.nix args); + propagatedBuildInputs = [getopt libxslt]; + configureFlags = []; + } ; + in with localDefs; +let + fixPkgconfig = FullDepEntry (" + ensureDir \$out/lib + ln -fs \$out/share/pkgconfig \$out/lib/pkgconfig + ") [minInit doMakeInstall defEnsureDir]; + fixInterpreter = FullDepEntry (" + sed -e 's@^#!/bin/bash@#! ${stdenv.bash}/bin/bash@' -i \$out/bin/bcop + ") [minInit doMakeInstall]; +in +stdenv.mkDerivation rec { + name = "compiz-bcop-"+version; + builder = writeScript (name + "-builder") + (textClosure localDefs [doAutotools doConfigure doMakeInstall fixPkgconfig fixInterpreter doForceShare + doPropagate]); + inherit propagatedBuildInputs; + meta = { + description = " + Compiz BCOP. +"; + inherit src; + }; +} diff --git a/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.4.nix index 5bed74bb2af..6ec5257cc2d 100644 --- a/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.4.nix +++ b/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.4.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.7.4/simple-ccsm-0.7.4.tar.bz2; @@ -14,7 +14,7 @@ args : with args; "PYTHONPATH" "\$PYTHONPATH" "PYTHONPATH" "$(toPythonPath ${pygtk})/gtk-2.0" ]; - } null; /* null is a terminator for sumArgs */ + } ; in with localDefs; stdenv.mkDerivation rec { name = "compizconfig-settings-"+args.version; diff --git a/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.8.nix new file mode 100644 index 00000000000..d739b54a534 --- /dev/null +++ b/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.8.nix @@ -0,0 +1,29 @@ +args : with args; + let localDefs = builderDefs.passthru.function { + src = /* put a fetchurl here */ + fetchurl { + url = http://releases.compiz-fusion.org/0.7.8/simple-ccsm-0.7.8.tar.bz2; + sha256 ="0djdzz1m9nvwzxfaywdm90bi816nig2ybfynf48394a5hpsng3l9"; + }; + buildInputs = (import ../general-dependencies.nix args) ++ + [libcompizconfig bcop compizConfigPython python gettext pygtk + pycairo configBackendGConf]; + configureFlags = []; + wrappedEnv = [ + "PYTHONPATH" "$(toPythonPath \$out)" + "PYTHONPATH" "\$PYTHONPATH" + "PYTHONPATH" "$(toPythonPath ${pygtk})/gtk-2.0" + ]; + } ; + in with localDefs; +stdenv.mkDerivation rec { + name = "compizconfig-settings-"+args.version; + builder = writeScript (name + "-builder") + (textClosure localDefs [installPythonPackage (doWrap "\$out/bin/simple-ccsm")]); + meta = { + description = " + Compiz Settings Manager (simplified) +"; + inherit src; + }; +} diff --git a/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.4.nix index a09e3df353b..a6761ad9ae5 100644 --- a/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.4.nix +++ b/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.4.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.7.4/ccsm-0.7.4.tar.bz2; @@ -14,7 +14,7 @@ args : with args; "PYTHONPATH" "\$PYTHONPATH" "PYTHONPATH" "$(toPythonPath ${pygtk})/gtk-2.0" ]; - } null; /* null is a terminator for sumArgs */ + } ; in with localDefs; stdenv.mkDerivation rec { name = "compizconfig-settings-"+args.version; diff --git a/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.8.nix new file mode 100644 index 00000000000..385819afd4c --- /dev/null +++ b/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.8.nix @@ -0,0 +1,29 @@ +args : with args; + let localDefs = builderDefs.passthru.function { + src = /* put a fetchurl here */ + fetchurl { + url = http://releases.compiz-fusion.org/0.7.8/ccsm-0.7.8.tar.bz2; + sha256 ="0s8difywj0ghc8c5xjxihfp8qhlhv5kyh00c2br1jh2ap5rrdfgc"; + }; + buildInputs = (import ../general-dependencies.nix args) ++ + [libcompizconfig bcop compizConfigPython python gettext pygtk + pycairo configBackendGConf]; + configureFlags = []; + wrappedEnv = [ + "PYTHONPATH" "$(toPythonPath \$out)" + "PYTHONPATH" "\$PYTHONPATH" + "PYTHONPATH" "$(toPythonPath ${pygtk})/gtk-2.0" + ]; + } ; + in with localDefs; +stdenv.mkDerivation rec { + name = "compizconfig-settings-"+args.version; + builder = writeScript (name + "-builder") + (textClosure localDefs [installPythonPackage (doWrap "\$out/bin/ccsm")]); + meta = { + description = " + Compiz Settings Manager +"; + inherit src; + }; +} diff --git a/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.4.nix index c77d332f890..39cf12d31da 100644 --- a/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.4.nix +++ b/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.4.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.7.4/compizconfig-python-0.7.4.tar.bz2; @@ -8,7 +8,7 @@ args : with args; buildInputs = (import ../general-dependencies.nix args) ++ [libcompizconfig bcop python pyrex configBackendGConf]; configureFlags = []; - } null; /* null is a terminator for sumArgs */ + } ; in with localDefs; stdenv.mkDerivation rec { name = "compizconfig-python-"+args.version; diff --git a/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.8.nix new file mode 100644 index 00000000000..d92349e238b --- /dev/null +++ b/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.8.nix @@ -0,0 +1,23 @@ +args : with args; + let localDefs = builderDefs.passthru.function { + src = /* put a fetchurl here */ + fetchurl { + url = http://releases.compiz-fusion.org/0.7.8/compizconfig-python-0.7.8.tar.bz2; + sha256 ="13g8vpgkimrbp19pd475ijiwbqx3zin0nzq8636l71yaqb0kjfjn"; + }; + buildInputs = (import ../general-dependencies.nix args) ++ + [libcompizconfig bcop python pyrex configBackendGConf]; + configureFlags = []; + } ; + in with localDefs; +stdenv.mkDerivation rec { + name = "compizconfig-python-"+args.version; + builder = writeScript (name + "-builder") + (textClosure localDefs [doAutotools doConfigure doMakeInstall doForceShare]); + meta = { + description = " + Compiz configuration - Python part. +"; + inherit src; + }; +} diff --git a/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.4.nix index 5136db338df..91a811e72cb 100644 --- a/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.4.nix +++ b/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.4.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.7.4/compizconfig-backend-gconf-0.7.4.tar.bz2; @@ -9,7 +9,7 @@ args : with args; [bcop libcompizconfig]; configureFlags = []; forceShare = ["man" "doc" "info" "lib/compizconfig"]; - } null; /* null is a terminator for sumArgs */ + } ; in with localDefs; stdenv.mkDerivation rec { name = "compizconfig-backend-GConf-"+version; diff --git a/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.8.nix new file mode 100644 index 00000000000..f6f1f1545b0 --- /dev/null +++ b/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.8.nix @@ -0,0 +1,24 @@ +args : with args; + let localDefs = builderDefs.passthru.function { + src = /* put a fetchurl here */ + fetchurl { + url = http://releases.compiz-fusion.org/0.7.8/compizconfig-backend-gconf-0.7.8.tar.bz2; + sha256 ="18bcfx3c2ipj3spfr8dg07h98pw77jh28w91w6n2fd5ffr6ja9q5"; + }; + buildInputs = (import ../general-dependencies.nix args) ++ + [bcop libcompizconfig]; + configureFlags = []; + forceShare = ["man" "doc" "info" "lib/compizconfig"]; + } ; + in with localDefs; +stdenv.mkDerivation rec { + name = "compizconfig-backend-GConf-"+version; + builder = writeScript (name + "-builder") + (textClosure localDefs [doAutotools doConfigure doMakeInstall doForceShare doPropagate]); + meta = { + description = " + Compiz configuration backend (GConf). +"; + inherit src; + }; +} 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 4ea554a6e7f..efaec0c8731 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 @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.7.4/compiz-fusion-plugins-extra-0.7.4.tar.bz2; @@ -8,7 +8,7 @@ args : with args; buildInputs = (import ../general-dependencies.nix args)++ [bcop libjpeg gettext pluginsMain]; configureFlags = []; - } null; /* null is a terminator for sumArgs */ + } ; in with localDefs; let sharePlugins = FullDepEntry (" 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 new file mode 100644 index 00000000000..39108fab204 --- /dev/null +++ b/pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix @@ -0,0 +1,32 @@ +args : with args; + let localDefs = builderDefs.passthru.function { + src = /* put a fetchurl here */ + fetchurl { + url = http://releases.compiz-fusion.org/0.7.8/compiz-fusion-plugins-extra-0.7.8.tar.bz2; + sha256 ="0hdnabq1bxln5cf6k9532iszj5qbhwkyl3b5d1gwfr80i01qxzy9"; + }; + buildInputs = (import ../general-dependencies.nix args)++ + [bcop libjpeg gettext pluginsMain]; + configureFlags = []; + } ; + in with localDefs; +let + sharePlugins = FullDepEntry (" + ensureDir \$out/share/compiz-plugins + ln -vsf \$out/lib/compiz \$out/share/compiz-plugins + ") [minInit doMakeInstall defEnsureDir]; + fixIncludes = FullDepEntry ('' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pluginsMain}/include/compiz" + '') [minInit doUnpack]; +in +stdenv.mkDerivation rec { + name = "compiz-fusion-plugins-extra-"+version; + builder = writeScript (name + "-builder") + (textClosure localDefs [fixIncludes doConfigure doMakeInstall sharePlugins doForceShare]); + meta = { + description = " + Extra Compiz Fusion plugins. +"; + inherit src; + }; +} diff --git a/pkgs/applications/window-managers/compiz-fusion/general-dependencies.nix b/pkgs/applications/window-managers/compiz-fusion/general-dependencies.nix index f02857cf80a..d8a0ffa3e7e 100644 --- a/pkgs/applications/window-managers/compiz-fusion/general-dependencies.nix +++ b/pkgs/applications/window-managers/compiz-fusion/general-dependencies.nix @@ -5,5 +5,5 @@ args: with args; [ libpng GConf mesa metacity librsvg dbus.libs dbus_glib gnomedesktop git autoconf automake - libtool libxslt libwnck intltool perl perlXMLParser compiz + libtool libxslt libwnck intltool perl perlXMLParser compiz pkgconfig libxml2 ] diff --git a/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.4.nix index d052a7d3c72..dd631b79b66 100644 --- a/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.4.nix +++ b/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.4.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.7.4/libcompizconfig-0.7.4.tar.bz2; @@ -8,7 +8,7 @@ args : with args; buildInputs = (import ../general-dependencies.nix args)++ [bcop]; configureFlags = []; - } null; /* null is a terminator for sumArgs */ + } ; in with localDefs; stdenv.mkDerivation rec { name = "libcompizconfig-"+version; diff --git a/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.8.nix new file mode 100644 index 00000000000..0ea38bd4520 --- /dev/null +++ b/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.8.nix @@ -0,0 +1,23 @@ +args : with args; + let localDefs = builderDefs.passthru.function { + src = /* put a fetchurl here */ + fetchurl { + url = http://releases.compiz-fusion.org/0.7.8/libcompizconfig-0.7.8.tar.bz2; + sha256 ="1026icgzyjxnn68gbkd85n9p8pxlwbc3h0dqqvpqmr93q1nhdmjr"; + }; + buildInputs = (import ../general-dependencies.nix args)++ + [bcop]; + configureFlags = []; + } ; + in with localDefs; +stdenv.mkDerivation rec { + name = "libcompizconfig-"+version; + builder = writeScript (name + "-builder") + (textClosure localDefs [doIntltool doAutotools doConfigure doMakeInstall doForceShare]); + meta = { + description = " + Compiz configuration backend library. +"; + inherit src; + }; +} 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 0fdb6ec5fa0..a50a4e03c3f 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 @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.7.4/compiz-fusion-plugins-main-0.7.4.tar.bz2; @@ -8,7 +8,7 @@ args : with args; buildInputs = (import ../general-dependencies.nix args)++ [bcop libjpeg gettext]; configureFlags = []; - } null; /* null is a terminator for sumArgs */ + } ; in with localDefs; let sharePlugins = FullDepEntry (" 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 new file mode 100644 index 00000000000..5fae889fd3e --- /dev/null +++ b/pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix @@ -0,0 +1,29 @@ +args : with args; + let localDefs = builderDefs.passthru.function { + src = /* put a fetchurl here */ + fetchurl { + url = http://releases.compiz-fusion.org/0.7.8/compiz-fusion-plugins-main-0.7.8.tar.bz2; + sha256 ="0lrvqi8kc8m6yap8pqbdg0wksckd3v3rp3k48q82pyvcwhaaf817"; + }; + buildInputs = (import ../general-dependencies.nix args)++ + [bcop libjpeg gettext]; + configureFlags = []; + } ; + in with localDefs; +let + sharePlugins = FullDepEntry (" + ensureDir \$out/share/compiz-plugins + ln -vsf \$out/lib/compiz \$out/share/compiz-plugins + ") [minInit doMakeInstall defEnsureDir]; +in +stdenv.mkDerivation rec { + name = "compiz-fusion-plugins-main-"+version; + builder = writeScript (name + "-builder") + (textClosure localDefs [doConfigure doMakeInstall sharePlugins doForceShare]); + meta = { + description = " + Main Compiz Fusion plugins. +"; + inherit src; + }; +} diff --git a/pkgs/applications/window-managers/compiz/0.6.2.nix b/pkgs/applications/window-managers/compiz/0.6.2.nix index 213fc810ddf..9531fdc3f6d 100644 --- a/pkgs/applications/window-managers/compiz/0.6.2.nix +++ b/pkgs/applications/window-managers/compiz/0.6.2.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/compiz/0.6.2/compiz-0.6.2.tar.bz2; diff --git a/pkgs/applications/window-managers/compiz/0.7.8.nix b/pkgs/applications/window-managers/compiz/0.7.8.nix index a7e700af4ea..e6447b68bdb 100644 --- a/pkgs/applications/window-managers/compiz/0.7.8.nix +++ b/pkgs/applications/window-managers/compiz/0.7.8.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://xorg.freedesktop.org/archive/individual/app/compiz-0.7.8.tar.gz; diff --git a/pkgs/applications/window-managers/fbpanel/4.12.nix b/pkgs/applications/window-managers/fbpanel/4.12.nix index cf09e347a5d..b4d83d9d1d0 100644 --- a/pkgs/applications/window-managers/fbpanel/4.12.nix +++ b/pkgs/applications/window-managers/fbpanel/4.12.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://garr.dl.sourceforge.net/sourceforge/fbpanel/fbpanel-4.12.tgz; diff --git a/pkgs/build-support/deb-package/default.nix b/pkgs/build-support/deb-package/default.nix index 78bdeb07d18..96b1a9aac45 100644 --- a/pkgs/build-support/deb-package/default.nix +++ b/pkgs/build-support/deb-package/default.nix @@ -1,10 +1,10 @@ args : with args; let - localDefs = with (builderDefs.meta.function {src="";}); + localDefs = with (builderDefs.passthru.function {src="";}); let checkFlag = flag : lib.getAttr [flag] false args; in - builderDefs.meta.function ({ + builderDefs.passthru.function ({ inherit src; inherit checkFlag; buildInputs = []; diff --git a/pkgs/build-support/fetchsvn/nix-prefetch-svn b/pkgs/build-support/fetchsvn/nix-prefetch-svn index f7a0ccc7b7b..e3a4cfc8aca 100755 --- a/pkgs/build-support/fetchsvn/nix-prefetch-svn +++ b/pkgs/build-support/fetchsvn/nix-prefetch-svn @@ -39,8 +39,7 @@ if test -z "$finalPath"; then trap "rm -rf $tmpPath" EXIT # Perform the checkout. - # !!! remove 2>/dev/null when we have fixed the certificate hackery. - echo p | svn export -r "$rev" "$url" $tmpFile 2>/dev/null >&2 + echo p | svn export --quiet -r "$rev" "$url" $tmpFile >&2 # Compute the hash. hash=$(nix-hash --type $hashType $hashFormat $tmpFile) diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index 2276bfc1de3..bbdf5fb7b4e 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -85,7 +85,7 @@ for url in $urls; do echo "warning: unknown mirror:// site \`$site'" else # Assume that SourceForge/GNU/kernel mirrors have better - # bandwidth than nix.cs.uu.nl. + # bandwidth than nixos.org. preferHashedMirrors= mirrors=${!varName} diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index ee3800f6d9b..00b7f3cc079 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation { urls = urls_; # If set, prefer the content-addressable mirrors - # (http://nix.cs.uu.nl/dist/tarballs) over the original URLs. + # (http://nixos.org/tarballs) over the original URLs. preferHashedMirrors = true; # Compatibility with Nix <= 0.7. diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 80916909771..fdf73d8db64 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -10,7 +10,6 @@ rec { # SourceForge. sourceforge = [ - http://prdownloads.sourceforge.net/ http://heanet.dl.sourceforge.net/sourceforge/ http://surfnet.dl.sourceforge.net/sourceforge/ http://dfn.dl.sourceforge.net/sourceforge/ @@ -18,6 +17,7 @@ rec { http://ovh.dl.sourceforge.net/sourceforge/ http://osdn.dl.sourceforge.net/sourceforge/ http://kent.dl.sourceforge.net/sourceforge/ + http://prdownloads.sourceforge.net/ ]; sf = sourceforge; @@ -163,6 +163,9 @@ rec { # Debian. debian = [ ftp://ftp.de.debian.org/debian/ + ftp://ftp.es.debian.org/debian/ + ftp://ftp.fr.debian.org/debian/ + ftp://ftp.it.debian.org/debian/ ftp://ftp.nl.debian.org/debian/ ftp://ftp.ru.debian.org/debian/ ftp://ftp.debian.org/debian/ diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix new file mode 100644 index 00000000000..fad216fb1c2 --- /dev/null +++ b/pkgs/build-support/release/debian-build.nix @@ -0,0 +1,78 @@ +# This function compiles a source tarball in a virtual machine image +# that contains a Debian-like (i.e. dpkg-based) OS. + +{vmTools, fetchurl}: args: with args; + +vmTools.runInLinuxImage (stdenv.mkDerivation ( + + { + name = "debian-build"; + + doCheck = true; + + prefix = "/usr"; + + phases = "installExtraDebsPhase sysInfoPhase unpackPhase patchPhase configurePhase buildPhase checkPhase installPhase distPhase"; + } + + // args // + + { + src = src.path; + + # !!! cut&paste from rpm-build.nix + postHook = '' + ensureDir $out/nix-support + cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name + + # If `src' is the result of a call to `makeSourceTarball', then it + # has a subdirectory containing the actual tarball(s). If there are + # multiple tarballs, just pick the first one. + echo $src + if test -d $src/tarballs; then + src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz | sort | head -1) + fi + ''; # */ + + extraDebs = [ + (fetchurl { + url = http://checkinstall.izto.org/files/deb/checkinstall_1.6.1-1_i386.deb; + sha256 = "0c9wwk1m0w677gr37zd4lhvkskkcrwa0bk7csh7b3qy94pnab618"; + }) + ]; + + installExtraDebsPhase = '' + for i in $extraDebs; do + dpkg --install $i + done + ''; + + sysInfoPhase = '' + echo "System/kernel: $(uname -a)" + if test -e /etc/debian_version; then echo "Debian release: $(cat /etc/debian_version)"; fi + header "installed Debian packages" + dpkg-query --list + stopNest + ''; + + installCommand = '' + /usr/local/sbin/checkinstall -y -D make install + + ensureDir $out/debs + find . -name "*.deb" -exec cp {} $out/debs \; + + shopt -s nullglob + for i in $out/debs/*.deb; do + header "Generated DEB package: $i" + dpkg-deb --info $i + echo "file deb $i" >> $out/nix-support/hydra-build-products + stopNest + done + ''; # */ + + meta = (if args ? meta then args.meta else {}) // { + description = "Build of a Deb package on ${args.diskImage.fullName} (${args.diskImage.name})"; + }; + } + +)) diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix new file mode 100644 index 00000000000..e3ea97876f4 --- /dev/null +++ b/pkgs/build-support/release/default.nix @@ -0,0 +1,27 @@ +{pkgs}: + +with pkgs; + +rec { + + makeSourceTarball = args: import ./make-source-tarball.nix ( + { inherit autoconf automake libtool; + stdenv = stdenvNew; + } // args); + + nixBuild = args: import ./nix-build.nix ( + { inherit stdenv; + } // args); + + coverageAnalysis = args: nixBuild ( + { inherit lcov; + doCoverageAnalysis = true; + } // args); + + rpmBuild = args: import ./rpm-build.nix vmTools args; + + debBuild = args: import ./debian-build.nix {inherit vmTools fetchurl;} ( + { inherit stdenv; + } // args); + +} diff --git a/pkgs/build-support/release/make-source-tarball.nix b/pkgs/build-support/release/make-source-tarball.nix new file mode 100644 index 00000000000..806246db794 --- /dev/null +++ b/pkgs/build-support/release/make-source-tarball.nix @@ -0,0 +1,107 @@ +# This function converts an un-Autoconfed source tarball (typically a +# checkout from a Subversion or CVS repository) into a source tarball +# by running `autoreconf', `configure' and `make dist'. + +{ officialRelease ? false +, buildInputs ? [] +, src, stdenv, autoconf, automake, libtool +, ... } @ args: + +let + + versionSuffix = + if officialRelease + then "" + else if src ? rev then "pre${toString src.rev}" else ""; + +in + +stdenv.mkDerivation ( + + # First, attributes that can be overriden by the caller (via args): + { + name = "source-tarball"; + + # By default, only configure and build a source distribution. + # Some packages can only build a distribution after a general + # `make' (or even `make install'). + dontBuild = true; + dontInstall = true; + doDist = true; + + # If we do install, install to a dummy location. + useTempPrefix = true; + + showBuildStats = true; + + preConfigurePhases = "autoconfPhase"; + postPhases = "finalPhase"; + } + + # Then, the caller-supplied attributes. + // args // + + # And finally, our own stuff. + { + src = src.path; + + buildInputs = buildInputs ++ [autoconf automake libtool]; + + postHook = '' + ensureDir $out/nix-support + ''; + + postUnpack = '' + # Set all source files to the current date. This is because Nix + # resets the timestamp on all files to 0 (1/1/1970), which some + # people don't like (in particular GNU tar prints harmless but + # frightening warnings about it). + touch now + touch -d "1970-01-01 00:00:00 UTC" then + find $sourceRoot ! -newer then -print0 | xargs -0r touch --reference now + eval "$nextPostUnpack" + ''; + + nextPostUnpack = if args ? postUnpack then args.postUnpack else ""; + + # Autoconfiscate the sources. + autoconfPhase = '' + export VERSION_SUFFIX=${versionSuffix} + + eval "$preAutoconf" + + if test -f ./bootstrap; then ./bootstrap + elif test -f ./bootstrap.sh; then ./bootstrap.sh + elif test -f ./reconf; then ./reconf + elif test -f ./configure.in || test -f ./configure.ac; then + autoreconf --install --force --verbose + else + echo "No bootstrap, bootstrap.sh, configure.in or configure.ac. Assuming this is not an GNU Autotools package." + fi + + eval "$postAutoconf" + ''; + + # Cause distPhase to copy tar.bz2 in addition to tar.gz. + tarballs = "*.tar.gz *.tar.bz2"; + + finalPhase = '' + shopt -s nullglob + for i in $out/tarballs/*; do + echo "file source-dist $i" >> $out/nix-support/hydra-build-products + done + + # Try to figure out the release name. + releaseName=$( (cd $out/tarballs && ls) | head -n 1 | sed -e 's^\.[a-z].*^^') + test -n "$releaseName" && (echo "$releaseName" >> $out/nix-support/hydra-release-name) + ''; # */ + + passthru = {inherit src;}; + + meta = (if args ? meta then args.meta else {}) // { + description = "Build of a source distribution from a checkout"; + }; + + } + +) diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix new file mode 100644 index 00000000000..5f127265d4a --- /dev/null +++ b/pkgs/build-support/release/nix-build.nix @@ -0,0 +1,95 @@ +# This function builds and tests an Autoconf-style source tarball. +# The result can be installed normally in an environment (e.g., after +# making it available through a channel). If `doCoverageAnalysis' is +# true, it does an ordinary build from a source tarball, except that +# it turns on GCC's coverage analysis feature. It then runs `make +# check' and produces a coverage analysis report using `lcov'. + +{ doCoverageAnalysis ? false +, lcovFilter ? [] +, src, stdenv +, ... } @ args: + +stdenv.mkDerivation ( + + { + name = "nix-build"; + + # Also run a `make check'. + doCheck = true; + + # When doing coverage analysis, we don't care about the result. + dontInstall = doCoverageAnalysis; + + showBuildStats = true; + + # Hack - swap checkPhase and installPhase (otherwise Stratego barfs). + phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase ${if doCoverageAnalysis then "coverageReportPhase" else ""}"; + } + + // args // + + { + src = src.path; + + postHook = '' + ensureDir $out/nix-support + echo "$system" > $out/nix-support/system + + if test -z "${toString doCoverageAnalysis}"; then + echo "nix-build none $out" >> $out/nix-support/hydra-build-products + fi + + # If `src' is the result of a call to `makeSourceTarball', then it + # has a subdirectory containing the actual tarball(s). If there are + # multiple tarballs, just pick the first one. + echo $src + if test -d $src/tarballs; then + src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz | sort | head -1) + fi + + # Hack to compress log files. Prevents (by pointer hiding!) + # unnecessary dependencies. + startLogWrite() { + # Use process substitution to send the FIFO output to both + # stdout and bzip2. + bash -c "tee >(bzip2 > \"$1\".bz2) < \"$2\"" & + logWriterPid=$! + } + + # Set GCC flags for coverage analysis, if desired. + if test -n "${toString doCoverageAnalysis}"; then + export NIX_CFLAGS_COMPILE="-O0 -fprofile-arcs -ftest-coverage $NIX_CFLAGS_COMPILE" + export CFLAGS="-O0" + export CXXFLAGS="-O0" + fi + + ''; # */ + + + # In the report phase, create a coverage analysis report. + coverageReportPhase = if doCoverageAnalysis then '' + ${args.lcov}/bin/lcov --directory . --capture --output-file app.info + set -o noglob + ${args.lcov}/bin/lcov --remove app.info $lcovFilter > app2.info + set +o noglob + mv app2.info app.info + mkdir $out/coverage + ${args.lcov}/bin/genhtml app.info -o $out/coverage > log + + # Grab the overall coverage percentage for use in release overviews. + grep "Overall coverage rate" log | sed 's/^.*(\(.*\)%).*$/\1/' > $out/nix-support/coverage-rate + + echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products + '' else ""; + + + lcovFilter = ["/nix/store/*"] ++ lcovFilter; + + + 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/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix new file mode 100644 index 00000000000..88273b5958c --- /dev/null +++ b/pkgs/build-support/release/rpm-build.nix @@ -0,0 +1,41 @@ +# This function builds an RPM from a source tarball that contains a +# RPM spec file (i.e., one that can be built using `rpmbuild -ta'). + +vmTools: args: with args; + +vmTools.buildRPM ( + + { + name = "rpm-build"; + } + + // args // + + { + src = src.path; + + preBuild = '' + ensureDir $out/nix-support + cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name + + # If `src' is the result of a call to `makeSourceTarball', then it + # has a subdirectory containing the actual tarball(s). If there are + # multiple tarballs, just pick the first one. + if test -d $src/tarballs; then + src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz | sort | head -1) + fi + ''; # */ + + postInstall = '' + shopt -s nullglob + for i in $out/rpms/*/*.rpm; do + echo "file rpm $i" >> $out/nix-support/hydra-build-products + done + ''; # */ + + meta = (if args ? meta then args.meta else {}) // { + description = "Build of an RPM package on ${args.diskImage.fullName} (${args.diskImage.name})"; + }; + } + +) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 92895018689..33de9804237 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -233,6 +233,15 @@ rec { ''; + modifyDerivation = f: attrs: + let attrsCleaned = removeAttrs attrs ["meta" "passthru" "outPath" "drvPath"]; + newDrv = derivation (attrsCleaned // (f attrs)); + in newDrv // + { meta = if attrs ? meta then attrs.meta else {}; + passthru = if attrs ? passthru then attrs.passthru else {}; + }; + + /* Run a derivation in a Linux virtual machine (using Qemu/KVM). By default, there is no disk image; the root filesystem is a tmpfs, and /nix/store is shared with the host (via the CIFS protocol to @@ -254,7 +263,7 @@ rec { `run-vm' will be left behind in the temporary build directory that allows you to boot into the VM and debug it interactively. */ - runInLinuxVM = attrs: derivation (removeAttrs attrs ["meta" "passthru" "outPath" "drvPath"] // { + runInLinuxVM = modifyDerivation (attrs: { builder = "${bash}/bin/sh"; args = ["-e" (vmRunCommand qemuCommandLinux)]; origArgs = attrs.args; @@ -289,7 +298,7 @@ rec { - Reboot to shutdown the machine (because Qemu doesn't seem capable of a APM/ACPI VM shutdown). */ - runInGenericVM = attrs: derivation (removeAttrs attrs ["meta" "passthru" "outPath" "drvPath"] // { + runInGenericVM = modifyDerivation (attrs: { system = "i686-linux"; builder = "${bash}/bin/sh"; args = ["-e" (vmRunCommand qemuCommandGeneric)]; @@ -391,6 +400,8 @@ rec { ${klibcShrunk}/bin/umount /mnt/nix/store ${klibcShrunk}/bin/umount /mnt ''; + + passthru = {inherit fullName;}; }); @@ -450,20 +461,32 @@ rec { srcName="$strippedName" cp "$src" "$srcName" # `ln' doesn't work always work: RPM requires that the file is owned by root - rpmbuild -vv -ta "$srcName" || fail + export HOME=/tmp/home + mkdir $HOME + + rpmout=/tmp/rpmout + mkdir $rpmout $rpmout/SPECS $rpmout/BUILD $rpmout/RPMS $rpmout/SRPMS + + echo "%_topdir $rpmout" >> $HOME/.rpmmacros + + rpmbuild -vv -ta "$srcName" eval "$postBuild" ''; installPhase = '' + eval "$preInstall" + ensureDir $out/$outDir - find /usr/src -name "*.rpm" -exec cp {} $out/$outDir \; + find $rpmout -name "*.rpm" -exec cp {} $out/$outDir \; for i in $out/$outDir/*.rpm; do header "Generated RPM/SRPM: $i" rpm -qip $i stopNest done + + eval "$postInstall" ''; # */ } // attrs)); @@ -486,7 +509,6 @@ rec { buildCommand = '' ${createRootFS} - echo "initialising Debian DB..." PATH=$PATH:${dpkg}/bin:${dpkg}/sbin:${glibc}/sbin # Unpack the .debs. We do this to prevent pre-install scripts @@ -507,6 +529,7 @@ rec { ${klibcShrunk}/bin/mount -o bind /dev /mnt/dev # Misc. files/directories assumed by various packages. + echo "initialising Dpkg DB..." touch /mnt/etc/shells touch /mnt/var/lib/dpkg/status touch /mnt/var/lib/dpkg/available @@ -543,6 +566,8 @@ rec { ${klibcShrunk}/bin/umount /mnt/dev ${klibcShrunk}/bin/umount /mnt ''; + + passthru = {inherit fullName;}; }); @@ -600,12 +625,15 @@ rec { makeImageFromDebDist = {name, fullName, size ? 2048, urlPrefix, packagesList, packages, postInstall ? ""}: - fillDiskWithDebs { - inherit name fullName size postInstall; - debs = import (debClosureGenerator { + let + expr = debClosureGenerator { inherit name packagesList urlPrefix packages; - }) {inherit fetchurl;}; - }; + }; + in + (fillDiskWithDebs { + inherit name fullName size postInstall; + debs = import expr {inherit fetchurl;}; + }) // {inherit expr;}; /* A bunch of functions that build disk images of various Linux @@ -688,6 +716,27 @@ rec { archs = ["noarch" "x86_64"]; } // args); + fedora10i386 = args: makeImageFromRPMDist ({ + name = "fedora-10-i386"; + fullName = "Fedora 10 (i386)"; + packagesList = fetchurl { + url = mirror://fedora/linux/releases/10/Fedora/i386/os/repodata/primary.xml.gz; + sha256 = "15ha8pxzvlch707mpy06c7pkr2ra2vpd5b8x30qhydvx8fgcqcx9"; + }; + urlPrefix = mirror://fedora/linux/releases/10/Fedora/i386/os; + } // args); + + fedora10x86_64 = args: makeImageFromRPMDist ({ + name = "fedora-10-x86_64"; + fullName = "Fedora 10 (x86_64)"; + packagesList = fetchurl { + url = mirror://fedora/linux/releases/10/Fedora/x86_64/os/repodata/primary.xml.gz; + sha256 = "1pmaav6mdaw13fq99wfggbsmhcix306cimijjxh35qi7yc3wbsz4"; + }; + urlPrefix = mirror://fedora/linux/releases/10/Fedora/x86_64/os; + archs = ["noarch" "x86_64"]; + } // args); + opensuse103i386 = args: makeImageFromRPMDist ({ name = "opensuse-10.3-i586"; fullName = "openSUSE 10.3 (i586)"; @@ -701,7 +750,7 @@ rec { # Interestingly, the SHA-256 hashes provided by Ubuntu in # http://nl.archive.ubuntu.com/ubuntu/dists/{gutsy,hardy}/Release are - # wrong, but the SHA-1 and MD5 hashes are correct. + # wrong, but the SHA-1 and MD5 hashes are correct. Intrepid is fine. ubuntu710i386 = args: makeImageFromDebDist ({ name = "ubuntu-7.10-gutsy-i386"; @@ -733,22 +782,42 @@ rec { urlPrefix = mirror://ubuntu; } // args); + ubuntu810i386 = args: makeImageFromDebDist ({ + name = "ubuntu-8.10-intrepid-i386"; + fullName = "Ubuntu 8.10 Intrepid (i386)"; + packagesList = fetchurl { + url = mirror://ubuntu/dists/intrepid/main/binary-i386/Packages.bz2; + sha256 = "70483d40a9e9b74598f2faede7df5d5103ee60055af7374f8db5c7e6017c4cf6"; + }; + urlPrefix = mirror://ubuntu; + } // args); + + ubuntu810x86_64 = args: makeImageFromDebDist ({ + name = "ubuntu-8.10-intrepid-amd64"; + fullName = "Ubuntu 8.10 Intrepid (amd64)"; + packagesList = fetchurl { + url = mirror://ubuntu/dists/intrepid/main/binary-amd64/Packages.bz2; + sha1 = "01b2f3842cbdd5834446ddf91691bcf60f59a726dcefa23fb5b93fdc8ea7e27f"; + }; + urlPrefix = mirror://ubuntu; + } // args); + debian40i386 = args: makeImageFromDebDist ({ - name = "debian-4.0r4a-etch-i386"; - fullName = "Debian 4.0r4a Etch (i386)"; + name = "debian-4.0r5-etch-i386"; + fullName = "Debian 4.0r5 Etch (i386)"; packagesList = fetchurl { url = mirror://debian/dists/etch/main/binary-i386/Packages.bz2; - sha256 = "ce963cc348f89ca50f65a8e32aa518c590e213c26c9ead48b0899f01f4456a4a"; + sha256 = "37a5c17fd8d62b1d9a0264a702025a4381c1a8751e2550d101957d8fa724a6f4"; }; urlPrefix = mirror://debian; } // args); debian40x86_64 = args: makeImageFromDebDist ({ - name = "debian-4.0r4a-etch-amd64"; - fullName = "Debian 4.0r4a Etch (amd64)"; + name = "debian-4.0r5-etch-amd64"; + fullName = "Debian 4.0r5 Etch (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/etch/main/binary-amd64/Packages.bz2; - sha256 = "3403ebca73baeb68092e32d2c61a14eec4497702ef7281a7c1485abeb3d263f6"; + sha256 = "244dc892f89f2f73ce8372cdf1f1d450b00c0e95196927ef7f99715f0d119d5b"; }; urlPrefix = mirror://debian; } // args); @@ -822,6 +891,11 @@ rec { "curl" "patch" "diff" + "locales" + # Needed by checkinstall: + "util-linux" + "file" + "dpkg-dev" ]; @@ -863,11 +937,15 @@ rec { fedora8i386 = diskImageFuns.fedora8i386 { packages = commonFedoraPackages; }; fedora9i386 = diskImageFuns.fedora9i386 { packages = commonFedoraPackages; }; fedora9x86_64 = diskImageFuns.fedora9x86_64 { packages = commonFedoraPackages; }; + fedora10i386 = diskImageFuns.fedora10i386 { packages = commonFedoraPackages; }; + fedora10x86_64 = diskImageFuns.fedora10x86_64 { packages = commonFedoraPackages; }; opensuse103i386 = diskImageFuns.opensuse103i386 { packages = commonOpenSUSEPackages; }; ubuntu710i386 = diskImageFuns.ubuntu710i386 { packages = commonDebianPackages; }; ubuntu804i386 = diskImageFuns.ubuntu804i386 { packages = commonDebianPackages; }; ubuntu804x86_64 = diskImageFuns.ubuntu804x86_64 { packages = commonDebianPackages; }; + ubuntu810i386 = diskImageFuns.ubuntu810i386 { packages = commonDebianPackages; }; + ubuntu810x86_64 = diskImageFuns.ubuntu810x86_64 { packages = commonDebianPackages; }; debian40i386 = diskImageFuns.debian40i386 { packages = commonDebianPackages; }; debian40x86_64 = diskImageFuns.debian40x86_64 { packages = commonDebianPackages; }; diff --git a/pkgs/build-support/vm/rpm/rpm-closure.pl b/pkgs/build-support/vm/rpm/rpm-closure.pl index a29745d9283..c3e8d52a4c6 100644 --- a/pkgs/build-support/vm/rpm/rpm-closure.pl +++ b/pkgs/build-support/vm/rpm/rpm-closure.pl @@ -69,7 +69,7 @@ sub closePackage { my $pkg = $pkgs{$pkgName} or die "package $pkgName doesn't exist"; - my $requires = $pkg->{format}->{'rpm:requires'}->{'rpm:entry'} or die; + my $requires = $pkg->{format}->{'rpm:requires'}->{'rpm:entry'} || []; my @deps = (); foreach my $req (@{$requires}) { diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix index 2dce01195b7..064fabdd500 100644 --- a/pkgs/build-support/vm/test.nix +++ b/pkgs/build-support/vm/test.nix @@ -14,17 +14,17 @@ rec { buildPatchelfRPM = buildRPM { name = "patchelf-rpm"; src = patchelf.src; - diskImage = diskImages.fedora5i386; + diskImage = diskImages.fedora8i386; }; - testUbuntuImage = makeImageTestScript diskImages.ubuntu710i386; + testUbuntuImage = makeImageTestScript diskImages.ubuntu810i386; buildInDebian = runInLinuxImage (stdenv.mkDerivation { name = "deb-compile"; src = nixUnstable.src; - diskImage = diskImages.debian40r3i386; + diskImage = diskImages.ubuntu810i386; memSize = 512; phases = "sysInfoPhase unpackPhase patchPhase configurePhase buildPhase checkPhase installPhase fixupPhase distPhase"; sysInfoPhase = '' diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 8ed4ec69e70..7bab7354372 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "man-pages-3.05"; +stdenv.mkDerivation rec { + name = "man-pages-3.11"; src = fetchurl { - url = mirror://kernel/linux/docs/man-pages/man-pages-3.05.tar.bz2; - sha256 = "08c48w41qjmv37g0fqcr1ky2y2mfnxqn55jxay079qrj5vxraink"; + url = "mirror://kernel/linux/docs/man-pages/${name}.tar.bz2"; + sha256 = "1pl3jdp7vh6vl2drqdal3ggdc22icdgfkfbswh21k8jlcxf00dn8"; }; preBuild = " @@ -14,6 +14,6 @@ stdenv.mkDerivation { meta = { description = "Linux development manual pages"; - homepage = ftp://ftp.win.tue.nl/pub/linux-local/manpages/; + homepage = http://kernel.org/pub/linux/docs/manpages/; }; } diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/data/fonts/bakoma-ttf/default.nix index b913cc132f4..c7f1ad38f47 100644 --- a/pkgs/data/fonts/bakoma-ttf/default.nix +++ b/pkgs/data/fonts/bakoma-ttf/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "bakoma-ttf"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/bakoma-ttf.tar.bz2; + url = http://nixos.org/tarballs/bakoma-ttf.tar.bz2; sha256 = "1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km"; }; diff --git a/pkgs/data/fonts/clearlyU/1.9.nix b/pkgs/data/fonts/clearlyU/1.9.nix index e447dd3e065..db5709bf035 100644 --- a/pkgs/data/fonts/clearlyU/1.9.nix +++ b/pkgs/data/fonts/clearlyU/1.9.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function (rec { + let localDefs = builderDefs.passthru.function (rec { src = /* put a fetchurl here */ fetchurl { url = http://crl.nmsu.edu/~mleisher/cu/cu12-1.9.tar.gz; diff --git a/pkgs/data/fonts/fontWrap/default.nix b/pkgs/data/fonts/fontWrap/default.nix index 875c65108ce..2c749ea609e 100644 --- a/pkgs/data/fonts/fontWrap/default.nix +++ b/pkgs/data/fonts/fontWrap/default.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src =""; /* put a fetchurl here */ buildInputs = [mkfontdir mkfontscale ttmkfdir]; configureFlags = []; diff --git a/pkgs/data/fonts/junicode/0.6.15.nix b/pkgs/data/fonts/junicode/0.6.15.nix index f6fcc1917b3..601b6671e95 100644 --- a/pkgs/data/fonts/junicode/0.6.15.nix +++ b/pkgs/data/fonts/junicode/0.6.15.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function (rec { + let localDefs = builderDefs.passthru.function (rec { src = /* put a fetchurl here */ fetchurl { url = http://prdownloads.sourceforge.net/junicode/junicode-0.6.15.zip; 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 15a7edd6535..da520e96832 100644 --- a/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix +++ b/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function (rec { + let localDefs = builderDefs.passthru.function (rec { src = /* put a fetchurl here */ fetchurl { url = http://prdownloads.sourceforge.net/wqy/wqy-zenhei-0.4.23-1.tar.gz; diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 942835593b7..6af4fd032d8 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -155,6 +155,7 @@ rec { gnomeicontheme = import ./gnome-icon-theme.nix { inherit fetchurl stdenv pkgconfig perl perlXMLParser iconnamingutils gettext; + inherit (args) intltool; input = desktop.gnomeicontheme; }; @@ -295,6 +296,11 @@ rec { inherit (xlibs) libXmu; input = desktop.gnomeutils; }; + + gtkdoc = import ./gtkdoc.nix { + inherit (platform) gtkdoc; + inherit stdenv args; + }; }; diff --git a/pkgs/desktops/gnome/gnome-icon-theme.nix b/pkgs/desktops/gnome/gnome-icon-theme.nix index 6ee8995305d..fbfe154401e 100644 --- a/pkgs/desktops/gnome/gnome-icon-theme.nix +++ b/pkgs/desktops/gnome/gnome-icon-theme.nix @@ -1,11 +1,12 @@ { input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser -, iconnamingutils, gettext +, iconnamingutils, gettext, intltool }: stdenv.mkDerivation { inherit (input) name src; - buildInputs = [pkgconfig perl perlXMLParser iconnamingutils gettext]; + buildInputs = [intltool pkgconfig perl perlXMLParser iconnamingutils gettext ]; + # the ln line can be removed because pkgconfig adds both locations postInstall = " ensureDir $out/lib ln -s $out/share/pkgconfig $out/lib/pkgconfig # WTF? diff --git a/pkgs/desktops/gnome/gtkdoc.nix b/pkgs/desktops/gnome/gtkdoc.nix new file mode 100644 index 00000000000..f65c908b6d9 --- /dev/null +++ b/pkgs/desktops/gnome/gtkdoc.nix @@ -0,0 +1,26 @@ +{ stdenv, gtkdoc, args }: with args; + +stdenv.mkDerivation { + inherit (gtkdoc) name src; + + inherit docbook_xml_dtd_412; + buildInputs = [ perl + libxml2 + xmlto docbook2x docbook_xsl docbook_xml_dtd_412 libxslt ]; + + + # 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" + ''; +} diff --git a/pkgs/desktops/gnome/src-gnome-desktop-2.22.1.nix b/pkgs/desktops/gnome/src-gnome-desktop-2.22.1.nix index d1308fc1ee5..866882569c3 100644 --- a/pkgs/desktops/gnome/src-gnome-desktop-2.22.1.nix +++ b/pkgs/desktops/gnome/src-gnome-desktop-2.22.1.nix @@ -193,9 +193,13 @@ gnomeicontheme = { name = "gnome-icon-theme-2.22.0"; src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-icon-theme-2.22.0.tar.bz2; - md5 = "a4c03092da28ad53ed3867aef83f29d9"; + url = http://ftp.gnome.org/pub/GNOME/desktop/2.25/2.25.1/sources/gnome-icon-theme-2.24.0.tar.bz2; + sha256 = "1ciid3p21n5m2ixdc7b6sqjvw68pzg1adxljrcy7snnnxbwqj7xp"; }; + #src = fetchurl { + # url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-icon-theme-2.22.0.tar.bz2; + # md5 = "a4c03092da28ad53ed3867aef83f29d9"; + #}; }; gnomekeyring = { name = "gnome-keyring-2.22.1"; diff --git a/pkgs/desktops/kde-4/base/default.nix b/pkgs/desktops/kde-4/base/default.nix index 451dd4863c3..ea4ee603c02 100644 --- a/pkgs/desktops/kde-4/base/default.nix +++ b/pkgs/desktops/kde-4/base/default.nix @@ -3,9 +3,9 @@ args: with args; stdenv.mkDerivation { name = "kdebase-4.0.0"; #builder = ./builder.sh; - + src = fetchurl { - url = http://download.kde.org/stable/4.0.0/src/kdebase-4.0.0.tar.bz2; + url = mirror://kde/stable/4.0.0/src/kdebase-4.0.0.tar.bz2; md5 = "01d8f2f16cbd4e225efc996b0dd39769"; }; diff --git a/pkgs/desktops/kde-4/edu/default.nix b/pkgs/desktops/kde-4/edu/default.nix index 0cf140a5de9..4ee00d76527 100644 --- a/pkgs/desktops/kde-4/edu/default.nix +++ b/pkgs/desktops/kde-4/edu/default.nix @@ -2,15 +2,20 @@ args: with args; stdenv.mkDerivation rec { name = "kdeedu-4.0.0"; - + src = fetchurl { - url = http://download.kde.org/stable/4.0.0/src/kdeedu-4.0.0.tar.bz2; + url = mirror://kde/stable/4.0.0/src/kdeedu-4.0.0.tar.bz2; md5 = "73924e158e4a2de2107be441c808251f"; }; buildInputs = [kdelibs kdepimlibs kdeworkspace boost readline openbabel ocaml libusb facile python]; + + # !!! shouldn't include directories, since that can lead to inconsistent hashing + # between different machines/users due to .svn directories. Either use filterSource + # or include the files separately. myCmakeFiles = ./myCmakeFiles; + patchPhase = " cp ${myCmakeFiles}/* ../cmake/modules sed -e 's@+facile@\${LIBFACILE_INCLUDE_DIR}@' -i \\ diff --git a/pkgs/desktops/kde-4/games/default.nix b/pkgs/desktops/kde-4/games/default.nix index 8f3b6c0ec48..4c3c1c115f0 100644 --- a/pkgs/desktops/kde-4/games/default.nix +++ b/pkgs/desktops/kde-4/games/default.nix @@ -2,9 +2,9 @@ args: with args; stdenv.mkDerivation { name = "kdegames-4.0.0"; - + src = fetchurl { - url = http://download.kde.org/stable/4.0.0/src/kdegames-4.0.0.tar.bz2; + url = mirror://kde/stable/4.0.0/src/kdegames-4.0.0.tar.bz2; md5 = "6264c0034f6389a2807a4e1723ba1c81"; }; diff --git a/pkgs/desktops/kde-4/graphics/default.nix b/pkgs/desktops/kde-4/graphics/default.nix index 6ab84fd8eff..e67551fddb7 100644 --- a/pkgs/desktops/kde-4/graphics/default.nix +++ b/pkgs/desktops/kde-4/graphics/default.nix @@ -2,9 +2,9 @@ args: with args; stdenv.mkDerivation { name = "kdegraphics-4.0.0"; - + src = fetchurl { - url = http://download.kde.org/stable/4.0.0/src/kdegraphics-4.0.0.tar.bz2; + url = mirror://kde/stable/4.0.0/src/kdegraphics-4.0.0.tar.bz2; md5 = "6cad7b165d99c43d1a19a0350598821c"; }; diff --git a/pkgs/desktops/kde-4/libs/default.nix b/pkgs/desktops/kde-4/libs/default.nix index 91f722ec658..d0995429afe 100644 --- a/pkgs/desktops/kde-4/libs/default.nix +++ b/pkgs/desktops/kde-4/libs/default.nix @@ -2,9 +2,9 @@ args: with args; stdenv.mkDerivation rec { name = "kdelibs-4.0.0"; - + src = fetchurl { - url = http://download.kde.org/stable/4.0.0/src/kdelibs-4.0.0.tar.bz2; + url = mirror://kde/stable/4.0.0/src/kdelibs-4.0.0.tar.bz2; md5 = "79d0f83ca81fc4a135663943340c0b8f"; }; diff --git a/pkgs/desktops/kde-4/multimedia/default.nix b/pkgs/desktops/kde-4/multimedia/default.nix index f1f7994ce1a..c23439b5fc0 100644 --- a/pkgs/desktops/kde-4/multimedia/default.nix +++ b/pkgs/desktops/kde-4/multimedia/default.nix @@ -2,9 +2,9 @@ args: with args; stdenv.mkDerivation { name = "kdemultimedia-4.0.0"; - + src = fetchurl { - url = http://download.kde.org/stable/4.0.0/src/kdemultimedia-4.0.0.tar.bz2; + url = mirror://kde/stable/4.0.0/src/kdemultimedia-4.0.0.tar.bz2; md5 = "0bf1cd18a23017a37324d9f8c4902e19"; }; diff --git a/pkgs/desktops/kde-4/network/default.nix b/pkgs/desktops/kde-4/network/default.nix index f99f2184bca..f006c4c5921 100644 --- a/pkgs/desktops/kde-4/network/default.nix +++ b/pkgs/desktops/kde-4/network/default.nix @@ -2,9 +2,9 @@ args: with args; stdenv.mkDerivation { name = "kdenetwork-4.0.0"; - + src = fetchurl { - url = http://download.kde.org/stable/4.0.0/src/kdenetwork-4.0.0.tar.bz2; + url = mirror://kde/stable/4.0.0/src/kdenetwork-4.0.0.tar.bz2; md5 = "f362bd34b589800845abfb99589d4cfc"; }; diff --git a/pkgs/desktops/kde-4/pimlibs/default.nix b/pkgs/desktops/kde-4/pimlibs/default.nix index 30c6ca6250b..6a61374a774 100644 --- a/pkgs/desktops/kde-4/pimlibs/default.nix +++ b/pkgs/desktops/kde-4/pimlibs/default.nix @@ -2,9 +2,9 @@ args: with args; stdenv.mkDerivation { name = "kdepimlibs-4.0.0"; - + src = fetchurl { - url = http://download.kde.org/stable/4.0.0/src/kdepimlibs-4.0.0.tar.bz2; + url = mirror://kde/stable/4.0.0/src/kdepimlibs-4.0.0.tar.bz2; md5 = "1a68662230fcd4ec8cea90bb780f920e"; }; diff --git a/pkgs/desktops/kde-4/runtime/default.nix b/pkgs/desktops/kde-4/runtime/default.nix index 7b9d16bdc45..8e31bce32fd 100644 --- a/pkgs/desktops/kde-4/runtime/default.nix +++ b/pkgs/desktops/kde-4/runtime/default.nix @@ -3,9 +3,9 @@ args: with args; stdenv.mkDerivation { name = "kdebase-runtime-4.0.0"; builder = ./builder.sh; - + src = fetchurl { - url = http://download.kde.org/stable/4.0.0/src/kdebase-runtime-4.0.0.tar.bz2; + url = mirror://kde/stable/4.0.0/src/kdebase-runtime-4.0.0.tar.bz2; md5 = "da93f59497ff90ad01bd4ab9b458f6cb"; }; diff --git a/pkgs/desktops/kde-4/toys/default.nix b/pkgs/desktops/kde-4/toys/default.nix index 39933f0b131..b88afded411 100644 --- a/pkgs/desktops/kde-4/toys/default.nix +++ b/pkgs/desktops/kde-4/toys/default.nix @@ -2,9 +2,9 @@ args: with args; stdenv.mkDerivation { name = "kdetoys-4.0.0"; - + src = fetchurl { - url = http://download.kde.org/stable/4.0.0/src/kdetoys-4.0.0.tar.bz2; + url = mirror://kde/stable/4.0.0/src/kdetoys-4.0.0.tar.bz2; md5 = "6e4e2eea3d87718f48716f975b48ada2"; }; diff --git a/pkgs/desktops/kde-4/utils/default.nix b/pkgs/desktops/kde-4/utils/default.nix index 2b256a8e768..4372bac8758 100644 --- a/pkgs/desktops/kde-4/utils/default.nix +++ b/pkgs/desktops/kde-4/utils/default.nix @@ -2,9 +2,9 @@ args: with args; stdenv.mkDerivation { name = "kdeutils-4.0.0"; - + src = fetchurl { - url = http://download.kde.org/stable/4.0.0/src/kdeutils-4.0.0.tar.bz2; + url = mirror://kde/stable/4.0.0/src/kdeutils-4.0.0.tar.bz2; md5 = "5815625f215ff3be47a21074d2c047a0"; }; diff --git a/pkgs/desktops/kde-4/workspace/default.nix b/pkgs/desktops/kde-4/workspace/default.nix index 70d2b3eddc3..041cd897765 100644 --- a/pkgs/desktops/kde-4/workspace/default.nix +++ b/pkgs/desktops/kde-4/workspace/default.nix @@ -3,9 +3,9 @@ args: with args; stdenv.mkDerivation { name = "kdebase-workspace-4.0.0"; builder = ./builder.sh; - + src = fetchurl { - url = http://download.kde.org/stable/4.0.0/src/kdebase-workspace-4.0.0.tar.bz2; + url = mirror://kde/stable/4.0.0/src/kdebase-workspace-4.0.0.tar.bz2; md5 = "f3d2155ff5ff7472a8884bd3f31bff16"; }; diff --git a/pkgs/development/compilers/ghc-6.8/ghc-6.8.3.nix b/pkgs/development/compilers/ghc-6.8/ghc-6.8.3.nix index 60047acea1e..98ddca5b36d 100644 --- a/pkgs/development/compilers/ghc-6.8/ghc-6.8.3.nix +++ b/pkgs/development/compilers/ghc-6.8/ghc-6.8.3.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation (rec { homepage = "http://www.haskell.org/ghc"; src = map fetchurl [ - { url = "${homepage}/dist/stable/dist/${name}-src.tar.bz2"; + { url = "${homepage}/dist/6.8.3/${name}-src.tar.bz2"; sha256 = "1fc1ff82a555532f1c9d2dc628fd9de5e6ebab2ce6ee9490a34174ceb6f76e6b"; } - { url = "${homepage}/dist/stable/dist/${name}-src-extralibs.tar.bz2"; + { url = "${homepage}/dist/6.8.3/${name}-src-extralibs.tar.bz2"; sha256 = "ee2f5ba6a46157fc53eae515cb6fa1ed3c5023e7eac15981d92af0af00ee2ba2"; } ]; diff --git a/pkgs/development/compilers/ghc/boot.nix b/pkgs/development/compilers/ghc/boot.nix index 254a9fb855a..60664374b8e 100644 --- a/pkgs/development/compilers/ghc/boot.nix +++ b/pkgs/development/compilers/ghc/boot.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = if stdenv.system == "i686-linux" then fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/ghc-6.4.2-i386-unknown-linux.tar.bz2; + url = http://nixos.org/tarballs/ghc-6.4.2-i386-unknown-linux.tar.bz2; md5 = "092fe2e25dab22b926babe97cc77db1f"; } else if stdenv.system == "x86_64-linux" then @@ -47,11 +47,13 @@ stdenv.mkDerivation { ln -s ${readline}/lib/libreadline.dylib $out/frameworks/GNUreadline.framework/GNUreadline ln -s ${readline}/lib/libreadline.dylib $out/frameworks/GNUreadline.framework/Versions/A/GNUreadline - mv $out/bin $out/bin-orig - mkdir $out/bin - for i in $(cd $out/bin-orig && ls); do + mkdir $out/bin-orig + for i in $(cd $out/bin && ls *); do + mv $out/bin/$i $out/bin-orig/$i echo \"#! $SHELL -e\" >> $out/bin/$i - echo \"DYLD_FRAMEWORK_PATH=$out/frameworks exec $out/bin-orig/$i -framework-path $out/frameworks \\\"\\$@\\\"\" >> $out/bin/$i + extraFlag= + if test $i != ghc-pkg; then extraFlag=\"-framework-path $out/frameworks\"; fi + echo \"DYLD_FRAMEWORK_PATH=$out/frameworks exec $out/bin-orig/$i $extraFlag \\\"\\$@\\\"\" >> $out/bin/$i chmod +x $out/bin/$i done diff --git a/pkgs/development/compilers/ghc/boot610.nix b/pkgs/development/compilers/ghc/boot610.nix new file mode 100644 index 00000000000..679f2c94dd8 --- /dev/null +++ b/pkgs/development/compilers/ghc/boot610.nix @@ -0,0 +1,101 @@ +{stdenv, fetchurl, perl, editline, ncurses, gmp, makeWrapper}: + +stdenv.mkDerivation rec { + version = "6.10.1"; + + name = "ghc-${version}"; + + src = + if stdenv.system == "i686-linux" then + fetchurl { + # libedit .so.0 + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-unknown-linux.tar.bz2"; + sha256 = "18l0vwlf7y86s65klpdvz4ccp8kydvcmyh03c86hld8jvx16q7zz"; + } + else if stdenv.system == "x86_64-linux" then + fetchurl { + # libedit .so.0 + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2"; + sha256 = "14jvvn333i36wm7mmvi47jr93f5hxrw1h2dpjvqql0rp00svhzzg"; + } + else if stdenv.system == "i686-darwin" then + fetchurl { + # update + # untested + } + else throw "cannot bootstrap GHC on this platform"; + + buildInputs = [perl makeWrapper]; + + # On Linux, use patchelf to modify the executables so that they can + # find editline/gmp. + postUnpack = (if stdenv.isLinux then '' + find . -type f -perm +100 \ + -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath "${editline}/lib:${ncurses}/lib:${gmp}/lib" {} \; + for prog in strip ranlib; do + find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \; + done + '' else "") + + '' + mkdir "$TMP/bin" + for i in strip; do + echo '#!/bin/sh' >> "$TMP/bin/$i" + chmod +x "$TMP/bin/$i" + PATH="$TMP/bin:$PATH" + done + '' + + ; + + configurePhase = '' + ./configure --prefix=$out --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include + ''; + # Stripping combined with patchelf breaks the executables (they die + # with a segfault or the kernel even refuses the execve). (NIXPKGS-85) + dontStrip = true; + + # The binaries for Darwin use frameworks, so fake those frameworks, + # and create some wrapper scripts that set DYLD_FRAMEWORK_PATH so + # that the executables work with no special setup. + postInstall = (if stdenv.isDarwin then " + + ensureDir $out/frameworks/GMP.framework/Versions/A + ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP + ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/Versions/A/GMP + ensureDir $out/frameworks/GNUeditline.framework/Versions/A + ln -s ${editline}/lib/libeditline.dylib $out/frameworks/GNUeditline.framework/GNUeditline + ln -s ${editline}/lib/libeditline.dylib $out/frameworks/GNUeditline.framework/Versions/A/GNUeditline + + mv $out/bin $out/bin-orig + mkdir $out/bin + for i in $(cd $out/bin-orig && ls); do + echo \"#! $SHELL -e\" >> $out/bin/$i + echo \"DYLD_FRAMEWORK_PATH=$out/frameworks exec $out/bin-orig/$i -framework-path $out/frameworks \\\"\\$@\\\"\" >> $out/bin/$i + chmod +x $out/bin/$i + done + + " else "") + + + '' + # the installed ghc executable segfaults, maybe some stripping or such has been done somewhere? + # Just copy teh version from the $TMP dir over + cp ghc/dist-stage2/build/ghc/ghc $out/lib/ghc-${version}/ghc + # bah, the passing gmp doesn't work, so let's add it to the final package.conf in a quick but dirty way + sed -i "s@^\(.*pkgName = PackageName \"rts\".*\libraryDirs = \\[\)\(.*\)@\\1\"${gmp}/lib\",\2@" $out/lib/ghc-${version}/package.conf + + wrapProgram $out/bin/ghc --set LDPATH "${gmp}/lib" + # sanity check, can ghc create executables? + cd $TMP + mkdir test-ghc; cd test-ghc + cat > main.hs << EOF + module Main where + main = putStrLn "yes" + EOF + $out/bin/ghc --make main.hs + echo compilation ok + [ $(./main) == "yes" ] + '' + ; + +} diff --git a/pkgs/development/compilers/jdk/jdk5-sun-linux.nix b/pkgs/development/compilers/jdk/jdk5-sun-linux.nix index a5d6f8bc516..b1dde8eb7eb 100644 --- a/pkgs/development/compilers/jdk/jdk5-sun-linux.nix +++ b/pkgs/development/compilers/jdk/jdk5-sun-linux.nix @@ -10,14 +10,14 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; -let name = "jdk-1_5_0_15"; in +let name = "jdk-1_5_0_16"; in stdenv.mkDerivation { inherit name; - filename = "jdk-1_5_0_15"; - dirname = "jdk1.5.0_15"; + filename = "jdk-1_5_0_16"; + dirname = "jdk1.5.0_16"; builder = ./builder.sh; pathname = if stdenv.system == "x86_64-linux" then "/tmp/${name}-linux-amd64.bin" else "/tmp/${name}-linux-i586.bin"; - md5 = if stdenv.system == "x86_64-linux" then "8c560eda470a50926b9e8dab2c806a25" else "6f45ac598a2f6ff73a2429d6a0da2624"; + md5 = if stdenv.system == "x86_64-linux" then "ca0fb55426615512d00e7d3cb26442bb" else "ac4ad1c563bfa7fea88f08be08cdee10"; stdenv = stdenv; inherit unzip; diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index f0b1bc2132c..22214aa84cf 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "mono-1.1.4"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/mono-1.1.4.tar.gz; + url = http://nixos.org/tarballs/mono-1.1.4.tar.gz; md5 = "66755e5f201e912cecdd19807ba62487"; }; diff --git a/pkgs/development/compilers/ocaml/3.08.0.nix b/pkgs/development/compilers/ocaml/3.08.0.nix index 6d4b4ca616c..b2e7e131a81 100644 --- a/pkgs/development/compilers/ocaml/3.08.0.nix +++ b/pkgs/development/compilers/ocaml/3.08.0.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ocaml-3.08.0"; builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/ocaml-3.08.0.tar.gz; + url = http://nixos.org/tarballs/ocaml-3.08.0.tar.gz; md5 = "c6ef478362295c150101cdd2efcd38e0"; }; configureScript = ./configure-3.08.0; diff --git a/pkgs/development/compilers/qcmm/default.nix b/pkgs/development/compilers/qcmm/default.nix index 508221aeaef..b7f11866687 100644 --- a/pkgs/development/compilers/qcmm/default.nix +++ b/pkgs/development/compilers/qcmm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "qcmm-2006-01-31"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/qc--20060131.tar.gz; + url = http://nixos.org/tarballs/qc--20060131.tar.gz; md5 = "9097830775bcf22c9bad54f389f5db23"; }; buildInputs = [ mk ocaml noweb groff ]; diff --git a/pkgs/development/compilers/qi/9.1.nix b/pkgs/development/compilers/qi/9.1.nix index 73aaabf9227..da21abef29e 100644 --- a/pkgs/development/compilers/qi/9.1.nix +++ b/pkgs/development/compilers/qi/9.1.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://www.lambdassociates.org/Download/Qi9.1.zip; diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix new file mode 100644 index 00000000000..435747e1248 --- /dev/null +++ b/pkgs/development/compilers/tinycc/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, perl, texinfo }: + +assert stdenv ? glibc; + +let version = "0.9.24"; in + stdenv.mkDerivation { + name = "tinycc-${version}"; + + src = fetchurl { + url = "mirror://savannah/tinycc/tcc-${version}.tar.bz2"; + sha256 = "0yafz627ky0lhppa6g1mfmisnis745m39l15aixmmv5n383x9bi7"; + }; + + buildInputs = [ perl texinfo ]; + + patchPhase = '' + substituteInPlace "texi2pod.pl" \ + --replace "/usr/bin/perl" "${perl}/bin/perl" + + # To produce executables, `tcc' needs to know where `crt*.o' are. + sed -i "tcc.c" \ + -e's|define CONFIG_TCC_CRT_PREFIX.*$|define CONFIG_TCC_CRT_PREFIX "${stdenv.glibc}/lib"|g ; + s|tcc_add_library_path(s, "/usr/lib");|tcc_add_library_path(s, "${stdenv.glibc}/lib");|g' + + # Tell it about the loader's location. + sed -i "tccelf.c" \ + -e's|".*/ld-linux\([^"]\+\)"|"${stdenv.glibc}/lib/ld-linux\1"|g' + ''; + + postInstall = '' + makeinfo --force tcc-doc.texi || true + + ensureDir "$out/share/info" + mv tcc-doc.info* "$out/share/info" + ''; + + meta = { + description = "TinyCC, a small, fast, and embeddable C compiler and interpreter"; + homepage = http://www.tinycc.org/; + license = "LGPLv2+"; + }; + } diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 5a5df9eed3e..ed542f283c0 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -2,10 +2,10 @@ , gawk, makeWrapper }: stdenv.mkDerivation rec { - name = "guile-1.8.5"; + name = "guile-1.8.6"; src = fetchurl { url = "mirror://gnu/guile/" + name + ".tar.gz"; - sha256 = "12b215bbqqkanapwh4dp3lnkg7k239dqiawfcdrb1zjz8hnkvxp2"; + sha256 = "11hxk8hyibbvjlk3zyf8vnl0xm0kvhmymj643inpbzw02i4zk8k9"; }; patches = [ ./popen-zombie.patch ]; diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix new file mode 100644 index 00000000000..4d737fe7065 --- /dev/null +++ b/pkgs/development/interpreters/io/default.nix @@ -0,0 +1,55 @@ +args : +let + lib = args.lib; + fetchurl = args.fetchurl; + FullDepEntry = args.FullDepEntry; + doPatchShebangs = args.doPatchShebangs; + + version = lib.getAttr ["version"] "2008.03.30" args; + buildInputs = with args; [ + zlib sqlite gmp libffi cairo ncurses freetype mesa + libpng libtiff libjpeg readline libsndfile libxml2 + freeglut e2fsprogs libsamplerate pcre libevent editline + ]; +in +rec { + src = /* Here a fetchurl expression goes */ + fetchurl { + url = "http://github.com/stevedekorte/io/tarball/${version}"; + name = "io-${version}.tar.gz"; + sha256 = "1vdjyqv86l290kzhyw8mwzfqgb279dl9nqmy6bih6g8n4yz36ady"; + }; + + inherit buildInputs; + configureFlags = []; + + makeFlags = ["INSTALL_PREFIX=$out"]; + + /* doConfigure should be specified separately */ + phaseNames = ["preBuild" "doMakeInstall" "postInstall" (doPatchShebangs "$out/share/io/samples") + (doPatchShebangs "$out/lib/io")]; + + preBuild = FullDepEntry ('' + for i in $pkgs ${ + if args.stdenv ? glibc then args.stdenv.glibc else "" + } ${ + if args ? libffi && args.libffi != null then "$(echo ${args.libffi}/lib/*/include/..)" else "" + }; do + echo "Path: $i" + sed -i build/AddonBuilder.io -e '/"\/sw"/asearchPrefixes append("'"$i"'"); ' + sed -i addons/Flux/io/Flux.io -e 's@/usr/local/@'"$out/"'@g' + done + '') ["minInit" "addInputs" "doUnpack"]; + + postInstall = FullDepEntry ('' + ensureDir $out/share/io + + ln -s $out/lib/io/addons $out/share/io + cp -r samples $out/share/io + '') ["minInit" "doUnpack" "defEnsureDir" "doMakeInstall"]; + + name = "io-" + version; + meta = { + description = "Io programming language"; + }; +} diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index dd6a82c3def..59a51c5681c 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -1,31 +1,36 @@ -{ stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, gmp }: +{ stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmp, makeWrapper }: stdenv.mkDerivation rec { - name = "maude-2.3"; + name = "maude-2.4"; meta = { homepage = "http://maude.cs.uiuc.edu/"; description = "Maude -- a high-level specification language"; license = "GPLv2"; }; src = fetchurl { - url = "http://maude.cs.uiuc.edu/download/current/Maude-2.3.tar.gz"; - sha256 = "1nzxj8x1379nxsdvldqy55wl513hdi4xwf8i2bhngz7s8228vs37"; + url = "http://maude.cs.uiuc.edu/download/current/Maude-2.4.tar.gz"; + sha256 = "0bydkf8fd5v267bfak4mm5lmm3vvnr6ir1jr7gimgyzqygdk0in2"; + }; + fullMaude = fetchurl { + url = "http://maude.cs.uiuc.edu/download/current/FM2.4/full-maude24.maude"; + sha256 = "0fwpnp5a8vw7q3iczwlra9074is95a1087ikx0a0idy8p4drnl61"; }; docs = fetchurl { url = "http://mirror.switch.ch/mirror/gentoo/distfiles/maude-2.3.0-extras.tar.bz2"; sha256 = "0kd5623k1wwj1rk4b6halrm3sdvd9kbiwg1hi2c3qim1nlfdgl0d"; }; - buildInputs = [flex bison ncurses buddy tecla gmp]; - configurePhase = ''./configure --disable-dependency-tracking --prefix=$out TECLA_LIBS="-ltecla -lncursesw" CFLAGS="-O3" CXXFLAGS="-O3"''; - # Regression test suite says: - # FAIL: metaWellFormed - doCheck = false; + buildInputs = [flex bison ncurses buddy tecla gmp libsigsegv makeWrapper]; + configurePhase = ''./configure --disable-dependency-tracking --prefix=$out --datadir=$out/share/maude TECLA_LIBS="-ltecla -lncursesw" CFLAGS="-O3" CXXFLAGS="-O3"''; + doCheck = true; postInstall = '' + for n in $out/bin/*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done ensureDir $out/share/maude + cp ${fullMaude} $out/share/maude/full-maude.maude + ensureDir $out/share/doc/maude tar xf ${docs} - mv src/Main/*.maude maude-2.3.0-extras/*.maude $out/share/maude/ + rm -f maude-2.3.0-extras/full-maude.maude mv maude-2.3.0-extras/pdfs $out/share/doc/maude/pdf mv maude-2.3.0-extras/* $out/share/doc/maude/ ''; diff --git a/pkgs/development/interpreters/octave/hg.nix b/pkgs/development/interpreters/octave/hg.nix new file mode 100644 index 00000000000..037a2ab66b0 --- /dev/null +++ b/pkgs/development/interpreters/octave/hg.nix @@ -0,0 +1,49 @@ +{stdenv, fetchurl, g77, readline, ncurses, perl, flex, + bison, autoconf, automake, sourceByName, getConfig, lib, atlas, gperf, python, glibc, gnuplot, texinfo, texLive}: + +assert readline != null && ncurses != null && flex != null; +assert g77.langF77; + +let commonBuildInputs = [g77 readline ncurses perl glibc]; in + +stdenv.mkDerivation ({ + NIX_LDFLAGS = "-lpthread"; + configureFlags = "--enable-readline --enable-dl --disable-static --enable-shared"; + meta = { + description = "High-level interactive language for numerical computations"; + homepage = http://www.octave.org; + license = "GPL-3"; + }; +} // ( + if (getConfig ["octave" "devVersion"] false) then { + name = "octave-hg"; # developement version mercurial repo + src = sourceByName "octave"; + # HOME is set to $TMP because octave needs to access ${HOME}/.octave_hist while running targets + # in doc/interpreter.. Maybe this can be done better. This hack is fastest :) + preConfigure = '' + # glob is contained in glibc! Don't know why autotools want to use -lglob + sed -i 's/-lglob//' configure.in + ./autogen.sh + export HOME=$TMP + ''; + buildInputs = commonBuildInputs ++ [ flex bison autoconf automake gperf gnuplot texinfo texLive ] + ++ lib.optionals (getConfig ["octave" "atlas"] true) [ python atlas ]; + # it does build, but documentation doesn't.. So just remove that directory + # from the buildfile + buildPhase = '' + sed -i octMakefile \ + -e 's/^\(INSTALL_SUBDIRS = .*\)doc \(.*\)$/\1 \2/' \ + -e 's/^\(SUBDIRS = .*\)doc \(.*\)$/\1 \2/' \ + -e 's/\$(MAKE) -C doc/#/' + make + ''; + } else { + name = "octave-3.1.51"; + src = fetchurl { + url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-3.1.51.tar.bz2; + sha256 = "0v0khhpmydyimvdl2rswfd0jrcqa9rhd3cyi60zhqv2hi0bhmkh8"; + }; + buildInputs = commonBuildInputs ++ [ flex bison autoconf automake python ] + ++ lib.optionals (getConfig ["octave" "atlas"] true) [ python atlas ]; + } +)) diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix index 0b57d690e01..415ed78f117 100644 --- a/pkgs/development/interpreters/pyrex/0.9.5.nix +++ b/pkgs/development/interpreters/pyrex/0.9.5.nix @@ -2,7 +2,7 @@ args: with args; let - localDefs = builderDefs.meta.function { + localDefs = builderDefs.passthru.function { src = fetchurl { url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.5.1.1.tar.gz; diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix index 7125a2aff20..471532be2fe 100644 --- a/pkgs/development/interpreters/pyrex/0.9.6.nix +++ b/pkgs/development/interpreters/pyrex/0.9.6.nix @@ -2,7 +2,7 @@ args: with args; let - localDefs = builderDefs.meta.function { + localDefs = builderDefs.passthru.function { src = fetchurl { url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.6.4.tar.gz; diff --git a/pkgs/development/interpreters/python-new/2.5/default.nix b/pkgs/development/interpreters/python-new/2.5/default.nix new file mode 100644 index 00000000000..1bc7ca4b419 --- /dev/null +++ b/pkgs/development/interpreters/python-new/2.5/default.nix @@ -0,0 +1,534 @@ +# the nix-python way.. + +# By default python looks in the $prefix/lib/python-$version/site-packages directory +# and reads the .pth files to add the library paths to sys.path. +# Using PYHTONPATH is not enough because it doesn't make python read the .pth files +# telling python where to find additional modules. PYTHONUSERBASE would suffice, but +# it only supports *one* user location. That's why I've added the new env var NIX_PYTHON_SITES +# containing a colon separated list of modules telling python where to look +# for imports and also read the .pth files + +# TODO optimize py modules automatically (gentoo has a ebuild function called python_mod_optimize ?) + +p: # p = pkgs +let + inherit (p) lib fetchurl stdenv getConfig; + # 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); +in + withName ( lib.fix ( t : { # t = this attrs + + version = "2.5"; + versionAttr = "python25"; + + # see pythonFull. + pythonMinimal = ( (import ./python.nix) { + name = "python-${t.version}"; + inherit (p) fetchurl stdenv lib bzip2 ncurses composableDerivation; + inherit (p) zlib sqlite db4 readline openssl gdbm; + }); + + # python wiht all features enabled. + # if you really need a stripped version we should add __overides + # so that you can replace it the way it's done in all-packages.nix + pythonFull = t.pythonMinimal.passthru.fun { + name = "python-${t.version}-full"; + cfg = { + zlibSupport = true; + sqliteSupport = true; + db4Support = true; + readlineSupport = true; + opensslSupport = true; + gdbmSupport = true; + }; + }; + + # python wrapper. You should install this + # It automatically wrapps python adding NIX_PYTHON_SITES so that you can use all the libraries + # when running the wrapper from the console. + # configuration: + # python25 = { wrapperLibs = let p = pkgs.python25New; in [ p.wxPython25 p.name p.name2 ]; }; + # python25 = { wrapperLibs = [ "all" ]; }; # install all libraries provided by this file + # TODO: does pydoc find stuff from libraries? + pythonWrapper = stdenv.mkDerivation { + name = "${t.pythonFull.name}-wrapper"; + # [1] using full because I feel installing various versions isn't any better + phases = "buildPhase"; + buildInputs = [ p.makeWrapper ] + ++ lib.concatMap (x: if x == "all" then t.all else [x]) (getConfig [t.versionAttr "wrapperLibs"] []); + + buildPhase = '' + ensureDir $out/bin + cat >> $out/bin/python << EOF + export NIX_PYTHON_SITES=\$NIX_PYTHON_SITES:$NIX_PYTHON_SITES + exec ${t.pythonFull}/bin/python "\$@" + EOF + chmod +x $out/bin/python + ''; + }; + + ### basic support for installing python libraries + # set pyCheck to a small python snippet importing all modules of this python + # lib to verify it works + # You can define { python25 { debugCmd = "DISPLAY=:0.0 pathtoxterm"; } + # in your config for easier debugging.. + pythonLibStub = p.composableDerivation { + initial = { + 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 + # run check + if [ -n "$pyCheck" ]; then + ( . $out/nix-support/setup-hook + mkdir $TMP/new-test; cd $TMP/new-test + echo PYTHONPATH=$PYTHONPATH + echo NIX_PYTHON_SITES=$NIX_PYTHON_SITES + script="$(echo -e "import sys\nprint sys.path\npyCheck\nprint \"check ok\"")" + script="''${script/pyCheck/$pyCheck}" + echo "check script is"; echo "$script" + echo "$script" | python || { ${ getConfig [t.versionAttr "debugCmd"] ":"} ; echo "pycheck failed"; exit 1; } + ) + fi''; + passthru = { + libPython = t.version; # used to find all python libraries fitting this version (-> see name all below) + }; + mergeAttrBy = { + pyCheck = x : y : "${x}\n${y}"; + }; + }; + }; + + # same as pythonLibStub, but runs default python setup.py actions + pythonLibSetup = t.pythonLibStub.passthru.fun { + buildPhase = ''python setup.py $setupFlags build''; + installPhase = ''python setup.py $setupFlags install --prefix=$out''; + mergeAttrBy = { + setupFlags = lib.concatList; + }; + }; + + ### python libraries: + + wxPythonBaseFun = (t.pythonLibSetup.passthru.funMerge (a : + let inherit (a.fixed) wxGTK version; in + { + buildInputs = [p.pkgconfig wxGTK (wxGTK.gtk)]; + setupFlags=["WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=0 BUILD_OGL=0 UNICODE=1"]; + configurePhase = ''cd wxPython''; + pyCheck = "import wx"; + name = "wxPython-${version}"; + meta = { # 2.6.x and 2.8.x + description="A blending of the wxWindows C++ class library with Python"; + homepage="http://www.wxpython.org/"; + license="wxWinLL-3"; + }; + } + )).passthru.fun; + + wxPython26 = t.wxPythonBaseFun { + version = "2.6.3.3"; + passthru = { wxGTK = p.wxGTK26; }; + src = fetchurl { + url = mirror://sourceforge/wxpython/wxPython-src-2.6.3.3.tar.bz2; + md5 = "66b9c5f8e20a9505c39dab1a1234daa9"; + }; + }; + + # compilation errors + #wxPython28 = t.wxPythonBaseFun { + # version = "2.8.9.1"; + # passthru = { wxGTK = wxGTK28; }; + # src = fetchurl { + # url = mirror://sourceforge.net/sourceforge/wxpython/wxPython-src-2.8.9.1.tar.bz2; + # sha256 = "1yp7l2c2lfpwc2x5lk5pawmzq2bqajzhbzqs1p10jd211slwhjsq"; + # }; + #}; + + # couldn't download source + #foursuite = pythonLibSetup.passthru.fun { + # version = "1.0.2"; + # name = "4suite-${version}"; + # src = fetchurl { + # url = "mirror://sourceforge/foursuite/4Suite-XML-${version}.tar.bz2"; + # sha256 = "0g5cyqxhhiqnvqk457k8sb97r18pwgx6gff18q5296xd3zf4cias"; + # }; + #}; + + #bsddb3 = t.pythonLibSetup.passthru.fun { + # version = "1.0.2"; + # name = "bsddb3-4.5.0"; + # setupFlags = ["--berkeley-db=${p.db4}"]; + # src = fetchurl { + # url = mirror://sourceforge/pybsddb/bsddb3-4.5.0.tar.gz; + # sha256 = "1h09kij32iikr9racp5p7qrb4li2gf2hs0lyq6d312qarja4d45v"; + # }; + #}; + + # pyglib contains import reference to pygtk! So its best to install both at + # the same time. I don't want to patch this. + # You can install both into different store paths, however you won't be able + # to import gtk because after pygtk.require sys.path contains to + # /nix/store/*-pygobject/**/gtk-2.0 (should be pygtk/**/gtk-2.0 instead) + + # gnome python is added here as well because it is loaded after + # pygtk.require('2.0') as well. So the pygtk lib path is added to sys.path only. + # We could make extra derivations for that. But on the other hand that would require + # patching pygtk to another */gtk2.0 directory to sys.path for each NIX_PYTHON_SITES. + # If you install dozens of python packages this might be bloat. + # So I think the overhead of installing these packages into the same store path should be prefered. + pygtkBaseFun = (t.pythonLibStub.passthru.funMerge (a : + let inherit (a.fixed) glib gtk; in lib.mergeAttrsByFuncDefaults [ + { + unpackPhase = "true"; + configurePhase = "true"; + patchPhase = "true"; + buildPhase = "true"; + installPhase = '' + unset unpackPhase + unset configurePhase + unset buildPhase + unset installPhase + export G2CONF="--enable-gconf" # hack, should be specified somewhere else + for srcs in $pygobjectSrc $pygtkSrc $pySrcs; do + cd $TMP; mkdir "$(basename $srcs)"; cd "$(basename $srcs)"; unpackPhase + cd $sourceRoot + configurePhase; buildPhase; installPhase + addToEnv $out # pygtk has to know about pygobject + PATH=$out/bin:$PATH # gnome-python nees pygtk-codegen + done + ''; + mergeAttrBy = { + phases = lib.concatList; + pySrcs = lib.concatList; + pyCheck = x : y : "${x}\n${y}"; + }; + } + # pygobject + { + flags = { + libffi = { buildInputs = [p.libffi];}; + }; + cfg = { + libffiSupport = true; + }; + pyCheck = "import gobject"; + passthru = { + pygobjectVersion = "2.15.4"; + }; + pygobjectSrc = fetchurl { + url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.15/pygobject-2.15.4.tar.bz2"; + sha256 = "19vxczy01xyss2f5aqf93al3jzrxn50srgzkl4w7ivdz50rnjin7"; + }; + buildInputs = [ p.glibc ]; # requires ld-config + + propagatedBuildInputs = [ p.pkgconfig glib gtk ]; + } + # pygtk + { + propagatedBuildInputs = [ t.pycairo ]; + flags = { + cairo = { + propagatedBuildInputs = [ p.cairo ]; + pyCheck = "import cairo"; + }; # TODO add pyCheck + glade = { + propagatedBuildInputs = [ p.gnome.libglade ]; + pyCheck = "from gtk import glade"; + }; + }; + pyCheck = '' + import pygtk; pygtk.require('2.0') + import gtk + import gconf + ''; + cfg = { + gladeSupport = true; + cairoSupport = true; + }; + } + # gnome-python + { + #name = "gnome-python-2.22.3"; + buildInputs = [ p.pkgconfig p.gnome.libgnome ]; + propagatedBuildInputs = [ p.gnome.GConf ]; + pySrcs = [(fetchurl { + url = http://ftp.gnome.org/pub/GNOME/sources/gnome-python/2.22/gnome-python-2.22.3.tar.bz2; + sha256 = "0ndm3cns9381mm6d8jxxfd931fk93nqfcszy38p1bz501bs3wxm1"; + })]; + } + # gnome-desktop or gnome-python-extras desktop containing egg.trayicon needed by istanbul + { + # name = "gnome-desktop-2.24.0"; + buildInputs = [ p.pkgconfig ]; + propagatedBuildInputs = [ p.gnome.GConf ]; + pySrcs = [(fetchurl { + url = http://ftp.gnome.org/pub/GNOME/sources/gnome-python-desktop/2.24/gnome-python-desktop-2.24.0.tar.bz2; + sha256 = "16514gmv42ygjh5ggzsis697m73pgg7ydz11h487932kkzv4mmlg"; + })]; + pyCheck = "import egg.trayicon"; + } + { + # name = "gnome-python-extras-2.13"; + buildInputs = [ p.pkgconfig ]; + propagatedBuildInputs = [ p.gnome.GConf ]; + pySrcs = [(fetchurl { + url = http://ftp.gnome.org/pub/GNOME/sources/gnome-python-extras/2.13/gnome-python-extras-2.13.3.tar.gz; + sha256 = "0vj0289snagrnvbmrs1camwmrc93xgpw650iavj6mq7a3wqcra0b"; + })]; + } + ])); + + #pygtk213 = t.pygtkBaseFun { + # version = "2.13.0"; + # pygtkSrc = fetchurl { + # url = http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.13/pygtk-2.13.0.tar.bz2; + # sha256 = "0644ll48hi8kwfng37b0k5qgb0fbiy298r7sxd4j7ag7lj4bgic0"; + # }; + # passthru = { inherit (p.gtkLibs) glib gitk; }; + # pyCheck = '' + # import pygtk; pygtk.require('2.0') + # import gtk + # ''; + #}; + + pygtk212 = t.pygtkBaseFun.passthru.funMerge (a : { + version = "2.12.1"; + name = "pygobject-${a.fixed.pygobjectVersion}-and-pygtk-${a.fixed.version}"; + pygtkSrc = fetchurl { + url = http://ftp.acc.umu.se/pub/GNOME/sources/pygtk/2.12/pygtk-2.12.1.tar.bz2; + sha256 = "0gg13xgr7y9sppw8bdys042928nc66czn74g60333c4my95ys021"; + }; + passthru = { inherit (p.gtkLibs) glib gtk; }; + pyCheck = '' + import pygtk; pygtk.require('2.0') + import gtk + ''; + }); + + pycairo = t.pythonLibStub.passthru.fun { + name = "pycairo-1.8.0"; + buildInputs = [ p.pkgconfig p.cairo p.x11 ]; + src = fetchurl { + url = http://www.cairographics.org/releases/pycairo-1.6.4.tar.gz; + md5 = "2c3aa21e6e610321498f9f81f7b625df"; + }; + pyCheck = "import cairo"; + }; + + gstPython = t.pythonLibStub.passthru.fun { + name = "gst-python-0.10.13"; + src = fetchurl { + url = http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.10.13.tar.gz; + sha256 = "0yin36acr5ryfpmhlb4rlagabgxrjcmbpizwrc8csadmxzmigb86"; + }; + buildInputs =[ p.flex2535 p.pkgconfig]; + flags = { + pluginsGood = { propagatedBuildInputs = [p.gst_all.gstPluginsGood]; }; + ffmpeg = { propagatedBuildInputs = [p.gst_all.gstFfmpeg]; }; + }; + cfg = { + pluginsGoodSupport = true; + ffmpegSupport = true; + }; + propagatedBuildInputs = [ + t.pygtk212 + p.gst_all.gstreamer + p.gst_all.gstPluginsBase + p.gst_all.gnonlin + ]; + # this check fails while building: It succeeds running as normal user + /* + Traceback (most recent call last): + File "", line 5, in + File "/nix/store/hnc51h035phlk68i1qmr5a8kc73dfvhp-gst-python-0.10.13/lib/python2.5/site-packages/gst-0.10/gst/__init__.py", line 170, in + from _gst import * + RuntimeError: can't initialize module gst: Error re-scanning registry , child terminated by signal + */ + pyCheck = '' + #import pygst + #pygst.require('0.10') + #import gst + ''; + meta = { + description = "python gstreamer bindings"; + homepage = http://gstreamer.freedesktop.org/modules/gst-python.html; + license = "GPLv2.1"; + }; + }; + + pygoocanvas = t.pythonLibStub.passthru.fun { + src = p.fetchurl { + url = http://download.berlios.de/pygoocanvas/pygoocanvas-0.10.0.tar.gz; + sha256 = "0pxznzdscbhvn8102vrqy3r1g6ss4sgs8wwy6y4c5g26rrp7l55d"; + }; + propagatedBuildInputs = [ t.pygtk212 ]; + buildInputs = [ p.pkgconfig p.goocanvas ]; + pyCheck = "import goocanvas"; + name = "pygoocanvas-0.10.0"; + meta = { + description = ""; + homepage = http://developer.berlios.de/projects/pygoocanvas/; + license = "LGPL"; + }; + }; + +# zope = t.pythonLibStub.passthru.fun rec { +#[> version = "3.3.1"; +# version = "svn"; +# name = "zope-${version}"; +# [>src = p.blending.sourceByName "zope"; +# src = "/home/marc/managed_repos/zope"; + +# [>fetchurl { +# [> Doh! Python version 2.4.3 before continuing. Versions +# [> 2.4.7 2.4.6 2.4.5 2.4.4 2.4.2 2.4.1 also work, but not as optimally. +# [> url = "http://www.zope.org/Products/Zope3/${version}/Zope-${version}.tgz"; +# [> sha256 = "1qvvh384j7blzhwgfmd5kqvr5vzpv5khaj8ha46ln3hrwffrk2b1"; +# [>}; +# pyCheck = ""; +# }; + + setuptools = t.pythonLibSetup.passthru.fun { + name = "setuptools-0.6c9"; + postUnpack = '' + ensureDir $out/lib/python2.5/site-packages + export PYTHONPATH="$out/lib/python${t.version}/site-packages" # shut up installation script + + # setuptools tries to write to the installation location, so ensure it exists + # and it requires PYTHONPATH to be set to that location (maybe its better to patch it. - I'm lazy) + ensureDir $out/nix-support + cat >> $out/nix-support/setup-hook << EOF + ensureDir \$out/lib/python${t.version}/site-packages + export PYTHONPATH="\$out/lib/python${t.version}/site-packages" # shut up installation script + EOF + ''; + src = p.fetchurl { + url = "http://pypi.python.org/packages/source/s/setuptools/setuptools-0.6c9.tar.gz"; + md5 = "3864c01d9c719c8924c455714492295e"; + }; + }; + + zopeInterface = t.pythonLibSetup.passthru.fun rec { + version = "3.3.0"; + name = "zope.interface-${version}"; + buildInputs = [ t.setuptools ]; + src = p.fetchurl { + url = "http://www.zope.org/Products/ZopeInterface/3.3.0/zope.interface-${version}.tar.gz"; + sha256 = "0xahg9cmagn4j3dbifvgzbjliw2jdrbf27fhqwkdp8j80xpyyjf0"; + }; + pyCheck = "from zope.interface import Interface, Attribute"; + }; + + dbusPython = t.pythonLibStub.passthru.fun rec { + version = "0.83.0"; + name = "dbus-python-0.83.0"; + buildInputs = [ p.pkgconfig ]; + propagatedBuildInputs = [ p.dbus p.dbus_glib ]; + src = fetchurl { + url = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-0.83.0.tar.gz"; + sha256 = "14b1fwq9jyvg9qbbrmpk1264s9shm9n638hsgmkh9fn2lmd1vpc9"; + }; + pyCheck = "import dbus"; + meta = { + description = ""; + homepage = http://freedesktop.org/wiki/Software/DBusBindings; + license = [ "GPLv2" "AFL-2.1" ]; + }; + }; + + pythonXlib = t.pythonLibSetup.passthru.fun { + name = "python-xlib-0.14"; + src = fetchurl { + url = http://puzzle.dl.sourceforge.net/sourceforge/python-xlib/python-xlib-0.14.tar.gz; + sha256 = "1sv0447j0rx8cgs3jhjl695p5pv13ihglcjlrrz1kq05lsvb0wa7"; + }; + meta = { + description = "tries to be a fully functional X client library beeing entirely written in python"; + license = [ "GPL" ]; + homepage = http://python-xlib.sourceforge.net/; + }; + }; + + ### python applications + + pythonExStub = p.composableDerivation { + initial = { + buildInputs = [p.makeWrapper]; + postPhases = ["wrapExecutables"]; + propagatedBuildInputs = [ t.pythonFull ]; # see [1] + + # adding $out to NIX_PYTHON_SITES because some of those executables seem to come with extra libs + wrapExecutables = '' + for prog in $out/bin/*; do + wrapProgram "$prog" \ + --set NIX_PYTHON_SITES "$NIX_PYTHON_SITES:$out" \ + --set PYTHONPATH "\$PYTHONPATH:$out" + done + ''; + }; + }; + + pitivi = t.pythonExStub.passthru.fun { + name = "pitivi-0.11.2"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/sources/pitivi/0.11/pitivi-0.11.2.tar.bz2; + sha256 = "0d3bqgfp60qm5bf904k477bd8jhxizj1klv84wbxsz9vhjwx9zcl"; + }; + buildInputs = [ t.pygtk212 t.gstPython t.pygoocanvas t.zopeInterface t.dbusPython + p.intltool p.gettext p.makeWrapper p.gettext ]; + # why do have to add gtk-2.0 explicitely? + meta = { + description = "A non-linear video editor using the GStreamer multimedia framework"; + homepage = http://www.pitivi.org/wiki/Downloads; + license = "LGPL-2.1"; + }; + postInstall = '' + # set the python which has been used to compile this package + sed -i -e 's@#!.*@#!'"$(which python)@" $out/bin/pitivi + ''; + }; + + istanbul = t.pythonExStub.passthru.fun { + name = "istanbul-0.2.2"; + buildInputs = [ t.pygtk212 t.gstPython /*t.gnomePython (contained in gtk) t.gnomePythonExtras */ t.pythonXlib + p.perl p.perlXMLParser p.gettext]; + # gstPython can't be imported when building (TODO).. so just run true instead of python + configurePhase = ''./configure --prefix=""''; # DESTDIR is set below + postUnpack = '' + sed -i 's/$PYTHON/true/' istanbul-0.2.2/configure + mkdir -p $out/bin + export DESTDIR="$out" + shopt -s nullglob + ''; + src = fetchurl { + url = http://zaheer.merali.org/istanbul-0.2.2.tar.bz2; + sha256 = "1mdc82d0xs9pyavs616bz0ywq3zwy3h5y0ydjl6kvcgixii29aiv"; + }; + postInstall = "chmod a+x $out/bin/istanbul"; + meta = { + description = "A non-linear video editor using the GStreamer multimedia framework"; + homepage = http://live.gnome.org/Istanbul; + license = "LGPLv2"; + }; + }; + + all = lib.filter (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/nix-find-sites-2.5.patch b/pkgs/development/interpreters/python-new/2.5/nix-find-sites-2.5.patch new file mode 100644 index 00000000000..c856429b630 --- /dev/null +++ b/pkgs/development/interpreters/python-new/2.5/nix-find-sites-2.5.patch @@ -0,0 +1,33 @@ +--- a/site.py 2008-11-19 14:48:49.000000000 +0100 +--- Python-2.5-orig/Lib/site.py 2008-05-10 19:36:24.000000000 +0200 ++++ Python-2.5/Lib/site.py 2008-11-17 05:37:02.000000000 +0100 +@@ -390,6 +390,20 @@ + except ImportError: + pass + ++def addnixsitepackages(known_paths): ++ """ ++ used to add multiple site packages for /nix/store to sys.path also ++ evaluating the .pth files (http://docs.python.org/library/site.html#module-site) ++ """ ++ env_nix_sites = os.environ.get("NIX_PYTHON_SITES", None) ++ if env_nix_sites: ++ for path in env_nix_sites.split(":"): ++ ++ NIX_SITE = os.path.join(path, "lib", ++ "python" + sys.version[:3], ++ "site-packages") ++ addsitedir(NIX_SITE, known_paths) ++ return known_paths + + def main(): + abs__file__() +@@ -400,6 +414,7 @@ + paths_in_sys = addsitepackages(paths_in_sys) + if sys.platform == 'os2emx': + setBEGINLIBPATH() ++ paths_in_sys = addnixsitepackages(paths_in_sys) + setquit() + setcopyright() + sethelper() + diff --git a/pkgs/development/interpreters/python-new/2.5/python.nix b/pkgs/development/interpreters/python-new/2.5/python.nix new file mode 100644 index 00000000000..6ae5ffb6822 --- /dev/null +++ b/pkgs/development/interpreters/python-new/2.5/python.nix @@ -0,0 +1,69 @@ +args: with args; +let inherit (lib) optional prepareDerivationArgs concatStringsSep fix; in + +composableDerivation { + f = args: let attr = lib.prepareDerivationArgs args; in stdenv.mkDerivation ( attr // { + C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") attr.buildInputs); + LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") attr.buildInputs); + }); + initial = { + + postPhases = ["runCheck"]; + + mergeAttrBy = { pyCheck = x : y : "${x}\n${y}"; }; + + # should be last because it sources setup-hook of this package itself + runCheck = '' + PATH=$out/bin:$PATH; . $out/nix-support/setup-hook; + echo -e "import sys\n$pyCheck\nprint \"import pyCheck ok\"" | python + ''; + + inherit (args) name; + + # everything can be overriden by composedArgsAndFun additional args + # assuming that if a module can be loaded that it does also work.. + flags = { + zlib = { buildInputs = [ zlib ]; pyCheck = "import zlib"; }; + gdbm = { buildInputs = [ gdbm ]; pyCheck = "import gdbm"; }; + sqlite = { buildInputs = [ sqlite ]; pyCheck = "import sqlite3"; }; + db4 = { buildInputs = [ db4 ]; }; # TODO add pyCheck + readline = { buildInputs = [ readline ]; }; # doesn't work yet (?) + openssl = { buildInputs = [ openssl ]; pyCheck ="import socket\nsocket.ssl"; }; + }; + + src = fetchurl { + url = http://www.python.org/ftp/python/2.5.2/Python-2.5.2.tar.bz2; + sha256 = "0gh8bvs56vdv8qmlfmiwyczjpldj0y3zbzd0zyhyjfd0c8m0xy7j"; + }; + + configureFlags = ["--enable-shared" "--with-wctype-functions"]; + + buildInputs = + optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ + [bzip2 ncurses]; + + patches = [ + # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff. + ./search-path.patch + + + # make python know about libraries reading .pth files + # http://docs.python.org/library/site.html#module-site + # TODO: think about security (see the other code contained in site.py) + ./nix-find-sites-2.5.patch + ]; + + preConfigure = '' + # Purity. + for i in /usr /sw /opt /pkg; do + substituteInPlace ./setup.py --replace $i /no-such-path + done + export NIX_LDFLAGS="$NIX_LDFLAGS -lncurses" + ''; + + postInstall = " + rm -rf $out/lib/python2.5/test + "; + + }; +} diff --git a/pkgs/development/interpreters/python-new/2.5/search-path.patch b/pkgs/development/interpreters/python-new/2.5/search-path.patch new file mode 100644 index 00000000000..8fcddcb3f8d --- /dev/null +++ b/pkgs/development/interpreters/python-new/2.5/search-path.patch @@ -0,0 +1,28 @@ +diff -rc Python-2.4.4-orig/setup.py Python-2.4.4/setup.py +*** Python-2.4.4-orig/setup.py 2006-10-08 19:41:25.000000000 +0200 +--- Python-2.4.4/setup.py 2007-05-27 16:04:54.000000000 +0200 +*************** +*** 279,288 **** + # Check for AtheOS which has libraries in non-standard locations + if platform == 'atheos': + lib_dirs += ['/system/libs', '/atheos/autolnk/lib'] +- lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) + inc_dirs += ['/system/include', '/atheos/autolnk/include'] +- inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) + + # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) + if platform in ['osf1', 'unixware7', 'openunix8']: + lib_dirs += ['/usr/ccs/lib'] +--- 279,289 ---- + # Check for AtheOS which has libraries in non-standard locations + if platform == 'atheos': + lib_dirs += ['/system/libs', '/atheos/autolnk/lib'] + inc_dirs += ['/system/include', '/atheos/autolnk/include'] + ++ lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) ++ inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) ++ + # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) + if platform in ['osf1', 'unixware7', 'openunix8']: + lib_dirs += ['/usr/ccs/lib'] + diff --git a/pkgs/development/interpreters/python/2.5/default.nix b/pkgs/development/interpreters/python/2.5/default.nix index bfbc421e115..7b009bbe0c0 100644 --- a/pkgs/development/interpreters/python/2.5/default.nix +++ b/pkgs/development/interpreters/python/2.5/default.nix @@ -4,6 +4,10 @@ , db4 ? null , readline ? null , openssl ? null +, tk ? null +, tcl ? null +, libX11 ? null +, xproto ? null }: assert zlibSupport -> zlib != null; @@ -22,6 +26,10 @@ let ++ optional (db4 != null) db4 ++ optional (readline != null) readline ++ optional (openssl != null) openssl + ++ optional (tk != null) tk + ++ optional (tcl != null) tcl + ++ optional (libX11 != null) libX11 + ++ optional (xproto != null) xproto ; in @@ -66,6 +74,7 @@ stdenv.mkDerivation { db4Support = db4 != null; readlineSupport = readline != null; opensslSupport = openssl != null; + tkSupport = (tk != null) && (tcl != null); libPrefix = "python2.5"; }; } diff --git a/pkgs/development/interpreters/ruby/gems.nix b/pkgs/development/interpreters/ruby/gems.nix index f53d8aa5f36..9b24d582c18 100644 --- a/pkgs/development/interpreters/ruby/gems.nix +++ b/pkgs/development/interpreters/ruby/gems.nix @@ -20,5 +20,11 @@ rec { name = "rubygems-" + version; meta = { description = "Ruby gems package collection"; + longDescription = '' + Example usage: + gem install -i .ruby-gems json + ruby -I ~/.ruby-gems/gems/json-1.1.3/lib your-script.rb + Probably there are better ways to handle this all. Go on and fix it. + ''; }; } diff --git a/pkgs/development/interpreters/toolbus/default.nix b/pkgs/development/interpreters/toolbus/default.nix index 5acc1f780bc..eda55b06963 100644 --- a/pkgs/development/interpreters/toolbus/default.nix +++ b/pkgs/development/interpreters/toolbus/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "toolbus-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/toolbus-1.2.2.tar.gz; + url = http://nixos.org/tarballs/toolbus-1.2.2.tar.gz; md5 = "887349b097006c0883e1948797349a50"; }; java = if javaAdapter then true else false; diff --git a/pkgs/development/interpreters/xulrunner/wrapper/builder.sh b/pkgs/development/interpreters/xulrunner/wrapper/builder.sh index 79247a16023..4deed9e7a7f 100644 --- a/pkgs/development/interpreters/xulrunner/wrapper/builder.sh +++ b/pkgs/development/interpreters/xulrunner/wrapper/builder.sh @@ -2,8 +2,6 @@ source $stdenv/setup ensureDir $out/bin -set -x - wrapper="$out/bin/$launcher" if test -e $xulrunner/bin/xulrunner; then @@ -17,7 +15,7 @@ fi cat > $wrapper < guile != null; stdenv.mkDerivation rec { - name = "gnutls-2.4.2"; + name = "gnutls-2.6.2"; src = fetchurl { url = "mirror://gnu/gnutls/${name}.tar.bz2"; - sha256 = "03mvpx35psvw51rv60jffpddziz6vbpapwn8lcgc7iwiqqbfjw0w"; + sha256 = "1jg7mcf8z9ghyzm8ca1b19pzwaaq3cvj5grsgi2hmlfms95zic80"; }; patches = [ ./tmpdir.patch ]; diff --git a/pkgs/development/libraries/gnutls/tmpdir.patch b/pkgs/development/libraries/gnutls/tmpdir.patch index 5670647af5f..bc61d7e5079 100644 --- a/pkgs/development/libraries/gnutls/tmpdir.patch +++ b/pkgs/development/libraries/gnutls/tmpdir.patch @@ -5,29 +5,20 @@ build failures in chroots. See also: http://thread.gmane.org/gmane.comp.encryption.gpg.gnutls.devel/2693 ---- gnutls-2.4.0/tests/Makefile.in 2008-06-18 17:02:36.000000000 +0200 -+++ gnutls-2.4.0/tests/Makefile.in 2008-06-28 20:00:10.000000000 +0200 -@@ -56,7 +56,7 @@ host_triplet = @host@ - @HAVE_FORK_TRUE@am__append_2 = x509self x509signself x509dn anonself pskself dhepskself \ - @HAVE_FORK_TRUE@ tlsia resume netconf-psk +--- gnutls-2.6.1/tests/Makefile.in 2008-11-10 10:37:52.000000000 +0100 ++++ gnutls-2.6.1/tests/Makefile.in 2008-11-10 19:31:52.000000000 +0100 +@@ -58,7 +58,7 @@ host_triplet = @host@ + @HAVE_FORK_TRUE@am__append_4 = x509self x509signself x509dn anonself pskself dhepskself \ + @HAVE_FORK_TRUE@ tlsia resume netconf-psk setcredcrash --@ENABLE_OPENPGP_TRUE@@HAVE_FORK_TRUE@am__append_3 = openpgpself -+@ENABLE_OPENPGP_TRUE@@HAVE_FORK_TRUE@am__append_3 = - @ENABLE_OPRFI_TRUE@am__append_4 = oprfi - check_PROGRAMS = $(am__EXEEXT_4) - TESTS = $(am__EXEEXT_4) -@@ -151,7 +151,7 @@ libutils_la_OBJECTS = $(am_libutils_la_O - @HAVE_FORK_TRUE@ tlsia$(EXEEXT) resume$(EXEEXT) \ - @HAVE_FORK_TRUE@ netconf-psk$(EXEEXT) - @ENABLE_OPENPGP_TRUE@@HAVE_FORK_TRUE@am__EXEEXT_2 = \ --@ENABLE_OPENPGP_TRUE@@HAVE_FORK_TRUE@ openpgpself$(EXEEXT) -+@ENABLE_OPENPGP_TRUE@@HAVE_FORK_TRUE@ - @ENABLE_OPRFI_TRUE@am__EXEEXT_3 = oprfi$(EXEEXT) - am__EXEEXT_4 = simple$(EXEEXT) openssl$(EXEEXT) gc$(EXEEXT) \ - set_pkcs12_cred$(EXEEXT) certder$(EXEEXT) \ +-@ENABLE_OPENPGP_TRUE@@HAVE_FORK_TRUE@am__append_5 = openpgpself ++@ENABLE_OPENPGP_TRUE@@HAVE_FORK_TRUE@am__append_5 = + @ENABLE_OPRFI_TRUE@am__append_6 = oprfi + check_PROGRAMS = $(am__EXEEXT_5) + TESTS = $(am__EXEEXT_5) ---- gnutls-2.4.0/tests/openpgp/Makefile.in 2008-06-18 17:02:37.000000000 +0200 -+++ gnutls-2.4.0/tests/openpgp/Makefile.in 2008-06-27 20:07:00.000000000 +0200 +--- gnutls-2.6.1/tests/openpgp/Makefile.in 2008-11-10 10:37:52.000000000 +0100 ++++ gnutls-2.6.1/tests/openpgp/Makefile.in 2008-11-10 19:32:26.000000000 +0100 @@ -51,7 +51,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ @@ -38,8 +29,8 @@ build failures in chroots. See also: subdir = tests/openpgp DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ---- gnutls-2.4.0/guile/tests/Makefile.in 2008-06-18 17:02:34.000000000 +0200 -+++ gnutls-2.4.0/guile/tests/Makefile.in 2008-06-27 20:08:13.000000000 +0200 +--- gnutls-2.6.1/guile/tests/Makefile.in 2008-11-10 10:37:50.000000000 +0100 ++++ gnutls-2.6.1/guile/tests/Makefile.in 2008-11-10 19:32:50.000000000 +0100 @@ -48,7 +48,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix new file mode 100644 index 00000000000..4bec18e7eca --- /dev/null +++ b/pkgs/development/libraries/goocanvas/default.nix @@ -0,0 +1,17 @@ +args: +args.stdenv.mkDerivation { + name = "goocanvas-0.10"; + + src = args.fetchurl { + url = mirror://sourceforge/goocanvas/goocanvas-0.10.tar.gz; + sha256 = "0b49szbr3n7vpavly9w17ipa8q3ydicdcd177vxbdvbsnvg7aqp9"; + }; + + buildInputs =(with args; [gtk cairo glib pkgconfig]); + + meta = { + description = "canvas widget for GTK+ using the cairo 2D library"; + homepage = http://goocanvas.sourceforge.net/; + license = ["GPL" "LGPL"]; + }; +} diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 678fbdb137a..bedd49e3dc6 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -1,13 +1,21 @@ args: with args; rec { - gstreamerFun = lib.sumArgs (selectVersion ./gstreamer "0.10.17") args; + gstreamerFun = lib.sumArgs (selectVersion ./gstreamer "0.10.21") args; gstreamer = gstreamerFun null; - gstPluginsBaseFun = lib.sumArgs (selectVersion ./gst-plugins-base "0.10.17") + gstPluginsBaseFun = lib.sumArgs (selectVersion ./gst-plugins-base "0.10.21") args { inherit gstreamer; }; gstPluginsBase = gstPluginsBaseFun null; - gstPluginsGoodFun = lib.sumArgs (selectVersion ./gst-plugins-good "0.10.6") + gstPluginsGoodFun = lib.sumArgs (selectVersion ./gst-plugins-good "0.10.11") args { inherit gstPluginsBase; }; gstPluginsGood = gstPluginsGoodFun null; + + gstFfmpeg = import ./gst-ffmpeg { + inherit fetchurl stdenv pkgconfig gstPluginsBase bzip2; + }; + + gnonlin = import ./gnonlin { + inherit fetchurl stdenv pkgconfig gstreamer gstPluginsBase; + }; } diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix new file mode 100644 index 00000000000..4dd8db4e18c --- /dev/null +++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix @@ -0,0 +1,21 @@ +args: with args; + +let version = "0.10.10"; in + stdenv.mkDerivation rec { + name = "gnonlin-${version}"; + + src = fetchurl { + url = "http://gstreamer.freedesktop.org/src/gnonlin/gnonlin-${version}.tar.gz"; + sha256 = "041in2y0x3755hw29rhnyhsh216v2fl1q1p12m9faxiv2r52x83y"; + }; + + buildInputs = [ gstPluginsBase gstreamer pkgconfig ]; + + configureFlags = "--enable-shared --disable-static"; + + meta = { + homepage = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; + description = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; + license = "GPLv2+"; + }; + } diff --git a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix new file mode 100644 index 00000000000..6ec9acf0e9b --- /dev/null +++ b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix @@ -0,0 +1,24 @@ +{ fetchurl, stdenv, pkgconfig, gstPluginsBase, bzip2 }: + +let version = "0.10.5"; in + stdenv.mkDerivation rec { + name = "gst-ffmpeg-${version}"; + + src = fetchurl { + url = "http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2"; + sha256 = "12y240jp2lda57frz7pj96izqxcns0k31cc5rp4kdfwwfdsvy5ik"; + }; + + propagatedBuildInputs = [ gstPluginsBase ]; + buildInputs = [ pkgconfig bzip2 ]; + + configureFlags = "--enable-shared --disable-static --enable-ladspa"; + + meta = { + homepage = "http://gstreamer.freedesktop.org/releases/gst-ffmpeg/${version}.html"; + + description = "GStreamer's plug-in using FFmpeg"; + + license = "GPLv2+"; + }; + } diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.21.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.21.nix new file mode 100644 index 00000000000..5777a571320 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.21.nix @@ -0,0 +1,24 @@ +args: with args; + +stdenv.mkDerivation rec { + name = "gst-plugins-base-" + version; + + src = fetchurl { + url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.bz2"; + sha256 = "14vyshhxpdpfd06jyw1fgcfxb6nh0bg7n2aqd9h9kapkl12llgv7"; + }; + + patchPhase = "sed -i 's@/bin/echo@echo@g' configure"; + + configureFlags = "--enable-shared --disable-static"; + +# TODO : v4l, libvisual + propagatedBuildInputs = [gstreamer libX11 libXv libXext alsaLib cdparanoia + libogg libtheora libvorbis freetype pango liboil gtk which gtkdoc]; + + buildInputs = [pkgconfig python]; + + meta = { + homepage = http://gstreamer.freedesktop.org; + }; +} diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.11.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.11.nix new file mode 100644 index 00000000000..4653f4277e7 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.11.nix @@ -0,0 +1,21 @@ +args: with args; + +stdenv.mkDerivation rec { + name = "gst-plugins-good-" + version; + + src = fetchurl { + url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.bz2"; + sha256 = "1ccnyzn9n2a6xjxz5srydc8bm63mjz5cxbcwbigxzqw0a033ych5"; + }; + + propagatedBuildInputs = [gstPluginsBase aalib cairo flac hal libjpeg + zlib speex libpng libdv libcaca dbus.libs libiec61883 libavc1394 ladspaH + taglib ]; + buildInputs = [pkgconfig]; + + configureFlags = "--enable-shared --disable-static --enable-ladspa"; + + meta = { + homepage = http://gstreamer.freedesktop.org; + }; +} diff --git a/pkgs/development/libraries/gstreamer/gstreamer/0.10.17.nix b/pkgs/development/libraries/gstreamer/gstreamer/0.10.17.nix index 3508145c22c..02244e77371 100644 --- a/pkgs/development/libraries/gstreamer/gstreamer/0.10.17.nix +++ b/pkgs/development/libraries/gstreamer/gstreamer/0.10.17.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { configureFlags = "--enable-shared --disable-static --enable-failing-tests --localstatedir=/var"; + setupHook = ./setup-hook.sh; + meta = { homepage = http://gstreamer.freedesktop.org; }; diff --git a/pkgs/development/libraries/gstreamer/gstreamer/0.10.21.nix b/pkgs/development/libraries/gstreamer/gstreamer/0.10.21.nix new file mode 100644 index 00000000000..30b5b40ffe0 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/gstreamer/0.10.21.nix @@ -0,0 +1,20 @@ +args: with args; + +stdenv.mkDerivation rec { + name = "gstreamer-" + version; + + src = fetchurl { + url = "${meta.homepage}/src/gstreamer/${name}.tar.bz2"; + sha256 = "1ly3b6ja51vwwkdqzi20hg5azdsrz5pnhswgagdwsprb8nh8bhcl"; + }; + + buildInputs = [perl bison flex pkgconfig python which gtkdoc ]; + propagatedBuildInputs = [glib libxml2]; + + configureFlags = "--enable-shared --disable-static --enable-failing-tests + --localstatedir=/var --disable-gtk-doc --disable-docbook"; + + meta = { + homepage = http://gstreamer.freedesktop.org; + }; +} diff --git a/pkgs/development/libraries/gstreamer/gstreamer/setup-hook.sh b/pkgs/development/libraries/gstreamer/gstreamer/setup-hook.sh new file mode 100644 index 00000000000..ad184dc21e9 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/gstreamer/setup-hook.sh @@ -0,0 +1,8 @@ +addGstreamerLibPath () { + if test -d "$1/lib/gstreamer-0.10" + then + export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}${GST_PLUGIN_PATH:+:}$1/lib/gstreamer-0.10" + fi +} + +envHooks=(${envHooks[@]} addGstreamerLibPath) diff --git a/pkgs/development/libraries/gtk-sharp-1/default.nix b/pkgs/development/libraries/gtk-sharp-1/default.nix index 262e42bf000..2110884a022 100644 --- a/pkgs/development/libraries/gtk-sharp-1/default.nix +++ b/pkgs/development/libraries/gtk-sharp-1/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/gtk-sharp-1.0.6.tar.gz; + url = http://nixos.org/tarballs/gtk-sharp-1.0.6.tar.gz; md5 = "2651d14fe77174ab20b8af53d150ee11"; }; diff --git a/pkgs/development/libraries/gtk-sharp-2/default.nix b/pkgs/development/libraries/gtk-sharp-2/default.nix index e308a2afa39..cd2adfdd66b 100644 --- a/pkgs/development/libraries/gtk-sharp-2/default.nix +++ b/pkgs/development/libraries/gtk-sharp-2/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/gtk-sharp-1.9.2.tar.gz; + url = http://nixos.org/tarballs/gtk-sharp-1.9.2.tar.gz; md5 = "b7c5afab5f736ffa4011974302831363"; }; diff --git a/pkgs/development/libraries/gtkmozembed-sharp/default.nix b/pkgs/development/libraries/gtkmozembed-sharp/default.nix index 2af5ac93ca9..43476d6e78a 100644 --- a/pkgs/development/libraries/gtkmozembed-sharp/default.nix +++ b/pkgs/development/libraries/gtkmozembed-sharp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/gtkmozembed-sharp-0.7-pre41601.tar.bz2; + url = http://nixos.org/tarballs/gtkmozembed-sharp-0.7-pre41601.tar.bz2; md5 = "34aac139377296791acf3af9b5dc27ed"; }; diff --git a/pkgs/development/libraries/gtksourceview-sharp/default.nix b/pkgs/development/libraries/gtksourceview-sharp/default.nix index 430226789ea..abd97ca777b 100644 --- a/pkgs/development/libraries/gtksourceview-sharp/default.nix +++ b/pkgs/development/libraries/gtksourceview-sharp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/gtksourceview-sharp-0.6-pre40261.tar.bz2; + url = http://nixos.org/tarballs/gtksourceview-sharp-0.6-pre40261.tar.bz2; md5 = "8bc26c182bd897f50988e110a9a11f34"; }; diff --git a/pkgs/development/libraries/haskell/monadlab/default.nix b/pkgs/development/libraries/haskell/monadlab/default.nix new file mode 100644 index 00000000000..94044e4d585 --- /dev/null +++ b/pkgs/development/libraries/haskell/monadlab/default.nix @@ -0,0 +1,11 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "MonadLab"; + version = "0.0.1"; + sha256 = "06fdfkm79653s08ykcf3gl84cf2jl7h3vj00jv3khji5448fwsaw"; + meta = { + description = "Automatically generate layered monads."; + }; + propagatedBuildInputs = []; +}) diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix index de548d1ddb7..24e7d2afab5 100644 --- a/pkgs/development/libraries/imlib/default.nix +++ b/pkgs/development/libraries/imlib/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "imlib-1.9.15"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/imlib-1.9.15.tar.gz; + url = http://nixos.org/tarballs/imlib-1.9.15.tar.gz; md5 = "2a5561457e7f8b2e04d88f73508fd13a"; }; diff --git a/pkgs/development/libraries/java/jakarta-bcel/default.nix b/pkgs/development/libraries/java/jakarta-bcel/default.nix index fc609d8095b..3bea2a0d8f4 100644 --- a/pkgs/development/libraries/java/jakarta-bcel/default.nix +++ b/pkgs/development/libraries/java/jakarta-bcel/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/bcel-5.1.tar.gz; + url = http://nixos.org/tarballs/bcel-5.1.tar.gz; md5 = "318f22e4f5f59b68cd004db83a7d65dc"; }; diff --git a/pkgs/development/libraries/java/jakarta-regexp/default.nix b/pkgs/development/libraries/java/jakarta-regexp/default.nix index e95df89ecc3..d6c093423d8 100644 --- a/pkgs/development/libraries/java/jakarta-regexp/default.nix +++ b/pkgs/development/libraries/java/jakarta-regexp/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { builder = ./java-bin-builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/jakarta-regexp-1.4.tar.gz; + url = http://nixos.org/tarballs/jakarta-regexp-1.4.tar.gz; md5 = "d903d84c949df848009f3bf205b32c97"; }; diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix index e3730693659..13018d29dcb 100644 --- a/pkgs/development/libraries/lcms/default.nix +++ b/pkgs/development/libraries/lcms/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "lcms-1.14"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/lcms-1.14.tar.gz; + url = http://nixos.org/tarballs/lcms-1.14.tar.gz; md5 = "5a803460aeb10e762d97e11a37462a69"; }; } diff --git a/pkgs/development/libraries/libcv/default.nix b/pkgs/development/libraries/libcv/default.nix new file mode 100644 index 00000000000..7daa084c8e5 --- /dev/null +++ b/pkgs/development/libraries/libcv/default.nix @@ -0,0 +1,33 @@ +args : +let + lib = args.lib; + fetchurl = args.fetchurl; + FullDepEntry = args.FullDepEntry; + + version = lib.getAttr ["version"] "" args; + buildInputs = with args; [ + libtiff libpng libjpeg pkgconfig + gtk glib + ]; +in +rec { + src = fetchurl { + url = ftp://ftp.debian.org/debian/pool/main/o/opencv/opencv_0.9.7.orig.tar.gz; + sha256 = "14qnm59gn518gjxwjb9hm3ij0b1awlxa76qdvnn5ygxsx713lf2j"; + }; + + inherit buildInputs; + configureFlags = []; + + /* doConfigure should be specified separately */ + phaseNames = ["doConfigure" "doMakeInstall" "postInstall"]; + + postInstall = FullDepEntry ('' + ln -s $out/include/opencv/* $out/include + '') ["doMakeInstall" "minInit"]; + + name = "libcv-" + version; + meta = { + description = "libcv - computer vision library"; + }; +} diff --git a/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix b/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix index 2dd008c7348..575d141fcf5 100644 --- a/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix +++ b/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = mirror://sourceforge/libdbi-drivers/libdbi-drivers-0.8.2-1.tar.gz; diff --git a/pkgs/development/libraries/libdbi/0.8.2.nix b/pkgs/development/libraries/libdbi/0.8.2.nix index 06c76438604..fd7b950c3ce 100644 --- a/pkgs/development/libraries/libdbi/0.8.2.nix +++ b/pkgs/development/libraries/libdbi/0.8.2.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = mirror://sourceforge/libdbi/libdbi-0.8.2.tar.gz; diff --git a/pkgs/development/libraries/libextractor/0.5.18.nix b/pkgs/development/libraries/libextractor/0.5.18.nix index 5d854115b04..da3bafd915b 100644 --- a/pkgs/development/libraries/libextractor/0.5.18.nix +++ b/pkgs/development/libraries/libextractor/0.5.18.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://gnunet.org/libextractor/download/libextractor-0.5.18.tar.gz; diff --git a/pkgs/development/libraries/libjpeg-static/default.nix b/pkgs/development/libraries/libjpeg-static/default.nix index a088987fcba..e0722eba415 100644 --- a/pkgs/development/libraries/libjpeg-static/default.nix +++ b/pkgs/development/libraries/libjpeg-static/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libjpeg-6b"; builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/jpegsrc.v6b.tar.gz; + url = http://nixos.org/tarballs/jpegsrc.v6b.tar.gz; md5 = "dbd5f3b47ed13132f04c685d608a7547"; }; inherit libtool; @@ -15,11 +15,11 @@ stdenv.mkDerivation { # Required for building of dynamic libraries on Darwin. patches = [ (fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/patch-ltconfig; + url = http://nixos.org/tarballs/patch-ltconfig; md5 = "e6725fa4a09aa1de4ca75343fd0f61d5"; }) (fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/patch-ltmain.sh; + url = http://nixos.org/tarballs/patch-ltmain.sh; #md5 = "489986ad8e7a93aef036766b25f321d5"; md5 = "092a12aeb0c386dd7dae059109d950ba"; }) diff --git a/pkgs/development/libraries/liboil/0.3.15.nix b/pkgs/development/libraries/liboil/0.3.15.nix new file mode 100644 index 00000000000..db068d2dec3 --- /dev/null +++ b/pkgs/development/libraries/liboil/0.3.15.nix @@ -0,0 +1,20 @@ +args: with args; + +stdenv.mkDerivation rec { + name = "liboil-" + version; + + src = fetchurl { + url = "${meta.homepage}/download/${name}.tar.gz"; + sha256 = "1m3zcl54sf21cf2ckzny16ihymz8whi60ymyrhmd3m1dlw1knpmf"; + }; + + configureFlags = "--enable-shared --disable-static"; + + buildInputs = [pkgconfig glib]; + + meta = { + homepage = http://liboil.freedesktop.org; + description = "Liboil is a library of simple functions that are optimized + for various CPUs."; + }; +} diff --git a/pkgs/development/libraries/libsigsegv/2.5.nix b/pkgs/development/libraries/libsigsegv/2.5.nix index 11f69753dc8..af8bd225820 100644 --- a/pkgs/development/libraries/libsigsegv/2.5.nix +++ b/pkgs/development/libraries/libsigsegv/2.5.nix @@ -11,4 +11,7 @@ stdenv.mkDerivation rec { homepage = http://libsigsegv.sf.net; description = "A library for handling page faults in user mode"; }; + + configureFlags = "--enable-shared --disable-static"; + doCheck = true; } diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index 2a6f2254c14..7b63cbb9f78 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, libogg, libvorbis}: stdenv.mkDerivation { - name = "libtheora-1.0beta2"; + name = "libtheora-1.0"; src = fetchurl { - url = http://downloads.xiph.org/releases/theora/libtheora-1.0beta2.tar.gz; - sha256 = "0iwwprpi4s9y37c5yvlb572wd5gb2s635pxrkz5589266g1j1dcg"; + url = http://downloads.xiph.org/releases/theora/libtheora-1.0.tar.gz; + sha256 = "0j5hv0pfsiwa2qq5d647py4g7ixnax1v47xc3aj5sa9v2iknib6m"; }; propagatedBuildInputs = [libogg libvorbis]; } diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 52ed30c0ae9..a7dad9d5589 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,14 +1,19 @@ -args: with args; +{stdenv, fetchurl}: + stdenv.mkDerivation rec { - name = "libunwind-0.98.6"; - src = fetchurl { - url = "http://download.savannah.nongnu.org/releases/libunwind/${name}.tar.gz"; - sha256 = "1qfxqkyx4r5dmwajyhvsyyl8zwxs6n2rcg7a61fgfdfp0gxvpzgx"; - }; - configureFlags = "--enable-shared --disable-static"; - meta = { - homepage = http://www.nongnu.org/libunwind; - description = "The primary goal of this project is to define a portable - and efficient API to determine the call-chain of a program"; - }; + name = "libunwind-0.98.6"; + + src = fetchurl { + url = "http://download.savannah.nongnu.org/releases/libunwind/${name}.tar.gz"; + sha256 = "1qfxqkyx4r5dmwajyhvsyyl8zwxs6n2rcg7a61fgfdfp0gxvpzgx"; + }; + + configureFlags = "--enable-shared --disable-static"; + + NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; + + meta = { + homepage = http://www.nongnu.org/libunwind; + description = "A portable and efficient API to determine the call-chain of a program"; + }; } diff --git a/pkgs/development/libraries/neon/0.28.nix b/pkgs/development/libraries/neon/0.28.nix index 7043679e1e3..ff777688565 100644 --- a/pkgs/development/libraries/neon/0.28.nix +++ b/pkgs/development/libraries/neon/0.28.nix @@ -1,23 +1,27 @@ { stdenv, fetchurl, libxml2 , compressionSupport ? true, zlib ? null , sslSupport ? true, openssl ? null +, static ? false +, shared ? true }: assert compressionSupport -> zlib != null; assert sslSupport -> openssl != null; +assert static || shared; stdenv.mkDerivation { name = "neon-0.28.3"; - + src = fetchurl { url = http://www.webdav.org/neon/neon-0.28.3.tar.gz; sha256 = "1hnd9wlbnfpppx6rvalhdkc1rf29afacl1m15z751g3h9hdybplh"; }; - + buildInputs = [libxml2] ++ stdenv.lib.optional compressionSupport zlib; configureFlags = '' - --enable-shared --disable-static + ${if shared then "--enable-shared" else "--disable-shared"} + ${if static then "--enable-static" else "--disable-static"} ${if compressionSupport then "--with-zlib" else "--without-zlib"} ${if sslSupport then "--with-ssl --with-libs=${openssl}" else "--without-ssl"} ''; diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix new file mode 100644 index 00000000000..35264f2cdf6 --- /dev/null +++ b/pkgs/development/libraries/ode/default.nix @@ -0,0 +1,27 @@ +args : +let + lib = args.lib; + fetchurl = args.fetchurl; + + version = lib.getAttr ["version"] "0.10.1" args; + buildInputs = with args; [ + + ]; +in +rec { + src = fetchurl { + url = "http://downloads.sourceforge.net/opende/ode-${version}.tar.bz2"; + sha256 = "0bm7kmm7qvrbk40pgaszqr66pjfvnln8vjzdmcdl2h1dxi3b4dln"; + }; + + inherit buildInputs; + configureFlags = []; + + /* doConfigure should be specified separately */ + phaseNames = ["doConfigure" "doMakeInstall"]; + + name = "ode-" + version; + meta = { + description = "Open Dynamics Engine"; + }; +} diff --git a/pkgs/development/libraries/openal/builder.sh b/pkgs/development/libraries/openal/builder.sh deleted file mode 100644 index c870497eb6c..00000000000 --- a/pkgs/development/libraries/openal/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -source $stdenv/setup - -preConfigure=preConfigure -preConfigure() { - ./autogen.sh -} - -genericBuild \ No newline at end of file diff --git a/pkgs/development/libraries/openal/default.nix b/pkgs/development/libraries/openal/default.nix index 887a668b4e6..170cb521047 100644 --- a/pkgs/development/libraries/openal/default.nix +++ b/pkgs/development/libraries/openal/default.nix @@ -1,15 +1,38 @@ -{stdenv, fetchurl, alsaLib, autoconf, automake, libtool}: +{ stdenv, fetchurl, alsaLib, cmake }: + +let version = "1.5.304"; in +stdenv.mkDerivation rec { + name = "openal-${version}"; -stdenv.mkDerivation { - name = "openal-0.0.8"; src = fetchurl { - url = http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz; - md5 = "0379bd39fc84454491ef38434a2e6e8d"; + url = "http://connect.creativelabs.com/openal/Downloads/openal-soft-${version}.tar.bz2"; + sha256 = "0k26ycprmpynvfkqkqsbaahl6avn033z2c03sp21vhpqbyms50ks"; + }; + + # FIXME: The `$out/bin/openal-info' executable doesn't have the + # right RPATH, so it can't find `libopenal.so'. This must be fixed + # by tweaking the CMake crap. + buildInputs = [ cmake alsaLib ]; + + meta = { + description = "OpenAL, a cross-platform 3D audio API"; + + longDescription = '' + OpenAL is a cross-platform 3D audio API appropriate for use with + gaming applications and many other types of audio applications. + + The library models a collection of audio sources moving in a 3D + space that are heard by a single listener somewhere in that + space. The basic OpenAL objects are a Listener, a Source, and a + Buffer. There can be a large number of Buffers, which contain + audio data. Each buffer can be attached to one or more Sources, + which represent points in 3D space which are emitting audio. + There is always one Listener object (per audio context), which + represents the position where the sources are heard -- rendering + is done from the perspective of the Listener. + ''; + + homepage = http://www.openal.org/; + license = "GPLv2+"; }; - # Note: the autoconf/automake dependency can go once the Automake - # patch is unnecessary. - builder = ./builder.sh; - patches = [./makefile.patch]; - buildInputs = [alsaLib autoconf automake libtool]; - configureFlags = ["--disable-arts" "--enable-alsa"]; } diff --git a/pkgs/development/libraries/openal/makefile.patch b/pkgs/development/libraries/openal/makefile.patch deleted file mode 100644 index a7feafeed95..00000000000 --- a/pkgs/development/libraries/openal/makefile.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -rc openal-0.0.8-orig/configure.ac openal-0.0.8-new/configure.ac -*** openal-0.0.8-orig/configure.ac 2005-12-15 16:58:45.000000000 +0100 ---- openal-0.0.8-new/configure.ac 2006-01-26 14:28:47.000000000 +0100 -*************** -*** 530,535 **** ---- 530,537 ---- - fi - fi - -+ AM_CONDITIONAL([ARTSENABLED], [test -n "$HAVEARTS"]) -+ - # enable esd sound? - AC_ARG_ENABLE([esd], - [AS_HELP_STRING([--enable-esd], -*************** -*** 558,563 **** ---- 560,567 ---- - fi - fi - -+ AM_CONDITIONAL([ESDENABLED], [test -n "$HAVEESD"]) -+ - # enable wave output? - AC_ARG_ENABLE([waveout], - [AS_HELP_STRING([--enable-waveout], -*************** -*** 614,619 **** ---- 618,625 ---- - esac - fi - -+ AM_CONDITIONAL([SDLENABLED], [test -n "$HAVESDL"]) -+ - # enable directsound backend? - AC_ARG_ENABLE([dsound], - [AS_HELP_STRING([--enable-dsound], -diff -rc openal-0.0.8-orig/src/Makefile.am openal-0.0.8-new/src/Makefile.am -*** openal-0.0.8-orig/src/Makefile.am 2005-12-04 19:16:21.000000000 +0100 ---- openal-0.0.8-new/src/Makefile.am 2006-01-26 14:28:56.000000000 +0100 -*************** -*** 61,79 **** - arch/alsa/alsa.h - endif - - libopenal_la_SOURCES += \ - arch/interface/interface_sound.c \ - arch/interface/interface_sound.h \ - arch/interface/platform.h \ - arch/portable/cpu_caps.c \ -- arch/arts/arts.c \ -- arch/arts/arts.h \ -- arch/esd/esd.c \ -- arch/esd/esd.h \ - arch/null/null.c \ - arch/null/null.h \ -- arch/sdl/sdl.c \ -- arch/sdl/sdl.h \ - arch/waveout/waveout.c \ - arch/waveout/waveout.h - ---- 61,91 ---- - arch/alsa/alsa.h - endif - -+ if SDLENABLED -+ libopenal_la_SOURCES += \ -+ arch/sdl/sdl.c \ -+ arch/sdl/sdl.h -+ endif -+ -+ if ESDENABLED -+ libopenal_la_SOURCES += \ -+ arch/esd/esd.c \ -+ arch/esd/esd.h -+ endif -+ -+ if ARTSENABLED -+ libopenal_la_SOURCES += \ -+ arch/arts/arts.c \ -+ arch/arts/arts.h -+ endif -+ - libopenal_la_SOURCES += \ - arch/interface/interface_sound.c \ - arch/interface/interface_sound.h \ - arch/interface/platform.h \ - arch/portable/cpu_caps.c \ - arch/null/null.c \ - arch/null/null.h \ - arch/waveout/waveout.c \ - arch/waveout/waveout.h - diff --git a/pkgs/development/libraries/openmotif/default.nix b/pkgs/development/libraries/openmotif/default.nix new file mode 100644 index 00000000000..cf9b059bd16 --- /dev/null +++ b/pkgs/development/libraries/openmotif/default.nix @@ -0,0 +1,32 @@ +args: with args; + +# this is the stable edition of OpenMotif - sources fetched from Debian, without +# patches applied + +stdenv.mkDerivation { + name = "openmotif-2.2.3"; + src = fetchurl { + url = http://ftp.de.debian.org/debian/pool/non-free/o/openmotif/openmotif_2.2.3.orig.tar.gz; + sha256 = "0amd9834p1ajnin7c8f1gad2jl2csf69msxcpc10rzm2x27jigxi"; + }; + + unpackPhase = '' + tar xzf $src + tar xzf openmotif-2.2.3.orig/dist/openMotif-2.2.3.tar.gz + rm -rf openmotif-2.2.3.orig + cd openMotif-2.2.3 + ''; + + buildInputs = [flex perl]; + propagatedBuildInputs = [x11 libXp libXau libXaw libXext xbitmaps]; + + CFLAGS="-fno-strict-aliasing"; # without this openmotif may segfault + + meta = { + description = "Open source version of motif toolkit including aka libmotif3"; + homepage = http://www.opengroup.org/openmotif/; + # Open motif is free for open source projects + license = "non-free"; + }; +} + diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 0ca141fc528..e9dd19859f2 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, unicodeSupport ? false, cplusplusSupport ? true}: stdenv.mkDerivation { - name = "pcre-7.8"; + name = "pcre-7.4"; src = fetchurl { - url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-7.8.tar.bz2; - sha256 = "1zsqk352mx2zklf9bgpg9d88ckfdssbbbiyslhrycfckw8m3qpvr"; + url = mirror://sourceforge/pcre/pcre-7.4.tar.bz2; + sha256 = "1rdks2h5f3p2d71c4jnxaic1c9gmgsfky80djnafcdbdrhzkiyx5"; }; configureFlags = '' ${if unicodeSupport then "--enable-unicode-properties --enable-shared --disable-static" else ""} diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix new file mode 100644 index 00000000000..33b940f7718 --- /dev/null +++ b/pkgs/development/libraries/plib/default.nix @@ -0,0 +1,38 @@ +{ fetchurl, stdenv, mesa, freeglut, SDL +, libXi, libSM, libXmu, libXext, libX11 }: + +stdenv.mkDerivation rec { + name = "plib-1.8.5"; + + src = fetchurl { + # XXX: The author doesn't use the orthodox SF way to store tarballs. + url = "http://plib.sourceforge.net/dist/${name}.tar.gz"; + sha256 = "0cha71mflpa10vh2l7ipyqk67dq2y0k5xbafwdks03fwdyzj4ns8"; + }; + + propagatedBuildInputs = [ + mesa freeglut SDL + + # The following libs ought to be propagated build inputs of Mesa. + libXi libSM libXmu libXext libX11 + ]; + + meta = { + description = "PLIB: A Suite of Portable Game Libraries"; + + longDescription = '' + PLIB includes sound effects, music, a complete 3D engine, font + rendering, a simple Windowing library, a game scripting + language, a GUI, networking, 3D math library and a collection of + handy utility functions. All are 100% portable across nearly + all modern computing platforms. What's more, it's all available + on line - and completely free. Each library component is fairly + independent of the others - so if you want to use SDL, GTK, + GLUT, or FLTK instead of PLIB's 'PW' windowing library, you can. + ''; + + license = "LGPLv2+"; + + homepage = http://plib.sourceforge.net/; + }; +} diff --git a/pkgs/development/libraries/popt/popt-1.7.nix b/pkgs/development/libraries/popt/popt-1.7.nix index 9ae06b0ed26..d82fa2b9fc7 100644 --- a/pkgs/development/libraries/popt/popt-1.7.nix +++ b/pkgs/development/libraries/popt/popt-1.7.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ ftp://distro.ibiblio.org/pub/linux/distributions/pdaxrom/src/popt-1.7.tar.gz - http://nix.cs.uu.nl/dist/tarballs/popt-1.7.tar.gz + http://nixos.org/tarballs/popt-1.7.tar.gz ]; md5 = "5988e7aeb0ae4dac8d83561265984cc9"; }; diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix new file mode 100644 index 00000000000..f78a6073b71 --- /dev/null +++ b/pkgs/development/libraries/pupnp/default.nix @@ -0,0 +1,25 @@ +{ fetchurl, stdenv }: + +stdenv.mkDerivation rec { + name = "libupnp-1.6.6"; + + src = fetchurl { + url = "mirror://sourceforge/pupnp/${name}.tar.bz2"; + sha256 = "1cxvn0v8lcc5p70jc3j50a7rm12am6xr0l2fibi8075jqazcmmsq"; + }; + + meta = { + description = "libupnp, an open source UPnP development kit for Linux"; + + longDescription = '' + The Linux SDK for UPnP Devices (libupnp) provides developers + with an API and open source code for building control points, + devices, and bridges that are compliant with Version 1.0 of the + UPnP Device Architecture Specification. + ''; + + license = "BSD-style"; + + homepage = http://pupnp.sourceforge.net/; + }; +} diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index 1b6a93fe653..037de754a27 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -7,6 +7,11 @@ stdenv.mkDerivation { sha256 = "1avbfppzgiws3nvqr7isr5a5pfbk3g4gfgd89xhyiywixjj3f7c6"; }; + # 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 ""; + buildInputs = [gfortran]; meta = { diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index b6cede8e148..fc844239516 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, readline}: stdenv.mkDerivation { - name = "sqlite-3.5.9"; + name = "sqlite-3.6.3"; # Note: don't use the "amalgamation" source release, since it # doesn't install sqlite3.pc. src = fetchurl { - url = http://www.sqlite.org/sqlite-3.5.9.tar.gz; - sha256 = "0731zj0fnivhfc74wc3yh0p9gn7fpjgy3g79haarciqkdf8k3lvx"; + url = http://www.sqlite.org/sqlite-3.6.3.tar.gz; + sha256 = "0kd9dpbrjp05159qsqwrm00h6a2cqjxqwpi33b6i5q8mr1bzkz1i"; }; buildInputs = [readline]; diff --git a/pkgs/development/libraries/stlport/builder.sh b/pkgs/development/libraries/stlport/builder.sh deleted file mode 100644 index e09db1e35ab..00000000000 --- a/pkgs/development/libraries/stlport/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -. $stdenv/setup - -tar jxvf $src -mkdir $out -mkdir $out/include - -cd STLport -cp -prv stlport $out/include diff --git a/pkgs/development/libraries/stlport/default.nix b/pkgs/development/libraries/stlport/default.nix index 8d99d4e73a9..040395ecf8a 100644 --- a/pkgs/development/libraries/stlport/default.nix +++ b/pkgs/development/libraries/stlport/default.nix @@ -1,11 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "STLport-5.0.0"; - builder = ./builder.sh; + name = "STLport-5.2.0"; src = fetchurl { - url = mirror://sourceforge/stlport/STLport-5.0.0.tar.bz2; - md5 = "5aefcbb0c30a91d50bb2d6c7b30e8393"; + url = mirror://sourceforge/stlport/STLport-5.2.0.tar.bz2; + md5 = "448d74859407912c0087adcf51bf109a"; }; } diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 9b8cee26868..636a5081c5f 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -8,6 +8,8 @@ args.stdenv.mkDerivation rec { sha256 = "07khxih1lmhvrzlaksqmaghbi8w2yyjrjcw867gi2y4z1h0ndhks"; }; + configureFlags= if args.stdenv.system == "x86_64-linux" then ["--enable-pic"] else []; + buildInputs =(with args; []); meta = { diff --git a/pkgs/development/misc/bleeding-edge-repos/default.nix b/pkgs/development/misc/bleeding-edge-repos/default.nix index 8ed2c80bacc..dade5b3e94b 100644 --- a/pkgs/development/misc/bleeding-edge-repos/default.nix +++ b/pkgs/development/misc/bleeding-edge-repos/default.nix @@ -1,6 +1,6 @@ args: with args; - let inherit (builtins) pathExists; in + let inherit (builtins) pathExists hasAttr getAttr head; in rec { /* tries to get source in this order @@ -13,13 +13,14 @@ args: managedRepoDir = getConfig [ "bleedingEdgeRepos" "managedRepoDir" ] (builtins.getEnv "HOME" + "/managed_repos"); sourceByName = name : - let localTarGZ = managedRepoDir+"/dist/${name}.tar.gz"; + let fetchinfo = if (hasAttr name fetchInfos) + then (getAttr name fetchInfos) { inherit fetchurl; } + else throw "no bleeding edge source attribute found in bleeding-edge-fetch-infos.nix with name ${name}\n" + "run NO_FETCH=1 nix-repository-manager --update to add it automatically"; + localTarGZ = managedRepoDir+"/dist/${ lib.dropPath (head fetchinfo.urls) }"; # hack, dropPath should be implemented as primop fetchInfos = import ../../../misc/bleeding-edge-fetch-infos.nix; in - if (getConfig ["bleedingEdgeRepos" "useLocalRepos"] false ) && pathExists localTarGZ - then localTarGZ - else if __hasAttr name fetchInfos - then (__getAttr name fetchInfos) { inherit fetchurl; } - else throw "warning, no bleeding edge source attribute found in bleeding-edge-fetch-infos.nix with name ${name}"; + if (getConfig ["bleedingEdgeRepos" "useLocalRepos"] false ) + then localTarGZ else fetchinfo; repos = let kde4support = builtins.listToAttrs (map (n: lib.nv ("kdesupport_"+n) { type = "svn"; url = "svn://anonsvn.kde.org/home/kde/trunk/kdesupport/${n}"; groups="kdesupport"; }) @@ -36,6 +37,8 @@ args: plugins = { type = "darcs"; url="http://code.haskell.org/~dons/code/hs-plugins/"; groups="haskell"; }; + hg2git = { type = "git"; url="git://repo.or.cz/hg2git.git"; }; + # darcs repositories haskell http = { type= "darcs"; url="http://darcs.haskell.org/http/"; groups="happs"; }; syb_with_class = { type="darcs"; url="http://happs.org/HAppS/syb-with-class"; groups="happs"; }; @@ -64,6 +67,8 @@ args: kdepimlibs = { type="svn"; url="svn://anonsvn.kde.org/home/kde/trunk/KDE/kdepimlibs"; groups = "kde"; }; 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"; }; + # git repositories hypertable = { type="git"; url="git://scm.hypertable.org/pub/repos/hypertable.git"; groups=""; }; } // kde4support // getConfig [ "bleedingEdgeRepos" "repos" ] {}; diff --git a/pkgs/development/perl-modules/Archive-Zip/default.nix b/pkgs/development/perl-modules/Archive-Zip/default.nix deleted file mode 100644 index 752b812a2de..00000000000 --- a/pkgs/development/perl-modules/Archive-Zip/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{fetchurl, perl}: - -import ../generic perl { - name = "Archive-Zip-1.16"; - src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/Archive-Zip-1.16.tar.gz; - md5 = "e28dff400d07b1659d659d8dde7071f1"; - }; -} diff --git a/pkgs/development/perl-modules/BerkeleyDB/default.nix b/pkgs/development/perl-modules/BerkeleyDB/default.nix index 24423fb359f..59826ee8a44 100644 --- a/pkgs/development/perl-modules/BerkeleyDB/default.nix +++ b/pkgs/development/perl-modules/BerkeleyDB/default.nix @@ -2,10 +2,14 @@ import ../generic perl { name = "BerkeleyDB-0.27"; + src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/BerkeleyDB-0.27.tar.gz; + url = http://nixos.org/tarballs/BerkeleyDB-0.27.tar.gz; md5 = "43aa72c0c6941af0d656d749ad543e96"; }; - perlPreHook = "source ${./hook.sh}"; - inherit db4; + + preConfigure = '' + echo "LIB = ${db4}/lib" > config.in + echo "INCLUDE = ${db4}/include" >> config.in + ''; } diff --git a/pkgs/development/perl-modules/BerkeleyDB/hook.sh b/pkgs/development/perl-modules/BerkeleyDB/hook.sh deleted file mode 100644 index c0735d27e9f..00000000000 --- a/pkgs/development/perl-modules/BerkeleyDB/hook.sh +++ /dev/null @@ -1,7 +0,0 @@ -oldPreConfigure=$preConfigure -preConfigure=myPreConfigure -myPreConfigure() { - echo "LIB = $db4/lib" > config.in - echo "INCLUDE = $db4/include" >> config.in - $oldPreConfigure -} diff --git a/pkgs/development/perl-modules/Compress-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Zlib/default.nix deleted file mode 100644 index 38a821d915f..00000000000 --- a/pkgs/development/perl-modules/Compress-Zlib/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{fetchurl, perl}: - -import ../generic perl { - name = "Compress-Zlib-1.41"; - src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/Compress-Zlib-1.41.tar.gz; - md5 = "ac135b84a03e814734496777cf5e5722"; - }; -} diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix new file mode 100644 index 00000000000..3aa6a9486a0 --- /dev/null +++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix @@ -0,0 +1,19 @@ +{fetchurl, buildPerlPackage, perlDBI, sqlite}: + +buildPerlPackage { + name = "DBD-SQLite-1.14"; + + src = fetchurl { + url = mirror://cpan/authors/id/M/MS/MSERGEANT/DBD-SQLite-1.14.tar.gz; + sha256 = "01qd5xfx702chg3bv2k727kfdp84zy5xh31y6njvivkp78vrs624"; + }; + + propagatedBuildInputs = [perlDBI]; + + makeMakerFlags = "SQLITE_LOCATION=${sqlite}"; + + patches = [ + # Prevent segfaults in case of timeouts. + ./reset.patch + ]; +} diff --git a/pkgs/development/perl-modules/DBD-SQLite/reset.patch b/pkgs/development/perl-modules/DBD-SQLite/reset.patch new file mode 100644 index 00000000000..af6a0b73796 --- /dev/null +++ b/pkgs/development/perl-modules/DBD-SQLite/reset.patch @@ -0,0 +1,40 @@ +diff -rc DBD-SQLite-1.14-orig/dbdimp.c DBD-SQLite-1.14/dbdimp.c +*** DBD-SQLite-1.14-orig/dbdimp.c 2007-08-24 04:51:25.000000000 +0200 +--- DBD-SQLite-1.14/dbdimp.c 2008-11-10 18:31:53.000000000 +0100 +*************** +*** 398,405 **** + if (imp_sth->retval == SQLITE_ROW) { + continue; + } +! /* There are bug reports that say this should be sqlite3_reset() */ +! sqlite3_finalize(imp_sth->stmt); + sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval, (char*)sqlite3_errmsg(imp_dbh->db)); + return -5; + } +--- 398,404 ---- + if (imp_sth->retval == SQLITE_ROW) { + continue; + } +! sqlite3_reset(imp_sth->stmt); + sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval, (char*)sqlite3_errmsg(imp_dbh->db)); + return -5; + } +*************** +*** 418,425 **** + case SQLITE_DONE: DBIc_ACTIVE_on(imp_sth); + sqlite_trace(5, "exec ok - %d rows, %d cols\n", imp_sth->nrow, DBIc_NUM_FIELDS(imp_sth)); + return 0; +! /* There are bug reports that say this should be sqlite3_reset() */ +! default: sqlite3_finalize(imp_sth->stmt); + sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval, (char*)sqlite3_errmsg(imp_dbh->db)); + return -6; + } +--- 417,423 ---- + case SQLITE_DONE: DBIc_ACTIVE_on(imp_sth); + sqlite_trace(5, "exec ok - %d rows, %d cols\n", imp_sth->nrow, DBIc_NUM_FIELDS(imp_sth)); + return 0; +! default: sqlite3_reset(imp_sth->stmt); + sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval, (char*)sqlite3_errmsg(imp_dbh->db)); + return -6; + } +Only in DBD-SQLite-1.14/: dbdimp.c~ diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix index 339093625f6..f9074335004 100644 --- a/pkgs/development/perl-modules/DB_File/default.nix +++ b/pkgs/development/perl-modules/DB_File/default.nix @@ -2,10 +2,20 @@ import ../generic perl { name = "DB_File-1.816"; + src = fetchurl { url = mirror://cpan/authors/id/P/PM/PMQS/DB_File-1.816.tar.gz; sha256 = "1a668hk5v0l180kbqss2hq9khl756cmrykn8fz1rl4qzsp6lq284"; }; - perlPreHook = "source ${./hook.sh}"; + + preConfigure = '' + cat > config.in < config.in < /dev/null) diff --git a/pkgs/development/perl-modules/template-toolkit-nix-store.patch b/pkgs/development/perl-modules/template-toolkit-nix-store.patch new file mode 100644 index 00000000000..402f1cb41be --- /dev/null +++ b/pkgs/development/perl-modules/template-toolkit-nix-store.patch @@ -0,0 +1,23 @@ +diff -rc Template-Toolkit-2.20-orig/lib/Template/Provider.pm Template-Toolkit-2.20/lib/Template/Provider.pm +*** Template-Toolkit-2.20-orig/lib/Template/Provider.pm 2008-08-06 11:32:02.000000000 +0200 +--- Template-Toolkit-2.20/lib/Template/Provider.pm 2008-11-28 16:37:36.000000000 +0100 +*************** +*** 936,942 **** + sub _template_modified { + my $self = shift; + my $template = shift || return; +! return (stat( $template ))[9]; + } + + #------------------------------------------------------------------------ +--- 936,945 ---- + sub _template_modified { + my $self = shift; + my $template = shift || return; +! # Nix specific hack: timestamps of 0 (1-1-1970) should not be +! # treated as undefined, so return 1 instead. +! my $t = (stat( $template ))[9]; +! return (defined $t && $t == 0) ? 1 : $t; + } + + #------------------------------------------------------------------------ diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 8b8e2f976e0..9ce423bd934 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,19 +1,16 @@ -args: with args; -stdenv.mkDerivation { - name = "cmake-2.6.0"; +{fetchurl, stdenv, replace}: + +stdenv.mkDerivation rec { + name = "cmake-2.6.2"; setupHook = ./setup-hook.sh; - - src = fetchurl { url=http://www.cmake.org/files/v2.6/cmake-2.6.0.tar.gz; - sha256 = "09qgk5gk0pnihzf2mmqz5cayd64y5viic8x78x4czrh4982x76a9"; - }; - - propagatedBuildInputs = [replace]; - - postUnpack = "source \${setupHook}; fixCmakeFiles \${sourceRoot}"; - - postInstall="fixCmakeFiles \$out/share"; - meta = { description = "Cross-Platform Makefile Generator"; }; + src = fetchurl { + url = "http://www.cmake.org/files/v2.6/${name}.tar.gz"; + sha256 = "b3f5a9dfa97fb82cb1b7d78a62d949f93c8d4317af36674f337d27066fa6b7e9"; + }; + propagatedBuildInputs = [replace]; + postUnpack = "source \${setupHook}; fixCmakeFiles \${sourceRoot}"; + postInstall="fixCmakeFiles \$out/share"; } diff --git a/pkgs/development/tools/build-managers/gnumake-3.80/default.nix b/pkgs/development/tools/build-managers/gnumake-3.80/default.nix index 2e343b4237b..dbc68e1d90c 100644 --- a/pkgs/development/tools/build-managers/gnumake-3.80/default.nix +++ b/pkgs/development/tools/build-managers/gnumake-3.80/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "gnumake-3.80"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/make-3.80.tar.bz2; + url = http://nixos.org/tarballs/make-3.80.tar.bz2; md5 = "0bbd1df101bc0294d440471e50feca71"; }; patches = [./log.patch]; diff --git a/pkgs/development/tools/build-managers/mk/default.nix b/pkgs/development/tools/build-managers/mk/default.nix index bc4fbdcd54e..9cd208f5a81 100644 --- a/pkgs/development/tools/build-managers/mk/default.nix +++ b/pkgs/development/tools/build-managers/mk/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "mk-2006-01-31"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/mk-20060131.tar.gz; + url = http://nixos.org/tarballs/mk-20060131.tar.gz; md5 = "167fd4e0eea4f49def01984ec203289b"; }; builder = ./builder.sh; diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix new file mode 100644 index 00000000000..e5a91ec6b01 --- /dev/null +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -0,0 +1,15 @@ +{stdenv, fetchurl, graphviz, perl, flex, bison, gnumake, libX11, libXext, qt}: + +stdenv.mkDerivation rec { + name = "doxygen-1.5.7.1"; + src = fetchurl { + url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz"; + sha256 = "0abds9d2ff4476105myl4933q6l4vqyyyajx6qial88iffbczsbw"; + }; + buildInputs = [graphviz perl flex bison libX11 libXext qt]; + prefixKey = "--prefix "; + configureFlags = "--release" + + " --make ${gnumake}/bin/make" + + (if qt == null then "" else " --with-doxywizard") + ; +} diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix index 9e3233133c7..37d9e685eb1 100644 --- a/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/pkgs/development/tools/literate-programming/noweb/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "noweb-2.10c"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/noweb-20060201.tar.gz; + url = http://nixos.org/tarballs/noweb-20060201.tar.gz; md5 = "b4813c6bc0bab9004e57edc1d7e57638"; }; builder = ./builder.sh; diff --git a/pkgs/development/tools/misc/automake/automake-1.10.x.nix b/pkgs/development/tools/misc/automake/automake-1.10.x.nix index 385f614a50f..10aecf7c678 100644 --- a/pkgs/development/tools/misc/automake/automake-1.10.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.10.x.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl, perl, autoconf}: stdenv.mkDerivation rec { - name = "automake-1.10.1"; + name = "automake-1.10.2"; builder = ./builder.sh; setupHook = ./setup-hook.sh; src = fetchurl { url = "mirror://gnu/automake/${name}.tar.bz2"; - sha256 = "1v155av3vdsgj9fil66cw2g4vrqanvgn33kwv35xs3ibcyck8smj"; + sha256 = "03v4gsvi71nhqvnxxbhkrksdg5icrn8yda021852njfragzck2n3"; }; patches = [ ./test-broken-make.patch ]; diff --git a/pkgs/development/tools/misc/automake/automake-1.7.x.nix b/pkgs/development/tools/misc/automake/automake-1.7.x.nix index 5c2a720aaab..fc34ef8e3aa 100644 --- a/pkgs/development/tools/misc/automake/automake-1.7.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.7.x.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; setupHook = ./setup-hook.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/automake-1.7.9.tar.bz2; + url = http://nixos.org/tarballs/automake-1.7.9.tar.bz2; md5 = "571fd0b0598eb2a27dcf68adcfddfacb"; }; buildInputs = [perl autoconf]; diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix new file mode 100644 index 00000000000..44fc1779771 --- /dev/null +++ b/pkgs/development/tools/misc/cflow/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, gettext, emacs }: + +stdenv.mkDerivation rec { + name = "cflow-1.2"; + + src = fetchurl { + url = "mirror://gnu/cflow/${name}.tar.bz2"; + sha256 = "0b45b1x1g9i23mv68pjl008qm4lkbd62hka2bf2gkjd2n4nalc6v"; + }; + + patchPhase = '' + substituteInPlace "src/cflow.h" \ + --replace "/usr/bin/cpp" \ + "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/bin/cpp" + ''; + + buildInputs = [ gettext emacs ]; + + doCheck = true; + + meta = { + description = "GNU cflow, a tool to analyze the control flow of C programs"; + + longDescription = '' + GNU cflow analyzes a collection of C source files and prints a + graph, charting control flow within the program. + + GNU cflow is able to produce both direct and inverted flowgraphs + for C sources. Optionally a cross-reference listing can be + generated. Two output formats are implemented: POSIX and GNU + (extended). + + The package also provides Emacs major mode for examining the + produced flowcharts in Emacs. + ''; + + license = "GPLv3+"; + + homepage = http://www.gnu.org/software/cflow/; + }; +} diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 0c7cad6424a..7ac79ecb12a 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -10,7 +10,20 @@ stdenv.mkDerivation rec { buildInputs = [ expect makeWrapper ]; - doCheck = true; + # FIXME: Enable when the "spawn id" problem is fixed. + doCheck = false; + + # Note: The test-suite *requires* /dev/pts among the + # `build-chroot-dirs' of the build daemon when building in a chroot. + + # FIXME: The test-suite currently fails with this problem: + # http://lists.gnu.org/archive/html/bug-dejagnu/2003-06/msg00002.html + # http://thread.gmane.org/gmane.linux.distributions.nixos/1036 + checkPhase = '' + # Provide `runtest' with a log name, otherwise it tries to run + # `whoami', which fails when in a chroot. + LOGNAME="nix-build-daemon" make check + ''; postInstall = '' wrapProgram "$out/bin/runtest" \ diff --git a/pkgs/development/tools/misc/elfutils/0.127.nix b/pkgs/development/tools/misc/elfutils/0.127.nix index 198242e2708..3d6f650290b 100644 --- a/pkgs/development/tools/misc/elfutils/0.127.nix +++ b/pkgs/development/tools/misc/elfutils/0.127.nix @@ -3,7 +3,7 @@ args: with args; stdenv.mkDerivation { name = "elfutils-"+version; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/elfutils-0.127.tar.gz; + url = http://nixos.org/tarballs/elfutils-0.127.tar.gz; sha256 = "12n3h5r3c24a6l2wxz0w2dqq072bvgms0dzckivrwp5vdn22lpdv"; }; preBuild = "sed -e 's/-Werror//' -i */Makefile "; diff --git a/pkgs/development/tools/misc/icon-naming-utils/default.nix b/pkgs/development/tools/misc/icon-naming-utils/default.nix index 60ad3f7ff54..fb8a863968a 100644 --- a/pkgs/development/tools/misc/icon-naming-utils/default.nix +++ b/pkgs/development/tools/misc/icon-naming-utils/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, perl, perlXMLSimple}: stdenv.mkDerivation { - name = "icon-naming-utils-0.8.2"; + name = "icon-naming-utils-0.8.7"; src = fetchurl { - url = http://tango-project.org/releases/icon-naming-utils-0.8.2.tar.gz; - sha256 = "0ml00nrnd7bkdm09wdj592axwg6v6lcb9yvazc540ls8by6kkzl7"; + url = http://tango.freedesktop.org/releases/icon-naming-utils-0.8.7.tar.gz; + sha256 = "1lj0lffdg7fjfinhrn0vsq1kj010dxlxlix4jfc969j6l3k9rd0w"; }; buildInputs = [perl perlXMLSimple]; postInstall = " diff --git a/pkgs/development/tools/misc/indent/2.2.9.nix b/pkgs/development/tools/misc/indent/2.2.9.nix index 6dc28ea0c30..3fefc259b39 100644 --- a/pkgs/development/tools/misc/indent/2.2.9.nix +++ b/pkgs/development/tools/misc/indent/2.2.9.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = ftp://ftp.gnu.org/gnu/indent/indent-2.2.9.tar.gz; diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix index 23b1b3921da..78cd15e04bd 100644 --- a/pkgs/development/tools/misc/libtool/default.nix +++ b/pkgs/development/tools/misc/libtool/default.nix @@ -13,4 +13,22 @@ stdenv.mkDerivation rec { # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the # "fixed" path in generated files! dontPatchShebangs = true; + + meta = { + description = "GNU Libtool, a generic library support script"; + + longDescription = '' + GNU libtool is a generic library support script. Libtool hides + the complexity of using shared libraries behind a consistent, + portable interface. + + To use libtool, add the new generic library building commands to + your Makefile, Makefile.in, or Makefile.am. See the + documentation for details. + ''; + + homepage = http://www.gnu.org/software/libtool/; + + license = "GPLv2+"; + }; } diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix new file mode 100644 index 00000000000..8661404766e --- /dev/null +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, m4, perl, lzma }: + +stdenv.mkDerivation rec { + name = "libtool-2.2.6a"; + + src = fetchurl { + url = "mirror://gnu/libtool/${name}.tar.lzma"; + sha256 = "12k3m7d0ngcwwahicncxbyd1155ij63ylr8372f0q8xbzq59c8hx"; + }; + + buildInputs = [ lzma m4 perl ]; + + unpackCmd = "lzma -d < $src | tar xv"; + + # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the + # "fixed" path in generated files! + dontPatchShebangs = true; + + meta = { + description = "GNU Libtool, a generic library support script"; + + longDescription = '' + GNU libtool is a generic library support script. Libtool hides + the complexity of using shared libraries behind a consistent, + portable interface. + + To use libtool, add the new generic library building commands to + your Makefile, Makefile.in, or Makefile.am. See the + documentation for details. + ''; + + homepage = http://www.gnu.org/software/libtool/; + + license = "GPLv2+"; + }; +} diff --git a/pkgs/development/tools/misc/ltrace/0.5-3deb.nix b/pkgs/development/tools/misc/ltrace/0.5-3deb.nix index 2c9349bf6a3..8dde78d516b 100644 --- a/pkgs/development/tools/misc/ltrace/0.5-3deb.nix +++ b/pkgs/development/tools/misc/ltrace/0.5-3deb.nix @@ -1,7 +1,7 @@ args : with args; let patch = ./ltrace_0.5-3.diff.gz; localDefs = with builderDefs; - builderDefs.meta.function { + builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.5.orig.tar.gz; diff --git a/pkgs/development/tools/parsing/bison/bison-1.875.nix b/pkgs/development/tools/parsing/bison/bison-1.875.nix index 6a2ae1c794d..3ee12a252ce 100644 --- a/pkgs/development/tools/parsing/bison/bison-1.875.nix +++ b/pkgs/development/tools/parsing/bison/bison-1.875.nix @@ -5,12 +5,9 @@ assert m4 != null; stdenv.mkDerivation { name = "bison-1.875"; src = fetchurl { - urls = [ http://nix.cs.uu.nl/dist/tarballs/bison-1.875.tar.bz2 - ftp://ftp.gnu.org/pub/gnu/bison/bison-1.875.tar.bz2 - ]; + url = mirror://gnu/bison/bison-1.875.tar.bz2; md5 = "b7f8027b249ebd4dd0cc948943a71af0"; }; buildInputs = [m4]; -} // { - glrSupport = false; + passthru = { glrSupport = true; }; } diff --git a/pkgs/development/tools/parsing/bison/bison-2.3.nix b/pkgs/development/tools/parsing/bison/bison-2.3.nix index 8f043a5b9f4..ae90f2e83d0 100644 --- a/pkgs/development/tools/parsing/bison/bison-2.3.nix +++ b/pkgs/development/tools/parsing/bison/bison-2.3.nix @@ -11,8 +11,26 @@ stdenv.mkDerivation { buildInputs = [m4]; meta = { - description = "A yacc-compatible parser generator"; + description = "GNU Bison, a Yacc-compatible parser generator"; + + longDescription = '' + Bison is a general-purpose parser generator that converts an + annotated context-free grammar into an LALR(1) or GLR parser for + that grammar. Once you are proficient with Bison, you can use + it to develop a wide range of language parsers, from those used + in simple desk calculators to complex programming languages. + + Bison is upward compatible with Yacc: all properly-written Yacc + grammars ought to work with Bison with no change. Anyone + familiar with Yacc should be able to use Bison with little + trouble. You need to be fluent in C or C++ programming in order + to use Bison. + ''; + + homepage = http://www.gnu.org/software/bison/; + + license = "GPLv2+"; }; -} // { - glrSupport = true; + + passthru = { glrSupport = true; }; } diff --git a/pkgs/development/tools/parsing/bison/bison-2.4.nix b/pkgs/development/tools/parsing/bison/bison-2.4.nix new file mode 100644 index 00000000000..09596f173d0 --- /dev/null +++ b/pkgs/development/tools/parsing/bison/bison-2.4.nix @@ -0,0 +1,38 @@ +{stdenv, fetchurl, m4}: + +stdenv.mkDerivation rec { + name = "bison-2.4"; + + src = fetchurl { + url = "mirror://gnu/bison/${name}.tar.bz2"; + sha256 = "0c9sv03wsqnqc7wfpa51yc9yy1i3kdgsrjg7qchx0sk8zr11cvqf"; + }; + + buildInputs = [m4]; + + doCheck = true; + + meta = { + description = "GNU Bison, a Yacc-compatible parser generator"; + + longDescription = '' + Bison is a general-purpose parser generator that converts an + annotated context-free grammar into an LALR(1) or GLR parser for + that grammar. Once you are proficient with Bison, you can use + it to develop a wide range of language parsers, from those used + in simple desk calculators to complex programming languages. + + Bison is upward compatible with Yacc: all properly-written Yacc + grammars ought to work with Bison with no change. Anyone + familiar with Yacc should be able to use Bison with little + trouble. You need to be fluent in C or C++ programming in order + to use Bison. + ''; + + homepage = http://www.gnu.org/software/bison/; + + license = "GPLv3+"; + }; + + passthru = { glrSupport = true; }; +} diff --git a/pkgs/games/construo/0.2.2.nix b/pkgs/games/construo/0.2.2.nix index 3d9da7f531a..e0447382e56 100644 --- a/pkgs/games/construo/0.2.2.nix +++ b/pkgs/games/construo/0.2.2.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://savannah.nongnu.org/download/construo/construo-0.2.2.tar.gz; diff --git a/pkgs/games/fsg/alt-builder.nix b/pkgs/games/fsg/alt-builder.nix index c48041fe5e9..70a342e3226 100644 --- a/pkgs/games/fsg/alt-builder.nix +++ b/pkgs/games/fsg/alt-builder.nix @@ -1,5 +1,5 @@ args: with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { buildInputs =[(wxGTK null)]; src = fetchurl { diff --git a/pkgs/games/orbit/1.01.nix b/pkgs/games/orbit/1.01.nix index b60b617fc2c..f128c7b90c2 100644 --- a/pkgs/games/orbit/1.01.nix +++ b/pkgs/games/orbit/1.01.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function (rec { + let localDefs = builderDefs.passthru.function (rec { src = /* put a fetchurl here */ fetchurl { sha256 = "1kx69f9jqnfzwjh47cl1df8p8hn3bnp6bznxnb6c4wx32ijn5gri"; diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix new file mode 100644 index 00000000000..b2552bd9dc8 --- /dev/null +++ b/pkgs/games/super-tux-kart/default.nix @@ -0,0 +1,29 @@ +{ fetchurl, stdenv, plib, SDL, openal, freealut, mesa +, libvorbis, libogg, gettext }: + +stdenv.mkDerivation rec { + name = "supertuxkart-0.5"; + + src = fetchurl { + url = "mirror://sourceforge/supertuxkart/${name}.tar.bz2"; + sha256 = "1c9gdfcsygsflbrsar38p6gm17kxnna70s9mw4bsixyg45aghii9"; + }; + + buildInputs = [ + plib SDL openal freealut mesa libvorbis libogg gettext + ]; + + meta = { + description = "SuperTuxKart is a Free 3D kart racing game"; + + longDescription = '' + SuperTuxKart is a Free 3D kart racing game, with many tracks, + characters and items for you to try, similar in spirit to Mario + Kart. + ''; + + homepage = http://supertuxkart.sourceforge.net/; + + license = "GPLv2+"; + }; +} diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix new file mode 100644 index 00000000000..314ef1cc1b3 --- /dev/null +++ b/pkgs/games/xmoto/default.nix @@ -0,0 +1,29 @@ +args : +let + lib = args.lib; + fetchurl = args.fetchurl; + + version = lib.getAttr ["version"] "0.5.0" args; + buildInputs = with args; [ + chipmunk sqlite curl zlib bzip2 libjpeg libpng + freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf + lua5 ode + ]; +in +rec { + src = fetchurl { + url = "http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"; + sha256 = "0gy9rjmjns4kbqfrdh9v1bg1w92xipxv3ia9w1wh2c58rp1p0nkh"; + }; + + inherit buildInputs; + configureFlags = []; + + /* doConfigure should be specified separately */ + phaseNames = ["doConfigure" "doMakeInstall"]; + + name = "xmoto-" + version; + meta = { + description = "X-Moto - obstacled race game"; + }; +} diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix index 34d1cdda148..66b67baafef 100644 --- a/pkgs/lib/default.nix +++ b/pkgs/lib/default.nix @@ -40,12 +40,41 @@ rec { sumTwoArgs = f: x: y: f (defaultMerge x y); foldArgs = merger: f: init: x: - let arg=(merger init (defaultMergeArg init x)); in - (f arg) // { - meta = { - function = foldArgs merger f arg; - }; - }; + let arg=(merger init (defaultMergeArg init x)); in + # now add the function with composed args already applied to the final attrs + setAttrMerge "passthru" {} (f arg) ( x : x // { function = foldArgs merger f arg; } ); + + # returns f x // { passthru.fun = y : f (merge x y); } while preserving other passthru names. + # example: let ex = applyAndFun (x : removeAttrs x ["fixed"]) (mergeOrApply mergeAttr) {name = 6;}; + # usage1 = ex.passthru.fun { name = 7; }; # result: { name = 7;} + # usage2 = ex.passthru.fun (a: a // {name = __add a.name 1; }); # result: { a = 7; } + # fix usage: + # usage3a = ex.passthru.fun (a: a // {name2 = a.fixed.toBePassed; }); # usage3a will fail because toBePassed is not yet given + # usage3b usage3a.passthru.fun { toBePassed = "foo";}; # result { name = 7; name2 = "foo"; toBePassed = "foo"; fixed = ; } + applyAndFun = f : merge : x : assert (__isAttrs x || __isFunction x); + let takeFix = if (__isFunction x) then x else (attr: merge attr x); in + setAttrMerge "passthru" {} (fix (fixed : f (takeFix {inherit fixed;}))) + ( y : y // + { + fun = z : applyAndFun f merge (fixed: merge (takeFix fixed) z); + funMerge = z : applyAndFun f merge (fixed: let e = takeFix fixed; in merge e (merge e z)); + } ); + mergeOrApply = merge : x : y : if (__isFunction y) then y x else merge x y; + + # rec { # an example of how composedArgsAndFun can be used + # a = composedArgsAndFun (x : x) { a = ["2"]; meta = { d = "bar";}; }; + # # meta.d will be lost ! It's your task to preserve it (eg using a merge function) + # b = a.passthru.function { a = [ "3" ]; meta = { d2 = "bar2";}; }; + # # instead of passing/ overriding values you can use a merge function: + # c = b.passthru.function ( x: { a = x.a ++ ["4"]; }); # consider using (maybeAttr "a" [] x) + # } + # result: + # { + # a = { a = ["2"]; meta = { d = "bar"; }; passthru = { function = .. }; }; + # b = { a = ["3"]; meta = { d2 = "bar2"; }; passthru = { function = .. }; }; + # c = { a = ["3" "4"]; meta = { d2 = "bar2"; }; passthru = { function = .. }; }; + # # c2 is equal to c + # } composedArgsAndFun = f: foldArgs defaultMerge f {}; # example a = pairMap (x : y : x + y) ["a" "b" "c" "d"]; @@ -67,10 +96,16 @@ rec { then nul else op (head list) (fold op nul (tail list)); + # Haskell's fold + foldl = op: nul: list: + if list == [] + then nul + else fold op (op nul (head list)) (tail list); + # Concatenate a list of lists. - concatLists = - fold (x: y: x ++ y) []; + concatList = x : y : x ++ y; + concatLists = fold concatList []; # Concatenate a list of strings. @@ -221,6 +256,16 @@ rec { optionalString = cond: string: if cond then string else ""; + # Return the second argument if the first one is true or the empty version + # of the second argument. + ifEnable = cond: val: + if cond then val + else if builtins.isList val then [] + else if builtins.isAttrs val then {} + # else if builtins.isString val then "" + else if (val == true || val == false) then false + else null; + # Return a list of integers from `first' up to and including `last'. range = first: last: if builtins.lessThan last first @@ -327,32 +372,88 @@ rec { fix = f: (rec { result = f result; }).result; - finalReference = fix; # bad name - - # flatten a list of sets returned by 'f'. - # f : function to evaluate each set. - # attr : name of the attribute which contains more values. + # flatten a list of elements by following the properties of the elements. + # key : return the key which correspond to the value. + # value : return the value inserted in the returned list. + # next : return the list of following elements. + # keys : lists of keys already seen. # default: result if 'x' is empty. # x : list of values that have to be processed. - uniqFlattenAttr = f: attr: default: x: + uniqFlatten = prop@{key, value, next, ...}: keys: default: x: if x == [] then default - else let h = f (head x); t = tail x; in - if elem h default - then uniqFlattenAttr f attr default t - else uniqFlattenAttr f attr (default ++ [h]) (toList (getAttr [attr] [] h) ++ t) + else + let h = head x; t = tail x; + k = key h; v = value h; n = next h; + in + if elem k keys + then uniqFlatten prop keys default t + else uniqFlatten prop (keys ++ [k]) (default ++ [v]) (n ++ t) ; + /* If. ThenElse. Always. */ + + # create "if" statement that can be dealyed on sets until a "then-else" or + # "always" set is reached. When an always set is reached the condition + # is ignore. + + isIf = attrs: (typeOf attrs) == "if"; + mkIf = condition: thenelse: + if isIf thenelse then + mkIf (condition && thenelse.condition) thenelse.thenelse + else { + _type = "if"; + inherit condition thenelse; + }; + + + isThenElse = attrs: (typeOf attrs) == "then-else"; + mkThenElse = attrs: + assert attrs ? thenPart && attrs ? elsePart; + attrs // { _type = "then-else"; }; + + + isAlways = attrs: (typeOf attrs) == "always"; + mkAlways = value: { inherit value; _type = "always"; }; + + pushIf = f: attrs: + if isIf attrs then pushIf f ( + let val = attrs.thenelse; in + # evaluate the condition. + if isThenElse val then + if attrs.condition then + val.thenPart + else + val.elsePart + # ignore the condition. + else if isAlways val then + val.value + # otherwise + else + f attrs.condition val) + else + attrs; + + # take care otherwise you will have to handle this by hand. + rmIf = pushIf (condition: val: val); + + evalIf = pushIf (condition: val: + # guess: empty else part. + ifEnable condition val + ); + + delayIf = pushIf (condition: val: + # rewrite the condition on sub-attributes. + mapAttrs (name: mkIf condition) val + ); + /* Options. */ mkOption = attrs: attrs // {_type = "option";}; - typeOf = x: if x ? _type then x._type else ""; + typeOf = x: if (__isAttrs x && x ? _type) then x._type else ""; - isOption = attrs: - __isAttrs attrs - && attrs ? _type - && attrs._type == "option"; + isOption = attrs: (typeOf attrs) == "option"; addDefaultOptionValues = defs: opts: opts // builtins.listToAttrs (map (defName: @@ -382,16 +483,22 @@ rec { 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 mergeAttrs list + else if all (x: true == x || false == x) list then fold logicalOR false list else abort "${name}: Cannot merge values."; - mergeEnableOption = name: list: - if all (x: true == x || false == x) list - then fold logicalOR false list - else abort "${name}: Expect a boolean value."; + mergeTypedOption = typeName: predicate: merge: name: list: + if all predicate list then merge list + else abort "${name}: Expect a ${typeName}."; - mergeListOption = name: list: - if all __isList list then concatLists list - else abort "${name}: Expect a list."; + mergeEnableOption = mergeTypedOption "boolean" + (x: true == x || false == x) (fold logicalOR false); + + mergeListOption = mergeTypedOption "list" + __isList concatLists; + + mergeStringOption = mergeTypedOption "string" + (x: if builtins ? isString then builtins.isString x else x + "") + concatStrings; # Merge sets of options and bindings. # noOption: function to call if no option is declared. @@ -400,13 +507,13 @@ rec { zip (attr: opts: let name = if path == "" then attr else path + "." + attr; - defaultOpt = { merge = mergeDefaultOption; }; test = partition isOption opts; + opt = ({ merge = mergeDefaultOption; apply = id; } // head test.right); in - if test.right == [] then mergeOptionSets noOption name test.wrong + if test.right == [] then mergeOptionSets noOption name (map delayIf test.wrong) else if tail test.right != [] then throw "Multiple options for '${name}'." - else if test.wrong == [] then (head test.right).default - else (defaultOpt // head test.right).merge name test.wrong + else if test.wrong == [] then opt.apply opt.default + else opt.apply (opt.merge name (map evalIf test.wrong)) ) opts else noOption path opts; @@ -420,7 +527,7 @@ rec { name = if path == "" then attr else path + "." + attr; test = partition isOption opts; in - if test.right == [] then filterOptionSets name test.wrong + if test.right == [] then filterOptionSets name (map delayIf test.wrong) else if tail test.right != [] then throw "Multiple options for '${name}'." else { inherit name; } // (head test.right) ) opts @@ -430,27 +537,41 @@ rec { # function "merge" which expects two arguments. The attribute named # "require" is used to imports option declarations and bindings. fixOptionSetsFun = merge: pkgs: opts: - let optionSet = config: configFun: - if __isFunction configFun then - let result = configFun { inherit pkgs config; }; in - # {pkgs, config, ...}: {..} - if builtins.isAttrs result then result - # pkgs: config: {..} - else configFun pkgs config - # {..} - else configFun; - in - config: merge "" - (map (x: removeAttrs x ["require"]) - (uniqFlattenAttr (optionSet config) "require" [] (toList opts)) - ); + let + # ignore all conditions that are on require attributes. + rmRequireIf = conf: + let conf2 = delayIf conf; in + if conf2 ? require then + conf2 // { require = rmIf conf2.require; } + else + conf2; + + # call configuration "files" with one of the existing convention. + optionSet = config: configFun: + if __isFunction configFun then + let result = configFun { inherit pkgs config; }; in + # {pkgs, config, ...}: {..} + if builtins.isAttrs result then result + # pkgs: config: {..} + else configFun pkgs config + # {..} + else configFun; + + processConfig = config: configFun: + rmRequireIf (optionSet config configFun); + + prop = config: rec { + key = id; + prepare = x: processConfig config x; + value = x: removeAttrs (prepare x) ["require"]; + next = x: toList (getAttr ["require"] [] (prepare x)); + }; + in config: + merge "" (uniqFlatten (prop config) [] [] (toList opts)); fixOptionSets = merge: pkgs: opts: fix (fixOptionSetsFun merge pkgs opts); - finalOptionSetsFun = fixOptionSetsFun; - finalReferenceOptionSets = fixOptionSets; - optionAttrSetToDocList = (l: attrs: (if (getAttr ["_type"] "" attrs) == "option" then [({ @@ -476,10 +597,11 @@ rec { # this can help debug your code as well - designed to not produce thousands of lines traceWhatis = x : __trace (whatis x) x; traceMarked = str: x: __trace (str + (whatis x)) x; - whatis = x : + attrNamesToStr = a : concatStringsSep "; " (map (x : "${x}=") (__attrNames a)); + whatis = x : if (__isAttrs x) then - if (x ? outPath) then "x is a derivation with name ${x.name}" - else "x is an attr set with attributes ${builtins.toString (__attrNames x)}" + 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 (x == []) then "x is an empty list" else if (__isList x) then "x is a list, first item is : ${whatis (__head x)}" @@ -487,6 +609,11 @@ rec { 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}.."; + # trace the arguments passed to function and its result + traceCall = n : f : a : let t = n2 : x : traceMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a)); + traceCall2 = n : f : a : b : let t = n2 : x : traceMarked "${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 : traceMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b) (t "arg 3" c)); + innerClosePropagation = ready: list: if list == [] then ready else @@ -507,7 +634,18 @@ rec { defineShList = name : list : "\n${name}=(${concatStringsSep " " (map escapeShellArg list)})\n"; + # this as well :-) arg: http://foo/bar/bz.ext returns bz.ext + dropPath = s : + 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; + # calls a function (f attr value ) for each record item. returns a list + # should be renamed to mapAttrsFlatten mapRecordFlatten = f : r : map (attr: f attr (builtins.getAttr attr r) ) (attrNames r); # maps a function on each attr value @@ -521,10 +659,17 @@ rec { # adds / replaces an attribute of an attribute set setAttr = set : name : v : set // (nvs name v); + # setAttrMerge (similar to mergeAttrsWithFunc but only merges the values of a particular name) + # setAttrMerge "a" [] { a = [2];} (x : x ++ [3]) -> { a = [2 3]; } + # setAttrMerge "a" [] { } (x : x ++ [3]) -> { a = [ 3]; } + setAttrMerge = name : default : attrs : f : + setAttr attrs name (f (maybeAttr name default attrs)); + # iterates over a list of attributes collecting the attribute attr if it exists catAttrs = attr : l : fold ( s : l : if (hasAttr attr s) then [(builtins.getAttr attr s)] ++ l else l) [] l; - mergeAttrs = fold ( x : y : x // y) {}; + mergeAttr = x : y : x // y; + mergeAttrs = fold mergeAttr {}; attrVals = nameList : attrSet : map (x: builtins.getAttr x attrSet) nameList; @@ -548,6 +693,7 @@ rec { # { buildInputs = [a b]; } # merging buildPhase does'nt really make sense. The cases will be rare where appending /prefixing will fit your needs? # in these cases the first buildPhase will override the second one + # ! depreceated, use mergeAttrByFunc instead mergeAttrsNoOverride = { mergeLists ? ["buildInputs" "propagatedBuildInputs"], overrideSnd ? [ "buildPhase" ] } : attrs1 : attrs2 : @@ -561,6 +707,45 @@ rec { else throw "error mergeAttrsNoOverride, attribute ${n} given in both attributes - no merge func defined" else __getAttr n attrs2 # add attribute not existing in attr1 )) attrs1 (__attrNames attrs2); + + + # example usage: + # mergeAttrByFunc { + # inherit mergeAttrBy; # defined below + # buildInputs = [ a b ]; + # } { + # buildInputs = [ c d ]; + # }; + # will result in + # { mergeAttrsBy = [...]; buildInputs = [ a b c d ]; } + # is used by prepareDerivationArgs and can be used when composing using + # foldArgs, composedArgsAndFun or applyAndFun. Example: composableDerivation in all-packages.nix + mergeAttrByFunc = x : y : + let + mergeAttrBy2 = { mergeAttrBy=mergeAttr; } + // (maybeAttr "mergeAttrBy" {} x) + // (maybeAttr "mergeAttrBy" {} y); in + 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) + ) (removeAttrs mergeAttrBy2 + # don't merge attrs which are neither in x nor y + (filter (a : (! __hasAttr a x) && (! __hasAttr a y) ) + (__attrNames mergeAttrBy2)) + ) + ) + ]; + mergeAttrsByFuncDefaults = foldl mergeAttrByFunc { inherit mergeAttrBy; }; + # sane defaults (same name as attr name so that inherit can be used) + mergeAttrBy = # { buildInputs = concatList; [...]; passthru = mergeAttr; [..]; } + listToAttrs (map (n : nv n concatList) [ "buildInputs" "propagatedBuildInputs" "configureFlags" "prePhases" "postAll" ]) + // listToAttrs (map (n : nv n mergeAttr) [ "passthru" "meta" "cfg" "flags" ]); + # returns atribute values as a list flattenAttrs = set : map ( attr : builtins.getAttr attr set) (attrNames set); mapIf = cond : f : fold ( x : l : if (cond x) then [(f x)] ++ l else l) []; @@ -571,7 +756,65 @@ rec { then r ++ [ ( nv attr ( f (__getAttr attr attrs) ) ) ] else r ) [] subset_attr_names ); + # prepareDerivationArgs tries to make writing configurable derivations easier + # example: + # prepareDerivationArgs { + # mergeAttrBy = { + # myScript = x : y : x ++ "\n" ++ y; + # }; + # cfg = { + # readlineSupport = true; + # }; + # flags = { + # readline = { + # set = { + # configureFlags = [ "--with-compiler=${compiler}" ]; + # buildInputs = [ compiler ]; + # pass = { inherit compiler; READLINE=1; }; + # assertion = compiler.dllSupport; + # myScript = "foo"; + # }; + # unset = { configureFlags = ["--without-compiler"]; }; + # }; + # }; + # src = ... + # buildPhase = '' ... ''; + # name = ... + # myScript = "bar"; + # }; + # if you don't have need for unset you can omit the surrounding set = { .. } attr + # all attrs except flags cfg and mergeAttrBy will be merged with the + # additional data from flags depending on config settings + # It's used in composableDerivation in all-packages.nix. It's also used + # heavily in the new python and libs implementation + # + # should we check for misspelled cfg options? + prepareDerivationArgs = args: + let args2 = { cfg = {}; flags = {}; } // args; + flagName = name : "${name}Support"; + cfgWithDefaults = (listToAttrs (map (n : nv (flagName n) false) (attrNames args2.flags))) + // 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"; + attr = maybeAttr n {} v2; in + if (maybeAttr "assertion" true attr) + then attr + else throw "assertion of flag ${a} of derivation ${args.name} failed" + ) args2.flags ); + in removeAttrs + (mergeAttrsByFuncDefaults ([args] ++ opts)) + ["flags" "cfg" "mergeAttrBy" "fixed" ]; # fixed may be passed as fix argument or such + # supportFlag functions for convinience + sFlagEnable = { name, buildInputs ? [], propagatedBuildInputs ? [] } : { + set = { configureFlags = "--enable-${name}"; inherit buildInputs; inherit propagatedBuildInputs; }; + unset = { configureFlags = "--disable-${name}"; }; + }; + + + # Marc 2nd proposal: (not everything has been tested in detail yet..) +# depreceated because it's too complicated. use prepareDerivationArgs instead # usage / example # flagConfig = { diff --git a/pkgs/misc/bleeding-edge-fetch-infos.nix b/pkgs/misc/bleeding-edge-fetch-infos.nix index b08b4630b29..86a75eac5bb 100644 --- a/pkgs/misc/bleeding-edge-fetch-infos.nix +++ b/pkgs/misc/bleeding-edge-fetch-infos.nix @@ -215,4 +215,16 @@ url = http://mawercer.de/~nix/repos/kdesupport_telepathy_qt.tar.gz; sha256 = "022599182ff629662bbd01acdea6ead9aec64b3e73e8da3eb58ef857803035f2"; }; + cinelerra = args: with args; fetchurl { # Tue Oct 14 12:36:49 UTC 2008 + url = "http://mawercer.de/~nix/repos/cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz"; + sha256 = "1e84ff59dcd7a3c80343eb9be302f822e510c95398fd1a6c8f2e4b163fd51e45"; + }; + hg2git = args: with args; fetchurl { # Sat Oct 18 21:02:44 UTC 2008 + url = "http://mawercer.de/~nix/repos/hg2git-4c77e121b739d2aac8a23352503763343823f870.tar.gz"; + sha256 = "22354d36937bf9e5d3e3dfc1a3ef9e3f2bc183b8e114a23958a2b10f83abc97e"; + }; + octave = args: with args; fetchurl { # Mon Dec 1 23:23:49 UTC 2008 + url = "http://mawercer.de/~nix/repos/octave-03b414516dd8.tar.gz"; + sha256 = "28ca0be1407954e746909241bda95c5bf0a04f611e73100c1e3967ddc249c519"; + }; } diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 80650cac346..de56e336289 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,31 +1,39 @@ -{stdenv, fetchurl, zlib, libjpeg, libpng, libtiff, pam}: +{stdenv, fetchurl, zlib, libjpeg, libpng, libtiff, pam, openssl}: stdenv.mkDerivation { - name = "cups-1.2.10"; + name = "cups-1.3.9"; src = fetchurl { - url = http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/1.2.10/cups-1.2.10-source.tar.bz2; - sha256 = "0dmvjl513kqbb7m4m0b22wa4xvn9avdyihr7fi3n2ly5as93n6v0"; + url = http://ftp.easysw.com/pub/cups/1.3.9/cups-1.3.9-source.tar.bz2; + sha256 = "0svb5alfsj9bfraw0yb9i92g5hc9h36m9xfipvi1pxdwp2s6m19q"; }; - buildInputs = [zlib libjpeg libpng libtiff pam]; + buildInputs = [zlib libjpeg libpng libtiff pam openssl]; - preConfigure = " - configureFlags=\"--localstatedir=/var\" - "; + preConfigure = '' + configureFlags="--localstatedir=/var" + ''; - preBuild = " + preBuild = '' makeFlagsArray=(INITDIR=$out/etc/rc.d) - "; + ''; # Awful hack: CUPS' `make install' wants to write in /var, but it # can't. So redirect it with a BUILDROOT (=DESTDIR). - preInstall = " + preInstall = '' installFlagsArray=(BUILDROOT=$out/destdir) - "; + ''; - postInstall = " + # !!! Ideally, we wouldn't have Samba as a dependency of CUPS. + # Rather, the backend directory should be treated as configuration + # data generated in some other Nix expression in NixOS. + postInstall = '' mv $out/destdir/$out/* $out rm -rf $out/destdir - "; + ''; # */ + + meta = { + homepage = http://www.cups.org/; + description = "A standards-based printing system for UNIX"; + }; } diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 441f2086aa4..95505071a38 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -8,11 +8,11 @@ assert stdenv.isLinux; let lib = import ../../../lib/default.nix; in stdenv.mkDerivation { - name = "wine-1.1.2"; + name = "wine-1.1.9"; src = fetchurl { - url = mirror://sourceforge/wine/wine-1.1.2.tar.bz2; - sha256 = "1d136dmfnjmghm5hkmcfc635s3xgrhdwvrw0gr3gymwhzrxa1y8y"; + url = mirror://sourceforge/wine/wine-1.1.9.tar.bz2; + sha256 = "1jhy7l5q1jri529n5070f4wjigbw4dr7d4jgdc10v6hxfmlp1mzy"; }; buildInputs = [ diff --git a/pkgs/misc/linuxwacom/default.nix b/pkgs/misc/linuxwacom/default.nix index c7fc90e1b88..7fbf62b0589 100644 --- a/pkgs/misc/linuxwacom/default.nix +++ b/pkgs/misc/linuxwacom/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "linuxwacom-0.7.2"; builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/linuxwacom-0.7.2.tar.bz2; + url = http://nixos.org/tarballs/linuxwacom-0.7.2.tar.bz2; md5 = "3f6290101d5712a24097243ca9f092ed"; }; buildInputs = [libX11 libXi]; diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix new file mode 100644 index 00000000000..2bf2d86c2c8 --- /dev/null +++ b/pkgs/misc/my-env/default.nix @@ -0,0 +1,79 @@ +# idea: provide nix environment for your developement actions +# experimental + +/* + # example: + # add postgresql to environment and create ctags (tagfiles can be extracted from TAG_FILES) + # add this to your ~/.nixpkgs/config.nix + + { + packageOverrides = pkgs : with pkgs; with sourceAndTags; + let simple = { name, buildInputs ? [], cTags ? [], extraCmds ? ""}: + pkgs.myEnvFun { + inherit name; + buildInputs = buildInputs + ++ map (x : sourceWithTagsDerivation ( (addCTaggingInfo x ).passthru.sourceWithTags ) ) cTags; + extraCmds = '' + ${extraCmds} + HOME=${builtins.getEnv "HOME"} + . ~/.bashrc + ''; + }; + in rec { + nixEnv = simple { + name = "nix"; + buildInputs = [ libtool stdenv perl curl bzip2 openssl aterm242fixes db45 autoconf automake zlib ]; + cTags = [ aterm242fixes]; + }; + [...] + }; + } + + + Put this into your .bashrc + loadEnv(){ . "${HOME}/.nix-profile/dev-envs/${1}" } + + then nix-env -iA ...nixEnv + and + $ loadEnv postgresql + +*/ + +{ mkDerivation, substituteAll, pkgs } : { stdenv ? pkgs.stdenv, name, buildInputs ? [], cTags ? [], extraCmds ? ""} : +mkDerivation { + buildInputs = [ ] ++ buildInputs ; + name = "env-${name}"; + phases = "buildPhase"; + setupNew = substituteAll { + src = ../../stdenv/generic/setup-new.sh; + preHook=""; + postHook=""; + initialPath= (import ../../stdenv/common-path.nix) { inherit pkgs; }; + gcc = stdenv.gcc; + }; + buildPhase = '' + set -x + mkdir -p "$out/dev-envs" "$out/nix-support" + s="$out/nix-support/setup-new-modified" + cp "$setupNew" "$s" + # shut some warning up.., do not use set -e + sed -e 's@set -e@@' \ + -e 's@assertEnvExists\s\+NIX_STORE@:@' \ + -e 's@trap.*@@' \ + -i "$s" + cat >> "$out/dev-envs/''${name/env-/}" << EOF + buildInputs="$buildInputs" + # the setup-new script wants to write some data to a temp file.. so just let it do that and tidy up afterwards + tmp="\$("${pkgs.coreutils}/bin/mktemp" -d)" + NIX_BUILD_TOP="\$tmp" + phases= + # only do all the setup stuff in nix-support/* + set +e + source "$s" + rm -fr "\$tmp" + ${extraCmds} + export PATH + echo $name loaded + EOF + ''; +} diff --git a/pkgs/misc/ntfs-3g/default.nix b/pkgs/misc/ntfs-3g/default.nix index 03ef6327779..6edaf02084e 100644 --- a/pkgs/misc/ntfs-3g/default.nix +++ b/pkgs/misc/ntfs-3g/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ntfs-3g"; - version = "1.2812"; + version = "1.5012"; name = "${pname}-${version}"; src = fetchurl { url = "${meta.homepage}/${name}.tgz"; - sha256 = "1jvgv53glrxk883bixl2dl1fjydmprmw189yn6jqwjvfhnx6g1zy"; + sha256 = "e79102fdb5948f209d25432f8f5127965877fe47bed68b9270b23fc1d187735a"; }; preConfigure = '' diff --git a/pkgs/misc/tex/pgf/default.nix b/pkgs/misc/tex/pgf/1.x.nix similarity index 100% rename from pkgs/misc/tex/pgf/default.nix rename to pkgs/misc/tex/pgf/1.x.nix diff --git a/pkgs/misc/tex/pgf/2.x.nix b/pkgs/misc/tex/pgf/2.x.nix new file mode 100644 index 00000000000..5e73d12959c --- /dev/null +++ b/pkgs/misc/tex/pgf/2.x.nix @@ -0,0 +1,17 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "pgf-2.00"; + + src = fetchurl { + url = mirror://sourceforge/pgf/pgf-2.00.tar.gz; + sha256 = "0j57niag4jb2k0iyrvjsannxljc3vkx0iag7zd35ilhiy4dh6264"; + }; + + buildPhase = "true"; + + installPhase = " + ensureDir $out/share/texmf-nix + cp -prd * $out/share/texmf-nix + "; +} diff --git a/pkgs/misc/tex/texlive/pgf.nix b/pkgs/misc/tex/texlive/pgf.nix index 5e30740f694..01be99b9501 100644 --- a/pkgs/misc/tex/texlive/pgf.nix +++ b/pkgs/misc/tex/texlive/pgf.nix @@ -1,9 +1,11 @@ args: with args; + rec { name = "texlive-pgf-2007"; + src = fetchurl { - url = mirror://debian/pool/main/p/pgf/pgf_1.18.orig.tar.gz; - sha256 = "1fk0m3rqsgdrxp2n6mbhh92819g1133w67lbgk66pqgspbrnk6h2"; + url = "mirror://sourceforge/pgf/pgf-2.00.tar.gz"; + sha256 = "0j57niag4jb2k0iyrvjsannxljc3vkx0iag7zd35ilhiy4dh6264"; }; propagatedBuildInputs = [texLiveLatexXColor texLive]; @@ -16,5 +18,21 @@ rec { meta = { description = "Extra components for TeXLive: graphics package"; + + longDescription = '' + PGF is a macro package for creating graphics. It is platform- + and format-independent and works together with the most + important TeX backend drivers, including pdftex and dvips. It + comes with a user-friedly syntax layer called TikZ. + + Its usage is similar to pstricks and the standard picture + environment. PGF works with plain (pdf-)TeX, (pdf-)LaTeX, and + ConTeXt. Unlike pstricks , it can produce either PostScript or + PDF output. + ''; + + license = [ "GPLv2" "LPPLv1.3c" ]; + + homepage = http://tug.ctan.org/tex-archive/graphics/pgf/; }; } diff --git a/pkgs/os-specific/linux/atheros/0.9.4.nix b/pkgs/os-specific/linux/atheros/0.9.4.nix index f187dbe234d..86a2a0eaf4f 100644 --- a/pkgs/os-specific/linux/atheros/0.9.4.nix +++ b/pkgs/os-specific/linux/atheros/0.9.4.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://downloads.sourceforge.net/madwifi/madwifi-0.9.4.tar.gz; diff --git a/pkgs/os-specific/linux/atheros/inj.patch b/pkgs/os-specific/linux/atheros/inj.patch new file mode 100644 index 00000000000..baae9b88aa4 --- /dev/null +++ b/pkgs/os-specific/linux/atheros/inj.patch @@ -0,0 +1,32 @@ +diff -Naur madwifi/ath/if_ath.c madwifi_rawtx/ath/if_ath.c +--- madwifi/ath/if_ath.c 2008-06-24 17:20:58.000000000 -0400 ++++ madwifi_rawtx/ath/if_ath.c 2008-06-24 17:20:12.000000000 -0400 +@@ -2950,6 +2950,7 @@ + ath_tx_startraw(struct net_device *dev, struct ath_buf *bf, struct sk_buff *skb) + { + struct ath_softc *sc = dev->priv; ++ struct ieee80211com *ic = &sc->sc_ic; + struct ath_hal *ah = sc->sc_ah; + struct ieee80211_phy_params *ph = &(SKB_CB(skb)->phy); + const HAL_RATE_TABLE *rt; +@@ -2962,7 +2963,8 @@ + struct ieee80211_frame *wh; + + wh = (struct ieee80211_frame *)skb->data; +- try0 = ph->try[0]; ++// try0 = ph->try[0]; ++ try0 = (ic->ic_opmode == IEEE80211_M_MONITOR) ? 1 : ph->try[0]; + rt = sc->sc_currates; + txrate = dot11_to_ratecode(sc, rt, ph->rate[0]); + power = ph->power > 60 ? 60 : ph->power; +@@ -2986,7 +2988,8 @@ + rt = sc->sc_currates; + KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode)); + +- if (IEEE80211_IS_MULTICAST(wh->i_addr1)) { ++ if (IEEE80211_IS_MULTICAST(wh->i_addr1) || ((ic->ic_opmode == ++IEEE80211_M_MONITOR) && (skb->data[1]&3) != 0x01) ) { + flags |= HAL_TXDESC_NOACK; /* no ack on broad/multicast */ + sc->sc_stats.ast_tx_noack++; + try0 = 1; + diff --git a/pkgs/os-specific/linux/atheros/r3693.nix b/pkgs/os-specific/linux/atheros/r3693.nix index e4544608c24..7561e07609a 100644 --- a/pkgs/os-specific/linux/atheros/r3693.nix +++ b/pkgs/os-specific/linux/atheros/r3693.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = fetchurl { url = http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3693-20080602.tar.gz; sha256 = "0r9nnxcq50rgwcm9y93rpk3mqknl3ixkxkd72437b55qlz1f9vs3"; diff --git a/pkgs/os-specific/linux/atheros/r3837.nix b/pkgs/os-specific/linux/atheros/r3837.nix index 24cc66d8eb4..ca475bfc3e1 100644 --- a/pkgs/os-specific/linux/atheros/r3837.nix +++ b/pkgs/os-specific/linux/atheros/r3837.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = fetchurl { url = http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3837-20080802.tar.gz; sha256 = "0yj6jxlygb5bdnysmn47dn4wi220ma310vd885a1pl7hp3ky216m"; @@ -12,6 +12,7 @@ args : with args; url = http://people.freebsd.org/~sam/ath_hal-20080528.tgz; sha256 = "1a6glkd8n46876hl48ib08p81qwsvrk4153j4b9xrxgid6f8bar9"; }; + injectionPatchFile = ./inj.patch; }; in with localDefs; let @@ -27,12 +28,15 @@ postInstall = FullDepEntry ('' in stdenv.mkDerivation rec { name = "atheros-"+version; + patches = lib.optional + (lib.getAttr ["injectionPatch"] false args) + injectionPatchFile; builder = writeScript (name + "-builder") (textClosure localDefs ((lib.optional (lib.getAttr ["freshHAL"] false args) preBuild) - ++ [doMakeInstall postInstall + ++ [doPatch doMakeInstall postInstall doForceShare doPropagate])); meta = { description = " diff --git a/pkgs/os-specific/linux/atheros/r3867.nix b/pkgs/os-specific/linux/atheros/r3867.nix new file mode 100644 index 00000000000..aaa708c2c5d --- /dev/null +++ b/pkgs/os-specific/linux/atheros/r3867.nix @@ -0,0 +1,47 @@ +args : with args; + let localDefs = builderDefs.passthru.function { + src = fetchurl { + url = http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3867-20080924.tar.gz; + sha256 = "0m48p5mqx1d3aimjjiy251fii7x7y15ch5n74hvq4hygc6bcjf79"; + }; + + buildInputs = []; + configureFlags = []; + makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out'']; + hal20080528 = fetchurl { + url = http://people.freebsd.org/~sam/ath_hal-20080528.tgz; + sha256 = "1a6glkd8n46876hl48ib08p81qwsvrk4153j4b9xrxgid6f8bar9"; + }; + injectionPatchFile = ./inj.patch; + }; + in with localDefs; +let +preBuild = FullDepEntry ('' + echo Replacing HAL. + tar xvf ${hal20080528} + rm -r hal + mv ath_hal-* hal +'') ["minInit" "doUnpack"]; +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) + injectionPatchFile; + builder = writeScript (name + "-builder") + (textClosure localDefs + ((lib.optional + (lib.getAttr ["freshHAL"] false args) + preBuild) + ++ [doPatch doMakeInstall postInstall + doForceShare doPropagate])); + meta = { + description = " + Atheros WiFi driver. +"; + inherit src; + }; +} diff --git a/pkgs/os-specific/linux/cryopid/default.nix b/pkgs/os-specific/linux/cryopid/default.nix new file mode 100644 index 00000000000..a5f6f4fa5b2 --- /dev/null +++ b/pkgs/os-specific/linux/cryopid/default.nix @@ -0,0 +1,50 @@ +{stdenv, fetchurl, zlibStatic}: + +let + + src32 = fetchurl { + url = http://dagobah.ucc.asn.au/wacky/cryopid-0.5.9.1-i386.tar.gz; + sha256 = "14175pc87x932c09cl1n5iwc5v1086gd4xpb4pz7d5fvqpaxca3h"; + }; + + src64 = fetchurl { + url = http://dagobah.ucc.asn.au/wacky/cryopid-0.5.9.1-x86_64.tar.gz; + sha256 = "0y3h9fvb59c8i07das5srhprnsbj1i9m93fp37mzqcjxi2gwjw3b"; + }; + +in + +stdenv.mkDerivation { + name = "cryopid-0.5.9.1"; + + src = + if stdenv.system == "i686-linux" then src32 + else if stdenv.system == "x86_64-linux" then src64 + else throw "unsupported platform for CryoPID"; + + buildInputs = [zlibStatic]; + + buildPhase = '' + make -C src ARCH=i386 + ''; + + installPhase = '' + mkdir -p $out/bin + cp src/freeze $out/bin + ''; + + meta = { + description = "A process freezer for Linux"; + longDescription = '' + CryoPID allows you to capture the state of a running process in Linux + and save it to a file. This file can then be used to resume the process + later on, either after a reboot or even on another machines. + ''; + homepage = http://cryopid.berlios.de; + license = '' + Modified BSD license (without advertising clause). CryoPID ships with + and links against the dietlibc library, which is distributed under the + GNU General Public Licence, version 2. + ''; + }; +} diff --git a/pkgs/os-specific/linux/dmidecode/2.9.nix b/pkgs/os-specific/linux/dmidecode/2.9.nix index 2ee868af486..65081d9f82e 100644 --- a/pkgs/os-specific/linux/dmidecode/2.9.nix +++ b/pkgs/os-specific/linux/dmidecode/2.9.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://download.savannah.gnu.org/releases/dmidecode/dmidecode-2.9.tar.bz2; diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix new file mode 100644 index 00000000000..189272b7d9b --- /dev/null +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -0,0 +1,26 @@ +a : +let + fetchurl = a.fetchurl; + + version = a.lib.getAttr ["version"] "1.2" a; + buildInputs = with a; [ + gpm fontconfig freetype pkgconfig + ]; +in +rec { + src = fetchurl { + url = "http://fbterm.googlecode.com/files/fbterm-${version}.tar.gz"; + sha256 = "0q4axmnpwlpjlpaj19iw7nyxkqsvwq767szdkzsgancq99afwqyd"; + }; + + inherit buildInputs; + configureFlags = []; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "doMakeInstall"]; + + name = "fbterm-" + version; + meta = { + description = "Framebuffer terminal emulator"; + }; +} diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix index 97f00cc31a9..3b50d8688a4 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix @@ -22,6 +22,14 @@ stdenv.mkDerivation rec { meta = { description = "Firmware for the Intel 4965ABG wireless card"; + + longDescription = '' + This package provides version 2 of the Intel wireless card + firmware, for Linux up to 2.6.26. It contains the + `iwlwifi-4965-1.ucode' file, which is loaded by the `iw4965' + driver found in recent kernels. + ''; + homepage = http://intellinuxwireless.org/; }; } diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix new file mode 100644 index 00000000000..0948d381f7f --- /dev/null +++ b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "iwlwifi-4965-ucode-228.57.2.21"; + + src = fetchurl { + url = "http://intellinuxwireless.org/iwlwifi/downloads/" + name + ".tgz"; + sha256 = "1ss8r9l8j28n4zplpcwf81n74yy7p4q9dldnblmh4g0h9nyr8nf0"; + }; + + buildPhase = "true"; + + installPhase = '' + ensureDir "$out" + chmod -x * + cp * "$out" + ''; + + meta = { + description = "Firmware for the Intel 4965ABG wireless card, for Linux 2.6.27+"; + + longDescription = '' + This package provides version 2 of the Intel wireless card + firmware, for Linux 2.6.27 and later. It contains the + `iwlwifi-4965-2.ucode' file, which is loaded by the `iwlagn' + driver found in recent kernels. + ''; + + homepage = http://intellinuxwireless.org/; + }; +} diff --git a/pkgs/os-specific/linux/initscripts/default.nix b/pkgs/os-specific/linux/initscripts/default.nix index 338191ce138..acb13826515 100644 --- a/pkgs/os-specific/linux/initscripts/default.nix +++ b/pkgs/os-specific/linux/initscripts/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "initscripts-8.18"; builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/initscripts-8.18.tar.bz2; + url = http://nixos.org/tarballs/initscripts-8.18.tar.bz2; md5 = "1b89ac4d344f1f20fe5022a198b69915"; }; buildInputs = [popt pkgconfig glib]; diff --git a/pkgs/os-specific/linux/kernel/config-2.6.27-i686-smp b/pkgs/os-specific/linux/kernel/config-2.6.27-i686-smp new file mode 100644 index 00000000000..03c43e566c6 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/config-2.6.27-i686-smp @@ -0,0 +1,4052 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.27.4 +# Wed Oct 29 13:32:34 2008 +# +# 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_LOCKBREAK is not set +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_GENERIC_GPIO is not set +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +# CONFIG_RWSEM_GENERIC_SPINLOCK is not set +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +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_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_AOUT=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_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 +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=17 +# CONFIG_CGROUPS is not set +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_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_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=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_COMPAT_BRK=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_ANON_INODES=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +CONFIG_PROFILING=y +# CONFIG_MARKERS is not set +CONFIG_OPROFILE=m +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 is not set +# CONFIG_HAVE_DMA_ATTRS is not set +CONFIG_USE_GENERIC_SMP_HELPERS=y +# CONFIG_HAVE_CLK is not set +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +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_KMOD=y +CONFIG_STOP_MACHINE=y +CONFIG_BLOCK=y +CONFIG_LBD=y +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF 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_CLASSIC_RCU=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_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_NO_NO_OMIT_FRAME_POINTER=y +CONFIG_PARAVIRT_GUEST=y +CONFIG_XEN=y +CONFIG_XEN_MAX_DOMAIN_MEMORY=8 +CONFIG_XEN_SAVE_RESTORE=y +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_MWINCHIP2 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_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_DMI=y +# CONFIG_IOMMU_HELPER 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_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_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_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_SPARSEMEM_VMEMMAP_ENABLE is not set +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_RESOURCES_64BIT=y +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_MMU_NOTIFIER=y +CONFIG_HIGHPTE=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_IRQBALANCE=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_ARCH_ENABLE_MEMORY_HOTPLUG=y + +# +# Power management 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=m +CONFIG_ACPI_BAY=m +CONFIG_ACPI_PROCESSOR=m +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_THERMAL=m +CONFIG_ACPI_WMI=m +CONFIG_ACPI_ASUS=m +CONFIG_ACPI_TOSHIBA=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_EC=y +CONFIG_ACPI_PCI_SLOT=m +CONFIG_ACPI_POWER=y +CONFIG_ACPI_SYSTEM=y +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 +# CONFIG_APM_REAL_MODE_POWER_OFF 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_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_ACPI_CPUFREQ_PROC_INTF is not set +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_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_BINFMT_AOUT=m +CONFIG_BINFMT_MISC=m +CONFIG_NET=y + +# +# Networking options +# +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_IP_VS=m +# 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_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 +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_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_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_RATEEST=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_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_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=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_SCTP=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_NETFILTER_XT_MATCH_HASHLIMIT=m + +# +# IP: Netfilter Configuration +# +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_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_REDIRECT=m +CONFIG_IP_NF_TARGET_NETMAP=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_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_TARGET_CLUSTERIP=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_RT=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=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 + +# +# Bridge: Netfilter Configuration +# +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_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_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_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_CLS_IND is not set +CONFIG_NET_SCH_FIFO=y + +# +# 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_FIB_RULES=y + +# +# Wireless +# +CONFIG_CFG80211=m +CONFIG_NL80211=y +CONFIG_WIRELESS_EXT=y +CONFIG_WIRELESS_EXT_SYSFS=y +CONFIG_MAC80211=m + +# +# Rate control algorithm selection +# +CONFIG_MAC80211_RC_PID=y +CONFIG_MAC80211_RC_DEFAULT_PID=y +CONFIG_MAC80211_RC_DEFAULT="pid" +# CONFIG_MAC80211_MESH is not set +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_CRYPT_TKIP=m +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_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_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_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_START=0x8000000 +CONFIG_MTD_PHYSMAP_LEN=0x4000000 +CONFIG_MTD_PHYSMAP_BANKWIDTH=2 +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_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 + +# +# 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 is not set + +# +# 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_EEPROM_93CX6=m +# CONFIG_SGI_IOC4 is not set +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m +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_COMPAL_LAPTOP=m +CONFIG_SONY_LAPTOP=m +CONFIG_SONYPI_COMPAT=y +CONFIG_THINKPAD_ACPI=m +# 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_ENCLOSURE_SERVICES=m +CONFIG_HP_ILO=m +CONFIG_HAVE_IDE=y +CONFIG_IDE=m +CONFIG_BLK_DEV_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_BLK_DEV_IDEDISK=m +CONFIG_IDEDISK_MULTI_MODE=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_IDEFLOPPY=m +CONFIG_BLK_DEV_IDESCSI=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_HPT366=m +CONFIG_BLK_DEV_JMICRON=m +CONFIG_BLK_DEV_SC1200=m +CONFIG_BLK_DEV_PIIX=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_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_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_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_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_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_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_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_EEPRO100=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_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_NETDEV_1000=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_DL2K=m +CONFIG_E1000=m +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set +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_NETDEV_10000=y +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T3=m +CONFIG_IXGBE=m +CONFIG_IXGB=m +CONFIG_S2IO=m +CONFIG_MYRI10GE=m +CONFIG_NETXEN_NIC=m +CONFIG_NIU=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_TEHUTI=m +CONFIG_BNX2X=m +CONFIG_SFC=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_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_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_CS=m +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_AIRO=m +CONFIG_HERMES=m +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_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_RT2X00_LIB=m +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_RFKILL=y +CONFIG_RT2X00_LIB_LEDS=y +CONFIG_RT2400PCI=m +CONFIG_RT2400PCI_RFKILL=y +CONFIG_RT2400PCI_LEDS=y +CONFIG_RT2500PCI=m +CONFIG_RT2500PCI_RFKILL=y +CONFIG_RT2500PCI_LEDS=y +CONFIG_RT61PCI=m +CONFIG_RT61PCI_RFKILL=y +CONFIG_RT61PCI_LEDS=y +CONFIG_RT2500USB=m +CONFIG_RT2500USB_LEDS=y +CONFIG_RT73USB=m +CONFIG_RT73USB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set + +# +# 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_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_PC300 is not set +# 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_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_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_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_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_UCB1400=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_INPUT_MISC=y +CONFIG_INPUT_PCSPKR=y +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_UINPUT=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_ESPSERIAL is not set +# 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_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_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_AT24=m +CONFIG_SENSORS_EEPROM=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_AT25=m +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_DS2433=m +# CONFIG_W1_SLAVE_DS2433_CRC is not set +CONFIG_W1_SLAVE_DS2760=m +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +# CONFIG_PDA_POWER is not set +# CONFIG_BATTERY_DS2760 is not set +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_ADT7470=m +CONFIG_SENSORS_ADT7473=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_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_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_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_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_SMSC37B787_WDT=m +CONFIG_W83627HF_WDT=m +CONFIG_W83697HF_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 + +# +# Sonics Silicon Backplane +# +CONFIG_SSB_POSSIBLE=y +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 is not set +CONFIG_MFD_SM501=m +CONFIG_HTC_PASIC3=m +# CONFIG_MFD_TMIO is not set + +# +# 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_DMA_CONTIG=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_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_TUNER_3036=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_DPC=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_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_V4L_USB_DRIVERS=y +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=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_SOC_CAMERA=m +CONFIG_SOC_CAMERA_MT9M001=m +CONFIG_SOC_CAMERA_MT9V022=m +CONFIG_SOC_CAMERA_PLATFORM=m +CONFIG_VIDEO_SH_MOBILE_CEU=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_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_ANYSEE=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_DVB_CINERGYT2=m +# CONFIG_DVB_CINERGYT2_TUNING is not set +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 DVB Frontends +# + +# +# Customise DVB Frontends +# +# CONFIG_DVB_FE_CUSTOMISE is not set + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUA6100=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_S5H1409=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_S5H1411=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_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_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_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_IMAC=y +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_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_SM501=m +# CONFIG_FB_VIRTUAL is not set +CONFIG_XEN_FBDEV_FRONTEND=m +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_LTV350QV=m +CONFIG_LCD_ILI9320=m +CONFIG_LCD_VGG2432A4=m +CONFIG_LCD_PLATFORM=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_CORGI=m +CONFIG_BACKLIGHT_PROGEAR=m +CONFIG_BACKLIGHT_CARILLO_RANCH=m +CONFIG_BACKLIGHT_MBP_NVIDIA=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_VIDEO_SELECT=y +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_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +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_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_AD1848_LIB=m +CONFIG_SND_CS4231_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_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_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_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_AEDSP16_MSS is not set +# CONFIG_AEDSP16_SBPRO is not set +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_USB_HIDINPUT_POWERBOOK=y +CONFIG_HID_FF=y +CONFIG_HID_PID=y +CONFIG_LOGITECH_FF=y +CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_PANTHERLORD_FF=y +CONFIG_THRUSTMASTER_FF=y +CONFIG_ZEROPLUS_FF=y +CONFIG_USB_HIDDEV=y + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +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=y + +# +# 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_ISP116X_HCD=m +CONFIG_USB_ISP1760_HCD=m +# CONFIG_USB_ISP1760_PCI is not set +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 + +# +# 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 + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# 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_DPCM=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_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_DEBUG is not set + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=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_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m +# CONFIG_USB_GADGET is not set +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set + +# +# MMC/SD Card Drivers +# +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=m +# CONFIG_MMC_TEST is not set + +# +# MMC/SD Host Controller Drivers +# +# CONFIG_MMC_SDHCI is not set +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_PCA9532=m +CONFIG_LEDS_CLEVO_MAIL=m +CONFIG_LEDS_PCA955X=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_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 + +# +# SPI RTC drivers +# +CONFIG_RTC_DRV_M41T94=m +CONFIG_RTC_DRV_DS1305=m +CONFIG_RTC_DRV_MAX6902=m +CONFIG_RTC_DRV_R9701=m +CONFIG_RTC_DRV_RS5C348=m + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=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_M48T59=m +CONFIG_RTC_DRV_V3020=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_XEN_BALLOON=y +CONFIG_XEN_SCRUB_PAGES=y + +# +# 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_FS_XIP=y +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +# CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +CONFIG_JBD_DEBUG=y +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_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +# CONFIG_XFS_DEBUG is not set +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_DNOTIFY=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +CONFIG_PRINT_QUOTA_WARNING=y +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_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y +CONFIG_CONFIGFS_FS=m + +# +# Miscellaneous filesystems +# +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_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_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_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_WRITECOUNT is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_FRAME_POINTER is not set +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +CONFIG_SYSCTL_SYSCALL_CHECK=y +CONFIG_HAVE_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +# CONFIG_FTRACE 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_PROVIDE_OHCI1394_DMA_INIT 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_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_MMIOTRACE is not set +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_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM 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_ENABLE_SECMARK_DEFAULT is not set +# 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_ALGAPI=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_MANAGER=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_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 +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_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_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.27-x86_64-smp b/pkgs/os-specific/linux/kernel/config-2.6.27-x86_64-smp new file mode 100644 index 00000000000..5775b6c6607 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/config-2.6.27-x86_64-smp @@ -0,0 +1,3818 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.27.4 +# Wed Oct 29 13:19:48 2008 +# +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_LOCKBREAK is not set +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_GENERIC_GPIO is not set +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 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_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_AOUT=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_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 +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=17 +# CONFIG_CGROUPS is not set +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_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_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=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_COMPAT_BRK=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_ANON_INODES=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +CONFIG_PROFILING=y +# CONFIG_MARKERS is not set +CONFIG_OPROFILE=m +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 is not set +# CONFIG_HAVE_DMA_ATTRS is not set +CONFIG_USE_GENERIC_SMP_HELPERS=y +# CONFIG_HAVE_CLK is not set +CONFIG_PROC_PAGE_MONITOR=y +# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +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_KMOD=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_CLASSIC_RCU=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_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_PARAVIRT_GUEST=y +CONFIG_XEN=y +CONFIG_XEN_MAX_DOMAIN_MEMORY=32 +CONFIG_XEN_SAVE_RESTORE=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 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_MWINCHIP2 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_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_SWIOTLB=y +CONFIG_IOMMU_HELPER=y +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_MCE=y +CONFIG_X86_MCE_INTEL=y +CONFIG_X86_MCE_AMD=y +CONFIG_I8K=m +CONFIG_MICROCODE=m +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=m +CONFIG_X86_CPUID=m +# 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_STATIC is not set +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_RESOURCES_64BIT=y +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_MMU_NOTIFIER=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_ARCH_ENABLE_MEMORY_HOTPLUG=y + +# +# Power management 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=m +CONFIG_ACPI_BAY=m +CONFIG_ACPI_PROCESSOR=m +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_THERMAL=m +CONFIG_ACPI_WMI=m +CONFIG_ACPI_ASUS=m +CONFIG_ACPI_TOSHIBA=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_EC=y +CONFIG_ACPI_PCI_SLOT=m +CONFIG_ACPI_POWER=y +CONFIG_ACPI_SYSTEM=y +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_ACPI_CPUFREQ_PROC_INTF is not set +CONFIG_X86_SPEEDSTEP_LIB=m +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_DIRECT=y +CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_DOMAINS=y +# CONFIG_DMAR 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_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_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_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_IP_VS=m +# 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_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 +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_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_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_RATEEST=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_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_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=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_SCTP=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_NETFILTER_XT_MATCH_HASHLIMIT=m + +# +# IP: Netfilter Configuration +# +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_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_REDIRECT=m +CONFIG_IP_NF_TARGET_NETMAP=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_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_TARGET_CLUSTERIP=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_RT=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=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 + +# +# Bridge: Netfilter Configuration +# +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_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_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_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_CLS_IND is not set +CONFIG_NET_SCH_FIFO=y + +# +# 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_FIB_RULES=y + +# +# Wireless +# +CONFIG_CFG80211=m +CONFIG_NL80211=y +CONFIG_WIRELESS_EXT=y +CONFIG_WIRELESS_EXT_SYSFS=y +CONFIG_MAC80211=m + +# +# Rate control algorithm selection +# +CONFIG_MAC80211_RC_PID=y +CONFIG_MAC80211_RC_DEFAULT_PID=y +CONFIG_MAC80211_RC_DEFAULT="pid" +# CONFIG_MAC80211_MESH is not set +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_CRYPT_TKIP=m +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_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_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_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_START=0x8000000 +CONFIG_MTD_PHYSMAP_LEN=0x4000000 +CONFIG_MTD_PHYSMAP_BANKWIDTH=2 +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_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 + +# +# 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 is not set + +# +# 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_EEPROM_93CX6=m +# CONFIG_SGI_IOC4 is not set +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m +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_COMPAL_LAPTOP=m +CONFIG_SONY_LAPTOP=m +CONFIG_SONYPI_COMPAT=y +CONFIG_THINKPAD_ACPI=m +# 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_ENCLOSURE_SERVICES=m +CONFIG_SGI_XP=m +CONFIG_HP_ILO=m +CONFIG_SGI_GRU=m +# CONFIG_SGI_GRU_DEBUG is not set +CONFIG_HAVE_IDE=y +CONFIG_IDE=m +CONFIG_BLK_DEV_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_BLK_DEV_IDEDISK=m +CONFIG_IDEDISK_MULTI_MODE=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_IDEFLOPPY=m +CONFIG_BLK_DEV_IDESCSI=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_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_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_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_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_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_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_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_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_EEPRO100=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_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_NETDEV_1000=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_DL2K=m +CONFIG_E1000=m +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set +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_NETDEV_10000=y +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T3=m +CONFIG_IXGBE=m +CONFIG_IXGB=m +CONFIG_S2IO=m +CONFIG_MYRI10GE=m +CONFIG_NETXEN_NIC=m +CONFIG_NIU=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_TEHUTI=m +CONFIG_BNX2X=m +CONFIG_SFC=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_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_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_CS=m +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_AIRO=m +CONFIG_HERMES=m +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_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_RT2X00_LIB=m +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_RFKILL=y +CONFIG_RT2X00_LIB_LEDS=y +CONFIG_RT2400PCI=m +CONFIG_RT2400PCI_RFKILL=y +CONFIG_RT2400PCI_LEDS=y +CONFIG_RT2500PCI=m +CONFIG_RT2500PCI_RFKILL=y +CONFIG_RT2500PCI_LEDS=y +CONFIG_RT61PCI=m +CONFIG_RT61PCI_RFKILL=y +CONFIG_RT61PCI_LEDS=y +CONFIG_RT2500USB=m +CONFIG_RT2500USB_LEDS=y +CONFIG_RT73USB=m +CONFIG_RT73USB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set + +# +# 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_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_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_PC300 is not set +# 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_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_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_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_MTOUCH=m +CONFIG_TOUCHSCREEN_INEXIO=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_UCB1400=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_INPUT_MISC=y +CONFIG_INPUT_PCSPKR=y +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_UINPUT=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_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_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_AT24=m +CONFIG_SENSORS_EEPROM=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_AT25=m +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_DS2433=m +# CONFIG_W1_SLAVE_DS2433_CRC is not set +CONFIG_W1_SLAVE_DS2760=m +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +# CONFIG_PDA_POWER is not set +# CONFIG_BATTERY_DS2760 is not set +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_ADT7470=m +CONFIG_SENSORS_ADT7473=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_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_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_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_HP_WATCHDOG=m +CONFIG_SC1200_WDT=m +CONFIG_PC87413_WDT=m +CONFIG_60XX_WDT=m +CONFIG_SBC8360_WDT=m +CONFIG_CPU5_WDT=m +CONFIG_SMSC37B787_WDT=m +CONFIG_W83627HF_WDT=m +CONFIG_W83697HF_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 + +# +# Sonics Silicon Backplane +# +CONFIG_SSB_POSSIBLE=y +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 is not set +CONFIG_MFD_SM501=m +CONFIG_HTC_PASIC3=m +# CONFIG_MFD_TMIO is not set + +# +# 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_DMA_CONTIG=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_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_TUNER_3036=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_DPC=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_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_V4L_USB_DRIVERS=y +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=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_SOC_CAMERA=m +CONFIG_SOC_CAMERA_MT9M001=m +CONFIG_SOC_CAMERA_MT9V022=m +CONFIG_SOC_CAMERA_PLATFORM=m +CONFIG_VIDEO_SH_MOBILE_CEU=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_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_ANYSEE=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_DVB_CINERGYT2=m +# CONFIG_DVB_CINERGYT2_TUNING is not set +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 DVB Frontends +# + +# +# Customise DVB Frontends +# +# CONFIG_DVB_FE_CUSTOMISE is not set + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUA6100=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_S5H1409=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_S5H1411=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_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_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_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_IMAC=y +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_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_SM501=m +# CONFIG_FB_VIRTUAL is not set +CONFIG_XEN_FBDEV_FRONTEND=m +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_LTV350QV=m +CONFIG_LCD_ILI9320=m +CONFIG_LCD_VGG2432A4=m +CONFIG_LCD_PLATFORM=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_CORGI=m +CONFIG_BACKLIGHT_PROGEAR=m +CONFIG_BACKLIGHT_CARILLO_RANCH=m +CONFIG_BACKLIGHT_MBP_NVIDIA=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_VIDEO_SELECT=y +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_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +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_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_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_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_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_AEDSP16_MSS is not set +# CONFIG_AEDSP16_SBPRO is not set +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_USB_HIDINPUT_POWERBOOK=y +CONFIG_HID_FF=y +CONFIG_HID_PID=y +CONFIG_LOGITECH_FF=y +CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_PANTHERLORD_FF=y +CONFIG_THRUSTMASTER_FF=y +CONFIG_ZEROPLUS_FF=y +CONFIG_USB_HIDDEV=y + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +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=y + +# +# 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_ISP116X_HCD=m +CONFIG_USB_ISP1760_HCD=m +# CONFIG_USB_ISP1760_PCI is not set +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 + +# +# 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 + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# 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_DPCM=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_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_DEBUG is not set + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=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_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m +# CONFIG_USB_GADGET is not set +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set + +# +# MMC/SD Card Drivers +# +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=m +# CONFIG_MMC_TEST is not set + +# +# MMC/SD 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_PCA9532=m +CONFIG_LEDS_CLEVO_MAIL=m +CONFIG_LEDS_PCA955X=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_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 + +# +# SPI RTC drivers +# +CONFIG_RTC_DRV_M41T94=m +CONFIG_RTC_DRV_DS1305=m +CONFIG_RTC_DRV_MAX6902=m +CONFIG_RTC_DRV_R9701=m +CONFIG_RTC_DRV_RS5C348=m + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=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_M48T59=m +CONFIG_RTC_DRV_V3020=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_XEN_BALLOON=y +CONFIG_XEN_SCRUB_PAGES=y + +# +# 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_FS_XIP=y +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +# CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +CONFIG_JBD_DEBUG=y +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_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_DNOTIFY=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +CONFIG_PRINT_QUOTA_WARNING=y +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_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y +CONFIG_CONFIGFS_FS=m + +# +# Miscellaneous filesystems +# +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_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_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_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM 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_FRAME_POINTER is not set +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +CONFIG_SYSCTL_SYSCALL_CHECK=y +CONFIG_HAVE_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +# CONFIG_FTRACE 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_PROVIDE_OHCI1394_DMA_INIT 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_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_DIRECT_GBPAGES is not set +# CONFIG_DEBUG_NX_TEST is not set +# CONFIG_IOMMU_DEBUG is not set +# CONFIG_MMIOTRACE is not set +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_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM 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_ENABLE_SECMARK_DEFAULT is not set +# 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_ALGAPI=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_MANAGER=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_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 +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_HIFN_795X=m +# CONFIG_CRYPTO_DEV_HIFN_795X_RNG is not set +CONFIG_HAVE_KVM=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_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.26.nix b/pkgs/os-specific/linux/kernel/linux-2.6.26.nix index 8b2bcc855df..b5c45f60edc 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.26.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.26.nix @@ -28,7 +28,7 @@ let lib = stdenv.lib; - version = "2.6.26.5"; + version = "2.6.26.7"; baseFeatures = { iwlwifi = true; @@ -49,7 +49,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "16kp986767jxd9x4wxnnqnb1gkcv2ip3k234zbs7l6ikarafp0s8"; + sha256 = "1za4xq9q4gngmdxxwi728hdp30wjkwg4sh07fgyrs4nakjbjsgsj"; }; patches = map (p: p.patch) kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.27.nix b/pkgs/os-specific/linux/kernel/linux-2.6.27.nix new file mode 100644 index 00000000000..30d198ab7f3 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-2.6.27.nix @@ -0,0 +1,95 @@ +{ stdenv, fetchurl, perl, mktemp, module_init_tools + + # A list of patches to apply to the kernel. Each element of this list + # should be an attribute set {name, patch} where `name' is a + # symbolic name and `patch' is the actual patch. The patch may + # optionally be compressed with gzip or bzip2. +, kernelPatches ? [] + +, # Whether to build a User-Mode Linux kernel. + userModeLinux ? false + +, # Allows you to set your own kernel version suffix (e.g., + # "-my-kernel"). + localVersion ? "" + +, # Your own kernel configuration file, if you don't want to use the + # default. + kernelConfig ? null + +, # A list of additional statements to be appended to the + # configuration file. + extraConfig ? [] +}: + +assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; + +let + + lib = stdenv.lib; + + version = "2.6.27.7"; + + baseFeatures = { + iwlwifi = true; + }; + +in + +stdenv.mkDerivation { + name = if userModeLinux then "user-mode-linux-${version}" else "linux-${version}"; + + passthru = { + inherit version; + # Combine the `features' attribute sets of all the kernel patches. + features = lib.fold (x: y: (if x ? features then x.features else {}) // y) baseFeatures kernelPatches; + }; + + builder = ./builder.sh; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; + sha256 = "0l59jf8nb3ds1gaqd643k17j4n8pg4i0pmyb4hyczyszhpy7aw4f"; + }; + + patches = map (p: p.patch) kernelPatches; + extraConfig = + let addNewlines = map (s: "\n" + s + "\n"); + configFromPatches = + map (p: if p ? extraConfig then p.extraConfig else "") kernelPatches; + in lib.concatStrings (addNewlines (configFromPatches ++ extraConfig)); + + config = + if kernelConfig != null then kernelConfig else + if userModeLinux then ./config-2.6.27-uml else + if stdenv.system == "i686-linux" then ./config-2.6.27-i686-smp else + if stdenv.system == "x86_64-linux" then ./config-2.6.27-x86_64-smp else + abort "No kernel configuration for your platform!"; + + buildInputs = [perl mktemp]; + + arch = + if userModeLinux then "um" else + if stdenv.system == "i686-linux" then "i386" else + if stdenv.system == "x86_64-linux" then "x86_64" else + abort "Platform ${stdenv.system} is not supported."; + + makeFlags = if userModeLinux then "ARCH=um SHELL=bash" else ""; + + inherit module_init_tools; + + allowLocalVersion = false; # don't allow patches to set a suffix + inherit localVersion; # but do allow the user to set one. + + meta = { + description = + (if userModeLinux then + "User-Mode Linux" + else + "The Linux kernel") + + (if kernelPatches == [] then "" else + " (with patches: " + + lib.concatStrings (lib.intersperse ", " (map (x: x.name) kernelPatches)) + + ")"); + }; +} diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 34883ad0042..024b1ffe9fa 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -2,13 +2,22 @@ , version ? "1.5" , sha256 ? "1izhf8kscjymsvsvhcqw9awnmp94vwv70zdj09srg9bkpjj0n017" , subdir ? "" + , addPreBuild ? "" }: assert stdenv.isLinux; stdenv.mkDerivation { name = "klibc-${version}"; - builder = ./builder.sh; + #builder = ./builder.sh; + makeFlags = ["V=1" "prefix=$out" "SHLIBDIR=$out/lib"]; + preBuild = '' + makeFlags=$(eval "echo $makeFlags") + + mkdir -p linux/include + cp -prd $kernel/lib/modules/*/build/include/* linux/include/ + chmod -R u+w linux/include/ + '' + addPreBuild; src = fetchurl { url = "mirror://kernel/linux/libs/klibc/${subdir}klibc-${version}.tar.bz2"; inherit sha256; diff --git a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix b/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix index 6dba6ffd041..9e56e96f297 100644 --- a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix +++ b/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix @@ -2,7 +2,7 @@ args : with args; rec { name = "kqemu-"+version; src = fetchurl { - url = http://fabrice.bellard.free.fr/qemu/kqemu-1.3.0pre11.tar.gz; + url = http://bellard.org/qemu/kqemu-1.3.0pre11.tar.gz; sha256 = "03svg2x52ziglf9r9irf6ziiz8iwa731fk1mdskwdip5jxbyy6jl"; }; diff --git a/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix b/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix new file mode 100644 index 00000000000..7dad06c3d0e --- /dev/null +++ b/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix @@ -0,0 +1,26 @@ +args : with args; +rec { + name = "kqemu-"+version; + src = fetchurl { + url = http://bellard.org/qemu/kqemu-1.4.0pre1.tar.gz; + sha256 = "14dlmawn3gia1j401ag5si5k1a1vav7jpv86rl37p1hwmr7fihxs"; + }; + + buildInputs = []; + configureFlags = [''--PREFIx=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)'']; + debugStep = FullDepEntry ('' + cat config-host.mak + '') ["minInit"]; + 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 + cat install.sh + '') ["minInit" "doUnpack"]; + + phaseNames = ["preConfigure" "doConfigure" "debugStep" "doMakeInstall"]; + + meta = { + description = " Kernel module for Qemu acceleration "; + }; +} diff --git a/pkgs/os-specific/linux/kvm/76.nix b/pkgs/os-specific/linux/kvm/76.nix new file mode 100644 index 00000000000..e438f044c59 --- /dev/null +++ b/pkgs/os-specific/linux/kvm/76.nix @@ -0,0 +1,38 @@ +{stdenv, fetchurl, kernelHeaders, zlib, e2fsprogs, SDL, alsaLib, pkgconfig, rsync}: + +assert stdenv.isLinux; + +stdenv.mkDerivation { + name = "kvm-76"; + + src = fetchurl { + url = mirror://sourceforge/kvm/kvm-76.tar.gz; + sha256 = "06gf2aic6n0b3fnd9vi0llyydr2w6qnx1k8imm710862xhncpssk"; + }; + + patches = [ + # Allow setting the path to Samba through $QEMU_SMBD_COMMAND. + ./smbd-path.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-r2.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/nvidia/builder.sh b/pkgs/os-specific/linux/nvidia/builder.sh index cb4e67614bb..eaec6d56ed0 100755 --- a/pkgs/os-specific/linux/nvidia/builder.sh +++ b/pkgs/os-specific/linux/nvidia/builder.sh @@ -56,10 +56,10 @@ installPhase() { # Install the programs. ensureDir $out/bin - patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.*.* - patchelf --set-rpath $out/lib:$glPath $out/lib/libXvMCNVIDIA.so.*.*.* - patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.*.* - patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.*.* + patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.* + patchelf --set-rpath $out/lib:$glPath $out/lib/libXvMCNVIDIA.so.*.* + patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* + patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.* for i in nvidia-settings nvidia-xconfig; do cp usr/bin/$i $out/bin/$i diff --git a/pkgs/os-specific/linux/nvidia/default.nix b/pkgs/os-specific/linux/nvidia/default.nix index 934b97ad638..6e7b50dffa5 100644 --- a/pkgs/os-specific/linux/nvidia/default.nix +++ b/pkgs/os-specific/linux/nvidia/default.nix @@ -2,7 +2,7 @@ let - versionNumber = "173.14.12"; + versionNumber = "177.80"; 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}-pkg1.run"; - sha256 = "0a4i4a7vk0j7z52d2pg92f8wnlabd4r6v19qxdrr8nhgm0imjh78"; + sha256 = "1z6z4dzhl2zmnwywaxbn2nf7lf72whjn7ffasdkb9217d5099wh7"; } 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}-pkg2.run"; - sha256 = "1jblrvpa69z98g39sgadb3xbdsbzlvps4h9w73211l83sppqq84s"; # was 01hyyb5s7xc7108gy9cr7zkrfccfnpzqpipfygx9fikxyjb1vmig + sha256 = "1kx1kpc5flbsy9h1ii8al8cwzmvlfg4ymr6hvqsanxcdarq1sz47"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix b/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix index 0a4886d1ab1..4b2cd1ed5b2 100644 --- a/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix +++ b/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ov511-2.30"; builder = ./ov511-2.30-builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/ov511-2.30.tar.bz2; + url = http://nixos.org/tarballs/ov511-2.30.tar.bz2; md5 = "9eacf9e54f2f54a59ddbf14221a53f2a"; }; patches = [./ov511-kernel.patch ./ov511-2.32-kdir.patch]; diff --git a/pkgs/os-specific/linux/sdparm/1.02.nix b/pkgs/os-specific/linux/sdparm/1.03.nix similarity index 64% rename from pkgs/os-specific/linux/sdparm/1.02.nix rename to pkgs/os-specific/linux/sdparm/1.03.nix index 1f12222c4b4..e11db22fff0 100644 --- a/pkgs/os-specific/linux/sdparm/1.02.nix +++ b/pkgs/os-specific/linux/sdparm/1.03.nix @@ -1,9 +1,9 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { - url = http://sg.torque.net/sg/p/sdparm-1.02.tgz; - sha256 = "13acyg6r65gypdprjhfkmvaykgfcj1riwpnycpvv9znzgq9fxsiv"; + url = http://freshmeat.net/redir/sdparm/66844/url_bz2/sdparm-1.03.tar.bz2; + sha256 = "2066af4d55c60bba366b34a29e02f37264e8e1f0efc232d65beba5e317c20819"; }; buildInputs = []; diff --git a/pkgs/os-specific/linux/uml-utilities/default.nix b/pkgs/os-specific/linux/uml-utilities/default.nix index 3e085b41ebf..4fb4ea55310 100644 --- a/pkgs/os-specific/linux/uml-utilities/default.nix +++ b/pkgs/os-specific/linux/uml-utilities/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "uml-utilities-20040114"; builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/uml_utilities_20040114.tar.bz2; + url = http://nixos.org/tarballs/uml_utilities_20040114.tar.bz2; md5 = "1fd5b791ef32c6a3ed4ae42c4a53a316"; }; } diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 1f123fadc87..fbd5e8c7cdf 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -3,7 +3,7 @@ let usbids = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/usb.ids.20080115.bz2; + url = http://nixos.org/tarballs/usb.ids.20080115.bz2; sha256 = "0xymp8fpp9pnkj2i4ry8zpsvy18zw14sx03pnz316lpgwc6dx12n"; }; diff --git a/pkgs/servers/dict/1.9.15.nix b/pkgs/servers/dict/1.9.15.nix index e31a2769be6..b3d104b3901 100644 --- a/pkgs/servers/dict/1.9.15.nix +++ b/pkgs/servers/dict/1.9.15.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function ((rec { + let localDefs = builderDefs.passthru.function ((rec { src = /* put a fetchurl here */ fetchurl { url = ftp://ftp.dict.org/pub/dict/dictd-1.9.15.tar.gz; diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix index a7129b94d8e..9eb89361c35 100644 --- a/pkgs/servers/dict/dictd-db.nix +++ b/pkgs/servers/dict/dictd-db.nix @@ -2,7 +2,7 @@ let makeDictdDB = _src: _name: _subdir: _locale: with builderDefs; - let localDefs = builderDefs.meta.function (rec { + let localDefs = builderDefs.passthru.function (rec { src=_src; doInstall = FullDepEntry ('' ensureDir $out/share/dictd diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix new file mode 100644 index 00000000000..fbd2966237d --- /dev/null +++ b/pkgs/servers/http/nginx/default.nix @@ -0,0 +1,39 @@ +args : +let + lib = args.lib; + fetchurl = args.fetchurl; + FullDepEntry = args.FullDepEntry; + + version = lib.getAttr ["version"] "0.7.23" args; + buildInputs = with args; [ + openssl zlib pcre libxml2 libxslt + ]; +in +rec { + src = fetchurl { + url = "http://sysoev.ru/nginx/nginx-${version}.tar.gz"; + sha256 = "1fygkagzclfqygipgi140jf3aiwqn8yqxjmk181i31p4di5m46rk"; + }; + + inherit buildInputs; + configureFlags = [ + "--with-http_ssl_module" + "--with-http_xslt_module" + "--with-http_sub_module" + "--with-http_dav_module" + "--with-http_gzip_static_module" + "--with-http_secure_link_module" + ]; + + preConfigure = FullDepEntry '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${args.libxml2}/include/libxml2" + '' []; + + /* doConfigure should be specified separately */ + phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"]; + + name = "nginx-" + version; + meta = { + description = "nginx - 'engine x' - reverse proxy and lightweight webserver"; + }; +} diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 93add3fcfa3..862fc78c7eb 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -1,16 +1,23 @@ -args: with args; +{ stdenv, fetchurl, readline, pam, openldap, kerberos, popt +, iniparser, libunwind, fam, acl +}: stdenv.mkDerivation rec { - name = "samba-3.0.32"; + name = "samba-3.2.4"; src = fetchurl { - url = http://www.samba.org/samba/ftp/stable/samba-3.0.32.tar.gz; - sha256 = "1mpc1w68c4sgpg6n58b6dqv0kzks6rjd9rxym72wbc2yx3h50zwa"; + url = http://us3.samba.org/samba/ftp/stable/samba-3.2.4.tar.gz; + sha256 = "1srypwpmfhw30kd7zdv7q2dpdjlzdwb28lc34z1dnls4wbpaapm8"; }; - buildInputs = [readline pam openldap kerberos popt iniparser libunwind fam]; + buildInputs = [readline pam openldap kerberos popt iniparser libunwind fam acl]; preConfigure = "cd source"; + + # Provide a dummy smb.conf to shut up programs like smbclient and smbspool. + postInstall = '' + touch $out/lib/smb.conf + ''; configureFlags = '' --with-pam diff --git a/pkgs/servers/x11/xorg/replacements.nix b/pkgs/servers/x11/xorg/replacements.nix new file mode 100644 index 00000000000..3a7ac34e618 --- /dev/null +++ b/pkgs/servers/x11/xorg/replacements.nix @@ -0,0 +1,21 @@ +{stdenv, fetchurl, xorg, automake, autoconf, libtool, composedArgsAndFun}: +{ + xf86videoati = {src, suffix}: + composedArgsAndFun stdenv.mkDerivation { + name = "xf86-video-ati-${suffix}"; + buildInputs = xorg.xf86videoati.buildInputs ++ + [autoconf automake libtool]; + builder = ./builder.sh; + inherit src; + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DPACKAGE_VERSION_MAJOR=6" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DPACKAGE_VERSION_MINOR=9" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DPACKAGE_VERSION_PATCHLEVEL=999" + + sed -e 's/@DRIVER_MAN_SUFFIX@/man/g' -i man/Makefile.am + export DRIVER_MAN_DIR=$out/share/man/man5 + + ./autogen.sh + ''; + }; +} diff --git a/pkgs/servers/xmpp/openfire/3.4.5.nix b/pkgs/servers/xmpp/openfire/3.4.5.nix index 26c2aa6f813..3bb69b37341 100644 --- a/pkgs/servers/xmpp/openfire/3.4.5.nix +++ b/pkgs/servers/xmpp/openfire/3.4.5.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function (rec { + let localDefs = builderDefs.passthru.function (rec { src = /* put a fetchurl here */ fetchurl { url = http://www.igniterealtime.org/downloadServlet?filename=openfire/openfire_3_4_5.tar.gz; diff --git a/pkgs/servers/xmpp/openfire/3.5.2.nix b/pkgs/servers/xmpp/openfire/3.5.2.nix index 7d66071df0a..23f6f348a11 100644 --- a/pkgs/servers/xmpp/openfire/3.5.2.nix +++ b/pkgs/servers/xmpp/openfire/3.5.2.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function (rec { + let localDefs = builderDefs.passthru.function (rec { src = /* put a fetchurl here */ fetchurl { url = http://www.igniterealtime.org/downloadServlet?filename=openfire/openfire_3_5_2.tar.gz; diff --git a/pkgs/shells/zsh/4.3.9.nix b/pkgs/shells/zsh/4.3.9.nix new file mode 100644 index 00000000000..6a1d0d14dee --- /dev/null +++ b/pkgs/shells/zsh/4.3.9.nix @@ -0,0 +1,22 @@ +args: with args; +let documentation = fetchurl { + url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.bz2"; + sha256 = "0rc19q5r8x2yln7synpqzxngm7g4g6idrpgc1i0jsawc48m7dbhm"; + }; +in +stdenv.mkDerivation { + name = "zsh-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/zsh/zsh-${version}.tar.bz2"; + sha256 = "1aw28c5w83vl2ckbvf6ljj00s36icyrnxcm1r6q63863dmn6vpcg"; + }; + configureFlags = "--with-tcsetpgrp --enable-maildir-support --enable-multibyte"; + + postInstall = '' + ensureDir $out/share/ + tar xf ${documentation} -C $out/share + ''; + + buildInputs = [ncurses coreutils]; +} diff --git a/pkgs/stdenv/linux/bootstrap/i686/default.nix b/pkgs/stdenv/linux/bootstrap/i686/default.nix index db5c581453b..e065931e5eb 100644 --- a/pkgs/stdenv/linux/bootstrap/i686/default.nix +++ b/pkgs/stdenv/linux/bootstrap/i686/default.nix @@ -6,22 +6,22 @@ tar = ./tar.bz2; binutilsURL = { - url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r9803/binutils.tar.bz2; + url = http://nixos.org/tarballs/stdenv-linux/i686/r9803/binutils.tar.bz2; sha1 = "73532561c2f98d0df641fbd778bc92cea298762a"; }; gccURL = { - url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r9803/gcc.tar.bz2; + url = http://nixos.org/tarballs/stdenv-linux/i686/r9803/gcc.tar.bz2; sha1 = "522dc2e22dc42f640b0290638382d45bd43a7d55"; }; glibcURL = { - url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r9803/glibc.tar.bz2; + url = http://nixos.org/tarballs/stdenv-linux/i686/r9803/glibc.tar.bz2; sha1 = "b9ae1e43e9977476ef53f8c1c9cd1cff5526ff40"; }; staticToolsURL = { - url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r9803/static-tools.tar.bz2; + url = http://nixos.org/tarballs/stdenv-linux/i686/r9803/static-tools.tar.bz2; sha1 = "ebe826e848736a82bcdd9a195dd510b533ecc997"; }; } diff --git a/pkgs/stdenv/linux/bootstrap/powerpc/default.nix b/pkgs/stdenv/linux/bootstrap/powerpc/default.nix index a354cc01d85..61f7f863512 100644 --- a/pkgs/stdenv/linux/bootstrap/powerpc/default.nix +++ b/pkgs/stdenv/linux/bootstrap/powerpc/default.nix @@ -6,22 +6,22 @@ tar = ./tar.bz2; staticToolsURL = { - url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/powerpc/r9828/static-tools.tar.bz2; + url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/static-tools.tar.bz2; sha1 = "e4d1680e3dfa752e49a996a31140db53b10061cb"; }; binutilsURL = { - url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/powerpc/r9828/binutils.tar.bz2; + url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/binutils.tar.bz2; sha1 = "2609f4d9277a60fcd178395d3d49911190e08f36"; }; gccURL = { - url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/powerpc/r9828/gcc.tar.bz2; + url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/gcc.tar.bz2; sha1 = "71d79d736bfef6252208fe6239e528a591becbed"; }; glibcURL = { - url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/powerpc/r9828/glibc.tar.bz2; + url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/glibc.tar.bz2; sha1 = "bf0245e16235800c8aa9c6a5de6565583a66e46d"; }; } diff --git a/pkgs/stdenv/linux/bootstrap/x86_64/default.nix b/pkgs/stdenv/linux/bootstrap/x86_64/default.nix index 5746bbbfa2e..1b265bd66a5 100644 --- a/pkgs/stdenv/linux/bootstrap/x86_64/default.nix +++ b/pkgs/stdenv/linux/bootstrap/x86_64/default.nix @@ -6,22 +6,22 @@ tar = ./tar.bz2; binutilsURL = { - url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/x86_64/r9803/binutils.tar.bz2; + url = http://nixos.org/tarballs/stdenv-linux/x86_64/r9803/binutils.tar.bz2; sha1 = "9ac95e34c96c19cd0b925af46c97c9979becaaca"; }; gccURL = { - url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/x86_64/r9803/gcc.tar.bz2; + url = http://nixos.org/tarballs/stdenv-linux/x86_64/r9803/gcc.tar.bz2; sha1 = "e8cb32425c8f55833ca081bd74668a029bdf1755"; }; glibcURL = { - url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/x86_64/r9803/glibc.tar.bz2; + url = http://nixos.org/tarballs/stdenv-linux/x86_64/r9803/glibc.tar.bz2; sha1 = "74b1698a4595ce4b4f43a33b3ceca1e4459e494e"; }; staticToolsURL = { - url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/x86_64/r9803/static-tools.tar.bz2; + url = http://nixos.org/tarballs/stdenv-linux/x86_64/r9803/static-tools.tar.bz2; sha1 = "4da3af92c9bcd8fc43b31934d8429412e209741b"; }; } diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 69b4046a6cd..da97b6a4c19 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -40,6 +40,7 @@ rec { args = [ ./scripts/download.sh ]; outputHashAlgo = "sha1"; outputHash = sha1; + impureEnvVars = [ "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" ]; }; # This function downloads and unpacks a file. diff --git a/pkgs/tools/X11/x11vnc/0.9.3.nix b/pkgs/tools/X11/x11vnc/0.9.3.nix index 72c0997cc6a..3452d3f893b 100644 --- a/pkgs/tools/X11/x11vnc/0.9.3.nix +++ b/pkgs/tools/X11/x11vnc/0.9.3.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function (rec { + let localDefs = builderDefs.passthru.function (rec { src = /* put a fetchurl here */ fetchurl { url = mirror://sourceforge/libvncserver/x11vnc-0.9.3.tar.gz; diff --git a/pkgs/tools/X11/x2vnc/1.7.2.nix b/pkgs/tools/X11/x2vnc/1.7.2.nix index 3966b852adc..917995b719d 100644 --- a/pkgs/tools/X11/x2vnc/1.7.2.nix +++ b/pkgs/tools/X11/x2vnc/1.7.2.nix @@ -1,6 +1,6 @@ -args : with args; with builderDefs.meta.function {src="";}; - let localDefs = builderDefs.meta.function ((rec { +args : with args; with builderDefs.passthru.function {src="";}; + let localDefs = builderDefs.passthru.function ((rec { src = /* put a fetchurl here */ fetchurl { url = http://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz; diff --git a/pkgs/tools/X11/xauth/default.nix b/pkgs/tools/X11/xauth/default.nix index e946ef81669..42e01c0aeda 100644 --- a/pkgs/tools/X11/xauth/default.nix +++ b/pkgs/tools/X11/xauth/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "xauth-7.0"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/xauth-7.0.tar.bz2; + url = http://nixos.org/tarballs/xauth-7.0.tar.bz2; md5 = "d597005016baa8af81a5b0e38951d563"; }; buildInputs = [pkgconfig libX11 libXau libXext libXmu]; diff --git a/pkgs/tools/archivers/gnutar/1.15.1.nix b/pkgs/tools/archivers/gnutar/1.15.1.nix index 841280d5730..77dc1a3c76e 100644 --- a/pkgs/tools/archivers/gnutar/1.15.1.nix +++ b/pkgs/tools/archivers/gnutar/1.15.1.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "gnutar-1.15.1"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/tar-1.15.1.tar.bz2; + url = http://nixos.org/tarballs/tar-1.15.1.tar.bz2; md5 = "57da3c38f8e06589699548a34d5a5d07"; }; } diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index a690a8e7163..9e17e2d9edd 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "unzip-5.52"; builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/unzip552.tar.gz; + url = http://nixos.org/tarballs/unzip552.tar.gz; md5 = "9d23919999d6eac9217d1f41472034a9"; }; diff --git a/pkgs/tools/graphics/dmtx/default.nix b/pkgs/tools/graphics/dmtx/default.nix new file mode 100644 index 00000000000..3457a0ab402 --- /dev/null +++ b/pkgs/tools/graphics/dmtx/default.nix @@ -0,0 +1,27 @@ +args : +let + lib = args.lib; + fetchurl = args.fetchurl; + + version = lib.getAttr ["version"] "0.5.2" args; + buildInputs = with args; [ + libpng libtiff + ]; +in +rec { + src = fetchurl { + url = "http://prdownloads.sourceforge.net/libdmtx/libdmtx-${version}.tar.bz2"; + sha256 = "1xx61gykmq07m2vkqazns5whj8rv9nhwhjs6dakz9ai4qh7d53qz"; + }; + + inherit buildInputs; + configureFlags = []; + + /* doConfigure should be specified separately */ + phaseNames = ["doConfigure" "doMakeInstall"]; + + name = "dmtx-" + version; + meta = { + description = "DataMatrix (2D bar code) processing tools."; + }; +} diff --git a/pkgs/tools/graphics/qrdecode/default.nix b/pkgs/tools/graphics/qrdecode/default.nix new file mode 100644 index 00000000000..bd850a509b4 --- /dev/null +++ b/pkgs/tools/graphics/qrdecode/default.nix @@ -0,0 +1,41 @@ +args : +let + lib = args.lib; + fetchurl = args.fetchurl; + FullDepEntry = args.FullDepEntry; + + version = lib.getAttr ["version"] "0.9.3" args; + buildInputs = with args; [ + libpng libcv + ]; +in +rec { + src = fetchurl { + url = "ftp://ftp.debian.org/debian/pool/main/libd/libdecodeqr/libdecodeqr_${version}.orig.tar.gz"; + sha256 = "1kmljwx69h7zq6zlp2j19bbpz11px45z1abw03acrxjyzz5f1f13"; + }; + + inherit buildInputs; + configureFlags = []; + + /* doConfigure should be specified separately */ + phaseNames = ["preConfigure" "doConfigure" "doMake" + "createDirs" "doMakeInstall" "postInstall"]; + + preConfigure = FullDepEntry '' + cd src + sed -e /LDCONFIG/d -i libdecodeqr/Makefile.in + '' ["doUnpack"]; + postInstall = FullDepEntry '' + cp sample/simple/simpletest $out/bin/qrdecode + cd .. + '' ["doMake"]; + createDirs = FullDepEntry '' + ensureDir $out/bin $out/lib $out/include $out/share + '' ["defEnsureDir"]; + + name = "libdecodeqr-" + version; + meta = { + description = "QR code decoder library"; + }; +} diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix new file mode 100644 index 00000000000..28f7b579b4d --- /dev/null +++ b/pkgs/tools/graphics/qrencode/default.nix @@ -0,0 +1,27 @@ +args : +let + lib = args.lib; + fetchurl = args.fetchurl; + + version = lib.getAttr ["version"] "3.0.3" args; + buildInputs = with args; [ + libpng pkgconfig + ]; +in +rec { + src = fetchurl { + url = "http://megaui.net/fukuchi/works/qrencode/qrencode-${version}.tar.gz"; + sha256 = "1f5nnbk016casqfprdli50ssv08l0gj5zrd0q4rdvzfwqy67i7vm"; + }; + + inherit buildInputs; + configureFlags = []; + + /* doConfigure should be specified separately */ + phaseNames = ["doConfigure" "doMakeInstall"]; + + name = "qrencode-" + version; + meta = { + description = "QR code encoder"; + }; +} diff --git a/pkgs/tools/misc/coreutils-5/default.nix b/pkgs/tools/misc/coreutils-5/default.nix index e09a44842d5..fc9ef3b7c42 100644 --- a/pkgs/tools/misc/coreutils-5/default.nix +++ b/pkgs/tools/misc/coreutils-5/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "coreutils-5.97"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/coreutils-5.97.tar.gz; + url = http://nixos.org/tarballs/coreutils-5.97.tar.gz; md5 = "bdec4b75c76ac9bf51b6dd1747d3b06e"; }; patches = [./dietlibc.patch]; diff --git a/pkgs/tools/misc/dosfstools/2.11deb.nix b/pkgs/tools/misc/dosfstools/3.00deb.nix similarity index 67% rename from pkgs/tools/misc/dosfstools/2.11deb.nix rename to pkgs/tools/misc/dosfstools/3.00deb.nix index 8878ee38325..59c386da2b2 100644 --- a/pkgs/tools/misc/dosfstools/2.11deb.nix +++ b/pkgs/tools/misc/dosfstools/3.00deb.nix @@ -1,15 +1,15 @@ args : with args; with builderDefs; let patch = fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_2.11-2.3.diff.gz; - sha256 = "0bzjhpgg4ih6c76ax8byis9vxgkr2c7bbbshqrkfq8j7ar48n5ld"; - }; - localDefs = builderDefs.meta.function (rec { - src = /* put a fetchurl here */ - fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_2.11.orig.tar.gz; - sha256 = "1154k0y04npblgac81p4pcmglilk1ldrqll4hvbrwgcb7096vb0f"; - }; + url = http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_3.0.0-1.diff.gz; + sha256 = "5ecab7e9cf213b0cc7406649ca59edb9ec6daad2fa454bce423ccb1744fc1336"; + }; + localDefs = builderDefs.passthru.function (rec { + src = /* put a fetchurl here */ + fetchurl { + url = http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_3.0.0.orig.tar.gz; + sha256 = "46125aafff40e8215e6aa30087c6c72a82654c8f5fca4878adc1fa26342eab58"; + }; preBuild = FullDepEntry ('' gunzip < ${patch} | patch -Np1 '')["minInit" "doUnpack"]; diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix new file mode 100644 index 00000000000..868ea6e4b5d --- /dev/null +++ b/pkgs/tools/misc/fdupes/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "fdupes-1.40"; + src = fetchurl { + url = http://premium.caribe.net/~adrian2/programs/fdupes-1.40.tar.gz; + sha256 = "1ryxpckgrmqa4y7nx9a9xpg4z1r00k11kc1cm7lqv87l9g293vg1"; + }; + + installPhase = '' + mkdir -p $out/{bin,man/man1} + make INSTALLDIR=$out/bin MANPAGEDIR=$out/man install + ''; + + meta = { + description = "identifies duplicate files residing within specified directories."; + longDescription = '' + FDUPES uses md5sums and then a byte by byte comparison to finde duplicate + files within a set of directories. + ''; + homepage = http://premium.caribe.net/~adrian2/fdupes.html; + license = "MIT"; + }; +} diff --git a/pkgs/tools/misc/findutils/4.2.27.nix b/pkgs/tools/misc/findutils/4.2.27.nix index 80f5fbfc5d7..591134d692d 100644 --- a/pkgs/tools/misc/findutils/4.2.27.nix +++ b/pkgs/tools/misc/findutils/4.2.27.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "findutils-4.2.27"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/findutils-4.2.27.tar.gz; + url = http://nixos.org/tarballs/findutils-4.2.27.tar.gz; md5 = "f1e0ddf09f28f8102ff3b90f3b5bc920"; }; buildInputs = [coreutils]; diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/tools/misc/getopt/default.nix index d8e8bb9ab62..faa4a9e8f7a 100644 --- a/pkgs/tools/misc/getopt/default.nix +++ b/pkgs/tools/misc/getopt/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "getopt-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/getopt-1.1.4.tar.gz; + url = http://nixos.org/tarballs/getopt-1.1.4.tar.gz; md5 = "02188ca68da27c4175d6e9f3da732101"; }; } diff --git a/pkgs/tools/misc/hg2git/default.nix b/pkgs/tools/misc/hg2git/default.nix new file mode 100644 index 00000000000..291391b6719 --- /dev/null +++ b/pkgs/tools/misc/hg2git/default.nix @@ -0,0 +1,26 @@ +args: with args; +stdenv.mkDerivation { + name = "hg2git"; + + src = sourceByName "hg2git"; + + buildInputs =([mercurial.python mercurial makeWrapper]); + + installPhase = '' + ensureDir $out/bin; + cp hg2git.sh hg2git.py $out/bin + cat >> $out/bin/hg2git-doc << EOF + #!${coreutils}/bin/cat + $(cat hg2git.txt) + EOF + chmod +x $out/bin/hg2git-doc + wrapProgram $out/bin/hg2git.sh \ + --set PYTHONPATH "$(echo ${mercurial}/lib/python*/site-packages)" + ''; + + meta = { + description = "mercurial to git one way conversion"; + homepage = "http://git.grml.org/?p=hg-to-git.git;a=summary"; + license = "?"; # the .py file is GPLv2 + }; +} diff --git a/pkgs/tools/misc/pinentry/default.nix b/pkgs/tools/misc/pinentry/default.nix index 4ee84006975..900370d0f8e 100644 --- a/pkgs/tools/misc/pinentry/default.nix +++ b/pkgs/tools/misc/pinentry/default.nix @@ -1,17 +1,26 @@ -args: -args.stdenv.mkDerivation { - name = "pinentry-0.7.2"; +{ fetchurl, stdenv, glib, pkgconfig, gtk, ncurses }: - src = args.fetchurl { - url = http://gentoo.chem.wisc.edu/gentoo/distfiles/pinentry-0.7.2.tar.gz; - sha256 = "0s6n5n4bxg95rmwa3mw3r49dabf8yh6fkpfi8mbl7i85dgpibnzv"; +stdenv.mkDerivation rec { + name = "pinentry-0.7.5"; + + src = fetchurl { + url = "mirror://gnupg/pinentry/${name}.tar.gz"; + sha256 = "cb269ac058793b2df343a12a65e3402abc4b68503e105b12e4ca903d8d8e3172"; }; - buildInputs =(with args; [glib pkgconfig x11 gtk]); + patches = [ ./duplicate-glib-defs.patch ]; + + buildInputs = [ glib pkgconfig gtk ncurses ]; meta = { - description = "input interface for passwords needed by gnupg"; - homepage = "don't know, gentoo lists http://www.gnupg.org/aegypten/"; - license = "GPL2"; + description = "GnuPG's interface to passphrase input"; + + longDescription = '' + Pinentry provides a console and a GTK+ GUI that allows users to + enter a passphrase when `gpg' or `gpg2' is run and needs it. + ''; + + homepage = http://gnupg.org/aegypten2/; + license = "GPLv2+"; }; } diff --git a/pkgs/tools/misc/pinentry/duplicate-glib-defs.patch b/pkgs/tools/misc/pinentry/duplicate-glib-defs.patch new file mode 100644 index 00000000000..78796ee2f53 --- /dev/null +++ b/pkgs/tools/misc/pinentry/duplicate-glib-defs.patch @@ -0,0 +1,20 @@ +Comment out definitions of functions that are part of Glib. + +--- pinentry-0.7.5/gtk+-2/gtksecentry.c 2007-11-19 12:20:50.000000000 +0100 ++++ pinentry-0.7.5/gtk+-2/gtksecentry.c 2008-12-08 22:08:22.000000000 +0100 +@@ -269,6 +269,7 @@ gboolean g_use_secure_mem = FALSE; + } while(0) + + ++#if 0 + gpointer + g_malloc(gulong size) + { +@@ -347,6 +348,7 @@ g_free(gpointer mem) + free(mem); + } + } ++#endif + + GType + gtk_secure_entry_get_type(void) diff --git a/pkgs/tools/misc/relfs/cvs.2008.03.05.nix b/pkgs/tools/misc/relfs/cvs.2008.03.05.nix index a02df67fd58..90275c1b32f 100644 --- a/pkgs/tools/misc/relfs/cvs.2008.03.05.nix +++ b/pkgs/tools/misc/relfs/cvs.2008.03.05.nix @@ -1,6 +1,6 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ if args ? src then args.src else fetchcvs { cvsRoot = ":pserver:anonymous@relfs.cvs.sourceforge.net:/cvsroot/relfs"; diff --git a/pkgs/tools/misc/rlwrap/0.28.nix b/pkgs/tools/misc/rlwrap/0.28.nix index b6db8638601..c694109c2e8 100644 --- a/pkgs/tools/misc/rlwrap/0.28.nix +++ b/pkgs/tools/misc/rlwrap/0.28.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = ftp://ftp.chg.ru/mirrors/ftp.freebsd.org/pub/FreeBSD/ports/distfiles/rlwrap-0.28.tar.gz; diff --git a/pkgs/tools/networking/host/default.nix b/pkgs/tools/networking/host/default.nix new file mode 100644 index 00000000000..9383b857a3a --- /dev/null +++ b/pkgs/tools/networking/host/default.nix @@ -0,0 +1,24 @@ +{ fetchurl, stdenv }: + +let version = "20000331"; in + stdenv.mkDerivation { + name = "host-${version}"; + + src = fetchurl { + url = "mirror://debian/pool/main/h/host/host_${version}.orig.tar.gz"; + sha256 = "1g352k80arhwyidsa95nk28xjvzyypmwv3kga2451m3g7fmdqki1"; + }; + + preConfigure = '' + makeFlagsArray=(DESTBIN=$out/bin DESTMAN=$out/share/man OWNER=$(id -u) GROUP=$(id -g)) + ensureDir "$out/bin" + ensureDir "$out/share/man/man1" + ''; + + installTargets = "install man"; + + meta = { + description = "`host', a DNS resolution utility"; + license = "BSD-style"; + }; + } diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix new file mode 100644 index 00000000000..132d1832a9d --- /dev/null +++ b/pkgs/tools/networking/jnettop/default.nix @@ -0,0 +1,28 @@ +{ fetchurl, stdenv, autoconf, libpcap, ncurses, pkgconfig, glib }: + +stdenv.mkDerivation rec { + name = "jnettop-0.13.0"; + + src = fetchurl { + url = "http://jnettop.kubs.info/dist/jnettop-0.13.0.tar.gz"; + sha256 = "1855np7c4b0bqzhf1l1dyzxb90fpnvrirdisajhci5am6als31z9"; + }; + + buildInputs = [ autoconf libpcap ncurses pkgconfig glib ]; + + patches = [ ./no-dns-resolution.patch ]; + preConfigure = '' autoconf ''; + + meta = { + description = "Jnettop, a network traffic visualizer"; + + longDescription = '' + Jnettop is a traffic visualiser, which captures traffic going + through the host it is running from and displays streams sorted + by bandwidth they use. + ''; + + homepage = http://jnettop.kubs.info/; + license = "GPLv2+"; + }; +} diff --git a/pkgs/tools/networking/jnettop/no-dns-resolution.patch b/pkgs/tools/networking/jnettop/no-dns-resolution.patch new file mode 100644 index 00000000000..65928a37300 --- /dev/null +++ b/pkgs/tools/networking/jnettop/no-dns-resolution.patch @@ -0,0 +1,13 @@ +When built in a chroot, `configure' fails to resolve `localhost'. +Furthermore that test appears to be useless. + +--- jnettop-0.13.0/configure.ac 2006-04-29 15:34:09.000000000 +0200 ++++ jnettop-0.13.0/configure.ac 2008-12-03 15:11:28.000000000 +0100 +@@ -63,7 +63,6 @@ AC_NETTOP_CHECK_IN6_ADDR + + LDFLAGS="$LDFLAGS $NSL_LIBS $SOCKET_LIBS" + +-AC_NETTOP_CHECK_WORKING_RESOLVER + AC_NETTOP_CHECK_GETHOSTBYADDR_R + + AM_PATH_GLIB_2_0(2.0.1,, AC_MSG_ERROR("glib >= 2.0.1 library required"), gthread) diff --git a/pkgs/tools/networking/nc6/1.0.nix b/pkgs/tools/networking/nc6/1.0.nix index 130b128149b..4ea5578abed 100644 --- a/pkgs/tools/networking/nc6/1.0.nix +++ b/pkgs/tools/networking/nc6/1.0.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; -let localDefs = builderDefs.meta.function (rec { +let localDefs = builderDefs.passthru.function (rec { src = /* put a fetchurl here */ fetchurl { url = ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-1.0.tar.bz2; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 2802ac887aa..f38d72f8be5 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -5,11 +5,11 @@ assert pamSupport -> pam != null; stdenv.mkDerivation { - name = "openssh-4.7p1"; + name = "openssh-5.1p1"; src = fetchurl { - url = ftp://ftp.nluug.nl/pub/security/OpenSSH/openssh-4.7p1.tar.gz; - sha256 = "1g28npm025a5a8dd2g7sqz8nh8pwi7rvv9wdpy4jhzbkqvq36wfl"; + url = ftp://ftp.nluug.nl/pub/security/OpenSSH/openssh-5.1p1.tar.gz; + sha256 = "0xbdcsjji7i952jfm6wc3xxblp4zbqxfayz5d8w2245f9lb5hlzh"; }; buildInputs = [zlib openssl perl diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index 38aa9474f79..886194a557f 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -1,14 +1,15 @@ -{ fetchurl, stdenv, zlib, wxGTK, perl, cryptopp, gettext }: +{ fetchurl, stdenv, zlib, wxGTK, perl, cryptopp, libupnp, gettext +, makeWrapper }: stdenv.mkDerivation rec { - name = "aMule-2.2.1"; + name = "aMule-2.2.2"; src = fetchurl { url = "mirror://sourceforge/amule/${name}.tar.bz2"; - sha256 = "0zcsyy6bm7ls1dpmfm0yskd2gj50ah2bvkm0v42826zwzj6sbxy9"; + sha256 = "0yrp3vk1gqfajgldfs4an5rd1l4i69icsrzcqmfxsny6qbcrv5hv"; }; - buildInputs = [ zlib wxGTK perl cryptopp gettext ]; + buildInputs = [ zlib wxGTK perl cryptopp libupnp gettext makeWrapper ]; configureFlags = "--with-crypto-prefix=${cryptopp}"; @@ -17,6 +18,13 @@ stdenv.mkDerivation rec { -es'|/usr/bin/perl|${perl}/bin/perl|g' ''; + # aMule will try to `dlopen' libupnp and libixml, so help it + # find them. + postInstall = '' + wrapProgram "$out/bin/amule" \ + --prefix LD_LIBRARY_PATH ":" "${libupnp}/lib" + ''; + meta = { homepage = http://amule.org/; description = "aMule, a peer-to-peer client for the eD2K and Kademlia networks"; diff --git a/pkgs/tools/networking/p2p/azureus/default.nix b/pkgs/tools/networking/p2p/azureus/default.nix index 69fb60117e9..3e613bb9a6b 100644 --- a/pkgs/tools/networking/p2p/azureus/default.nix +++ b/pkgs/tools/networking/p2p/azureus/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "azureus-2.3.0.6"; builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/Azureus2.3.0.6.jar; + url = http://nixos.org/tarballs/Azureus2.3.0.6.jar; md5 = "84f85b144cdc574338c2c84d659ca620"; }; # buildInputs = [unzip]; diff --git a/pkgs/tools/networking/smbfs-fuse/0.8.7.nix b/pkgs/tools/networking/smbfs-fuse/0.8.7.nix index fa98d3d0ac6..c5ef3ebeae0 100644 --- a/pkgs/tools/networking/smbfs-fuse/0.8.7.nix +++ b/pkgs/tools/networking/smbfs-fuse/0.8.7.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://www.ricardis.tudelft.nl/~vincent/fusesmb/download/fusesmb-0.8.7.tar.gz; diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index dcce3bba5df..34f41272da8 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -1,21 +1,25 @@ -args: with args; +{ stdenv, fetchurl, nettools, libgcrypt, perl, gawk, makeWrapper }: -stdenv.mkDerivation { - name = "vpnc-0.5.1"; +stdenv.mkDerivation rec { + name = "vpnc-0.5.3"; src = fetchurl { - url = http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-0.5.1.tar.gz; - sha256 = "f63660bd020bbe6a39e8eb67ad60c54d719046c6198a6834371d098947f9a2ed"; + url = "http://www.unix-ag.uni-kl.de/~massar/vpnc/${name}.tar.gz"; + sha256 = "1128860lis89g1s21hqxvap2nq426c9j4bvgghncc1zj0ays7kj6"; }; patches = [ ./makefile.patch ]; # The `etc/vpnc/vpnc-script' script relies on `which' and on # `ifconfig' as found in net-tools (not GNU Inetutils). - propagatedBuildInputs = [which nettools]; + propagatedBuildInputs = [ nettools ]; buildInputs = [libgcrypt perl makeWrapper]; preConfigure = '' + substituteInPlace "vpnc-script.in" \ + --replace "which" "type -P" \ + --replace "awk" "${gawk}/bin/awk" + substituteInPlace "config.c" \ --replace "/etc/vpnc/vpnc-script" "$out/etc/vpnc/vpnc-script" @@ -27,7 +31,7 @@ stdenv.mkDerivation { for i in $out/{bin,sbin}/* do wrapProgram $i --prefix PATH : \ - "${which}/bin:${nettools}/bin:${nettools}/sbin" + "${nettools}/bin:${nettools}/sbin" done ''; diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix new file mode 100644 index 00000000000..80f774e8e5d --- /dev/null +++ b/pkgs/tools/package-management/checkinstall/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, gettext}: + +stdenv.mkDerivation { + name = "checkinstall-1.6.1"; + + src = fetchurl { + url = http://checkinstall.izto.org/files/source/checkinstall-1.6.1.tgz; + sha256 = "0p6gbbnk4hjwkmv8dr7c4v5wpdnanczavi7yiiivvf45zyfl8lil"; + }; + + buildInputs = [gettext]; + + preBuild = '' + makeFlagsArray=(PREFIX=$out) + + substituteInPlace checkinstall --replace /usr/local/lib/checkinstall $out/lib/checkinstall + substituteInPlace checkinstallrc-dist --replace /usr/local $out + ''; + + meta = { + homepage = http://checkinstall.izto.org/; + description = "A tool for automatically generating Slackware, RPM or Debian packages when doing `make install'"; + }; +} diff --git a/pkgs/tools/package-management/nix-static/builder.sh b/pkgs/tools/package-management/nix-static/builder.sh deleted file mode 100644 index 940e8b828e9..00000000000 --- a/pkgs/tools/package-management/nix-static/builder.sh +++ /dev/null @@ -1,26 +0,0 @@ -source $stdenv/setup - -configureFlags="\ - --with-store-dir=$storeDir --localstatedir=$stateDir \ - --with-aterm=$aterm --with-bdb=$bdb \ - --disable-init-state" - -preConfigure() { - autoreconf -} - -preConfigure=preConfigure - -postInstall() { - cd $out/bin - - find . -type f | while read fn; do - cat $fn | sed "s|/nix/store/[a-z0-9]*-glibc|/nix/store/ffffffffffffffffffffffffffffffff-glibc|g" > $fn.tmp - if test -x $fn; then chmod +x $fn.tmp; fi - mv $fn.tmp $fn - done -} - -postInstall=postInstall - -genericBuild diff --git a/pkgs/tools/package-management/nix-static/default.nix b/pkgs/tools/package-management/nix-static/default.nix deleted file mode 100644 index e0380652def..00000000000 --- a/pkgs/tools/package-management/nix-static/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, aterm, bdb, perl, curl, autoconf, automake, libtool -, storeDir ? "/nix/store" -, stateDir ? "/nix/var" -}: - -assert aterm != null && bdb != null && perl != null; -# assert bdb.version >= 4.2 -# assert aterm.version >= 2.0 - -stdenv.mkDerivation { - name = "nix-0.10pre5896"; - builder = ./builder.sh; - src = fetchurl { - url = http://nix.cs.uu.nl/dist/nix/nix-0.10pre5896/nix-0.10pre5896.tar.bz2; - md5 = "509d4a452cbf2894a86184b5eaf45abd"; - }; - buildInputs = [aterm bdb perl curl autoconf automake libtool]; - inherit storeDir stateDir aterm bdb; - - # uncomment if you want to be able to use nix-prefetch-url when NIX_ROOT - # is set - patches = [./nix-0.10pre5679.patch ./nix-0.10pre5896-static.patch]; -} diff --git a/pkgs/tools/package-management/nix-static/nix-0.10pre5679.patch b/pkgs/tools/package-management/nix-static/nix-0.10pre5679.patch deleted file mode 100644 index 4d72c198941..00000000000 --- a/pkgs/tools/package-management/nix-static/nix-0.10pre5679.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ruN nix-0.10pre5679/scripts/nix-prefetch-url.in nix-0.10pre5679.new/scripts/nix-prefetch-url.in ---- nix-0.10pre5679/scripts/nix-prefetch-url.in 2006-07-11 13:24:20.000000000 +0200 -+++ nix-0.10pre5679.new/scripts/nix-prefetch-url.in 2006-08-01 11:54:02.000000000 +0200 -@@ -39,10 +39,10 @@ - - tmpPath=/tmp/nix-prefetch-url-$$ # !!! security? - tmpFile=$tmpPath/$name -- mkdir $tmpPath -+ mkdir -p $NIX_ROOT/$tmpPath - - # Perform the download. -- @curl@ --fail --location --max-redirs 20 "$url" > $tmpFile -+ @curl@ --fail --location --max-redirs 20 "$url" > $NIX_ROOT/$tmpFile - - # Compute the hash. - hash=$(@bindir@/nix-hash --type "$hashType" $hashFormat --flat $tmpFile) -@@ -51,7 +51,7 @@ - # Add the downloaded file to the Nix store. - finalPath=$(@bindir@/nix-store --add-fixed "$hashType" $tmpFile) - -- if test -n "$tmpPath"; then rm -rf $tmpPath || true; fi -+ if test -n "$NIX_ROOT/$tmpPath"; then rm -rf $NIX_ROOT/$tmpPath || true; fi - - if test -n "$expHash" -a "$expHash" != "$hash"; then - echo "hash mismatch for URL \`$url'" diff --git a/pkgs/tools/package-management/nix-static/nix-0.10pre5896-static.patch b/pkgs/tools/package-management/nix-static/nix-0.10pre5896-static.patch deleted file mode 100644 index 749ee53bacd..00000000000 --- a/pkgs/tools/package-management/nix-static/nix-0.10pre5896-static.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -ruN nix-0.10pre5896/src/nix-env/Makefile.am nix-0.10pre5896.new/src/nix-env/Makefile.am ---- nix-0.10pre5896/src/nix-env/Makefile.am 2006-07-24 20:39:47.000000000 +0200 -+++ nix-0.10pre5896.new/src/nix-env/Makefile.am 2006-08-02 12:16:34.000000000 +0200 -@@ -5,6 +5,7 @@ - nix_env_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \ - ../libstore/libstore.la ../libutil/libutil.la \ - ../boost/format/libformat.la ${bdb_lib} ${aterm_lib} -+nix_env_LDFLAGS = -all-static - - main.o: help.txt.hh - -diff -ruN nix-0.10pre5896/src/nix-hash/Makefile.am nix-0.10pre5896.new/src/nix-hash/Makefile.am ---- nix-0.10pre5896/src/nix-hash/Makefile.am 2006-07-24 20:39:47.000000000 +0200 -+++ nix-0.10pre5896.new/src/nix-hash/Makefile.am 2006-08-02 12:16:50.000000000 +0200 -@@ -3,6 +3,7 @@ - nix_hash_SOURCES = nix-hash.cc help.txt - nix_hash_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \ - ../boost/format/libformat.la ${bdb_lib} ${aterm_lib} -+nix_hash_LDFLAGS = -all-static - - nix-hash.o: help.txt.hh - -diff -ruN nix-0.10pre5896/src/nix-instantiate/Makefile.am nix-0.10pre5896.new/src/nix-instantiate/Makefile.am ---- nix-0.10pre5896/src/nix-instantiate/Makefile.am 2006-07-24 20:39:47.000000000 +0200 -+++ nix-0.10pre5896.new/src/nix-instantiate/Makefile.am 2006-08-02 12:17:09.000000000 +0200 -@@ -4,6 +4,7 @@ - nix_instantiate_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \ - ../libstore/libstore.la ../libutil/libutil.la \ - ../boost/format/libformat.la ${bdb_lib} ${aterm_lib} -+nix_instantiate_LDFLAGS = -all-static - - main.o: help.txt.hh - -diff -ruN nix-0.10pre5896/src/nix-log2xml/Makefile.am nix-0.10pre5896.new/src/nix-log2xml/Makefile.am ---- nix-0.10pre5896/src/nix-log2xml/Makefile.am 2006-07-24 20:39:47.000000000 +0200 -+++ nix-0.10pre5896.new/src/nix-log2xml/Makefile.am 2006-08-02 12:17:26.000000000 +0200 -@@ -1,6 +1,7 @@ - bin_PROGRAMS = nix-log2xml - - nix_log2xml_SOURCES = log2xml.cc -+nix_log2xml_LDFLAGS = -all-static - - %.xml: %.log nix-log2xml - ./nix-log2xml < $< > $@ -diff -ruN nix-0.10pre5896/src/nix-store/Makefile.am nix-0.10pre5896.new/src/nix-store/Makefile.am ---- nix-0.10pre5896/src/nix-store/Makefile.am 2006-07-24 20:39:47.000000000 +0200 -+++ nix-0.10pre5896.new/src/nix-store/Makefile.am 2006-08-02 12:17:45.000000000 +0200 -@@ -3,6 +3,7 @@ - nix_store_SOURCES = main.cc dotgraph.cc dotgraph.hh help.txt - nix_store_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \ - ../boost/format/libformat.la ${bdb_lib} ${aterm_lib} -+nix_store_LDFLAGS = -all-static - - main.o: help.txt.hh - diff --git a/pkgs/tools/package-management/nix/custom.nix b/pkgs/tools/package-management/nix/custom.nix index 475a365d95b..dea1c93b01a 100644 --- a/pkgs/tools/package-management/nix/custom.nix +++ b/pkgs/tools/package-management/nix/custom.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = { description = "The Nix Deployment System"; - homepage = http://nix.cs.uu.nl/; + homepage = http://nixos.org/; license = "LGPL"; }; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index b7b95031a17..dcb5d3ce4da 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,22 +1,25 @@ { stdenv, fetchurl, aterm, db4, perl, curl, bzip2, openssl ? null , storeDir ? "/nix/store" , stateDir ? "/nix/var" +, supportOldDBs ? true }: stdenv.mkDerivation { - name = "nix-0.11"; + name = "nix-0.12"; src = fetchurl { - url = http://nixos.org/releases/nix/nix-0.11/nix-0.11.tar.bz2; - md5 = "890c25ac0005ff466683869efc288b67"; + url = http://nixos.org/releases/nix/nix-0.12/nix-0.12.tar.bz2; + sha256 = "44454670876ad0e96d551c94ba993903b84594ccf57fef17bc2d92b1f6b155b1"; }; buildInputs = [perl curl openssl]; - configureFlags = " + configureFlags = '' --with-store-dir=${storeDir} --localstatedir=${stateDir} - --with-aterm=${aterm} --with-bdb=${db4} --with-bzip2=${bzip2} - --disable-init-state"; + --with-aterm=${aterm} --with-bzip2=${bzip2} + ${if supportOldDBs then "--with-bdb=${db4}" else "--disable-old-db-compat"} + --disable-init-state + ''; meta = { description = "The Nix Deployment System"; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index c4f6b2ec0f1..ad180c7906f 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -4,14 +4,14 @@ , supportOldDBs ? true }: -let version = "0.12pre12824"; in +let version = "0.13pre13403"; in stdenv.mkDerivation { name = "nix-${version}"; src = fetchurl { - url = "http://nixos.org/releases/nix/nix-${version}-dr98xr6q/nix-${version}.tar.bz2"; - sha256 = "cd6176fbcb677435218d5e8067b9c3a4dee172e6ede44a28080edef5e69ccd75"; + url = "http://nixos.org/releases/nix/nix-${version}-a84h5996/nix-${version}.tar.bz2"; + sha256 = "81169cc6448fff2e1f72464fb537d6db0d386d303869346fea2433b04181cc7b"; }; buildInputs = [perl curl openssl]; diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 7d5a564b283..dee5d81b558 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, cpio, zlib, bzip2, file, sqlite, beecrypt, neon, elfutils}: stdenv.mkDerivation { - name = "rpm-4.4.5"; + name = "rpm-4.4.8"; src = fetchurl { url = http://wraptastic.org/pub/rpm-4.4.x/rpm-4.4.8.tar.gz; diff --git a/pkgs/tools/package-management/snix/default.nix b/pkgs/tools/package-management/snix/default.nix index 72cf291bdd6..c8a13944d5b 100644 --- a/pkgs/tools/package-management/snix/default.nix +++ b/pkgs/tools/package-management/snix/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = { description = "The SNix Deployment System (Nix extended to handle state)"; - homepage = http://nix.cs.uu.nl/; + homepage = http://nixos.org/; license = "LGPL"; }; } diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix index 9a5468e8cc5..7d6f04422f5 100644 --- a/pkgs/tools/security/bmrsa/11.nix +++ b/pkgs/tools/security/bmrsa/11.nix @@ -1,32 +1,38 @@ -args : with args; with builderDefs; - let localDefs = builderDefs.meta.function (rec { - src = /* put a fetchurl here */ - fetchurl { - url = http://prdownloads.sourceforge.net/sourceforge/bmrsa/bmrsa11.zip; - sha256 = "0ksd9xkvm9lkvj4yl5sl0zmydp1wn3xhc55b28gj70gi4k75kcl4"; - }; +args : +let + lib = args.lib; + fetchurl = args.fetchurl; + FullDepEntry = args.FullDepEntry; - buildInputs = [unzip]; - configureFlags = []; - doUnpack = FullDepEntry ('' - mkdir bmrsa - cd bmrsa - unzip ${src} - sed -e 's/gcc/g++/' -i Makefile - ensureDir $out/bin - echo -e 'install:\n\tcp bmrsa '$out'/bin' >> Makefile - '') ["minInit" "addInputs" "defEnsureDir"]; - }); - in with localDefs; -stdenv.mkDerivation rec { - name = "bmrsa-"+version; - builder = writeScript (name + "-builder") - (textClosure localDefs - [doMakeInstall doForceShare doPropagate]); - meta = { - description = " - RSA utility. -"; - inherit src; - }; + version = lib.getAttr ["version"] "" args; + buildInputs = with args; [ + unzip + ]; +in +rec { + src = fetchurl { + url = "http://prdownloads.sourceforge.net/sourceforge/bmrsa/bmrsa${version}.zip"; + sha256 = "0ksd9xkvm9lkvj4yl5sl0zmydp1wn3xhc55b28gj70gi4k75kcl4"; + }; + + inherit buildInputs; + configureFlags = []; + + /* doConfigure should be specified separately */ + phaseNames = ["doMakeInstall"]; + + doUnpack = FullDepEntry ('' + mkdir bmrsa + cd bmrsa + unzip ${src} + sed -e 's/gcc/g++/' -i Makefile + ensureDir $out/bin + echo -e 'install:\n\tcp bmrsa '$out'/bin' >> Makefile + '') ["minInit" "addInputs" "defEnsureDir"]; + + name = "bmrsa-"+version; + meta = { + description = "RSA utility"; + }; } + diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix index 9182d1cf4bb..5e8023a582a 100644 --- a/pkgs/tools/security/gnupg/default.nix +++ b/pkgs/tools/security/gnupg/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [readline]; idea = if ideaSupport then fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/idea.c.gz; + url = http://nixos.org/tarballs/idea.c.gz; md5 = "9dc3bc086824a8c7a331f35e09a3e57f"; } else null; diff --git a/pkgs/tools/security/seccure/0.3.nix b/pkgs/tools/security/seccure/0.3.nix index 36109524831..1725d7ab903 100644 --- a/pkgs/tools/security/seccure/0.3.nix +++ b/pkgs/tools/security/seccure/0.3.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function ((rec { + let localDefs = builderDefs.passthru.function ((rec { src = /* put a fetchurl here */ fetchurl { url = http://freshmeat.net/redir/seccure/65485/url_tgz/seccure-0.3.tar.gz; diff --git a/pkgs/tools/security/ssss/0.5.nix b/pkgs/tools/security/ssss/0.5.nix index e35165be32b..28c59185069 100644 --- a/pkgs/tools/security/ssss/0.5.nix +++ b/pkgs/tools/security/ssss/0.5.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function (rec { + let localDefs = builderDefs.passthru.function (rec { src = /* put a fetchurl here */ fetchurl { url = http://point-at-infinity.org/ssss/ssss-0.5.tar.gz; diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix new file mode 100644 index 00000000000..6ad363d2d55 --- /dev/null +++ b/pkgs/tools/system/fcron/default.nix @@ -0,0 +1,52 @@ +# I've only worked on this till it compiled and worked. So maybe there are some things which should be done but I've missed +# restart using 'killall -TERM fcron; fcron -b +# use convert-fcrontab to update fcrontab files + +args: +args.stdenv.mkDerivation { + name = "fcron-3.0.4"; + + src = args.fetchurl { + url = http://fcron.free.fr/archives/fcron-3.0.4.src.tar.gz; + sha256 = "15kgphsfa0nqgjd8yxyz947x2xyljj4iyh298kw4c8bz6iznqxn8"; + }; + + buildInputs =(with args; [perl]); + + configureFlags = [ "--with-sendmail=/var/setuid-wrappers/sendmail" + "--with-editor=/var/run/current-system/sw/bin/vi" + "--with-bootinstall=no" + "--sysconfdir=/etc" + # fcron would have been default user/grp + "--with-username=root" + "--with-groupname=root" + # fcron must not try to verify that sendmail has already been installed int /var/setuid-wrappers/sendmail + "--disable-checks" + ]; + installTargets = "install-staged"; # install does also try to change permissions of /etc/* files + preConfigure = '' + sed -i 's@/usr/bin/env perl@${args.perl}/bin/perl@g' configure script/* + # Don't let fcron create the group fcron, nix(os) should do this + sed -i '2s@.*@exit 0@' script/user-group + + # --with-bootinstall=no shoud do this, didn't work. So just exit the script before doing anything + sed -i '2s@.*@exit 0@' script/boot-install + + # also don't use chown or chgrp for documentation (or whatever) when installing + find -type f | xargs sed -i -e 's@^\(\s\)*chown@\1:@' -e 's@^\(\s\)*chgrp@\1:@' + + ''; + + patchPhase = '' + # don't try to create /etc/fcron.{allow,deny,conf} + + sed -i -e 's@test -f $(DESTDIR)$(ETC)/fcron.conf @ # @' \ + -e 's@if test ! -f $(DESTDIR)$(ETC)/fcron.allow@ # @' Makefile.in + ''; + + meta = { + description="A command scheduler with extended capabilities over cron and anacron"; + homepage = http://fcron.free.fr; + license = "GPLv2"; + }; +} diff --git a/pkgs/tools/system/gdmap/0.8.1.nix b/pkgs/tools/system/gdmap/0.8.1.nix index c8ba4ac2418..ee2bd707fff 100644 --- a/pkgs/tools/system/gdmap/0.8.1.nix +++ b/pkgs/tools/system/gdmap/0.8.1.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://downloads.sourceforge.net/gdmap/gdmap-0.8.1.tar.gz; diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index fcb45f2cb3d..c44aa10c700 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gnugrep-2.5.3"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/grep-2.5.3-with-info.tar.bz2; + url = http://nixos.org/tarballs/grep-2.5.3-with-info.tar.bz2; sha256 = "0rg9dipksqzbg8v1xalib1n3xkkycc5r1l2gb9cxy1cz3cjip5l8"; }; diff --git a/pkgs/tools/text/py-string-template/default.nix b/pkgs/tools/text/py-string-template/default.nix new file mode 100644 index 00000000000..0ca503a16ac --- /dev/null +++ b/pkgs/tools/text/py-string-template/default.nix @@ -0,0 +1,17 @@ +{stdenv, fetchurl, python}: + +stdenv.mkDerivation rec { + name = "PyStringTemplate-${version}"; + version = "3.2b1"; + meta = { + homepage = "http://www.stringtemplate.org/"; + description = "Text Templating Library"; + }; + src = fetchurl { + url = "http://www.stringtemplate.org/download/PyStringTemplate-3.2b1.tar.gz"; + sha256 = "0lbib0l8c1q7i1j610rwcdagymr1idahrql4dkgnm5rzyg2vk3ml"; + }; + propagatedBuildInputs = [python]; + buildPhase = "true"; + installPhase = "python setup.py install --prefix=$out --install-lib=$(toPythonPath $out) -O1"; +} diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix index 7170eaf8160..7ad55102c4f 100644 --- a/pkgs/tools/text/xml/xpf/default.nix +++ b/pkgs/tools/text/xml/xpf/default.nix @@ -5,7 +5,7 @@ assert libxml2.pythonSupport == true; stdenv.mkDerivation { name = "xpf-0.2"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/xpf-0.2.tar.gz; + url = http://nixos.org/tarballs/xpf-0.2.tar.gz; md5 = "d92658828139e1495e052d0cfe25d312"; }; buildInputs = [python libxml2]; diff --git a/pkgs/tools/typesetting/bibtex-tools/default.nix b/pkgs/tools/typesetting/bibtex-tools/default.nix index 86e856a4d51..304f50f2906 100644 --- a/pkgs/tools/typesetting/bibtex-tools/default.nix +++ b/pkgs/tools/typesetting/bibtex-tools/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "bibtex-tools-0.2pre13026"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/bibtex-tools-0.2pre13026.tar.gz; + url = http://nixos.org/tarballs/bibtex-tools-0.2pre13026.tar.gz; md5 = "2d8a5de7c53eb670307048eb3d14cdd6"; }; configureFlags = " diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/tools/typesetting/lout/default.nix index f1d6295a617..77f9388b824 100644 --- a/pkgs/tools/typesetting/lout/default.nix +++ b/pkgs/tools/typesetting/lout/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, ghostscript}: stdenv.mkDerivation rec { - name = "lout-3.37"; + name = "lout-3.38"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # XXX: We could add the CTAN mirrors # (see http://www.ctan.org/tex-archive/support/lout/). ]; - sha256 = "1a388q7rpv27bvily7ii8sv2brns30g1hh77gq50qc7w0wsli0cc"; + sha256 = "02nqv99jsps2g3v20piyvaq6lji8v9w8fclkk39ixa5lm1jdqaka"; }; buildInputs = [ ghostscript ]; diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index 3ac57124a7d..92e01b8fc78 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -1,11 +1,10 @@ {stdenv, fetchurl, libjpeg, libX11}: stdenv.mkDerivation { - name = "mjpegtools-1.6.2"; + name = "mjpegtools-1.9.0rc3"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/mjpegtools-1.6.2.tar.gz; - md5 = "01c0120b0182de67f182ef99ad855daa" ; + url = mirror://sourceforge/mjpeg/mjpegtools-1.9.0rc3.tar.gz; + sha256 = "1xvgqzdb2rw6j4ss65k4hrzrbsl74p7k5l4qgf5dbfcw522kw7lb"; }; buildInputs = [libjpeg libX11]; - patches = [./fix.patch]; } diff --git a/pkgs/tools/video/mjpegtools/fix.patch b/pkgs/tools/video/mjpegtools/fix.patch deleted file mode 100644 index 2103fda54b4..00000000000 --- a/pkgs/tools/video/mjpegtools/fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -*** /tmp/mjpegtools-1.6.2/lavtools/lavpipe.c Mon Sep 23 19:46:43 2002 ---- mjpegtools-1.6.2/lavtools/lavpipe.c Thu Mar 17 10:24:10 2005 -*************** -*** 582,587 **** ---- 582,588 ---- - mjpeg_info( "closing input %d (source %d)", i, current_index); - decommission_pipe_source(source); - KEEP_SOURCE: -+ ; - } - } - } -*** /tmp/mjpegtools-1.6.2/mpeg2enc/picture.cc Sat Oct 25 17:36:32 2003 ---- mjpegtools-1.6.2/mpeg2enc/picture.cc Fri Mar 18 07:55:36 2005 -*************** -*** 83,91 **** - } - - -! curref = new (uint8_t *)[5]; -! curorg = new (uint8_t *)[5]; -! pred = new (uint8_t *)[5]; - - for( i = 0 ; i<3; i++) - { ---- 83,91 ---- - } - - -! curref = new uint8_t *[5]; -! curorg = new uint8_t *[5]; -! pred = new uint8_t *[5]; - - for( i = 0 ; i<3; i++) - { - diff --git a/pkgs/tools/video/swftools/default.nix b/pkgs/tools/video/swftools/default.nix new file mode 100644 index 00000000000..4249d32b3ce --- /dev/null +++ b/pkgs/tools/video/swftools/default.nix @@ -0,0 +1,24 @@ +args: +args.stdenv.mkDerivation { + # snapshot version does'nt compile + #name = "swftools-2008-10-13-1554"; + name = "swftools-0.8.1"; + + src = args.fetchurl { + #url = http://www.swftools.org/swftools-2008-10-13-1554.tar.gz; + #sha256 = "05r2qg8yc6lpj5263jyrdykr2vkq9rlyqxydx0rnfnkqpr7s6931"; + + url = http://www.swftools.org/swftools-0.8.1.tar.gz; + sha256 = "0l75c3ibwd24g9nqghp1rv1dfrlicw87s0rbdnyffjv4izz6gc2l"; + }; + + buildInputs =(with args; [zlib + # the following are not needed to compile 0.8.1 + libjpeg giflib freetype]); + + meta = { + description = "collection of SWF manipulation and creation utilities"; + homepage = http://www.swftools.org/about.html; + license = "GPLv2"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ff10725f2d..21439923d69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -73,7 +73,7 @@ let pkgsOrig = pkgsFun {}; # the un-overriden packages, passed to packageOverrides pkgsOverriden = pkgsFun __overrides; # the overriden, final packages pkgs = pkgsOverriden; - + # The package compositions. Yes, this isn't properly indented. pkgsFun = __overrides: rec { @@ -85,7 +85,7 @@ let # For convenience, allow callers to get the path to Nixpkgs. path = ./..; - + ### Symbolic names. @@ -102,7 +102,7 @@ let inherit lib config getConfig; - + # Override the compiler in stdenv for specific packages. overrideGCC = stdenv: gcc: stdenv // { mkDerivation = args: stdenv.mkDerivation (args // { NIX_GCC = gcc; }); @@ -306,7 +306,7 @@ let { function = newArgsFun: makeOverridable f (origArgs // (newArgsFun origArgs)); }; - + ### STANDARD ENVIRONMENT @@ -429,17 +429,27 @@ let inherit name buildCommand; } // env); - # Write a plain text file to the Nix store. (The advantage over - # plain sources is that `text' can refer to the output paths of - # derivations, e.g., "... ${somePkg}/bin/foo ...". - writeText = name: text: runCommand name {inherit text;} "echo -n \"$text\" > $out"; - - writeScript = name: text: runCommand name {inherit text;} "echo -n \"$text\" > $out; chmod +x $out"; - - writeScriptBin = name: text: runCommand name {inherit text;} "mkdir -p \$out/bin; echo -n \"\$text\" > \$out/bin/\$name ; chmod +x \$out/bin/\$name"; - symlinkJoin = name: paths: runCommand name {inherit paths;} "mkdir -p $out; for i in $paths; do ${xorg.lndir}/bin/lndir $i $out; done"; + # Create a single file. + writeTextFile = + { name # the name of the derivation + , text + , executable ? false # run chmod +x ? + , destination ? "" # relative path appended to $out eg "/bin/foo" + }: + runCommand name {inherit text executable; } '' + n=$out${destination} + mkdir -p "$(dirname "$n")" + echo -n "$text" > "$n" + (test -n "$executable" && chmod +x "$n") || true + ''; + + # Shorthands for `writeTextFile'. + writeText = name: text: writeTextFile {inherit name text;}; + writeScript = name: text: writeTextFile {inherit name text; executable = true;}; + writeScriptBin = name: text: writeTextFile {inherit name text; executable = true; destination = "/bin/${name}";}; + # entries is a list of attribute sets like { name = "name" ; path = "/nix/store/..."; } linkFarm = name: entries: runCommand name {} ("mkdir -p $out; cd $out; \n" + (lib.concatMapStrings (x: "ln -s '${x.path}' '${x.name}';\n") entries)); @@ -458,6 +468,24 @@ let inherit pkgs; }; + releaseTools = import ../build-support/release/default.nix { + inherit pkgs; + }; + + # see new python derivations for example.. + # You should be able to override anything you like easily + composableDerivation = { + # modify args before applying stdenv.mkDerivation, this should remove at least attrs removeAttrsBy + f ? lib.prepareDerivationArgs, + stdenv ? pkgs.stdenv, + # initial set of arguments to be passed to stdenv.mkDerivation passing prepareDerivationArgs by default + initial ? {}, + # example func : (x: x // { x.buildInputs ++ ["foo"] }), but see mergeAttrByFunc which does this for you + merge ? (lib.mergeOrApply lib.mergeAttrByFunc) + }: lib.applyAndFun + (args: stdenv.mkDerivation (f args)) + merge + (merge { inherit (lib) mergeAttrBy; } initial); ### TOOLS @@ -467,7 +495,7 @@ let }; amule = import ../tools/networking/p2p/amule { - inherit fetchurl stdenv zlib perl cryptopp gettext; + inherit fetchurl stdenv zlib perl cryptopp gettext libupnp makeWrapper; wxGTK = wxGTK28; }; @@ -526,8 +554,8 @@ let inherit fetchurl stdenv python wxPython26; }; - bmrsa = composedArgsAndFun (selectVersion ../tools/security/bmrsa "11") { - inherit builderDefs unzip; + bmrsa = builderDefsPackage (selectVersion ../tools/security/bmrsa "11") { + inherit unzip; }; bogofilter = import ../tools/misc/bogofilter { @@ -556,6 +584,10 @@ let inherit fetchurl stdenv cmake libcap zlib bzip2; }; + checkinstall = import ../tools/package-management/checkinstall { + inherit fetchurl stdenv gettext; + }; + cheetahTemplate = builderDefsPackage (selectVersion ../tools/text/cheetah-template "2.0.1") { inherit makeWrapper python; }; @@ -589,7 +621,7 @@ let inherit fetchurl stdenv; }; - cron = import ../tools/system/cron { + cron = import ../tools/system/cron { # see also fcron inherit fetchurl stdenv; }; @@ -632,7 +664,7 @@ let gnused groff libxml2 libxslt makeWrapper; }; - dosfstools = composedArgsAndFun (selectVersion ../tools/misc/dosfstools "2.11deb") { + dosfstools = composedArgsAndFun (selectVersion ../tools/misc/dosfstools "3.00deb") { inherit builderDefs; }; @@ -661,6 +693,10 @@ let inherit fetchurl stdenv tcl; }; + fcron = import ../tools/system/fcron { # see also cron + inherit fetchurl stdenv perl; + }; + file = import ../tools/misc/file { inherit fetchurl stdenv; }; @@ -745,8 +781,11 @@ let }; gnupg2 = import ../tools/security/gnupg2 { - inherit fetchurl stdenv readline openldap bzip2 zlib libgpgerror pth - libgcrypt libassuan libksba libusb curl; + inherit fetchurl stdenv readline libgpgerror libgcrypt libassuan pth libksba zlib; + openldap = if getPkgConfig "gnupg" "ldap" true then openldap else null; + bzip2 = if getPkgConfig "gnupg" "bzip2" true then bzip2 else null; + libusb = if getPkgConfig "gnupg" "usb" true then libusb else null; + curl = if getPkgConfig "gnupg" "curl" true then curl else null; }; gnuplot = import ../tools/graphics/gnuplot { @@ -829,10 +868,19 @@ let inherit fetchurl stdenv ocaml; }; + hg2git = import ../tools/misc/hg2git { + inherit fetchurl stdenv mercurial coreutils git makeWrapper; + inherit (bleedingEdgeRepos) sourceByName; + }; + highlight = builderDefsPackage (selectVersion ../tools/text/highlight "2.6.10") { inherit getopt; }; + host = import ../tools/networking/host { + inherit fetchurl stdenv; + }; + /* hyppocampusFun = lib.sumArgs ( selectVersion ../tools/misc/hyppocampus "0.3rc1") { inherit builderDefs stdenv fetchurl libdbi libdbiDrivers fuse @@ -866,6 +914,11 @@ let inherit fetchurl stdenv unzip jre; }; + jnettop = import ../tools/networking/jnettop { + inherit fetchurl stdenv autoconf libpcap ncurses pkgconfig; + inherit (gnome) glib; + }; + jwhois = import ../tools/networking/jwhois { inherit fetchurl stdenv; }; @@ -1027,7 +1080,7 @@ let }; pinentry = import ../tools/misc/pinentry { - inherit fetchurl stdenv pkgconfig x11; + inherit fetchurl stdenv pkgconfig ncurses; inherit (gnome) glib gtk; }; @@ -1048,6 +1101,15 @@ let inherit stdenv fetchurl; }; + pystringtemplate = import ../tools/text/py-string-template { + inherit stdenv fetchurl python; + /* TODO: Some parts of this package depend on the ANTLR run-time library + * for Python. We have a package for ANTLR3, too, but that one is + * rather big and contains much more than we need. I guess this issue + * calls for some clever refactoring. + */ + }; + qtparted = import ../tools/misc/qtparted { inherit fetchurl stdenv e2fsprogs ncurses readline parted zlib qt3; inherit (xlibs) libX11 libXext; @@ -1109,7 +1171,7 @@ let # 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.meta.function { + seccureUser = lowPrio (seccure.passthru.function { makeFlags = [" CFLAGS+=-DNOMEMLOCK "]; }); @@ -1174,7 +1236,8 @@ let }; vpnc = import ../tools/networking/vpnc { - inherit fetchurl stdenv libgcrypt perl which nettools makeWrapper; + inherit fetchurl stdenv libgcrypt perl gawk + nettools makeWrapper; }; testdisk = import ../tools/misc/testdisk { @@ -1322,7 +1385,7 @@ let inherit fetchurl stdenv ncurses; }; - zsh = composedArgsAndFun (selectVersion ../shells/zsh "4.3.5") { + zsh = composedArgsAndFun (selectVersion ../shells/zsh "4.3.9") { inherit fetchurl stdenv ncurses coreutils; }; @@ -1680,6 +1743,11 @@ let perl = perl58; })); + ghcboot610 = lowPrio (appendToName "boot" (import ../development/compilers/ghc/boot610.nix { + inherit fetchurl stdenv ncurses gmp editline makeWrapper; + # readline = if stdenv.system == "i686-linux" then readline4 else readline; + perl = perl58; + })); /* ghcWrapper = assert uulib.ghc == ghc; import ../development/compilers/ghc-wrapper { @@ -1867,6 +1935,10 @@ let inherit fetchurl stdenv; }; + tinycc = import ../development/compilers/tinycc { + inherit fetchurl stdenv perl texinfo; + }; + transformers = import ../development/compilers/transformers { inherit fetchurl pkgconfig sdf stlport; aterm = aterm23; @@ -1940,6 +2012,12 @@ let inherit fetchurl stdenv readline libtool gmp gawk makeWrapper; }; + io = builderDefsPackage (import ../development/interpreters/io) { + inherit sqlite zlib gmp libffi cairo ncurses freetype mesa + libpng libtiff libjpeg readline libsndfile libxml2 + freeglut e2fsprogs libsamplerate pcre libevent editline; + }; + kaffe = import ../development/interpreters/kaffe { inherit fetchurl stdenv jikes alsaLib xlibs; }; @@ -1953,23 +2031,29 @@ let }; maude = import ../development/interpreters/maude { - inherit fetchurl stdenv flex bison ncurses buddy tecla gmp; + inherit fetchurl stdenv flex bison ncurses buddy tecla gmp libsigsegv makeWrapper; }; - maudeUnstable = lowPrio (import ../development/interpreters/maude/unstable.nix { - inherit fetchurl stdenv flex bison ncurses buddy tecla gmp libsigsegv; - }); - octave = import ../development/interpreters/octave { inherit stdenv fetchurl readline ncurses perl flex; g77 = g77_42; }; + # mercurial (hg) bleeding edge version + octaveHG = import ../development/interpreters/octave/hg.nix { + inherit fetchurl readline ncurses perl flex atlas getConfig glibc; + inherit automake autoconf bison gperf lib python gnuplot texinfo texLive; # for dev Version + stdenv = overrideGCC stdenv gcc40; + g77 = g77_42; + inherit (bleedingEdgeRepos) sourceByName; + }; + perl = if !stdenv.isLinux then sysPerl else realPerl; - perl58 = import ../development/interpreters/perl-5.8 { - inherit fetchurl stdenv; - }; + perl58 = if !stdenv.isLinux then sysPerl else + import ../development/interpreters/perl-5.8 { + inherit fetchurl stdenv; + }; # FIXME: unixODBC needs patching on Darwin (see darwinports) phpOld = import ../development/interpreters/php { @@ -1997,23 +2081,40 @@ let libXt; }; - python = python25; + python = if getConfig ["python" "full"] false then pythonFull else pythonBase; + python25 = if getConfig ["python" "full"] false then python25Full else python25Base; + pythonBase = python25Base; + pythonFull = python25Full; python24 = import ../development/interpreters/python/2.4 { inherit fetchurl stdenv zlib bzip2; }; - python25base = composedArgsAndFun (import ../development/interpreters/python/2.5) { + python25Base = composedArgsAndFun (import ../development/interpreters/python/2.5) { inherit fetchurl stdenv zlib bzip2 gdbm; }; - python25 = python25base.meta.function { - db4 = if getConfig ["python" "db4Support"] false then db4 else null; - sqlite = if getConfig ["python" "sqliteSupport"] false then sqlite else null; - readline = if getConfig ["python" "readlineSupport"] false then readline else null; - openssl = if getConfig ["python" "opensslSupport"] false then openssl else null; + python25Full = python25Base.passthru.function { + 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; + openssl = if getConfig ["python" "opensslSupport"] true then openssl else null; + tk = if getConfig ["python" "tkSupport"] true then tk else null; + tcl = if getConfig ["python" "tkSupport"] true then tcl else null; + libX11 = if getConfig ["python" "tkSupport"] true then xlibs.libX11 else null; + xproto = if getConfig ["python" "tkSupport"] true then xlibs.xproto else null; }; + # new python and lib proposal + # - adding a python lib to buildinputs should be enough + # (handles .pth files by patching site.py + # while introducing NIX_PYTHON_SITES describing list of modules) + # - adding pyCheck = "import foo" test scripts to ensure libraries can be imported + # - providing pythonWrapper so that you can run python and import the selected libraries + # feel free to comment on this (experimental) + python25New = recurseIntoAttrs ((import ../development/interpreters/python-new/2.5) pkgs); + pythonNew = python25New; # the default python + pyrex = pyrex095; pyrex095 = import ../development/interpreters/pyrex/0.9.5.nix { @@ -2074,7 +2175,7 @@ let xulrunnerWrapper = {application, launcher}: import ../development/interpreters/xulrunner/wrapper { inherit stdenv application launcher; - xulrunner = firefox3; + xulrunner = xulrunner3; }; @@ -2177,6 +2278,10 @@ let inherit fetchurl stdenv m4; }; + bison24 = import ../development/tools/parsing/bison/bison-2.4.nix { + inherit fetchurl stdenv m4; + }; + buildbot = import ../development/tools/build-managers/buildbot { inherit fetchurl stdenv python twisted makeWrapper; }; @@ -2201,6 +2306,10 @@ let inherit fetchurl stdenv flex bison; }; + cflow = import ../development/tools/misc/cflow { + inherit fetchurl stdenv gettext emacs; + }; + cscope = import ../development/tools/misc/cscope { inherit fetchurl stdenv ncurses pkgconfig emacs; }; @@ -2214,6 +2323,12 @@ let inherit (xlibs) libX11 libXt; }; + doxygen = import ../development/tools/documentation/doxygen { + inherit fetchurl stdenv graphviz perl flex bison gnumake; + inherit (xlibs) libX11 libXext; + qt = if getPkgConfig "doxygen" "qt3" true then qt3 else null; + }; + elfutils = composedArgsAndFun (selectVersion ../development/tools/misc/elfutils "0.131") { inherit fetchurl stdenv; @@ -2290,9 +2405,9 @@ let }; # does not compile with ghc-6.8.3 - haddock210 = import ../development/tools/documentation/haddock/haddock-2.1.0.nix { + haddock210 = lowPrio (import ../development/tools/documentation/haddock/haddock-2.1.0.nix { cabal = cabal682; - }; + }); hsc2hs = import ../development/tools/misc/hsc2hs { inherit bleedingEdgeRepos stdenv; @@ -2349,6 +2464,10 @@ let inherit fetchurl stdenv perl m4; }; + libtool2 = import ../development/tools/misc/libtool/libtool2.nix { + inherit fetchurl stdenv lzma perl m4; + }; + libtoolOld = lowPrio (import ../development/tools/misc/libtool/old.nix { inherit fetchurl stdenv perl m4; }); @@ -2359,7 +2478,7 @@ let ltrace = composedArgsAndFun (selectVersion ../development/tools/misc/ltrace "0.5-3deb") { inherit fetchurl stdenv builderDefs stringsWithDeps lib; - elfutils = elfutils.meta.function {version = "0.127";}; + elfutils = elfutils.passthru.function {version = "0.127";}; }; mk = import ../development/tools/build-managers/mk { @@ -2436,6 +2555,10 @@ let javaSupport = false; }; + swftools = import ../tools/video/swftools { + inherit fetchurl stdenv x264 zlib libjpeg freetype giflib; + }; + swigWithJava = lowPrio (appendToName "with-java" (import ../development/tools/misc/swig { inherit fetchurl stdenv jdk; perlSupport = false; @@ -2573,9 +2696,10 @@ let inherit fetchurl stdenv; }; - boost = selectVersion ../development/libraries/boost "1.36.0" { + boostVersionChoice = version: selectVersion ../development/libraries/boost version { inherit fetchurl stdenv icu expat zlib bzip2 python; }; + boost = boostVersionChoice "1.37.0"; buddy = import ../development/libraries/buddy { inherit fetchurl stdenv; @@ -2590,6 +2714,11 @@ let inherit fetchurl stdenv pkgconfig cairo x11 fontconfig freetype; }; + chipmunk = builderDefsPackage (import ../development/libraries/chipmunk) { + inherit cmake freeglut mesa; + inherit (xlibs) libX11 xproto inputproto libXi libXmu; + }; + chmlib = import ../development/libraries/chmlib { inherit fetchurl stdenv; }; @@ -2697,6 +2826,14 @@ let ocaml = builtins.getAttr "3.10.0" ocaml_alts; }; + faac = import ../development/libraries/faac { + inherit fetchurl stdenv autoconf automake libtool; + }; + + faad2 = import ../development/libraries/faad2 { + inherit fetchurl stdenv autoconf automake libtool; + }; + fcgi = import ../development/libraries/fcgi { inherit fetchurl stdenv; }; @@ -2711,11 +2848,17 @@ let fftw = import ../development/libraries/fftw { inherit fetchurl stdenv builderDefs stringsWithDeps; + singlePrecision = false; + }; + fftwSinglePrec = import ../development/libraries/fftw { + inherit fetchurl stdenv builderDefs stringsWithDeps; + singlePrecision = true; }; fltk20 = (import ../development/libraries/fltk) { inherit mkDerivationByConfiguration x11 lib; inherit fetchurl stdenv mesa mesaHeaders libpng libjpeg zlib ; + inherit (xlibs) inputproto libXi; flags = [ "useNixLibs" "threads" "shared" "gl" ]; }; @@ -2761,12 +2904,10 @@ let gegl = import ../development/libraries/gegl { inherit fetchurl stdenv libpng pkgconfig babl; - # optional gtk+ - glib = glib214; openexr = openexr_1_6_1; # avocodec avformat librsvg inherit cairo libjpeg librsvg; - inherit (gtkLibs) pango; + inherit (gtkLibs) pango glib gtk; }; geos = import ../development/libraries/geos { @@ -2851,20 +2992,27 @@ let inherit fetchurl stdenv m4; }; + goocanvas = import ../development/libraries/goocanvas { + inherit fetchurl stdenv pkgconfig cairo; + inherit (gnome) gtk glib; + }; + #GMP ex-satellite, so better keep it near gmp mpfr = import ../development/libraries/mpfr { inherit fetchurl stdenv gmp; }; - gst_all = import ../development/libraries/gstreamer { - inherit lib selectVersion stdenv fetchurl perl bison flex pkgconfig libxml2 + gst_all = recurseIntoAttrs (import ../development/libraries/gstreamer { + inherit lib selectVersion stdenv fetchurl perl bison pkgconfig libxml2 python alsaLib cdparanoia libogg libvorbis libtheora freetype liboil libjpeg zlib speex libpng libdv aalib cairo libcaca flac hal libiec61883 - dbus libavc1394 ladspaH taglib; + dbus libavc1394 ladspaH taglib bzip2 which; + flex = flex2535; inherit (xorg) libX11 libXv libXext; inherit (gtkLibs) glib pango gtk; - inherit (gnome) gnomevfs; - }; + inherit (gnome) gnomevfs /* <- only passed for the no longer used older versions + it is depreceated and didn't build on amd64 due to samba dependenccy */ gtkdoc; + }); gnet = import ../development/libraries/gnet { inherit fetchurl stdenv pkgconfig; @@ -3054,6 +3202,11 @@ let inherit (gtkLibs) glib; }; + libcv = builderDefsPackage (import ../development/libraries/libcv) { + inherit libtiff libjpeg libpng pkgconfig; + inherit (gtkLibs) gtk glib; + }; + libdaemon = import ../development/libraries/libdaemon { inherit fetchurl stdenv; }; @@ -3068,7 +3221,7 @@ let inherit stdenv fetchurl builderDefs libdbi; }; - libdbiDrivers = libdbiDriversBase.meta.function { + libdbiDrivers = libdbiDriversBase.passthru.function { inherit sqlite mysql; }; @@ -3202,7 +3355,7 @@ let }; liboil = composedArgsAndFun - (selectVersion ../development/libraries/liboil "0.3.13") { + (selectVersion ../development/libraries/liboil "0.3.15") { inherit fetchurl stdenv pkgconfig; inherit (gtkLibs) glib; }; @@ -3257,6 +3410,10 @@ let inherit fetchurl stdenv libtool; }; + libupnp = import ../development/libraries/pupnp { + inherit fetchurl stdenv; + }; + giflib = import ../development/libraries/giflib { inherit fetchurl stdenv; }; @@ -3275,7 +3432,7 @@ let libvncserver = builderDefsPackage (import ../development/libraries/libvncserver) { inherit libtool libjpeg openssl zlib; - inherit (xlibs) xproto libX11 damageproto libXdamage + inherit (xlibs) xproto libX11 damageproto libXdamage libXext xextproto fixesproto libXfixes xineramaproto libXinerama libXrandr randrproto libXtst; }; @@ -3409,8 +3566,11 @@ let inherit fetchurl stdenv perl zip; }; + ode = builderDefsPackage (import ../development/libraries/ode) { + }; + openal = import ../development/libraries/openal { - inherit fetchurl stdenv alsaLib autoconf automake libtool; + inherit fetchurl stdenv cmake alsaLib; }; # added because I hope that it has been easier to compile on x86 (for blender) @@ -3465,6 +3625,11 @@ let cplusplusSupport = !stdenv ? isDietLibC; }; + plib = import ../development/libraries/plib { + inherit fetchurl stdenv mesa freeglut SDL; + inherit (xlibs) libXi libSM libXmu libXext libX11; + }; + poppler = import ../development/libraries/poppler { inherit fetchurl stdenv qt4 cairo freetype fontconfig zlib libjpeg pkgconfig; @@ -3876,6 +4041,10 @@ let inherit cabal; }; + monadlab = import ../development/libraries/haskell/monadlab { + inherit cabal; + }; + pcreLight = import ../development/libraries/haskell/pcre-light { inherit cabal pcre; }; @@ -3912,44 +4081,279 @@ let ### DEVELOPMENT / PERL MODULES + buildPerlPackage = import ../development/perl-modules/generic perl; - perlAlgorithmAnnotate = import ../development/perl-modules/generic perl { + perlAlgorithmAnnotate = buildPerlPackage { name = "Algorithm-Annotate-0.10"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/C/CL/CLKAO/Algorithm-Annotate-0.10.tar.gz; + url = mirror://cpan/authors/id/C/CL/CLKAO/Algorithm-Annotate-0.10.tar.gz; sha256 = "1y92k4nqkscfwpriv8q7c90rjfj85lvwq1k96niv2glk8d37dcf9"; }; - propagatedBuildInputs = []; }; - perlAlgorithmDiff = import ../development/perl-modules/generic perl { + perlAlgorithmDiff = buildPerlPackage { name = "Algorithm-Diff-1.15"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/T/TY/TYEMQ/Algorithm-Diff-1.1901.zip; + url = mirror://cpan/authors/id/T/TY/TYEMQ/Algorithm-Diff-1.1901.zip; sha256 = "0qk60fi49mpyvnfpjd2dzcmya8x3g5zfgb2hrnl7a5krn045g6i2"; }; - propagatedBuildInputs = []; buildInputs = [unzip]; }; - perlAppCLI = import ../development/perl-modules/generic perl { + perlAppCLI = buildPerlPackage { name = "App-CLI-0.07"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/C/CL/CLKAO/App-CLI-0.07.tar.gz; + url = mirror://cpan/authors/id/C/CL/CLKAO/App-CLI-0.07.tar.gz; sha256 = "000866qsm7jck3ini69b02sgbjwp6s297lsds002r7xk2wb6fqcz"; }; propagatedBuildInputs = [perlLocaleMaketextSimple]; }; - perlArchiveZip = import ../development/perl-modules/Archive-Zip { - inherit fetchurl perl; + perlAppConfig = buildPerlPackage { + name = "AppConfig-1.66"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AB/ABW/AppConfig-1.66.tar.gz; + sha256 = "1p1vs9px20lrq9mdwpzp309a8r6rchibsdmxang4krk90pi2sh4b"; + }; + }; + + perlArrayCompare = buildPerlPackage { + name = "Array-Compare-1.16"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-1.16.tar.gz; + sha256 = "1iwkn7d07a7vgl3jrv4f0glwapxcbdwwsy3aa6apgwam9119hl7q"; + }; + }; + + perlArchiveZip = buildPerlPackage { + name = "Archive-Zip-1.16"; + src = fetchurl { + url = http://nixos.org/tarballs/Archive-Zip-1.16.tar.gz; + md5 = "e28dff400d07b1659d659d8dde7071f1"; + }; }; perlBerkeleyDB = import ../development/perl-modules/BerkeleyDB { inherit fetchurl perl db4; }; - perlCGISession = import ../development/perl-modules/generic perl { + perlBitVector = buildPerlPackage { + name = "Bit-Vector-6.4"; + src = fetchurl { + url = mirror://cpan/authors/id/S/ST/STBEY/Bit-Vector-6.4.tar.gz; + sha256 = "146vr78r6w3cxrm0ji491ylaa1abqh7fs81qhg15g3gzzxfg33bp"; + }; + propagatedBuildInputs = [perlCarpClan]; + }; + + perlCacheFastMmap = buildPerlPackage { + name = "Cache-FastMmap-1.28"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.28.tar.gz; + sha256 = "1m851bz5025wy24mzsi1i8hdyg8bm7lszx9rnn47llsv6hb9v0da"; + }; + }; + + perlCarpClan = buildPerlPackage { + name = "Carp-Clan-6.00"; + src = fetchurl { + url = mirror://cpan/authors/id/J/JJ/JJORE/Carp-Clan-6.00.tar.gz; + sha256 = "0lbin4i0vzagcwkywpd5x4gz3a4ira4yn5g5v1ip0pbpyqnjk15h"; + }; + propagatedBuildInputs = [perlTestException]; + }; + + perlCatalystActionRenderView = buildPerlPackage { + name = "Catalyst-Action-RenderView-0.08"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MR/MRAMBERG/Catalyst-Action-RenderView-0.08.tar.gz; + sha256 = "1qng995mzgpm1gwb315ynm3spajf0ypmh1ciivqks3r0aamq2ar0"; + }; + propagatedBuildInputs = [perlCatalystRuntime perlHTTPRequestAsCGI perlDataVisitor]; + }; + + perlCatalystDevel = buildPerlPackage { + name = "Catalyst-Devel-1.08"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MR/MRAMBERG/Catalyst-Devel-1.08.tar.gz; + sha256 = "1wc2ysmldxd5bczfy6ijd8pbaq18g3snrg0cjc8k48941k8dcqpc"; + }; + propagatedBuildInputs = [ + perlCatalystRuntime perlCatalystActionRenderView + perlCatalystPluginStaticSimple perlCatalystPluginConfigLoader + perlPathClass perlTemplateToolkit perlClassAccessor + perlConfigGeneral perlFileCopyRecursive perlParent + ]; + }; + + perlCatalystManual = buildPerlPackage { + name = "Catalyst-Manual-5.7013"; + src = fetchurl { + url = mirror://cpan/authors/id/Z/ZA/ZARQUON/Catalyst-Manual-5.7013.tar.gz; + sha256 = "17n9w7gd2mj8mkw8zv9as0ba3qzwn07js7xgd46avxpcscl2fpqx"; + }; + }; + + perlCatalystModelDBICSchema = buildPerlPackage { + name = "Catalyst-Model-DBIC-Schema-0.21"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BO/BOGDAN/Catalyst-Model-DBIC-Schema-0.21.tar.gz; + sha256 = "12hi2sa5ggn2jqnhbb9i2wf602bf6c06xmcqmiki5lvh4z1pxg6x"; + }; + propagatedBuildInputs = [ + perlCatalystRuntime perlCatalystDevel perlDBIxClass + perlUNIVERSALrequire perlClassDataAccessor + perlDBIxClassSchemaLoader + ]; + }; + + perlCatalystRuntime = buildPerlPackage { + name = "Catalyst-Runtime-5.7015"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MR/MRAMBERG/Catalyst-Runtime-5.7015.tar.gz; + sha256 = "039c6ipn87lf23y7r7zg0bnga31nqzklrf28p6nd0xkhs1wihfbg"; + }; + propagatedBuildInputs = [ + perlLWP perlClassAccessor perlClassDataInheritable perlClassInspector + perlCGISimple perlDataDump perlFileModified perlHTTPBody perlHTTPRequestAsCGI + perlPathClass perlTextSimpleTable perlTreeSimple perlTreeSimpleVisitorFactory + ]; + }; + + perlCatalystPluginAuthentication = buildPerlPackage { + name = "Catalyst-Plugin-Authentication-0.10006"; + src = fetchurl { + url = mirror://cpan/authors/id/J/JA/JAYK/Catalyst-Plugin-Authentication-0.10006.tar.gz; + sha256 = "11x5d1l7p8z7q20fj79nlhwbmsab21m56rj5x20jkqfl91jx1l2s"; + }; + propagatedBuildInputs = [perlCatalystRuntime perlCatalystPluginSession]; + }; + + perlCatalystPluginAuthenticationStoreDBIC = buildPerlPackage { + name = "Catalyst-Plugin-Authentication-Store-DBIC-0.11"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MS/MSTROUT/Catalyst-Plugin-Authentication-Store-DBIC-0.11.tar.gz; + sha256 = "008x5yh65bmfdz3q7gxia739aajb8nx4ly5kyl4khl2pa9fy2jn7"; + }; + propagatedBuildInputs = [ + perlCatalystRuntime perlCatalystPluginAuthentication + perlSetObject perlDBIxClass perlCatalystModelDBICSchema + perlCatalystPluginAuthorizationRoles perlCatalystPluginSessionStateCookie + ]; + }; + + perlCatalystPluginAuthenticationStoreDBIxClass = buildPerlPackage { + name = "Catalyst-Authentication-Store-DBIx-Class-0.107"; + src = fetchurl { + url = http://search.cpan.org/CPAN/authors/id/J/JA/JAYK/Catalyst-Authentication-Store-DBIx-Class-0.107.tar.gz; + sha256 = "1vlrl65wf2i65zm2svb1mvylcx5vdrvxr09y16az60kdwiqvam6n"; + }; + propagatedBuildInputs = [ + perlCatalystRuntime perlCatalystPluginAuthentication perlCatalystModelDBICSchema + ]; + }; + + perlCatalystPluginAuthorizationACL = buildPerlPackage { + name = "Catalyst-Plugin-Authorization-ACL-0.10"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RK/RKITOVER/Catalyst-Plugin-Authorization-ACL-0.10.tar.gz; + sha256 = "1y9pj0scpc4nd7m1xqy7yvjsffhfadzl0z5r4jjv2srndcv4xj1p"; + }; + propagatedBuildInputs = [perlCatalystRuntime perlClassThrowable]; + }; + + perlCatalystPluginAuthorizationRoles = buildPerlPackage { + name = "Catalyst-Plugin-Authorization-Roles-0.07"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BR/BRICAS/Catalyst-Plugin-Authorization-Roles-0.07.tar.gz; + sha256 = "07b8zc7b06p0fprjj68fk7rgh781r9s3q8dx045sk03w0fnk3b4b"; + }; + propagatedBuildInputs = [ + perlCatalystRuntime perlCatalystPluginAuthentication + perlTestException perlSetObject perlUNIVERSALisa + ]; + }; + + perlCatalystPluginConfigLoader = buildPerlPackage { + name = "Catalyst-Plugin-ConfigLoader-0.21"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BR/BRICAS/Catalyst-Plugin-ConfigLoader-0.21.tar.gz; + sha256 = "1wv7j69ddwr8vrc6v4ipymdnv8mr9ak5jwiq0fia85bx9cv9f77j"; + }; + propagatedBuildInputs = [perlCatalystRuntime perlDataVisitor perlConfigAny]; + }; + + perlCatalystPluginHTMLWidget = buildPerlPackage { + name = "Catalyst-Plugin-HTML-Widget-1.1"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SR/SRI/Catalyst-Plugin-HTML-Widget-1.1.tar.gz; + sha256 = "1zzyfhmzlqvbwk2w930k3mqk8z1lzhrja9ynx9yfq5gmc8qqg95l"; + }; + propagatedBuildInputs = [perlCatalystRuntime perlHTMLWidget]; + }; + + perlCatalystPluginSession = buildPerlPackage { + name = "Catalyst-Plugin-Session-0.19"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NU/NUFFIN/Catalyst-Plugin-Session-0.19.tar.gz; + sha256 = "1gdirzm0fd167cm7ilqjhsw3g8ipfcklkrb0sj1grp9szhs5nlsd"; + }; + propagatedBuildInputs = [perlCatalystRuntime perlTestMockObject perlObjectSignature perlTestDeep]; + }; + + perlCatalystPluginSessionStateCookie = buildPerlPackage { + name = "Catalyst-Plugin-Session-State-Cookie-0.09"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NU/NUFFIN/Catalyst-Plugin-Session-State-Cookie-0.09.tar.gz; + sha256 = "03j2x66vq1ns4m5xlpwxmpnwhwqmg27m9qxm0kqg1a4v12ky9669"; + }; + propagatedBuildInputs = [ + perlCatalystRuntime perlCatalystPluginSession perlTestMockObject + ]; + }; + + perlCatalystPluginSessionStoreFastMmap = buildPerlPackage { + name = "Catalyst-Plugin-Session-State-Cookie-0.09"; + src = fetchurl { + url = mirror://cpan/authors/id/K/KA/KARMAN/Catalyst-Plugin-Session-Store-FastMmap-0.05.tar.gz; + sha256 = "0k1x9fbixlb20bw5rym27ariss6rwbp06rd4znr979l7r571fy3p"; + }; + propagatedBuildInputs = [ + perlPathClass perlCatalystPluginSession perlCacheFastMmap + ]; + }; + + perlCatalystPluginStackTrace = buildPerlPackage { + name = "Catalyst-Plugin-StackTrace-0.09"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MS/MSTROUT/Catalyst-Plugin-StackTrace-0.09.tar.gz; + sha256 = "1pywxjhvn5zmcpnxj9ba77pz1jxq4d037yd43y0ks9sc31p01ydh"; + }; + propagatedBuildInputs = [perlCatalystRuntime perlDevelStackTrace]; + }; + + perlCatalystPluginStaticSimple = buildPerlPackage { + name = "Catalyst-Plugin-Static-Simple-0.20"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AG/AGRUNDMA/Catalyst-Plugin-Static-Simple-0.20.tar.gz; + sha256 = "1qpicgfha81ykxzg4kjll2qw8b1rwzdgvj4s3q9s20zl86gmfr3p"; + }; + propagatedBuildInputs = [perlCatalystRuntime perlMIMETypes]; + }; + + perlCatalystViewTT = buildPerlPackage { + name = "Catalyst-View-TT-0.27"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MR/MRAMBERG/Catalyst-View-TT-0.27.tar.gz; + sha256 = "03xs31y9m5nrmfzpfmlzlg3ivys1gg8nwd6fvwbg72a3z36brghd"; + }; + propagatedBuildInputs = [ + perlCatalystRuntime perlTemplateToolkit perlClassAccessor + perlPathClass perlTemplateTimer + ]; + }; + + perlCGISession = buildPerlPackage { name = "CGI-Session-3.95"; src = fetchurl { url = mirror://cpan/authors/id/S/SH/SHERZODR/CGI-Session-3.95.tar.gz; @@ -3957,47 +4361,130 @@ let }; }; - perlClassAccessor = import ../development/perl-modules/generic perl { + perlCGISimple = buildPerlPackage { + name = "CGI-Simple-1.106"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AN/ANDYA/CGI-Simple-1.106.tar.gz; + sha256 = "0r0wc2260jnnch7dv7f6ailjf5w8hpqm2w146flfcchcryfxjlpg"; + }; + }; + + perlClassAccessor = buildPerlPackage { name = "Class-Accessor-0.31"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/K/KA/KASEI/Class-Accessor-0.31.tar.gz; + url = mirror://cpan/authors/id/K/KA/KASEI/Class-Accessor-0.31.tar.gz; sha256 = "1a4v5qqdf9bipd6ba5n47mag0cmgwp97cid67i510aw96bcjrsiy"; }; - propagatedBuildInputs = []; }; - perlClassAutouse = import ../development/perl-modules/generic perl { + perlClassAccessorChained = buildPerlPackage { + name = "Class-Accessor-Chained-0.01"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RC/RCLAMP/Class-Accessor-Chained-0.01.tar.gz; + sha256 = "1lilrjy1s0q5hyr0888kf0ifxjyl2iyk4vxil4jsv0sgh39lkgx5"; + }; + propagatedBuildInputs = [perlClassAccessor]; + }; + + perlClassAccessorGrouped = buildPerlPackage { + name = "Class-Accessor-Grouped-0.08001"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CL/CLACO/Class-Accessor-Grouped-0.08001.tar.gz; + sha256 = "15hwk5w4xxw5zr3yzp8ib93mja6xwsknasfb1jsa6a4k0r7xmq3f"; + }; + propagatedBuildInputs = [perlClassInspector perlMROCompat]; + }; + + perlClassAutouse = buildPerlPackage { name = "Class-Autouse-1.99_02"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Class-Autouse-1.99_02.tar.gz; + url = mirror://cpan/authors/id/A/AD/ADAMK/Class-Autouse-1.99_02.tar.gz; sha256 = "1jkhczx2flxrz154ps90fj9wcchkpmnp5sapwc0l92rpn7jpsf08"; }; - propagatedBuildInputs = []; }; - perlClassDataInheritable = import ../development/perl-modules/generic perl { + perlClassC3 = buildPerlPackage { + name = "Class-C3-0.19"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BL/BLBLACK/Class-C3-0.19.tar.gz; + sha256 = "1sn3s2ibdgwzirn3vl0s458qqncg76fxpqzcmyjmxy1kbdmjy01s"; + }; + }; + + perlClassC3Componentised = buildPerlPackage { + name = "Class-C3-Componentised-1.0003"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AS/ASH/Class-C3-Componentised-1.0003.tar.gz; + sha256 = "0lbhzz18lfp2xa8h5cmhfnqbqzhvpx4jkvga9gzwiv9ppbdpzqdp"; + }; + propagatedBuildInputs = [perlClassC3 perlClassInspector perlTestException]; + }; + + perlClassDataAccessor = buildPerlPackage { + name = "Class-Data-Accessor-0.04004"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CL/CLACO/Class-Data-Accessor-0.04004.tar.gz; + sha256 = "0578m3rplk41059rkkjy1009xrmrdivjnv8yxadwwdk1vzidc8n1"; + }; + }; + + perlClassDataInheritable = buildPerlPackage { name = "Class-Data-Inheritable-0.08"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-Data-Inheritable-0.08.tar.gz; + url = mirror://cpan/authors/id/T/TM/TMTM/Class-Data-Inheritable-0.08.tar.gz; sha256 = "0jpi38wy5xh6p1mg2cbyjjw76vgbccqp46685r27w8hmxb7gwrwr"; }; - propagatedBuildInputs = []; }; - perlCompressZlib = import ../development/perl-modules/Compress-Zlib { - inherit fetchurl perl; + perlClassInspector = buildPerlPackage { + name = "Class-Inspector-1.23"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AD/ADAMK/Class-Inspector-1.23.tar.gz; + sha256 = "0d15b5wls14gqcd6v2k4kbc0v0a1qfb794h49wfc4vwjk5gnpbw1"; + }; }; - perlconstant = import ../development/perl-modules/generic perl { + perlClassThrowable = buildPerlPackage { + name = "Class-Throwable-0.10"; + src = fetchurl { + url = mirror://cpan/authors/id/S/ST/STEVAN/Class-Throwable-0.10.tar.gz; + sha256 = "01hjrfb951c9j83ncg5drnam8vsfdgkjjv0kjshxhkl93sgnlvdl"; + }; + }; + + perlCompressZlib = buildPerlPackage { + name = "Compress-Zlib-1.41"; + src = fetchurl { + url = http://nixos.org/tarballs/Compress-Zlib-1.41.tar.gz; + md5 = "ac135b84a03e814734496777cf5e5722"; + }; + }; + + perlConfigAny = buildPerlPackage { + name = "Config-Any-0.14"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BR/BRICAS/Config-Any-0.14.tar.gz; + sha256 = "1vlr4w2m88figac5pblg6ppzrm11x2pm7r05n48s84cp4mizhim1"; + }; + }; + + perlConfigGeneral = buildPerlPackage { + name = "Config-General-2.40"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.40.tar.gz; + sha256 = "0wf6dpaanaiy0490dlgs3pi3xvvijs237x9izb00cnzggxcfmsnz"; + }; + }; + + perlconstant = buildPerlPackage { name = "constant-1.15"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/S/SA/SAPER/constant-1.15.tar.gz; + url = mirror://cpan/authors/id/S/SA/SAPER/constant-1.15.tar.gz; sha256 = "1ygz0hd1fd3q88r6dlw14kpyh06zjprksdci7qva6skxz3261636"; }; - propagatedBuildInputs = []; }; - perlCryptPasswordMD5 = import ../development/perl-modules/generic perl { + perlCryptPasswordMD5 = buildPerlPackage { name = "Crypt-PasswdMD5-1.3"; src = fetchurl { url = mirror://cpan/authors/id/L/LU/LUISMUNOZ/Crypt-PasswdMD5-1.3.tar.gz; @@ -4005,28 +4492,132 @@ let }; }; - perlDataHierarchy = import ../development/perl-modules/generic perl { + perlDataDump = buildPerlPackage { + name = "Data-Dump-1.11"; + src = fetchurl { + url = mirror://cpan/authors/id/G/GA/GAAS/Data-Dump-1.11.tar.gz; + sha256 = "0h5y40b6drgsf87nhwhqx1dprq70f98ibm03l9al4ndq7mrx97dd"; + }; + }; + + perlDataHierarchy = buildPerlPackage { name = "Data-Hierarchy-0.34"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/C/CL/CLKAO/Data-Hierarchy-0.34.tar.gz; + url = mirror://cpan/authors/id/C/CL/CLKAO/Data-Hierarchy-0.34.tar.gz; sha256 = "1vfrkygdaq0k7006i83jwavg9wgszfcyzbl9b7fp37z2acmyda5k"; }; propagatedBuildInputs = [perlTestException]; }; - perlDateManip = import ../development/perl-modules/generic perl { - name = "DateManip-5.42a"; + perlDataPage = buildPerlPackage { + name = "Data-Page-2.01"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/DateManip-5.42a.tar.gz; - md5 = "648386bbf46d021ae283811f75b07bdf"; + url = mirror://cpan/authors/id/L/LB/LBROCARD/Data-Page-2.01.tar.gz; + sha256 = "0mvhlid9qx9yd94rgr4lfz9kvflimc1dzcah0x7q5disw39aqrzr"; }; + propagatedBuildInputs = [perlTestException perlClassAccessorChained]; + }; + + perlDataVisitor = buildPerlPackage { + name = "Data-Visitor-0.21"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NU/NUFFIN/Data-Visitor-0.21.tar.gz; + sha256 = "10cjh3rrqi4gwrmkpzilzmaqdrh71wr59035s6b4p2dzd117p931"; + }; + propagatedBuildInputs = [ + perlTestMockObject perlMouse perlTaskWeaken perlTieUseOk perlTieToObject + perlNamespaceClean + ]; + }; + + perlDateCalc = buildPerlPackage { + name = "Date-Calc-5.4"; + src = fetchurl { + url = mirror://cpan/authors/id/S/ST/STBEY/Date-Calc-5.4.tar.gz; + sha256 = "1q7d1sy9ka1akpbysgwj673i7wiwb48yjv6wx1v5dhxllyxlxqc8"; + }; + propagatedBuildInputs = [perlCarpClan perlBitVector]; + }; + + perlDateManip = buildPerlPackage { + name = "DateManip-5.54"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-5.54.tar.gz; + sha256 = "0ap2jgqx7yvjsyph9zsvadsih41cj991j3jwgz5261sq7q74y7xn"; + }; + }; + + perlDBDSQLite = import ../development/perl-modules/DBD-SQLite { + inherit fetchurl buildPerlPackage perlDBI sqlite; }; perlDBFile = import ../development/perl-modules/DB_File { inherit fetchurl perl db4; }; - perlDigestSHA1 = import ../development/perl-modules/generic perl { + perlDBI = buildPerlPackage { + name = "DBI-1.607"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.607.tar.gz; + sha256 = "053ysk2a4njhzq5p59v5s6jzyi0yqr8l6wkswbvy4fyil3ka343h"; + }; + }; + + perlDBIxClass = buildPerlPackage { + name = "DBIx-Class-0.08099_04"; + src = fetchurl { + url = mirror://cpan/authors/id/L/LS/LSAUNDERS/DBIx-Class-0.08099_04.tar.gz; + sha256 = "0ik5bjsrlpz0sbwrrwiyjiga17rh9jb09gflqif5h59gq9y7kcyf"; + }; + propagatedBuildInputs = [ + perlTestNoWarnings perlTestException perlDBI perlScopeGuard + perlPathClass perlClassInspector perlClassAccessorGrouped + perlCarpClan perlTestWarn perlDataPage perlSQLAbstract + perlSQLAbstractLimit perlClassC3 perlClassC3Componentised + perlModuleFind perlDBDSQLite perlJSONAny + ]; + }; + + perlDBIxClassHTMLWidget = buildPerlPackage { + name = "DBIx-Class-HTMLWidget"; + src = fetchurl { + url = http://search.cpan.org/CPAN/authors/id/A/AN/ANDREMAR/DBIx-Class-HTMLWidget-0.16.tar.gz; + sha256 = "05zhniyzl31nq410ywhxm0vmvac53h7ax42hjs9mmpvf45ipahj1"; + }; + propagatedBuildInputs = [perlDBIxClass perlHTMLWidget]; + }; + + perlDBIxClassSchemaLoader = buildPerlPackage { + name = "DBIx-Class-Schema-Loader-0.04005"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IL/ILMARI/DBIx-Class-Schema-Loader-0.04005.tar.gz; + sha256 = "1adymxsh1q7y1d3x25mar1rz6nshag16h6bfzhwy0w50qd2vvx9l"; + }; + propagatedBuildInputs = [ + perlDBI perlDBDSQLite perlDataDump perlUNIVERSALrequire + perlClassAccessor perlClassDataAccessor perlClassC3 perlCarpClan + perlClassInspector perlDBIxClass perlLinguaENInflectNumber + ]; + }; + + perlDevelStackTrace = buildPerlPackage { + name = "Devel-StackTrace-1.1902"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-1.1902.tar.gz; + sha256 = "0llkvmpdcbqhw28ck0gzw4jlc2zbz7sx3dqscysdc05nk2fd3iax"; + }; + }; + + perlDigestHMAC = buildPerlPackage { + name = "Digest-HMAC-1.01"; + src = fetchurl { + url = mirror://cpan/authors/id/G/GA/GAAS/Digest-HMAC-1.01.tar.gz; + sha256 = "042d6nknc5icxqsy5asrh8v2shmvg7b3vbj95jyk4sbqlqpacwz3"; + }; + propagatedBuildInputs = [perlDigestSHA1]; + }; + + perlDigestSHA1 = buildPerlPackage { name = "Digest-SHA1-2.11"; src = fetchurl { url = mirror://cpan/authors/id/G/GA/GAAS/Digest-SHA1-2.11.tar.gz; @@ -4034,7 +4625,7 @@ let }; }; - perlEmailAddress = import ../development/perl-modules/generic perl { + perlEmailAddress = buildPerlPackage { name = "Email-Address-1.888"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.888.tar.gz; @@ -4042,7 +4633,7 @@ let }; }; - perlEmailSend = import ../development/perl-modules/generic perl { + perlEmailSend = buildPerlPackage { name = "Email-Send-2.185"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Send-2.185.tar.gz; @@ -4051,7 +4642,7 @@ let propagatedBuildInputs = [perlEmailSimple perlEmailAddress perlModulePluggable perlReturnValue]; }; - perlEmailSimple = import ../development/perl-modules/generic perl { + perlEmailSimple = buildPerlPackage { name = "Email-Simple-2.003"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Simple-2.003.tar.gz; @@ -4059,70 +4650,95 @@ let }; }; - perlEncode = import ../development/perl-modules/generic perl { + perlEmailValid = buildPerlPackage { + name = "Email-Valid-0.179"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-0.179.tar.gz; + sha256 = "13yfjll63cp1y4xqzdcr1mjhfncn48v6hckk5mvwi47w3ccj934a"; + }; + propagatedBuildInputs = [perlMailTools perlNetDNS]; + }; + + perlEncode = buildPerlPackage { name = "Encode-2.25"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/D/DA/DANKOGAI/Encode-2.25.tar.gz; + url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-2.25.tar.gz; sha256 = "0prwmbg3xh1lqskianwrfrgasdfmz4kjm3qpdm27ay110jkk25ak"; }; propagatedBuildInputs = []; }; - perlExtUtilsInstall = import ../development/perl-modules/generic perl { + perlExtUtilsInstall = buildPerlPackage { name = "ExtUtils-Install-1.50"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/Y/YV/YVES/ExtUtils-Install-1.50.tar.gz; + url = mirror://cpan/authors/id/Y/YV/YVES/ExtUtils-Install-1.50.tar.gz; sha256 = "18fr056fwnnhvgc646crx2p9mybf69mh5rkcphc7bbvahw9i61jy"; }; propagatedBuildInputs = [perlExtUtilsMakeMaker]; }; - perlExtUtilsMakeMaker = import ../development/perl-modules/generic perl { + perlExtUtilsMakeMaker = buildPerlPackage { name = "ExtUtils-MakeMaker-6.44"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/ExtUtils-MakeMaker-6.44.tar.gz; + url = mirror://cpan/authors/id/M/MS/MSCHWERN/ExtUtils-MakeMaker-6.44.tar.gz; sha256 = "0zyypnlmmyp06qbfdpc14rp5rj63066mjammn6rlcqz2iil9mpcj"; }; propagatedBuildInputs = []; }; - perlExtUtilsManifest = import ../development/perl-modules/generic perl { + perlExtUtilsManifest = buildPerlPackage { name = "ExtUtils-Manifest-1.53"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/R/RK/RKOBES/ExtUtils-Manifest-1.53.tar.gz; + url = mirror://cpan/authors/id/R/RK/RKOBES/ExtUtils-Manifest-1.53.tar.gz; sha256 = "0xgfzivw0dfy29ydfjkg0c9mvlhjvlhc54s0yvbb4sxb2mdvrfkp"; }; propagatedBuildInputs = []; }; - perlFilechdir = import ../development/perl-modules/generic perl { + perlFilechdir = buildPerlPackage { name = "File-chdir-0.1002"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/File-chdir-0.1002.tar.gz; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/File-chdir-0.1002.tar.gz; sha256 = "1fc2l754bxsizli3injm4wqf8dn03iq16rmfn62l99nxpibl5k6p"; }; propagatedBuildInputs = []; }; - perlFileTemp = import ../development/perl-modules/generic perl { + perlFileCopyRecursive = buildPerlPackage { + name = "File-Copy-Recursive-0.37"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.37.tar.gz; + sha256 = "12j0s01zwm67g4bcgbs0k61jwz59q1lndrnxyywxsz3xd30ki8rr"; + }; + }; + + perlFileModified = buildPerlPackage { + name = "File-Modified-0.07"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CO/CORION/File-Modified-0.07.tar.gz; + sha256 = "11zkg171fa5vdbyrbfcay134hhgyf4yaincjxwspwznrfmkpi49h"; + }; + }; + + perlFileTemp = buildPerlPackage { name = "File-Temp-0.20"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/T/TJ/TJENNESS/File-Temp-0.20.tar.gz; + url = mirror://cpan/authors/id/T/TJ/TJENNESS/File-Temp-0.20.tar.gz; sha256 = "0n7lr7mpdvwgznw469qdpdmac627a26wp615dkpzanc452skad4v"; }; propagatedBuildInputs = []; }; - perlFreezeThaw = import ../development/perl-modules/generic perl { + perlFreezeThaw = buildPerlPackage { name = "FreezeThaw-0.43"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/I/IL/ILYAZ/modules/FreezeThaw-0.43.tar.gz; + url = mirror://cpan/authors/id/I/IL/ILYAZ/modules/FreezeThaw-0.43.tar.gz; sha256 = "1qamc5aggp35xk590a4hy660f2rhc2l7j65hbyxdya9yvg7z437l"; }; propagatedBuildInputs = []; }; - perlHTMLParser = import ../development/perl-modules/generic perl { + perlHTMLParser = buildPerlPackage { name = "HTML-Parser-3.56"; src = fetchurl { url = mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.56.tar.gz; @@ -4131,7 +4747,16 @@ let propagatedBuildInputs = [perlHTMLTagset]; }; - perlHTMLTagset = import ../development/perl-modules/generic perl { + perlHTMLScrubber = buildPerlPackage { + name = "HTML-Scrubber-0.08"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PO/PODMASTER/HTML-Scrubber-0.08.tar.gz; + sha256 = "0xb5zj67y2sjid9bs3yfm81rgi91fmn38wy1ryngssw6vd92ijh2"; + }; + propagatedBuildInputs = [perlHTMLParser]; + }; + + perlHTMLTagset = buildPerlPackage { name = "HTML-Tagset-3.10"; src = fetchurl { url = mirror://cpan/authors/id/P/PE/PETDANCE/HTML-Tagset-3.10.tar.gz; @@ -4139,169 +4764,341 @@ let }; }; - perlHTMLTree = import ../development/perl-modules/generic perl { - name = "HTML-Tree-3.18"; + perlHTMLTree = buildPerlPackage { + name = "HTML-Tree-3.23"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/HTML-Tree-3.18.tar.gz; - md5 = "6a9e4e565648c9772e7d8ec6d4392497"; + url = mirror://cpan/authors/id/P/PE/PETEK/HTML-Tree-3.23.tar.gz; + sha256 = "1pn80f4g1wixs030f40b80wrj12kwfinwycrx3f10drg4v7ml5zm"; + }; + propagatedBuildInputs = [perlHTMLParser]; + }; + + perlHTMLWidget = buildPerlPackage { + name = "HTML-Widget-1.11"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CF/CFRANKS/HTML-Widget-1.11.tar.gz; + sha256 = "02w21rd30cza094m5xs9clzw8ayigbhg2ddzl6jycp4jam0dyhmy"; + }; + propagatedBuildInputs = [ + perlTestNoWarnings perlClassAccessor perlClassAccessorChained + perlClassDataAccessor perlModulePluggableFast perlHTMLTree + perlHTMLScrubber perlEmailValid perlDateCalc + ]; + }; + + perlHTTPBody = buildPerlPackage { + name = "HTTP-Body-1.04"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AG/AGRUNDMA/HTTP-Body-1.04.tar.gz; + sha256 = "11qxfv2p2bzd5xnl0ypy8l3frssszwrxafipm1fm36sxay2v71js"; }; }; - perlI18NLangTags = import ../development/perl-modules/generic perl { + perlHTTPRequestAsCGI = buildPerlPackage { + name = "HTTP-Request-AsCGI-0.5"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CH/CHANSEN/HTTP-Request-AsCGI-0.5.tar.gz; + sha256 = "164159iiyk0waqayplchkisxg2ldamx8iifrccx32p344714qcrh"; + }; + propagatedBuildInputs = [perlClassAccessor perlLWP]; + }; + + perlI18NLangTags = buildPerlPackage { name = "I18N-LangTags-0.35"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/S/SB/SBURKE/I18N-LangTags-0.35.tar.gz; + url = mirror://cpan/authors/id/S/SB/SBURKE/I18N-LangTags-0.35.tar.gz; sha256 = "0idwfi7k8l44d9akpdj6ygdz3q8zxr690m18s7w23ms9d55bh3jy"; }; propagatedBuildInputs = []; }; - perlIODigest = import ../development/perl-modules/generic perl { + perlIODigest = buildPerlPackage { name = "IO-Digest-0.10"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/C/CL/CLKAO/IO-Digest-0.10.tar.gz; + url = mirror://cpan/authors/id/C/CL/CLKAO/IO-Digest-0.10.tar.gz; sha256 = "1g6ilxqv2a7spf273v7k0721c6am7pwpjrin3h5zaqxfmd312nav"; }; propagatedBuildInputs = [perlPerlIOviadynamic]; }; - perlIOPager = import ../development/perl-modules/generic perl { + perlIOPager = buildPerlPackage { name = "IO-Pager-0.06.tgz"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/J/JP/JPIERCE/IO-Pager-0.06.tgz; + url = mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-0.06.tgz; sha256 = "0r3af4gyjpy0f7bhs7hy5s7900w0yhbckb2dl3a1x5wpv7hcbkjb"; }; - propagatedBuildInputs = []; }; - perlListMoreUtils = import ../development/perl-modules/generic perl { + perlIPCRun = buildPerlPackage { + name = "IPC-Run-0.80"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RS/RSOD/IPC-Run-0.80.tar.gz; + sha256 = "1lb0skp093ikkjg125l2f8lw7jzawmy4x7h1azgcs0d5miy8apj4"; + }; + }; + + perlJSON = buildPerlPackage { + name = "JSON-2.12"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-2.12.tar.gz; + sha256 = "0qbxfwvfsx8s50h2dzpb0z7qi22k9ghygfzbfk8v08kkpmrkls47"; + }; + propagatedBuildInputs = [perlJSONXS]; + }; + + perlJSONAny = buildPerlPackage { + name = "JSON-Any-1.17"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RB/RBERJON/JSON-Any-1.17.tar.gz; + sha256 = "07y6zb0vzb4c87k2lflxafb69zc4a29bxhzh6xdcpjhplf4vbifb"; + }; + propagatedBuildInputs = [perlJSON]; + }; + + perlJSONXS = buildPerlPackage { + name = "JSON-XS-2.23"; + src = fetchurl { + url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-2.23.tar.gz; + sha256 = "0yd1j5d9b0ymfzfaxyi9zgca3vqwjb3dl8pg14m1qwsx3pidd5j7"; + }; + }; + + perlLinguaENInflect = buildPerlPackage { + name = "Lingua-EN-Inflect-1.89"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-1.89.tar.gz; + sha256 = "1jvj67mvvfqxgxspmblay1c844vvhfwrviiarglkaw6phpg74rby"; + }; + }; + + perlLinguaENInflectNumber = buildPerlPackage { + name = "Lingua-EN-Inflect-Number-1.1"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SI/SIMON/Lingua-EN-Inflect-Number-1.1.tar.gz; + sha256 = "13hlr1srp9cd9mcc78snkng9il8iavvylfyh81iadvn2y7wikwfy"; + }; + propagatedBuildInputs = [perlLinguaENInflect]; + }; + + perlListMoreUtils = buildPerlPackage { name = "List-MoreUtils-0.22"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/V/VP/VPARSEVAL/List-MoreUtils-0.22.tar.gz; + url = mirror://cpan/authors/id/V/VP/VPARSEVAL/List-MoreUtils-0.22.tar.gz; sha256 = "1dv21xclh6r1cyy19r34xv2w6pc1jb5pwj7b2739m78xhlk8p55l"; }; - propagatedBuildInputs = []; }; - perlLocaleGettext = import ../development/perl-modules/generic perl { - name = "LocaleGettext-1.04"; + perlLocaleGettext = buildPerlPackage { + name = "LocaleGettext-1.05"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/gettext-1.04.tar.gz; - md5 = "578dd0c76f8673943be043435b0fbde4"; + url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz; + sha256 = "15262a00vx714szpx8p2z52wxkz46xp7acl72znwjydyq4ypydi7"; }; }; - perlLocaleMaketext = import ../development/perl-modules/generic perl { + perlLocaleMaketext = buildPerlPackage { name = "Locale-Maketext-1.13"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/F/FE/FERREIRA/Locale-Maketext-1.13.tar.gz; + url = mirror://cpan/authors/id/F/FE/FERREIRA/Locale-Maketext-1.13.tar.gz; sha256 = "0qvrhcs1f28ix3v8hcd5xr4z9s7plz4g5a4q1cjp7bs0c3w2yl6z"; }; propagatedBuildInputs = [perlI18NLangTags]; }; - perlLocaleMaketextLexicon = import ../development/perl-modules/generic perl { + perlLocaleMaketextLexicon = buildPerlPackage { name = "Locale-Maketext-Lexicon-0.66"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/A/AU/AUDREYT/Locale-Maketext-Lexicon-0.66.tar.gz; + url = mirror://cpan/authors/id/A/AU/AUDREYT/Locale-Maketext-Lexicon-0.66.tar.gz; sha256 = "1cd2kbcrlyjcmlr7m8kf94mm1hlr7hpv1r80a596f4ljk81f2nvd"; }; propagatedBuildInputs = [perlLocaleMaketext]; }; - perlLocaleMaketextSimple = import ../development/perl-modules/generic perl { + perlLocaleMaketextSimple = buildPerlPackage { name = "Locale-Maketext-Simple-0.18"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/A/AU/AUDREYT/Locale-Maketext-Simple-0.18.tar.gz; + url = mirror://cpan/authors/id/A/AU/AUDREYT/Locale-Maketext-Simple-0.18.tar.gz; sha256 = "14kx7vkxyfqndy90rzavrjp2346aidyc7x5dzzdj293qf8s4q6ig"; }; propagatedBuildInputs = []; }; - perlLWP = import ../development/perl-modules/generic perl { - name = "libwww-perl-5.808"; + perlLWP = buildPerlPackage { + name = "libwww-perl-5.819"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/libwww-perl-5.808.tar.gz; - sha256 = "1r5rslx68yplyd07bvjahjjrrqb56bhgg6gwdr9c16mv2s57gq12"; + url = mirror://cpan/authors/id/G/GA/GAAS/libwww-perl-5.819.tar.gz; + sha256 = "6bc03e9e88213add8436fed020509a7126c6b79c330c3c115cb696fa3b5373ae"; }; propagatedBuildInputs = [perlURI perlHTMLParser perlHTMLTagset]; }; - perlModuleBuild = import ../development/perl-modules/generic perl { + perlMailTools = buildPerlPackage { + name = "MailTools-2.04"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MARKOV/MailTools-2.04.tar.gz; + sha256 = "0w91rcrz4v0pjdnnv2mvlbrm9ww32f7ajhr7xkjdhhr3455p7adx"; + }; + propagatedBuildInputs = [perlTimeDate perlTestPod]; + }; + + perlMIMETypes = buildPerlPackage { + name = "MIME-Types-1.24"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-1.24.tar.gz; + sha256 = "1j89kjv9lipv6r3bq6dp0k9b8y1f8z9vrmhi7b8h7cs1yc8g7qz9"; + }; + propagatedBuildInputs = [perlTestPod]; + }; + + perlModuleBuild = buildPerlPackage { name = "Module-Build-0.2808"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/Module-Build-0.2808.tar.gz; + url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Module-Build-0.2808.tar.gz; sha256 = "1h8zpf4g2n8v47l9apmdqbdgcg039g70w75hpn84m37pmqkbnj8v"; }; propagatedBuildInputs = [perlExtUtilsInstall perlExtUtilsManifest perlTestHarness]; }; - perlPathClass = import ../development/perl-modules/generic perl { - name = "Path-Class-0.16"; + perlModuleFind = buildPerlPackage { + name = "Module-Find-0.06"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/Path-Class-0.16.tar.gz; - sha256 = "0zisxkj58jm84fwcssmdq8g6n37s33v5h7j28m12sbkqib0h76gc"; + url = mirror://cpan/authors/id/C/CR/CRENZ/Module-Find-0.06.tar.gz; + sha256 = "1394jk0rn2zmchpl11kim69xh5h5yzg96jdlf76fqrk3dcn0y2ip"; }; - propagatedBuildInputs = []; }; - perlPerlIOeol = import ../development/perl-modules/generic perl { + perlMouse = buildPerlPackage { + name = "Mouse-0.09"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SA/SARTAK/Mouse-0.09.tar.gz; + sha256 = "1akymbjim6w6i1q8h97izah26ndmcbnl1lwdsw9fa22hnhm0axg0"; + }; + }; + + perlMROCompat = buildPerlPackage { + name = "MRO-Compat-0.09"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BL/BLBLACK/MRO-Compat-0.09.tar.gz; + sha256 = "16l37bxd5apax4kyvnadiplz8xmmx76y9pyq9iksqrv0d5rl5vl8"; + }; + }; + + perlNamespaceClean = buildPerlPackage { + name = "namespace-clean-0.08"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PH/PHAYLON/namespace-clean-0.08.tar.gz; + sha256 = "1jwc15zz1j6indqgz64l09ayg0db4gfaasq74x0vyi1yx3d9x2yx"; + }; + propagatedBuildInputs = [perlScopeGuard]; + }; + + perlNetDNS = buildPerlPackage { + name = "Net-DNS-0.63"; + src = fetchurl { + url = mirror://cpan/authors/id/O/OL/OLAF/Net-DNS-0.63.tar.gz; + sha256 = "1pswrwhkav051xahm3k4cbyhi8kqpfmaz85lw44kwi2wc7mz4prk"; + }; + propagatedBuildInputs = [perlNetIP perlDigestHMAC]; + }; + + perlNetIP = buildPerlPackage { + name = "Net-IP-1.25"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MANU/Net-IP-1.25.tar.gz; + sha256 = "1iv0ka6d8kp9iana6zn51sxbcmz2h3mbn6cd8pald36q5whf5mjc"; + }; + }; + + perlObjectSignature = buildPerlPackage { + name = "Object-Signature-1.05"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AD/ADAMK/Object-Signature-1.05.tar.gz; + sha256 = "10k9j18jpb16brv0hs7592r7hx877290pafb8gnk6ydy7hcq9r2j"; + }; + }; + + perlParent = buildPerlPackage { + name = "parent-0.221"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CO/CORION/parent-0.221.tar.gz; + sha256 = "17jhscpa5p5szh1173pd6wvh2m05an1l941zqq9jkw9bzgk12hm0"; + }; + }; + + perlPathClass = buildPerlPackage { + name = "Path-Class-0.16"; + src = fetchurl { + url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Path-Class-0.16.tar.gz; + sha256 = "0zisxkj58jm84fwcssmdq8g6n37s33v5h7j28m12sbkqib0h76gc"; + }; + }; + + perlPerlIOeol = buildPerlPackage { name = "PerlIO-eol-0.14"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/A/AU/AUDREYT/PerlIO-eol-0.14.tar.gz; + url = mirror://cpan/authors/id/A/AU/AUDREYT/PerlIO-eol-0.14.tar.gz; sha256 = "1rwj0r075jfvvd0fnzgdqldc7qdb94wwsi21rs2l6yhcv0380fs2"; }; propagatedBuildInputs = []; }; - perlPerlIOviadynamic = import ../development/perl-modules/generic perl { + perlPerlIOviadynamic = buildPerlPackage { name = "PerlIO-via-dynamic-0.12"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/C/CL/CLKAO/PerlIO-via-dynamic-0.12.tar.gz; + url = mirror://cpan/authors/id/C/CL/CLKAO/PerlIO-via-dynamic-0.12.tar.gz; sha256 = "140hay9q8q9sz1fa2s57ijp5l2448fkcg7indgn6k4vc7yshmqz2"; }; propagatedBuildInputs = []; }; - perlPerlIOviasymlink = import ../development/perl-modules/generic perl { + perlPerlIOviasymlink = buildPerlPackage { name = "PerlIO-via-symlink-0.05"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/C/CL/CLKAO/PerlIO-via-symlink-0.05.tar.gz; + url = mirror://cpan/authors/id/C/CL/CLKAO/PerlIO-via-symlink-0.05.tar.gz; sha256 = "0lidddcaz9anddqrpqk4zwm550igv6amdhj86i2jjdka9b1x81s1"; }; propagatedBuildInputs = []; }; - perlModulePluggable = import ../development/perl-modules/generic perl { + perlModulePluggable = buildPerlPackage { name = "Module-Pluggable-3.5"; src = fetchurl { url = mirror://cpan/authors/id/S/SI/SIMONW/Module-Pluggable-3.5.tar.gz; sha256 = "08rywi79pqn2c8zr17fmd18lpj5hm8lxd1j4v2k002ni8vhl43nv"; }; patches = [ + # !!! merge this patch into Perl itself (which contains Module::Pluggable as well) ../development/perl-modules/module-pluggable.patch ]; }; - perlPodEscapes = import ../development/perl-modules/generic perl { - name = "Pod-Escapes-1.04"; + perlModulePluggableFast = buildPerlPackage { + name = "Module-Pluggable-Fast-0.18"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/S/SB/SBURKE/Pod-Escapes-1.04.tar.gz; - sha256 = "1wrg5dnsl785ygga7bp6qmakhjgh9n4g3jp2l85ab02r502cagig"; + url = mirror://cpan/authors/id/S/SR/SRI/Module-Pluggable-Fast-0.18.tar.gz; + sha256 = "140c311x2darrc2p1drbkafv7qwhzdcff4ad300n6whsx4dfp6wr"; }; - propagatedBuildInputs = []; + propagatedBuildInputs = [perlUNIVERSALrequire]; }; - perlPodSimple = import ../development/perl-modules/generic perl { + perlPodEscapes = buildPerlPackage { + name = "Pod-Escapes-1.04"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SB/SBURKE/Pod-Escapes-1.04.tar.gz; + sha256 = "1wrg5dnsl785ygga7bp6qmakhjgh9n4g3jp2l85ab02r502cagig"; + }; + }; + + perlPodSimple = buildPerlPackage { name = "Pod-Simple-3.05"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/A/AR/ARANDAL/Pod-Simple-3.05.tar.gz; + url = mirror://cpan/authors/id/A/AR/ARANDAL/Pod-Simple-3.05.tar.gz; sha256 = "1j0kqcvr9ykcqlkr797j1npkbggykb3p4w5ri73s8mi163lzxkqb"; }; propagatedBuildInputs = [perlconstant perlPodEscapes]; }; - perlReturnValue = import ../development/perl-modules/generic perl { + perlReturnValue = buildPerlPackage { name = "Return-Value-1.302"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Return-Value-1.302.tar.gz; @@ -4309,7 +5106,40 @@ let }; }; - perlStringMkPasswd = import ../development/perl-modules/generic perl { + perlScopeGuard = buildPerlPackage { + name = "Scope-Guard-0.03"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.03.tar.gz; + sha256 = "07x966fkqxlwnngxs7a2jrhabh8gzhjfpqq56n9gkwy7f340sayb"; + }; + }; + + perlSetObject = buildPerlPackage { + name = "Set-Object-1.26"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SA/SAMV/Set-Object-1.26.tar.gz; + sha256 = "1hx3wrw8xkvaggacc8zyn86hfi3079ahmia1n8vsw7dglp1bbhmj"; + }; + }; + + perlSQLAbstract = buildPerlPackage { + name = "SQL-Abstract-1.24"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MS/MSTROUT/SQL-Abstract-1.24.tar.gz; + sha256 = "0vnpnca9cahnk0zgzqkngcwyzjqnckar0jwp3vyhj9hcaylirnvg"; + }; + }; + + perlSQLAbstractLimit = buildPerlPackage { + name = "SQL-Abstract-Limit-0.12"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DAVEBAIRD/SQL-Abstract-Limit-0.12.tar.gz; + sha256 = "1b8663l7myc54k40xmyq003v6xs1y6bhdm1jpahrv44wzcl60n7z"; + }; + propagatedBuildInputs = [perlSQLAbstract perlTestException perlDBI]; + }; + + perlStringMkPasswd = buildPerlPackage { name = "String-MkPasswd-0.02"; src = fetchurl { url = mirror://cpan/authors/id/C/CG/CGRAU/String-MkPasswd-0.02.tar.gz; @@ -4317,109 +5147,286 @@ let }; }; - perlSVK = import ../development/perl-modules/generic perl { + perlSubUplevel = buildPerlPackage { + name = "Sub-Uplevel-0.2002"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.2002.tar.gz; + sha256 = "19b2b9xsw7lvvkcmmnhhv8ybxdkbnrky9nnqgjridr108ww9m5rh"; + }; + }; + + perlSVK = buildPerlPackage { name = "SVK-v2.0.2"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/C/CL/CLKAO/SVK-v2.0.2.tar.gz; + url = mirror://cpan/authors/id/C/CL/CLKAO/SVK-v2.0.2.tar.gz; sha256 = "0c4m2q7cvzwh9kk1nc1vd8lkxx2kss5nd4k20dpkal4c7735jns0"; }; propagatedBuildInputs = [perlAlgorithmDiff perlAlgorithmAnnotate perlAppCLI perlClassDataInheritable perlDataHierarchy perlEncode perlFileTemp perlIODigest perlListMoreUtils perlPathClass perlPerlIOeol perlPerlIOviadynamic perlPerlIOviasymlink perlPodEscapes perlPodSimple perlSVNMirror perlTimeHiRes perlUNIVERSALrequire perlURI perlYAMLSyck perlClassAutouse perlIOPager perlLocaleMaketextLexicon perlFreezeThaw]; }; - perlSVNMirror = import ../development/perl-modules/generic perl { + perlSVNMirror = buildPerlPackage { name = "SVN-Mirror-0.73"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/C/CL/CLKAO/SVN-Mirror-0.73.tar.gz; + url = mirror://cpan/authors/id/C/CL/CLKAO/SVN-Mirror-0.73.tar.gz; sha256 = "1scjaq7qjz6jlsk1c2l5q15yxf0sqbydvf22mb2xzy1bzaln0x2c"; }; propagatedBuildInputs = [perlClassAccessor perlFilechdir subversion perlURI perlTermReadKey perlTimeDate perlSVNSimple]; }; - perlSVNSimple = import ../development/perl-modules/generic perl { + perlSVNSimple = buildPerlPackage { name = "SVN-Simple-0.27"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/C/CL/CLKAO/SVN-Simple-0.27.tar.gz; + url = mirror://cpan/authors/id/C/CL/CLKAO/SVN-Simple-0.27.tar.gz; sha256 = "0p7p52ja6sf4j0w3b05i0bbqi5wiambckw2m5dsr63bbmlhv4a71"; }; propagatedBuildInputs = [subversion]; }; - perlTermReadKey = import ../development/perl-modules/generic perl { + perlTaskCatalystTutorial = buildPerlPackage { + name = "Task-Catalyst-Tutorial"; + src = fetchurl { + url = mirror://cpan/authors/id/J/JR/JROCKWAY/Task-Catalyst-Tutorial-0.03.tar.gz; + sha256 = "1f9nqg8h455s8dah482hf78i3h2bilji26i5m3lzr2cxws98lsak"; + }; + propagatedBuildInputs = [ + perlCatalystRuntime perlCatalystManual perlCatalystDevel + perlCatalystPluginSession perlCatalystPluginAuthentication + perlCatalystPluginAuthenticationStoreDBIC + perlCatalystPluginAuthorizationRoles + perlCatalystPluginAuthorizationACL + perlCatalystPluginHTMLWidget + perlCatalystPluginSessionStoreFastMmap + perlCatalystPluginStackTrace + perlCatalystViewTT + perlDBIxClass perlDBIxClassHTMLWidget + ]; + preConfigure = '' + substituteInPlace Makefile.PL --replace "'Catalyst::Manual' => 0," "" + ''; + }; + + perlTaskWeaken = buildPerlPackage { + name = "Task-Weaken-1.02"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AD/ADAMK/Task-Weaken-1.02.tar.gz; + sha256 = "10f9kd1lwbscmmjwgbfwa4kkp723mb463lkbmh29rlhbsl7kb5wz"; + }; + }; + + perlTemplateTimer = buildPerlPackage { + name = "Template-Timer-0.04"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PE/PETDANCE/Template-Timer-0.04.tar.gz; + sha256 = "0j0gmxbq1svp0rb4kprwj2fk2mhl07yah08bksfz0a0pfz6lsam4"; + }; + propagatedBuildInputs = [perlTemplateToolkit]; + }; + + perlTemplateToolkit = buildPerlPackage { + name = "Template-Toolkit-2.20"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-2.20.tar.gz; + sha256 = "13wbh06a76k4ag14lhszmpwv4hb8hlj1d9glizhp8izazl3xf1zg"; + }; + propagatedBuildInputs = [perlAppConfig]; + patches = [ + # Needed to make TT works properly on templates in the Nix store. + ../development/perl-modules/template-toolkit-nix-store.patch + ]; + }; + + perlTermReadKey = buildPerlPackage { name = "TermReadKey-2.30"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/TermReadKey-2.30.tar.gz; + url = mirror://cpan/authors/id/J/JS/JSTOWE/TermReadKey-2.30.tar.gz; md5 = "f0ef2cea8acfbcc58d865c05b0c7e1ff"; }; }; - perlTestBuilderTester = import ../development/perl-modules/generic perl { - name = "Test-Builder-Tester-1.01"; + perlTestDeep = buildPerlPackage { + name = "Test-Deep-0.103"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/M/MA/MARKF/Test-Builder-Tester-1.01.tar.gz; - sha256 = "0s785j4w7rfx5b6bwzflic04vynrcp4dci4p3n8w609zrdn43g32"; + url = mirror://cpan/authors/id/F/FD/FDALY/Test-Deep-0.103.tar.gz; + sha256 = "0cdl08k5v0wc9w20va5qw98ynlbs9ifwndgsix8qhi7h15sj8a5j"; }; - propagatedBuildInputs = []; + propagatedBuildInputs = [perlTestTester perlTestNoWarnings]; + postInstall = "ensureDir $out/lib/site_perl; mv $out/lib/5.* $out/lib/site_perl"; }; - perlTestException = import ../development/perl-modules/generic perl { + perlTestException = buildPerlPackage { name = "Test-Exception-0.27"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/A/AD/ADIE/Test-Exception-0.27.tar.gz; + url = mirror://cpan/authors/id/A/AD/ADIE/Test-Exception-0.27.tar.gz; sha256 = "1s921j7yv2szywd1ffi6yz3ngrbq97f9dh38bvvajqnm29g1xb9j"; }; - propagatedBuildInputs = [perlTestBuilderTester perlTestHarness perlTestSimple]; + propagatedBuildInputs = [perlTestHarness perlTestSimple perlSubUplevel]; }; - perlTestHarness = import ../development/perl-modules/generic perl { + perlTestHarness = buildPerlPackage { name = "Test-Harness-3.10"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/A/AN/ANDYA/Test-Harness-3.10.tar.gz; + url = mirror://cpan/authors/id/A/AN/ANDYA/Test-Harness-3.10.tar.gz; sha256 = "1qd217yzppj1vbjhny06v8niqhz85pam996ry6bzi08z0jidr2wh"; }; - propagatedBuildInputs = []; }; - perlTestSimple = import ../development/perl-modules/generic perl { - name = "Test-Simple-0.80"; + perlTestMockObject = buildPerlPackage { + name = "Test-MockObject-1.09"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/Test-Simple-0.80.tar.gz; - sha256 = "15rzwi01q4lp5sl5n8rvghcvhfd4h4a9m86pnds16nv045irv4x0"; + url = mirror://cpan/authors/id/C/CH/CHROMATIC/Test-MockObject-1.09.tar.gz; + sha256 = "1cz385x0jrkj84nmfs6qyzwwvv8m9v8r2isagfj1zxvhdw49wdyy"; + }; + propagatedBuildInputs = [perlTestException perlUNIVERSALisa perlUNIVERSALcan]; + }; + + perlTestNoWarnings = buildPerlPackage { + name = "Test-NoWarnings-0.084"; + src = fetchurl { + url = mirror://cpan/authors/id/F/FD/FDALY/Test-NoWarnings-0.084.tar.gz; + sha256 = "19g47pa3brr9px3jnwziapvxcnghqqjjwxz1jfch4asawpdx2s8b"; + }; + propagatedBuildInputs = [perlTestTester]; + }; + + perlTestPod = buildPerlPackage { + name = "Test-Pod-1.26"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-Pod-1.26.tar.gz; + sha256 = "025rviipiaa1rf0bp040jlwaxwvx48kdcjriaysvkjpyvilwvqd4"; + }; + }; + + perlTestSimple = buildPerlPackage { + name = "Test-Simple-0.84"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MS/MSCHWERN/Test-Simple-0.84.tar.gz; + sha256 = "030j47q3p46jfk60dsh2d5m7ip4nqz0fl4inqr8hx8b8q0f00r4l"; }; propagatedBuildInputs = [perlTestHarness]; + postInstall = "ensureDir $out/lib/site_perl; mv $out/lib/5.* $out/lib/site_perl"; }; - perlTimeDate = import ../development/perl-modules/generic perl { + perlTestTester = buildPerlPackage { + name = "Test-Tester-0.107"; + src = fetchurl { + url = mirror://cpan/authors/id/F/FD/FDALY/Test-Tester-0.107.tar.gz; + sha256 = "0qgmsl6s6xm39211lywyzwrlz0gcmax7fb8zipybs9yxfmwcvyx2"; + }; + postInstall = "ensureDir $out/lib/site_perl; mv $out/lib/5.* $out/lib/site_perl"; + }; + + perlTestWarn = buildPerlPackage { + name = "Test-Warn-0.11"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CH/CHORNY/Test-Warn-0.11.tar.gz; + sha256 = "1y9g13bzvjsmg5v555zrl7w085jq40a47hfs4gc3k78s0bkwxbyi"; + }; + propagatedBuildInputs = [perlTestSimple perlTestException perlArrayCompare perlTreeDAGNode]; + }; + + perlTextSimpleTable = buildPerlPackage { + name = "Text-SimpleTable-0.05"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SR/SRI/Text-SimpleTable-0.05.tar.gz; + sha256 = "028pdfmr2gnaq8w3iar8kqvrpxcghnag8ls7h4227l9zbxd1k9p9"; + }; + }; + + perlTieUseOk = buildPerlPackage { + name = "Test-use-ok-0.02"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AU/AUDREYT/Test-use-ok-0.02.tar.gz; + sha256 = "11inaxiavb35k8zwxwbfbp9wcffvfqas7k9idy822grn2sz5gyig"; + }; + }; + + perlTieToObject = buildPerlPackage { + name = "Tie-ToObject-0.03"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NU/NUFFIN/Tie-ToObject-0.03.tar.gz; + sha256 = "1x1smn1kw383xc5h9wajxk9dlx92bgrbf7gk4abga57y6120s6m3"; + }; + propagatedBuildInputs = [perlTieUseOk]; + }; + + perlTimeDate = buildPerlPackage { name = "TimeDate-1.16"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/G/GB/GBARR/TimeDate-1.16.tar.gz; + url = mirror://cpan/authors/id/G/GB/GBARR/TimeDate-1.16.tar.gz; sha256 = "1cvcpaghn7dc14m9871sfw103g3m3a00m2mrl5iqb0mmh40yyhkr"; }; propagatedBuildInputs = []; }; - perlTimeHiRes = import ../development/perl-modules/generic perl { + perlTimeHiRes = buildPerlPackage { name = "Time-HiRes-1.9715"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/J/JH/JHI/Time-HiRes-1.9715.tar.gz; + url = mirror://cpan/authors/id/J/JH/JHI/Time-HiRes-1.9715.tar.gz; sha256 = "0pgqrfkysy3mdcx5nd0x8c80lgqb7rkb3nrkii3vc576dcbpvw0i"; }; propagatedBuildInputs = []; }; - perlFontTTF = import ../development/perl-modules/Font-TTF { - inherit fetchurl perl; + perlTreeDAGNode = buildPerlPackage { + name = "Tree-DAG_Node-1.06"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CO/COGENT/Tree-DAG_Node-1.06.tar.gz; + sha256 = "0anvwfh4vqj41ipq52p65sqlvw3rvm6cla5hbws13gyk9mvp09ah"; + }; }; - perlUNIVERSALrequire = import ../development/perl-modules/generic perl { + perlTreeSimple = buildPerlPackage { + name = "Tree-Simple-1.18"; + src = fetchurl { + url = mirror://cpan/authors/id/S/ST/STEVAN/Tree-Simple-1.18.tar.gz; + sha256 = "0bb2hc8q5rwvz8a9n6f49kzx992cxczmrvq82d71757v087dzg6g"; + }; + propagatedBuildInputs = [perlTestException]; + }; + + perlTreeSimpleVisitorFactory = buildPerlPackage { + name = "Tree-Simple-VisitorFactory-0.10"; + src = fetchurl { + url = mirror://cpan/authors/id/S/ST/STEVAN/Tree-Simple-VisitorFactory-0.10.tar.gz; + sha256 = "1ghcgnb3xvqjyh4h4aa37x98613aldnpj738z9b80p33bbfxq158"; + }; + propagatedBuildInputs = [perlTreeSimple]; + buildInputs = [perlTestException]; + }; + + perlFontTTF = buildPerlPackage { + name = "perl-Font-TTF-0.43"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MH/MHOSKEN/Font-TTF-0.43.tar.gz; + sha256 = "0782mj5n5a2qbghvvr20x51llizly6q5smak98kzhgq9a7q3fg89"; + }; + }; + + perlUNIVERSALcan = buildPerlPackage { + name = "UNIVERSAL-can-1.12"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CH/CHROMATIC/UNIVERSAL-can-1.12.tar.gz; + sha256 = "1abadbgcy11cmlmj9qf1v73ycic1qhysxv5xx81h8s4p81alialr"; + }; + }; + + perlUNIVERSALisa = buildPerlPackage { + name = "UNIVERSAL-isa-1.00"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CH/CHROMATIC/UNIVERSAL-isa-1.00_00.tar.gz; + sha256 = "04dj0z458k57l3phmq635bdmj3zzl2iy5dxp3yqaldc6g65wz0d0"; + }; + }; + + perlUNIVERSALrequire = buildPerlPackage { name = "UNIVERSAL-require-0.11"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/UNIVERSAL-require-0.11.tar.gz; + url = mirror://cpan/authors/id/M/MS/MSCHWERN/UNIVERSAL-require-0.11.tar.gz; sha256 = "1rh7i3gva4m96m31g6yfhlqcabszhghbb3k3qwxbgx3mkf5s6x6i"; }; - propagatedBuildInputs = []; }; - perlURI = import ../development/perl-modules/generic perl { + perlURI = buildPerlPackage { name = "URI-1.35"; src = fetchurl { url = mirror://cpan/authors/id/G/GA/GAAS/URI-1.35.tar.gz; @@ -4427,7 +5434,7 @@ let }; }; - perlXMLDOM = import ../development/perl-modules/generic perl { + perlXMLDOM = buildPerlPackage { name = "XML-DOM-1.44"; src = fetchurl { url = mirror://cpan/authors/id/T/TJ/TJMATHER/XML-DOM-1.44.tar.gz; @@ -4437,39 +5444,44 @@ let propagatedBuildInputs = [perlXMLRegExp perlXMLParser perlLWP]; }; - perlXMLLibXML = import ../development/perl-modules/generic perl { - name = "XML-LibXML-1.58"; + perlXMLLibXML = buildPerlPackage { + name = "XML-LibXML-1.66"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/XML-LibXML-1.58.tar.gz; - md5 = "4691fc436e5c0f22787f5b4a54fc56b0"; + url = mirror://cpan/authors/id/P/PA/PAJAS/XML-LibXML-1.66.tar.gz; + sha256 = "1a0bdiv3px6igxnbbjq10064iahm8f5i310p4y05w6zn5d51awyl"; }; buildInputs = [libxml2]; propagatedBuildInputs = [perlXMLLibXMLCommon perlXMLSAX]; }; - perlXMLLibXMLCommon = import ../development/perl-modules/generic perl { + perlXMLLibXMLCommon = buildPerlPackage { name = "XML-LibXML-Common-0.13"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/XML-LibXML-Common-0.13.tar.gz; + url = mirror://cpan/authors/id/P/PH/PHISH/XML-LibXML-Common-0.13.tar.gz; md5 = "13b6d93f53375d15fd11922216249659"; }; buildInputs = [libxml2]; }; - perlXMLNamespaceSupport = import ../development/perl-modules/generic perl { - name = "XML-NamespaceSupport-1.08"; + perlXMLNamespaceSupport = buildPerlPackage { + name = "XML-NamespaceSupport-1.09"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/XML-NamespaceSupport-1.08.tar.gz; - md5 = "81bd5ae772906d0579c10061ed735dc8"; + url = mirror://cpan/authors/id/R/RB/RBERJON/XML-NamespaceSupport-1.09.tar.gz; + sha256 = "0ny2i4pf6j8ggfj1x02rm5zm9a37hfalgx9w9kxnk69xsixfwb51"; }; buildInputs = []; }; - perlXMLParser = import ../development/perl-modules/XML-Parser { - inherit fetchurl perl expat; + perlXMLParser = buildPerlPackage { + name = "XML-Parser-2.36"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MS/MSERGEANT/XML-Parser-2.36.tar.gz; + sha256 = "0gyp5qfbflhkin1zv8l6wlkjwfjvsf45a3py4vc6ni82fj32kmcz"; + }; + makeMakerFlags = "EXPATLIBPATH=${expat}/lib EXPATINCPATH=${expat}/include"; }; - perlXMLRegExp = import ../development/perl-modules/generic perl { + perlXMLRegExp = buildPerlPackage { name = "XML-RegExp-0.03"; src = fetchurl { url = mirror://cpan/authors/id/T/TJ/TJMATHER/XML-RegExp-0.03.tar.gz; @@ -4477,16 +5489,16 @@ let }; }; - perlXMLSAX = import ../development/perl-modules/generic perl { - name = "XML-SAX-0.12"; + perlXMLSAX = buildPerlPackage { + name = "XML-SAX-0.96"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/XML-SAX-0.12.tar.gz; - md5 = "bff58bd077a9693fc8cf32e2b95f571f"; + url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-0.96.tar.gz; + sha256 = "024fbjgg6s87j0y3yik55plzf7d6qpn7slwd03glcb54mw9zdglv"; }; propagatedBuildInputs = [perlXMLNamespaceSupport]; }; - perlXMLSimple = import ../development/perl-modules/generic perl { + perlXMLSimple = buildPerlPackage { name = "XML-Simple-2.18"; src = fetchurl { url = mirror://cpan/authors/id/G/GR/GRANTM/XML-Simple-2.18.tar.gz; @@ -4495,16 +5507,16 @@ let propagatedBuildInputs = [perlXMLParser]; }; - perlXMLTwig = import ../development/perl-modules/generic perl { - name = "XML-Twig-3.15"; + perlXMLTwig = buildPerlPackage { + name = "XML-Twig-3.32"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/XML-Twig-3.15.tar.gz; - md5 = "b26886b8bd19761fff37b23e4964b499"; + url = mirror://cpan/authors/id/M/MI/MIROD/XML-Twig-3.32.tar.gz; + sha256 = "07zdsfzw9dlrx6ril9clf1jfif09vpf27rz66laja7mvih9izd1v"; }; propagatedBuildInputs = [perlXMLParser]; }; - perlXMLWriter = import ../development/perl-modules/generic perl { + perlXMLWriter = buildPerlPackage { name = "XML-Writer-0.602"; src = fetchurl { url = mirror://cpan/authors/id/J/JO/JOSEPHW/XML-Writer-0.602.tar.gz; @@ -4512,28 +5524,28 @@ let }; }; - perlXSLoader = import ../development/perl-modules/generic perl { + perlXSLoader = buildPerlPackage { name = "XSLoader-0.08"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/S/SA/SAPER/XSLoader-0.08.tar.gz; + url = mirror://cpan/authors/id/S/SA/SAPER/XSLoader-0.08.tar.gz; sha256 = "0mr4l3givrpyvz1kg0kap2ds8g0rza2cim9kbnjy8hi64igkixi5"; }; propagatedBuildInputs = []; }; - perlYAML = import ../development/perl-modules/generic perl { + perlYAML = buildPerlPackage { name = "YAML-0.66"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-0.66.tar.gz; + url = mirror://cpan/authors/id/I/IN/INGY/YAML-0.66.tar.gz; sha256 = "1pcjf6y3l88ypa52mkk349jglabm53mhxda4p5awc1jl67lx3ngw"; }; propagatedBuildInputs = []; }; - perlYAMLSyck = import ../development/perl-modules/generic perl { + perlYAMLSyck = buildPerlPackage { name = "YAML-Syck-1.04"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/A/AU/AUDREYT/YAML-Syck-1.04.tar.gz; + url = mirror://cpan/authors/id/A/AU/AUDREYT/YAML-Syck-1.04.tar.gz; sha256 = "180w77rxqwrfmd2jjmrd407bf8vnpry73941g5n61ippzic5x1v3"; }; propagatedBuildInputs = []; @@ -4555,7 +5567,7 @@ let (let python=python25; in { inherit python; - setuptools = setuptools.meta.function {inherit python;}; + setuptools = setuptools.passthru.function {inherit python;}; }); numeric = import ../development/python-modules/numeric { @@ -4717,6 +5729,10 @@ let inherit fetchurl stdenv apacheHttpd python; }; + nginx = builderDefsPackage (import ../servers/http/nginx) { + inherit openssl pcre zlib libxml2 libxslt; + }; + postfix = import ../servers/mail/postfix { inherit fetchurl stdenv db4 openssl cyrus_sasl; glibc = stdenv.glibc; @@ -4812,6 +5828,10 @@ let xkeyboard_config dbus hal python e2fsprogs openssl gperf m4; }); + xorgReplacements = composedArgsAndFun (import ../servers/x11/xorg/replacements.nix) { + inherit fetchurl stdenv automake autoconf libtool xorg composedArgsAndFun; + }; + zabbixAgent = import ../servers/monitoring/zabbix { inherit fetchurl stdenv; enableServer = false; @@ -4860,7 +5880,7 @@ let inherit perl; }; - blcrCurrent = kernel : (blcr.meta.function { + blcrCurrent = kernel : (blcr.passthru.function { inherit kernel; }); @@ -4868,6 +5888,10 @@ let inherit fetchurl stdenv autoconf automake; }; + cryopid = import ../os-specific/linux/cryopid { + inherit fetchurl stdenv zlibStatic; + }; + cramfsswap = import ../os-specific/linux/cramfsswap { inherit fetchurl stdenv zlib; }; @@ -4898,6 +5922,10 @@ let inherit fetchurl stdenv gettext; }; + fbterm = builderDefsPackage (import ../os-specific/linux/fbterm) { + inherit fontconfig gpm freetype pkgconfig; + }; + fuse = import ../os-specific/linux/fuse { inherit fetchurl stdenv utillinux; }; @@ -4969,7 +5997,11 @@ let inherit fetchurl stdenv; }; - iwlwifi4965ucode = import ../os-specific/linux/firmware/iwlwifi-4965-ucode { + iwlwifi4965ucodeV1 = import ../os-specific/linux/firmware/iwlwifi-4965-ucode { + inherit fetchurl stdenv; + }; + + iwlwifi4965ucodeV2 = import ../os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix { inherit fetchurl stdenv; }; @@ -5258,6 +6290,27 @@ let [(getConfig ["kernel" "addConfig"] "")]; }; + kernel_2_6_27 = import ../os-specific/linux/kernel/linux-2.6.27.nix { + inherit fetchurl stdenv perl mktemp module_init_tools; + kernelPatches = [ + { name = "fbcondecor-0.9.4-2.6.27"; + patch = fetchurl { + url = http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.4-2.6.27.patch; + sha256 = "170l9l5fvbgjrr4klqcwbgjg4kwvrrhjpmgbfpqj0scq0s4q4vk6"; + }; + 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; }; + } + ]; + extraConfig = + lib.optional (getConfig ["kernel" "no_irqbalance"] false) "# CONFIG_IRQBALANCE is not set" ++ + [(getConfig ["kernel" "addConfig"] "")]; + }; + /* 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 @@ -5281,6 +6334,12 @@ let inherit fetchurl stdenv kernel; }; + iwlwifi4965ucode = + (if (builtins.compareVersions kernel.version "2.6.27" == 0) + || (builtins.compareVersions kernel.version "2.6.27" == 1) + then iwlwifi4965ucodeV2 + else iwlwifi4965ucodeV1); + atheros = composedArgsAndFun (selectVersion ../os-specific/linux/atheros "0.9.4") { inherit fetchurl stdenv builderDefs kernel lib; }; @@ -5303,7 +6362,7 @@ let inherit fetchurl stdenv perl bison mktemp kernel; }; - klibcShrunk = import ../os-specific/linux/klibc/shrunk.nix { + klibcShrunk = composedArgsAndFun (import ../os-specific/linux/klibc/shrunk.nix) { inherit stdenv klibc; }; @@ -5366,6 +6425,7 @@ let kernelPackages_2_6_23 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_23); kernelPackages_2_6_25 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_25); kernelPackages_2_6_26 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_26); + kernelPackages_2_6_27 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_27); # The current default kernel / kernel modules. kernelPackages = kernelPackages_2_6_25; @@ -5402,7 +6462,7 @@ let inherit fetchurl stdenv bison flex perl; }; - kvm = kvm74; + kvm = kvm76; kvm57 = import ../os-specific/linux/kvm/57.nix { inherit fetchurl zlib e2fsprogs SDL alsaLib; @@ -5410,7 +6470,7 @@ let kernelHeaders = kernelHeaders_2_6_23; }; - kvm74 = import ../os-specific/linux/kvm/74.nix { + kvm76 = import ../os-specific/linux/kvm/76.nix { inherit fetchurl stdenv zlib e2fsprogs SDL alsaLib pkgconfig rsync; kernelHeaders = kernelHeaders_2_6_26; }; @@ -5543,7 +6603,7 @@ let inherit fetchurl stdenv; }; - sdparm = composedArgsAndFun (selectVersion ../os-specific/linux/sdparm "1.02") { + sdparm = composedArgsAndFun (selectVersion ../os-specific/linux/sdparm "1.03") { inherit fetchurl stdenv builderDefs; }; @@ -5615,7 +6675,7 @@ let inherit fetchurl stdenv libusb; }; - utillinux = import ../os-specific/linux/util-linux { + utillinux = composedArgsAndFun (import ../os-specific/linux/util-linux) { inherit fetchurl stdenv; }; @@ -5644,6 +6704,12 @@ let inherit libtool gettext e2fsprogs; }; + xmoto = builderDefsPackage (import ../games/xmoto) { + inherit chipmunk sqlite curl zlib bzip2 libjpeg libpng + freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf + lua5 ode; + }; + xorg_sys_opengl = import ../os-specific/linux/opengl/xorg-sys { inherit stdenv xlibs expat libdrm; }; @@ -5866,7 +6932,8 @@ let }; bazaar = import ../applications/version-management/bazaar { - inherit fetchurl stdenv makeWrapper python; + inherit fetchurl stdenv makeWrapper; + python = pythonFull; }; bazaarTools = builderDefsPackage (import ../applications/version-management/bazaar/tools.nix) { @@ -5965,6 +7032,20 @@ let }; }; + cinelerra = import ../applications/video/cinelerra { + inherit fetchurl stdenv + automake autoconf libtool + a52dec alsaLib lame libavc1394 libiec61883 libraw1394 libsndfile + libvorbis libogg libjpeg libtiff freetype mjpegtools x264 + gettext X11 faad2 faac libtheora libpng libdv perl nasm e2fsprogs + pkgconfig; + openexr = openexr_1_6_1; + fftw = fftwSinglePrec; + inherit (xorg) libXxf86vm libXv; + inherit (bleedingEdgeRepos) sourceByName; + inherit (gnome) esound; + }; + compiz_050 = assert mesaSupported; import ../applications/window-managers/compiz/0.5.0.nix { inherit fetchurl stdenv pkgconfig libpng mesa; inherit (xorg) libXcomposite libXfixes libXdamage libXrandr @@ -5978,7 +7059,7 @@ let inherit librsvg fuse; }; - compiz_062 = compiz.meta.function { + compiz_062 = compiz.passthru.function { version = "0.6.2"; }; @@ -6000,15 +7081,15 @@ let inherit dbus dbus_glib; }; - compiz = compizBase.meta.function { + compiz = compizBase.passthru.function { extraConfigureFlags = getConfig ["compiz" "extraConfigureFlags"] []; }; compizFusion = assert mesaSupported; import ../applications/window-managers/compiz-fusion { - version = getConfig ["compizFusion" "version"] "0.7.4"; + version = getConfig ["compizFusion" "version"] "0.7.8"; inherit compiz; inherit stringsWithDeps lib builderDefs; - inherit fetchurl stdenv pkgconfig libpng mesa perl perlXMLParser libxslt; + inherit fetchurl stdenv pkgconfig libpng mesa perl perlXMLParser libxslt libxml2; inherit (xorg) libXcomposite libXfixes libXdamage libXrandr libXinerama libICE libSM libXrender xextproto; inherit (gnome) startupnotification libwnck GConf; @@ -6035,7 +7116,8 @@ let }; codeville = builderDefsPackage (selectVersion ../applications/version-management/codeville "0.8.0") { - inherit makeWrapper python; + inherit makeWrapper; + python = pythonFull; }; cua = import ../applications/editors/emacs-modes/cua { @@ -6060,7 +7142,7 @@ let }; darcs = import ../applications/version-management/darcs { - inherit fetchurl stdenv zlib ncurses curl; + inherit fetchurl stdenv zlib ncurses curl getConfig; ghc = ghc661; }; @@ -6092,18 +7174,30 @@ let inherit (xlibs) libX11 libXinerama; }; + dmtx = builderDefsPackage (import ../tools/graphics/dmtx) { + inherit libpng libtiff; + }; + dwm = import ../applications/window-managers/dwm { inherit fetchurl stdenv; inherit (xlibs) libX11 libXinerama; - }; + }; - # building eclipise from source - # experimental tested on x86_64-linux only - eclipse_classic_src = import ../applications/editors/eclipse/eclipse_classic.nix { - inherit fetchurl stdenv makeWrapper jdk unzip ant; + + # put something like this into your ~/.nixpkgs/config.nix file + #eclipse = { + # plugins = {eclipse, version, plugins } : let p = plugins; in + # [ p.pdt # PHP developement + # p.viPlugin # vim keybindings (see license) + # ]; + #}; + eclipseNew = (selectVersion ../applications/editors/eclipse-new "3.3.1.1" { + # outdated, but 3.3.1.1 does already compile on nix, feel free to work 3.4 + inherit fetchurl stdenv makeWrapper jdk unzip ant selectVersion buildEnv + getConfig lib zip writeTextFile runCommand; inherit (gtkLibs) gtk glib; inherit (xlibs) libXtst; - }; + }); eclipse = plugins: import ../applications/editors/eclipse { @@ -6191,11 +7285,17 @@ let inherit (gtkLibs) gtk; }; + fdupes = import ../tools/misc/fdupes { + inherit fetchurl stdenv; + }; + feh = import ../applications/graphics/feh { inherit fetchurl stdenv x11 imlib2 libjpeg libpng; }; - firefox = firefox2; + firefox = firefox3; + + firefoxWrapper = firefox3Wrapper; firefox2 = lowPrio (import ../applications/networking/browsers/firefox-2 { inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo; @@ -6205,14 +7305,15 @@ let #enableOfficialBranding = true; }); - firefoxWrapper = wrapFirefox firefox "firefox" ""; + firefox2Wrapper = wrapFirefox firefox2 "firefox" ""; firefox3 = lowPrio (import ../applications/networking/browsers/firefox-3 { - inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo - python dbus dbus_glib freetype fontconfig bzip2 xlibs; + inherit fetchurl stdenv pkgconfig perl zip libjpeg zlib cairo + python dbus dbus_glib freetype fontconfig bzip2; inherit (gtkLibs) gtk pango; inherit (gnome) libIDL; #enableOfficialBranding = true; + xulrunner = xulrunner3; }); xulrunner3 = lowPrio (import ../applications/networking/browsers/firefox-3/xulrunner.nix { @@ -6223,10 +7324,6 @@ let #enableOfficialBranding = true; }); - firefox3Xul = lowPrio ((symlinkJoin "firefox-3-with-xulrunner" [firefox3 xulrunner3]) // { - inherit (firefox) gtk; - }); - firefox3b1Bin = lowPrio (import ../applications/networking/browsers/firefox-3/binary.nix { inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo python curl coreutils freetype fontconfig; @@ -6235,7 +7332,7 @@ let inherit (xlibs) libXi libX11 libXrender libXft libXt; }); - firefox3Wrapper = lowPrio (wrapFirefox firefox3 "firefox" ""); + firefox3Wrapper = wrapFirefox firefox3 "firefox" ""; firefox3b1BinWrapper = lowPrio (wrapFirefox firefox3b1Bin "firefox" ""); flacAlts = import ../applications/audio/flac { @@ -6244,17 +7341,16 @@ let flac = getVersion "flac" flacAlts; - flashplayer = flashplayer9; - - flashplayer7 = import ../applications/networking/browsers/mozilla-plugins/flashplayer-7 { - inherit fetchurl stdenv zlib; - inherit (xlibs) libXmu; - }; + flashplayer = flashplayer10; flashplayer9 = import ../applications/networking/browsers/mozilla-plugins/flashplayer-9 { inherit fetchurl stdenv zlib alsaLib; }; + flashplayer10 = import ../applications/networking/browsers/mozilla-plugins/flashplayer-10 { + inherit fetchurl stdenv zlib alsaLib curl; + }; + flite = import ../applications/misc/flite { inherit fetchurl stdenv; }; @@ -6275,7 +7371,7 @@ let gimp = import ../applications/graphics/gimp { inherit fetchurl stdenv pkgconfig freetype fontconfig libtiff libjpeg libpng libexif zlib perl perlXMLParser - python pygtk gettext xlibs; + python pygtk gettext xlibs intltool babl gegl; inherit (gnome) gtk libgtkhtml libart_lgpl; }; @@ -6319,9 +7415,10 @@ let gnash = assert mesaSupported; import ../applications/video/gnash { inherit fetchurl stdenv SDL SDL_mixer libogg libxml2 libjpeg mesa libpng - boost freetype agg dbus curl pkgconfig x11 libtool lib; + boost freetype agg dbus curl pkgconfig x11 libtool lib libungif + gettext makeWrapper ming dejagnu python; inherit (gtkLibs) glib gtk; - GStreamer = gst_all.gstreamer; + inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg; }; gnunet = import ../applications/networking/p2p/gnunet { @@ -6341,6 +7438,14 @@ let libjpeg readline libtool; }; + qrdecode = builderDefsPackage (import ../tools/graphics/qrdecode) { + inherit libpng libcv; + }; + + qrencode = builderDefsPackage (import ../tools/graphics/qrencode) { + inherit libpng pkgconfig; + }; + gqview = import ../applications/graphics/gqview { inherit fetchurl stdenv pkgconfig libpng; inherit (gtkLibs) gtk; @@ -6515,11 +7620,12 @@ let }; mercurial = import ../applications/version-management/mercurial { - inherit fetchurl stdenv python makeWrapper; + inherit fetchurl stdenv python makeWrapper getConfig tk; + guiSupport = getConfig ["mercurial" "guiSupport"] false; # for hgk (gitk gui for hg) }; midori = builderDefsPackage (import ../applications/networking/browsers/midori) { - inherit imagemagick intltool python pkgconfig webkit libxml2 + inherit imagemagick intltool python pkgconfig webkit libxml2 which gettext makeWrapper file; inherit (gtkLibs) gtk glib; inherit (gnome) gtksourceview; @@ -6581,9 +7687,9 @@ let }; */ - MPlayerPlugin = browser: browserName: + MPlayerPlugin = browser: import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in { - inherit browser browserName; + inherit browser; inherit fetchurl stdenv pkgconfig gettext; inherit (xlibs) libXpm; # !!! should depend on MPlayer @@ -6597,6 +7703,11 @@ let }; */ + multisync = import ../applications/misc/multisync { + inherit fetchurl stdenv autoconf automake libtool pkgconfig; + inherit (gnome) gtk glib ORBit2 libbonobo libgnomeui GConf; + }; + mutt = import ../applications/networking/mailreaders/mutt { inherit fetchurl stdenv ncurses which openssl gdbm; }; @@ -6635,8 +7746,9 @@ let perl perlArchiveZip perlCompressZlib zlib libjpeg expat pkgconfig freetype fontconfig libwpd libxml2 db4 sablotron curl libsndfile flex zip unzip libmspack - getopt file neon cairo which icu boost jdk ant hsqldb + getopt file neon cairo which icu jdk ant hsqldb cups openssl bison; + boost = boostVersionChoice "1.36.0"; inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama; inherit (gtkLibs) gtk; }; @@ -6784,7 +7896,7 @@ let inherit (gtkLibs) gtk glib; }; - snd = sndBase.meta.function { + snd = sndBase.passthru.function { inherit guile mesa libtool jackaudio alsaLib; }; @@ -6813,7 +7925,7 @@ let inherit clisp texinfo; }; - subversion = subversion14; + subversion = subversion15; subversion14 = makeOverridable (import ../applications/version-management/subversion-1.4.x) { inherit fetchurl stdenv apr aprutil expat swig zlib jdk; @@ -6842,6 +7954,31 @@ let httpd = apacheHttpd; }; + subversionStatic = lowPrio (appendToName "static" (import ../applications/version-management/subversion-1.5.x { + inherit fetchurl stdenv apr aprutil expat swig jdk; + neon = import ../development/libraries/neon/0.28.nix { + inherit fetchurl stdenv libxml2 zlib openssl; + compressionSupport = true; + sslSupport = true; + static = true; + shared = false; + }; + zlib = import ../development/libraries/zlib { + inherit fetchurl stdenv; + static = true; + }; + bdbSupport = true; + httpServer = false; + httpSupport = true; + sslSupport = true; + pythonBindings = false; + perlBindings = false; + javahlBindings = false; + compressionSupport = true; + httpd = null; + static = true; + })); + svk = perlSVK; sylpheed = import ../applications/networking/mailreaders/sylpheed { @@ -7004,7 +8141,7 @@ let ++ lib.optional (enableAdobeFlash) flashplayer # RealPlayer is disabled by default for legal reasons. ++ lib.optional (system != "i686-linux" && getConfig [browserName "enableRealPlayer"] false) RealPlayer - ++ lib.optional (getConfig [browserName "enableMPlayer"] true) (MPlayerPlugin browser browserName) + ++ lib.optional (getConfig [browserName "enableMPlayer"] true) (MPlayerPlugin browser) ++ lib.optional (supportsJDK && getConfig [browserName "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin ); }; @@ -7042,7 +8179,7 @@ let }; /* Doesn't work yet - + xen = builderDefsPackage (import ../applications/virtualization/xen) { inherit python e2fsprogs gnutls pkgconfig libjpeg ncurses SDL libvncserver zlib; @@ -7085,7 +8222,7 @@ let xneur = import ../applications/misc/xneur { inherit fetchurl stdenv pkgconfig pcre libxml2 aspell; GStreamer=gst_all.gstreamer; - inherit (xlibs) libX11; + inherit (xlibs) libX11 libXpm; inherit (gtkLibs) glib; }; @@ -7106,7 +8243,7 @@ let inherit (xlibs) libX11 libXmu; }; - xscreensaver = xscreensaverBase.meta.function { + xscreensaver = xscreensaverBase.passthru.function { flags = ["GL" "gdkpixbuf" "DPMS" "gui" "jpeg"]; inherit mesa libxml2 libjpeg; inherit (gtkLibs) gtk; @@ -7194,7 +8331,7 @@ let inherit (xlibs) libX11 xproto; }; - construo = construoBase.meta.function { + construo = construoBase.passthru.function { inherit mesa freeglut; }; @@ -7274,6 +8411,11 @@ let inherit (xlibs) libXt libX11 libXmu libXi libXext; }; + superTuxKart = import ../games/super-tux-kart { + inherit fetchurl stdenv plib SDL openal freealut mesa + libvorbis libogg gettext; + }; + /*tpm = import ../games/thePenguinMachine { inherit stdenv fetchurl pil pygame SDL; python24 = python; @@ -7303,7 +8445,8 @@ let perl perlXMLParser docbook_xml_dtd_42 docbook_xml_dtd_412 gettext x11 libtiff libjpeg libpng gtkLibs xlibs bzip2 libcm python dbus_glib ncurses which libxml2Python - iconnamingutils openssl hal samba fam libgcrypt libtasn1; + iconnamingutils openssl hal samba fam libgcrypt libtasn1 + xmlto docbook2x docbook_xsl intltool; }); kdelibs = import ../desktops/kde/kdelibs { @@ -7357,7 +8500,7 @@ let arb = import ../applications/science/biology/arb { inherit fetchurl stdenv readline libpng zlib x11 lesstif93 freeglut perl; inherit (xlibs) libXpm libXaw libX11 libXext libXt; - inherit mesa glew libtiff lynx rxp sablotron jdk xfig transfig gv gnuplot; + inherit mesa glew libtiff lynx rxp sablotron jdk transfig gv gnuplot; lesstif = lesstif93; }; @@ -7449,7 +8592,7 @@ let }; cups = import ../misc/cups { - inherit fetchurl stdenv zlib libjpeg libpng libtiff pam; + inherit fetchurl stdenv zlib libjpeg libpng libtiff pam openssl; }; dblatex = import ../misc/tex/dblatex { @@ -7536,14 +8679,6 @@ let db4 = db45; }; - /* - nixStatic = import ../tools/package-management/nix-static { - inherit fetchurl stdenv perl curl autoconf automake libtool; - aterm = aterm242fixes; - bdb = db4; - }; - */ - # The bleeding edge. nixUnstable = import ../tools/package-management/nix/unstable.nix { inherit fetchurl stdenv perl curl bzip2 openssl; @@ -7585,7 +8720,15 @@ let wxGTK = wxGTK28; }; - pgf = import ../misc/tex/pgf { + pgf = pgf2; + + # Keep the old PGF since some documents don't render properly with + # the new one. + pgf1 = import ../misc/tex/pgf/1.x.nix { + inherit fetchurl stdenv; + }; + + pgf2 = import ../misc/tex/pgf/2.x.nix { inherit fetchurl stdenv; }; @@ -7729,6 +8872,9 @@ let inherit (xlibs) libX11; }; - myEnvFun = import ../misc/my_env; + myEnvFun = import ../misc/my-env { + inherit substituteAll pkgs; + inherit (stdenv) mkDerivation; + }; }; in pkgs diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix index e9c6e4bebaf..7d99450e6b9 100644 --- a/pkgs/top-level/build-for-release.nix +++ b/pkgs/top-level/build-for-release.nix @@ -6,19 +6,22 @@ let commonLinuxPkgs = system: let pkgs = allPackages {inherit system;}; in { inherit (pkgs) MPlayer - MPlayerPlugin + abcde alsaUtils apacheHttpd aspell aspellDicts + at audacious audacious_plugins autoconf automake19x + avahi bash bashInteractive binutils bison23 + bison24 bitlbee bittorrent bsdiff @@ -64,7 +67,8 @@ let ghc ghostscript gimp - gnash + git + /*gnash*/ gnugrep gnum4 gnumake @@ -72,17 +76,22 @@ let gnused gnutar gnutls + gphoto2 guile gqview graphviz grub + gv gzip hal hello + host iana_etc + imagemagick inkscape iputils irssi + jnettop jwhois kbd kcachegrind @@ -90,6 +99,7 @@ let ktorrent kvm less + lftp lhs2tex libtool libxml2 @@ -128,6 +138,7 @@ let pciutils perl php + pinentry pkgconfig postgresql procps @@ -152,13 +163,16 @@ let subversion14 subversion15 sudo + superTuxKart swig sylpheed sysklogd sysvinit sysvtools + tcpdump #tetex texLive + texLiveBeamer texLiveExtra texinfo thunderbird @@ -172,6 +186,7 @@ let vim vlc vorbisTools + vpnc w3m wget wirelesstools @@ -238,6 +253,13 @@ let inherit (pkgs.kernelPackages_2_6_26) kernel klibc +# splashutils + ; + }; + kernelPackages_2_6_27 = pkgs.recurseIntoAttrs { + inherit (pkgs.kernelPackages_2_6_27) + kernel + klibc # splashutils ; }; @@ -270,6 +292,7 @@ let strategoxt strategoxtUtils syslinux + tinycc uml wine xorg_sys_opengl @@ -330,11 +353,13 @@ let inherit (allPackages {system = "i686-darwin";}) aterm autoconf - automake19x automake110x + automake19x + ghc libtool libxml2 libxslt + nixUnstable subversion ; }; diff --git a/pkgs/top-level/builder-defs.nix b/pkgs/top-level/builder-defs.nix index ea6914eddcb..367f018a194 100644 --- a/pkgs/top-level/builder-defs.nix +++ b/pkgs/top-level/builder-defs.nix @@ -228,6 +228,11 @@ args: with args; with stringsWithDeps; with lib; ${configureCommand} --prefix=\"\$prefix\" ${toString configureFlags} ") ["minInit" "addInputs" "doUnpack"]; + doIntltool = FullDepEntry (" + mkdir -p config + intltoolize --copy --force + ") ["minInit" "addInputs" "doUnpack"]; + doAutotools = FullDepEntry (" mkdir -p config libtoolize --copy --force @@ -376,69 +381,6 @@ args: with args; with stringsWithDeps; with lib; surroundWithCommands = x : before : after : {deps=x.deps; text = before + "\n" + x.text + "\n" + after ;}; - - # some haskell stuff - untested! - # -------------------------------------------------------- - # creates a setup hook - # adding the package database - # nix-support/package.conf to GHC_PACKAGE_PATH - # if not already contained - # using nix-support because user does'nt want to have it in it's - # nix-profile I think? - defSetupHookRegisteringPackageDatabase = noDepEntry ( - "\nsetupHookRegisteringPackageDatabase(){" + - "\n ensureDir $out/nix-support;" + - "\n if test -n \"$1\"; then" + - "\n local pkgdb=$1" + - "\n else" + - "\n local pkgdb=$out/nix-support/package.conf" + - "\n fi" + - "\n cat >> $out/nix-support/setup-hook << EOF" + - "\n " + - "\n echo \$GHC_PACKAGE_PATH | grep -l $pkgdb &> /dev/null || \" "+ - "\n export GHC_PACKAGE_PATH=\$GHC_PACKAGE_PATH\${GHC_PACKAGE_PATH:+\"\${PATH_DELIMITER}\"}$pkgdb;" + - "\nEOF" + - "\n}"); - - # Either rungghc or compile setup.hs - # / which one is better ? runghc had some trouble with ghc-6.6.1 - defCabalSetupCmd = noDepEntry " - CABAL_SETUP=\"runghc setup.hs\" - "; - - # create an empty package database in which the new library can be registered. - defCreateEmptyPackageDatabaseAndSetupHook = FullDepEntry " - createEmptyPackageDatabaseAndSetupHook(){ - ensureDir $out/nix-support; - PACKAGE_DB=$out/nix-support/package.conf; - echo '[]' > \"$PACKAGE_DB\"; - setupHookRegisteringPackageDatabase - }" ["defSetupHookRegisteringPackageDatabase" "defEnsureDir"]; - - # Cabal does only support --user ($HOME/.ghc/** ) and --global (/nix/store/*-ghc/lib/...) - # But we need kind of --custom=my-package-db - # by accident cabal does support using multiple databases passed by GHC_PACKAGE_PATH - # - # Options: - # 1) create a local package db containing all dependencies - # 2) create a single db file for each package merging them using GHC_PACKAGE_PATH=db1:db2 - # (no trailing : which would mean add global and user db) - # I prefer 2) (Marc Weber) so the most convinient way is - # using ./setup copy to install - # and ./setup register --gen-script to install to our local database - # after replacing /usr/lib etc with our pure $out path - cabalBuild = FullDepEntry - " createEmptyPackageDatabaseAndSetupHook - ghc --make setup.hs -o setup - \$CABAL_SETUP configure - \$CABAL_SETUP build - \$CABAL_SETUP copy --dest-dir=\$out - \$CABAL_SETUP register --gen-script - sed -e 's=/usr/local/lib=\$out=g' \\ - -i register.sh - GHC_PACKAGE_PATH=\$PACKAGE_DB ./register.sh - " ["defCreateEmptyPackageDatabaseAndSetupHook" "defCabalSetupCmd"]; - realPhaseNames = args.phaseNames ++ ["doForceShare" "doPropagate" "doForceCopy"] ++ @@ -462,7 +404,7 @@ args: with args; with stringsWithDeps; with lib; builderDefsArgs = args; innerBuilderDefsPackage = bd: args: ( - let localDefs = bd.meta.function args; in + let localDefs = bd.passthru.function args; in stdenv.mkDerivation ((rec { inherit (localDefs) name; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix new file mode 100644 index 00000000000..9436457a09b --- /dev/null +++ b/pkgs/top-level/release.nix @@ -0,0 +1,103 @@ +let + + allPackages = import ./all-packages.nix; + + test = f: {system}: f (allPackages {inherit system;}); + + + jobs = { + + + tarball = + { nixpkgs ? {path = (allPackages {}).lib.cleanSource ../..; rev = 1234;} + , officialRelease ? false + }: + + with import nixpkgs.path {}; + + releaseTools.makeSourceTarball { + name = "nixpkgs-tarball"; + src = nixpkgs; + inherit officialRelease; + + buildInputs = [ + lzma + libxml2 # Needed for the release notes. + libxslt + w3m + nixUnstable # Needed to check whether the expressions are valid. + ]; + + configurePhase = '' + eval "$preConfigure" + releaseName=nixpkgs-$(cat $src/VERSION)$VERSION_SUFFIX + echo "release name is $releaseName" + echo $releaseName > relname + ''; + + dontBuild = false; + + buildPhase = '' + echo "building docs..." + (cd doc && make docbookxsl=${docbook5_xsl}/xml/xsl/docbook) || false + ln -s doc/NEWS.txt NEWS + ''; + + doCheck = true; + + checkPhase = '' + # Check that we can fully evaluate build-for-release.nix. + header "checking pkgs/top-level/build-for-release.nix" + nix-env --readonly-mode -f pkgs/top-level/build-for-release.nix \ + -qa \* --drv-path --system-filter \* --system + stopNest + + # Check that all-packages.nix evaluates on a number of platforms. + for platform in i686-linux x86_64-linux powerpc-linux i686-freebsd powerpc-darwin i686-darwin; do + header "checking pkgs/top-level/all-packages.nix on $platform" + nix-env --readonly-mode -f pkgs/top-level/all-packages.nix \ + --argstr system "$platform" \ + -qa \* --drv-path --system-filter \* --system + stopNest + done + ''; + + distPhase = '' + ensureDir $out/tarballs + mkdir ../$releaseName + cp -prd . ../$releaseName + (cd .. && tar cfa $out/tarballs/$releaseName.tar.bz2 $releaseName) || false + (cd .. && tar cfa $out/tarballs/$releaseName.tar.lzma $releaseName) || false + + ensureDir $out/release-notes + cp doc/NEWS.html $out/release-notes/index.html + cp doc/style.css $out/release-notes/ + echo "doc release-notes $out/release-notes" >> $out/nix-support/hydra-build-products + + ensureDir $out/manual + cp doc/manual.html $out/manual/index.html + cp doc/style.css $out/manual/ + echo "doc manual $out/manual" >> $out/nix-support/hydra-build-products + ''; + }; + + + # All the top-level packages that want to build in the build farm. + # !!! notation is kinda clumsy + + MPlayer = test (pkgs: pkgs.MPlayer); + autoconf = test (pkgs: pkgs.autoconf); + bash = test (pkgs: pkgs.bash); + firefox3 = test (pkgs: pkgs.firefox3); + gcc = test (pkgs: pkgs.gcc); + hello = test (pkgs: pkgs.hello); + libtool = test (pkgs: pkgs.libtool); + pan = test (pkgs: pkgs.pan); + perl = test (pkgs: pkgs.perl); + python = test (pkgs: pkgs.python); + thunderbird = test (pkgs: pkgs.thunderbird); + wine = test (pkgs: pkgs.wine); + + }; + +in jobs diff --git a/pkgs/top-level/template-composing-builder.nix b/pkgs/top-level/template-composing-builder.nix index f29eef10537..0efb347d821 100644 --- a/pkgs/top-level/template-composing-builder.nix +++ b/pkgs/top-level/template-composing-builder.nix @@ -1,10 +1,9 @@ -args : +a : let - lib = args.lib; - fetchurl = args.fetchurl; + fetchurl = a.fetchurl; - version = lib.getAttr ["version"] "" args; - buildInputs = with args; [ + version = a.lib.getAttr ["version"] "" a; + buildInputs = with a; [ ]; in @@ -14,8 +13,8 @@ rec { inherit buildInputs; configureFlags = []; - /* doConfigure should be specified separately */ - phaseNames = ["doMakeInstall"]; + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "doMakeInstall"]; name = "${abort "Specify name"}-" + version; meta = {