Merging from trunk.

I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages. Also a small conflict in all-packages about making openssl overridable. And I some linux 2.6.31-zen kernel files also marked in conflict. svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
2010-01-14 14:49:31 +00:00 · 2010-01-14 14:49:31 +00:00 · 9183f21f7e
commit 9183f21f7e
parent c161cd1773 c63858a169
167 changed files with 3562 additions and 1240 deletions
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@ -11,7 +11,7 @@ Linux kernel or X.org.</para>

 <!--============================================================-->

-<section>
+<section xml:id="sec-linux-kernel">

 <title>Linux kernel</title>

@ -181,7 +181,7 @@ generator.</para>

 <screen>
 $ cd pkgs/servers/x11/xorg
-$ cat tarballs-7.4.list extra.list old.list \
+$ cat tarballs-7.5.list extra.list old.list \
  | perl ./generate-expr-from-tarballs.pl
 </screen>

@ -195,7 +195,7 @@ tarballs between runs.  Pay close attention to the <literal>NOT FOUND:
 run, since they may indicate missing dependencies.  (Some might be
 optional dependencies, however.)</para>

-<para>A file like <filename>tarballs-7.4.list</filename> contains all
+<para>A file like <filename>tarballs-7.5.list</filename> contains all
 tarballs in a X.org release.  It can be generated like this:

 <screen>
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@ -4,11 +4,11 @@
 }:

 stdenv.mkDerivation rec {
-  name = "gimp-2.6.7";
+  name = "gimp-2.6.8";
  
  src = fetchurl {
    url = "ftp://ftp.gtk.org/pub/gimp/v2.6/${name}.tar.bz2";
-    sha256 = "05g1dwxf0ydaadc8nv85akr9n240frh3f2sdrc9j90cywpxwa0d4";
+    sha256 = "0cikkb4l6psankz9yhgal934b41nwk6d5a93r9zib413fj5j3m6m";
  };
  
  buildInputs = [
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@ -0,0 +1,46 @@
+{stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng,
+imagemagick, libjpeg, fontconfig, podofo, qt4, mechanize, lxml, dateutil,
+pil, makeWrapper, unrar}:
+
+stdenv.mkDerivation rec {
+  name = "calibre-0.6.32";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/calibre/${name}.tar.gz";
+    sha256 = "0r646k5yig9y139jpajsr5scwsqjbgyq94klj7f2b8wjw79qpsmz";
+  };
+
+  inherit python;
+
+  buildInputs = [ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick
+    libjpeg fontconfig podofo qt4 mechanize lxml dateutil pil makeWrapper ];
+
+  installPhase = ''
+    export POPPLER_INC_DIR=${popplerQt4}/include/poppler
+    export POPPLER_LIB_DIR=${popplerQt4}/lib
+    export MAGICK_INC=${imagemagick}/include/ImageMagick
+    export MAGICK_LIB=${imagemagick}/lib
+    export FC_INC_DIR=${fontconfig}/include/fontconfig
+    export FC_LIB_DIR=${fontconfig}/lib
+    export PODOFO_INC_DIR=${podofo}/include/podofo
+    export PODOFO_LIB_DIR=${podofo}/lib
+    python setup.py install --prefix=$out
+
+    PYFILES="$out/bin/* $out/lib/calibre/calibre/web/feeds/*.py
+      $out/lib/calibre/calibre/ebooks/metadata/*.py
+      $out/lib/calibre/calibre/ebooks/rtf2xml/*.py"
+
+    sed -i "s/env python/python/" $PYFILES
+    for a in $out/bin/*; do
+      wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH --prefix LD_LIBRARY_PATH : ${unrar}/lib
+    done
+  '';
+
+  meta = { 
+    description = "Comprehensive e-book software";
+    homepage = http://calibre-ebook.com;
+    license = "GPLv3";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
--- a/pkgs/applications/misc/gv/default.nix
+++ b/pkgs/applications/misc/gv/default.nix
@ -1,18 +1,18 @@
 { stdenv, fetchurl, Xaw3d, ghostscriptX }:

 stdenv.mkDerivation rec {
-  name = "gv-3.6.7";
+  name = "gv-3.6.8";

  src = fetchurl {
    url = "mirror://gnu/gv/${name}.tar.gz";
-    sha256 = "1cdkkxamsicpk0jdbrkjpxhcsrx0b82kqgrc4j407q2gc3qs8wgf";
+    sha256 = "1i86a4wfswp908gp4i0f6jbksn8bqqzkfy58r9ishspzkp2fb510";
  };

  buildInputs = [ Xaw3d ghostscriptX ];
-  
+
  patchPhase = ''
-    sed 's|\<gs\>|${ghostscriptX}/bin/gs|g' -i src/*.in
-    sed 's|"gs"|"${ghostscriptX}/bin/gs"|g' -i src/*.c
+    sed 's|\<gs\>|${ghostscriptX}/bin/gs|g' -i "src/"*.in
+    sed 's|"gs"|"${ghostscriptX}/bin/gs"|g' -i "src/"*.c
  '';

  doCheck = true;
@ -28,5 +28,7 @@ stdenv.mkDerivation rec {
    '';

    license = "GPLv3+";
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
  };
 }
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@ -20,23 +20,26 @@
 , unzip
 , expat
 , zlib
+, libjpeg
+, bzip2
+, libpng
 }:

 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;

 stdenv.mkDerivation rec {
  name = "chrome-${version}";
-  version = "32599";
+  version = "35449";
  src = 
    if stdenv.system == "x86_64-linux" then 
      fetchurl {
        url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/${version}/chrome-linux.zip";
-        sha256 = "1wz24hrnnjggsjxsaa4spqg73p1f7bv4a8l2ys3kbkdp709fl6v8";
+        sha256 = "0fdm1hs67vcr68r290ami3zlyypcvd88rm059622qyadqz49yvcj";
      } 
    else if stdenv.system == "i686-linux" then 
      fetchurl {
        url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip";
-        sha256 = "16w6d7kp34jr1c4ym6y2h6llkq3d65rybj5hs46w1b8qri60q6aa";
+        sha256 = "1indm0s87yz9zsg4archsywvp4yd0ff83azkjbwszj0snggk16pg";
      } 
    else null;

@ -46,7 +49,7 @@ stdenv.mkDerivation rec {

  libPath = 
    stdenv.lib.makeLibraryPath
-       [ stdenv.glibc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk libXt expat zlib] ;
+       [ stdenv.glibc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk libXt expat zlib libjpeg bzip2 libpng] ;

  installPhase = ''
    ensureDir $out/bin
--- a/pkgs/applications/networking/browsers/firefox/3.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/3.0.nix
@ -11,14 +11,14 @@

 rec {

-  firefoxVersion = "3.0.15";
+  firefoxVersion = "3.0.17";
  
-  xulVersion = "1.9.0.15"; # this attribute is used by other packages
+  xulVersion = "1.9.0.17"; # this attribute is used by other packages

  
  src = fetchurl {
    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}-source.tar.bz2";
-    sha1 = "06d488f0aee8f9e60dc6526c1d292f3708da301f";
+    sha1 = "e4bb7daae1699f3493936ca6739512d28c7f150f";
  };


--- a/pkgs/applications/networking/browsers/firefox/3.5.nix
+++ b/pkgs/applications/networking/browsers/firefox/3.5.nix
@ -12,14 +12,14 @@

 rec {

-  firefoxVersion = "3.5.6";
+  firefoxVersion = "3.5.7";
  
-  xulVersion = "1.9.1.6"; # this attribute is used by other packages
+  xulVersion = "1.9.1.7"; # this attribute is used by other packages

  
  src = fetchurl {
    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha1 = "fc1de4ddb9c20c7ba9e297737f926e9d8e32eed4";
+    sha1 = "7605d89b3d3e458db74dea4d227dd86d0d12ba1b";
  };


--- a/pkgs/applications/networking/browsers/icecat-3/default.nix
+++ b/pkgs/applications/networking/browsers/icecat-3/default.nix
@ -4,13 +4,13 @@
 , freetype, fontconfig
 , application ? "browser" }:

-let version = "3.5.6"; in
+let version = "3.5.7"; in
 stdenv.mkDerivation {
  name = "icecat-${version}";

  src = fetchurl {
    url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.bz2";
-    sha256 = "10lacri0imag90ib1lg4caxljzsfzryysygx22ja3akfwjlkrk8c";
+    sha256 = "0pz48rz9rpig3xdvs6jkjc4azhwxabn81bz7c0alkfkdzjmcl8ym";
  };

  buildInputs = [
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
@ -16,24 +16,47 @@
 , glib
 , pango
 , atk
+, debug ? false
+
+/* you have to add ~/mm.cfg :
+
+    TraceOutputFileEnable=1
+    ErrorReportingEnable=1
+    MaxWarnings=1
+
+  in order to read the flash trace at ~/.macromedia/Flash_Player/Logs/flashlog.txt
+  Then FlashBug (a FireFox plugin) shows the log as well
+*/
+
 }:

-stdenv.mkDerivation {
+stdenv.mkDerivation ({
  name = "flashplayer-10.0.32.18";

  builder = ./builder.sh;
  
  src =
    if stdenv.system == "x86_64-linux" then
-      fetchurl {
-        url = http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-10.0.32.18.linux-x86_64.so.tar.gz;
-        sha256 = "006k3jvahlq2v34q5mf2y7ghczhy6spsdd69fj120i9yz9zklhpw";
-      }
+      fetchurl (
+        if debug then
+          # no plans to provide a x86_64 version:
+          # http://labs.adobe.com/technologies/flashplayer10/faq.html
+          throw "no x86_64 debugging version available"
+        else {
+          # -> http://labs.adobe.com/downloads/flashplayer10_64bit.html
+          url = http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-10.0.32.18.linux-x86_64.so.tar.gz;
+          sha256 = "006k3jvahlq2v34q5mf2y7ghczhy6spsdd69fj120i9yz9zklhpw";
+        }
+      )
    else
-      fetchurl {
+      fetchurl ( if debug then {
+        # The debug version also contains a player
+        url = http://download.macromedia.com/pub/flashplayer/updaters/10/flash_player_10_linux_dev.tar.gz;
+        sha256 = "0j3i4sbry9xdln23892hbkfbznqg2wzrakpfv4g5g6y7r2nchkfj";
+      } else {
        url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz;
-        sha256 = "1nnswpivn8ymbvqywdw39xf26mn2i65hyqw8lcl77qsv7kbsbbl8";
-      };
+        sha256 = "04ppx812dz4d93pkyx412z3jslkw8nsqw5gni467ipahqz6lifhi";
+      });

  inherit zlib alsaLib;

@ -47,4 +70,9 @@ stdenv.mkDerivation {
    description = "Adobe Flash Player browser plugin";
    homepage = http://www.adobe.com/products/flashplayer/;
  };
-}
+} // (if debug then {
+    buildPhase = ''
+      pwd;ls -l .
+      tar xfz plugin/debugger/libflashplayer.so.tar.gz
+    '';
+  } else {} ) )
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@ -1,11 +1,11 @@
 { fetchurl, stdenv, gnutls, glib, pkgconfig }:

 stdenv.mkDerivation rec {
-  name = "bitlbee-1.2.3";
+  name = "bitlbee-1.2.4";

  src = fetchurl {
    url = "mirror://bitlbee/src/" + name + ".tar.gz";
-    sha256 = "1qj5cx0lqhg6dy2gdjb05ap963r84rv1b96iz23c97c2ihc31fqc";
+    sha256 = "1lwcjh1r81xqf6fxjwd2a2hv8dq9g0iyc8dnbr1pgas4vmjg9xf2";
  };

  buildInputs = [ gnutls glib pkgconfig ];
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@ -14,17 +14,17 @@
  GStreamer, gstPluginsBase, startupnotification, gettext,
  perl, perlXMLParser, libxml2, nss, nspr, farsight2,
  libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn
-  , lib
+  , lib, python
  , openssl ? null
  , gnutls ? null
  , voice ? null
 } :

 stdenv.mkDerivation {
-  name = "pidgin-2.6.4";
+  name = "pidgin-2.6.5";
  src = fetchurl {
-    url = mirror://sourceforge/pidgin/pidgin-2.6.4.tar.bz2;
-    sha256 = "04dyr2g45i3wr67zsn04pjl6vyvic8dchb73pajf823pa377m47s";
+    url = mirror://sourceforge/pidgin/pidgin-2.6.5.tar.bz2;
+    sha256 = "03ix5w1dr1hl98qh1jmp5dgv2i8f9bd39sim3rcpk9pwjd09wi9w";
  };

  inherit nss ncurses;
@ -36,7 +36,7 @@ stdenv.mkDerivation {
  ++ (lib.optional (gnutls != null) gnutls)
  ++
  [nss nspr farsight2
-    libXScrnSaver ncurses
+    libXScrnSaver ncurses python
    avahi dbus dbus_glib intltool libidn
  ]
  ;
--- a/pkgs/applications/networking/mailreaders/thunderbird-3.x/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-3.x/default.nix
@ -1,105 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
-, libjpeg, zlib, cairo, dbus, dbus_glib, bzip2
-, freetype, fontconfig, xulrunner
-, autoconf , libpng , alsaLib, sqlite, patchelf
-
-, # If you want the resulting program to call itself "Thunderbird"
-  # instead of "Mail", enable this option.  However, those
-  # binaries may not be distributed without permission from the
-  # Mozilla Foundation, see
-  # http://www.mozilla.org/foundation/trademarks/.
-  enableOfficialBranding ? false
-    
-}:
-
-stdenv.mkDerivation {
-  name = "thunderbird-3.0beta2";
-
-  src = fetchurl {
-    url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/3.0b2/source/thunderbird-3.0b2-source.tar.bz2";
-    sha256 = "17mlp0x6sf1v9w8vraln7mr566gvk84rxvxiwzhbdj2p0475zjqr";
-  };
-
-  buildInputs = [
-    pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2
-    python dbus dbus_glib pango freetype fontconfig autoconf
-    libpng alsaLib sqlite patchelf
-  ];
-
-  propagatedBuildInputs = [xulrunner];
-
-  preUnpack = "mkdir thunderbird; cd thunderbird;";
-  setSourceRoot = "export sourceRoot=.;";
-  preConfigure = ''
-    for i in $(find . -name configure.in); do echo $i; (cd $(dirname $i); autoconf || true; ); done;
-    XUL_SDK=$(echo ${xulrunner}/lib/xulrunner-devel-*/)
-    export NIX_CFLAGS_COMPILE="''${NIX_CFLAGS_COMPILE} -I$XUL_SDK/include";
-    export NIX_CFLAGS_COMPILE="''${NIX_CFLAGS_COMPILE} -I$(echo ${xulrunner}/include/xulrunner-*/stable)";
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE";
-    export NIX_LDFLAGS="''${NIX_LDFLAGS} -L$XUL_SDK/lib -L$XUL_SDK/sdk/lib";
-    export NIX_LDFLAGS="$NIX_LDFLAGS -L${xulrunner}/lib/xulrunner-${xulrunner.version}";
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lxpcomglue -lxpcomglue_s -lxul -lnss -lmozjs -lsqlite3";
-    echo NIX_CFLAGS_COMPILE: $NIX_CFLAGS_COMPILE
-    echo NIX_LDFLAGS: $NIX_LDFLAGS
-    for i in $(find $(pwd) -wholename '*/public/*.idl' -exec dirname '{}' ';' | sort | uniq); do
-      export XPIDL_FLAGS="$XPIDL_FLAGS -I$i";
-    done;
-    echo $XPIDL_FLAGS
-
-    sed -e "s@\$(XPIDL_FLAGS)@\$(XPIDL_FLAGS) $XPIDL_FLAGS@" -i config/rules.mk
-  '';
-  postConfigure = ''
-    (cd mozilla/nsprpub; ./configure --prefix=$out/XUL_SDK; )
-  '';
-  preBuild = ''
-    for i in $(find . -name autoconf.mk); do echo $i; sed -e 's@-Wl,-rpath-link,$(PREFIX)/lib@@' -i $i; done
-    make -C mozilla/config nsinstall
-    mkdir -p $out/libexec/mozilla/nsinstall
-    mv mozilla/config/nsinstall $out/libexec/mozilla/nsinstall/nsinstall
-    cat > mozilla/config/nsinstall <<EOF
-    #! /bin/sh
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${sqlite}/lib:${xulrunner}/lib/xulrunner-${xulrunner.version}"
-    $out/libexec/mozilla/nsinstall/nsinstall "\$@"
-    EOF
-    chmod a+x mozilla/config/nsinstall
-  '';
-
-  configureFlags = [
-    "--enable-application=mail"
-    "--enable-optimize"
-    "--disable-debug"
-    "--with-system-jpeg"
-    "--with-system-zlib"
-    "--with-system-bz2"
-    #"--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
-    "--enable-system-cairo"
-    #"--enable-system-sqlite" # <-- this seems to be discouraged
-    "--disable-crashreporter"
-    "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
-    "--enable-extensions=default"
-  ]
-  ++ (if enableOfficialBranding then ["--enable-official-branding"] else []);
-
-  postInstall = ''
-    # Strip some more stuff.
-    strip -S $out/lib/*/* || true
-
-    libDir=$(cd $out/lib && ls -d thunderbird-[0-9]*)
-    test -n "$libDir"
-    
-    ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $out/lib/$libDir/xulrunner
-
-    # Register extensions etc. !!! is this needed anymore?
-    echo "running thunderbird -register..."
-    $out/bin/thunderbird -register
-  ''; # */
-
-  meta = {
-    description = "Mozilla Thunderbird, a full-featured email client";
-    homepage = http://www.mozilla.com/en-US/thunderbird/;
-  };
-
-  passthru = {
-    inherit gtk;
-  };
-}
--- a/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix
--- a/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
@ -0,0 +1,65 @@
+{ stdenv, fetchurl, pkgconfig, gtk, perl, python, zip, libIDL
+, dbus_glib, bzip2, alsaLib, nspr
+
+, # If you want the resulting program to call itself "Thunderbird"
+  # instead of "Shredder", enable this option.  However, those
+  # binaries may not be distributed without permission from the
+  # Mozilla Foundation, see
+  # http://www.mozilla.org/foundation/trademarks/.
+  enableOfficialBranding ? false
+    
+}:
+
+let version = "3.0"; in
+
+stdenv.mkDerivation {
+  name = "thunderbird-${version}";
+
+  src = fetchurl {
+    url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
+    sha1 = "7a8a08f011901b4c0b737de2d7a226242935543d";
+  };
+
+  buildInputs =
+    [ pkgconfig perl python zip bzip2 gtk dbus_glib alsaLib libIDL nspr ];
+
+  configureFlags =
+    [ "--enable-application=mail"
+      "--enable-optimize"
+      "--disable-debug"
+      "--enable-strip"
+      "--with-system-jpeg"
+      "--with-system-zlib"
+      "--with-system-bz2"
+      "--with-system-nspr"
+      "--enable-system-cairo"
+      "--disable-crashreporter"
+      "--disable-tests"
+      "--enable-static" # required by `make install'
+    ]
+    ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
+
+  # The Thunderbird Makefiles refer to the variables LIBXUL_DIST,
+  # prefix, and PREFIX in some places where they are not set.  In
+  # particular, there are some linker flags like
+  # `-rpath-link=$(LIBXUL_DIST)/bin'.  Since this expands to
+  # `-rpath-link=/bin', the build fails due to the purity checks in
+  # the ld wrapper.  So disable the purity check for now.
+  preBuild = "NIX_ENFORCE_PURITY=0";
+
+  # This doesn't work:
+  #makeFlags = "LIBXUL_DIST=$(out) prefix=$(out) PREFIX=$(out)";
+    
+  postInstall =
+    ''
+      # Fix some references to /bin paths in the Xulrunner shell script.
+      substituteInPlace $out/lib/thunderbird-*/thunderbird \
+          --replace /bin/pwd "$(type -tP pwd)" \
+          --replace /bin/ls "$(type -tP ls)"
+    '';
+
+  meta = {
+    description = "Mozilla Thunderbird, a full-featured email client";
+    homepage = http://www.mozilla.com/en-US/thunderbird/;
+  };
+}
--- a/pkgs/applications/networking/mailreaders/thunderbird-2.x/builder.sh
+++ b/pkgs/applications/networking/mailreaders/thunderbird-2.x/builder.sh
--- a/pkgs/applications/networking/mailreaders/thunderbird-2.x/xlibs.patch
+++ b/pkgs/applications/networking/mailreaders/thunderbird-2.x/xlibs.patch
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@ -6,20 +6,16 @@

 assert gtkSupport -> (gtk != null) && (libglade != null);

-let version = "0.8.0b";
+let version = "0.8.1";
 in
  stdenv.mkDerivation {
    name = "gnunet-${version}";

    src = fetchurl {
-      url = "http://gnunet.org/download/GNUnet-${version}.tar.bz2";
-      sha256 = "1d1abnfqbd1f8pjzq9p0za7jyy2lay7k8l09xadk83k8d96abwcs";
+      url = "mirror://gnu/gnunet/GNUnet-${version}.tar.gz";
+      sha256 = "0makh52fsrsxg2qgfi1n68sh2hllqxj453g335m05wk05d7minl4";
    };

-    configureFlags = ''
-      --without-included-ltdl --disable-ltdl-install --with-ltdl-include=${libtool}/include --with-ltdl-lib=${libtool}/lib
-    '';
-
    buildInputs = [
      libextractor libmicrohttpd libgcrypt gmp curl libtool
      zlib guile adns sqlite libxml2 ncurses
@ -27,14 +23,19 @@ in
      makeWrapper
    ] ++ (if gtkSupport then [ gtk libglade ] else []);

-    patches = [
-      ./tmpdir.patch
-      ./disable-http-tests.patch
-    ];
-
    preConfigure = ''
-      # Brute force: make sure the tests don't rely on `/tmp', for
-      # the sake of chroot builds.
+      # Brute force: since nix-worker chroots don't provide
+      # /etc/{resolv.conf,hosts}, replace all references to `localhost'
+      # by their IPv4 equivalent.
+      for i in $(find . \( -name \*.c -or -name \*.conf \) \
+                      -exec grep -l localhost {} \;)
+      do
+        echo "$i: substituting \`127.0.0.1' to \`localhost'..."
+        substituteInPlace "$i" --replace "localhost" "127.0.0.1"
+      done
+
+      # Make sure the tests don't rely on `/tmp', for the sake of chroot
+      # builds.
      for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \
                      -exec grep -l /tmp {} \;)
      do
@ -43,16 +44,15 @@ in
      done
    '';

-    # Tests have to be run xonce it's installed.
-    # FIXME: Re-enable tests when they are less broken.
-    #postInstall = ''
-    #  GNUNET_PREFIX="$out" make check
-    #'';
-
    doCheck = false;

-    # Help programs find the numerous modules that sit under `$out/lib/GNUnet'.
+    # 1. Run tests have once GNUnet is installed.
+    # 2. Help programs find the numerous modules that sit under
+    #    `$out/lib/GNUnet'.
+
+    # FIXME: `src/transports/test_udp' hangs forever.
    postInstall = ''
+      #GNUNET_PREFIX="$out" make check
      wrapProgram "$out/bin/gnunetd" \
        --prefix LTDL_LIBRARY_PATH ":" "$out/lib/GNUnet"
    '';
@ -78,5 +78,8 @@ in
      homepage = http://gnunet.org/;

      license = "GPLv2+";
+
+      maintainers = [ stdenv.lib.maintainers.ludo ];
+      platforms = stdenv.lib.platforms.gnu;
    };
  }
