Merge from trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=29461
2024-11-22 23:13:19 +00:00 · 2011-09-23 16:58:45 +00:00 · 2011-09-23 16:58:45 +00:00 · 01df54f5cc
commit 01df54f5cc
parent 99863cb87b 8770aaea0e
443 changed files with 7115 additions and 2178 deletions
--- a/doc/quick-start.xml
+++ b/doc/quick-start.xml
@ -105,7 +105,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>

        <listitem>
          <para>Thunderbird: <link
-          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix"><filename>pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix</filename></link>.
+          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix"><filename>pkgs/applications/networking/mailreaders/thunderbird/3.x.nix</filename></link>.
          Lots of dependencies.</para>
        </listitem>

--- a/maintainers/scripts/gnome-latest.sh
+++ b/maintainers/scripts/gnome-latest.sh
@ -0,0 +1,105 @@
+#!/bin/sh
+
+GNOME_FTP="ftp.gnome.org/pub/GNOME/sources"
+
+project=$1
+
+if [ "$project" == "--help" ]; then
+  echo "Usage: $0 project [major.minor]"
+  exit 0
+fi
+
+baseVersion=$2
+
+if [ -z "$project" ]; then
+  echo "No project specified, exiting"
+  exit 1
+fi
+
+# curl -l ftp://... doesn't work from my office in HSE, and I don't want to have
+# any conversations with sysadmin. Somehow lftp works.
+if [ "$FTP_CLIENT" = "lftp" ]; then
+  ls_ftp() {
+    lftp -c "open $1; cls"
+  }
+else
+  ls_ftp() {
+    curl -l "$1"/
+  }
+fi
+
+if [ -z "$baseVersion" ]; then
+  echo "Looking for available versions..." >&2
+  available_baseversions=( `ls_ftp ftp://${GNOME_FTP}/${project} | grep '[0-9]\.[0-9]' | sort -t. -k1,1n -k 2,2n` )
+  echo -e "The following versions are available:\n ${available_baseversions[@]}" >&2
+  echo -en "Choose one of them: " >&2
+  read baseVersion
+fi
+
+FTPDIR="${GNOME_FTP}/${project}/${baseVersion}"
+
+#version=`curl -l ${FTPDIR}/ 2>/dev/null | grep LATEST-IS | sed -e s/LATEST-IS-//`
+# gnome's LATEST-IS is broken. Do not trust it.
+
+files=$(ls_ftp "${FTPDIR}")
+declare -A versions
+
+for f in $files; do
+  case $f in
+    (LATEST-IS-*|*.news|*.changes|*.sha256sum|*.diff*):
+      ;;
+    ($project-*.*.9*.tar.*):
+      tmp=${f#$project-}
+      tmp=${tmp%.tar*}
+      echo "Ignored unstable version ${tmp}" >&2
+      ;;
+    ($project-*.tar.*):
+      tmp=${f#$project-}
+      tmp=${tmp%.tar*}
+      versions[${tmp}]=1
+      ;;
+    (*):
+      echo "UNKNOWN FILE $f"
+      ;;
+  esac
+done
+echo "Found versions ${!versions[@]}" >&2
+version=`echo ${!versions[@]} | sed -e 's/ /\n/g' | sort -t. -k1,1n -k 2,2n -k 3,3n | tail -n1`
+echo "Latest version is: ${version}" >&2
+
+name=${project}-${version}
+echo "Fetching .sha256 file" >&2
+curl -O http://${FTPDIR}/${name}.sha256sum
+
+extensions=( "xz" "bz2" "gz" )
+echo "Choosing archive extension (known are ${extensions[@]})..." >&2
+for ext in ${extensions[@]}; do
+  if grep "\\.tar\\.${ext}$" ${name}.sha256sum >& /dev/null; then
+    ext_pref=$ext
+    sha256=$(grep "\\.tar\\.${ext}$" ${name}.sha256sum | cut -f1 -d\ )
+    break
+  fi
+done
+sha256=`nix-hash --to-base32 --type sha256 $sha256`
+echo "Chosen ${ext_pref}, hash is ${sha256}" >&2
+
+cat <<EOF
+  src = fetchurl_gnome {
+    project = "${project}";
+EOF
+echo -n "    major = \"`echo ${version} | cut -d. -f1`\";"
+echo -n " minor = \"`echo ${version} | cut -d. -f2`\";"
+patchlevel=`echo ${version} | cut -d. -f3`
+if [ -n "$patchlevel" ]; then
+  echo -n " patchlevel = \"${patchlevel}\";"
+fi
+if [ "$ext_pref" != "bz2" ]; then
+  echo -n " extension = \"${ext_pref}\";"
+fi
+echo
+cat <<EOF
+    sha256 = "${sha256}";
+  };
+EOF
+
+rm -v ${name}.sha256sum >&2
--- a/maintainers/scripts/gnu/gnupdate
+++ b/maintainers/scripts/gnu/gnupdate
@ -400,6 +400,120 @@ replaced by the result of their application to DERIVATIONS, a vhash."
  ;; Return the output path of the "src" derivation of PACKAGE.
  (derivation-source-output-path (attribute-value package)))

+
+;;;
+;;; GnuPG interface.
+;;;
+
+(define %gpg-command "gpg2")
+(define %openpgp-key-server "keys.gnupg.net")
+
+(define (gnupg-verify sig file)
+  "Verify signature SIG for FILE.  Return a status s-exp or #f if GnuPG
+failed."
+
+  (define (status-line->sexp line)
+    ;; See file `doc/DETAILS' in GnuPG.
+    (define sigid-rx
+      (make-regexp
+       "^\\[GNUPG:\\] SIG_ID ([A-Za-z0-9/]+) ([[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}) ([[:digit:]]+)"))
+    (define goodsig-rx
+      (make-regexp "^\\[GNUPG:\\] GOODSIG ([[:xdigit:]]+) (.+)$"))
+    (define validsig-rx
+      (make-regexp
+       "^\\[GNUPG:\\] VALIDSIG ([[:xdigit:]]+) ([[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}) ([[:digit:]]+) .*$"))
+    (define errsig-rx
+      (make-regexp
+       "^\\[GNUPG:\\] ERRSIG ([[:xdigit:]]+) ([^ ]+) ([^ ]+) ([^ ]+) ([[:digit:]]+) ([[:digit:]]+)"))
+
+    (cond ((regexp-exec sigid-rx line)
+           =>
+           (lambda (match)
+             `(signature-id ,(match:substring match 1) ; sig id
+                            ,(match:substring match 2) ; date
+                            ,(string->number      ; timestamp
+                              (match:substring match 3)))))
+          ((regexp-exec goodsig-rx line)
+           =>
+           (lambda (match)
+             `(good-signature ,(match:substring match 1) ; key id
+                              ,(match:substring match 2)))) ; user name
+          ((regexp-exec validsig-rx line)
+           =>
+           (lambda (match)
+             `(valid-signature ,(match:substring match 1) ; fingerprint
+                               ,(match:substring match 2) ; sig creation date
+                               ,(string->number   ; timestamp
+                                 (match:substring match 3)))))
+          ((regexp-exec errsig-rx line)
+           =>
+           (lambda (match)
+             `(signature-error ,(match:substring match 1) ; key id or fingerprint
+                               ,(match:substring match 2) ; pubkey algo
+                               ,(match:substring match 3) ; hash algo
+                               ,(match:substring match 4) ; sig class
+                               ,(string->number   ; timestamp
+                                 (match:substring match 5))
+                               ,(let ((rc
+                                       (string->number ; return code
+                                        (match:substring match 6))))
+                                  (case rc
+                                    ((9) 'missing-key)
+                                    ((4) 'unknown-algorithm)
+                                    (else rc))))))
+          (else
+           `(unparsed-line ,line))))
+
+  (define (parse-status input)
+    (let loop ((line   (read-line input))
+               (result '()))
+      (if (eof-object? line)
+          (reverse result)
+          (loop (read-line input)
+                (cons (status-line->sexp line) result)))))
+
+  (let* ((pipe   (open-pipe* OPEN_READ %gpg-command "--status-fd=1"
+                             "--verify" sig file))
+         (status (parse-status pipe)))
+    (if (pipe-failed? pipe)
+        #f
+        status)))
+
+(define (gnupg-status-good-signature? status)
+  "If STATUS, as returned by `gnupg-verify', denotes a good signature, return
+a key-id/user pair; return #f otherwise."
+  (any (lambda (sexp)
+         (match sexp
+           (('good-signature key-id user)
+            (cons key-id user))
+           (_ #f)))
+       status))
+
+(define (gnupg-status-missing-key? status)
+  "If STATUS denotes a missing-key error, then return the key-id of the
+missing key."
+  (any (lambda (sexp)
+         (match sexp
+           (('signature-error key-id _ ...)
+            key-id)
+           (_ #f)))
+       status))
+
+(define (gnupg-receive-keys key-id)
+  (system* %gpg-command "--keyserver" %openpgp-key-server "--recv-keys" key-id))
+
+(define (gnupg-verify* sig file)
+  "Like `gnupg-verify', but try downloading the public key if it's missing.
+Return #t if the signature was good, #f otherwise."
+  (let ((status (gnupg-verify sig file)))
+    (or (gnupg-status-good-signature? status)
+        (let ((missing (gnupg-status-missing-key? status)))
+          (and missing
+               (begin
+                 ;; Download the missing key and try again.
+                 (gnupg-receive-keys missing)
+                 (gnupg-status-good-signature? (gnupg-verify sig file))))))))
+

 ;;;
 ;;; FTP client.
@ -580,8 +694,10 @@ replaced by the result of their application to DERIVATIONS, a vhash."
    "glibc27"
    "glibc29"
    "guile_1_8"
+    "icecat3"
    "icecat3Xul" ;; redundant with `icecat'
    "icecatWrapper"
+    "icecat3Wrapper"
    "icecatXulrunner3"
    "libzrtpcpp_1_6"
    "parted_2_3"
@ -599,8 +715,10 @@ replaced by the result of their application to DERIVATIONS, a vhash."
                      (match attr
                        (('attribute _ "description" value)
                         (string-prefix? "GNU" value))
-                        (('attribute _ "homepage" value)
+                        (('attribute _ "homepage" (? string? value))
                         (string-contains value "www.gnu.org"))
+                        (('attribute _ "homepage" ((? string? value) ...))
+                         (any (cut string-contains <> "www.gnu.org") value))
                        (_ #f)))
                    metas))
              (_ #f)))
@ -815,9 +933,9 @@ pairs.  Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\").
             (false-if-exception (delete-file sig))
             (system* "wget" sig-url)
             (if (file-exists? sig)
-                 (let ((ret (system* "gpg" "--verify" sig path)))
+                 (let ((ret (gnupg-verify* sig path)))
                   (false-if-exception (delete-file sig))
-                   (if (and ret (= 0 (status:exit-val ret)))
+                   (if ret
                       hash
                       (begin
                         (format (current-error-port)
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@ -1,8 +1,8 @@
-{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper }:
+{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl }:

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

-let version = "0.5.2.84"; in
+let version = "0.6.1.309"; in

 stdenv.mkDerivation {
  name = "spotify-${version}";
@ -10,13 +10,13 @@ stdenv.mkDerivation {
  src =
    if stdenv.system == "i686-linux" then 
      fetchurl {
-        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g6d797eb-1_i386.deb";
-        sha256 = "0l1pvvkkssng0yc7zlgxr39jx3cs6i71sspmm4xb84y1bl045pas";
+        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gb871a7d-1_i386.deb";
+        sha256 = "01bavmv78vd3lxsinbls72v2sj8czbcwzdg6sc2f9yd5g7snb3im";
      }
    else if stdenv.system == "x86_64-linux" then 
      fetchurl {
-        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g6d797eb-1_amd64.deb";
-        sha256 = "1wi1z3dyzjz13mkb0r2ilm914p8sg06923sv872nclrl102qbbni";
+        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gb871a7d-1_amd64.deb";
+        sha256 = "13ki1pcpna7f5sxf1j2axww95c4kqhj0r1d11y98mfvzxxjqimjs";
      }
    else throw "Spotify not supported on this platform.";

@ -31,9 +31,15 @@ stdenv.mkDerivation {
      mv $out/usr/* $out/
      rmdir $out/usr

+      # Work around Spotify referring to a specific minor version of
+      # OpenSSL.
+      mkdir $out/lib
+      ln -s ${openssl}/lib/libssl.so $out/lib/libssl.so.0.9.8
+      ln -s ${openssl}/lib/libcrypto.so $out/lib/libcrypto.so.0.9.8
+
      patchelf \
        --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-        --set-rpath ${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc ]}:${stdenv.gcc.gcc}/lib64 \
+        --set-rpath ${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib openssl stdenv.gcc.gcc ]}:${stdenv.gcc.gcc}/lib64:$out/lib \
        $out/bin/spotify

      preload=$out/libexec/spotify/libpreload.so
--- a/pkgs/applications/editors/texmacs/default.nix
+++ b/pkgs/applications/editors/texmacs/default.nix
@ -9,7 +9,7 @@

 let 
  pname = "TeXmacs";
-  version = "1.0.7.10";
+  version = "1.0.7.11";
  extraFontsSrc = fetchurl {
    url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz";
    sha256 = "0hylgjmd95y9yahbblmawkkw0i71vb145xxv2xqrmff81301n6k7";
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "ftp://ftp.texmacs.org/pub/${pname}/targz/${name}-src.tar.gz";
-    sha256 = "02gqalr775r4xyfy4bq3qq1h3pkarsxjb6ami7lgxfgmyg6ca5kn";
+    sha256 = "0x1r9417dzbrxf785faq1vjszqdj94ig2lzwm8sd92bxcxr6knfa";
  };

  buildInputs = [ guile libX11 libXext makeWrapper ghostscriptX freetype ];
--- a/pkgs/applications/graphics/comical/default.nix
+++ b/pkgs/applications/graphics/comical/default.nix
@ -1,19 +1,17 @@
 {stdenv, fetchurl, wxGTK, utillinux, zlib }:

-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
  name = "comical-0.8";
  src = fetchurl {
-    url = mirror://sourceforge/comical/comical-0.8.tar.gz;
+    url = "mirror://sourceforge/comical/${name}.tar.gz";
    sha256 = "0b6527cc06b25a937041f1eb248d0fd881cf055362097036b939817f785ab85e";
  };
  buildInputs = [ wxGTK utillinux zlib ];
-  patchPhase = ''
-    sed -i -e 's@"zlib\\.h"@<zlib.h>@' unzip/unzip.h
-    sed -i -e 's@/usr/local@'$out@ \
-      -e 's@-lminiunzip@-lminiunzip -lz@' Makefile
-  '';
+  preBuild="makeFlags=\"prefix=$out\"";

-  installPhase = "mkdir -p $out/bin ; make install";
+  patches = [ ./wxgtk-2.8.patch ];
+
+  preInstall = "mkdir -pv $out/bin";

  meta = {
    description = "Viewer of CBR and CBZ files, often used to store scanned comics";
--- a/pkgs/applications/graphics/comical/wxgtk-2.8.patch
+++ b/pkgs/applications/graphics/comical/wxgtk-2.8.patch
@ -0,0 +1,36 @@
+diff --git a/Makefile b/Makefile
+index a648e72..181c47f 100644
+--- a/Makefile
+++ b/Makefile
+@@ -1,5 +1,5 @@
+ CC = `wx-config --cxx`
+-LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip
+LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip -lz
+ INSTALL = install
+ INSTALL_PROGRAM = $(INSTALL)
+ prefix = /usr/local
+diff --git a/src/ComicalApp.cpp b/src/ComicalApp.cpp
+index 0c004cd..667e75e 100644
+--- a/src/ComicalApp.cpp
+++ b/src/ComicalApp.cpp
+@@ -28,6 +28,7 @@
+ #include "ComicalApp.h"
+ #include "ComicalFrame.h"
+ #include <wx/log.h>
+#include <wx/icon.h>
+ 
+ #if !defined(__WXMAC__) && !defined(__WXCOCOA__) && !defined(__WXMSW__) && !defined(__WXPM__)
+ #include "../Comical Icons/comical.xpm"
+diff --git a/unzip/unzip.h b/unzip/unzip.h
+index b247937..5bb6a69 100644
+--- a/unzip/unzip.h
+++ b/unzip/unzip.h
+@@ -50,7 +50,7 @@ extern "C" {
+ #endif
+ 
+ #ifndef _ZLIB_H
+-#include "zlib.h"
+#include <zlib.h>
+ #endif
+ 
+ #ifndef _ZLIBIOAPI_H
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@ -1,19 +1,29 @@
-{stdenv, fetchurl, gtk, pkgconfig, glib, perl, perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool }:
-stdenv.mkDerivation {
-  name = "dia-0.97";
+{stdenv, fetchurl_gnome, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext
+, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl
+, withGNOME ? false, libgnomeui }:

-  src = fetchurl {
-    url = mirror://gnome/sources/dia/0.97/dia-0.97.tar.bz2;
-    sha256 = "0nngdjklap3x1b7cxnwawh29axbwk8siyq7w4iinsns3slmki0wh";
+stdenv.mkDerivation rec {
+  inherit (src) name;
+
+  src = fetchurl_gnome {
+    project = "dia";
+    major = "0"; minor = "97"; patchlevel = "1";
+    sha256 = "0hli89fdzzbshqdznxrbgyqw55qlr4z5xpn86jcg5fl7kln8pzld";
  };

-  buildInputs = [gtk glib perl pkgconfig perlXMLParser libxml2 gettext python libxml2Python docbook5 libxslt docbook_xsl intltool];
+  buildInputs =
+    [ gtk perlXMLParser libxml2 gettext python libxml2Python docbook5
+      libxslt docbook_xsl libart_lgpl
+    ] ++ stdenv.lib.optional withGNOME libgnomeui;
+
+  buildNativeInputs = [ pkgconfig intltool perl ];
+
+  configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome";

  meta = {
-    description = "Gnome Diagram drawing software.";
+    description = "Gnome Diagram drawing software";
    homepage = http://live.gnome.org/Dia;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = with stdenv.lib.platforms;
-      linux;
+    maintainers = with stdenv.lib.maintainers; [raskin urkud];
+    platforms = stdenv.lib.platforms.linux;
  };
 }
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@ -195,6 +195,35 @@ rec {
    ";
  };

+  gimplensfun = pluginDerivation rec {
+    name = "gimplensfun-0.1.1";
+
+    src = fetchurl {
+      url = "http://lensfun.sebastiankraft.net/${name}.tar.gz";
+      sha256 = "0kr296n4k7gsjqg1abmvpysxi88iq5wrzdpcg7vm7l1ifvbs972q";
+    };
+
+    patchPhase = '' sed -i Makefile -e's|/usr/bin/g++|g++|' '';
+
+    buildInputs = [ gimp pkgconfig glib gimp.gtk pkgs.lensfun pkgs.exiv2 ];
+
+    installPhase = "
+      installPlugins gimplensfun
+      ensureDir $out/bin
+      cp gimplensfun $out/bin
+    ";
+
+    meta = {
+      description = "GIMP plugin to correct lens distortion using the lensfun library and database";
+
+      homepage = http://lensfun.sebastiankraft.net/;
+
+      license = "GPLv3+";
+      maintainers = [ stdenv.lib.maintainers.ludo ];
+      platforms = stdenv.lib.platforms.gnu;
+    };
+  };
+
  /* =============== simple script files ==================== */

  # also have a look at enblendenfuse in all-packages.nix
--- a/pkgs/applications/graphics/kipi-plugins/default.nix
+++ b/pkgs/applications/graphics/kipi-plugins/default.nix
@ -1,6 +1,8 @@
-{ stdenv, fetchurl, kdelibs, qimageblitz, qca2, libkexiv2, libkdcraw, libkipi
-, libksane, kdepimlibs, libxml2, libxslt, gettext, opencv, libgpod, gdk_pixbuf
-, qjson , pkgconfig }:
+{ stdenv, fetchurl, kdelibs, qimageblitz, qca2, kdepimlibs, libxml2, libxslt
+, gettext, opencv, libgpod, gdk_pixbuf , qjson, pkgconfig
+, cmake, automoc4
+, kdegraphics, libkexiv2 ? kdegraphics, libkdcraw ? kdegraphics
+, libkipi ? kdegraphics, libksane ? kdegraphics }:

 stdenv.mkDerivation rec {
  name = "kipi-plugins-1.9.0";
@ -15,7 +17,7 @@ stdenv.mkDerivation rec {
      libksane libxslt gettext opencv libgpod gdk_pixbuf qjson
    ];

-  buildNativeInputs = [ pkgconfig ];
+  buildNativeInputs = [ pkgconfig cmake automoc4 ];

  meta = {
    description = "Photo Management Program";
--- a/pkgs/applications/graphics/xournal/default.nix
+++ b/pkgs/applications/graphics/xournal/default.nix
@ -1,7 +1,7 @@
 { stdenv, fetchurl
 , ghostscript, atk, gtk, glib, fontconfig, freetype
 , libgnomecanvas, libgnomeprint, libgnomeprintui
-, pango, libX11, xproto, zlib, poppler, popplerData
+, pango, libX11, xproto, zlib, poppler, poppler_data
 , autoconf, automake, libtool, pkgconfig}:
 stdenv.mkDerivation rec {
  version = "0.4.5";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
  buildInputs = [
    ghostscript atk gtk glib fontconfig freetype
    libgnomecanvas libgnomeprint libgnomeprintui
-    pango libX11 xproto zlib poppler popplerData
+    pango libX11 xproto zlib poppler poppler_data
    autoconf automake libtool pkgconfig
  ];

--- a/pkgs/applications/misc/bibletime/default.nix
+++ b/pkgs/applications/misc/bibletime/default.nix
@ -1,16 +1,16 @@
-{stdenv, fetchurl, cmake, sword, qt, boost, cluceneCore}:
+{stdenv, fetchurl, cmake, sword, qt4, boost, cluceneCore}:

 stdenv.mkDerivation rec {

-  version = "2.7.3";
+  version = "2.8.1";

  name = "bibletime-${version}";

  src = fetchurl {
-    url = "mirror://sourceforge/project/bibletime/BibleTime%202/BibleTime%202%20source%20code/${name}.tar.bz2";
-    sha256 = "0171hlwg4rjv93b3gwcyv3nsj2kzwf4n8f6jw6ld18x7xmk9rkdg";
+    url = "mirror://sourceforge/bibletime/${name}.tar.bz2";
+    sha256 = "00xrgv4cx50ddbcfjiz3vl0cvsixwd0vj7avjvhrh617qqg8w325";
  };
-  
+
  prePatch = ''
    patchShebangs .;
  '';
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
    export SWORD_HOME=${sword};
  '';

-  buildInputs = [ cmake sword qt boost cluceneCore ];
+  buildInputs = [ cmake sword qt4 boost cluceneCore ];

  cmakeFlags = "-DUSE_QT_WEBKIT=ON -DCMAKE_BUILD_TYPE=Debug";

@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
    homepage = http://www.bibletime.info/;
    platforms = stdenv.lib.platforms.linux;
    license = "GPLv2";
+    maintainers = [ stdenv.lib.maintainers.piotr ];
  };
-
 }
-
--- a/pkgs/applications/misc/freemind/default.nix
+++ b/pkgs/applications/misc/freemind/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, jdk, jre, ant, coreutils, gnugrep }:

 stdenv.mkDerivation {
-  name = "freemind-0.9.0_RC_6";
+  name = "freemind-0.9.0";

  src = fetchurl {
-    url = mirror://sourceforge/freemind/freemind-src-0.9.0_RC_6.tar.gz;
-    sha256 = "0qxpwqmb4xd8c83zh76gczmx0hsx5m209k7p60kh7c4f25snhngf";
+    url = mirror://sourceforge/freemind/freemind-src-0.9.0.tar.gz;
+    sha256 = "1qd535gwx00d8z56mplxli5529yds2gsmbgla5b0bhhmsdwmrxmf";
  };

  buildInputs = [ jdk ant ];
--- a/pkgs/applications/misc/get_iplayer/default.nix
+++ b/pkgs/applications/misc/get_iplayer/default.nix
@ -0,0 +1,19 @@
+{stdenv, fetchurl, flvstreamer, ffmpeg, makeWrapper, perl}:
+
+stdenv.mkDerivation {
+  name = "get_iplayer-2.80";
+
+  buildInputs = [makeWrapper perl];
+
+  installPhase = '' 
+    ensureDir $out/bin
+    cp get_iplayer $out/bin
+    wrapProgram $out/bin/get_iplayer --suffix PATH ${ffmpeg}/bin:${flvstreamer}/bin
+  '';  
+  
+  src = fetchurl {
+    url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.80.tar.gz;
+    sha256 = "1hnadryyzca3bv1hfk2q3np9ihwvyxa3prwcrply6ywy4vnayjf8";
+  };
+  
+}
--- a/pkgs/applications/misc/krename/default.nix
+++ b/pkgs/applications/misc/krename/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, automoc4, kdelibs, taglib, exiv2, podofo, gettext, qt, phonon }:
+{ stdenv, fetchurl, cmake, automoc4, kdelibs, taglib, exiv2, podofo, gettext, qt4, phonon }:

 stdenv.mkDerivation rec {
  name = "krename-4.0.4";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
    sha256 = "12qhclw1vbg5bv6619qd4408y8d1w26499gcr8gwhgfzk0v83hic";
  };

-  buildInputs = [ cmake automoc4 kdelibs taglib exiv2 podofo gettext qt phonon ];
+  buildInputs = [ cmake automoc4 kdelibs taglib exiv2 podofo gettext qt4 phonon ];

  meta = {
    homepage = http://www.krename.net;
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@ -6,12 +6,12 @@

 stdenv.mkDerivation rec {
  pname = "mysql-workbench";
-  version = "5.2.33";
+  version = "5.2.34";
  name = "${pname}-${version}";

  src = fetchurl {
    url = "http://mirror.services.wisc.edu/mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-${version}-src.tar.gz";
-    sha256 = "193iikz0wfm3yvazficxfiqb84f34psq0bcasp3l41n9dygbgldc";
+    sha256 = "1b5ijaccy2k7if4pld8ihz1wa1wr1f9gj2m5xa4kf7v05zcx93c6";
  };

  buildInputs = [ boost file gettext glib glibc gnome_keyring gtk gtkmm intltool
--- a/pkgs/applications/misc/sakura/default.nix
+++ b/pkgs/applications/misc/sakura/default.nix
@ -1,9 +1,10 @@
 { stdenv, fetchurl, cmake, pkgconfig, gtk, vte, pixman, gettext, perl }:
 stdenv.mkDerivation rec {
-  name = "sakura-2.4.0";
+  name = "sakura-${version}";
+  version = "2.4.2";
  src = fetchurl {
-    url = "http://www.pleyades.net/david/projects/sakura/${name}.tar.bz2";
-    sha256 = "12k9ra5b3vgslry5wc40lf4a64mh3p9wy7qfirr8alyvgvw2pb0h";
+    url = "http://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2";
+    sha256 = "1mpsjsk7dgz56h7yagd9aq0d92vj59yrz4ri6za3mfmglhn29rn5";
  };
  buildInputs = [ cmake pkgconfig gtk vte pixman gettext perl ];
  meta = {
--- a/pkgs/applications/misc/vue/default.nix
+++ b/pkgs/applications/misc/vue/default.nix
@ -0,0 +1,52 @@
+x@{builderDefsPackage
+  , jre, unzip
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="vue";
+    version="3.1.1";
+    name="${baseName}-${version}";
+    url="http://releases.atech.tufts.edu/vue/v${version}/VUE_3_1_1.zip";
+    hash="1wq2mdvfm7c4vhs9ivl7n3w9ncwyrjgdgycbapzd6l1nym5iz76y";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doDeploy"];
+
+  doDeploy = a.fullDepEntry ''
+    unzip ${src}
+    ensureDir "$out"/{share/vue,bin}
+    cp VUE.jar "$out/share/vue/vue.jar"
+    echo '#!${a.stdenv.shell}' >> "$out/bin/vue" 
+    echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue" 
+    chmod a+x "$out/bin/vue"
+  '' ["addInputs" "defEnsureDir"];
+      
+  meta = {
+    description = "Visual Understanding Environment - mind mapping software";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+    license = "free-noncopyleft"; # Apache License fork, actually
+  };
+}) x
+
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@ -1,4 +1,4 @@
-{ cabal, mtl, parsec, stm, time, utf8String, X11 }:
+{ cabal, mtl, parsec, stm, time, utf8String, X11, X11Xft }:

 cabal.mkDerivation (self: {
  pname = "xmobar";
@ -6,7 +6,8 @@ cabal.mkDerivation (self: {
  sha256 = "0ijava0vn2dmc6v57i6x663rvxz3ryb2gqks18qk1qli4k0m3hf7";
  isLibrary = false;
  isExecutable = true;
-  buildDepends = [ mtl parsec stm time utf8String X11 ];
+  buildDepends = [ mtl parsec stm time utf8String X11 X11Xft ];
+  configureFlags = "-fwith_xft";
  meta = {
    homepage = "http://projects.haskell.org/xmobar/";
    description = "A Minimalistic Text Based Status Bar";
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@ -2,23 +2,28 @@
 , fetchurl, ffmpeg, fontconfig, freetype, gtkLibs, libX11
 , libXScrnSaver, libXdamage, libXext, libXrender, libXt, libXtst
 , libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, patchelf
-, stdenv, unzip, zlib, pam }:
+, stdenv, unzip, zlib, pam, pcre }:

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

 stdenv.mkDerivation rec {
-  name = "chrome-${version}";
-  version = "88807";
+  name = "chromium-16.0.879.0-pre${version}";
+
+  # To determine the latest revision, get
+  # ‘http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/LAST_CHANGE’.
+  # For the version number, see ‘about:config’.
+  version = "100626";
+  
  src =
    if stdenv.system == "x86_64-linux" then
      fetchurl {
        url = "http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux_x64/${version}/chrome-linux.zip";
-        sha256 = "c158f58fa8220782ec8dec4170f90c564b978d1c6ead298cc2f67e84613f17b1";
+        sha256 = "1dymz7h9v5hkivn6qn26bnj1waw60z3mngh8g46yvvc5xn4npc3l";
      }
    else if stdenv.system == "i686-linux" then
      fetchurl {
        url = "http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/${version}/chrome-linux.zip";
-        sha256 = "01sr882c7hr53001p8bnk5vyj8zfjm6r3i4a6wxzxd17xjh1bcxb";
+        sha256 = "0zqaj90lfzdddbs6sjygmyxlh8nw3xfr9xw450g9cabg6a2sh7ca";
      }
    else throw "Chromium is not supported on this platform.";

@ -31,7 +36,7 @@ stdenv.mkDerivation rec {
       [ GConf alsaLib bzip2 cairo cups dbus dbus_glib expat
         ffmpeg fontconfig freetype libX11 libXScrnSaver
         libXdamage libXext libXrender libXt libXtst libgcrypt libjpeg
-         libpng nspr nss stdenv.gcc.gcc zlib stdenv.gcc.libc
+         libpng nspr stdenv.gcc.gcc zlib stdenv.gcc.libc
         gtkLibs.glib gtkLibs.gtk gtkLibs.gdk_pixbuf gtkLibs.pango
         pam
       ];
@ -41,6 +46,8 @@ stdenv.mkDerivation rec {
    ensureDir $out/libexec/chrome

    cp -R * $out/libexec/chrome
+
+    strip $out/libexec/chrome/chrome
    
    ${patchelf}/bin/patchelf \
      --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
@ -48,7 +55,7 @@ stdenv.mkDerivation rec {
      $out/libexec/chrome/chrome

    makeWrapper $out/libexec/chrome/chrome $out/bin/chrome \
-      --prefix LD_LIBRARY_PATH : "${nss}/lib"
+      --prefix LD_LIBRARY_PATH : "${pcre}/lib:${nss}/lib"
  '';

  meta =  with stdenv.lib; {
--- a/pkgs/applications/networking/browsers/conkeror/default.nix
+++ b/pkgs/applications/networking/browsers/conkeror/default.nix
@ -1,9 +1,9 @@
 { stdenv, fetchurl, unzip }:
 stdenv.mkDerivation {
-  name = "conkeror-0.9.3-20110606";
+  name = "conkeror-1.0pre-20110917";
  src = fetchurl {
-    url = http://repo.or.cz/w/conkeror.git/snapshot/0d883dfd5e61e7d0b8a96a079d69b46af064fdca.zip;
-    sha256 = "0h21fw78iq4hljy5p98mpy0wgd5wpx9a0jdwv7l5wrds5vp23dhh";
+    url = http://repo.or.cz/w/conkeror.git/snapshot/9d1f522674379874e502545babe0c843f78fa43c.zip;
+    sha256 = "1ga3d9rc3xfaxvjnhnar752q9ga897q9fck0864i7rh0w7xbrhx2";
  };
  buildInputs = [ unzip ];
  installPhase = ''
--- a/pkgs/applications/networking/browsers/firefox/3.6.nix
+++ b/pkgs/applications/networking/browsers/firefox/3.6.nix
@ -12,14 +12,14 @@

 rec {

-  firefoxVersion = "3.6.16";
+  firefoxVersion = "3.6.21";
  
-  xulVersion = "1.9.2.16"; # this attribute is used by other packages
+  xulVersion = "1.9.2.21"; # 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 = "38124597440b7d60aa568adeef23659575841e92";
+    sha1 = "3c1f001ad22d93b48e191999f548b4382db3d36c";
  };


@ -101,7 +101,7 @@ rec {

    meta = {
      description = "Mozilla Firefox XUL runner";
-      homepage = http://www.mozilla.org/en-US/firefox/;
+      homepage = http://www.mozilla.org/firefox/;
    };

    passthru = { inherit gtk; version = xulVersion; };
@ -141,7 +141,7 @@ rec {

    meta = {
      description = "Mozilla Firefox - the browser, reloaded";
-      homepage = http://www.mozilla.org/en-US/firefox/;
+      homepage = http://www.mozilla.org/firefox/;
    };

    passthru = {
--- a/pkgs/applications/networking/browsers/firefox/5.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/5.0.nix
@ -108,7 +108,7 @@ rec {

    meta = {
      description = "Mozilla Firefox XUL runner";
-      homepage = http://www.mozilla.org/en-US/firefox/;
+      homepage = http://www.mozilla.org/firefox/;
    };

    passthru = { inherit gtk; version = xulVersion; };
@ -154,7 +154,7 @@ rec {

    meta = {
      description = "Mozilla Firefox - the browser, reloaded";
-      homepage = http://www.mozilla.org/en-US/firefox/;
+      homepage = http://www.mozilla.org/firefox/;
    };

    passthru = {
--- a/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch
+++ b/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch
@ -0,0 +1,35 @@
+
+# HG changeset patch
+# User Chris Coulson <chrisccoulson@ubuntu.com>
+# Date 1306390403 -7200
+# Node ID 99672871e93003520189cfe3a684ebbea151cb4b
+# Parent  831f8e040f381ed58441d8bf413f9845f26ce08e
+Bug 639554 - Install sdk/bin with make install. r=bsmedberg
+
+diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
+--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
+@@ -704,20 +704,22 @@ ifdef INSTALL_SDK # Here comes the hard 
+ 	$(NSINSTALL) -D $(DESTDIR)$(includedir)
+ 	(cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \
+ 	  (cd $(DESTDIR)$(includedir) && tar -xf -)
+ 	$(NSINSTALL) -D $(DESTDIR)$(idldir)
+ 	(cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \
+ 	  (cd $(DESTDIR)$(idldir) && tar -xf -)
+ # SDK directory is the libs + a bunch of symlinks
+ 	$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib
+	$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin
+ 	if test -f $(DIST)/include/xpcom-config.h; then \
+ 	  $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \
+ 	fi
+ 	(cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -)
+	(cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -)
+ 	$(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl
+ 	ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib
+ 	ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin
+ 	ln -s $(includedir) $(DESTDIR)$(sdkdir)/include
+ 	ln -s $(idldir) $(DESTDIR)$(sdkdir)/idl
+ endif # INSTALL_SDK
+ 
+ make-sdk:
+
--- a/pkgs/applications/networking/browsers/firefox/6.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/6.0.nix
@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;

 rec {

-  firefoxVersion = "6.0";
+  firefoxVersion = "6.0.2";
  
-  xulVersion = "6.0"; # this attribute is used by other packages
+  xulVersion = "6.0.2"; # 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";
-    sha256 = "0ws96gc1mkmilgsikirhmqc6s7m0bcyh58820l08wd82r9abagyc";
+    sha1 = "074eb9c1df4de0fe0a4bb9226ca3c2822c334cd6";
  };

  
@ -51,6 +51,8 @@ rec {
    
    inherit src;

+    patches = [ ./6.0-install-sdk-bin.patch ];
+
    buildInputs =
      [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
        python dbus dbus_glib pango freetype fontconfig xlibs.libXi
@ -76,9 +78,10 @@ rec {
        }' ';'
      '';

-    # !!! Temporary hack.
+    # !!! Temporary hacks.
    preBuild =
      ''
+        ln -s Linux2.6.mk security/coreconf/Linux3.0.mk
        export NIX_ENFORCE_PURITY=
      '';

@ -108,7 +111,7 @@ rec {

    meta = {
      description = "Mozilla Firefox XUL runner";
-      homepage = http://www.mozilla.org/en-US/firefox/;
+      homepage = http://www.mozilla.org/firefox/;
    };

    passthru = { inherit gtk; version = xulVersion; };
@ -154,7 +157,7 @@ rec {

    meta = {
      description = "Mozilla Firefox - the browser, reloaded";
-      homepage = http://www.mozilla.org/en-US/firefox/;
+      homepage = http://www.mozilla.org/firefox/;
    };

    passthru = {
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
@ -53,9 +53,9 @@ let
        url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_32bit_debug_linux_092710.tar.gz;
        sha256 = "11w3mxa39l4mnlsqzlwbdh1sald549afyqbx2kbid7in5qzamlcc";
      } else {
-        version = "10.3.183.5";
+        version = "10.3.183.7";
        url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz;
-        sha256 = "1kv7szpadgv0wwmi46vc05723qzsgclz68rij6x49l61sngzmw0x";
+        sha256 = "166ipldmd03psy68xxirmdd4p591vjnffpv2l97yg1bbkn5h2pj6";
      }
    else throw "Flash Player is not supported on this platform";

--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@ -45,7 +45,7 @@ stdenv.mkDerivation {
    if stdenv.system == "x86_64-linux" then
      fetchurl {
        url = "http://dl.google.com/linux/direct/google-talkplugin_current_x86_64.rpm";
-        sha256 = "01c8w221azvmqvxf5lgb8l151086d72ll5wnjndwn50dvi6rphvx";
+        sha256 = "14cf9bef6f70ff850b773dbb92833bbe45645db2636b7e17720fdc6b60e76d63";
      }
    else
      throw "Google Talk does not support your platform.";
@ -89,4 +89,4 @@ stdenv.mkDerivation {
    homepage = http://www.google.com/chat/video/;
    license = "unfree";
  };
-}
+}
--- a/pkgs/applications/networking/instant-messengers/kadu/config.patch
+++ b/pkgs/applications/networking/instant-messengers/kadu/config.patch
@ -1,15 +0,0 @@
-diff --git a/.config b/.config
-index e0068bf..808ebf4 100644
--- a/.config
-+++ b/.config
-@@ -187,8 +187,8 @@ module_history_migration=m
- # PL: Obsługa szyfrowania wiadomości przy pomocy OpenSSLa
- # Platform: Linux, Mac OS X, Windows
- # Needs: libcrypto, libssl
-module_encryption_ng=m
-module_encryption_ng_simlite=m
-+module_encryption_ng=n
-+module_encryption_ng_simlite=n
- 
- # Description: Auto away module
- # PL: Obsługa automatycznej zmiany statusu po określonym czasie bezczynności
--- a/pkgs/applications/networking/instant-messengers/kadu/default.nix
+++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix
@ -3,15 +3,14 @@

 stdenv.mkDerivation {

-  name = "kadu-0.9.2";
+  name = "kadu-0.10.0";

  src = fetchurl {
-    url = http://www.kadu.net/download/stable/kadu-0.9.2.tar.bz2;
-    sha256 = "05lpx7m2adx8vv4h62rsiwlgay24m6cxdbibg7vzl4xkq9ybv30b";
+    url = http://www.kadu.net/download/stable/kadu-0.10.0.tar.bz2;
+    sha256 = "039dx8y6vzqmv86prk1srmi7fvxlrbisyd6rcfs0gv497bfi1995";
  };

-  buildInputs = [
-    cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon
+  buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon
  ];

  configureFlags = "CPPFLAGS=-DQT_NO_DEBUG";
@ -22,7 +21,8 @@ stdenv.mkDerivation {
    patchShebangs .
  '';

-  patches = [ ./config.patch ];
+  # because I was not able to get those working
+  patches = [ ./disable_encryption_plugins.patch ];

  NIX_LDFLAGS="-lX11";

@ -31,5 +31,6 @@ stdenv.mkDerivation {
    homepage = http://www.kadu.net/w/English:Main_Page;
    license = "GPLv2";
    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.piotr ];
  };
 }
--- a/pkgs/applications/networking/instant-messengers/kadu/disable_encryption_plugins.patch
+++ b/pkgs/applications/networking/instant-messengers/kadu/disable_encryption_plugins.patch
@ -0,0 +1,16 @@
+diff --git a/Plugins.cmake b/Plugins.cmake
+index c6906ce..b1284d6 100644
+--- a/Plugins.cmake
+++ b/Plugins.cmake
+@@ -30,9 +30,9 @@ set (COMPILE_PLUGINS
+ 
+ # encryption
+ 	# Encrypted chat support
+-	encryption_ng
+	# encryption_ng
+ 	# OpenSSL encrypted chat support
+-	encryption_ng_simlite
+	# encryption_ng_simlite
+ 
+ # docking
+ 	# Tray icon support (common part of all docking modules)
--- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
@ -1,6 +1,7 @@
 x@{builderDefsPackage
  , qt4, openssl
  , xproto, libX11, libXScrnSaver, scrnsaverproto
+  , xz
  , ...}:
 builderDefsPackage
 (a :  
@ -11,11 +12,11 @@ let
  buildInputs = map (n: builtins.getAttr n x)
    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
  sourceInfo = rec {
-    version="1.1.0";
-    baseName="vacuum";
+    version="1.1.1";
+    baseName="vacuum-im";
    name="${baseName}-${version}";
-    url="http://vacuum-im.googlecode.com/files/${name}.tar.gz";
-    hash="c956b0cf5cc0a1acee47a96f0b0e7ab5d716e48cac4a7fcbca496f901a219dcc";
+    url="http://vacuum-im.googlecode.com/files/${name}.tar.xz";
+    hash="b4b3472bf83173f6be1bbe69520bf6cab97e24cf9fd8a7b60e4ffdc1cb43b1dc";
  };
 in
 rec {
@ -28,7 +29,7 @@ rec {
  inherit buildInputs;

  /* doConfigure should be removed if not needed */
-  phaseNames = ["preBuild" "doQMake" "doMakeInstall"];
+  phaseNames = ["addInputs" "preBuild" "doQMake" "doMakeInstall"];

  preBuild = a.fullDepEntry (''
    echo "Fixing a name collision with a function added in Qt 4.7"
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@ -1,70 +1,75 @@
-{ fetchgit, stdenv, bash, emacs, gdb, git, glib, gmime, gnupg1, pkgconfig, talloc, xapian }:
+{ fetchurl, stdenv, bash, emacs, gdb, git, glib, gmime, gnupg1, pkgconfig, talloc, xapian }:

 stdenv.mkDerivation rec {
-  name = "notmuch-0.6-rc4";
+  name = "notmuch-0.8";

-  src = fetchgit {
-    url = "git://github.com/chaoflow/notmuch";
-    rev = "9f8ef78e0c6b28918f3edda06b59a9e8f9bef8e3";
-    sha256 = "c7c425c10a695ca22dfbdf5fe8e0dcb6a888edc0b3388023e7ff35f69acc0085";
+  src = fetchurl {
+    url = "http://notmuchmail.org/releases/${name}.tar.gz";
+    sha256 = "f40bcdc6447cae9f76d5b4e70ab70d87e4a813cd123b524c1dc3155a3371a949";
  };

  buildInputs = [ bash emacs gdb git glib gmime gnupg1 pkgconfig talloc xapian ];

  # XXX: Make me a loop
  patchPhase = ''
-    substituteInPlace "test/atomicity" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+    # substituteInPlace "test/atomicity" \
+    #   --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
+    substituteInPlace "test/aggregate-results.sh" \
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/author-order" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/basic" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/crypto" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/dump-restore" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/emacs" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/emacs-large-search-buffer" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/encoding" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/from-guessing" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/json" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/long-id" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/maildir-sync" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/new" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/notmuch-test" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/raw" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/reply" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/search" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/search-by-folder" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/search-insufficient-from-quoting" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
+    substituteInPlace "test/search-folder-coherence" \
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/search-output" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/search-position-overlap-bug" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
+    substituteInPlace "test/symbol-hiding" \
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/test-lib.sh" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/test-verbose" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/thread-naming" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/thread-order" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
    substituteInPlace "test/uuencode" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
  '';

  postBuild = ''
--- a/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
@ -66,6 +66,6 @@ stdenv.mkDerivation {

  meta = {
    description = "Mozilla Thunderbird, a full-featured email client";
-    homepage = http://www.mozilla.org/en-US/thunderbird/;
+    homepage = http://www.mozilla.org/thunderbird/;
  };
 }
--- a/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix
@ -73,11 +73,12 @@ stdenv.mkDerivation {

  meta = with stdenv.lib; {
    description = "Mozilla Thunderbird, a full-featured email client";
-    homepage = http://www.mozilla.org/en-US/thunderbird/;
+    homepage = http://www.mozilla.org/thunderbird/;
    license =
      # Official branding implies thunderbird name and logo cannot be reuse,
      # see http://www.mozilla.org/foundation/licensing.html
      if enableOfficialBranding then licenses.proprietary else licenses.mpl11;
    maintainers = with maintainers; [ pierron ];
+    platforms = with platforms; linux;
  };
 }
--- a/pkgs/applications/networking/p2p/gnunet/0.9.nix
+++ b/pkgs/applications/networking/p2p/gnunet/0.9.nix
@ -0,0 +1,79 @@
+{ stdenv, fetchsvn, libextractor, libmicrohttpd, libgcrypt
+, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig
+, libxml2, ncurses, gettext, findutils
+, autoconf, automake
+, gtkSupport ? false, gtk ? null, libglade ? null
+, makeWrapper }:
+
+assert gtkSupport -> (gtk != null) && (libglade != null);
+
+let
+  rev = "17000";
+  version = "0.9-svn-${rev}";
+in
+  stdenv.mkDerivation {
+    name = "gnunet-${version}";
+
+    src = fetchsvn {
+      url = "https://gnunet.org/svn/gnunet";
+      sha256 = "17nkvykg3xb5m1y86i9lahgsic9jpj6h0nr73ywzpxpp7ql45cm4";
+      inherit rev;
+    };
+
+    buildInputs = [
+      libextractor libmicrohttpd libgcrypt gmp curl libtool
+      zlib adns sqlite libxml2 ncurses
+      pkgconfig gettext findutils
+      autoconf automake
+      makeWrapper
+    ] ++ (if gtkSupport then [ gtk libglade ] else []);
+
+    preConfigure = ''
+      # 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
+        echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..."
+        substituteInPlace "$i" --replace "/tmp" "$TMPDIR"
+      done
+
+      autoreconf -vfi
+    '';
+
+    meta = {
+      description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework";
+
+      longDescription = ''
+        GNUnet is a framework for secure peer-to-peer networking that
+        does not use any centralized or otherwise trusted services.  A
+        first service implemented on top of the networking layer
+        allows anonymous censorship-resistant file-sharing.  Anonymity
+        is provided by making messages originating from a peer
+        indistinguishable from messages that the peer is routing.  All
+        peers act as routers and use link-encrypted connections with
+        stable bandwidth utilization to communicate with each other.
+        GNUnet uses a simple, excess-based economic model to allocate
+        resources.  Peers in GNUnet monitor each others behavior with
+        respect to resource usage; peers that contribute to the
+        network are rewarded with better service.
+      '';
+
+      homepage = http://gnunet.org/;
+
+      license = "GPLv2+";
+
+      maintainers = [ stdenv.lib.maintainers.ludo ];
+      platforms = stdenv.lib.platforms.gnu;
+    };
+  }
--- a/pkgs/applications/networking/p2p/ktorrent/default.nix
+++ b/pkgs/applications/networking/p2p/ktorrent/default.nix
@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
    description = "KDE integrated BtTorrent client";
    homepage = http://ktorrent.org;
    maintainers = with stdenv.lib.maintainers; [ sander urkud ];
+    inherit (libktorrent.meta) platforms;
  };
 }
--- a/pkgs/applications/networking/p2p/ldcpp/default.nix
+++ b/pkgs/applications/networking/p2p/ldcpp/default.nix
@ -1,31 +1,38 @@
-{ builderDefs, scons, pkgconfig, gtk, bzip2, libglade, openssl, libX11 }:
+{ builderDefs, scons, pkgconfig, gtk, bzip2, libglade, openssl, libX11, boost, zlib }:

 with builderDefs;
-	let localDefs = builderDefs.passthru.function ((rec {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://launchpad.net/linuxdcpp/1.0/1.0.3/+download/linuxdcpp-1.0.3.tar.bz2;
-			sha256 = "0w9c8k13cl85y4v4av8ic6w4zkdivcj6p5q86llfh3sz077vckiv";
-		};
+  let localDefs = builderDefs.passthru.function ((rec {
+    src = /* put a fetchurl here */
+    fetchurl {
+      url = http://launchpad.net/linuxdcpp/1.1/1.1.0/+download/linuxdcpp-1.1.0.tar.bz2;
+      sha256 = "66012740e9347a2e994c8af5609c40ebf3f86f767258e071a03ef39a2314298a";
+    };

-		buildInputs = [scons pkgconfig gtk bzip2 libglade
-			openssl libX11];
-		configureFlags = [];
-		doScons = fullDepEntry (''
-			ensureDir $out
-			export NIX_LDFLAGS="$NIX_LDFLAGS -lX11";
-			scons PREFIX=$out 
-			scons PREFIX=$out install
-		'') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
-	}));
-	in with localDefs;
+    buildInputs = [scons pkgconfig gtk bzip2 libglade
+      openssl libX11 boost];
+    configureFlags = [];
+    doScons = fullDepEntry (''
+      ensureDir $out
+      export NIX_LDFLAGS="$NIX_LDFLAGS -lX11";
+      
+      for i in gettext xgettext msgfmt msgcat; do
+        echo > $i
+	chmod a+x $i
+      done
+      export PATH=$PATH:$PWD
+
+      scons PREFIX=$out 
+      scons PREFIX=$out install
+    '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
+  }));
+  in with localDefs;
 stdenv.mkDerivation rec {
-	name = "ldcpp-1.0.3";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			[doScons doForceShare doPropagate]);
-	meta = {
-		description = "Linux DC++ - Direct Connect client";
-		inherit src;
-	};
+  name = "ldcpp-1.1.0";
+  builder = writeScript (name + "-builder")
+    (textClosure localDefs 
+      [doScons doForceShare doPropagate]);
+  meta = {
+    description = "Linux DC++ - Direct Connect client";
+    inherit src;
+  };
 }
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@ -1,12 +1,14 @@
 { stdenv, fetchsvn, pythonPackages, makeWrapper, nettools }:

+let rev = "22523"; in
+
 stdenv.mkDerivation {
-  name = "tribler-5.3.9-pre21071";
+  name = "tribler-5.4.3-pre${rev}";

  src = fetchsvn {
-    url = http://svn.tribler.org/abc/branches/release-5.3.x;
-    rev = 21071;
-    sha256 = "0plzw5m9rligz66rbq8qr9sj0fiqx8gwmchdw3p4mwlwfx72gixm";
+    url = http://svn.tribler.org/abc/branches/release-5.4.x;
+    inherit rev;
+    sha256 = "09hscrnl50s9qncklnqqzwxwvidl3hj7hr7qsysmv6sw7b9rbx0g";
  };

  buildInputs = [ pythonPackages.python pythonPackages.wrapPython makeWrapper ];
@ -32,7 +34,7 @@ stdenv.mkDerivation {
          --set _TRIBLERPATH $out/share/tribler \
          --set PYTHONPATH $out/share/tribler:$program_PYTHONPATH \
          --run 'cd $_TRIBLERPATH' \
-          --add-flags $out/share/tribler/Tribler/Main/tribler.py
+          --add-flags "-O $out/share/tribler/Tribler/Main/tribler.py"
    '';

  meta = {
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@ -0,0 +1,49 @@
+{ stdenv
+, fetchurl
+, openssl
+, printerSupport ? true, cups
+, pkgconfig
+, zlib
+, libX11
+, libXcursor
+, alsaLib
+}:
+
+assert printerSupport -> cups != null;
+stdenv.mkDerivation rec {
+  name = "freerdp-0.8.2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/freerdp/${name}.tar.gz";
+    sha256 = "1q9hhwyc4hk49hsmd2kghrfsawxcc7gy7vcmhdf91l8v95xp16iq";
+  };
+
+  buildInputs = [
+    openssl
+    pkgconfig
+    zlib
+    libX11
+    libXcursor
+    alsaLib
+  ] ++ stdenv.lib.optional printerSupport cups;
+
+  configureFlags = [
+    "--with-x"
+  ] ++ stdenv.lib.optional printerSupport "--with-printer=cups";
+
+  meta = {
+    description = "A Remote Desktop Protocol Client";
+
+    longDescription = ''
+      FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP)
+      following the Microsoft Open Specifications.
+    '';
+
+    homepage = http://www.freerdp.com/;
+
+    license = "free-non-copyleft";
+
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+  };
+}
+
--- a/pkgs/applications/networking/remote/freerdp/unstable.nix
+++ b/pkgs/applications/networking/remote/freerdp/unstable.nix
@ -0,0 +1,67 @@
+{ stdenv
+, fetchgit
+, openssl
+, printerSupport ? true, cups
+, pkgconfig
+, zlib
+, libX11
+, libXcursor
+, alsaLib
+, cmake
+, libxkbfile
+, libXinerama
+, libXext
+, directfb
+, cunit
+}:
+
+assert printerSupport -> cups != null;
+
+let rev = "42fb9f84e82268073a3838e6082783ba956ecc99"; in
+
+stdenv.mkDerivation rec {
+  name = "freerdp-1.0pre${rev}";
+
+  src = fetchgit {
+    url = git://github.com/FreeRDP/FreeRDP.git;
+    inherit rev;
+    sha256 = "5e77163e2a728802fc426860b3f5ff88cb2f2f3b0bbf0912e9e44c3d8fa060e5";
+  };
+
+  buildInputs = [
+    openssl
+    pkgconfig
+    zlib
+    libX11
+    libXcursor
+    libxkbfile
+    libXinerama
+    libXext
+    directfb
+    alsaLib
+    cmake
+    cunit
+  ] ++ stdenv.lib.optional printerSupport cups;
+
+  postUnpack = ''
+    sed -i 's@xf_GetWorkArea(xfi)@///xf_GetWorkArea(xfi)@' git-export/client/X11/xf_monitor.c
+  '';
+
+  cmakeFlags = [ "-DWITH_DIRECTFB=ON" "-DWITH_CUNIT=ON" ];
+
+  meta = {
+    description = "A Remote Desktop Protocol Client";
+
+    longDescription = ''
+      FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP)
+      following the Microsoft Open Specifications.
+    '';
+
+    homepage = http://www.freerdp.com/;
+
+    license = "free-non-copyleft";
+
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+  };
+}
+
--- a/pkgs/applications/networking/sniffers/etherape/default.nix
+++ b/pkgs/applications/networking/sniffers/etherape/default.nix
@ -0,0 +1,20 @@
+{stdenv, fetchurl, pkgconfig, gtk, libpcap, libglade, libgnome, libgnomeui,
+gnomedocutils, scrollkeeper, libxslt}:
+
+stdenv.mkDerivation rec {
+  name = "etherape-0.9.12";
+  src = fetchurl {
+    url = "mirror://sourceforge/etherape/${name}.tar.gz";
+    sha256 = "0ici0aqw2r221lc3rhrdcnvavbhcj0ybwawgrhh399i74w7wf14k";
+  };
+
+  configureFlags = [ "--disable-scrollkeeper" ];
+  buildInputs = [ gtk libpcap pkgconfig libglade libgnome libgnomeui gnomedocutils
+    scrollkeeper libxslt ];
+
+  meta = {
+    homepage = http://etherape.sourceforge.net/;
+    license = "GPLv2+";
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@ -12,7 +12,8 @@ stdenv.mkDerivation {
    sha256 = "1j77vwz6q3dvgr8w6wvigd5v4m5952czaqdvihr8di13q0b0vq4y";
  };

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

  meta = {
    homepage = http://samba.anu.edu.au/rsync/;
--- a/pkgs/applications/office/antiword/default.nix
+++ b/pkgs/applications/office/antiword/default.nix
@ -0,0 +1,28 @@
+{ fetchurl, stdenv }:
+
+let
+  name = "antiword-0.37";
+in
+stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url = "http://www.winfield.demon.nl/linux/${name}.tar.gz";
+    sha256 = "1b7mi1l20jhj09kyh0bq14qzz8vdhhyf35gzwsq43mn6rc7h0b4f";
+  };
+
+  patchPhase = ''
+    sed -i -e "s|/usr/local/bin|$out/bin|g" -e "s|/usr/share|$out/share|g" Makefile antiword.h
+  '';
+
+  installTargets = "global_install";
+
+  meta = {
+    homepage = "http://www.winfield.demon.nl/";
+    description = "convert MS Word documents to plain text or PostScript";
+    license = stdenv.lib.licenses.gpl2;
+
+    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
--- a/pkgs/applications/office/hledger-interest/default.nix
+++ b/pkgs/applications/office/hledger-interest/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "hledger-interest";
-  version = "1.2";
-  sha256 = "1r5x6z0k33fpvqba6zlkhpm7b0rwwnli4q100psms89x0rrj7y2d";
+  version = "1.3";
+  sha256 = "1sgnl3vv38cmgxv3xag3c78j1955xxwdmr5xr3f8rc78np6d0wnz";
  isLibrary = false;
  isExecutable = true;
  buildDepends = [ hledgerLib mtl time ];
--- a/pkgs/applications/office/kmymoney/default.nix
+++ b/pkgs/applications/office/kmymoney/default.nix
@ -0,0 +1,22 @@
+{ stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext,
+  shared_mime_info, perl, boost, gpgme }:
+
+stdenv.mkDerivation rec {
+  name = "kmymoney-4.5.3";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/kmymoney2/${name}.tar.bz2";
+    sha256 = "1yvgyzybfm1ajswwq3w3kdij4y2cyhfkk52xhv7dbp1wrxsp5cx9";
+  };
+
+  buildInputs = [ kdelibs kdepimlibs perl boost gpgme ];
+  buildNativeInputs = [ cmake automoc4 gettext shared_mime_info ];
+
+  patches = [ ./qgpgme.patch ];
+
+  meta = {
+    homepage = http://kmymoney2.sourceforge.net/;
+    description = "KDE personal money manager";
+    inherit (kdelibs.meta) platforms maintainers;
+  };
+}
--- a/pkgs/applications/office/kmymoney/qgpgme.patch
+++ b/pkgs/applications/office/kmymoney/qgpgme.patch
@ -0,0 +1,17 @@
+KMymoney tries to find qgpgme before kdepimlibs. This is wrong because
+FindQGpgme is installed by kdepimlibs, thus can be invisible until kdepimlibs
+found.
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f6d7305..88bac67 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -59,8 +59,8 @@ else (WIN32)
+   find_package(Boost "1.33.1" COMPONENTS graph)
+ endif (WIN32)
+ # needed by libkgpgfile
+-find_package(QGpgme REQUIRED)
+ find_package(KdepimLibs REQUIRED)
+find_package(QGpgme REQUIRED)
+ find_package(SharedMimeInfo REQUIRED)
+ 
+ add_definitions( ${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
--- a/pkgs/applications/science/electronics/qucs/default.nix
+++ b/pkgs/applications/science/electronics/qucs/default.nix
@ -1,4 +1,4 @@
-{stdenv, fetchurl, qt, libX11}:
+{stdenv, fetchurl, qt3, libX11}:

 stdenv.mkDerivation rec {
  name = "qucs-0.0.15";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
    sha256 = "0ggs2nicj8q270l0rbmzg4jc0d0zdxvfsjh4wgww670ma5855xsp";
  };

-  buildInputs = [ qt libX11 ];
+  buildInputs = [ qt3 libX11 ];

  meta = {
    description = "Integrated circuit simulator";
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@ -1,8 +1,8 @@
 {stdenv, fetchurl, zlib, openssl, tcl}:

 let
-  version = "1.18";
-  filedate = "20110713230341";
+  version = "1.19";
+  filedate = "20110901182519";
 in

 stdenv.mkDerivation {
@ -10,7 +10,7 @@ stdenv.mkDerivation {

  src = fetchurl {
    url = "http://www.fossil-scm.org/download/fossil-src-${filedate}.tar.gz";
-    sha256 = "065hp5hppzjzvvk9g8zaqbfms011rkiimydnfsgkp4s8jlc2h6dc";
+    sha256 = "14snmwjfl9xz52d8lfzsp4zciwfbi9fwk623bm5dxhn2fczzc960";
  };

  buildInputs = [ zlib openssl ];
@ -18,8 +18,6 @@ stdenv.mkDerivation {

  doCheck = true;

-  configurePhase = ":";
-
  checkTarget = "test";

  installPhase = ''
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@ -10,7 +10,7 @@ rec {
  git = lib.makeOverridable (import ./git) {
    inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep
      asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt
-      cpio tcl tk makeWrapper subversion;
+      cpio tcl tk makeWrapper subversionClient;
    svnSupport = false;		# for git-svn support
    guiSupport = false;		# requires tcl/tk
    sendEmailSupport = false;	# requires plenty of perl libraries
@ -47,8 +47,9 @@ rec {

  gitAnnex = lib.makeOverridable (import ./git-annex) {
    inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which;
-    inherit (haskellPackages) ghc MissingH utf8String QuickCheck2 pcreLight SHA dataenc
-      HTTP testpack monadControl;
+    inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc
+      HTTP testpack monadControl hS3 mtl network hslogger hxt json;
+    QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1;
  };

  qgit = import ./qgit {
@ -103,24 +104,7 @@ rec {
    inherit stdenv fetchgit qt47 subversion apr;
  };

-  gitSubtree = stdenv.mkDerivation {
-    name = "git-subtree-0.4";
-    src = fetchurl {
-      url = "http://github.com/apenwarr/git-subtree/tarball/v0.4";
-#      sha256 = "0y57lpbcc2142jgrr4lflyb9xgzs9x33r7g4b919ncn3alb95vdr";
-      sha256 = "19s8352igwh7x1nqgdfs7rgxahw9cnfv7zmpzpd63m1r3l2945d4";
-    };
-    unpackCmd = "gzip -d < $curSrc | tar xvf -";
-    buildInputs = [ git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt ];
-    configurePhase = "export prefix=$out";
-    buildPhase = "true";
-    installPhase = ''
-      make install prefix=$out gitdir=$out/bin #work around to deal with a wrong makefile
-    '';
-    meta= {
-      description = "An experimental alternative to the git-submodule command";
-      homepage = http://github.com/apenwarr/git-subtree;
-      license = "GPLv2";
-    };
+  gitSubtree = import ./git-subtree {
+    inherit stdenv fetchurl git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt;
  };
 }
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@ -1,20 +1,24 @@
-{ stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH, utf8String
-, QuickCheck2, pcreLight, SHA, dataenc, HTTP, testpack, git, ikiwiki, which
-, monadControl }:
+{ stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, hxt
+, ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl
+, QuickCheck2, rsync, SHA, testpack, utf8String, which
+}:

 let
-  version = "3.20110819";
+  version = "3.20110915";
 in
 stdenv.mkDerivation {
  name = "git-annex-${version}";

  src = fetchurl {
    url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz";
-    sha256 = "1442ba4ff35ec8f92f336a5f1055d7ad8306348871a9697262f4f2af3b3c0943";
+    sha256 = "d16c305c82b151ef6ce0c5cfa52a119240b66e02424aefc15a1f67392f976d47";
  };

-  buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2 pcreLight
-    SHA dataenc HTTP testpack git ikiwiki which monadControl];
+  buildInputs = [
+    curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json
+    libuuid MissingH monadControl mtl network pcreLight perl QuickCheck2
+    rsync SHA testpack utf8String which
+  ];

  checkTarget = "test";
  doCheck = true;
--- a/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix
@ -0,0 +1,27 @@
+{ stdenv, fetchurl, git, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt }:
+
+stdenv.mkDerivation {
+  name = "git-subtree-0.4-2-g2793ee6";
+
+  src = fetchurl {
+    url = "http://github.com/apenwarr/git-subtree/tarball/2793ee6ba6da57d97e9c313741041f7eb2e88974";
+    sha256 = "33fdba315cf8846f45dff7622c1099c386db960c7b43d5d8fbb382fd4d1acff6";
+    name = "git-subtree-0.4-2-g2793ee6.tar.gz";
+  };
+
+  buildInputs = [ git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt ];
+
+  configurePhase = "export prefix=$out";
+
+  buildPhase = "true";
+
+  installPhase = "make install prefix=$out gitdir=$out/bin";
+
+  meta= {
+    description = "experimental alternative to the git-submodule command";
+    homepage = http://github.com/apenwarr/git-subtree;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.gnu;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+}
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@ -1,14 +1,14 @@
 { fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep
 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
 , libxslt, tcl, tk, makeWrapper
-, svnSupport, subversion, perlLibs, smtpPerlLibs
+, svnSupport, subversionClient, perlLibs, smtpPerlLibs
 , guiSupport
 , pythonSupport ? true
 , sendEmailSupport
 }:

 let
-  svn = subversion.override { perlBindings = true; };
+  svn = subversionClient.override { perlBindings = true; };
 in

 stdenv.mkDerivation rec {
--- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
@ -1,25 +1,34 @@
-args:
-args.stdenv.mkDerivation {
-  name = "stgit-0.14.3";
+{ stdenv, fetchurl, python, git }:

-  src = args.fetchurl {
-    url = http://homepage.ntlworld.com/cmarinas/stgit/stgit-0.14.3.tar.gz;
-    sha256 = "13gcvz6x91m2860n26xp12j0xsshzvwij03sfzm5g3ckm18ffkw7";
+let
+  name = "stgit-0.15";
+in
+stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url = "http://download.gna.org/stgit/${name}.tar.gz";
+    sha256 = "0kgq9x0i7riwcl1lmmm40z0jiz5agr1kqxm2byv1qsf0q1ny47v9";
  };

-  buildInputs =(with args; [python git]);
+  buildInputs = [ python git ];

-  buildPhase = "true";
-  
-  installPhase = ''
-    python ./setup.py install --prefix=$out
-      d="$out/etc/bash_completion.d"
-      ensureDir $d; ln -s "$out/share/stgit/contrib/stgit-completion.bash" "$d"
+  makeFlags = "prefix=$$out";
+
+  postInstall = ''
+    ensureDir "$out/etc/bash_completion.d/"
+    ln -s ../../share/stgit/completion/stgit-completion.bash "$out/etc/bash_completion.d/"
  '';

-  meta = { 
-      description = "quilt for git (stacking patches)";
-      homepage = http://procode.org/stgit/;
-      license = "GPL";
+  doCheck = false;
+  checkTarget = "test";
+
+  meta = {
+    homepage = "http://procode.org/stgit/";
+    description = "StGit is a patch manager implemented on top of Git";
+    license = "GPL";
+
+    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = stdenv.lib.platforms.unix;
  };
 }
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@ -1,19 +1,19 @@
-{stdenv, fetchurl, pygtk, python, intltool, scrollkeeper, makeWrapper }:
+{stdenv, fetchurl, xz, pygtk, python, intltool, scrollkeeper, makeWrapper }:

 let
  minor = "1.5";
-  version = "${minor}.1";
+  version = "${minor}.2";
 in

 stdenv.mkDerivation {
  name = "meld-${version}";

  src = fetchurl {
-    url = "http://ftp.gnome.org/pub/gnome/sources/meld/${minor}/meld-${version}.tar.bz2";
-    sha256 = "0ykj3rb5hvcr4dmc52mz8q3iknrsh042v1x7yvffgs6yibakcac2";
+    url = "http://ftp.gnome.org/pub/gnome/sources/meld/${minor}/meld-${version}.tar.xz";
+    sha256 = "05rbkqflbqnh2c4682d2fmidhwz2bvlggrhp1p7xbi3z8ci87pdx";
  };

-  buildInputs = [ pygtk python intltool scrollkeeper makeWrapper ];
+  buildInputs = [ pygtk python intltool scrollkeeper makeWrapper xz ];

  patchPhase = ''
    sed -e s,/usr/local,$out, -i INSTALL
--- a/pkgs/applications/version-management/veracity/default.nix
+++ b/pkgs/applications/version-management/veracity/default.nix
@ -2,6 +2,7 @@ x@{builderDefsPackage
  , cmake, curl, patch, zlib, icu, sqlite, libuuid
  , readline, openssl, spidermonkey_1_8_0rc1
  , nspr, nss
+  , unzip, glibcLocales
  , runTests ? false
  , ...}:
 builderDefsPackage
@ -20,16 +21,18 @@ rec {
  inherit (s) name;
  inherit buildInputs;

-  phaseNames = ["prepare_sgneeds" "dump0" "prepareMakefiles" "doMake" "doTest" "doDeploy"];
+  phaseNames = ["prepare_sgneeds" "dump0" "prepareMakefiles" "fixPaths" "doMake" "doTest" "doDeploy"];

  dump0 = (a.doDump "0");

  runTests = a.stdenv.lib.attrByPath ["runTests"] false a;

  doTest = a.fullDepEntry (if runTests then ''
-    sed -e "s@/bin/bash@${a.stdenv.shell}@" -i $(find .. -type f)
    mkdir pseudo-home
    export HOME=$PWD/pseudo-home
+    export LC_ALL=en_US.UTF-8
+    export LANG=en_US.UTF-8
+    ${if a.stdenv.isLinux then "export LOCALE_ARCHIVE=${a.glibcLocales}/lib/locale/locale-archive;" else ""}
    make test || true
  '' else "") ["doMake" "minInit"];

@ -73,6 +76,13 @@ rec {
    cmake -G "Unix Makefiles" -D SGNEEDS_DIR="$SGNEEDS_DIR" -D VVTHIRDPARTY="$VVTHIRDPARTY" -D SPIDERMONKEY_INCDIR="${a.spidermonkey_1_8_0rc1}/include" -D SPIDERMONKEY_LIB="${a.spidermonkey_1_8_0rc1}/lib/libjs.so" ../veracity*
  '' ["minInit" "addInputs" "doUnpack"];

+  fixPaths = a.fullDepEntry ''
+    sed -e "s@/bin/bash@${a.stdenv.shell}@" -i $(find .. -type f)
+    sed -e 's@/bin/ln@#{a.coreutils}/bin/ln@g' -i ../veracity/src/js_tests/*.js
+    sed -e 's@/usr/bin/gdb@#{a.gdb}/bin/gdb@g' -i ../veracity/testsuite/c_test.sh
+    sed -e 's@"/bin/@"@g' -i ../veracity/testsuite/u*.c
+  '' ["minInit"];
+
  doDeploy = a.fullDepEntry ''
    ensureDir "$out/bin" "$out/share/veracity/"
    cp -r .. "$out/share/veracity/build-dir"
--- a/pkgs/applications/version-management/viewmtn/0.10.nix
+++ b/pkgs/applications/version-management/viewmtn/0.10.nix
@ -2,7 +2,7 @@
 args : with args; 
 rec {
  src = fetchurl {
-    url = http://grahame.angrygoats.net/source/viewmtn/viewmtn-0.10.tgz;
+    url = http://viewmtn.1erlei.de/downloads/viewmtn-0.10.tgz;
    sha256 = "1c6y708xaf6pds1r6l00q7vpgfagfbnf95kqj168vw3xr3l8a4yx";
  };

--- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
@ -1,12 +1,15 @@
-{cabal, xmonad, xmonadContrib, X11, utf8String, X11Xft,
- parsec, split}:
+{ cabal, hint, mtl, network, parsec, random, split, X11, xmonad
+, xmonadContrib
+}:

 cabal.mkDerivation (self: {
  pname = "xmonad-extras";
  version = "0.9.2";
  sha256 = "54b41a4c59ff3d68b3a214d727fb5675fa7c1b90090d99e58ecae62b3dfdd701";
-  propagatedBuildInputs =
-    [X11 xmonad xmonadContrib utf8String X11Xft parsec split];
+  buildDepends = [
+    hint mtl network parsec random split X11 xmonad xmonadContrib
+  ];
+  configureFlags = "-f-with_hlist -f-with_mpd";
  noHaddock = true;
  meta = {
    homepage = "http://projects.haskell.org/xmonad-extras";
--- a/pkgs/build-support/dotnetenv/Wrapper/Wrapper.sln
+++ b/pkgs/build-support/dotnetenv/Wrapper/Wrapper.sln
@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wrapper", "Wrapper\Wrapper.csproj", "{D01B3597-E85E-42F4-940A-EF5AE712942F}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x86 = Debug|x86
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D01B3597-E85E-42F4-940A-EF5AE712942F}.Debug|x86.ActiveCfg = Debug|x86
+		{D01B3597-E85E-42F4-940A-EF5AE712942F}.Debug|x86.Build.0 = Debug|x86
+		{D01B3597-E85E-42F4-940A-EF5AE712942F}.Release|x86.ActiveCfg = Release|x86
+		{D01B3597-E85E-42F4-940A-EF5AE712942F}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
--- a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs
+++ b/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs
@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Wrapper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Philips Healthcare")]
+[assembly: AssemblyProduct("Wrapper")]
+[assembly: AssemblyCopyright("Copyright © Philips Healthcare 2011")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("2045ce22-78c7-4cd6-ad0a-9367f8a49738")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
--- a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in
+++ b/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in
@ -0,0 +1,66 @@
+using System;
+using System.Reflection;
+using System.IO;
+
+namespace @NAMESPACE@Wrapper
+{
+    class @MAINCLASSNAME@Wrapper
+    {
+        private String[] AssemblySearchPaths = { @ASSEMBLYSEARCHPATH@ };
+
+        private String ExePath = @"@EXEPATH@";
+
+        private String MainClassName = "@NAMESPACE@.@MAINCLASSNAME@";
+
+        private Assembly exeAssembly;
+
+        public @MAINCLASSNAME@Wrapper(string[] args)
+        {
+            // Attach the resolve event handler to the AppDomain so that missing library assemblies will be searched
+            AppDomain currentDomain = AppDomain.CurrentDomain;
+            currentDomain.AssemblyResolve += new ResolveEventHandler(MyResolveEventHandler);
+
+            // Dynamically load the executable assembly
+            exeAssembly = Assembly.LoadFrom(ExePath);
+
+            // Lookup the main class
+            Type mainClass = exeAssembly.GetType(MainClassName);
+
+            // Lookup the main method
+            MethodInfo mainMethod = mainClass.GetMethod("Main");
+
+            // Invoke the main method
+            mainMethod.Invoke(this, new Object[] {args});
+        }
+
+        static void Main(string[] args)
+        {
+            new @MAINCLASSNAME@Wrapper(args);
+        }
+
+        private Assembly MyResolveEventHandler(object sender, ResolveEventArgs args)
+        {
+            // This handler is called only when the common language runtime tries to bind to the assembly and fails.
+
+            Assembly MyAssembly;
+            String assemblyPath = "";
+            String requestedAssemblyName = args.Name.Substring(0, args.Name.IndexOf(","));
+
+            // Search for the right path of the library assembly
+            foreach (String currentAssemblyPath in AssemblySearchPaths)
+            {
+                assemblyPath = currentAssemblyPath + "/" + requestedAssemblyName + ".dll";
+
+                if (File.Exists(assemblyPath))
+                    break;
+            }
+
+            // Load the assembly from the specified path. 					
+            MyAssembly = Assembly.LoadFrom(assemblyPath);
+
+            // Return the loaded assembly.
+            return MyAssembly;
+        }
+
+    }
+}
--- a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in
+++ b/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in
@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{D01B3597-E85E-42F4-940A-EF5AE712942F}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>@ROOTNAMESPACE@</RootNamespace>
+    <AssemblyName>@ASSEMBLYNAME@</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Wrapper.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
--- a/pkgs/build-support/dotnetenv/build-solution.nix
+++ b/pkgs/build-support/dotnetenv/build-solution.nix
@ -7,19 +7,47 @@
 , verbosity ? "detailed"
 , options ? "/p:Configuration=Debug;Platform=Win32"
 , assemblyInputs ? []
-, runtimeAssemblies ? []
 , preBuild ? ""
+, modifyPublicMain ? false
+, mainClassFile ? null
 }:

+assert modifyPublicMain -> mainClassFile != null;
+
+let
+  wrapperCS = ./Wrapper.cs.in;  
+in
 stdenv.mkDerivation {
-  inherit name src preBuild;  
+  inherit name src;
  
  buildInputs = [ dotnetfx ];  
+
  preConfigure = ''
    cd ${baseDir}
  '';
  
-  installPhase = ''        
+  preBuild = ''
+    ${stdenv.lib.optionalString modifyPublicMain ''
+      sed -i -e "s|static void Main|public static void Main|" ${mainClassFile}
+    ''}
+    ${preBuild}
+  '';
+  
+  installPhase = ''
+    addDeps()
+    {
+	if [ -f $1/nix-support/dotnet-assemblies ]
+	then
+	    for i in $(cat $1/nix-support/dotnet-assemblies)
+	    do
+		windowsPath=$(cygpath --windows $i)
+		assemblySearchPaths="$assemblySearchPaths;$windowsPath"
+		
+		addDeps $i
+	    done
+	fi
+    }
+    
    for i in ${toString assemblyInputs}
    do
 	windowsPath=$(cygpath --windows $i) 
@ -31,6 +59,8 @@ stdenv.mkDerivation {
 	else
 	    assemblySearchPaths="$assemblySearchPaths;$windowsPath"
 	fi
+	
+	addDeps $i
    done
      
    echo "Assembly search paths are: $assemblySearchPaths"
@ -44,18 +74,15 @@ stdenv.mkDerivation {
    ensureDir $out
    MSBuild.exe ${toString slnFile} /nologo /t:${targets} /p:IntermediateOutputPath=$(cygpath --windows $out)\\ /p:OutputPath=$(cygpath --windows $out)\\ /verbosity:${verbosity} ${options}
    
-    # Create references to runtime dependencies
-    # !!! Should be more efficient (e.g. symlinking)
+    # Because .NET assemblies store strings as UTF-16 internally, we cannot detect
+    # hashes. Therefore a text files containing the proper paths is created
+    # We can also use this file the propagate transitive dependencies.
    
-    for i in ${toString runtimeAssemblies}
+    ensureDir $out/nix-support
+    
+    for i in ${toString assemblyInputs}
    do
-        cd $i
-	
-        for j in $(find . -type f)
-	do
-	    mkdir -p $out/$(dirname $j)
-	    cp $j $out/$(dirname $j)
-	done
+        echo $i >> $out/nix-support/dotnet-assemblies
    done
  '';
 }
--- a/pkgs/build-support/dotnetenv/default.nix
+++ b/pkgs/build-support/dotnetenv/default.nix
@ -1,10 +1,17 @@
 {stdenv, dotnetfx}:

+let dotnetenv =
 {
  buildSolution = import ./build-solution.nix {
    inherit stdenv;
    dotnetfx = dotnetfx.pkg;
  };
+
+  buildWrapper = import ./wrapper.nix {
+    inherit dotnetenv;
+  };
  
  inherit (dotnetfx) assembly20Path wcfPath referenceAssembly30Path referenceAssembly35Path;
-}
+};
+in
+dotnetenv
--- a/pkgs/build-support/dotnetenv/wrapper.nix
+++ b/pkgs/build-support/dotnetenv/wrapper.nix
@ -0,0 +1,64 @@
+{dotnetenv}:
+
+{ name
+, src
+, baseDir ? "."
+, slnFile
+, targets ? "ReBuild"
+, verbosity ? "detailed"
+, options ? "/p:Configuration=Debug;Platform=Win32"
+, assemblyInputs ? []
+, preBuild ? ""
+, namespace
+, mainClassName
+, mainClassFile
+, modifyPublicMain ? true
+}:
+
+let
+  application = dotnetenv.buildSolution {
+    inherit name src baseDir slnFile targets verbosity;
+    inherit options assemblyInputs preBuild;
+    inherit modifyPublicMain mainClassFile;
+  };
+in
+dotnetenv.buildSolution {
+  name = "${name}-wrapper";
+  src = ./Wrapper;
+  slnFile = "Wrapper.sln";
+  assemblyInputs = [ application ];
+  preBuild = ''
+    addRuntimeDeps()
+    {
+	if [ -f $1/nix-support/dotnet-assemblies ]
+	then
+	    for i in $(cat $1/nix-support/dotnet-assemblies)
+	    do
+		windowsPath=$(cygpath --windows $i | sed 's|\\|\\\\|g')
+		assemblySearchArray="$assemblySearchArray @\"$windowsPath\""
+		
+		addRuntimeDeps $i
+	    done
+	fi
+    }
+    
+    export exePath=$(cygpath --windows $(find ${application} -name \*.exe) | sed 's|\\|\\\\|g')
+    
+    # Generate assemblySearchPaths string array contents
+    for path in ${toString assemblyInputs}
+    do
+        assemblySearchArray="$assemblySearchArray @\"$(cygpath --windows $path | sed 's|\\|\\\\|g')\", "
+	addRuntimeDeps $path
+    done
+    
+    sed -e "s|@ROOTNAMESPACE@|${namespace}Wrapper|" \
+        -e "s|@ASSEMBLYNAME@|${namespace}|" \
+        Wrapper/Wrapper.csproj.in > Wrapper/Wrapper.csproj
+    
+    sed -e "s|@NAMESPACE@|${namespace}|g" \
+        -e "s|@MAINCLASSNAME@|${mainClassName}|g" \
+	-e "s|@EXEPATH@|$exePath|g" \
+	-e "s|@ASSEMBLYSEARCHPATH@|$assemblySearchArray|" \
+        Wrapper/Wrapper.cs.in > Wrapper/Wrapper.cs
+  '';
+}
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@ -1,4 +1,4 @@
-{stdenv, git}:
+{stdenv, git, cacert}:
 {url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? false }:

 /* NOTE:
@ -35,6 +35,8 @@ stdenv.mkDerivation {

  inherit url rev leaveDotGit;

+  GIT_SSL_CAINFO = "${cacert}/etc/ca-bundle.crt";
+
  impureEnvVars = [
    # We borrow these environment variables from the caller to allow
    # easy proxy configuration.  This is impure, but a fixed-output
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@ -33,7 +33,6 @@ for arg; do
      --deepClone) deepClone=true;;
      --no-deepClone) deepClone=false;;
      --leave-dotGit) leaveDotGit=true;;
-      --keep-dotGit) leaveDotGit=;;
      --builder) builder=true;;
      *)
          argi=$(($argi + 1))
@ -56,9 +55,24 @@ for arg; do
  fi
 done

-if test -z "$url"; then
-    echo "syntax: nix-prefetch-git URL [REVISION [EXPECTED-HASH]]" >&2
+usage(){
+    echo  >&2 "syntax: nix-prefetch-git [options] [URL [REVISION [EXPECTED-HASH]]]
+
+Options:
+      --out path      Path where the output would be stored.
+      --url url       Any url understand by 'git clone'.
+      --rev ref       Any sha1 or references (such as refs/heads/master)
+      --hash h        Expected hash.
+      --deepClone     Clone submodules recursively.
+      --no-deepClone  Do not clone submodules.
+      --leave-dotGit  Keep the .git directories.
+      --builder       Clone as fetchgit does, but url, rev, and out option are mandatory.
+"
    exit 1
+}
+
+if test -z "$url"; then
+  usage
 fi


@ -196,13 +210,14 @@ clone_user_rev() {
    eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK"
    if test -z "$leaveDotGit"; then
 	echo "removing \`.git'..." >&2
-        find $out -name .git\* | xargs rm -rf
+        find $dir -name .git\* | xargs rm -rf
    fi
 }

 if test -n "$builder"; then
-    mkdir $out
-    clone_user_rev "$out" "$url" "$rev"
+  test -n "$out" -a -n "$url" -a -n "$rev" || usage
+  mkdir $out
+  clone_user_rev "$out" "$url" "$rev"
 else
  if test -z "$hashType"; then
      hashType=sha256
@ -210,7 +225,7 @@ else

  # If the hash was given, a file with that hash may already be in the
  # store.
-  if -n "$expHash"; then
+  if test -n "$expHash"; then
      finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" git-export)
      if ! nix-store --check-validity "$finalPath" 2> /dev/null; then
          finalPath=
@ -251,4 +266,4 @@ else
  if test -n "$PRINT_PATH"; then
      echo $finalPath
  fi
-fi
+fi
--- a/pkgs/build-support/fetchurl/gnome.nix
+++ b/pkgs/build-support/fetchurl/gnome.nix
@ -0,0 +1,17 @@
+{ fetchurl }:
+
+{ project, major, minor, patchlevel, extension ? "bz2", sha256 }:
+
+let
+  baseVersion = "${major}.${minor}";
+  version = baseVersion + (if patchlevel != null then ".${patchlevel}" else "");
+  name = "${project}-${version}";
+in
+
+(fetchurl {
+  url = "mirror://gnome/sources/${project}/${baseVersion}/${name}.tar.${extension}";
+  inherit sha256;
+}) // {
+  inherit major minor patchlevel baseVersion version;
+  pkgname = name;
+}
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@ -7,7 +7,7 @@ rec {

  # Mirrors for mirror://site/filename URIs, where "site" is
  # "sourceforge", "gnu", etc.
-  
+
  # SourceForge.
  sourceforge = [
    http://prdownloads.sourceforge.net/
@ -97,6 +97,7 @@ rec {
    http://www.all.kernel.org/pub/
    http://www.eu.kernel.org/pub/
    http://www.de.kernel.org/pub/
+    http://ramses.wh2.tu-dresden.de/pub/mirrors/kernel.org/
  ];

  # Mirrors of ftp://ftp.kde.org/pub/kde/.
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  name = "cacert-20090922";
+  name = "cacert-20110902";

  src = fetchurl {
-    url = http://nixos.org/tarballs/cacert-20090922.pem.bz2;
-    sha256 = "1fakipxy5y62vslw6czj24pksh16b042py9v0199mxhzg5nmbmy7";
+    url = "http://nixos.org/tarballs/${name}.pem.bz2";
+    sha256 = "05vwziwrckgdg4l029jsb8apj65lcvk0rfcyyrvz34m2znk0vlmi";
  };

  unpackPhase = "true";
--- a/pkgs/data/misc/poppler-data/default.nix
+++ b/pkgs/data/misc/poppler-data/default.nix
@ -1,20 +1,23 @@
 { fetchurl, stdenv, cmake }:

 stdenv.mkDerivation rec {
-  name = "poppler-data-0.4.3";
+  name = "poppler-data-0.4.5";

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

  buildInputs = [ cmake ];

-  postInstall = ''
-    ensureDir ''${out}/etc/profile.d
-    echo "export POPPLER_DATADIR=''${out}/share/poppler" > \
-      ''${out}/etc/profile.d/60-poppler.sh
-  '';
+# TODO: actually use $prefix/etc/profile.d in NixOS
+  postInstall =
+    ''
+      mkdir -pv ''${out}/etc/profile.d
+      echo "export POPPLER_DATADIR=''${out}/share/poppler" |
+        tee ''${out}/etc/profile.d/60-poppler.sh
+      chmod -c +x ''${out}/etc/profile.d/60-poppler.sh
+    '';

  meta = {
    homepage = http://poppler.freedesktop.org/;
--- a/pkgs/data/misc/shared-desktop-ontologies/default.nix
+++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake }:

 stdenv.mkDerivation rec {
-  name = "shared-desktop-ontologies-0.7.1";
+  name = "shared-desktop-ontologies-0.8.0";
  
  src = fetchurl {
    url = "mirror://sourceforge/oscaf/${name}.tar.bz2";
-    sha256 = "1b38amxr4b0n6cyy9l3lgzyjsky172cjphjr0iscahrlrc0h4phy";
+    sha256 = "0wf4gli2akkqbl944lqjjy2hvcfagq6zzmdg7fkzr61p6vw7nk82";
  };
  
  buildInputs = [ cmake ];
--- a/pkgs/desktops/gnome-2.28/default.nix
+++ b/pkgs/desktops/gnome-2.28/default.nix
@ -143,7 +143,7 @@ pkgs.makeOverridable
  };

  glib_networking = import ./platform/glib-networking {
-    inherit (pkgs) stdenv fetchurl pkgconfig glib libtool intltool gnutls
+    inherit (pkgs) stdenv fetchurl pkgconfig glib libtool intltool gnutls2
      libproxy libgcrypt libtasn1;
  };

--- a/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix
+++ b/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix
@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls, libproxy
+{stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls2, libproxy
  , libgcrypt, libtasn1
  }:

@ -19,6 +19,6 @@ stdenv.mkDerivation {
  '';

  buildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ glib libtool intltool gnutls libproxy libgcrypt 
+  propagatedBuildInputs = [ glib libtool intltool gnutls2 libproxy libgcrypt 
    libtasn1];
 }
--- a/pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix
+++ b/pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix
@ -1,13 +1,16 @@
 {stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl }:

-stdenv.mkDerivation {
+let
  name = "libgnomecups-0.2.3";
-  
+in
+stdenv.mkDerivation {
+  inherit name;
+
  src = fetchurl {
-    url = mirror://gnome/sources/libgnomecups/0.2/libgnomecups-0.2.3.tar.bz2;
+    url = "mirror://gnome/sources/libgnomecups/0.2/${name}.tar.bz2";
    sha256 = "0a8xdaxzz2wc0n1fjcav65093gixzyac3948l8cxx1mk884yhc71";
  };
-  
+
  buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl ];
  propagatedBuildInputs = [ libxml2 ];
 }
--- a/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix
+++ b/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix
@ -1,14 +1,17 @@
 {stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl, libgnomecups, bison,
 flex }:

+let
+  name = "libgnomeprint-2.18.8";
+in
 stdenv.mkDerivation {
-  name = "libgnomeprint-2.11.1";
-  
+  inherit name;
+
  src = fetchurl {
-    url = mirror://gnome/sources/libgnomeprint/2.18/libgnomeprint-2.18.6.tar.bz2;
-    sha256 = "15c00ya2mx0x4mh8lyy3xg9dd66z5yjnax74bqx99zd90sar10fg";
+    url = "mirror://gnome/sources/libgnomeprint/2.18/${name}.tar.bz2";
+    sha256 = "1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691";
  };
-  
+
  buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl libgnomecups bison flex ];
  propagatedBuildInputs = [ libxml2 ];
 }
--- a/pkgs/desktops/kde-4.5/base-workspace/default.nix
+++ b/pkgs/desktops/kde-4.5/base-workspace/default.nix
@ -3,7 +3,7 @@
 , libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver
 , lm_sensors, libxklavier, libusb, libpthreadstubs, boost
 , automoc4, strigi, soprano, qimageblitz, akonadi
-, libdbusmenu_qt, libqalculate, pciutils, libraw1394, bluez, networkmanager
+, libdbusmenu_qt, libqalculate, pciutils, libraw1394, bluez
 }:

 kde.package {
@ -13,7 +13,7 @@ kde.package {
    kdepimlibs kdebindings boost libusb libXi libXau libXdmcp libraw1394
    libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4
    strigi soprano qimageblitz akonadi libpthreadstubs libdbusmenu_qt libqalculate
-    pciutils bluez networkmanager ];
+    pciutils bluez ];

  patches =
    [ # Don't do compositing with the software GLX driver, since it's
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@ -1,4 +1,4 @@
-{ callPackage, recurseIntoAttrs, runCommand, stdenv, fetchurl, qt47, ffmpeg_0_6_90 } :
+{ callPackage, recurseIntoAttrs, callPackageOrig, runCommand, stdenv, fetchurl, qt47, ffmpeg_0_6_90 } :

 let

@ -17,9 +17,7 @@ let

 in

-recurseIntoAttrs rec {
-  recurseForRelease = true;
-
+rec {
  inherit callPackage stdenv;

  qt4 = qt47;
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@ -1,7 +1,7 @@
 { callPackage, callPackageOrig, stdenv, qt47 }:

 let
-  release = "4.7.0";
+  release = "4.7.1";

  # Need callPackageOrig to avoid infinite cycle
  kde = callPackageOrig ./kde-package {
@ -41,14 +41,13 @@ in
 kde.modules // kde.individual //
 {
  inherit (kde) manifest modules individual splittedModuleList;
-  recurseForRelease = true;

  akonadi = callPackage ./support/akonadi { };
  soprano = callPackage ./support/soprano { };

  qt4 = qt47;

-  kdebase_workspace = kde.individual.kde_workspace;
+  kdebase_workspace = kde.modules.kde_workspace;

  inherit release;

--- a/pkgs/desktops/kde-4.7/kde-baseapps/kate.nix
+++ b/pkgs/desktops/kde-4.7/kde-baseapps/kate.nix
--- a/pkgs/desktops/kde-4.7/kde-baseapps/kde-baseapps.nix
+++ b/pkgs/desktops/kde-4.7/kde-baseapps/kde-baseapps.nix
--- a/pkgs/desktops/kde-4.7/kde-baseapps/konsole.nix
+++ b/pkgs/desktops/kde-4.7/kde-baseapps/konsole.nix
--- a/pkgs/desktops/kde-4.7/kde-package/4.7.0.nix
+++ b/pkgs/desktops/kde-4.7/kde-package/4.7.0.nix
--- a/pkgs/desktops/kde-4.7/kde-package/4.7.1.nix
+++ b/pkgs/desktops/kde-4.7/kde-package/4.7.1.nix
@ -0,0 +1,273 @@
+{stable=true;
+hashes=builtins.listToAttrs[
+  {name="blinken";value="0946y6g67bqbkdcnqas97izr514190f08qzq5jg12xjv3q5i9xnr";}
+  {name="cantor";value="1yipf6019nr1vacdl1mp6wwffwaq7khyh1rp5wx0f3y70p7q6w8v";}
+  {name="gwenview";value="00vxhpg2481pz7bh0kac1fsl8dawjlxm7x38y572802qbhd02jr4";}
+  {name="kalgebra";value="1rkl8jyiqi9ymwl4inflgwg2252k5x5yag25zr8crwg1ax9rvmhv";}
+  {name="kalzium";value="110l065vwjfyjr0130xklrsr3jwlqb27fv9mhc9w5v9i5shl79xm";}
+  {name="kamera";value="17sac0bydq4d2rv63jzjy87dry9g3n6chw7gg6nncisvkgz1dyz2";}
+  {name="kanagram";value="10nhgb1gf5vh6767xrbfwicdhw4kd3za4lnwrsww823dqpi6cryz";}
+  {name="kate";value="1n3zs4rs3y4z9g2ssiqi6jy7c2li0pah2p0vsdjw0ifq0xqvvz67";}
+  {name="kbruch";value="0x3y5gbq4xhqjrp4g91v3wjggrimxx6k8nsvny0ykriqql6xzq77";}
+  {name="kcolorchooser";value="1fwjf0fys3iz4c86jfhzq6j43ps7jiab9qhspkv6cvnv1dyi0ryy";}
+  {name="kdeaccessibility";value="1980y2vqxkhz40xkkljqawkafshhrimlyb7hvk5waz9a2jz0vwwj";}
+  {name="kdeadmin";value="1614acnvycihysxy3k26q8xsxswsx73m32n0c34hb0d5xj87ndk0";}
+  {name="kdeartwork";value="0xsmq5x9lbplj3rxza0lxxdbnz5srmxjzw993rzwj9687jvgi6hv";}
+  {name="kde-baseapps";value="1jpfslapsl4l7yqxq4cry0dwj2hps2s6kayj81dcs2crqrz75plc";}
+  {name="kdegames";value="0b3zljmkhyml31kfj9n75sa9h3xknn8v0y099mdc1wcny7p7zyrl";}
+  {name="kdegraphics-strigi-analyzer";value="1xnaipyn29wa5i26rgv2jbijii64qklz5fgcy49zpd0pxqnkxxwl";}
+  {name="kdegraphics-thumbnailers";value="07nvydwzzwnr1a5x3v732mry1qw7lvn8l3h3b73r6fvmnhs91iyp";}
+  {name="kdelibs";value="1gwgilr2m95m8w4q55d79g3qsgpq5jv7aq7crq7xbrhz3smv6ciw";}
+  {name="kdemultimedia";value="1p76vrzr1wmlpnkspy9nf8v1am6bdi5wc6zl4y9lp6y6qv9diz1w";}
+  {name="kdenetwork";value="1hmcljp8d85zyi55314js7jl5ihf060hji5gcm6s4s95xqg7hwvh";}
+  {name="kdepim";value="09lvdpq8nm9b97g0xlmc2ikklq7pc4c61v9lz53mb8c1hi9yxasd";}
+  {name="kdepimlibs";value="0svj7fqkn3g8ryip9qy4rh0j7xnjgwhv45rbz4s6lsjh81ipnc4j";}
+  {name="kdepim-runtime";value="0iy0sph5cvzmyn2gi0had5xhppdxdhs5dqm7lm79lk27i8913sjk";}
+  {name="kdeplasma-addons";value="1xrdqhaklf2l5043l1qhfjqyr6985m5j1jzd8rgabkwa9dv5bb4c";}
+  {name="kde-runtime";value="1qppx56xdrmapl0l0fv2p502yg470hiwhzdjv5kiw0akwl7g2ll5";}
+  {name="kdesdk";value="0db4kiikf0bl07m09cj01id0ivl1hm30pr5401xscqask7ddq2v9";}
+  {name="kdetoys";value="02zjz6h62nlxhjhsv5apxyhs140h6dc5i5laxi68j8fi4p8gyk5a";}
+  {name="kdeutils";value="0s7lw9qiyzn4wccbgalrsb91hspqniaf93x94s3gcw7jmk4znwwd";}
+  {name="kde-wallpapers";value="17x3npychdv9z90a6y2yxxscnczrpzkd8zanml3y1kkx1kcwvkrv";}
+  {name="kdewebdev";value="0ll5s60231vc6k989ahfw7k9wk0r6ml3icg25zj90785ildqqrnz";}
+  {name="kde-workspace";value="15kvc30w4ysjm7il7lkfls3xm9v4azhlz2jv75n5bp5h41kbznl5";}
+  {name="kgamma";value="1fzhhjqz6x19lk6c77mmq94bjk5f8qj0pq9c7923gd9d644azbsc";}
+  {name="kgeography";value="0s9nnsjma95j402wlcswrqdjz9csxbnxpnshcg5xxj3135122yv6";}
+  {name="khangman";value="04frra3qj4jkmhlsr4im6sjhyv7rs32fj88vphzwx0nbq086i078";}
+  {name="kig";value="1si3zi3w75mg9sd2imbs6f2z0ywkzbvg9cj672fmamczw5wrjp6n";}
+  {name="kimono";value="1bqw23g6c1l3bxnnzgz4pn5j2w2vxwfi1nrdjcbkfwsa4px2q7bn";}
+  {name="kiten";value="0i3dp8jqqjlx2hjbqwc01qaja9bh7aas0m4s75py5j2im7gkxncs";}
+  {name="klettres";value="1mxpxh4p16jnxmd2gff4ink222hbd1qxigr3hn8jc3a0kwrnpxdk";}
+  {name="kmplot";value="1adw71m9h6z85lwavsjsbdcnlgkchic6y5110hmb9x067n5hrfkq";}
+  {name="kolourpaint";value="01lc73vvpl5jmzvx9vi857k69mww97rd7fnqm2776d7dbkgpzzs8";}
+  {name="konsole";value="0ywy8xy38v058hfl6yakxqz355y64mmqbhxf0j1h0zz50744ww1r";}
+  {name="korundum";value="1ib02m2dr9ab1v1xxcngdisprr7mlll3h52d9lrjj6clnxlxz1sz";}
+  {name="kross-interpreters";value="1glb2hkj84zmcjjq3sh79w7g4y0v25ddd9hjiilppskwnqby16bb";}
+  {name="kruler";value="18h5kp7pni6j9nqfxzwfcfnv8sbgg1s656clzyi7f9znsw8bgzvd";}
+  {name="ksaneplugin";value="0mk7q66h6v5carkywkpjr5893r01vgcqf0lx9c1fq7n0mn22zl9s";}
+  {name="ksnapshot";value="0wf1bwkrhp714fhhh3y82p35rxk7prwqsn89nsl7rj3l7gryismp";}
+  {name="kstars";value="0bbnf8vnhinmgb03dab7ji2rpb3k2d901nm5r11lxwjdv58d4vkn";}
+  {name="ktouch";value="1b354imxnfv4yklzh0xd358gydczmlijkkjm2ks04111895h97b1";}
+  {name="kturtle";value="147sn2lrzxgfwiqxziymjvvy67sgwmdfcrgqvv93rmp5r9y3zmiy";}
+  {name="kwordquiz";value="1a2vifgixn6zgrp4nm5lvq41v24xp4nbnv8a7c9p53chx3y8i2px";}
+  {name="libkdcraw";value="1h49g41c2sxxzx6w865k2ljiqlgill7imh1pnkw1wsfwk4ii9msz";}
+  {name="libkdeedu";value="058gidzzda4ca4h2125ja17gdfq52zqdh70c22f6p4ph47qw503m";}
+  {name="libkexiv2";value="0vkl2gnp7saw26crj2hbg953knrv3v1pjd9c5d29vckdn5q417zr";}
+  {name="libkipi";value="00wnm45v65my7dp7g3sri54prjk1mkqi4nqf3f5xisnshi3vzr5f";}
+  {name="libksane";value="1w0d164lnc576irrxfi1f6rzv85wn5gawqp92yg8zqhna1zxjhzp";}
+  {name="marble";value="1964ix9dcssw4bny944rdwhxifnj5ay6nmbhvbvwq1d77ckzz9sf";}
+  {name="mobipocket";value="1npmbkvrg1kil6sh91m79kavfrivkk3jpb0c0spm0s93b85pgvky";}
+  {name="okular";value="0fw49r0hskhscml18715yqxxwrzigrx0rkhcljgckss7bksyfsfn";}
+  {name="oxygen-icons";value="1gwpsh7iwmzl1n9wzp8q95jlimbmygcrqwkzzp9jwsyfl9qn86y5";}
+  {name="parley";value="0c8k3sxpzxnaldvyskfp86cnhrzabq8alkv32ikr3y948ib9q31m";}
+  {name="perlkde";value="01ysn4bq5zjc0b8gqyinx08scimiix505zvdw13a9axfb4vnk05j";}
+  {name="perlqt";value="067hj2fw2jvd6d0ywdmq6y630ygm6xjrvkrnhm3czqxpfs6hp2mk";}
+  {name="pykde4";value="106kjcbg2gpgj7kypg79yjb2b3jbcc8zfslc65vkb32ivipk0j16";}
+  {name="qtruby";value="1dp3zdh5m3yp55r7pwxi4nqfjsfv84qcg9n5msp7lw78k04xidg7";}
+  {name="qyoto";value="1kynbz0gpjbq5xdpfv1by39cxji1z3wisv8c6bgxz7yknqp16qix";}
+  {name="rocs";value="1mlvw0fb83f0vjdf0amlx92w2fvjl79rcvhlv267vsw0idd3vp2g";}
+  {name="smokegen";value="1j0apyqv17fycysfjc0mf4rhq2g6zwn9fz7dsib1hylza813smxr";}
+  {name="smokekde";value="1zgf2pcxwxzhjhab46q2ir1ys4mq2xf9ais9473xc6xjvrbg74dd";}
+  {name="smokeqt";value="19xfpm9as6sbsfjsn8qiqnlfsqwpri56886kl9kp7qhr6dga54ma";}
+  {name="step";value="1819shriclbp1ny28gjik1mg1c3mvm4drk0c84zcq2vj6dz2fp61";}
+  {name="svgpart";value="1wcjbhl608y7a0rzwziaja7zi1kjixcnmwaik5xyss2hmx59m934";}
+];
+modules=[
+{
+  module="kdegraphics";
+  split=true;
+  pkgs=[
+    { name="gwenview";  }
+    { name="kamera";  }
+    { name="kcolorchooser";  }
+    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
+    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
+    { name="kgamma";  }
+    { name="kolourpaint";  }
+    { name="kruler";  }
+    { name="ksaneplugin";  }
+    { name="ksnapshot";  }
+    { name="libkdcraw";  }
+    { name="libkexiv2";  }
+    { name="libkipi";  }
+    { name="libksane";  }
+    { name="mobipocket";  }
+    { name="okular";  }
+    { name="svgpart";  }
+  ];
+}
+{
+  module="kdeedu";
+  split=true;
+  pkgs=[
+    { name="blinken";  }
+    { name="cantor";  }
+    { name="kalgebra";  }
+    { name="kalzium";  }
+    { name="kanagram";  }
+    { name="kbruch";  }
+    { name="kgeography";  }
+    { name="khangman";  }
+    { name="kig";  }
+    { name="kiten";  }
+    { name="klettres";  }
+    { name="kmplot";  }
+    { name="kstars";  }
+    { name="ktouch";  }
+    { name="kturtle";  }
+    { name="kwordquiz";  }
+    { name="libkdeedu";  }
+    { name="marble";  }
+    { name="parley";  }
+    { name="rocs";  }
+    { name="step";  }
+  ];
+}
+{
+  module="kdebindings";
+  split=true;
+  pkgs=[
+    { name="kimono";  }
+    { name="korundum";  }
+    { name="kross-interpreters"; sane="kross_interpreters"; }
+    { name="perlkde";  }
+    { name="perlqt";  }
+    { name="pykde4";  }
+    { name="qtruby";  }
+    { name="qyoto";  }
+    { name="smokegen";  }
+    { name="smokekde";  }
+    { name="smokeqt";  }
+  ];
+}
+{
+  module="kde-baseapps";
+sane="kde_baseapps";  split=true;
+  pkgs=[
+    { name="kate";  }
+    { name="kde-baseapps"; sane="kde_baseapps"; }
+    { name="konsole";  }
+  ];
+}
+{ module="kdeaccessibility";  split=false;
+  pkgs=[
+    { name="kaccessible"; }
+    { name="kmag"; }
+    { name="kmouth"; }
+    { name="kmousetool"; }
+    { name="jovie"; }
+  ];
+
+}
+{ module="kdeadmin";  split=false;
+  pkgs=[
+    { name="strigi-analyzer"; sane="strigi_analyzer";}
+    { name="kuser"; }
+    { name="kcron"; }
+    { name="ksystemlog"; }
+    { name="system-config-printer-kde"; sane="system_config_printer_kde";}
+  ];
+
+}
+{ module="kdeartwork";  split=false;
+  pkgs=[
+    { name="ColorSchemes"; }
+    { name="IconThemes"; }
+    { name="emoticons"; }
+    { name="kscreensaver"; }
+    { name="kwin-styles"; sane="kwin_styles";}
+    { name="sounds"; }
+    { name="styles"; }
+    { name="wallpapers"; }
+    { name="HighResolutionWallpapers"; }
+    { name="WeatherWallpapers"; }
+    { name="desktopthemes"; }
+    { name="aurorae"; }
+  ];
+
+}
+{ module="kdegames";  split=false;}
+{ module="kdelibs";  split=false;}
+{ module="kdemultimedia";  split=false;}
+{ module="kdenetwork";  split=false;
+  pkgs=[
+    { name="kfile-plugins"; sane="kfile_plugins";}
+    { name="kget"; }
+    { name="kopete"; }
+    { name="krdc"; }
+    { name="kppp"; }
+    { name="krfb"; }
+    { name="kdnssd"; }
+    { name="filesharing"; }
+  ];
+
+}
+{ module="kdepim";  split=false;}
+{ module="kdepimlibs";  split=false;}
+{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
+{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
+{ module="kde-runtime"; sane="kde_runtime"; split=false;}
+{ module="kdesdk";  split=false;
+  pkgs=[
+    { name="cervisia"; }
+    { name="lokalize"; }
+    { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";}
+    { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; }
+    { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; }
+    { name="kcachegrind"; }
+    { name="kapptemplate"; }
+    { name="kpartloader"; }
+    { name="strigi-analyzer"; sane="strigi_analyzer";}
+    { name="kioslave"; }
+    { name="okteta"; }
+    { name="kmtrace"; }
+    { name="kompare"; }
+    { name="kprofilemethod"; }
+    { name="kstartperf"; }
+    { name="kuiviewer"; }
+    { name="poxml"; }
+    { name="scripts"; }
+    { name="umbrello"; }
+  ];
+
+}
+{ module="kdetoys";  split=false;
+  pkgs=[
+    { name="kteatime"; }
+    { name="ktux"; }
+    { name="amor"; }
+  ];
+
+}
+{ module="kdeutils";  split=false;
+  pkgs=[
+    { name="ark"; }
+    { name="kcalc"; }
+    { name="kremotecontrol"; }
+    { name="kdf"; }
+    { name="kfloppy"; }
+    { name="printer-applet"; sane="printer_applet";}
+    { name="filelight"; }
+    { name="kcharselect"; }
+    { name="kgpg"; }
+    { name="ktimer"; }
+    { name="kwallet"; }
+    { name="sweeper"; }
+    { name="superkaramba"; }
+  ];
+
+}
+{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
+{ module="kdewebdev";  split=false;
+  pkgs=[
+    { name="klinkstatus"; }
+    { name="kfilereplace"; }
+    { name="kimagemapeditor"; }
+    { name="kommander"; }
+  ];
+
+}
+{ module="kde-workspace"; sane="kde_workspace"; split=false;}
+{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
+];
+}
--- a/pkgs/desktops/kde-4.7/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.7/kde-package/default.nix
@ -27,10 +27,11 @@ rec {
  # released as individual tarballs
  kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, ...}:
    stdenv.mkDerivation ({
-        name = "${name}-${release}";
-        src = kdesrc name;
-        meta = defMeta // meta;
-      } // (removeAttrs a [ "meta" "name" ]));
+      name = "${name}-${release}";
+      src = kdesrc name;
+      meta = defMeta // meta;
+      enableParallelBuilding = true;
+    } // (removeAttrs a [ "meta" "name" ]));

  # kdeMonoPkg wrapper for modules splitted upstream. Used in TODO
  kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
@ -39,13 +40,18 @@ rec {
  kdeSubdirPkg = module:
    {name, subdir ? name, sane ? name}:
    let name_ = name; in
-    a@{cmakeFlags ? [], name ? name_, ...}:
+    a@{cmakeFlags ? [], name ? name_, meta ? {}, ...}:
    stdenv.mkDerivation ({
      name = "${name}-${release}";
      src = kdesrc module;
-      cmakeFlags = ["-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
-      "-DBUILD_doc=TRUE" "-DBUILD_${subdir}=TRUE"] ++ cmakeFlags;
-    } // (removeAttrs a [ "cmakeFlags" ]));
+      cmakeFlags =
+        [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
+          "-DBUILD_doc=TRUE"
+          "-DBUILD_${subdir}=TRUE"
+        ] ++ cmakeFlags;
+      meta = defMeta // meta;
+      enableParallelBuilding = true;
+    } // (removeAttrs a [ "meta" "name" "cmakeFlags" ]));

  # A KDE monolithic module
  kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; };
--- a/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh
+++ b/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh
@ -33,6 +33,8 @@ if [[ ! -f kde_projects.xml ]]; then
 fi
 eval `xsltproc kde-submodules.xslt kde_projects.xml`

+module[kde-baseapps]=kde-baseapps
+
 print_sane() {
  echo "Called print_sane $1" >&2
  sane="${1//[^a-z0-9_]/_}"
@ -62,38 +64,39 @@ done


 print_pkg_hash() {
-  echo -n "{name=\"${1}\";value=\"${hash[$1]}\";}"
+  echo "  {name=\"${1}\";value=\"${hash[$1]}\";}"
 }

 print_hashes(){
-  echo -n "hashes=builtins.listToAttrs["
+  echo "hashes=builtins.listToAttrs["
  for p in "${packages[@]}"; do print_pkg_hash "$p"; done
-  echo -n "];"
+  echo "];"
 }

 print_split_module(){
  echo -n "$1:" >&2
-  echo -n "{module=\"$1\";"
+  echo -e "{\n  module=\"$1\";"
  print_sane "$1"
-  echo -n "split=true;"
-  echo -n "pkgs=["
+  echo "  split=true;"
+  echo "  pkgs=["
  for p in "${packages[@]}"; do
    if [[ "${module[$p]}" == "$1" ]]; then
-      echo -n "{name=\"$p\";"
+      echo -n "    { name=\"$p\"; "
      print_sane "$p"
-      echo -n "}"
+      echo " }"
      echo -n " $p" >&2
    fi
  done
-  echo -n "];}"
+  echo "  ];"
+  echo "}"
  echo >&2
 }

 print_mono_module(){
-  echo -n "{module=\"$1\";"
+  echo -en "{ module=\"$1\"; "
  print_sane "$1"
  echo -n "$1 ... " >&2
-  echo -n "split=false;"
+  echo -n " split=false;"
  cml="$1-$release/CMakeLists.txt"
  tar -xf "${dir}/$1-${release}.tar.bz2" "$cml"
  if grep '^[^#]*add_subdirectory' $cml >/dev/null; then
@ -104,38 +107,39 @@ print_mono_module(){
        sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' |
        grep -v '\(doc\|cmake\)'` )
      echo " seems splittable, subdirs: ${subdirs[*]}" >&2
-      echo -n "pkgs=["
+      echo -e "\n  pkgs=["
      for s in "${subdirs[@]}"; do
-        echo -n "{name=\"${s//\//-}\";"
+        echo -en "    {"
+		echo -n " name=\"${s//\//-}\"; "
        print_sane "$s"
        if [[ $s != "${s//\//-}" ]]; then
-          echo -n "subdir=\"$s\";"
+          echo -n "subdir=\"$s\"; "
        fi
-        echo -n "}"
+        echo "}"
      done
-    echo -n "];"
+      echo -e "  ];\n"
    fi
  else
    echo " is monolithic (has no subdirs)" >&2
  fi
  rm $cml
  rmdir $1-$release
-  echo -n "}"
+  echo "}"
 }

 print_modules(){
-  echo -n "modules=["
+  echo "modules=["
  echo "Printing modules splitted by upstream" >&2
  for m in "${!modules[@]}"; do print_split_module "$m"; done
  echo >&2
  echo "Printing modules not splitted by upstream (${top_level[*]})" >&2
  for m in "${top_level[@]}"; do print_mono_module "$m"; done
-  echo -n "];"
+  echo "];"
 }

 echo "Writing ${release}.nix" >&2
 exec > "${release}.nix"
-echo -n "{stable=${stable};"
+echo "{stable=${stable};"
 print_hashes
 print_modules
-echo -n "}"
+echo "}"
--- a/pkgs/desktops/kde-4.7/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.7/kde-runtime.nix
@ -0,0 +1,16 @@
+{ kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica
+, libcanberra, virtuoso, samba, ntrack
+}:
+
+kde {
+  buildInputs =
+    [ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica
+      samba (libcanberra.override { gtk = null; }) ntrack
+    ];
+
+  passthru.propagatedUserEnvPackages = [ virtuoso ];
+
+  meta = {
+    license = "LGPL";
+  };
+}
--- a/pkgs/desktops/kde-4.7/kdebase/kde-workspace.nix
+++ b/pkgs/desktops/kde-4.7/kdebase/kde-workspace.nix
--- a/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix
@ -1,22 +0,0 @@
-{ kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica,
-  libcanberra, virtuoso, makeWrapper, samba
-}:
-
-# TODO: Re-enable ntrack once it is fixed upstream
-
-kde {
-  buildInputs =
-    [ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica virtuoso
-      makeWrapper samba (libcanberra.override { gtk = null; })
-    ];
-
-# Copied from kde45, Nepomuk needs it.
-  postInstall = ''
-    wrapProgram "$out/bin/nepomukservicestub" --prefix LD_LIBRARY_PATH : "${virtuoso}/lib" \
-        --prefix PATH : "${virtuoso}/bin"
-  '';
-
-  meta = {
-    license = "LGPL";
-  };
-}
--- a/pkgs/desktops/kde-4.7/kdepim.nix
+++ b/pkgs/desktops/kde-4.7/kdepim.nix
@ -3,8 +3,10 @@

 kde {

-  buildInputs = [ kdepimlibs boost akonadi shared_desktop_ontologies libxml2
-    libxslt cyrus_sasl gpgme libassuan grantlee ];
+  buildInputs =
+    [ kdepimlibs boost akonadi shared_desktop_ontologies libxml2
+      libxslt cyrus_sasl gpgme libassuan grantlee
+    ];

  passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ];

--- a/pkgs/desktops/kde-4.7/kdepimlibs.nix
+++ b/pkgs/desktops/kde-4.7/kdepimlibs.nix
@ -2,8 +2,10 @@
 , kdelibs, akonadi, shared_desktop_ontologies, libxml2, libxslt, prison }:

 kde {
-  buildInputs = [ boost gpgme shared_desktop_ontologies libical libxml2 libxslt
-    openldap cyrus_sasl akonadi prison ];
+  buildInputs =
+    [ boost gpgme shared_desktop_ontologies libical libxml2 libxslt
+      openldap cyrus_sasl akonadi prison
+    ];

  propagatedBuildInputs = [ kdelibs ];

--- a/pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix
+++ b/pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix
@ -1,7 +1,7 @@
-{ kde, kdelibs, subversion, apr, aprutil }:
+{ kde, kdelibs, subversionClient, apr, aprutil }:

 kde {
-  buildInputs = [ kdelibs subversion apr aprutil ];
+  buildInputs = [ kdelibs subversionClient apr aprutil ];

  patches = [ ./find-svn.patch ];

--- a/pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix
+++ b/pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix
@ -1,7 +1,7 @@
-{ kde, kdelibs, libXtst }:
+{ kde, kdelibs, kde_workspace, libXtst }:

 kde {
-  buildInputs = [ kdelibs libXtst ];
+  buildInputs = [ kdelibs kde_workspace libXtst ];

  meta = {
    description = "KDE remote control";
--- a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.1.nix
+++ b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.1.nix
@ -0,0 +1,262 @@
+[
+{
+  lang = "ar";
+  saneName = "ar";
+  sha256 = "03sl2d83hyl138kl7424nxi546v1x1yp5ywqknk194532gf7isf2";
+}
+{
+  lang = "bg";
+  saneName = "bg";
+  sha256 = "0dal1sdvr28d0w9izl6chzybp1xgnvl20yn59yszl9zfwxzm5z45";
+}
+{
+  lang = "bs";
+  saneName = "bs";
+  sha256 = "17galw35j93jsmdpihr2x1jrpz8phyrrw403q77xb7csdc89mg41";
+}
+{
+  lang = "ca";
+  saneName = "ca";
+  sha256 = "07llq52f0hxz39h2amq1an788m6bijijifk9hilbkiixs1bpcycp";
+}
+{
+  lang = "ca@valencia";
+  saneName = "ca_valencia";
+  sha256 = "0f07p6nz0gryjihz35ga4hn7gj32is978ns74mxkgql3cqkmzpp8";
+}
+{
+  lang = "cs";
+  saneName = "cs";
+  sha256 = "0lcmp4lrlzjx8003fdpgsz5xi33ldj5sxkim90y76866kwgfd8a0";
+}
+{
+  lang = "da";
+  saneName = "da";
+  sha256 = "10ja0jg6fqq0a9nx2lcljp4fmrvn8yicv75wchfmz6ydrylfmlmc";
+}
+{
+  lang = "de";
+  saneName = "de";
+  sha256 = "10xbbjq08r47pcxg6j8k3yyvfjf6fvk16f3njriclsrxg5kgjcb1";
+}
+{
+  lang = "el";
+  saneName = "el";
+  sha256 = "0w6fkkmqqx73mf3piwqfk98xyk8izvrxkhw653npm30j2x5l1ccf";
+}
+{
+  lang = "en_GB";
+  saneName = "en_GB";
+  sha256 = "1xpsly96d68kzswscfz7fj4xzk3z92ddlzs06jl5ga3vi5v08br9";
+}
+{
+  lang = "es";
+  saneName = "es";
+  sha256 = "12wpzdqx5ckkr3x7wsbyb6ljixm66cxsxw5vpxf987hm9pblip9c";
+}
+{
+  lang = "et";
+  saneName = "et";
+  sha256 = "11s8wlv3qpnd9hf39z53nan6ljxdvh17knaz1jl7a04f0dczc1hj";
+}
+{
+  lang = "eu";
+  saneName = "eu";
+  sha256 = "0a491igqcz1gb7218m9wflvrlyj0h95xlmsn70pb1jv0kvmpib7w";
+}
+{
+  lang = "fi";
+  saneName = "fi";
+  sha256 = "0c5fji14j8h7zpj5941wrl6nar76ll5ry2yhcdq82ciphc74421q";
+}
+{
+  lang = "fr";
+  saneName = "fr";
+  sha256 = "1bgmlj7s7rdzva5i3kdi0hf16kh929a9qmhg745ivbfl89slbi6c";
+}
+{
+  lang = "ga";
+  saneName = "ga";
+  sha256 = "1fail3mpmsb0zvskwrxzjx0bvsbf28rv5qjzh061w1a9jqd0ggn3";
+}
+{
+  lang = "gl";
+  saneName = "gl";
+  sha256 = "0hx6y2xzgvnhcvmdf7qh1bk1jk87srmxpi1m4blwqara189bmqz7";
+}
+{
+  lang = "he";
+  saneName = "he";
+  sha256 = "1fjdjaqplqs9jk0np4fj8sm9jds8i9hxxf64cqj0is6wcf7lf9bc";
+}
+{
+  lang = "hr";
+  saneName = "hr";
+  sha256 = "1j56aj0bhpgfzlxcav3rwzahxm6q00hpdg6jmgq0m02d45kvn8z5";
+}
+{
+  lang = "hu";
+  saneName = "hu";
+  sha256 = "1syxpqk37jwippx7p273f4h6n14jhbv22wmq8la48jsqdkgrrgjg";
+}
+{
+  lang = "ia";
+  saneName = "ia";
+  sha256 = "1jazhp4n5ymz5gbxc3g3c9jvd7k1fs2b1w09vhnbgwa6i3gpa1i8";
+}
+{
+  lang = "id";
+  saneName = "id";
+  sha256 = "1g85002i29g6qzmjrwng4pndrkxnkg1ph1qvkkrnkkpygbw3whvm";
+}
+{
+  lang = "is";
+  saneName = "is";
+  sha256 = "11aavg4gw7xcdaq72ygynm2zbjcmal0baaw6sk1gy597620hfm5g";
+}
+{
+  lang = "it";
+  saneName = "it";
+  sha256 = "1395nskpbg8ah2q18ahsfv39ixhw74gb5cxr2irsfkgnwbmglas1";
+}
+{
+  lang = "ja";
+  saneName = "ja";
+  sha256 = "0jrnbd8j6qcfhxvfs014qq0dbdbp6632bk2210xg07sfmrz43csm";
+}
+{
+  lang = "kk";
+  saneName = "kk";
+  sha256 = "0rxvj142rw40d93ygfysavpw4jbyn8yx6c828sv5lp8c2r4kid5a";
+}
+{
+  lang = "km";
+  saneName = "km";
+  sha256 = "12x5dnk33khmfnf9fk5qq3par1l21xfy24lq4a6jdf8ya9nj62r5";
+}
+{
+  lang = "kn";
+  saneName = "kn";
+  sha256 = "0c4cp019ij80fc188dzkv5nbxplxhnhqc3b2qda9xr1j78vbbh46";
+}
+{
+  lang = "ko";
+  saneName = "ko";
+  sha256 = "0lhnvy370fk21z1r1wdq484pdjq6c0jsj3s2z58z4x7rfw2lq487";
+}
+{
+  lang = "lt";
+  saneName = "lt";
+  sha256 = "1blcg57vm05sbvcgslr49k84whm3f99mcd15zb8fxvvrybg0hr2m";
+}
+{
+  lang = "lv";
+  saneName = "lv";
+  sha256 = "0jc2vv97jwbbr966spzv10aimb9c42x5ia1rnr2kvs1hb8sxwvp1";
+}
+{
+  lang = "nb";
+  saneName = "nb";
+  sha256 = "04362qr5p3dhscrppcbg9cj28idrs0hslc2lk98drpq2rkc8rjmb";
+}
+{
+  lang = "nds";
+  saneName = "nds";
+  sha256 = "1ci4xh56w6rn68sl5xk23l1rxxfz7ni7y4z2sc5yidwi1acxfwpm";
+}
+{
+  lang = "nl";
+  saneName = "nl";
+  sha256 = "197jdabjxk61n5b69sw9jqcpp7561hq3dw086z2pymqll5irjf7f";
+}
+{
+  lang = "nn";
+  saneName = "nn";
+  sha256 = "1cd0ifr6p9m8h665grwy8nk3gw72w9h5a8bygf5nj55164qmff98";
+}
+{
+  lang = "pa";
+  saneName = "pa";
+  sha256 = "1scn7nkl521v1f1y0km3s57s02xfblblg2f572s9yz5j2da9p2j0";
+}
+{
+  lang = "pl";
+  saneName = "pl";
+  sha256 = "1qn6lakcfah85ws9njz2xp36xj2n3ld3mhqkvcb6mddv943x65vj";
+}
+{
+  lang = "pt";
+  saneName = "pt";
+  sha256 = "0pw2zvma1jczkp0ypshxyl4dcnx6jakms91i2pwyswa8jv3mfx3b";
+}
+{
+  lang = "pt_BR";
+  saneName = "pt_BR";
+  sha256 = "1n9m7wj5gd3kwf6smbx53l3jbjyvd26ginw007bnv6x14g2y7k19";
+}
+{
+  lang = "ro";
+  saneName = "ro";
+  sha256 = "155l1szxvjcgmw44097q8dvgd9ljgs2y3dn8mpi3y6cqj5kdb42s";
+}
+{
+  lang = "ru";
+  saneName = "ru";
+  sha256 = "166ck2pvhdrpyf269fmkqkqs3l6s4cc8f2p3w88f5z75qg9xc3bj";
+}
+{
+  lang = "sk";
+  saneName = "sk";
+  sha256 = "18bidvnhg2gqnjgr6np1gm2irn81b108kx7ri11gwppqh3h90340";
+}
+{
+  lang = "sl";
+  saneName = "sl";
+  sha256 = "0c2av80r3zc1jkybj3yp5hspv5rwlyda039jy11y49d6zwval097";
+}
+{
+  lang = "sr";
+  saneName = "sr";
+  sha256 = "0dffkmsd9l30c17fi5x6m6lx5hi5diqqxmmn36a9wb393mw8srm9";
+}
+{
+  lang = "sv";
+  saneName = "sv";
+  sha256 = "10rrlrwarh8sks2wym2kq3rk69kgzqk38ll93i0i0zhjgyqiahrg";
+}
+{
+  lang = "th";
+  saneName = "th";
+  sha256 = "1sqyw6zd3vnpkvb7iisqhnk7vjp3212h97yqgmlsxfry2rys1kmr";
+}
+{
+  lang = "tr";
+  saneName = "tr";
+  sha256 = "0vzr81c004zwxqhfwhpfs4g1w5dvbxzb9y3g3vsagnsc94i5fb9y";
+}
+{
+  lang = "ug";
+  saneName = "ug";
+  sha256 = "0p0ln8dcpq2hbqz651lb7izb82dqhh5pl3a931yzd99a6lr3kd39";
+}
+{
+  lang = "uk";
+  saneName = "uk";
+  sha256 = "0b6q2s1qigzchqs9dmzm31jrnhz3vfsix4zbmzs0wdib05qy6y1f";
+}
+{
+  lang = "wa";
+  saneName = "wa";
+  sha256 = "01hi12hanz44lbn52dcll2glcljax1mv3n5qc8w9gf4cqjjrs2ia";
+}
+{
+  lang = "zh_CN";
+  saneName = "zh_CN";
+  sha256 = "0iwszbl2myh9ik3yk19nyrj43rcki23amp5i2sx7lz9gy14lvgl8";
+}
+{
+  lang = "zh_TW";
+  saneName = "zh_TW";
+  sha256 = "1j1kvyc82ysin4ksp63gzczg4ihvn4qlfjd5l16qi0galp96mz21";
+}
+]
--- a/pkgs/desktops/kde-4.7/oxygen-icons.nix
+++ b/pkgs/desktops/kde-4.7/oxygen-icons.nix
@ -3,7 +3,7 @@
 kde {
  outputHashAlgo = "sha256";
  outputHashMode = "recursive";
-  outputHash = "7d7f352f574f5747f16ac517cbe19d0b011adb74e7a0b791705afb3addac1e96";
+  outputHash = "87010a208f6860429d78c0d518a4f70c450b9c199900076d0aa232de8ae6452e";

  buildNativeInputs = [ cmake ];

--- a/pkgs/desktops/kde-4.7/support/soprano/default.nix
+++ b/pkgs/desktops/kde-4.7/support/soprano/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qt4, clucene_core, redland, libiodbc }:
+{ stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc }:

 stdenv.mkDerivation rec {
  name = "soprano-2.7.0";
@ -8,8 +8,17 @@ stdenv.mkDerivation rec {
    sha256 = "1ki92wg0i9nhn1fh5mdcls5h9h3lf2k5r66snsags4x7zw0dmv2z";
  };

+  patches =
+    [ (fetchurl {
+        url = https://git.reviewboard.kde.org/r/102466/diff/raw/;
+        name = "soprano-virtuoso-restart.patch";
+        sha256 = "0jk038fp7ii6847mbxdajhhc7f6ap6lriaklxcqqxf6ddj37gf3y";
+      })
+      ./find-virtuoso.patch 
+    ];
+
  # We disable the Java backend, since we do not need them and they make the closure size much bigger
-  buildInputs = [ cmake qt4 clucene_core redland libiodbc ];
+  buildInputs = [ cmake qt4 clucene_core librdf_redland libiodbc ];

  meta = {
    homepage = http://soprano.sourceforge.net/;
--- a/pkgs/desktops/kde-4.7/support/soprano/find-virtuoso.patch
+++ b/pkgs/desktops/kde-4.7/support/soprano/find-virtuoso.patch
@ -0,0 +1,77 @@
+From: Yury G. Kudryashov <urkud.urkud@gmail.com>
+Subject: [PATCH] Find virtuoso if virtuoso-t is in PATH
+
+---
+ backends/virtuoso/virtuosobackend.cpp |   29 ++++++++++++++++++++---------
+ backends/virtuoso/virtuosobackend.h   |    2 +-
+ 2 files changed, 21 insertions(+), 10 deletions(-)
+
+diff --git a/backends/virtuoso/virtuosobackend.cpp b/backends/virtuoso/virtuosobackend.cpp
+index c83605d..c24854e 100644
+--- a/backends/virtuoso/virtuosobackend.cpp
+++ b/backends/virtuoso/virtuosobackend.cpp
+@@ -188,19 +188,19 @@ namespace {
+ 
+ bool Soprano::Virtuoso::BackendPlugin::isAvailable() const
+ {
+-#ifndef Q_OS_WIN
+-    if ( findVirtuosoDriver().isEmpty() ) {
+-        qDebug() << Q_FUNC_INFO << "could not find Virtuoso ODBC driver";
+-        return false;
+-    }
+-#endif
+-
+     QString virtuosoBin = VirtuosoController::locateVirtuosoBinary();
+     if ( virtuosoBin.isEmpty() ) {
+         qDebug() << Q_FUNC_INFO << "could not find virtuoso-t binary";
+         return false;
+     }
+ 
+#ifndef Q_OS_WIN
+    if ( findVirtuosoDriver(virtuosoBin).isEmpty() ) {
+        qDebug() << Q_FUNC_INFO << "could not find Virtuoso ODBC driver";
+        return false;
+    }
+#endif
+
+     QString vs = determineVirtuosoVersion( virtuosoBin );
+     if ( vs.isEmpty() ) {
+         qDebug() << Q_FUNC_INFO << "Failed to determine version of the Virtuoso server at" << virtuosoBin;
+@@ -217,9 +217,20 @@ bool Soprano::Virtuoso::BackendPlugin::isAvailable() const
+ 
+ 
+ #ifndef Q_OS_WIN
+-QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver() const
+QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver( const QString &virtuosoBinHint ) const
+ {
+-    return Soprano::findLibraryPath( "virtodbc_r", QStringList(), QStringList() << QLatin1String( "virtuoso/plugins/" ) << QLatin1String( "odbc/" ) );
+    QString virtuosoBin;
+    if (virtuosoBinHint.isEmpty())
+        virtuosoBin = VirtuosoController::locateVirtuosoBinary();
+    else
+        virtuosoBin = virtuosoBinHint;
+
+    QDir virtuosoBinDir = QFileInfo(virtuosoBin).absoluteDir();
+    return Soprano::findLibraryPath( "virtodbc_r",
+            QStringList() << virtuosoBinDir.absolutePath()
+            << virtuosoBinDir.absoluteFilePath("../lib"),
+            QStringList() << QLatin1String( "virtuoso/plugins/" ) <<
+            QLatin1String( "odbc/" ) );
+ }
+ #endif
+ 
+diff --git a/backends/virtuoso/virtuosobackend.h b/backends/virtuoso/virtuosobackend.h
+index 3971b83..0807e5d 100644
+--- a/backends/virtuoso/virtuosobackend.h
+++ b/backends/virtuoso/virtuosobackend.h
+@@ -50,7 +50,7 @@ namespace Soprano {
+ 
+ #ifndef Q_OS_WIN
+         private:
+-            QString findVirtuosoDriver() const;
+            QString findVirtuosoDriver(const QString &virtuosoBinHint = QString()) const;
+ #endif
+         };
+     }
+-- 
+tg: (432b73f..) t/find-virtuoso (depends on: master)
--- a/pkgs/desktops/xfce-4.8/applications/mousepad.nix
+++ b/pkgs/desktops/xfce-4.8/applications/mousepad.nix
@ -14,5 +14,7 @@ stdenv.mkDerivation rec {
    homepage = http://www.xfce.org/projects/mousepad/;
    description = "A simple text editor for Xfce";
    license = "GPLv2+";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
  };
 }
--- a/pkgs/desktops/xfce-4.8/applications/ristretto.nix
+++ b/pkgs/desktops/xfce-4.8/applications/ristretto.nix
@ -20,5 +20,7 @@ stdenv.mkDerivation rec {
    homepage = http://goodies.xfce.org/projects/applications/ristretto;
    description = "A fast and lightweight picture-viewer for the Xfce desktop environment";
    license = "GPLv2+";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
  };
 }
--- a/pkgs/desktops/xfce-4.8/applications/terminal.nix
+++ b/pkgs/desktops/xfce-4.8/applications/terminal.nix
@ -19,5 +19,7 @@ stdenv.mkDerivation {
    homepage = http://www.xfce.org/projects/terminal;
    description = "A modern terminal emulator primarily for the Xfce desktop environment";
    license = "GPLv2+";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
  };
 }
--- a/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix
+++ b/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix
@ -34,5 +34,7 @@ stdenv.mkDerivation rec {
    homepage = http://www.xfce.org/projects/xfce4-mixer;
    description = "A volume control application for the Xfce desktop environment";
    license = "GPLv2+";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
  };
 }
--- a/Show More
+++ b/Show More