--- a/pkgs/applications/networking/p2p/gnunet/disable-http-tests.patch
+++ b/pkgs/applications/networking/p2p/gnunet/disable-http-tests.patch
@ -1,88 +0,0 @@
-Disable HTTP tests as they seem to deadlock when building in a chroot on NixOS.
-
-diff --git a/src/transports/Makefile.in b/src/transports/Makefile.in
-index b0b76a2..30a0bb5 100644
--- a/src/transports/Makefile.in
-+++ b/src/transports/Makefile.in
-@@ -38,8 +38,8 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
- check_PROGRAMS = test_udp$(EXEEXT) test_tcp$(EXEEXT) \
-	test_http$(EXEEXT) testrepeat_udp$(EXEEXT) \
-	testrepeat_tcp$(EXEEXT) testrepeat_http$(EXEEXT)
-+	testrepeat_udp$(EXEEXT) \
-+	testrepeat_tcp$(EXEEXT)
- subdir = src/transports
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-
-diff --git a/src/applications/session/Makefile.in b/src/applications/session/Makefile.in
-index b2717f9..a048d21 100644
--- a/src/applications/session/Makefile.in
-+++ b/src/applications/session/Makefile.in
-@@ -38,7 +38,7 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
- check_PROGRAMS = sessiontest_tcp$(EXEEXT) sessiontest_udp$(EXEEXT) \
-	sessiontest_nat$(EXEEXT) $(am__EXEEXT_1)
-+	sessiontest_nat$(EXEEXT)
- subdir = src/applications/session
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-
-diff --git a/src/applications/tbench/Makefile.in b/src/applications/tbench/Makefile.in
-index ea061bc..c6ee8f8 100644
--- a/src/applications/tbench/Makefile.in
-+++ b/src/applications/tbench/Makefile.in
-@@ -39,8 +39,7 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
- bin_PROGRAMS = gnunet-tbench$(EXEEXT)
-check_PROGRAMS = tbenchtest_tcp$(EXEEXT) tbenchtest_udp$(EXEEXT) \
-	$(am__EXEEXT_1)
-+check_PROGRAMS = tbenchtest_tcp$(EXEEXT) tbenchtest_udp$(EXEEXT)
- subdir = src/applications/tbench
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-
-diff --git a/src/applications/advertising/Makefile.in b/src/applications/advertising/Makefile.in
-index 454fa63..af7aefb 100644
--- a/src/applications/advertising/Makefile.in
-+++ b/src/applications/advertising/Makefile.in
-@@ -38,7 +38,7 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
- check_PROGRAMS = advertisingtest_tcp$(EXEEXT) \
-	advertisingtest_udp$(EXEEXT) $(am__EXEEXT_1)
-+	advertisingtest_udp$(EXEEXT)
- subdir = src/applications/advertising
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-
-diff --git a/src/applications/bootstrap_http/Makefile.in b/src/applications/bootstrap_http/Makefile.in
-index 29800af..ad5c6a1 100644
--- a/src/applications/bootstrap_http/Makefile.in
-+++ b/src/applications/bootstrap_http/Makefile.in
-@@ -37,7 +37,7 @@ NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-check_PROGRAMS = httptest$(EXEEXT)
-+check_PROGRAMS =
- subdir = src/applications/bootstrap_http
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-
-diff --git a/src/applications/hostlist/Makefile.in b/src/applications/hostlist/Makefile.in
-index 126df5e..2317c60 100644
--- a/src/applications/hostlist/Makefile.in
-+++ b/src/applications/hostlist/Makefile.in
-@@ -37,7 +37,7 @@ NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- host_triplet = @host@
-check_PROGRAMS = hostlisttest$(EXEEXT)
-+check_PROGRAMS =
- subdir = src/applications/hostlist
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--- a/pkgs/applications/networking/p2p/gnunet/tmpdir.patch
+++ b/pkgs/applications/networking/p2p/gnunet/tmpdir.patch
@ -1,93 +0,0 @@
-Make sure the core libraries used by the tests honor $TMPDIR.
-
-diff --git a/src/applications/dstore_sqlite/dstore.c b/src/applications/dstore_sqlite/dstore.c
-index cdcae81..4bb45a3 100644
--- a/src/applications/dstore_sqlite/dstore.c
-+++ b/src/applications/dstore_sqlite/dstore.c
-@@ -129,6 +129,7 @@ db_reset ()
-   int fd;
-   sqlite3 *dbh;
-   char *tmpl;
-+  const char *tmpdir;
- 
-   if (fn != NULL)
-     {
-@@ -136,7 +137,15 @@ db_reset ()
-       GNUNET_free (fn);
-     }
-   payload = 0;
-  tmpl = "/tmp/dstoreXXXXXX";
-+
-+  tmpdir = getenv ("TMPDIR");
-+  tmpdir = tmpdir ? tmpdir : "/tmp";
-+
-+#define TEMPLATE "/gnunet-dstoreXXXXXX"
-+  tmpl = alloca (strlen (tmpdir) + sizeof (TEMPLATE) + 1);
-+  strcpy (tmpl, tmpdir);
-+  strcat (tmpl, TEMPLATE);
-+#undef TEMPLATE
- 
- #ifdef MINGW
-   fn = (char *) GNUNET_malloc (MAX_PATH + 1);
-diff --git a/src/applications/fs/collection/collection.c b/src/applications/fs/collection/collection.c
-index 5671cb3..da2b605 100644
--- a/src/applications/fs/collection/collection.c
-+++ b/src/applications/fs/collection/collection.c
-@@ -487,6 +487,7 @@ GNUNET_CO_collection_publish_now ()
-   char *dirData;
-   char this_revision_string[128];
-   char next_revision_string[128];
-+  const char *tmpdir;
- 
-   GNUNET_mutex_lock (lock);
-   if ((collectionData == NULL) ||
-@@ -495,7 +496,17 @@ GNUNET_CO_collection_publish_now ()
-       GNUNET_mutex_unlock (lock);
-       return;
-     }
-  tmpName = GNUNET_strdup ("/tmp/gnunet-collectionXXXXXX");
-+
-+  tmpdir = getenv ("TMPDIR");
-+  tmpdir = tmpdir ? tmpdir : "/tmp";
-+
-+#define TEMPLATE "/gnunet-collectionXXXXXX"
-+  tmpName = alloca (strlen (tmpdir) + sizeof (TEMPLATE) + 1);
-+  strcpy (tmpName, tmpdir);
-+  strcat (tmpName, TEMPLATE);
-+#undef TEMPLATE
-+
-+  tmpName = GNUNET_strdup (tmpName);
-   fd = mkstemp (tmpName);
-   if (fd == -1)
-     {
-diff --git a/src/applications/fs/fsui/upload.c b/src/applications/fs/fsui/upload.c
-index dc683a5..46a04af 100644
--- a/src/applications/fs/fsui/upload.c
-+++ b/src/applications/fs/fsui/upload.c
-@@ -159,6 +159,7 @@ createDirectoryHelper (struct GNUNET_GE_Context *ectx,
-   int handle;
-   struct GNUNET_GE_Memory *mem;
-   struct GNUNET_GE_Context *ee;
-+  const char *tmpdir;
- 
-   fis = NULL;
-   size = 0;
-@@ -208,7 +209,17 @@ createDirectoryHelper (struct GNUNET_GE_Context *ectx,
-       pos = pos->next;
-     }
-   GNUNET_GE_memory_reset (mem);
-  tempName = GNUNET_strdup ("/tmp/gnunet-upload-dir.XXXXXX");
-+
-+  tmpdir = getenv ("TMPDIR");
-+  tmpdir = tmpdir ? tmpdir : "/tmp";
-+
-+#define TEMPLATE "/gnunet-upload-dirXXXXXX"
-+  tempName = alloca (strlen (tmpdir) + sizeof (TEMPLATE) + 1);
-+  strcpy (tempName, tmpdir);
-+  strcat (tempName, TEMPLATE);
-+#undef TEMPLATE
-+
-+  tempName = GNUNET_strdup (tempName);
-   handle = mkstemp (tempName);
-   if (handle == -1)
-     {
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@ -1,18 +1,18 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, perl
 , enableACLs ? true, acl ? null
 }:

 assert enableACLs -> acl != null;

 stdenv.mkDerivation {
-  name = "rsync-3.0.6";
+  name = "rsync-3.0.7";
  
  src = fetchurl {
-    url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.6.tar.gz;
-    sha256 = "1cz1adlshjwwi41yqhw7wph7vq58a73b4zgs8piv6rnbcj9rdk1k";
+    url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.7.tar.gz;
+    sha256 = "1j77vwz6q3dvgr8w6wvigd5v4m5952czaqdvihr8di13q0b0vq4y";
  };

-  buildInputs = stdenv.lib.optional enableACLs acl;
+  buildInputs = [perl] ++ stdenv.lib.optional enableACLs acl;

  meta = {
    homepage = http://samba.anu.edu.au/rsync/;
--- a/pkgs/applications/office/openoffice/OOo-3.1.1-HEADERFIX-1.patch
+++ b/pkgs/applications/office/openoffice/OOo-3.1.1-HEADERFIX-1.patch
@ -0,0 +1,74 @@
+Submitted By:            zippo zippo@oppiz.net
+Date:                    2009-09-23
+Initial Package Version: 3.1.1
+Upstream Status:         Unknown
+Origin:                  zippo@oppiz.net
+Description: Fixes missing headers, GCC-4.3.2 and corrects errors for Glib 2.10
+diff -Naur OOO310_m19/soltools/mkdepend/def.h OOO310_m19.new/soltools/mkdepend/def.h
+--- OOO310_m19/soltools/mkdepend/def.h	2008-04-10 18:05:14.000000000 +0000
+++ OOO310_m19.new/soltools/mkdepend/def.h	2009-09-23 01:17:01.913883308 +0000
+@@ -154,7 +154,7 @@
+ 
+ char			*copy();
+ char			*base_name();
+-char			*getline();
+char			*get_line();
+ char			*isdefined();
+ struct filepointer	*getfile();
+ struct inclist		*newinclude();
+diff -Naur OOO310_m19/soltools/mkdepend/main.c OOO310_m19.new/soltools/mkdepend/main.c
+--- OOO310_m19/soltools/mkdepend/main.c	2008-07-22 17:24:34.000000000 +0000
+++ OOO310_m19.new/soltools/mkdepend/main.c	2009-09-23 01:18:09.160646833 +0000
+@@ -548,7 +548,7 @@
+  * Get the next line.  We only return lines beginning with '#' since that
+  * is all this program is ever interested in.
+  */
+-char *getline(filep)
+char *get_line(filep)
+ 	register struct filepointer	*filep;
+ {
+ 	register char	*p,	/* walking pointer */
+diff -Naur OOO310_m19/soltools/mkdepend/parse.c OOO310_m19.new/soltools/mkdepend/parse.c
+--- OOO310_m19/soltools/mkdepend/parse.c	2008-04-10 18:06:39.000000000 +0000
+++ OOO310_m19.new/soltools/mkdepend/parse.c	2009-09-23 01:18:54.183802453 +0000
+@@ -45,7 +45,7 @@
+ 	register int	type;
+ 	boolean recfailOK;
+ 
+-	while ((line = getline(filep))) {
+	while ((line = get_line(filep))) {
+ 		switch(type = deftype(line, filep, file_red, file, TRUE, symbols)) {
+ 		case IF:
+ 		doif:
+@@ -168,7 +168,7 @@
+ 	register char	*line;
+ 	register int	type;
+ 
+-	while ((line = getline(filep))) {
+	while ((line = get_line(filep))) {
+ 		switch(type = deftype(line, filep, file_red, file, FALSE, symbols)) {
+ 		case IF:
+ 		case IFFALSE:
+diff -Naur OOO310_m19/sw/source/core/doc/docbm.cxx OOO310_m19.new/sw/source/core/doc/docbm.cxx
+--- OOO310_m19/sw/source/core/doc/docbm.cxx	2008-09-04 10:19:07.000000000 +0000
+++ OOO310_m19.new/sw/source/core/doc/docbm.cxx	2009-09-23 12:32:08.011104664 +0000
+@@ -32,7 +32,7 @@
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_sw.hxx"
+ 
+-
+#include <stdio.h>
+ #include <tools/pstm.hxx>
+ #include <svx/linkmgr.hxx>
+ #include <fmtanchr.hxx>
+diff -Naur OOO310_m19/sw/source/filter/ww8/WW8TableInfo.cxx OOO310_m19.new/sw/source/filter/ww8/WW8TableInfo.cxx
+--- OOO310_m19/sw/source/filter/ww8/WW8TableInfo.cxx	2009-04-21 09:51:46.000000000 +0000
+++ OOO310_m19.new/sw/source/filter/ww8/WW8TableInfo.cxx	2009-09-23 12:51:12.882511596 +0000
+@@ -31,6 +31,7 @@
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_sw.hxx"
+ 
+#include <stdio.h>
+ #include <iostream> 
+ #include "WW8TableInfo.hxx"
+ #include "swtable.hxx"
--- a/pkgs/applications/office/openoffice/default.nix
+++ b/pkgs/applications/office/openoffice/default.nix
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
      sha256 = "95440f09f8dce616178b86b26af8e543c869d01579207aa68e8474019b59caca";
    };

-  patches = [ ./oo.patch ];
+  patches = [ ./oo.patch ./OOo-3.1.1-HEADERFIX-1.patch ];

  src_system = fetchurl {
      url = "http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=src_bzip&lang=system&version=${version}";
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/applications/science/math/maxima/default.nix
@ -2,14 +2,14 @@

 let
    name    = "maxima";
-    version = "5.19.2";
+    version = "5.20.1";
 in
 stdenv.mkDerivation {
  name = "${name}-${version}";

  src = fetchurl {
    url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
-    sha256 = "4b9d592cb5c5b49acf10c894aa4e899bd47f079b315ee22542122a2e64589072";
+    sha256 = "cc2430ad6b895fb730ee2a7b8df4852c2b6d09a5a8bb715bdba783982c470bd9";
  };

  buildInputs = [clisp];
--- a/pkgs/applications/virtualization/qemu/0.12.1.nix
+++ b/pkgs/applications/virtualization/qemu/0.12.1.nix
@ -1,11 +1,11 @@
 {stdenv, fetchurl, SDL, zlib, which}:

 stdenv.mkDerivation {
-  name = "qemu-0.10.3";
+  name = "qemu-0.12.1";

  src = fetchurl {
-    url = http://download.savannah.gnu.org/releases/qemu/qemu-0.10.3.tar.gz;
-    sha256 = "0xxhyxa376vi4drjpqq21g0h6gqgb1fxamca7zinl2l8iix0sm49";
+    url = http://download.savannah.gnu.org/releases/qemu/qemu-0.12.1.tar.gz;
+    sha256 = "15frq26h2f847fiy1aivb3kj4psx8id8kw217781aimqlk9q45pf";
  };

  patchFlags = "-p2";
--- a/pkgs/applications/virtualization/qemu/0.9.1.nix
+++ b/pkgs/applications/virtualization/qemu/0.9.1.nix
@ -1,20 +0,0 @@
-{stdenv, fetchurl, SDL, zlib, which}:
-
-stdenv.mkDerivation {
-  name = "qemu-0.9.1";
-
-  src = fetchurl {
-    url = http://bellard.org/qemu/qemu-0.9.1.tar.gz;
-    sha256 = "199mb12w141yh2afzznh539jsip4h79kfsxwaj1xhzfwljsd0mj7";
-  };
-
-  patches = [../../../os-specific/linux/kvm/smbd-path.patch];
-
-  patchFlags = "-p2";
-  
-  buildInputs = [SDL zlib which];
-  
-  meta = {
-    description = "QEmu processor emulator";
-  };
-}
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@ -4,11 +4,11 @@
 }:

 stdenv.mkDerivation {
-  name = "virtualbox-3.1.0-${kernel.version}";
+  name = "virtualbox-3.1.2-${kernel.version}";

  src = fetchurl {
-    url = http://download.virtualbox.org/virtualbox/3.1.0/VirtualBox-3.1.0-OSE.tar.bz2;
-    sha256 = "0f86w4awscgbg9az26h0rlg4i7xr9319hbddjs69ils28g2gz2ns";
+    url = http://download.virtualbox.org/virtualbox/3.1.2/VirtualBox-3.1.2-OSE.tar.bz2;
+    sha256 = "1cgj696lyrklddjjhmrgb5j1jvj43d46hr1wnpyrx8pd6wp5hgr9";
  };

  buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl];
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@ -1,13 +1,16 @@
-args: with args;
+{ stdenv, fetchurl, gettext, libjpeg, libtiff, libungif, libpng, imlib, xlibs }:

-stdenv.mkDerivation {
-  name = "icewm-1.2.32";
+stdenv.mkDerivation rec {
+  name = "icewm-1.2.37";

-  buildInputs = [ gettext libX11 libXft libXext libXinerama libXrandr libjpeg libtiff libungif libpng imlib ];
+  buildInputs =
+    [ gettext libjpeg libtiff libungif libpng imlib
+      xlibs.libX11 xlibs.libXft xlibs.libXext xlibs.libXinerama xlibs.libXrandr
+    ];

  src = fetchurl {
-    url = http://mesh.dl.sourceforge.net/sourceforge/icewm/icewm-1.2.32.tar.gz;
-    sha256 = "c2fe6ef0bdc0a9f841ae6fe214c06a15d666f90df027d105305f3e0dc109a667";
+    url = "mirror://sourceforge/icewm/${name}.tar.gz";
+    sha256 = "15852k96z2w19v3d02jynxyf6ld378hbkd6lpy64byysrmjh3dmz";
  };

  meta = {
--- a/pkgs/applications/window-managers/xcompmgr/default.nix
+++ b/pkgs/applications/window-managers/xcompmgr/default.nix
@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, libXcomposite, libXfixes, libXdamage
+, libXrender }:
+stdenv.mkDerivation rec {
+  name = "xcompmgr-1.1.5";
+  src = fetchurl {
+    url = "http://www.x.org/releases/individual/app/${name}.tar.bz2";
+    sha256 = "bb20737a6f9e0cdf5cfbd5288b6a9a4b16ca18d2be19444549c1d6be2a90b571";
+  };
+  buildInputs = [ pkgconfig libXcomposite libXfixes libXdamage libXrender ];
+  meta = {
+    homepage = http://www.x.org/;
+    description = "A sample compositing manager for X servers";
+    longDescription = ''
+      A sample compositing manager for X servers supporting the XFIXES,
+      DAMAGE, RENDER, and COMPOSITE extensions.  It enables basic eye-candy
+      effects.
+    '';
+    license = "bsd";
+    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
--- a/pkgs/applications/window-managers/xmonad/default.nix
+++ b/pkgs/applications/window-managers/xmonad/default.nix
@ -3,8 +3,8 @@
 cabal.mkDerivation (self : {
  pname = "xmonad";
  name = "${self.fname}";
-  version = "0.9";
-  sha256 = "51670f83de211a8ea24ce2724c71ac5c3e4782f25422319d8b5e43f3ae7bf9e8";
+  version = "0.9.1";
+  sha256 = "014201200e8a521ee3a0d8c0727392916a7549207b91064fb456f8c660609927";
  propagatedBuildInputs = [X11 mtl];
  meta = {
    description = "xmonad is a tiling window manager for X";
--- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
@ -3,8 +3,8 @@
 cabal.mkDerivation (self : {
  pname = "xmonad-contrib";
  name = "${self.fname}";
-  version = "0.9";
-  sha256 = "f67471785eba323ac416f912d3503976ef6ed43e93e53fabf5621b2c93351ae9";
+  version = "0.9.1";
+  sha256 = "b4ca1d71d12903be76187ce58898697086e7af3ef73468987cb7ef03b076ec47";
  propagatedBuildInputs = [X11 xmonad utf8String];
  meta = {
    description = "a huge extension library for xmonad";
--- a/pkgs/build-support/release/nix-build.nix
+++ b/pkgs/build-support/release/nix-build.nix
@ -22,7 +22,8 @@ stdenv.mkDerivation (

    showBuildStats = true;

-    phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase ${if doCoverageAnalysis then "coverageReportPhase" else ""} finalPhase";
+    postPhases =
+      (stdenv.lib.optional doCoverageAnalysis "coverageReportPhase") ++ ["finalPhase"];

    finalPhase =
      ''
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@ -73,4 +73,29 @@ rec {
  linkFarm = name: entries: runCommand name {} ("mkdir -p $out; cd $out; \n" +
    (stdenv.lib.concatMapStrings (x: "ln -s '${x.path}' '${x.name}';\n") entries));

+  # Search in the environment if the same program exists with a set uid or
+  # set gid bit.  If it exists, run the first program found, otherwise run
+  # the default binary.
+  useSetUID = drv: path:
+    let
+      name = stdenv.lib.basename path;
+      bin = "${drv}${path}";
+    in assert name != "";
+      writeScript "setUID-${name}" ''
+        #!${stdenv.shell}
+        inode=$(stat -Lc %i ${bin})
+        for file in $(type -ap ${name}); do
+          case $(stat -Lc %a $file) in
+            ([2-7][0-7][0-7][0-7])
+              if test -r "$file".real; then
+                orig=$(cat "$file".real)
+                if test $inode = $(stat -Lc %i "$orig"); then
+                  exec "$file" "$@"
+                fi
+              fi;;
+          esac
+        done
+        exec ${bin} "$@"
+      '';
+
 }
--- a/pkgs/desktops/gnome-2.28/desktop/libsoup/default.nix
+++ b/pkgs/desktops/gnome-2.28/desktop/libsoup/default.nix
@ -2,10 +2,10 @@
  glib, GConf, gnome_keyring}:

 stdenv.mkDerivation {
-  name = "libsoup-2.28.0";
+  name = "libsoup-2.28.2";
  src = fetchurl {
-    url = mirror://gnome/sources/libsoup/2.28/libsoup-2.28.0.tar.bz2;
-    sha256 = "1dkgih5im81lqc0y2qv3xcjd8hvmd4fjjvh5a5akfq6mjp9ifwk4";
+    url = mirror://gnome/sources/libsoup/2.28/libsoup-2.28.2.tar.bz2;
+    sha256 = "002kxjh6dwpps4iwly1bazxlzgqhkfszqqy26mp1gy2il3lzrlcx";
  };
  buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl 
    glib GConf gnome_keyring ];
--- a/pkgs/development/compilers/adobe-flex-sdk/default.nix
+++ b/pkgs/development/compilers/adobe-flex-sdk/default.nix
@ -1,10 +1,11 @@
 args: with args;
 stdenv.mkDerivation rec {
-  name = "adobe-flex-sdk-3.3.0.4852_mpl";
+  name = "adobe_flex_sdk_3.4.1.10084_mpl";

  src = fetchurl {
-    url = http://flexorg.wip3.adobe.com/flexsdk/3.3.0.4852/flex_sdk_3.3.0.4852_mpl.zip;
-    sha256 = "1gsm774afc7zwv3hyib5n6fpdbnd0dh6z7r2amjf38fm96jw7a99";
+    # This is the open source distribution
+    url = http://fpdownload.adobe.com/pub/flex/sdk/builds/flex3/flex_sdk_3.4.1.10084_mpl.zip;
+    sha256 = "0bq0cnq25qyr3g64sqqc20y3mmnhgh07p3ylxd2iq0ha8cdis7z0";
  };

  phases="installPhase";
@ -18,9 +19,9 @@ stdenv.mkDerivation rec {
    t=$out/opt/flex-sdk
    ensureDir $t $out/bin
    mv * $t
-    sed 's/
$//' -i $t/bin/mxmlc
-    rm $t/bin/*.exe
-    for i in $t/bin/mxmlc; do
+    rm $t/bin/*.exe $t/bin/*.bat
+    sed 's/
$//' -i $t/bin/*
+    for i in $t/bin/*; do
      b="$(basename "$i")";
    cat > "$out/bin/$b" << EOF
    #!/bin/sh
--- a/pkgs/development/compilers/fpc/binary.nix
+++ b/pkgs/development/compilers/fpc/binary.nix
@ -1,12 +1,19 @@
 args: with args;

 stdenv.mkDerivation {
-  name = "fpc-2.2.2-binary";
+  name = "fpc-2.4.0-binary";

-  src = fetchurl {
-    url = ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/i386-linux-2.2.2/fpc-2.2.2.i386-linux.tar;
-    sha256 = "8c18f63b36a76eee673f96ca254c49c5a42bcf3e36279abe8774f961792449a5";
-  };
+  src = if stdenv.system == "i686-linux" then
+  fetchurl {
+    url = "ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.4.0/i386-linux/fpc-2.4.0.i386-linux.tar";
+    sha256 = "1zas9kp0b36zxqvb9i4idh2l0nb6qpmgah038l77w6las7ghh0dv";
+  }
+  else if stdenv.system == "x86_64-linux" then
+  fetchurl {
+    url = "ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.4.0/x86_64-linux/fpc-2.4.0.x86_64-linux.tar";
+    sha256 = "111d11g5ra55hjywx64ldwwflpimsy8zryvap68v0309nyd23f0z";
+  }
+  else null;

  builder = ./binary-builder.sh;

--- a/pkgs/development/compilers/fpc/default.nix
+++ b/pkgs/development/compilers/fpc/default.nix
@ -5,12 +5,12 @@ if args ? startFPC && args.startFPC != null then
 with args;

 stdenv.mkDerivation rec {
-  version = "2.2.4";
+  version = "2.4.0";
  name = "fpc-${version}";

  src = fetchurl {
    url = "http://downloads.sourceforge.net/sourceforge/freepascal/fpcbuild-${version}.tar.gz";
-    sha256 = "1kxljnivww4riqff8vxann7s135cv634ly3i61rfs1wzwc4lz9bp";
+    sha256 = "1m2g2bafjixbwl5b9lna5h7r56y1rcayfnbp8kyjfd1c1ymbxaxk";
  };

  buildInputs = [startFPC gawk];
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@ -2,8 +2,8 @@ args : with args;
 rec {
  version = "0.9.26.2-0";
  src = fetchurl {
-    url = "http://downloads.sourceforge.net/lazarus/lazarus-${version}.tgz";
-    sha256 = "5b582685c0447034580fe17c60b8fc84a8b097b6f31ff9b4583cf0eb741297cc";
+    url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%200.9.28.2/lazarus-0.9.28.2-src.tar.bz2";
+    sha256 = "1zad1sylgvhpb210zxypdyng72fpjz1zdf3cpqj9dl94cwn3f4ap";
  };

  buildInputs = [fpc gtk glib libXi inputproto 
--- a/pkgs/development/compilers/ghc/6.12.1.nix
+++ b/pkgs/development/compilers/ghc/6.12.1.nix
@ -1,15 +1,15 @@
 {stdenv, fetchurl, ghc, perl, gmp, ncurses}:

 stdenv.mkDerivation rec {
-  version = "6.12.0.20091010";
+  version = "6.12.1";
  
  name = "ghc-${version}";
  
  homepage = "http://haskell.org/ghc";

  src = fetchurl {
-    url = "http://darcs.haskell.org/~ghc/dist/6.12.1rc1/${name}-src.tar.bz2";
-    sha256 = "903552917778329fc79cc273ece81030324006f47157ddd4278cb08c1c637fd3";
+    url = http://haskell.org/ghc/dist/6.12.1/ghc-6.12.1-src.tar.bz2;
+    sha256 = "0ajm4sypk4zgjp0m6i03fadyv5dm9vlqfnvsx1g94yk7vnd9zyfd";
  };

  buildInputs = [ghc perl gmp ncurses];
@ -34,12 +34,14 @@ stdenv.mkDerivation rec {
  meta = {
    inherit homepage;
    description = "The Glasgow Haskell Compiler";
+    maintainers = [stdenv.lib.maintainers.marcweber];
+    platforms = stdenv.platforms.linux;
  };


  passthru = {
    corePackages = [
-       [ "Cabal" "1.8.0" ]
+       [ "Cabal" "1.8.0.2" ]
       [ "array" "0.3.0.0" ]
       [ "base" "3.0.3.2" ]
       [ "base" "4.2.0.0" ]
@ -56,7 +58,7 @@ stdenv.mkDerivation rec {
       [ "extensible-exceptions" "0.1.1.1" ]
       [ "ffi" "1.0" ]
       [ "filepath" "1.1.0.3" ]
-       [ "ghc" "6.12.0.20091010" ]
+       [ "ghc" "6.12.1" ]
       [ "ghc-binary" "0.5.0.2" ]
       [ "ghc-prim" "0.2.0.0" ]
       [ "haskell98" "1.0.1.1" ]
--- a/pkgs/development/compilers/ghc/ghc-get-packages.sh
+++ b/pkgs/development/compilers/ghc/ghc-get-packages.sh
@ -18,3 +18,4 @@ for p in $PATH; do
    test -f $i && echo -n " $prefix$i"
  done
 done
+test -f "$2/../lib/ghc-$version/package.conf" && echo -n " $prefix$2/../lib/ghc-$version/package.conf"
--- a/pkgs/development/compilers/mozart/default.nix
+++ b/pkgs/development/compilers/mozart/default.nix
@ -0,0 +1,14 @@
+{stdenv, fetchurl, flex, bison, perl, gmp, zlib, tcl, tk, gdbm, m4, x11, emacs}:
+
+stdenv.mkDerivation {
+  name = "mozart-1.4.0";
+  src = fetchurl {
+    url = http://www.mozart-oz.org/download/mozart-ftp/store/1.4.0-2008-07-02-tar/mozart-1.4.0.20080704-src.tar.gz;
+    sha256 = "5da73d80b5aa7fa42edca64159a1a076323f090e5c548f3747f94d0afc60b223";
+  };
+
+  buildInputs = [flex bison perl gmp zlib tcl tk gdbm m4 x11 emacs];
+
+  # micq gives a compile error for me
+  configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --disable-contrib-micq";
+}
--- a/pkgs/development/compilers/strategoxt/0.18.nix
+++ b/pkgs/development/compilers/strategoxt/0.18.nix
@ -41,11 +41,11 @@ rec {

  
  strategoxt = stdenv.mkDerivation rec {
-    name = "strategoxt-0.18pre20227";
+    name = "strategoxt-0.18pre20449";

    src = fetchurl {
-      url = "http://hydra.nixos.org/build/124117/download/1/strategoxt-0.18pre20227.tar.gz";
-      sha256 = "c2c7a68f76c6dfaf470ed9f7bad71cddebb620b709f20b01231c3a6fd93d8150";
+      url = "http://hydra.nixos.org/build/199475/download/1/strategoxt-0.18pre20449.tar.gz";
+      sha256 = "c492df19a810801377f160f6d117bfd3e689f23396bd89c3e98224f35db666f2";
    };

    buildInputs = [pkgconfig aterm sdf getopt];
--- a/pkgs/development/interpreters/guile/1.9.nix
+++ b/pkgs/development/interpreters/guile/1.9.nix
@ -17,8 +17,8 @@ rec {
  propagatedBuildInputs = [ gmp boehmgc ];

  patches =
-    stdenv.lib.optional (coverageAnalysis != null)
-      ./disable-gc-sensitive-tests.patch;
+    stdenv.lib.optionals (coverageAnalysis != null)
+      [ ./gcov-file-name.patch ./disable-gc-sensitive-tests.patch ];

  postInstall = ''
    wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
--- a/pkgs/development/interpreters/guile/gcov-file-name.patch
+++ b/pkgs/development/interpreters/guile/gcov-file-name.patch
@ -0,0 +1,42 @@
+This patch arranges so that we don't end up, with profiling builds, with a
+file named `<stdout>.gcov' since that confuses lcov:
+
+  <stdout>:cannot open source file
+  geninfo: ERROR: cannot read <stdout>.gcov!
+
+--- guile/libguile/c-tokenize.c	2009-09-13 13:05:15.000000000 +0200
+++ guile/libguile/c-tokenize.c	2009-10-28 16:24:15.000000000 +0100
+@@ -1,5 +1,5 @@
+ 
+-#line 3 "<stdout>"
+#line 3 "c-tokenize.c"
+ 
+ #define  YY_INT_ALIGNED short int
+ 
+@@ -616,7 +616,7 @@ int cookie_was_last = 0; 
+ #define IS_COOKIE cookie_was_last = 1
+ #define IS_NOT_COOKIE cookie_was_last = 0
+  
+-#line 620 "<stdout>"
+#line 620 "c-tokenize.c"
+ 
+ #define INITIAL 0
+ 
+@@ -799,7 +799,7 @@ YY_DECL
+ #line 65 "./c-tokenize.lex"
+ 
+ 
+-#line 803 "<stdout>"
+#line 803 "c-tokenize.c"
+ 
+ 	if ( !(yy_init) )
+ 		{
+@@ -1235,7 +1235,7 @@ YY_RULE_SETUP
+ #line 181 "./c-tokenize.lex"
+ ECHO;
+ 	YY_BREAK
+-#line 1239 "<stdout>"
+#line 1239 "c-tokenize.c"
+ case YY_STATE_EOF(INITIAL):
+ 	yyterminate();
+ 
--- a/pkgs/development/interpreters/php-xdebug/default.nix
+++ b/pkgs/development/interpreters/php-xdebug/default.nix
@ -0,0 +1,34 @@
+args: with args;
+stdenv.mkDerivation {
+  name = "php-xdebug";
+
+  src = args.fetchurl {
+    url = "http://xdebug.org/files/xdebug-2.0.5.tgz";
+    sha256 = "1cmq7c36gj8n41mfq1wba5rij8j77yqhydpcsbcysk1zchg68f26";
+  };
+
+  buildInputs = [php autoconf automake];
+
+  configurePhase = ''
+    phpize
+    ./configure --prefix=$out
+  '';
+
+  buildPhase = ''
+    make && make test
+  '';
+
+  installPhase = ''
+    ensureDir $out/lib/xdebug
+    cp modules/xdebug.so $out/lib
+    cp LICENSE $out/lib/xdebug
+  '';
+
+  meta = {
+    description = "php debugger and profiler extension";
+    homepage = http://xdebug.org/;
+    license = "xdebug"; # based on PHP-3
+    maintainers = [stdenv.lib.maintainers.marcweber];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
--- a/pkgs/development/interpreters/php/ini-bulider.nix
+++ b/pkgs/development/interpreters/php/ini-bulider.nix
@ -0,0 +1,43 @@
+{runCommand, php, appendLines ? "", prefixPhpRecommended ? true} :
+
+
+/*
+
+NixOS: see apache-httpd/default.nix's phpIni option
+
+to enable Xdebug append these lines:
+  ''
+      zend_extension="${pkgs.phpXdebug}/lib/xdebug.so"
+      zend_extension_ts="${pkgs.phpXdebug}/lib/xdebug.so"
+      zend_extension_debug="${pkgs.phpXdebug}/lib/xdebug.so"
+      xdebug.remote_enable=true
+      xdebug.remote_host=127.0.0.1
+      xdebug.remote_port=9000
+      xdebug.remote_handler=dbgp
+      xdebug.profiler_enable=0
+      xdebug.profiler_output_dir="/tmp/xdebug"
+      xdebug.remote_mode=req
+  ''
+
+to make php's mail() function work add
+  ''
+   ; Needed for PHP's mail() function.
+   sendmail_path = sendmail -t -i
+  ''
+*/
+
+
+runCommand "php.ini"
+  {
+    inherit php appendLines prefixPhpRecommended;
+  }
+  ''
+    [ -z "$prefixPhpRecommended" ] || {
+      {
+      echo "# PHP RECOMMENDED INI START"
+      cat $php/etc/php-recommended.ini
+      echo "# PHP RECOMMENDED INI END"
+      } >> $out
+    }
+    echo "$appendLines" >> $out
+  ''
--- a/pkgs/development/interpreters/php_configurable/default.nix
+++ b/pkgs/development/interpreters/php_configurable/default.nix
@ -106,13 +106,6 @@ composableDerivation {} ( fixed : {
                license = "based on the PHP license - as is";
                };
      */
-      xdebug = {
-        buildInputs = [ automake autoconf ];
-        xdebug_src = args.fetchurl {
-          url = "http://xdebug.org/files/xdebug-2.0.5.tgz";
-          sha256 = "1cmq7c36gj8n41mfq1wba5rij8j77yqhydpcsbcysk1zchg68f26";
-        };
-      };
    };

  cfg = {
@ -130,14 +123,13 @@ composableDerivation {} ( fixed : {
    soapSupport = getConfig ["php" "soap"] true;
    zlibSupport = getConfig ["php" "zlib"] true;
    opensslSupport = getConfig ["php" "openssl"] true;
-    xdebugSupport = getConfig ["php" "xdebug"] false;
    mbstringSupport = getConfig ["php" "mbstring"] true;
    gdSupport = getConfig ["php" "gd"] true;
  };

  # only -O1
  configurePhase = ''
-    iniFile=$out/etc/$name.ini
+    iniFile=$out/etc/php-recommended.ini
    [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
    ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out  $configureFlags
    echo configurePhase end
@ -147,32 +139,6 @@ composableDerivation {} ( fixed : {
  installPhase = ''
    unset installPhase; installPhase;
    cp php.ini-recommended $iniFile
-
-    # Now Let's build xdebug if flag has been given
-    # TODO I think there are better paths than the given below
-    if [ -n "$xdebug_src" ]; then
-      PATH=$PATH:$out/bin
-      tar xfz $xdebug_src;
-      cd xdebug*
-      phpize
-      ./configure --prefix=$out
-      make
-      ensureDir $out/lib; cp modules/xdebug.so $out/lib
-      cat >> $out/etc/php.ini << EOF
-        zend_extension="$out/lib/xdebug.so"
-        zend_extension_ts="$out/lib/xdebug.so"
-        zend_extension_debug="$out/lib/xdebug.so"
-        xdebug.remote_enable=true
-        xdebug.remote_host=127.0.0.1
-        xdebug.remote_port=9000
-        xdebug.remote_handler=dbgp
-        xdebug.profiler_enable=0
-        xdebug.profiler_output_dir="/tmp/xdebug"
-        xdebug.remote_mode=req
-        max_execution_time = 300
-        date.timezone = UTC
-  EOF
-    fi
  '';

  src = args.fetchurl {
--- a/pkgs/development/libraries/adns/default.nix
+++ b/pkgs/development/libraries/adns/default.nix
@ -11,7 +11,11 @@ stdenv.mkDerivation
  };
  src = fetchurl
  {
-    url = "ftp://ftp.chiark.greenend.org.uk/users/ian/adns/adns-${version}.tar.gz";
+    urls =
+      [ "http://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${version}.tar.gz"
+        "ftp://ftp.chiark.greenend.org.uk/users/ian/adns/adns-${version}.tar.gz"
+        "mirror://gnu/adns/adns-${version}.tar.gz"
+      ];
    sha256 = "${versionHash}";
  };
  configureFlags = if static then "--disable-dynamic" else "--enable-dynamic";
--- a/pkgs/development/libraries/enginepkcs11/default.nix
+++ b/pkgs/development/libraries/enginepkcs11/default.nix
@ -0,0 +1,18 @@
+{stdenv, fetchurl, libp11, pkgconfig, openssl}:
+
+stdenv.mkDerivation rec {
+  name = "engine_pkcs11-0.1.8";
+  
+  src = fetchurl {
+    url = "http://www.opensc-project.org/files/engine_pkcs11/${name}.tar.gz";
+    sha256 = "1rd20rxy12rfx3kwwvk5sqvc1ll87z60rqak1ksfwbf4wx0pwzfy";
+  };
+  
+  buildInputs = [ libp11 pkgconfig openssl ];
+
+  meta = {
+    homepage = http://www.opensc-project.org/engine_pkcs11/;
+    license = "BSD";
+    description = "Engine for OpenSSL to use smart cards in PKCS#11 format";
+  };
+}
--- a/pkgs/development/libraries/glib/2.22.x.nix
+++ b/pkgs/development/libraries/glib/2.22.x.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gettext, perl }:

 stdenv.mkDerivation rec {
-  name = "glib-2.22.2";
+  name = "glib-2.22.4";

  src = fetchurl {
    url = "mirror://gnome/sources/glib/2.22/${name}.tar.bz2";
-    sha256 = "18ycpaf69wlpp4wq385hkq7bcfhbis8ncd7wl7zmwgrdzh11v954";
+    sha256 = "055dv2hymbyzwpcd39r97x747vsvlkyywa826zr75dzambw6n7qd";
  };

  buildInputs = [pkgconfig gettext perl];
--- a/pkgs/development/libraries/gtk+/2.18.x.nix
+++ b/pkgs/development/libraries/gtk+/2.18.x.nix
@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null;
 assert cupsSupport -> cups != null;

 stdenv.mkDerivation rec {
-  name = "gtk+-2.18.3";
+  name = "gtk+-2.18.6";
  
  src = fetchurl {
    url = "mirror://gnome/sources/gtk+/2.18/${name}.tar.bz2";
-    sha256 = "1gv8lx7a00yp95ss0vzvmda4nv213m8adjdkx18hhmhaavz6a1hw";
+    sha256 = "0k9mz46q97537kdpmz8j5bhrzpn3zjp7k4mni4niafdp2x4r8aan";
  };
  
  buildInputs = [ pkgconfig perl jasper ];
--- a/pkgs/development/libraries/haskell/Agda/default.nix
+++ b/pkgs/development/libraries/haskell/Agda/default.nix
@ -3,13 +3,14 @@

 cabal.mkDerivation (self : {
  pname = "Agda";
-  version = "2.2.2";
-  sha256 = "265dbb5bc6d67bfeefa4a2a4ac9e5018d6d8b5c1a75816e05da2661c43a39bba";
+  version = "2.2.6";
+  sha256 = "e9268a61db30fc0f22f7e1fbc78673cd3e0d1bf2dd40ee5cf809635ca40fca78";
  extraBuildInputs = [happy alex];
  propagatedBuildInputs =
    [QuickCheck binary haskeline haskellSrc mtl utf8String xhtml zlib];
  meta = {
    description = "A dependently typed functional language and proof assistant";
+    maintainers = [self.stdenv.lib.maintainers.andres];
  };
 })  

--- a/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix
@ -2,12 +2,13 @@

 cabal.mkDerivation (self : {
  pname = "QuickCheck";
-  version = "2.1.0.1";
-  sha256 = "f99edf1a45315e90c9ec672d5d959d5878dcc1de65678c6aed85829a896b75f1";
+  version = "2.1.0.2";
+  sha256 = "1adeea5aa52cba7b8bcd27f9cdd9fe944e9a4a22d22fdf0570b526f580981e58";
  propagatedBuildInputs = [mtl];
-  configureFlags = ''--constraint=base<4'';
  meta = {
    description = "Automatic testing of Haskell programs";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
  };
 })  

--- a/pkgs/development/libraries/haskell/X11/default.nix
+++ b/pkgs/development/libraries/haskell/X11/default.nix
@ -4,8 +4,8 @@ assert xineramaSupport -> (libXinerama != null && libXext != null);

 cabal.mkDerivation (self : {
  pname = "X11";
-  version = "1.4.6.1";
-  sha256 = "3e1375d4e53a8366fa2ea12bd9c3033ffe2f7dd00443acd84f722cf0dfff0fa9";
+  version = "1.5.0.0";
+  sha256 = "653ff8aa4053574a36dbb1729459df6e5a1a87a223bc3eeced8e40c6e3a5406f";
  propagatedBuildInputs = [libX11] ++ (if xineramaSupport then [libXinerama libXext] else []);
  meta = {
    description = "A Haskell binding to the X11 graphics library";
--- a/pkgs/development/libraries/haskell/cabal/cabal.nix
+++ b/pkgs/development/libraries/haskell/cabal/cabal.nix
@ -9,15 +9,15 @@ attrs :

            # pname should be defined by the client to be the package basename
            # version should be defined by the client to be the package version
- 
+
            # fname is the internal full name of the package
            fname = "${self.pname}-${self.version}";

-	    # name is the external full name of the package; usually we prefix
-	    # all packages with haskell- to avoid name clashes for libraries;
-	    # if that is not desired (for applications), name can be set to
-	    # fname.
-            name = "haskell-${self.pname}-ghc${attrs.ghc.ghc.version}-${self.version}"; 
+            # name is the external full name of the package; usually we prefix
+            # all packages with haskell- to avoid name clashes for libraries;
+            # if that is not desired (for applications), name can be set to
+            # fname.
+            name = "haskell-${self.pname}-ghc${attrs.ghc.ghc.version}-${self.version}";

            # the default download location for Cabal packages is Hackage,
            # you still have to specify the checksum
@ -37,7 +37,7 @@ attrs :
            propagatedBuildInputs = [];

            # library directories that have to be added to the Cabal files
-            extraLibDirs = attrs.lib.lists.concatMap (x : [ (x + "/lib64") (x + "/lib") ]) self.propagatedBuildInputs;
+            extraLibDirs = [];

            # compiles Setup and configures
            configurePhase = ''
@ -46,7 +46,16 @@ attrs :
              for i in Setup.hs Setup.lhs; do
                test -f $i && ghc --make $i
              done
-              ./Setup configure --verbose --prefix="$out" ${toString (map (x : "--extra-lib-dir=" + x) self.extraLibDirs)} $configureFlags
+
+              for p in $propagatedBuildInputs; do
+                for d in lib{,64}; do
+                  if [ -e "$p/$d" ]; then
+                    extraLibDirs="$extraLibDirs --extra-lib-dir=$p/$d"
+                  fi
+                done
+              done
+
+              ./Setup configure --verbose --prefix="$out" $extraLibDirs $configureFlags

              eval "$postConfigure"
            '';
@ -57,12 +66,15 @@ attrs :

              ./Setup build

+              export GHC_PACKAGE_PATH=$(ghc-packages)
+              ./Setup haddock
+
              eval "$postBuild"
            '';

-	    # installs via Cabal; creates a registration file for nix-support
-	    # so that the package can be used in other Haskell-builds; also
-	    # adds all propagated build inputs to the user environment packages
+            # installs via Cabal; creates a registration file for nix-support
+            # so that the package can be used in other Haskell-builds; also
+            # adds all propagated build inputs to the user environment packages
            installPhase = ''
              eval "$preInstall"

@ -82,9 +94,13 @@ attrs :

              ensureDir $out/nix-support
              ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
-              
+
              eval "$postInstall"
            '';
+
+            # We inherit stdenv and ghc so that they can be used
+            # in Cabal derivations.
+            inherit (attrs) stdenv ghc;
          };
    in  attrs.stdenv.mkDerivation ((rec { f = dtransform f // transform f; }).f);
-} 
+}
--- a/pkgs/development/libraries/haskell/haskeline/default.nix
+++ b/pkgs/development/libraries/haskell/haskeline/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self : {
  pname = "haskeline";
-  version = "0.6.1.3";
-  sha256 = "af27d17bf6df7647e843bca91548b542748a5305f072ba7cfef97105a52578d4";
+  version = "0.6.2.2";
+  sha256 = "b6307563258802453d65c7e7bd1ef1c6635fefea17af3e01449192b52075b25b";
  propagatedBuildInputs = [extensibleExceptions mtl utf8String];
  meta = {
    description = "A command-line interface for user input, written in Haskell";
--- a/pkgs/development/libraries/haskell/regular/default.nix
+++ b/pkgs/development/libraries/haskell/regular/default.nix
@ -2,10 +2,12 @@

 cabal.mkDerivation (self : {
  pname = "regular";
-  version = "0.1";
-  sha256 = "2f2858a22dd26d93eaa4b5244141d6d146387eac98e0fb15f647123d50525820";
+  version = "0.2.1";
+  sha256 = "732de15c4687b34a2702d38975581c8ab32167a76cd3c40cd4886bca0fc8b762";
  meta = {
    description = "Generic programming library for regular datatypes";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
  };
 })  

--- a/pkgs/development/libraries/haskell/utf8-string/default.nix
+++ b/pkgs/development/libraries/haskell/utf8-string/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self : {
  pname = "utf8-string";
-  version = "0.3.5";
-  sha256 = "41f99b3e9f61ab5309c93f98d45f1ba2e475a8504c5202a350720c27fb82d07a";
+  version = "0.3.6";
+  sha256 = "c8c74555174edfb96145585c9b80780d0fc55ba249282b8a4c5968cca7c09d69";
  meta = {
    description = "A UTF8 layer for IO and Strings";
  };
--- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
+++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self : {
  pname = "uu-parsinglib";
-  version = "2.2.1";
-  sha256 = "f05088d621715e5ebc7037f1a8cb5f34fd13ed055a26bf2dc331bdbeef7552dc";
+  version = "2.3.0";
+  sha256 = "0ddf5ff41e59d8a777942f821170f1e6c7373712b029261a7efbc16fa663b671";
  meta = {
    description = "New version of the Utrecht University parser combinator library";
  };
--- a/pkgs/development/libraries/java/dbus-java/default.nix
+++ b/pkgs/development/libraries/java/dbus-java/default.nix
@ -0,0 +1,21 @@
+{stdenv, fetchurl, gettext, jdk, libmatthew_java}:
+
+stdenv.mkDerivation {
+  name = "dbus-java-2.7";
+  src = fetchurl {
+    url = http://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.7.tar.gz;
+    sha256 = "0cyaxd8x6sxmi6pklkkx45j311a6w51fxl4jc5j3inc4cailwh5y";
+  };
+  JAVA_HOME=jdk;
+  JAVA="${jdk}/bin/java";
+  PREFIX=''''${out}'';
+  JAVAUNIXLIBDIR="${libmatthew_java}/lib/jni";
+  JAVAUNIXJARDIR="${libmatthew_java}/share/java";
+  buildInputs = [ gettext jdk ];
+  # I'm too lazy to build the documentation
+  preBuild = ''
+    sed -i -e "s|all: bin doc man|all: bin|" \
+           -e "s|install: install-bin install-man install-doc|install: install-bin|" Makefile
+  '';
+  maintainers = [ stdenv.lib.maintainers.sander ];
+}
--- a/pkgs/development/libraries/java/libmatthew-java/default.nix
+++ b/pkgs/development/libraries/java/libmatthew-java/default.nix
@ -0,0 +1,13 @@
+{stdenv, fetchurl, jdk}:
+
+stdenv.mkDerivation {
+  name = "libmatthew-java-0.7.2";
+  src = fetchurl {
+    url = http://www.matthew.ath.cx/projects/java/libmatthew-java-0.7.2.tar.gz;
+    sha256 = "00zd6vplbvha64pf65bpw44abg2y8irblik30pbk35wcm86a0j4z";
+  };
+  JAVA_HOME=jdk;
+  PREFIX=''''${out}'';
+  buildInputs = [ jdk ];
+  maintainers = [ stdenv.lib.maintainers.sander ];
+}
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@ -1,11 +1,11 @@
 {stdenv, fetchurl, pkgconfig, libpthreadstubs}:

 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.15";
+  name = "libdrm-2.4.17";
  
  src = fetchurl {
    url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "1pm7iddv3yjwvqmlbdmj9m55bmkfcfzq0wvqpgx4gkmdjfd8kzxw";
+    sha256 = "0sii8bhplb99i4x67626sd4pm1c2i3i0c73rdma71sdh233fg95q";
  };

  buildInputs = [ pkgconfig libpthreadstubs ];
--- a/pkgs/development/libraries/libextractor/0.5.18.nix
+++ b/pkgs/development/libraries/libextractor/0.5.18.nix
@ -1,21 +0,0 @@
-args : with args;
-	let localDefs = builderDefs.passthru.function {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://gnunet.org/libextractor/download/libextractor-0.5.18.tar.gz;
-			sha256 = "09y869zmnr6n2953ra4y7z9m9nj23prlqa4nr4rwcb50dzdmil1k";
-		};
-
-		buildInputs = [ zlib];
-		configureFlags = [];
-	};
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "libextractor-0.5.18";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "A tool to extract metadata from files";
-		inherit src;
-	};
-}
--- a/pkgs/development/libraries/libextractor/default.nix
+++ b/pkgs/development/libraries/libextractor/default.nix
@ -0,0 +1,64 @@
+{ fetchurl, stdenv, libtool, gettext, zlib, bzip2, flac, libvorbis, libmpeg2
+, ffmpeg, exiv2, libgsf, rpm, pkgconfig, glib, gtk }:
+
+stdenv.mkDerivation rec {
+  name = "libextractor-0.5.23";
+
+  src = fetchurl {
+    url = "mirror://gnu/libextractor/${name}.tar.gz";
+    sha256 = "1zyfshayjrp7kd87pm7blyq0dvbv5bbh3f368pp4jws4qxs8aj9f";
+  };
+
+  preConfigure =
+    '' echo "patching installation directory in \`extractor.c'..."
+       sed -i "src/main/extractor.c" \
+           -e "s|pexe[[:blank:]]*=.*$|pexe = strdup(\"$out/lib/\");|g"
+    '';
+
+  buildInputs =
+   [ libtool gettext zlib bzip2 flac libvorbis libmpeg2 exiv2 ffmpeg
+     libgsf rpm
+     pkgconfig glib gtk
+   ];
+
+  configureFlags = "--disable-ltdl-install "
+    + "--with-ltdl-include=${libtool}/include "
+    + "--with-ltdl-lib=${libtool}/lib "
+    + "--enable-xpdf";
+
+  # Checks need to be run after "make install", otherwise plug-ins are not in
+  # the search path, etc.
+  # FIXME: Tests currently fail and the test framework appears to be deeply
+  # broken anyway.
+  doCheck = false;
+  #postInstall = "make check";
+
+  meta = {
+    description = "GNU libextractor, a simple library for keyword extraction";
+
+    longDescription =
+      '' GNU libextractor is a library used to extract meta-data from files
+         of arbitrary type.  It is designed to use helper-libraries to perform
+         the actual extraction, and to be trivially extendable by linking
+         against external extractors for additional file types.
+
+         The goal is to provide developers of file-sharing networks or
+         WWW-indexing bots with a universal library to obtain simple keywords
+         to match against queries.  libextractor contains a shell-command
+         extract that, similar to the well-known file command, can extract
+         meta-data from a file an print the results to stdout.
+
+         Currently, libextractor supports the following formats: HTML, PDF,
+         PS, OLE2 (DOC, XLS, PPT), OpenOffice (sxw), StarOffice (sdw), DVI,
+         MAN, FLAC, MP3 (ID3v1 and ID3v2), NSF(E) (NES music), SID (C64
+         music), OGG, WAV, EXIV2, JPEG, GIF, PNG, TIFF, DEB, RPM, TAR(.GZ),
+         ZIP, ELF, S3M (Scream Tracker 3), XM (eXtended Module), IT (Impulse
+         Tracker), FLV, REAL, RIFF (AVI), MPEG, QT and ASF.  Also, various
+         additional MIME types are detected.
+      '';
+
+    license = "GPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
+}
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@ -1,11 +1,11 @@
 { fetchurl, stdenv }:

 stdenv.mkDerivation rec {
-  name = "libidn-1.13";
+  name = "libidn-1.16";

  src = fetchurl {
    url = "mirror://gnu/libidn/${name}.tar.gz";
-    sha256 = "07p7cnmfnq7ds8a56iqmxps46bzznn92xxpdlnnp3n6pwcnidmn7";
+    sha256 = "1zywwhqg7i44qg0sj2wpwprxif7723sp3if7vhvgy8mdzfn0zn7p";
  };

  doCheck = true;
@ -31,5 +31,7 @@ stdenv.mkDerivation rec {
    '';

    license = "LGPLv2+";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.ludo ];
  };
 }
--- a/pkgs/development/libraries/libjpeg/62.nix
+++ b/pkgs/development/libraries/libjpeg/62.nix
@ -0,0 +1,29 @@
+{stdenv, fetchurl, libtool, static ? false, ...}: 
+
+stdenv.mkDerivation {
+  name = "libjpeg-6b";
+  
+  builder = ./builder.sh;
+  
+  src = fetchurl {
+    url = http://www.ijg.org/files/jpegsrc.v6b.tar.gz;
+    md5 = "dbd5f3b47ed13132f04c685d608a7547";
+  };
+  
+  inherit libtool;
+
+  configureFlags = "--enable-shared ${if static then " --enable-static" else ""}";
+    
+  # Required for building of dynamic libraries on Darwin.
+  patches = [
+    (fetchurl {
+      url = http://svn.macports.org/repository/macports/trunk/dports/graphics/jpeg/files/patch-ltconfig;
+      md5 = "e6725fa4a09aa1de4ca75343fd0f61d5";
+    })
+    (fetchurl {
+      url = http://svn.macports.org/repository/macports/trunk/dports/graphics/jpeg/files/patch-ltmain.sh;
+      #md5 = "489986ad8e7a93aef036766b25f321d5";
+      md5 = "092a12aeb0c386dd7dae059109d950ba";
+    })
+  ];
+}
--- a/pkgs/development/libraries/libjpeg/builder.sh
+++ b/pkgs/development/libraries/libjpeg/builder.sh
@ -0,0 +1,25 @@
+source $stdenv/setup
+
+preConfigure() {
+    # Workarounds for the ancient libtool shipped by libjpeg.
+    ln -s $libtool/bin/libtool .
+    cp $libtool/share/libtool/config.guess .
+    cp $libtool/share/libtool/config.sub .
+}
+
+preInstall() {
+    mkdir $out
+    mkdir $out/bin
+    mkdir $out/lib
+    mkdir $out/include
+    mkdir $out/man
+    mkdir $out/man/man1
+}
+
+patchPhase() {
+    for i in $patches; do
+	patch < $i
+    done
+}
+
+genericBuild
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@ -1,15 +1,23 @@
 {stdenv, fetchurl, curl}:

 stdenv.mkDerivation rec {
-  name = "libmicrohttpd-0.3.1";
+  name = "libmicrohttpd-0.4.4";

  src = fetchurl {
    url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
-    sha256 = "1zv8a7lwypwbwzam5jvr35wvxb13chyh0ir18k82nzm9q5s3v3n3";
+    sha256 = "1w486b4hpwnzpc4zdywm3f1q5zs7j4yh7xibbsig6b8cv1npn0rz";
  };

  buildInputs = [ curl ];

+  preCheck =
+    # Since `localhost' can't be resolved in a chroot, work around it.
+    '' for i in "src/test"*"/"*.[ch]
+       do
+         sed -i "$i" -es/localhost/127.0.0.1/g
+       done
+    '';
+
  doCheck = true;

  meta = {
@ -23,5 +31,7 @@ stdenv.mkDerivation rec {
    license = "LGPLv2+";

    homepage = http://www.gnu.org/software/libmicrohttpd/;
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
  };
 }
--- a/pkgs/development/libraries/libmusclecard/default.nix
+++ b/pkgs/development/libraries/libmusclecard/default.nix
@ -0,0 +1,22 @@
+{stdenv, fetchurl, pkgconfig, pcsclite}:
+stdenv.mkDerivation {
+  name = "libmusclecard-1.3.6";
+
+  src = fetchurl {
+    url = https://alioth.debian.org/frs/download.php/3024/libmusclecard-1.3.6.tar.bz2;
+    sha256 = "1sswy7vcy0w9p6818al7prv9d3whj7w3w98k55zw9nhspbj6lppb";
+  };
+
+  # The OS should care on preparing the services into this location
+  configureFlags = [ "--enable-muscledropdir=/var/lib/pcsc/services" ];
+
+  buildInputs = [ pkgconfig pcsclite ];
+
+  meta = {
+    description = "Library for MUSCLE smartcard applications";
+    homepage = http://pcsclite.alioth.debian.org/;
+    license = "BSD";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
--- a/pkgs/development/libraries/libp11/default.nix
+++ b/pkgs/development/libraries/libp11/default.nix
@ -0,0 +1,18 @@
+{stdenv, fetchurl, libtool, openssl, pkgconfig}:
+
+stdenv.mkDerivation rec {
+  name = "libp11-0.2.7";
+  
+  src = fetchurl {
+    url = "http://www.opensc-project.org/files/libp11/${name}.tar.gz";
+    sha256 = "0kaz5qafaxm0ycywmajl166c29fh9cz89b8i043jqsbxlpzf4hdp";
+  };
+  
+  buildInputs = [ libtool openssl pkgconfig ];
+
+  meta = {
+    homepage = http://www.opensc-project.org/libp11/;
+    license = "LGPL";
+    description = "Small layer on top of PKCS#11 API to make PKCS#11 implementations easier";
+  };
+}
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@ -5,12 +5,14 @@ if stdenv.system != "i686-linux" && stdenv.system != "x86_64-linux" && stdenv.sy
 else

 stdenv.mkDerivation {
-  name = "mesa-7.5.2";
+  name = "mesa-7.6.1";
  
  src = fetchurl {
-    url = ftp://ftp.freedesktop.org/pub/mesa/7.5.2/MesaLib-7.5.2.tar.bz2;
-    md5 = "94e47a499f1226803869c2e37a6a8e3a";
+    url = ftp://ftp.freedesktop.org/pub/mesa/7.6.1/MesaLib-7.6.1.tar.bz2;
+    md5 = "7db4617e9e10ad3aca1b64339fd71b7d";
  };
+
+  configureFlags = "--disable-gallium";
  
  buildInputs =
    [ pkgconfig expat x11 libdrm xlibs.glproto
--- a/pkgs/development/libraries/mesa/headers.nix
+++ b/pkgs/development/libraries/mesa/headers.nix
@ -1,10 +0,0 @@
-{stdenv, mesaSrc}:
-
-stdenv.mkDerivation {
-  name = "mesa-headers-6.5.2"; # !!! keep up-to-date
-  buildCommand = "
-    unpackFile ${mesaSrc}
-    ensureDir $out/include
-    cp -prvd Mesa-*/include/GL $out/include/
-  ";
-}
--- a/pkgs/development/libraries/mpeg2dec/default.nix
+++ b/pkgs/development/libraries/mpeg2dec/default.nix
@ -8,6 +8,8 @@ stdenv.mkDerivation {
    sha256 = "1vny7rg0p2rmic71hli2l2612i5yaw8vy0wsnm5nvhwfiw37cjn7";
  };

+  configureFlags = "--enable-shared --disable-static";
+
  meta = {
    homepage = http://libmpeg2.sourceforge.net/;
    description = "A free library for decoding mpeg-2 and mpeg-1 video streams";
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@ -10,11 +10,11 @@ let
 in

 stdenv.mkDerivation {
-  name = "nss-3.12.4";
+  name = "nss-3.12.5";
  
  src = fetchurl {
-    url = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_4_RTM/src/nss-3.12.4.tar.gz;
-    sha1 = "a152bf980f3a3dcf575c2d149fb279058ef2e757";
+    url = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_5_RTM/src/nss-3.12.5.tar.gz;
+    sha1 = "ec12c6eddba5fb4609a174b079095b374935d37c";
  };

  buildInputs = [nspr perl zlib];
--- a/pkgs/development/libraries/openct/default.nix
+++ b/pkgs/development/libraries/openct/default.nix
@ -0,0 +1,21 @@
+{stdenv, fetchurl, libtool, pcsclite, libusb, pkgconfig}:
+
+stdenv.mkDerivation rec {
+  name = "openct-0.6.19";
+  
+  src = fetchurl {
+    url = "http://www.opensc-project.org/files/openct/${name}.tar.gz";
+    sha256 = "1y4jlr877g3lziq7i3p6pdkscqpkn1lld874q6r2hsvc39n7c88z";
+  };
+  
+  configureFlags = [ "--enable-usb" "--enable-pcsc" "--localstatedir=/var" ];
+  buildInputs = [ libtool pcsclite libusb pkgconfig ];
+
+  meta = {
+    homepage = http://www.opensc-project.org/openct/;
+    license = "LGPL";
+    description = "Drivers for several smart card readers";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
--- a/pkgs/development/libraries/opensc-dnie/default.nix
+++ b/pkgs/development/libraries/opensc-dnie/default.nix
@ -0,0 +1,49 @@
+{stdenv, fetchurl, writeScript, patchelf, glib, opensc, openssl, openct, libtool, pcsclite,
+zlib}:
+
+# Version 1.4.6-2 works only with opensc 0.11.7
+assert opensc.name == "opensc-0.11.7";
+
+stdenv.mkDerivation rec {
+  name = "opensc-dnie-1.4.6-2";
+  
+  src = if (stdenv.system == "i686-linux") then (fetchurl {
+      url = http://www.dnielectronico.es/descargas/PKCS11_para_Sistemas_Unix/1.4.6.Ubuntu_Jaunty_32/Ubuntu_Jaunty_opensc-dnie_1.4.6-2_i386.deb.tar;
+      sha256 = "1i6r9ahjr0rkcxjfzkg2rrib1rjsjd5raxswvvfiya98q8rlv39i";
+    })
+    else if (stdenv.system == "x86_64-linux") then (fetchurl { url = http://www.dnielectronico.es/descargas/PKCS11_para_Sistemas_Unix/1.4.6.Ubuntu_Jaunty_64/Ubuntu_Jaunty_opensc-dnie_1.4.6-2_amd64.deb.tar;
+      sha256 = "1py2bxavdcj0crhk1lwqzjgya5lvyhdfdbr4g04iysj56amxb7f9";
+    })
+    else throw "Architecture not supported";
+
+  buildInputs = [ patchelf glib ];
+
+  builder = writeScript (name + "-builder.sh") ''
+    source $stdenv/setup
+    tar xf $src
+    ar x opensc-dnie*
+    tar xf data.tar.gz
+
+    RPATH=${glib}/lib:${opensc}/lib:${openssl}/lib:${openct}/lib:${libtool}/lib:${pcsclite}/lib:${stdenv.gcc.libc}/lib:${zlib}/lib
+
+    for a in usr/lib/*.so*; do
+        if ! test -L $a; then
+            patchelf --set-rpath $RPATH $a
+        fi
+    done
+
+    sed -i s,/usr,$out, usr/lib/pkgconfig/*
+   
+    ensureDir $out
+    cp -R usr/lib $out
+    cp -R usr/share $out
+  '';
+
+  meta = {
+    homepage = http://www.dnielectronico.es/descargas/;
+    description = "Opensc plugin to access the Spanish national ID smartcard";
+    license = "nonfree";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
--- a/pkgs/development/libraries/pango/1.26.x.nix
+++ b/pkgs/development/libraries/pango/1.26.x.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }:

 stdenv.mkDerivation rec {
-  name = "pango-1.26.0";
+  name = "pango-1.26.2";

  src = fetchurl {
    url = "mirror://gnome/sources/pango/1.26/${name}.tar.bz2";
-    sha256 = "1hx6v6w3xk9wfcrb26gg7rrfl6m6ykxk2bqm67aqdzql4vysxgz1";
+    sha256 = "021ygk3l9bk00gsvxk02flxsk68w0wl99dx221fmb547bng8g19v";
  };

  buildInputs = [pkgconfig] ++ stdenv.lib.optional (stdenv.system == "i686-darwin") gettext;
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@ -0,0 +1,12 @@
+{stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig,
+openssl}:
+
+stdenv.mkDerivation rec {
+  name = "podofo-0.7.0";
+  src = fetchurl {
+    url = "mirror://sourceforge/podofo/${name}.tar.gz";
+    sha256 = "1hpd5ldjv013041rmcfrkbk8v6wdpxcg60i3aklik583q2rf0mqy";
+  };
+  buildInputs = [ cmake zlib freetype libjpeg libtiff fontconfig openssl ];
+  cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF";
+}
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@ -5,11 +5,11 @@
 assert qt4Support -> (qt4 != null);

 stdenv.mkDerivation rec {
-  name = "poppler-0.10.6";
+  name = "poppler-0.12.3";

  src = fetchurl {
    url = "http://poppler.freedesktop.org/${name}.tar.gz";
-    sha256 = "bcd78d674c4166af069afdb27af810c012e13cfd2b7b21f9dce63dd3f62bded1";
+    sha256 = "1k7vilpz0ipnmw9dfpb3rqkhlm4rqcnkn3bhhp14di2h55nzwkvs";
  };

  buildInputs = [pkgconfig zlib glib cairo freetype fontconfig libjpeg gtk]
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
    ''
    + (if qt4Support then "--enable-qt-poppler" else "--disable-qt-poppler");

-  patches = [ ./GDir-const.patch ./use_exceptions.patch ];
+  patches = [ ./GDir-const.patch ];

  preConfigure = "sed -e '/jpeg_incdirs/s@/usr@${libjpeg}@' -i configure";

--- a/pkgs/development/libraries/poppler/use_exceptions.patch
+++ b/pkgs/development/libraries/poppler/use_exceptions.patch
@ -1,60 +0,0 @@
-diff -ur poppler-0.6.1/goo/gmem.cc poppler-0.6.1-patched/goo/gmem.cc
--- poppler-0.6.1/goo/gmem.cc	2007-10-12 13:34:49.000000000 +0200
-+++ poppler-0.6.1-patched/goo/gmem.cc	2007-11-06 16:17:41.290632269 +0100
-@@ -60,7 +60,7 @@
-   }
-   size1 = gMemDataSize(size);
-   if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) {
-#if USE_EXCEPTIONS
-+#ifdef USE_EXCEPTIONS
-     throw GMemException();
- #else
-     fprintf(stderr, "Out of memory\n");
-@@ -95,7 +95,7 @@
-     return NULL;
-   }
-   if (!(p = malloc(size))) {
-#if USE_EXCEPTIONS
-+#ifdef USE_EXCEPTIONS
-     throw GMemException();
- #else
-     fprintf(stderr, "Out of memory\n");
-@@ -143,7 +143,7 @@
-     q = malloc(size);
-   }
-   if (!q) {
-#if USE_EXCEPTIONS
-+#ifdef USE_EXCEPTIONS
-     throw GMemException();
- #else
-     fprintf(stderr, "Out of memory\n");
-@@ -162,7 +162,7 @@
-   }
-   n = nObjs * objSize;
-   if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
-#if USE_EXCEPTIONS
-+#ifdef USE_EXCEPTIONS
-     throw GMemException();
- #else
-     fprintf(stderr, "Bogus memory allocation size\n");
-@@ -183,7 +183,7 @@
-   }
-   n = nObjs * objSize;
-   if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
-#if USE_EXCEPTIONS
-+#ifdef USE_EXCEPTIONS
-     throw GMemException();
- #else
-     fprintf(stderr, "Bogus memory allocation size\n");
-diff -ur poppler-0.6.1/goo/gmem.h poppler-0.6.1-patched/goo/gmem.h
--- poppler-0.6.1/goo/gmem.h	2007-09-17 20:37:39.000000000 +0200
-+++ poppler-0.6.1-patched/goo/gmem.h	2007-11-06 16:17:46.606925527 +0100
-@@ -12,7 +12,7 @@
- #include <stdio.h>
- #include <poppler/poppler-config.h>
- 
-#if USE_EXCEPTIONS
-+#ifdef USE_EXCEPTIONS
- 
- class GMemException {
- public:
--- a/pkgs/development/libraries/qt-4.6/default.nix
+++ b/pkgs/development/libraries/qt-4.6/default.nix
@ -13,6 +13,10 @@ stdenv.mkDerivation {
  };
  
  setupHook = ./setup-hook.sh;
+
+  preConfigure = '' 
+    export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH"
+  '';
  
  propagatedBuildInputs = [
    libXft 
--- a/pkgs/development/libraries/scmccid/default.nix
+++ b/pkgs/development/libraries/scmccid/default.nix
@ -0,0 +1,38 @@
+{stdenv, fetchurl, patchelf, libusb}:
+
+stdenv.mkDerivation rec {
+  name = "scmccid-5.0.11";
+  
+  src = if (stdenv.system == "i686-linux") then (fetchurl {
+      url = "http://www.scmmicro.com/support/download/scmccid_5.0.11_linux.tar.gz";
+      sha256 = "1r5wkarhzl09ncgj55baizf573czw0nplh1pgddzx9xck66kh5bm";
+    })
+    else if (stdenv.system == "x86_64-linux") then (fetchurl {
+        url = "http://www.scmmicro.com/support/download/scmccid_5.0.11_linux_x64.tar.gz";
+        sha256 = "0k9lzlk01sl4ycfqgrqqy3bildz0mcr1r0kkicgjz96l4s0jgz0i";
+    })
+    else throw "Architecture not supported";
+
+  buildInputs = [ patchelf ];
+
+  installPhase = ''
+    RPATH=${libusb}/lib:${stdenv.gcc.libc}/lib
+
+    for a in proprietary/*/Contents/Linux/*.so*; do
+        if ! test -L $a; then
+            patchelf --set-rpath $RPATH $a
+        fi
+    done
+
+    ensureDir $out/pcsc/drivers
+    cp -R proprietary/* $out/pcsc/drivers
+  '';
+
+  meta = {
+    homepage = http://www.scmmicro.com/support/pc-security-support/downloads.html;
+    description = "PCSC drivers for linux, for the SCM SCR3310 v2.0 card and others";
+    license = "nonfree";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
--- a/pkgs/development/libraries/webkit/src-for-default.nix
+++ b/pkgs/development/libraries/webkit/src-for-default.nix
@ -1,9 +1,9 @@
 rec {
-   version="r51303";
-   name="webkit-r51303";
-   hash="0khlc38gzb65xr0fsap60cz65rd6d7f7v31hhj4x1bxjrm3pj48w";
-   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r51303.tar.bz2";
-   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r51303.tar.bz2";
+   version="r53178";
+   name="webkit-r53178";
+   hash="0452kfqd73igmkgp0v4w13lk3ycypqz4zl9hnspg7ns5vlyknqcn";
+   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r53178.tar.bz2";
+   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r53178.tar.bz2";
  
  
 }
--- a/pkgs/development/python-modules/pyqt/default.nix
+++ b/pkgs/development/python-modules/pyqt/default.nix
@ -6,7 +6,7 @@ stdenv.mkDerivation {
    url = http://pyqwt.sourceforge.net/support/PyQt-x11-gpl-4.5.4.tar.gz; # Not downloading from riverbank, since they remove older releases
    sha256 = "1a55zng6yhnbk5swc02bkbyccdgf0f0v94yxk9v5a43hv9xnrl5k";
  };
-  configurePhase = "python ./configure.py --confirm-license -b $out/bin -d $out/lib/python2.5/site-packages -v $out/share/sip -p $out/plugins";
+  configurePhase = "python ./configure.py --confirm-license -b $out/bin -d $out/lib/${python.libPrefix}/site-packages -v $out/share/sip -p $out/plugins";
  buildInputs = [ python sip qt4 ];
  meta = {
    description = "Python bindings for Qt";
--- a/pkgs/development/python-modules/python-sip/default.nix
+++ b/pkgs/development/python-modules/python-sip/default.nix
@ -6,7 +6,7 @@ stdenv.mkDerivation {
    url = http://pyqwt.sourceforge.net/support/sip-4.8.2.tar.gz; # Not downloading from riverbank, since they remove older releases
    sha256 = "1afr2qaibzgf8fq4fmc31jz9hvbwxbg5jvl68ygvkkdvnbg2kfrf";
  };
-  configurePhase = "python ./configure.py -d $out/lib/python2.5/site-packages -b $out/bin -e $out/include";
+  configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include";
  buildInputs = [ python ];
  meta = {
    description = "Creates C++ bindings for Python modules";
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@ -29,16 +29,16 @@ rec {
  '') ["addInputs" "doUnpack"];

  doInstall = a.fullDepEntry(''
-    ensureDir "$out/lib/python2.5/site-packages"
+    ensureDir "$out/lib/${a.python.libPrefix}/site-packages"

-    PYTHONPATH="$out/lib/python2.5/site-packages:$PYTHONPATH" \
+    PYTHONPATH="$out/lib/${a.python.libPrefix}/site-packages:$PYTHONPATH" \
    python setup.py install --prefix="$out"

    for i in "$out/bin/"*
    do
      wrapProgram "$i"                          \
        --prefix PYTHONPATH ":"			\
-          "$out/lib/python2.5/site-packages"
+          "$out/lib/${a.python.libPrefix}/site-packages"
    done
  '') ["doBuild"];

--- a/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/default.nix
@ -11,8 +11,8 @@ let {
      inherit antContrib jdk;

      src = fetchurl {
-        url = http://apache.mirror.transip.nl/ant/binaries/apache-ant-1.7.1-bin.tar.bz2 ;
-        sha256 = "15rgkini0g100jygp7z9hgc3yfb9m62q4nk989rin7dqj2flrr94";
+        url = http://apache.mirror.transip.nl/ant/binaries/apache-ant-1.8.0RC1-bin.tar.bz2 ;
+        sha256 = "0xvmrsghibq7p3wvfkmvmkkg0zzfmw32lrfjl5f6cfzchjjnw9wx";
      };
    };

--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@ -1,21 +1,68 @@
-{stdenv, fetchurl, python, twisted, makeWrapper}:
+{ fetchurl, stdenv, buildPythonPackage, twisted, texinfo }:
+
+buildPythonPackage (rec {
+  name = "buildbot-0.7.11p3";
+  namePrefix = "";

-stdenv.mkDerivation rec {
-  name = "buildbot-${version}";
-  version = "0.7.8";
-  meta = {
-    homepage = "http://buildbot.net/";
-    description = "A system to automate the compile/test cycle to validate code changes.";
-  };
  src = fetchurl {
-    url = "mirror://sourceforge/buildbot/buildbot-${version}.tar.gz";
-    sha256 = "0f3qkbs1y4a1djxbfkvsr1639qkc7bzzsz2wpas2mk1zg8zrci2v";
+    url = "mirror://sourceforge/buildbot/${name}.tar.gz";
+    sha256 = "0h77ijf5iqvc8bnfxpsh3hvpr7wj23pkcywd3hcyphv1wwlhmhjv";
  };
-  propagatedBuildInputs = [python twisted makeWrapper];
-  buildPhase = "true";
-  installPhase =
-  ''
-     python setup.py install --prefix=$out --install-lib=$(toPythonPath $out) -O1
-     for n in $out/bin/*; do wrapProgram $n --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH"; done
-  '';
-}
+
+  patchPhase =
+    # The code insists on /usr/bin/tail, /usr/bin/make, etc.
+    '' echo "patching erroneous absolute path references..."
+       for i in $(find -name \*.py)
+       do
+         sed -i "$i" \
+             -e "s|/usr/bin/python|$(type -P python)|g ; s|/usr/bin/||g"
+       done
+    '';
+
+  buildInputs = [ texinfo ];
+  propagatedBuildInputs = [ twisted ];
+
+  # FIXME: Some tests fail.
+  doCheck = false;
+
+  postInstall =
+    '' ensureDir "$out/share/info"
+       make -C docs buildbot.info
+       cp -v "docs/buildbot.info"* "$out/share/info"
+    '';
+
+  meta = {
+    homepage = http://buildbot.net/;
+
+    license = "GPLv2+";
+
+    # Of course, we don't really need that on NixOS.  :-)
+    description = "BuildBot, a system to automate the software compile/test cycle";
+
+    longDescription =
+      '' The BuildBot is a system to automate the compile/test cycle
+         required by most software projects to validate code changes.  By
+         automatically rebuilding and testing the tree each time something
+         has changed, build problems are pinpointed quickly, before other
+         developers are inconvenienced by the failure.  The guilty
+         developer can be identified and harassed without human
+         intervention.  By running the builds on a variety of platforms,
+         developers who do not have the facilities to test their changes
+         everywhere before checkin will at least know shortly afterwards
+         whether they have broken the build or not.  Warning counts, lint
+         checks, image size, compile time, and other build parameters can
+         be tracked over time, are more visible, and are therefore easier
+         to improve.
+
+         The overall goal is to reduce tree breakage and provide a platform
+         to run tests or code-quality checks that are too annoying or
+         pedantic for any human to waste their time with.  Developers get
+         immediate (and potentially public) feedback about their changes,
+         encouraging them to be more careful about testing before checking
+         in code.
+      '';
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.all;
+  };
+})
--- a/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/pkgs/development/tools/misc/coccinelle/default.nix
@ -1,11 +1,11 @@
 { fetchurl, stdenv, ocaml, perl, python, ncurses, makeWrapper }:

 stdenv.mkDerivation rec {
-  name = "coccinelle-0.1.11rc1";
+  name = "coccinelle-0.2.0";

  src = fetchurl {
    url = "http://coccinelle.lip6.fr/distrib/${name}.tgz";
-    sha256 = "1rdsv3qcl6zcx3d3zd4cl9d79hdgaw19llxbflkfxipvkg3vk59x";
+    sha256 = "1mg6r92h8j3kqgy9iv6kk0g96m84wcj71iavgvv9qdbk3qwim8i4";
  };

  buildInputs = [ ocaml perl python ncurses makeWrapper ];
@ -18,14 +18,16 @@ stdenv.mkDerivation rec {

  buildPhase = "make depend && make all";

-  # Most of the test suite seems to fail (?!).
+  # Note: The tests want $out/share/coccinelle/standard.h so they must be run
+  # after "make install".
  doCheck = false;
-  checkPhase = "make test";

  postInstall =
    '' wrapProgram "$out/bin/spatch"                                    \
         --prefix "LD_LIBRARY_PATH" ":" "$out/lib"                      \
         --prefix "PYTHONPATH" ":" "$out/share/coccinelle/python"
+
+       make test
    '';

  meta = {
--- a/pkgs/games/quake3/wrapper/builder.sh
+++ b/pkgs/games/quake3/wrapper/builder.sh
@ -10,6 +10,6 @@ done
 # We add Mesa to the end of $LD_LIBRARY_PATH to provide fallback
 # software rendering.  GCC is needed so that libgcc_s.so can be found
 # when Mesa is used.
-makeWrapper $game/ioquake3.i386 $out/bin/quake3 \
+makeWrapper $game/ioquake3.* $out/bin/quake3 \
    --suffix-each LD_LIBRARY_PATH ':' "$mesa/lib $gcc/lib" \
    --add-flags "+set fs_basepath $out +set r_allowSoftwareGL 1"
--- a/pkgs/lib/lists.nix
+++ b/pkgs/lib/lists.nix
@ -167,4 +167,9 @@ rec {
    if list == [] || count == 0 then []
    else [ (head list) ] ++ take (builtins.sub count 1) (tail list);

+  last = list:
+    assert list != [];
+    let loop = l: if tail l == [] then head l else loop (tail l); in
+    loop list;
+
 }
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@ -5,6 +5,7 @@
     alphabetically sorted.  */

  andres = "Andres Loeh <andres@cs.uu.nl>";
+  astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
  eelco = "Eelco Dolstra <e.dolstra@tudelft.nl>";
  ludo = "Ludovic Courtès <ludo@gnu.org>";
  marcweber = "Marc Weber <marco-oweber@gmx.de>";
--- a/pkgs/lib/modules.nix
+++ b/pkgs/lib/modules.nix
@ -51,7 +51,7 @@ rec {
      getImportedSets = m: filter (x: !isPath x) (getImports m);

      getConfig = m:
-        removeAttrs (delayProperties m) ["require"];
+        removeAttrs (delayProperties m) ["require" "key"];
    in
      if isModule m then
        { key = "<unknown location>"; } // m
@ -81,18 +81,19 @@ rec {
  moduleClosure = initModules: args:
    let
      moduleImport = m:
-        (unifyModuleSyntax (applyIfFunction (importIfPath m) args)) // {
+        let m' = applyIfFunction (importIfPath m) args;
+        in (unifyModuleSyntax m') // {
          # used by generic closure to avoid duplicated imports.
-          key = if isPath m then m else "<unknown location>";
+          key = if isPath m then m else if m' ? key then m'.key else "<unknown location>";
        };

      getImports = m: attrByPath ["imports"] [] m;

    in
      (lazyGenericClosure {
-        startSet = map moduleImport (filter isPath initModules);
+        startSet = map moduleImport initModules;
        operator = m: map moduleImport (getImports m);
-      }) ++ (map moduleImport (filter (m: ! isPath m) initModules));
+      });

  selectDeclsAndDefs = modules:
    lib.concatMap (m:
--- a/pkgs/lib/strings.nix
+++ b/pkgs/lib/strings.nix
@ -141,4 +141,6 @@ rec {
      else
        s;

+  basename = s: lib.last (splitString "/" s);
+
 }
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@ -45,5 +45,7 @@ stdenv.mkDerivation rec {
    homepage = "http://www.winehq.org/";
    license = "LGPL";
    description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = [ "i686-linux" ];
  };
 }
--- a/pkgs/misc/emulators/wine/src-for-default.nix
+++ b/pkgs/misc/emulators/wine/src-for-default.nix
@ -1,9 +1,9 @@
 rec {
-   version="1.1.34";
-   name="wine-1.1.34";
-   hash="1llsm6h0s765n0s5nvr852iyml2ckdd7vq96dhqjlck5vr4nxsns";
+   version="1.1.36";
+   name="wine-1.1.36";
+   hash="0b22w68w7z4in21xy286yddix6sf4jna919z2lw2p9hxsgzvhlwk";
   url="http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2";
-   advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.1.34.tar.bz2";
+   advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.1.36.tar.bz2";
  
  
 }
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@ -10,7 +10,7 @@ stdenv.mkDerivation {
  configureFlags = [ "--enable-libdevmapper" ];

  patchPhase = ''
-    sed -i -e 's@/sbin/udevsettle@${udev}/sbin/udevsettle@' lib/libdevmapper.c
+    sed -i -e 's@/sbin/udevsettle@${udev}/sbin/udevadm settle@' lib/libdevmapper.c
  '';

  buildInputs = [ libuuid popt devicemapper ];
--- a/pkgs/os-specific/linux/device-mapper/default.nix
+++ b/pkgs/os-specific/linux/device-mapper/default.nix
@ -1,17 +0,0 @@
-{stdenv, fetchurl, enableStatic ? true}:
-
-stdenv.mkDerivation {
-  name = "device-mapper-1.02.27";
-  
-  src = fetchurl {
-    url = ftp://sources.redhat.com/pub/dm/device-mapper.1.02.27.tgz;
-    sha256 = "1z4dldjjxfinwvg39x4m2cm5rcsbxs833g3phm34f5a2lwh7i6v6";
-  };
-
-  inherit enableStatic;
-  
-  configureFlags = if enableStatic then "--enable-static_link" else "";
-
-  # To prevent make install from failing.
-  installFlags = "OWNER= GROUP=";
-}
--- a/pkgs/os-specific/linux/kernel/config-blocks.nix
+++ b/pkgs/os-specific/linux/kernel/config-blocks.nix
@ -0,0 +1,257 @@
+rec {
+      generalOptions = ''
+        # Don't include any debug features.
+        DEBUG_KERNEL n
+
+        # Support drivers that need external firmware.
+        STANDALONE n
+
+        # Make /proc/config.gz available.
+        IKCONFIG_PROC y
+
+        # Optimize with -O2, not -Os.
+        CC_OPTIMIZE_FOR_SIZE n
+
+        # Enable the kernel's built-in memory tester.
+        MEMTEST y
+
+        KALLSYMS_EXTRA_PASS n
+      '';
+      
+      virtualisation = ''
+        # Virtualisation (KVM, Xen...).
+        PARAVIRT_GUEST y
+        KVM_CLOCK y
+        KVM_GUEST y
+        XEN y
+        KSM y
+
+        # We need 64 GB (PAE) support for Xen guest support.
+        HIGHMEM64G? y
+      '';
+
+      noPAE = ''
+        HIGHMEM64G? n
+        PAE n
+      '';
+
+      usefulSubsystems = ''
+        # Enable various subsystems.
+        ACCESSIBILITY y # Accessibility support
+        AUXDISPLAY y # Auxiliary Display support
+        DONGLE y # Serial dongle support
+        HIPPI y
+        MTD_COMPLEX_MAPPINGS y # needed for many devices
+        NET_POCKET y # enable pocket and portable adapters
+        SCSI_LOWLEVEL y # enable lots of SCSI devices
+        SCSI_LOWLEVEL_PCMCIA y
+        SPI y # needed for many devices
+        SPI_MASTER y
+        WAN y
+      '';
+
+      cfq = ''
+        # Include the CFQ I/O scheduler in the kernel, rather than as a
+        # module, so that the initrd gets a good I/O scheduler.
+        IOSCHED_CFQ y
+      '';
+
+      noDebug = ''
+        # Disable some expensive (?) features.
+        FTRACE n
+        KPROBES n
+        PM_TRACE_RTC n
+
+        AIC79XX_DEBUG_ENABLE n
+        AIC7XXX_DEBUG_ENABLE n
+        AIC94XX_DEBUG n
+        USB_DEBUG n
+        CPU_FREQ_DEBUG n
+      '';
+
+      noNUMA = ''
+        NUMA? n
+      '';
+
+      networking = ''
+        # Networking options.
+        IP_PNP n
+        IPV6_PRIVACY y
+        NETFILTER_ADVANCED y
+        IP_VS_PROTO_TCP y
+        IP_VS_PROTO_UDP y
+        IP_VS_PROTO_ESP y
+        IP_VS_PROTO_AH y
+        IP_DCCP_CCID3 n # experimental
+        CLS_U32_PERF y
+        CLS_U32_MARK y
+      '';
+
+      wireless = ''
+        # Wireless networking.
+        IPW2100_MONITOR y # support promiscuous mode
+        IPW2200_MONITOR y # support promiscuous mode
+        IWLWIFI_LEDS? y
+        IWLWIFI_SPECTRUM_MEASUREMENT y
+        IWL3945_SPECTRUM_MEASUREMENT y
+        IWL4965 y # Intel Wireless WiFi 4965AGN
+        IWL5000 y # Intel Wireless WiFi 5000AGN
+        HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
+        HOSTAP_FIRMWARE_NVRAM y
+      '';
+
+      fb = ''
+        # Enable various FB devices.
+        FB y
+        FB_EFI y
+        FB_NVIDIA_I2C y # Enable DDC Support
+        FB_RIVA_I2C y
+        FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
+        FB_ATY_GX y # Mach64 GX support
+        FB_SAVAGE_I2C y
+        FB_SAVAGE_ACCEL y
+        FB_SIS_300 y
+        FB_SIS_315 y
+        FB_3DFX_ACCEL y
+        FB_GEODE y
+      '';
+
+      fbNoTileBlit = ''
+        # Disable tileblitting
+        FB_TILEBLITTING n
+        FB_S3 n
+        FB_VT8623 n
+        FB_ARK n
+      '';
+
+      fbConDecor = ''
+        ${fb}
+        ${fbNoTileBlit}
+        FRAMEBUFFER_CONSOLE y
+        FB_VESA y
+        FB_CON_DECOR y
+      '';
+
+      sound = ''
+        # Sound.
+        SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
+        SND_HDA_INPUT_BEEP y # Support digital beep via input layer
+        SND_USB_CAIAQ_INPUT y
+        PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
+      '';
+
+      usbserial = ''
+        # USB serial devices.
+        USB_SERIAL_GENERIC y # USB Generic Serial Driver
+        USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
+        USB_SERIAL_KEYSPAN_USA28 y
+        USB_SERIAL_KEYSPAN_USA28X y
+        USB_SERIAL_KEYSPAN_USA28XA y
+        USB_SERIAL_KEYSPAN_USA28XB y
+        USB_SERIAL_KEYSPAN_USA19 y
+        USB_SERIAL_KEYSPAN_USA18X y
+        USB_SERIAL_KEYSPAN_USA19W y
+        USB_SERIAL_KEYSPAN_USA19QW y
+        USB_SERIAL_KEYSPAN_USA19QI y
+        USB_SERIAL_KEYSPAN_USA49W y
+        USB_SERIAL_KEYSPAN_USA49WLC y
+      '';
+
+      fsXattr = ''
+        # Filesystem options - in particular, enable extended attributes and
+        # ACLs for all filesystems that support them.
+        EXT2_FS_XATTR y # Ext2 extended attributes
+        EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists
+        EXT2_FS_SECURITY y # Ext2 Security Labels
+        EXT2_FS_XIP y # Ext2 execute in place support
+        EXT4_FS_POSIX_ACL y
+        EXT4_FS_SECURITY y
+        REISERFS_FS_XATTR y
+        REISERFS_FS_POSIX_ACL y
+        REISERFS_FS_SECURITY y
+        JFS_POSIX_ACL y
+        JFS_SECURITY y
+        XFS_QUOTA y
+        XFS_POSIX_ACL y
+        XFS_RT y # XFS Realtime subvolume support
+        OCFS2_DEBUG_MASKLOG n
+        OCFS2_FS_POSIX_ACL y
+        BTRFS_FS_POSIX_ACL y
+        UBIFS_FS_XATTR y
+        UBIFS_FS_ADVANCED_COMPR y
+        NFSD_V2_ACL y
+        NFSD_V3 y
+        NFSD_V3_ACL y
+        NFSD_V4 y
+        CIFS_XATTR y
+        CIFS_POSIX y
+      '';
+
+      security = ''
+        # Security related features.
+        STRICT_DEVMEM y # Filter access to /dev/mem
+        SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
+      '';
+
+      blockDevices = ''
+        BLK_DEV_BSG n
+        BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
+        BLK_DEV_IDEACPI y # IDE ACPI support
+        BLK_DEV_INTEGRITY y
+      '';
+
+      bluetooth = ''
+        BT_HCIUART_BCSP y
+        BT_HCIUART_H4 y # UART (H4) protocol support
+        BT_HCIUART_LL y
+        BT_RFCOMM_TTY y # RFCOMM TTY support
+      '';
+
+      misc = ''
+        # Misc. options.
+        8139TOO_8129 y
+        8139TOO_PIO n # PIO is slower
+        B43_PCMCIA y
+        BSD_PROCESS_ACCT_V3 y
+        CRASH_DUMP n
+        DMAR? n # experimental
+        DVB_DYNAMIC_MINORS y # we use udev
+        FUSION y # Fusion MPT device support
+        IDE_GD_ATAPI y # ATAPI floppy support
+        IRDA_ULTRA y # Ultra (connectionless) protocol
+        JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
+        JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
+        JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
+        JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
+        LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
+        LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
+        LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
+        LOGO n # not needed
+        MEDIA_ATTACH y
+        MEGARAID_NEWGEN y
+        MICROCODE_AMD y
+        MODVERSIONS y
+        MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
+        MTRR_SANITIZER y
+        NET_FC y # Fibre Channel driver support
+        PCI_LEGACY y
+        PPP_MULTILINK y # PPP multilink support
+        REGULATOR y # Voltage and Current Regulator Support
+        SCSI_LOGGING y # SCSI logging facility
+        SERIAL_8250 y # 8250/16550 and compatible serial support
+        SLIP_COMPRESSED y # CSLIP compressed headers
+        SLIP_SMART y
+        THERMAL_HWMON y # Hardware monitoring support
+        USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
+        X86_CHECK_BIOS_CORRUPTION y
+        X86_MCE y
+      '';
+
+      bfsched = ''
+        SCHED_BFS y
+        NO_HZ n
+        HZ_1000 n
+        HZ_300 y
+        HZ 300
+      '';
+}
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@ -100,5 +100,8 @@ stdenv.mkDerivation {
        " (with patches: "
        + lib.concatStrings (lib.intersperse ", " (map (x: x.name) kernelPatches))
        + ")");
+    license = "GPLv2";
+    homepage = http://www.kernel.org/;
+    maintainers = [ lib.maintainers.eelco ];
  } // extraMeta;
 }
--- a/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
@ -3,11 +3,11 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "", ... }:
 import ./generic.nix (

  rec {
-    version = "2.6.27.42";
+    version = "2.6.27.43";
  
    src = fetchurl {
      url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-      sha256 = "0nsjhikswqrag44wablsr02kl03p8jwd0j50brg6gpjwb3485zaz";
+      sha256 = "0y2fpc6maazzg75ixrzc7h0v0k48jaflbjjcsh6c69f0mq3l8zay";
    };

    features.iwlwifi = true;
--- a/Show More
+++ b/Show More