diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate
index 96517f86cb8..6bb379f4fd2 100755
--- a/maintainers/scripts/gnu/gnupdate
+++ b/maintainers/scripts/gnu/gnupdate
@@ -308,12 +308,17 @@ replaced by the result of their application to DERIVATIONS, a vhash."
   ;; DERIVATION lacks an "src" attribute.
   (and=> (derivation-source derivation) source-output-path))
 
-(define (open-nixpkgs nixpkgs)
+(define* (open-nixpkgs nixpkgs #:optional attribute)
+  ;; Return an input pipe to the XML representation of Nixpkgs.  When
+  ;; ATTRIBUTE is true, only that attribute is considered.
   (let ((script  (string-append nixpkgs
                                 "/maintainers/scripts/eval-release.nix")))
-    (open-pipe* OPEN_READ "nix-instantiate"
-                "--strict" "--eval-only" "--xml"
-                script)))
+    (apply open-pipe* OPEN_READ
+           "nix-instantiate" "--strict" "--eval-only" "--xml"
+           `(,@(if attribute
+                   `("-A" ,attribute)
+                   '())
+             ,script))))
 
 (define (pipe-failed? pipe)
   "Close pipe and return its status if it failed."
@@ -323,21 +328,36 @@ replaced by the result of their application to DERIVATIONS, a vhash."
         status
         #f)))
 
-(define (nix-prefetch-url url)
-  ;; Download URL in the Nix store and return the base32-encoded SHA256 hash
-  ;; of the file at URL
-  (let* ((pipe (open-pipe* OPEN_READ "nix-prefetch-url" url))
-         (hash (read-line pipe)))
-    (if (or (pipe-failed? pipe)
-            (eof-object? hash))
-        (values #f #f)
-        (let* ((pipe (open-pipe* OPEN_READ "nix-store" "--print-fixed-path"
-                                   "sha256" hash (basename url)))
-               (path (read-line pipe)))
-          (if (or (pipe-failed? pipe)
-                  (eof-object? path))
-              (values #f #f)
-              (values (string-trim-both hash) (string-trim-both path)))))))
+(define (memoize proc)
+  "Return a memoizing version of PROC."
+  (let ((cache (make-hash-table)))
+    (lambda args
+      (let ((results (hash-ref cache args)))
+        (if results
+            (apply values results)
+            (let ((results (call-with-values (lambda ()
+                                               (apply proc args))
+                             list)))
+              (hash-set! cache args results)
+              (apply values results)))))))
+
+(define nix-prefetch-url
+  (memoize
+   (lambda (url)
+     "Download URL in the Nix store and return the base32-encoded SHA256 hash of
+the file at URL."
+     (let* ((pipe (open-pipe* OPEN_READ "nix-prefetch-url" url))
+            (hash (read-line pipe)))
+       (if (or (pipe-failed? pipe)
+               (eof-object? hash))
+           (values #f #f)
+           (let* ((pipe (open-pipe* OPEN_READ "nix-store" "--print-fixed-path"
+                                    "sha256" hash (basename url)))
+                  (path (read-line pipe)))
+             (if (or (pipe-failed? pipe)
+                     (eof-object? path))
+                 (values #f #f)
+                 (values (string-trim-both hash) (string-trim-both path)))))))))
 
 (define (update-nix-expression file
                                old-version old-hash
@@ -409,8 +429,7 @@ replaced by the result of their application to DERIVATIONS, a vhash."
 (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."
+  "Verify signature SIG for FILE.  Return a status s-exp if GnuPG failed."
 
   (define (status-line->sexp line)
     ;; See file `doc/DETAILS' in GnuPG.
@@ -422,6 +441,8 @@ failed."
     (define validsig-rx
       (make-regexp
        "^\\[GNUPG:\\] VALIDSIG ([[:xdigit:]]+) ([[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}) ([[:digit:]]+) .*$"))
+    (define expkeysig-rx                    ; good signature, but expired key
+      (make-regexp "^\\[GNUPG:\\] EXPKEYSIG ([[:xdigit:]]+) (.*)$"))
     (define errsig-rx
       (make-regexp
        "^\\[GNUPG:\\] ERRSIG ([[:xdigit:]]+) ([^ ]+) ([^ ]+) ([^ ]+) ([[:digit:]]+) ([[:digit:]]+)"))
@@ -431,20 +452,25 @@ failed."
            (lambda (match)
              `(signature-id ,(match:substring match 1) ; sig id
                             ,(match:substring match 2) ; date
-                            ,(string->number      ; timestamp
+                            ,(string->number           ; timestamp
                               (match:substring match 3)))))
           ((regexp-exec goodsig-rx line)
            =>
            (lambda (match)
-             `(good-signature ,(match:substring match 1) ; key id
+             `(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
+                               ,(string->number           ; timestamp
                                  (match:substring match 3)))))
+          ((regexp-exec expkeysig-rx line)
+           =>
+           (lambda (match)
+             `(expired-key-signature ,(match:substring match 1) ; fingerprint
+                                     ,(match:substring match 2)))) ; user name
           ((regexp-exec errsig-rx line)
            =>
            (lambda (match)
@@ -452,7 +478,7 @@ failed."
                                ,(match:substring match 2) ; pubkey algo
                                ,(match:substring match 3) ; hash algo
                                ,(match:substring match 4) ; sig class
-                               ,(string->number   ; timestamp
+                               ,(string->number           ; timestamp
                                  (match:substring match 5))
                                ,(let ((rc
                                        (string->number ; return code
@@ -475,16 +501,17 @@ failed."
   (let* ((pipe   (open-pipe* OPEN_READ %gpg-command "--status-fd=1"
                              "--verify" sig file))
          (status (parse-status pipe)))
-    (if (pipe-failed? pipe)
-        #f
-        status)))
+    ;; Ignore PIPE's exit status since STATUS above should contain all the
+    ;; info we need.
+    (close-pipe pipe)
+    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)
+           (((or 'good-signature 'expired-key-signature) key-id user)
             (cons key-id user))
            (_ #f)))
        status))
@@ -716,7 +743,8 @@ Return #t if the signature was good, #f otherwise."
                         (('attribute _ "description" value)
                          (string-prefix? "GNU" value))
                         (('attribute _ "homepage" (? string? value))
-                         (string-contains value "www.gnu.org"))
+                         (or (string-contains value "gnu.org")
+                             (string-contains value "gnupg.org")))
                         (('attribute _ "homepage" ((? string? value) ...))
                          (any (cut string-contains <> "www.gnu.org") value))
                         (_ #f)))
@@ -749,10 +777,10 @@ Return #t if the signature was good, #f otherwise."
       ("libosip2"     "ftp.gnu.org"   "/gnu/osip" #f)
       ("libgcrypt"    "ftp.gnupg.org" "/gcrypt" #t)
       ("libgpg-error" "ftp.gnupg.org" "/gcrypt" #t)
+      ("libassuan"    "ftp.gnupg.org" "/gcrypt" #t)
       ("freefont-ttf" "ftp.gnu.org"   "/gnu/freefont" #f)
       ("gnupg"        "ftp.gnupg.org" "/gcrypt" #t)
       ("gnu-ghostscript" "ftp.gnu.org"  "/gnu/ghostscript" #f)
-      ("GNUnet"       "ftp.gnu.org" "/gnu/gnunet" #f)
       ("mit-scheme"   "ftp.gnu.org" "/gnu/mit-scheme/stable.pkg" #f)
       ("icecat"       "ftp.gnu.org" "/gnu/gnuzilla" #f)
       ("source-highlight" "ftp.gnu.org" "/gnu/src-highlite" #f)
@@ -776,7 +804,6 @@ Return #t if the signature was good, #f otherwise."
       ("gnumake"     . "make")
       ("gnused"      . "sed")
       ("gnutar"      . "tar")
-      ("gnunet"      . "GNUnet") ;; ftp.gnu.org/gnu/gnunet/GNUnet-x.y.tar.gz
       ("mitscheme"   . "mit-scheme")
       ("texmacs"     . "TeXmacs")))
 
@@ -921,6 +948,7 @@ pairs.  Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\").
         gnu-packages))
 
 (define (fetch-gnu project directory version archive-type)
+  "Download PROJECT's tarball over FTP."
   (let* ((server  (ftp-server/directory project))
          (base    (string-append project "-" version ".tar." archive-type))
          (url     (string-append "ftp://" server "/" directory "/" base))
@@ -963,12 +991,18 @@ pairs.  Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\").
                   (format #t "~%")
                   (format #t "  -x, --xml=FILE      Read XML output of `nix-instantiate'~%")
                   (format #t "                      from FILE.~%")
+                  (format #t "  -A, --attribute=ATTR~%")
+                  (format #t "                      Update only the package pointed to by attribute~%")
+                  (format #t "                      ATTR.~%")
                   (format #t "  -s, --select=SET    Update only packages from SET, which may~%")
                   (format #t "                      be either `all', `stdenv', or `non-stdenv'.~%")
                   (format #t "  -d, --dry-run       Don't actually update Nix expressions~%")
                   (format #t "  -h, --help          Give this help list.~%~%")
                   (format #t "Report bugs to <ludo@gnu.org>~%")
                   (exit 0)))
+        (option '(#\A "attribute") #t #f
+                (lambda (opt name arg result)
+                  (alist-cons 'attribute arg result)))
         (option '(#\s "select") #t #f
                 (lambda (opt name arg result)
                   (cond ((string-ci=? arg "stdenv")
@@ -994,13 +1028,14 @@ pairs.  Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\").
 (define (gnupdate . args)
   ;; Assume Nixpkgs is under $NIXPKGS or ~/src/nixpkgs.
 
-  (define (nixpkgs->snix xml-file)
+  (define (nixpkgs->snix xml-file attribute)
     (format (current-error-port) "evaluating Nixpkgs...~%")
     (let* ((home (getenv "HOME"))
            (xml  (if xml-file
                      (open-input-file xml-file)
                      (open-nixpkgs (or (getenv "NIXPKGS")
-                                       (string-append home "/src/nixpkgs")))))
+                                       (string-append home "/src/nixpkgs"))
+                                   attribute)))
            (snix (xml->snix xml)))
       (if (not xml-file)
           (let ((status (pipe-failed? xml)))
@@ -1009,7 +1044,37 @@ pairs.  Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\").
                   (format (current-error-port) "`nix-instantiate' failed: ~A~%"
                           status)
                   (exit 1)))))
-      snix))
+
+      ;; If we asked for a specific attribute, rewrap the thing in an
+      ;; attribute set to match the expectations of `packages-to-update' & co.
+      (if attribute
+          (match snix
+            (('snix loc ('derivation args ...))
+             `(snix ,loc
+                    (attribute-set
+                     ((attribute #f ,attribute
+                                 (derivation ,@args)))))))
+          snix)))
+
+  (define (selected-gnu-packages packages stdenv selection)
+    ;; Return the subset of PACKAGES that are/aren't in STDENV, according to
+    ;; SELECTION.  To do that reliably, we check whether their "src"
+    ;; derivation is a requisite of STDENV.
+    (define gnu
+      (gnu-packages packages))
+
+    (case selection
+      ((stdenv)
+       (filter (lambda (p)
+                 (member (package-source-output-path p)
+                         (force stdenv)))
+               gnu))
+      ((non-stdenv)
+       (filter (lambda (p)
+                 (not (member (package-source-output-path p)
+                              (force stdenv))))
+               gnu))
+      (else gnu)))
 
   (let* ((opts      (args-fold (cdr args) %options
                                (lambda (opt name arg result)
@@ -1017,7 +1082,8 @@ pairs.  Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\").
                                (lambda (operand result)
                                  (error "extraneous argument `~A'" operand))
                                '()))
-         (snix      (nixpkgs->snix (assoc-ref opts 'xml-file)))
+         (snix      (nixpkgs->snix (assq-ref opts 'xml-file)
+                                   (assq-ref opts 'attribute)))
          (packages  (match snix
                       (('snix _ ('attribute-set attributes))
                        attributes)
@@ -1026,23 +1092,12 @@ pairs.  Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\").
                       ;; The source tarballs that make up stdenv.
                       (filter-map derivation-source-output-path
                                   (package-requisites (stdenv-package packages)))))
-         (gnu       (gnu-packages packages))
-         (gnu*      (case (assoc-ref opts 'filter)
-                      ;; Filter out packages that are/aren't in `stdenv'.  To
-                      ;; do that reliably, we check whether their "src"
-                      ;; derivation is a requisite of stdenv.
-                      ((stdenv)
-                       (filter (lambda (p)
-                                 (member (package-source-output-path p)
-                                         (force stdenv)))
-                               gnu))
-                      ((non-stdenv)
-                       (filter (lambda (p)
-                                 (not (member (package-source-output-path p)
-                                              (force stdenv))))
-                               gnu))
-                      (else gnu)))
-         (updates   (packages-to-update gnu*)))
+         (attribute (assq-ref opts 'attribute))
+         (selection (assq-ref opts 'filter))
+         (to-update (if attribute
+                        packages                  ; already a subset
+                        (selected-gnu-packages packages stdenv selection)))
+         (updates   (packages-to-update to-update)))
 
     (format #t "~%~A packages to update...~%" (length updates))
     (for-each (lambda (update)
diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix
new file mode 100644
index 00000000000..b9d30409711
--- /dev/null
+++ b/pkgs/applications/audio/ncmpcpp/default.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchurl, ncurses, curl, taglib, fftw, mpd_clientlib, pkgconfig}:
+
+stdenv.mkDerivation rec {
+  version = "0.5.8";
+  name = "ncmpcpp-${version}";
+
+  src = fetchurl {
+    url = "http://unkart.ovh.org/ncmpcpp/ncmpcpp-${version}.tar.bz2";
+    sha256 = "1kbkngs4fhf9z53awskqiwdl94i5slvxmjiajkrayi99373fallx";
+  };
+
+  buildInputs = [ ncurses curl taglib fftw mpd_clientlib pkgconfig ];
+
+  meta = {
+    description = "Curses-based interface for MPD (music player daemon)";
+    homepage = http://unkart.ovh.org/ncmpcpp/;
+    license = "GPLv2+";
+    maintainers = [ stdenv.lib.maintainers.mornfall ];
+  };
+}
+
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 3a15d32aa7f..38eb51b93db 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -2,7 +2,7 @@
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
-let version = "0.6.1.309"; in
+let version = "0.6.2.291"; 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}.gb871a7d-1_i386.deb";
-        sha256 = "01bavmv78vd3lxsinbls72v2sj8czbcwzdg6sc2f9yd5g7snb3im";
+        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gcccc1f5.116-1_i386.deb";
+        sha256 = "164ka9xry9nbnv77w71kzi7bjidlmccw8wnn4fyzavi8pbrpmj08";
       }
     else if stdenv.system == "x86_64-linux" then 
       fetchurl {
-        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gb871a7d-1_amd64.deb";
-        sha256 = "13ki1pcpna7f5sxf1j2axww95c4kqhj0r1d11y98mfvzxxjqimjs";
+        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gcccc1f5.116-1_amd64.deb";
+        sha256 = "08snnpqd5ldiqv98pwx3fjrhdlwp4arbgda9xnsy92wfk0s85lv8";
       }
     else throw "Spotify not supported on this platform.";
 
diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix
index ce01d4b9204..34acaa6d880 100644
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix
@@ -1,28 +1,32 @@
 { stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake }:
 
 stdenv.mkDerivation (rec {
-  name = "ProofGeneral-4.0";
+  name = "ProofGeneral-4.1";
 
   src = fetchurl {
-    url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.0.tgz;
-    sha256 = "1ang2lsc97vl70fkgypfsr1ivdzsdliq3bkvympj30wnc7ayzbmq";
+    url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.1.tgz;
+    sha256 = "1ivxx8c6j7cfdfj2pj0gzdqac7hpb679bjmwdqdcz1c1ni34s9ia";
   };
 
   sourceRoot = name;
 
   buildInputs = [ emacs texinfo texLive perl which ];
 
-  patches = [ ./emacs-23.3.patch ];
-
-  postPatch =
+  prePatch =
     '' sed -i "Makefile" \
            -e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \
                s|/sbin/install-info|install-info|g"
 
        sed -i "bin/proofgeneral" -e's/which/type -p/g'
+
+       # @image{ProofGeneral} fails, so remove it.
+       sed -i '94d' doc/PG-adapting.texi
+       sed -i '101d' doc/ProofGeneral.texi
     '';
 
-  preBuild = "make clean";
+  preBuild = ''
+    make clean;
+  '';
 
   installPhase =
     # Copy `texinfo.tex' in the right place so that `texi2pdf' works.
diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/emacs-23.3.patch b/pkgs/applications/editors/emacs-modes/proofgeneral/emacs-23.3.patch
deleted file mode 100644
index 9bbc21a82b8..00000000000
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/emacs-23.3.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Nuar ProofGeneral-4.0/contrib/mmm/mmm-mode.el ProofGeneral-4.0-nix/contrib/mmm/mmm-mode.el
---- ProofGeneral-4.0/contrib/mmm/mmm-mode.el	2010-10-11 00:56:57.000000000 +0200
-+++ ProofGeneral-4.0-nix/contrib/mmm/mmm-mode.el	2011-05-14 21:55:12.000000000 +0200
-@@ -160,9 +160,9 @@
-      (mmm-add-hooks)
-      (mmm-fixup-skeleton)
-      (make-local-variable 'font-lock-fontify-region-function)
--     (make-local-variable 'font-lock-beginning-of-syntax-function)
-+     (make-local-variable 'syntax-begin-function)
-      (setq font-lock-fontify-region-function 'mmm-fontify-region
--	   font-lock-beginning-of-syntax-function 'mmm-beginning-of-syntax)
-+	   syntax-begin-function 'mmm-beginning-of-syntax)
-      (setq mmm-mode t)
-      (condition-case err
- 	 (mmm-apply-all)
-@@ -190,7 +190,7 @@
-     (mmm-update-submode-region)
-     (setq font-lock-fontify-region-function
- 	  (get mmm-primary-mode 'mmm-fontify-region-function)
--	  font-lock-beginning-of-syntax-function
-+	  syntax-begin-function
- 	  (get mmm-primary-mode 'mmm-beginning-of-syntax-function))
-     (mmm-update-font-lock-buffer)
-     (mmm-refontify-maybe)
-diff -Nuar ProofGeneral-4.0/contrib/mmm/mmm-region.el ProofGeneral-4.0-nix/contrib/mmm/mmm-region.el
---- ProofGeneral-4.0/contrib/mmm/mmm-region.el	2010-10-11 00:56:57.000000000 +0200
-+++ ProofGeneral-4.0-nix/contrib/mmm/mmm-region.el	2011-05-14 21:58:01.000000000 +0200
-@@ -548,7 +548,7 @@
- 	    (put mode 'mmm-fontify-region-function
- 		 font-lock-fontify-region-function))
- 	  (put mode 'mmm-beginning-of-syntax-function
--	       font-lock-beginning-of-syntax-function))
-+	       syntax-begin-function))
- 	;; Get variables
- 	(setq global-vars (mmm-get-locals 'global)
- 	      buffer-vars (mmm-get-locals 'buffer)
-@@ -768,7 +768,7 @@
-   ;; For some reason `font-lock-fontify-block' binds this to nil, thus
-   ;; preventing `mmm-beginning-of-syntax' from doing The Right Thing.
-   ;; I don't know why it does this, but let's undo it here.
--  (let ((font-lock-beginning-of-syntax-function 'mmm-beginning-of-syntax))
-+  (let ((syntax-begin-function 'mmm-beginning-of-syntax))
-     (mapc #'(lambda (elt)
- 		(when (get (car elt) 'mmm-font-lock-mode)
- 		  (mmm-fontify-region-list (car elt) (cdr elt))))
diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix
index ea86f9caf52..badd18b8915 100644
--- a/pkgs/applications/editors/gobby/default.nix
+++ b/pkgs/applications/editors/gobby/default.nix
@@ -2,7 +2,7 @@
 , gnomeSupport ? false # build support for Gnome(gnome-vfs)
 , stdenv, fetchurl, pkgconfig
 , gtkmm, gsasl, gtksourceview, libxmlxx, libinfinity, intltool
-, gnomevfs ? null}:
+, gnome_vfs ? null}:
 
 let
   libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; };
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
   };
 
   buildInputs = [ pkgconfig gtkmm gsasl gtksourceview libxmlxx libinf intltool ]
-    ++ stdenv.lib.optional gnomeSupport gnomevfs;
+    ++ stdenv.lib.optional gnomeSupport gnome_vfs;
   
   configureFlags = ''
   '';
@@ -28,4 +28,4 @@ in stdenv.mkDerivation rec {
     maintainers = [ maintainers.phreedom ];
     platforms = platforms.all;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/editors/kile/2.0.nix b/pkgs/applications/editors/kile/2.0.nix
deleted file mode 100644
index 704b8e1b824..00000000000
--- a/pkgs/applications/editors/kile/2.0.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{stdenv, fetchurl, perl, arts, qt, kdelibs,
- libX11, libXt, libXext, libXrender, libXft,
- zlib, libpng, libjpeg, freetype, expat }:
-
-stdenv.mkDerivation {
-  name = "kile-2.0.3";
-
-  src = fetchurl {
-    url = mirror://sourceforge/kile/kile-2.0.3.tar.bz2;
-    md5 = "f0296547d3e916dd385e0b8913918852";
-  };
-
-  buildInputs = [ perl arts qt kdelibs libX11 libXt libXext libXrender libXft
-                  zlib libpng libjpeg freetype expat ];
-
-  meta = {
-    description = "An integrated LaTeX editor for KDE";
-    homepage = http://kile.sourceforge.net;
-    license = "GPLv2";
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/editors/kile/2.1.nix b/pkgs/applications/editors/kile/default.nix
similarity index 100%
rename from pkgs/applications/editors/kile/2.1.nix
rename to pkgs/applications/editors/kile/default.nix
diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
index 23dab206e18..e4dc00ff0a1 100644
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, file, mono, gtksharp, gtksourceviewsharp
 , gtkmozembedsharp, monodoc
 , perl, perlXMLParser, pkgconfig
-, glib, gtk, GConf, gnomevfs, libbonobo, libglade, libgnome
+, glib, gtk, GConf, gnome_vfs, libbonobo, libglade, libgnome
 , mozilla
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   
   buildInputs = [
     file mono gtksharp gtksourceviewsharp perl perlXMLParser pkgconfig
-    glib gtk GConf gnomevfs libbonobo libglade libgnome
+    glib gtk GConf gnome_vfs libbonobo libglade libgnome
     gtkmozembedsharp monodoc
   ];
   
diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix
index d8acf24cbf5..0d588e537bb 100644
--- a/pkgs/applications/editors/zile/default.nix
+++ b/pkgs/applications/editors/zile/default.nix
@@ -1,20 +1,23 @@
-{ fetchurl, stdenv, ncurses, help2man }:
+{ fetchurl, stdenv, ncurses, boehmgc, perl, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "zile-2.3.24";
+  name = "zile-2.4.2";
 
   src = fetchurl {
     url = "mirror://gnu/zile/${name}.tar.gz";
-    sha256 = "12by1f5nbk2qcq0f35aqjq5g54nsnajk2rk5060icsjc86pv52r1";
+    sha256 = "0ia91c18fyssnhabfb22npmidjkx32rqfkjgxxjibvdwfja25d3k";
   };
 
-  buildInputs = [ ncurses ];
-  buildNativeInputs = [ help2man ];
+  buildInputs = [ ncurses boehmgc ];
+  buildNativeInputs = [ help2man perl ];
 
   # Tests can't be run because most of them rely on the ability to
   # fiddle with the terminal.
   doCheck = false;
 
+  # XXX: Work around cross-compilation-unfriendly `gl_FUNC_FSTATAT' macro.
+  preConfigure = "export gl_cv_func_fstatat_zero_flag=yes";
+
   meta = {
     description = "GNU Zile, a lightweight Emacs clone";
 
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index c0ebb95a67a..b0452bba115 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -1,9 +1,11 @@
-{ stdenv, fetchurl,
-  GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib,
-  gnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2,
-  lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg,
-  libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb,
-  openexr, pixman, pkgconfig, sqlite}:
+{ stdenv, fetchurl
+, GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib
+, gnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2
+, lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
+, libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb
+, openexr, pixman, pkgconfig, sqlite }:
+
+assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
   version = "0.9.1";
@@ -14,11 +16,12 @@ stdenv.mkDerivation rec {
     sha256 = "b687a5f1b2a6c8aa230c1dc3ef83bf74a103e3ebe1c61cdea95a612a7375f21e";
   };
 
-  buildInputs = [
-    GConf atk cairo cmake curl dbus_glib exiv2 glib gnome_keyring gtk
-    ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
-    libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
-    librsvg libtiff libxcb openexr pixman pkgconfig sqlite];
+  buildInputs =
+    [ GConf atk cairo cmake curl dbus_glib exiv2 glib gnome_keyring gtk
+      ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
+      libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
+      librsvg libtiff libxcb openexr pixman pkgconfig sqlite
+    ];
 
   preConfigure = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0"
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index c36e79fbc3a..eedf797c1c7 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -2,11 +2,11 @@
 , libXinerama, curl }:
 
 stdenv.mkDerivation {
-  name = "feh-1.14.2";
+  name = "feh-2.0";
 
   src = fetchurl {
-    url = http://feh.finalrewind.org/feh-1.14.2.tar.bz2;
-    sha256 = "117g1caihil88a3q0qy9gqj521l3illlsk56cgxhpc2am6ch5nwr";
+    url = http://feh.finalrewind.org/feh-2.0.tar.bz2;
+    sha256 = "0ilrabi0i4gads6b5r4d7svdav00n5vxjcn6h4kbd05d2hz0mjf5";
   };
 
   buildInputs = [x11 imlib2 giblib libjpeg libpng libXinerama curl];
diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix
index d32ef5bbebc..a9eab8e00f8 100644
--- a/pkgs/applications/graphics/giv/default.nix
+++ b/pkgs/applications/graphics/giv/default.nix
@@ -2,11 +2,11 @@
   pcre, cfitsio, perl, gob2, vala, libtiff }:
 
 stdenv.mkDerivation rec {
-  name = "giv-0.9.19";
+  name = "giv-0.9.20";
 
   src = fetchurl {
     url = "mirror://sourceforge/giv/${name}.tar.gz";
-    sha256 = "07sgpp4k27417ymavcvil4waq6ac2mj08g42g1l52l435xm5mnh7";
+    sha256 = "09s659vvv26nw9vaw3a766al8yq6np7p0xb4iw907921j6nbqp7z";
   };
 
   # It built code to be put in a shared object without -fPIC
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sed -i s,/usr/local,$out, SConstruct 
   '';
 
-  patches = [ ./build.patch ./union.patch ];
+  patches = [ ./build.patch ];
 
   buildPhase = "scons";
 
diff --git a/pkgs/applications/graphics/giv/union.patch b/pkgs/applications/graphics/giv/union.patch
deleted file mode 100644
index f12fce03613..00000000000
--- a/pkgs/applications/graphics/giv/union.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Already reported uptream
-
-diff --git a/src/giv-data.h b/src/giv-data.h
-index 64e7696..d34bfe4 100644
---- a/src/giv-data.h
-+++ b/src/giv-data.h
-@@ -88,7 +88,7 @@ typedef struct
- typedef struct
- {
-   gint op;
--  union
-+  struct
-   {
-     struct
-     {
-diff --git a/src/giv_types.h b/src/giv_types.h
-index 02abebe..c3cfb78 100644
---- a/src/giv_types.h
-+++ b/src/giv_types.h
-@@ -11,13 +11,11 @@ typedef struct {
- 
- typedef struct {
-   gint op;
--  union {
--    struct {
--      gdouble x,y;
--    } point;
--    double arc_dev;
--    text_mark_t *text_object;
--  } data;
-+  struct {
-+    gdouble x,y;
-+  } point;
-+  double arc_dev;
-+  text_mark_t *text_object;
- } point_t;
- 
- typedef struct {
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 0da9bf0b41c..19a2346802c 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -4,14 +4,14 @@
 , gsl, python, pyxml, lxml, poppler }:
 
 stdenv.mkDerivation rec {
-  name = "inkscape-0.48.1";
+  name = "inkscape-0.48.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/inkscape/${name}.tar.bz2";
-    sha256 = "11mvwil787pj3kx3qvjqvd6z5hlk40i6g95g4vs52hrp2ifs9ga4";
+    sha256 = "10v7ixdz7f8vgk2wv0m81zli9p0f446cm1f4aqlvni1ndsx44fi2";
   };
 
-  patches = [ ./configure-python-libs.patch ]; 
+  patches = [ ./configure-python-libs.patch ];
 
   propagatedBuildInputs = [
     # Python is used at run-time to execute scripts, e.g., those from
diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix
index b6d7e431443..990709c03e5 100644
--- a/pkgs/applications/graphics/xournal/default.nix
+++ b/pkgs/applications/graphics/xournal/default.nix
@@ -15,11 +15,22 @@ stdenv.mkDerivation rec {
     ghostscript atk gtk glib fontconfig freetype
     libgnomecanvas libgnomeprint libgnomeprintui
     pango libX11 xproto zlib poppler poppler_data
-    autoconf automake libtool pkgconfig
   ];
 
+  buildNativeInputs = [ autoconf automake libtool pkgconfig ];
+
+  # Build with poppler-0.18.x
+  patchFlags = "-p0";
+
+  patches = [ (fetchurl {
+      url = "https://api.opensuse.org/public/source/X11:Utilities/xournal/xournal-poppler-0.18.patch?rev=eca1c0b24f5bc78111147ab8f4688455";
+      sha256 = "1q565kqb4bklncriq4dlhp1prhidv88wmxr9k3laykiia0qjmfyj";
+    })];
+
   NIX_LDFLAGS="-lX11 -lz";
+
   meta = {
+    homepage = http://xournal.sourceforge.net/;
     description = "note-taking application (supposes stylus)";
     maintainers = [ stdenv.lib.maintainers.guibert ];
   };
diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix
index 6182931de96..e56982a6680 100644
--- a/pkgs/applications/misc/adobe-reader/default.nix
+++ b/pkgs/applications/misc/adobe-reader/default.nix
@@ -28,5 +28,6 @@ stdenv.mkDerivation {
   meta = {
     description = "Adobe Reader, a viewer for PDF documents";
     homepage = http://www.adobe.com/products/reader;
+    license = "unfree";
   };
 }
diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix
index 9d9ddb056da..d56ebe6b17f 100644
--- a/pkgs/applications/misc/bitcoin/default.nix
+++ b/pkgs/applications/misc/bitcoin/default.nix
@@ -1,32 +1,30 @@
-{ fetchurl, stdenv, openssl, db4, boost, zlib, glib, libSM, gtk, wxGTK, miniupnpc }:
+{ fetchurl, stdenv, openssl, db4, boost, zlib, miniupnpc, qt4 }:
 
 stdenv.mkDerivation rec {
-  version = "0.3.24";
+  version = "0.5.0";
   name = "bitcoin-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/bitcoin/Bitcoin/${name}/${name}-src.tar.gz";
-    sha256 = "18n8i37c478b275m2x82411i1fsw8l34qm1k65ynnw38fpaj4h3r";
+    url = " https://github.com/bitcoin/bitcoin/tarball/v${version}";
+    sha256 = "1i9wnbjf9yrs9rq5jnh9pk1x5j982qh3xpjm05z8dgd3nympgyy8";
   };
 
-  buildInputs = [ openssl db4 boost zlib glib libSM gtk wxGTK miniupnpc ];
+  buildInputs = [ openssl db4 boost zlib miniupnpc qt4 ];
 
-  preConfigure = ''
+  unpackCmd = "tar xvf $curSrc";
+
+  buildPhase = ''
+    qmake
+    make
     cd src
-    substituteInPlace makefile.unix \
-      --replace "-Wl,-Bstatic" "" \
-      --replace "-Wl,-Bdynamic" "" \
-      --replace "DEBUGFLAGS=-g -D__WXDEBUG__" "DEBUGFLAGS=" \
+    make -f makefile.unix
+    cd ..
   '';
 
-  makefile = "makefile.unix";
-
-  buildFlags = "bitcoin bitcoind";
-
   installPhase = ''
     ensureDir $out/bin
-    cp bitcoin $out/bin
-    cp bitcoind $out/bin
+    cp bitcoin-qt $out/bin
+    cp src/bitcoind $out/bin
   '';
 
   meta = { 
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 421fb40e1bd..b38a6cb5644 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,21 +1,23 @@
 { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng
 , imagemagick, libjpeg, fontconfig, podofo, qt4, icu
-, pil, makeWrapper, unrar, chmlib, pythonPackages
+, pil, makeWrapper, unrar, chmlib, pythonPackages, xz
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-0.8.21";
+  name = "calibre-0.8.30";
 
   src = fetchurl {
-    url = "mirror://sourceforge/calibre/${name}.tar.gz";
-    sha256 = "173is8qlsm1gbsx5a411c2226kakwyv200wcw97yfs613k7cz256";
+    url = "http://calibre-ebook.googlecode.com/files/${name}.tar.xz";
+    sha256 = "1w94kaynxiksjfi6wqlvwnryl08f8m0ylqwgzwkz1hjznqiji282";
   };
 
   inherit python;
 
+  buildNativeInputs = [ makeWrapper xz pkgconfig ];
+
   buildInputs =
-    [ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick libjpeg
-      fontconfig podofo qt4 pil makeWrapper chmlib icu
+    [ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg
+      fontconfig podofo qt4 pil chmlib icu
       pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
       pythonPackages.cssutils pythonPackages.beautifulsoap pythonPackages.sqlite3
     ];
diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix
index 2a55512ff26..32af65f924a 100644
--- a/pkgs/applications/misc/dmenu/default.nix
+++ b/pkgs/applications/misc/dmenu/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, libX11, libXinerama}:
 
 stdenv.mkDerivation rec {
-  name = "dmenu-4.4";
+  name = "dmenu-4.4.1";
 
   src = fetchurl {
     url = "http://dl.suckless.org/tools/${name}.tar.gz";
-    sha256 = "016hfnmk4kb2n3slxrg4z27p2l8x1awqsig961syssw4p1zybpav";
+    sha256 = "0l25vdnzlslk0r4m6hjkzxdygh3wpq04b9mr8zc9h3b1md2icr3d";
   };
 
   buildInputs = [ libX11 libXinerama ];
diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix
index adf24041483..f027588c5dc 100644
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/pkgs/applications/misc/eaglemode/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, perl, libX11, xineLib, libjpeg, libpng, libtiff, pkgconfig,
-librsvg, glib, gtk, libXext, libXxf86vm }:
+librsvg, glib, gtk, libXext, libXxf86vm, poppler }:
 
 stdenv.mkDerivation {
-  name = "eaglemode-0.79.0";
+  name = "eaglemode-0.83.0";
  
   src = fetchurl {
-    url = mirror://sourceforge/eaglemode/eaglemode-0.79.0.tar.bz2;
-    sha256 = "115jydig35dqkrwl3x7fv564bks13nw89vfb46bb5rlr3l4a084s";
+    url = mirror://sourceforge/eaglemode/eaglemode-0.83.0.tar.bz2;
+    sha256 = "0rlvi9ljf3ml2l4ydkcgjjja8wk9c7h5qlpdr4x4ghh6sqq0q2x3";
   };
  
   buildInputs = [ perl libX11 xineLib libjpeg libpng libtiff pkgconfig 
-    librsvg glib gtk libXxf86vm libXext ];
+    librsvg glib gtk libXxf86vm libXext poppler ];
  
   # The program tries to dlopen both Xxf86vm and Xext, so we use the
   # trick on NIX_LDFLAGS and dontPatchELF to make it find them.
diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix
index 6da8ed05499..e93e2be85e3 100644
--- a/pkgs/applications/misc/gosmore/default.nix
+++ b/pkgs/applications/misc/gosmore/default.nix
@@ -17,7 +17,11 @@ rec {
   configureFlags = [];
 
   /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
+  phaseNames = ["fixCurlIncludes" "doConfigure" "doMakeInstall"];
+
+  fixCurlIncludes = a.fullDepEntry ''
+    sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp}
+  '' ["minInit" "doUnpack"];
       
   name = "gosmore-r21657";
   meta = {
diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix
index efce2c93561..7a02100b2cb 100644
--- a/pkgs/applications/misc/gv/default.nix
+++ b/pkgs/applications/misc/gv/default.nix
@@ -1,11 +1,14 @@
 { stdenv, fetchurl, Xaw3d, ghostscriptX, perl }:
 
-stdenv.mkDerivation rec {
-  name = "gv-3.7.2";
+let
+  name = "gv-3.7.3";
+in
+stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
     url = "mirror://gnu/gv/${name}.tar.gz";
-    sha256 = "1cj03rb7xs0l3krax4z2llwnldh876p1h3p5vql4gygcxki8vhk2";
+    sha256 = "ee01ba96e3a5c319eb4658357372a118dbb0e231891b360edecbdebd449d1c2b";
   };
 
   buildInputs = [ Xaw3d ghostscriptX perl ];
diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index 7fde09c2175..46e630804c6 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -13,14 +13,14 @@ assert monotoneSupport -> (monotone != null);
 
 let
   name = "ikiwiki";
-  version = "3.20110715";
+  version = "3.20111107";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
-    sha256 = "ef9cbe5ddf484e6b75de05cc6a5b51dfdff1f5920b1c4c66309b1409266df9c7";
+    sha256 = "5b14370ec9c31138d4937eca4ba9c1f1a74515edd34071cefd0cefa37395565c";
   };
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix
index ff2451761dc..cff71a6a00e 100644
--- a/pkgs/applications/misc/k3b/default.nix
+++ b/pkgs/applications/misc/k3b/default.nix
@@ -1,21 +1,25 @@
 { stdenv, fetchurl, cmake, qt4, perl, shared_mime_info, libvorbis, taglib
-, ffmpeg, flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext
-, kdelibs, kdemultimedia, automoc4, phonon, makeWrapper
+, flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext
+, kdelibs, kdemultimedia, automoc4, phonon
 }:
 
 stdenv.mkDerivation rec {
   name = "k3b-2.0.2";
+  
   src = fetchurl {
     url = "mirror://sourceforge/k3b/${name}.tar.bz2";
     sha256 = "1kdpylz3w9bg02jg4mjhqz8bq1yb4xi4fqfl9139qcyjq4lny5xg";
   };
 
-  buildInputs = [ cmake qt4 perl shared_mime_info libvorbis taglib
-                  ffmpeg flac libsamplerate libdvdread lame libsndfile
-                  libmad gettext stdenv.gcc.libc
-                  kdelibs kdemultimedia automoc4 phonon
-                  makeWrapper ];
+  buildInputs =
+    [ cmake qt4 perl shared_mime_info libvorbis taglib
+      flac libsamplerate libdvdread lame libsndfile
+      libmad gettext stdenv.gcc.libc
+      kdelibs kdemultimedia automoc4 phonon
+    ];
 
+  enableParallelBuilding = true;
+                  
   meta = with stdenv.lib; {
     description = "CD/DVD Burning Application for KDE";
     license = licenses.gpl2Plus;
diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix
index 798f9eeec20..233ee0e6551 100644
--- a/pkgs/applications/misc/qcad/default.nix
+++ b/pkgs/applications/misc/qcad/default.nix
@@ -19,15 +19,26 @@ stdenv.mkDerivation {
 
   buildInputs = [ qt3 libpng libXext libX11 ];
 
-  patchPhase = ''
+  prePatch = ''
     sed -i 's/-pedantic//' mkspecs/defs.pro
-    patch -p1 < ${ ./qcad-2.0.4.0-1.src-intptr.patch /* taken from gentoo, fixes amd64 compilation issue */}
+    # patch -p1 < ${ ./qcad-2.0.4.0-1.src-intptr.patch }
   '';
+  patches = [
+    /* taken from gentoo, fixes amd64 compilation issue */
+    ./qcad-2.0.4.0-1.src-intptr.patch
+    /* taken from gentoo, fixes gcc 4.3 or above compilation issue */
+    ./qcad-2.0.4.0-gcc43.patch
+  ];
 
   # probably there is more to be done. But this seems to work for now (eg see gentoo ebuild)
   installPhase = ''
     ensureDir $out/{bin,share}
     cp -r qcad $out/share
+
+    # The compilation does not fail with error code. But qcad will not exist
+    # if it failed.
+    test -f $out/share/qcad/qcad
+
     cat >> $out/bin/qcad << EOF
     #!/bin/sh
     cd $out/share/qcad
diff --git a/pkgs/applications/misc/qcad/qcad-2.0.4.0-gcc43.patch b/pkgs/applications/misc/qcad/qcad-2.0.4.0-gcc43.patch
new file mode 100644
index 00000000000..bc68e81c715
--- /dev/null
+++ b/pkgs/applications/misc/qcad/qcad-2.0.4.0-gcc43.patch
@@ -0,0 +1,45 @@
+diff -Naur qcad-2.0.4.0-1.src/dxflib/src/dl_writer_ascii.cpp qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer_ascii.cpp
+--- qcad-2.0.4.0-1.src/dxflib/src/dl_writer_ascii.cpp	2004-09-14 16:13:01.000000000 -0400
++++ qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer_ascii.cpp	2008-04-27 08:35:47.000000000 -0400
+@@ -30,6 +30,7 @@
+ #endif // _MSC_VER > 1000
+ 
+ #include <stdio.h>
++#include <cstring>
+ 
+ #include "dl_writer_ascii.h"
+ #include "dl_exception.h"
+diff -Naur qcad-2.0.4.0-1.src/dxflib/src/dl_writer.h qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer.h
+--- qcad-2.0.4.0-1.src/dxflib/src/dl_writer.h	2004-09-14 16:13:01.000000000 -0400
++++ qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer.h	2008-04-27 08:35:48.000000000 -0400
+@@ -34,6 +34,7 @@
+ 
+ 
+ #include <iostream>
++#include <cstring>
+ 
+ #include "dl_attributes.h"
+ 
+diff -Naur qcad-2.0.4.0-1.src/qcadactions/src/rs_actionzoompan.cpp qcad-2.0.4.0-1.src.new/qcadactions/src/rs_actionzoompan.cpp
+--- qcad-2.0.4.0-1.src/qcadactions/src/rs_actionzoompan.cpp	2004-09-14 16:13:03.000000000 -0400
++++ qcad-2.0.4.0-1.src.new/qcadactions/src/rs_actionzoompan.cpp	2008-04-27 08:35:48.000000000 -0400
+@@ -28,6 +28,7 @@
+ #include "rs_snapper.h"
+ #include "rs_point.h"
+ 
++#include <cstdlib>
+ 
+ RS_ActionZoomPan::RS_ActionZoomPan(RS_EntityContainer& container,
+                                    RS_GraphicView& graphicView)
+diff -Naur qcad-2.0.4.0-1.src/qcadlib/src/information/rs_information.h qcad-2.0.4.0-1.src.new/qcadlib/src/information/rs_information.h
+--- qcad-2.0.4.0-1.src/qcadlib/src/information/rs_information.h	2004-09-14 16:13:02.000000000 -0400
++++ qcad-2.0.4.0-1.src.new/qcadlib/src/information/rs_information.h	2008-04-27 08:35:48.000000000 -0400
+@@ -31,7 +31,7 @@
+ #include "rs_line.h"
+ #include "rs_arc.h"
+ 
+-
++#include <cstdlib>
+ 
+ /**
+  * Class for getting information about entities. This includes
diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix
index b875e51ecff..c81a346914c 100644
--- a/pkgs/applications/misc/xfontsel/default.nix
+++ b/pkgs/applications/misc/xfontsel/default.nix
@@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [libX11 pkgconfig libXaw];
 
+  # Without this, it gets Xmu as a dependency, but without rpath entry
+  NIX_LDFLAGS = "-lXmu";
+
   # This will not make xfontsel find its app-defaults, but at least the $out
   # directory will contain them.
   # hack: Copying the XFontSel app-defaults file to $HOME makes xfontsel work.
diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix
index 454e5493ea7..355deec4092 100644
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@@ -1,12 +1,14 @@
-{ cabal, mtl, parsec, stm, time, utf8String, X11, X11Xft }:
+{ cabal, libXrandr, mtl, parsec, stm, time, utf8String, X11, X11Xft
+}:
 
 cabal.mkDerivation (self: {
   pname = "xmobar";
-  version = "0.13";
-  sha256 = "0ijava0vn2dmc6v57i6x663rvxz3ryb2gqks18qk1qli4k0m3hf7";
+  version = "0.14";
+  sha256 = "1y26b2a5v9hxv1zmjcb4m8j9qkqdn74mqc3q58vgp5cav45rphvh";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ mtl parsec stm time utf8String X11 X11Xft ];
+  extraLibraries = [ libXrandr ];
   configureFlags = "-fwith_xft";
   meta = {
     homepage = "http://projects.haskell.org/xmobar/";
diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix
index 8b375fb2659..d653c972850 100644
--- a/pkgs/applications/misc/xpdf/default.nix
+++ b/pkgs/applications/misc/xpdf/default.nix
@@ -8,40 +8,19 @@ assert enablePDFtoPPM -> freetype != null;
 assert useT1Lib -> t1lib != null;
 
 stdenv.mkDerivation {
-  name = "xpdf-3.02pl5";
+  name = "xpdf-3.03";
 
   src = fetchurl {
-    url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz;
-    sha256 = "000zq4ddbwyxiki4vdwpmxbnw5n9hsg9hvwra2p33hslyib7sfmk";
+    url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.03.tar.gz;
+    sha256 = "1jnfzdqc54wa73lw28kjv0m7120mksb0zkcn81jdlvijyvc67kq2";
   };
 
   buildInputs =
     (if enableGUI then [x11 motif] else []) ++
     (if useT1Lib then [t1lib] else []);
 
-  patches = [
-    (fetchurl {
-      url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl1.patch;
-      sha256 = "1wxv9l0d2kkwi961ihpdwi75whdvk7cgqxkbfym8cjj11fq17xjq";
-    })
-    (fetchurl {
-      url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch;
-      sha256 = "1nfrgsh9xj0vryd8h65myzd94bjz117y89gq0hzji9dqn23xihfi";
-    })
-    (fetchurl {
-      url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch;
-      sha256 = "0jskkv8x6dqr9zj4azaglas8cziwqqrkbbnzrpm2kzrvsbxyhk2r";
-    })
-    (fetchurl {
-      url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl4.patch;
-      sha256 = "1c48h7aizx0ngmzlzw0mpja1w8vqyy3pg62hyxp7c60k86al715h";
-    })
-    (fetchurl {
-      url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl5.patch;
-      sha256 = "1fki66pw56yr6aw38f6amrx7wxwcxbx4704pjqq7pqqr784b7z4j";
-    })
-    ./xpdf-3.02-protection.patch
-  ];
+  # Debian uses '-fpermissive' to bypass some errors on char* constantness.
+  CXXFLAGS = "-O2 -fpermissive";
 
   configureFlags =
     "--infodir=$out/share/info --mandir=$out/share/man --enable-a4-paper"
@@ -54,7 +33,7 @@ stdenv.mkDerivation {
     if test -n \"${base14Fonts}\"; then
       substituteInPlace $out/etc/xpdfrc \\
         --replace /usr/local/share/ghostscript/fonts ${base14Fonts} \\
-        --replace '#displayFontT1' displayFontT1
+        --replace '#fontFile' fontFile
     fi
   ";
 
diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index e0df36efcb8..b4fab591ef4 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, xorg, ncurses, freetype, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "xterm-268";
+  name = "xterm-276";
   
   src = fetchurl {
     url = "ftp://invisible-island.net/xterm/${name}.tgz";
-    sha256 = "1hr886mgr74k146fjppnq1pmg6f95l00v88cfwac3rms5lx7ckap";
+    sha256 = "1k3k025z3vl91sc8i7f5lmnsb1rsblpbijri9vnxgpynw4wgrc7b";
   };
   
   buildInputs =
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index bd98d48ffa7..0be1d4dc48d 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,5 +1,5 @@
 { GConf, alsaLib, bzip2, cairo, cups, dbus, dbus_glib, expat
-, fetchurl, ffmpeg, fontconfig, freetype, gtkLibs, libX11
+, fetchurl, ffmpeg, fontconfig, freetype, gtkLibs, libX11, libXfixes
 , libXScrnSaver, libXdamage, libXext, libXrender, libXt, libXtst
 , libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, patchelf
 , stdenv, unzip, zlib, pam, pcre }:
@@ -7,23 +7,23 @@
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
 
 stdenv.mkDerivation rec {
-  name = "chromium-16.0.879.0-pre${version}";
+  name = "chromium-17.0.943.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";
+  version = "110566";
   
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux_x64/${version}/chrome-linux.zip";
-        sha256 = "1dymz7h9v5hkivn6qn26bnj1waw60z3mngh8g46yvvc5xn4npc3l";
+        sha256 = "0pi2qbcvqy9gn2s0bfqlam3mj5ghnnnkrbxrrjl63737377an7ha";
       }
     else if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/${version}/chrome-linux.zip";
-        sha256 = "0zqaj90lfzdddbs6sjygmyxlh8nw3xfr9xw450g9cabg6a2sh7ca";
+        sha256 = "0mk8ikgz97i69qy1cy3cqw4a2ff2ixjzyw5i86fmrq7m1f156yva";
       }
     else throw "Chromium is not supported on this platform.";
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   libPath =
     stdenv.lib.makeLibraryPath
        [ GConf alsaLib bzip2 cairo cups dbus dbus_glib expat
-         ffmpeg fontconfig freetype libX11 libXScrnSaver
+         ffmpeg fontconfig freetype libX11 libXScrnSaver libXfixes
          libXdamage libXext libXrender libXt libXtst libgcrypt libjpeg
          libpng nspr stdenv.gcc.gcc zlib stdenv.gcc.libc
          gtkLibs.glib gtkLibs.gtk gtkLibs.gdk_pixbuf gtkLibs.pango
diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix
index e9c1c926ba4..08196780143 100644
--- a/pkgs/applications/networking/browsers/conkeror/default.nix
+++ b/pkgs/applications/networking/browsers/conkeror/default.nix
@@ -1,14 +1,23 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchurl, unzip, xulrunner, makeWrapper }:
+
 stdenv.mkDerivation {
   name = "conkeror-1.0pre-20110917";
+  
   src = fetchurl {
     url = http://repo.or.cz/w/conkeror.git/snapshot/9d1f522674379874e502545babe0c843f78fa43c.zip;
     sha256 = "1ga3d9rc3xfaxvjnhnar752q9ga897q9fck0864i7rh0w7xbrhx2";
   };
-  buildInputs = [ unzip ];
-  installPhase = ''
-    cp -v -r . $out
+  
+  buildInputs = [ unzip makeWrapper ];
+  
+  buildCommand = ''
+    mkdir -p $out/libexec/conkeror
+    unzip $src -d $out/libexec
+
+    makeWrapper ${xulrunner}/bin/xulrunner $out/bin/conkeror \
+      --add-flags $out/libexec/conkeror/application.ini
   '';
+
   meta = {
     description = "A keyboard-oriented, customizable, extensible web browser";
     longDescription = ''
diff --git a/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch b/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch
deleted file mode 100644
index 30fe15c6e48..00000000000
--- a/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-
-# 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:
-
diff --git a/pkgs/applications/networking/browsers/firefox/7.0.nix b/pkgs/applications/networking/browsers/firefox/7.0.nix
index c14386e5f9e..c4fef3dfaf2 100644
--- a/pkgs/applications/networking/browsers/firefox/7.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/7.0.nix
@@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "7.0";
+  firefoxVersion = "7.0.1";
   
-  xulVersion = "7.0"; # this attribute is used by other packages
+  xulVersion = "7.0.1"; # 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 = "1fpadlsdc8d739cz52dicn68v2ilv044hxivilgy9jnrazznrm42";
+    sha1 = "94bbc7152832371dc0be82f411730df043c5c6ac";
   };
   
   commonConfigureFlags =
diff --git a/pkgs/applications/networking/browsers/firefox/8.0.nix b/pkgs/applications/networking/browsers/firefox/8.0.nix
index f6807056529..823d6e0cbd2 100644
--- a/pkgs/applications/networking/browsers/firefox/8.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/8.0.nix
@@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "8.0b1";
+  firefoxVersion = "8.0.1";
   
-  xulVersion = "8.0"; # this attribute is used by other packages
+  xulVersion = "8.0.1"; # this attribute is used by other packages
 
   
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha256 = "1sdahpawgngvjh4cap2vdg00ngiwji5nkb40dh5kd393wa6c8mpm";
+    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
+    sha1 = "0dd207c5cee9d53114c55aa23eeca36b754bc128";
   };
   
   commonConfigureFlags =
@@ -161,7 +161,7 @@ rec {
             file $i;
             if file $i | grep executable &>/dev/null; then 
 	        rm "$out/bin/$(basename "$i")"
-                echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"
+                echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")"
                 chmod a+x "$out/bin/$(basename "$i")"
             fi;
         done;
diff --git a/pkgs/applications/networking/browsers/firefox/6.0.nix b/pkgs/applications/networking/browsers/firefox/9.0.nix
similarity index 75%
rename from pkgs/applications/networking/browsers/firefox/6.0.nix
rename to pkgs/applications/networking/browsers/firefox/9.0.nix
index df205a64fb5..f14eb05899d 100644
--- a/pkgs/applications/networking/browsers/firefox/6.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/9.0.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
 , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
 , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
-, yasm, mesa, sqlite
+, yasm, mesa, sqlite, unzip
 
 , # If you want the resulting program to call itself "Firefox" instead
   # of "Shiretoko" or whatever, enable this option.  However, those
@@ -15,16 +15,15 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "6.0.2";
+  firefoxVersion = "9.0b1";
   
-  xulVersion = "6.0.2"; # this attribute is used by other packages
+  xulVersion = "9.0"; # 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 = "074eb9c1df4de0fe0a4bb9226ca3c2822c334cd6";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2";
+    sha256 = "0mvm0bjzghqywh54fnk5qhz7fjm5d8y952sf59ypq64bhs5dh009";
   };
-
   
   commonConfigureFlags =
     [ "--enable-optimize"
@@ -51,15 +50,13 @@ 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
         xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
         alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa
-	xlibs.libXScrnSaver xlibs.scrnsaverproto
-	xlibs.libXext xlibs.xextproto sqlite
+        xlibs.libXScrnSaver xlibs.scrnsaverproto
+        xlibs.libXext xlibs.xextproto sqlite unzip
       ];
 
     configureFlags =
@@ -76,12 +73,13 @@ rec {
           stdenv.lib.concatStringsSep ":" 
             (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
         }' ';'
+
+        export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
       '';
 
-    # !!! Temporary hacks.
+    # !!! Temporary hack.
     preBuild =
       ''
-        ln -s Linux2.6.mk security/coreconf/Linux3.0.mk
         export NIX_ENFORCE_PURITY=
       '';
 
@@ -103,15 +101,19 @@ rec {
       for i in $out/lib/$libDir/*; do 
           file $i;
           if file $i | grep executable &>/dev/null; then 
-              ln -s $i $out/bin
+              echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
+              chmod a+x "$out/bin/$(basename "$i")";
           fi;
       done;
+      for i in $out/lib/$libDir/{xpcshell,plugin-container,*.so}; do
+              patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
+      done;
       rm -f $out/bin/run-mozilla.sh
     ''; # */
 
     meta = {
       description = "Mozilla Firefox XUL runner";
-      homepage = http://www.mozilla.org/firefox/;
+      homepage = http://www.mozilla.com/en-US/firefox/;
     };
 
     passthru = { inherit gtk; version = xulVersion; };
@@ -128,7 +130,7 @@ rec {
     buildInputs =
       [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
         dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
-        xlibs.pixman yasm mesa sqlite
+        xlibs.pixman yasm mesa sqlite file unzip
       ];
 
     propagatedBuildInputs = [xulrunner];
@@ -137,6 +139,7 @@ rec {
       [ "--enable-application=browser"
         "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
         "--enable-chrome-format=jar"
+	"--disable-elf-hack"
       ]
       ++ commonConfigureFlags
       ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
@@ -153,11 +156,20 @@ rec {
     postInstall =
       ''
         ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
+        for j in $out/bin/*; do 
+	    i="$(readlink "$j")";
+            file $i;
+            if file $i | grep executable &>/dev/null; then 
+	        rm "$out/bin/$(basename "$i")"
+                echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")"
+                chmod a+x "$out/bin/$(basename "$i")"
+            fi;
+        done;
       ''; # */
 
     meta = {
       description = "Mozilla Firefox - the browser, reloaded";
-      homepage = http://www.mozilla.org/firefox/;
+      homepage = http://www.mozilla.com/en-US/firefox/;
     };
 
     passthru = {
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 24e1e827363..b6ec69ee388 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -1,7 +1,5 @@
-{ stdenv, browser, makeDesktopItem, makeWrapper, plugins
-, browserName ? "firefox"
-, desktopName ? "Firefox"
-, nameSuffix ? ""
+{ stdenv, browser, makeDesktopItem, makeWrapper, plugins, libs
+, browserName, desktopName, nameSuffix, icon
 }:
 
 stdenv.mkDerivation {
@@ -10,7 +8,7 @@ stdenv.mkDerivation {
   desktopItem = makeDesktopItem {
     name = browserName;
     exec = browserName;
-    icon = "${browser}/lib/${browser.name}/icons/mozicon128.png";
+    icon = icon;
     comment = "";
     desktopName = desktopName;
     genericName = "Web Browser";
@@ -29,6 +27,7 @@ stdenv.mkDerivation {
     makeWrapper "${browser}/bin/${browserName}" \
         "$out/bin/${browserName}${nameSuffix}" \
         --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \
+        --suffix-each LD_LIBRARY_PATH ':' "$libs" \
         --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))"
 
     ensureDir $out/share/applications
@@ -38,6 +37,7 @@ stdenv.mkDerivation {
   # Let each plugin tell us (through its `mozillaPlugin') attribute
   # where to find the plugin in its tree.
   plugins = map (x: x + x.mozillaPlugin) plugins;
+  libs = map (x: x + "/lib") libs ++ map (x: x + "/lib64") libs;
 
   meta = {
     description =
diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix
index a63584fda28..99f135c6d7b 100644
--- a/pkgs/applications/networking/browsers/icecat-3/default.nix
+++ b/pkgs/applications/networking/browsers/icecat-3/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, xz, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL
 , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib
-, libnotify, gnomevfs, libgnomeui
+, libnotify, gnome_vfs, libgnomeui
 , freetype, fontconfig, wirelesstools ? null, pixman
 , application ? "browser" }:
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs =
-    [ xz libgnomeui libnotify gnomevfs alsaLib
+    [ xz libgnomeui libnotify gnome_vfs alsaLib
       pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pixman
       python ply dbus dbus_glib pango freetype fontconfig
       xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt
diff --git a/pkgs/applications/networking/browsers/icecat-4/default.nix b/pkgs/applications/networking/browsers/icecat-4/default.nix
deleted file mode 100644
index 5d6f5c3acb0..00000000000
--- a/pkgs/applications/networking/browsers/icecat-4/default.nix
+++ /dev/null
@@ -1,118 +0,0 @@
-{ fetchurl, stdenv, xz, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL
-, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib
-, libnotify, gnomevfs, libgnomeui
-, freetype, fontconfig, wirelesstools ? null, pixman
-, application ? "browser" }:
-
-# Build the WiFi stuff on Linux-based systems.
-# FIXME: Disable for now until it can actually be built:
-# http://thread.gmane.org/gmane.comp.gnu.gnuzilla/1376 .
-#assert stdenv.isLinux -> (wirelesstools != null);
-
-let version = "4.0.1.1"; in
-stdenv.mkDerivation {
-  name = "icecat-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.xz";
-    sha256 = "1f1y1834pv8f5fmfb5d4d5gj2v7bxsk3k9b9g832bwq0h5203yvg";
-  };
-
-  buildInputs =
-    [ xz libgnomeui libnotify gnomevfs alsaLib
-      pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pixman
-      python ply dbus dbus_glib pango freetype fontconfig
-      xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt
-    ]
-    ++ (stdenv.lib.optional false /* stdenv.isLinux */ wirelesstools);
-
-  patches = [
-    ./skip-gre-registration.patch ./rpath-link.patch
-  ];
-
-  configureFlags =
-    [ "--enable-application=${application}"
-      "--enable-libxul"
-      "--disable-javaxpcom"
-
-      "--enable-optimize"
-      "--disable-debug"
-      "--enable-strip"
-      "--with-system-jpeg"
-      "--with-system-zlib"
-      "--with-system-bz2"
-      # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
-      "--enable-system-cairo"
-      #"--enable-system-sqlite" # <-- this seems to be discouraged
-      "--disable-crashreporter"
-    ]
-    ++ (stdenv.lib.optional true /* (!stdenv.isLinux) */ "--disable-necko-wifi");
-
-  postInstall = ''
-    export dontPatchELF=1;
-
-    # Strip some more stuff
-    strip -S "$out/lib/"*"/"* || true
-
-    # This fixes starting IceCat when there already is a running
-    # instance.  The `icecat' wrapper script actually expects to be
-    # in the same directory as `run-mozilla.sh', apparently.
-    libDir=$(cd $out/lib && ls -d icecat-[0-9]*)
-    test -n "$libDir"
-
-    if [ -f "$out/bin/icecat" ]
-    then
-        # Fix references to /bin paths in the IceCat shell script.
-        substituteInPlace $out/bin/icecat		\
-            --replace /bin/pwd "$(type -tP pwd)"	\
-            --replace /bin/ls "$(type -tP ls)"
-
-        cd $out/bin
-        mv icecat ../lib/$libDir/
-        ln -s ../lib/$libDir/icecat .
-
-        # Register extensions etc.
-        echo "running \`icecat -register'..."
-        (cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./icecat-bin -register) || false
-    fi
-
-    if [ -f "$out/lib/$libDir/xpidl" ]
-    then
-        # XulRunner's IDL compiler.
-        echo "linking \`xpidl'..."
-        ln -s "$out/lib/$libDir/xpidl" "$out/bin"
-    fi
-
-    # Put the GNU IceCat icon in the right place.
-    ensureDir "$out/lib/$libDir/chrome/icons/default"
-    ln -s ../../../icons/default.xpm  "$out/lib/$libDir/chrome/icons/default/"
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "GNU IceCat, a free web browser based on Mozilla Firefox";
-
-    longDescription = ''
-      Gnuzilla is the GNU version of the Mozilla suite, and GNU IceCat
-      is the GNU version of the Firefox browser.  Its main advantage
-      is an ethical one: it is entirely free software.  While the
-      source code from the Mozilla project is free software, the
-      binaries that they release include additional non-free software.
-      Also, they distribute and recommend non-free software as
-      plug-ins.  In addition, GNU IceCat includes some privacy
-      protection features.
-    '';
-
-    homepage = http://www.gnu.org/software/gnuzilla/;
-    licenses = [ "GPLv2+" "LGPLv2+" "MPLv1+" ];
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.gnu;
-  };
-
-  passthru = {
-    inherit gtk version;
-    isFirefox3Like = true;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/icecat-4/rpath-link.patch b/pkgs/applications/networking/browsers/icecat-4/rpath-link.patch
deleted file mode 100644
index d50784f13ee..00000000000
--- a/pkgs/applications/networking/browsers/icecat-4/rpath-link.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Without this patch, IceCat ends up linking with
-`-Wl,-rpath-link=/bin -Wl-,-rpath-link=/lib'.
-
---- icecat-3.5/js/src/configure	2009-07-04 18:03:01.000000000 +0200
-+++ icecat-3.5/js/src/configure	2009-07-13 18:34:30.000000000 +0200
-@@ -4775,7 +4775,6 @@ HOST_AR='$(AR)'
- HOST_AR_FLAGS='$(AR_FLAGS)'
- 
- MOZ_JS_LIBS='-L$(libdir) -lmozjs'
--MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib'
- 
- MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
- MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat'
-
diff --git a/pkgs/applications/networking/browsers/icecat-4/skip-gre-registration.patch b/pkgs/applications/networking/browsers/icecat-4/skip-gre-registration.patch
deleted file mode 100644
index d1fb4e3f30a..00000000000
--- a/pkgs/applications/networking/browsers/icecat-4/skip-gre-registration.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Skip "GRE" registration since that assumes write access to `/etc'.
-
---- icecat-3.0.1-g1/xulrunner/installer/Makefile.in	2008-07-27 12:52:16.000000000 +0200
-+++ icecat-3.0.1-g1/xulrunner/installer/Makefile.in	2008-09-08 17:19:17.000000000 +0200
-@@ -71,6 +71,7 @@ $(MOZILLA_VERSION).system.conf: $(topsrc
- 	printf "[%s]\nGRE_PATH=%s\nxulrunner=true\nabi=%s" \
- 	  $(MOZILLA_VERSION) $(installdir) $(TARGET_XPCOM_ABI)> $@
- 
-+SKIP_GRE_REGISTRATION = yes
- ifndef SKIP_GRE_REGISTRATION
- # to register xulrunner per-user, override this with $HOME/.gre.d
- regdir = /etc/gre.d
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
index 6cdd175573d..ad6867ab5be 100644
--- 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.7";
+        version = "10.3.183.10";
         url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz;
-        sha256 = "166ipldmd03psy68xxirmdd4p591vjnffpv2l97yg1bbkn5h2pj6";
+        sha256 = "0fj51dg0aa813b44yn8dvmmvw4qwi8vbi0x8n1bcqrcld3sbpmfz";
       }
     else throw "Flash Player is not supported on this platform";
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh
new file mode 100644
index 00000000000..4db487f5c51
--- /dev/null
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh
@@ -0,0 +1,23 @@
+source $stdenv/setup
+
+dontStrip=1
+dontPatchELF=1
+sourceRoot=$TMPDIR
+
+unpackPhase() {
+    tar xvzf $src;
+    for a in *; do
+	if [ -d $a ]; then
+		cd $a
+		break
+	fi
+    done
+}
+
+installPhase() {
+    ensureDir $out/lib/mozilla/plugins
+    cp -pv libflashplayer.so $out/lib/mozilla/plugins
+    patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so
+}
+
+genericBuild
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
new file mode 100644
index 00000000000..260edd360c6
--- /dev/null
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -0,0 +1,88 @@
+{ stdenv
+, fetchurl
+, zlib
+, alsaLib
+, curl
+, nss
+, nspr
+, fontconfig
+, freetype
+, expat
+, libX11
+, libXext
+, libXrender
+, libXt
+, gtk 
+, glib
+, pango
+, cairo
+, atk
+, gdk_pixbuf
+, debug ? false
+
+/* you have to add ~/mm.cfg :
+
+    TraceOutputFileEnable=1
+    ErrorReportingEnable=1
+    MaxWarnings=1
+
+  in order to read the flash trace at ~/.macromedia/Flash_Player/Logs/flashlog.txt
+  Then FlashBug (a FireFox plugin) shows the log as well
+*/
+
+}:
+
+let
+
+  src =
+    if stdenv.system == "x86_64-linux" then
+      if debug then
+        # no plans to provide a x86_64 version:
+        # http://labs.adobe.com/technologies/flashplayer10/faq.html
+        throw "no x86_64 debugging version available"
+      else {
+        # -> http://labs.adobe.com/downloads/flashplayer10.html
+        version = "11.1.102.55";
+        url = http://fpdownload.macromedia.com/get/flashplayer/pdc/11.1.102.55/install_flash_player_11_linux.x86_64.tar.gz;
+        sha256 = "09swldv174z23pnixy9fxkw084qkl3bbrxfpf159fbjdgvwihn1l";
+      }
+    else if stdenv.system == "i686-linux" then
+      if debug then {
+        # The debug version also contains a player
+        version = "11.1";
+        url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz;
+        sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk";
+      } else {
+        version = "11.1.102.55";
+        url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/11.1.102.55/install_flash_player_11_linux.i386.tar.gz";
+        sha256 = "08zdnl06lqyk2k3yq4lgphqd3ci2267448mghlv1p0hjrdq253k7";
+      }
+    else throw "Flash Player is not supported on this platform";
+
+in
+
+stdenv.mkDerivation {
+  name = "flashplayer-${src.version}";
+
+  builder = ./builder.sh;
+  
+  src = fetchurl { inherit (src) url sha256; };
+
+  inherit zlib alsaLib;
+
+  passthru = {
+    mozillaPlugin = "/lib/mozilla/plugins";
+  };
+
+  rpath = stdenv.lib.makeLibraryPath
+    [ zlib alsaLib curl nss nspr fontconfig freetype expat libX11
+      libXext libXrender libXt gtk glib pango atk cairo gdk_pixbuf
+    ];
+
+  buildPhase = ":";
+
+  meta = {
+    description = "Adobe Flash Player browser plugin";
+    homepage = http://www.adobe.com/products/flashplayer/;
+  };
+}
diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix
index 5aaf419d389..4c153fa6ff5 100644
--- a/pkgs/applications/networking/esniper/default.nix
+++ b/pkgs/applications/networking/esniper/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation {
 
   buildInputs = [openssl curl];
 
+  patches = [ ./fix-build-with-latest-curl.patch ];
+
   postInstall = ''
     sed -e  "2i export PATH=\"$out/bin:\$PATH\"" <"frontends/snipe" >"$out/bin/snipe"
     chmod 555 "$out/bin/snipe"
diff --git a/pkgs/applications/networking/esniper/fix-build-with-latest-curl.patch b/pkgs/applications/networking/esniper/fix-build-with-latest-curl.patch
new file mode 100644
index 00000000000..81005fd3ebe
--- /dev/null
+++ b/pkgs/applications/networking/esniper/fix-build-with-latest-curl.patch
@@ -0,0 +1,10 @@
+--- esniper-2-26-0/http.c	2011-08-09 21:05:59.000000000 +0200
++++ esniper/http.c	2011-08-10 00:24:43.000000000 +0200
+@@ -28,7 +28,6 @@
+ #include "esniper.h"
+ #include <ctype.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/pkgs/applications/networking/instant-messengers/amsn/builder.sh b/pkgs/applications/networking/instant-messengers/amsn/builder.sh
deleted file mode 100644
index 4f7680b29d9..00000000000
--- a/pkgs/applications/networking/instant-messengers/amsn/builder.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-source $stdenv/setup
-
-echo $libstdcpp
-echo "-L$libstdcpp/lib"
-LDFLAGS="-L$libstdcpp/lib"
-CPPFLAGS="-L$libstdcpp/include"
-CFLAGS="-lm"
-
-configureFlags="--with-tcl=$tcl/lib --with-tk=$tk/lib --enable-static"
-
-genericBuild
diff --git a/pkgs/applications/networking/instant-messengers/amsn/default.nix b/pkgs/applications/networking/instant-messengers/amsn/default.nix
index 330d7e9d281..07aa20ff1f3 100644
--- a/pkgs/applications/networking/instant-messengers/amsn/default.nix
+++ b/pkgs/applications/networking/instant-messengers/amsn/default.nix
@@ -1,15 +1,19 @@
-{stdenv, fetchurl, which, tcl, tk, x11, libstdcpp }:
+{stdenv, fetchurl, which, tcl, tk, x11, libpng, libjpeg, makeWrapper}:
 
 stdenv.mkDerivation {
-  name = "amsn-0.96";
-  builder = ./builder.sh;
+  name = "amsn-0.98.4";
   src = fetchurl {
-    url = mirror://sourceforge/amsn/amsn-0.96.tar.bz2;
-    md5 = "3df6b0d34ef1997a47c0b8af29b2547a";
+    url = mirror://sourceforge/amsn/amsn-0.98.4-src.tar.gz;
+    sha256 = "1kcn1hc6bvgy4svf5l3j5psdrvsmy0p3r33fn7gzcinqdf3xfgqx";
   };
 
-  inherit tcl tk libstdcpp;
-  buildInputs = [which tcl tk x11 ];
+  configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --enable-static";
+
+  buildInputs = [which tcl tk x11 libpng libjpeg makeWrapper];
+
+  postInstall = ''
+    wrapProgram $out/bin/amsn --prefix PATH : ${tk}/bin
+  '';
 
   meta = {
     homepage = http://amsn-project.net;
diff --git a/pkgs/applications/networking/instant-messengers/gtmess/default.nix b/pkgs/applications/networking/instant-messengers/gtmess/default.nix
new file mode 100644
index 00000000000..68973b4e47f
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/gtmess/default.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchurl, ncurses, openssl, tcl, tk}:
+
+stdenv.mkDerivation {
+  name = "gtmess-0.96";
+
+  src = fetchurl {
+    url = mirror://sourceforge/gtmess/gtmess-0.96.tar.gz;
+    sha256 = "0w29wyshx32485c7wazj51lvk2j9k1kn2jmwpf916r4513hwplvm";
+  };
+
+  buildInputs = [ ncurses openssl tcl tk];
+
+  patches = [ ./va_list.patch ];
+
+  meta = {
+    description = "Console MSN Messenger client for Linux and other unix systems";
+    homepage = http://gtmess.sourceforge.net/;
+    license = "GPLv2+";
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/gtmess/va_list.patch b/pkgs/applications/networking/instant-messengers/gtmess/va_list.patch
new file mode 100644
index 00000000000..7d4821279b2
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/gtmess/va_list.patch
@@ -0,0 +1,22 @@
+diff --git a/src/client/screen.c b/src/client/screen.c
+index e8fa75f..d3842ac 100644
+--- a/src/client/screen.c
++++ b/src/client/screen.c
+@@ -255,7 +255,7 @@ void msg(int attr, const char *fmt, ...)
+     va_start(ap, fmt);
+     r = vmsg(attr, SML, fmt, ap);
+     va_end(ap);
+-    if (r) vmsg(C_ERR, SML, "msg(): output truncated\n", NULL);
++    if (r) msgn(C_ERR, SML, "msg(): output truncated\n");
+ }
+ 
+ void msgn(int attr, int size, const char *fmt, ...)
+@@ -266,7 +266,7 @@ void msgn(int attr, int size, const char *fmt, ...)
+     va_start(ap, fmt);
+     r = vmsg(attr, size, fmt, ap);
+     va_end(ap);
+-    if (r) vmsg(C_ERR, SML, "msgn(): output truncated\n", NULL);
++    if (r) msgn(C_ERR, SML, "msgn(): output truncated\n");
+ }
+ 
+ int screen_shut()
diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix
index cdad7eb1e7c..76b5dde0e87 100644
--- a/pkgs/applications/networking/instant-messengers/kadu/default.nix
+++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation {
 
-  name = "kadu-0.10.0";
+  name = "kadu-0.10.1";
 
   src = fetchurl {
-    url = http://www.kadu.net/download/stable/kadu-0.10.0.tar.bz2;
-    sha256 = "039dx8y6vzqmv86prk1srmi7fvxlrbisyd6rcfs0gv497bfi1995";
+    url = http://download.kadu.im/stable/kadu-0.10.1.tar.bz2;
+    sha256 = "0j88pyp2nqpc57j38zr135ypfiv4v329gfgiz9rdbqi8j26cyp7g";
   };
 
   buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   '';
 
   # because I was not able to get those working
-  patches = [ ./disable_encryption_plugins.patch ];
+  patches = [ ./disable_some_plugins.patch ];
 
   NIX_LDFLAGS="-lX11";
 
diff --git a/pkgs/applications/networking/instant-messengers/kadu/disable_encryption_plugins.patch b/pkgs/applications/networking/instant-messengers/kadu/disable_encryption_plugins.patch
deleted file mode 100644
index e89095de55d..00000000000
--- a/pkgs/applications/networking/instant-messengers/kadu/disable_encryption_plugins.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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)
diff --git a/pkgs/applications/networking/instant-messengers/kadu/disable_some_plugins.patch b/pkgs/applications/networking/instant-messengers/kadu/disable_some_plugins.patch
new file mode 100644
index 00000000000..0ee06c21382
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/kadu/disable_some_plugins.patch
@@ -0,0 +1,28 @@
+diff --git a/Plugins.cmake b/Plugins.cmake
+index ad63f20..c14a781 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)
+@@ -104,9 +104,9 @@ if (UNIX)
+ 
+ 	# mediaplayer
+ 		# MPD mediaplayer support
+-		mpd_mediaplayer
++		# mpd_mediaplayer
+ 		# MPRIS Media Players support
+-		mprisplayer_mediaplayer
++                # mprisplayer_mediaplayer
+ 	)
+ endif (UNIX)
+ 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
index 02fbc9643b7..e8afdb37cbc 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
@@ -1,17 +1,15 @@
 { stdenv, fetchurl, pidgin, intltool, libxml2 }:
 
-let version = "1.10.0"; in
+let version = "1.12.0"; in
 
 stdenv.mkDerivation {
   name = "pidgin-sipe-${version}";
   
   src = fetchurl {
-    url = "mirror://sourceforge/sipe/sipe/pidgin-sipe-${version}/pidgin-sipe-${version}.tar.gz";
-    sha256 = "11d85qxix1dmwvzs3lx0sycsx1d5sy67r9y78fs7z716py4mg9np";
+    url = "mirror://sourceforge/sipe/pidgin-sipe-${version}.tar.gz";
+    sha256 = "12ki6n360v2ja961fzw4mwpgb8jdp9k21y5mbiab151867c862r6";
   };
 
-  patches = [ ./fix-2.7.0.patch ];
-
   meta = {
     description = "SIPE plugin for Pidgin IM.";
     homepage = http://sipe.sourceforge.net/;
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/fix-2.7.0.patch b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/fix-2.7.0.patch
deleted file mode 100644
index cecfa8a18e4..00000000000
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/fix-2.7.0.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 8ad28171ac5c3fbd1917a2f52e75423c4d357b24 Mon Sep 17 00:00:00 2001
-From: David Brown <nix@davidb.org>
-Date: Thu, 3 Jun 2010 06:40:04 -0700
-Subject: [PATCH] Fix initializer for 2.7.0 release
-
-The release of 2.7.0 of pidgin/purple gained two extra fields in a
-structure.
----
- src/core/sipe.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/core/sipe.c b/src/core/sipe.c
-index 45a9015..19f4237 100644
---- a/src/core/sipe.c
-+++ b/src/core/sipe.c
-@@ -10683,6 +10683,8 @@ PurplePluginProtocolInfo prpl_info =
- 	NULL,					/* get_media_caps */
- #if PURPLE_VERSION_CHECK(2,7,0)
- 	NULL,					/* get_moods */
-+	NULL,					/* set_public_alias */
-+	NULL,					/* get_public_alias */
- #endif
- #endif
- #endif
--- 
-1.7.1
-
diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix
new file mode 100644
index 00000000000..440ab624a62
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, python, unzip, wxPython, wrapPython, tor }:
+stdenv.mkDerivation rec {
+
+  name = "torchat-${version}";
+  version = "0.9.9.550";
+
+  src = fetchurl {
+    url = "http://torchat.googlecode.com/files/torchat-source-${version}.zip";
+    sha256 = "01z0vrmflcmb146m04b66zihkd22aqnxz2vr4x23z1q5mlwylmq2";
+  };
+
+  buildInputs = [ python unzip wxPython wrapPython ];
+  pythonPath = [ wxPython ];
+
+  preConfigure = "rm portable.txt";
+  preUnpack = "sourceRoot=`pwd`/src";
+
+  installPhase = ''
+    substituteInPlace "Tor/tor.sh" --replace "tor -f" "${tor}/bin/tor -f"
+
+    wrapPythonPrograms
+
+    ensureDir $out/lib/torchat
+    cp -rf * $out/lib/torchat
+    makeWrapper ${python}/bin/python $out/bin/torchat \
+        --set PYTHONPATH $out/lib/torchat:$program_PYTHONPATH \
+        --run "cd $out/lib/torchat" \
+        --add-flags "-O $out/lib/torchat/torchat.py"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://code.google.com/p/torchat/;
+    description = "instant messaging application on top of the Tor network and it's location hidden services";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.phreedom ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/applications/networking/irc/chatzilla/default.nix b/pkgs/applications/networking/irc/chatzilla/default.nix
index a0197a99a50..8ce73c69f3d 100644
--- a/pkgs/applications/networking/irc/chatzilla/default.nix
+++ b/pkgs/applications/networking/irc/chatzilla/default.nix
@@ -1,19 +1,22 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchurl, unzip, xulrunner, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "chatzilla-0.9.86.1";
+  name = "chatzilla-0.9.87";
   
   src = fetchurl {
     # Obtained from http://chatzilla.rdmsoft.com/xulrunner/.
-    url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.86.1-xr.zip;
-    sha256 = "06s4g0x7hsckd7wr904j8rzksvqhvcrhl9zwga2458rgafcbbghd";
+    url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.87-xr.zip;
+    sha256 = "1qwbqngrxyip3k2b71adg271sifvrrxcixkyrsy4vmgl5bwdsl4d";
   };
 
-  buildInputs = [ unzip ];
+  buildInputs = [ unzip makeWrapper ];
 
   buildCommand = ''
-    ensureDir $out
-    unzip $src -d $out
+    mkdir -p $out/libexec/chatzilla
+    unzip $src -d $out/libexec/chatzilla
+
+    makeWrapper ${xulrunner}/bin/xulrunner $out/bin/chatzilla \
+      --add-flags $out/libexec/chatzilla/application.ini
   '';
 
   meta = {
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 02870c70f64..5364bd445e6 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, fetchurl, ncurses, which, perl, gpgme
+{ stdenv, fetchurl, ncurses, which, perl
 , sslSupport ? true
 , imapSupport ? true
 , headerCache ? true
 , saslSupport ? true
+, gpgmeSupport ? true
 , gdbm ? null
 , openssl ? null
 , cyrus_sasl ? null
+, gpgme ? null
 }:
 
 assert headerCache -> gdbm != null;
@@ -21,17 +23,20 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    ncurses which perl gpgme
+    ncurses which perl
     (if headerCache then gdbm else null)
     (if sslSupport then openssl else null)
     (if saslSupport then cyrus_sasl else null)
+    (if gpgmeSupport then gpgme else null)
   ];
   
   configureFlags = [
     "--with-mailpath=" "--enable-smtp"
 
     # This allows calls with "-d N", that output debug info into ~/.muttdebug*
-    "--enable-debug" "--enable-pop" "--enable-imap" "--enable-gpgme"
+    "--enable-debug"
+
+    "--enable-pop" "--enable-imap"
 
     # The next allows building mutt without having anything setgid
     # set by the installer, and removing the need for the group 'mail'
@@ -41,6 +46,7 @@ stdenv.mkDerivation rec {
     (if sslSupport then "--with-ssl" else "--without-ssl")
     (if imapSupport then "--enable-imap" else "--disable-imap")
     (if saslSupport then "--with-sasl" else "--without-sasl")
+    (if gpgmeSupport then "--enable-gpgme" else "--disable-gpgme")
   ];
 
   meta = {
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index a9456a30ecc..9cf5909575b 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -1,75 +1,50 @@
 { fetchurl, stdenv, bash, emacs, gdb, git, glib, gmime, gnupg1, pkgconfig, talloc, xapian }:
 
 stdenv.mkDerivation rec {
-  name = "notmuch-0.8";
+  name = "notmuch-0.9";
 
   src = fetchurl {
     url = "http://notmuchmail.org/releases/${name}.tar.gz";
-    sha256 = "f40bcdc6447cae9f76d5b4e70ab70d87e4a813cd123b524c1dc3155a3371a949";
+    sha256 = "e6f1046941d2894d143cb7c19d4810f97946f98742f6d9b8a7208ddb858c57e4";
   };
 
   buildInputs = [ bash emacs gdb git glib gmime gnupg1 pkgconfig talloc xapian ];
 
-  # XXX: Make me a loop
   patchPhase = ''
-    # 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 "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/basic" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/crypto" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/dump-restore" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/emacs" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/emacs-large-search-buffer" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/encoding" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/from-guessing" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/json" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/long-id" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/maildir-sync" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/new" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/notmuch-test" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/raw" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/reply" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/search" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/search-by-folder" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/search-insufficient-from-quoting" \
-      --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 "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/search-position-overlap-bug" \
-      --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 "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/test-verbose" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/thread-naming" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/thread-order" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/uuencode" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
+    (cd test && for prg in \
+        aggregate-results.sh \
+        atomicity \
+        author-order \
+        basic \
+        crypto \
+        dump-restore \
+        emacs \
+        emacs-large-search-buffer \
+        encoding \
+        from-guessing \
+        json \
+        long-id \
+        maildir-sync \
+        new \
+        notmuch-test \
+        raw \
+        reply \
+        search \
+        search-by-folder \
+        search-insufficient-from-quoting \
+        search-folder-coherence \
+        search-output \
+        search-position-overlap-bug \
+        symbol-hiding \
+        test-lib.sh \
+        test-verbose \
+        thread-naming \
+        thread-order \
+        uuencode \
+    ;do
+      substituteInPlace "$prg" \
+        --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
+    done)
   '';
 
   postBuild = ''
@@ -78,11 +53,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Notmuch -- The mail indexer";
-
     longDescription = "";
-
-    license = "GPLv3";
-
+    license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.chaoflow ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/2.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/2.x.nix
deleted file mode 100644
index 3604470cb0d..00000000000
--- a/pkgs/applications/networking/mailreaders/thunderbird/2.x.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi
-, libjpeg, libpng, zlib, cairo
-
-, # If you want the resulting program to call itself "Thunderbird"
-  # instead of "Mail", enable this option.  However, those
-  # binaries may not be distributed without permission from the
-  # Mozilla Foundation, see
-  # http://www.mozilla.org/foundation/trademarks/.
-  enableOfficialBranding ? false
-    
-}:
-
-stdenv.mkDerivation {
-  name = "thunderbird-2.0.0.22";
-
-  builder = ./builder.sh;
-  
-  src = fetchurl {
-    url = ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.22/source/thunderbird-2.0.0.22-source.tar.bz2;
-    sha1 = "a9da470ff090dfd049cae6b0c3b1a4e95c3f2022";
-  };
-
-  buildInputs = [
-    pkgconfig gtk perl zip libIDL libXi libjpeg libpng zlib cairo
-  ];
-
-  patches = [
-    # Ugh, inexplicable problem since GTK+ 2.10.  Probably a Firefox
-    # bug, but I don't know.  See
-    # http://lists.gobolinux.org/pipermail/gobolinux-users/2007-January/004344.html
-    ./xlibs.patch
-  ];
-
-  configureFlags = [
-    "--enable-application=mail"
-    "--enable-optimize"
-    "--disable-debug"
-    "--enable-xft"
-    "--disable-freetype2"
-    "--enable-svg"
-    "--enable-canvas"
-    "--enable-strip"
-    "--enable-default-toolkit=gtk2"
-    "--with-system-jpeg"
-    "--with-system-png"
-    "--with-system-zlib"
-    "--enable-system-cairo"
-    "--enable-extensions=default"
-  ]
-  ++ (if enableOfficialBranding then ["--enable-official-branding"] else []);
-
-  meta = {
-    description = "Mozilla Thunderbird, a full-featured email client";
-  };
-}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
deleted file mode 100644
index cc21a5b0400..00000000000
--- a/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, perl, python, zip, libIDL
-, dbus_glib, bzip2, alsaLib, nspr
-, libnotify, cairo, pixman, fontconfig
-
-, # If you want the resulting program to call itself "Thunderbird"
-  # instead of "Shredder", enable this option.  However, those
-  # binaries may not be distributed without permission from the
-  # Mozilla Foundation, see
-  # http://www.mozilla.org/foundation/trademarks/.
-  enableOfficialBranding ? false
-    
-}:
-
-let version = "3.1.9"; in
-
-stdenv.mkDerivation {
-  name = "thunderbird-${version}";
-
-  src = fetchurl {
-    url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
-    sha1 = "22b153102939430180ae1873ce15ef52286ff08d";
-  };
-
-  buildInputs =
-    [ pkgconfig perl python zip bzip2 gtk dbus_glib alsaLib libIDL nspr libnotify
-      libnotify cairo pixman fontconfig
-    ];
-
-  NIX_LDFLAGS = "-lpixman-1";
-
-  configureFlags =
-    [ "--enable-application=mail"
-      "--enable-optimize"
-      "--disable-debug"
-      "--enable-strip"
-      "--with-system-jpeg"
-      "--with-system-zlib"
-      "--with-system-bz2"
-      "--with-system-nspr"
-      "--enable-system-cairo"
-      "--disable-crashreporter"
-      "--disable-necko-wifi"
-      "--disable-tests"
-      "--enable-static" # required by `make install'
-    ]
-    ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
-
-  # The Thunderbird Makefiles refer to the variables LIBXUL_DIST,
-  # prefix, and PREFIX in some places where they are not set.  In
-  # particular, there are some linker flags like
-  # `-rpath-link=$(LIBXUL_DIST)/bin'.  Since this expands to
-  # `-rpath-link=/bin', the build fails due to the purity checks in
-  # the ld wrapper.  So disable the purity check for now.
-  preBuild = "NIX_ENFORCE_PURITY=0";
-
-  # This doesn't work:
-  #makeFlags = "LIBXUL_DIST=$(out) prefix=$(out) PREFIX=$(out)";
-    
-  postInstall =
-    ''
-      # Fix some references to /bin paths in the Xulrunner shell script.
-      substituteInPlace $out/lib/thunderbird-*/thunderbird \
-          --replace /bin/pwd "$(type -tP pwd)" \
-          --replace /bin/ls "$(type -tP ls)"
-    '';
-
-  meta = {
-    description = "Mozilla Thunderbird, a full-featured email client";
-    homepage = http://www.mozilla.org/thunderbird/;
-  };
-}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/7.x.nix
similarity index 82%
rename from pkgs/applications/networking/mailreaders/thunderbird/5.x.nix
rename to pkgs/applications/networking/mailreaders/thunderbird/7.x.nix
index a409cae0d28..fb84271787c 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/7.x.nix
@@ -11,21 +11,21 @@
 
 }:
 
-let version = "5.0"; in
+let version = "7.0.1"; in
 
-# from wikipedia: This Release no longer supports versions of Mac OS X
-# before Mac OS X 10.5 Leopard or Mac computers with PowerPC processors.
 stdenv.mkDerivation {
   name = "thunderbird-${version}";
 
   src = fetchurl {
     url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
-    sha1 = "392c3e0ef70b62c29a543f88b2b8d5a51bfe69a7";
+    sha1 = "ccfc6fe3fe4ad07b214e20bc440d20e14d3ffbe5";
   };
 
+  enableParallelBuilding = true;
+
   buildInputs =
     [ pkgconfig perl python zip bzip2 gtk dbus_glib alsaLib libIDL nspr libnotify
-      libnotify cairo pixman fontconfig yasm mesa nss
+      libnotify cairo pixman fontconfig yasm mesa /* nss */
     ];
 
   patches = [
@@ -69,6 +69,18 @@ stdenv.mkDerivation {
       substituteInPlace $out/lib/thunderbird-*/thunderbird \
           --replace /bin/pwd "$(type -tP pwd)" \
           --replace /bin/ls "$(type -tP ls)"
+
+      # Create a desktop item.
+      mkdir -p $out/share/applications
+      cat > $out/share/applications/thunderbird.desktop <<EOF
+      [Desktop Entry]
+      Type=Application
+      Exec=$out/bin/thunderbird
+      Icon=$out/lib/thunderbird-${version}/chrome/icons/default/default256.png
+      Name=Thunderbird
+      GenericName=Mail Reader
+      Categories=Application;Network;
+      EOF
     '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/builder.sh b/pkgs/applications/networking/mailreaders/thunderbird/builder.sh
deleted file mode 100644
index c4b477fcec5..00000000000
--- a/pkgs/applications/networking/mailreaders/thunderbird/builder.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-source $stdenv/setup
-
-postInstall() {
-
-    # Strip some more stuff
-    strip -S $out/lib/*/* || true
-
-    # Fix some references to /bin paths in the Thunderbird shell script.
-    substituteInPlace $out/bin/thunderbird \
-        --replace /bin/pwd "$(type -tP pwd)" \
-        --replace /bin/ls "$(type -tP ls)"
-
-    # This fixes starting Thunderbird when there already is a running
-    # instance.  The `thunderbird' wrapper script actually expects to
-    # be in the same directory as `run-mozilla.sh', apparently.
-    libDir=$(cd $out/lib && ls -d thunderbird-*)
-    test -n "$libDir"
-    cd $out/bin
-    mv thunderbird ../lib/$libDir/
-    ln -s ../lib/$libDir/thunderbird .
-
-    # Register extensions etc.
-    echo "running thunderbird -register..."
-    (cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./thunderbird-bin -register) || false
-
-    echo "running regxpcom..."
-    (cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./regxpcom) || false
-
-    # Put the Thunderbird icon in the right place.
-    ensureDir $out/lib/$libDir/chrome/icons/default
-    ln -s ../../../icons/default.xpm  $out/lib/$libDir/chrome/icons/default/
-}
-
-genericBuild
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/xlibs.patch b/pkgs/applications/networking/mailreaders/thunderbird/xlibs.patch
deleted file mode 100644
index a656fbf9beb..00000000000
--- a/pkgs/applications/networking/mailreaders/thunderbird/xlibs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/layout/build/Makefile.in.orig	2007-01-13 14:23:19.000000000 -0200
-+++ mozilla/layout/build/Makefile.in	2007-01-13 14:24:55.000000000 -0200
-@@ -282,5 +282,6 @@ LDFLAGS += -Wl,-LD_LAYOUT:lgot_buffer=50
- endif
- endif
- 
-+LDFLAGS += -lX11 -lXrender
- 
- export:: $(BUILD_DATE)
- 
\ No newline at end of file
diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix
new file mode 100644
index 00000000000..7ef6a86c5eb
--- /dev/null
+++ b/pkgs/applications/networking/netperf/default.nix
@@ -0,0 +1,11 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "netperf-2.5.0";
+
+  src = fetchurl {
+    url = "ftp://ftp.netperf.org/netperf/${name}.tar.bz2";
+    sha256 = "1l06bb99b4wfnmq247b8rvp4kn3w6bh1m46ri4d74z22li7br545";
+  };
+}
+
diff --git a/pkgs/applications/networking/p2p/gnunet/0.9.nix b/pkgs/applications/networking/p2p/gnunet/0.8.nix
similarity index 76%
rename from pkgs/applications/networking/p2p/gnunet/0.9.nix
rename to pkgs/applications/networking/p2p/gnunet/0.8.nix
index 221640930d7..586146bdd9d 100644
--- a/pkgs/applications/networking/p2p/gnunet/0.9.nix
+++ b/pkgs/applications/networking/p2p/gnunet/0.8.nix
@@ -1,30 +1,25 @@
-{ stdenv, fetchsvn, libextractor, libmicrohttpd, libgcrypt
-, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig
+{ stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt
+, zlib, gmp, curl, libtool, guile, 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}";
+let version = "0.8.1b";
 in
   stdenv.mkDerivation {
     name = "gnunet-${version}";
 
-    src = fetchsvn {
-      url = "https://gnunet.org/svn/gnunet";
-      sha256 = "17nkvykg3xb5m1y86i9lahgsic9jpj6h0nr73ywzpxpp7ql45cm4";
-      inherit rev;
+    src = fetchurl {
+      url = "mirror://gnu/gnunet/GNUnet-${version}.tar.gz";
+      sha256 = "0k6nrsxz5s52z6hlahb7d3sj1z0gidm79n04pf9j2ngfylp4v1bw";
     };
 
     buildInputs = [
       libextractor libmicrohttpd libgcrypt gmp curl libtool
-      zlib adns sqlite libxml2 ncurses
+      zlib guile adns sqlite libxml2 ncurses
       pkgconfig gettext findutils
-      autoconf automake
       makeWrapper
     ] ++ (if gtkSupport then [ gtk libglade ] else []);
 
@@ -47,8 +42,19 @@ in
         echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..."
         substituteInPlace "$i" --replace "/tmp" "$TMPDIR"
       done
+    '';
 
-      autoreconf -vfi
+    doCheck = false;
+
+    # 1. Run tests have once GNUnet is installed.
+    # 2. Help programs find the numerous modules that sit under
+    #    `$out/lib/GNUnet'.
+
+    # FIXME: `src/transports/test_udp' hangs forever.
+    postInstall = ''
+      #GNUNET_PREFIX="$out" make check
+      wrapProgram "$out/bin/gnunetd" \
+        --prefix LTDL_LIBRARY_PATH ":" "$out/lib/GNUnet"
     '';
 
     meta = {
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index 586146bdd9d..1219c176354 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -1,85 +1,72 @@
 { stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt
-, zlib, gmp, curl, libtool, guile, adns, sqlite, pkgconfig
-, libxml2, ncurses, gettext, findutils
+, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig
+, libxml2, ncurses, gettext
 , gtkSupport ? false, gtk ? null, libglade ? null
 , makeWrapper }:
 
 assert gtkSupport -> (gtk != null) && (libglade != null);
 
-let version = "0.8.1b";
-in
-  stdenv.mkDerivation {
-    name = "gnunet-${version}";
+stdenv.mkDerivation rec {
+  name = "gnunet-0.9.0";
 
-    src = fetchurl {
-      url = "mirror://gnu/gnunet/GNUnet-${version}.tar.gz";
-      sha256 = "0k6nrsxz5s52z6hlahb7d3sj1z0gidm79n04pf9j2ngfylp4v1bw";
-    };
+  src = fetchurl {
+    url = "mirror://gnu/gnunet/${name}.tar.gz";
+    sha256 = "1a0faq2j20dxhpdq0lpi8mjhddwmscbaa1bsxk460p5mj8n55i3p";
+  };
 
-    buildInputs = [
-      libextractor libmicrohttpd libgcrypt gmp curl libtool
-      zlib guile adns sqlite libxml2 ncurses
-      pkgconfig gettext findutils
-      makeWrapper
-    ] ++ (if gtkSupport then [ gtk libglade ] else []);
+  buildInputs = [
+    libextractor libmicrohttpd libgcrypt gmp curl libtool
+    zlib adns sqlite libxml2 ncurses
+    pkgconfig gettext 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
+  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'..."
+      sed -i "$i" -e's/\<localhost\>/127.0.0.1/g'
+    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
+    # 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
+  '';
+
+  # XXX: There are several test failures, forwarded to bug-gnunet@gnu.org.
+  doCheck = false;
+
+  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.
     '';
 
-    doCheck = false;
+    homepage = http://gnunet.org/;
 
-    # 1. Run tests have once GNUnet is installed.
-    # 2. Help programs find the numerous modules that sit under
-    #    `$out/lib/GNUnet'.
+    license = "GPLv2+";
 
-    # FIXME: `src/transports/test_udp' hangs forever.
-    postInstall = ''
-      #GNUNET_PREFIX="$out" make check
-      wrapProgram "$out/bin/gnunetd" \
-        --prefix LTDL_LIBRARY_PATH ":" "$out/lib/GNUnet"
-    '';
-
-    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;
-    };
-  }
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;
+  };
+}
diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix
index 244858757d1..16ce0d3504d 100644
--- a/pkgs/applications/networking/p2p/mldonkey/default.nix
+++ b/pkgs/applications/networking/p2p/mldonkey/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng }:
 
 stdenv.mkDerivation (rec {
-  name = "mldonkey-3.0.7";
+  name = "mldonkey-3.1.0";
   
   src = fetchurl {
     url = "mirror://sourceforge/mldonkey/${name}.tar.bz2";
-    sha256 = "1m5cfx79jiym93bx789lqc1bmwrkz1b1jilhga7d994jsjcw6c2n";
+    sha256 = "02038nhh6lbb714ariy2xw1vgfycr1w750zplbgwk5pa3cm163zx";
   };
   
   meta = {
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 53710c54eaf..aca0203ca6c 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,12 +1,37 @@
-{stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison}:
+{ stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison
+, gnutls, libgcrypt, glib, zlib, libxml2, libxslt, adns, geoip
+, heimdal, python, lynx, lua5
+}:
 
-stdenv.mkDerivation rec {
-  version = "1.4.2";
+let
+  version = "1.6.2";
+in
+stdenv.mkDerivation {
   name = "wireshark-${version}";
+
   src = fetchurl {
-    url = "http://www.wireshark.org/download/src/${name}.tar.bz2";
-    sha256 = "1cj9n3yhahj6pabx1h1gas6b6dhwsljjz2w3ngky3a4g6bnf3ij4";
+    url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2";
+    sha256 = "0zqy8ws05xz36y49azf5lrwzgfz26h7f8d27xjc89hlqrqagahsk";
+  };
+
+  buildInputs = [perl pkgconfig gtk libpcap flex bison gnutls libgcrypt
+    glib zlib libxml2 libxslt adns geoip heimdal python lynx lua5
+  ];
+
+  configureFlags = "--disable-usr-local --with-ssl --enable-threads --enable-packet-editor";
+
+  meta = {
+    homepage = "http://sourceforge.net/projects/wireshark/";
+    description = "a powerful network protocol analyzer";
+    license = stdenv.lib.licenses.gpl2;
+
+    longDescription = ''
+      Wireshark (formerly known as "Etherreal") is a powerful network
+      protocol analyzer developed by an international team of networking
+      experts. It runs on UNIX, OS X and Windows.
+    '';
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
-  configureFlags = "--with-pcap=${libpcap}";
-  buildInputs = [perl pkgconfig gtk libpcap flex bison];
 }
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index cf770213ef9..343895e0877 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -5,11 +5,11 @@
 assert enableACLs -> acl != null;
 
 stdenv.mkDerivation {
-  name = "rsync-3.0.7";
-  
+  name = "rsync-3.0.9";
+
   src = fetchurl {
-    url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.7.tar.gz;
-    sha256 = "1j77vwz6q3dvgr8w6wvigd5v4m5952czaqdvihr8di13q0b0vq4y";
+    url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.9.tar.gz;
+    sha256 = "01bw4klqsrlhh3i9lazd485sd9qx5djvnwa21lj2h3a9sn6hzw9h";
   };
 
   buildInputs = stdenv.lib.optional enableACLs acl;
@@ -18,5 +18,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://samba.anu.edu.au/rsync/;
     description = "A fast incremental file transfer utility";
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
diff --git a/pkgs/applications/networking/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix
index ae3ce06ca50..a6c3c43417e 100644
--- a/pkgs/applications/networking/yafc/default.nix
+++ b/pkgs/applications/networking/yafc/default.nix
@@ -16,5 +16,6 @@ stdenv.mkDerivation {
   meta = {
     description = "ftp/sftp client with readline, autocompletion and bookmarks";
     homepage = http://yafc.sourceforge.net;
+    license = "GPLv2+";
   };
 }
diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index 3e20a350a79..a58c82e1b8b 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -9,14 +9,14 @@
  */
 
 let
-  name = "gnucash-2.4.7";
+  name = "gnucash-2.4.8";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
-    sha256 = "eeb3b17f9081a544f8705db735df88ab3f468642a1d01552ea4e36bcb5b0730e";
+    sha256 = "06gfgw4sq1b8c9qzinyd3wmcy3i0jyprngr259l0aldv8rvix8aa";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix
index 8123f8717a8..3c72db17e1f 100644
--- a/pkgs/applications/office/scribus/default.nix
+++ b/pkgs/applications/office/scribus/default.nix
@@ -1,50 +1,22 @@
 { stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2
 , libart_lgpl, qt, python, cups, fontconfig, libjpeg
-, zlib, libpng, xorg, cairo, cmake }:
-
-assert stdenv.gcc.gcc != null;
-
-# NOTE: ! If Scribus doesn't render text try another font.
-
-# a lot of templates, colour palettes, colour profiles or gradients
-# will be released with the next version of scribus - So don't miss them
-# when upgrading this package
-
-let useCairo = false; in
-
+, zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake }:
 stdenv.mkDerivation {
-  name = "scribus-1.3.3.14";
+  name = "scribus-1.4.0rc6";
 
   src = fetchurl {
-    url = mirror://sourceforge/scribus/scribus/1.3.3.14/scribus-1.3.3.14.tar.bz2;
-    sha256 = "1ig7x6vxhqgjlpnv6hkzpb6gj4yvxsrx7rw900zlp7g6zxl01iyy";
+    url = mirror://sourceforge/scribus/scribus/scribus-1.4.0.rc6.tar.bz2;
+    sha256 = "1rrnzxjzhqj4lgyfswly501xlyvm4hsnnq7zw008v0cnkx31icli";
   };
 
-  cmakeFlags = if useCairo then "-DWANT_CAIRO=1" else "";
-
-  configurePhase = ''
-    set -x
-    mkdir -p build;
-    cd build
-    eval -- "cmake .. $cmakeFlags"
-    set +x
-  '';
+  enableParallelBuilding = true;
 
   buildInputs =
-    [ pkgconfig /*<- required fro cairo only?*/ cmake freetype lcms libtiff libxml2 libart_lgpl qt
+    [ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt
       python cups fontconfig
       xorg.libXaw xorg.libXext xorg.libX11 xorg.libXtst xorg.libXi xorg.libXinerama
-      libjpeg zlib libpng
-    ] ++ stdenv.lib.optional useCairo cairo;
-
-  # fix rpath which is removed by cmake..
-  postFixup = ''
-    for i in $buildNativeInputs ${stdenv.gcc.gcc}; do
-      [ -d "$i/lib" ] && RPATH="$RPATH:$i/lib"
-      [ -d "$i/lib64" ] && RPATH="$RPATH:$i/lib64"
-    done
-    patchelf --set-rpath "''\${RPATH:1}" $out/bin/scribus
-  '';
+      libjpeg zlib libpng podofo aspell cairo
+    ];
 
   meta = {
     maintainers = [ stdenv.lib.maintainers.marcweber ];
@@ -54,4 +26,3 @@ stdenv.mkDerivation {
     license = "GPLv2";
   };
 }
-
diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix
index 8af963f84bc..388e65c9f75 100644
--- a/pkgs/applications/science/astronomy/gravit/default.nix
+++ b/pkgs/applications/science/astronomy/gravit/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     license = "GPLv2";
 
     longDescription = ''
-          Gravit is a gravity simulator which runs under Linux, Windows and
+      Gravit is a gravity simulator which runs under Linux, Windows and
       Mac OS X. It uses Newtonian physics using the Barnes-Hut N-body
       algorithm. Although the main goal of Gravit is to be as accurate
       as possible, it also creates beautiful looking gravity patterns.
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index acf7721489a..7dcc3c0b006 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -1,19 +1,18 @@
 {stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv}:
 
 let
-  name = "stellarium-0.11.0";
+  name = "stellarium-0.11.1";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://sourceforge/stellarium/${name}.tar.gz";
-    sha256 = "dbedf47dd0744fb325d67d63d1279101be7f4259af2a5e8027f1072012dd2587";
+    sha256 = "1lrz52g2li92yjsrnxqqfmgjy2jmcqszwqpaq9rz9319nd1f2zpl";
   };
 
   buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ];
 
-  cmakeFlags = "-DINTL_INCLUDE_DIR= -DINTL_LIBRARIES=";
   preConfigure = ''
     sed -i -e '/typedef void (\*__GLXextFuncPtr)(void);/d' src/core/external/GLee.h
   '';
diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index 72c3f3e2435..e1bf95700c9 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, xz, tcl, tk, judy} :
 stdenv.mkDerivation rec {
-  name = "gtkwave-3.3.20";
+  name = "gtkwave-3.3.28";
 
   src = fetchurl {
     url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
-    sha256 = "0r2yh8a5rrxjzvykdmqlb098wws5c9k255saf2bsdchnigs8il3n";
+    sha256 = "0y3dmx39xwc3m23fwjkxvp9gqxpckk8s5814nhs8fnxa384z5cz0";
   };
 
   buildInputs = [ gtk gperf pkgconfig bzip2 xz tcl tk judy];
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index d835e351cac..3f161b5249d 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchsvn, writeScript, ocaml, findlib, camlp5}:
 
 stdenv.mkDerivation rec {
-  name = "hol_light-20110813";
+  name = "hol_light-20111106";
   src = fetchsvn {
     url = http://hol-light.googlecode.com/svn/trunk;
-    rev = "102";
-    sha256 = "5b972672db6aa1838dc5d130accd9ab6a62030c6b0c1dc4b69e42088b1ae86c9";
+    rev = "112";
+    sha256 = "6c7b39ea024b2e8042c1a22a01f778caedaaf82189c9f2c1cfa8c08707151129";
   };
 
   buildInputs = [ ocaml findlib camlp5 ];
diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix
index 5705262f377..7cfe5f92736 100644
--- a/pkgs/applications/science/logic/isabelle/default.nix
+++ b/pkgs/applications/science/logic/isabelle/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   inherit name theories;
 
   src = fetchurl {
-    url = "http://www.cl.cam.ac.uk/research/hvg/${pname}/dist/${name}.tar.gz";
+    url = http://isabelle.in.tum.de/website-Isabelle2011/dist/Isabelle2011.tar.gz;
     sha256 = "ea85eb2a859891be387f020b2e45f8c9a0bd1d8bbc3902f28a429e9c61cb0b6a";
   };
 
diff --git a/pkgs/applications/science/logic/matita/default.nix b/pkgs/applications/science/logic/matita/default.nix
index 6ac672193e2..92e9479d9a4 100644
--- a/pkgs/applications/science/logic/matita/default.nix
+++ b/pkgs/applications/science/logic/matita/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, camlp5, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http, lablgtk, lablgtkmathview, ocaml_mysql, ocaml_sqlite3, ocamlnet, ulex08, camlzip, ocaml_pcre }:
+{stdenv, fetchurl, ocaml, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http, lablgtk, lablgtkmathview, ocaml_mysql, ocaml_sqlite3, ocamlnet, ulex08, camlzip, ocaml_pcre }:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     sha256 = "04sxklfak71khy1f07ks5c6163jbpxv6fmaw03fx8gwwlvpmzglh";
   };
 
-  buildInputs = [ocaml camlp5 findlib gdome2 ocaml_expat gmetadom ocaml_http lablgtk lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet ulex08 camlzip ocaml_pcre ];
+  buildInputs = [ocaml findlib gdome2 ocaml_expat gmetadom ocaml_http lablgtk lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet ulex08 camlzip ocaml_pcre ];
 
   postPatch = ''
     BASH=$(type -tp bash)
diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix
new file mode 100644
index 00000000000..5a92c103961
--- /dev/null
+++ b/pkgs/applications/science/logic/picosat/default.nix
@@ -0,0 +1,41 @@
+{stdenv, fetchurl }:
+
+let
+  version = "936";
+  pname = "picosat";
+
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://fmv.jku.at/picosat/${name}.tar.gz";
+    sha256 = "02hq68fmfjs085216wsj13ff6i1rhc652yscl16w9jzpfqzly91n";
+  };
+
+  dontAddPrefix = true;
+
+  # configureFlags = "--shared"; the ./configure file is broken and doesn't accept this parameter :(
+  patchPhase = ''
+   sed -e 's/^shared=no/shared=yes/' -i configure
+  '';
+
+  installPhase = ''
+   ensureDir "$out"/bin
+   cp picomus "$out"/bin
+   cp picosat "$out"/bin
+   ensureDir "$out"/lib
+   cp libpicosat.a "$out"/lib
+   cp libpicosat.so "$out"/lib
+   ensureDir "$out"/include/picosat
+   cp picosat.h "$out"/include/picosat
+  '';
+
+  meta = {
+    homepage = http://fmv.jku.at/picosat/;
+    description = "SAT solver with proof and core support";
+    license = "MIT";
+    maintainers = [ stdenv.lib.maintainers.roconnor ];
+  };
+}
diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix
index f8f21d8909b..b7949909760 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/applications/science/math/maxima/default.nix
@@ -2,7 +2,7 @@
 
 let
   name    = "maxima";
-  version = "5.25.0";
+  version = "5.25.1";
 
   searchPath =
     stdenv.lib.makeSearchPath "bin"
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
-    sha256 = "49c90fb809f5027787600050503476193db3620fd9517f620b82ad492ba30c0a";
+    sha256 = "8e98ad742151e52edb56337bd62c8a9749f7b598cb6ed4e991980e0e6f89706a";
   };
 
   buildInputs = [sbcl texinfo perl makeWrapper];
diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix
index 6bd6e9266e6..77fe32d1792 100644
--- a/pkgs/applications/science/math/wxmaxima/default.nix
+++ b/pkgs/applications/science/math/wxmaxima/default.nix
@@ -2,14 +2,14 @@
 
 let
   name    = "wxmaxima";
-  version = "11.04.0";
+  version = "11.08.0";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/wxMaxima-${version}.tar.gz";
-    sha256 = "1dfwh5ka125wr6wxzyiwz16lk8kaf09rb6lldzryjwh8zi7yw8dm";
+    sha256 = "dfa25cc15de52829a93da624d42344213cc979351b5fcd3dff2afed6738832df";
   };
 
   buildInputs = [wxGTK maxima makeWrapper];
diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix
new file mode 100644
index 00000000000..5cc79469b76
--- /dev/null
+++ b/pkgs/applications/science/misc/boinc/default.nix
@@ -0,0 +1,51 @@
+{ fetchsvn, stdenv, autoconf, automake, pkgconfig, m4, curl,
+mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK,
+sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11 }:
+
+stdenv.mkDerivation rec {
+  name = "boinc-6.12.39";
+
+  src = fetchsvn {
+    url = "http://boinc.berkeley.edu/svn/tags/boinc_core_release_6_12_39";
+    rev = 24341;
+    sha256 = "158fkm4mr7wljsy8gav20km8jamf00mxjk1wsiqw6kx62bih37yb";
+  };
+
+  buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi
+    freeglut libjpeg wxGTK sqlite gtk libXScrnSaver libnotify patchelf libX11 ];
+
+  postConfigure = ''
+    sed -i -e s,/etc,$out/etc, client/scripts/Makefile
+  '';
+
+  NIX_LDFLAGS = "-lX11";
+
+  preConfigure = ''
+    ./_autosetup
+    configureFlags="$configureFlags --sysconfdir=$out/etc"
+  '';
+
+  enableParallelBuilding = true;
+
+  configureFlags = "--disable-server --disable-fast-install";
+
+  postInstall = "
+    # Remove a leading rpath to /tmp/... I don't know how it got there
+    # I could not manage to get rid of that through autotools.
+    for a in $out/bin/*; do
+      RPATH=$(patchelf --print-rpath $a)
+      NEWRPATH=$(echo $RPATH | sed 's/^[^:]*://')
+      patchelf --set-rpath $out/lib:$NEWRPATH $a
+    done
+  ";
+
+  meta = {
+    description = "Free software for distributed and grid computing";
+
+    homepage = http://boinc.berkeley.edu/;
+
+    license = "LGPLv2+";
+
+    platforms = stdenv.lib.platforms.linux;  # arbitrary choice
+  };
+}
diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix
index ee2e276c6ca..a380f05b091 100644
--- a/pkgs/applications/science/misc/golly/default.nix
+++ b/pkgs/applications/science/misc/golly/default.nix
@@ -17,7 +17,7 @@ rec {
   inherit buildInputs;
 
   /* doConfigure should be removed if not needed */
-  phaseNames = ["setVars" "doMake" "doDeploy"];
+  phaseNames = ["setVars" "doConfigure" "doMakeInstall"];
   setVars = a.noDepEntry ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -lperl -L$(echo "${perl}"/lib/perl5/5*/*/CORE)"
     pythonLib="$(echo "${python}"/lib/libpython*.so)"
@@ -26,14 +26,6 @@ rec {
     export NIX_LDFLAGS="$NIX_LDFLAGS -l$pythonLib"
     echo "Flags: $NIX_LDFLAGS"
   '';
-  goSrcDir = ''cd */'';
-  makeFlags = [
-    "-f makefile-gtk"
-    ];
-  doDeploy = a.fullDepEntry ''
-    cat < ${./make-install.make}  >> makefile-gtk
-    make -f makefile-gtk out="$out" install
-  '' ["minInit" "doMake" "defEnsureDir"];
       
   meta = {
     description = "Cellular automata simulation program";
diff --git a/pkgs/applications/science/misc/golly/make-install.make b/pkgs/applications/science/misc/golly/make-install.make
deleted file mode 100644
index 1d082e2b6ce..00000000000
--- a/pkgs/applications/science/misc/golly/make-install.make
+++ /dev/null
@@ -1,9 +0,0 @@
-
-install_file = echo "\#! /bin/sh" > "$(out)/bin/$(binfile)"; echo "$(out)/share/golly/$(binfile)" >> "$(out)/bin/$(binfile)"; chmod a+x "$(out)/bin/$(binfile)";
-
-install:
-	mkdir -p "$(out)/share/golly"
-	mkdir -p "$(out)/bin"
-	cp -r $(BINFILES) $(SHAREDFILES) "$(out)/share/golly"
-	$(foreach binfile,$(BINFILES),$(install_file))
-
diff --git a/pkgs/applications/science/misc/golly/src-for-default.nix b/pkgs/applications/science/misc/golly/src-for-default.nix
index f60df2da315..bf0d9ddada4 100644
--- a/pkgs/applications/science/misc/golly/src-for-default.nix
+++ b/pkgs/applications/science/misc/golly/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="2.1-src";
-   name="golly-2.1-src";
-   hash="0m9sz0b7pwsxpgvscdvab2q8qnncr337gg3anzgzw83z5zyn3rdz";
-   url="http://downloads.sourceforge.net/project/golly/golly/golly-2.1/golly-2.1-src.tar.gz";
-   advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.1/golly-2.1-src.tar.gz";
+   version="2.3-src";
+   name="golly-2.3-src";
+   hash="12r1lrrn4c1kafzvz5mmfq3750smqv5dwl1xpj3753h0rl9a9gx1";
+   url="http://downloads.sourceforge.net/project/golly/golly/golly-2.3/golly-2.3-src.tar.gz";
+   advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.3/golly-2.3-src.tar.gz";
   
   
 }
diff --git a/pkgs/applications/science/misc/golly/src-info-for-default.nix b/pkgs/applications/science/misc/golly/src-info-for-default.nix
index c3bbb262a6f..a83b929f018 100644
--- a/pkgs/applications/science/misc/golly/src-info-for-default.nix
+++ b/pkgs/applications/science/misc/golly/src-info-for-default.nix
@@ -1,4 +1,5 @@
 {
-  downloadPage = "http://sourceforge.net/projects/golly/files/";
-  method="fetchSF";
+  downloadPage = "http://sourceforge.net/projects/golly/files/golly";
+  method="fetchSFdirs";
+  fileSuffix="-src.tar.gz";
 }
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index 6bf401b895a..7b84dcecb63 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -1,19 +1,14 @@
-{stdenv, fetchurl, zlib, openssl, tcl}:
-
-let
-  version = "1.19";
-  filedate = "20110901182519";
-in
+{stdenv, fetchurl, zlib, openssl, tcl, readline, sqlite}:
 
 stdenv.mkDerivation {
-  name = "fossil-${version}";
+  name = "fossil-1.21";
 
   src = fetchurl {
-    url = "http://www.fossil-scm.org/download/fossil-src-${filedate}.tar.gz";
-    sha256 = "14snmwjfl9xz52d8lfzsp4zciwfbi9fwk623bm5dxhn2fczzc960";
+    url = http://www.fossil-scm.org/download/fossil-src-20111213135356.tar.gz;
+    sha256 = "07g78sf26v7zr4qzcwky4h4zzaaz8apy33d35bhc5ax63z6md1f9";
   };
 
-  buildInputs = [ zlib openssl ];
+  buildInputs = [ zlib openssl readline sqlite ];
   buildNativeInputs = [ tcl ];
 
   doCheck = true;
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 7513a7adbc7..c6b29d8ae26 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -3,7 +3,7 @@
 */
 args: with args; with pkgs;
 let
-  inherit (pkgs) stdenv fetchurl subversion;
+  inherit (pkgs) stdenv fetchgit fetchurl subversion;
 in
 rec {
 
@@ -48,8 +48,9 @@ rec {
   gitAnnex = lib.makeOverridable (import ./git-annex) {
     inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which;
     inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc
-      HTTP testpack monadControl hS3 mtl network hslogger hxt json;
+      HTTP testpack hS3 mtl network hslogger hxt json;
     QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1;
+    monadControl = haskellPackages.monadControl_OBSOLETE;
   };
 
   qgit = import ./qgit {
@@ -92,8 +93,7 @@ rec {
   };
 
   gitFastExport = import ./fast-export {
-    inherit fetchurl sourceFromHead stdenv mercurial coreutils git makeWrapper
-      subversion;
+    inherit fetchgit stdenv mercurial coreutils git makeWrapper subversion;
   };
 
   git2cl = import ./git2cl {
@@ -101,7 +101,8 @@ rec {
   };
 
   svn2git = import ./svn2git {
-    inherit stdenv fetchgit qt47 subversion apr;
+    inherit stdenv fetchgit ruby makeWrapper;
+    git = gitSVN;
   };
 
   gitSubtree = import ./git-subtree {
diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
index ef633d87ca6..45860362433 100644
--- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
@@ -1,13 +1,14 @@
-args: with args;
+{stdenv, fetchgit, mercurial, coreutils, git, makeWrapper, subversion}:
+
 stdenv.mkDerivation {
   name = "fast-export";
 
-  # REGION AUTO UPDATE:     { name="git_fast_export"; type = "git"; url="git://repo.or.cz/hg2git.git"; }
-  src = sourceFromHead "git_fast_export-1464dabbff7fe42b9069e98869db40276d295ad6.tar.gz"
-               (fetchurl { url = "http://mawercer.de/~nix/repos/git_fast_export-1464dabbff7fe42b9069e98869db40276d295ad6.tar.gz"; sha256 = "c65b8607836794b250f5faeef5ec1bcbf40f0bfaeb39ccb600966deb6a40d755"; });
-  # END
+  src = fetchgit {
+    url = "git://repo.or.cz/fast-export.git";
+    rev = "refs/heads/master";
+  };
 
-  buildInputs =([mercurial.python mercurial makeWrapper subversion]);
+  buildInputs = [mercurial.python mercurial makeWrapper subversion];
 
   buildPhase="true"; # skip svn for now
 
@@ -24,7 +25,7 @@ stdenv.mkDerivation {
     mv *.py $l
     for p in $out/bin/*.sh; do
       wrapProgram $p \
-        --set PYTHONPATH "$(echo ${mercurial}/lib/python*/site-packages)" \
+        --prefix PYTHONPATH : "$(echo ${mercurial}/lib/python*/site-packages):$(echo ${mercurial.python}/lib/python*/site-packages)${stdenv.lib.concatMapStrings (x: ":$(echo ${x}/lib/python*/site-packages)") mercurial.pythonPackages}" \
         --prefix PATH : "$(dirname $(type -p python))":$l
     done
   '';
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 848214b0fb9..26a99c21f25 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -4,14 +4,14 @@
 }:
 
 let
-  version = "3.20110915";
+  version = "3.20111203";
 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 = "d16c305c82b151ef6ce0c5cfa52a119240b66e02424aefc15a1f67392f976d47";
+    sha256 = "236a8fa537be1738a16afcab8a7438dc567dce75a6b71b62780d31048428f74b";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 1491b6f7417..795d43da6da 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -8,15 +8,15 @@
 }:
 
 let
+  version = "1.7.8";
   svn = subversionClient.override { perlBindings = true; };
 in
-
-stdenv.mkDerivation rec {
-  name = "git-1.7.6";
+stdenv.mkDerivation {
+  name = "git-${version}";
 
   src = fetchurl {
-    url = "mirror://kernel/software/scm/git/${name}.tar.bz2";
-    sha256 = "778795cece63cd758192378f3a999870cea290181b3a4c9de573c77192561082";
+    url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
+    sha256 = "ede41a79c83e0d8673ed16c64d5c105e404d953591f9611e44c3964130da0713";
   };
 
   patches = [ ./docbook2texi.patch ];
diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
index ae928fa2d4d..6f5d36f6aa7 100644
--- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
@@ -1,25 +1,30 @@
-{ stdenv, fetchgit, qt47, subversion, apr}:
+{ stdenv, fetchgit, ruby, makeWrapper, git }:
 
 stdenv.mkDerivation rec {
-  name = "svn2git";
+  name = "svn2git-2.1.0-20111206";
 
   src = fetchgit {
-    url = http://git.gitorious.org/svn2git/svn2git.git;
-    rev = "197979b6a641b8b5fa4856c700b1235491c73a41";
-    sha256 = "7be1a8f5822aff2d4ea7f415dce0b4fa8c6a82310acf24e628c5f1ada2d2d613";
+    url = https://github.com/nirvdrum/svn2git;
+    rev = "5cd8d4b509affb66eb2dad50d7298c52b3b0d848";
+    sha256 = "26aa17f68f605e958b623d803b4bd405e12d6c5d51056635873a2c59e4c7b9ca";
   };
 
-  buildPhase = ''
-    sed -i 's|/bin/cat|cat|' ./src/repository.cpp
-    qmake
-    make CXXFLAGS='-I${apr}/include/apr-1 -I${subversion}/include/subversion-1 -DVER="\"${src.rev}\""'
-  '';
+  buildInputs = [ ruby makeWrapper ];
 
-  installPhase = ''
-    ensureDir $out/bin
-    cp svn-all-fast-export $out/bin
-  '';
+  buildPhase = "true";
 
-  buildInputs = [subversion apr qt47];
-  
+  installPhase =
+    ''
+      mkdir -p $out
+      cp -r lib $out/
+      
+      mkdir -p $out/bin
+      substituteInPlace bin/svn2git --replace '/usr/bin/env ruby' ${ruby}/bin/ruby
+      cp bin/svn2git $out/bin/
+      chmod +x $out/bin/svn2git
+      
+      wrapProgram $out/bin/svn2git \
+        --set RUBYLIB $out/lib \
+        --prefix PATH : ${git}/bin
+    '';
 }
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index eca4dfea17e..8d4a45a496c 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,17 +1,21 @@
-{ stdenv, fetchurl, python, makeWrapper, docutils
-, guiSupport ? false, tk ? null, ssl }:
+{ stdenv, fetchurl, python, makeWrapper, docutils, unzip
+, guiSupport ? false, tk ? null, ssl, curses }:
 
-stdenv.mkDerivation rec {
-  name = "mercurial-1.9";
+let
+  name = "mercurial-2.0";
+in
+stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
     url = "http://mercurial.selenic.com/release/${name}.tar.gz";
-    sha256 = "1q1307rv5cyv7qalwkampy1h2f92j4d46v4x9647ljljs8f4n7ki";
+    sha256 = "1565ns768vgvsqx6pn5q9r2670lmvq8y4zy0jwgwfx2h9n5bgymg";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git
+  pythonPackages = [ ssl curses ];
 
-  buildInputs = [ python makeWrapper docutils ];
+  buildInputs = [ python makeWrapper docutils unzip ];
 
   makeFlags = "PREFIX=$(out)";
 
@@ -31,7 +35,7 @@ stdenv.mkDerivation rec {
     ''
       for i in $(cd $out/bin && ls); do
         wrapProgram $out/bin/$i \
-          --prefix PYTHONPATH : "$(toPythonPath "$out ${ssl}")" \
+          --prefix PYTHONPATH : "$(toPythonPath "$out ${ssl} ${curses}")" \
           $WRAP_TK
       done
 
@@ -41,6 +45,8 @@ stdenv.mkDerivation rec {
       chmod u+x $out/share/cgi-bin/hgweb.cgi
     '';
 
+  doCheck = false;  # The test suite fails, unfortunately. Not sure why.
+
   meta = {
     description = "A fast, lightweight SCM system for very large distributed projects";
     homepage = http://www.selenic.com/mercurial/;
diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix
index 38c1d38e349..4be4c0c5f69 100644
--- a/pkgs/applications/version-management/rcs/default.nix
+++ b/pkgs/applications/version-management/rcs/default.nix
@@ -1,23 +1,28 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "rcs-5.7";
+stdenv.mkDerivation rec {
+  name = "rcs-5.8";
 
   src = fetchurl {
-    url = ftp://ftp.cs.purdue.edu/pub/RCS/rcs-5.7.tar;
-    md5 = "f7b3f106bf87ff6344df38490f6a02c5";
+    url = "mirror://gnu/rcs/${name}.tar.gz";
+    sha256 = "0q12nlghv4khxw5lk0y4949caghzg4jg0ripddi2h3q75vmfh6vh";
   };
 
-  patches = [ ./no-root.patch ];
-
-  preConfigure = ''
-    makeFlags="man1dir=$out/share/man/man1 man5dir=$out/share/man/man5";
-  '';
+  doCheck = true;
 
   meta = {
-    homepage = http://www.cs.purdue.edu/homes/trinkle/RCS/;
-    description = "Revision Control System, a version management system";
-    maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.simons ];
+    homepage = http://www.gnu.org/software/rcs/;
+    description = "GNU RCS, a revision control system";
+    longDescription =
+      '' The GNU Revision Control System (RCS) manages multiple revisions of
+         files. RCS automates the storing, retrieval, logging,
+         identification, and merging of revisions.  RCS is useful for text
+         that is revised frequently, including source code, programs,
+         documentation, graphics, papers, and form letters.
+      '';
+
+    license = "GPLv3+";
+    maintainers = with stdenv.lib.maintainers; [ eelco simons ludo ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index e1604ccc2e7..a1a6a3fcd7f 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -19,13 +19,13 @@ assert compressionSupport -> neon.compressionSupport;
 
 stdenv.mkDerivation rec {
 
-  version = "1.6.17";
+  version = "1.7.2";
 
   name = "subversion-${version}";
 
   src = fetchurl {
-    url = "http://subversion.tigris.org/downloads/${name}.tar.bz2";
-    sha1 = "6e3ed7c87d98fdf5f0a999050ab601dcec6155a1";
+    url = "mirror://apache/subversion//${name}.tar.bz2";
+    sha1 = "8c0824aeb7f42da1ff4f7cd296877af7f59812bb";
   };
 
   buildInputs = [ zlib apr aprutil sqlite ]
@@ -48,9 +48,6 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    ensureDir $out/share/emacs/site-lisp
-    cp contrib/client-side/emacs/[dp]svn*.el $out/share/emacs/site-lisp/
-
     if test -n "$pythonBindings"; then
         make swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn
         make install-swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn
diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix
index 504d260204c..85bc00db713 100644
--- a/pkgs/applications/version-management/veracity/src-for-default.nix
+++ b/pkgs/applications/version-management/veracity/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="1.0.0.10517";
-   name="veracity-1.0.0.10517";
-   hash="08bka5zzn7i7c3dm3xp57n3szvm9msmi7mq1zynqb6i210qix79g";
-   url="http://download.sourcegear.com/Veracity/release/1.0.0.10517/veracity-source-${version}.tar.gz";
-   advertisedUrl="http://download.sourcegear.com/Veracity/release/1.0.0.10517/veracity-source-1.0.0.10517.tar.gz";
+   version="1.1.0.10565";
+   name="veracity-1.1.0.10565";
+   hash="0sx12zzc60pdvzhf8ax2lisnw0rsrvnrk2500y1vfqhwxh2r04id";
+   url="http://download.sourcegear.com/Veracity/release/1.1.0.10565/veracity-source-${version}.tar.gz";
+   advertisedUrl="http://download.sourcegear.com/Veracity/release/1.1.0.10565/veracity-source-1.1.0.10565.tar.gz";
   
   
 }
diff --git a/pkgs/applications/video/bangarang/default.nix b/pkgs/applications/video/bangarang/default.nix
index e6ff1770c46..2fe4b4d0bdc 100644
--- a/pkgs/applications/video/bangarang/default.nix
+++ b/pkgs/applications/video/bangarang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, soprano, kdemultimedia, taglib, glibc, gettext }:
+{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, soprano, shared_desktop_ontologies, kdemultimedia, taglib, glibc, gettext }:
 stdenv.mkDerivation rec {
   name = "bangarang-2.0";
 
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
     sha256 = "1fixqx56k0mk0faz35rzpdg6zaa0mvm4548rg0g7fhafl35fxzlz";
   };
 
-  buildInputs = [ cmake qt4 kdelibs automoc4 phonon soprano kdemultimedia taglib glibc gettext ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon soprano shared_desktop_ontologies kdemultimedia taglib glibc gettext ];
 
   meta = with stdenv.lib; {
     description = "A media player for KDE based on Nepomuk and Phonon";
diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix
new file mode 100644
index 00000000000..74e3d58553a
--- /dev/null
+++ b/pkgs/applications/video/dvb-apps/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation {
+  name = "dvb-apps-7f68f9c8d311";
+
+  src = fetchurl {
+    url = "http://linuxtv.org/hg/dvb-apps/archive/7f68f9c8d311.tar.gz";
+    sha256 = "0a6c5jjq6ad98bj0r954l3n7zjb2syw9m19jksg06z4zg1z8yg82";
+  };
+
+  buildInputs = [ perl ];
+
+  configurePhase = "true"; # skip configure
+
+  installPhase = "make prefix=$out install";
+
+  meta = {
+    description = "Linux DVB API applications and utilities";
+    homepage = http://linuxtv.org/;
+    platforms = stdenv.lib.platforms.linux;
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix
new file mode 100644
index 00000000000..bef755afed4
--- /dev/null
+++ b/pkgs/applications/video/quvi/library.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts}:
+
+stdenv.mkDerivation rec {
+  name = "libquvi-${version}";
+  version="0.4.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/quvi/libquvi-${version}.tar.gz";
+    sha256 = "15cm9j8dssn2zhplqvlw49piwfw511lia6b635byiwfniqf6dnwp";
+  };
+
+  buildInputs = [ pkgconfig lua5 curl quvi_scripts ];
+
+  meta = { 
+    description = "Quvi is a web video downloader.";
+    homepage = http://quvi.sf.net;
+    license = "LGPLv2.1+";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.mornfall ]; 
+  };
+}
+
diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix
new file mode 100644
index 00000000000..9c6cd9d3137
--- /dev/null
+++ b/pkgs/applications/video/quvi/scripts.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchurl, pkgconfig}:
+
+stdenv.mkDerivation rec {
+  name = "quvi-scripts-${version}";
+  version="0.4.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/quvi/libquvi-scripts-${version}.tar.gz";
+    sha256 = "14p1sn7id4n35isaw3i3h8vsgfqlym09fih9k5xfqwsg6n7xdvq5";
+  };
+
+  buildInputs = [ pkgconfig ];
+
+  meta = { 
+    description = "Quvi is a web video downloader.";
+    homepage = http://quvi.sf.net;
+    license = "LGPLv2.1+";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.mornfall ]; 
+  };
+}
+
diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix
new file mode 100644
index 00000000000..b2ddabfa6a8
--- /dev/null
+++ b/pkgs/applications/video/quvi/tool.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libquvi}:
+
+stdenv.mkDerivation rec {
+  name = "quvi-${version}";
+  version="0.4.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/quvi/quvi-${version}.tar.gz";
+    sha256 = "0qzyj55py4z7pg97794jjycq8nvrlr02072rgjzg8jgknw49hgfv";
+  };
+
+  buildInputs = [ pkgconfig lua5 curl quvi_scripts libquvi ];
+
+  meta = { 
+    description = "Quvi is a web video downloader.";
+    homepage = http://quvi.sf.net;
+    license = "LGPLv2.1+";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.mornfall ]; 
+  };
+}
+
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index ce7b233fdd2..471a4c4a76f 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -5,7 +5,7 @@
 , libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg
 , mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image
 , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
-, libass, libva
+, libass, libva, libdvbpsi
 }:
 
 stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     pkgconfig dbus hal fribidi qt4 libvorbis libtheora speex lua libgcrypt
     libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec
     udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
-    libkate libtiger libv4l samba liboggz libass
+    libkate libtiger libv4l samba liboggz libass libdvbpsi
   ]
   ++ (with xlibs; [ xlibs.xlibs libXv libXvMC libXpm xcbutil libva ]);
 
diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix
index 1ac335ade00..4607c85b6a1 100644
--- a/pkgs/applications/video/xine-ui/default.nix
+++ b/pkgs/applications/video/xine-ui/default.nix
@@ -14,6 +14,10 @@ stdenv.mkDerivation {
       xlibs.libXinerama xlibs.libXi
     ];
 
+  preBuild = ''
+    sed -e '/curl.types.h/d' -i *.c *.h */*.c */*.h */*/*.c */*/*.h
+  '';
+
   configureFlags = "--with-readline=${readline}";
   
   NIX_LDFLAGS = "-lXext -lgcc_s";
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 0cb4999bce6..d435f53e109 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -4,14 +4,14 @@
 , xorriso, makeself, perl, jdk
 }:
 
-let version = "4.1.0"; in
+let version = "4.1.6"; in
 
 stdenv.mkDerivation {
   name = "virtualbox-${version}-${kernel.version}";
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "1pi066xnjgr3fl42i1vc1pbwic9l4m1k6mzs4ip41fz99w59xfzp";
+    sha256 = "0zmbq0h9g4lamzmxqg281nr9pp88606dxh2dsw6vy1m86g5kfham";
   };
 
   buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk ];
diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix
index 76b9b37456e..c89088e400b 100644
--- a/pkgs/applications/window-managers/xmonad/default.nix
+++ b/pkgs/applications/window-managers/xmonad/default.nix
@@ -1,12 +1,13 @@
-{cabal, X11, mtl, xmessage, syb}:
+{ cabal, extensibleExceptions, mtl, utf8String, X11, xmessage }:
 
 cabal.mkDerivation (self: {
   pname = "xmonad";
-  name = "${self.fname}";
-  version = "0.9.2";
-  sha256 = "07w5k3pqmybjn0zh2nr1glp69685xg2fhj3z9zxb37x5nzss7kdd";
+  version = "0.10";
+  sha256 = "19z5y36pybsm93x6hlj5hzyys9r4ag7hkdib5spsnryk2mv72xj6";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ extensibleExceptions mtl utf8String X11 ];
   noHaddock = true;
-  propagatedBuildInputs = [X11 mtl syb];
   meta = {
     homepage = "http://xmonad.org";
     description = "A tiling window manager";
@@ -18,7 +19,7 @@ cabal.mkDerivation (self: {
     ];
   };
 
-  preConfigure = '' 
+  preConfigure = ''
     substituteInPlace XMonad/Core.hs --replace \
       '"xmessage"' '"${xmessage}/bin/xmessage"'
   '';
diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
index 7ca5e2b17fd..6bb06f7d4a5 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xmonad-contrib";
-  version = "0.9.2";
-  sha256 = "06hg5j4w8iz62wmyygq4c7xcbi9dxlhhh3dbic438cjk7c0w1h5p";
+  version = "0.10";
+  sha256 = "0lp7qr69rpjy4s3knhdgh2bp6zs81xp0az1lisv4a2i7i1ys7hfq";
   buildDepends = [
     extensibleExceptions mtl random utf8String X11 X11Xft xmonad
   ];
diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
index 0461933a7bc..249310b6411 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
@@ -1,15 +1,15 @@
-{ cabal, hint, mtl, network, parsec, random, split, X11, xmonad
-, xmonadContrib
+{ cabal, hint, HList, libmpd, mtl, network, parsec, random
+, regexPosix, split, X11, xmonad, xmonadContrib
 }:
 
 cabal.mkDerivation (self: {
   pname = "xmonad-extras";
-  version = "0.9.2";
-  sha256 = "54b41a4c59ff3d68b3a214d727fb5675fa7c1b90090d99e58ecae62b3dfdd701";
+  version = "0.10.1";
+  sha256 = "17rac0xjw1zw1jlc1rpq54vg50xscb3b98knk4gkb8bv1khpgz27";
   buildDepends = [
-    hint mtl network parsec random split X11 xmonad xmonadContrib
+    hint HList libmpd mtl network parsec random regexPosix split X11
+    xmonad xmonadContrib
   ];
-  configureFlags = "-f-with_hlist -f-with_mpd";
   noHaddock = true;
   meta = {
     homepage = "http://projects.haskell.org/xmonad-extras";
diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix
index 58c439e4316..ba13a0911f7 100644
--- a/pkgs/build-support/builder-defs/builder-defs.nix
+++ b/pkgs/build-support/builder-defs/builder-defs.nix
@@ -25,6 +25,7 @@ let inherit (builtins) head tail trace; in
                 else if (hasSuffixHack ".tar.xz" s) then "tar.xz"
                 else if (hasSuffixHack ".zip" s) || (hasSuffixHack ".ZIP" s) then "zip"
                 else if (hasSuffixHack "-cvs-export" s) then "cvs-dir"
+                else if (hasSuffixHack "-git-export" s) then "git-dir"
                 else if (hasSuffixHack ".nar.bz2" s) then "narbz2"
                 else if (hasSuffixHack ".rpm" s) then "rpm"
 
@@ -228,6 +229,10 @@ let inherit (builtins) head tail trace; in
                 cp -r '${s}' .
                 cd \$(basename ${s})
                 chmod u+rwX -R .
+        " else if (archiveType s) == "git-dir" then "
+                cp -r '${s}' .
+                cd \$(basename ${s})
+                chmod u+rwX -R .
         " else if (archiveType s) == "dir" then "
                 cp -r '${s}' .
                 cd \$(basename ${s})
diff --git a/pkgs/build-support/clang-wrapper/add-flags b/pkgs/build-support/clang-wrapper/add-flags
new file mode 100644
index 00000000000..3b064547153
--- /dev/null
+++ b/pkgs/build-support/clang-wrapper/add-flags
@@ -0,0 +1,24 @@
+# `-B@out@/bin' forces clang to use ld-wrapper.sh when calling ld.
+export NIX_CFLAGS_COMPILE="-B@out@/bin/ $NIX_CFLAGS_COMPILE"
+
+if test -e @out@/nix-support/libc-cflags; then
+    export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE"
+fi
+
+if test -e @out@/nix-support/clang-cflags; then
+    export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/clang-cflags) $NIX_CFLAGS_COMPILE"
+fi
+
+if test -e @out@/nix-support/libc-ldflags; then
+    export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/libc-ldflags)"
+fi
+
+if test -e @out@/nix-support/clang-ldflags; then
+    export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/clang-ldflags)"
+fi
+
+if test -e @out@/nix-support/libc-ldflags-before; then
+    export NIX_LDFLAGS_BEFORE="$(cat @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE"
+fi
+
+export NIX_CLANG_WRAPPER_FLAGS_SET=1
diff --git a/pkgs/build-support/clang-wrapper/builder.sh b/pkgs/build-support/clang-wrapper/builder.sh
new file mode 100644
index 00000000000..fe714a0719a
--- /dev/null
+++ b/pkgs/build-support/clang-wrapper/builder.sh
@@ -0,0 +1,131 @@
+source $stdenv/setup
+
+
+ensureDir $out/bin
+ensureDir $out/nix-support
+
+
+if test -z "$nativeLibc"; then
+    dynamicLinker="$libc/lib/$dynamicLinker"
+    echo $dynamicLinker > $out/nix-support/dynamic-linker
+
+    if test -e $libc/lib/32/ld-linux.so.2; then
+        echo $libc/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32
+    fi
+
+    # The "-B$libc/lib/" flag is a quick hack to force clang to link
+    # against the crt1.o from our own glibc, rather than the one in
+    # /usr/lib.  (This is only an issue when using an `impure'
+    # compiler/linker, i.e., one that searches /usr/lib and so on.)
+    echo "-B$libc/lib/ -idirafter $libc/include" > $out/nix-support/libc-cflags
+
+    echo "-L$libc/lib" > $out/nix-support/libc-ldflags
+
+    # The dynamic linker is passed in `ldflagsBefore' to allow
+    # explicit overrides of the dynamic linker by callers to clang/ld
+    # (the *last* value counts, so ours should come first).
+    echo "-dynamic-linker $dynamicLinker" > $out/nix-support/libc-ldflags-before
+fi
+
+if test -n "$nativeTools"; then
+    clangPath="$nativePrefix/bin"
+    ldPath="$nativePrefix/bin"
+else
+    basePath=`echo $gcc/lib/*/*/*`
+    # Need libgcc until the llvm compiler-rt library is complete
+    clangLDFlags="$clangLDFlags -L$basePath"
+    if test -e "$gcc/lib64"; then
+        clangLDFlags="$clangLDFlags -L$gcc/lib64"
+    else
+        clangLDFlags="$clangLDFlags -L$gcc/lib"
+    fi
+
+    clangLDFlags="$clangLDFlags -L$clang/lib"
+    echo "$clangLDFlags" > $out/nix-support/clang-ldflags
+
+    # Need files like crtbegin.o from gcc
+    # It's unclear if these will ever be provided by an LLVM project
+    clangCFlags="$clangCFlags -B$basePath"
+
+    clangCFlags="$clangCFlags -isystem$clang/lib/clang/$clangVersion/include"
+    echo "$clangCFlags" > $out/nix-support/clang-cflags
+    
+    clangPath="$clang/bin"
+    ldPath="$binutils/bin"
+fi
+
+
+doSubstitute() {
+    local src=$1
+    local dst=$2
+    # Can't use substitute() here, because replace may not have been
+    # built yet (in the bootstrap).
+    sed \
+        -e "s^@out@^$out^g" \
+        -e "s^@shell@^$shell^g" \
+        -e "s^@clang@^$clang^g" \
+        -e "s^@clangProg@^$clangProg^g" \
+        -e "s^@binutils@^$binutils^g" \
+        -e "s^@coreutils@^$coreutils^g" \
+        -e "s^@libc@^$libc^g" \
+        -e "s^@ld@^$ldPath/ld^g" \
+        < "$src" > "$dst" 
+}
+
+
+# Make wrapper scripts around clang and clang++.  Also make symlinks
+# cc and c++
+mkClangWrapper() {
+    local dst=$1
+    local src=$2
+
+    if ! test -f "$src"; then
+        echo "$src does not exist (skipping)"
+        return 1
+    fi
+
+    clangProg="$src"
+    doSubstitute "$clangWrapper" "$dst"
+    chmod +x "$dst"
+}
+
+if mkClangWrapper $out/bin/clang $clangPath/clang
+then
+    ln -sv clang $out/bin/cc
+fi
+
+if mkClangWrapper $out/bin/clang++ $clangPath/clang++
+then
+    ln -sv clang++ $out/bin/c++
+fi
+
+
+# Create a symlink to as (the assembler).  This is useful when a
+# clang-wrapper is installed in a user environment, as it ensures that
+# the right assembler is called.
+ln -s $ldPath/as $out/bin/as
+
+
+# Make a wrapper around the linker.
+doSubstitute "$ldWrapper" "$out/bin/ld"
+chmod +x "$out/bin/ld"
+
+
+# Emit a setup hook.  Also store the path to the original Clang and
+# libc.
+test -n "$clang" && echo $clang > $out/nix-support/orig-clang
+test -n "$libc" && echo $libc > $out/nix-support/orig-libc
+
+doSubstitute "$addFlags" "$out/nix-support/add-flags.sh"
+
+doSubstitute "$setupHook" "$out/nix-support/setup-hook"
+
+cp -p $utils $out/nix-support/utils.sh
+
+
+# Propagate the wrapped clang so that if you install the wrapper, you get
+# llvm tools, the manpages, etc. as well (including for binutils
+# and Glibc).
+if test -z "$nativeTools"; then
+    echo $clang $binutils $libc > $out/nix-support/propagated-user-env-packages
+fi
diff --git a/pkgs/build-support/clang-wrapper/clang-wrapper.sh b/pkgs/build-support/clang-wrapper/clang-wrapper.sh
new file mode 100644
index 00000000000..473adba8627
--- /dev/null
+++ b/pkgs/build-support/clang-wrapper/clang-wrapper.sh
@@ -0,0 +1,152 @@
+#! @shell@ -e
+
+if test -n "$NIX_CLANG_WRAPPER_START_HOOK"; then
+    source "$NIX_CLANG_WRAPPER_START_HOOK"
+fi
+
+if test -z "$NIX_CLANG_WRAPPER_FLAGS_SET"; then
+    source @out@/nix-support/add-flags.sh
+fi
+
+source @out@/nix-support/utils.sh
+
+
+# Figure out if linker flags should be passed.  Clang prints annoying
+# warnings when they are not needed. (does it really? Copied from gcc-wrapper)
+dontLink=0
+getVersion=0
+nonFlagArgs=0
+
+for i in "$@"; do
+    if test "$i" = "-c"; then
+        dontLink=1
+    elif test "$i" = "-S"; then
+        dontLink=1
+    elif test "$i" = "-E"; then
+        dontLink=1
+    elif test "$i" = "-E"; then
+        dontLink=1
+    elif test "$i" = "-M"; then
+        dontLink=1
+    elif test "$i" = "-MM"; then
+        dontLink=1
+    elif test "$i" = "-x"; then
+        # At least for the cases c-header or c++-header we should set dontLink.
+        # I expect no one use -x other than making precompiled headers.
+        dontLink=1
+    elif test "${i:0:1}" != "-"; then
+        nonFlagArgs=1
+    elif test "$i" = "-m32"; then
+        if test -e @out@/nix-support/dynamic-linker-m32; then
+            NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)"
+        fi
+    fi
+done
+
+# If we pass a flag like -Wl, then clang will call the linker unless it
+# can figure out that it has to do something else (e.g., because of a
+# "-c" flag).  So if no non-flag arguments are given, don't pass any
+# linker flags.  This catches cases like "clang" (should just print
+# "clang: no input files") and "clang -v" (should print the version).
+if test "$nonFlagArgs" = "0"; then
+    dontLink=1
+fi
+
+
+# Optionally filter out paths not refering to the store.
+params=("$@")
+if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then
+    rest=()
+    n=0
+    while test $n -lt ${#params[*]}; do
+        p=${params[n]}
+        p2=${params[$((n+1))]}
+        if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then
+            skip $p
+        elif test "$p" = "-L" && badPath "$p2"; then
+            n=$((n + 1)); skip $p2
+        elif test "${p:0:3}" = "-I/" && badPath "${p:2}"; then
+            skip $p
+        elif test "$p" = "-I" && badPath "$p2"; then
+            n=$((n + 1)); skip $p2
+        elif test "$p" = "-isystem" && badPath "$p2"; then
+            n=$((n + 1)); skip $p2
+        else
+            rest=("${rest[@]}" "$p")
+        fi
+        n=$((n + 1))
+    done
+    params=("${rest[@]}")
+fi
+
+
+# Add the flags for the C compiler proper.
+extraAfter=($NIX_CFLAGS_COMPILE)
+extraBefore=()
+
+if test "$dontLink" != "1"; then
+
+    # Add the flags that should only be passed to the compiler when
+    # linking.
+    extraAfter=(${extraAfter[@]} $NIX_CFLAGS_LINK)
+
+    # Add the flags that should be passed to the linker (and prevent
+    # `ld-wrapper' from adding NIX_LDFLAGS again).
+    for i in $NIX_LDFLAGS_BEFORE; do
+        extraBefore=(${extraBefore[@]} "-Wl,$i")
+    done
+    for i in $NIX_LDFLAGS; do
+	if test "${i:0:3}" = "-L/"; then
+	    extraAfter=(${extraAfter[@]} "$i")
+	else
+	    extraAfter=(${extraAfter[@]} "-Wl,$i")
+	fi
+    done
+    export NIX_LDFLAGS_SET=1
+
+    if test "$NIX_STRIP_DEBUG" = "1"; then
+        # Add executable-stripping flags.
+        extraAfter=(${extraAfter[@]} $NIX_CFLAGS_STRIP)
+    fi
+fi
+
+# As a very special hack, if the arguments are just `-v', then don't
+# add anything.  This is to prevent `clang -v' (which normally prints
+# out the version number and returns exit code 0) from printing out
+# `No input files specified' and returning exit code 1.
+if test "$*" = "-v"; then
+    extraAfter=()
+    extraBefore=()
+fi    
+
+# Optionally print debug info.
+if test "$NIX_DEBUG" = "1"; then
+  echo "original flags to @clangProg@:" >&2
+  for i in "${params[@]}"; do
+      echo "  $i" >&2
+  done
+  echo "extraBefore flags to @clangProg@:" >&2
+  for i in ${extraBefore[@]}; do
+      echo "  $i" >&2
+  done
+  echo "extraAfter flags to @clangProg@:" >&2
+  for i in ${extraAfter[@]}; do
+      echo "  $i" >&2
+  done
+fi
+
+if test -n "$NIX_CLANG_WRAPPER_EXEC_HOOK"; then
+    source "$NIX_CLANG_WRAPPER_EXEC_HOOK"
+fi
+
+
+# Call the real `clang'.  Filter out warnings from stderr about unused
+# `-B' flags, since they confuse some programs.  Deep bash magic to
+# apply grep to stderr (by swapping stdin/stderr twice).
+if test -z "$NIX_CLANG_NEEDS_GREP"; then
+    @clangProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]}
+else
+    (@clangProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \
+        | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3-
+    exit $?
+fi    
diff --git a/pkgs/build-support/clang-wrapper/default.nix b/pkgs/build-support/clang-wrapper/default.nix
new file mode 100644
index 00000000000..4730a7969e2
--- /dev/null
+++ b/pkgs/build-support/clang-wrapper/default.nix
@@ -0,0 +1,84 @@
+# The Nix `clang' stdenv.mkDerivation is not directly usable, since it doesn't
+# know where the C library and standard header files are.  Therefore
+# the compiler produced by that package cannot be installed directly
+# in a user environment and used from the command line.  This
+# stdenv.mkDerivation provides a wrapper that sets up the right environment
+# variables so that the compiler and the linker just "work".
+
+{ name ? "", stdenv, nativeTools, nativeLibc, nativePrefix ? ""
+, clang ? null, libc ? null, binutils ? null, coreutils ? null, shell ? ""
+, zlib ? null
+}:
+
+assert nativeTools -> nativePrefix != "";
+assert !nativeTools -> clang != null && binutils != null && coreutils != null;
+assert !nativeLibc -> libc != null;
+
+let
+
+  clangVersion = (builtins.parseDrvName clang.name).version;
+  clangName = (builtins.parseDrvName clang.name).name;
+  
+in
+
+stdenv.mkDerivation {
+  name =
+    (if name != "" then name else clangName + "-wrapper") +
+    (if clang != null && clangVersion != "" then "-" + clangVersion else "");
+  
+  builder = ./builder.sh;
+  setupHook = ./setup-hook.sh;
+  clangWrapper = ./clang-wrapper.sh;
+  ldWrapper = ./ld-wrapper.sh;
+  utils = ./utils.sh;
+  addFlags = ./add-flags;
+  
+  inherit nativeTools nativeLibc nativePrefix clang clangVersion;
+  gcc = clang.gcc;
+  libc = if nativeLibc then null else libc;
+  binutils = if nativeTools then null else binutils;
+  # The wrapper scripts use 'cat', so we may need coreutils
+  coreutils = if nativeTools then null else coreutils;
+  
+  langC = true;
+  langCC = true;
+  shell = if shell == "" then stdenv.shell else
+    if builtins.isAttrs shell then (shell + shell.shellPath)
+    else shell;
+
+  crossAttrs = {
+    shell = shell.hostDrv + shell.hostDrv.shellPath;
+    libc = libc.hostDrv;
+    coreutils = coreutils.hostDrv;
+    binutils = binutils.hostDrv;
+    clang = clang.hostDrv;
+    #
+    # This is not the best way to do this. I think the reference should be
+    # the style in the gcc-cross-wrapper, but to keep a stable stdenv now I
+    # do this sufficient if/else.
+    dynamicLinker =
+      (if stdenv.cross.arch == "arm" then "ld-linux.so.3" else
+       if stdenv.cross.arch == "mips" then "ld.so.1" else
+       if stdenv.lib.hasSuffix "pc-gnu" stdenv.cross.config then "ld.so.1" else
+       abort "don't know the name of the dynamic linker for this platform");
+  };
+  
+  meta =
+    let clang_ = if clang != null then clang else {}; in
+    (if clang_ ? meta then removeAttrs clang.meta ["priority"] else {}) //
+    { description =
+        stdenv.lib.attrByPath ["meta" "description"] "System C compiler" clang_
+        + " (wrapper script)";
+    };
+
+  # The dynamic linker has different names on different Linux platforms.
+  dynamicLinker =
+    if !nativeLibc then
+      (if stdenv.system == "i686-linux" then "ld-linux.so.2" else
+       if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else
+       if stdenv.system == "armv5tel-linux" then "ld-linux.so.3" else
+       if stdenv.system == "powerpc-linux" then "ld.so.1" else
+       if stdenv.system == "mips64-linux" then "ld.so.1" else
+       abort "don't know the name of the dynamic linker for this platform")
+    else "";
+}
diff --git a/pkgs/build-support/clang-wrapper/ld-wrapper.sh b/pkgs/build-support/clang-wrapper/ld-wrapper.sh
new file mode 100644
index 00000000000..48378778ba9
--- /dev/null
+++ b/pkgs/build-support/clang-wrapper/ld-wrapper.sh
@@ -0,0 +1,161 @@
+#! @shell@ -e
+
+if test -n "$NIX_LD_WRAPPER_START_HOOK"; then
+    source "$NIX_LD_WRAPPER_START_HOOK"
+fi
+
+if test -z "$NIX_CLANG_WRAPPER_FLAGS_SET"; then
+    source @out@/nix-support/add-flags.sh
+fi
+
+source @out@/nix-support/utils.sh
+
+
+# Optionally filter out paths not refering to the store.
+params=("$@")
+if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \
+        -a \( -z "$NIX_IGNORE_LD_THROUGH_CLANG" -o -z "$NIX_LDFLAGS_SET" \); then
+    rest=()
+    n=0
+    while test $n -lt ${#params[*]}; do
+        p=${params[n]}
+        p2=${params[$((n+1))]}
+        if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then
+            skip $p
+        elif test "$p" = "-L" && badPath "$p2"; then
+            n=$((n + 1)); skip $p2
+        elif test "$p" = "-rpath" && badPath "$p2"; then
+            n=$((n + 1)); skip $p2
+        elif test "$p" = "-dynamic-linker" && badPath "$p2"; then
+            n=$((n + 1)); skip $p2
+        elif test "${p:0:1}" = "/" && badPath "$p"; then
+            # We cannot skip this; barf.
+            echo "impure path \`$p' used in link" >&2
+            exit 1
+        else
+            rest=("${rest[@]}" "$p")
+        fi
+        n=$((n + 1))
+    done
+    params=("${rest[@]}")
+fi
+
+
+extra=()
+extraBefore=()
+
+if test -z "$NIX_LDFLAGS_SET"; then
+    extra=(${extra[@]} $NIX_LDFLAGS)
+    extraBefore=(${extraBefore[@]} $NIX_LDFLAGS_BEFORE)
+fi
+
+
+# Add all used dynamic libraries to the rpath.
+if test "$NIX_DONT_SET_RPATH" != "1"; then
+
+    libPath=""
+    addToLibPath() {
+        local path="$1"
+        if test "${path:0:1}" != "/"; then return 0; fi
+        case "$path" in
+            *..*|*./*|*/.*|*//*)
+                local path2
+                if path2=$(readlink -f "$path"); then
+                    path="$path2"
+                fi
+                ;;
+        esac
+        case $libPath in
+            *\ $path\ *) return 0 ;;
+        esac
+        libPath="$libPath $path "
+    }
+    
+    addToRPath() {
+        # If the path is not in the store, don't add it to the rpath.
+        # This typically happens for libraries in /tmp that are later
+        # copied to $out/lib.  If not, we're screwed.
+        if test "${1:0:${#NIX_STORE}}" != "$NIX_STORE"; then return 0; fi
+        case $rpath in
+            *\ $1\ *) return 0 ;;
+        esac
+        rpath="$rpath $1 "
+    }
+
+    libs=""
+    addToLibs() {
+        libs="$libs $1"
+    }
+
+    rpath=""
+
+    # First, find all -L... switches.
+    allParams=("${params[@]}" ${extra[@]})
+    n=0
+    while test $n -lt ${#allParams[*]}; do
+        p=${allParams[n]}
+        p2=${allParams[$((n+1))]}
+        if test "${p:0:3}" = "-L/"; then
+            addToLibPath ${p:2}
+        elif test "$p" = "-L"; then
+            addToLibPath ${p2}
+            n=$((n + 1))
+        elif test "$p" = "-l"; then
+            addToLibs ${p2}
+            n=$((n + 1))
+        elif test "${p:0:2}" = "-l"; then
+            addToLibs ${p:2}
+        elif test "$p" = "-dynamic-linker"; then
+            # Ignore the dynamic linker argument, or it 
+            # will get into the next 'elif'. We don't want
+            # the dynamic linker path rpath to go always first.
+            n=$((n + 1))
+        elif [[ "$p" =~ ^[^-].*\.so($|\.) ]]; then
+            # This is a direct reference to a shared library, so add
+            # its directory to the rpath.
+            path="$(dirname "$p")";
+            addToRPath "${path}"
+        fi
+        n=$((n + 1))
+    done
+
+    # Second, for each directory in the library search path (-L...),
+    # see if it contains a dynamic library used by a -l... flag.  If
+    # so, add the directory to the rpath.
+    # It's important to add the rpath in the order of -L..., so
+    # the link time chosen objects will be those of runtime linking.
+    
+    for i in $libPath; do
+        for j in $libs; do
+            if test -f "$i/lib$j.so"; then
+                addToRPath $i
+                break
+            fi
+        done
+    done
+    
+
+    # Finally, add `-rpath' switches.
+    for i in $rpath; do
+        extra=(${extra[@]} -rpath $i)
+    done
+fi
+
+
+# Optionally print debug info.
+if test "$NIX_DEBUG" = "1"; then
+  echo "original flags to @ld@:" >&2
+  for i in "${params[@]}"; do
+      echo "  $i" >&2
+  done
+  echo "extra flags to @ld@:" >&2
+  for i in ${extra[@]}; do
+      echo "  $i" >&2
+  done
+fi
+
+if test -n "$NIX_LD_WRAPPER_EXEC_HOOK"; then
+    source "$NIX_LD_WRAPPER_EXEC_HOOK"
+fi
+
+exec @ld@ ${extraBefore[@]} "${params[@]}" ${extra[@]}
diff --git a/pkgs/build-support/clang-wrapper/setup-hook.sh b/pkgs/build-support/clang-wrapper/setup-hook.sh
new file mode 100644
index 00000000000..74365a52704
--- /dev/null
+++ b/pkgs/build-support/clang-wrapper/setup-hook.sh
@@ -0,0 +1,33 @@
+addCVars () {
+    if test -d $1/include; then
+        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$1/include"
+    fi
+
+    if test -d $1/lib64; then
+        export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib64"
+    fi
+
+    if test -d $1/lib; then
+        export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib"
+    fi
+}
+
+envHooks=(${envHooks[@]} addCVars)
+
+# Note: these come *after* $out in the PATH (see setup.sh).
+
+if test -n "@clang@"; then
+    addToSearchPath PATH @clang@/bin
+fi
+
+if test -n "@binutils@"; then
+    addToSearchPath PATH @binutils@/bin
+fi
+
+if test -n "@libc@"; then
+    addToSearchPath PATH @libc@/bin
+fi
+
+if test -n "@coreutils@"; then
+    addToSearchPath PATH @coreutils@/bin
+fi
diff --git a/pkgs/build-support/clang-wrapper/utils.sh b/pkgs/build-support/clang-wrapper/utils.sh
new file mode 100644
index 00000000000..9a664e1d1e6
--- /dev/null
+++ b/pkgs/build-support/clang-wrapper/utils.sh
@@ -0,0 +1,23 @@
+skip () {
+    if test "$NIX_DEBUG" = "1"; then
+        echo "skipping impure path $1" >&2
+    fi
+}
+
+
+# Checks whether a path is impure.  E.g., `/lib/foo.so' is impure, but
+# `/nix/store/.../lib/foo.so' isn't.
+badPath() {
+    local p=$1
+    
+    # Relative paths are okay (since they're presumably relative to
+    # the temporary build directory).
+    if test "${p:0:1}" != "/"; then return 1; fi
+    
+    # Otherwise, the path should refer to the store or some temporary
+    # directory (including the build directory).
+    test \
+        "${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \
+        "${p:0:4}" != "/tmp" -a \
+        "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP"
+}
diff --git a/pkgs/build-support/fetchhg/nix-prefetch-hg b/pkgs/build-support/fetchhg/nix-prefetch-hg
index 55501f41bbe..f1f648f4aeb 100755
--- a/pkgs/build-support/fetchhg/nix-prefetch-hg
+++ b/pkgs/build-support/fetchhg/nix-prefetch-hg
@@ -49,6 +49,7 @@ if test -z "$finalPath"; then
       tmpClone=$url
     fi
     hg archive -q -y -r "$rev" --cwd $tmpClone $tmpArchive
+    rm -f $tmpArchive/.hg_archival.txt
 
 
     # Compute the hash.
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index b8925f89303..cd52c1ce17c 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -24,6 +24,9 @@ rec {
 
   # GNU (http://www.gnu.org/prep/ftp.html).
   gnu = [
+    # This one is the master repository, and thus it's always up-to-date.
+    http://ftp.gnu.org/pub/gnu/
+
     # This one redirects to a (supposedly) nearby and (supposedly) up-to-date
     # mirror.
     http://ftpmirror.gnu.org/
@@ -33,8 +36,6 @@ rec {
     ftp://mirror.cict.fr/gnu/
     ftp://ftp.cs.tu-berlin.de/pub/gnu/
     ftp://ftp.chg.ru/pub/gnu/
-
-    http://ftp.gnu.org/pub/gnu/
   ];
 
   # GCC.
@@ -99,6 +100,7 @@ rec {
     http://www.de.kernel.org/pub/
     http://ramses.wh2.tu-dresden.de/pub/mirrors/kernel.org/
     http://linux-kernel.uio.no/pub/
+    http://kernel.osuosl.org/pub/
   ];
 
   # Mirrors of ftp://ftp.kde.org/pub/kde/.
diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh
index c1e216956e7..7faaa0122cd 100644
--- a/pkgs/build-support/kernel/modules-closure.sh
+++ b/pkgs/build-support/kernel/modules-closure.sh
@@ -27,7 +27,7 @@ done
 echo "closure:"
 ensureDir $out/lib/modules/"$version"
 for module in $closure; do
-    target=$(echo $module | sed "s^/nix/store/.*/lib/modules/^$out/lib/modules/^")
+    target=$(echo $module | sed "s^$NIX_STORE.*/lib/modules/^$out/lib/modules/^")
     if test -e "$target"; then continue; fi
     mkdir -p $(dirname $target)
     echo $module
diff --git a/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh b/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh
index 411cb867a98..c79b3709ee8 100644
--- a/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh
+++ b/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh
@@ -1,6 +1,6 @@
 source $stdenv/setup
 
 ensureDir $out/bin
-for i in ar as c++filt gprof ld nm nmedit ranlib size strings strip dsymutil; do 
+for i in ar as c++filt gprof ld nm nmedit ranlib size strings strip dsymutil libtool; do 
     ln -s /usr/bin/$i $out/bin/
 done
diff --git a/pkgs/build-support/nuke-references/builder.sh b/pkgs/build-support/nuke-references/builder.sh
index 429a5a8dee4..3b9324073ef 100644
--- a/pkgs/build-support/nuke-references/builder.sh
+++ b/pkgs/build-support/nuke-references/builder.sh
@@ -5,7 +5,7 @@ cat > $out/bin/nuke-refs <<EOF
 #! $SHELL -e
 for i in \$*; do
     if test ! -L \$i -a -f \$i; then
-        cat \$i | sed "s|/nix/store/[a-z0-9]*-|/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" > \$i.tmp
+        cat \$i | sed "s|$NIX_STORE/[a-z0-9]*-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" > \$i.tmp
         if test -x \$i; then chmod +x \$i.tmp; fi
         mv \$i.tmp \$i
     fi
diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix
index c2a194a042f..52924d2c42c 100644
--- a/pkgs/build-support/release/debian-build.nix
+++ b/pkgs/build-support/release/debian-build.nix
@@ -14,7 +14,7 @@
 vmTools.runInLinuxImage (stdenv.mkDerivation (
 
   {
-    #doCheck = true;
+    doCheck = true;
 
     prefix = "/usr";
 
diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix
index 5c569f97ccf..a32f0e07a0c 100644
--- a/pkgs/build-support/release/nix-build.nix
+++ b/pkgs/build-support/release/nix-build.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (
       # multiple tarballs, just pick the first one.
       origSrc=$src
       if test -d $src/tarballs; then
-          src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz | sort | head -1)
+          src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz $src/tarballs/*.tar.xz | sort | head -1)
       fi
 
       # Set GCC flags for coverage analysis, if desired.
diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix
index 94566e4c460..16ac0033d93 100644
--- a/pkgs/build-support/release/source-tarball.nix
+++ b/pkgs/build-support/release/source-tarball.nix
@@ -6,16 +6,15 @@
 , buildInputs ? []
 , name ? "source-tarball"
 , version ? "0"
+, versionSuffix ? 
+    if officialRelease
+    then ""
+    else if src ? rev then "pre${toString src.rev}" else ""
 , src, stdenv, autoconf, automake, libtool
 , ... } @ args:
 
 let
 
-  versionSuffix =
-    if officialRelease
-    then ""
-    else if src ? rev then "pre${toString src.rev}" else "";
-
   # By default, provide all the GNU Build System as input.
   bootstrapBuildInputs =
     if (args ? bootstrapBuildInputs)
diff --git a/pkgs/build-support/upstream-updater/update-upstream-data.sh b/pkgs/build-support/upstream-updater/update-upstream-data.sh
index 8e4f4490e7b..38c0d13a723 100755
--- a/pkgs/build-support/upstream-updater/update-upstream-data.sh
+++ b/pkgs/build-support/upstream-updater/update-upstream-data.sh
@@ -36,6 +36,42 @@ baseName="$(getAttr baseName 'unnamed-package')"
 commonPrefetchVars=" version name hash"
 
 prefetchClause=""
+[ fetchSFdirs = "$method" ] && {
+    if [ -z "$forcedUrl" ]; then 
+	freshUrl="$("$own_dir"/urls-from-page.sh "$(getAttr downloadPage)" |
+          eval "egrep '$(getAttr sourceRegexp '[-][0-9.]+/$')'" | 
+	  eval "egrep -v '$(getAttr blacklistRegexp '^$')'" |
+	  eval "$(getAttr choiceCommand 'head -n 1')" |
+	  eval "$(getAttr versionToFileCommand "sed -re 's@/([^/]*-[0-9.]+)/@/\1/\1$(getAttr fileSuffix .tar.gz)@'")" 
+	)"
+
+	if ! egrep ':' <<< "$freshUrl" ; then 
+		freshUrl="$(dirname "$(getAttr downloadPage).")/$freshUrl"
+	fi
+
+	echo "Found download link: $freshUrl" >&2
+    else
+        freshUrl="$forcedUrl"
+    fi
+
+    freshUrl="$(echo "$freshUrl" | sed -re "$skipRedirectSF")"
+    echo "Sourceforge-corrected URL: $freshUrl" >&2
+    
+    version="$(echo "$freshUrl" | 
+      sed -re "$(getAttr versionExtractorSedScript "$extractVersionSF")")"
+    baseName="$(getAttr baseName "$(echo "$freshUrl" | sed -re 's@.*/project/([^/]+)/.*@\1@')")"
+    url="$freshUrl"
+    name="$baseName-$version"
+    advertisedUrl="$freshUrl"
+
+    if [ x"$freshUrl" = x"$(cat "$src_defs_dir"/advertisedUrl)" ]; then
+        echo "Source link not changed" >&2
+        exit
+    fi
+    hash=$(nix-prefetch-url "$freshUrl")
+
+    prefetchVars="url advertisedUrl";
+}
 [ fetchSF = "$method" ] && {
     if [ -z "$forcedUrl" ]; then 
 	freshUrl="$("$own_dir"/urls-from-page.sh "$(getAttr downloadPage)" |
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index cc3d93bd561..979ceae5418 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -127,7 +127,7 @@ rec {
     if test -z "$mountDisk"; then
       mount -t tmpfs none /fs
     else
-      mount -t ext2 /dev/${hd} /fs
+      mount /dev/${hd} /fs
     fi
 
     mkdir -p /fs/dev
@@ -166,7 +166,6 @@ rec {
     halt -d -p -f
   '';
 
-  
   initrd = makeInitrd {
     contents = [
       { object = stage1Init;
@@ -303,7 +302,7 @@ rec {
   '';
 
 
-  createRootFS = ''
+  defaultCreateRootFS = ''
     mkdir /mnt
     ${e2fsprogs}/sbin/mke2fs -F /dev/${hd}
     ${utillinux}/bin/mount -t ext2 /dev/${hd} /mnt
@@ -486,12 +485,12 @@ rec {
     
   fillDiskWithRPMs =
     { size ? 4096, rpms, name, fullName, preInstall ? "", postInstall ? ""
-    , runScripts ? true
+    , runScripts ? true, createRootFS ? defaultCreateRootFS
     }:
     
     runInLinuxVM (stdenv.mkDerivation {
       inherit name preInstall postInstall rpms;
-
+      memSize = 512;
       preVM = createEmptyImage {inherit size fullName;};
 
       buildCommand = ''
@@ -526,10 +525,10 @@ rec {
         eval "$postInstall"
         
         rm /mnt/.debug
-        
-        ${utillinux}/bin/umount /mnt/nix/store
-        ${utillinux}/bin/umount /mnt/tmp
-        ${utillinux}/bin/umount /mnt
+
+        ${utillinux}/bin/umount /mnt/nix/store 
+        ${utillinux}/bin/umount /mnt/tmp 
+        ${utillinux}/bin/umount /mnt 
       '';
 
       passthru = { inherit fullName; };
@@ -631,7 +630,7 @@ rec {
      strongly connected components.  See deb/deb-closure.nix. */
 
   fillDiskWithDebs =
-    { size ? 4096, debs, name, fullName, postInstall ? null }:
+    { size ? 4096, debs, name, fullName, postInstall ? null, createRootFS ? defaultCreateRootFS }:
     
     runInLinuxVM (stdenv.mkDerivation {
       inherit name postInstall;
@@ -712,12 +711,15 @@ rec {
      `primary.xml.gz' file of a Fedora or openSUSE distribution. */
      
   rpmClosureGenerator =
-    {name, packagesList, urlPrefix, packages, archs ? []}:
-    
+    {name, packagesLists, urlPrefixes, packages, archs ? []}:
+    assert (builtins.length packagesLists) == (builtins.length urlPrefixes) ;
     runCommand "${name}.nix" {buildInputs = [perl perlPackages.XMLSimple]; inherit archs;} ''
-      gunzip < ${packagesList} > ./packages.xml
+      ${lib.concatImapStrings (i: pl: ''
+        gunzip < ${pl} > ./packages_${toString i}.xml
+      '') packagesLists}
       perl -w ${rpm/rpm-closure.pl} \
-        ./packages.xml ${urlPrefix} ${toString packages} > $out
+        ${lib.concatImapStrings (i: pl: "./packages_${toString i}.xml ${pl.snd} " ) (lib.zipLists packagesLists urlPrefixes)} \
+        ${toString packages} > $out
     '';
 
 
@@ -726,15 +728,17 @@ rec {
      names. */
      
   makeImageFromRPMDist =
-    { name, fullName, size ? 4096, urlPrefix, packagesList
+    { name, fullName, size ? 4096
+    , urlPrefix ? "", urlPrefixes ? [urlPrefix]
+    , packagesList ? "", packagesLists ? [packagesList]
     , packages, extraPackages ? []
     , preInstall ? "", postInstall ? "", archs ? ["noarch" "i386"]
-    , runScripts ? true }:
+    , runScripts ? true, createRootFS ? defaultCreateRootFS }:
 
     fillDiskWithRPMs {
-      inherit name fullName size preInstall postInstall runScripts;
+      inherit name fullName size preInstall postInstall runScripts createRootFS;
       rpms = import (rpmClosureGenerator {
-        inherit name packagesList urlPrefix archs;
+        inherit name packagesLists urlPrefixes archs;
         packages = packages ++ extraPackages;
       }) { inherit fetchurl; };
     };
@@ -1194,44 +1198,44 @@ rec {
     };
 
     debian50i386 = {
-      name = "debian-5.0.8-lenny-i386";
-      fullName = "Debian 5.0.8 Lenny (i386)";
+      name = "debian-5.0.9-lenny-i386";
+      fullName = "Debian 5.0.9 Lenny (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/lenny/main/binary-i386/Packages.bz2;
-        sha256 = "0dcvd8ivn71dwln7mx5dbqj30v4cqmc61lj21ry05karkglb5scg";
+        sha256 = "07f54775e2b54e201c7020cd65212fbb44288b1071a73f630f58b68b2d08b2af";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
     };
-        
+
     debian50x86_64 = {
-      name = "debian-5.0.8-lenny-amd64";
-      fullName = "Debian 5.0.8 Lenny (amd64)";
+      name = "debian-5.0.9-lenny-amd64";
+      fullName = "Debian 5.0.9 Lenny (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/lenny/main/binary-amd64/Packages.bz2;
-        sha256 = "1wrqjfcqfs7q5i7jnr8115zsjlhzxxm2x41agp546d3wpj68k938";
+        sha256 = "1jqb3rr5q5y7yyhrymwa51djsydm92zbbmg4vbif65i7sp9ggky0";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
     };
 
     debian60i386 = {
-      name = "debian-6.0.2.1-squeeze-i386";
-      fullName = "Debian 6.0.2.1 Squeeze (i386)";
+      name = "debian-6.0.3-squeeze-i386";
+      fullName = "Debian 6.0.3 Squeeze (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/squeeze/main/binary-i386/Packages.bz2;
-        sha256 = "0fv1vkyaci489a8np1aaqbrwnc2d0as39hadyj9dswhm7zgfvmk1";
+        sha1 = "90a55b6bb049d0777d06d5b28a1848b38678426b";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
     };
         
     debian60x86_64 = {
-      name = "debian-6.0.2.1-squeeze-amd64";
-      fullName = "Debian 6.0.2.1 Squeeze (amd64)";
+      name = "debian-6.0.3-squeeze-amd64";
+      fullName = "Debian 6.0.3 Squeeze (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/squeeze/main/binary-amd64/Packages.bz2;
-        sha256 = "1hvaqsmd801syifqwhpd1aqv30xg33z8g74k5pqcqhxqzah653d5";
+        sha1 = "071626063ab0a70f10200e2e27a5c7fae29fa4ad";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
diff --git a/pkgs/build-support/vm/rpm/rpm-closure.pl b/pkgs/build-support/vm/rpm/rpm-closure.pl
index 5f333fdfe80..5efc162784a 100644
--- a/pkgs/build-support/vm/rpm/rpm-closure.pl
+++ b/pkgs/build-support/vm/rpm/rpm-closure.pl
@@ -1,34 +1,52 @@
 use strict;
 use XML::Simple;
 
-my $packagesFile = shift @ARGV;
-my $urlPrefix = shift @ARGV;
+my @packagesFiles = ();
+my @urlPrefixes = ();
+
+# rpm-closure.pl (<package-file> <url-prefix>)+ <toplevel-pkg>+
+
+while(-f $ARGV[0]) {
+    my $packagesFile = shift @ARGV;
+    my $urlPrefix = shift @ARGV;
+    push(@packagesFiles, $packagesFile);
+    push(@urlPrefixes, $urlPrefix);
+}
+
 my @toplevelPkgs = @ARGV;
 
 my @archs = split ' ', ($ENV{'archs'} or "");
 
-print STDERR "parsing packages...\n";
-
-my $xml = XMLin($packagesFile, ForceArray => ['package', 'rpm:entry', 'file'], KeyAttr => []) or die;
-
-print STDERR "file contains $xml->{packages} packages\n";
-
-
 my %pkgs;
-foreach my $pkg (@{$xml->{'package'}}) {
-    if (scalar @archs > 0) {
-        my $arch = $pkg->{arch};
-        my $found = 0;
-        foreach my $a (@archs) { $found = 1 if $arch eq $a; }
-        next if !$found;
-    }
-    if (defined $pkgs{$pkg->{name}}) {
-        print STDERR "WARNING: duplicate occurrence of package $pkg->{name}\n";
-        next;
-    }
-    $pkgs{$pkg->{name}} = $pkg;
-}
+for (my $i = 0; $i < scalar(@packagesFiles); $i++) {
+    my $packagesFile = $packagesFiles[$i];
+    print STDERR "parsing packages in $packagesFile...\n";
 
+    my $xml = XMLin($packagesFile, ForceArray => ['package', 'rpm:entry', 'file'], KeyAttr => []) or die;
+
+    print STDERR "$packagesFile contains $xml->{packages} packages\n";
+
+    foreach my $pkg (@{$xml->{'package'}}) {
+        if (scalar @archs > 0) {
+            my $arch = $pkg->{arch};
+            my $found = 0;
+            foreach my $a (@archs) { $found = 1 if $arch eq $a; }
+            next if !$found;
+        }
+        if (defined $pkgs{$pkg->{name}}) {
+            my $earlierPkg = $pkgs{$pkg->{name}};
+            print STDERR "WARNING: duplicate occurrence of package $pkg->{name}\n";
+            if ($earlierPkg->{'time'}->{file} <= $pkg->{'time'}->{file}) {
+                print STDERR "WARNING: replaced package $pkg->{name} with newer one\n";
+                $pkg->{urlPrefix} = $urlPrefixes[$i];
+                $pkgs{$pkg->{name}} = $pkg;
+            }
+            next;
+        }
+        $pkg->{urlPrefix} = $urlPrefixes[$i];
+        $pkgs{$pkg->{name}} = $pkg;
+    }
+}
 
 my %provides;
 foreach my $pkgName (keys %pkgs) {
@@ -104,7 +122,7 @@ print "[\n\n";
 foreach my $pkgName (@needed) {
     my $pkg = $pkgs{$pkgName};
     print "  (fetchurl {\n";
-    print "    url = $urlPrefix/$pkg->{location}->{href};\n";
+    print "    url = $pkg->{urlPrefix}/$pkg->{location}->{href};\n";
     if ($pkg->{checksum}->{type} eq "sha") {
         print "    sha1 = \"$pkg->{checksum}->{content}\";\n";
     } elsif ($pkg->{checksum}->{type} eq "sha256") {
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 71c66a0794b..1376a92c134 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Linux development manual pages";
-    homepage = http://kernel.org/pub/linux/docs/manpages/;
+    homepage = http://www.kernel.org/doc/man-pages/;
   };
 }
diff --git a/pkgs/data/misc/xkeyboard-config/default.nix b/pkgs/data/misc/xkeyboard-config/default.nix
index 63357fb45a3..fbe8e7ce1f5 100644
--- a/pkgs/data/misc/xkeyboard-config/default.nix
+++ b/pkgs/data/misc/xkeyboard-config/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "0x9hkb4iqz64gcabzkdcfy4p78sdhnpjwh54g8wx5bdgy9087vpr";
   };
 
-  buildInputs = [ perl perlXMLParser xkbcomp gettext intltool ];
+  buildInputs = [ gettext ];
+
+  buildNativeInputs = [ perl perlXMLParser intltool xkbcomp ];
 
   patches = [ ./eo.patch ];
 
diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix
new file mode 100644
index 00000000000..811515ee55b
--- /dev/null
+++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, unzip }:
+
+let 
+
+  src = fetchurl {
+    url = http://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip;
+    sha256 = "04b3gp4zkh9c5g9kvnywdkdfkcqx3kjc04j4mpkr4xk7lgqgrany";
+  };
+
+  isoents = fetchurl {
+    url = http://www.oasis-open.org/cover/ISOEnts.zip;
+    sha256 = "1clrkaqnvc1ja4lj8blr0rdlphngkcda3snm7b9jzvcn76d3br6w";
+  };
+
+in
+
+stdenv.mkDerivation {
+  name = "docbook-sgml-4.1";
+
+  unpackPhase = "true";
+
+  buildInputs = [ unzip ];
+
+  installPhase =
+    ''
+      o=$out/sgml/dtd/docbook-4.1
+      mkdir -p $o
+      cd $o
+      unzip ${src}
+      unzip ${isoents}
+      sed -e "s/iso-/ISO/" -e "s/.gml//" -i docbook.cat
+    '';
+}
diff --git a/pkgs/desktops/e17/e_dbus/default.nix b/pkgs/desktops/e17/e_dbus/default.nix
index 44be90f7af9..7c078eee0ee 100644
--- a/pkgs/desktops/e17/e_dbus/default.nix
+++ b/pkgs/desktops/e17/e_dbus/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchurl, pkgconfig, ecore, eina, evas, dbus_libs }:
+{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, expat, ecore, eina, evas
+, dbus_libs }:
 stdenv.mkDerivation rec {
   name = "e_dbus-${version}";
-  version = "1.0.1";
+  version = "1.1.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "1ifkijy4ap2mlqw2nd1dlvzlppyi7bnp15bxiy40nhdly8vhpbdl";
+    sha256 = "10y68f023jjq6dinjc0brpr41acnd7clxgb0q1j2i9isalx1473z";
   };
-  buildInputs = [ pkgconfig ecore eina evas ];
+  buildInputs = [ pkgconfig zlib libjpeg expat ecore eina evas ];
   propagatedBuildInputs = [ dbus_libs ];
   configureFlags = ''
     --disable-edbus-test
diff --git a/pkgs/desktops/e17/ecore/default.nix b/pkgs/desktops/e17/ecore/default.nix
index 004d708070c..010a8022fca 100644
--- a/pkgs/desktops/e17/ecore/default.nix
+++ b/pkgs/desktops/e17/ecore/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, eina, evas, libX11, libXext }:
 stdenv.mkDerivation rec {
   name = "ecore-${version}";
-  version = "1.0.1";
+  version = "1.1.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "1vi03zxnsdnrjv1rh5r3v0si0b20ikrfb8hf5374i2sqvi1g65j0";
+    sha256 = "12iqhrklp3k5lvbxf7lhqd53wpl1csvricfkzlcv2nny4y3r31m0";
   };
   buildInputs = [ pkgconfig eina evas ];
   propagatedBuildInputs = [ libX11 libXext ];
diff --git a/pkgs/desktops/e17/edje/default.nix b/pkgs/desktops/e17/edje/default.nix
index 3272963b8b6..6c9e58c65fd 100644
--- a/pkgs/desktops/e17/edje/default.nix
+++ b/pkgs/desktops/e17/edje/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchurl, pkgconfig, lua, eina, eet, evas, ecore, embryo }:
+{ stdenv, fetchurl, pkgconfig, lua, expat, zlib, libjpeg, eina, eet, evas
+, ecore, embryo }:
 stdenv.mkDerivation rec {
   name = "edje-${version}";
-  version = "1.0.1";
+  version = "1.1.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "0z7gjj4ccjr36ba763ijmjkya58fc173vpdw1m298zwhy8n4164j";
+    sha256 = "0fjn4psl70hkfbjmczk06if8yxarg67w5hp2i1vq49kfkpyn2cx7";
   };
-  buildInputs = [ pkgconfig lua eina eet evas ecore embryo ];
+  buildInputs = [ pkgconfig expat zlib libjpeg lua eina eet evas ecore embryo ];
   meta = {
     description = "Enlightenment's abstract GUI layout and animation object library";
     longDescription = ''
diff --git a/pkgs/desktops/e17/eet/default.nix b/pkgs/desktops/e17/eet/default.nix
index 7f2809c0aa0..98cdca08179 100644
--- a/pkgs/desktops/e17/eet/default.nix
+++ b/pkgs/desktops/e17/eet/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, eina, zlib, libjpeg }:
 stdenv.mkDerivation rec {
   name = "eet-${version}";
-  version = "1.4.1";
+  version = "1.5.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "1hlznlmgkgzxnkmc3qgqjrc62bmwqj5af8lsh59vac2gf4jnymnc";
+    sha256 = "0csk2s0y3qllf40q06i4wqaj8y2p1csh5jxcqnlmf6lrk1ycjv32";
   };
   buildInputs = [ pkgconfig eina zlib libjpeg ];
   meta = {
diff --git a/pkgs/desktops/e17/eeze/default.nix b/pkgs/desktops/e17/eeze/default.nix
index 3499d29dbb1..c095e25f886 100644
--- a/pkgs/desktops/e17/eeze/default.nix
+++ b/pkgs/desktops/e17/eeze/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, eina, ecore, udev }:
 stdenv.mkDerivation rec {
   name = "eeze-${version}";
-  version = "1.0.2";
+  version = "1.1.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "0g6afhnl862clj1rfh0s4nzdnhdikylbalfp8zmsw56dj0zncynq";
+    sha256 = "10n2qd7rf1cnsgd3mhh1wd1qm7hsf1lxx1ig72xyj55i4i5dllh3";
   };
   buildInputs = [ pkgconfig eina ecore ];
   propagatedBuildInputs = [ udev ];
diff --git a/pkgs/desktops/e17/efreet/default.nix b/pkgs/desktops/e17/efreet/default.nix
index e1e8d34197f..291ea2f63f9 100644
--- a/pkgs/desktops/e17/efreet/default.nix
+++ b/pkgs/desktops/e17/efreet/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, eina, eet, ecore }:
 stdenv.mkDerivation rec {
   name = "efreet-${version}";
-  version = "1.0.1";
+  version = "1.1.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "0fakczsrr1idyvrp04mxw51ww017kn65xa77vq8wka4js8y0nagi";
+    sha256 = "0fqrrp8dvaqhwczlh7xyh1x6wr4flpmpy6ihrjh1ywymgcvrfwkf";
   };
   buildInputs = [ pkgconfig eina eet ecore ];
   meta = {
diff --git a/pkgs/desktops/e17/eina/default.nix b/pkgs/desktops/e17/eina/default.nix
index b4c3d0a7291..d3f02e595c1 100644
--- a/pkgs/desktops/e17/eina/default.nix
+++ b/pkgs/desktops/e17/eina/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
   name = "eina-${version}";
-  version = "1.0.1";
+  version = "1.1.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "1v2z1l6nqr7hnp5gki3972kprlvylpalp5wq9xdppm250z91kaas";
+    sha256 = "0h2vmvr7bmnb19n124bjvi2rddv7vm15pv19lrpc7av3idk7ic4j";
   };
   meta = {
     description = "Enlightenment's core data structure library";
diff --git a/pkgs/desktops/e17/embryo/default.nix b/pkgs/desktops/e17/embryo/default.nix
index e23b3f4b0b1..2dd1a5cbab0 100644
--- a/pkgs/desktops/e17/embryo/default.nix
+++ b/pkgs/desktops/e17/embryo/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, pkgconfig, eina }:
 stdenv.mkDerivation rec {
   name = "embryo-${version}";
-  version = "1.0.0";
+  version = "1.1.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "0ch9vps83s892vda1ss1cf1fbgzff9p51df2fip7fqlj8y1shvvx";
+    sha256 = "0nk7jajsgi5xf02yxahwr3cm7bml5477fb1mas1i7a788bw7i6zn";
   };
+  buildInputs = [ pkgconfig eina ];
   meta = {
     description = "Enlightenment's small Pawn based virtual machine and compiler";
     longDescription = ''
diff --git a/pkgs/desktops/e17/enlightenment/default.nix b/pkgs/desktops/e17/enlightenment/default.nix
index b21bfc92ef2..f8c57543f88 100644
--- a/pkgs/desktops/e17/enlightenment/default.nix
+++ b/pkgs/desktops/e17/enlightenment/default.nix
@@ -1,9 +1,10 @@
 { stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus, embryo }:
 stdenv.mkDerivation rec {
-  name = "enlightenment-0.16.999.55225";
+  name = "enlightenment-${version}";
+  version = "0.16.999.65643";
   src = fetchurl {
-    url = "http://download.enlightenment.org/snapshots/2010-12-03/${name}.tar.gz";
-    sha256 = "1cv701fidp9mx3g5m9klmzsp0fj149rb133v1w76rzms3a0wljl1";
+    url = "http://download.enlightenment.org/snapshots/2011-11-28/${name}.tar.gz";
+    sha256 = "1bb577gbccb1wrifrhv9pzm451zhig2p29mwz55b187ls31p36kz";
   };
   buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus embryo ];
   configureFlags = ''
diff --git a/pkgs/desktops/e17/evas/default.nix b/pkgs/desktops/e17/evas/default.nix
index c546eb1af54..84dae4822ba 100644
--- a/pkgs/desktops/e17/evas/default.nix
+++ b/pkgs/desktops/e17/evas/default.nix
@@ -2,10 +2,10 @@
 , libX11, libXext, eina, eet }:
 stdenv.mkDerivation rec {
   name = "evas-${version}";
-  version = "1.0.1";
+  version = "1.1.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "0xkwyvxy32dwja0i3j8r8bzlybjwlrgmrhcri1bscp3aaj75x2rx";
+    sha256 = "1qjmxn5a5qhc2slxjx7bsas76w0zlnrbs6hx9swr8xarkifjk3dv";
   };
   buildInputs = [ pkgconfig freetype fontconfig libpng libjpeg
                   libX11 libXext eina eet
diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix
deleted file mode 100644
index 36eb7b70be2..00000000000
--- a/pkgs/desktops/gnome-2.28/default.nix
+++ /dev/null
@@ -1,339 +0,0 @@
-pkgs:
-pkgs.makeOverridable
-(__overrides: rec {
-  inherit __overrides;
-
-  inherit (pkgs.gtkLibs) glib pango atk gtk gtkmm;
-
-  # Backward compatibility.
-  gnomevfs = gnome_vfs;
-  startupnotification = startup_notification;
-  gnomedocutils = gnome_doc_utils;
-  gnomeicontheme = gnome_icon_theme;
-  gnomepanel = gnome_panel;
-
-#### PLATFORM
-
-  audiofile = import ./platform/audiofile {
-    inherit (pkgs) stdenv fetchurl;
-  };
-
-  esound = import ./platform/esound {
-    inherit (pkgs) stdenv fetchurl pkgconfig alsaLib;
-    inherit audiofile;
-  };
-
-  libIDL = import ./platform/libIDL {
-    inherit (pkgs) stdenv fetchurl flex bison pkgconfig;
-    inherit (pkgs.gtkLibs) glib;
-    gettext = if pkgs.stdenv.isDarwin then pkgs.gettext else null;
-  };
-
-  ORBit2 = import ./platform/ORBit2 {
-    inherit (pkgs) stdenv fetchurl pkgconfig;
-    inherit (pkgs.gtkLibs) glib;
-    inherit libIDL;
-  };
-
-  libart_lgpl = import ./platform/libart_lgpl {
-    inherit (pkgs) stdenv fetchurl;
-  };
-
-  libglade = import ./platform/libglade {
-    inherit (pkgs) stdenv fetchurl pkgconfig libxml2 python gettext;
-    inherit (pkgs.gtkLibs) gtk;
-  };
-
-  libgnomeprint = import ./platform/libgnomeprint {
-    inherit intltool libart_lgpl libgnomecups;
-    inherit (pkgs) stdenv fetchurl pkgconfig gettext libxml2 bison flex;
-    inherit (pkgs.gtkLibs) gtk;
-  };
-
-  libgnomeprintui = import ./platform/libgnomeprintui {
-    inherit intltool libgnomecanvas libgnomeprint gnomeicontheme;
-    inherit (pkgs) stdenv fetchurl pkgconfig gettext;
-    inherit (pkgs.gtkLibs) gtk;
-  };
-
-  libgnomecups = import ./platform/libgnomecups {
-    inherit intltool libart_lgpl;
-    inherit (pkgs) stdenv fetchurl pkgconfig gettext libxml2;
-    inherit (pkgs.gtkLibs) gtk;
-  };
-
-  libgtkhtml = import ./platform/libgtkhtml {
-    inherit (pkgs) stdenv fetchurl pkgconfig gettext libxml2;
-    inherit (pkgs.gtkLibs) gtk;
-  };
-
-  intltool = import ./platform/intltool {
-    inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser gettext;
-  };
-
-  GConf = import ./platform/GConf {
-    inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxml2 policykit;
-    inherit (pkgs.gtkLibs) glib;
-    inherit intltool ORBit2;
-    dbus_libs = pkgs.dbus.libs;
-  };
-
-  libgnomecanvas = import ./platform/libgnomecanvas {
-    inherit (pkgs) stdenv fetchurl pkgconfig;
-    inherit (pkgs.gtkLibs) gtk;
-    inherit intltool libart_lgpl libglade;
-  };
-
-  libgnomecanvasmm = import ./platform/libgnomecanvasmm {
-    inherit (pkgs) stdenv fetchurl pkgconfig;
-    inherit libgnomecanvas gtkmm;
-  };
-
-  # for git-head builds
-  gnome_common = import platform/gnome-common {
-    inherit (pkgs) stdenv fetchgit pkgconfig
-      autoconf automake libtool;
-  };
-
-  gnome_mime_data = import ./platform/gnome-mime-data {
-    inherit (pkgs) stdenv fetchurl;
-    inherit intltool;
-  };
-
-  gnome_vfs = import ./platform/gnome-vfs {
-    inherit (pkgs) stdenv fetchurl pkgconfig libxml2 bzip2 openssl samba dbus_glib fam hal cdparanoia;
-    inherit (pkgs.gtkLibs) glib;
-    inherit intltool GConf gnome_mime_data;
-  };
-
-  gnome_vfs_monikers = import ./platform/gnome-vfs-monikers {
-    inherit (pkgs) stdenv fetchurl pkgconfig;
-    inherit (pkgs.gtkLibs) glib;
-    inherit intltool gnome_vfs libbonobo ORBit2;
-  };
-
-  libgnome = import ./platform/libgnome {
-    inherit (pkgs) stdenv fetchurl pkgconfig popt zlib;
-    inherit (pkgs.gtkLibs) glib;
-    inherit intltool esound libbonobo GConf gnome_vfs ORBit2;
-  };
-
-  libgnomeui = import ./platform/libgnomeui {
-    inherit (pkgs) stdenv fetchurl pkgconfig libxml2 xlibs;
-    inherit intltool libgnome libgnomecanvas libbonoboui GConf;
-    inherit gnome_vfs gnome_keyring libglade glib pango;
-  };
-
-  libbonobo = import ./platform/libbonobo {
-    inherit (pkgs) stdenv fetchurl flex bison pkgconfig dbus_glib libxml2 popt;
-    inherit (pkgs.gtkLibs) glib;
-    inherit intltool ORBit2;
-  };
-
-  libbonoboui = import ./platform/libbonoboui {
-    inherit (pkgs) stdenv fetchurl bison pkgconfig popt libxml2;
-    inherit intltool libbonobo GConf libgnomecanvas libgnome libglade gtk;
-  };
-
-  at_spi = import ./platform/at-spi {
-    inherit (pkgs) stdenv fetchurl python pkgconfig popt;
-    inherit (pkgs.xlibs) libX11 libICE libXtst libXi;
-    inherit (pkgs.gtkLibs) atk gtk;
-    inherit intltool libbonobo ORBit2;
-  };
-
-  glib_networking = import ./platform/glib-networking {
-    inherit (pkgs) stdenv fetchurl pkgconfig glib libtool intltool gnutls2
-      libproxy libgcrypt libtasn1;
-  };
-
-  gtk_doc = import ./platform/gtk-doc {
-    inherit (pkgs) stdenv fetchurl pkgconfig perl python libxml2 libxslt;
-    inherit (pkgs) docbook_xml_dtd_43 docbook_xsl dblatex;
-    inherit gnome_doc_utils;
-  };
-
-  # What name should we use??
-  gtkdoc = gtk_doc;
-
-  gtkhtml = import ./platform/gtkhtml {
-    inherit (pkgs.gtkLibs) gtk;
-    inherit (pkgs) fetchurl stdenv pkgconfig intltool enchant isocodes;
-    inherit GConf gnome_icon_theme;
-  };
-
-
-  # Freedesktop library
-  startup_notification = import ./platform/startup-notification {
-    inherit (pkgs) stdenv fetchurl pkgconfig xlibs;
-  };
-
-  # Required for nautilus
-  libunique = import ./platform/libunique {
-    inherit (pkgs) stdenv fetchurl pkgconfig gettext;
-    inherit (pkgs.gtkLibs) gtk;
-  };
-
-  gtkglext = import ./platform/gtkglext {
-    inherit (pkgs) stdenv fetchurl mesa pkgconfig;
-    inherit (pkgs.gtkLibs) gtk pango;
-  };
-
-#### DESKTOP
-
-  gnome_keyring = import ./desktop/gnome-keyring {
-    inherit (pkgs) stdenv fetchurl pkgconfig dbus libgcrypt libtasn1 pam hal python;
-    inherit (pkgs.gtkLibs) glib gtk;
-    inherit intltool GConf;
-  };
-
-  libsoup = import ./desktop/libsoup {
-    inherit (pkgs) stdenv fetchurl pkgconfig libxml2 gnutls libproxy sqlite curl;
-    inherit (pkgs.gtkLibs) glib;
-    inherit GConf gnome_keyring;
-  };
-
-  libwnck = import ./desktop/libwnck {
-    inherit (pkgs) stdenv fetchurl pkgconfig;
-    inherit (pkgs.xlibs) libX11;
-    inherit (pkgs.gtkLibs) gtk;
-    inherit intltool;
-  };
-
-  # Not part of GNOME desktop, but provides CSS support for librsvg
-  libcroco = import ./desktop/libcroco {
-    inherit (pkgs) stdenv fetchurl pkgconfig libxml2;
-    inherit (pkgs.gtkLibs) glib;
-  };
-
-  librsvg = import ./desktop/librsvg {
-    inherit (pkgs) stdenv fetchurl pkgconfig libxml2 libgsf bzip2;
-    inherit (pkgs.gtkLibs) glib gtk;
-    inherit libcroco;
-  };
-
-  libgweather = import ./desktop/libgweather {
-    inherit (pkgs) stdenv fetchurl pkgconfig libxml2 libtasn1 nettle gmp;
-    inherit (pkgs.gtkLibs) gtk;
-    inherit intltool GConf libsoup;
-  };
-
-  gvfs = import ./desktop/gvfs {
-    inherit (pkgs) stdenv fetchurl pkgconfig dbus samba hal libarchive fuse libgphoto2 cdparanoia libxml2 libtool;
-    inherit (pkgs.gtkLibs) glib;
-    inherit intltool GConf gnome_keyring libsoup;
-  };
-
-  libgnomekbd = import ./desktop/libgnomekbd {
-    inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier;
-    inherit (pkgs.gtkLibs) glib gtk;
-    inherit intltool GConf libglade;
-  };
-
-  # Removed from recent GNOME releases, but still required
-  scrollkeeper = import ./desktop/scrollkeeper {
-    inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser libxml2 libxslt docbook_xml_dtd_42 automake;
-  };
-
-  # scrollkeeper replacement
-  rarian = import ./desktop/rarian {
-    inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser libxml2 libxslt docbook_xml_dtd_42;
-  };
-
-  gnome_doc_utils = import ./desktop/gnome-doc-utils {
-    inherit (pkgs) stdenv fetchurl python pkgconfig libxslt
-      makeWrapper;
-    inherit intltool scrollkeeper;
-    libxml2 = pkgs.libxml2Python;
-  };
-
-  zenity = import ./desktop/zenity {
-    inherit (pkgs) stdenv fetchurl pkgconfig cairo libxml2 libxslt;
-    inherit (pkgs.gtkLibs) glib gtk pango atk;
-    inherit gnome_doc_utils intltool libglade;
-    inherit (pkgs.xlibs) libX11;
-  };
-
-  metacity = import ./desktop/metacity {
-    inherit (pkgs) stdenv fetchurl pkgconfig libcanberra;
-    inherit (pkgs.gtkLibs) glib gtk;
-    inherit (pkgs.xlibs) libXcomposite libXcursor libXdamage;
-    inherit intltool GConf startup_notification zenity gnome_doc_utils;
-  };
-
-  gnome_menus = import ./desktop/gnome-menus {
-    inherit (pkgs) stdenv fetchurl pkgconfig python;
-    inherit (pkgs.gtkLibs) glib;
-    inherit intltool;
-  };
-
-  gnome_desktop = import ./desktop/gnome-desktop {
-    inherit (pkgs) stdenv fetchurl pkgconfig python libxslt which;
-    libxml2 = pkgs.libxml2Python;
-    inherit (pkgs.xlibs) libX11;
-    inherit (pkgs.gtkLibs) gtk;
-    inherit intltool GConf gnome_doc_utils;
-  };
-
-  gnome_panel = import ./desktop/gnome-panel {
-    inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib dbus cairo popt which bzip2 python libxslt libtasn1;
-    libxml2 = pkgs.libxml2Python;
-    inherit (pkgs.gtkLibs) glib gtk pango atk;
-    inherit (pkgs.xlibs) libXau;
-    inherit intltool ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf gnome_menus gnome_desktop;
-    inherit libwnck librsvg libgweather gnome_doc_utils libgnomecanvas libart_lgpl;
-  };
-
-  gnome_session = import ./desktop/gnome-session {
-    inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib cairo dbus;
-    inherit (pkgs.gtkLibs) gtk pango atk;
-    inherit (pkgs.xlibs) libXau libXtst inputproto;
-    inherit intltool libglade startup_notification GConf;
-  };
-
-  gnome_settings_daemon = import ./desktop/gnome-settings-daemon {
-    inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier;
-    inherit (pkgs.gtkLibs) gtk;
-    inherit intltool GConf gnome_desktop libglade libgnomekbd;
-  };
-
-  gnome_control_center = import ./desktop/gnome-control-center {
-    inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier hal libtool bzip2;
-    inherit (pkgs) cairo popt which python libxslt shared_mime_info desktop_file_utils;
-    inherit (pkgs.gtkLibs) glib gtk pango atk;
-    inherit gnome_doc_utils intltool GConf libglade libgnome libgnomeui libgnomekbd libunique;
-    inherit librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon;
-    inherit libbonobo libbonoboui libgnomecanvas libart_lgpl gnome_vfs ORBit2;
-    libxml2 = pkgs.libxml2Python;
-  };
-
-  gtksourceview = import ./desktop/gtksourceview {
-    inherit (pkgs) stdenv fetchurl pkgconfig cairo perl intltool
-      gettext;
-    inherit (pkgs.gtkLibs) atk glib gtk pango;
-    libxml2 = pkgs.libxml2Python;
-  };
-
-  nautilus = import ./desktop/nautilus {
-    inherit (pkgs) stdenv fetchurl pkgconfig libxml2 dbus_glib libexif shared_mime_info;
-    inherit (pkgs.gtkLibs) gtk;
-    inherit gnome_desktop libunique intltool GConf;
-  };
-
-  gnome_icon_theme = import ./desktop/gnome-icon-theme {
-    inherit (pkgs) stdenv fetchurl pkgconfig intltool iconnamingutils;
-  };
-
-  vte = import ./desktop/vte {
-    inherit (pkgs) stdenv fetchurl pkgconfig ncurses python;
-    inherit intltool glib gtk;
-  };
-
-#### BINDINGS
-
-  libglademm = import ./bindings/libglademm {
-    inherit (pkgs) stdenv fetchurl pkgconfig intltool;
-    inherit gtkmm libglade;
-  };
-
-}) {}
diff --git a/pkgs/desktops/gnome-2.28/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2.28/platform/ORBit2/default.nix
deleted file mode 100644
index 0d536e830b1..00000000000
--- a/pkgs/desktops/gnome-2.28/platform/ORBit2/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, pkgconfig, glib, libIDL}:
-
-stdenv.mkDerivation {
-  name = "ORBit2-2.14.17";
-  
-  src = fetchurl {
-    url = mirror://gnome/sources/ORBit2/2.14/ORBit2-2.14.17.tar.bz2;
-    sha256 = "0k4px2f949ac7vmj7b155g1rpf7pmvl48sbnkjhlg4wgcwzwxgv2";
-  };
-  
-  buildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ glib libIDL ];
-}
diff --git a/pkgs/desktops/gnome-2.28/platform/gnome-common/default.nix b/pkgs/desktops/gnome-2.28/platform/gnome-common/default.nix
deleted file mode 100644
index 1d2e1724163..00000000000
--- a/pkgs/desktops/gnome-2.28/platform/gnome-common/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchgit, pkgconfig, autoconf, automake, libtool}:
-
-stdenv.mkDerivation {
-  name = "gnome-common-2.28.0";
-  src =  fetchgit {
-    url = mirror://gnome/sources/gnome-common/2.28/gnome-common-2.28.0.tar.bz2;
-    sha256 = "18dnx5hndl19lpk6i3ybfsssfasma5wi7p9mqw05sx137l81fj6x";
-  };
-  buildInputs = [ pkgconfig automake autoconf libtool
-    ];
-  preConfigure = ''
-    ./autogen.sh
-  '';
-}
diff --git a/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix
deleted file mode 100644
index 1e35ac9430b..00000000000
--- a/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, samba, dbus_glib, glib, fam, hal, cdparanoia
-, intltool, GConf, gnome_mime_data}:
-
-stdenv.mkDerivation {
-  name = "gnome-vfs-2.24.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-vfs/2.24/gnome-vfs-2.24.1.tar.bz2;
-    sha256 = "1dmyr8nj77717r8dhwkixpar2yp8ld3r683gp222n59v61718ndw";
-  };
-
-  buildInputs =
-    [ pkgconfig libxml2 bzip2 openssl samba dbus_glib fam cdparanoia
-      intltool gnome_mime_data
-    ]
-    ++ (if stdenv.isLinux then [hal] else []);
-
-  propagatedBuildInputs = [ GConf glib ];
-}
diff --git a/pkgs/desktops/gnome-2.28/platform/libIDL/default.nix b/pkgs/desktops/gnome-2.28/platform/libIDL/default.nix
deleted file mode 100644
index f48b0821f12..00000000000
--- a/pkgs/desktops/gnome-2.28/platform/libIDL/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchurl, flex, bison, pkgconfig, glib, gettext ? null}:
-
-stdenv.mkDerivation {
-  name = "libIDL-0.8.13";
-  src = fetchurl {
-    url = mirror://gnome/sources/libIDL/0.8/libIDL-0.8.13.tar.bz2;
-    sha256 = "0w9b4q5sllwncz498sj5lmc3ajzc8x74dy0jy27m2yg9v887xk5w";
-  };
-  buildInputs = [ flex bison pkgconfig glib gettext ];
-}
diff --git a/pkgs/desktops/gnome-2.28/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2.28/platform/libbonobo/default.nix
deleted file mode 100644
index 9910965cf91..00000000000
--- a/pkgs/desktops/gnome-2.28/platform/libbonobo/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt, intltool, ORBit2}:
-
-stdenv.mkDerivation {
-  name = "libbonobo-2.24.2";
-  
-  src = fetchurl {
-    url = mirror://gnome/sources/libbonobo/2.24/libbonobo-2.24.2.tar.bz2;
-    sha256 = "1gr85amd271z0lbr68crcsc24rx1pa5k20f67y3y2mx664527h4m";
-  };
-  
-  buildInputs = [ flex bison pkgconfig dbus_glib libxml2 intltool ];
-  propagatedBuildInputs = [ popt glib ORBit2 ];
-}
diff --git a/pkgs/desktops/gnome-2.28/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2.28/platform/libbonoboui/default.nix
deleted file mode 100644
index 20169161b82..00000000000
--- a/pkgs/desktops/gnome-2.28/platform/libbonoboui/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ stdenv, fetchurl, bison, pkgconfig, popt, libxml2, gtk
-, intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }:
-
-stdenv.mkDerivation {
-  name = "libbonoboui-2.24.2";
-  
-  src = fetchurl {
-    url = mirror://gnome/sources/libbonoboui/2.24/libbonoboui-2.24.2.tar.bz2;
-    sha256 = "005ypnzb3mfsb0k0aa3h77vwc4ifjq6r4d11msqllvx7avfgkg5f";
-  };
-  
-  buildInputs = [ bison pkgconfig popt gtk libxml2 intltool GConf libglade ];
-  propagatedBuildInputs = [ libbonobo libgnomecanvas libgnome ];
-}
diff --git a/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix b/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix
deleted file mode 100644
index c79a61b883a..00000000000
--- a/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, popt, zlib
-, intltool, esound, libbonobo, GConf, gnome_vfs, ORBit2}:
-
-stdenv.mkDerivation {
-  name = "libgnome-2.28.0";
-  
-  src = fetchurl {
-    url = mirror://gnome/sources/libgnome/2.28/libgnome-2.28.0.tar.bz2;
-    sha256 = "03hc1m88swxxw4cq491kz7495ksv762imamzbbvhci41bc40anwv";
-  };
-  
-  buildInputs = [ pkgconfig popt zlib intltool GConf gnome_vfs ];
-  propagatedBuildInputs = [ glib libbonobo esound ];
-}
diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2.28/platform/libgnomecanvas/default.nix
deleted file mode 100644
index 95f484ff7a4..00000000000
--- a/pkgs/desktops/gnome-2.28/platform/libgnomecanvas/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, intltool, libart_lgpl, libglade }:
-
-stdenv.mkDerivation {
-  name = "libgnomecanvas-2.26.0";
-  
-  src = fetchurl {
-    url = mirror://gnome/sources/libgnomecanvas/2.26/libgnomecanvas-2.26.0.tar.bz2;
-    sha256 = "13f5rf5pkp9hnyxzvssrxnlykjaixa7vrig9a7v06wrxqfn81d40";
-  };
-  
-  buildInputs = [ pkgconfig intltool libglade ];
-
-  propagatedBuildInputs = [ libart_lgpl gtk ];
-}
diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2.28/platform/libgnomeui/default.nix
deleted file mode 100644
index d3edee3ffd3..00000000000
--- a/pkgs/desktops/gnome-2.28/platform/libgnomeui/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, xlibs, glib, pango
-, intltool, libgnome, libgnomecanvas, libbonoboui, GConf
-, gnome_vfs, gnome_keyring, libglade }:
-
-stdenv.mkDerivation {
-  name = "libgnomeui-2.24.2";
-  
-  src = fetchurl {
-    url = mirror://gnome/sources/libgnomeui/2.24/libgnomeui-2.24.2.tar.bz2;
-    sha256 = "04296nf6agg8zsbw6pzl3mzn890bkcczs6fnna5jay7fvnrmjx5f";
-  };
-  
-  buildInputs = [ pkgconfig intltool xlibs.xlibs libxml2 GConf pango glib gnome_keyring libglade ];
-
-  propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ];
-}
diff --git a/pkgs/desktops/gnome-2.28/platform/libunique/default.nix b/pkgs/desktops/gnome-2.28/platform/libunique/default.nix
deleted file mode 100644
index ed6d268fdeb..00000000000
--- a/pkgs/desktops/gnome-2.28/platform/libunique/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchurl, pkgconfig, gettext, gtk}:
-
-stdenv.mkDerivation {
-  name = "libunique-1.1.2";
-  src = fetchurl {
-    url = mirror://gnome/sources/libunique/1.1/libunique-1.1.2.tar.bz2;
-    sha256 = "0vhcbw4ccc58xhs99r6bkabrzbayyq2qk01xm8vv4hpwjl117yvk";
-  };
-  buildInputs = [ pkgconfig gettext gtk ];
-}
diff --git a/pkgs/desktops/gnome-2.28/bindings/libglademm/default.nix b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/bindings/libglademm/default.nix
rename to pkgs/desktops/gnome-2/bindings/libglademm/default.nix
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
new file mode 100644
index 00000000000..814b054f74e
--- /dev/null
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -0,0 +1,133 @@
+{ callPackage, self, stdenv, gettext, overrides ? {} }:
+{
+  __overrides = overrides;
+
+  # Backward compatibility.
+  gtkdoc = self.gtk_doc;
+  startupnotification = self.startup_notification;
+  gnomedocutils = self.gnome_doc_utils;
+  gnomeicontheme = self.gnome_icon_theme;
+  gnomepanel = self.gnome_panel;
+
+#### PLATFORM
+
+  audiofile = callPackage ./platform/audiofile { };
+
+  esound = callPackage ./platform/esound { };
+
+  libIDL = callPackage ./platform/libIDL {
+    gettext = if stdenv.isDarwin then gettext else null;
+  };
+
+  ORBit2 = callPackage ./platform/ORBit2 { };
+
+  libart_lgpl = callPackage ./platform/libart_lgpl { };
+
+  libglade = callPackage ./platform/libglade { };
+
+  libgnomeprint = callPackage ./platform/libgnomeprint { };
+
+  libgnomeprintui = callPackage ./platform/libgnomeprintui { };
+
+  libgnomecups = callPackage ./platform/libgnomecups { };
+
+  libgtkhtml = callPackage ./platform/libgtkhtml { };
+
+  intltool = callPackage ./platform/intltool { };
+
+  GConf = callPackage ./platform/GConf { };
+
+  libgnomecanvas = callPackage ./platform/libgnomecanvas { };
+
+  libgnomecanvasmm = callPackage ./platform/libgnomecanvasmm { };
+
+  # for git-head builds
+  gnome_common = callPackage platform/gnome-common { };
+
+  gnome_mime_data = callPackage ./platform/gnome-mime-data { };
+
+  gnome_vfs = callPackage ./platform/gnome-vfs { };
+
+  gnome_vfs_monikers = callPackage ./platform/gnome-vfs-monikers { };
+
+  libgnome = callPackage ./platform/libgnome { };
+
+  libgnomeui = callPackage ./platform/libgnomeui { };
+
+  libbonobo = callPackage ./platform/libbonobo { };
+
+  libbonoboui = callPackage ./platform/libbonoboui { };
+
+  at_spi = callPackage ./platform/at-spi { };
+
+  glib_networking = callPackage ./platform/glib-networking { };
+
+  gtk_doc = callPackage ./platform/gtk-doc { };
+
+  gtkhtml = callPackage ./platform/gtkhtml { };
+
+
+  # Freedesktop library
+  startup_notification = callPackage ./platform/startup-notification { };
+
+  # Required for nautilus
+  libunique = callPackage ./platform/libunique { };
+
+  gtkglext = callPackage ./platform/gtkglext { };
+
+#### DESKTOP
+
+  gnome_keyring = callPackage ./desktop/gnome-keyring { };
+
+  libsoup = callPackage ./desktop/libsoup { };
+
+  libwnck = callPackage ./desktop/libwnck { };
+
+  # Not part of GNOME desktop, but provides CSS support for librsvg
+  libcroco = callPackage ./desktop/libcroco { };
+
+  librsvg = callPackage ./desktop/librsvg { };
+
+  libgweather = callPackage ./desktop/libgweather { };
+
+  gvfs = callPackage ./desktop/gvfs { };
+
+  libgnomekbd = callPackage ./desktop/libgnomekbd { };
+
+  # Removed from recent GNOME releases, but still required
+  scrollkeeper = callPackage ./desktop/scrollkeeper { };
+
+  # scrollkeeper replacement
+  rarian = callPackage ./desktop/rarian { };
+
+  gnome_doc_utils = callPackage ./desktop/gnome-doc-utils { };
+
+  zenity = callPackage ./desktop/zenity { };
+
+  metacity = callPackage ./desktop/metacity { };
+
+  gnome_menus = callPackage ./desktop/gnome-menus { };
+
+  gnome_desktop = callPackage ./desktop/gnome-desktop { };
+
+  gnome_panel = callPackage ./desktop/gnome-panel { };
+
+  gnome_session = callPackage ./desktop/gnome-session { };
+
+  gnome_settings_daemon = callPackage ./desktop/gnome-settings-daemon { };
+
+  gnome_control_center = callPackage ./desktop/gnome-control-center { };
+
+  gtksourceview = callPackage ./desktop/gtksourceview { };
+
+  nautilus = callPackage ./desktop/nautilus { };
+
+  gnome_icon_theme = callPackage ./desktop/gnome-icon-theme { };
+
+  vte = callPackage ./desktop/vte { };
+
+#### BINDINGS
+
+  libglademm = callPackage ./bindings/libglademm { };
+
+}
diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
similarity index 88%
rename from pkgs/desktops/gnome-2.28/desktop/gnome-control-center/default.nix
rename to pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
index 4ebbd20d229..7d7e6cb6aec 100644
--- a/pkgs/desktops/gnome-2.28/desktop/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, libxklavier, hal, cairo, popt, which, python
+{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2Python, libxslt, libxklavier, hal, cairo, popt, which, python
 , shared_mime_info, desktop_file_utils, libunique, libtool, bzip2
 , glib, gtk, pango, atk, gnome_doc_utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd
 , librsvg, gnome_menus, gnome_desktop, gnome_panel, metacity, gnome_settings_daemon
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     url = mirror://gnome/sources/gnome-control-center/2.28/gnome-control-center-2.28.0.tar.bz2;
     sha256 = "0m0z7dn5qzl63cpc8ivagm4yfsfgigfawl5v3df3pw3z4jk2bsfp";
   };
-  buildInputs = [ pkgconfig dbus_glib libxml2 libxslt libxklavier hal popt which python shared_mime_info desktop_file_utils
+  buildInputs = [ pkgconfig dbus_glib libxml2Python libxslt libxklavier hal popt which python shared_mime_info desktop_file_utils
                   gtk gnome_doc_utils intltool GConf libglade libgnomekbd libunique libtool bzip2 
                   libgnomeui librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon ];
   configureFlags = "--disable-scrollkeeper";
diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-desktop/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix
similarity index 70%
rename from pkgs/desktops/gnome-2.28/desktop/gnome-desktop/default.nix
rename to pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix
index e048488bff8..8c011ad2769 100644
--- a/pkgs/desktops/gnome-2.28/desktop/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, python, libxml2, libxslt, which, libX11, gtk
+{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gtk
 , intltool, GConf, gnome_doc_utils}:
 
 stdenv.mkDerivation {
@@ -8,6 +8,6 @@ stdenv.mkDerivation {
     sha256 = "1raag5c74pyy0f1i37fjxyxcnk9ck4mh6c1hcdmv5dv40xndwvwp";
   };
   configureFlags = "--disable-scrollkeeper";
-  buildInputs = [ pkgconfig python libxml2 libxslt which libX11 gtk
+  buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 gtk
                   intltool GConf gnome_doc_utils ];
 }
diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix
similarity index 74%
rename from pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix
rename to pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix
index c2e49deb009..58d3dfd0a8f 100644
--- a/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, python, pkgconfig, libxml2, libxslt, intltool, scrollkeeper,
+{stdenv, fetchurl, python, pkgconfig, libxml2Python, libxslt, intltool, scrollkeeper,
   makeWrapper}:
 
 stdenv.mkDerivation {
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "1937zr088vn7vhy9rwfc021ih21hhf700c3m4ria8mlcpcvh1380";
   };
   configureFlags = "--disable-scrollkeeper";
-  buildInputs = [ python pkgconfig libxml2 libxslt intltool scrollkeeper 
+  buildInputs = [ python pkgconfig libxml2Python libxslt intltool scrollkeeper 
     makeWrapper ];
   postInstall = ''
     wrapProgram $out/bin/xml2po --prefix PYTHONPATH : $(toPythonPath $out) \
diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/desktop/gnome-icon-theme/default.nix
rename to pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix
similarity index 60%
rename from pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix
rename to pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix
index fdb885bf595..f49cb1c2d1c 100644
--- a/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, hal, python, glib, gtk, intltool, GConf}:
+{stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, gtk, intltool, GConf}:
 
 stdenv.mkDerivation {
   name = "gnome-keyring-2.28.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "1d6av3cq32ypq9f9mv7f9bcqkkdqgbvbb831kad62smczvqk8chv";
   };
   
-  buildInputs = [ pkgconfig dbus.libs libgcrypt pam hal python gtk intltool GConf ];
+  buildInputs = [ pkgconfig dbus.libs libgcrypt pam python gtk intltool GConf ];
 
   propagatedBuildInputs = [ glib libtasn1 ];
 }
diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-menus/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/desktop/gnome-menus/default.nix
rename to pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix
similarity index 92%
rename from pkgs/desktops/gnome-2.28/desktop/gnome-panel/default.nix
rename to pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix
index 48b2ca2f8ef..774b1ff508b 100644
--- a/pkgs/desktops/gnome-2.28/desktop/gnome-panel/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, dbus_glib, dbus, cairo, popt, which, libxml2, libxslt, bzip2, python
+{ stdenv, fetchurl, pkgconfig, dbus_glib, dbus, cairo, popt, which, libxml2Python, libxslt, bzip2, python
 , glib, gtk, pango, atk, libXau
 , intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome_desktop
 , libwnck, librsvg, libgweather, gnome_doc_utils, libgnomecanvas, libart_lgpl, libtasn1}:
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     url = mirror://gnome/sources/gnome-panel/2.28/gnome-panel-2.28.0.tar.bz2;
     sha256 = "0rc4f6vmyrm3s8ncbll0a1ik2j1gg068fq3xal120sc4iw68q5n1";
   };
-  buildInputs = [ pkgconfig gtk dbus_glib popt which libxml2 libxslt bzip2 python libXau
+  buildInputs = [ pkgconfig gtk dbus_glib popt which libxml2Python libxslt bzip2 python libXau
                   intltool ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf gnome_menus gnome_desktop 
 		  libwnck librsvg libgweather gnome_doc_utils libtasn1 ];
   configureFlags = "--disable-scrollkeeper";
diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-session/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/desktop/gnome-session/default.nix
rename to pkgs/desktops/gnome-2/desktop/gnome-session/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/desktop/gnome-settings-daemon/default.nix
rename to pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
similarity index 71%
rename from pkgs/desktops/gnome-2.28/desktop/gtksourceview/default.nix
rename to pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
index 64dbd8e1a6f..aa1080012d5 100644
--- a/pkgs/desktops/gnome-2.28/desktop/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk, pango, 
-  libxml2, perl, intltool, gettext}:
+  libxml2Python, perl, intltool, gettext}:
 
 stdenv.mkDerivation {
   name = "gtksourceview-2.9.9";
@@ -7,6 +7,6 @@ stdenv.mkDerivation {
     url = mirror://gnome/sources/gtksourceview/2.9/gtksourceview-2.9.9.tar.bz2;
     sha256 = "0d0i586nj8jsqqfcjcvaj0yzc3sid3s1a4y62xr0qbddkbn1wllj";
   };
-  buildInputs = [pkgconfig atk cairo glib gtk pango libxml2 perl intltool
+  buildInputs = [pkgconfig atk cairo glib gtk pango libxml2Python perl intltool
     gettext];
 }
diff --git a/pkgs/desktops/gnome-2.28/desktop/gvfs/builder.sh b/pkgs/desktops/gnome-2/desktop/gvfs/builder.sh
similarity index 100%
rename from pkgs/desktops/gnome-2.28/desktop/gvfs/builder.sh
rename to pkgs/desktops/gnome-2/desktop/gvfs/builder.sh
diff --git a/pkgs/desktops/gnome-2.28/desktop/gvfs/default.nix b/pkgs/desktops/gnome-2/desktop/gvfs/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/desktop/gvfs/default.nix
rename to pkgs/desktops/gnome-2/desktop/gvfs/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/libcroco/default.nix b/pkgs/desktops/gnome-2/desktop/libcroco/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/desktop/libcroco/default.nix
rename to pkgs/desktops/gnome-2/desktop/libcroco/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/libgnomekbd/default.nix b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/desktop/libgnomekbd/default.nix
rename to pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix
rename to pkgs/desktops/gnome-2/desktop/libgweather/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/librsvg/default.nix b/pkgs/desktops/gnome-2/desktop/librsvg/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/desktop/librsvg/default.nix
rename to pkgs/desktops/gnome-2/desktop/librsvg/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/libsoup/default.nix b/pkgs/desktops/gnome-2/desktop/libsoup/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/desktop/libsoup/default.nix
rename to pkgs/desktops/gnome-2/desktop/libsoup/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/libwnck/default.nix b/pkgs/desktops/gnome-2/desktop/libwnck/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/desktop/libwnck/default.nix
rename to pkgs/desktops/gnome-2/desktop/libwnck/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/metacity/default.nix b/pkgs/desktops/gnome-2/desktop/metacity/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/desktop/metacity/default.nix
rename to pkgs/desktops/gnome-2/desktop/metacity/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/nautilus/default.nix b/pkgs/desktops/gnome-2/desktop/nautilus/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/desktop/nautilus/default.nix
rename to pkgs/desktops/gnome-2/desktop/nautilus/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/rarian/default.nix b/pkgs/desktops/gnome-2/desktop/rarian/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/desktop/rarian/default.nix
rename to pkgs/desktops/gnome-2/desktop/rarian/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/desktop/scrollkeeper/default.nix
rename to pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/desktop/vte/default.nix
rename to pkgs/desktops/gnome-2/desktop/vte/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/desktop/zenity/default.nix
rename to pkgs/desktops/gnome-2/desktop/zenity/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/platform/GConf/default.nix
rename to pkgs/desktops/gnome-2/platform/GConf/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
new file mode 100644
index 00000000000..e58dd38e369
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
@@ -0,0 +1,14 @@
+{stdenv, fetchurl_gnome, pkgconfig, glib, libIDL}:
+
+stdenv.mkDerivation rec {
+  name = src.pkgname;
+  
+  src = fetchurl_gnome {
+    project = "ORBit2";
+    major = "2"; minor = "14"; patchlevel = "19";
+    sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam";
+  };
+
+  buildNativeInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ glib libIDL ];
+}
diff --git a/pkgs/desktops/gnome-2.28/platform/at-spi/default.nix b/pkgs/desktops/gnome-2/platform/at-spi/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/platform/at-spi/default.nix
rename to pkgs/desktops/gnome-2/platform/at-spi/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/audiofile/default.nix b/pkgs/desktops/gnome-2/platform/audiofile/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/platform/audiofile/default.nix
rename to pkgs/desktops/gnome-2/platform/audiofile/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/esound/default.nix b/pkgs/desktops/gnome-2/platform/esound/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/platform/esound/default.nix
rename to pkgs/desktops/gnome-2/platform/esound/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix b/pkgs/desktops/gnome-2/platform/glib-networking/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix
rename to pkgs/desktops/gnome-2/platform/glib-networking/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
new file mode 100644
index 00000000000..548783abf79
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
@@ -0,0 +1,11 @@
+{ stdenv, fetchurl_gnome }:
+
+stdenv.mkDerivation rec {
+  name = src.pkgname;
+
+  src = fetchurl_gnome {
+    project = "gnome-common";
+    major = "2"; minor = "34"; patchlevel = "0";
+    sha256 = "1pz13mpp09q5s3bikm8ml92s1g0scihsm4iipqv1ql3mp6d4z73s";
+  };
+}
diff --git a/pkgs/desktops/gnome-2.28/platform/gnome-mime-data/default.nix b/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/platform/gnome-mime-data/default.nix
rename to pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/gnome-vfs-monikers/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/platform/gnome-vfs-monikers/default.nix
rename to pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
new file mode 100644
index 00000000000..c141da4324d
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl_gnome, pkgconfig, libxml2, bzip2, openssl, samba, dbus_glib
+, glib, fam, hal, cdparanoia, intltool, GConf, gnome_mime_data}:
+
+stdenv.mkDerivation rec {
+  name = src.pkgname;
+
+  src = fetchurl_gnome {
+    project = "gnome-vfs";
+    major = "2"; minor = "24"; patchlevel = "4";
+    sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2";
+  };
+
+  buildInputs =
+    [ pkgconfig libxml2 bzip2 openssl samba dbus_glib fam cdparanoia
+      intltool gnome_mime_data
+    ]
+    ++ (if stdenv.isLinux then [hal] else []);
+
+  propagatedBuildInputs = [ GConf glib ];
+}
diff --git a/pkgs/desktops/gnome-2.28/platform/gtk-doc/default.nix b/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/platform/gtk-doc/default.nix
rename to pkgs/desktops/gnome-2/platform/gtk-doc/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/platform/gtkglext/default.nix
rename to pkgs/desktops/gnome-2/platform/gtkglext/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/gtkhtml/01_remove-disable-deprecated.patch b/pkgs/desktops/gnome-2/platform/gtkhtml/01_remove-disable-deprecated.patch
similarity index 100%
rename from pkgs/desktops/gnome-2.28/platform/gtkhtml/01_remove-disable-deprecated.patch
rename to pkgs/desktops/gnome-2/platform/gtkhtml/01_remove-disable-deprecated.patch
diff --git a/pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix
rename to pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/intltool/default.nix b/pkgs/desktops/gnome-2/platform/intltool/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/platform/intltool/default.nix
rename to pkgs/desktops/gnome-2/platform/intltool/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/libIDL/default.nix b/pkgs/desktops/gnome-2/platform/libIDL/default.nix
new file mode 100644
index 00000000000..5783976d9a2
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/libIDL/default.nix
@@ -0,0 +1,15 @@
+{stdenv, fetchurl_gnome, flex, bison, pkgconfig, glib, gettext}:
+
+stdenv.mkDerivation rec {
+  name = src.pkgname;
+
+  src = fetchurl_gnome {
+    project = "libIDL";
+    major = "0"; minor = "8"; patchlevel = "14";
+    sha256 = "08129my8s9fbrk0vqvnmx6ph4nid744g5vbwphzkaik51664vln5";
+  };
+
+  buildInputs = [ glib gettext ];
+
+  buildNativeInputs = [ flex bison pkgconfig ];
+}
diff --git a/pkgs/desktops/gnome-2.28/platform/libart_lgpl/default.nix b/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/platform/libart_lgpl/default.nix
rename to pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
new file mode 100644
index 00000000000..bd268e5ec43
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl_gnome, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt
+, intltool, ORBit2, procps }:
+
+stdenv.mkDerivation rec {
+  name = src.pkgname;
+  
+  src = fetchurl_gnome {
+    project = "libbonobo";
+    major = "2"; minor = "32"; patchlevel = "1";
+    sha256 = "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i";
+  };
+
+  preConfigure = "export USER=`whoami`";
+  buildNativeInputs = [ flex bison pkgconfig intltool procps ];
+  buildInputs = [ libxml2 ];
+  propagatedBuildInputs = [ popt glib ORBit2 ];
+}
diff --git a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
new file mode 100644
index 00000000000..6eefd42b38d
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl_gnome, bison, pkgconfig, popt, libxml2, gtk, libtool
+, intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }:
+
+stdenv.mkDerivation rec {
+  name = src.pkgname;
+  
+  src = fetchurl_gnome {
+    project = "libbonoboui";
+    major = "2"; minor = "24"; patchlevel = "5";
+    sha256 = "1kbgqh7bw0fdx4f1a1aqwpff7gp5mwhbaz60c6c98bc4djng5dgs";
+  };
+
+  buildNativeInputs = [ pkgconfig intltool ];
+  buildInputs = [ bison popt gtk libxml2 GConf libglade libtool ];
+  propagatedBuildInputs = [ libbonobo libgnomecanvas libgnome ];
+}
diff --git a/pkgs/desktops/gnome-2.28/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/platform/libglade/default.nix
rename to pkgs/desktops/gnome-2/platform/libglade/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
new file mode 100644
index 00000000000..76f213b5fa8
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl_gnome, pkgconfig, glib, popt, zlib, libcanberra
+, intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool}:
+
+stdenv.mkDerivation rec {
+  name = src.pkgname;
+  
+  src = fetchurl_gnome {
+    project = "libgnome";
+    major = "2"; minor = "32"; patchlevel = "1";
+    sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj";
+  };
+  
+  buildNativeInputs = [ pkgconfig ];
+  buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra libtool ];
+  propagatedBuildInputs = [ glib libbonobo ];
+}
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
new file mode 100644
index 00000000000..bf2c0360aa2
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchurl_gnome, pkgconfig, gtk, intltool, libart_lgpl, libglade }:
+
+stdenv.mkDerivation rec {
+  name = src.pkgname;
+  
+  src = fetchurl_gnome {
+    project = "libgnomecanvas";
+    major = "2"; minor = "30"; patchlevel = "3";
+    sha256 = "0h6xvswbqspdifnyh5pm2pqq55yp3kn6yrswq7ay9z49hkh7i6w5";
+  };
+  
+  buildInputs = [ libglade ];
+  buildNativeInputs = [ pkgconfig intltool ];
+  propagatedBuildInputs = [ libart_lgpl gtk ];
+}
diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomecanvasmm/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/platform/libgnomecanvasmm/default.nix
rename to pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix
rename to pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix
rename to pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/platform/libgnomeprintui/default.nix
rename to pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
new file mode 100644
index 00000000000..04bac7f4164
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl_gnome, pkgconfig, libxml2, xlibs, glib, pango
+, intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool
+, gnome_vfs, gnome_keyring, libglade }:
+
+stdenv.mkDerivation rec {
+  name = src.pkgname;
+  
+  src = fetchurl_gnome {
+    project = "libgnomeui";
+    major = "2"; minor = "24"; patchlevel = "5";
+    sha256 = "03rwbli76crkjl6gp422wrc9lqpl174k56cp9i96b7l8jlj2yddf";
+  };
+  
+  buildNativeInputs = [ pkgconfig intltool ];
+  buildInputs =
+    [ xlibs.xlibs libxml2 GConf pango glib gnome_keyring libglade libtool ];
+
+  propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ];
+}
diff --git a/pkgs/desktops/gnome-2.28/platform/libgtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/platform/libgtkhtml/default.nix
rename to pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
diff --git a/pkgs/desktops/gnome-2/platform/libunique/default.nix b/pkgs/desktops/gnome-2/platform/libunique/default.nix
new file mode 100644
index 00000000000..2661307c9d2
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/libunique/default.nix
@@ -0,0 +1,14 @@
+{stdenv, fetchurl_gnome, pkgconfig, gtk}:
+
+stdenv.mkDerivation rec {
+  name = src.pkgname;
+
+  src = fetchurl_gnome {
+    project = "libunique";
+    major = "1"; minor = "1"; patchlevel = "6";
+    sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75";
+  };
+
+  buildNativeInputs = [ pkgconfig ];
+  buildInputs = [ gtk ];
+}
diff --git a/pkgs/desktops/gnome-2.28/platform/startup-notification/default.nix b/pkgs/desktops/gnome-2/platform/startup-notification/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2.28/platform/startup-notification/default.nix
rename to pkgs/desktops/gnome-2/platform/startup-notification/default.nix
diff --git a/pkgs/desktops/gnome-3/TODO.txt b/pkgs/desktops/gnome-3/TODO.txt
new file mode 100644
index 00000000000..eaffb5d3092
--- /dev/null
+++ b/pkgs/desktops/gnome-3/TODO.txt
@@ -0,0 +1,106 @@
+## CORE
+core:NetworkManager:0.9.1.90:
+core:brasero:3.2.0:
+core:cantarell-fonts:0.0.6:
+core:caribou:0.4.0:
+core:clutter:1.8.0:
+core:clutter-gtk:1.0.4:
+core:cogl:1.8.0:
+core:dconf:0.10.0:
+core:empathy:3.2.0:
+core:eog:3.2.0:
+core:epiphany:3.2.0:
+core:evince:3.2.0:
+core:evolution-data-server:3.2.0:
+core:folks:0.6.3.2:
+core:gcalctool:6.2.0:
+core:gdm:3.2.0:
+core:gjs:1.30.0:
+core:glib-networking:2.30.0:
+core:gnome-backgrounds:3.2.0:
+core:gnome-bluetooth:3.2.0:
+core:gnome-contacts:3.2.0.1:
+core:gnome-control-center:3.2.0:
+core:gnome-desktop:3.2.0:
+core:gnome-disk-utility:3.0.2:
+core:gnome-doc-utils:0.20.6:
+core:gnome-icon-theme:3.2.0:
+core:gnome-icon-theme-extras:3.0.0:
+core:gnome-icon-theme-symbolic:3.2.0:
+core:gnome-keyring:3.2.0:
+core:gnome-menus:3.2.0:
+core:gnome-online-accounts:3.2.0.1:
+core:gnome-packagekit:3.2.0:
+core:gnome-panel:3.2.0:
+core:gnome-power-manager:3.2.0:
+core:gnome-screensaver:3.2.0:
+core:gnome-session:3.2.0:
+core:gnome-settings-daemon:3.2.0:
+core:gnome-shell:3.2.0:
+core:gnome-system-monitor:3.2.0:
+core:gnome-terminal:3.2.0:
+core:gnome-themes-standard:3.2.0.2:
+core:gnome-user-docs:3.2.0.1:
+core:gnome-user-share:3.0.0:
+core:gnome-utils:3.2.0:
+core:gnome-video-effects:0.3.0:
+core:gobject-introspection:1.30.0:
+core:gsettings-desktop-schemas:3.2.0:
+core:gst-plugins-base:0.10.35:
+core:gst-plugins-good:0.10.30:
+core:gstreamer:0.10.35:
+core:gtk+:2.24.6:
+core:gtk-doc:1.18:
+core:gtkmm:3.2.0:
+core:gucharmap:3.2.0:
+core:gvfs:1.10.0:
+core:libgnome-keyring:3.2.0:
+core:libgnomekbd:3.2.0:
+core:libgtop:2.28.4:
+core:libgweather:3.2.0:
+core:libpeas:1.2.0:
+core:librsvg:2.34.1:
+core:libsoup:2.36.0:
+core:libwnck:3.2.0:
+core:metacity:2.34.1:
+core:mm-common:0.9.5:
+core:mousetweaks:3.2.0:
+core:mutter:3.2.0:
+core:nautilus:3.2.0:
+core:network-manager-applet:0.9.1.90:
+core:notification-daemon:0.7.2:
+core:pangomm:2.28.3:
+core:polkit-gnome:0.103:
+core:sushi:0.2.0:
+core:totem-pl-parser:2.32.6:
+core:vino:3.2.0:
+core:vte:0.30.0:
+core:yelp:3.2.0:
+core:yelp-tools:3.2.0:
+core:yelp-xsl:3.2.0:
+core:zenity:3.2.0:
+
+## APPS
+apps:accerciser:3.2.0:
+apps:aisleriot:3.2.0:
+apps:anjuta:3.2.0:
+apps:cheese:3.2.0:
+apps:devhelp:3.2.0:
+apps:evolution:3.2.0:
+apps:file-roller:3.2.0:
+apps:gedit:3.2.0:
+apps:glade:3.10.0:
+apps:gnome-color-manager:3.2.0:
+apps:gnome-devel-docs:3.2.0:
+apps:gnome-documents:0.2.0:
+apps:gnome-games:3.2.0:
+apps:gnome-nettool:3.0.0:
+apps:hamster-applet:2.91.2:
+apps:nautilus-sendto:3.0.1:
+apps:nemiver:0.9.0:
+apps:orca:3.2.0:
+apps:rygel:0.12.3:
+apps:seahorse:3.2.0:
+apps:totem:3.2.0:
+apps:vinagre:3.2.0:
+
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
new file mode 100644
index 00000000000..b82ca22d94f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -0,0 +1,8 @@
+{ callPackage }:
+
+{
+  # Ensure that we use dbus-glib built with gtkLibs3x.glib
+  dbus_glib = callPackage ../../development/libraries/dbus-glib { };
+
+  GConf = callPackage ./platform/GConf.nix { };
+}
diff --git a/pkgs/desktops/gnome-3/platform/GConf.nix b/pkgs/desktops/gnome-3/platform/GConf.nix
new file mode 100644
index 00000000000..824aa8843a7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/platform/GConf.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl_gnome, glib, dbus_glib, pkgconfig, xz, libxml2, gtk, intltool }:
+
+stdenv.mkDerivation rec {
+  name = src.pkgname;
+
+  src = fetchurl_gnome {
+    project = "GConf";
+    major = "3"; minor = "2"; patchlevel = "0"; extension = "xz";
+    sha256 = "02vdm6slc2mdw0yfl6lh7qawqcb2k7sk6br21fdj1vfp55ap8wgk";
+  };
+
+  propagatedBuildInputs = [ glib dbus_glib libxml2 gtk ];
+  buildNativeInputs = [ pkgconfig xz intltool ];
+
+  configureFlags = "--disable-orbit";
+}
diff --git a/pkgs/desktops/kde-3/kdebase/default.nix b/pkgs/desktops/kde-3/kdebase/default.nix
deleted file mode 100644
index 6a6a1ea4a1e..00000000000
--- a/pkgs/desktops/kde-3/kdebase/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, x11, xlibs, zlib, libpng, libjpeg, perl
-, qt, kdelibs, openssl, bzip2, fontconfig, pam, hal, dbus, glib
-}:
-
-# Note: the glib dependency is needed for nspluginviewer.
-
-let version = "3.5.10"; in
-
-stdenv.mkDerivation {
-  name = "kdebase-${version}";
-  
-  src = fetchurl {
-    url = "mirror://kde/stable/${version}/src/kdebase-${version}.tar.bz2";
-    sha256 = "0qbbw78b725kf35p5jx11zq0246zm15pyyhmlpkz4cn5527rvakp";
-  };
-
-  buildInputs = [
-    pkgconfig x11 zlib libpng libjpeg perl qt kdelibs openssl bzip2
-    fontconfig pam hal dbus glib
-    xlibs.libXrandr xlibs.libXinerama xlibs.libXau xlibs.libXdmcp
-    xlibs.libXcursor xlibs.libfontenc xlibs.imake xlibs.bdftopcf
-    xlibs.libxkbfile xlibs.xf86miscproto xlibs.libXxf86misc
-    xlibs.scrnsaverproto xlibs.libXScrnSaver
-    xlibs.libXcomposite xlibs.libXfixes
-  ];
-
-  configureFlags = ''
-    --without-arts 
-    --with-ssl-dir=${openssl}
-    --with-extra-includes=${libjpeg}/include
-  '';
-
-  # Prevent configure from looking for pkg-config and freetype-config
-  # in the wrong location (it looks in /usr/bin etc. *before* looking
-  # in $PATH).
-  preConfigure = ''
-    substituteInPlace configure \
-      --replace /usr/bin /no-such-path \
-      --replace /usr/local/bin /no-such-path \
-      --replace /opt/local/bin /no-such-path
-  '';
-
-  # Quick hack to work around a faulty dependency in
-  # konqueror/keditbookmarks/Makefile.am (${includedir} should be
-  # ${kdelibs} or so).
-  preBuild = ''
-    ensureDir $out/include
-    ln -s ${kdelibs}/include/kbookmarknotifier.h $out/include/
-  '';
-  
-  postInstall = "rm $out/include/kbookmarknotifier.h";
-
-  # Work around some inexplicable build failure starting in kdebase 3.5.9.
-  LDFLAGS = "-L${kdelibs}/lib";
-
-  meta.platforms = stdenv.lib.platforms.linux;
-}
diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 0e2377f2535..3bdf825410c 100644
--- 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.1";
+  release = "4.7.4";
 
   # Need callPackageOrig to avoid infinite cycle
   kde = callPackageOrig ./kde-package {
diff --git a/pkgs/desktops/kde-4.7/kde-package/4.7.1.nix b/pkgs/desktops/kde-4.7/kde-package/4.7.1.nix
deleted file mode 100644
index 43de59d7a2e..00000000000
--- a/pkgs/desktops/kde-4.7/kde-package/4.7.1.nix
+++ /dev/null
@@ -1,273 +0,0 @@
-{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;}
-];
-}
diff --git a/pkgs/desktops/kde-4.7/kde-package/4.7.4.nix b/pkgs/desktops/kde-4.7/kde-package/4.7.4.nix
new file mode 100644
index 00000000000..9a816b72cc6
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/kde-package/4.7.4.nix
@@ -0,0 +1,273 @@
+{stable=true;
+hashes=builtins.listToAttrs[
+  {name="blinken";value="16daqg0bbkci305qrcrvpv66cvshjfni5rf5gakblcn8qqlmwsi6";}
+  {name="cantor";value="0wgm0j9bl632bk94fi0hzp5s392xpyz0d524ahhi8q33bqkl06ra";}
+  {name="gwenview";value="1dhpb7q0myr9rl4bjsajq0kslvhxcddv1ddplqad63j619wk8gfj";}
+  {name="kalgebra";value="04g07syrk14kpr15f9kgfkkmkjgdvcwmrykmy56jwm8sfb6ncli9";}
+  {name="kalzium";value="0k25cinwp6yjp8q9irmwcb1ahf98ck3mw706jfpybpa7ds8ym5z1";}
+  {name="kamera";value="0airyhxzpnvpzag4w0q1h0pc1lwwplglki5max1mj5miaxg93r34";}
+  {name="kanagram";value="0271aq39dbs92rhc83m19pmm7rx5c573k27931sf3j3pw3x2q0nm";}
+  {name="kate";value="0pfddi7g99apqipnqv62i86ld11vl4igqv65xprqqf0a5a1413my";}
+  {name="kbruch";value="1dhhk55d3bs474l2w0xma89pq74gklq5faskrvd1lvvl853z3zib";}
+  {name="kcolorchooser";value="1gb861f1fy0fvmkg30l1gza998gyhjwj4gcyyv266wp5v7d01xda";}
+  {name="kdeaccessibility";value="12mvs1hy5ygnbbz14hg2fvs7mpvlamkfbz7g7kcvzp0fkjb524h3";}
+  {name="kdeadmin";value="16y73zpdgh72cf8yz8zn246i4d8nh4k6mbz9cbc4ggjblgjcn3pr";}
+  {name="kdeartwork";value="0vfz9mzpm8yy6fysmhcavd8l1fjcld36p0x9qymi4l072b7dkgyv";}
+  {name="kde-baseapps";value="075m3nn407di2mx8w5lv7va3ij0yd7yb575wmf05vfqr01xyhn8a";}
+  {name="kdegames";value="0c42wyk2mq3hz99zg4f9i2dbc9vyaa5l2301j0859pwvnp9zgafz";}
+  {name="kdegraphics-strigi-analyzer";value="1j7chf76mlwrq7z1dgm525f5srx1h30czm8dnw2f0yxfn18lvnl9";}
+  {name="kdegraphics-thumbnailers";value="1ny51jc8fm4gldrlmrfmslpfpn5pahlyws3jzaj6nkd3hdw3krnr";}
+  {name="kdelibs";value="0fdgl8qvpyb9pmb26b3yjfm9ib75mxayw75qm5kyzncmrvn427gy";}
+  {name="kdemultimedia";value="0a0vp1pq159lzgd0x817p9mf6al99w1dwnlyhs9zfpspgz8nw8y1";}
+  {name="kdenetwork";value="0zwqbyl5vw5nnzlilc4khlisjj1xjpziw9ahgvw8cbszscmv68b5";}
+  {name="kdepim";value="0s38qxks58dmwyi3fnvprpq5q9kr17v31n808j33d50rw62y398p";}
+  {name="kdepimlibs";value="0rpfkc0pxvfkaz8pb3yx21dm3ixw8gfrcdny1aqzbn3f7f8abhip";}
+  {name="kdepim-runtime";value="14p5bxrhqjnmz303hxlrdj4vxlmiv8j04qni33ljbgib0hnllva3";}
+  {name="kdeplasma-addons";value="068m2jpyprrscyk3f4nk9qix5smka5pq59sdwdan9996sh256py5";}
+  {name="kde-runtime";value="06nxv46s7ff5n3kmzq3mdc16b0ck0411lj0gf3scdyd85iqx06wd";}
+  {name="kdesdk";value="0v3gwml9rvqz96q8jk8myqvl6gjw3q37js2jn24yawli3sjjw552";}
+  {name="kdetoys";value="17fk1bmabgj9nz0m4j248f48m2xfscql43wmzkqnr7y6zghqfhfh";}
+  {name="kdeutils";value="0s1whgg59xnc6ny609s3vjzvpxak02f2y6v7zw72i808k03aal5v";}
+  {name="kde-wallpapers";value="133amrhhca4xi0gbmajcc6rw1c1ai5x29265fqp45588kyycbgvz";}
+  {name="kdewebdev";value="1nqp2j09nr3jhmfvjydwp86jz4nn5pxwcfi6ww9krfd1hyg4aqjc";}
+  {name="kde-workspace";value="1dj39nndpws9grinz287ypn5lj3zjh96gl4zhl7kp6z8f9mdqp0p";}
+  {name="kgamma";value="05vk5b40w0i75nx5lqn9qax10m604jkjxyxynm0i0b8gyksv78h9";}
+  {name="kgeography";value="1a49zqz8zb9kn7m4m5fsm5ibvn9m5pzq89isrd1yy9q7zlv3qfqc";}
+  {name="khangman";value="1bmzrc5jzbw9q9gxw9pzad37zj4h89rh3k4smycif6ky2jy72x6d";}
+  {name="kig";value="1s0mwnj2riam811l0nfk08ja43f0nibqaqchy2ff7627w22yr5m0";}
+  {name="kimono";value="1cbbchdj4x5sn6ldkmzrx5alhvgzgbprvyjpg1rcsfnyc6whp2p9";}
+  {name="kiten";value="13bcw1r39h0g75vwbyrsh8sb27vmqsbrmx2ay621ily4iy3jn5az";}
+  {name="klettres";value="1wczh41wq3w5ccy2yi4pqr3zk4v0wiy4slcn54a8bfi1b5s1267j";}
+  {name="kmplot";value="0dx5gnya008q7smf74fvygwfsa0hc2ajiznvdmf4qmm3s5bxpbrr";}
+  {name="kolourpaint";value="14zrh321av5f5i8a4bjj7xb1sqfcphzhc5qyg2w54cywaiswy8nx";}
+  {name="konsole";value="1wq2k8g6in86x72jzhz4ar8ba5lyjp0pia969wxa6b1vsj148ipy";}
+  {name="korundum";value="024daf05c9l83whcy0cfgxb3s24ci038kg1pnxlzz4z9sk39432r";}
+  {name="kross-interpreters";value="1kkg4w3id2g7nr89kjdgyy9hik75dnxlm6jmn3g8ilqdvw5ip1qx";}
+  {name="kruler";value="0wd805w2k1ask9l44z50jcd033zkbaxs3xd3w21qrwdvs52x8m41";}
+  {name="ksaneplugin";value="1rxpl6f5b0ld5ap6aag892rjd7r74szbzd6lqw8q8gzm6jmk34gq";}
+  {name="ksnapshot";value="0dn99b6qr4b4hc3c88m26axmb3jim836ig3mfgqpban9r7k15xci";}
+  {name="kstars";value="0zrw4rlfm5cwfbj884zn50sdp90zjg7inl9k2zj450dpvh7i6q3q";}
+  {name="ktouch";value="0vbzr69jbci058bcphf9i3fh40hwgrmcyj1n4gj90gwr4x2ha5hp";}
+  {name="kturtle";value="0mhg2b1jbywafnj93274yimvnaxivycqj98pvld3hppaq32f7vzp";}
+  {name="kwordquiz";value="0kfa83a91w8z39r55456i1vn85pb4dqrbav40sx5fhjb03iyrsdk";}
+  {name="libkdcraw";value="14y8ni9w441zx1k2fhcbnzpa1vcmpvk58mjdqrqvn8n630cy0hzn";}
+  {name="libkdeedu";value="1ga88g5s8mq1m8xwmhl09ylrnl8sw639cpah6wi8wwnqslj2zj0a";}
+  {name="libkexiv2";value="0w8mpjsiw2sr8ya7ffnvnprbsbi8ngpxrcxylgw617zcxpxky6ha";}
+  {name="libkipi";value="01fivyyg5jhnkn9r7bh96ygxvnh7a99h11wh228wk8nzx3i63lsc";}
+  {name="libksane";value="0bb26ajfmknxf4hdy513zx1q9j0hzrs0dr98vxmrwfxxbza67fbm";}
+  {name="marble";value="02yljp6lmqs753zkqpaz58zlrjjxydx9pizppzwjvjx8xk63b9z6";}
+  {name="mobipocket";value="0m08j4cdj2sr1xw3hi0zy651c2ap0q8y9s913r6ccm0f292n0856";}
+  {name="okular";value="03x1fgdnz0s17wj3pkdp77rqrbbb6ssgq0ly493pbi1x4lx768ib";}
+  {name="oxygen-icons";value="0ayx0y2swdcgz4wd1idkhm3gbixkn4mw89f1hrhrdvc6j7wdn2dj";}
+  {name="parley";value="0wgps4adiwaq3l471ig9j56vm7p2xf37779nlhfzavby622lyv8q";}
+  {name="perlkde";value="1psa8ca2ynmavhmbh5p8bgxiljiqj6figi3cmvkaa7ksnmg2p9a3";}
+  {name="perlqt";value="1v12vx46kmg9cgld7krphcqp97y0py1bc3s2gd6jbz5j48g1wznb";}
+  {name="pykde4";value="07c7rzi0rzafrh92m57ldz3v66v8996zqpgcqn351jfycwccg7pz";}
+  {name="qtruby";value="05j08dfqbqnj92k9n70x8yiiaxyk6p9sk3lwm8w8nhsxdciq8yny";}
+  {name="qyoto";value="1maq0c6qb618jiqrdfp4imq3x7x5rdgf80wbrsf8wmaz3iwg18jz";}
+  {name="rocs";value="0qqzfxas64jz95v8i0birbcp0azk01jx5ic6pny7szngwrms6k34";}
+  {name="smokegen";value="0rdaxss113l80gmzp71ngp1l07nn2ip5nhk0a3mmjkvd08i507i8";}
+  {name="smokekde";value="0cxd5y1i672wc295m2czvp5jry1lmvv88dkipd97368gxsqzd3q8";}
+  {name="smokeqt";value="0ll1q87y1sdmna4iac61cm6sn7imsfvcfq573cj7f5raqn08gbpf";}
+  {name="step";value="000a0hc45znshwrjsydrf05f5rwn7lmaiqbk65py827fgk67qkyb";}
+  {name="svgpart";value="056h2ynbl6ylfpf5a2l0qjasnicwx2yzizgd21pprzl9n7708zcw";}
+];
+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;}
+];
+}
diff --git a/pkgs/desktops/kde-4.7/kde-package/default.nix b/pkgs/desktops/kde-4.7/kde-package/default.nix
index f725c2f7bb1..38713de5820 100644
--- a/pkgs/desktops/kde-4.7/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.7/kde-package/default.nix
@@ -33,7 +33,8 @@ rec {
       enableParallelBuilding = true;
     } // (removeAttrs a [ "meta" "name" ]));
 
-  # kdeMonoPkg wrapper for modules splitted upstream. Used in TODO
+  # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs
+  # API.
   kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
 
   # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.bz2
diff --git a/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh
index dbb5970ab64..910394fb6a3 100755
--- a/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh
+++ b/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#! /bin/sh
 
 # Usage: download kde release to $dir, then run
 # $0 $dir
diff --git a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.0.nix b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.0.nix
deleted file mode 100644
index d9eba519942..00000000000
--- a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.0.nix
+++ /dev/null
@@ -1,262 +0,0 @@
-[
-{
-  lang = "ar";
-  saneName = "ar";
-  sha256 = "16533377hxcb6xy92qw74yp2cvyrmi5bjxjh62xbqf7m3967nj56";
-}
-{
-  lang = "bg";
-  saneName = "bg";
-  sha256 = "06i189a8z0z7jv9mi1cvxc1k57gmfsf207m28rg30jhbd4gd5py7";
-}
-{
-  lang = "bs";
-  saneName = "bs";
-  sha256 = "1sqcd5jdl04ax6r615rqs4nlsc4xc1xsvc8cdi5pplwilsys0flm";
-}
-{
-  lang = "ca";
-  saneName = "ca";
-  sha256 = "1ghhl6yxhcjakv41lznhdp1nx9jp7g75g305cz3n26nbpwaz4mkd";
-}
-{
-  lang = "ca@valencia";
-  saneName = "ca_valencia";
-  sha256 = "16sb3kcjc7s02sg9bi3678cdv7hqn3xlpcsa07iwgxdzgh6yp6x0";
-}
-{
-  lang = "cs";
-  saneName = "cs";
-  sha256 = "1g52dbp4jwn67p90jkd209csn3nrc1aznpsay5i9919240wsb4mm";
-}
-{
-  lang = "da";
-  saneName = "da";
-  sha256 = "168hd69gznsarvxbzgs7hjmxjhhxsccwjfgvf328qbcb88n7570w";
-}
-{
-  lang = "de";
-  saneName = "de";
-  sha256 = "07a5f6k22pkps3a0n1ph80f1affmmrlxf1v6ywxdna64si97za43";
-}
-{
-  lang = "el";
-  saneName = "el";
-  sha256 = "1kv1wx91mgsrkscx6jf9sjl2li5n8z39hnbiyl9zy2364ximjb3c";
-}
-{
-  lang = "en_GB";
-  saneName = "en_GB";
-  sha256 = "12y9m2c0kaigi0qdisw7w2dxf40xz3ihqkwk2x2vbivzsd91ai44";
-}
-{
-  lang = "es";
-  saneName = "es";
-  sha256 = "0manicnw3l3kg6qmwq7894cjlwh8091nw6s1w31qvpx7grxznp4w";
-}
-{
-  lang = "et";
-  saneName = "et";
-  sha256 = "06xm411l20qqgfv12wxbz3x6daahwlzpp07n3ifi7jh6wzv1j0nh";
-}
-{
-  lang = "eu";
-  saneName = "eu";
-  sha256 = "08y65gkpq2ziylddzk44d2rp8mprr3bayxsgl4zw8plmyj6p79fs";
-}
-{
-  lang = "fi";
-  saneName = "fi";
-  sha256 = "1xdgnn06psg84a60ssd85855jw93bi787aawyrh7n77q5za8rs83";
-}
-{
-  lang = "fr";
-  saneName = "fr";
-  sha256 = "1l6ljqy5aa6wbvkywi47mvkw28whcdwcdd3hrqy8kyxf064d5lk6";
-}
-{
-  lang = "ga";
-  saneName = "ga";
-  sha256 = "1nnh11hbqvb6gxgfp086algbjiw5j4rs5fxzl74i8935qhjz12pk";
-}
-{
-  lang = "gl";
-  saneName = "gl";
-  sha256 = "0sqgcjrzr422iy9qmyyzhmwah696gkv810xh6hd71yv3416wpnjk";
-}
-{
-  lang = "he";
-  saneName = "he";
-  sha256 = "1hid5izn5g63iaz634x2x7ahylf99ccjms21461lg4w72mb732f9";
-}
-{
-  lang = "hr";
-  saneName = "hr";
-  sha256 = "0kqk28rcdawdxz1h8dph1ik49ag2nxbbq3712fpjylswqa0dh4v3";
-}
-{
-  lang = "hu";
-  saneName = "hu";
-  sha256 = "1gnsvyw412j2k9maac2sflvfnv1mf4lwaqcxrhyb5zfvz7pflfqh";
-}
-{
-  lang = "ia";
-  saneName = "ia";
-  sha256 = "03a89wb03yc57d5nxvawdzvc7qzzcwj5r1gri7p6khjbl6r5gx63";
-}
-{
-  lang = "id";
-  saneName = "id";
-  sha256 = "0r0c7yd3sq4bwqa9l3j8fc7bhdfnr14q1270l2vvn1r4r9y4myb7";
-}
-{
-  lang = "is";
-  saneName = "is";
-  sha256 = "00m3sfrcawqva93w90y29lf747b43pmcgd97n6iii2alk8z1xc6b";
-}
-{
-  lang = "it";
-  saneName = "it";
-  sha256 = "1v6gl0bbml5ddz60sc7dk0pirnjdmpiqhksbyqbmx9d650x5jpm0";
-}
-{
-  lang = "ja";
-  saneName = "ja";
-  sha256 = "0y0nwy805w0x90kfmpkldjllaq5qrs031kl2r2v67n0i2i0g48n3";
-}
-{
-  lang = "kk";
-  saneName = "kk";
-  sha256 = "06fmh05ccbx58vprw4h1f4hqsv2gjkm0y982lajgrwpswc09kdrj";
-}
-{
-  lang = "km";
-  saneName = "km";
-  sha256 = "1l17xj681m29xladp8cb6vbwprvf7l5kj8iignyyziv7sw6v5fs9";
-}
-{
-  lang = "kn";
-  saneName = "kn";
-  sha256 = "0is1yarm4r5dcm424nha7p093rzndsqmkbgrj65q8szf8pdii3pz";
-}
-{
-  lang = "ko";
-  saneName = "ko";
-  sha256 = "1fr2ln91k910qbpkxsqxaf05bdgf2mg4jj4chxygqhwv1ffxj4f0";
-}
-{
-  lang = "lt";
-  saneName = "lt";
-  sha256 = "1m8iawglrznv1qsqsw2sns6fbbv52zs2wzmz793p4n1v67ly4n75";
-}
-{
-  lang = "lv";
-  saneName = "lv";
-  sha256 = "1p89fw17nfd77klr2dkrm98xahxqprq9a1906rl7m7jdrsh44zrd";
-}
-{
-  lang = "nb";
-  saneName = "nb";
-  sha256 = "082cjvczqlvzsgzwdlyqy8qvfdfcvxgj8fy4faxv5iaqdv4hzf1j";
-}
-{
-  lang = "nds";
-  saneName = "nds";
-  sha256 = "0vhg8hkg4iad0g0jmy9qb61z7bnyw9dmpnibwpn1sypq8cy1qgax";
-}
-{
-  lang = "nl";
-  saneName = "nl";
-  sha256 = "1nvkspaycgkx639cmjp0cv81fb8fjqmfw6r7r6fhq4gjyk6awdbl";
-}
-{
-  lang = "nn";
-  saneName = "nn";
-  sha256 = "03y7c4vn9ihz65bylmabcjsjssb9wc4j4nb9slb98dm97cqn015b";
-}
-{
-  lang = "pa";
-  saneName = "pa";
-  sha256 = "0vhf2bb4ii737hmg639s0h7pl38dxrpncvgl6l2lzv2nb3g92ihk";
-}
-{
-  lang = "pl";
-  saneName = "pl";
-  sha256 = "116ii59z71v3wlp9xd5ni3zk140i4s461l1wpqxx2p8lrs6087m6";
-}
-{
-  lang = "pt";
-  saneName = "pt";
-  sha256 = "04mh52cdg63nacs5mydmx244ljq39495bai4zm7viz1b0lkwhfi8";
-}
-{
-  lang = "pt_BR";
-  saneName = "pt_BR";
-  sha256 = "1fqsgxfxmsbadk32kgxskkjvbq4wb06gq26i4h41y3cbanw11r9v";
-}
-{
-  lang = "ro";
-  saneName = "ro";
-  sha256 = "04r6avdjd4pjnq6viprm5252jyqd73wiqc419y72vpxh39rri72k";
-}
-{
-  lang = "ru";
-  saneName = "ru";
-  sha256 = "0gdy3yjczgjigr1pfmwsjscgh9q7mvz11m82axw0989kvq34ryx3";
-}
-{
-  lang = "sk";
-  saneName = "sk";
-  sha256 = "0kgg6a0xy4cnij7g576rsixkn7b0c9l782zxn2brcnqlfqzyh3b7";
-}
-{
-  lang = "sl";
-  saneName = "sl";
-  sha256 = "1yf15mcyi0k9vmrmd0fqz265dsy2xr6fhf1wl3lljb0mqsyf0a8a";
-}
-{
-  lang = "sr";
-  saneName = "sr";
-  sha256 = "1cyw5kkpwq7yzhib6dlqln21fk3zfppalhw21rnfr0ih1znpaa1p";
-}
-{
-  lang = "sv";
-  saneName = "sv";
-  sha256 = "1kaq1zlgxb5z9bpfpnpznnv3yhqjr4wgdm47b5fcg149ha6q43hp";
-}
-{
-  lang = "th";
-  saneName = "th";
-  sha256 = "1yzbxwzd624akmby1bhfm74fp6p41fq38jxs8qdsflav531nz47z";
-}
-{
-  lang = "tr";
-  saneName = "tr";
-  sha256 = "1l1q154ib9wr8brp0pk6r0n7xz8kzdbhfb803kwg0ajhjddpihim";
-}
-{
-  lang = "ug";
-  saneName = "ug";
-  sha256 = "05zcz4rwvlc1gbcm7612rlvsbjnf293kiv902rms64smd3w8237r";
-}
-{
-  lang = "uk";
-  saneName = "uk";
-  sha256 = "04b5nj9q3x2cpc03awm09ijx0qzkvmxp9wb3cj3q4mhkd8n42k6i";
-}
-{
-  lang = "wa";
-  saneName = "wa";
-  sha256 = "10w1n2cni7mqf8fyy5gq699d9nw0fma1brq5a3wfwnxhlk7hxs6a";
-}
-{
-  lang = "zh_CN";
-  saneName = "zh_CN";
-  sha256 = "15xfbyf2m3lhd6q7imsmjxv81kw1ml286dh771gg4m668j7101pq";
-}
-{
-  lang = "zh_TW";
-  saneName = "zh_TW";
-  sha256 = "0d9gw75qq37yq3icz4mjqnqqar0vrmc6aly8pybg4qw167jzzqn6";
-}
-]
diff --git a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.1.nix b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.1.nix
deleted file mode 100644
index f4ecf8656cf..00000000000
--- a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.1.nix
+++ /dev/null
@@ -1,262 +0,0 @@
-[
-{
-  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";
-}
-]
diff --git a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.4.nix b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.4.nix
new file mode 100644
index 00000000000..a128ff8dc62
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.4.nix
@@ -0,0 +1,267 @@
+[
+{
+  lang = "ar";
+  saneName = "ar";
+  sha256 = "1iw8x8k31jrgqc8nq276iwca1dgicz9vcx58rfbnk924dvqrflpv";
+}
+{
+  lang = "bg";
+  saneName = "bg";
+  sha256 = "07i4s6jkfkw59mr5n4256rzwy64y1c5wy957jbvnidqcrpzh1azf";
+}
+{
+  lang = "bs";
+  saneName = "bs";
+  sha256 = "080svc26zqf45wra6d6ljxzgs8f6gzl567wm73yp5qrgqnvyvxir";
+}
+{
+  lang = "ca";
+  saneName = "ca";
+  sha256 = "04fz56hsrpl6mxsbw5ja7armf8zbib542d7iv4p4c87xncib13qj";
+}
+{
+  lang = "ca@valencia";
+  saneName = "ca_valencia";
+  sha256 = "01mi1d6yz5w122bcjzp3r8g70pzil6216sv2y2dxaqjlxpdllklp";
+}
+{
+  lang = "cs";
+  saneName = "cs";
+  sha256 = "0l1rwx1k0vpkfc52divm5cnwxr05mwcl1sr84mi24s2ygs6rk8ib";
+}
+{
+  lang = "da";
+  saneName = "da";
+  sha256 = "1r2pzkvs1rc8hfzi5q0p6drvkl1ykq89bzi3k73i3fghx42qdxv6";
+}
+{
+  lang = "de";
+  saneName = "de";
+  sha256 = "100589wkw5rdcihk1nwl4i0bc30bq3b289n03q9lgf8zadflrrg9";
+}
+{
+  lang = "el";
+  saneName = "el";
+  sha256 = "0q41lpkf8srjxrrcnw9c7rkc83m4jw3r7z6s8x9rn0d5h2l36gv8";
+}
+{
+  lang = "en_GB";
+  saneName = "en_GB";
+  sha256 = "0mmvr3fh51r958myc18nxvl7d8hsm4wl70vmac3a3w47mr9aayqi";
+}
+{
+  lang = "es";
+  saneName = "es";
+  sha256 = "11k8svvnph9431maxdhzr334h7h11jk681fb2z1hb7i6cprmac9f";
+}
+{
+  lang = "et";
+  saneName = "et";
+  sha256 = "0pvjfkh93avkg9dii5byjh3kiqcgax9dfw97jmy6qccicgq6frvd";
+}
+{
+  lang = "eu";
+  saneName = "eu";
+  sha256 = "0gnnr7nyxjrzf632zs1k3j4bss3gm5qadfm2jki41y9q1f82vy99";
+}
+{
+  lang = "fi";
+  saneName = "fi";
+  sha256 = "0mfrmqn1yiqrgq79bgbb8799myv5h30g1gr83xja9g9y0lb645bs";
+}
+{
+  lang = "fr";
+  saneName = "fr";
+  sha256 = "03d6xbc7h9gslzvx1q7lcb8bfr5w8809jfb6cn4zv36in593wq85";
+}
+{
+  lang = "ga";
+  saneName = "ga";
+  sha256 = "13m7rdz2gd1cag2x6hfzyv8xj5777fly5f9pyhr28hrafyqc44l5";
+}
+{
+  lang = "gl";
+  saneName = "gl";
+  sha256 = "1ryimhlddxwaa40si3j0id37xm845ybsfkck0i7x2kmg87a55wcz";
+}
+{
+  lang = "he";
+  saneName = "he";
+  sha256 = "01v4vkbyhbsv64z7mnj129ss1rnr00n19iiza0ivjzsbzryhh3p2";
+}
+{
+  lang = "hr";
+  saneName = "hr";
+  sha256 = "0s2a4nc3z03xj8za426arwr1cjqqcd6pq82lc9q0kiv2fpxgagxw";
+}
+{
+  lang = "hu";
+  saneName = "hu";
+  sha256 = "0sv4fsnnnnpnf14s7fv83g9kzqq31gl0647cy523xkyxpdwhj9hp";
+}
+{
+  lang = "ia";
+  saneName = "ia";
+  sha256 = "0k9gzxiyplvk78nqk3kmqh74lani6iqciyighii1m0cvylq5sljz";
+}
+{
+  lang = "id";
+  saneName = "id";
+  sha256 = "16l4wif0qsmvpikagkhfyh98wdss4w0imixnzawadx0jq5mac6ga";
+}
+{
+  lang = "is";
+  saneName = "is";
+  sha256 = "1g5pan1iy2mx43z5gxvp07n3a9yrc56y4pya2r9g6wjnzcp0ynbj";
+}
+{
+  lang = "it";
+  saneName = "it";
+  sha256 = "0p0grhjx04khqmih8gmlpgjazr8asv7ql1gj965sjaf8a6z1h5ar";
+}
+{
+  lang = "ja";
+  saneName = "ja";
+  sha256 = "1f6ig8x3siqww4bwldpgncpyhlmkf6hbd6ahlvd5dqn6hqpknygx";
+}
+{
+  lang = "kk";
+  saneName = "kk";
+  sha256 = "0kyhr0b5g842dds59l3rcvyq3n12xx11svcqbqhiqqm3a8qki9vi";
+}
+{
+  lang = "km";
+  saneName = "km";
+  sha256 = "02ss6rxqf71n06a769l0xky30nhyqdhhsad9lmxs0dbbnxdcnixr";
+}
+{
+  lang = "kn";
+  saneName = "kn";
+  sha256 = "0rk193a27hvh63lfb7yy8g0wxb05kymyqnhdxcmai3wk2n53bi9y";
+}
+{
+  lang = "ko";
+  saneName = "ko";
+  sha256 = "0wyplpkkq6mdm5k7jxxppwgrm4rrb5mbhagszg1y460rcx7d5vcm";
+}
+{
+  lang = "lt";
+  saneName = "lt";
+  sha256 = "08767csx7sq02jkkrdl16jj7jprqc3qbsz7vdcwli3274qjkdk9s";
+}
+{
+  lang = "lv";
+  saneName = "lv";
+  sha256 = "0f4mxjsg2ipsj57ki26n870zxnk28z9ayblzgmv821xiawjaa4gc";
+}
+{
+  lang = "nb";
+  saneName = "nb";
+  sha256 = "1myb1b4p849nvb4q2n5hcy5fsfb4zdvhc5vkwa2giiy0pv230cmm";
+}
+{
+  lang = "nds";
+  saneName = "nds";
+  sha256 = "1vm6fjac0aaxls0rlgz4s804kbarj1rzyli50dzfcfqwngzkckxk";
+}
+{
+  lang = "nl";
+  saneName = "nl";
+  sha256 = "02v0cscngl7wfsl7yc2xr1a593qq064spgk1ynzad1rz1g98z212";
+}
+{
+  lang = "nn";
+  saneName = "nn";
+  sha256 = "01s1kfp5x036hcpyl87qzqjlmjwp8hda3qplnj3inihias2cnvb7";
+}
+{
+  lang = "pa";
+  saneName = "pa";
+  sha256 = "0al2lwvj23rp1plg2ykakbgw6qzxkkd5pd2nqdfnaif9xq9fp9db";
+}
+{
+  lang = "pl";
+  saneName = "pl";
+  sha256 = "08fffsaay01dnbs7bg3w325bknjcfbp3f1ryrdy2g7w2achyakls";
+}
+{
+  lang = "pt";
+  saneName = "pt";
+  sha256 = "03klc7q1h0xxc43vqw2m87n4wzxg140ql7mlzrjsrdnqgx2pvch4";
+}
+{
+  lang = "pt_BR";
+  saneName = "pt_BR";
+  sha256 = "1g4nd48fzfxam8zsi0imw57lhjm7i7qifqmy53s7pfr4cmq4fbw5";
+}
+{
+  lang = "ro";
+  saneName = "ro";
+  sha256 = "112pj6bi1bagafh89322mdj8ynmljv0ry7z2zss4ljfhqxxndc6b";
+}
+{
+  lang = "ru";
+  saneName = "ru";
+  sha256 = "1i4fx5mrz9910wkfgi885gjafcspnk8nyx7cimkvnp6y2xwpl733";
+}
+{
+  lang = "si";
+  saneName = "si";
+  sha256 = "0h77cqi9cmzni4mn7k91ar56b9ph8dlyagn29wd958hpkxwbdqiw";
+}
+{
+  lang = "sk";
+  saneName = "sk";
+  sha256 = "1q8bxlaah7afs12ni8xpjj6nlxjmxfpzabavm7ixqwnn4l732vyn";
+}
+{
+  lang = "sl";
+  saneName = "sl";
+  sha256 = "0508w2k4g7f9dm0ds28h5hhxd5qc4w16zxqskygrs6144567hb0c";
+}
+{
+  lang = "sr";
+  saneName = "sr";
+  sha256 = "0bvbzah338bh8vnn2ppakd8zb49vcc7d95ahyahrkqc4ls5z60sv";
+}
+{
+  lang = "sv";
+  saneName = "sv";
+  sha256 = "1glgb7shn3qlszayyc11wjhbc5g29agq2rlwf45drk2b5fi2m8bn";
+}
+{
+  lang = "th";
+  saneName = "th";
+  sha256 = "0g3pgrsb3d33295nw45y0a318yb4bvld46xvjsd3ay8hxpxrf4yy";
+}
+{
+  lang = "tr";
+  saneName = "tr";
+  sha256 = "02k1jakxwj5zp0z7x8yrjrl17syzv6rfyscal6af5bavjsx99kxp";
+}
+{
+  lang = "ug";
+  saneName = "ug";
+  sha256 = "0wq1jlxwz2avqzb9yqnck69qkfy3q7cq76i2jadbfdvwk06w44bi";
+}
+{
+  lang = "uk";
+  saneName = "uk";
+  sha256 = "0813bmgi9k3kx2k8rl8h1l9p6zcnabk36p7nm8v9vb4v7d52cyds";
+}
+{
+  lang = "wa";
+  saneName = "wa";
+  sha256 = "14slp0ybjbsm62misrp9qni5pzw4pzz3zznzc49z0a7yfni9i6av";
+}
+{
+  lang = "zh_CN";
+  saneName = "zh_CN";
+  sha256 = "18jfbz2h8jjby48hwjyrd9yn3k7xbp58g28psmlhsg2m3f8mr669";
+}
+{
+  lang = "zh_TW";
+  saneName = "zh_TW";
+  sha256 = "09mfspiy3ihg0n6paqhp0g1srl60sxrkxgha536624kbrbwp1jpq";
+}
+]
diff --git a/pkgs/desktops/kde-4.7/oxygen-icons.nix b/pkgs/desktops/kde-4.7/oxygen-icons.nix
index 655aadda48e..f2a5e666232 100644
--- 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 = "87010a208f6860429d78c0d518a4f70c450b9c199900076d0aa232de8ae6452e";
+  outputHash = "0c12c72bcf41cfaf03f85fc1ae27e44d8cecac3deb504ab1de4c30f4fc9e3cd0";
 
   buildNativeInputs = [ cmake ];
 
diff --git a/pkgs/development/compilers/Agda-executable/default.nix b/pkgs/development/compilers/Agda-executable/default.nix
index 02b1f0bfa93..1b772b8dc71 100644
--- a/pkgs/development/compilers/Agda-executable/default.nix
+++ b/pkgs/development/compilers/Agda-executable/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Agda-executable";
-  version = "2.2.10";
-  sha256 = "0jjlbz5vaz1pasfws1cy8wvllzdzv3sxm2lfj6bckl93kdrxlpy6";
+  version = "2.3.0";
+  sha256 = "1n1ak6z2vh356k9mk0zkiv6dqp9dvx97a7r21b0xnhwkmh3f8p5p";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Agda ];
diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix
index e4cc56a5f05..fac4a99283a 100644
--- a/pkgs/development/compilers/bigloo/default.nix
+++ b/pkgs/development/compilers/bigloo/default.nix
@@ -1,20 +1,25 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "bigloo3.2a";
+  name = "bigloo3.7a";
 
   src = fetchurl {
-    url = "ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/${name}.tar.gz";
-    sha256 = "131jnn17rcccbijpji7v5xlx4z2jldhbn46gkysf6axdcwxwqgg4";
+    url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${name}.tar.gz";
+    sha256 = "0y8i87c2bpqzap8rhzgpyfgdzq21py5xq6mgp0w6xv4rjcj9d0v1";
   };
 
+  preConfigure =
+    # Help libgc's configure.
+    '' export CXXCPP="g++ -E"
+    '';
+
   patchPhase = ''
     # Fix absolute paths.
     sed -e 's=/bin/mv=mv=g' -e 's=/bin/rm=rm=g'			\
         -e 's=/tmp=$TMPDIR=g' -i configure autoconf/*		\
 	[Mm]akefile*   */[Mm]akefile*   */*/[Mm]akefile*	\
 	*/*/*/[Mm]akefile*   */*/*/*/[Mm]akefile*		\
-	comptime/Cc/cc.scm gc/install-gc-*
+	comptime/Cc/cc.scm gc/install-*
 
     # Make sure we don't change string lengths in the generated
     # C files.
@@ -24,7 +29,7 @@ stdenv.mkDerivation rec {
 
   checkTarget = "test";
 
-  meta = { 
+  meta = {
     description = "Bigloo, an efficient Scheme compiler";
 
     longDescription = ''
@@ -39,7 +44,7 @@ stdenv.mkDerivation rec {
       between Scheme and C# programs.
     '';
 
-    homepage = http://www-sop.inria.fr/mimosa/fp/Bigloo/;
+    homepage = http://www-sop.inria.fr/indes/fp/Bigloo/;
     license = "GPLv2+";
 
     maintainers = [ stdenv.lib.maintainers.ludo ];
diff --git a/pkgs/development/compilers/epic/default.nix b/pkgs/development/compilers/epic/default.nix
index b4a53df9433..377a7377a32 100644
--- a/pkgs/development/compilers/epic/default.nix
+++ b/pkgs/development/compilers/epic/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "epic";
-  version = "0.1.13";
-  sha256 = "00rdprgndrvssrjlp6jh5jak2rxq6bcd2dknldx6i8h1cq6i69rb";
+  version = "0.9";
+  sha256 = "0bxvabzizq0msj0fy02vqj0pylq4cbymsypi6w2babwykscrdgm0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ mtl ];
diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix
index 6c2897c56c4..fa34364912e 100644
--- a/pkgs/development/compilers/gcc-4.4/default.nix
+++ b/pkgs/development/compilers/gcc-4.4/default.nix
@@ -33,7 +33,7 @@ assert langVhdl     -> gnat != null;
 
 with stdenv.lib;
 
-let version = "4.4.3";
+let version = "4.4.6";
     javaEcj = fetchurl {
       # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
       # `configure' time.
diff --git a/pkgs/development/compilers/gcc-4.4/sources.nix b/pkgs/development/compilers/gcc-4.4/sources.nix
index 351240e73ca..357cc2634ed 100644
--- a/pkgs/development/compilers/gcc-4.4/sources.nix
+++ b/pkgs/development/compilers/gcc-4.4/sources.nix
@@ -1,26 +1,26 @@
 /* Automatically generated by `update-gcc.sh', do not edit.
-   For GCC 4.4.2.  */
+   For GCC 4.4.6.  */
 { fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda }:
 
-assert version == "4.4.3";
+assert version == "4.4.6";
 optional /* langC */ true (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2";
-  sha256 = "0ml360nwkf95w0ykn19zlyxmdvvzpmrbxj2vfrn0k8i2pvk13wwj";
+  sha256 = "c2959820de3e42eee6b1d381586992f26430f0083b9a51db31d706080fc9b44a";
 }) ++
 optional langCC (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2";
-  sha256 = "1s5zy8pfn4rgfm2l1dpfzrrdhi2l5zhphqk0h3gsbn1pdw751kkv";
+  sha256 = "6d5d2dacab9569472e4caa291abe94017a9b19574b9b0d866de7b04702634ddf";
 }) ++
 optional langFortran (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2";
-  sha256 = "0iivw5kgwxdlqamwgaw5zhw48jajsmg09fgynyxkrxsa702s74sw";
+  sha256 = "2b9998716a16b80f4cf843ce81da1cf58ce116e0b85422e3004ce4454e8ff923";
 }) ++
 optional langJava (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2";
-  sha256 = "13r0yxz6sif3i6sxh7b3fa5m1ygynvsg1bf6ssq6njp1fzp9a2kq";
+  sha256 = "7c8c12eac21d2a5c605ea4d9b7aa52e482354205b801bc93d62603b6f0956b35";
 }) ++
 optional langAda (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2";
-  sha256 = "146jfkwgg7gdgfqnrm04133amk8k9vr51wc01rwp2bcjai9c3kk7";
+  sha256 = "771ef0e90abf61208ce84689bed15391ad249287e36a28e816d6a044035af0c6";
 }) ++
 []
diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix
index 19efa57af8e..0948e94702e 100644
--- a/pkgs/development/compilers/gcc-4.5/default.nix
+++ b/pkgs/development/compilers/gcc-4.5/default.nix
@@ -147,13 +147,17 @@ stdenv.mkDerivation ({
 
   postPatch =
     if (stdenv.system == "i586-pc-gnu"
+        || (libcCross != null                  # e.g., building `gcc.hostDrv'
+            && libcCross ? crossConfig
+            && libcCross.crossConfig == "i586-pc-gnu")
         || (cross != null && cross.config == "i586-pc-gnu"
             && libcCross != null))
     then
       # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
       # in glibc, so add the right `-I' flags to the default spec string.
+      assert libcCross != null -> libpthreadCross != null;
       let
-        libc = if cross != null then libcCross else stdenv.glibc;
+        libc = if libcCross != null then libcCross else stdenv.glibc;
         gnu_h = "gcc/config/gnu.h";
         i386_gnu_h = "gcc/config/i386/gnu.h";
         extraCPPDeps =
@@ -175,12 +179,18 @@ stdenv.mkDerivation ({
            echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..."
            sed -i "${gnu_h}" \
                -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g'
+
+           echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..."
+           sed -i "${gnu_h}" \
+               -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g'
+           sed -i gcc/config/t-gnu \
+               -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc}/include|g'
         ''
     else if cross != null || stdenv.gcc.libc != null then
       # On NixOS, use the right path to the dynamic linker instead of
       # `/lib/ld*.so'.
       let
-        libc = if (cross != null && libcCross != null) then libcCross else stdenv.gcc.libc;
+        libc = if (libcCross != null) then libcCross else stdenv.gcc.libc;
       in
         '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."
            for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
@@ -387,6 +397,13 @@ stdenv.mkDerivation ({
   };
 }
 
+// optionalAttrs (cross != null || libcCross != null) {
+  # `builder.sh' sets $CPP, which leads configure to use "gcc -E" instead of,
+  # say, "i586-pc-gnu-gcc -E" when building `gcc.hostDrv'.
+  # FIXME: Fix `builder.sh' directly in the next stdenv-update.
+  postUnpack = "unset CPP";
+}
+
 // optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) {
   makeFlags = [ "all-gcc" "all-target-libgcc" ];
   installTargets = "install-gcc install-target-libgcc";
diff --git a/pkgs/development/compilers/gcc-4.6/builder.sh b/pkgs/development/compilers/gcc-4.6/builder.sh
index 8e1b3c8e407..6cd64bc58f2 100644
--- a/pkgs/development/compilers/gcc-4.6/builder.sh
+++ b/pkgs/development/compilers/gcc-4.6/builder.sh
@@ -5,11 +5,6 @@ export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
 mkdir $NIX_FIXINC_DUMMY
 
 
-# libstdc++ needs this; otherwise it will use /lib/cpp, which is a Bad
-# Thing.
-export CPP="gcc -E"
-export CXXCPP="g++ -E"
-
 if test "$staticCompiler" = "1"; then
     EXTRA_LDFLAGS="-static"
 else
diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix
index 6b484a09877..5fdb61576fa 100644
--- a/pkgs/development/compilers/gcc-4.6/default.nix
+++ b/pkgs/development/compilers/gcc-4.6/default.nix
@@ -46,7 +46,7 @@ assert cloog != null -> cloogppl == null;
 with stdenv.lib;
 with builtins;
 
-let version = "4.6.1";
+let version = "4.6.2";
     javaEcj = fetchurl {
       # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
       # `configure' time.
@@ -153,13 +153,17 @@ stdenv.mkDerivation ({
 
   postPatch =
     if (stdenv.system == "i586-pc-gnu"
+        || (libcCross != null                  # e.g., building `gcc.hostDrv'
+            && libcCross ? crossConfig
+            && libcCross.crossConfig == "i586-pc-gnu")
         || (cross != null && cross.config == "i586-pc-gnu"
             && libcCross != null))
     then
       # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
       # in glibc, so add the right `-I' flags to the default spec string.
+      assert libcCross != null -> libpthreadCross != null;
       let
-        libc = if cross != null then libcCross else stdenv.glibc;
+        libc = if libcCross != null then libcCross else stdenv.glibc;
         gnu_h = "gcc/config/gnu.h";
         i386_gnu_h = "gcc/config/i386/gnu.h";
         extraCPPDeps =
@@ -181,12 +185,18 @@ stdenv.mkDerivation ({
            echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..."
            sed -i "${gnu_h}" \
                -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g'
+
+           echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..."
+           sed -i "${gnu_h}" \
+               -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g'
+           sed -i gcc/config/t-gnu \
+               -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc}/include|g'
         ''
     else if cross != null || stdenv.gcc.libc != null then
       # On NixOS, use the right path to the dynamic linker instead of
       # `/lib/ld*.so'.
       let
-        libc = if (cross != null && libcCross != null) then libcCross else stdenv.gcc.libc;
+        libc = if (libcCross != null) then libcCross else stdenv.gcc.libc;
       in
         '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."
            for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
@@ -202,17 +212,18 @@ stdenv.mkDerivation ({
   inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic
     libcCross crossMingw;
 
-  buildNativeInputs = [ texinfo which ]
-    ++ optional langJava perl;
+  buildNativeInputs = [ texinfo which gettext ]
+    ++ (optional (perl != null) perl)
+    ++ (optional javaAwtGtk pkgconfig)
+    ++ (optionals langTreelang [bison flex]);
 
-  buildInputs = [ gmp mpfr mpc libelf gettext ]
+  buildInputs = [ gmp mpfr mpc libelf ]
     ++ (optional (ppl != null) ppl)
     ++ (optional (cloogppl != null) cloogppl)
     ++ (optional (cloog != null) cloog)
-    ++ (optionals langTreelang [bison flex])
     ++ (optional (zlib != null) zlib)
     ++ (optionals langJava [ boehmgc zip unzip ])
-    ++ (optionals javaAwtGtk [gtk pkgconfig libart_lgpl] ++ xlibs)
+    ++ (optionals javaAwtGtk [ gtk libart_lgpl ] ++ xlibs)
     ++ (optionals (cross != null) [binutilsCross])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
diff --git a/pkgs/development/compilers/gcc-4.6/sources.nix b/pkgs/development/compilers/gcc-4.6/sources.nix
index e91f3facb8e..dc85ff10b51 100644
--- a/pkgs/development/compilers/gcc-4.6/sources.nix
+++ b/pkgs/development/compilers/gcc-4.6/sources.nix
@@ -1,31 +1,31 @@
 /* Automatically generated by `update-gcc.sh', do not edit.
-   For GCC 4.6.1.  */
+   For GCC 4.6.2.  */
 { fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda,
   langGo }:
 
-assert version == "4.6.1";
+assert version == "4.6.2";
 optional /* langC */ true (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2";
-  sha256 = "0bbb8f754a31f29013f6e9ad4c755d92bb0f154a665c4b623e86ae7174d98e33";
+  sha256 = "dcbf391f05277b7e09d14d54f3bdaba5515a3a8e7dd1d8af93af3f6f68455e10";
 }) ++
 optional langCC (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2";
-  sha256 = "44a91149bf4608aceb03b22209e5ec14ffe0c4003b11e3a368d6cebe5a327901";
+  sha256 = "5470bea8093438cf5840fbbef3546b6dba7b0153ef6a16e142c1fba1fac6e598";
 }) ++
 optional langFortran (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2";
-  sha256 = "a0069a4452572b46cc20f1a1b52dc839b69c1d25e19c147a782e439d6be0156b";
+  sha256 = "492becd732662349eaa5e7c4e458ac009df0ccb8904df54ae295d277c4d6be6f";
 }) ++
 optional langJava (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2";
-  sha256 = "728462275a0532714063803282d1ea815e35b5fd91a96f65a1f0a14da355765f";
+  sha256 = "d021a16816daeb5db9a3280909d846b38cbdb4cc0d9aa47714c49b08a81d11f1";
 }) ++
 optional langAda (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2";
-  sha256 = "0e2958b7be2e7ec9d7847658262ce9276d6c75f91d53c48d7141848cfe3cd093";
+  sha256 = "9ac26821ad900d02ed251b62e6a0506ee12417b506a7bb9b02ec9f09e5d9c84f";
 }) ++
 optional langGo (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-go-${version}.tar.bz2";
-  sha256 = "9512347a76c46528d25295cd762f262c8265e99cee497dc2d66caddf9c021198";
+  sha256 = "1cafbb254d70f60c39a62a39a3b236674e02c875a1775057ddd33ffafe0fd4e1";
 }) ++
 []
diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix
new file mode 100644
index 00000000000..358f41dcf08
--- /dev/null
+++ b/pkgs/development/compilers/ghc/7.2.2.nix
@@ -0,0 +1,44 @@
+{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
+
+stdenv.mkDerivation rec {
+  version = "7.2.2";
+  name = "ghc-${version}";
+
+  src = fetchurl {
+    url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2";
+    sha256 = "0g87d3z9275dniaqzkf56qfgzp1msd89nqqhhm2gkc6iga072spz";
+  };
+
+  buildInputs = [ghc perl gmp ncurses] ++
+    (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
+
+  buildMK = ''
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+  '';
+
+  preConfigure = ''
+    echo "${buildMK}" > mk/build.mk
+    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+  '';
+
+  configureFlags=[
+    "--with-gcc=${stdenv.gcc}/bin/gcc"
+  ];
+
+  # required, because otherwise all symbols from HSffi.o are stripped, and
+  # that in turn causes GHCi to abort
+  stripDebugFlags=["-S" "--keep-file-symbols"];
+
+  meta = {
+    homepage = "http://haskell.org/ghc";
+    description = "The Glasgow Haskell Compiler";
+    maintainers = [
+      stdenv.lib.maintainers.marcweber
+      stdenv.lib.maintainers.andres
+      stdenv.lib.maintainers.simons
+    ];
+    platforms = ghc.meta.platforms;
+  };
+
+}
diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix
new file mode 100644
index 00000000000..19ce4eabf42
--- /dev/null
+++ b/pkgs/development/compilers/ghc/with-packages.nix
@@ -0,0 +1,89 @@
+{stdenv, ghc, packages ? [], makeWrapper}:
+
+stdenv.mkDerivation rec {
+  name = "ghc-${ghc.version}-linkdir";
+
+  allPackages = stdenv.lib.closePropagation packages;
+  buildInputs = allPackages ++ [makeWrapper];
+  propagatedBuildInputs = packages;
+
+  unpackPhase = "true";
+
+  installPhase = ''
+    originalTopDir="${ghc}/lib/ghc-${ghc.version}"
+    originalPkgDir="$originalTopDir/package.conf.d"
+    linkedTopDir="$out/lib"
+    linkedPkgDir="$linkedTopDir/package.conf.d"
+
+    ensureDir $out/bin
+    ensureDir $linkedTopDir
+    ensureDir $linkedPkgDir
+
+    echo "Linking GHC core libraries:"
+
+    echo -n "Linking $originalTopDir "
+    for f in $originalTopDir/*; do
+      if test -f $f; then
+        ln -s $f $linkedTopDir
+        echo -n .
+      fi
+    done
+    echo
+
+    echo -n "Linking $originalPkgDir "
+    for f in $originalPkgDir/*.conf; do
+      ln -s $f $linkedPkgDir
+      echo -n .
+    done
+    echo
+
+    echo "Linking selected packages and dependencies:"
+
+    for currentPath in ${stdenv.lib.concatStringsSep " " allPackages}; do
+      currentPkgDir="$currentPath/lib/ghc-pkgs/ghc-${ghc.version}"
+      # Check if current path is a Cabal package for the current GHC
+      if test -d $currentPkgDir; then
+        echo -n "Linking $currentPath "
+        for f in $currentPath/bin/*; do
+          ln -s $f $out/bin
+          echo -n .
+        done
+        for f in $currentPkgDir/*.conf; do
+          ln -s $f $linkedPkgDir
+          echo -n .
+        done
+        echo
+      fi
+    done
+
+    echo -n "Generating package cache "
+    ${ghc}/bin/ghc-pkg --global-conf $linkedPkgDir recache
+    echo .
+
+    echo -n "Generating wrappers "
+
+    for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do
+      makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "-B$linkedTopDir"
+      echo -n .
+    done
+
+    for prg in runghc runhaskell; do
+      makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "-f $out/bin/ghc"
+      echo -n .
+    done
+
+    for prg in ghc-pkg ghc-pkg-${ghc.version}; do
+      makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "--global-conf $linkedPkgDir"
+      echo -n .
+    done
+
+    for prg in hp2ps hpc hasktags hsc2hs haddock haddock-${ghc.version}; do
+      if test -x ${ghc}/bin/$prg -a ! -x $out/bin/$prg; then
+        ln -s ${ghc}/bin/$prg $out/bin/$prg && echo -n .
+      fi
+    done
+    echo
+  '';
+
+  meta = ghc.meta;
+}
diff --git a/pkgs/development/compilers/llvm/clang-include-paths-svn.patch b/pkgs/development/compilers/llvm/clang-include-paths-svn.patch
deleted file mode 100644
index 85c7a12d09b..00000000000
--- a/pkgs/development/compilers/llvm/clang-include-paths-svn.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ru -x '*~' a/tools/clang/lib/Frontend/InitHeaderSearch.cpp b/tools/clang/lib/Frontend/InitHeaderSearch.cpp
---- a/tools/clang/lib/Frontend/InitHeaderSearch.cpp	2010-09-03 18:45:53.000000000 +0200
-+++ b/tools/clang/lib/Frontend/InitHeaderSearch.cpp	2011-02-05 14:59:08.669573190 +0100
-@@ -480,6 +480,7 @@
-       AddPath(*i, System, false, false, false);
-     return;
-   }
- 
-+#if 0
-   switch (os) {
-   case llvm::Triple::Win32: {
-@@ -593,7 +593,9 @@
-   }
- 
-   if ( os != llvm::Triple::RTEMS )
-     AddPath("/usr/include", System, false, false, false);
-+#endif
-+  AddPath(C_INCLUDE_PATH, System, false, false, false);
- }
- 
- void InitHeaderSearch::
-@@ -550,6 +553,7 @@
-                                   triple);
-     return;
-   }
-+#if 0  
-   // FIXME: temporary hack: hard-coded paths.
- 
-   if (triple.isOSDarwin()) {
-@@ -769,6 +773,10 @@
-   default:
-     break;
-   }
-+#endif
-+  AddGnuCPlusPlusIncludePaths(
-+      CPP_INCLUDE_PATH,
-+      CPP_HOST, "", "", triple);
- }
- 
- void InitHeaderSearch::AddDefaultSystemIncludePaths(const LangOptions &Lang,
diff --git a/pkgs/development/compilers/llvm/clang-include-paths.patch b/pkgs/development/compilers/llvm/clang-include-paths.patch
index 5c80e582145..aaa9a5fc4b5 100644
--- a/pkgs/development/compilers/llvm/clang-include-paths.patch
+++ b/pkgs/development/compilers/llvm/clang-include-paths.patch
@@ -1,15 +1,15 @@
 diff -ru -x '*~' a/tools/clang/lib/Frontend/InitHeaderSearch.cpp b/tools/clang/lib/Frontend/InitHeaderSearch.cpp
---- a/tools/clang/lib/Frontend/InitHeaderSearch.cpp	2010-09-03 18:45:53.000000000 +0200
-+++ b/tools/clang/lib/Frontend/InitHeaderSearch.cpp	2011-02-05 14:59:08.669573190 +0100
-@@ -443,6 +443,7 @@
-       AddPath(*i, System, false, false, false);
-     return;
-   }
+--- a/tools/clang/lib/Frontend/InitHeaderSearch.cpp	2011-03-21 20:24:04.000000000 -0400
++++ b/tools/clang/lib/Frontend/InitHeaderSearch.cpp	2011-10-18 12:09:50.624355551 -0400
+@@ -438,6 +438,7 @@
+ 
+ void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple,
+                                             const HeaderSearchOptions &HSOpts) {
 +#if 0
    llvm::Triple::OSType os = triple.getOS();
+ 
    switch (os) {
-   case llvm::Triple::Win32:
-@@ -532,6 +533,8 @@
+@@ -559,6 +560,8 @@
    }
  
    AddPath("/usr/include", System, false, false, false);
@@ -18,7 +18,7 @@ diff -ru -x '*~' a/tools/clang/lib/Frontend/InitHeaderSearch.cpp b/tools/clang/l
  }
  
  void InitHeaderSearch::
-@@ -550,6 +553,7 @@
+@@ -577,6 +580,7 @@
                                    triple);
      return;
    }
@@ -26,7 +26,7 @@ diff -ru -x '*~' a/tools/clang/lib/Frontend/InitHeaderSearch.cpp b/tools/clang/l
    // FIXME: temporary hack: hard-coded paths.
    switch (os) {
    case llvm::Triple::Cygwin:
-@@ -769,6 +773,10 @@
+@@ -847,6 +851,10 @@
    default:
      break;
    }
diff --git a/pkgs/development/compilers/llvm/clang-ld-flags.patch b/pkgs/development/compilers/llvm/clang-ld-flags.patch
new file mode 100644
index 00000000000..fc625a0e0b7
--- /dev/null
+++ b/pkgs/development/compilers/llvm/clang-ld-flags.patch
@@ -0,0 +1,45 @@
+diff -Naur a/tools/clang/lib/Driver/ToolChains.cpp b/tools/clang/lib/Driver/ToolChains.cpp
+--- a/tools/clang/lib/Driver/ToolChains.cpp	2011-03-21 17:29:27.000000000 -0400
++++ b/tools/clang/lib/Driver/ToolChains.cpp	2011-10-18 19:43:48.999590771 -0400
+@@ -1482,12 +1482,9 @@
+     Lib = Lib64;
+   }
+ 
+-  llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld");
+-  if (!llvm::sys::fs::exists(LinkerPath.str(), Exists) && Exists)
+-    Linker = LinkerPath.str();
+-  else
+-    Linker = GetProgramPath("ld");
++  Linker = GetProgramPath("ld");
+ 
++#if 0
+   LinuxDistro Distro = DetectLinuxDistro(Arch);
+ 
+   if (IsUbuntu(Distro)) {
+@@ -1531,6 +1528,7 @@
+   Paths.push_back(Base + "/../../..");
+   if (Arch == getArch() && IsUbuntu(Distro))
+     Paths.push_back("/usr/lib/" + GccTriple);
++#endif
+ }
+ 
+ bool Linux::HasNativeLLVMSupport() const {
+diff -Naur a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp
+--- a/tools/clang/lib/Driver/Tools.cpp	2011-03-06 18:31:01.000000000 -0500
++++ b/tools/clang/lib/Driver/Tools.cpp	2011-10-18 18:44:00.799604267 -0400
+@@ -3619,6 +3619,7 @@
+       ToolChain.getArch() == llvm::Triple::thumb ||
+       (!Args.hasArg(options::OPT_static) &&
+        !Args.hasArg(options::OPT_shared))) {
++#if 0
+     CmdArgs.push_back("-dynamic-linker");
+     if (ToolChain.getArch() == llvm::Triple::x86)
+       CmdArgs.push_back("/lib/ld-linux.so.2");
+@@ -3627,6 +3628,7 @@
+       CmdArgs.push_back("/lib/ld-linux.so.3");
+     else
+       CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
++#endif
+   }
+ 
+   CmdArgs.push_back("-o");
diff --git a/pkgs/development/compilers/llvm/clang-system-llvm-libs.patch b/pkgs/development/compilers/llvm/clang-system-llvm-libs.patch
new file mode 100644
index 00000000000..0d82cf4017a
--- /dev/null
+++ b/pkgs/development/compilers/llvm/clang-system-llvm-libs.patch
@@ -0,0 +1,42 @@
+diff -Naur llvm-2.9-orig/Makefile.rules llvm-2.9/Makefile.rules
+--- llvm-2.9-orig/Makefile.rules	2011-03-25 02:26:58.000000000 -0400
++++ llvm-2.9/Makefile.rules	2011-10-19 15:31:38.538674143 -0400
+@@ -941,7 +941,7 @@
+ 	@echo "*** llvm-config doesn't exist - rebuilding it."
+ 	@$(MAKE) -C $(PROJ_OBJ_ROOT)/tools/llvm-config
+ 
+-$(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT): $(LLVM_CONFIG)
++$(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT):
+ 
+ ifeq ($(ENABLE_SHARED), 1)
+ # We can take the "auto-import" feature to get rid of using dllimport.
+@@ -1137,7 +1137,7 @@
+ else
+ SharedLibKindMessage := "Shared Library"
+ endif
+-$(LibName.SO): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) $(SharedLibDir)/.dir
++$(LibName.SO): $(ObjectsO) $(ProjLibsPaths) $(SharedLibDir)/.dir
+ 	$(Echo) Linking $(BuildMode) $(SharedLibKindMessage) \
+ 	  $(notdir $@)
+ 	$(Verb) $(Link) $(SharedLinkOptions) -o $@ $(ObjectsO) \
+@@ -1411,7 +1411,7 @@
+ $(ToolBuildPath): $(ToolDir)/.dir
+ endif
+ 
+-$(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)
++$(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths)
+ 	$(Echo) Linking $(BuildMode) executable $(TOOLNAME) $(StripWarnMsg)
+ 	$(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \
+ 	$(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS)
+diff -Naur llvm-2.9-orig/unittests/Makefile.unittest llvm-2.9/unittests/Makefile.unittest
+--- llvm-2.9-orig/unittests/Makefile.unittest	2011-02-04 12:12:18.000000000 -0500
++++ llvm-2.9/unittests/Makefile.unittest	2011-10-19 15:47:27.100035616 -0400
+@@ -47,7 +47,7 @@
+   Run.Shared := $(SHLIBPATH_VAR)="$(SharedLibDir)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)"
+ endif
+ 
+-$(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)
++$(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths)
+ 	$(Echo) Linking $(BuildMode) unit test $(TESTNAME) $(StripWarnMsg)
+ 	$(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \
+ 	$(TESTLIBS) $(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS)
diff --git a/pkgs/development/compilers/llvm/clang-tblgen.patch b/pkgs/development/compilers/llvm/clang-tblgen.patch
new file mode 100644
index 00000000000..9533529555d
--- /dev/null
+++ b/pkgs/development/compilers/llvm/clang-tblgen.patch
@@ -0,0 +1,134 @@
+diff -Naur a/tools/clang/include/clang/AST/Makefile b/tools/clang/include/clang/AST/Makefile
+--- a/tools/clang/include/clang/AST/Makefile	2010-08-18 19:23:40.000000000 -0400
++++ b/tools/clang/include/clang/AST/Makefile	2011-10-19 14:19:21.420750346 -0400
+@@ -6,24 +6,24 @@
+ 
+ include $(CLANG_LEVEL)/Makefile
+ 
+-$(ObjDir)/Attrs.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \
++$(ObjDir)/Attrs.inc.tmp : $(TD_SRC_DIR)/Attr.td \
+                               $(ObjDir)/.dir
+ 	$(Echo) "Building Clang attribute classes with tblgen"
+ 	$(Verb) $(TableGen) -gen-clang-attr-classes -o $(call SYSPATH, $@) \
+ 		-I $(PROJ_SRC_DIR)/../../ $<
+ 
+-$(ObjDir)/AttrImpl.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \
++$(ObjDir)/AttrImpl.inc.tmp : $(TD_SRC_DIR)/Attr.td \
+                               $(ObjDir)/.dir
+ 	$(Echo) "Building Clang attribute implementations with tblgen"
+ 	$(Verb) $(TableGen) -gen-clang-attr-impl -o $(call SYSPATH, $@) \
+ 		-I $(PROJ_SRC_DIR)/../../ $<
+ 
+-$(ObjDir)/StmtNodes.inc.tmp : $(TD_SRC_DIR)/StmtNodes.td $(TBLGEN) \
++$(ObjDir)/StmtNodes.inc.tmp : $(TD_SRC_DIR)/StmtNodes.td \
+                               $(ObjDir)/.dir
+ 	$(Echo) "Building Clang statement node tables with tblgen"
+ 	$(Verb) $(TableGen) -gen-clang-stmt-nodes -o $(call SYSPATH, $@) $<
+ 
+-$(ObjDir)/DeclNodes.inc.tmp : $(TD_SRC_DIR)/DeclNodes.td $(TBLGEN) \
++$(ObjDir)/DeclNodes.inc.tmp : $(TD_SRC_DIR)/DeclNodes.td \
+                               $(ObjDir)/.dir
+ 	$(Echo) "Building Clang declaration node tables with tblgen"
+ 	$(Verb) $(TableGen) -gen-clang-decl-nodes -o $(call SYSPATH, $@) $<
+diff -Naur a/tools/clang/include/clang/Basic/Makefile b/tools/clang/include/clang/Basic/Makefile
+--- a/tools/clang/include/clang/Basic/Makefile	2010-09-09 16:27:36.000000000 -0400
++++ b/tools/clang/include/clang/Basic/Makefile	2011-10-19 14:17:54.950837324 -0400
+@@ -29,20 +29,20 @@
+ CLANG_HAS_VERSION_PATCHLEVEL := 1
+ endif
+ 
+-$(ObjDir)/Diagnostic%Kinds.inc.tmp : Diagnostic.td Diagnostic%Kinds.td $(TBLGEN) $(ObjDir)/.dir
++$(ObjDir)/Diagnostic%Kinds.inc.tmp : Diagnostic.td Diagnostic%Kinds.td $(ObjDir)/.dir
+ 	$(Echo) "Building Clang $(patsubst Diagnostic%Kinds.inc.tmp,%,$(@F)) diagnostic tables with tblgen"
+ 	$(Verb) $(TableGen) -gen-clang-diags-defs -clang-component=$(patsubst Diagnostic%Kinds.inc.tmp,%,$(@F)) -o $(call SYSPATH, $@) $<
+ 
+-$(ObjDir)/DiagnosticGroups.inc.tmp : Diagnostic.td DiagnosticGroups.td $(INPUT_TDS) $(TBLGEN) $(ObjDir)/.dir
++$(ObjDir)/DiagnosticGroups.inc.tmp : Diagnostic.td DiagnosticGroups.td $(INPUT_TDS) $(ObjDir)/.dir
+ 	$(Echo) "Building Clang diagnostic groups with tblgen"
+ 	$(Verb) $(TableGen) -gen-clang-diag-groups -o $(call SYSPATH, $@) $<
+ 
+-$(ObjDir)/AttrList.inc.tmp : Attr.td $(TBLGEN) $(ObjDir)/.dir
++$(ObjDir)/AttrList.inc.tmp : Attr.td $(ObjDir)/.dir
+ 	$(Echo) "Building Clang attribute list with tblgen"
+ 	$(Verb) $(TableGen) -gen-clang-attr-list -o $(call SYSPATH, $@) \
+ 	  -I $(PROJ_SRC_DIR)/../.. $<
+ 
+-$(ObjDir)/arm_neon.inc.tmp : arm_neon.td $(TBLGEN) $(ObjDir)/.dir
++$(ObjDir)/arm_neon.inc.tmp : arm_neon.td $(ObjDir)/.dir
+ 	$(Echo) "Building Clang arm_neon.inc with tblgen"
+ 	$(Verb) $(TableGen) -gen-arm-neon-sema -o $(call SYSPATH, $@) $<
+ 
+diff -Naur a/tools/clang/include/clang/Driver/Makefile b/tools/clang/include/clang/Driver/Makefile
+--- a/tools/clang/include/clang/Driver/Makefile	2010-06-08 16:34:18.000000000 -0400
++++ b/tools/clang/include/clang/Driver/Makefile	2011-10-19 14:25:33.739369159 -0400
+@@ -5,14 +5,14 @@
+ 
+ include $(CLANG_LEVEL)/Makefile
+ 
+-$(ObjDir)/Options.inc.tmp : Options.td OptParser.td $(TBLGEN) $(ObjDir)/.dir
++$(ObjDir)/Options.inc.tmp : Options.td OptParser.td $(ObjDir)/.dir
+ 	$(Echo) "Building Clang Driver Option tables with tblgen"
+ 	$(Verb) $(TableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $<
+ 
+-$(ObjDir)/CC1Options.inc.tmp : CC1Options.td OptParser.td $(TBLGEN) $(ObjDir)/.dir
++$(ObjDir)/CC1Options.inc.tmp : CC1Options.td OptParser.td $(ObjDir)/.dir
+ 	$(Echo) "Building Clang CC1 Option tables with tblgen"
+ 	$(Verb) $(TableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $<
+ 
+-$(ObjDir)/CC1AsOptions.inc.tmp : CC1AsOptions.td OptParser.td $(TBLGEN) $(ObjDir)/.dir
++$(ObjDir)/CC1AsOptions.inc.tmp : CC1AsOptions.td OptParser.td $(ObjDir)/.dir
+ 	$(Echo) "Building Clang CC1 Assembler Option tables with tblgen"
+ 	$(Verb) $(TableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $<
+diff -Naur a/tools/clang/include/clang/Lex/Makefile b/tools/clang/include/clang/Lex/Makefile
+--- a/tools/clang/include/clang/Lex/Makefile	2010-10-19 22:31:43.000000000 -0400
++++ b/tools/clang/include/clang/Lex/Makefile	2011-10-19 14:18:25.082807086 -0400
+@@ -6,7 +6,7 @@
+ 
+ include $(CLANG_LEVEL)/Makefile
+ 
+-$(ObjDir)/AttrSpellings.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \
++$(ObjDir)/AttrSpellings.inc.tmp : $(TD_SRC_DIR)/Attr.td \
+                                   $(ObjDir)/.dir
+ 	$(Echo) "Building Clang attribute spellings with tblgen"
+ 	$(Verb) $(TableGen) -gen-clang-attr-spelling-list -o $(call SYSPATH, $@) \
+diff -Naur a/tools/clang/include/clang/Serialization/Makefile b/tools/clang/include/clang/Serialization/Makefile
+--- a/tools/clang/include/clang/Serialization/Makefile	2010-08-18 19:23:40.000000000 -0400
++++ b/tools/clang/include/clang/Serialization/Makefile	2011-10-19 14:25:05.764398164 -0400
+@@ -6,13 +6,13 @@
+ 
+ include $(CLANG_LEVEL)/Makefile
+ 
+-$(ObjDir)/AttrPCHRead.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \
++$(ObjDir)/AttrPCHRead.inc.tmp : $(TD_SRC_DIR)/Attr.td \
+                               $(ObjDir)/.dir
+ 	$(Echo) "Building Clang PCH reader with tblgen"
+ 	$(Verb) $(TableGen) -gen-clang-attr-pch-read -o $(call SYSPATH, $@) \
+ 		-I $(PROJ_SRC_DIR)/../../ $<
+ 
+-$(ObjDir)/AttrPCHWrite.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \
++$(ObjDir)/AttrPCHWrite.inc.tmp : $(TD_SRC_DIR)/Attr.td \
+                               $(ObjDir)/.dir
+ 	$(Echo) "Building Clang PCH writer with tblgen"
+ 	$(Verb) $(TableGen) -gen-clang-attr-pch-write -o $(call SYSPATH, $@) \
+diff -Naur a/tools/clang/lib/Headers/Makefile b/tools/clang/lib/Headers/Makefile
+--- a/tools/clang/lib/Headers/Makefile	2010-07-21 21:19:36.000000000 -0400
++++ b/tools/clang/lib/Headers/Makefile	2011-10-19 14:15:18.520993127 -0400
+@@ -49,6 +49,6 @@
+ 
+ install-local:: $(INSTHEADERS)
+ 
+-$(ObjDir)/arm_neon.h.inc.tmp : $(CLANG_LEVEL)/include/clang/Basic/arm_neon.td $(TBLGEN) $(ObjDir)/.dir
++$(ObjDir)/arm_neon.h.inc.tmp : $(CLANG_LEVEL)/include/clang/Basic/arm_neon.td $(ObjDir)/.dir
+ 	$(Echo) "Building Clang arm_neon.h.inc with tblgen"
+ 	$(Verb) $(TableGen) -gen-arm-neon -o $(call SYSPATH, $@) $<
+diff -Naur a/tools/clang/lib/StaticAnalyzer/Checkers/Makefile b/tools/clang/lib/StaticAnalyzer/Checkers/Makefile
+--- a/tools/clang/lib/StaticAnalyzer/Checkers/Makefile	2011-02-15 02:42:38.000000000 -0500
++++ b/tools/clang/lib/StaticAnalyzer/Checkers/Makefile	2011-10-19 14:15:58.240953760 -0400
+@@ -19,6 +19,6 @@
+ 
+ include $(CLANG_LEVEL)/Makefile
+ 
+-$(ObjDir)/Checkers.inc.tmp : Checkers.td $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include/clang/StaticAnalyzer/Checkers/CheckerBase.td $(TBLGEN) $(ObjDir)/.dir
++$(ObjDir)/Checkers.inc.tmp : Checkers.td $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include/clang/StaticAnalyzer/Checkers/CheckerBase.td $(ObjDir)/.dir
+ 	$(Echo) "Building Clang SA Checkers tables with tblgen"
+ 	$(Verb) $(TableGen) -gen-clang-sa-checkers -I $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include -o $(call SYSPATH, $@) $<
diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix
new file mode 100644
index 00000000000..1763e1e9e16
--- /dev/null
+++ b/pkgs/development/compilers/llvm/clang.nix
@@ -0,0 +1,58 @@
+{ stdenv, fetchurl, perl, groff, llvm }:
+
+assert stdenv.isLinux && stdenv.gcc.gcc != null;
+
+let version = "2.9"; in
+
+stdenv.mkDerivation {
+  name = "clang-${version}";
+
+  src = llvm.src;
+
+  buildInputs = [ perl llvm groff ];
+
+  configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ]
+    ++ stdenv.lib.optionals (stdenv.gcc ? clang) [
+      "--with-built-clang=yes"
+      "CXX=clang++"
+    ];
+
+  srcClang = fetchurl {
+      url = "http://llvm.org/releases/${version}/clang-${version}.tgz";
+      sha256 = "1pq9g7qxw761dp6gx3amx39kl9p4zhlymmn8gfmcnw9ag0zizi3h";
+  };
+
+  prePatch = ''
+    pushd tools
+    unpackFile $srcClang
+    mv clang-${version} clang
+    popd
+    find
+  '';
+
+  patches = [ ./clang-include-paths.patch ./clang-ld-flags.patch ./clang-tblgen.patch ./clang-system-llvm-libs.patch ];
+
+  buildFlags = [ "TableGen=tblgen" "LLVM_CONFIG=llvm-config" ];
+
+  preBuild = ''
+    sed -i -e 's,C_INCLUDE_PATH,"${stdenv.gcc.libc}/include/",' \
+      -e 's,CPP_HOST,"'$(${stdenv.gcc.gcc}/bin/gcc -dumpmachine)'",' \
+      -e 's,CPP_INCLUDE_PATH,"${stdenv.gcc.gcc}/include/c++/${stdenv.gcc.gcc.version}",' \
+      tools/clang/lib/Frontend/InitHeaderSearch.cpp
+
+    pushd utils/unittest
+    make
+    popd
+    cd tools/clang
+  '';
+
+  passthru = { gcc = stdenv.gcc.gcc; };
+
+  meta = {
+    homepage = http://clang.llvm.org/;
+    description = "A C language family frontend for LLVM";
+    license = "BSD";
+    maintainers = with stdenv.lib.maintainers; [viric shlevy];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 4229e43949a..afc1a55b093 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -1,66 +1,32 @@
-{ stdenv, fetchurl, gcc, flex, perl, libtool, groff
-, buildClang ? false }:
+{ stdenv, fetchurl, perl, groff, darwinSwVersUtility }:
+
+let version = "3.0"; in
+
+stdenv.mkDerivation {
+  name = "llvm-${version}";
 
-stdenv.mkDerivation ({
-  name = "llvm-2.8";
-  
   src = fetchurl {
-    url    = http://llvm.org/releases/2.8/llvm-2.8.tgz;
-    sha256 = "0fyl2gk2ld28isz9bq4f6r4dhqm9vljfj3pdfwlc2v0w5xsdpb95";
+    url    = "http://llvm.org/releases/${version}/llvm-${version}.tar.gz";
+    sha256 = "0xq4gi7lflv8ilfckslhfvnja5693xjii1yvzz39kklr6hfv37ji";
   };
 
-  buildInputs = [ gcc flex perl groff ];
+  buildInputs = [ perl groff ] ++
+    stdenv.lib.optional stdenv.isDarwin darwinSwVersUtility;
 
-  configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ];
+  configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ]
+    ++ stdenv.lib.optionals (stdenv.gcc ? clang) [
+      "--with-built-clang=yes"
+      "CXX=clang++"
+    ];
+
+  enableParallelBuilding = true;
 
   meta = {
     homepage = http://llvm.org/;
     description = "Collection of modular and reusable compiler and toolchain technologies";
     license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [viric];
+    maintainers = with stdenv.lib.maintainers; [viric shlevy];
     platforms = with stdenv.lib.platforms; all;
   };
 }
-// stdenv.lib.optionalAttrs buildClang (
-  # I write the assert because 'gcc.libc' will be evaluated although 'triplet' would not
-  # evaluate properly (in the preConfigure below)
-  assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
-  let
-    triplet = if (stdenv.system == "i686-linux") then "i686-unknown-linux-gnu"
-              else if (stdenv.system == "x86_64-linux") then "x86_64-unknown-linux-gnu"
-              else throw "System not supported";
-  in {
-    name = "clang-2.8";
 
-    srcClang = fetchurl {
-      url = http://llvm.org/releases/2.8/clang-2.8.tgz;
-      sha256 = "1hg0vqmyr4wdy686l2bga0rpin41v0q9ds2k5659m8z6acali0zd";
-    };
-
-    prePatch = ''
-      pushd tools
-      unpackFile $srcClang
-      mv clang-2.8 clang
-      popd
-      find
-    '';
-
-    patches = [ ./clang-include-paths.patch ];
-
-    # Set up the header file paths
-    preConfigure = ''
-      sed -i -e 's,C_INCLUDE_PATH,"${gcc.libc}/include/",' \
-        -e 's,CPP_HOST,"${triplet}",' \
-        -e 's,CPP_INCLUDE_PATH,"${gcc.gcc}/include/c++/${gcc.gcc.version}",' \
-        tools/clang/lib/Frontend/InitHeaderSearch.cpp
-    '';
-
-    meta = {
-      homepage = http://clang.llvm.org/;
-      description = "A C language family frontend for LLVM";
-      license = "BSD";
-      maintainers = with stdenv.lib.maintainers; [viric];
-      platforms = with stdenv.lib.platforms; linux;
-    };
-  }
-))
diff --git a/pkgs/development/compilers/llvm/svn-head.nix b/pkgs/development/compilers/llvm/svn-head.nix
deleted file mode 100644
index f929815f8a2..00000000000
--- a/pkgs/development/compilers/llvm/svn-head.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{ stdenv, fetchurl, gcc, flex, perl, libtool, groff, fetchsvn
-, buildClang ? false }:
-
-let rev =  "134309"; in
-stdenv.mkDerivation ({
-  name = "llvm-r${rev}";
-  
-  src = fetchsvn {
-    url    = "http://llvm.org/svn/llvm-project/llvm/trunk";
-    inherit rev;
-    sha256 = "136qwpcl22r5bl9y4kk94vgbha1m58xrggy7qw19lg7jkgxxj8s6";
-  };
-
-  buildInputs = [ gcc flex perl groff ];
-
-  configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ];
-
-  meta = {
-    homepage = http://llvm.org/;
-    description = "Collection of modular and reusable compiler and toolchain technologies";
-    license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; all;
-  };
-}
-// stdenv.lib.optionalAttrs buildClang (
-  # I write the assert because 'gcc.libc' will be evaluated although 'triplet' would not
-  # evaluate properly (in the preConfigure below)
-  assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
-  let
-    triplet = if (stdenv.system == "i686-linux") then "i686-unknown-linux-gnu"
-              else if (stdenv.system == "x86_64-linux") then "x86_64-unknown-linux-gnu"
-              else throw "System not supported";
-  in rec {
-    name = "clang-r${rev}";
-
-    srcClang = fetchsvn {
-      url = http://llvm.org/svn/llvm-project/cfe/trunk;
-      inherit rev;
-      sha256 = "0afbrjakfw6zgsplxblgzr2kwjndlnr2lnqjnbj16ggam5fcnhlr";
-    };
-
-    prePatch = ''
-      cp -r ${srcClang} tools/clang
-      chmod u+rwX -R tools/clang
-    '';
-
-    patches = [ ./clang-include-paths-svn.patch ];
-
-    # Set up the header file paths
-    preConfigure = ''
-      sed -i -e 's,C_INCLUDE_PATH,"${gcc.libc}/include/",' \
-        -e 's,CPP_HOST,"${triplet}",' \
-        -e 's,CPP_INCLUDE_PATH,"${gcc.gcc}/include/c++/${gcc.gcc.version}",' \
-        tools/clang/lib/Frontend/InitHeaderSearch.cpp
-    '';
-
-    meta = {
-      homepage = http://clang.llvm.org/;
-      description = "A C language family frontend for LLVM";
-      license = "BSD";
-      maintainers = with stdenv.lib.maintainers; [viric];
-      platforms = with stdenv.lib.platforms; linux;
-    };
-  }
-))
diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix
index 8a277f9b89e..ef11c5b3baf 100644
--- a/pkgs/development/compilers/mit-scheme/default.nix
+++ b/pkgs/development/compilers/mit-scheme/default.nix
@@ -1,7 +1,7 @@
-{ fetchurl, stdenv, gnum4 }:
+{ fetchurl, stdenv, gnum4, texinfo, texLive, automake }:
 
 let
-  version = "9.0.1";
+  version = "9.1.1";
   bootstrapFromC = ! (stdenv.isi686 || stdenv.isx86_64);
 in
 stdenv.mkDerivation {
@@ -15,23 +15,38 @@ stdenv.mkDerivation {
     if stdenv.isi686
     then fetchurl {
       url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-i386.tar.gz";
-      sha256 = "0cfj3bawjdnpa7cbqh2f23hfpjpmryypmzkhndvdbi79a65fl0n2";
+      sha256 = "0vi760fy550d9db538m0vzbq1mpdncvw9g8bk4lswk0kcdira55z";
     } else if stdenv.isx86_64
     then fetchurl {
       url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-x86-64.tar.gz";
-      sha256 = "0p188d7n0iqdgvra6qv5apvcsv0z2p97ry7xz5216zkc364i6mmr";
+      sha256 = "1wcxm9hyfc53myvlcn93fyqrnnn4scwkknl9hkbp1cphc6mp291x";
     } else fetchurl {
       url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-c-${version}.tar.gz";
-      sha256 = "1g2mifrx0bvag0hlrbk81rkrlm1pbn688zw8b9d2i0sl5g2p1ril";
+      sha256 = "0pclakzwxbqgy6wqwvs6ml62wgby8ba8xzmwzdwhx1v8wv05yw1j";
     };
 
-  preConfigure = "cd src";
   buildPhase =
-    if bootstrapFromC
-    then "./etc/make-liarc.sh --prefix=$out"
-    else "make compile-microcode";
+    '' cd src
+       ${if bootstrapFromC
+         then "./etc/make-liarc.sh --prefix=$out"
+         else "make compile-microcode"}
 
-  buildInputs = [ gnum4 ];
+       cd ../doc
+
+       # Provide a `texinfo.tex'.
+       export TEXINPUTS="$(echo ${automake}/share/automake-*)"
+       echo "\$TEXINPUTS is \`$TEXINPUTS'"
+       make
+
+       cd ..
+    '';
+
+  installPhase =
+    '' make install -C src
+       make install -C doc
+    '';
+
+  buildNativeInputs = [ gnum4 texinfo texLive automake ];
 
   # XXX: The `check' target doesn't exist.
   doCheck = false;
diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
new file mode 100644
index 00000000000..8bb201f975e
--- /dev/null
+++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, patchelf }:
+
+assert stdenv ? glibc;
+
+stdenv.mkDerivation rec {
+  version = "3.0";
+  
+  date = "February2011";
+  
+  name = "nvidia-cg-toolkit-${version}";
+  
+  src =
+    if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86_64.tgz";
+        sha256 = "07gmnzfsla3vf1kf00cj86p87h6wrdbp6ri4ycslc5kmfxsq7ypq";
+      }
+    else if stdenv.system == "i686-linux" then
+      fetchurl {
+        url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86.tgz";
+        sha256 = "0hr8l0r20akbfm5j0vqv4ghl0acwjf5996pxnfxlajacl9w58nam";
+      }
+    else throw "nvidia-cg-toolkit does not support platform ${stdenv.system}";
+    
+  installPhase = ''
+    for b in cgc cgfxcat cginfo
+    do
+        patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-*.so.? "bin/$b"
+    done
+    # FIXME: cgfxcat and cginfo need more patchelf
+    ensureDir "$out/bin/"
+    cp -v bin/* "$out/bin/"
+    ensureDir "$out/include/"
+    cp -v -r include/Cg/ "$out/include/"
+    ensureDir "$out/lib/"
+    [ "$system" = "x86_64-linux" ] && cp -v lib64/* "$out/lib/"
+    [ "$system" = "i686-linux" ] && cp -v lib/* "$out/lib/"
+    for mandir in man1 man3 manCg manCgFX
+    do
+        ensureDir "$out/share/man/$mandir/"
+        cp -v share/man/$mandir/* "$out/share/man/$mandir/"
+    done
+    ensureDir "$out/share/doc/$name/"
+    cp -v -r local/Cg/* "$out/share/doc/$name/"
+  '';
+  
+  meta = {
+    homepage = http://developer.nvidia.com/cg-toolkit;
+    license = [ "nonfree-redistributable" ];
+  };
+}
diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix
new file mode 100644
index 00000000000..6df16e44c3d
--- /dev/null
+++ b/pkgs/development/compilers/opa/default.nix
@@ -0,0 +1,63 @@
+{ stdenv, fetchurl, which, ocaml, perl, jdk
+, findlib, ocaml_ssl, openssl, cryptokit, camlzip, ulex
+, ocamlgraph, coreutils, zlib, ncurses, makeWrapper
+, gcc, binutils, gnumake } :
+
+stdenv.mkDerivation rec {
+  pname = "opa";
+  version = "962";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/MLstate/opalang/tarball/v${version}";
+    name = "opa-${version}.tar.gz";
+    sha256 = "0g4kq2kxbld0iqlzb076b7g43d8fh4sfxam615z15mbk1jcvpf9l";
+  };
+
+  # Paths so the opa compiler code generation will use the same programs as were
+  # used to build opa.
+  codeGeneratorPaths = "${ocaml}/bin:${gcc}/bin:${binutils}/bin:${gnumake}/bin";
+
+  prePatch = ''
+    find . -type f -exec sed -i 's@/usr/bin/env@${coreutils}/bin/env@' {} \;
+    find . -type f -exec sed -i 's@/usr/bin/perl@${perl}/bin/perl@' {} \;
+  '';
+
+  patches = [ ./locate.patch ./libdir.patch ];
+
+  preConfigure = ''
+    configureFlags="$configureFlags -prefix $out"
+  '';
+
+  dontAddPrefix = true;
+
+  configureFlags = "-ocamlfind ${findlib}/bin/ocamlfind -openssl ${openssl}/lib";
+
+  buildInputs = [ which ocaml perl jdk findlib ocaml_ssl openssl cryptokit camlzip ulex
+                  ocamlgraph coreutils zlib ncurses makeWrapper gcc binutils gnumake ];
+
+  postInstall = ''
+    # Have compiler use same tools for code generation as used to build it.
+    for p in $out/bin/opa ; do
+      wrapProgram $p --prefix PATH ":" "${codeGeneratorPaths}" ;
+    done
+
+    # Install emacs mode.
+    ensureDir $out/share/emacs/site-lisp/opa
+    install -m 0644 -v ./utils/emacs/{opa-mode.el,site-start.el} $out/share/emacs/site-lisp/opa
+  '';
+
+  meta = {
+    description = "Opa is a concise and elegant language for writing distributed web applications. Both client and server sides.";
+    longDescription = ''
+    Opa is a new generation of web development platform that lets you write distributed
+    web applications using a single technology. Among the the many features of Opa are these:
+    Opa is concise, simple, concurrent, dynamically distributed, and secure.
+    '';
+
+    homepage = http://opalang.org/;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.kkallio ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/development/compilers/opa/libdir.patch b/pkgs/development/compilers/opa/libdir.patch
new file mode 100644
index 00000000000..05c8a89afa8
--- /dev/null
+++ b/pkgs/development/compilers/opa/libdir.patch
@@ -0,0 +1,93 @@
+These patches have the compiler place path flags in various places so that
+ocaml and c libraries are found in their Nixpkgs locations.
+
+diff -x '*~' -Naur MLstate-opalang-6b295a9//build_rules.ml MLstate-opalang-6b295a9-new//build_rules.ml
+--- MLstate-opalang-6b295a9//build_rules.ml	2011-11-21 08:07:04.000000000 -0430
++++ MLstate-opalang-6b295a9-new//build_rules.ml	2011-11-27 00:34:35.845277134 -0430
+@@ -373,7 +373,11 @@
+     | Some dep -> dep::list
+   ) (tags_of_pathname (env "%.opa_plugin")) []
+   in
+-  let lib_dir s = [A"--ml";A"-I";A"--ml";P (if Pathname.exists s then ".." / s else ("+"^s))] in
++  let cryptokitdir_opt = function
++    | Some path -> path
++    | None -> ""
++  in
++  let lib_dir s = [A"--ml";A"-I";A"--ml";P (if Pathname.exists s then ".." / s else (if s = "cryptokit" then (cryptokitdir_opt Config.Libdir.cryptokit) else ("+"^s)))] in
+   let include_dirs = List.flatten (List.map lib_dir caml_use_lib) in
+   let files = List.map ((^) path) files in
+   build_list build files;
+diff -x '*~' -Naur MLstate-opalang-6b295a9//config.mli MLstate-opalang-6b295a9-new//config.mli
+--- MLstate-opalang-6b295a9//config.mli	2011-11-21 08:07:04.000000000 -0430
++++ MLstate-opalang-6b295a9-new//config.mli	2011-11-27 00:30:39.312443906 -0430
+@@ -43,6 +43,9 @@
+ (** Flag for Dbm present *)
+ val has_dbm : bool
+ 
++(** openssh link directory *)
++val openssl : string option
++
+ (** library directories, if the libs are enabled *)
+ val libnatpmp : (string*string*string) option (** name of the lib, lib dir, include dir *)
+ 
+diff -x '*~' -Naur MLstate-opalang-6b295a9//configure MLstate-opalang-6b295a9-new//configure
+--- MLstate-opalang-6b295a9//configure	2011-11-21 08:07:04.000000000 -0430
++++ MLstate-opalang-6b295a9-new//configure	2011-11-27 00:40:52.496151405 -0430
+@@ -27,6 +27,7 @@
+ 
+ NO_CAMLIDL=1
+ NO_DBM=1
++CONFIG_LIB_OPENSSL=""
+ 
+ while [ $# -gt 0 ]; do
+     case "$1" in
+@@ -51,6 +52,11 @@
+             shift
+             OCAMLOPT=$1
+             ;;
++        -openssl)
++            if [ $# -lt 2 ]; then echo "Error: option $1 requires an argument" >&2; exit 1; fi
++            shift
++            CONFIG_LIB_OPENSSL=$1
++            ;;
+         -ocamlfind)
+             if [ $# -lt 2 ]; then echo "Error: option $1 requires an argument" >&2; exit 1; fi
+             shift
+@@ -647,6 +653,8 @@
+ let miniupnpc = $(camlopt "$HAS_MINIUPNPC" "$(camlstrtuple "${MINIUPNPC[@]}")")
+ let has_dbm = $(camlbool "$HAS_DBM")
+ 
++let openssl = $(camlopt "$CONFIG_LIB_OPENSSL" '"'"$CONFIG_LIB_OPENSSL"'"')
++
+ let available = [ $TAGS_LIST]
+ let all_tags = [ $(for t in $ALL_TAGS_LIST; do echo -n "\"$t\"; "; done)]
+ 
+diff -x '*~' -Naur MLstate-opalang-6b295a9//qml2ocaml/qml2ocamlOptions.ml MLstate-opalang-6b295a9-new//qml2ocaml/qml2ocamlOptions.ml
+--- MLstate-opalang-6b295a9//qml2ocaml/qml2ocamlOptions.ml	2011-11-21 08:07:04.000000000 -0430
++++ MLstate-opalang-6b295a9-new//qml2ocaml/qml2ocamlOptions.ml	2011-11-27 00:32:57.721442828 -0430
+@@ -44,6 +44,7 @@
+ 
+   let options_linker =
+     ["-w a"]
++    @ (match Config.openssl with | Some dir -> ["-ccopt"; "-L"^dir] | None -> [])
+     @ (if Base.is_windows then
+          ["-cclib"; "Dnsapi.lib"; "-cclib"; "libeay32.lib"; "-cclib"; "ssleay32.lib" (*; "ssl_stubs.obj" *)]
+        else [])
+@@ -51,11 +52,13 @@
+   (**
+      Absolute path for include directory, will be passed with the option -I to the ocaml compiler.
+   *)
++  let uselibdirpath = fun po p -> match po with | Some path -> path | None -> p
++
+   let server_include_dir = [
+-    "+zip" ; "+site-lib/zip" ; "+site-lib/camlzip" ;
+-    "+ssl" ; "+site-lib/ssl" ;
+-    "+cryptokit"; "+site-lib/cryptokit" ;
+-    "+ulex" ; "+site-lib/ulex" ;
++    uselibdirpath Config.Libdir.camlzip "+zip" ; "+site-lib/zip" ; "+site-lib/camlzip" ;
++    uselibdirpath Config.Libdir.ssl "+ssl" ; "+site-lib/ssl" ;
++    uselibdirpath Config.Libdir.cryptokit "+cryptokit"; "+site-lib/cryptokit" ;
++    uselibdirpath Config.Libdir.ulex "+ulex" ; "+site-lib/ulex" ;
+   ] @ (
+     if Config.has_dbm then [
+       "+dbm" ; "+site-lib/dbm" ;
diff --git a/pkgs/development/compilers/opa/locate.patch b/pkgs/development/compilers/opa/locate.patch
new file mode 100644
index 00000000000..e67e6bab260
--- /dev/null
+++ b/pkgs/development/compilers/opa/locate.patch
@@ -0,0 +1,14 @@
+Needed to have ocamlfind discover ocamlgraph with Nixpkgs.
+
+diff -x '*~' -Naur MLstate-opalang-ee92891/configure MLstate-opalang-ee92891-new//configure
+--- MLstate-opalang-ee92891/configure	2011-09-30 05:41:18.000000000 -0430
++++ MLstate-opalang-ee92891-new//configure	2011-11-24 13:47:01.332558705 -0430
+@@ -567,7 +567,7 @@
+ fi
+ 
+ # - checking ocamlgraph
+-if ! CONFIG_LIB_OCAMLGRAPH=$(locate-ocaml-lib "Graph" "ocamlgraph/graph")
++if ! CONFIG_LIB_OCAMLGRAPH=$(locate-ocaml-lib "Graph" "ocamlgraph" "graph")
+ then lib-not-found "ocamlgraph" "libocamlgraph-ocaml-dev"
+ fi
+ 
diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix
index 364fbd621d7..bcdd3002fd6 100644
--- a/pkgs/development/compilers/sbcl/src-for-default.nix
+++ b/pkgs/development/compilers/sbcl/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="1.0.51";
-   name="sbcl-1.0.51";
-   hash="0kh7c7pgiv0k0rsm1iysbcp0hf2148fhpixi4d8kclryzqpzl9yj";
-   url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.51/sbcl-1.0.51-source.tar.bz2";
-   advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.51/sbcl-1.0.51-source.tar.bz2";
+   version="1.0.54";
+   name="sbcl-1.0.54";
+   hash="1ip13hz5zsys3vy68y3x0fapxs87xk0gqi6bdp68vyznz2a0v1cd";
+   url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.54/sbcl-1.0.54-source.tar.bz2";
+   advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.54/sbcl-1.0.54-source.tar.bz2";
   
   
 }
diff --git a/pkgs/development/compilers/sbcl/src-info-for-default.nix b/pkgs/development/compilers/sbcl/src-info-for-default.nix
index 4bc8516d4b9..597aded1792 100644
--- a/pkgs/development/compilers/sbcl/src-info-for-default.nix
+++ b/pkgs/development/compilers/sbcl/src-info-for-default.nix
@@ -1,8 +1,7 @@
 {
   baseName = "sbcl";
-  downloadPage = "http://sourceforge.net/projects/sbcl/files/";
-  choiceCommand = "head -n 2| tail -n 1 | sed -e 's@/download@@;'\"$skipRedirectSF\"";
-  sourceRegexp = "source[.-].*tar";
+  downloadPage = "http://sourceforge.net/projects/sbcl/files/sbcl/";
+  choiceCommand = "head -n 1 | sed -re 's%.*/([0-9.]+)/%http://downloads.sourceforge.net/project/sbcl/sbcl/\\1/sbcl-\\1-source.tar.bz2%'";
+  sourceRegexp = "[/][0-9.]+/\$";
   versionExtractorSedScript = "s/.*-([0-9.rc]+)-.*/\\1/";
-  blacklistRegexp = "1[.]0[.]3[012]|1[.]0[.]29[.]54[.]rc1";
 }
diff --git a/pkgs/development/compilers/strategoxt/0.18.nix b/pkgs/development/compilers/strategoxt/0.18.nix
index 898923b48ac..edb3c2691c6 100644
--- a/pkgs/development/compilers/strategoxt/0.18.nix
+++ b/pkgs/development/compilers/strategoxt/0.18.nix
@@ -41,11 +41,11 @@ rec {
 
   
   strategoxt = stdenv.mkDerivation rec {
-    name = "strategoxt-1.8pre21839";
+    name = "strategoxt-1.8pre23644";
 
     src = fetchurl {
-      url = http://hydra.nixos.org/build/1030762/download/1/strategoxt-1.8pre21839.tar.gz;
-      sha256 = "b84012ac75dfd031e5356f07ea9202b9e660de48e07de0b8e1c93ac39c073b24";
+      url = http://hydra.nixos.org/build/1569309/download/1/strategoxt-1.8pre23644.tar.gz;
+      sha256 = "9c900d132e7a8790e914aa78598c376f8ed05947c62b9d05df617ba2eae29381";
     };
 
     buildInputs = [pkgconfig aterm sdf getopt];
diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index 1b24b7008f6..7ece90e8601 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -11,7 +11,7 @@ let version = "0.9.25"; in
       sha256 = "0dfycf80x73dz67c97j1ry29wrv35393ai5ry46i1x1fzfq6rv8v";
     };
 
-    buildInputs = [ perl texinfo ];
+    buildNativeInputs = [ perl texinfo ];
 
     patches =
       [ (fetchurl {
diff --git a/pkgs/development/compilers/ehc/default.nix b/pkgs/development/compilers/uhc/default.nix
similarity index 67%
rename from pkgs/development/compilers/ehc/default.nix
rename to pkgs/development/compilers/uhc/default.nix
index 27a0c431f67..0baba9c603e 100644
--- a/pkgs/development/compilers/ehc/default.nix
+++ b/pkgs/development/compilers/uhc/default.nix
@@ -3,28 +3,29 @@
 }:
 
 let
-  revision = "2293";
+  revision = "2375";
 in
 stdenv.mkDerivation {
-  name = "ehc-svn-${revision}";
+  name = "uhc-svn-${revision}";
 
   src = fetchsvn {
-     url = https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC;
+     url = "https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC";
      rev = revision;
-     sha256 = "f4c3d83734cffd64b11e31637598330271a2bb8d2573235d063b27b2ef5f76b6";
+     sha256 = "bde79664b7d04337ce668eab63291702687e6d572a302111425e5ff870c57619";
   };
 
   propagatedBuildInputs = [mtl network binary fgl syb];
   buildInputs = [coreutils m4 ghc libtool uulib uuagc];
 
+  # Can we rename this flag to "--with-cpp-uhc-options"?
   configureFlags = "--with-cpp-ehc-options=-I${glibc}/include";
 
-  # EHC builds packages during compilation; these are by default
+  # UHC builds packages during compilation; these are by default
   # installed in the user-specific package config file. We do not
   # want that, and hack the build process to use a temporary package
   # configuration file instead.
   preConfigure = ''
-    p=`pwd`/ehc-local-packages
+    p=`pwd`/uhc-local-packages
     echo '[]' > $p
     sed -i "s|--user|--package-db=$p|g" mk/shared.mk.in
     sed -i "s|-fglasgow-exts|-fglasgow-exts -package-conf=$p|g" mk/shared.mk.in
@@ -32,8 +33,8 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "http://www.cs.uu.nl/wiki/Ehc/WebHome";
-    description = "Essential Haskell Compiler";
+    homepage = "http://www.cs.uu.nl/wiki/UHC";
+    description = "Utrecht Haskell Compiler";
     platforms = stdenv.lib.platforms.linux;
     maintainers = [
       stdenv.lib.maintainers.andres
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index 44067e4207d..2c197a1be57 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -2,23 +2,23 @@
 
 stdenv.mkDerivation rec {
   pname = "urweb";
-  version = "20110917";
+  version = "20111127";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.impredicative.com/ur/${name}.tgz";
-    sha256 = "1qgb25bwpdcs303q7yz1dm577xyy5pzzyvaqabhkvhbgxmlcpl73";
+    sha256 = "1mhicigbi434fdr4gim4dswnmff9dldszh93g2w2542nlxvn9lbj";
   };
 
   buildInputs = [ stdenv.gcc file openssl mlton mysql postgresql sqlite ];
 
   prePatch = ''
     sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure
-    sed -e 's@gcc @${stdenv.gcc}/bin/gcc @g' -i src/compiler.sml
     '';
 
   preConfigure =
     ''
+      export CC="${stdenv.gcc}/bin/gcc";
       export CCARGS="-I$out/include \
                       -L${mysql}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib";
 
diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix
index b6a7a43297c..30480844a41 100644
--- a/pkgs/development/guile-modules/guile-gnome/default.nix
+++ b/pkgs/development/guile-modules/guile-gnome/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, guile, guile_lib, gwrap
-, pkgconfig, gconf, glib, gnomevfs, gtk
+, pkgconfig, gconf, glib, gnome_vfs, gtk
 , libglade, libgnome, libgnomecanvas, libgnomeui, pango, guileCairo }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ guile gwrap
-      pkgconfig gconf glib gnomevfs gtk libglade libgnome libgnomecanvas
+      pkgconfig gconf glib gnome_vfs gtk libglade libgnome libgnomecanvas
       libgnomeui pango guileCairo
     ]
     ++ stdenv.lib.optional doCheck guile_lib;
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index be8d238a97c..bb64d35f8a4 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
+{ fetchurl, stdenv, xz, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
 , libffi, gawk, makeWrapper, coverageAnalysis ? null }:
 
 # Do either a coverage analysis build or a standard build.
@@ -7,17 +7,15 @@
  else stdenv.mkDerivation)
 
 rec {
-  name = "guile-2.0.2";
+  name = "guile-2.0.3";
 
   src = fetchurl {
-    url = "mirror://gnu/guile/${name}.tar.gz";
-    sha256 = "0adiwydwb285bb7mcakfdzjgyv24lrm7pk2grgxzi66kidpm6dhx";
+    url = "mirror://gnu/guile/${name}.tar.xz";
+    sha256 = "14rhlpxxa4v5y3gl992l7lnd5qnqawx0a84idnwq0w2qviwcvsyj";
   };
 
-  buildInputs =
-    [ makeWrapper gawk readline libtool libunistring
-      libffi pkgconfig
-    ];
+  buildNativeInputs = [ xz makeWrapper gawk pkgconfig ];
+  buildInputs = [ readline libtool libunistring libffi ];
   propagatedBuildInputs = [ gmp boehmgc ]
 
     # XXX: These ones aren't normally needed here, but since
@@ -26,9 +24,13 @@ rec {
     # see below.
     ++ [ libtool libunistring ];
 
-  patches =
-    stdenv.lib.optionals (coverageAnalysis != null)
-      [ ./gcov-file-name.patch ./disable-gc-sensitive-tests.patch ];
+  # A native Guile 2.0 is needed to cross-build Guile.
+  selfBuildNativeInput = true;
+
+  enableParallelBuilding = true;
+
+  patches = [ ./disable-gc-sensitive-tests.patch ] ++
+    (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch);
 
   postInstall = ''
     wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
diff --git a/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch b/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch
index 8a43e58f5f5..076091a702a 100644
--- a/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch
+++ b/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch
@@ -3,6 +3,16 @@ compiling with `-O0' (as is done with coverage analysis) since there may
 be many false references held on the stack, leading to the failure of
 such tests.
 
+--- a/test-suite/tests/gc.test
++++ b/test-suite/tests/gc.test
+@@ -67,6 +67,7 @@
+ 
+ (with-test-prefix "gc"
+   (pass-if "Unused modules are removed"
++    (throw 'unresolved)
+     (let* ((guard (make-guardian))
+            (total 1000))
+
 --- a/test-suite/tests/threads.test
 +++ b/test-suite/tests/threads.test
 @@ -366,6 +366,7 @@
diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix
index b3427caea59..b5ec30563d0 100644
--- a/pkgs/development/interpreters/io/default.nix
+++ b/pkgs/development/interpreters/io/default.nix
@@ -1,57 +1,31 @@
-args :  
-let 
-  lib = args.lib;
-  fetchurl = args.fetchurl;
-  fullDepEntry = args.fullDepEntry;
-  doPatchShebangs = args.doPatchShebangs;
+{ stdenv, fetchurl, cmake, zlib, sqlite, gmp, libffi, cairo, ncurses,
+  freetype, mesa, libpng, libtiff, libjpeg, readline, libsndfile, libxml2,
+  freeglut, libsamplerate, pcre, libevent, libedit, yajl,
+  python, openssl, glfw
+}:
 
-  version = lib.attrByPath ["version"] "2008.03.30" args; 
-  buildInputs = with args; [
-    zlib sqlite gmp libffi cairo ncurses freetype mesa
+stdenv.mkDerivation {
+  name = "io-2011.09.12";
+  src = fetchurl {
+    url = http://github.com/stevedekorte/io/tarball/2011.09.12;
+    name = "io-2011.09.12.tar.gz";
+    sha256 = "14nhk5vkk74pbf36jsfaxqh2ihi5d7jby79yf1ibbax319xbjk3v";
+  };
+
+  buildInputs = [
+    cmake zlib sqlite gmp libffi cairo ncurses freetype mesa
     libpng libtiff libjpeg readline libsndfile libxml2
-    freeglut e2fsprogs libsamplerate pcre libevent libedit
+    freeglut libsamplerate pcre libevent libedit yajl
   ];
-in
-rec {
-  src = /* Here a fetchurl expression goes */
-    fetchurl {
-      url = "http://github.com/stevedekorte/io/tarball/${version}";
-      name = "io-${version}.tar.gz";
-      sha256 = "1i1hcidcf93145jj1vwwa2jvp8lb25pn2kg0cb56a059narrqxlv";
-    };
 
-  inherit buildInputs;
-  configureFlags = [];
+  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=release" ];
 
-  makeFlags = ["INSTALL_PREFIX=$out"];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["preBuild" "doMakeInstall" "postInstall" (doPatchShebangs "$out/share/io/samples") 
-    (doPatchShebangs "$out/lib/io")];
-      
-  preBuild = fullDepEntry (''
-    for i in $pkgs ${
-        if args.stdenv ? glibc then args.stdenv.glibc else ""
-      } ${
-        if args ? libffi &&  args.libffi != null then "$(echo ${args.libffi}/lib/*/include/..)" else ""
-      }; do
-        echo "Path: $i"
-        sed -i build/AddonBuilder.io -e '/"\/sw"/asearchPrefixes append("'"$i"'"); '
-	sed -i addons/Flux/io/Flux.io -e 's@/usr/local/@'"$out/"'@g' 
-    done
-  '') ["minInit" "addInputs" "doUnpack"];
-
-  postInstall = fullDepEntry (''
-    ensureDir $out/share/io
-
-    ln -s $out/lib/io/addons $out/share/io
-    cp -r samples $out/share/io
-  '') ["minInit" "doUnpack" "defEnsureDir" "doMakeInstall"];
-
-  name = "io-" + version;
   meta = {
     description = "Io programming language";
-    maintainers = [lib.maintainers.raskin];
-    platforms = lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [
+      raskin
+      z77z
+    ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix
index 69cb686bec2..dd1982e836d 100644
--- a/pkgs/development/interpreters/pure/default.nix
+++ b/pkgs/development/interpreters/pure/default.nix
@@ -12,11 +12,11 @@ let
   sourceInfo = rec {
     baseName="pure";
     project="pure-lang";
-    version="0.47";
+    version="0.49";
     name="${baseName}-${version}";
     extension="tar.gz";
     url="http://${project}.googlecode.com/files/${name}.${extension}";
-    hash="16j0k639kw2am4fc2h7q5sk7kx5z7nca896dakhphlb9zn9h0gbv";
+    hash="0kkrcmmqks82g3qlkvs3cd23v6b5948rw3xsdadd1jidh74jg33x";
   };
 in
 rec {
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 0b2eac45e3f..81a8c8ec696 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   pname = "racket";
-  version = "5.1.3";
+  version = "5.2";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://download.racket-lang.org/installers/${version}/${pname}/${name}-src-unix.tgz";
-    sha256 = "0dhcx6fzjc2cnhfr0j3pbq8lgxfgmhssidi62q0byiqpcm8wjd98";
+    sha256 = "1viz2hq1q1wyw9jmnssg5sbgglh05fwqkhyhfbak9lb6nfbhlg5w";
   };
 
   # Various racket executables do run-time searches for these.
diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
index b6ec049f9f7..1c286aa2ce4 100644
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@@ -3,106 +3,108 @@
 g: # Get dependencies from patched gems
 {
   aliases = {
-    actionmailer = g.actionmailer_3_1_0;
-    actionpack = g.actionpack_3_1_0;
-    activemodel = g.activemodel_3_1_0;
-    activerecord = g.activerecord_3_1_0;
-    activeresource = g.activeresource_3_1_0;
-    activesupport = g.activesupport_3_1_0;
+    actionmailer = g.actionmailer_3_1_3;
+    actionpack = g.actionpack_3_1_3;
+    activemodel = g.activemodel_3_1_3;
+    activerecord = g.activerecord_3_1_3;
+    activeresource = g.activeresource_3_1_3;
+    activesupport = g.activesupport_3_1_3;
     arel = g.arel_2_2_1;
-    bcrypt_ruby = g.bcrypt_ruby_3_0_0;
     builder = g.builder_3_0_0;
-    bundler = g.bundler_1_0_18;
+    bundler = g.bundler_1_0_21;
     erubis = g.erubis_2_7_0;
     hike = g.hike_1_2_1;
     i18n = g.i18n_0_6_0;
+    json = g.json_1_6_3;
     mail = g.mail_2_3_0;
-    mime_types = g.mime_types_1_16;
-    multi_json = g.multi_json_1_0_3;
+    mime_types = g.mime_types_1_17_2;
+    multi_json = g.multi_json_1_0_4;
     nix = g.nix_0_1_1;
-    polyglot = g.polyglot_0_3_2;
-    rack = g.rack_1_3_2;
-    rack_cache = g.rack_cache_1_0_3;
+    polyglot = g.polyglot_0_3_3;
+    rack = g.rack_1_3_5;
+    rack_cache = g.rack_cache_1_1;
     rack_mount = g.rack_mount_0_8_3;
     rack_ssl = g.rack_ssl_1_3_2;
     rack_test = g.rack_test_0_6_1;
-    rails = g.rails_3_1_0;
-    railties = g.railties_3_1_0;
-    rake = g.rake_0_9_2;
-    rdoc = g.rdoc_3_9_4;
-    sprockets = g.sprockets_2_0_0;
+    rails = g.rails_3_1_3;
+    railties = g.railties_3_1_3;
+    rake = g.rake_0_9_2_2;
+    rb_fsevent = g.rb_fsevent_0_4_3_1;
+    rdoc = g.rdoc_3_11;
+    sass = g.sass_3_1_11;
+    sprockets = g.sprockets_2_0_3;
     thor = g.thor_0_14_6;
     tilt = g.tilt_1_3_3;
     treetop = g.treetop_1_4_10;
-    tzinfo = g.tzinfo_0_3_29;
+    tzinfo = g.tzinfo_0_3_31;
   };
-  gem_nix_args = [ ''nix'' ''rails'' ''rake'' ];
+  gem_nix_args = [ ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ];
   gems = {
-    actionmailer_3_1_0 = {
+    actionmailer_3_1_3 = {
       basename = ''actionmailer'';
       meta = {
         description = ''Email composition, delivery, and receiving framework (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.'';
       };
-      name = ''actionmailer-3.1.0'';
+      name = ''actionmailer-3.1.3'';
       requiredGems = [ g.mail_2_3_0 ];
-      sha256 = ''1730ky434qhbqnwnvbj9r57i4s6lcmwvnfhv6i91iif7anmjl22p'';
+      sha256 = ''04qjgf8irg2srqa9j0ahxpydx42h9dymiabfiyzwy0h3wayg2qyj'';
     };
-    actionpack_3_1_0 = {
+    actionpack_3_1_3 = {
       basename = ''actionpack'';
       meta = {
         description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.'';
       };
-      name = ''actionpack-3.1.0'';
-      requiredGems = [ g.activemodel_3_1_0 g.rack_cache_1_0_3 g.rack_test_0_6_1 g.rack_mount_0_8_3 g.sprockets_2_0_0 g.erubis_2_7_0 ];
-      sha256 = ''0igy1dp8zdh653v4wz7vxdjmz681k8653n0xan9ng1qgsk9b7wlh'';
+      name = ''actionpack-3.1.3'';
+      requiredGems = [ g.activemodel_3_1_3 g.rack_cache_1_1 g.rack_test_0_6_1 g.rack_mount_0_8_3 g.sprockets_2_0_3 g.erubis_2_7_0 ];
+      sha256 = ''1awhqxdfg2zcb0b34jwq3sm2favay94n4glqywqzrn85wkf47a2q'';
     };
-    activemodel_3_1_0 = {
+    activemodel_3_1_3 = {
       basename = ''activemodel'';
       meta = {
         description = ''A toolkit for building modeling frameworks (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.'';
       };
-      name = ''activemodel-3.1.0'';
-      requiredGems = [ g.builder_3_0_0 g.i18n_0_6_0 g.bcrypt_ruby_3_0_0 ];
-      sha256 = ''1hpppp54v05ci4l7nx79i9lcnf6z00lhi5wpn8sgyr5869xihvq6'';
+      name = ''activemodel-3.1.3'';
+      requiredGems = [ g.builder_3_0_0 g.i18n_0_6_0 ];
+      sha256 = ''1kpkr1gwvjbxc8q3n1ps1j8zf7m1258swb9n5zm5igr6j0d803a3'';
     };
-    activerecord_3_1_0 = {
+    activerecord_3_1_3 = {
       basename = ''activerecord'';
       meta = {
         description = ''Object-relational mapper framework (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.'';
       };
-      name = ''activerecord-3.1.0'';
-      requiredGems = [ g.arel_2_2_1 g.tzinfo_0_3_29 ];
-      sha256 = ''1dq5k2r6a85wmzgv5gv0rrxf43agzzcj6z4az6w034nxarv7ccml'';
+      name = ''activerecord-3.1.3'';
+      requiredGems = [ g.arel_2_2_1 g.tzinfo_0_3_31 ];
+      sha256 = ''0z2p51hm12alg6axih2mhxjsj8vmnvdqp3wwzcg9bbkp3fc368w0'';
     };
-    activeresource_3_1_0 = {
+    activeresource_3_1_3 = {
       basename = ''activeresource'';
       meta = {
         description = ''REST modeling framework (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.'';
       };
-      name = ''activeresource-3.1.0'';
+      name = ''activeresource-3.1.3'';
       requiredGems = [  ];
-      sha256 = ''1vd4mmfxk1zmqxv44q0wxhg74yc7qah17im44qjv0b850522vavg'';
+      sha256 = ''0hf3fi6zwk9zqzgk4rr95ax9mfzfkzpq28qw7fm2av6841wl54fg'';
     };
-    activesupport_3_1_0 = {
+    activesupport_3_1_3 = {
       basename = ''activesupport'';
       meta = {
         description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'';
       };
-      name = ''activesupport-3.1.0'';
-      requiredGems = [ g.multi_json_1_0_3 ];
-      sha256 = ''0hrnak4rpaxxb34918d9yjvcgz2jv7mnbsf3a7nz6dvqf6gw7110'';
+      name = ''activesupport-3.1.3'';
+      requiredGems = [ g.multi_json_1_0_4 ];
+      sha256 = ''19na7857adshdsswsgygky30r985ng100z3n78scd65481zcgb9z'';
     };
     arel_2_2_1 = {
       basename = ''arel'';
@@ -122,20 +124,6 @@ database compatibility and query generation.'';
       requiredGems = [  ];
       sha256 = ''19pz68pr9l8h2j2v3vqzhjvs94s0hwqwpb6m9sd6ncj18gaci8jy'';
     };
-    bcrypt_ruby_3_0_0 = {
-      basename = ''bcrypt_ruby'';
-      meta = {
-        description = ''OpenBSD's bcrypt() password hashing algorithm.'';
-        homepage = ''http://bcrypt-ruby.rubyforge.org'';
-        longDescription = ''    bcrypt() is a sophisticated and secure hash algorithm designed by The OpenBSD project
-    for hashing passwords. bcrypt-ruby provides a simple, humane wrapper for safely handling
-    passwords.
-'';
-      };
-      name = ''bcrypt-ruby-3.0.0'';
-      requiredGems = [  ];
-      sha256 = ''0chw0hh2vkb0nc4x1g350wzplf7kas6fddfa976c6gwvjgrbd7fw'';
-    };
     builder_3_0_0 = {
       basename = ''builder'';
       meta = {
@@ -152,16 +140,16 @@ simple to do.  Currently the following builder objects are supported:
       requiredGems = [  ];
       sha256 = ''13k12jii9z1hma4xxk2dl74wsx985idl3cs9svvla8p0bmgf3lzv'';
     };
-    bundler_1_0_18 = {
+    bundler_1_0_21 = {
       basename = ''bundler'';
       meta = {
         description = ''The best way to manage your application's dependencies'';
         homepage = ''http://gembundler.com'';
         longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably'';
       };
-      name = ''bundler-1.0.18'';
+      name = ''bundler-1.0.21'';
       requiredGems = [  ];
-      sha256 = ''0rz1qibmvydkfx0akq97rlihvf20jl51dxh8x0xivb1i0zkykb5b'';
+      sha256 = ''0lcxz75vvgqib43wxzv6021qs5d7bxhnds4j4q27hzqs982cn0s6'';
     };
     erubis_2_7_0 = {
       basename = ''erubis'';
@@ -208,6 +196,17 @@ simple to do.  Currently the following builder objects are supported:
       requiredGems = [  ];
       sha256 = ''1pgmfhmh2wv409g7kla30mkp8jpslvp25vcmmim1figl87wpn3j0'';
     };
+    json_1_6_3 = {
+      basename = ''json'';
+      meta = {
+        description = ''JSON Implementation for Ruby'';
+        homepage = ''http://flori.github.com/json'';
+        longDescription = ''This is a JSON implementation as a Ruby extension in C.'';
+      };
+      name = ''json-1.6.3'';
+      requiredGems = [  ];
+      sha256 = ''0bcl6r04b0r5c0n1y47c7d29r50rl2rzd2hsc23832kgfrc1488m'';
+    };
     mail_2_3_0 = {
       basename = ''mail'';
       meta = {
@@ -216,30 +215,44 @@ simple to do.  Currently the following builder objects are supported:
         longDescription = ''A really Ruby Mail handler.'';
       };
       name = ''mail-2.3.0'';
-      requiredGems = [ g.mime_types_1_16 g.treetop_1_4_10 ];
+      requiredGems = [ g.mime_types_1_17_2 g.treetop_1_4_10 ];
       sha256 = ''1cnid9wn5wy0d2shx4ykvgd5jrvgq55yal8i51b47d4037n1yr53'';
     };
-    mime_types_1_16 = {
+    mime_types_1_17_2 = {
       basename = ''mime_types'';
       meta = {
-        description = ''Manages a MIME Content-Type database that will return the Content-Type for a given filename.'';
+        description = ''This library allows for the identification of a file's likely MIME content type'';
         homepage = ''http://mime-types.rubyforge.org/'';
-        longDescription = ''MIME::Types for Ruby originally based on and synchronized with MIME::Types for Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data format for the MIME::Type list has changed and the synchronization will no longer happen.'';
+        longDescription = ''This library allows for the identification of a file's likely MIME content
+type. This is release 1.17.2. The identification of MIME content type is based
+on a file's filename extensions.
+
+MIME::Types for Ruby originally based on and synchronized with MIME::Types for
+Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data
+format for the MIME::Type list has changed and the synchronization will no
+longer happen.
+
+Homepage::  http://mime-types.rubyforge.org/
+GitHub::    http://github.com/halostatue/mime-types/
+Copyright:: 2002 - 2011, Austin Ziegler
+            Based in part on prior work copyright Mark Overmeer
+
+:include: License.rdoc'';
       };
-      name = ''mime-types-1.16'';
+      name = ''mime-types-1.17.2'';
       requiredGems = [  ];
-      sha256 = ''1slp7g2xv9ygcapqv13qgh3g6ipx5k5c3imb5sdyh0b9ip5s34y3'';
+      sha256 = ''0i4pmx86xbnlrhbbm9znnyfglmb21vwjvh262c6qw3m19w6ifs6p'';
     };
-    multi_json_1_0_3 = {
+    multi_json_1_0_4 = {
       basename = ''multi_json'';
       meta = {
         description = ''A gem to provide swappable JSON backends.'';
         homepage = ''http://github.com/intridea/multi_json'';
         longDescription = ''A gem to provide swappable JSON backends utilizing Yajl::Ruby, the JSON gem, JSON pure, or a vendored version of okjson.'';
       };
-      name = ''multi_json-1.0.3'';
+      name = ''multi_json-1.0.4'';
       requiredGems = [  ];
-      sha256 = ''12c7h38x1cmgl265n4397zx3ag8szkrq1q4lw7pp6fkqd532n9xb'';
+      sha256 = ''0f2yrlxcdhdskkm4q11p2didwl26wikxycysb7i49ndp94rklvcr'';
     };
     nix_0_1_1 = {
       basename = ''nix'';
@@ -252,7 +265,7 @@ simple to do.  Currently the following builder objects are supported:
       requiredGems = [  ];
       sha256 = ''0kwrbkkg0gxibhsz9dpd5zabcf2wqsicg28yiazyb3dc9dslk26k'';
     };
-    polyglot_0_3_2 = {
+    polyglot_0_3_3 = {
       basename = ''polyglot'';
       meta = {
         description = ''Augment 'require' to load non-Ruby file types'';
@@ -262,11 +275,11 @@ The Polyglot library allows a Ruby module to register a loader
 for the file type associated with a filename extension, and it
 augments 'require' to find and load matching files.'';
       };
-      name = ''polyglot-0.3.2'';
+      name = ''polyglot-0.3.3'';
       requiredGems = [  ];
-      sha256 = ''0m2ni5bcwfmhjwndhy115zgcvq0wdf3hk0hal1sfidfz9vbd0hyz'';
+      sha256 = ''082zmail2h3cxd9z1wnibhk6aj4sb1f3zzwra6kg9bp51kx2c00v'';
     };
-    rack_1_3_2 = {
+    rack_1_3_5 = {
       basename = ''rack'';
       meta = {
         description = ''a modular Ruby webserver interface'';
@@ -280,20 +293,20 @@ middleware) into a single method call.
 Also see http://rack.rubyforge.org.
 '';
       };
-      name = ''rack-1.3.2'';
+      name = ''rack-1.3.5'';
       requiredGems = [  ];
-      sha256 = ''1qrs4ryj8a4c3f9raz8mvcl82dinzyiy7rcp7i3jd2xjra75dz7k'';
+      sha256 = ''1qg5nqd3a8v52hfcr9885vyfc9sscykp72by1xb1c090l5pc68hp'';
     };
-    rack_cache_1_0_3 = {
+    rack_cache_1_1 = {
       basename = ''rack_cache'';
       meta = {
         description = ''HTTP Caching for Rack'';
         homepage = ''http://tomayko.com/src/rack-cache/'';
         longDescription = ''HTTP Caching for Rack'';
       };
-      name = ''rack-cache-1.0.3'';
-      requiredGems = [ g.rack_1_3_2 ];
-      sha256 = ''188q2sf44380zqq8kpqb6d4gl7fh5bimkcn8khpri64n6lmqd42w'';
+      name = ''rack-cache-1.1'';
+      requiredGems = [ g.rack_1_3_5 ];
+      sha256 = ''08jlym48qwfj7wddv0vpjj3vlc03q8wvbya24zbrjj8grgfgrvrl'';
     };
     rack_mount_0_8_3 = {
       basename = ''rack_mount'';
@@ -333,42 +346,51 @@ request helpers feature.'';
       requiredGems = [  ];
       sha256 = ''0hq5q8fjhbb7szzrj7k0l21z025c4qsxqzd5qmgivikhymw10ws0'';
     };
-    rails_3_1_0 = {
+    rails_3_1_3 = {
       basename = ''rails'';
       meta = {
         description = ''Full-stack web application framework.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
       };
-      name = ''rails-3.1.0'';
-      requiredGems = [ g.activesupport_3_1_0 g.actionpack_3_1_0 g.activerecord_3_1_0 g.activeresource_3_1_0 g.actionmailer_3_1_0 g.railties_3_1_0 g.bundler_1_0_18 ];
-      sha256 = ''1ki0jnq40kvfdp3kvnzvnrl9j09n9gql77pbl6jz565siqnvikms'';
+      name = ''rails-3.1.3'';
+      requiredGems = [ g.activesupport_3_1_3 g.actionpack_3_1_3 g.activerecord_3_1_3 g.activeresource_3_1_3 g.actionmailer_3_1_3 g.railties_3_1_3 g.bundler_1_0_21 ];
+      sha256 = ''07p8agfarj5nz8v1nlg1rfqy1cnqxhpakxhadfhk4sqrzlp2a5z8'';
     };
-    railties_3_1_0 = {
+    railties_3_1_3 = {
       basename = ''railties'';
       meta = {
         description = ''Tools for creating, working with, and running Rails applications.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.'';
       };
-      name = ''railties-3.1.0'';
-      requiredGems = [ g.rake_0_9_2 g.thor_0_14_6 g.rack_ssl_1_3_2 g.rdoc_3_9_4 ];
-      sha256 = ''155snh4hwflxqylyqlsyqpdm5f80qk2lqn9jhksx85m1sz99mxym'';
+      name = ''railties-3.1.3'';
+      requiredGems = [ g.rake_0_9_2_2 g.thor_0_14_6 g.rack_ssl_1_3_2 g.rdoc_3_11 ];
+      sha256 = ''07kgr9nzvgwpjqwssiknlqds1a9mj74g1hqpwsj6720x4pk9r13h'';
     };
-    rake_0_9_2 = {
+    rake_0_9_2_2 = {
       basename = ''rake'';
       meta = {
         description = ''Ruby based make-like utility.'';
         homepage = ''http://rake.rubyforge.org'';
-        longDescription = ''      Rake is a Make-like program implemented in Ruby. Tasks
-      and dependencies are specified in standard Ruby syntax.
-'';
+        longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies arespecified in standard Ruby syntax.'';
       };
-      name = ''rake-0.9.2'';
+      name = ''rake-0.9.2.2'';
       requiredGems = [  ];
-      sha256 = ''1348lm18j0rki4zjgb4rgplai32j0izkvbbi66lk7n0z89dm4ny5'';
+      sha256 = ''19n4qp5gzbcqy9ajh56kgwqv9p9w2hnczhyvaqz0nlvk9diyng6q'';
     };
-    rdoc_3_9_4 = {
+    rb_fsevent_0_4_3_1 = {
+      basename = ''rb_fsevent'';
+      meta = {
+        description = ''Very simple &amp; usable FSEvents API'';
+        homepage = ''http://rubygems.org/gems/rb-fsevent'';
+        longDescription = ''FSEvents API with Signals catching (without RubyCocoa)'';
+      };
+      name = ''rb-fsevent-0.4.3.1'';
+      requiredGems = [  ];
+      sha256 = ''043w4695j7f9n0hawy9y0yci36linivsbp23v52v2qg64ji7hsiw'';
+    };
+    rdoc_3_11 = {
       basename = ''rdoc'';
       meta = {
         description = ''RDoc produces HTML and command-line documentation for Ruby projects'';
@@ -379,20 +401,35 @@ documentation.
 
 See RDoc for a description of RDoc's markup and basic use.'';
       };
-      name = ''rdoc-3.9.4'';
-      requiredGems = [  ];
-      sha256 = ''0znp5xssql3pmk38s58b0dvvcv5d3r28gx6jrzyb9158jz98jmf5'';
+      name = ''rdoc-3.11'';
+      requiredGems = [ g.json_1_6_3 ];
+      sha256 = ''0wq8525v21pxcnwgn5ypblcsb0xasnicjnqqd7mrrfqm2g3k2frm'';
     };
-    sprockets_2_0_0 = {
+    sass_3_1_11 = {
+      basename = ''sass'';
+      meta = {
+        description = ''A powerful but elegant CSS compiler that makes CSS fun again.'';
+        homepage = ''http://sass-lang.com/'';
+        longDescription = ''      Sass makes CSS fun again. Sass is an extension of CSS3, adding
+      nested rules, variables, mixins, selector inheritance, and more.
+      It's translated to well-formatted, standard CSS using the
+      command line tool or a web-framework plugin.
+'';
+      };
+      name = ''sass-3.1.11'';
+      requiredGems = [  ];
+      sha256 = ''0ksbvvc210yd3fjk7gzsj25qzcd5ahw5rsh3bx94w53ylq60af2g'';
+    };
+    sprockets_2_0_3 = {
       basename = ''sprockets'';
       meta = {
         description = ''Rack-based asset packaging system'';
         homepage = ''http://getsprockets.org/'';
         longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.'';
       };
-      name = ''sprockets-2.0.0'';
+      name = ''sprockets-2.0.3'';
       requiredGems = [ g.hike_1_2_1 g.tilt_1_3_3 ];
-      sha256 = ''1b3yih9mzpbn6w1kymwrcd606yw8nds5h3ig4ky5g65qwl7gk75c'';
+      sha256 = ''1az22a7vjfhfglbn02np8lci6ww1lzgzs0i9qlfwx87ybp2227bi'';
     };
     thor_0_14_6 = {
       basename = ''thor'';
@@ -423,19 +460,19 @@ See RDoc for a description of RDoc's markup and basic use.'';
         homepage = ''http://functionalform.blogspot.com'';
       };
       name = ''treetop-1.4.10'';
-      requiredGems = [ g.polyglot_0_3_2 ];
+      requiredGems = [ g.polyglot_0_3_3 ];
       sha256 = ''01f4w7fm6phhdbkx7bp0b58hrk3x4b0a63p2vvjbxm5gi2gv9ap2'';
     };
-    tzinfo_0_3_29 = {
+    tzinfo_0_3_31 = {
       basename = ''tzinfo'';
       meta = {
         description = ''Daylight-savings aware timezone library'';
         homepage = ''http://tzinfo.rubyforge.org/'';
         longDescription = ''TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones.'';
       };
-      name = ''tzinfo-0.3.29'';
+      name = ''tzinfo-0.3.31'';
       requiredGems = [  ];
-      sha256 = ''10504cr141vgg12nqbd920xj0q2b07gbjjdwdrwjj35pp97ymrij'';
+      sha256 = ''1kwc25c1x8cvryjhpp8sx20vrd8h9g9gsl7p5393a88544qy41hb'';
     };
   };
 }
diff --git a/pkgs/development/interpreters/ruby/ruby-19.nix b/pkgs/development/interpreters/ruby/ruby-19.nix
index d5ccb19caec..5e406509a8c 100644
--- a/pkgs/development/interpreters/ruby/ruby-19.nix
+++ b/pkgs/development/interpreters/ruby/ruby-19.nix
@@ -4,6 +4,7 @@
 , gdbm, gdbmSupport ? true
 , ncurses, readline, cursesSupport ? false
 , groff, docSupport ? false
+, libyaml, yamlSupport ? false
 }:
 
 let
@@ -18,7 +19,7 @@ stdenv.mkDerivation rec {
   
   src = fetchurl {
     url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.gz";
-    sha256 = "0zmxdqzprbdc5mvmba1i94mpqnqxxlh460jri7bx6i29bibigj0w";
+    sha256 = "0km3ryc0cs578982x6c3y3n3xr920grnpncmznb447snwd10149v";
   };
 
   # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
@@ -28,7 +29,8 @@ stdenv.mkDerivation rec {
     ++ (op docSupport groff )
     ++ (op zlibSupport zlib)
     ++ (op opensslSupport openssl)
-    ++ (op gdbmSupport gdbm);
+    ++ (op gdbmSupport gdbm)
+    ++ (op yamlSupport libyaml);
     
   configureFlags = ["--enable-shared" "--enable-pthread"];
 
@@ -40,12 +42,13 @@ stdenv.mkDerivation rec {
     license = "Ruby";
     homepage = "http://www.ruby-lang.org/en/";
     description = "The Ruby language";
+    platforms = stdenv.lib.platforms.all;
   };
 
   passthru = rec {
     majorVersion = "1.9";
-    minorVersion = "2";
-    patchLevel = "290";
+    minorVersion = "3";
+    patchLevel = "0";
     libPath = "lib/ruby/${majorVersion}";
     gemPath = "lib/ruby/gems/${majorVersion}";
   };
diff --git a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
new file mode 100644
index 00000000000..55e0dada71e
--- /dev/null
+++ b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, autoconf213, nspr, perl, python, readline, zip }:
+
+stdenv.mkDerivation rec {
+  version = "185-1.0.0";
+  name = "spidermonkey-${version}";
+
+  src = fetchurl {
+    url = "http://ftp.mozilla.org/pub/mozilla.org/js/js${version}.tar.gz";
+    sha256 = "5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687";
+  };
+
+  buildInputs = [ autoconf213 nspr perl python readline zip ];
+
+  postUnpack = "sourceRoot=\${sourceRoot}/js/src";
+
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr"
+    export LIBXUL_DIST=$out
+    autoconf
+  '';
+
+  meta = with stdenv.lib; {
+      description = "Mozilla's JavaScript engine written in C/C++";
+      homepage = https://developer.mozilla.org/en/SpiderMonkey;
+      # TODO: MPL/GPL/LGPL tri-license.
+      maintainers = [ maintainers.goibhniu ];
+  };
+
+}
diff --git a/pkgs/development/interpreters/xulrunner/wrapper/builder.sh b/pkgs/development/interpreters/xulrunner/wrapper/builder.sh
deleted file mode 100644
index 4deed9e7a7f..00000000000
--- a/pkgs/development/interpreters/xulrunner/wrapper/builder.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-source $stdenv/setup
-
-ensureDir $out/bin
-
-wrapper="$out/bin/$launcher"
-
-if test -e $xulrunner/bin/xulrunner; then
-    runner=$xulrunner/bin/xulrunner
-elif test -e $xulrunner/bin/firefox; then
-    runner="$xulrunner/bin/firefox -app"
-else
-    echo "XUL runner not found"
-    exit 1
-fi
-
-cat > $wrapper <<EOF
-#! $SHELL -e
-exec $runner $appfile "\$@"
-EOF
-
-chmod +x $wrapper
diff --git a/pkgs/development/interpreters/xulrunner/wrapper/default.nix b/pkgs/development/interpreters/xulrunner/wrapper/default.nix
deleted file mode 100644
index 218dfd34cc1..00000000000
--- a/pkgs/development/interpreters/xulrunner/wrapper/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, xulrunner, application, launcher}:
-
-stdenv.mkDerivation {
-  name = application.name;
-
-  builder = ./builder.sh;
-  
-  inherit xulrunner launcher;
-  
-  appfile = application + "/application.ini";
-
-  inherit (application) meta;
-}
diff --git a/pkgs/development/libraries/atk/2.1.x.nix b/pkgs/development/libraries/atk/2.2.x.nix
similarity index 87%
rename from pkgs/development/libraries/atk/2.1.x.nix
rename to pkgs/development/libraries/atk/2.2.x.nix
index 28619a85c03..45737aad319 100644
--- a/pkgs/development/libraries/atk/2.1.x.nix
+++ b/pkgs/development/libraries/atk/2.2.x.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation rec {
 
   src = fetchurl_gnome {
     project = "atk";
-    major = "2"; minor = "1"; patchlevel = "5"; extension = "xz";
-    sha256 = "005b9sq8p9ykp4f35b59si3mcbw4p9hyxps1ij4x73p07rrbf0z9";
+    major = "2"; minor = "2"; patchlevel = "0"; extension = "xz";
+    sha256 = "17bkqg89l9hxbkgc76cxlin1bwczk7m6ikbccx677lrxh3kz08lb";
   };
 
   buildNativeInputs = [ pkgconfig perl xz ];
diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index 77ddecd71c0..3449314a381 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "babl-0.1.4";
 
   src = fetchurl {
-    url = "ftp://ftp.gimp.org/pub/babl/0.1/${name}.tar.bz2";
+    url = "http://ftp.snt.utwente.nl/pub/software/gimp/babl/0.1/${name}.tar.bz2";
     sha256 = "0cz7zw206bb87c0n0h54h4wlkaa3hx3wsia30mgq316y50jk2djv";
   };
 
diff --git a/pkgs/development/libraries/boost/1.48.nix b/pkgs/development/libraries/boost/1.48.nix
new file mode 100644
index 00000000000..2adc0191cc0
--- /dev/null
+++ b/pkgs/development/libraries/boost/1.48.nix
@@ -0,0 +1,91 @@
+{ stdenv, fetchurl, icu, expat, zlib, bzip2, python
+, enableRelease ? true
+, enableDebug ? false
+, enableSingleThreaded ? false
+, enableMultiThreaded ? true
+, enableShared ? true
+, enableStatic ? false
+, enablePIC ? false
+, enableExceptions ? false
+}:
+
+let
+
+  variant = stdenv.lib.concatStringsSep ","
+    (stdenv.lib.optional enableRelease "release" ++
+     stdenv.lib.optional enableDebug "debug");
+
+  threading = stdenv.lib.concatStringsSep ","
+    (stdenv.lib.optional enableSingleThreaded "single" ++
+     stdenv.lib.optional enableMultiThreaded "multi");
+
+  link = stdenv.lib.concatStringsSep ","
+    (stdenv.lib.optional enableShared "shared" ++
+     stdenv.lib.optional enableStatic "static");
+
+  # To avoid library name collisions
+  finalLayout = if ((enableRelease && enableDebug) ||
+    (enableSingleThreaded && enableMultiThreaded) ||
+    (enableShared && enableStatic)) then
+    "tagged" else "system";
+
+  cflags = if (enablePIC && enableExceptions) then
+             "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC"
+           else if (enablePIC) then
+             "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC"
+           else if (enableExceptions) then
+             "cflags=-fexceptions"
+           else
+             "";
+in
+
+stdenv.mkDerivation {
+  name = "boost-1.48.0";
+
+  meta = {
+    homepage = "http://boost.org/";
+    description = "Boost C++ Library Collection";
+    license = "boost-license";
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+
+  src = fetchurl {
+    url = "mirror://sourceforge/boost/boost_1_48_0.tar.bz2";
+    sha256 = "1njsircy5xfj5rws10w8vq2s0603z2i31p9wgbawr4wkssr59whv";
+  };
+
+  # See <http://svn.boost.org/trac/boost/ticket/4688>.
+  patches = [ ./boost_filesystem.patch ];
+
+  enableParallelBuilding = true;
+
+  buildInputs = [icu expat zlib bzip2 python];
+
+  configureScript = "./bootstrap.sh";
+  configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python";
+
+  buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
+
+  installPhase = ":";
+
+  crossAttrs = rec {
+    buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ];
+    # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
+    # override them.
+    propagatedBuildInputs = buildInputs;
+    # We want to substitute the contents of configureFlags, removing thus the
+    # usual --build and --host added on cross building.
+    preConfigure = ''
+      export configureFlags="--prefix=$out --without-icu"
+    '';
+    buildPhase = ''
+      set -x
+      cat << EOF > user-config.jam
+      using gcc : cross : $crossConfig-g++ ;
+      EOF
+      ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install
+    '';
+  };
+}
diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix
index 8b16af37932..5610588ea41 100644
--- a/pkgs/development/libraries/ccrtp/default.nix
+++ b/pkgs/development/libraries/ccrtp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, pkgconfig, libgcrypt, ucommon }:
 
 stdenv.mkDerivation {
-  name = "ccrtp-2.0.1";
+  name = "ccrtp-2.0.2";
 
   src = fetchurl {
-    url = mirror://gnu/ccrtp/ccrtp-2.0.1.tar.gz;
-    sha256 = "0wksiq55zq8yvjgzkaxyg15w9kfr4sni8a0yqk11qdqpl8x0al9x";
+    url = mirror://gnu/ccrtp/ccrtp-2.0.2.tar.gz;
+    sha256 = "1n42nscqwryz9f0jpg8lnv22x9m8mzr6rqir9cvbgm1r2skwjh4f";
   };
 
   buildInputs = [ openssl pkgconfig libgcrypt ucommon ];
diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix
index 93af6d18b14..7bd0d68c3ec 100644
--- a/pkgs/development/libraries/cloog/default.nix
+++ b/pkgs/development/libraries/cloog/default.nix
@@ -1,31 +1,23 @@
 { fetchurl, stdenv, gmp, isl, static ? false }:
 
-let
-  staticFlags =
-    assert static -> isl.dontDisableStatic == true;
-    if static then "--enable-static --disable-shared" else "";
-
-in
+assert static -> isl.dontDisableStatic;
 
 stdenv.mkDerivation rec {
-  name = "cloog-0.16.2";
+  name = "cloog-0.16.3";
 
   src = fetchurl {
     url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./${name}.tar.gz";
-    sha256 = "1w9n9lsq18k65fywwbbvhkgl917053w1kvqw0xhlwcma0v59m6mx";
+    sha256 = "0lzbsszfzsr0jfwkccfbsvx913d2yc45dqwa472plmxkhbwykmc9";
   };
 
   buildInputs = [ gmp ];
 
   propagatedBuildInputs = [ isl ];
 
-  configureFlags = "--with-isl=system --with-isl-prefix=${isl}" + staticFlags;
-    
-  dontDisableStatic = if static then true else false;
+  configureFlags = [ "--with-isl=system" ]
+    ++ (stdenv.lib.optionals static [ "--enable-static" "--disable-shared" ]);
 
-  crossAttrs = {
-    configureFlags = "--with-isl=system --with-isl-prefix=${isl.hostDrv}" + staticFlags;
-  };
+  dontDisableStatic = static;
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
new file mode 100644
index 00000000000..e7ee3816210
--- /dev/null
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl_gnome, pkgconfig, mesa, glib, gdk_pixbuf
+, pangoSupport ? true, pango, cairo
+, libXfixes, libXcomposite, libXdamage, xz }:
+
+stdenv.mkDerivation rec {
+  name = src.pkgname;
+
+  src = fetchurl_gnome {
+    project = "cogl";
+    major = "1"; minor = "8"; patchlevel = "0"; extension = "xz";
+    sha256 = "0b0arg0sjky5y4ypgh8dpznd9f1azhi1d5rhf4zbcw2mkl91qmdi";
+  };
+
+  buildNativeInputs = [ xz pkgconfig ];
+
+  propagatedBuildInputs =
+    [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage ];
+
+  buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];
+
+  meta = {
+    description = "A small open source library for using 3D graphics hardware for rendering";
+    longDescription =
+      ''
+        Cogl is a small open source library for using 3D graphics hardware for
+        rendering. The API departs from the flat state machine style of OpenGL
+        and is designed to make it easy to write orthogonal components that can
+        render without stepping on each others toes.
+      '';
+    inherit (glib.meta) platforms;
+  };
+}
diff --git a/pkgs/development/libraries/cppunit/1.10.nix b/pkgs/development/libraries/cppunit/1.10.nix
deleted file mode 100644
index 546f2bbba1e..00000000000
--- a/pkgs/development/libraries/cppunit/1.10.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "cppunit-1.10.0";
-  
-  src = fetchurl {
-    url = mirror://sf/cppunit/cppunit-1.10.0.tar.gz;
-    sha256 = "08w5ljd3rbz6wzipzxqx1ma779b6k930iwjrg4bckddigrq897bg";
-  };
-
-  patches = [./include-cstdlib.patch];
-}
diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix
index 5e55bd51bcd..dbbcf4388c5 100644
--- a/pkgs/development/libraries/cppunit/default.nix
+++ b/pkgs/development/libraries/cppunit/default.nix
@@ -2,9 +2,16 @@
 
 stdenv.mkDerivation {
   name = "cppunit-1.12.0";
-  
+
   src = fetchurl {
     url = mirror://sf/cppunit/cppunit-1.12.0.tar.gz;
     sha256 = "07zyyx5dyai94y8r8va28971f5mw84mb93xx9pm6m4ddpj6c79cq";
   };
+
+  meta = {
+    homepage = "http://sourceforge.net/apps/mediawiki/cppunit/";
+    description = "C++ unit testing framework";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
 }
diff --git a/pkgs/development/libraries/cppunit/include-cstdlib.patch b/pkgs/development/libraries/cppunit/include-cstdlib.patch
deleted file mode 100644
index 8a00c370ce2..00000000000
--- a/pkgs/development/libraries/cppunit/include-cstdlib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rc cppunit-1.10.0/src/cppunit/TypeInfoHelper.cpp cppunit-1.10.0-2/src/cppunit/TypeInfoHelper.cpp
-*** cppunit-1.10.0/src/cppunit/TypeInfoHelper.cpp	2004-02-18 21:45:44.000000000 +0100
---- cppunit-1.10.0-2/src/cppunit/TypeInfoHelper.cpp	2011-04-13 09:20:57.000000000 +0200
-***************
-*** 1,5 ****
---- 1,6 ----
-  #include <cppunit/Portability.h>
-  #include <cppunit/extensions/TypeInfoHelper.h>
-+ #include <cstdlib>
-  
-  #if CPPUNIT_HAVE_RTTI
-  
diff --git a/pkgs/development/libraries/db4/db4-4.8.nix b/pkgs/development/libraries/db4/db4-4.8.nix
index 5b99f068769..86424fac567 100644
--- a/pkgs/development/libraries/db4/db4-4.8.nix
+++ b/pkgs/development/libraries/db4/db4-4.8.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://download-east.oracle.com/berkeley-db/db-4.8.26.tar.gz;
+    url = http://download.oracle.com/berkeley-db/db-4.8.26.tar.gz;
     sha256 = "0hcxh0kb6m0wk3apjhs57p7b171zzn63rg4l3nkcavygg5gx2mgp";
   };
   
diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix
index 6bea14f3837..26ff5dd245e 100644
--- a/pkgs/development/libraries/fcgi/default.nix
+++ b/pkgs/development/libraries/fcgi/default.nix
@@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
 
   patches = [ ./gcc-4.4.diff ];
 
-  meta = { 
+  postInstall = "ln -s . $out/include/fastcgi";
+
+  meta = {
     description = "FastCGI  is a language independent, scalable, open extension to CG";
     homepage = http://www.fastcgi.com/;
     license = "FastCGI see LICENSE.TERMS";
diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix
new file mode 100644
index 00000000000..87a7f879be8
--- /dev/null
+++ b/pkgs/development/libraries/freetds/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "freetds-0.91";
+
+  src = fetchurl {
+    url = ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-stable.tgz;
+    sha256 = "0r946axzxs0czsmr7283w7vmk5jx3jnxxc32d2ncxsrsh2yli0ba";
+  };
+
+  meta = {
+    description =
+      "Libraries to natively talk to Microsoft SQL Server and Sybase databases";
+    homepage = "http://www.freetds.org";
+    license = "lgpl";
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
+
diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix
index 807e6a6a2a8..3b982582b54 100644
--- a/pkgs/development/libraries/gdbm/default.nix
+++ b/pkgs/development/libraries/gdbm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "gdbm-1.9.1";
+  name = "gdbm-1.10";
 
   src = fetchurl {
     url = "mirror://gnu/gdbm/${name}.tar.gz";
-    sha256 = "1vcs39nhvwyicjfx4qc17k54n22azla5yjr9yachcavp6wk8a9b0";
+    sha256 = "0h9lfzdjc2yl849y0byg51h6xfjg0y7vg9jnsw3gpfwlbd617y13";
   };
 
   doCheck = true;
diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix
index 8fa87d90be2..3e7f29ecb6f 100644
--- a/pkgs/development/libraries/gegl/default.nix
+++ b/pkgs/development/libraries/gegl/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "gegl-0.1.6";
 
   src = fetchurl {
-    url = "ftp://ftp.gimp.org/pub/gegl/0.1/${name}.tar.bz2";
+    url = "http://ftp.snt.utwente.nl/pub/software/gimp/gegl/0.1/${name}.tar.bz2";
     sha256 = "1l966ygss2zkksyw62nm139v2abfzbqqrj0psizvbgzf4mb24rm1";
   };
 
diff --git a/pkgs/development/libraries/glib/2.29.x.nix b/pkgs/development/libraries/glib/2.30.x.nix
similarity index 89%
rename from pkgs/development/libraries/glib/2.29.x.nix
rename to pkgs/development/libraries/glib/2.30.x.nix
index 589ec625dcc..25f8abfeb0a 100644
--- a/pkgs/development/libraries/glib/2.29.x.nix
+++ b/pkgs/development/libraries/glib/2.30.x.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
 
   src = fetchurl_gnome {
     project = "glib";
-    major = "2"; minor = "29"; patchlevel = "18"; extension = "xz";
-    sha256 = "1hc198x625w1w8if1xlvqyjs9aazc27s0l374kqc4sr51wcpbxpy";
+    major = "2"; minor = "30"; patchlevel = "0"; extension = "xz";
+    sha256 = "1hfdnxf5hsfhkd54390lnc1b14m9n7y031fpma4vpsh96js00k6n";
   };
 
   # configure script looks for d-bus but it is only needed for tests
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ zlib libffi ];
 
+  passthru.gioModuleDir = "lib/gio/modules";
+
   # glib buildsystem fails to find python, thus hardcodes python2.4 in #!
   postInstall = ''rm -rvf $out/share/gtk-doc'';
 
diff --git a/pkgs/development/libraries/glibc-2.12/common.nix b/pkgs/development/libraries/glibc-2.12/common.nix
index 2efe56bb214..0d56d877018 100644
--- a/pkgs/development/libraries/glibc-2.12/common.nix
+++ b/pkgs/development/libraries/glibc-2.12/common.nix
@@ -5,13 +5,14 @@ cross :
 
 { name, fetchurl, stdenv, installLocales ? false
 , gccCross ? null, kernelHeaders ? null
-, machHeaders ? null, hurdHeaders ? null, mig ? null, fetchgit ? null
+, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null
+, mig ? null, fetchgit ? null
 , profilingLibraries ? false, meta
 , preConfigure ? "", ... }@args :
 
 let
   # For GNU/Hurd, see below.
-  version = if hurdHeaders != null then "20110623" else "2.12.2";
+  version = if hurdHeaders != null then "20111025" else "2.12.2";
 
   needsPortsNative = stdenv.isMips || stdenv.isArm;
   needsPortsCross = cross.arch == "mips" || cross.arch == "arm";
@@ -31,6 +32,7 @@ assert (cross != null) -> (gccCross != null);
 
 assert (mig != null) -> (machHeaders != null);
 assert (machHeaders != null) -> (hurdHeaders != null);
+assert (hurdHeaders != null) -> (libpthreadHeaders != null);
 assert (hurdHeaders != null) -> (fetchgit != null);
 
 stdenv.mkDerivation ({
@@ -141,8 +143,8 @@ stdenv.mkDerivation ({
       # maintained by the Hurd folks, `tschwinge/Roger_Whittaker' branch.
       # See <http://www.gnu.org/software/hurd/source_repositories/glibc.html>.
       url = "git://git.sv.gnu.org/hurd/glibc.git";
-      sha256 = "39ea53f318376cbd33e06ec23f4a393fc0801ea3aa87286b30943aa7ef7604cd";
-      rev = "77a94de8d3490e73a71efc0b981356d5acb7a28a";
+      sha256 = "3fb3dd7030a4b6d3e144fa94c32a0c4f46f17f94e2dfbc6bef41cfc3198725ca";
+      rev = "d740cf9d201dc9ecb0335b0a585828dea9cce793";
     }
     else fetchurl {
       url = "mirror://gnu/glibc/glibc-${version}.tar.bz2";
@@ -198,11 +200,15 @@ stdenv.mkDerivation ({
  then {
    # Work around the fact that the configure snippet that looks for
    # <hurd/version.h> does not honor `--with-headers=$sysheaders' and that
-   # glibc expects both Mach and Hurd headers to be in the same place.
-   CPATH = "${hurdHeaders}/include:${machHeaders}/include";
+   # glibc expects Mach, Hurd, and pthread headers to be in the same place.
+   CPATH = "${hurdHeaders}/include:${machHeaders}/include:${libpthreadHeaders}/include";
 
    # `fetchgit' is a function and thus should not be passed to the
    # `derivation' primitive.
    fetchgit = null;
+
+   # Install NSS stuff in the right place.
+   # XXX: This will be needed for all new glibcs and isn't Hurd-specific.
+   makeFlags = ''vardbdir="$out/var/db"'';
  }
  else { }))
diff --git a/pkgs/development/libraries/glibc-2.12/default.nix b/pkgs/development/libraries/glibc-2.12/default.nix
index 31a8ef13a4f..89e8c60b7da 100644
--- a/pkgs/development/libraries/glibc-2.12/default.nix
+++ b/pkgs/development/libraries/glibc-2.12/default.nix
@@ -1,8 +1,10 @@
 { stdenv, fetchurl, kernelHeaders
-, machHeaders ? null, hurdHeaders ? null, mig ? null, fetchgit ? null
+, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null
+, mig ? null, fetchgit ? null
 , installLocales ? true
 , profilingLibraries ? false
 , gccCross ? null
+, debugSymbols ? false
 }:
 
 assert stdenv.gcc.gcc != null;
@@ -12,7 +14,7 @@ let
   cross = if gccCross != null then gccCross.target else null;
 in
   build cross ({
-    name = "glibc";
+    name = "glibc${if debugSymbols then "-debug" else ""}";
 
     inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries
       gccCross;
@@ -38,11 +40,23 @@ in
 
   //
 
+  (if debugSymbols
+   then {
+     # Build with debugging symbols, but leave optimizations on and don't
+     # attempt to keep the build tree.
+     dontStrip = true;
+     dontCrossStrip = true;
+     NIX_STRIP_DEBUG = 0;
+   }
+   else {})
+
+  //
+
   (if hurdHeaders != null
    then rec {
-     inherit machHeaders hurdHeaders mig fetchgit;
+     inherit machHeaders hurdHeaders libpthreadHeaders mig fetchgit;
 
-     propagatedBuildInputs = [ machHeaders hurdHeaders ];
+     propagatedBuildInputs = [ machHeaders hurdHeaders libpthreadHeaders ];
 
      passthru = {
        # When building GCC itself `propagatedBuildInputs' above is not
diff --git a/pkgs/development/libraries/glibc-2.12/locales.nix b/pkgs/development/libraries/glibc-2.12/locales.nix
index d598e0e094d..31a03c48d85 100644
--- a/pkgs/development/libraries/glibc-2.12/locales.nix
+++ b/pkgs/development/libraries/glibc-2.12/locales.nix
@@ -40,7 +40,7 @@ in
     installPhase =
       ''
         ensureDir "$out/lib/locale"
-        cp -v "$TMPDIR/nix/store/"*"/lib/locale/locale-archive" "$out/lib/locale"
+        cp -v "$TMPDIR/$NIX_STORE/"*"/lib/locale/locale-archive" "$out/lib/locale"
       '';
 
     meta.description = "Locale information for the GNU C Library";
diff --git a/pkgs/development/libraries/glibmm/2.18.x.nix b/pkgs/development/libraries/glibmm/2.18.x.nix
deleted file mode 100644
index b5f8ebf7eb1..00000000000
--- a/pkgs/development/libraries/glibmm/2.18.x.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, libsigcxx }:
-
-stdenv.mkDerivation rec {
-  name = "glibmm-2.18.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/glibmm/2.18/${name}.tar.bz2";
-    sha256 = "0jg65hv6pwxqk4fabsjjz2zwn5hb6rgy3szj956avliarbliyr3r";
-  };
-
-  buildInputs = [pkgconfig];
-  propagatedBuildInputs = [glib libsigcxx];
-
-  meta = {
-    description = "C++ interface to the GLib library";
-
-    homepage = http://gtkmm.org/;
-
-    license = "LGPLv2+";
-  };
-}
diff --git a/pkgs/development/libraries/glibmm/2.30.x.nix b/pkgs/development/libraries/glibmm/2.30.x.nix
new file mode 100644
index 00000000000..e3565a4e614
--- /dev/null
+++ b/pkgs/development/libraries/glibmm/2.30.x.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl_gnome, pkgconfig, glib, libsigcxx, xz }:
+
+stdenv.mkDerivation rec {
+  name = src.pkgname;
+
+  src = fetchurl_gnome {
+    project = "glibmm";
+    major = "2"; minor = "30"; patchlevel = "0"; extension = "xz";
+    sha256 = "1d0dxq4iamch8igrnbvbfwkfpvcnjfzyr9iq2x8hi89b9k1kzbd7";
+  };
+
+  buildNativeInputs = [pkgconfig xz];
+  propagatedBuildInputs = [glib libsigcxx];
+
+  meta = {
+    description = "C++ interface to the GLib library";
+
+    homepage = http://gtkmm.org/;
+
+    license = "LGPLv2+";
+
+    maintainers = with stdenv.lib.maintainers; [urkud raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 39532c075d1..3cd8e718021 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -1,15 +1,15 @@
 { fetchurl, stdenv, xz, zlib, lzo, libtasn1, nettle
-, guileBindings, guile }:
+, guileBindings, guile, perl }:
 
 assert guileBindings -> guile != null;
 
 stdenv.mkDerivation rec {
 
-  name = "gnutls-3.0.2";
+  name = "gnutls-3.0.8";
 
   src = fetchurl {
     url = "mirror://gnu/gnutls/${name}.tar.xz";
-    sha256 = "0jy0j77inv6yr7s9mnhs5kvjjmhj0ifg35145s1qn3hd9ma36nii";
+    sha256 = "0qcp7jm8c2fyk5kdb4fgyrv9hb745mcf066vwmlb8dchx15ijkms";
   };
 
   configurePhase = ''
@@ -22,9 +22,11 @@ stdenv.mkDerivation rec {
         else ""}
   '';
 
-  buildInputs = [ xz zlib lzo ]
+  buildInputs = [ zlib lzo ]
     ++ stdenv.lib.optional guileBindings guile;
 
+  buildNativeInputs = [ xz perl ];
+
   propagatedBuildInputs = [ nettle libtasn1 ];
 
   doCheck = true;
diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix
index ded3fccca7b..4959a70ca63 100644
--- a/pkgs/development/libraries/gss/default.nix
+++ b/pkgs/development/libraries/gss/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, shishi }:
 
 stdenv.mkDerivation rec {
-  name = "gss-1.0.1";
+  name = "gss-1.0.2";
 
   src = fetchurl {
     url = "mirror://gnu/gss/${name}.tar.gz";
-    sha256 = "05g9p45gmd0332ly19g13rbi0wdx447imw42f22482rdr8vpy9m0";
+    sha256 = "1qa8lbkzi6ilfggx7mchfzjnchvhwi68rck3jf9j4425ncz7zsd9";
   };
 
   buildInputs = [ shishi ];
diff --git a/pkgs/development/libraries/gtk+/3.1.x.nix b/pkgs/development/libraries/gtk+/3.2.x.nix
similarity index 91%
rename from pkgs/development/libraries/gtk+/3.1.x.nix
rename to pkgs/development/libraries/gtk+/3.2.x.nix
index 5b473d44e7e..a72411d1636 100644
--- a/pkgs/development/libraries/gtk+/3.1.x.nix
+++ b/pkgs/development/libraries/gtk+/3.2.x.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
 
   src = fetchurl_gnome {
     project = "gtk+";
-    major = "3"; minor = "1"; patchlevel = "16"; extension = "xz";
-    sha256 = "15arbf75qpchr9wrawb3zkn52rzf5wm2qv4dq10zfzlflimrq2rg";
+    major = "3"; minor = "2"; patchlevel = "0"; extension = "xz";
+    sha256 = "0k6l5sw8njbnbapzm9v5jwlrrl7xv1b8c9lmqx97bzbapslw3qxw";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/gtkmm/2.14.x.nix b/pkgs/development/libraries/gtkmm/2.14.x.nix
deleted file mode 100644
index 74b234d8e4b..00000000000
--- a/pkgs/development/libraries/gtkmm/2.14.x.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, atk, glibmm, cairomm, pangomm }:
-
-stdenv.mkDerivation rec {
-  name = "gtkmm-2.14.3";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gtkmm/2.14/${name}.tar.bz2";
-    sha256 = "18jral2lv9jv02d3balh0mi0wgbqhrz5y2laclri1skccc2q3c94";
-  };
-
-  buildInputs = [pkgconfig];
-  propagatedBuildInputs = [ glibmm gtk atk cairomm pangomm ];
-
-  meta = {
-    description = "C++ interface to the GTK+ graphical user interface library";
-
-    longDescription = ''
-      gtkmm is the official C++ interface for the popular GUI library
-      GTK+.  Highlights include typesafe callbacks, and a
-      comprehensive set of widgets that are easily extensible via
-      inheritance.  You can create user interfaces either in code or
-      with the Glade User Interface designer, using libglademm.
-      There's extensive documentation, including API reference and a
-      tutorial.
-    '';
-
-    homepage = http://gtkmm.org/;
-
-    license = "LGPLv2+";
-  };
-}
diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix
index eb40a854e32..724dabbab1b 100644
--- a/pkgs/development/libraries/haskell/Agda/default.nix
+++ b/pkgs/development/libraries/haskell/Agda/default.nix
@@ -1,15 +1,16 @@
-{ cabal, alex, binary, happy, haskeline, haskellSrcExts, mtl
-, QuickCheck, syb, xhtml, zlib
+{ cabal, alex, binary, happy, hashable, hashtables, haskeline
+, haskellSrcExts, mtl, QuickCheck, syb, xhtml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "Agda";
-  version = "2.2.10";
-  sha256 = "1bh96g5c6b6jzaf3m9gm0vr64avgi86kb45p8i1vg1jbfjdbdlsw";
+  version = "2.3.0";
+  sha256 = "1p0cwf3d146z73gp49cm8fmk33hcbjsvyijbakm1871ssc5i73k0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    binary haskeline haskellSrcExts mtl QuickCheck syb xhtml zlib
+    binary hashable hashtables haskeline haskellSrcExts mtl QuickCheck
+    syb xhtml zlib
   ];
   buildTools = [ alex happy ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix
index 378d1e2cd37..d8cfb2ee407 100644
--- a/pkgs/development/libraries/haskell/ConfigFile/default.nix
+++ b/pkgs/development/libraries/haskell/ConfigFile/default.nix
@@ -2,11 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "ConfigFile";
-  version = "1.0.6";
-  sha256 = "339722184b86d53d8b361933e572b6e1478824c7eba3fb66b67d0eb5245cd038";
+  version = "1.1.1";
+  sha256 = "0w2yhbnqldhmj3d98j720l4lj4d08abqcff751p2slszdm5pw1jm";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ MissingH mtl parsec ];
+  noHaddock = true;
   meta = {
     homepage = "http://software.complete.org/configfile";
     description = "Configuration file reading & writing";
diff --git a/pkgs/development/libraries/haskell/GLURaw/default.nix b/pkgs/development/libraries/haskell/GLURaw/default.nix
index c6ed00e0836..03480856669 100644
--- a/pkgs/development/libraries/haskell/GLURaw/default.nix
+++ b/pkgs/development/libraries/haskell/GLURaw/default.nix
@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "GLURaw";
-  version = "1.1.0.0";
-  sha256 = "03lsskqxh2q7kbnw8hbxz5wp7zq55nwbibsb9maj4y3xpc1vprac";
+  version = "1.1.0.1";
+  sha256 = "0n2yazdk98ia9j65n4ac7k0lnyp9cmz51d344x0jsi0xyfckm0mq";
   buildDepends = [ OpenGLRaw ];
   extraLibraries = [ freeglut mesa ];
   meta = {
-    homepage = "http://www.haskell.org/HOpenGL/";
+    homepage = "http://www.haskell.org/haskellwiki/Opengl";
     description = "A raw binding for the OpenGL graphics system";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix
similarity index 77%
rename from pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix
rename to pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix
index 2f25c5bd1ce..3248631be3e 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix
@@ -4,12 +4,12 @@
 
 cabal.mkDerivation (self: {
   pname = "GLUT";
-  version = "2.2.2.0";
-  sha256 = "0hilpjwkjvpz4sz0zqa36vmx8m1yycjnqdd721mqns7lib2fnzrx";
+  version = "2.2.2.1";
+  sha256 = "09qpkrwpc3w173mvqwda7vi0ncpzzzrnlfa14ja7jba489a8l1mw";
   buildDepends = [ OpenGL StateVar Tensor ];
   extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
   meta = {
-    homepage = "http://www.haskell.org/HOpenGL/";
+    homepage = "http://www.haskell.org/haskellwiki/Opengl";
     description = "A binding for the OpenGL Utility Toolkit";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/HTTP/3001.1.5.nix b/pkgs/development/libraries/haskell/HTTP/3001.1.5.nix
deleted file mode 100644
index d16db78d8f4..00000000000
--- a/pkgs/development/libraries/haskell/HTTP/3001.1.5.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ cabal, network, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "HTTP";
-  version = "3001.1.5";
-  sha256 = "e34d9f979bafbbf2e45bf90a9ee9bfd291f3c67c291a250cc0a6378431578aeb";
-  buildDepends = [ network parsec ];
-  meta = {
-    homepage = "http://www.haskell.org/http/";
-    description = "A library for client-side HTTP";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix
similarity index 73%
rename from pkgs/development/libraries/haskell/HTTP/4000.1.2.nix
rename to pkgs/development/libraries/haskell/HTTP/4000.2.1.nix
index 5dcb4cbe618..a707189ed5e 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "HTTP";
-  version = "4000.1.2";
-  sha256 = "19vcy8xinrvn01caly6sg1p1yvbbf7nwq10kxmnwqssnl4h5cwn8";
+  version = "4000.2.1";
+  sha256 = "01076rk7ly5228pszn54x4nqc6rqq1xw11ij9ajvhzf419islh0a";
   buildDepends = [ mtl network parsec ];
   meta = {
-    homepage = "http://projects.haskell.org/http/";
+    homepage = "https://github.com/haskell/HTTP";
     description = "A library for client-side HTTP";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
index d4e1532b101..e55619fb3ab 100644
--- a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
+++ b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HaskellForMaths";
-  version = "0.4.0";
-  sha256 = "1x6kac1im07cpb1014ci8v222q66w2g3gr1wdcv2yvdi5g24ymbp";
+  version = "0.4.1";
+  sha256 = "0jwdxz5wqayx196giv7nj5j0k9zw50x555ig6xj00cladvplvh9h";
   buildDepends = [ random ];
   meta = {
     homepage = "http://haskellformaths.blogspot.com/";
diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix
index d1fb880ed1f..6877e07524d 100644
--- a/pkgs/development/libraries/haskell/Hipmunk/default.nix
+++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Hipmunk";
-  version = "5.2.0.3";
-  sha256 = "1as00372hz0ngy6pc5l0w7qgw5flcyag07zk3dxkbj5kv24xk49m";
+  version = "5.2.0.6";
+  sha256 = "16yh7v6v05nksspcfz8h054piyhmrfbpaada36562rjxcywyfnfj";
   buildDepends = [ StateVar transformers ];
   noHaddock = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
index 1c992f4b571..52080c26a3b 100644
--- a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
+++ b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "MonadCatchIO-transformers";
-  version = "0.2.2.2";
-  sha256 = "083c0abwja447j0p8q0j15iv7bshchy83rfqw07b2hfy38467h9g";
+  version = "0.2.2.3";
+  sha256 = "1qwy9rrmf3kl7rb7v46n81xmrwy4xl63lfnlsiz1qc0hybjkl7m6";
   buildDepends = [ extensibleExceptions transformers ];
   meta = {
     description = "Monad-transformer compatible version of the Control.Exception module";
-    license = self.stdenv.lib.licenses.publicDomain;
+    license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
       self.stdenv.lib.maintainers.andres
diff --git a/pkgs/development/libraries/haskell/NanoProlog/default.nix b/pkgs/development/libraries/haskell/NanoProlog/default.nix
new file mode 100644
index 00000000000..85f5a1d9e6e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/NanoProlog/default.nix
@@ -0,0 +1,19 @@
+{ cabal, ListLike, uuParsinglib }:
+
+cabal.mkDerivation (self: {
+  pname = "NanoProlog";
+  version = "0.2.3.3";
+  sha256 = "0008xpahqbs2djchlw1bslhqqhbc0n7ql7pqm4g7lh8xd3ampxba";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ ListLike uuParsinglib ];
+  meta = {
+    description = "Very small interpreter for a Prolog-like language";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.4.0.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix
similarity index 77%
rename from pkgs/development/libraries/haskell/OpenGL/2.4.0.1.nix
rename to pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix
index 2deb96d750f..73b5c741bbb 100644
--- a/pkgs/development/libraries/haskell/OpenGL/2.4.0.1.nix
+++ b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix
@@ -4,12 +4,12 @@
 
 cabal.mkDerivation (self: {
   pname = "OpenGL";
-  version = "2.4.0.1";
-  sha256 = "0xdclf0m7qxp4157053cbsybpy7fqiiiak0g2kyf8awr7a5736n5";
+  version = "2.4.0.2";
+  sha256 = "00rjvm02p6h8vbyxi3ri4jkk75ki414wk5al2z2fsszjfpdl93b6";
   buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ];
   extraLibraries = [ libX11 mesa ];
   meta = {
-    homepage = "http://www.haskell.org/HOpenGL/";
+    homepage = "http://www.haskell.org/haskellwiki/Opengl";
     description = "A binding for the OpenGL graphics system";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
index 16863a4be15..3a86955a438 100644
--- a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
+++ b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "OpenGLRaw";
-  version = "1.1.0.1";
-  sha256 = "0v6zcy4xvjj5g137rwjsh6hs0ni9dfkvsqynxv4bl5s78amppqnf";
+  version = "1.1.0.2";
+  sha256 = "0d1rjh2vq0w1pzf3vz0mw6p0w43h3sf6034qsi89m4jkx3125fwf";
   extraLibraries = [ mesa ];
   meta = {
-    homepage = "http://www.haskell.org/HOpenGL/";
+    homepage = "http://www.haskell.org/haskellwiki/Opengl";
     description = "A raw binding for the OpenGL graphics system";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/WebBits/2.1.nix b/pkgs/development/libraries/haskell/WebBits/2.1.nix
new file mode 100644
index 00000000000..915ff0b1d60
--- /dev/null
+++ b/pkgs/development/libraries/haskell/WebBits/2.1.nix
@@ -0,0 +1,18 @@
+{ cabal, mtl, parsec, syb }:
+
+cabal.mkDerivation (self: {
+  pname = "WebBits";
+  version = "2.1";
+  sha256 = "18m19fck9zb6jh8bfd47nja1q6ab1jmd0q5r3k8m5674i6273hyn";
+  buildDepends = [ mtl parsec syb ];
+  meta = {
+    homepage = "http://www.cs.brown.edu/research/plt/";
+    description = "JavaScript analysis tools";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/X11/default.nix b/pkgs/development/libraries/haskell/X11/default.nix
index 9d01b2fdd86..6b0047085bc 100644
--- a/pkgs/development/libraries/haskell/X11/default.nix
+++ b/pkgs/development/libraries/haskell/X11/default.nix
@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "X11";
-  version = "1.5.0.0";
-  sha256 = "653ff8aa4053574a36dbb1729459df6e5a1a87a223bc3eeced8e40c6e3a5406f";
+  version = "1.5.0.1";
+  sha256 = "0s8k3lhvlks6i1mwfnm5fimfd2f0sjw9k2p67is3x564kih7mh19";
   buildDepends = [ syb ];
   extraLibraries = [ libX11 libXext libXinerama ];
   meta = {
-    homepage = "http://code.haskell.org/X11";
+    homepage = "https://github.com/haskell-pkg-janitors/X11";
     description = "A binding to the X11 graphics library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/Zwaluw/default.nix b/pkgs/development/libraries/haskell/Zwaluw/default.nix
new file mode 100644
index 00000000000..125da2a795e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/Zwaluw/default.nix
@@ -0,0 +1,17 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "Zwaluw";
+  version = "0.1";
+  sha256 = "1crvcvni5gzpc1c6cnaqqp0gng1l9gk9d8ac23967nvp82xav7s1";
+  meta = {
+    homepage = "https://github.com/MedeaMelana/Zwaluw";
+    description = "Combinators for bidirectional URL routing";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix
index 030f973e35e..0bd68b6b92e 100644
--- a/pkgs/development/libraries/haskell/aeson/default.nix
+++ b/pkgs/development/libraries/haskell/aeson/default.nix
@@ -1,17 +1,17 @@
-{ cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, hashable
-, mtl, syb, text, time, unorderedContainers, vector
+{ cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, dlist
+, hashable, mtl, syb, text, time, unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "aeson";
-  version = "0.3.2.12";
-  sha256 = "12dq79bd8kvl4hc493c7ff9k9xdpibnnnfgpvpxh4ljnqcqr4hcy";
+  version = "0.4.0.0";
+  sha256 = "1j0m7hh82ab7lg757wq75k28llfd1igawmg4g2qdia5gimm652pa";
   buildDepends = [
-    attoparsec blazeBuilder blazeTextual deepseq hashable mtl syb text
-    time unorderedContainers vector
+    attoparsec blazeBuilder blazeTextual deepseq dlist hashable mtl syb
+    text time unorderedContainers vector
   ];
   meta = {
-    homepage = "http://github.com/mailrank/aeson";
+    homepage = "https://github.com/bos/aeson";
     description = "Fast JSON parsing and encoding";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix
index 01229fe3f07..7ba67e5ce79 100644
--- a/pkgs/development/libraries/haskell/asn1-data/default.nix
+++ b/pkgs/development/libraries/haskell/asn1-data/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "asn1-data";
-  version = "0.5.1";
-  sha256 = "10ci77pf0y8g7i1fwksv5na32jsy3brfdv6nzrnwih1brq6l5fn4";
+  version = "0.6.1.1";
+  sha256 = "13l7gcrgngr2bdr7hxh1wbsh21q7nc5bdknz0gpzjf65297g44an";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/attoparsec-text-enumerator/default.nix b/pkgs/development/libraries/haskell/attoparsec-text-enumerator/default.nix
deleted file mode 100644
index bcc9e8b1a6f..00000000000
--- a/pkgs/development/libraries/haskell/attoparsec-text-enumerator/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ cabal, attoparsecText, enumerator, text }:
-
-cabal.mkDerivation (self: {
-  pname = "attoparsec-text-enumerator";
-  version = "0.2.0.0";
-  sha256 = "149ipf5qh7wzjrnv98h6j94djr0ndzg8s4rs8h7kzbii21ynmzz5";
-  buildDepends = [ attoparsecText enumerator text ];
-  meta = {
-    description = "Convert an attoparsec-text parser into an iteratee";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/attoparsec-text/default.nix b/pkgs/development/libraries/haskell/attoparsec-text/default.nix
deleted file mode 100644
index 5ff16e30c18..00000000000
--- a/pkgs/development/libraries/haskell/attoparsec-text/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ cabal, attoparsec, text }:
-
-cabal.mkDerivation (self: {
-  pname = "attoparsec-text";
-  version = "0.8.5.1";
-  sha256 = "1in0ziqjf2hvlv6yay2b5xkm35j1szzwdfapn5mpflv64qi33i0z";
-  buildDepends = [ attoparsec text ];
-  meta = {
-    homepage = "http://patch-tag.com/r/felipe/attoparsec-text/home";
-    description = "Fast combinator parsing for texts";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/attoparsec/default.nix b/pkgs/development/libraries/haskell/attoparsec/default.nix
index b76545143d6..c0b9a0eab82 100644
--- a/pkgs/development/libraries/haskell/attoparsec/default.nix
+++ b/pkgs/development/libraries/haskell/attoparsec/default.nix
@@ -1,12 +1,12 @@
-{ cabal, deepseq }:
+{ cabal, deepseq, text }:
 
 cabal.mkDerivation (self: {
   pname = "attoparsec";
-  version = "0.9.1.2";
-  sha256 = "0h9j4gn376k6j3v9l6pk7a4vxabkwk80043x6xlyxsh8p77jgj3v";
-  buildDepends = [ deepseq ];
+  version = "0.10.1.0";
+  sha256 = "1wlil4zxnyrygvkgmap8kcqf4f6rc08ais20alyy4ggzmx73sl9q";
+  buildDepends = [ deepseq text ];
   meta = {
-    homepage = "https://bitbucket.org/bos/attoparsec";
+    homepage = "https://github.com/bos/attoparsec";
     description = "Fast combinator parsing for bytestrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/attoparsec/enumerator.nix b/pkgs/development/libraries/haskell/attoparsec/enumerator.nix
index 7c990332a37..ad73d41f587 100644
--- a/pkgs/development/libraries/haskell/attoparsec/enumerator.nix
+++ b/pkgs/development/libraries/haskell/attoparsec/enumerator.nix
@@ -1,13 +1,13 @@
-{ cabal, attoparsec, enumerator }:
+{ cabal, attoparsec, enumerator, text }:
 
 cabal.mkDerivation (self: {
   pname = "attoparsec-enumerator";
-  version = "0.2.0.4";
-  sha256 = "14v53vppcf4k3m4kid10pg5r3zsn894f36w1y2pzlc72w81fv3gd";
-  buildDepends = [ attoparsec enumerator ];
+  version = "0.3";
+  sha256 = "1sfqcr1mvny9gf0zzggwvs2b20knxrbb208rzaa86ay0b5b5jw5v";
+  buildDepends = [ attoparsec enumerator text ];
   meta = {
-    homepage = "http://john-millikin.com/software/attoparsec-enumerator/";
-    description = "Convert an Attoparsec parser into an iteratee";
+    homepage = "https://john-millikin.com/software/attoparsec-enumerator/";
+    description = "Pass input from an enumerator to an Attoparsec parser";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [
diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix
index ed91c9d4dd9..3a55192b76a 100644
--- a/pkgs/development/libraries/haskell/authenticate/default.nix
+++ b/pkgs/development/libraries/haskell/authenticate/default.nix
@@ -1,17 +1,18 @@
-{ cabal, aesonNative, attoparsec, base64Bytestring, blazeBuilder
+{ cabal, aeson, attoparsec, base64Bytestring, blazeBuilder
 , caseInsensitive, enumerator, failure, httpEnumerator, httpTypes
 , network, random, RSA, SHA, tagsoup, text, time, tls, transformers
-, xmlEnumerator
+, unorderedContainers, xmlEnumerator
 }:
 
 cabal.mkDerivation (self: {
   pname = "authenticate";
-  version = "0.10.2.1";
-  sha256 = "1bi46bls57wzmd90grrp6rpvgzsz064yi804b6pavq0pxiz1yaj9";
+  version = "0.10.3.1";
+  sha256 = "01xqqnvy2xjcgnp5qq5xiqm1whxywa31cgd79mm290i2r4baiq8s";
   buildDepends = [
-    aesonNative attoparsec base64Bytestring blazeBuilder
-    caseInsensitive enumerator failure httpEnumerator httpTypes network
-    random RSA SHA tagsoup text time tls transformers xmlEnumerator
+    aeson attoparsec base64Bytestring blazeBuilder caseInsensitive
+    enumerator failure httpEnumerator httpTypes network random RSA SHA
+    tagsoup text time tls transformers unorderedContainers
+    xmlEnumerator
   ];
   meta = {
     homepage = "http://github.com/snoyberg/authenticate/tree/master";
diff --git a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix
index 7fbddd1c43d..ab0233e1956 100644
--- a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix
+++ b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "base-unicode-symbols";
-  version = "0.2.2.1";
-  sha256 = "095x4mlkn7i9byg6kdp2f7z0x7sizmy4lgsi0rsabazyd3d8rr9l";
+  version = "0.2.2.2";
+  sha256 = "13bn580r3wk7g5bq8ry04i2lvrcf576wjzlr0imli8rklkx8k3b8";
   meta = {
     homepage = "http://haskell.org/haskellwiki/Unicode-symbols";
     description = "Unicode alternatives for common functions and operators";
diff --git a/pkgs/development/libraries/haskell/base16-bytestring/default.nix b/pkgs/development/libraries/haskell/base16-bytestring/default.nix
new file mode 100644
index 00000000000..b95052d02d9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/base16-bytestring/default.nix
@@ -0,0 +1,17 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "base16-bytestring";
+  version = "0.1.1.3";
+  sha256 = "0v08fnkykvd6y6in6f9a808vk2gfd9pf0wd7rr28z6wwxm5d2x6l";
+  meta = {
+    homepage = "http://github.com/bos/base16-bytestring";
+    description = "Fast base16 (hex) encoding and decoding for ByteStrings";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
index 84d667de29a..ccc8d36d6fd 100644
--- a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-builder-enumerator";
-  version = "0.2.0.2";
-  sha256 = "0as4mjh695jpxp9qfhpsxyr1448l0pk94sh5kk8sgxv5hfiy41k9";
+  version = "0.2.0.3";
+  sha256 = "00a9rly27sh49gi5askg7z3ji8ig9llxk4qcznsag01d1z0kb97n";
   buildDepends = [ blazeBuilder enumerator transformers ];
   meta = {
     homepage = "https://github.com/meiersi/blaze-builder-enumerator";
diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix
index 3a20e5d0cb1..a21d9b7c96f 100644
--- a/pkgs/development/libraries/haskell/blaze-builder/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-builder";
-  version = "0.3.0.1";
-  sha256 = "1p3xlifcr7v987zx8l2sppn9yydph332mn1xxk0yfi78a6386nfb";
+  version = "0.3.0.2";
+  sha256 = "009njfm9g0fs7kg6q9c7qqfl69msw9q3d07xh3xg7layh09khsdb";
   buildDepends = [ text ];
   meta = {
     homepage = "http://github.com/meiersi/blaze-builder";
diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix
index 6315bade7b0..2e8a5868d12 100644
--- a/pkgs/development/libraries/haskell/blaze-html/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-html/default.nix
@@ -2,11 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-html";
-  version = "0.4.2.0";
-  sha256 = "098y9mzq6jr73lavv7ky58bl3aajvdg72y12varpf3v3rr4l0lb2";
+  version = "0.4.2.2";
+  sha256 = "1fg0qgqml7ar3m0as9sk9zc260j2jvdsf5cdfrsify5l62ip060f";
   buildDepends = [ blazeBuilder text ];
   meta = {
     homepage = "http://jaspervdj.be/blaze";
+    description = "A blazingly fast HTML combinator library for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix
index deb1e3caa78..b5924d7c73b 100644
--- a/pkgs/development/libraries/haskell/blaze-textual/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-textual/default.nix
@@ -1,12 +1,12 @@
-{ cabal, blazeBuilder, doubleConversion, text, time, vector }:
+{ cabal, blazeBuilder, text, time, vector }:
 
 cabal.mkDerivation (self: {
   pname = "blaze-textual";
-  version = "0.2.0.4";
-  sha256 = "0bifxyzm35xvlqry06iv6pqgx1d33jnrvpmn4wnydkyg1r7q3k9v";
-  buildDepends = [ blazeBuilder doubleConversion text time vector ];
+  version = "0.2.0.5";
+  sha256 = "0rl41idjmrw227yi2x6nk2rlm93rgzz2y7jvz2yvmya2ihrppzjf";
+  buildDepends = [ blazeBuilder text time vector ];
   meta = {
-    homepage = "http://github.com/mailrank/blaze-textual";
+    homepage = "http://github.com/bos/blaze-textual";
     description = "Fast rendering of common datatypes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix
new file mode 100644
index 00000000000..d14b0c990c8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/bson/default.nix
@@ -0,0 +1,23 @@
+{ cabal, binary, compactStringFix, cryptohash, dataBinaryIeee754
+, mtl, network, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "bson";
+  version = "0.1.6";
+  sha256 = "0w9dab8x6b3dwk2afy0gnmrvcvx2dshwhjvlr2k69nchid4wh823";
+  buildDepends = [
+    binary compactStringFix cryptohash dataBinaryIeee754 mtl network
+    time
+  ];
+  meta = {
+    homepage = "http://github.com/TonyGen/bson-haskell";
+    description = "BSON documents are JSON-like objects with a standard binary encoding";
+    license = "unknown";
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
new file mode 100644
index 00000000000..446a628dd05
--- /dev/null
+++ b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
@@ -0,0 +1,18 @@
+{ cabal, alex }:
+
+cabal.mkDerivation (self: {
+  pname = "bytestring-lexing";
+  version = "0.2.1";
+  sha256 = "0pibn4phfp346i6i8zwic5zlbq9lqa6ifyx6bdl3p5c8jy3v23r9";
+  buildTools = [ alex ];
+  meta = {
+    homepage = "http://code.haskell.org/~dons/code/bytestring-lexing";
+    description = "Parse literals efficiently from bytestrings";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/bytestring-nums/default.nix b/pkgs/development/libraries/haskell/bytestring-nums/default.nix
index 4a480b07931..20228b9eed1 100644
--- a/pkgs/development/libraries/haskell/bytestring-nums/default.nix
+++ b/pkgs/development/libraries/haskell/bytestring-nums/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bytestring-nums";
-  version = "0.3.3";
-  sha256 = "09gdbyj5qw98j57cs9phzsbmvdm7y6j07wg908i34jklwm24nxfd";
+  version = "0.3.5";
+  sha256 = "12knbyrvr1wa7za8bwypvq3cp81k18qi032dl98s2ylhcz1r6rdk";
   isLibrary = true;
   isExecutable = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/cabal-file-th/default.nix b/pkgs/development/libraries/haskell/cabal-file-th/default.nix
new file mode 100644
index 00000000000..e03c10dea31
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cabal-file-th/default.nix
@@ -0,0 +1,17 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "cabal-file-th";
+  version = "0.2.1";
+  sha256 = "0nczwicgf6kx3lk5m7wqf1wj6ghn8jfx112dzh7jh4f4xs66nsd1";
+  meta = {
+    homepage = "http://github.com/nkpart/cabal-file-th";
+    description = "Template Haskell expressions for reading fields from a project's cabal file";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix
index aa7fae51544..32d62dad8d0 100644
--- a/pkgs/development/libraries/haskell/cairo/default.nix
+++ b/pkgs/development/libraries/haskell/cairo/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cairo";
-  version = "0.12.1";
-  sha256 = "0krclr32cn3vq3cmwhmxz7wzams92iliq44p6s4nj9jg4928cgfk";
+  version = "0.12.2";
+  sha256 = "1sa0xfx14y4imq3bd9l0rqrmxls3l9yga249a31zfhcinnr1j9db";
   buildDepends = [ mtl ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ cairo libc pkgconfig zlib ];
diff --git a/pkgs/development/libraries/haskell/case-insensitive/default.nix b/pkgs/development/libraries/haskell/case-insensitive/default.nix
index 8dff7eda284..9d72d8cedf7 100644
--- a/pkgs/development/libraries/haskell/case-insensitive/default.nix
+++ b/pkgs/development/libraries/haskell/case-insensitive/default.nix
@@ -2,10 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "case-insensitive";
-  version = "0.3.0.1";
-  sha256 = "0aaj7avg3rd2bvjjcny7wjdif60ikk7q49896g12jnczi5ba97ml";
+  version = "0.4.0.1";
+  sha256 = "15wcpzmj1ppl27p8hph9y8nxkjkd4yrvamxi3gk0ahfnb47chaq7";
   buildDepends = [ hashable text ];
   meta = {
+    homepage = "https://github.com/basvandijk/case-insensitive";
     description = "Case insensitive string comparison";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix
index c035b1603f1..eedf4936833 100644
--- a/pkgs/development/libraries/haskell/cereal/default.nix
+++ b/pkgs/development/libraries/haskell/cereal/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cereal";
-  version = "0.3.3.0";
-  sha256 = "0bqd5qfvbz77mq0zxgafj011hrxcanrfzvlwhf4j4dzr6yryk53y";
+  version = "0.3.5.0";
+  sha256 = "0bqkb9al8mr0dzik17bcrjdsk414x78wfc919jb17ihcg7gnvrg8";
   meta = {
     description = "A binary serialization library";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix
index 41646034aa0..33b36578bc8 100644
--- a/pkgs/development/libraries/haskell/certificate/default.nix
+++ b/pkgs/development/libraries/haskell/certificate/default.nix
@@ -1,12 +1,15 @@
-{ cabal, asn1Data, base64Bytestring, mtl, time }:
+{ cabal, asn1Data, base64Bytestring, cryptoPubkeyTypes, mtl, time
+}:
 
 cabal.mkDerivation (self: {
   pname = "certificate";
-  version = "0.9.1";
-  sha256 = "0hq9a0vz72kk1n3hdza36rji8vc95y667iwcsmsh5habyh6q8228";
+  version = "1.0.1";
+  sha256 = "0rv9gs316ng86zv5njcfj96zplbrn317vypnyv7sz28v4k4vha10";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ asn1Data base64Bytestring mtl time ];
+  buildDepends = [
+    asn1Data base64Bytestring cryptoPubkeyTypes mtl time
+  ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-certificate";
     description = "Certificates and Key Reader/Writer";
diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
index c5096ae9a77..32e88cbf2cf 100644
--- a/pkgs/development/libraries/haskell/clientsession/default.nix
+++ b/pkgs/development/libraries/haskell/clientsession/default.nix
@@ -1,12 +1,14 @@
-{ cabal, base64Bytestring, cereal, cryptoApi, cryptocipher, skein
+{ cabal, base64Bytestring, cereal, cprngAes, cryptoApi
+, cryptocipher, entropy, skein, tagged
 }:
 
 cabal.mkDerivation (self: {
   pname = "clientsession";
-  version = "0.7.3.1";
-  sha256 = "0q16brla4m5g7dmgln3awx964ms7pi1s2r21idmc0mk4rnw2rpi7";
+  version = "0.7.3.6";
+  sha256 = "04cvws7h2pm3rk8p2yj1pqkf9vjqq65hxg9sjldg7zhxdjgq1hgc";
   buildDepends = [
-    base64Bytestring cereal cryptoApi cryptocipher skein
+    base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy
+    skein tagged
   ];
   meta = {
     homepage = "http://github.com/snoyberg/clientsession/tree/master";
diff --git a/pkgs/development/libraries/haskell/cmdlib/default.nix b/pkgs/development/libraries/haskell/cmdlib/default.nix
index 93df5ef217c..7b29ba58004 100644
--- a/pkgs/development/libraries/haskell/cmdlib/default.nix
+++ b/pkgs/development/libraries/haskell/cmdlib/default.nix
@@ -1,12 +1,12 @@
-{ cabal, mtl, split, syb }:
+{ cabal, mtl, split, syb, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "cmdlib";
-  version = "0.3.3";
-  sha256 = "0gryz70d69r9pscwxmn5yr02r0zvvgj1vwc3g9klgbkipbsa7xvk";
+  version = "0.3.5";
+  sha256 = "0218f4rl64wvvka95m969hg5y9vc29dqaawfcnk7d1qsv3hx9ydl";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ mtl split syb ];
+  buildDepends = [ mtl split syb transformers ];
   meta = {
     description = "a library for command line parsing & online help";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/compact-string-fix/default.nix b/pkgs/development/libraries/haskell/compact-string-fix/default.nix
new file mode 100644
index 00000000000..416826298bb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/compact-string-fix/default.nix
@@ -0,0 +1,17 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "compact-string-fix";
+  version = "0.3.2";
+  sha256 = "161z0lmrrqvy77ppdgz7m6nazcmlmy1azxa8rx0cgpqmyxzkf87n";
+  meta = {
+    homepage = "http://twan.home.fmf.nl/compact-string/";
+    description = "Same as compact-string except with a small fix so it builds on ghc-6.12";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/convertible-text/default.nix b/pkgs/development/libraries/haskell/convertible-text/default.nix
index 305d589dfb5..b987c9e21e5 100644
--- a/pkgs/development/libraries/haskell/convertible-text/default.nix
+++ b/pkgs/development/libraries/haskell/convertible-text/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "convertible-text";
-  version = "0.3.0.10";
-  sha256 = "1hi7rqijay37b5msyzqqgvkvrsdpj9p96ajxmyk4vm7nnk5dfhbp";
+  version = "0.4.0.1";
+  sha256 = "0m252ml2zgw0jxfs678m1wp9ivy6gvi9w50qw7zi9ycxnzj9j6r2";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ attempt text time ];
diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix
index dce5b245a78..698c643d339 100644
--- a/pkgs/development/libraries/haskell/cookie/default.nix
+++ b/pkgs/development/libraries/haskell/cookie/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cookie";
-  version = "0.3.0.1";
-  sha256 = "1gqz2q09fnbk8scd164mg02jsdh0sg5g06grr627qsjy583i2ad7";
+  version = "0.3.0.2";
+  sha256 = "123ylraxcavj82qcvrbfpb172k8zl5qgzh2byv84did1f1dz0ris";
   buildDepends = [ blazeBuilder text time ];
   meta = {
     homepage = "http://github.com/snoyberg/cookie";
diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix
index 1c156f47a3f..0a40bd29575 100644
--- a/pkgs/development/libraries/haskell/cprng-aes/default.nix
+++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix
@@ -1,10 +1,10 @@
-{ cabal, cereal, cryptoApi, cryptocipher, random }:
+{ cabal, cereal, cryptoApi, cryptocipher, entropy, random }:
 
 cabal.mkDerivation (self: {
   pname = "cprng-aes";
-  version = "0.2.1";
-  sha256 = "0q6qkvha7cckz3zjnzfsrx298arzbdavy1f73hygrd8f7n74442j";
-  buildDepends = [ cereal cryptoApi cryptocipher random ];
+  version = "0.2.3";
+  sha256 = "1xyphzb3afvw7kpgq3b0c86b45rp5a8s870gag1lp7h686lhfnn3";
+  buildDepends = [ cereal cryptoApi cryptocipher entropy random ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-cprng-aes";
     description = "Crypto Pseudo Random Number Generator using AES in counter mode";
diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix
index f567569a6f6..e8d1c4f901b 100644
--- a/pkgs/development/libraries/haskell/criterion/default.nix
+++ b/pkgs/development/libraries/haskell/criterion/default.nix
@@ -1,17 +1,17 @@
-{ cabal, aeson, deepseq, mtl, mwcRandom, parsec, statistics, time
-, vector, vectorAlgorithms
+{ cabal, aeson, deepseq, hastache, mtl, mwcRandom, parsec
+, statistics, time, transformers, vector, vectorAlgorithms
 }:
 
 cabal.mkDerivation (self: {
   pname = "criterion";
-  version = "0.5.1.0";
-  sha256 = "0v43dm1d84zvn32q89dq0nh4dvqr4r6fjdzwcjac0mjics3iy29d";
+  version = "0.6.0.0";
+  sha256 = "0yi6gx9zrmljhhdfqpaylri8x71q2yzyhwwn1c377xngrskpydr9";
   buildDepends = [
-    aeson deepseq mtl mwcRandom parsec statistics time vector
-    vectorAlgorithms
+    aeson deepseq hastache mtl mwcRandom parsec statistics time
+    transformers vector vectorAlgorithms
   ];
   meta = {
-    homepage = "http://bitbucket.org/bos/criterion";
+    homepage = "https://github.com/bos/criterion";
     description = "Robust, reliable performance measurement and analysis";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix
index e651d03b736..66204112c16 100644
--- a/pkgs/development/libraries/haskell/crypto-api/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-api/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-api";
-  version = "0.6.4";
-  sha256 = "1v3nnfw13r514a723lsx8d1awlad6fmv27bgp76f1ssv1garraf3";
+  version = "0.8";
+  sha256 = "1fwkafb9v2348vr1a4xnlmkgs4kh85az4f3wnrl9cbqwxf3cc328";
   buildDepends = [ cereal entropy largeword tagged ];
   meta = {
     homepage = "http://trac.haskell.org/crypto-api/wiki";
diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
new file mode 100644
index 00000000000..5f146d047be
--- /dev/null
+++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
@@ -0,0 +1,18 @@
+{ cabal, cryptoApi }:
+
+cabal.mkDerivation (self: {
+  pname = "crypto-pubkey-types";
+  version = "0.1.0";
+  sha256 = "1ib5bqxydvv37l53wl6b4j6m6y904rsiamhh144lm6rmqiym26f5";
+  buildDepends = [ cryptoApi ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types";
+    description = "Generic cryptography Public keys algorithm types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix
index 754f728aed5..a95e3ec1f64 100644
--- a/pkgs/development/libraries/haskell/cryptocipher/default.nix
+++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix
@@ -1,12 +1,16 @@
-{ cabal, cereal, cryptoApi, primitive, tagged, vector }:
+{ cabal, cereal, cryptoApi, cryptoPubkeyTypes, primitive, tagged
+, vector
+}:
 
 cabal.mkDerivation (self: {
   pname = "cryptocipher";
-  version = "0.2.14";
-  sha256 = "1r91d9sqc53c628z378fyah7vvmkakvxpwbslam0yhfgp2p0l23z";
+  version = "0.3.0";
+  sha256 = "17jbzssdbprspadz5ynyam60l5iw7s809irklfg1ii89x26mlyix";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ cereal cryptoApi primitive tagged vector ];
+  buildDepends = [
+    cereal cryptoApi cryptoPubkeyTypes primitive tagged vector
+  ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-cryptocipher";
     description = "Symmetrical Block, Stream and PubKey Ciphers";
diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix
index 132a46be09e..4336be8318d 100644
--- a/pkgs/development/libraries/haskell/cryptohash/default.nix
+++ b/pkgs/development/libraries/haskell/cryptohash/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cryptohash";
-  version = "0.7.3";
-  sha256 = "1wjmf7ll9jady6p79066b5ib70ywvbgnbc71s76pibkg5hsvclgj";
+  version = "0.7.4";
+  sha256 = "1nplmwihq40jmng4r3wiyfb0i33a8wx2gmlbqajc62wny98l7sab";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ cereal cryptoApi tagged ];
diff --git a/pkgs/development/libraries/haskell/css-text/default.nix b/pkgs/development/libraries/haskell/css-text/default.nix
index efd0f641920..609eb593ebb 100644
--- a/pkgs/development/libraries/haskell/css-text/default.nix
+++ b/pkgs/development/libraries/haskell/css-text/default.nix
@@ -1,10 +1,10 @@
-{ cabal, attoparsecText, text }:
+{ cabal, attoparsec, text }:
 
 cabal.mkDerivation (self: {
   pname = "css-text";
-  version = "0.1.0.1";
-  sha256 = "004ky2s6jmiliw8faja5kzp99i36qf56cixvn43n3pnq8gg26kfi";
-  buildDepends = [ attoparsecText text ];
+  version = "0.1.1";
+  sha256 = "10vb08rnfq987w7wrirw8ib1kzafxaaancswm4xpw46ha3rq1m0y";
+  buildDepends = [ attoparsec text ];
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "CSS parser and renderer";
diff --git a/pkgs/development/libraries/haskell/random/1.0.0.3.nix b/pkgs/development/libraries/haskell/curl/default.nix
similarity index 55%
rename from pkgs/development/libraries/haskell/random/1.0.0.3.nix
rename to pkgs/development/libraries/haskell/curl/default.nix
index f89cad32f9e..c512820114f 100644
--- a/pkgs/development/libraries/haskell/random/1.0.0.3.nix
+++ b/pkgs/development/libraries/haskell/curl/default.nix
@@ -1,12 +1,12 @@
-{ cabal, time }:
+{ cabal, curl }:
 
 cabal.mkDerivation (self: {
-  pname = "random";
-  version = "1.0.0.3";
-  sha256 = "0k2735vrx0id2dxzk7lkm22w07p7gy86zffygk60jxgh9rvignf6";
-  buildDepends = [ time ];
+  pname = "curl";
+  version = "1.3.7";
+  sha256 = "0i6d7732p5gn1bcvavbxcg4wd18j425mi1yjg0b29zzz3yl0qhgi";
+  extraLibraries = [ curl ];
   meta = {
-    description = "random number library";
+    description = "Haskell binding to libcurl";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
diff --git a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
new file mode 100644
index 00000000000..48786b509fa
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
@@ -0,0 +1,20 @@
+{ cabal, binary }:
+
+cabal.mkDerivation (self: {
+  pname = "data-binary-ieee754";
+  version = "0.4.2.1";
+  sha256 = "0i0nclq8858flpp2sl3czwz6rfaykjrlzpvlfr6vlxzf8zvah9kz";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ binary ];
+  meta = {
+    homepage = "http://john-millikin.com/software/data-binary-ieee754/";
+    description = "Parser/Serialiser for IEEE-754 floating-point values";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/data-object-yaml/default.nix b/pkgs/development/libraries/haskell/data-object-yaml/default.nix
index 9622c2af6b9..a29ba40b823 100644
--- a/pkgs/development/libraries/haskell/data-object-yaml/default.nix
+++ b/pkgs/development/libraries/haskell/data-object-yaml/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "data-object-yaml";
-  version = "0.3.3.5";
-  sha256 = "0ag0rac9j4ipfg9haa63s73sn7zckrpwybcfk2nbg84ix56nv36w";
+  version = "0.3.3.6";
+  sha256 = "0hha52nrxb539bvdz6ksn9sxmksfwmjhh7h8mp223s340vxrlpk3";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/data-object/default.nix b/pkgs/development/libraries/haskell/data-object/default.nix
index 2c774c8c79f..fb2c013da8d 100644
--- a/pkgs/development/libraries/haskell/data-object/default.nix
+++ b/pkgs/development/libraries/haskell/data-object/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "data-object";
-  version = "0.3.1.7";
-  sha256 = "0b4jai09nx3h2vfj5f2q1wp0wldvkjygyzkgrrc6hnsfx2qv8qf7";
+  version = "0.3.1.8";
+  sha256 = "0v7kn6rv71fhf2l7ll7plzr90irm2fyp25lskv2zwazp4swhw52x";
   buildDepends = [ failure text time ];
   meta = {
     homepage = "http://github.com/snoyberg/data-object/tree/master";
diff --git a/pkgs/development/libraries/haskell/double-conversion/default.nix b/pkgs/development/libraries/haskell/double-conversion/default.nix
index 4f1bf34dc29..ee84665ad63 100644
--- a/pkgs/development/libraries/haskell/double-conversion/default.nix
+++ b/pkgs/development/libraries/haskell/double-conversion/default.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "double-conversion";
-  version = "0.2.0.1";
-  sha256 = "146ijcv55k0lqlw8y4nz7p5kjpwry2jzbqmkan904pnlcfv4a60a";
+  version = "0.2.0.3";
+  sha256 = "17ny1gvd622rnqjvlrmcpgw3wlabrsc6d046d4ii6xv299z97qw9";
   buildDepends = [ text ];
   meta = {
-    homepage = "https://github.com/mailrank/double-conversion";
+    homepage = "https://github.com/bos/double-conversion";
     description = "Fast conversion between double precision floating point and text";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/download-curl/default.nix b/pkgs/development/libraries/haskell/download-curl/default.nix
new file mode 100644
index 00000000000..81e88b8f58d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/download-curl/default.nix
@@ -0,0 +1,18 @@
+{ cabal, curl, feed, tagsoup, xml }:
+
+cabal.mkDerivation (self: {
+  pname = "download-curl";
+  version = "0.1.3";
+  sha256 = "17g5dnw4yxi4kf5x71bkk4wx1zl8yjs5dd34k6dgnw9wgkz97qw1";
+  buildDepends = [ curl feed tagsoup xml ];
+  meta = {
+    homepage = "http://code.haskell.org/~dons/code/download-curl";
+    description = "High-level file download based on URLs";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/download/default.nix b/pkgs/development/libraries/haskell/download/default.nix
new file mode 100644
index 00000000000..c0895ac2938
--- /dev/null
+++ b/pkgs/development/libraries/haskell/download/default.nix
@@ -0,0 +1,18 @@
+{ cabal, feed, tagsoup, xml }:
+
+cabal.mkDerivation (self: {
+  pname = "download";
+  version = "0.3.2";
+  sha256 = "0nhbfq8q9ckc5fnlg54l361p2jhkag9cz11v07kj9f1kwkm4d7w3";
+  buildDepends = [ feed tagsoup xml ];
+  meta = {
+    homepage = "http://code.haskell.org/~dons/code/download";
+    description = "High-level file download based on URLs";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/enumerator/default.nix b/pkgs/development/libraries/haskell/enumerator/default.nix
index 1037c570bdb..12e801516a6 100644
--- a/pkgs/development/libraries/haskell/enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/enumerator/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "enumerator";
-  version = "0.4.14";
-  sha256 = "06bvrr76y12r3i1xi1s98fc1v6mcmn8nzhbp80wgyi743ksqcr1d";
+  version = "0.4.16";
+  sha256 = "16556x3km4si7gvprf7xmsiqw1ygjwavhbgh32fmzf7709bpqnhs";
   buildDepends = [ text transformers ];
   meta = {
     homepage = "https://john-millikin.com/software/enumerator/";
diff --git a/pkgs/development/libraries/haskell/flexible-defaults/default.nix b/pkgs/development/libraries/haskell/flexible-defaults/default.nix
index b552ab51e2e..3c7e45ce0d5 100755
--- a/pkgs/development/libraries/haskell/flexible-defaults/default.nix
+++ b/pkgs/development/libraries/haskell/flexible-defaults/default.nix
@@ -1,10 +1,10 @@
-{ cabal, transformers }:
+{ cabal, thExtras, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "flexible-defaults";
-  version = "0.0.0.2";
-  sha256 = "0hr3x4hlah6pd88xvr9lgvz1v4pyxpyv6q9zms96jkm5wc4mkbwx";
-  buildDepends = [ transformers ];
+  version = "0.0.0.3";
+  sha256 = "1s0dz61bqzzbxqvn9i8zwaccsha15als45zzjs2yc11r3m151dla";
+  buildDepends = [ thExtras transformers ];
   meta = {
     homepage = "https://github.com/mokus0/flexible-defaults";
     description = "Generate default function implementations for complex type classes";
diff --git a/pkgs/development/libraries/haskell/gamma/default.nix b/pkgs/development/libraries/haskell/gamma/default.nix
index 523b9d233ca..7a068a25eee 100755
--- a/pkgs/development/libraries/haskell/gamma/default.nix
+++ b/pkgs/development/libraries/haskell/gamma/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gamma";
-  version = "0.7.0.1";
-  sha256 = "0728b5mrzmj9hkaqvikl45jyi2p9hnkl2p6l9yv7wnw557yb0gb2";
+  version = "0.9.0.1";
+  sha256 = "02s9m2vlrnfg26c7921x60xxmawzzk27y3czcnvs8hlk01mb1xv7";
   buildDepends = [ continuedFractions converge vector ];
   meta = {
     homepage = "https://github.com/mokus0/gamma";
diff --git a/pkgs/development/libraries/haskell/ghc-mtl/default.nix b/pkgs/development/libraries/haskell/ghc-mtl/default.nix
index 43a8deaf915..d67f455471f 100644
--- a/pkgs/development/libraries/haskell/ghc-mtl/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mtl/default.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "ghc-mtl";
-  version = "1.0.1.0";
-  sha256 = "5284e0ecf99511e6263503412faf6fa809dc577c009fde63203d46405eb1b191";
+  version = "1.0.1.1";
+  sha256 = "04lm1g27xwwph02k3d8b51nbhi2sw8jx7arqczcqc3rygak10fpn";
   buildDepends = [ MonadCatchIOMtl mtl ];
   meta = {
-    homepage = "http://code.haskell.org/~jcpetruzza/ghc-mtl";
+    homepage = "http://darcsden.com/jcpetruzza/ghc-mtl";
     description = "An mtl compatible version of the Ghc-Api monads and monad-transformers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix
index 445f7122809..c60c776e60f 100644
--- a/pkgs/development/libraries/haskell/glib/default.nix
+++ b/pkgs/development/libraries/haskell/glib/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "glib";
-  version = "0.12.1";
-  sha256 = "0lsgpbd08w64npc0xsnxg8n4vj2hdnjvs55h4lhgc61p05q9gv52";
+  version = "0.12.2";
+  sha256 = "0p1d6j23yf30824q5gn7pw7s47hs4rnaqs69d2hn2pnzpc1ml3c6";
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];
   pkgconfigDepends = [ glib ];
diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
index 509624321f8..1b9fbb03da4 100644
--- a/pkgs/development/libraries/haskell/gloss/default.nix
+++ b/pkgs/development/libraries/haskell/gloss/default.nix
@@ -1,10 +1,10 @@
-{ cabal, GLUT, OpenGL }:
+{ cabal, bmp, GLUT, OpenGL }:
 
 cabal.mkDerivation (self: {
   pname = "gloss";
-  version = "1.3.4.1";
-  sha256 = "0cyk75b495vq59pnfqy6ny5kb0i0zq2hwfb1q69vj0cfyiqiwjsb";
-  buildDepends = [ GLUT OpenGL ];
+  version = "1.5.2.1";
+  sha256 = "1mwk9gnkbjr76f9g79ixxlwzpsvmhflp5c8a0584fyypjg2r33n3";
+  buildDepends = [ bmp GLUT OpenGL ];
   meta = {
     homepage = "http://gloss.ouroborus.net";
     description = "Painless 2D vector graphics, animations and simulations";
diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix
index 9e1ab17a940..006e0c3266f 100644
--- a/pkgs/development/libraries/haskell/graphviz/default.nix
+++ b/pkgs/development/libraries/haskell/graphviz/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "graphviz";
-  version = "2999.12.0.3";
-  sha256 = "0qvkmklf2wxac6j01fnh8r352b52xzhr8wryk1b9119wvcbli8md";
+  version = "2999.12.0.4";
+  sha256 = "02yg5c02k3sdrcq5srzpdvlzs6cnrns67576qzr8n7ynhpvard73";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix
index e3fac24865b..346caa1b72e 100644
--- a/pkgs/development/libraries/haskell/gtk/default.nix
+++ b/pkgs/development/libraries/haskell/gtk/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gtk";
-  version = "0.12.1";
-  sha256 = "007wxxff2ibfi3848yjxg7hqgpiqpn0zpyivjvjv0zphk1d2j9sv";
+  version = "0.12.2";
+  sha256 = "0qjhy2adbqv03qbmh6ydga4axvj263n5srwpfrw4v5gk34fvyj9w";
   buildDepends = [ cairo glib mtl pango ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 856949200e0..9035c606ed8 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -1,14 +1,15 @@
-{ cabal, binary, blazeHtml, cryptohash, hamlet, mtl, pandoc, parsec
-, regexBase, regexPcre, snapCore, snapServer, tagsoup, time
+{ cabal, binary, blazeHtml, citeprocHs, cryptohash, hamlet, mtl
+, pandoc, parsec, regexBase, regexPcre, snapCore, snapServer
+, tagsoup, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "3.2.0.8";
-  sha256 = "1yp01g7wzr9qkx3vz7v791gglmr0pg5c6jj076rv118kw0l8n61l";
+  version = "3.2.3.2";
+  sha256 = "0410gg8sdnw0iyhqrw1wfv9abbrv7r6awgvlhqds17vnrdxxk2w8";
   buildDepends = [
-    binary blazeHtml cryptohash hamlet mtl pandoc parsec regexBase
-    regexPcre snapCore snapServer tagsoup time
+    binary blazeHtml citeprocHs cryptohash hamlet mtl pandoc parsec
+    regexBase regexPcre snapCore snapServer tagsoup time
   ];
   meta = {
     homepage = "http://jaspervdj.be/hakyll";
diff --git a/pkgs/development/libraries/haskell/hamlet/0.8.2.1.nix b/pkgs/development/libraries/haskell/hamlet/0.8.2.1.nix
deleted file mode 100644
index 0bf489ae983..00000000000
--- a/pkgs/development/libraries/haskell/hamlet/0.8.2.1.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ cabal, blazeBuilder, blazeHtml, failure, parsec, text }:
-
-cabal.mkDerivation (self: {
-  pname = "hamlet";
-  version = "0.8.2.1";
-  sha256 = "0798ic6qap4npw2rx42xcgmi1fcbwqvyic5x6vyyf6abvxv16925";
-  buildDepends = [ blazeBuilder blazeHtml failure parsec text ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Haml-like template files that are compile-time checked";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hamlet/0.10.2.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
similarity index 86%
rename from pkgs/development/libraries/haskell/hamlet/0.10.2.nix
rename to pkgs/development/libraries/haskell/hamlet/default.nix
index 1992be553b2..15d219830a4 100644
--- a/pkgs/development/libraries/haskell/hamlet/0.10.2.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "0.10.2";
-  sha256 = "1p4dz1h640ryhj7prks7qazqyx0l79hi7130ksfchlb5mprz6wq2";
+  version = "0.10.5";
+  sha256 = "0kizy0qij6zbayrbb3gr4iqys1551ax5c8w5lvh6chg3ypl1i1m3";
   buildDepends = [
     blazeBuilder blazeHtml failure parsec shakespeare text
   ];
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
index 3eccba4eb38..2826d84fa90 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-hamlet";
-  version = "6.2.0";
-  sha256 = "1y3nc6z9y96fci25dc6w66l0qlnkz29kr29dpd2sjnhpqm0kvzsc";
+  version = "6.2.2";
+  sha256 = "02kpfv7axrmgzyyqsfkdixcm7badh0sgy7am2kryvyb49zzk1vjr";
   buildDepends = [ hamlet happstackServer text ];
   meta = {
     homepage = "http://www.happstack.com/";
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index b62c8bd0202..c8e5e12cf4b 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-server";
-  version = "6.2.4";
-  sha256 = "0lhyjaxw1qkh1pi0v14j7ya2ljrfizmxwahrhqk3sasnf2mrqycp";
+  version = "6.2.5";
+  sha256 = "196s8i3v55i10nkapkvzyw048flshw8mlm604548f0qjciynfjmg";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/hashable/default.nix b/pkgs/development/libraries/haskell/hashable/default.nix
index 5149da865c7..ba4c0312f9b 100644
--- a/pkgs/development/libraries/haskell/hashable/default.nix
+++ b/pkgs/development/libraries/haskell/hashable/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hashable";
-  version = "1.1.2.1";
-  sha256 = "1kmx3jr9cmkbapd7gywx7zvyd22nyz2mgs8lnzspp5hi7crx3wcx";
+  version = "1.1.2.2";
+  sha256 = "0gfg1cyd468czfv5xfhn7rz0r5s0v378c4xjlm6kkw7n10n2zg8y";
   buildDepends = [ text ];
   meta = {
     homepage = "http://github.com/tibbe/hashable";
diff --git a/pkgs/development/libraries/haskell/hashed-storage/default.nix b/pkgs/development/libraries/haskell/hashed-storage/default.nix
index dc7378ce047..441dac7a4df 100644
--- a/pkgs/development/libraries/haskell/hashed-storage/default.nix
+++ b/pkgs/development/libraries/haskell/hashed-storage/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hashed-storage";
-  version = "0.5.8";
-  sha256 = "1730hg6h7a1b0vgr9dvish41bpgly5cjpdwhqny75fi5in7dqplh";
+  version = "0.5.9";
+  sha256 = "1ycn0zwk5jqm6wwgs8nxpdg7fh5wx0i2058i0a924whj196kkhk2";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix
new file mode 100644
index 00000000000..56b2316a5f9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hashtables/default.nix
@@ -0,0 +1,18 @@
+{ cabal, hashable, primitive, vector }:
+
+cabal.mkDerivation (self: {
+  pname = "hashtables";
+  version = "1.0.1.2";
+  sha256 = "09lviwxwlhvhrgm7v66w0vd7j02s0191w1izsvwh1a3dj2vc7vw7";
+  buildDepends = [ hashable primitive vector ];
+  meta = {
+    homepage = "http://github.com/gregorycollins/hashtables";
+    description = "Mutable hash tables in the ST monad";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix
index 12e1448c041..2b15fa562bf 100644
--- a/pkgs/development/libraries/haskell/haskeline/default.nix
+++ b/pkgs/development/libraries/haskell/haskeline/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskeline";
-  version = "0.6.4.3";
-  sha256 = "1dlrsazprvn6xcd12k5ln536rv9sljjccrjgpq6jj6b9ziadwiwr";
+  version = "0.6.4.5";
+  sha256 = "1blhbh53p6di3q3gldzmg3i8f4w3ahipai3di49i4rdcnjry0j5b";
   buildDepends = [ extensibleExceptions mtl terminfo utf8String ];
   meta = {
     homepage = "http://trac.haskell.org/haskeline";
diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.9.6.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.9.6.nix
deleted file mode 100644
index 42b69258397..00000000000
--- a/pkgs/development/libraries/haskell/haskell-src-exts/1.9.6.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ cabal, cpphs, happy }:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-src-exts";
-  version = "1.9.6";
-  sha256 = "1bdbjwhzms962ncwiszp82a8m6jkgz6d9cns5585kipy9n224d3h";
-  buildDepends = [ cpphs ];
-  buildTools = [ happy ];
-  meta = {
-    homepage = "http://code.haskell.org/haskell-src-exts";
-    description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix
rename to pkgs/development/libraries/haskell/haskell-src-exts/default.nix
diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
index fd16c1151f2..5271176a5cf 100644
--- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskell-src-meta";
-  version = "0.5";
-  sha256 = "0403j2ks2as61rfl049v4h43xpgx06bm739y80vada6jc85rfinr";
+  version = "0.5.0.2";
+  sha256 = "059zvr91bnajql19c76vwivvy6sbca83ky8ja91bf8xv1p3jfz3w";
   buildDepends = [ haskellSrcExts syb thLift ];
   meta = {
     description = "Parse source to template-haskell abstract syntax";
diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix
new file mode 100644
index 00000000000..dd62d57a02a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix
@@ -0,0 +1,18 @@
+{ cabal, happy, syb }:
+
+cabal.mkDerivation (self: {
+  pname = "haskell-src";
+  version = "1.0.1.5";
+  sha256 = "1ay3i2sbrp0pzg6fagg8gqrwq5lcnm5jb5sr11frbk274a82cdwz";
+  buildDepends = [ syb ];
+  buildTools = [ happy ];
+  meta = {
+    description = "Support for manipulating Haskell source code";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix
new file mode 100644
index 00000000000..ac9515348db
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hastache/default.nix
@@ -0,0 +1,18 @@
+{ cabal, blazeBuilder, mtl, syb, text, utf8String }:
+
+cabal.mkDerivation (self: {
+  pname = "hastache";
+  version = "0.2.4";
+  sha256 = "0881sh3vp5v8kk3rnz9dg2bnis6qy4gx5sr0sqj6xl162sbhf3yv";
+  buildDepends = [ blazeBuilder mtl syb text utf8String ];
+  meta = {
+    homepage = "http://github.com/lymar/hastache";
+    description = "Haskell implementation of Mustache templates";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix
index ac6e81e702e..ff7101aba23 100644
--- a/pkgs/development/libraries/haskell/hint/default.nix
+++ b/pkgs/development/libraries/haskell/hint/default.nix
@@ -4,14 +4,14 @@
 
 cabal.mkDerivation (self: {
   pname = "hint";
-  version = "0.3.3.2";
-  sha256 = "1qm74hjz8cxypvavcw7s094zg9ic3r1ll2lj3y159ipc79cw2sn1";
+  version = "0.3.3.3";
+  sha256 = "0i7d7c2786c13npbb5np3gaidsq4kkajvm3fn2gx8djrhhlrqw5l";
   buildDepends = [
     extensibleExceptions ghcMtl ghcPaths haskellSrc MonadCatchIOMtl mtl
     random utf8String
   ];
   meta = {
-    homepage = "http://projects.haskell.org/hint";
+    homepage = "http://darcsden.com/jcpetruzza/hint";
     description = "Runtime Haskell interpreter (GHC API wrapper)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/hledger-chart/default.nix b/pkgs/development/libraries/haskell/hledger-chart/default.nix
index 1b9d0eb6f55..84b8c33fc21 100644
--- a/pkgs/development/libraries/haskell/hledger-chart/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-chart/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger-chart";
-  version = "0.16";
-  sha256 = "05njn30xxnjxigvz6sjhm1ks595f9y7ndw3il1grh09rhvgp42f7";
+  version = "0.16.1";
+  sha256 = "1yk563032ir98gqdvxazjjl1alg6q1pflzawh11pr3zrdnriracn";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix
index 16dc72f3450..d8fdbf3f71d 100644
--- a/pkgs/development/libraries/haskell/hledger-lib/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger-lib";
-  version = "0.16";
-  sha256 = "095hghg7b6x355yfd3xcp8cngl94k8qbl5x7qm12ncin9dsmz8h8";
+  version = "0.16.1";
+  sha256 = "15imhdkzfnxr72lsghrbsfisc7c2al4jkzcp72yf4hhra4zym1sd";
   buildDepends = [
     cmdargs HUnit mtl parsec regexpr safe split time utf8String
   ];
diff --git a/pkgs/development/libraries/haskell/hledger-vty/default.nix b/pkgs/development/libraries/haskell/hledger-vty/default.nix
index 5cd816c5ddf..0a6dd1cf202 100644
--- a/pkgs/development/libraries/haskell/hledger-vty/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-vty/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger-vty";
-  version = "0.16";
-  sha256 = "161ziq4vwg6wsxijq065g1dpfnvcpxzzbarsj7znbqq4gs02mxx2";
+  version = "0.16.1";
+  sha256 = "10aq9apxz6nrzvvynha0wkhy34dn8dybizr8assni6rns8ylh188";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ cmdargs hledger hledgerLib HUnit safe time vty ];
diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix
index 2c3affc9c62..5b697906f3b 100644
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-web/default.nix
@@ -1,19 +1,19 @@
-{ cabal, aesonNative, blazeHtml, clientsession, cmdargs, dataObject
-, dataObjectYaml, failure, fileEmbed, hamlet, hledger, hledgerLib
-, HUnit, ioStorage, parsec, regexpr, safe, shakespeareCss
-, shakespeareJs, shakespeareText, text, time, transformers, wai
-, waiExtra, warp, yesod, yesodCore, yesodForm, yesodJson
-, yesodStatic
+{ cabal, aesonNative, blazeHtml, cabalFileTh, clientsession
+, cmdargs, dataObject, dataObjectYaml, failure, fileEmbed, hamlet
+, hledger, hledgerLib, HUnit, ioStorage, parsec, regexpr, safe
+, shakespeareCss, shakespeareJs, shakespeareText, text, time
+, transformers, wai, waiExtra, warp, yesod, yesodCore, yesodForm
+, yesodJson, yesodStatic
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger-web";
-  version = "0.16";
-  sha256 = "1564w1619s08q5c1zx8i8z488zis13a8d6n4cnyha9ci95p1c89j";
+  version = "0.16.5";
+  sha256 = "0gqhmyl62jkz156gypzxwj46xrh5as3wrvkwrg04wfmpqrac5n06";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    aesonNative blazeHtml clientsession cmdargs dataObject
+    aesonNative blazeHtml cabalFileTh clientsession cmdargs dataObject
     dataObjectYaml failure fileEmbed hamlet hledger hledgerLib HUnit
     ioStorage parsec regexpr safe shakespeareCss shakespeareJs
     shakespeareText text time transformers wai waiExtra warp yesod
diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix
index 471e410553a..e0560855286 100644
--- a/pkgs/development/libraries/haskell/hledger/default.nix
+++ b/pkgs/development/libraries/haskell/hledger/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger";
-  version = "0.16";
-  sha256 = "0wz4g67ilxj741j8d7amssa6dr0xrdfghwmhzwlcp1fj4a5a44c8";
+  version = "0.16.1";
+  sha256 = "182a5qlcxbh9q8hzrmgm99hcgvxjq8j5xq202iff14p1yqv0irs2";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix
index 43c66c3d894..84866e026fd 100644
--- a/pkgs/development/libraries/haskell/hmatrix/default.nix
+++ b/pkgs/development/libraries/haskell/hmatrix/default.nix
@@ -4,12 +4,13 @@
 
 cabal.mkDerivation (self: {
   pname = "hmatrix";
-  version = "0.12.0.1";
-  sha256 = "1lnq1892vzx094d84jfs2477m3w47xgmqvnvzignwgfi470d9lw5";
+  version = "0.12.0.2";
+  sha256 = "08i3vi0vs6wpyvjsjpqrxp8lw0f89cgzwv1j27y7i2yfp4xmrw8d";
   buildDepends = [
     binary HUnit QuickCheck random storableComplex vector
   ];
   extraLibraries = [ blas gsl liblapack ];
+  configureFlags = "-fvector";
   meta = {
     homepage = "http://perception.inf.um.es/hmatrix";
     description = "Linear algebra and numerical computation";
diff --git a/pkgs/development/libraries/haskell/hp2any-core/default.nix b/pkgs/development/libraries/haskell/hp2any-core/default.nix
index 8bc4620ac26..f1634f632a3 100644
--- a/pkgs/development/libraries/haskell/hp2any-core/default.nix
+++ b/pkgs/development/libraries/haskell/hp2any-core/default.nix
@@ -1,10 +1,10 @@
-{ cabal, bytestringTrie, network, time }:
+{ cabal, attoparsec, network, time }:
 
 cabal.mkDerivation (self: {
   pname = "hp2any-core";
-  version = "0.10.1";
-  sha256 = "1qblsvlj4x22ml3k5mlr28r5xk9rmi7lpipd369dbvdzm0rflf03";
-  buildDepends = [ bytestringTrie network time ];
+  version = "0.11.1";
+  sha256 = "146bigmch7dawyyakj0w55p0jdpnxkj8q5izjsswqqk0pdxia546";
+  buildDepends = [ attoparsec network time ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Hp2any";
     description = "Heap profiling helper library";
diff --git a/pkgs/development/libraries/haskell/http-date/default.nix b/pkgs/development/libraries/haskell/http-date/default.nix
index e7dbaedb591..1fbcc40a814 100644
--- a/pkgs/development/libraries/haskell/http-date/default.nix
+++ b/pkgs/development/libraries/haskell/http-date/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-date";
-  version = "0.0.0";
-  sha256 = "0jia05636xk9k70hqjjiny5298pkb8g7mck7zybfwvigi1fppa46";
+  version = "0.0.1";
+  sha256 = "1dqnglz1l6h14339nd5q8sq90fak64ab8fs9fkhf8ipg5y0pzwbd";
   buildDepends = [ attoparsec ];
   meta = {
     description = "HTTP Date parser/formatter";
diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix
index 22b6e6370f3..14109cd1c11 100644
--- a/pkgs/development/libraries/haskell/http-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-enumerator";
-  version = "0.7.1";
-  sha256 = "0d8zfgj41jdg6k9ny717xy1ca2jxnmr7aliqlq2arf4900lxjlwd";
+  version = "0.7.2";
+  sha256 = "096rwnfm8bqn0pq9cs4i2kr1ljmawk2l17afw301zqfg79q97crc";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix
index 4966803af36..1006d2fd2c3 100644
--- a/pkgs/development/libraries/haskell/http-types/default.nix
+++ b/pkgs/development/libraries/haskell/http-types/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-types";
-  version = "0.6.5.1";
-  sha256 = "1gmf5ghfm8hzifinknyk10m7ayxkn48h1l0mchi2vl6h5rg0nnca";
+  version = "0.6.7";
+  sha256 = "04bmw5k9gvlh7x4ggmwz7pdc1ik3va0v4icg7nv47ab2w2pn88pb";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ blazeBuilder caseInsensitive text ];
diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix
index 88112a1f089..979fa3c11e9 100644
--- a/pkgs/development/libraries/haskell/hxt/default.nix
+++ b/pkgs/development/libraries/haskell/hxt/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hxt";
-  version = "9.1.4";
-  sha256 = "1dqnxb1dikw74l02sb6q193ipk9qfwqlgvcd362705mdqzai124c";
+  version = "9.1.5";
+  sha256 = "0w0l86y8q2391dvqn112f2s0infm1zzqnlp9hhwcx8jg2slsxbcm";
   buildDepends = [
     binary deepseq HUnit hxtCharproperties hxtRegexXmlschema hxtUnicode
     network parsec
diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix
new file mode 100644
index 00000000000..148cf3474b1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/iteratee/default.nix
@@ -0,0 +1,23 @@
+{ cabal, ListLike, MonadCatchIOTransformers, parallel, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "iteratee";
+  version = "0.8.7.5";
+  sha256 = "182bxdnj7k4dkmrbnkzy93axq8hwpq3xdbkyf93hbzzp4vhdvjnl";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    ListLike MonadCatchIOTransformers parallel transformers
+  ];
+  meta = {
+    homepage = "http://www.tiresiaspress.us/haskell/iteratee";
+    description = "Iteratee-based I/O";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix
new file mode 100644
index 00000000000..758a068453d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/libmpd/default.nix
@@ -0,0 +1,20 @@
+{ cabal, mtl, network, time, utf8String }:
+
+cabal.mkDerivation (self: {
+  pname = "libmpd";
+  version = "0.7.0";
+  sha256 = "03bp3bpf1zr8srbzxjhppj7pba0h1if9lga7x5nvhlgc6p7799nw";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ mtl network time utf8String ];
+  meta = {
+    homepage = "http://github.com/joachifm/libmpd-haskell";
+    description = "An MPD client library";
+    license = "LGPL";
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix
index 7651d36aca8..db2734c8739 100644
--- a/pkgs/development/libraries/haskell/mime-mail/default.nix
+++ b/pkgs/development/libraries/haskell/mime-mail/default.nix
@@ -1,10 +1,10 @@
-{ cabal, blazeBuilder, dataenc, random, text }:
+{ cabal, base64Bytestring, blazeBuilder, random, text }:
 
 cabal.mkDerivation (self: {
   pname = "mime-mail";
-  version = "0.3.0.3";
-  sha256 = "0aag2mj1jchgwgnlh6hmv9qz78qjxffn1b52nwl6257sk0qv6va6";
-  buildDepends = [ blazeBuilder dataenc random text ];
+  version = "0.4.1.0";
+  sha256 = "1czjxxpv2w8zvwm6nkv0rr47rdl84s5f5xvf3r4kjaw44a6jfgg0";
+  buildDepends = [ base64Bytestring blazeBuilder random text ];
   meta = {
     homepage = "http://github.com/snoyberg/mime-mail";
     description = "Compose MIME email messages";
diff --git a/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix b/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix
new file mode 100644
index 00000000000..b3d9208bd25
--- /dev/null
+++ b/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix
@@ -0,0 +1,18 @@
+{ cabal, baseUnicodeSymbols, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "monad-control";
+  version = "0.2.0.3";
+  sha256 = "0z7wjilrx6phqs2gxwv65dy1n3mc0j8hj3adshkwy6z8ggj283nh";
+  buildDepends = [ baseUnicodeSymbols transformers ];
+  meta = {
+    homepage = "https://github.com/basvandijk/monad-control/";
+    description = "Lift control operations, like exception catching, through monad transformers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix
index b3d9208bd25..52e3d001f48 100644
--- a/pkgs/development/libraries/haskell/monad-control/default.nix
+++ b/pkgs/development/libraries/haskell/monad-control/default.nix
@@ -1,12 +1,14 @@
-{ cabal, baseUnicodeSymbols, transformers }:
+{ cabal, baseUnicodeSymbols, transformers, transformersBase }:
 
 cabal.mkDerivation (self: {
   pname = "monad-control";
-  version = "0.2.0.3";
-  sha256 = "0z7wjilrx6phqs2gxwv65dy1n3mc0j8hj3adshkwy6z8ggj283nh";
-  buildDepends = [ baseUnicodeSymbols transformers ];
+  version = "0.3.0.1";
+  sha256 = "0aa73cw82yssias0a9y237h9r4v4abvs0lv2lmhxaa4a4mdrj3ms";
+  buildDepends = [
+    baseUnicodeSymbols transformers transformersBase
+  ];
   meta = {
-    homepage = "https://github.com/basvandijk/monad-control/";
+    homepage = "https://github.com/basvandijk/monad-control";
     description = "Lift control operations, like exception catching, through monad transformers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/monad-par/default.nix b/pkgs/development/libraries/haskell/monad-par/default.nix
index 01d6a40a433..8b6850ea08d 100644
--- a/pkgs/development/libraries/haskell/monad-par/default.nix
+++ b/pkgs/development/libraries/haskell/monad-par/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-par";
-  version = "0.1.0.1";
-  sha256 = "0sd5w09vi12jwzz8xgh51r27577byr6pqp15dw0z5nhf4w869qxq";
+  version = "0.1.0.2";
+  sha256 = "0ca5fbc92bmghg8pk40rwcf58jk3y7xcr0nwfhyhi67riqnwqrl8";
   buildDepends = [ deepseq HUnit ];
   meta = {
     homepage = "https://github.com/simonmar/monad-par";
diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix
new file mode 100644
index 00000000000..0b59808a53a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/mongoDB/default.nix
@@ -0,0 +1,23 @@
+{ cabal, binary, bson, cryptohash, monadControl, mtl, network
+, parsec, random, randomShuffle
+}:
+
+cabal.mkDerivation (self: {
+  pname = "mongoDB";
+  version = "1.1.1";
+  sha256 = "0hy47kvswm4g85c3lb75fvdrcnrcbmjrhk15r1jjriwzqicgiimz";
+  buildDepends = [
+    binary bson cryptohash monadControl mtl network parsec random
+    randomShuffle
+  ];
+  meta = {
+    homepage = "http://github.com/TonyGen/mongoDB-haskell";
+    description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
+    license = "unknown";
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/murmur-hash/default.nix b/pkgs/development/libraries/haskell/murmur-hash/default.nix
index 468c18f9051..d20822244ef 100644
--- a/pkgs/development/libraries/haskell/murmur-hash/default.nix
+++ b/pkgs/development/libraries/haskell/murmur-hash/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "murmur-hash";
-  version = "0.1.0.4";
-  sha256 = "08nvdv3r5scqpdcivwp0d77dl4vpkgq58rzxv1xpb8r1krqy588d";
+  version = "0.1.0.5";
+  sha256 = "1m7rm57bxkrl4i9fbvmx5m29axyxddrs4ss7plbd19pw3wsvgmr0";
   meta = {
     homepage = "http://github.com/nominolo/murmur-hash";
     description = "MurmurHash2 implementation for Haskell";
diff --git a/pkgs/development/libraries/haskell/network/2.3.0.6.nix b/pkgs/development/libraries/haskell/network/2.3.0.6.nix
deleted file mode 100644
index a62a0f59773..00000000000
--- a/pkgs/development/libraries/haskell/network/2.3.0.6.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ cabal, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "network";
-  version = "2.3.0.6";
-  sha256 = "0xdqcf7zfxpa7qmvwzxf11y61b6xn4v2jjrqpibr2pfqqr0p3gkw";
-  buildDepends = [ parsec ];
-  meta = {
-    homepage = "http://github.com/haskell/network";
-    description = "Low-level networking interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network/2.3.0.5.nix b/pkgs/development/libraries/haskell/network/2.3.0.8.nix
similarity index 82%
rename from pkgs/development/libraries/haskell/network/2.3.0.5.nix
rename to pkgs/development/libraries/haskell/network/2.3.0.8.nix
index bf9330eb256..93e57b0ec01 100644
--- a/pkgs/development/libraries/haskell/network/2.3.0.5.nix
+++ b/pkgs/development/libraries/haskell/network/2.3.0.8.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network";
-  version = "2.3.0.5";
-  sha256 = "0y1sbgsffzr0skm6xl8907iclgw9vmf395zvpwgakp69i3snh1z0";
+  version = "2.3.0.8";
+  sha256 = "10y7spi1qwjmq7mz7h09ijrzq0jl4r02jrgxiqavsiw6j35r4yfv";
   buildDepends = [ parsec ];
   meta = {
     homepage = "http://github.com/haskell/network";
diff --git a/pkgs/development/libraries/haskell/nixos-types/default.nix b/pkgs/development/libraries/haskell/nixos-types/default.nix
index b63f8a9fbdc..9a1103a2bb8 100644
--- a/pkgs/development/libraries/haskell/nixos-types/default.nix
+++ b/pkgs/development/libraries/haskell/nixos-types/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "nixos-types";
-  version = "1.1";
-  sha256 = "0vnlhq2pjnslq1h9h3lyaxw604s3zdhs7k8hfr35m178rdm3a5az";
+  version = "1.2";
+  sha256 = "140qk6wqq87qfk471cnhrg135fnqv0vfmfxh8kj14ar2kxvzrr8w";
   buildDepends = [ regexPosix ];
   meta = {
     homepage = "http://github.com/haskell4nix/nixos-types";
diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix
index 2bf090ab746..99e4d04f774 100644
--- a/pkgs/development/libraries/haskell/pango/default.nix
+++ b/pkgs/development/libraries/haskell/pango/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pango";
-  version = "0.12.1";
-  sha256 = "0bfwgz2wx0hw9lrf9fdc0pic7xjkiqnv1wr1lfp55gm2qhakz83w";
+  version = "0.12.2";
+  sha256 = "0kf9sw2ajqlvv9n685fbif7c8x1qnz4w3y3xqql3a1rv6s3kmqba";
   buildDepends = [ cairo glib mtl ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];
diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.0.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.0.nix
new file mode 100644
index 00000000000..9c260d06566
--- /dev/null
+++ b/pkgs/development/libraries/haskell/parallel/3.2.0.0.nix
@@ -0,0 +1,17 @@
+{ cabal, deepseq }:
+
+cabal.mkDerivation (self: {
+  pname = "parallel";
+  version = "3.2.0.0";
+  sha256 = "1wqdy9p7xqq84ffgzdakvqydxq9668r9xq3wyay9wlgrk83wd1sq";
+  buildDepends = [ deepseq ];
+  meta = {
+    description = "Parallel programming library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/parsec/3.1.2.nix b/pkgs/development/libraries/haskell/parsec/3.1.2.nix
new file mode 100644
index 00000000000..95ef6219dbb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/parsec/3.1.2.nix
@@ -0,0 +1,18 @@
+{ cabal, mtl, text }:
+
+cabal.mkDerivation (self: {
+  pname = "parsec";
+  version = "3.1.2";
+  sha256 = "0lhn9j2j5jlh7g0qx9f6ms63n9x1xlxg9isdvm6z0ksy3ywj9wch";
+  buildDepends = [ mtl text ];
+  meta = {
+    homepage = "http://www.cs.uu.nl/~daan/parsec.html";
+    description = "Monadic parser combinators";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index 67d8e10a3ef..7a32591b97c 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -1,10 +1,10 @@
-{ cabal, monadControl, persistent, text }:
+{ cabal, monadControl, persistent, text, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "persistent-template";
-  version = "0.6.3";
-  sha256 = "1vcjvfjxmv9c0wg7pbx0lw73128f5y0r4sfdsyq3jrkkiq1bgsxa";
-  buildDepends = [ monadControl persistent text ];
+  version = "0.6.3.1";
+  sha256 = "0hppxd80q7bnxz9vm08i278d9k95w6z139y73dy53ncqkp72ahrg";
+  buildDepends = [ monadControl persistent text transformers ];
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";
     description = "Type-safe, non-relational, multi-backend persistence";
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 879edcbcb7b..527bbf9f2ae 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -1,14 +1,15 @@
 { cabal, blazeHtml, dataObject, enumerator, monadControl, mtl
 , pathPieces, pool, sqlite, text, time, transformers
+, transformersBase
 }:
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "0.6.3";
-  sha256 = "0m50z9k941bhh05jjz1268sn1bi7w8i6jzccldgnbjjvsw2xaisx";
+  version = "0.6.4.3";
+  sha256 = "0j4agwm8hcphrmzmc7d7al57cwp3i5iy7d8yhqw9m8pcx61sqkg4";
   buildDepends = [
     blazeHtml dataObject enumerator monadControl mtl pathPieces pool
-    text time transformers
+    text time transformers transformersBase
   ];
   extraLibraries = [ sqlite ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/pool/default.nix b/pkgs/development/libraries/haskell/pool/default.nix
index 51befe00ce4..09c871692ec 100644
--- a/pkgs/development/libraries/haskell/pool/default.nix
+++ b/pkgs/development/libraries/haskell/pool/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pool";
-  version = "0.1.1";
-  sha256 = "0h498pi7048m4cida10s28dp9f8c2ig3m4s9chwrfw3yiyai926l";
+  version = "0.1.2";
+  sha256 = "05lrinyk9gxdf67vwdav93ral2y8qsb33i9y5k91vlcjfp7w516q";
   buildDepends = [ monadControl transformers ];
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";
diff --git a/pkgs/development/libraries/haskell/random-source/default.nix b/pkgs/development/libraries/haskell/random-source/default.nix
index 7bf8a225956..caa4b65814c 100755
--- a/pkgs/development/libraries/haskell/random-source/default.nix
+++ b/pkgs/development/libraries/haskell/random-source/default.nix
@@ -1,14 +1,14 @@
 { cabal, flexibleDefaults, mersenneRandomPure64, mtl, mwcRandom
-, random, stateref, syb
+, random, stateref, syb, thExtras
 }:
 
 cabal.mkDerivation (self: {
   pname = "random-source";
-  version = "0.3";
-  sha256 = "08nj7mq8gjj9rv1zmkr2m30z295k5b352103wb1ag1ryw5wyzg1n";
+  version = "0.3.0.2";
+  sha256 = "0sp39bj7rqg4w4rc4d4zgj0f77c23z4xc47p55chy12znc4frlp2";
   buildDepends = [
     flexibleDefaults mersenneRandomPure64 mtl mwcRandom random stateref
-    syb
+    syb thExtras
   ];
   meta = {
     homepage = "https://github.com/mokus0/random-fu";
diff --git a/pkgs/development/libraries/haskell/random/1.0.0.2.nix b/pkgs/development/libraries/haskell/random/1.0.0.2.nix
deleted file mode 100644
index e9101a11407..00000000000
--- a/pkgs/development/libraries/haskell/random/1.0.0.2.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ cabal, time }:
-
-cabal.mkDerivation (self: {
-  pname = "random";
-  version = "1.0.0.2";
-  sha256 = "5433aebb4bbfb999f1d02410c8ca3769c63cd8b02109d2771a37c12918f92dd5";
-  buildDepends = [ time ];
-  meta = {
-    description = "random number library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/random/1.0.1.0.nix b/pkgs/development/libraries/haskell/random/1.0.1.1.nix
similarity index 80%
rename from pkgs/development/libraries/haskell/random/1.0.1.0.nix
rename to pkgs/development/libraries/haskell/random/1.0.1.1.nix
index 275a1a09736..a4feee31d02 100644
--- a/pkgs/development/libraries/haskell/random/1.0.1.0.nix
+++ b/pkgs/development/libraries/haskell/random/1.0.1.1.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "random";
-  version = "1.0.1.0";
-  sha256 = "1ghdmjzcn6n02x4gffa4g7wag4g7azrgxk3nsc5fqn9iny6rwp2i";
+  version = "1.0.1.1";
+  sha256 = "0n8m2744gg233s357vqzq3mfhhnbhynqvp4gxsi2gb70bm03nz6z";
   buildDepends = [ time ];
   meta = {
     description = "random number library";
diff --git a/pkgs/development/libraries/haskell/safe/default.nix b/pkgs/development/libraries/haskell/safe/default.nix
index 20044e6905b..067b7c4cf67 100644
--- a/pkgs/development/libraries/haskell/safe/default.nix
+++ b/pkgs/development/libraries/haskell/safe/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "safe";
-  version = "0.3";
-  sha256 = "174jm7nlqsgvc6namjpfknlix6yy2sf9pxnb3ifznjvx18kgc7m0";
+  version = "0.3.3";
+  sha256 = "0ig9laq1p4iic24smjb304mvlsvdyn90lvxh64c4p75c8g459489";
   meta = {
     homepage = "http://community.haskell.org/~ndm/safe/";
     description = "Library for safe (pattern match free) functions";
diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index 65f2debed9c..1cef979c01e 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "0.10.2";
-  sha256 = "181bknfws2s7jygy527w93v07i04xf1pwyfmylva59p0z45adlb4";
+  version = "0.10.4";
+  sha256 = "006ndbhzxkr2zw6gs13bm5pfq7i301bbg6nhagm3h9nnzp155snz";
   buildDepends = [ parsec shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";
diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index 5a402840d71..a4a20c98b19 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-js";
-  version = "0.10.2";
-  sha256 = "1yyqfp2lj8vq7x2a74wrgm7kx6zp1djp67bls9ip74kxi24dbznv";
+  version = "0.10.3";
+  sha256 = "1xz4jf91dfz60dji31d3hyy1k01hk0v41pb8qmi598jylk9iz1r2";
   buildDepends = [ shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";
diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
index 58ffa1404fc..26ce04559ec 100644
--- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-text";
-  version = "0.10.2";
-  sha256 = "04n1aflg4b5byfsg494d4dskx25nyy0a654wl4cxz8920sl7qpha";
+  version = "0.10.3";
+  sha256 = "0w3qf0zykdi5ixjcp0l9zdgwhbnnljn6ib88xkai05xkm6wzh06s";
   buildDepends = [ shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";
diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
index 1c57e45713c..bc5f3097855 100644
--- a/pkgs/development/libraries/haskell/shakespeare/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare";
-  version = "0.10.1.1";
-  sha256 = "1qd5wrcr4ss5zigbb7s6c7y7qbvrnbvgdpwq985yyy71i5hwxv0a";
+  version = "0.10.2";
+  sha256 = "173pcdm69w1xg3vm31xh6hs9w1552cmb1pz99ri09h1ajdhf2qwc";
   buildDepends = [ parsec text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";
diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
index fd362b44b88..f66eb3bb591 100644
--- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix
+++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "simple-sendfile";
-  version = "0.1.2";
-  sha256 = "08w5ria2x41j85z1126kddi918zdqrwmr4vwqczgzh9kdi49wv8j";
+  version = "0.1.3";
+  sha256 = "0n78d6bn2hsm3p6r2kc2cr5nf9v1vqs6v5i9x71f910r3kk2grm8";
   buildDepends = [ network ];
   meta = {
     description = "Cross platform library for the sendfile system call";
diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix
index 2eebd665aa1..cd7f2115074 100644
--- a/pkgs/development/libraries/haskell/skein/default.nix
+++ b/pkgs/development/libraries/haskell/skein/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "skein";
-  version = "0.1";
-  sha256 = "10fnhbjdq4vrpl17b27pmxg943wsxv27js6p5nrgyzx9ybmdrmdi";
+  version = "0.1.0.3";
+  sha256 = "1lag86db793l7n6zg97kn5wv31dal5sb8wig4sr7kqschxszq44d";
   buildDepends = [ cereal cryptoApi tagged ];
   meta = {
     description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix
index a4106ea8002..d8a9bf24f55 100644
--- a/pkgs/development/libraries/haskell/smallcheck/default.nix
+++ b/pkgs/development/libraries/haskell/smallcheck/default.nix
@@ -1,11 +1,13 @@
-{ cabal }:
+{ cabal, dlist }:
 
 cabal.mkDerivation (self: {
   pname = "smallcheck";
-  version = "0.4";
-  sha256 = "0nq13jm3akrmgk6n2clisip16v0jf1xkm0hm678v63s87hxqb1ma";
+  version = "0.6";
+  sha256 = "19b2dyjbryx2a5bq70pn2mbzlcvjjwhii78fwwx6q57r13zljb9v";
+  buildDepends = [ dlist ];
   meta = {
-    description = "Another lightweight testing library in Haskell";
+    homepage = "https://github.com/feuerbach/smallcheck";
+    description = "A property-based testing library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix
index 5baa0c9d82b..c0639515bf5 100644
--- a/pkgs/development/libraries/haskell/snap/core.nix
+++ b/pkgs/development/libraries/haskell/snap/core.nix
@@ -1,18 +1,21 @@
-{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder
-, bytestringMmap, bytestringNums, caseInsensitive, deepseq, dlist
-, enumerator, MonadCatchIOTransformers, mtl, text, time
-, transformers, unixCompat, vector, zlib
+{ cabal, attoparsec, attoparsecEnumerator, base16Bytestring
+, blazeBuilder, blazeBuilderEnumerator, bytestringMmap
+, bytestringNums, caseInsensitive, deepseq, dlist, enumerator
+, HUnit, MonadCatchIOTransformers, mtl, mwcRandom, regexPosix, text
+, time, transformers, unixCompat, unorderedContainers, vector
+, zlibEnum
 }:
 
 cabal.mkDerivation (self: {
   pname = "snap-core";
-  version = "0.5.4";
-  sha256 = "0v6lsb60s3w96rqpp9ky8nd660zja8asw02vx1562nvd19k65jbb";
+  version = "0.7";
+  sha256 = "1rplv1pg531jfmvxlhl7lz9hdhbxllk59daik013i172wglggivp";
   buildDepends = [
-    attoparsec attoparsecEnumerator blazeBuilder bytestringMmap
-    bytestringNums caseInsensitive deepseq dlist enumerator
-    MonadCatchIOTransformers mtl text time transformers unixCompat
-    vector zlib
+    attoparsec attoparsecEnumerator base16Bytestring blazeBuilder
+    blazeBuilderEnumerator bytestringMmap bytestringNums
+    caseInsensitive deepseq dlist enumerator HUnit
+    MonadCatchIOTransformers mtl mwcRandom regexPosix text time
+    transformers unixCompat unorderedContainers vector zlibEnum
   ];
   meta = {
     homepage = "http://snapframework.com/";
diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix
index c2c1fcddbf1..da786f8a7c6 100644
--- a/pkgs/development/libraries/haskell/snap/server.nix
+++ b/pkgs/development/libraries/haskell/snap/server.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap-server";
-  version = "0.5.4";
-  sha256 = "1kzhmn8pg2lzpqz6319lcy5lk27jcl7jlxq96x1bhnxss8k0idix";
+  version = "0.7";
+  sha256 = "1zvijghk7597xbmxv2x3qk92jlckwpz73c57cmfl63as5x6psxhr";
   buildDepends = [
     attoparsec attoparsecEnumerator binary blazeBuilder
     blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree
diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix
index 18347fc374e..ad18f9cbd98 100644
--- a/pkgs/development/libraries/haskell/statistics/default.nix
+++ b/pkgs/development/libraries/haskell/statistics/default.nix
@@ -1,17 +1,16 @@
-{ cabal, aeson, deepseq, erf, monadPar, mwcRandom, primitive, time
-, vector, vectorAlgorithms
+{ cabal, deepseq, erf, monadPar, mwcRandom, primitive, vector
+, vectorAlgorithms
 }:
 
 cabal.mkDerivation (self: {
   pname = "statistics";
-  version = "0.9.0.0";
-  sha256 = "1rwp9gkjs011lxzhkajiljs6x2a4xc8cg558kpfy9xj4q1lk43x7";
+  version = "0.10.0.1";
+  sha256 = "0bn131yzq3qk4dpr78i3ndsxyn7hars9jw9krfsxmin9pqr114sw";
   buildDepends = [
-    aeson deepseq erf monadPar mwcRandom primitive time vector
-    vectorAlgorithms
+    deepseq erf monadPar mwcRandom primitive vector vectorAlgorithms
   ];
   meta = {
-    homepage = "http://bitbucket.org/bos/statistics";
+    homepage = "https://github.com/bos/statistics";
     description = "A library of statistical types, data, and functions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/syb/0.3.3.nix b/pkgs/development/libraries/haskell/syb/0.3.6.nix
similarity index 81%
rename from pkgs/development/libraries/haskell/syb/0.3.3.nix
rename to pkgs/development/libraries/haskell/syb/0.3.6.nix
index 01cc80c883d..a40b25cc1bc 100644
--- a/pkgs/development/libraries/haskell/syb/0.3.3.nix
+++ b/pkgs/development/libraries/haskell/syb/0.3.6.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "syb";
-  version = "0.3.3";
-  sha256 = "0jskxbnzariq2ahcymvjrp4bhl9cpflc1nh51whdl9axcrd5c901";
+  version = "0.3.6";
+  sha256 = "1khb5h4gw1f9l9zhb7x1y9rf2qpypbvm9kmpf0b6xgggd2800s25";
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
     description = "Scrap Your Boilerplate";
diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix
index 172489f6b52..844864ac103 100644
--- a/pkgs/development/libraries/haskell/system-fileio/default.nix
+++ b/pkgs/development/libraries/haskell/system-fileio/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "system-fileio";
-  version = "0.3.2.1";
-  sha256 = "0a0vkbj9z5i74g6kkz3n4ffmvinavmnak0zxsx0fck18ppdgv394";
+  version = "0.3.3";
+  sha256 = "0z7y99g8ij9ykpxsgdb0addyibvpv2s95i0wpx4yc7mgi8cl50bx";
   buildDepends = [ systemFilepath text time ];
   meta = {
     homepage = "https://john-millikin.com/software/hs-fileio/";
diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix
index 3e475d6f0e5..75f13c948e9 100644
--- a/pkgs/development/libraries/haskell/system-filepath/default.nix
+++ b/pkgs/development/libraries/haskell/system-filepath/default.nix
@@ -1,10 +1,10 @@
-{ cabal, text }:
+{ cabal, deepseq, text }:
 
 cabal.mkDerivation (self: {
   pname = "system-filepath";
-  version = "0.4.1";
-  sha256 = "0jb32516xiwgbvr68yrf142fnzxfhn2dwh48nfr06gz65l7y4fcx";
-  buildDepends = [ text ];
+  version = "0.4.3";
+  sha256 = "16a57dipz3aid5n22gzyd9yqmsxm98c3s6vb7minj82q9rbl5z67";
+  buildDepends = [ deepseq text ];
   meta = {
     homepage = "https://john-millikin.com/software/hs-filepath/";
     description = "High-level, byte-based file and directory path manipulations";
diff --git a/pkgs/development/libraries/haskell/tagsoup/0.10.1nix b/pkgs/development/libraries/haskell/tagsoup/0.10.1nix
new file mode 100644
index 00000000000..462ee658fd2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/tagsoup/0.10.1nix
@@ -0,0 +1,16 @@
+{ cabal, mtl, network }:
+
+cabal.mkDerivation (self: {
+  pname = "tagsoup";
+  version = "0.10.1";
+  sha256 = "0bssfj5r790yj33q23i0lbj83xahzd9rf4jhqs21vgrpn9fqsynl";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ mtl network ];
+  meta = {
+    homepage = "http://community.haskell.org/~ndm/tagsoup/";
+    description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix
index e31cb09fdf4..a6fcea3c1c2 100644
--- a/pkgs/development/libraries/haskell/tagsoup/default.nix
+++ b/pkgs/development/libraries/haskell/tagsoup/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tagsoup";
-  version = "0.12.3";
-  sha256 = "0f41kc6kdzslyhskyql431nq0kkdzf13vn9saqi48ycajnrm1vcb";
+  version = "0.12.6";
+  sha256 = "1q1dzsaj131fcvibka72i7si1i0gxkz5d9zl0akd8mbapy5mmlv5";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ text ];
diff --git a/pkgs/development/libraries/haskell/terminfo/default.nix b/pkgs/development/libraries/haskell/terminfo/default.nix
index 240b72d7a8f..66212bbe385 100644
--- a/pkgs/development/libraries/haskell/terminfo/default.nix
+++ b/pkgs/development/libraries/haskell/terminfo/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "terminfo";
-  version = "0.3.2.2";
-  sha256 = "1370vxvv32aarmk64yvwb8rav523xk7fg5h65cgxvn4ppjqv0f51";
+  version = "0.3.2.3";
+  sha256 = "06y2vx7d4hl55p3p1c7yj2lx8yaw14c5h2qclj8m5xg2wkifnf5f";
   buildDepends = [ extensibleExceptions ];
   extraLibraries = [ ncurses ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/test-framework/default.nix b/pkgs/development/libraries/haskell/test-framework/default.nix
index 21ea2ebe954..64a45206b6e 100644
--- a/pkgs/development/libraries/haskell/test-framework/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "test-framework";
-  version = "0.4.1.1";
-  sha256 = "1ig4v2y8xba2rg6pc8yjf0j20cwa3czknnfqn1sgpqhmip2961pc";
+  version = "0.4.2.0";
+  sha256 = "0a74ajlmwsajrj06k22zqwnyxqfrpbd9xplf4b1swafp7y952ind";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/texmath/0.5.0.1.nix b/pkgs/development/libraries/haskell/texmath/default.nix
similarity index 84%
rename from pkgs/development/libraries/haskell/texmath/0.5.0.1.nix
rename to pkgs/development/libraries/haskell/texmath/default.nix
index f82e98703c7..d25c80a1810 100644
--- a/pkgs/development/libraries/haskell/texmath/0.5.0.1.nix
+++ b/pkgs/development/libraries/haskell/texmath/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "texmath";
-  version = "0.5.0.1";
-  sha256 = "0kw23b1df7456d2h48g2p7k8nvfv80a8a70xgkq4pn7v50vqipdy";
+  version = "0.5.0.3";
+  sha256 = "0pw3b5qvsngy0wdny8y3widkaphvjksg7mnpa8yzqfsw0rl36s0p";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ parsec syb xml ];
diff --git a/pkgs/development/libraries/haskell/text/0.11.1.5.nix b/pkgs/development/libraries/haskell/text/0.11.1.9.nix
similarity index 73%
rename from pkgs/development/libraries/haskell/text/0.11.1.5.nix
rename to pkgs/development/libraries/haskell/text/0.11.1.9.nix
index db438a54bc2..5b095c97e67 100644
--- a/pkgs/development/libraries/haskell/text/0.11.1.5.nix
+++ b/pkgs/development/libraries/haskell/text/0.11.1.9.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "text";
-  version = "0.11.1.5";
-  sha256 = "0fxxhw932gdvaqafsbw7dfzccc43hv92yhxppzp6jrg0npbyz04l";
+  version = "0.11.1.9";
+  sha256 = "12lq9v1byrsan7rp7kywkbwp15qyganpkanmln43yylxdzdc8a2k";
   buildDepends = [ deepseq ];
   meta = {
-    homepage = "https://bitbucket.org/bos/text";
+    homepage = "https://github.com/bos/text";
     description = "An efficient packed Unicode text type";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/th-extras/default.nix b/pkgs/development/libraries/haskell/th-extras/default.nix
new file mode 100644
index 00000000000..9a5f4a32cda
--- /dev/null
+++ b/pkgs/development/libraries/haskell/th-extras/default.nix
@@ -0,0 +1,18 @@
+{ cabal, syb }:
+
+cabal.mkDerivation (self: {
+  pname = "th-extras";
+  version = "0.0.0.1";
+  sha256 = "13d9fs48z87inma3kg9b7lfjp3h8j85fav6awd1zj3i2nl214hff";
+  buildDepends = [ syb ];
+  meta = {
+    homepage = "https://github.com/mokus0/th-extras";
+    description = "A grab bag of useful functions for use with Template Haskell";
+    license = self.stdenv.lib.licenses.publicDomain;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/thespian/default.nix b/pkgs/development/libraries/haskell/thespian/default.nix
new file mode 100644
index 00000000000..d4108f0a012
--- /dev/null
+++ b/pkgs/development/libraries/haskell/thespian/default.nix
@@ -0,0 +1,18 @@
+{ cabal, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "thespian";
+  version = "0.999";
+  sha256 = "0z3cqjcf6xr0z7g3s1jszcs39w43sl0793gl0qm3dklbginqbcnn";
+  buildDepends = [ mtl ];
+  meta = {
+    homepage = "http://bitbucket.org/alinabi/thespian";
+    description = "Lightweight Erlang-style actors for Haskell";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/time/1.4.nix b/pkgs/development/libraries/haskell/time/1.4.0.1.nix
similarity index 82%
rename from pkgs/development/libraries/haskell/time/1.4.nix
rename to pkgs/development/libraries/haskell/time/1.4.0.1.nix
index 5ece2f13f0d..8d9f810f724 100644
--- a/pkgs/development/libraries/haskell/time/1.4.nix
+++ b/pkgs/development/libraries/haskell/time/1.4.0.1.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "time";
-  version = "1.4";
-  sha256 = "0y9g7kazch7747x2s4f6yp1b1ys4s0r1r1n7qsvb3dwfbfmv93pz";
+  version = "1.4.0.1";
+  sha256 = "046jyz2xnbg2s94d9xhpphgq93mqlky7bc50vss40wdk6l7w8aws";
   buildDepends = [ deepseq ];
   meta = {
     homepage = "http://semantic.org/TimeLib/";
diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix
index 7b7517b0d42..52cdfc5ffe4 100644
--- a/pkgs/development/libraries/haskell/tls-extra/default.nix
+++ b/pkgs/development/libraries/haskell/tls-extra/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tls-extra";
-  version = "0.3.1";
-  sha256 = "1zj8l5nglfaarbbzb1icil6cp6rjqfs33nryxc34akz22zwwmln4";
+  version = "0.4.1";
+  sha256 = "0yimnq5p89jfbnk5cpa9w30zvfqs9dxxjxy2a86l8jvba5xb8068";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix
index 8da9fbbf4b5..ef0f1bb4dd0 100644
--- a/pkgs/development/libraries/haskell/tls/default.nix
+++ b/pkgs/development/libraries/haskell/tls/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tls";
-  version = "0.7.2";
-  sha256 = "0x24jf83sfsnpvfm645lng5bc21zsbv6mbagr6q1q71zhfzfyb74";
+  version = "0.8.3.2";
+  sha256 = "1g30viz94qhwv3v16d9njrwyqmv0p1hs0r11xmzx0adp806w54z9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/transformers-base/default.nix b/pkgs/development/libraries/haskell/transformers-base/default.nix
new file mode 100644
index 00000000000..6571b082281
--- /dev/null
+++ b/pkgs/development/libraries/haskell/transformers-base/default.nix
@@ -0,0 +1,18 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "transformers-base";
+  version = "0.4.0.1";
+  sha256 = "0avnnxbxh59xgxzb8vldysrbw37sim9iaiiscgjhdlscxy6yasbb";
+  buildDepends = [ transformers ];
+  meta = {
+    homepage = "https://github.com/mvv/transformers-base";
+    description = "Lift computations from the bottom of a transformer stack";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/uniplate/default.nix b/pkgs/development/libraries/haskell/uniplate/default.nix
index c9320595e55..c3043d0d14c 100644
--- a/pkgs/development/libraries/haskell/uniplate/default.nix
+++ b/pkgs/development/libraries/haskell/uniplate/default.nix
@@ -1,10 +1,10 @@
-{ cabal, syb }:
+{ cabal, hashable, syb, unorderedContainers }:
 
 cabal.mkDerivation (self: {
   pname = "uniplate";
-  version = "1.6.2";
-  sha256 = "1lns0llhszk68jnq5if3xrk997idzszqc267q63kkdwp1zxdicrd";
-  buildDepends = [ syb ];
+  version = "1.6.5";
+  sha256 = "1g29jbh2clxp87p8qjihgjgi8hdqgzray34bg6hv7whsy053apqs";
+  buildDepends = [ hashable syb unorderedContainers ];
   meta = {
     homepage = "http://community.haskell.org/~ndm/uniplate/";
     description = "Help writing simple, concise and fast generic operations";
diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix
index 096fb1932ac..df50bacd522 100644
--- a/pkgs/development/libraries/haskell/unordered-containers/default.nix
+++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unordered-containers";
-  version = "0.1.4.3";
-  sha256 = "0zya72777bnmiw77rqn8k2a0g7g3j0fzpk409qb827qs3j1ffikg";
+  version = "0.1.4.4";
+  sha256 = "1fvicb2a8fnfg7579x6v4fpyz3dhjij8vmny4fa8x5g8ih608kb8";
   buildDepends = [ deepseq hashable ];
   meta = {
     description = "Efficient hashing-based container types";
diff --git a/pkgs/development/libraries/haskell/utility-ht/default.nix b/pkgs/development/libraries/haskell/utility-ht/default.nix
index 6c67d98c3bb..6b79e4cdda8 100644
--- a/pkgs/development/libraries/haskell/utility-ht/default.nix
+++ b/pkgs/development/libraries/haskell/utility-ht/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "utility-ht";
-  version = "0.0.7";
-  sha256 = "83ffd750088a0eef5485b5dfadd13158ab7883655a3773bcc8d22485ba8d3a20";
+  version = "0.0.7.1";
+  sha256 = "0k097kyv6rxjvg1drnphv2mg882xx2lk098hs557fcsr16w658ma";
   meta = {
     description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
index de2d1e1f020..124d08aabc0 100644
--- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
+++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "uu-parsinglib";
-  version = "2.7.1.1";
-  sha256 = "1qn3impl64cvbzyvhc73yxyibgak4dkgl1vkbrzxrxb770kb5r4p";
+  version = "2.7.3.1";
+  sha256 = "11lwf2b4l4sll6xvscv3c2n3kl6hs0s8rplw66cwskcck3mvs7ms";
   buildDepends = [ ListLike time ];
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix
index 960e90d645d..1b5b5d540fd 100644
--- a/pkgs/development/libraries/haskell/vacuum/default.nix
+++ b/pkgs/development/libraries/haskell/vacuum/default.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "vacuum";
-  version = "1.0.0";
-  sha256 = "2229948ce801052c5ffb70ffc07e301d87d60740b053df8a7b7851ad02c01d9f";
+  version = "1.0.0.2";
+  sha256 = "1amlzd89952fvw1sbajf9kv3f2s2i6xbqs1zjxw442achg465y7i";
   extraLibraries = [ ghcPaths ];
   meta = {
-    homepage = "http://moonpatio.com/vacuum/";
+    homepage = "http://web.archive.org/web/20100410115820/http://moonpatio.com/vacuum/";
     description = "Extract graph representations of ghc heap values";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix
index 3cc44a018f0..b9ba9bae525 100644
--- a/pkgs/development/libraries/haskell/vector-space/default.nix
+++ b/pkgs/development/libraries/haskell/vector-space/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vector-space";
-  version = "0.7.8";
-  sha256 = "195g9zsb73w4a0fcfz0kank6gyqajww0qiqivr4fy0bik2nsr6ry";
+  version = "0.8.0";
+  sha256 = "1wd8psw2s98m8yfr8mam5abz2bhvxz1r78w703hgca8rr6hiaz0g";
   buildDepends = [ Boolean MemoTrie NumInstances ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/vector-space";
diff --git a/pkgs/development/libraries/haskell/vty/4.6.0.4.nix b/pkgs/development/libraries/haskell/vty/4.6.0.4.nix
deleted file mode 100644
index 55c73118446..00000000000
--- a/pkgs/development/libraries/haskell/vty/4.6.0.4.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ cabal, deepseq, mtl, parallel, parsec, terminfo, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "vty";
-  version = "4.6.0.4";
-  sha256 = "0kabssw3v7nglvsr687ppmdnnmii1q2g5zg8rxwi2hcmvnjx7567";
-  buildDepends = [ deepseq mtl parallel parsec terminfo utf8String ];
-  meta = {
-    homepage = "http://trac.haskell.org/vty/";
-    description = "A simple terminal access library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vty/4.7.0.4.nix b/pkgs/development/libraries/haskell/vty/default.nix
similarity index 85%
rename from pkgs/development/libraries/haskell/vty/4.7.0.4.nix
rename to pkgs/development/libraries/haskell/vty/default.nix
index 8ef4c51d03d..85c3a32930d 100644
--- a/pkgs/development/libraries/haskell/vty/4.7.0.4.nix
+++ b/pkgs/development/libraries/haskell/vty/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vty";
-  version = "4.7.0.4";
-  sha256 = "1rwki3ch1r3dqzb1cxmzxn05k49ams64licl0silbhsj3qibbj53";
+  version = "4.7.0.6";
+  sha256 = "1jb7c4wh8pjb5salh725vxjbx29wy6ph5gvdp177piq40v3zvbg3";
   buildDepends = [
     deepseq mtl parallel parsec terminfo utf8String vector
   ];
diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
index 2ef32922346..2cb4ae16ce7 100644
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-app-static";
-  version = "0.3.4";
-  sha256 = "0jxlm0qfv59c3q6ngvr94rzrn01byfn3wak208ws18xhk14cv058";
+  version = "0.3.5.1";
+  sha256 = "0pk7biyfg8za2i85vawgf3mxglbhk7bfl9xmiswqk6ppwwq2q4xb";
   buildDepends = [
     base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed
     httpDate httpTypes text time transformers unixCompat wai
diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index 7a06bfb1958..a0a736deeef 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -1,15 +1,16 @@
 { cabal, blazeBuilder, blazeBuilderEnumerator, caseInsensitive
-, enumerator, httpTypes, network, text, time, transformers, wai
-, zlibBindings
+, dataDefault, enumerator, httpTypes, network, text, time
+, transformers, wai, zlibBindings, zlibEnum
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "0.4.3";
-  sha256 = "07m86khgfyyadjgq8yp9kj3ljlpkvf209b1cfz2x7n5wdq8k2wm9";
+  version = "0.4.5.2";
+  sha256 = "05gq22il1jnvw5rcqr6gassxj29f8l4536zm6bpgk1kff8cxa3g1";
   buildDepends = [
-    blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator
-    httpTypes network text time transformers wai zlibBindings
+    blazeBuilder blazeBuilderEnumerator caseInsensitive dataDefault
+    enumerator httpTypes network text time transformers wai
+    zlibBindings zlibEnum
   ];
   meta = {
     homepage = "http://github.com/yesodweb/wai";
diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix
index d85d3629cae..b118d794563 100644
--- a/pkgs/development/libraries/haskell/wai/default.nix
+++ b/pkgs/development/libraries/haskell/wai/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai";
-  version = "0.4.2";
-  sha256 = "18w4wzryyqcqqihwckbz92smkqhhxh3lmi0kgxkcgivyzvhd2jqy";
+  version = "0.4.3";
+  sha256 = "08dmsl90ibs6a4sadsd2dhf5mssf5jswk6n2jv19q5sg3dra4m84";
   buildDepends = [
     blazeBuilder enumerator httpTypes network text transformers
   ];
diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index b461e36d33f..5ff96051307 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -5,14 +5,14 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "0.4.5";
-  sha256 = "0ql9a7qa6ivsvgr66hgj6bs8c3y8rr320kk1cxq9qbpi00gy5j8b";
+  version = "0.4.6.2";
+  sha256 = "1ja9w3440j69w7638wrjd6067svqcsaqdl1zklr6jx20zyadww94";
   buildDepends = [
     blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator
     httpTypes network simpleSendfile transformers unixCompat wai
   ];
   meta = {
-    homepage = "http://github.com/snoyberg/warp";
+    homepage = "http://github.com/yesodweb/wai";
     description = "A fast, light-weight web server for WAI applications";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/xml-enumerator/default.nix b/pkgs/development/libraries/haskell/xml-enumerator/default.nix
index 016c841eb07..698279be5c6 100644
--- a/pkgs/development/libraries/haskell/xml-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/xml-enumerator/default.nix
@@ -1,16 +1,15 @@
-{ cabal, attoparsecText, attoparsecTextEnumerator, blazeBuilder
+{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder
 , blazeBuilderEnumerator, dataDefault, enumerator, failure, text
 , transformers, xmlTypes
 }:
 
 cabal.mkDerivation (self: {
   pname = "xml-enumerator";
-  version = "0.4.1";
-  sha256 = "081avccvkakcbf2m22xdda63jhwykqxxclmlhj6msawkyyqniadj";
+  version = "0.4.4";
+  sha256 = "1xz37gzk3kk9sqkcbyspcdyz7rk3afkv33g7q45ih5fbd7zkd5gm";
   buildDepends = [
-    attoparsecText attoparsecTextEnumerator blazeBuilder
-    blazeBuilderEnumerator dataDefault enumerator failure text
-    transformers xmlTypes
+    attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
+    dataDefault enumerator failure text transformers xmlTypes
   ];
   meta = {
     homepage = "http://github.com/snoyberg/xml";
diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
index e13e0e50c90..745480ecf0c 100644
--- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix
+++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
@@ -1,13 +1,11 @@
-{ cabal, attoparsecText, cssText, network, tagsoup, text
-, utf8String
-}:
+{ cabal, attoparsec, cssText, network, tagsoup, text, utf8String }:
 
 cabal.mkDerivation (self: {
   pname = "xss-sanitize";
-  version = "0.3.0.1";
-  sha256 = "1rycdjl7b7bk100vgdwy6iighdqsbsyvrklp0zqbl1x45abph9pc";
+  version = "0.3.1";
+  sha256 = "0s8nqqx5f5b07xxlda4gh0w6vmlkhbqbz36cf6glhbhhyw27jkx5";
   buildDepends = [
-    attoparsecText cssText network tagsoup text utf8String
+    attoparsec cssText network tagsoup text utf8String
   ];
   meta = {
     homepage = "http://github.com/gregwebs/haskell-xss-sanitize";
diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index fce7026c0ca..76010bb4f86 100644
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ b/pkgs/development/libraries/haskell/yaml/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yaml";
-  version = "0.4.1.1";
-  sha256 = "0qm7kfvi99m80m2lsmn98ssr2sfsw1rbbmzyjlg7bmvbaxsyw0b9";
+  version = "0.4.1.2";
+  sha256 = "1c7ffs5gkwk0l0vg7amsflra1j8ifd9cvvbqx9jzkqsay8hbr4vb";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ enumerator transformers ];
diff --git a/pkgs/development/libraries/haskell/yap/default.nix b/pkgs/development/libraries/haskell/yap/default.nix
index 858466ab1a4..27938a2fad0 100644
--- a/pkgs/development/libraries/haskell/yap/default.nix
+++ b/pkgs/development/libraries/haskell/yap/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yap";
-  version = "0.0";
-  sha256 = "0cjsmf9p220fb9yf2i81xspa3rpnlln3hfb9yc5x6xbcc6py0nw5";
+  version = "0.1";
+  sha256 = "14x1z5pmb499qq5sy0iksxv0mli8556s1jh9jm7rdg671h1cy1hl";
   meta = {
     description = "yet another prelude - a simplistic refactoring with algebraic classes";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index 56d5c43887b..19ba48b58cc 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -1,19 +1,20 @@
-{ cabal, aesonNative, authenticate, blazeHtml, controlMonadAttempt
+{ cabal, aeson, authenticate, blazeHtml, controlMonadAttempt
 , hamlet, httpEnumerator, mimeMail, persistent, persistentTemplate
 , pureMD5, pwstoreFast, random, SHA, shakespeareCss, text
-, transformers, wai, yesodCore, yesodForm, yesodJson
-, yesodPersistent
+, transformers, unorderedContainers, wai, yesodCore, yesodForm
+, yesodJson, yesodPersistent
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "0.7.2";
-  sha256 = "18i1ijxrhmmxy45ymc89f7m2zazd7lca4jv4q08d7mr1hdgsx8cn";
+  version = "0.7.7.2";
+  sha256 = "1zqxg13hpd45i2nyhh1bvaly1cwaygmjpz46cm7knp553bdhy8c8";
   buildDepends = [
-    aesonNative authenticate blazeHtml controlMonadAttempt hamlet
+    aeson authenticate blazeHtml controlMonadAttempt hamlet
     httpEnumerator mimeMail persistent persistentTemplate pureMD5
-    pwstoreFast random SHA shakespeareCss text transformers wai
-    yesodCore yesodForm yesodJson yesodPersistent
+    pwstoreFast random SHA shakespeareCss text transformers
+    unorderedContainers wai yesodCore yesodForm yesodJson
+    yesodPersistent
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 5321294e55a..c894a5138e6 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -1,19 +1,21 @@
-{ cabal, blazeBuilder, blazeHtml, caseInsensitive, cereal
-, clientsession, cookie, enumerator, failure, hamlet, httpTypes
-, monadControl, parsec, pathPieces, random, shakespeare
-, shakespeareCss, shakespeareJs, strictConcurrency, text, time
-, transformers, wai, waiExtra
+{ cabal, aeson, blazeBuilder, blazeHtml, caseInsensitive, cereal
+, clientsession, cookie, dataObject, dataObjectYaml, enumerator
+, failure, hamlet, httpTypes, monadControl, parsec, pathPieces
+, random, shakespeare, shakespeareCss, shakespeareJs
+, strictConcurrency, text, time, transformers, transformersBase
+, vector, wai, waiExtra
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "0.9.2";
-  sha256 = "1h9w5fgdr4w4ikp5axzxmsvc14ikbsjmlwd2lmlrh1cjcx8xzjwf";
+  version = "0.9.3.6";
+  sha256 = "00h1ylrr5wrid9vn3jhspibprx0175j9rcwdb1hd7ya5gwmzlhjs";
   buildDepends = [
-    blazeBuilder blazeHtml caseInsensitive cereal clientsession cookie
-    enumerator failure hamlet httpTypes monadControl parsec pathPieces
-    random shakespeare shakespeareCss shakespeareJs strictConcurrency
-    text time transformers wai waiExtra
+    aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession
+    cookie dataObject dataObjectYaml enumerator failure hamlet
+    httpTypes monadControl parsec pathPieces random shakespeare
+    shakespeareCss shakespeareJs strictConcurrency text time
+    transformers transformersBase vector wai waiExtra
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index fab623a2926..7ed924fb07b 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "0.3.2.1";
-  sha256 = "1gzd8vs9nabv7vf41b5xxwy49yak9jd3mpxkg4yx7pndm4321hp9";
+  version = "0.3.4";
+  sha256 = "05hvffzhwb6x6cmpvpf60hbzm4lvn7gp47rvspm5k6y6d999az3l";
   buildDepends = [
     blazeBuilder blazeHtml dataDefault emailValidate hamlet network
     persistent shakespeareCss shakespeareJs text time transformers wai
diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix
index 2e5df42d9da..167ead39dd5 100644
--- a/pkgs/development/libraries/haskell/yesod-json/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-json/default.nix
@@ -1,10 +1,14 @@
-{ cabal, aesonNative, shakespeareJs, text, vector, yesodCore }:
+{ cabal, aeson, shakespeareJs, text, unorderedContainers, vector
+, yesodCore
+}:
 
 cabal.mkDerivation (self: {
   pname = "yesod-json";
-  version = "0.2.1";
-  sha256 = "1d710pqrdafyz8s0spd19vwvx5v9kwy44wb0byz3445jhi3kwn88";
-  buildDepends = [ aesonNative shakespeareJs text vector yesodCore ];
+  version = "0.2.2.1";
+  sha256 = "16l5ygj9xsg2lzw3mkn1kmq543n9w5z1g6lyl8nw5bblp66lfxq3";
+  buildDepends = [
+    aeson shakespeareJs text unorderedContainers vector yesodCore
+  ];
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "Generate content for Yesod using the aeson package";
diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
index 187780f9ebb..00b5fb317fd 100644
--- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-persistent";
-  version = "0.2.1";
-  sha256 = "1ka8jsxr7i5rcjxnv82ykq34yqxqzxdvk4b3ck7pbvx2a4g7bxw9";
+  version = "0.2.2";
+  sha256 = "0pgvckyn3l9ggw77hmdpxfx5iwdk36fcfx464rqfzdy28agax47c";
   buildDepends = [
     failure persistent persistentTemplate transformers yesodCore
   ];
diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
index 8fbc8baff49..65cb5493181 100644
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-static/default.nix
@@ -1,13 +1,14 @@
-{ cabal, base64Bytestring, cereal, fileEmbed, httpTypes, pureMD5
-, text, transformers, unixCompat, wai, waiAppStatic, yesodCore
+{ cabal, base64Bytestring, cereal, enumerator, fileEmbed, httpTypes
+, pureMD5, text, transformers, unixCompat, wai, waiAppStatic
+, yesodCore
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-static";
-  version = "0.3.0.1";
-  sha256 = "1dvg60kawmvczwxvkxzx5k19y36i23fi0faw71ck58mlkjdczby5";
+  version = "0.3.2";
+  sha256 = "0m0fws0bwhf1cyw1a3cg85mhdjr9pv35a39671jsqkkvmmxiixlf";
   buildDepends = [
-    base64Bytestring cereal fileEmbed httpTypes pureMD5 text
+    base64Bytestring cereal enumerator fileEmbed httpTypes pureMD5 text
     transformers unixCompat wai waiAppStatic yesodCore
   ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index e4947dc94f2..ecd7dc012aa 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -1,4 +1,4 @@
-{ cabal, attoparsecText, blazeBuilder, blazeHtml, hamlet, httpTypes
+{ cabal, attoparsec, blazeBuilder, blazeHtml, hamlet, httpTypes
 , monadControl, parsec, shakespeareCss, shakespeareJs
 , shakespeareText, text, time, transformers, unixCompat, wai
 , waiExtra, warp, yesodAuth, yesodCore, yesodForm, yesodJson
@@ -7,12 +7,12 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "0.9.2.2";
-  sha256 = "09l7cdsrxlr1nb03h3nisih9sm824gnp3nkblvgh8b1pfi54wdkl";
+  version = "0.9.3.4";
+  sha256 = "1iw6qf1dywss8w4ig3dr04cyi01jq9frvmkbqgj5jq8v11y55x6v";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    attoparsecText blazeBuilder blazeHtml hamlet httpTypes monadControl
+    attoparsec blazeBuilder blazeHtml hamlet httpTypes monadControl
     parsec shakespeareCss shakespeareJs shakespeareText text time
     transformers unixCompat wai waiExtra warp yesodAuth yesodCore
     yesodForm yesodJson yesodPersistent
diff --git a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix
new file mode 100644
index 00000000000..b456c1d81a0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix
@@ -0,0 +1,18 @@
+{ cabal, zeromq }:
+
+cabal.mkDerivation (self: {
+  pname = "zeromq-haskell";
+  version = "0.8.1";
+  sha256 = "19fl3nd548yj6d6c3jqr6lxk6y033qa68jgnc5aq5w8kmlpn70mc";
+  extraLibraries = [ zeromq ];
+  meta = {
+    homepage = "http://github.com/twittner/zeromq-haskell/";
+    description = "bindings to zeromq";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix
index 9bb7562cc21..303f2750d82 100644
--- a/pkgs/development/libraries/hwloc/default.nix
+++ b/pkgs/development/libraries/hwloc/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, cairo, expat, ncurses }:
+{ stdenv, fetchurl, pkgconfig, cairo, expat, ncurses, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "hwloc-1.2";
+  name = "hwloc-1.3";
 
   src = fetchurl {
-    url = "http://www.open-mpi.org/software/hwloc/v1.2/downloads/${name}.tar.bz2";
-    sha256 = "04mrlmcp596imzbhlflb53ddld705k9617rzpprnhp3643krn0dw";
+    url = "http://www.open-mpi.org/software/hwloc/v1.3/downloads/${name}.tar.bz2";
+    sha256 = "10zlz0hng7scjx1xn8jflx3gbga5djbhxhj94k5kszrivc8zh8xy";
   };
 
-  buildInputs = [ pkgconfig cairo expat ncurses ];
+  # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo.
+  buildInputs = [ pkgconfig cairo expat ncurses libX11 ];
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/isl/default.nix b/pkgs/development/libraries/isl/default.nix
index b6f1d45b8fa..2261baba030 100644
--- a/pkgs/development/libraries/isl/default.nix
+++ b/pkgs/development/libraries/isl/default.nix
@@ -1,28 +1,24 @@
 {stdenv, fetchurl, gmp, static ? false}:
 
-let 
-  version = "0.06";
-  staticFlags = if static then " --enable-static --disable-shared" else "";
-in
+stdenv.mkDerivation rec {
+  name = "isl-0.07";             # CLooG 0.16.3 fails to build with ISL 0.08.
 
-stdenv.mkDerivation {
-  name = "isl-${version}";
-  
   src = fetchurl {
-    url = "http://www.kotnet.org/~skimo/isl/isl-${version}.tar.bz2";
-    sha256 = "0w1i1m94w0jkmm0bzlp08c4r97j7yp0d7crxf28524b9mgbg0mwk";
+    url = "http://www.kotnet.org/~skimo/isl/${name}.tar.bz2";
+    sha256 = "0kpxmvhrwwdygqqafqzjf9xiksq7paac2x24g9jhr3f9ajj3zkyx";
   };
 
   buildInputs = [ gmp ];
 
-  dontDisableStatic = if static then true else false;
-  configureFlags = "--with-gmp-prefix=${gmp}" + staticFlags;
+  dontDisableStatic = static;
+  configureFlags =
+    stdenv.lib.optionals static [ " --enable-static" "--disable-shared" ];
 
   meta = {
     homepage = http://www.kotnet.org/~skimo/isl/;
     license = "LGPLv2.1";
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints.";
     maintainers = [ stdenv.lib.maintainers.shlevy ];
+    platforms = stdenv.lib.platforms.all;
   };
 }
-
diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix
new file mode 100644
index 00000000000..fa53cb2ddd4
--- /dev/null
+++ b/pkgs/development/libraries/json-c/default.nix
@@ -0,0 +1,14 @@
+{ stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "json-c-0.9";
+  src = fetchurl {
+    url = "http://oss.metaparadigm.com/json-c/json-c-0.9.tar.gz";
+    sha256 = "0xcl8cwzm860f8m0cdzyw6slwcddni4mraw4shvr3qgqkdn4hakh";
+  };
+  meta = {
+    homepage = "http://oss.metaparadigm.com/json-c/";
+    description = "A JSON implementation in C";
+    longDescription = "JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects.";
+  };
+}
diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix
index 045a35d3c37..25d2f1c4435 100644
--- a/pkgs/development/libraries/json-glib/default.nix
+++ b/pkgs/development/libraries/json-glib/default.nix
@@ -1,19 +1,16 @@
-{ stdenv, fetchurl, glib, pkgconfig }:
+{ stdenv, fetchurl_gnome, glib, pkgconfig, xz }:
 
-let
-  pname = "json-glib";
-  version = "0.10.4";
-in
 stdenv.mkDerivation rec {
-  name = pname + "-" + version;
+  name = src.pkgname;
 
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/0.10/${name}.tar.bz2";
-    sha256 = "1naydnjagxw5gsq77lhaasjzfv1kp19v6bkybg1krq7rsd0v7n7g";
+  src = fetchurl_gnome {
+    project = "json-glib";
+    major = "0"; minor = "14"; patchlevel = "0"; extension = "xz";
+    sha256 = "0mpw996cyidspjwns281l5haj9i8azpkfpl4jf98lh3kcqcr07l2";
   };
 
   propagatedBuildInputs = [ glib ];
-  buildInputs = [ pkgconfig ];
+  buildNativeInputs = [ pkgconfig xz ];
 
   meta = {
     homepage = http://live.gnome.org/JsonGlib;
diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix
new file mode 100644
index 00000000000..a357fccca16
--- /dev/null
+++ b/pkgs/development/libraries/ldns/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, openssl, perl}:
+
+stdenv.mkDerivation {
+  name = "ldns-1.6.11";
+  src = fetchurl {
+    url = "http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.11.tar.gz";
+    sha256 = "1248c9gkgfmjdmpp3lfd56vvln94ii54kbxa5iykxvcxivmbi4b8";
+  };
+
+  patchPhase = ''
+    sed -i 's,\$(srcdir)/doc/doxyparse.pl,perl $(srcdir)/doc/doxyparse.pl,' Makefile.in
+  '';
+
+  buildInputs = [ openssl perl ];
+
+  configureFlags = [ "--with-ssl=${openssl}" ];
+
+  meta = {
+    description = "Library with the aim of simplifying DNS programming in C";
+    license = "BSD";
+    homepage = "http://www.nlnetlabs.nl/projects/ldns/";
+  };
+}
diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix
index 90ee45865ed..c9b02d1cef2 100644
--- a/pkgs/development/libraries/libassuan/default.nix
+++ b/pkgs/development/libraries/libassuan/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, pth, libgpgerror }:
 
 stdenv.mkDerivation rec {
-  name = "libassuan-2.0.0";
+  name = "libassuan-2.0.2";
 
   src = fetchurl {
     url = "mirror://gnupg/libassuan/${name}.tar.bz2";
-    sha256 = "13vzs4jxscnlskwzd3wpqwnfb5f0hwqc75rbi8j9f42bs6q08apx";
+    sha256 = "1n5lfpafq9sjb3r06lw7vrrjmbs3p035zfakx7ff5bfb7niwpq31";
   };
 
   propagatedBuildInputs = [ pth libgpgerror ];
@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://gnupg.org;
     license = "LGPLv2+";
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix
new file mode 100644
index 00000000000..a736aec1600
--- /dev/null
+++ b/pkgs/development/libraries/libchop/default.nix
@@ -0,0 +1,47 @@
+{ fetchurl, stdenv, zlib, bzip2, libgcrypt, gdbm, gperf, tdb, gnutls, db4
+, libuuid, lzo, pkgconfig, guile }:
+
+stdenv.mkDerivation rec {
+  name = "libchop-0.5.1";
+
+  src = fetchurl {
+    url = "mirror://savannah/libchop/${name}.tar.gz";
+    sha256 = "1sfq4ibzc9fjmq7ga96k05lr77cyizxnipa3bzm5d22jwal1x3ib";
+  };
+
+  buildNativeInputs = [ pkgconfig gperf ];
+  buildInputs =
+    [ zlib bzip2 lzo
+      libgcrypt
+      gdbm db4 tdb
+      gnutls libuuid
+      guile
+    ];
+
+  doCheck = true;
+
+  meta = {
+    description = "libchop, tools & library for data backup and distributed storage";
+
+    longDescription =
+      '' Libchop is a set of utilities and library for data backup and
+         distributed storage.  Its main application is chop-backup, an
+         encrypted backup program that supports data integrity checks,
+         versioning at little cost, distribution among several sites,
+         selective sharing of stored data, adaptive compression, and more.
+         The library itself, which chop-backup builds upon, implements
+         storage techniques such as content-based addressing, content hash
+         keys, Merkle trees, similarity detection, and lossless compression.
+         It makes it easy to combine them in different ways.  The
+         ‘chop-archiver’ and ‘chop-block-server’ tools, illustrated in the
+         manual, provide direct access to these facilities from the command
+         line.  It is written in C and has Guile (Scheme) bindings.
+      '';
+
+    homepage = http://nongnu.org/libchop/;
+    license = "GPLv3+";
+
+    maintainers = with stdenv.lib.maintainers; [ ludo viric ];
+    platforms = stdenv.lib.platforms.gnu;
+  };
+}
diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix
new file mode 100644
index 00000000000..d3ce7082621
--- /dev/null
+++ b/pkgs/development/libraries/libdvbpsi/default.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+
+  name = "libdvbpsi-0.2.2";
+
+  src = fetchurl {
+    url = http://download.videolan.org/pub/libdvbpsi/0.2.2/libdvbpsi-0.2.2.tar.bz2;
+    sha256 = "1lry2swxqm8mhq0a4rjnc819ngsf2pxnfjajb57lml7yr12j79ls";
+  };
+
+  meta = {
+    description = "A simple library designed for decoding and generation of MPEG TS and DVB PSI tables according to standards ISO/IEC 13818 and ITU-T H.222.0";
+    homepage = http://www.videolan.org/developers/libdvbpsi.html ;
+    platforms = stdenv.lib.platforms.linux;
+    license = "LGPLv2.1";
+  };
+
+}
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index 038fbef69e5..d705bd80bdc 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libgpgerror }:
 
 stdenv.mkDerivation rec {
-  name = "libgcrypt-1.4.6";
+  name = "libgcrypt-1.5.0";
 
   src = fetchurl {
     url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
-    sha256 = "11bbpjlqwp0nh4q76wmsk6z1812anqrj28nh6d9mcyrmdgd30jry";
+    sha256 = "1ykkh7dm0gyndz7bbpvn3agijj8xb2h02m02f42hm504c18zqqjb";
   };
 
   propagatedBuildInputs = [ libgpgerror ];
@@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
     license = "LGPLv2+";
 
     homepage = http://gnupg.org/;
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index 7554ec0e2f9..255057b5134 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "libgpg-error-1.7";
+  name = "libgpg-error-1.10";
 
   src = fetchurl {
     url = "mirror://gnupg/libgpg-error/${name}.tar.bz2";
-    sha256 = "14as9cpm4k9c6lxm517s9vzqrmjmdpf8i4s41k355xc27qdk6083";
+    sha256 = "0cal3jdnzdailr13qcy74grfbplbghkgr3qwk6qjjp4bass2j1jj";
   };
 
   doCheck = true;
@@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
     homepage = http://gnupg.org;
 
     license = "LGPLv2+";
-  };    
+    platforms = stdenv.lib.platforms.all;
+  };
 }
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index d68cb73b2b5..a417f63cdd9 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, perl, perlXMLParser, pkgconfig, libxml2
 , glib, gettext, intltool, bzip2
-, gnomevfs, libbonobo, python }:
+, gnome_vfs, libbonobo, python }:
 
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ perl perlXMLParser pkgconfig gettext bzip2 gnomevfs python intltool ];
+    [ perl perlXMLParser pkgconfig gettext bzip2 gnome_vfs python intltool ];
 
   propagatedBuildInputs = [ glib libxml2 libbonobo ];
 
diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix
index ab7ee1b2da5..3774d0993c6 100644
--- a/pkgs/development/libraries/libical/default.nix
+++ b/pkgs/development/libraries/libical/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, perl}:
 
-stdenv.mkDerivation {
-  name = "libical-0.43";
+stdenv.mkDerivation rec {
+  name = "libical-0.47";
   src = fetchurl {
-    url = http://superb-east.dl.sourceforge.net/sourceforge/freeassociation/libical-0.43.tar.gz;
-    md5 = "5f0a1feb60894d0be537aefea5647474";
+    url = "mirror://sourceforge/freeassociation/${name}.tar.gz";
+    sha256 = "1218vaaks9lvx31mrc8212kyngw2k68xm0914vrd77ixn55vnk5g";
   };
-  buildInputs = [ perl ];
+  buildNativeInputs = [ perl ];
 }
diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix
index 7510c6be899..3c72382dea4 100644
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@@ -1,14 +1,14 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "libidn-1.22";
+  name = "libidn-1.23";
 
   src = fetchurl {
     url = "mirror://gnu/libidn/${name}.tar.gz";
-    sha256 = "1vc8yni7sg5iq1ijg9l558pa4v6c1v5l57zc024lgxcmhy35wxig";
+    sha256 = "0sjy1k35x3r5vfkd5j21gy0xdlzg9svm74wn3hpfbfhyhmsjvd15";
   };
 
-  doCheck = true;
+  doCheck = ! stdenv.isDarwin;
 
   meta = {
     homepage = http://www.gnu.org/software/libidn/;
diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix
new file mode 100644
index 00000000000..f49c885c066
--- /dev/null
+++ b/pkgs/development/libraries/libjson/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "libjson-7.4.0";
+  src = fetchurl {
+    url = "mirror://sourceforge/libjson/libjson_7.4.0.zip";
+    sha256 = "0rd6m3r3acm7xq6f0mbyyhc3dnwmiga60cws29yjl6nx2f9h3r0x";
+  };
+  buildInputs = [ unzip ];
+  makeFlags = "prefix=$out";
+  meta = {
+    homepage = "http://libjson.sourceforge.net/";
+    description = "A JSON reader and writer";
+    longDescription = "A JSON reader and writer which is super-effiecient and usually runs circles around other JSON libraries. It's highly customizable to optimize for your particular project, and very lightweight. For Windows, OSX, or Linux. Works in any language.";
+  };
+}
diff --git a/pkgs/development/libraries/libofa/curl-types.patch b/pkgs/development/libraries/libofa/curl-types.patch
new file mode 100644
index 00000000000..acd8d9aeabb
--- /dev/null
+++ b/pkgs/development/libraries/libofa/curl-types.patch
@@ -0,0 +1,13 @@
+diff -rc libofa-0.9.3/examples/protocol.cpp libofa-0.9.3-new/examples/protocol.cpp
+*** libofa-0.9.3/examples/protocol.cpp	2006-05-10 14:05:42.000000000 -0400
+--- libofa-0.9.3-new/examples/protocol.cpp	2011-11-06 09:24:05.653283203 -0500
+***************
+*** 12,18 ****
+  #include <map>
+  #include <expat.h>
+  #include <curl/curl.h>
+- #include <curl/types.h>
+  #include <curl/easy.h>
+  
+  using namespace std;
+--- 12,17 ----
diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix
index 437726d6976..6b1ceee40f1 100644
--- a/pkgs/development/libraries/libofa/default.nix
+++ b/pkgs/development/libraries/libofa/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ expat curl fftw ];
 
-  patches = [ ./libofa-0.9.3-gcc-4.patch ./libofa-0.9.3-gcc-4.3.patch ./gcc-4.x.patch ];
+  patches = [ ./libofa-0.9.3-gcc-4.patch ./libofa-0.9.3-gcc-4.3.patch ./gcc-4.x.patch ./curl-types.patch ];
 
   src = fetchurl {
     url = "http://musicip-libofa.googlecode.com/files/${name}.tar.gz";
diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix
index acacd89f02b..ba031cd927c 100644
--- a/pkgs/development/libraries/libofx/default.nix
+++ b/pkgs/development/libraries/libofx/default.nix
@@ -1,15 +1,13 @@
 { stdenv, fetchurl, opensp, pkgconfig, libxml2, curl }:
         
 stdenv.mkDerivation rec {
-  name = "libofx-0.9.1";
+  name = "libofx-0.9.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/libofx/${name}.tar.gz";
-    sha256 = "0gyana7v3pcqdpncjr5vg5z2r2z3rvg0fiml59mazi9n62zk86rj";
+    sha256 = "1byvc1ar7s0nivi5cmycwlwh1y4xiad7ipfkgx57lbk7slgn8c4v";
   };
 
-  patches = [ ./libofx-0.9.0-gcc43.patch ];
-
   configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ];
   buildInputs = [ opensp pkgconfig libxml2 curl ];
 
diff --git a/pkgs/development/libraries/libofx/libofx-0.9.0-gcc43.patch b/pkgs/development/libraries/libofx/libofx-0.9.0-gcc43.patch
deleted file mode 100644
index 63ced2d5f81..00000000000
--- a/pkgs/development/libraries/libofx/libofx-0.9.0-gcc43.patch
+++ /dev/null
@@ -1,375 +0,0 @@
-http://bugs.gentoo.org/218782
-diff -NrU5 libofx-0.9.0.orig/lib/ofx_container_transaction.cpp libofx-0.9.0/lib/ofx_container_transaction.cpp
---- libofx-0.9.0.orig/lib/ofx_container_transaction.cpp	2007-11-10 00:10:49.000000000 +0100
-+++ libofx-0.9.0/lib/ofx_container_transaction.cpp	2008-04-21 22:26:24.000000000 +0200
-@@ -19,10 +19,11 @@
- 
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
- 
-+#include <cstdlib>
- #include <string>
- #include "messages.hh"
- #include "libofx.h"
- #include "ofx_containers.hh"
- #include "ofx_utilities.hh"
-diff -NrU5 libofx-0.9.0.orig/lib/ofx_request_accountinfo.cpp libofx-0.9.0/lib/ofx_request_accountinfo.cpp
---- libofx-0.9.0.orig/lib/ofx_request_accountinfo.cpp	2007-10-28 03:33:43.000000000 +0100
-+++ libofx-0.9.0/lib/ofx_request_accountinfo.cpp	2008-04-21 22:26:24.000000000 +0200
-@@ -19,10 +19,11 @@
- 
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
- 
-+#include <cstdlib>
- #include <string>
- #include "libofx.h"
- #include "ofx_request_accountinfo.hh"
- 
- using namespace std;
-diff -NrU5 libofx-0.9.0.orig/lib/ofx_request.cpp libofx-0.9.0/lib/ofx_request.cpp
---- libofx-0.9.0.orig/lib/ofx_request.cpp	2007-10-28 03:37:52.000000000 +0100
-+++ libofx-0.9.0/lib/ofx_request.cpp	2008-04-21 22:26:24.000000000 +0200
-@@ -19,10 +19,11 @@
- 
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
- 
-+#include <cstring>
- #include <string>
- #include "messages.hh"
- #include "libofx.h"
- #include "ofx_request.hh"
- 
-diff -NrU5 libofx-0.9.0.orig/lib/ofx_request_statement.cpp libofx-0.9.0/lib/ofx_request_statement.cpp
---- libofx-0.9.0.orig/lib/ofx_request_statement.cpp	2007-10-28 13:57:18.000000000 +0100
-+++ libofx-0.9.0/lib/ofx_request_statement.cpp	2008-04-21 22:26:24.000000000 +0200
-@@ -19,10 +19,11 @@
- 
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
- 
-+#include <cstdlib>
- #include <string>
- #include "libofx.h"
- #include "ofx_utilities.hh"
- #include "ofx_request_statement.hh"
- 
-diff -NrU5 libofx-0.9.0.orig/lib/ofx_utilities.cpp libofx-0.9.0/lib/ofx_utilities.cpp
---- libofx-0.9.0.orig/lib/ofx_utilities.cpp	2007-10-27 14:12:49.000000000 +0200
-+++ libofx-0.9.0/lib/ofx_utilities.cpp	2008-04-21 22:26:24.000000000 +0200
-@@ -19,11 +19,12 @@
- #include <iostream>
- #include <assert.h>
- 
- #include "ParserEventGeneratorKit.h"
- #include "SGMLApplication.h"
--#include <time.h>
-+#include <ctime>
-+#include <cstdlib>
- #include <string>
- #include <locale.h>
- #include "messages.hh"
- #include "ofx_utilities.hh"
- 
-diff -NrU5 libofx-0.9.0.orig/lib/ofx_utilities.cpp.orig libofx-0.9.0/lib/ofx_utilities.cpp.orig
---- libofx-0.9.0.orig/lib/ofx_utilities.cpp.orig	1970-01-01 01:00:00.000000000 +0100
-+++ libofx-0.9.0/lib/ofx_utilities.cpp.orig	2007-10-27 14:12:49.000000000 +0200
-@@ -0,0 +1,245 @@
-+/***************************************************************************
-+                          ofx_util.cpp
-+                             -------------------
-+    copyright            : (C) 2002 by Benoit Gr�goire
-+    email                : bock@step.polymtl.ca
-+ ***************************************************************************/
-+/**@file
-+ * \brief Various simple functions for type conversion & al
-+ */
-+/***************************************************************************
-+ *                                                                         *
-+ *   This program is free software; you can redistribute it and/or modify  *
-+ *   it under the terms of the GNU General Public License as published by  *
-+ *   the Free Software Foundation; either version 2 of the License, or     *
-+ *   (at your option) any later version.                                   *
-+ *                                                                         *
-+ ***************************************************************************/
-+#include <config.h>
-+#include <iostream>
-+#include <assert.h>
-+
-+#include "ParserEventGeneratorKit.h"
-+#include "SGMLApplication.h"
-+#include <time.h>
-+#include <string>
-+#include <locale.h>
-+#include "messages.hh"
-+#include "ofx_utilities.hh"
-+
-+#ifdef OS_WIN32
-+# define DIRSEP "\\"
-+#else
-+# define DIRSEP "/"
-+#endif
-+
-+
-+using namespace std;
-+/**
-+   Convert an OpenSP CharString directly to a C++ stream, to enable the use of cout directly for debugging.
-+*/ 
-+/*ostream &operator<<(ostream &os, SGMLApplication::CharString s)
-+  {
-+  for (size_t i = 0; i < s.len; i++)
-+  {
-+  os << ((char *)(s.ptr))[i*sizeof(SGMLApplication::Char)];
-+  }
-+  return os;
-+  }*/
-+
-+/*wostream &operator<<(wostream &os, SGMLApplication::CharString s)
-+  {
-+  for (size_t i = 0; i < s.len; i++)
-+  {//cout<<i;
-+  os << wchar_t(s.ptr[i*MULTIPLY4]);  
-+  }
-+  return os;
-+  }            */
-+
-+/*wchar_t* CharStringtowchar_t(SGMLApplication::CharString source, wchar_t *dest)
-+  {
-+  size_t i;
-+  for (i = 0; i < source.len; i++)
-+  {
-+  dest[i]+=wchar_t(source.ptr[i*sizeof(SGMLApplication::Char)*(sizeof(char)/sizeof(wchar_t))]);
-+  }
-+  return dest;
-+  }*/
-+
-+string CharStringtostring(const SGMLApplication::CharString source, string &dest)
-+{
-+  size_t i;
-+  dest.assign("");//Empty the provided string
-+  //  cout<<"Length: "<<source.len<<"sizeof(Char)"<<sizeof(SGMLApplication::Char)<<endl;
-+  for (i = 0; i < source.len; i++){
-+    dest+=(char)(((source.ptr)[i]));  
-+    //    cout<<i<<" "<<(char)(((source.ptr)[i]))<<endl; 
-+  }
-+  return dest;
-+}
-+
-+string AppendCharStringtostring(const SGMLApplication::CharString source, string &dest)
-+{
-+  size_t i;
-+  for (i = 0; i < source.len; i++)
-+    {
-+      dest+=(char)(((source.ptr)[i]));
-+    }
-+  return dest;
-+}
-+
-+/** 
-+ * Converts a date from the YYYYMMDDHHMMSS.XXX[gmt offset:tz name] OFX format (see OFX 2.01 spec p.66) to a C time_t.
-+ * @param ofxdate date from the YYYYMMDDHHMMSS.XXX[gmt offset:tz name] OFX format
-+ * @return C time_t in the local time zone
-+ * @note
-+ * @li The library always returns the time in the systems local time
-+ * @li OFX defines the date up to the millisecond.  The library ignores those milliseconds, since ANSI C does not handle such precision cleanly.  The date provided by LibOFX is precise to the second, assuming that information this precise was provided in the ofx file.  So you wont know the millisecond you were ruined...
-+ 
-+ * @note DEVIATION FROM THE SPECS : The OFX specifications (both version 1.6 and 2.02) state that a client should assume that if the server returns a date without � specific time, we assume it means 0h00 GMT.  As such, when we apply the local timezone and for example you are in the EST timezone, we will remove 5h, and the transaction will have occurred on the prior day!  This is probably not what the bank intended (and will lead to systematic errors), but the spec is quite explicit in this respect (Ref:  OFX 2.01 spec pp. 66-68)<BR><BR>
-+ * To solve this problem (since usually a time error is relatively unimportant, but date error is), and to avoid problems in Australia caused by the behaviour in libofx up to 0.6.4, it was decided starting with 0.6.5 to use the following behavior:<BR><BR>
-+ * -No specific time is given in the file (date only):  Considering that most banks seem to be sending dates in this format represented as local time (not compliant with the specs), the transaction is assumed to have occurred 11h59 (just before noon) LOCAL TIME.  This way, we should never change the date, since you'd have to travel in a timezone at least 11 hours backwards or 13 hours forward from your own to introduce mistakes.  However, if you are in timezone +13 or +14, and your bank meant the data to be interpreted by the spec, you will get the wrong date.  We hope that banks in those timezone will either represent in local time like most, or specify the timezone properly.<BR><BR>
-+ * -No timezone is specified, but exact time is, the same behavior is mostly used, as many banks just append zeros instead of using the short notation.  However, the time specified is used, even if 0 (midnight).<BR><BR>
-+ * -When a timezone is specified, it is always used to properly convert in local time, following the spec.
-+ *
-+ */
-+time_t ofxdate_to_time_t(const string ofxdate)
-+{
-+  struct tm time;
-+  double local_offset; /* in seconds */
-+  float ofx_gmt_offset; /* in fractionnal hours */
-+  char timezone[4]; /* Original timezone: the library does not expose this value*/
-+  char exact_time_specified = false;
-+  char time_zone_specified = false;
-+
-+  time_t temptime;
-+  std::time(&temptime);
-+  local_offset = difftime(mktime(localtime(&temptime)), mktime(gmtime(&temptime)));
-+  
-+  if(ofxdate.size()!=0){
-+    time.tm_year=atoi(ofxdate.substr(0,4).c_str())-1900;
-+    time.tm_mon=atoi(ofxdate.substr(4,2).c_str())-1;
-+    time.tm_mday=atoi(ofxdate.substr(6,2).c_str());
-+    if(ofxdate.size()>8) {
-+    /* if exact time is specified */
-+exact_time_specified = true;
-+      time.tm_hour=atoi(ofxdate.substr(8,2).c_str());
-+      time.tm_min=atoi(ofxdate.substr(10,2).c_str());
-+      time.tm_sec=atoi(ofxdate.substr(12,2).c_str());
-+    }
-+    
-+    /* Check if the timezone has been specified */
-+    string::size_type startidx = ofxdate.find("[");
-+    string::size_type endidx;
-+    if(startidx!=string::npos){
-+      /* Time zone was specified */
-+      time_zone_specified = true;
-+      startidx++;
-+      endidx = ofxdate.find(":", startidx)-1;
-+      ofx_gmt_offset=atof(ofxdate.substr(startidx,(endidx-startidx)+1).c_str());
-+      startidx = endidx+2;
-+      strncpy(timezone,ofxdate.substr(startidx,3).c_str(),4);
-+    }
-+    else{
-+      /* Time zone was not specified, assume GMT (provisionnaly) in case exact time is specified */
-+      ofx_gmt_offset=0;
-+      strcpy(timezone, "GMT");
-+    }
-+
-+    if(time_zone_specified == true)
-+      {
-+	/* If the timezone is specified always correct the timezone */
-+	/* If the timezone is not specified, but the exact time is, correct the timezone, assuming GMT following the spec */
-+	/* Correct the time for the timezone */
-+	time.tm_sec = time.tm_sec + (int)(local_offset - (ofx_gmt_offset*60*60));//Convert from fractionnal hours to seconds
-+      }
-+    else if (exact_time_specified == false)
-+      {
-+	/*Time zone data missing and exact time not specified, diverge from the OFX spec ans assume 11h59 local time */
-+       time.tm_hour=11;
-+       time.tm_min=59;
-+       time.tm_sec=0;
-+      }
-+  }
-+  else{
-+    message_out(ERROR, "ofxdate_to_time_t():  Unable to convert time, string is 0 length!");
-+  }
-+  return mktime(&time);
-+}
-+
-+/**
-+ * Convert a C++ string containing an amount of money as specified by the OFX standard and convert it to a double float.
-+ *\note The ofx number format is the following:  "." or "," as decimal separator, NO thousands separator.
-+ */ 
-+double ofxamount_to_double(const string ofxamount)
-+{
-+  //Replace commas and decimal points for atof()
-+  string::size_type idx;
-+  string tmp = ofxamount;
-+
-+  idx = tmp.find(',');
-+  if(idx==string::npos){
-+    idx = tmp.find('.');
-+  }
-+  
-+  if(idx!=string::npos){
-+    tmp.replace(idx,1,1,((localeconv())->decimal_point)[0]);
-+  }
-+
-+  return atof(tmp.c_str());
-+}
-+
-+/**
-+Many weird caracters can be present inside a SGML element, as a result on the transfer protocol, or for any reason.  This function greatly enhances the reliability of the library by zapping those gremlins (backspace,formfeed,newline,carriage return, horizontal and vertical tabs) as well as removing whitespace at the begining and end of the string.  Otherwise, many problems will occur during stringmatching.
-+*/
-+string strip_whitespace(const string para_string)
-+{
-+  size_t index;
-+  size_t i;
-+  string temp_string = para_string;
-+  const char *whitespace = " \b\f\n\r\t\v";
-+  const char *abnormal_whitespace = "\b\f\n\r\t\v";//backspace,formfeed,newline,cariage return, horizontal and vertical tabs
-+  message_out(DEBUG4,"strip_whitespace() Before: |"+temp_string+"|");
-+  for(i=0;i<=temp_string.size()&&temp_string.find_first_of(whitespace, i)==i&&temp_string.find_first_of(whitespace, i)!=string::npos;i++);
-+  temp_string.erase(0,i);//Strip leading whitespace
-+  for(i=temp_string.size()-1;(i>=0)&&(temp_string.find_last_of(whitespace, i)==i)&&(temp_string.find_last_of(whitespace, i)!=string::npos);i--);
-+  temp_string.erase(i+1,temp_string.size()-(i+1));//Strip trailing whitespace
-+  
-+while ((index = temp_string.find_first_of(abnormal_whitespace))!=string::npos)
-+  {
-+    temp_string.erase(index,1);//Strip leading whitespace
-+  };
-+ 
-+ message_out(DEBUG4,"strip_whitespace() After:  |"+temp_string+"|");
-+ 
-+ return temp_string;
-+}
-+
-+
-+int mkTempFileName(const char *tmpl, char *buffer, unsigned int size) {
-+  const char *tmp_dir;
-+
-+  tmp_dir = getenv ("TMPDIR");
-+  if (!tmp_dir)
-+    tmp_dir = getenv ("TMP");
-+  if (!tmp_dir)
-+    tmp_dir = getenv ("TEMP");
-+
-+  if (!tmp_dir)
-+    {
-+#ifdef OS_WIN32
-+      tmp_dir = "C:\\";
-+#else  
-+      tmp_dir = "/tmp";
-+#endif	/* !OS_WIN32 */
-+    }
-+
-+  strncpy(buffer, tmp_dir, size);
-+  assert((strlen(buffer)+strlen(tmpl)+2)<size);
-+  strcat(buffer, DIRSEP);
-+  strcat(buffer, tmpl);
-+  return 0;
-+}
-+
-+
-+
-diff -NrU5 libofx-0.9.0.orig/ofxconnect/ofxconnect.cpp libofx-0.9.0/ofxconnect/ofxconnect.cpp
---- libofx-0.9.0.orig/ofxconnect/ofxconnect.cpp	2007-10-26 20:24:10.000000000 +0200
-+++ libofx-0.9.0/ofxconnect/ofxconnect.cpp	2008-04-21 22:31:18.000000000 +0200
-@@ -34,10 +34,11 @@
- #include "libofx.h"
- #include <config.h>		/* Include config constants, e.g., VERSION TF */
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <cstring>
- 
- #ifdef HAVE_LIBCURL
- #include <curl/curl.h>
- #endif
- 
-diff -NrU5 libofx-0.9.0.orig/ofxconnect/ofxpartner.cpp libofx-0.9.0/ofxconnect/ofxpartner.cpp
---- libofx-0.9.0.orig/ofxconnect/ofxpartner.cpp	2006-03-26 06:49:54.000000000 +0200
-+++ libofx-0.9.0/ofxconnect/ofxpartner.cpp	2008-04-21 22:28:26.000000000 +0200
-@@ -33,10 +33,13 @@
- #include <sys/stat.h>
- 
- #include <iostream>
- #include <string>
- #include <vector>
-+#include <algorithm>
-+#include <cstring>
-+
- 
- using std::string;
- using std::vector;
- using std::cout;
- using std::endl;
-diff -NrU5 libofx-0.9.0.orig/ofxdump/ofxdump.cpp libofx-0.9.0/ofxdump/ofxdump.cpp
---- libofx-0.9.0.orig/ofxdump/ofxdump.cpp	2006-08-02 06:19:22.000000000 +0200
-+++ libofx-0.9.0/ofxdump/ofxdump.cpp	2008-04-21 22:26:24.000000000 +0200
-@@ -27,10 +27,12 @@
-  *   (at your option) any later version.                                   *
-  *                                                                         *
-  ***************************************************************************/
- #include <iostream>
- #include <iomanip>
-+#include <cstdlib>
-+#include <cstring>
- #include <string>
- #include "libofx.h"
- #include <stdio.h>		/* for printf() */
- #include <config.h>		/* Include config constants, e.g., VERSION TF */
- #include <errno.h>
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index 08d24c834b6..8461bfef439 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, cmake, zlib}:
 
 stdenv.mkDerivation rec {
-  name = "libproxy-0.4.6";
+  name = "libproxy-0.4.7";
   src = fetchurl {
     url = "http://libproxy.googlecode.com/files/${name}.tar.gz";
-    sha256 = "9ad912e63b1efca98fb442240a2bc7302e6021c1d0b1b9363327729f29462f30";
+    sha256 = "15rp97g3s2xkc842p5qfm8kx3p4awvrwrpl6w71a76qk224abq4g";
   };
   buildInputs = [cmake zlib];
 }
diff --git a/pkgs/development/libraries/librdf/raptor.nix b/pkgs/development/libraries/librdf/raptor.nix
index 738369e796a..dd19d3f179f 100644
--- a/pkgs/development/libraries/librdf/raptor.nix
+++ b/pkgs/development/libraries/librdf/raptor.nix
@@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libxml2 curl ];
 
+  preBuild = ''
+    sed -e '/curl\/types/d' -i src/*.c src/*.h
+  '';
+
   meta = { 
     description = "The RDF Parser Toolkit";
     homepage = "http://librdf.org/raptor";
diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix
index 84f34eeebe1..a70a61042e0 100644
--- a/pkgs/development/libraries/librsync/default.nix
+++ b/pkgs/development/libraries/librsync/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "1mj1pj99mgf1a59q9f2mxjli2fzxpnf55233pc1klxk2arhf8cv6";
   };
 
-  configureFlags = "--enable-shared";
+  configureFlags = if stdenv.isCygwin then "--enable-static" else "--enable-shared";
 
   meta = {
     homepage = http://librsync.sourceforge.net/;
diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index 0f33174bf9f..edaae75a66b 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libtasn1-2.9";
+  name = "libtasn1-2.11";
 
   src = fetchurl {
     url = "mirror://gnu/libtasn1/${name}.tar.gz";
-    sha256 = "1i0jnk810hg88jh3bhq63yn0n2cfmpmhrdm1ypv8rc68z9anii7s";
+    sha256 = "1yws0xfys6fm7ywb3pr8ncl3gr37iky7454if8dbzsicq5vkrm7l";
   };
 
   doCheck = true;
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 90b643c11c1..8916e926771 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libtorrent-rasterbar-${version}";
-  version = "0.15.4";
+  version = "0.15.8";
   
   src = fetchurl {
     url = "http://libtorrent.googlecode.com/files/${name}.tar.gz";
-    sha256 = "1pjdn0as4h71bhm0fbjqsh1y10fbifn2hfrkhkgdsdqhz7vdbfwy";
+    sha256 = "0767i20igrfadscw3vdyadd4qidybwx9h898rkaq95zlwhaygpzm";
   };
 
   buildInputs = [ boost pkgconfig openssl zlib ];
diff --git a/pkgs/development/libraries/libtunepimp/gcc-4.x.patch b/pkgs/development/libraries/libtunepimp/gcc-4.x.patch
index 92219ea6f9b..aed742b0490 100644
--- a/pkgs/development/libraries/libtunepimp/gcc-4.x.patch
+++ b/pkgs/development/libraries/libtunepimp/gcc-4.x.patch
@@ -1,177 +1,237 @@
-diff --git a/include/tunepimp-0.5/metadata.h b/include/tunepimp-0.5/metadata.h
-index f9bab5d..ea08cf5 100644
---- a/include/tunepimp-0.5/metadata.h
-+++ b/include/tunepimp-0.5/metadata.h
-@@ -29,6 +29,7 @@
- 
- #include <string>
- #include <cstdio>
-+#include <cstring>
- 
- #include "defs.h"
- #include "tp_c.h"
-diff --git a/lib/c_wrapper.cpp b/lib/c_wrapper.cpp
-index 760cc08..66c6111 100644
---- a/lib/c_wrapper.cpp
-+++ b/lib/c_wrapper.cpp
-@@ -43,6 +43,7 @@
-                          if (obj == NULL) return;
- 
- #include <deque>
-+#include <cstdlib>
- 
- class NotifyData
- {
-diff --git a/lib/fileio.cpp b/lib/fileio.cpp
-index a1602da..abe2b24 100644
---- a/lib/fileio.cpp
-+++ b/lib/fileio.cpp
-@@ -27,6 +27,8 @@
- 
- #include <assert.h>
- #include <errno.h>
-+#include <string.h>
-+#include <stdlib.h>
- #include <string>
- #ifndef WIN32
- #include <unistd.h>
-@@ -122,7 +124,8 @@ int taccess(const char *pathname, int mode, const char *encoding)
- 
- void tmktempname(const char *path, char *newPath, int newPathLen)
- {
--    char *ptr, *temp;
-+    char *temp;
-+	const char *ptr;
- 
-     temp = (char *)malloc(strlen(path) + 32);
-     ptr = strrchr(path, dirSepChar);
-diff --git a/lib/metadata.cpp b/lib/metadata.cpp
-index 0a1a70a..dcd0aa1 100644
---- a/lib/metadata.cpp
-+++ b/lib/metadata.cpp
-@@ -24,8 +24,9 @@
-    $Id: metadata.cpp 8359 2006-08-07 20:34:50Z luks $
- 
- ----------------------------------------------------------------------------*/
--#include <math.h>
--#include <stdio.h>
-+#include <cmath>
-+#include <cstdio>
-+#include <cstdlib>
- #include "metadata.h"
- #include "../config.h"
- using namespace std;
-diff --git a/lib/protocol.cpp b/lib/protocol.cpp
-index 83e8b33..3436f80 100644
---- a/lib/protocol.cpp
-+++ b/lib/protocol.cpp
-@@ -8,6 +8,7 @@
- -------------------------------------------------------------------*/
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <string>
- #include <map>
- #include <expat.h>
-diff --git a/lib/readmeta.cpp b/lib/readmeta.cpp
-index 7f325de..5e5513a 100644
---- a/lib/readmeta.cpp
-+++ b/lib/readmeta.cpp
-@@ -30,7 +30,8 @@
- #endif
- #endif
- 
--#include <stdio.h>
-+#include <cstdio>
-+#include <cstdlib>
- #ifndef WIN32
- #include <unistd.h>
- #endif
-diff --git a/lib/tunepimp.cpp b/lib/tunepimp.cpp
-index bf09383..f1b9b56 100644
---- a/lib/tunepimp.cpp
-+++ b/lib/tunepimp.cpp
-@@ -30,7 +30,8 @@
- #endif
- #endif
- 
--#include <stdio.h>
-+#include <cstdio>
-+#include <cstdlib>
- #include <map>
- using namespace std;
- 
-diff --git a/lib/utf8/utf8util.cpp b/lib/utf8/utf8util.cpp
-index a066956..6ea86e4 100644
---- a/lib/utf8/utf8util.cpp
-+++ b/lib/utf8/utf8util.cpp
-@@ -26,6 +26,7 @@
- ----------------------------------------------------------------------------*/
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include "utf8util.h"
- #include "utf8.h"
- #ifdef WIN32
-diff --git a/plugins/mp3/id3_2_3_meta.cpp b/plugins/mp3/id3_2_3_meta.cpp
-index fa9a7e0..efac1c9 100644
---- a/plugins/mp3/id3_2_3_meta.cpp
-+++ b/plugins/mp3/id3_2_3_meta.cpp
-@@ -26,6 +26,7 @@
- ----------------------------------------------------------------------------*/
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <assert.h>
- #include <ctype.h>
- #include <musicbrainz/mb_c.h>
-diff --git a/plugins/mp3/id3_meta.cpp b/plugins/mp3/id3_meta.cpp
-index d860bf6..804ca5c 100644
---- a/plugins/mp3/id3_meta.cpp
-+++ b/plugins/mp3/id3_meta.cpp
-@@ -26,6 +26,7 @@
- ----------------------------------------------------------------------------*/
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <time.h>
- #include <ctype.h>
- #include <musicbrainz/mb_c.h>
-diff --git a/plugins/mp4/mp4.cpp b/plugins/mp4/mp4.cpp
-index 9f741e3..dcc7ec9 100644
---- a/plugins/mp4/mp4.cpp
-+++ b/plugins/mp4/mp4.cpp
-@@ -27,7 +27,8 @@
- 
- #include <string.h>
- #include <stdio.h>
--#include <mp4.h>
-+#include <stdlib.h>
-+#include <mp4v2/mp4v2.h>
- #include "metadata.h"
- #include "plugin.h"
- #ifndef WIN32
-diff --git a/plugins/wma/wma.cpp b/plugins/wma/wma.cpp
-index 3d7a50a..a28901c 100644
---- a/plugins/wma/wma.cpp
-+++ b/plugins/wma/wma.cpp
-@@ -27,6 +27,7 @@
- 
- #include <string.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include <wmafile.h>
- #include "metadata.h"
- #include "plugin.h"
-diff --git a/plugins/wma/wmafile.cpp b/plugins/wma/wmafile.cpp
-index 1b38af8..31fa150 100644
---- a/plugins/wma/wmafile.cpp
-+++ b/plugins/wma/wmafile.cpp
-@@ -19,6 +19,7 @@
-  *   USA                                                                   *
-  ***************************************************************************/
- 
-+#include <string.h>
- #include <tstring.h>
- #include <wmafile.h>
- #include <wmatag.h>
+diff -rc libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h libtunepimp-0.5.3-new/include/tunepimp-0.5/metadata.h
+*** libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h	2006-11-18 05:52:08.000000000 -0500
+--- libtunepimp-0.5.3-new/include/tunepimp-0.5/metadata.h	2011-11-06 09:00:14.816684749 -0500
+***************
+*** 29,34 ****
+--- 29,35 ----
+  
+  #include <string>
+  #include <cstdio>
++ #include <cstring>
+  
+  #include "defs.h"
+  #include "tp_c.h"
+diff -rc libtunepimp-0.5.3/lib/c_wrapper.cpp libtunepimp-0.5.3-new/lib/c_wrapper.cpp
+*** libtunepimp-0.5.3/lib/c_wrapper.cpp	2006-11-18 05:52:33.000000000 -0500
+--- libtunepimp-0.5.3-new/lib/c_wrapper.cpp	2011-11-06 09:00:14.816684749 -0500
+***************
+*** 43,48 ****
+--- 43,49 ----
+                           if (obj == NULL) return;
+  
+  #include <deque>
++ #include <cstdlib>
+  
+  class NotifyData
+  {
+diff -rc libtunepimp-0.5.3/lib/fileio.cpp libtunepimp-0.5.3-new/lib/fileio.cpp
+*** libtunepimp-0.5.3/lib/fileio.cpp	2006-11-18 05:52:33.000000000 -0500
+--- libtunepimp-0.5.3-new/lib/fileio.cpp	2011-11-06 09:00:14.816684749 -0500
+***************
+*** 27,32 ****
+--- 27,34 ----
+  
+  #include <assert.h>
+  #include <errno.h>
++ #include <string.h>
++ #include <stdlib.h>
+  #include <string>
+  #ifndef WIN32
+  #include <unistd.h>
+***************
+*** 122,128 ****
+  
+  void tmktempname(const char *path, char *newPath, int newPathLen)
+  {
+!     char *ptr, *temp;
+  
+      temp = (char *)malloc(strlen(path) + 32);
+      ptr = strrchr(path, dirSepChar);
+--- 124,131 ----
+  
+  void tmktempname(const char *path, char *newPath, int newPathLen)
+  {
+!     char *temp;
+! 	const char *ptr;
+  
+      temp = (char *)malloc(strlen(path) + 32);
+      ptr = strrchr(path, dirSepChar);
+diff -rc libtunepimp-0.5.3/lib/metadata.cpp libtunepimp-0.5.3-new/lib/metadata.cpp
+*** libtunepimp-0.5.3/lib/metadata.cpp	2006-11-18 05:52:33.000000000 -0500
+--- libtunepimp-0.5.3-new/lib/metadata.cpp	2011-11-06 09:00:14.817684754 -0500
+***************
+*** 24,31 ****
+     $Id: metadata.cpp 8359 2006-08-07 20:34:50Z luks $
+  
+  ----------------------------------------------------------------------------*/
+! #include <math.h>
+! #include <stdio.h>
+  #include "metadata.h"
+  #include "../config.h"
+  using namespace std;
+--- 24,32 ----
+     $Id: metadata.cpp 8359 2006-08-07 20:34:50Z luks $
+  
+  ----------------------------------------------------------------------------*/
+! #include <cmath>
+! #include <cstdio>
+! #include <cstdlib>
+  #include "metadata.h"
+  #include "../config.h"
+  using namespace std;
+diff -rc libtunepimp-0.5.3/lib/protocol.cpp libtunepimp-0.5.3-new/lib/protocol.cpp
+*** libtunepimp-0.5.3/lib/protocol.cpp	2006-11-28 15:25:04.000000000 -0500
+--- libtunepimp-0.5.3-new/lib/protocol.cpp	2011-11-06 09:00:23.281742454 -0500
+***************
+*** 8,18 ****
+  -------------------------------------------------------------------*/
+  #include <stdio.h>
+  #include <stdlib.h>
+  #include <string>
+  #include <map>
+  #include <expat.h>
+  #include <curl/curl.h>
+- #include <curl/types.h>
+  #include <curl/easy.h>
+  using namespace std;
+  
+--- 8,18 ----
+  -------------------------------------------------------------------*/
+  #include <stdio.h>
+  #include <stdlib.h>
++ #include <string.h>
+  #include <string>
+  #include <map>
+  #include <expat.h>
+  #include <curl/curl.h>
+  #include <curl/easy.h>
+  using namespace std;
+  
+diff -rc libtunepimp-0.5.3/lib/readmeta.cpp libtunepimp-0.5.3-new/lib/readmeta.cpp
+*** libtunepimp-0.5.3/lib/readmeta.cpp	2006-11-18 05:52:33.000000000 -0500
+--- libtunepimp-0.5.3-new/lib/readmeta.cpp	2011-11-06 09:00:14.817684754 -0500
+***************
+*** 30,36 ****
+  #endif
+  #endif
+  
+! #include <stdio.h>
+  #ifndef WIN32
+  #include <unistd.h>
+  #endif
+--- 30,37 ----
+  #endif
+  #endif
+  
+! #include <cstdio>
+! #include <cstdlib>
+  #ifndef WIN32
+  #include <unistd.h>
+  #endif
+diff -rc libtunepimp-0.5.3/lib/tunepimp.cpp libtunepimp-0.5.3-new/lib/tunepimp.cpp
+*** libtunepimp-0.5.3/lib/tunepimp.cpp	2006-11-18 05:52:33.000000000 -0500
+--- libtunepimp-0.5.3-new/lib/tunepimp.cpp	2011-11-06 09:00:14.818684760 -0500
+***************
+*** 30,36 ****
+  #endif
+  #endif
+  
+! #include <stdio.h>
+  #include <map>
+  using namespace std;
+  
+--- 30,37 ----
+  #endif
+  #endif
+  
+! #include <cstdio>
+! #include <cstdlib>
+  #include <map>
+  using namespace std;
+  
+diff -rc libtunepimp-0.5.3/lib/utf8/utf8util.cpp libtunepimp-0.5.3-new/lib/utf8/utf8util.cpp
+*** libtunepimp-0.5.3/lib/utf8/utf8util.cpp	2006-11-18 05:52:26.000000000 -0500
+--- libtunepimp-0.5.3-new/lib/utf8/utf8util.cpp	2011-11-06 09:00:14.818684760 -0500
+***************
+*** 26,31 ****
+--- 26,32 ----
+  ----------------------------------------------------------------------------*/
+  
+  #include <stdio.h>
++ #include <stdlib.h>
+  #include "utf8util.h"
+  #include "utf8.h"
+  #ifdef WIN32
+diff -rc libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp libtunepimp-0.5.3-new/plugins/mp3/id3_2_3_meta.cpp
+*** libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp	2006-11-18 05:51:07.000000000 -0500
+--- libtunepimp-0.5.3-new/plugins/mp3/id3_2_3_meta.cpp	2011-11-06 09:00:14.818684760 -0500
+***************
+*** 26,31 ****
+--- 26,32 ----
+  ----------------------------------------------------------------------------*/
+  
+  #include <stdio.h>
++ #include <stdlib.h>
+  #include <assert.h>
+  #include <ctype.h>
+  #include <musicbrainz/mb_c.h>
+diff -rc libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp libtunepimp-0.5.3-new/plugins/mp3/id3_meta.cpp
+*** libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp	2006-11-18 05:51:07.000000000 -0500
+--- libtunepimp-0.5.3-new/plugins/mp3/id3_meta.cpp	2011-11-06 09:00:14.818684760 -0500
+***************
+*** 26,31 ****
+--- 26,32 ----
+  ----------------------------------------------------------------------------*/
+  
+  #include <stdio.h>
++ #include <stdlib.h>
+  #include <time.h>
+  #include <ctype.h>
+  #include <musicbrainz/mb_c.h>
+diff -rc libtunepimp-0.5.3/plugins/mp4/mp4.cpp libtunepimp-0.5.3-new/plugins/mp4/mp4.cpp
+*** libtunepimp-0.5.3/plugins/mp4/mp4.cpp	2006-11-18 05:51:08.000000000 -0500
+--- libtunepimp-0.5.3-new/plugins/mp4/mp4.cpp	2011-11-06 09:00:14.819684766 -0500
+***************
+*** 27,33 ****
+  
+  #include <string.h>
+  #include <stdio.h>
+! #include <mp4.h>
+  #include "metadata.h"
+  #include "plugin.h"
+  #ifndef WIN32
+--- 27,34 ----
+  
+  #include <string.h>
+  #include <stdio.h>
+! #include <stdlib.h>
+! #include <mp4v2/mp4v2.h>
+  #include "metadata.h"
+  #include "plugin.h"
+  #ifndef WIN32
+diff -rc libtunepimp-0.5.3/plugins/wma/wma.cpp libtunepimp-0.5.3-new/plugins/wma/wma.cpp
+*** libtunepimp-0.5.3/plugins/wma/wma.cpp	2006-11-18 05:51:28.000000000 -0500
+--- libtunepimp-0.5.3-new/plugins/wma/wma.cpp	2011-11-06 09:00:14.819684766 -0500
+***************
+*** 27,32 ****
+--- 27,33 ----
+  
+  #include <string.h>
+  #include <stdio.h>
++ #include <stdlib.h>
+  #include <wmafile.h>
+  #include "metadata.h"
+  #include "plugin.h"
+diff -rc libtunepimp-0.5.3/plugins/wma/wmafile.cpp libtunepimp-0.5.3-new/plugins/wma/wmafile.cpp
+*** libtunepimp-0.5.3/plugins/wma/wmafile.cpp	2006-11-18 05:51:28.000000000 -0500
+--- libtunepimp-0.5.3-new/plugins/wma/wmafile.cpp	2011-11-06 09:00:14.819684766 -0500
+***************
+*** 19,24 ****
+--- 19,25 ----
+   *   USA                                                                   *
+   ***************************************************************************/
+  
++ #include <string.h>
+  #include <tstring.h>
+  #include <wmafile.h>
+  #include <wmatag.h>
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 451c2f28a8f..bf4d858f023 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -3,14 +3,14 @@
 , libtasn1, ebtables, libgcrypt
 }:
 
-let version = "0.9.2"; in
+let version = "0.9.7"; in
 
 stdenv.mkDerivation {
   name = "libvirt-${version}";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/libvirt-${version}.tar.gz";
-    sha256 = "0f4z85whrjfjjfd9rmpn57sib42sh599g0cjvq2bdbrbafx1z1cs";
+    sha256 = "08xg0pfjqfia37xby9187ycsxkrxaz99w9rcq206cz8pwnzhbzr9";
   };
 
   buildInputs =
diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix
new file mode 100644
index 00000000000..0856832c188
--- /dev/null
+++ b/pkgs/development/libraries/log4cplus/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+let
+  name = "log4cplus-1.0.4";
+in
+stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url = "mirror://sourceforge/log4cplus/${name}.tar.bz2";
+    sha256 = "c2bb01b5f4bff5fa768700e98ead4a79dfd556096c9f3f0401849da7ab80fbef";
+  };
+
+  meta = {
+    homepage = "http://log4cplus.sourceforge.net/";
+    description = "a port the log4j library from Java to C++";
+    license = stdenv.lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 6e15dca01f3..b503493ac88 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -8,7 +8,7 @@ let
      <http://mail.python.org/pipermail/python-bugs-list/2006-September/035362.html>,
      but this is left as an exercise to the reader.
      So disable them for now.  */
-  cxx = stdenv.system != "i386-sunos";
+  cxx = stdenv.system != "i686-solaris";
 in
 stdenv.mkDerivation (rec {
   name = "ncurses-5.7";
diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 2509f26b5cb..0497278f14a 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
-let version = "4.8.8"; in
+let version = "4.8.9"; in
 
 stdenv.mkDerivation {
   name = "nspr-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha256 = "1jfl97hbb88lpyvhcv6q8zrqyw9wri2m838qdhwkwcgfsbgg9wwj";
+    sha256 = "1khw7l80f0k5jbk37hw6xqqmv6pmsp2m4xlfj2xh6bz7374cfhzz";
   };
 
   preConfigure = "cd mozilla/nsprpub";
diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix
index e77a241af72..62a343d8efc 100644
--- a/pkgs/development/libraries/opendkim/default.nix
+++ b/pkgs/development/libraries/opendkim/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, openssl, libmilter}:
 
 stdenv.mkDerivation rec {
-  name = "opendkim-1.2.2";
+  name = "opendkim-2.4.2";
   src = fetchurl {
     url = "mirror://sourceforge/opendkim/files/${name}.tar.gz";
-    sha256 = "01kvhm10kv17mm4zfz0zd24wzr98fxqwyzm56m2l1v262ng3l4nw";
+    sha256 = "0gwgcrnl5c60sxb9z38ari2gl7vd626r3z3dcq8a6aw28pw9w2lk";
   };
 
   configureFlags="--with-openssl=${openssl} --with-milter=${libmilter}";
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index e51b88f5bca..45d269a918b 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -6,6 +6,11 @@ let
   opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
     (throw "openssl needs its platform name cross building" null)
     stdenv.cross;
+
+  hurdGNUSourcePatch = fetchurl {
+    url = http://patch-tracker.debian.org/patch/series/dl/openssl/1.0.0e-2.1/gnu_source.patch;
+    sha256 = "0zp4x8bql92fbqywnigqfsfj2vvabb66wv6g6zgzh0y6js1ic4pn";
+  };
 in
 
 stdenv.mkDerivation {
@@ -16,7 +21,9 @@ stdenv.mkDerivation {
     sha256 = "1nr0cf6pf8i4qsnx31kqhiqv402xgn76yhjhlbdri8ma1hgislcj";
   };
 
-  patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
+  patches =
+    stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch
+    ++ stdenv.lib.optional (stdenv.system == "x86_64-freebsd") ./freebsd-x86_64-asm.patch;
 
   buildNativeInputs = [ perl ];
 
@@ -42,6 +49,17 @@ stdenv.mkDerivation {
       export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}"
     '';
 
+    patches = stdenv.lib.optionals (opensslCrossSystem == "hurd-x86") [
+      # OpenSSL only defines _GNU_SOURCE on Linux, but we need it on GNU
+      hurdGNUSourcePatch
+
+      # Use the target settings from Debian's "debian-hurd-i386" target.
+      # see http://patch-tracker.debian.org/patch/series/view/openssl/1.0.0e-2.1/debian-targets.patch
+      # In particular, this sets the shared library extension properly so that
+      # make install succeeds
+      ./hurd-target.patch
+    ];
+
     postInstall = ''
       # Openssl installs readonly files, which otherwise we can't strip.
       # This could at some stdenv hash change be put out of crossAttrs, too
diff --git a/pkgs/development/libraries/openssl/freebsd-x86_64-asm.patch b/pkgs/development/libraries/openssl/freebsd-x86_64-asm.patch
new file mode 100644
index 00000000000..f52e4dac25f
--- /dev/null
+++ b/pkgs/development/libraries/openssl/freebsd-x86_64-asm.patch
@@ -0,0 +1,16 @@
+Patch for <http://rt.openssl.org/Ticket/Display.html?id=2435&user=guest&pass=guest>.
+Fixes compilation on FreeBSD 8.2 with GNU Make 3.81.
+
+diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
+index e47116b..dc500ae 100755
+--- a/crypto/perlasm/x86_64-xlate.pl
++++ b/crypto/perlasm/x86_64-xlate.pl
+@@ -66,7 +66,7 @@ if ($flavour =~ /\./) { $output = $flavour; undef $flavour; }
+   my ($outdev,$outino,@junk)=stat($output);
+ 
+     open STDOUT,">$output" || die "can't open $output: $!"
+-	if ($stddev!=$outdev || $stdino!=$outino);
++	if (!defined($outdev) || $stddev!=$outdev || $stdino!=$outino);
+ }
+ 
+ my $gas=1;	$gas=0 if ($output =~ /\.asm$/);
diff --git a/pkgs/development/libraries/openssl/hurd-target.patch b/pkgs/development/libraries/openssl/hurd-target.patch
new file mode 100644
index 00000000000..399a37a69ed
--- /dev/null
+++ b/pkgs/development/libraries/openssl/hurd-target.patch
@@ -0,0 +1,12 @@
+diff -Naur openssl-1.0.0d-orig/Configure openssl-1.0.0d/Configure
+--- openssl-1.0.0d-orig/Configure	2010-11-30 17:19:26.000000000 -0500
++++ openssl-1.0.0d/Configure	2011-11-16 13:52:57.614416683 -0500
+@@ -563,7 +563,7 @@
+ "newsos4-gcc","gcc:-O -DB_ENDIAN::(unknown):NEWS4:-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::",
+ 
+ ##### GNU Hurd
+-"hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC",
++"hurd-x86","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mtune=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ 
+ ##### OS/2 EMX
+ "OS2-EMX", "gcc::::::::",
diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix
index 9e270f9eec2..2c1b148251c 100644
--- a/pkgs/development/libraries/osip/default.nix
+++ b/pkgs/development/libraries/osip/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation rec {
-  version = "3.5.0";
+  version = "3.6.0";
   src = fetchurl {
     url = "mirror://gnu/osip/libosip2-${version}.tar.gz";
-    sha256 = "14csf6z7b802bahxd560ibx3mg2fq3ki734vf3k2vknr4jm5v5fx";
+    sha256 = "1kcndqvsyxgbhkksgydvvjw15znfq6jiznvw058d21h5fq68p8f9";
   };
   name = "libosip2-${version}";
 
diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
new file mode 100644
index 00000000000..8366636a251
--- /dev/null
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "p11-kit-0.7";
+
+  src = fetchurl {
+    url = "${meta.homepage}releases/${name}.tar.gz";
+    sha256 = "1vj86kc7ir1djlb5akrr3w4x4k7h34pq2l4abwgqmcwxbm4j0lln";
+  };
+
+  postInstall = "rm -frv $out/share/gtk-doc";
+
+  meta = {
+    homepage = http://p11-glue.freedesktop.org/;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}
diff --git a/pkgs/development/libraries/pango/1.29.x.nix b/pkgs/development/libraries/pango/1.29.x.nix
index 14dd3d8c5a5..b255f05dd23 100644
--- a/pkgs/development/libraries/pango/1.29.x.nix
+++ b/pkgs/development/libraries/pango/1.29.x.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation rec {
 
   src = fetchurl_gnome {
     project = "pango";
-    major = "1"; minor = "29"; patchlevel = "3"; extension = "xz";
-    sha256 = "0vp88j3ghngkkc4dpya443qng0bb1g86g54bcwf4lf3zmk6r1nmh";
+    major = "1"; minor = "29"; patchlevel = "4"; extension = "xz";
+    sha256 = "0zqjq6ccv6mbah74rcvb03ksq1jwan21z37mdmqa56307sax3s3s";
   };
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin gettext;
diff --git a/pkgs/development/libraries/pangomm/2.14.x.nix b/pkgs/development/libraries/pangomm/2.14.x.nix
deleted file mode 100644
index 346962c5eaa..00000000000
--- a/pkgs/development/libraries/pangomm/2.14.x.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng }:
-
-stdenv.mkDerivation rec {
-  name = "pangomm-2.14.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/pangomm/2.14/${name}.tar.bz2";
-    sha256 = "0mrm5hv8kb84qzb97lqbipzzc8g0b97pfgz2hqq33xs2ha3lswnp";
-  };
-
-  buildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ pango glibmm cairomm libpng ];
-
-  meta = {
-    description = "C++ interface to the Pango text rendering library";
-
-    longDescription = ''
-      Pango is a library for laying out and rendering of text, with an
-      emphasis on internationalization.  Pango can be used anywhere
-      that text layout is needed, though most of the work on Pango so
-      far has been done in the context of the GTK+ widget toolkit.
-      Pango forms the core of text and font handling for GTK+-2.x.
-    '';
-
-    homepage = http://www.pango.org/;
-    license = "LGPLv2+";
-  };
-}
diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index 6cf63aa757a..c8eae2eac4e 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -1,21 +1,26 @@
-{ stdenv, fetchurl, cmake, automoc4, qt4 }:
+{ stdenv, fetchurl, cmake, automoc4, qt4, xz }:
+
+let
+  v = "4.5.1";
+in
 
 stdenv.mkDerivation rec {
-  name = "phonon-4.5.0";
+  name = "phonon-${v}";
 
   src = fetchurl {
-    url = "mirror://kde/stable/phonon/4.5.0/src/${name}.tar.bz2";
-    sha256 = "1p2jhxx3ij9xqxvzdz6fm14b83iag9sk940clgj5jnnw00x93s36";
+    url = "mirror://kde/stable/phonon/${v}/src/${name}.tar.xz";
+    sha256 = "1j7lw8w7h2z415vhbp2jlgv3mqwvrspf8xnzb8l0gsfanqfg1001";
   };
 
-  buildInputs = [ cmake automoc4 qt4 ];
+  buildInputs = [ qt4 ];
 
+  buildNativeInputs = [ cmake automoc4 xz ];
+
+  cmakeFlags = "-DPHONON_MKSPECS_DIR=mkspecs";
   preConfigure =
     ''
-      substituteInPlace CMakeLists.txt \
-        --replace 'PHONON_MKSPECS_DIR}' 'CMAKE_INSTALL_PREFIX}/mkspecs'
       substituteInPlace designer/CMakeLists.txt \
-        --replace 'QT_PLUGINS_DIR}' 'CMAKE_INSTALL_PREFIX}/lib/qt4/plugins'
+        --replace '{QT_PLUGINS_DIR}' '{CMAKE_INSTALL_PREFIX}/lib/qt4/plugins'
     '';
 
   meta = {
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index bb19338cc88..f22d6a795c9 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "poppler-0.16.7";
+  name = "poppler-0.18.2";
 
   src = fetchurl {
     url = "${meta.homepage}${name}.tar.gz";
-    sha256 = "1k9by922qkn9pkkf03jjxxqhp4s0gmsgs6c8f4m19m1l5npyid7s";
+    sha256 = "0ljvr6l1lfwbkl0v4vw9dybski7d4sx52iz6k37mkfnj3x36npxi";
   };
 
   propagatedBuildInputs =
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optionals gtkSupport [ glib gtk ]
     ++ stdenv.lib.optional qt4Support qt4;
 
-  buildInputs = [ pkgconfig cmake ];
+  buildNativeInputs = [ pkgconfig cmake ];
 
   cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON";
 
diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix
index be219f1f288..ffd81f84489 100644
--- a/pkgs/development/libraries/pth/default.nix
+++ b/pkgs/development/libraries/pth/default.nix
@@ -11,5 +11,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The GNU Portable Threads library";
     homepage = http://www.gnu.org/software/pth;
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 5475e26dcca..5d256bc7024 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -3,19 +3,19 @@
 assert readline != null -> ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.7.7.1";
+  name = "sqlite-3.7.9";
 
   src = fetchurl {
-    url = http://www.sqlite.org/sqlite-autoconf-3070701.tar.gz;
-    sha256 = "1pvf72gb6yidc4zjml3k6kwhlvvhbgmbm8hfin9y5jvvbyr3dk3x";
+    url = http://www.sqlite.org/sqlite-autoconf-3070900.tar.gz;
+    sha1 = "a9da98a4bde4d9dae5c29a969455d11a03600e11";
   };
 
   buildInputs = [ readline ncurses ];
   
   configureFlags = "--enable-threadsafe";
 
-  NIX_CFLAGS_COMPILE = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1";
-  NIX_CFLAGS_LINK = if readline != null then "-lncurses" else "";
+  CFLAGS = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1";
+  LDFLAGS = if readline != null then "-lncurses" else "";
 
   meta = {
     homepage = http://www.sqlite.org/;
diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix
index 06bd5823e87..a3684194c0f 100644
--- a/pkgs/development/libraries/sword/default.nix
+++ b/pkgs/development/libraries/sword/default.nix
@@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig icu cluceneCore curl ];
 
+  # because curl/types.h disappeared since at least curl 7.21.7
+  patches = [ ./dont_include_curl_types_h.patch ];
+
   prePatch = ''
     patchShebangs .;
   '';
diff --git a/pkgs/development/libraries/sword/dont_include_curl_types_h.patch b/pkgs/development/libraries/sword/dont_include_curl_types_h.patch
new file mode 100644
index 00000000000..233d59a3243
--- /dev/null
+++ b/pkgs/development/libraries/sword/dont_include_curl_types_h.patch
@@ -0,0 +1,24 @@
+diff --git a/src/mgr/curlftpt.cpp b/src/mgr/curlftpt.cpp
+index 7d2fd3c..046291e 100644
+--- a/src/mgr/curlftpt.cpp
++++ b/src/mgr/curlftpt.cpp
+@@ -26,7 +26,6 @@
+ #include <fcntl.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <swlog.h>
+diff --git a/src/mgr/curlhttpt.cpp b/src/mgr/curlhttpt.cpp
+index b736050..229d4dd 100644
+--- a/src/mgr/curlhttpt.cpp
++++ b/src/mgr/curlhttpt.cpp
+@@ -25,7 +25,6 @@
+ #include <cctype>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <swlog.h>
diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
new file mode 100644
index 00000000000..1fbfdc58fce
--- /dev/null
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -0,0 +1,44 @@
+{ fetchurl, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "libtirpc-0.1.8-1";
+
+  src = fetchurl {
+    url = "http://nfsv4.bullopensource.org/tarballs/tirpc/${name}.tar.bz2";
+    sha256 = "0jf0sj2cv1rm1dm1i226ww9h93srljf8zf0yfy9mvwxg8gqnn5fy";
+  };
+
+  preConfigure =
+    '' sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i "Makefile.in"
+    '';
+  preInstall = "ensureDir $out/etc";
+
+  doCheck = true;
+
+  meta = {
+    description = "The transport-independent Sun RPC implementation (TI-RPC)";
+
+    longDescription =
+      '' Currently, NFS commands use the SunRPC routines provided by the
+         glibc.  These routines do not support IPv6 addresses.  Ulrich
+         Drepper, who is the maintainer of the glibc, refuses any change in
+         the glibc concerning the RPC.  He wants the RPC to become a separate
+         library.  Other OS (NetBSD, FreeBSD, Solarix, HP-UX, AIX) have
+         migrated their SunRPC library to a TI-RPC (Transport Independent
+         RPC) implementation.  This implementation allows the support of
+         other transports than UDP and TCP over IPv4.  FreeBSD provides a
+         TI-RPC library ported from NetBSD with improvments.  This library
+         already supports IPv6.  So, the FreeBSD release 5.2.1 TI-RPC has
+         been ported to replace the SunRPC of the glibc.
+      '';
+
+    homepage = http://nfsv4.bullopensource.org/doc/tirpc_rpcbind.php;
+
+    # Free software license, see
+    # <http://www.gnu.org/licenses/license-list.html#SISSL>.
+    license = "Sun Industry Standards Source License 1.0";
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
+}
diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix
new file mode 100644
index 00000000000..63319213312
--- /dev/null
+++ b/pkgs/development/libraries/tokyo-tyrant/default.nix
@@ -0,0 +1,41 @@
+{ fetchurl, stdenv, tokyocabinet, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "tokyotyrant-1.1.41";
+
+  src = fetchurl {
+    url = "http://fallabs.com/tokyotyrant/${name}.tar.gz";
+    sha256 = "13xqcinhydqmh7231qlir6pymacjwcf98drybkhd9597kzxp1bs2";
+  };
+
+  buildNativeInputs = [ pkgconfig ];
+  buildInputs = [ tokyocabinet ];
+
+  doCheck = false;                                # FIXME
+
+  meta = {
+    description = "Network interface of the Tokyo Cabinet DBM";
+
+    longDescription =
+      '' Tokyo Tyrant is a package of network interface to the DBM called
+         Tokyo Cabinet.  Though the DBM has high performance, you might
+         bother in case that multiple processes share the same database, or
+         remote processes access the database.  Thus, Tokyo Tyrant is
+         provided for concurrent and remote connections to Tokyo Cabinet.  It
+         is composed of the server process managing a database and its access
+         library for client applications.
+
+         Tokyo Tyrant is written in the C language, and provided as API of C,
+         Perl, and Ruby.  Tokyo Tyrant is available on platforms which have
+         API conforming to C99 and POSIX.  Tokyo Tyrant is a free software
+         licensed under the GNU Lesser General Public License.
+       '';
+
+    homepage = http://fallabs.com/tokyotyrant/;
+
+    license = "LGPLv2.1+";
+
+    platforms = stdenv.lib.platforms.gnu;         # arbitrary choice
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
+}
diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix
index af481f2ffed..cca5c5aaa9f 100644
--- a/pkgs/development/libraries/ucommon/default.nix
+++ b/pkgs/development/libraries/ucommon/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, gnutls, pkgconfig, zlib, libgcrypt }:
 
 stdenv.mkDerivation rec {
-  name = "ucommon-5.0.5";
+  name = "ucommon-5.0.7";
 
   src = fetchurl {
-    url = mirror://gnu/commoncpp/ucommon-5.0.5.tar.gz;
-    sha256 = "0rpq6qkhzcsls2rmnf1p1dnf9vyzmgw0cips3hl82mh0w5d70253";
+    url = mirror://gnu/commoncpp/ucommon-5.0.7.tar.gz;
+    sha256 = "0zr4zjwb62dpq7aa88vclhv2y8j7glkq693kwmb8agfx0fv8nkny";
   };
 
   buildInputs = [ pkgconfig gnutls zlib ];
diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix
index 7dee0da9eed..bb7643330a0 100644
--- a/pkgs/development/libraries/xapian/bindings/default.nix
+++ b/pkgs/development/libraries/xapian/bindings/default.nix
@@ -5,11 +5,11 @@ let inherit (composableDerivation) wwf; in
 
 composableDerivation.composableDerivation {} rec {
 
-  name = "xapian-bindings-1.2.5";
+  name = "xapian-bindings-1.2.7";
 
   src = fetchurl {
-    url = "http://oligarchy.co.uk/xapian/1.2.5/${name}.tar.gz";
-    sha256 = "0d723af62b8d633cd49fdf92058a4985061659454b390c0c08db05fa4f7fb09c";
+    url = "http://oligarchy.co.uk/xapian/1.2.7/${name}.tar.gz";
+    sha256 = "c9f63ad7a032c260f0617e029327d7b05dd986d91af401032268a9f7b2eabde8";
   };
 
   buildInputs = [ xapian pkgconfig zlib ];
@@ -68,7 +68,7 @@ composableDerivation.composableDerivation {} rec {
   meta = { 
     description = "Bindings for the Xapian library";
     homepage = xapian.meta.homepage;
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.chaoflow ];
   };
 }
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index ac86c24af6c..ac27962b8c5 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libuuid, zlib }:
 
 stdenv.mkDerivation {
-  name = "xapian-1.2.5";
+  name = "xapian-1.2.7";
 
   src = fetchurl {
-    url = http://oligarchy.co.uk/xapian/1.2.5/xapian-core-1.2.5.tar.gz;
-    sha256 = "392ccfccb4372725be24509e5ee95a7422f07c3d47d0cbdbb8545e789cc936f7";
+    url = http://oligarchy.co.uk/xapian/1.2.7/xapian-core-1.2.7.tar.gz;
+    sha256 = "6ce8cb3502f35245ec0cb0dcf579ce4f65c015a2f2e8d1b4c388c95f58278c89";
   };
 
   buildInputs = [ libuuid zlib ];
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   meta = { 
     description = "Xapian Probabilistic Information Retrieval library";
     homepage = "http://xapian.org";
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.chaoflow ];
   };
 }
diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix
new file mode 100644
index 00000000000..221344b9125
--- /dev/null
+++ b/pkgs/development/libraries/yajl/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl, cmake, ruby, darwinInstallNameToolUtility}:
+
+stdenv.mkDerivation {
+  name = "yajl-2.0.1";
+
+  src = fetchurl {
+    url = http://github.com/lloyd/yajl/tarball/2.0.1;
+    name = "yajl-2.0.1.tar.gz";
+    sha256 = "08a7bgmdpvi6w9f9bxx5f42njwmwzdf6jz3w6ila7jgbl5mhknf2";
+  };
+
+  buildInputs = [ cmake ruby ]
+    ++ stdenv.lib.optional stdenv.isDarwin darwinInstallNameToolUtility;
+
+  meta = {
+    description = "Yet Another JSON Library";
+    longDescription = ''
+      YAJL is a small event-driven (SAX-style) JSON parser written in ANSI
+      C, and a small validating JSON generator.
+    '';
+    homepage = http://lloyd.github.com/yajl/;
+    license = stdenv.lib.licenses.isc;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    maintainers = with stdenv.lib.maintainers; [ z77z ];
+  };
+}
diff --git a/pkgs/development/libraries/zeromq/default.nix b/pkgs/development/libraries/zeromq/default.nix
new file mode 100644
index 00000000000..06beb9254f9
--- /dev/null
+++ b/pkgs/development/libraries/zeromq/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, libuuid}:
+
+stdenv.mkDerivation rec {
+  name = "zeromq-2.1.10";
+
+  src = fetchurl {
+    url = "http://download.zeromq.org/${name}.tar.gz";
+    sha256 = "0yabbbgx9ajpq0hjzqjm6rmj7pkcj95d5zn7d59b4wmm6kipwwn6";
+  };
+
+  buildInputs = [ libuuid ];
+
+  meta = {
+    homepage = "http://www.zeromq.org";
+    description = "The Intelligent Transport Layer";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/cryptokit/META b/pkgs/development/ocaml-modules/cryptokit/META
deleted file mode 100644
index 661170835fd..00000000000
--- a/pkgs/development/ocaml-modules/cryptokit/META
+++ /dev/null
@@ -1,8 +0,0 @@
-# Specifications for the "cryptokit" library:
-requires = ""
-description = "A library of cryptographic primitives for OCaml"
-version = "1.3"
-directory = "^"
-
-archive(byte) = "cryptokit.cma"
-archive(native) = "cryptokit.cmxa"
diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix
index f4ba9a8d7d7..8aa3f2ba77e 100644
--- a/pkgs/development/ocaml-modules/cryptokit/default.nix
+++ b/pkgs/development/ocaml-modules/cryptokit/default.nix
@@ -1,40 +1,24 @@
-{stdenv, fetchurl, zlib, ocaml}:
+{stdenv, fetchurl, zlib, ocaml, findlib, ncurses}:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
-  version = "1.3";
+  version = "1.5";
 in
 
 stdenv.mkDerivation {
   name = "cryptokit-${version}";
 
   src = fetchurl {
-    url = "http://forge.ocamlcore.org/frs/download.php/326/" +
+    url = "http://forge.ocamlcore.org/frs/download.php/639/" +
           "cryptokit-${version}.tar.gz";
-    sha256 = "0kqrlxkpzrj2qpniy6mhn7gx3n29s86vk4q0im2hqpxi9knkkwwy";
+    sha256 = "1r5kbsbsicrbpdrdim7h8xg2b1a8qg8sxig9q6cywzm57r33lj72";
   };
 
-  buildInputs = [zlib ocaml];
+  buildInputs = [zlib ocaml findlib ncurses];
 
-  patches = [ ./makefile.patch ];
+  buildFlags = "setup.data build";
 
-  configurePhase = ''
-    export INSTALLDIR="$out/lib/ocaml/${ocaml_version}/site-lib/cryptokit"
-    substituteInPlace Makefile \
-      --subst-var-by ZLIB_LIBDIR "${zlib}/lib" \
-      --subst-var-by ZLIB_INCLUDE "${zlib}/include" \
-      --subst-var INSTALLDIR 
-  '';
-
-  buildFlags = "all allopt";
-
-  doCheck = true;
-  
-  checkTarget = "test";
-
-  preInstall = "ensureDir $INSTALLDIR";
-
-  postInstall = "cp -a ${./META} $INSTALLDIR/META";
+  preBuild = "ensureDir $out/lib/ocaml/${ocaml_version}/site-lib/cryptokit";
 
   meta = {
     homepage = "http://pauillac.inria.fr/~xleroy/software.html";
diff --git a/pkgs/development/ocaml-modules/cryptokit/makefile.patch b/pkgs/development/ocaml-modules/cryptokit/makefile.patch
deleted file mode 100644
index b4a82c7d677..00000000000
--- a/pkgs/development/ocaml-modules/cryptokit/makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nuar cryptokit-1.3/Makefile cryptokit-1.3.nixos/Makefile
---- cryptokit-1.3/Makefile	2005-04-20 15:19:54.000000000 +0200
-+++ cryptokit-1.3.nixos/Makefile	2010-08-17 15:22:07.000000000 +0200
-@@ -9,14 +9,13 @@
- 
- # The directory containing the Zlib library (libz.a or libz.so)
- # Leave blank if you don't have Zlib.
--ZLIB_LIBDIR=/usr/lib
--#ZLIB_LIBDIR=/usr/lib64    # for x86-64 Linux
-+ZLIB_LIBDIR=@ZLIB_LIBDIR@
- 
- # The directory containing the Zlib header file (zlib.h)
--ZLIB_INCLUDE=/usr/include
-+ZLIB_INCLUDE=@ZLIB_INCLUDE@
- 
- # Where to install the library. By default: OCaml's standard library directory.
--INSTALLDIR=`$(OCAMLC) -where`
-+INSTALLDIR=@INSTALLDIR@
- 
- # Flags for the C compiler.
- CFLAGS=-O -I$(ZLIB_INCLUDE) $(ZLIB)
diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
new file mode 100644
index 00000000000..92a46573117
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
@@ -0,0 +1,40 @@
+{stdenv, fetchurl, ocaml, findlib }:
+
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+  version = "1.8.1";
+in
+
+stdenv.mkDerivation {
+  name = "ocamlgraph-${version}";
+
+  src = fetchurl {
+    url = "http://ocamlgraph.lri.fr/download/ocamlgraph-${version}.tar.gz";
+    sha256 = "0hrba69wvw9b42irkvjf6q7zzw12v5nyyc33yaq3jlf1qbzqhqxs";
+  };
+
+  buildInputs = [ ocaml findlib ];
+
+  patches = ./destdir.patch;
+
+  postPatch = ''
+    sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(DESTDIR)/lib/ocaml/${ocaml_version}/site-lib/ocamlgraph@' Makefile.in
+  '';
+
+  createFindlibDestdir = true;
+
+  buildPhase = ''
+    make all
+    make install-findlib
+  '';
+
+  meta = {
+    homepage = http://ocamlgraph.lri.fr/;
+    description = "ocamlgraph is a graph library for Objective Caml.";
+    license = "GNU Library General Public License version 2, with the special exception on linking described in file LICENSE";
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.kkallio
+    ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ocamlgraph/destdir.patch b/pkgs/development/ocaml-modules/ocamlgraph/destdir.patch
new file mode 100644
index 00000000000..38fca1c491f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocamlgraph/destdir.patch
@@ -0,0 +1,13 @@
+diff -Naur -x '*~' ocamlgraph-1.8.1/Makefile.in ocamlgraph-1.8.1-new//Makefile.in
+--- ocamlgraph-1.8.1/Makefile.in	2011-10-17 09:57:03.000000000 -0430
++++ ocamlgraph-1.8.1-new//Makefile.in	2011-11-24 13:01:22.626004819 -0430
+@@ -16,8 +16,8 @@
+ ##########################################################################
+ 
+ # Where to install the binaries
+-DESTDIR	=
+ prefix	=@prefix@
++DESTDIR=$(prefix)
+ exec_prefix=@exec_prefix@
+ datarootdir=@datarootdir@
+ BINDIR	=$(DESTDIR)@bindir@
diff --git a/pkgs/development/ocaml-modules/ulex/0.8/default.nix b/pkgs/development/ocaml-modules/ulex/0.8/default.nix
index 169f3bfad8c..e996b6223b1 100644
--- a/pkgs/development/ocaml-modules/ulex/0.8/default.nix
+++ b/pkgs/development/ocaml-modules/ulex/0.8/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation {
 
   patches = [ ./meta_version.patch ./camlp5.patch ];
 
+  propagatedBuildInputs = [ camlp5 ];
+
   buildFlags = "all all.opt";
 
   meta = {
diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix
index aee65a6e2ee..19beeec1ec5 100644
--- a/pkgs/development/ocaml-modules/ulex/default.nix
+++ b/pkgs/development/ocaml-modules/ulex/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation {
     sha256 = "0fjlkwps14adfgxdrbb4yg65fhyimplvjjs1xqj5np197cig67x0";
   };
 
+  createFindlibDestdir = true;
+
   buildInputs = [ocaml findlib];
 
   buildFlags = "all all.opt";
diff --git a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch
new file mode 100644
index 00000000000..c0fa85ecce8
--- /dev/null
+++ b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch
@@ -0,0 +1,17 @@
+Use $OPENSSL_X509_CERT_FILE to get the CA certificates.
+
+diff -ru -x '*~' LWP-Protocol-https-6.02-orig/lib/LWP/Protocol/https.pm LWP-Protocol-https-6.02/lib/LWP/Protocol/https.pm
+--- LWP-Protocol-https-6.02-orig/lib/LWP/Protocol/https.pm	2011-03-27 13:54:01.000000000 +0200
++++ LWP-Protocol-https-6.02/lib/LWP/Protocol/https.pm	2011-10-07 13:23:41.398628375 +0200
+@@ -21,6 +21,11 @@
+     }
+     if ($ssl_opts{SSL_verify_mode}) {
+ 	unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
++            if (defined $ENV{'OPENSSL_X509_CERT_FILE'}) {
++                $ssl_opts{SSL_ca_file} = $ENV{'OPENSSL_X509_CERT_FILE'};
++            }
++        }
++	unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
+ 	    eval {
+ 		require Mozilla::CA;
+ 	    };
diff --git a/pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch b/pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch
new file mode 100644
index 00000000000..0568aeb56bf
--- /dev/null
+++ b/pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch
@@ -0,0 +1,51 @@
+diff -ru stanaka-net-amazon-ec2-bc66577-orig/lib/Net/Amazon/EC2/RunningInstances.pm stanaka-net-amazon-ec2-bc66577/lib/Net/Amazon/EC2/RunningInstances.pm
+--- stanaka-net-amazon-ec2-bc66577-orig/lib/Net/Amazon/EC2/RunningInstances.pm	2011-06-13 19:45:30.000000000 -0400
++++ stanaka-net-amazon-ec2-bc66577/lib/Net/Amazon/EC2/RunningInstances.pm	2011-10-27 17:25:29.000000000 -0400
+@@ -25,6 +25,10 @@
+ This element remains empty until the instance enters a 
+ running state.
+ 
++=item dns_name_v6 (optional)
++
++The public IPv6 address of the instance.
++
+ =item image_id (required)
+ 
+ The image id of the AMI currently running in this instance.
+@@ -134,6 +138,7 @@
+ 
+ has 'ami_launch_index'  	=> ( is => 'ro', isa => 'Str', required => 0 );
+ has 'dns_name'          	=> ( is => 'ro', isa => 'Maybe[Str]', required => 0 );
++has 'dns_name_v6'          	=> ( is => 'ro', isa => 'Maybe[Str]', required => 0 );
+ has 'image_id'          	=> ( is => 'ro', isa => 'Str', required => 1 );
+ has 'kernel_id'         	=> ( is => 'ro', isa => 'Maybe[Str]', required => 1 );
+ has 'ramdisk_id'        	=> ( is => 'ro', isa => 'Maybe[Str]', required => 1 );
+diff -ru stanaka-net-amazon-ec2-bc66577-orig/lib/Net/Amazon/EC2.pm stanaka-net-amazon-ec2-bc66577/lib/Net/Amazon/EC2.pm
+--- stanaka-net-amazon-ec2-bc66577-orig/lib/Net/Amazon/EC2.pm	2011-06-13 19:45:30.000000000 -0400
++++ stanaka-net-amazon-ec2-bc66577/lib/Net/Amazon/EC2.pm	2011-10-27 17:25:29.000000000 -0400
+@@ -1691,6 +1691,7 @@
+ 	my $self = shift;
+ 	my %args = validate( @_, {
+ 		InstanceId => { type => SCALAR | ARRAYREF, optional => 1 },
++		Action => { default => "DescribeInstances" },
+ 	});
+ 	
+ 	# If we have a array ref of instances lets split them out into their InstanceId.n format
+@@ -1703,7 +1704,8 @@
+ 		}
+ 	}
+ 	
+-	my $xml = $self->_sign(Action  => 'DescribeInstances', %args);
++	my $xml = $self->_sign(Action => $args{Action}, %args);
++	delete $args{Action};
+ 	my $reservations;
+ 	
+ 	if ( grep { defined && length } $xml->{Errors} ) {
+@@ -1791,6 +1793,7 @@
+ 				my $running_instance = Net::Amazon::EC2::RunningInstances->new(
+ 					ami_launch_index		=> $instance_elem->{amiLaunchIndex},
+ 					dns_name				=> $instance_elem->{dnsName},
++					dns_name_v6			=> $instance_elem->{dnsNameV6},
+ 					image_id				=> $instance_elem->{imageId},
+ 					kernel_id				=> $instance_elem->{kernelId},
+ 					ramdisk_id				=> $instance_elem->{ramdiskId},
diff --git a/pkgs/development/perl-modules/net-amazon-ec2-nova-compat.patch b/pkgs/development/perl-modules/net-amazon-ec2-nova-compat.patch
index c08b3579fc3..5d9aef7f70d 100644
--- a/pkgs/development/perl-modules/net-amazon-ec2-nova-compat.patch
+++ b/pkgs/development/perl-modules/net-amazon-ec2-nova-compat.patch
@@ -1,6 +1,6 @@
 diff -ru -x '*~' Net-Amazon-EC2-0.14-orig/lib/Net/Amazon/EC2.pm Net-Amazon-EC2-0.14/lib/Net/Amazon/EC2.pm
 --- Net-Amazon-EC2-0.14-orig/lib/Net/Amazon/EC2.pm	2010-02-02 02:26:58.000000000 +0100
-+++ Net-Amazon-EC2-0.14/lib/Net/Amazon/EC2.pm	2011-06-16 14:18:19.874176129 +0200
++++ Net-Amazon-EC2-0.14/lib/Net/Amazon/EC2.pm	2011-06-16 16:11:53.861341300 +0200
 @@ -1552,6 +1552,8 @@
  			$args{"InstanceId." . $count} = $instance_id;
  			$count++;
@@ -10,3 +10,12 @@ diff -ru -x '*~' Net-Amazon-EC2-0.14-orig/lib/Net/Amazon/EC2.pm Net-Amazon-EC2-0
  	}
  	
  	my $xml = $self->_sign(Action  => 'DescribeInstances', %args);
+@@ -3739,6 +3741,8 @@
+ 			$args{"InstanceId." . $count} = $instance_id;
+ 			$count++;
+ 		}
++	} else {
++		$args{"InstanceId.1"} = delete $args{InstanceId};
+ 	}
+ 	
+ 	my $xml = $self->_sign(Action  => 'TerminateInstances', %args);	
diff --git a/pkgs/development/perl-modules/starman-dont-change-name.patch b/pkgs/development/perl-modules/starman-dont-change-name.patch
new file mode 100644
index 00000000000..82454cfdd16
--- /dev/null
+++ b/pkgs/development/perl-modules/starman-dont-change-name.patch
@@ -0,0 +1,23 @@
+Changing the process name breaks applying libcgroup rules, so don't do it.
+
+diff -ru -x '*~' Starman-0.2014-orig/lib/Starman/Server.pm Starman-0.2014/lib/Starman/Server.pm
+--- Starman-0.2014-orig/lib/Starman/Server.pm	2011-08-27 01:19:43.000000000 +0200
++++ Starman-0.2014/lib/Starman/Server.pm	2011-11-25 13:30:24.570434653 +0100
+@@ -100,7 +100,7 @@
+ 
+ sub run_parent {
+     my $self = shift;
+-    $0 = "starman master " . join(" ", @{$self->{options}{argv} || []});
++    #$0 = "starman master " . join(" ", @{$self->{options}{argv} || []});
+     $self->SUPER::run_parent(@_);
+ }
+ 
+@@ -113,7 +113,7 @@
+         DEBUG && warn "[$$] Initializing the PSGI app\n";
+         $self->{app} = $self->{options}->{psgi_app_builder}->();
+     }
+-    $0 = "starman worker " . join(" ", @{$self->{options}{argv} || []});
++    #$0 = "starman worker " . join(" ", @{$self->{options}{argv} || []});
+ }
+ 
+ sub post_accept_hook {
diff --git a/pkgs/development/python-modules/boto-1.9-python-2.7.patch b/pkgs/development/python-modules/boto-1.9-python-2.7.patch
new file mode 100644
index 00000000000..79ff9a7e4af
--- /dev/null
+++ b/pkgs/development/python-modules/boto-1.9-python-2.7.patch
@@ -0,0 +1,19 @@
+Fix Boto 1.9 on Python 2.7.
+
+https://github.com/boto/boto/commit/6760075073c34d6dddb7e13b80dfa8d09f0f4f79
+
+diff --git a/boto/connection.py b/boto/connection.py
+index c5779e2..71942f1 100644
+--- a/boto/connection.py
++++ b/boto/connection.py
+@@ -252,8 +252,9 @@ class AWSAuthConnection(object):
+             # versions, it would append ":443" to the hostname sent
+             # in the Host header and so we needed to make sure we
+             # did the same when calculating the V2 signature.  In 2.6
++            # (and higher!)
+             # it no longer does that.  Hence, this kludge.
+-            if sys.version[:3] == "2.6" and port == 443:
++            if sys.version[:3] in ('2.6', '2.7') and port == 443:
+                 signature_host = self.host
+             else:
+                 signature_host = '%s:%d' % (self.host, port)
diff --git a/pkgs/development/python-modules/wxPython/2.6.nix b/pkgs/development/python-modules/wxPython/2.6.nix
deleted file mode 100644
index 362f52bf44f..00000000000
--- a/pkgs/development/python-modules/wxPython/2.6.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, wxGTK, pythonPackages }:
-
-assert wxGTK.unicode;
-
-stdenv.mkDerivation {
-  name = "wxPython-2.6.3.3";
-  
-  builder = ./builder.sh;
-  
-  src = fetchurl {
-    url = mirror://sourceforge/wxpython/wxPython-src-2.6.3.3.tar.bz2;
-    md5 = "66b9c5f8e20a9505c39dab1a1234daa9";
-  };
-  
-  buildInputs = [ pkgconfig wxGTK (wxGTK.gtk) pythonPackages.python pythonPackages.wrapPython ];
-  
-  passthru = { inherit wxGTK; };
-}
diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix
index 73c3e66f074..c768669bda9 100644
--- a/pkgs/development/tools/analysis/lcov/default.nix
+++ b/pkgs/development/tools/analysis/lcov/default.nix
@@ -42,5 +42,6 @@ stdenv.mkDerivation rec {
     license = "GPLv2+";
 
     maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index a9774a84638..d0c5e624d39 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, gdb }:
 
 stdenv.mkDerivation (rec {
-  name = "valgrind-3.6.1";
+  name = "valgrind-3.7.0";
 
   src = fetchurl {
     url = "http://valgrind.org/downloads/${name}.tar.bz2";
-    sha256 = "03kaf8q49r347diryc2p1q5hxsd6hyhxikqdbydh8q7hpi7wrga9";
+    sha256 = "1xnb4jiimscwriw3jd1lkk0m9x4glqpijj9jb4ngx08l1wrw0qjx";
   };
 
   # Perl is needed for `cg_annotate'.
diff --git a/pkgs/development/tools/haskell/SourceGraph/default.nix b/pkgs/development/tools/haskell/SourceGraph/default.nix
new file mode 100644
index 00000000000..0987989051f
--- /dev/null
+++ b/pkgs/development/tools/haskell/SourceGraph/default.nix
@@ -0,0 +1,24 @@
+{ cabal, extensibleExceptions, fgl, Graphalyze, graphviz
+, haskellSrcExts, mtl, multiset, random
+}:
+
+cabal.mkDerivation (self: {
+  pname = "SourceGraph";
+  version = "0.7.0.1";
+  sha256 = "0f6h240a72cxa65cwjrp34cx80c6frzhgl9dpv3krc8xzhxssk78";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    extensibleExceptions fgl Graphalyze graphviz haskellSrcExts mtl
+    multiset random
+  ];
+  meta = {
+    description = "Static code analysis using graph-theoretic techniques";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 5c354c8e156..c8753ea367b 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.17";
-  sha256 = "0pga0rfghpvjazhs0mgnxg2kf82m8bsmlx3g9pxhiw5f4amfr2g7";
+  version = "1.21";
+  sha256 = "00gsayb7axxm8z9jrngckb7c666x1kibvln67g2rpchi6djg6wn7";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ];
diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
index 53a60968860..1e4b04db04a 100644
--- a/pkgs/development/tools/haskell/hlint/default.nix
+++ b/pkgs/development/tools/haskell/hlint/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hlint";
-  version = "1.8.17";
-  sha256 = "0p2sd24zi4a9fynib03dll8jbcc7izbmknfxv80v9j3lb2p8qj5h";
+  version = "1.8.20";
+  sha256 = "0nkvlvax2yv8lqq7axnghdw38fj6r44y78ss23yxqqav7q046vyh";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/tools/haskell/uuagc/cabal.nix b/pkgs/development/tools/haskell/uuagc/cabal.nix
index b8e1ca46f57..70c0a8e9931 100644
--- a/pkgs/development/tools/haskell/uuagc/cabal.nix
+++ b/pkgs/development/tools/haskell/uuagc/cabal.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "uuagc-cabal";
-  version = "1.0.0.7";
-  sha256 = "1ciypx0rrisjbwx8fc9bzkkv975646951ibqpvbxipxzvv5npy9y";
+  version = "1.0.0.10";
+  sha256 = "0dqj5nqq8qpylbxyv8cpy3rrnna9yqb4dnxxk7sgyhw6yvz48l56";
   buildDepends = [ mtl uulib ];
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix
index 82f8b110054..ce18fd1a377 100644
--- a/pkgs/development/tools/misc/autoconf/default.nix
+++ b/pkgs/development/tools/misc/autoconf/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   # details.
   # There are many test failures on `i386-pc-solaris2.11'.
   doCheck = (stdenv.system != "i686-cygwin"
-             && stdenv.system != "i386-sunos");
+             && stdenv.system != "i686-solaris");
 
   # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the
   # "fixed" path in generated files!
diff --git a/pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff b/pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff
new file mode 100644
index 00000000000..cc42f0745da
--- /dev/null
+++ b/pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff
@@ -0,0 +1,49 @@
+Based on this:
+http://sourceforge.net/tracker/?func=detail&aid=1493886&group_id=5152&atid=305152
+fix the infinite loops in quote highlight - ID: 1493886
+
+--- cbrowser-0.8-2/ftcllib.tcl	2000-07-04 01:17:43.000000000 +0200
++++ cbrowser-0.8/ftcllib.tcl	2006-05-24 00:39:18.833762522 +0200
+@@ -1290,13 +1290,39 @@
+   foreach {start end} [concat 1.0 [$widget tag ranges comment] end] {
+ 
+     while {[set temp [$widget search -regexp -- $pattern $start $end]] != ""} {
++      set startquote [$widget index "$temp + 1chars"]
+ 
+-      set endquote [$widget search -regexp -- {[^\\]\"} "$temp + 1chars" $end]
++      set temp [$widget index "$startquote + 1chars"]
++      while {1==1} {
++        set endquote [$widget search -regexp -- {\"} $temp $end]
++
++	# The program will not break if a /*C comment*/ is between C quotes.
++	if { $endquote == "" } {
++	  set endquote $startquote
++	  break
++	}
++
++        # look for double backslashes
++	if {[set temp2 [$widget search -regexp -- {\\\\} $temp $endquote]] != ""} {
++	  set temp "$temp2 + 2chars"
++	  continue
++	}
++        
++        # look for \"
++	if {[set temp2 [$widget search -regexp -- {\\\"} $temp $endquote]] != ""} {
++	  set temp "$temp2 + 2chars"
++	  continue
++	}
++
++	break
++      }
+ 
+       if {[strlen $endquote] > 0} {
+-        set start [$widget index "$endquote + 2chars"]
++        set start [$widget index "$endquote + 1chars"]
+ 
+-        $widget tag add quote "$temp + 1chars" $start
++        $widget tag add quote $startquote $start
++      } else {
++        set start [$widget index "$start + 1chars"]
+       }
+     }
+   }
diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix
new file mode 100644
index 00000000000..50dc907a780
--- /dev/null
+++ b/pkgs/development/tools/misc/cbrowser/default.nix
@@ -0,0 +1,34 @@
+{ fetchurl, stdenv, cscope, tk, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "cbrowser-0.8";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/cbrowser/cbrowser-0.8.tar.gz";
+    sha256 = "1050mirjab23qsnq3lp3a9vwcbavmh9kznzjm7dr5vkx8b7ffcji";
+  };
+
+  patches = [ ./backslashes-quotes.diff ];
+
+  buildInputs = [ tk makeWrapper ];
+
+  installPhase = ''
+    ensureDir $out/bin $out/share/${name}
+    cp -R * $out/share/${name}/
+
+    makeWrapper $out/share/${name}/cbrowser $out/bin/cbrowser \
+      --prefix PATH : ${tk}/bin
+  '';
+
+  meta = {
+    description = "Tcl/Tk GUI front-end to cscope";
+
+    license = "GPLv2+";
+
+    homepage = http://sourceforge.net/projects/cbrowser/;
+
+    maintainers = with stdenv.lib.maintainers; [viric];
+
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix
index c8cfb77d71a..041191640bd 100644
--- a/pkgs/development/tools/misc/cflow/default.nix
+++ b/pkgs/development/tools/misc/cflow/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext, emacs }:
 
 stdenv.mkDerivation rec {
-  name = "cflow-1.3";
+  name = "cflow-1.4";
 
   src = fetchurl {
     url = "mirror://gnu/cflow/${name}.tar.bz2";
-    sha256 = "1nlmgcjsy1rl5zpqz9f8mf74faq3rm725hhpf11b8w80sniqgnnk";
+    sha256 = "1jkbq97ajcf834z68hbn3xfhiz921zhn39gklml1racf0kb3jzh3";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix
index 702c88d2ddb..620cb8149a2 100644
--- a/pkgs/development/tools/misc/cpphs/default.nix
+++ b/pkgs/development/tools/misc/cpphs/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cpphs";
-  version = "1.13.1";
-  sha256 = "0k5p9gqnalll3w1962dwydnygk25h777bic2gvdh8i8hhyz5fsx2";
+  version = "1.13.2";
+  sha256 = "1q3pzfcgrl9nka1gdl84c4fqc1ql83idlbb8fghqsjp0ijzcxk3s";
   isLibrary = true;
   isExecutable = true;
   meta = {
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 7da5ac31e2a..cd2eb6cc02d 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -4,16 +4,28 @@
 # Set it to true to fetch the latest release/branchpoint from git.
 , bleedingEdgeVersion ? false
 
+# Additional dependencies for GNU/Hurd.
+, mig ? null, hurd ? null
+
 # needed for the git version
 , flex, bison }:
 
 let
-    basename =
-      if bleedingEdgeVersion
-      then "gdb-7.3.20110726"
-      else "gdb-7.3.1";
+  basename =
+    if bleedingEdgeVersion
+    then "gdb-7.3.20110726"
+    else "gdb-7.3.1";
+
+  # Whether (cross-)building for GNU/Hurd.  This is an approximation since
+  # having `stdenv ? cross' doesn't tell us if we're building `hostDrv' and
+  # `buildDrv'.
+  isGNU =
+      stdenv.system == "i686-gnu"
+      || (stdenv ? cross && stdenv.cross.config == "i586-pc-gnu");
 in
 
+assert isGNU -> mig != null && hurd != null;
+
 stdenv.mkDerivation rec {
   name = basename + stdenv.lib.optionalString (target != null)
       ("-" + target.config);
@@ -34,9 +46,11 @@ stdenv.mkDerivation rec {
   # I think python is not a native input, but I leave it
   # here while I will not need it cross building
   buildNativeInputs = [ texinfo python ]
-  ++ stdenv.lib.optionals bleedingEdgeVersion [ flex bison ];
+    ++ stdenv.lib.optional isGNU mig
+    ++ stdenv.lib.optionals bleedingEdgeVersion [ flex bison ];
 
   buildInputs = [ ncurses readline gmp mpfr expat ]
+    ++ stdenv.lib.optional isGNU hurd
     ++ stdenv.lib.optional doCheck dejagnu;
 
   configureFlags = with stdenv.lib;
diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix
index 7d5f47dba39..ff4eec81d96 100644
--- a/pkgs/development/tools/misc/gengetopt/default.nix
+++ b/pkgs/development/tools/misc/gengetopt/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "gengetopt-2.22.4";
+  name = "gengetopt-2.22.5";
 
   src = fetchurl {
     url = "mirror://gnu/gengetopt/${name}.tar.gz";
-    sha256 = "08a4wmzvin8ljdgw2c0mcz654h4hpzam2p43hsf951c0xhj6ppsf";
+    sha256 = "0dr1xmlgk9q8za17wnpgghb5ifnbca5vb0w5bc6fpc2j0cjb6vrv";
   };
 
   doCheck = true;
diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index 93d3641de72..fef5a71201a 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libtool, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "global-6.0";
+  name = "global-6.1";
 
   src = fetchurl {
     url = "mirror://gnu/global/${name}.tar.gz";
-    sha256 = "1nwhlxd97grq8ynw7szv5lcxiqgqifiy1jqaa45664hd6bv1i5xx";
+    sha256 = "1q305isw1hy2zxcg10jk1g9rmpl8x2r3nkla52jdl4dbydsg6z39";
   };
 
   buildInputs = [ libtool ncurses ];
diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix
index 14848dc2352..403381af485 100644
--- a/pkgs/development/tools/misc/libtool/libtool2.nix
+++ b/pkgs/development/tools/misc/libtool/libtool2.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, m4, perl, lzma }:
 
 stdenv.mkDerivation (rec {
-  name = "libtool-2.4";
+  name = "libtool-2.4.2";
 
   src = fetchurl {
     url = "mirror://gnu/libtool/${name}.tar.gz";
-    sha256 = "0bpnvmqryzqpiz184phdg3z38a16ad7dd5bfbmn1jkm9cfmmgpqk";
+    sha256 = "0649qfpzkswgcj9vqkkr9rn4nlcx80faxpyqscy2k1x9c94f93dk";
   };
 
   buildNativeInputs = [ lzma m4 perl ];
diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index 628546e47a7..f679577a3f1 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "lsof-4.84";
+  name = "lsof-4.85";
 
   src = fetchurl {
-    url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.84.tar.bz2;
-    sha256 = "09f71lrwav31nay3c4nwyslm887psn95dw02jr8vlgs4kcnkm290";
+    url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.85.tar.bz2;
+    sha256 = "1hd1aihbzx2c2p4ps4zll6nldyf9l7js59hllnnmpi1r6pk5iaj9";
   };
 
   unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); ";
diff --git a/pkgs/development/tools/misc/patchelf/0.6.nix b/pkgs/development/tools/misc/patchelf/0.6.nix
index 5a2a7c1d716..857aa1cabcf 100644
--- a/pkgs/development/tools/misc/patchelf/0.6.nix
+++ b/pkgs/development/tools/misc/patchelf/0.6.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "patchelf-0.6pre29192";
+  name = "patchelf-0.6";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/1319933/download/2/${name}.tar.bz2";
-    sha256 = "1873d76994c112355f53d1ac6233ce334d0852ce67cae6b21f492b9b8e0b48b5";
+    url = "http://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
+    sha256 = "fc7e7fa95f282fc37a591a802629e0e1ed07bc2a8bf162228d9a69dd76127c01";
   };
 
   meta = {
diff --git a/pkgs/development/tools/ocaml/camlp5/5.15.nix b/pkgs/development/tools/ocaml/camlp5/5.15.nix
new file mode 100644
index 00000000000..7247041cb1d
--- /dev/null
+++ b/pkgs/development/tools/ocaml/camlp5/5.15.nix
@@ -0,0 +1,44 @@
+{stdenv, fetchurl, ocaml, transitional ? false}:
+
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+  pname = "camlp5";
+  version = "5.15";
+  webpage = http://pauillac.inria.fr/~ddr/camlp5/;
+  metafile = ./META;
+in
+
+stdenv.mkDerivation {
+
+  name = "${pname}${if transitional then "_transitional" else ""}-${version}";
+
+  src = fetchurl {
+    url = "${webpage}/distrib/src/${pname}-${version}.tgz";
+    sha256 = "1sx5wlfpydqskm97gp7887p3avbl3vanlmrwj35wx5mbzj6kn9nq";
+  };
+
+  buildInputs = [ ocaml ];
+
+  prefixKey = "-prefix ";
+
+  preConfigure = "configureFlagsArray=(" +  (if transitional then "--transitional" else "--strict") +
+                  " --libdir $out/lib/ocaml/${ocaml_version}/site-lib)";
+
+  buildFlags = "world.opt";
+
+  postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml_version}/site-lib/camlp5/META";
+
+  meta = {
+    description = "Preprocessor-pretty-printer for OCaml";
+    longDescription = ''
+      Camlp5 is a preprocessor and pretty-printer for OCaml programs.
+      It also provides parsing and printing tools.
+    '';
+    homepage = "${webpage}";
+    license = "BSD";
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.z77z
+    ];
+  };
+}
diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix
index 7247041cb1d..315bca38f36 100644
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -3,7 +3,7 @@
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
   pname = "camlp5";
-  version = "5.15";
+  version = "6.02.3";
   webpage = http://pauillac.inria.fr/~ddr/camlp5/;
   metafile = ./META;
 in
@@ -14,9 +14,16 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "${webpage}/distrib/src/${pname}-${version}.tgz";
-    sha256 = "1sx5wlfpydqskm97gp7887p3avbl3vanlmrwj35wx5mbzj6kn9nq";
+    sha256 = "1z9bwh267117br0vlhirv9yy2niqp2n25zfnl14wg6kgg9bqx7rj";
   };
 
+  patches = fetchurl {
+    url = "${webpage}/distrib/src/patch-${version}-1";
+    sha256 = "159qpvr07mnn72yqwx24c6mw7hs6bl77capsii7apg9dcxar8w7v";
+  };
+
+  patchFlags = "-p 0";
+
   buildInputs = [ ocaml ];
 
   prefixKey = "-prefix ";
diff --git a/pkgs/development/tools/parsing/bison/bison-2.4.nix b/pkgs/development/tools/parsing/bison/bison-2.4.nix
index 61ce9b895db..a79a5e96381 100644
--- a/pkgs/development/tools/parsing/bison/bison-2.4.nix
+++ b/pkgs/development/tools/parsing/bison/bison-2.4.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "019s3pdzggb71g7p7dgajhh53gh0h6nfl4yrzrs0jzsc37ph4lwk";
   };
 
-  buildInputs = [m4];
+  buildNativeInputs = [m4];
 
   doCheck = true;
 
diff --git a/pkgs/development/tools/parsing/flex/flex-2.5.35.nix b/pkgs/development/tools/parsing/flex/flex-2.5.35.nix
index c200e4e7d2f..66ece227c92 100644
--- a/pkgs/development/tools/parsing/flex/flex-2.5.35.nix
+++ b/pkgs/development/tools/parsing/flex/flex-2.5.35.nix
@@ -11,7 +11,14 @@ stdenv.mkDerivation {
     sha256 = "0ysff249mwhq0053bw3hxh58djc0gy7vjan2z1krrf9n5d5vvv0b";
   };
   buildInputs = [yacc];
-  propagatedBuildInputs = [m4];
+  propagatedBuildNativeInputs = [m4];
+
+  crossAttrs = {
+    preConfigure = ''
+      export ac_cv_func_malloc_0_nonnull=yes
+      export ac_cv_func_realloc_0_nonnull=yes
+    '';
+  };
 
   meta = {
     description = "A fast lexical analyser generator";
diff --git a/pkgs/development/tools/parsing/happy/1.18.8.nix b/pkgs/development/tools/parsing/happy/1.18.8.nix
new file mode 100644
index 00000000000..b1ba0b165dd
--- /dev/null
+++ b/pkgs/development/tools/parsing/happy/1.18.8.nix
@@ -0,0 +1,21 @@
+{ cabal, mtl, perl }:
+
+cabal.mkDerivation (self: {
+  pname = "happy";
+  version = "1.18.8";
+  sha256 = "1mqdawxszmdk71fbl8ljxz7jyhai00sflaw0gahp039n44mrspam";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ mtl ];
+  buildTools = [ perl ];
+  meta = {
+    homepage = "http://www.haskell.org/happy/";
+    description = "Happy is a parser generator for Haskell";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 909f0d39fbd..75776416cfc 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -1,19 +1,24 @@
-{ stdenv, fetchurl, openssl, python }:
+{ stdenv, fetchurl, openssl, python, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.5.4";
+  version = "0.6.5";
   name = "nodejs-${version}";
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "d32d3af4e3286b383640df857d76c2fcca1a2e2cb85abb484483a0a49d09ae71";
+    sha256 = "72364d240fb61e678897c099df6f2913857c5931aa9b1f44e73e432d4629ca2f";
   };
 
+  configureFlags = [
+    "--openssl-includes=${openssl}/include"
+    "--openssl-libpath=${openssl}/lib"
+  ];
+
   patchPhase = ''
     sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf}
   '';
 
-  buildInputs = [ python openssl ];
+  buildInputs = [ python openssl zlib];
 
   meta = with stdenv.lib; {
     description = "Event-driven I/O framework for the V8 JavaScript engine";
diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix
new file mode 100644
index 00000000000..aa7d2f1e914
--- /dev/null
+++ b/pkgs/games/alienarena/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig, libjpeg, libX11, libXxf86vm, curl, libogg
+, libvorbis, freetype, openal, mesa }:
+stdenv.mkDerivation rec {
+  name = "alienarena-7.52";
+  src = fetchurl {
+    url = "http://icculus.org/alienarena/Files/alienarena-7_52-linux20110929.tar.gz";
+    sha256 = "1s1l3apxsxnd8lyi568y38a1fcdr0gwmc3lkgq2nkc676k4gki3m";
+  };
+  buildInputs = [ pkgconfig libjpeg libX11 curl libogg libvorbis
+                  freetype openal mesa libXxf86vm ];
+  patchPhase = ''
+    substituteInPlace ./configure \
+      --replace libopenal.so.1 ${openal}/lib/libopenal.so.1
+  '';
+  meta = {
+    description = "A free, stand-alone first-person shooter computer game";
+    longDescription = ''
+      Do you like old school deathmatch with modern features? How
+      about rich, colorful, arcade-like atmospheres? How about retro
+      Sci-Fi? Then you're going to love what Alien Arena has in store
+      for you! This game combines some of the very best aspects of
+      such games as Quake III and Unreal Tournament and wraps them up
+      with a retro alien theme, while adding tons of original ideas to
+      make the game quite unique.
+    '';
+    homepage = http://red.planetarena.org;
+    # Engine is under GPLv2, everything else is under
+    license = [ "unfree-redistributable" ];
+    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index b08a70a3982..f12caaae53f 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.system == "i686-linux";
 
 stdenv.mkDerivation rec {
-  name = "dwarf-fortress-0.31.16";
+  name = "dwarf-fortress-0.31.25";
 
   src = fetchurl {
-    url = "http://www.bay12games.com/dwarves/df_31_16_linux.tar.bz2";
-    sha256 = "04pyxyigrrclbpxdx3wryisgy5xraz0s7rsxr2kp4i136479f2r4";
+    url = "http://www.bay12games.com/dwarves/df_31_25_linux.tar.bz2";
+    sha256 = "0d3klvf5n99j38pdhx9mak78px65aw47smck82jb92la97drmcg3";
   };
 
   phases = "unpackPhase patchPhase installPhase";
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 1308d93c672..2991f3de92e 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -6,11 +6,11 @@
 stdenv.mkDerivation rec {
 
   name = "spring-${version}";
-  version = "0.82.6.1";
+  version = "0.83.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/springrts/spring_${version}_src.tar.lzma";
-    sha256 = "1bi64jgc390sqc514scz80a0pdgc5n9kx45sppky2152y725900n";
+    url = "mirror://sourceforge/springrts/spring_83.0_src.tar.lzma";
+    sha256 = "073x1mlzil588r8xgzc323293xmi0xbw6w0k6psxl5cs0gqrvfqa";
   };
 
   buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL
@@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
 
   prePatch = ''
     substituteInPlace cont/base/make_gamedata_arch.sh --replace "#!/bin/sh" "#!${stdenv.shell}/bin/sh" \
-      --replace "which" "type -p"    
+      --replace "which" "type -p"
   '';
 
-  patches = [ ./gcc44.patch];
+  #patches = [ ./gcc44.patch];
 
   enableParallelBuilding = true;
 
@@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
     description = "A powerful real-time strategy(RTS) game engine";
     license = licenses.gpl2;
     maintainers = [ maintainers.phreedom ];
+    platforms = platforms.unix;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix
index 35b20fff98d..7824fbd9bdf 100644
--- a/pkgs/games/teeworlds/default.nix
+++ b/pkgs/games/teeworlds/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, python, alsaLib, libX11, mesa, SDL, lua5, zlib, bam }:
 
 stdenv.mkDerivation rec {
-  name = "teeworlds-0.6.0";
+  name = "teeworlds-0.6.1";
 
   src = fetchurl {
-    url = "http://www.teeworlds.com/files/${name}-src.tar.gz";
-    sha256 = "7540ecf10624b7e4e530c44402dc2d162ff40a3fe10bf30e0bb542d3d0a6a721";
+    url = "http://www.teeworlds.com/files/${name}-source.tar.gz";
+    sha256 = "025rcz59mdqksja4akn888c8avj9j28rk86vw7w1licdp67x8a33";
   };
 
   # Note: Teeworlds requires Python 2.x to compile.  Python 3.0 will
@@ -62,5 +62,7 @@ EOF
 
     homepage = http://teeworlds.com/;
     license = "BSD-style, see `license.txt'";
+    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+    platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix
index 0d655736467..7468ccdd2b8 100644
--- a/pkgs/games/warzone2100/default.nix
+++ b/pkgs/games/warzone2100/default.nix
@@ -3,11 +3,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "warzone2100";
-  version = "2.3.7";
+  version = "2.3.9";
   name = "${pname}-${version}";
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.gz";
-    sha256 = "157v3jqaj0l910y8bcr9zpl0inx8g2942nm8zdnnn16gklf9mb26";
+    sha256 = "1nvs4slnl75b64pf9gwcpbra56jzcbxyv83fis5pki69aavkp14y";
   };
   buildInputs = [ bison flex gettext pkgconfig SDL libpng libtheora openal
                   popt physfs mesa quesoglc zip unzip
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 000fa02b8ab..f9f1ddebc1d 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -3,20 +3,20 @@
 , fribidi, asciidoc }:
 
 stdenv.mkDerivation rec {
-  name = "wesnoth";
+  pname = "wesnoth";
   version = "1.8.6";
 
-  pname = "${name}-${version}";
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/sourceforge/${name}/${pname}.tar.bz2";
+    url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
     sha256 = "10c01ys846zsy831gprdy2nx3qlzv65s4jy99lw6misak3x07rjg";
   };
 
   buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost fribidi
                   automake autoconf freetype libpng pkgconfig lua dbus fontconfig libtool ];
 
-  # The preInstall sed substitution fix errors which I 
+  # The preInstall sed substitution fix errors which I
   # believe arise from autotools version mismatches.  Rather than
   # hunt for the correct automake and autoconf versions these changes
   # make the build work with the versions current in Nixpkgs.
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
 
   configurePhase = ''
     ./autogen.sh --prefix=$out --with-boost=${boost} \
-                 --with-preferences-dir=.${name} \
-                 --with-datadir-name=${name}
+                 --with-preferences-dir=.${pname} \
+                 --with-datadir-name=${pname}
   '';
 
   # Make the package build with the gcc currently available in Nixpkgs.
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
       reclaim the throne of Wesnoth, or take hand in any number of other
       adventures.
     '';
-    
+
     homepage = http://www.wesnoth.org/;
     license = licenses.gpl2;
     maintainers = [ maintainers.kkallio ];
diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix
new file mode 100644
index 00000000000..8ac05d9ef72
--- /dev/null
+++ b/pkgs/games/xonotic/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, unzip, SDL, libjpeg, zlib, libvorbis, curl }:
+stdenv.mkDerivation rec {
+  name = "xonotic-0.5.0";
+  src = fetchurl {
+    url = "http://dl.xonotic.org/${name}.zip";
+    sha256 = "03vkbddffnz6ws3gkwc3qvi6icfsyiqq0dqw2vw5hj2kidm25rsq";
+  };
+  # Commented out things needed to build cl-release because of errors.
+  #buildInputs = [ libX11 libXpm libXext xf86dgaproto libXxf86dga libXxf86vm mesa ];
+  buildInputs = [ unzip SDL libjpeg ];
+  sourceRoot = "Xonotic/source/darkplaces";
+  #patchPhase = ''
+  #  substituteInPlace glquake.h \
+  #    --replace 'typedef char GLchar;' '/*typedef char GLchar;*/'
+  #'';
+  NIX_LDFLAGS="
+    -rpath ${zlib}/lib
+    -rpath ${libvorbis}/lib
+    -rpath ${curl}/lib
+  ";
+  buildPhase = ''
+    DP_FS_BASEDIR="$out/share/xonotic"
+    #make DP_FS_BASEDIR=$DP_FS_BASEDIR cl-release
+    make DP_FS_BASEDIR=$DP_FS_BASEDIR sdl-release
+    make DP_FS_BASEDIR=$DP_FS_BASEDIR sv-release
+  '';
+  installPhase = ''
+    ensureDir "$out/bin"
+    cp darkplaces-dedicated "$out/bin/xonotic-dedicated"
+    cp darkplaces-sdl "$out/bin/xonotic-sdl"
+    cd ../..
+    ensureDir "$out/share/xonotic"
+    mv data "$out/share/xonotic"
+  '';
+  dontPatchELF = true;
+  meta = {
+    description = "A free fast-paced first-person shooter";
+    longDescription = ''
+      Xonotic is a free, fast-paced first-person shooter that works on
+      Windows, OS X and Linux. The project is geared towards providing
+      addictive arena shooter gameplay which is all spawned and driven
+      by the community itself. Xonotic is a direct successor of the
+      Nexuiz project with years of development between them, and it
+      aims to become the best possible open-source FPS of its kind.
+    '';
+    homepage = http://www.xonotic.org;
+    license = with stdenv.lib.licenses; gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix
index f39b46db621..fcaf4f5c9b5 100644
--- a/pkgs/lib/attrsets.nix
+++ b/pkgs/lib/attrsets.nix
@@ -273,6 +273,6 @@ rec {
   # override only the attributes that are already present in the old set
   # useful for deep-overriding
   overrideExisting = old: new:
-  old // listToAttrs (map (attr: nameValuePair attr (attrByPath [attr] (getAttr attr old) new)) (attrNames old));
+    old // listToAttrs (map (attr: nameValuePair attr (attrByPath [attr] (getAttr attr old) new)) (attrNames old));
 
 }
diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix
index 1d6b1ca58e2..edfa057be7b 100644
--- a/pkgs/lib/licenses.nix
+++ b/pkgs/lib/licenses.nix
@@ -82,6 +82,18 @@
     url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception;
   };
 
+  isc = {
+    shortName = "ISC";
+    fullName = "Internet Systems Consortium License";
+    url = http://www.opensource.org/licenses/ISC;
+  };
+
+  ipl10 = {
+    shortName = "IPL 1.0";
+    fullName = "IBM Public License Version 1.0";
+    url = http://www.ibm.com/developerworks/opensource/library/os-i18n2/os-ipl.html;
+  };
+
   ijg = {
     shortName = "IJG";
     fullName = "Independent JPEG Group License";
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index 4cf215ee3b8..d377dd2e1c5 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -15,6 +15,7 @@
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   ludo = "Ludovic Courtès <ludo@gnu.org>";
   marcweber = "Marc Weber <marco-oweber@gmx.de>";
+  mornfall = "Petr Ročkai <me@mornfall.net>";
   neznalek = "Vladimír Čunát <vcunat@gmail.com>";
   phreedom = "Evgeny Egorochkin <phreedom.stdin@gmail.com>";
   pierron = "Nicolas B. Pierron <nixos@nbp.name>";
@@ -27,7 +28,7 @@
   simons = "Peter Simons <simons@cryp.to>";
   thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
   urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
-  viric = "Lluís Batlle i Rossell <viriketo@gmail.com>";
+  viric = "Lluís Batlle i Rossell <viric@viric.name>";
   winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
   z77z = "Marco Maggesi <maggesi@math.unifi.it>";
 }
diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix
index 9a6bb4b24dd..c1d7240f693 100644
--- a/pkgs/lib/types.nix
+++ b/pkgs/lib/types.nix
@@ -148,7 +148,6 @@ rec {
       }
     ;
 
-
     uniq = elemType: mkOptionType {
       inherit (elemType) name check iter fold docPath hasOptions;
       merge = list:
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index 17755a17b7b..2a6409a8fdd 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -7,11 +7,11 @@ assert stdenv.isLinux;
 assert stdenv.gcc.gcc != null;
 
 stdenv.mkDerivation rec {
-  name = "wine-1.3.29";
+  name = "wine-1.3.32";
 
   src = fetchurl {
     url = "mirror://sourceforge/wine/${name}.tar.bz2";
-    sha256 = "1mi4xzbpqmian9q5bs6df8b1mfgnnd4mlh0kb2ynbpk7kmx0zyj1";
+    sha256 = "fe1691ef8e9c5c4afeb345ad0f0b364d055cfe67a7e64b0a4a44da4d85cfa8b6";
   };
 
   gecko = fetchurl {
diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix
index 65e748b68fc..458985c61f7 100644
--- a/pkgs/misc/sane-backends/default.nix
+++ b/pkgs/misc/sane-backends/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, hotplugSupport ? false, libusb ? null
+{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null
 , gt68xxFirmware ? null }:
 let
   firmware = gt68xxFirmware {inherit fetchurl;};
 in
-assert hotplugSupport -> stdenv.system == "i686-linux";
+assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux");
 
 stdenv.mkDerivation {
   name = "sane-backends-1.0.21";
@@ -20,6 +20,7 @@ stdenv.mkDerivation {
   postInstall = ''
     if test "$udevSupport" = "1"; then
       ensureDir $out/etc/udev/rules.d/
+      ./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \
       cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules
     fi
   '';
diff --git a/pkgs/misc/sane-backends/snapshot.nix b/pkgs/misc/sane-backends/snapshot.nix
new file mode 100644
index 00000000000..8725206ddce
--- /dev/null
+++ b/pkgs/misc/sane-backends/snapshot.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null
+, gt68xxFirmware ? null }:
+let
+  firmware = gt68xxFirmware {inherit fetchurl;};
+in
+assert hotplugSupport -> stdenv.system == "i686-linux";
+
+stdenv.mkDerivation {
+  name = "sane-backends-1.0.22.git201111204";
+  
+  src = fetchurl {
+    url = http://www.sane-project.org/snapshots/sane-backends-git20111204.tar.gz;
+    sha256 = "00b3fi8zjrq3in0wndz1xcz228mgfhwhh2knmyjsikr88hal0m47";
+  };
+  
+  udevSupport = hotplugSupport;
+
+  buildInputs = if libusb != null then [libusb] else [];
+
+  postInstall = ''
+    if test "$udevSupport" = "1"; then
+      ensureDir $out/etc/udev/rules.d/
+      ./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \
+      cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules
+    fi
+  '';
+
+  preInstall =
+    if gt68xxFirmware != null then 
+      "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw +
+      " \${out}/share/sane/gt68xx/" + firmware.name
+    else "";
+}
diff --git a/pkgs/misc/tex/dblatex/default.nix b/pkgs/misc/tex/dblatex/default.nix
index 911c461bfba..05f4bd7a9fa 100644
--- a/pkgs/misc/tex/dblatex/default.nix
+++ b/pkgs/misc/tex/dblatex/default.nix
@@ -1,20 +1,18 @@
-{stdenv, fetchurl, python, libxslt, tetex}:
+{ stdenv, fetchurl, python, libxslt, tetex }:
 
 stdenv.mkDerivation rec {
-  name = "dblatex-0.2.12";
+  name = "dblatex-0.3.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/dblatex/${name}.tar.bz2";
-    sha256 = "1wjghrlcn7hkr70nnyzzag1z57l5b1ck8i3r8zl7bw2rsrvqmyz2";
+    sha256 = "0jg2acv2lyrbw06l8rr0id75lj1pws7xbsmryq58r3n13xzb1p7b";
   };
 
   buildPhase = "true";
   
-  installPhase = "
-    python ./setup.py install --prefix=$out
-  ";
+  installPhase = "python ./setup.py install --prefix=$out";
 
-  buildInputs = [python libxslt tetex];
+  buildInputs = [ python libxslt tetex ];
 
   meta = {
     description = "A program to convert DocBook to DVI, PostScript or PDF via LaTeX or ConTeXt";
diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix
new file mode 100644
index 00000000000..3978979d702
--- /dev/null
+++ b/pkgs/os-specific/gnu/default.nix
@@ -0,0 +1,89 @@
+# Packages that make up the GNU/Hurd operating system (aka. GNU).
+
+args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool
+, texinfo, glibcCross, hurdPartedCross, libuuid
+, gccCrossStageStatic, gccCrossStageFinal
+, forceBuildDrv, callPackage, platform, config, crossSystem }:
+
+with args;
+
+rec {
+  hurdCross = forceBuildDrv(import ./hurd {
+    inherit fetchgit stdenv autoconf libtool texinfo machHeaders
+      mig glibcCross hurdPartedCross;
+    libuuid = libuuid.hostDrv;
+    automake = automake111x;
+    headersOnly = false;
+    cross = assert crossSystem != null; crossSystem;
+    gccCross = gccCrossStageFinal;
+  });
+
+  hurdCrossIntermediate = forceBuildDrv(import ./hurd {
+    inherit fetchgit stdenv autoconf libtool texinfo machHeaders
+      mig glibcCross;
+    automake = automake111x;
+    headersOnly = false;
+    cross = assert crossSystem != null; crossSystem;
+
+    # The "final" GCC needs glibc and the Hurd libraries (libpthread in
+    # particular) so we first need an intermediate Hurd built with the
+    # intermediate GCC.
+    gccCross = gccCrossStageStatic;
+
+    # This intermediate Hurd is only needed to build libpthread, which needs
+    # libihash, and to build Parted, which needs libstore and
+    # libshouldbeinlibc.
+    buildTarget = "libihash libstore libshouldbeinlibc";
+    installTarget = "libihash-install libstore-install libshouldbeinlibc-install";
+  });
+
+  hurdHeaders = callPackage ./hurd {
+    automake = automake111x;
+    headersOnly = true;
+    gccCross = null;
+    glibcCross = null;
+    libuuid = null;
+    hurdPartedCross = null;
+  };
+
+  libpthreadHeaders = callPackage ./libpthread {
+    headersOnly = true;
+    hurd = null;
+  };
+
+  libpthreadCross = forceBuildDrv(import ./libpthread {
+    inherit fetchgit stdenv autoconf automake libtool
+      machHeaders hurdHeaders glibcCross;
+    hurd = hurdCrossIntermediate;
+    gccCross = gccCrossStageStatic;
+    cross = assert crossSystem != null; crossSystem;
+  });
+
+  # In theory GNU Mach doesn't have to be cross-compiled.  However, since it
+  # has to be built for i586 (it doesn't work on x86_64), one needs a cross
+  # compiler for that host.
+  mach = callPackage ./mach {
+    automake = automake111x;
+  };
+
+  machHeaders = callPackage ./mach {
+    automake = automake111x;
+    headersOnly = true;
+    mig = null;
+  };
+
+  mig = callPackage ./mig
+    (if stdenv.isLinux
+     then {
+       # Build natively, but force use of a 32-bit environment because we're
+       # targeting `i586-pc-gnu'.
+       stdenv = (import ../../stdenv {
+         system = "i686-linux";
+         stdenvType = "i686-linux";
+         allPackages = args:
+           import ../../top-level/all-packages.nix ({ inherit config; } // args);
+         inherit platform;
+       }).stdenv;
+     }
+     else { });
+}
diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix
index bc5e79e8ef3..ca1c71053e5 100644
--- a/pkgs/os-specific/gnu/hurd/default.nix
+++ b/pkgs/os-specific/gnu/hurd/default.nix
@@ -10,8 +10,8 @@ assert (hurdPartedCross != null) -> (libuuid != null);
 let
   # Unfortunately we can't use `master@{DATE}', see
   # <http://www.bramschoenmakers.nl/en/node/645>.
-  date   = "20110516";
-  rev    = "ffd73488f9eecdb9da40e15f5fdcebf392cb88f8";
+  date   = "20111115";
+  rev    = "969fbb646ffd89a482302e303eaded79781c3331";
   suffix = if headersOnly
            then "-headers"
            else (if buildTarget != "all"
@@ -23,7 +23,7 @@ stdenv.mkDerivation ({
 
   src = fetchgit {
     url = "git://git.sv.gnu.org/hurd/hurd.git";
-    sha256 = "6527e85347fe387bd3119fbf2ea07590a35ecad9eec14bb00cd6a443507111a9";
+    sha256 = "b7f57ec2c6dcaf35ec03fb7979eb5506180ce4c6e2edf60a587f12ac5b11f004";
     inherit rev;
   };
 
diff --git a/pkgs/os-specific/gnu/libpthread/default.nix b/pkgs/os-specific/gnu/libpthread/default.nix
index 6f978b0c76d..08838f17aff 100644
--- a/pkgs/os-specific/gnu/libpthread/default.nix
+++ b/pkgs/os-specific/gnu/libpthread/default.nix
@@ -1,27 +1,29 @@
 { fetchgit, stdenv, autoconf, automake, libtool
-, machHeaders, hurdHeaders, hurd
+, machHeaders, hurdHeaders, hurd, headersOnly ? false
 , cross ? null, gccCross ? null, glibcCross ? null }:
 
 assert (cross != null) -> (gccCross != null) && (glibcCross != null);
+assert (!headersOnly) -> (hurd != null);
 
 let
-  date = "20100512";
+  date = "20111020";
 
   # Use the `tschwinge/Peter_Herbolzheimer' branch as prescribed in
   # <http://www.gnu.org/software/hurd/hurd/building/cross-compiling.html>.
-  rev = "c4bb52770f0b6703bef76c5abdd08663b46b4dc9";
+  rev = "a7b82c3302bf9c47176648eb802a61ae2d9a16f5";
 in
 stdenv.mkDerivation ({
-  name = "libpthread-hurd-${date}";
+  name = "libpthread-hurd-${if headersOnly then "headers-" else ""}${date}";
 
   src = fetchgit {
     url = "git://git.sv.gnu.org/hurd/libpthread.git";
-    sha256 = "1wya9kfmqgn04l995a25p4hxfwddjahfmhdzljb4cribw0bqdizg";
+    sha256 = "e8300762914d927c0da4168341a5982a1057613e1af363ee68942087b2570b3d";
     inherit rev;
   };
 
   buildNativeInputs = [ autoconf automake libtool ];
-  buildInputs = [ machHeaders hurdHeaders hurd ]
+  buildInputs = [ machHeaders hurdHeaders ]
+   ++ stdenv.lib.optional (!headersOnly) hurd
    ++ stdenv.lib.optional (gccCross != null) gccCross;
 
   preConfigure = "autoreconf -vfi";
@@ -37,6 +39,20 @@ stdenv.mkDerivation ({
 
 //
 
+(if headersOnly
+ then {
+   configureFlags =
+     [ "--build=i586-pc-gnu"
+       "ac_cv_lib_ihash_hurd_ihash_create=yes"
+     ];
+
+   buildPhase = ":";
+   installPhase = "make install-data-local-headers";
+ }
+ else { })
+
+//
+
 (if cross != null
  then {
    crossConfig = cross.config;
diff --git a/pkgs/os-specific/linux/aufs2.1-util/default.nix b/pkgs/os-specific/linux/aufs-util/2.1.nix
similarity index 79%
rename from pkgs/os-specific/linux/aufs2.1-util/default.nix
rename to pkgs/os-specific/linux/aufs-util/2.1.nix
index a12a0900ca4..87541def9ad 100644
--- a/pkgs/os-specific/linux/aufs2.1-util/default.nix
+++ b/pkgs/os-specific/linux/aufs-util/2.1.nix
@@ -1,9 +1,11 @@
-{ stdenv, fetchgit, kernel, aufs2_1 }:
+{ stdenv, fetchgit, kernel, aufs }:
+
+assert aufs != null;
 
 let version = "20110217"; in
 
 stdenv.mkDerivation {
-  name = "aufs2.1-util-${version}";
+  name = "aufs2.1-util-${version}-${kernel.version}";
 
   src = fetchgit {
     url = "git://git.c3sl.ufpr.br/aufs/aufs2-util.git";
@@ -11,7 +13,7 @@ stdenv.mkDerivation {
     sha256 = "0fce5601b67efe8b5652a813ae612348bf4503aa71056cd31a5ed0406632e364";
   };
 
-  buildInputs = [ aufs2_1 ];
+  buildInputs = [ aufs ];
 
   makeFlags =
     [ "KDIR=${kernel}/lib/modules/${kernel.version}/build"
@@ -34,8 +36,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Utilities for AUFS2.1";
     homepage = http://aufs.sourceforge.net/;
-    maintainers = [ stdenv.lib.maintainers.eelco 
-                    stdenv.lib.maintainers.shlevy ];
+    maintainers = [ stdenv.lib.maintainers.eelco  ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/aufs2-util/default.nix b/pkgs/os-specific/linux/aufs-util/2.nix
similarity index 85%
rename from pkgs/os-specific/linux/aufs2-util/default.nix
rename to pkgs/os-specific/linux/aufs-util/2.nix
index 50031b7351c..501dcbf4b94 100644
--- a/pkgs/os-specific/linux/aufs2-util/default.nix
+++ b/pkgs/os-specific/linux/aufs-util/2.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl, kernel, aufs2 }:
+{ stdenv, fetchurl, kernel, aufs }:
+
+assert aufs != null;
 
 let version = "20100506"; in
 
 stdenv.mkDerivation {
-  name = "aufs2-util-${version}";
+  name = "aufs2-util-${version}-${kernel.version}";
 
   src = fetchurl {
     url = "http://nixos.org/tarballs/aufs2-util-git-${version}.tar.bz2";
     sha256 = "0ly0c3p8fjxqbk8k5rmm1a91wg8wcrvhi1lv4aawalkkk8rqbnwk";
   };
 
-  buildInputs = [ aufs2 ];
+  buildInputs = [ aufs ];
 
   makeFlags =
     [ "KDIR=${kernel}/lib/modules/${kernel.version}/build"
diff --git a/pkgs/os-specific/linux/aufs3-util/default.nix b/pkgs/os-specific/linux/aufs-util/3.nix
similarity index 78%
rename from pkgs/os-specific/linux/aufs3-util/default.nix
rename to pkgs/os-specific/linux/aufs-util/3.nix
index 00c3e99c457..8eefc1b0f4a 100644
--- a/pkgs/os-specific/linux/aufs3-util/default.nix
+++ b/pkgs/os-specific/linux/aufs-util/3.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchgit, kernel, aufs3 }:
+{ stdenv, fetchgit, kernel, aufs }:
+
+assert aufs != null;
 
 stdenv.mkDerivation {
-  name = "aufs3-util-${aufs3.patch.version}";
+  name = "aufs3-util-${aufs.patch.version}-${kernel.version}";
 
   src = fetchgit {
     url = git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git;
-    rev = aufs3.patch.utilRev;
-    sha256 = aufs3.patch.utilHash;
+    rev = aufs.patch.utilRev;
+    sha256 = aufs.patch.utilHash;
   };
 
-  buildInputs = [ aufs3 ];
+  buildInputs = [ aufs ];
 
   makeFlags =
     [ "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/build"
diff --git a/pkgs/os-specific/linux/aufs2.1/default.nix b/pkgs/os-specific/linux/aufs/2.1.nix
similarity index 91%
rename from pkgs/os-specific/linux/aufs2.1/default.nix
rename to pkgs/os-specific/linux/aufs/2.1.nix
index d118f1f7487..f6a3a6dffc2 100644
--- a/pkgs/os-specific/linux/aufs2.1/default.nix
+++ b/pkgs/os-specific/linux/aufs/2.1.nix
@@ -8,7 +8,7 @@ let version =
   else "20110408"; in
 
 stdenv.mkDerivation {
-  name = "aufs2.1-${version}";
+  name = "aufs2.1-${version}-${kernel.version}";
 
   src =
   if (builtins.lessThan (builtins.compareVersions kernel.version "2.6.38") 0) 
@@ -42,8 +42,7 @@ stdenv.mkDerivation {
     description = "Another Unionfs implementation for Linux (second generation)";
     homepage = http://aufs.sourceforge.net/;
     maintainers = [ stdenv.lib.maintainers.eelco
-                    stdenv.lib.maintainers.raskin
-                    stdenv.lib.maintainers.shlevy ];
+                    stdenv.lib.maintainers.raskin ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/aufs2/default.nix b/pkgs/os-specific/linux/aufs/2.nix
similarity index 96%
rename from pkgs/os-specific/linux/aufs2/default.nix
rename to pkgs/os-specific/linux/aufs/2.nix
index c755b993ec8..696ed57b860 100644
--- a/pkgs/os-specific/linux/aufs2/default.nix
+++ b/pkgs/os-specific/linux/aufs/2.nix
@@ -5,7 +5,7 @@ assert kernel.features ? aufsBase;
 let version = "20100522"; in
 
 stdenv.mkDerivation {
-  name = "aufs2-${version}";
+  name = "aufs2-${version}-${kernel.version}";
 
   src = 
   if (builtins.lessThan (builtins.compareVersions kernel.version "2.6.35") 0) then
diff --git a/pkgs/os-specific/linux/aufs3/default.nix b/pkgs/os-specific/linux/aufs/3.nix
similarity index 95%
rename from pkgs/os-specific/linux/aufs3/default.nix
rename to pkgs/os-specific/linux/aufs/3.nix
index bf73e6510f7..ec3c5aec85b 100644
--- a/pkgs/os-specific/linux/aufs3/default.nix
+++ b/pkgs/os-specific/linux/aufs/3.nix
@@ -12,7 +12,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "aufs3-${patch.version}";
+  name = "aufs3-${patch.version}-${kernel.version}";
 
   src = patch.patch.src;
 
diff --git a/pkgs/os-specific/linux/aufs/debian-2.6.29.diff b/pkgs/os-specific/linux/aufs/debian-2.6.29.diff
deleted file mode 100644
index 88660bc4011..00000000000
--- a/pkgs/os-specific/linux/aufs/debian-2.6.29.diff
+++ /dev/null
@@ -1,133 +0,0 @@
-Debian patch for aufs on 2.6.29
-
----
-
-Add support for Kernel 2.6.29.
-
-Changes we are affected by:
- 1. dentry_open() receives a new argument for passing the cred
- 2. current->fsuid is now current_fsuid()
- 3. disable security_inode_* calls, as they are not exported normally. Enable
-    them only if CONFIG_AUFS_SEC_PERM_PATCH is defined
---- a/fs/aufs25/export.c
-+++ b/fs/aufs25/export.c
-@@ -384,7 +384,11 @@ static struct dentry *au_lkup_by_ino(str
- 	if (nsi_lock)
- 		si_read_unlock(parent->d_sb);
- 	path_get(path);
-+	#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
- 	file = dentry_open(parent, path->mnt, au_dir_roflags);
-+	#else
-+	file = dentry_open(parent, path->mnt, au_dir_roflags, current_cred());
-+	#endif
- 	dentry = (void *)file;
- 	if (IS_ERR(file))
- 		goto out;
---- a/fs/aufs25/file.c
-+++ b/fs/aufs25/file.c
-@@ -98,8 +98,13 @@ struct file *au_h_open(struct dentry *de
- 	h_file = NULL;
- 	if (file && au_test_nfs(h_dentry->d_sb))
- 		h_file = au_h_intent(dentry, bindex, file);
--	if (!h_file)
-+	if (!h_file) {
-+		#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
- 		h_file = dentry_open(dget(h_dentry), mntget(br->br_mnt), flags);
-+		#else
-+		h_file = dentry_open(dget(h_dentry), mntget(br->br_mnt), flags, current_cred());
-+		#endif
-+	}
-
- 	/*
- 	 * a dirty trick for handling FMODE_EXEC and deny_write_access().
---- a/fs/aufs25/inode.c
-+++ b/fs/aufs25/inode.c
-@@ -405,7 +405,11 @@ int au_test_ro(struct super_block *sb, a
-
- int au_test_h_perm(struct inode *h_inode, int mask, int dlgt)
- {
-+	#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
- 	if (!current->fsuid)
-+	#else
-+	if (!current_fsuid())
-+	#endif
- 		return 0;
- 	/* todo: fake nameidata? */
- 	return vfsub_permission(h_inode, mask, NULL, dlgt);
---- a/fs/aufs25/whout.c
-+++ b/fs/aufs25/whout.c
-@@ -274,9 +274,15 @@ static int do_unlink_wh(struct au_hinode
- 	 * forces superio when the dir has a sticky bit.
- 	 * this may be a violation of unix fs semantics.
- 	 */
-+	#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
- 	vfsub_args_init(&vargs, &ign, dlgt,
- 			(h_dir->i_mode & S_ISVTX)
- 			&& wh_dentry->d_inode->i_uid != current->fsuid);
-+	#else
-+	vfsub_args_init(&vargs, &ign, dlgt,
-+			(h_dir->i_mode & S_ISVTX)
-+			&& wh_dentry->d_inode->i_uid != current_fsuid());
-+	#endif
- 	vfsub_ign_hinode(&vargs, IN_DELETE, hdir);
- 	err = vfsub_unlink(h_dir, wh_dentry, &vargs);
- 	AuTraceErr(err);
-@@ -625,7 +631,11 @@ static void reinit_br_wh(void *arg)
- 	struct vfsub_args vargs;
-
- 	AuTraceEnter();
-+	#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
- 	AuDebugOn(current->fsuid);
-+	#else
-+	AuDebugOn(current_fsuid());
-+	#endif
-
- 	err = 0;
- 	wbr = a->br->br_wbr;
---- a/fs/aufs25/xino.c
-+++ b/fs/aufs25/xino.c
-@@ -620,8 +620,13 @@ struct file *au_xino_create2(struct supe
- 		AuErr("%.*s create err %d\n", AuLNPair(name), err);
- 		goto out_dput;
- 	}
-+	#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
- 	file = dentry_open(dget(dentry), mntget(base_file->f_vfsmnt),
- 			   O_RDWR | O_CREAT | O_EXCL | O_LARGEFILE);
-+	#else
-+	file = dentry_open(dget(dentry), mntget(base_file->f_vfsmnt),
-+			   O_RDWR | O_CREAT | O_EXCL | O_LARGEFILE, current_cred());
-+	#endif
- 	if (IS_ERR(file)) {
- 		AuErr("%.*s open err %ld\n", AuLNPair(name), PTR_ERR(file));
- 		goto out_dput;
---- a/fs/aufs25/i_op.c
-+++ b/fs/aufs25/i_op.c
-@@ -61,7 +61,7 @@ static int h_permission(struct inode *h_
- 		AuTraceErr(err);
- 	}
- 
--#if 1 /* todo: export? */
-+#ifdef CONFIG_AUFS_SEC_PERM_PATCH
- 	if (!err)
- 		err = au_security_inode_permission(h_inode, mask, NULL,
- 						   dlgt);
-@@ -221,7 +221,7 @@ static int h_permission(struct inode *h_
- 		AuTraceErr(err);
- 	}
- 
--#if 1 /* todo: export? */
-+#ifdef CONFIG_AUFS_SEC_PERM_PATCH
- 	if (!err)
- 		err = au_security_inode_permission(h_inode, mask, fake_nd,
- 						   dlgt);
---- a/fs/aufs25/inode.h
-+++ b/fs/aufs25/inode.h
-@@ -148,7 +148,7 @@ int aufs_rename(struct inode *src_dir, s
- /* dlgt.c */
- int au_security_inode_permission(struct inode *h_inode, int mask,
- 				 struct nameidata *fake_nd, int dlgt);
--#else
-+#elif defined(CONFIG_AUFS_SEC_PERM_PATCH)
- static inline
- int au_security_inode_permission(struct inode *h_inode, int mask,
- 				 struct nameidata *fake_nd, int dlgt)
diff --git a/pkgs/os-specific/linux/aufs/default.nix b/pkgs/os-specific/linux/aufs/default.nix
deleted file mode 100644
index 5321bfa3d6b..00000000000
--- a/pkgs/os-specific/linux/aufs/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, fetchurl, kernel }:
-
-stdenv.mkDerivation {
-  name = "aufs-20090414-${kernel.version}";
-
-  src = fetchurl {
-    url = http://nixos.org/tarballs/aufs-20090414.tar.bz2;
-    sha256 = "1jhf3kccx0m84frlgx2d0ysn1c4272dgci59dsk7vsfrf7yik526";
-  };
-
-  buildPhase = ''
-    kernelVersion=$(cd ${kernel}/lib/modules && ls)
-    kernelBuild=$(echo ${kernel}/lib/modules/$kernelVersion/source)
-    tar xvfj ${kernel.src}
-    kernelSource=$(echo $(pwd)/linux-*)
-    cp -prd $kernelBuild/* $kernelSource
-
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$PWD/include"
-  
-    make KDIR=$kernelSource -f local.mk
-  '';
-
-  installPhase = ''
-    ensureDir $out/bin
-    cp util/aulchown $out/bin
-
-    ensureDir $out/share/man/man5
-    cp util/aufs.5 $out/share/man/man5
-
-    ensureDir $out/lib/modules/$kernelVersion/misc
-    cp aufs.ko $out/lib/modules/$kernelVersion/misc
-  '';
-
-  patches = [
-    # Debian patch to build AUFS on 2.6.29+
-    ./debian-2.6.29.diff
-  ];
-
-  meta = {
-    description = "Another Unionfs implementation for Linux";
-    homepage = http://aufs.sourceforge.net/;
-  };
-}
diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix
index afe627f7886..cc7f3934734 100644
--- a/pkgs/os-specific/linux/blcr/default.nix
+++ b/pkgs/os-specific/linux/blcr/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation {
-  name = "blcr-0.8.3-${kernel.version}";
+  name = "blcr-0.8.4-${kernel.version}";
 
   src = fetchurl {
-    url = https://ftg.lbl.gov/assets/projects/CheckpointRestart/downloads/blcr-0.8.3.tar.gz;
-    sha256 = "c8243c9a7a215d4fc4e8f2199045711cf711a6f2e0b39a94413478ffae110eac";
+    url = https://ftg.lbl.gov/assets/projects/CheckpointRestart/downloads/blcr-0.8.4.tar.gz;
+    sha256 = "d851da66627d9212ac37bc9ea2aba40008ff2dc51d45dbd395ca2e403c3d78cf";
   };
 
   buildInputs = [ perl makeWrapper ];
@@ -31,5 +31,9 @@ stdenv.mkDerivation {
     description = "Berkeley Lab Checkpoint/Restart for Linux (BLCR)";
     homepage = https://ftg.lbl.gov/projects/CheckpointRestart/;
     license = "GPL2";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [
+      z77z
+    ];
   };
 }
diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix
index 598ee26124f..81d15a0aa0c 100644
--- a/pkgs/os-specific/linux/bluez/default.nix
+++ b/pkgs/os-specific/linux/bluez/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     depending on Python etc. */
   postInstall = ''
     pushd test
-    for a in simple-agent test-adapter test-device; do
+    for a in simple-agent test-adapter test-device test-input; do
       cp $a $out/bin/bluez-$a
       wrapProgram $out/bin/bluez-$a --prefix PYTHONPATH : ${pythonpath}
     done
diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix
index cadc49195e3..029f7ed6e29 100644
--- a/pkgs/os-specific/linux/bridge-utils/default.nix
+++ b/pkgs/os-specific/linux/bridge-utils/default.nix
@@ -1,18 +1,21 @@
 { stdenv, fetchurl, autoconf, automake }:
 
-stdenv.mkDerivation rec {
-  name = "bridge-utils-1.4";
+let
+  name = "bridge-utils-1.5";
+in
+stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
     url = "mirror://sourceforge/bridge/${name}.tar.gz";
-    sha256 = "0csrvpjx1n5fzscdrc0xky3rnaxi90rylqciha5sl0n3pklpasc7";
+    sha256 = "42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688";
   };
 
   buildInputs = [ autoconf automake ];
 
   preConfigure = "autoreconf";
 
-  meta = { 
+  meta = {
     description = "http://sourceforge.net/projects/bridge/";
     homepage = [ "http://www.linux-foundation.org/en/Net:Bridge/" "http://sourceforge.net/projects/bridge/" ];
     license = "GPL";
diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix
new file mode 100644
index 00000000000..7129b685eb9
--- /dev/null
+++ b/pkgs/os-specific/linux/drbd/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, flex, udev, perl }:
+
+assert stdenv.isLinux;
+
+stdenv.mkDerivation rec {
+  name = "drbd-8.4.0";
+
+  src = fetchurl {
+    url = "http://oss.linbit.com/drbd/8.4/${name}.tar.gz";
+    sha256 = "096njwxjpwvnl259gxq6cr6n0r6ba0h5aryvgk05hqi95jx927vg";
+  };
+
+  patches = [ ./pass-force.patch ];
+
+  buildInputs = [ flex perl ];
+
+  configureFlags = "--without-distro --without-pacemaker --localstatedir=/var --sysconfdir=/etc";
+
+  preConfigure =
+    ''
+      export PATH=${udev}/sbin:$PATH
+      substituteInPlace user/Makefile.in --replace /sbin/ $out/sbin/
+      substituteInPlace user/legacy/Makefile.in \
+        --replace /sbin/ $out/sbin/ \
+        --replace '$(DESTDIR)/lib/drbd' $out/lib/drbd
+      substituteInPlace user/drbdadm_usage_cnt.c --replace /lib/drbd $out/lib/drbd
+      substituteInPlace scripts/drbd.rules --replace /sbin/drbdadm $out/sbin/drbdadm
+    '';
+
+  makeFlags = "SHELL=${stdenv.shell}";
+
+  installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc INITDIR=$(out)/etc/init.d";
+
+  meta = {
+    homepage = http://www.drbd.org/;
+    description = "Distributed Replicated Block Device, a distributed storage system for Linux";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/drbd/pass-force.patch b/pkgs/os-specific/linux/drbd/pass-force.patch
new file mode 100644
index 00000000000..8f0201100f7
--- /dev/null
+++ b/pkgs/os-specific/linux/drbd/pass-force.patch
@@ -0,0 +1,15 @@
+Propagate the --force flag in the legacy drbdadm to drbdsetup.
+Otherwise "drbdadm primary --force" won't work as expected (the kernel
+will say "State change failed: Need access to UpToDate data").
+
+diff -ru -x '*~' drbd-8.4.0-orig/user/legacy/drbdadm_main.c drbd-8.4.0/user/legacy/drbdadm_main.c
+--- drbd-8.4.0-orig/user/legacy/drbdadm_main.c	2011-07-07 06:55:39.000000000 -0400
++++ drbd-8.4.0/user/legacy/drbdadm_main.c	2011-11-02 14:51:04.000000000 -0400
+@@ -1547,6 +1547,7 @@
+ 	for (i = 0; i < soi; i++) {
+ 		argv[NA(argc)] = setup_opts[i];
+ 	}
++	if (force) argv[NA(argc)] = "--force";
+ 	argv[NA(argc)] = 0;
+ 
+ 	setenv("DRBD_RESOURCE", res->name, 1);
diff --git a/pkgs/os-specific/linux/firmware/bcm43xx/default.nix b/pkgs/os-specific/linux/firmware/bcm43xx/default.nix
new file mode 100644
index 00000000000..edc15a360ff
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/bcm43xx/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl }:
+
+let
+  src1 = fetchurl {
+    url = "https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=blob_plain;f=brcm/bcm43xx_hdr-0.fw;hb=15888a2eab052ac3d3f49334e4f6f05f347a516e";
+    sha256 = "d02549964d21dd90fc35806483b9fc871d93d7d38ae1a70a9ce006103c2a3de3";
+    name = "bcm43xx_hdr-0.fw";
+  };
+
+  src2 = fetchurl {
+    url = "https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=blob_plain;f=brcm/bcm43xx-0.fw;hb=15888a2eab052ac3d3f49334e4f6f05f347a516e";
+    sha256 = "f90f685903127e4db431fe1efccefebf77272712bd4bfe46d1d1d5825ee52797";
+    name = "bcm43xx-0.fw";
+  };
+in
+stdenv.mkDerivation {
+  name = "bcm43xx-firmware-610.811";
+
+  unpackPhase = "true";
+
+  buildPhase = "true";
+
+  installPhase = ''
+    mkdir -p $out/brcm
+    cp ${src1} $out/brcm/${src1.name}
+    cp ${src2} $out/brcm/${src2.name}
+  '';
+
+  meta = {
+    description = "Firmware for the Broadcom 43xx 802.11 wireless cards";
+    homepage = http://linuxwireless.org/;
+  };
+}
diff --git a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix b/pkgs/os-specific/linux/firmware/rtl8192c/default.nix
index 0ab7436ebff..877784d4b58 100644
--- a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix
+++ b/pkgs/os-specific/linux/firmware/rtl8192c/default.nix
@@ -3,8 +3,8 @@
 stdenv.mkDerivation rec {
   name = "rtl8192c-fw";
   src = fetchurl {
-    url = "ftp://WebUser:n8W9ErCy@208.70.202.219/cn/wlan/92ce_se_de_linux_mac80211_0003.0401.2011.tar.gz";
-    sha256 = "002kj6f1xaali2iwrxvirqq0hbiyb2cpf93y2xycp3qd69cp8lik";
+    url = "ftp://WebUser:AxPL9s3k@202.134.71.21/cn/wlan/92ce_se_de_linux_mac80211_0004.0816.2011.tar.gz";
+    sha256 = "1kg63h5rj4kja2csmqsrxjipb1wpznfbrvn9cla9d9byksy5fn64";
   };
 
   phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 806efdcba6d..cc5339ba900 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "iproute2-2.6.35";
 
   src = fetchurl {
-    url = "http://devresources.linux-foundation.org/dev/iproute2/download/${name}.tar.bz2";
+    url = "http://pkgs.fedoraproject.org/repo/pkgs/iproute/iproute2-2.6.35.tar.bz2/b0f281b3124bf04669e18f5fe16d4934/iproute2-2.6.35.tar.bz2";
     sha256 = "18why1wy0v859axgrlfxn80zmskss0410hh9rf5gn9cr29zg9cla";
   };
 
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
    + " CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc/${name}"
   + " MANDIR=$(out)/share/man";
 
-  buildInputs = [bison flex db4 iptables];
+  buildInputs = [db4 iptables];
+  buildNativeInputs = [bison flex db4];
 
   meta = {
     homepage =
diff --git a/pkgs/os-specific/linux/kernel/efi-stub.patch b/pkgs/os-specific/linux/kernel/efi-stub.patch
deleted file mode 100644
index 581a9fff27f..00000000000
--- a/pkgs/os-specific/linux/kernel/efi-stub.patch
+++ /dev/null
@@ -1,1778 +0,0 @@
-diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 6a47bb2..d40c876 100644
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -1466,6 +1466,13 @@ config EFI
- 	  resultant kernel should continue to boot on existing non-EFI
- 	  platforms.
- 
-+config EFI_STUB
-+       bool "EFI stub support"
-+       depends on EFI
-+       ---help---
-+          This kernel feature allows a bzImage to be loaded directly
-+	  by EFI firmware without the use of a bootloader.
-+
- config SECCOMP
- 	def_bool y
- 	prompt "Enable seccomp to safely compute untrusted bytecode"
-diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
-index 09664ef..b123b9a 100644
---- a/arch/x86/boot/compressed/Makefile
-+++ b/arch/x86/boot/compressed/Makefile
-@@ -23,7 +23,15 @@ LDFLAGS_vmlinux := -T
- 
- hostprogs-y	:= mkpiggy
- 
--$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o $(obj)/string.o $(obj)/cmdline.o $(obj)/early_serial_console.o $(obj)/piggy.o FORCE
-+VMLINUX_OBJS = $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \
-+	$(obj)/string.o $(obj)/cmdline.o $(obj)/early_serial_console.o \
-+	$(obj)/piggy.o
-+
-+ifeq ($(CONFIG_EFI_STUB), y)
-+	VMLINUX_OBJS += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o
-+endif
-+
-+$(obj)/vmlinux: $(VMLINUX_OBJS) FORCE
- 	$(call if_changed,ld)
- 	@:
- 
-diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
-new file mode 100644
-index 0000000..c1b494d
---- /dev/null
-+++ b/arch/x86/boot/compressed/eboot.c
-@@ -0,0 +1,975 @@
-+/* -----------------------------------------------------------------------
-+ *
-+ *   Copyright 2011 Intel Corporation; author Matt Fleming
-+ *
-+ *   This file is part of the Linux kernel, and is made available under
-+ *   the terms of the GNU General Public License version 2.
-+ *
-+ * ----------------------------------------------------------------------- */
-+
-+#include <linux/efi.h>
-+#include <asm/efi.h>
-+#include <asm/setup.h>
-+#include <asm/desc.h>
-+
-+#define SEG_TYPE_DATA		(0 << 3)
-+#define SEG_TYPE_READ_WRITE	(1 << 1)
-+#define SEG_TYPE_CODE		(1 << 3)
-+#define SEG_TYPE_EXEC_READ	(1 << 1)
-+#define SEG_TYPE_TSS		((1 << 3) | (1 << 0))
-+#define SEG_OP_SIZE_32BIT	(1 << 0)
-+#define SEG_GRANULARITY_4KB	(1 << 0)
-+
-+#define DESC_TYPE_CODE_DATA	(1 << 0)
-+
-+#define EFI_PAGE_SIZE		(1UL << EFI_PAGE_SHIFT)
-+
-+#define PIXEL_RGB_RESERVED_8BIT_PER_COLOR		0
-+#define PIXEL_BGR_RESERVED_8BIT_PER_COLOR		1
-+#define PIXEL_BIT_MASK					2
-+#define PIXEL_BLT_ONLY					3
-+#define PIXEL_FORMAT_MAX				4
-+
-+typedef struct {
-+	u32 red_mask;
-+	u32 green_mask;
-+	u32 blue_mask;
-+	u32 reserved_mask;
-+} efi_pixel_bitmask_t;
-+
-+typedef struct {
-+	u32 version;
-+	u32 horizontal_resolution;
-+	u32 vertical_resolution;
-+	int pixel_format;
-+	efi_pixel_bitmask_t pixel_information;
-+	u32 pixels_per_scan_line;
-+} __attribute__((packed)) efi_graphics_output_mode_information_t;
-+
-+typedef struct {
-+	u32 max_mode;
-+	u32 mode;
-+	unsigned long info;
-+	unsigned long size_of_info;
-+	u64 frame_buffer_base;
-+	unsigned long frame_buffer_size;
-+} __attribute__((packed)) efi_graphics_output_protocol_mode_t;
-+
-+typedef struct {
-+	void *query_mode;
-+	unsigned long set_mode;
-+	unsigned long blt;
-+	efi_graphics_output_protocol_mode_t *mode;
-+} efi_graphics_output_protocol_t;
-+
-+typedef struct {
-+	void *get_mode;
-+	void *set_mode;
-+	void *blt;
-+} efi_uga_draw_protocol_t;
-+
-+static efi_system_table_t *sys_table;
-+
-+static efi_status_t low_alloc(unsigned long size, unsigned long align,
-+			      unsigned long *addr)
-+{
-+	unsigned long map_size, key, desc_size;
-+	efi_memory_desc_t *map;
-+	efi_status_t status;
-+	unsigned long nr_pages;
-+	u32 desc_version;
-+	int i;
-+
-+	nr_pages = round_up(size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE;
-+
-+	map_size = sizeof(*map) * 32;
-+
-+again:
-+	/*
-+	 * Add an additional efi_memory_desc_t because we're doing an
-+	 * allocation which may be in a new descriptor region.
-+	 */
-+	map_size += sizeof(*map);
-+	status = efi_call_phys3(sys_table->boottime->allocate_pool,
-+				EFI_LOADER_DATA, map_size, (void **)&map);
-+	if (status != EFI_SUCCESS)
-+		goto fail;
-+
-+	status = efi_call_phys5(sys_table->boottime->get_memory_map, &map_size,
-+				map, &key, &desc_size, &desc_version);
-+	if (status == EFI_BUFFER_TOO_SMALL) {
-+		efi_call_phys1(sys_table->boottime->free_pool, map);
-+		goto again;
-+	}
-+
-+	if (status != EFI_SUCCESS)
-+		goto free_pool;
-+
-+	for (i = 0; i < map_size / desc_size; i++) {
-+		efi_memory_desc_t *desc;
-+		u64 start, end;
-+
-+		desc = (efi_memory_desc_t *)((unsigned long)map + (i * desc_size));
-+
-+		if (desc->type != EFI_CONVENTIONAL_MEMORY)
-+			continue;
-+
-+		if (desc->num_pages < nr_pages)
-+			continue;
-+
-+		start = desc->phys_addr;
-+		end = start + desc->num_pages * (1UL << EFI_PAGE_SHIFT);
-+
-+		/*
-+		 * Don't allocate at 0x0. It will confuse code that
-+		 * checks pointers against NULL. Skip the first 8
-+		 * bytes so we start at a nice even number.
-+		 */
-+		if (start == 0x0) {
-+			start += 8;
-+
-+			/* Check for tiny memory regions */
-+			if (start >= end)
-+				continue;
-+		}
-+
-+		start = round_up(start, align);
-+		if ((start + size) > end)
-+			continue;
-+
-+		status = efi_call_phys4(sys_table->boottime->allocate_pages,
-+					EFI_ALLOCATE_ADDRESS, EFI_LOADER_DATA,
-+					nr_pages, &start);
-+		if (status == EFI_SUCCESS) {
-+			*addr = start;
-+			break;
-+		}
-+	}
-+
-+	if (i == map_size / desc_size)
-+		status = EFI_NOT_FOUND;
-+
-+free_pool:
-+	efi_call_phys1(sys_table->boottime->free_pool, map);
-+fail:
-+	return status;
-+}
-+
-+static void low_free(unsigned long size, unsigned long addr)
-+{
-+	unsigned long nr_pages;
-+
-+	nr_pages = round_up(size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE;
-+	efi_call_phys2(sys_table->boottime->free_pages, addr, size);
-+}
-+
-+static void find_bits(unsigned long mask, u8 *pos, u8 *size)
-+{
-+        u8 first, len;
-+
-+	first = 0;
-+	len = 0;
-+
-+	if (mask) {
-+		while (!(mask & 0x1)) {
-+			mask = mask >> 1;
-+			first++;
-+		}
-+
-+		while (mask & 0x1) {
-+			mask = mask >> 1;
-+			len++;
-+		}
-+	}
-+
-+        *pos = first;
-+        *size = len;
-+}
-+
-+/*
-+ * See if we have Graphics Output Protocol
-+ */
-+static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto,
-+			      unsigned long size)
-+{
-+	efi_graphics_output_protocol_t *gop, *first_gop;
-+	efi_pixel_bitmask_t pixel_info;
-+	unsigned long nr_gops;
-+	efi_status_t status;
-+	void **gop_handle;
-+	u16 width, height;
-+	u32 fb_base, fb_size;
-+	u32 pixels_per_scan_line;
-+	int pixel_format;
-+	int i;
-+
-+	status = efi_call_phys3(sys_table->boottime->allocate_pool,
-+				EFI_LOADER_DATA, size, &gop_handle);
-+	if (status != EFI_SUCCESS)
-+		return status;
-+
-+	status = efi_call_phys5(sys_table->boottime->locate_handle,
-+				EFI_LOCATE_BY_PROTOCOL, proto,
-+				NULL, &size, gop_handle);
-+	if (status != EFI_SUCCESS)
-+		goto free_handle;
-+
-+	first_gop = NULL;
-+
-+	nr_gops = size / sizeof(void *);
-+	for (i = 0; i < nr_gops; i++) {
-+		efi_graphics_output_mode_information_t *info;
-+		efi_guid_t pciio_proto = EFI_PCI_IO_PROTOCOL_GUID;
-+		void *pciio;
-+		void *h = gop_handle[i];
-+
-+		status = efi_call_phys3(sys_table->boottime->handle_protocol,
-+					h, proto, &gop);
-+		if (status != EFI_SUCCESS)
-+			continue;
-+
-+		efi_call_phys3(sys_table->boottime->handle_protocol,
-+			       h, &pciio_proto, &pciio);
-+
-+		status = efi_call_phys4(gop->query_mode, gop,
-+					gop->mode->mode, &size, &info);
-+		if (status == EFI_SUCCESS && (!first_gop || pciio)) {
-+			/*
-+			 * Apple provide GOPs that are not backed by
-+			 * real hardware (they're used to handle
-+			 * multiple displays). The workaround is to
-+			 * search for a GOP implementing the PCIIO
-+			 * protocol, and if one isn't found, to just
-+			 * fallback to the first GOP.
-+			 */
-+			width = info->horizontal_resolution;
-+			height = info->vertical_resolution;
-+			fb_base = gop->mode->frame_buffer_base;
-+			fb_size = gop->mode->frame_buffer_size;
-+			pixel_format = info->pixel_format;
-+			pixel_info = info->pixel_information;
-+			pixels_per_scan_line = info->pixels_per_scan_line;
-+
-+			/*
-+			 * Once we've found a GOP supporting PCIIO,
-+			 * don't bother looking any further.
-+			 */
-+			if (pciio)
-+				break;
-+
-+			first_gop = gop;
-+		}
-+	}
-+
-+	/* Did we find any GOPs? */
-+	if (!first_gop)
-+		goto free_handle;
-+
-+	/* EFI framebuffer */
-+	si->orig_video_isVGA = VIDEO_TYPE_EFI;
-+
-+	si->lfb_width = width;
-+	si->lfb_height = height;
-+	si->lfb_base = fb_base;
-+	si->lfb_size = fb_size;
-+	si->pages = 1;
-+
-+	if (pixel_format == PIXEL_RGB_RESERVED_8BIT_PER_COLOR) {
-+		si->lfb_depth = 32;
-+		si->lfb_linelength = pixels_per_scan_line * 4;
-+		si->red_size = 8;
-+		si->red_pos = 0;
-+		si->green_size = 8;
-+		si->green_pos = 8;
-+		si->blue_size = 8;
-+		si->blue_pos = 16;
-+		si->rsvd_size = 8;
-+		si->rsvd_pos = 24;
-+	} else if (pixel_format == PIXEL_BGR_RESERVED_8BIT_PER_COLOR) {
-+		si->lfb_depth = 32;
-+		si->lfb_linelength = pixels_per_scan_line * 4;
-+		si->red_size = 8;
-+		si->red_pos = 16;
-+		si->green_size = 8;
-+		si->green_pos = 8;
-+		si->blue_size = 8;
-+		si->blue_pos = 0;
-+		si->rsvd_size = 8;
-+		si->rsvd_pos = 24;
-+	} else if (pixel_format == PIXEL_BIT_MASK) {
-+		find_bits(pixel_info.red_mask, &si->red_pos, &si->red_size);
-+		find_bits(pixel_info.green_mask, &si->green_pos,
-+			  &si->green_size);
-+		find_bits(pixel_info.blue_mask, &si->blue_pos, &si->blue_size);
-+		find_bits(pixel_info.reserved_mask, &si->rsvd_pos,
-+			  &si->rsvd_size);
-+		si->lfb_depth = si->red_size + si->green_size +
-+			si->blue_size + si->rsvd_size;
-+		si->lfb_linelength = (pixels_per_scan_line * si->lfb_depth) / 8;
-+	} else {
-+		si->lfb_depth = 4;
-+		si->lfb_linelength = si->lfb_width / 2;
-+		si->red_size = 0;
-+		si->red_pos = 0;
-+		si->green_size = 0;
-+		si->green_pos = 0;
-+		si->blue_size = 0;
-+		si->blue_pos = 0;
-+		si->rsvd_size = 0;
-+		si->rsvd_pos = 0;
-+	}
-+
-+free_handle:
-+	efi_call_phys1(sys_table->boottime->free_pool, gop_handle);
-+	return status;
-+}
-+
-+/*
-+ * See if we have Universal Graphics Adapter (UGA) protocol
-+ */
-+static efi_status_t setup_uga(struct screen_info *si, efi_guid_t *uga_proto,
-+			      unsigned long size)
-+{
-+	efi_uga_draw_protocol_t *uga, *first_uga;
-+	unsigned long nr_ugas;
-+	efi_status_t status;
-+	u32 width, height;
-+	void **uga_handle = NULL;
-+	int i;
-+
-+	status = efi_call_phys3(sys_table->boottime->allocate_pool,
-+				EFI_LOADER_DATA, size, &uga_handle);
-+	if (status != EFI_SUCCESS)
-+		return status;
-+
-+	status = efi_call_phys5(sys_table->boottime->locate_handle,
-+				EFI_LOCATE_BY_PROTOCOL, uga_proto,
-+				NULL, &size, uga_handle);
-+	if (status != EFI_SUCCESS)
-+		goto free_handle;
-+
-+	first_uga = NULL;
-+
-+	nr_ugas = size / sizeof(void *);
-+	for (i = 0; i < nr_ugas; i++) {
-+		efi_guid_t pciio_proto = EFI_PCI_IO_PROTOCOL_GUID;
-+		void *handle = uga_handle[i];
-+		u32 w, h, depth, refresh;
-+		void *pciio;
-+
-+		status = efi_call_phys3(sys_table->boottime->handle_protocol,
-+					handle, uga_proto, &uga);
-+		if (status != EFI_SUCCESS)
-+			continue;
-+
-+		efi_call_phys3(sys_table->boottime->handle_protocol,
-+			       handle, &pciio_proto, &pciio);
-+
-+		status = efi_call_phys5(uga->get_mode, uga, &w, &h,
-+					&depth, &refresh);
-+		if (status == EFI_SUCCESS && (!first_uga || pciio)) {
-+			width = w;
-+			height = h;
-+
-+			/*
-+			 * Once we've found a UGA supporting PCIIO,
-+			 * don't bother looking any further.
-+			 */
-+			if (pciio)
-+				break;
-+
-+			first_uga = uga;
-+		}
-+	}
-+
-+	if (!first_uga)
-+		goto free_handle;
-+
-+	/* EFI framebuffer */
-+	si->orig_video_isVGA = VIDEO_TYPE_EFI;
-+
-+	si->lfb_depth = 32;
-+	si->lfb_width = width;
-+	si->lfb_height = height;
-+
-+	si->red_size = 8;
-+	si->red_pos = 16;
-+	si->green_size = 8;
-+	si->green_pos = 8;
-+	si->blue_size = 8;
-+	si->blue_pos = 0;
-+	si->rsvd_size = 8;
-+	si->rsvd_pos = 24;
-+
-+
-+free_handle:
-+	efi_call_phys1(sys_table->boottime->free_pool, uga_handle);
-+	return status;
-+}
-+
-+void setup_graphics(struct boot_params *boot_params)
-+{
-+	efi_guid_t graphics_proto = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID;
-+	struct screen_info *si;
-+	efi_guid_t uga_proto = EFI_UGA_PROTOCOL_GUID;
-+	efi_status_t status;
-+	unsigned long size;
-+	void **gop_handle = NULL;
-+	void **uga_handle = NULL;
-+
-+	si = &boot_params->screen_info;
-+	memset(si, 0, sizeof(*si));
-+
-+	size = 0;
-+	status = efi_call_phys5(sys_table->boottime->locate_handle,
-+				EFI_LOCATE_BY_PROTOCOL, &graphics_proto,
-+				NULL, &size, gop_handle);
-+	if (status == EFI_BUFFER_TOO_SMALL)
-+		status = setup_gop(si, &graphics_proto, size);
-+
-+	if (status != EFI_SUCCESS) {
-+		size = 0;
-+		status = efi_call_phys5(sys_table->boottime->locate_handle,
-+					EFI_LOCATE_BY_PROTOCOL, &uga_proto,
-+					NULL, &size, uga_handle);
-+		if (status == EFI_BUFFER_TOO_SMALL)
-+			setup_uga(si, &uga_proto, size);
-+	}
-+}
-+
-+struct initrd {
-+	efi_file_handle_t *handle;
-+	u64 size;
-+};
-+
-+/*
-+ * Check the cmdline for a LILO-style initrd= arguments.
-+ *
-+ * We only support loading an initrd from the same filesystem as the
-+ * kernel image.
-+ */
-+static efi_status_t handle_ramdisks(efi_loaded_image_t *image,
-+				    struct setup_header *hdr)
-+{
-+	struct initrd *initrds;
-+	unsigned long initrd_addr;
-+	efi_guid_t fs_proto = EFI_FILE_SYSTEM_GUID;
-+	u64 initrd_total;
-+	efi_file_io_interface_t *io;
-+	efi_file_handle_t *fh;
-+	efi_status_t status;
-+	int nr_initrds;
-+	char *str;
-+	int i, j, k;
-+
-+	initrd_addr = 0;
-+	initrd_total = 0;
-+
-+	str = (char *)(unsigned long)hdr->cmd_line_ptr;
-+
-+	j = 0;			/* See close_handles */
-+
-+	if (!str || !*str)
-+		return EFI_SUCCESS;
-+
-+	for (nr_initrds = 0; *str; nr_initrds++) {
-+		str = strstr(str, "initrd=");
-+		if (!str)
-+			break;
-+
-+		str += 7;
-+
-+		/* Skip any leading slashes */
-+		while (*str == '/' || *str == '\\')
-+			str++;
-+
-+		while (*str && *str != ' ' && *str != '\n')
-+			str++;
-+	}
-+
-+	if (!nr_initrds)
-+		return EFI_SUCCESS;
-+
-+	status = efi_call_phys3(sys_table->boottime->allocate_pool,
-+				EFI_LOADER_DATA,
-+				nr_initrds * sizeof(*initrds),
-+				&initrds);
-+	if (status != EFI_SUCCESS)
-+		goto fail;
-+
-+	str = (char *)(unsigned long)hdr->cmd_line_ptr;
-+	for (i = 0; i < nr_initrds; i++) {
-+		struct initrd *initrd;
-+		efi_file_handle_t *h;
-+		efi_file_info_t *info;
-+		efi_char16_t filename[256];
-+		unsigned long info_sz;
-+		efi_guid_t info_guid = EFI_FILE_INFO_ID;
-+		efi_char16_t *p;
-+		u64 file_sz;
-+
-+		str = strstr(str, "initrd=");
-+		if (!str)
-+			break;
-+
-+		str += 7;
-+
-+		initrd = &initrds[i];
-+		p = filename;
-+
-+		/* Skip any leading slashes */
-+		while (*str == '/' || *str == '\\')
-+			str++;
-+
-+		while (*str && *str != ' ' && *str != '\n') {
-+			if (p >= filename + sizeof(filename))
-+				break;
-+
-+			*p++ = *str++;
-+		}
-+
-+		*p = '\0';
-+
-+		/* Only open the volume once. */
-+		if (!i) {
-+			efi_boot_services_t *boottime;
-+
-+			boottime = sys_table->boottime;
-+
-+			status = efi_call_phys3(boottime->handle_protocol,
-+					image->device_handle, &fs_proto, &io);
-+			if (status != EFI_SUCCESS)
-+				goto free_initrds;
-+
-+			status = efi_call_phys2(io->open_volume, io, &fh);
-+			if (status != EFI_SUCCESS)
-+				goto free_initrds;
-+		}
-+
-+		status = efi_call_phys5(fh->open, fh, &h, filename,
-+					EFI_FILE_MODE_READ, (u64)0);
-+		if (status != EFI_SUCCESS)
-+			goto close_handles;
-+
-+		initrd->handle = h;
-+
-+		info_sz = 0;
-+		status = efi_call_phys4(h->get_info, h, &info_guid,
-+					&info_sz, NULL);
-+		if (status != EFI_BUFFER_TOO_SMALL)
-+			goto close_handles;
-+
-+grow:
-+		status = efi_call_phys3(sys_table->boottime->allocate_pool,
-+					EFI_LOADER_DATA, info_sz, &info);
-+		if (status != EFI_SUCCESS)
-+			goto close_handles;
-+
-+		status = efi_call_phys4(h->get_info, h, &info_guid,
-+					&info_sz, info);
-+		if (status == EFI_BUFFER_TOO_SMALL) {
-+			efi_call_phys1(sys_table->boottime->free_pool, info);
-+			goto grow;
-+		}
-+
-+		file_sz = info->file_size;
-+		efi_call_phys1(sys_table->boottime->free_pool, info);
-+
-+		if (status != EFI_SUCCESS)
-+			goto close_handles;
-+
-+		initrd->size = file_sz;
-+		initrd_total += file_sz;
-+	}
-+
-+	if (initrd_total) {
-+		unsigned long addr;
-+
-+		/*
-+		 * Multiple initrd's need to be at consecutive
-+		 * addresses in memory, so allocate enough memory for
-+		 * all the initrd's.
-+		 */
-+		status = low_alloc(initrd_total, 0x1000, &initrd_addr);
-+		if (status != EFI_SUCCESS)
-+			goto close_handles;
-+
-+		/* We've run out of free low memory. */
-+		if (initrd_addr > hdr->initrd_addr_max) {
-+			status = EFI_INVALID_PARAMETER;
-+			goto free_initrd_total;
-+		}
-+
-+		addr = initrd_addr;
-+		for (j = 0; j < nr_initrds; j++) {
-+			u64 size;
-+
-+			size = initrds[j].size;
-+			status = efi_call_phys3(fh->read, initrds[j].handle,
-+						&size, addr);
-+			if (status != EFI_SUCCESS)
-+				goto free_initrd_total;
-+
-+			efi_call_phys1(fh->close, initrds[j].handle);
-+
-+			addr += size;
-+		}
-+
-+	}
-+
-+	efi_call_phys1(sys_table->boottime->free_pool, initrds);
-+
-+	hdr->ramdisk_image = initrd_addr;
-+	hdr->ramdisk_size = initrd_total;
-+
-+	return status;
-+
-+free_initrd_total:
-+	low_free(initrd_total, initrd_addr);
-+
-+close_handles:
-+	for (k = j; k < nr_initrds; k++)
-+		efi_call_phys1(fh->close, initrds[k].handle);
-+free_initrds:
-+	efi_call_phys1(sys_table->boottime->free_pool, initrds);
-+fail:
-+	hdr->ramdisk_image = 0;
-+	hdr->ramdisk_size = 0;
-+
-+	return status;
-+}
-+
-+/*
-+ * Because the x86 boot code expects to be passed a boot_params we
-+ * need to create one ourselves (usually the bootloader would create
-+ * one for us).
-+ */
-+static efi_status_t make_boot_params(struct boot_params *boot_params,
-+				     efi_loaded_image_t *image,
-+				     void *handle)
-+{
-+	struct efi_info *efi = &boot_params->efi_info;
-+	struct apm_bios_info *bi = &boot_params->apm_bios_info;
-+	struct sys_desc_table *sdt = &boot_params->sys_desc_table;
-+	struct e820entry *e820_map = &boot_params->e820_map[0];
-+	struct e820entry *prev = NULL;
-+	struct setup_header *hdr = &boot_params->hdr;
-+	unsigned long size, key, desc_size, _size;
-+	efi_memory_desc_t *mem_map;
-+	void *options = image->load_options;
-+	u32 load_options_size = image->load_options_size;
-+	int options_size = 0;
-+	efi_status_t status;
-+	__u32 desc_version;
-+	unsigned long cmdline;
-+	u8 nr_entries;
-+	u16 *s2;
-+	u8 *s1;
-+	int i;
-+
-+	hdr->type_of_loader = 0x21;
-+
-+	/* Convert unicode cmdline to ascii */
-+	cmdline = 0;
-+	s2 = (u16 *)options;
-+
-+	if (s2) {
-+		while (*s2 && *s2 != '\n' && options_size < load_options_size) {
-+			s2++;
-+			options_size++;
-+		}
-+
-+		if (options_size) {
-+			if (options_size > hdr->cmdline_size)
-+				options_size = hdr->cmdline_size;
-+
-+			options_size++;	/* NUL termination */
-+
-+			status = low_alloc(options_size, 1, &cmdline);
-+			if (status != EFI_SUCCESS)
-+				goto fail;
-+
-+			s1 = (u8 *)(unsigned long)cmdline;
-+			s2 = (u16 *)options;
-+
-+			for (i = 0; i < options_size - 1; i++)
-+				*s1++ = *s2++;
-+
-+			*s1 = '\0';
-+		}
-+	}
-+
-+	hdr->cmd_line_ptr = cmdline;
-+
-+	hdr->ramdisk_image = 0;
-+	hdr->ramdisk_size = 0;
-+
-+	status = handle_ramdisks(image, hdr);
-+	if (status != EFI_SUCCESS)
-+		goto free_cmdline;
-+
-+	setup_graphics(boot_params);
-+
-+	/* Clear APM BIOS info */
-+	memset(bi, 0, sizeof(*bi));
-+
-+	memset(sdt, 0, sizeof(*sdt));
-+
-+	memcpy(&efi->efi_loader_signature, EFI_LOADER_SIGNATURE, sizeof(__u32));
-+
-+	size = sizeof(*mem_map) * 32;
-+
-+again:
-+	size += sizeof(*mem_map);
-+	_size = size;
-+	status = low_alloc(size, 1, (unsigned long *)&mem_map);
-+	if (status != EFI_SUCCESS)
-+		goto free_cmdline;
-+
-+	status = efi_call_phys5(sys_table->boottime->get_memory_map, &size,
-+				mem_map, &key, &desc_size, &desc_version);
-+	if (status == EFI_BUFFER_TOO_SMALL) {
-+		low_free(_size, (unsigned long)mem_map);
-+		goto again;
-+	}
-+
-+	if (status != EFI_SUCCESS)
-+		goto free_mem_map;
-+
-+	efi->efi_systab = (unsigned long)sys_table;
-+	efi->efi_memdesc_size = desc_size;
-+	efi->efi_memdesc_version = desc_version;
-+	efi->efi_memmap = (unsigned long)mem_map;
-+	efi->efi_memmap_size = size;
-+
-+#ifdef CONFIG_X86_64
-+	efi->efi_systab_hi = (unsigned long)sys_table >> 32;
-+	efi->efi_memmap_hi = (unsigned long)mem_map >> 32;
-+#endif
-+
-+	/* Might as well exit boot services now */
-+	status = efi_call_phys2(sys_table->boottime->exit_boot_services,
-+				handle, key);
-+	if (status != EFI_SUCCESS)
-+		goto free_mem_map;
-+
-+	/* Historic? */
-+	boot_params->alt_mem_k = 32 * 1024;
-+
-+	/*
-+	 * Convert the EFI memory map to E820.
-+	 */
-+	nr_entries = 0;
-+	for (i = 0; i < size / desc_size; i++) {
-+		efi_memory_desc_t *d;
-+		unsigned int e820_type = 0;
-+
-+		d = (efi_memory_desc_t *)((unsigned long)mem_map + (i * desc_size));
-+		switch(d->type) {
-+		case EFI_RESERVED_TYPE:
-+		case EFI_RUNTIME_SERVICES_CODE:
-+		case EFI_RUNTIME_SERVICES_DATA:
-+		case EFI_MEMORY_MAPPED_IO:
-+		case EFI_MEMORY_MAPPED_IO_PORT_SPACE:
-+		case EFI_PAL_CODE:
-+			e820_type = E820_RESERVED;
-+			break;
-+
-+		case EFI_UNUSABLE_MEMORY:
-+			e820_type = E820_UNUSABLE;
-+			break;
-+
-+		case EFI_ACPI_RECLAIM_MEMORY:
-+			e820_type = E820_ACPI;
-+			break;
-+
-+		case EFI_LOADER_CODE:
-+		case EFI_LOADER_DATA:
-+		case EFI_BOOT_SERVICES_CODE:
-+		case EFI_BOOT_SERVICES_DATA:
-+		case EFI_CONVENTIONAL_MEMORY:
-+			e820_type = E820_RAM;
-+			break;
-+
-+		case EFI_ACPI_MEMORY_NVS:
-+			e820_type = E820_NVS;
-+			break;
-+
-+		default:
-+			continue;
-+		}
-+
-+		/* Merge adjacent mappings */
-+		if (prev && prev->type == e820_type &&
-+		    (prev->addr + prev->size) == d->phys_addr)
-+			prev->size += d->num_pages << 12;
-+		else {
-+			e820_map->addr = d->phys_addr;
-+			e820_map->size = d->num_pages << 12;
-+			e820_map->type = e820_type;
-+			prev = e820_map++;
-+			nr_entries++;
-+		}
-+	}
-+
-+	boot_params->e820_entries = nr_entries;
-+
-+	return EFI_SUCCESS;
-+
-+free_mem_map:
-+	low_free(_size, (unsigned long)mem_map);
-+free_cmdline:
-+	if (options_size)
-+		low_free(options_size, hdr->cmd_line_ptr);
-+fail:
-+	return status;
-+}
-+
-+/*
-+ * On success we return a pointer to a boot_params structure, and NULL
-+ * on failure.
-+ */
-+struct boot_params *efi_main(void *handle, efi_system_table_t *_table)
-+{
-+	struct boot_params *boot_params;
-+	unsigned long start, nr_pages;
-+	struct desc_ptr *gdt, *idt;
-+	efi_loaded_image_t *image;
-+	struct setup_header *hdr;
-+	efi_status_t status;
-+	efi_guid_t proto = LOADED_IMAGE_PROTOCOL_GUID;
-+	struct desc_struct *desc;
-+
-+	sys_table = _table;
-+
-+	/* Check if we were booted by the EFI firmware */
-+	if (sys_table->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE)
-+		goto fail;
-+
-+	status = efi_call_phys3(sys_table->boottime->handle_protocol,
-+				handle, &proto, (void *)&image);
-+	if (status != EFI_SUCCESS)
-+		goto fail;
-+
-+	status = low_alloc(0x4000, 1, (unsigned long *)&boot_params);
-+	if (status != EFI_SUCCESS)
-+		goto fail;
-+
-+	memset(boot_params, 0x0, 0x4000);
-+
-+	/* Copy first two sectors to boot_params */
-+	memcpy(boot_params, image->image_base, 1024);
-+
-+	hdr = &boot_params->hdr;
-+
-+	/*
-+	 * The EFI firmware loader could have placed the kernel image
-+	 * anywhere in memory, but the kernel has various restrictions
-+	 * on the max physical address it can run at. Attempt to move
-+	 * the kernel to boot_params.pref_address, or as close as
-+	 * possible to it.
-+	 */
-+	start = hdr->pref_address;
-+	nr_pages = round_up(hdr->init_size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE;
-+
-+	status = efi_call_phys4(sys_table->boottime->allocate_pages,
-+				EFI_ALLOCATE_ADDRESS, EFI_LOADER_DATA,
-+				nr_pages, &start);
-+	if (status != EFI_SUCCESS) {
-+		status = low_alloc(hdr->init_size, hdr->kernel_alignment,
-+				   &start);
-+		if (status != EFI_SUCCESS)
-+			goto fail;
-+	}
-+
-+	hdr->code32_start = (__u32)start;
-+	hdr->pref_address = (__u64)(unsigned long)image->image_base;
-+
-+	memcpy((void *)start, image->image_base, image->image_size);
-+
-+	status = efi_call_phys3(sys_table->boottime->allocate_pool,
-+				EFI_LOADER_DATA, sizeof(*gdt),
-+				(void **)&gdt);
-+	if (status != EFI_SUCCESS)
-+		goto fail;
-+
-+	gdt->size = 0x800;
-+	status = low_alloc(gdt->size, 8, (unsigned long *)&gdt->address);
-+	if (status != EFI_SUCCESS)
-+		goto fail;
-+
-+	status = efi_call_phys3(sys_table->boottime->allocate_pool,
-+				EFI_LOADER_DATA, sizeof(*idt),
-+				(void **)&idt);
-+	if (status != EFI_SUCCESS)
-+		goto fail;
-+
-+	idt->size = 0;
-+	idt->address = 0;
-+
-+	status = make_boot_params(boot_params, image, handle);
-+	if (status != EFI_SUCCESS)
-+		goto fail;
-+
-+	memset((char *)gdt->address, 0x0, gdt->size);
-+	desc = (struct desc_struct *)gdt->address;
-+
-+	/* The first GDT is a dummy and the second is unused. */
-+	desc += 2;
-+
-+	desc->limit0 = 0xffff;
-+	desc->base0 = 0x0000;
-+	desc->base1 = 0x0000;
-+	desc->type = SEG_TYPE_CODE | SEG_TYPE_EXEC_READ;
-+	desc->s = DESC_TYPE_CODE_DATA;
-+	desc->dpl = 0;
-+	desc->p = 1;
-+	desc->limit = 0xf;
-+	desc->avl = 0;
-+	desc->l = 0;
-+	desc->d = SEG_OP_SIZE_32BIT;
-+	desc->g = SEG_GRANULARITY_4KB;
-+	desc->base2 = 0x00;
-+
-+	desc++;
-+	desc->limit0 = 0xffff;
-+	desc->base0 = 0x0000;
-+	desc->base1 = 0x0000;
-+	desc->type = SEG_TYPE_DATA | SEG_TYPE_READ_WRITE;
-+	desc->s = DESC_TYPE_CODE_DATA;
-+	desc->dpl = 0;
-+	desc->p = 1;
-+	desc->limit = 0xf;
-+	desc->avl = 0;
-+	desc->l = 0;
-+	desc->d = SEG_OP_SIZE_32BIT;
-+	desc->g = SEG_GRANULARITY_4KB;
-+	desc->base2 = 0x00;
-+
-+#ifdef CONFIG_X86_64
-+	/* Task segment value */
-+	desc++;
-+	desc->limit0 = 0x0000;
-+	desc->base0 = 0x0000;
-+	desc->base1 = 0x0000;
-+	desc->type = SEG_TYPE_TSS;
-+	desc->s = 0;
-+	desc->dpl = 0;
-+	desc->p = 1;
-+	desc->limit = 0x0;
-+	desc->avl = 0;
-+	desc->l = 0;
-+	desc->d = 0;
-+	desc->g = SEG_GRANULARITY_4KB;
-+	desc->base2 = 0x00;
-+#endif /* CONFIG_X86_64 */
-+
-+	asm volatile ("lidt %0" :: "m" (*idt));
-+	asm volatile ("lgdt %0" :: "m" (*gdt));
-+
-+	asm volatile("cli");
-+
-+	return boot_params;
-+fail:
-+	return NULL;
-+}
-diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
-new file mode 100644
-index 0000000..5047cd9
---- /dev/null
-+++ b/arch/x86/boot/compressed/efi_stub_32.S
-@@ -0,0 +1,87 @@
-+/*
-+ * EFI call stub for IA32.
-+ *
-+ * This stub allows us to make EFI calls in physical mode with interrupts
-+ * turned off. Note that this implementation is different from the one in
-+ * arch/x86/platform/efi/efi_stub_32.S because we're _already_ in physical
-+ * mode at this point.
-+ */
-+
-+#include <linux/linkage.h>
-+#include <asm/page_types.h>
-+
-+/*
-+ * efi_call_phys(void *, ...) is a function with variable parameters.
-+ * All the callers of this function assure that all the parameters are 4-bytes.
-+ */
-+
-+/*
-+ * In gcc calling convention, EBX, ESP, EBP, ESI and EDI are all callee save.
-+ * So we'd better save all of them at the beginning of this function and restore
-+ * at the end no matter how many we use, because we can not assure EFI runtime
-+ * service functions will comply with gcc calling convention, too.
-+ */
-+
-+.text
-+ENTRY(efi_call_phys)
-+	/*
-+	 * 0. The function can only be called in Linux kernel. So CS has been
-+	 * set to 0x0010, DS and SS have been set to 0x0018. In EFI, I found
-+	 * the values of these registers are the same. And, the corresponding
-+	 * GDT entries are identical. So I will do nothing about segment reg
-+	 * and GDT, but change GDT base register in prelog and epilog.
-+	 */
-+
-+	/*
-+	 * 1. Because we haven't been relocated by this point we need to
-+	 * use relative addressing.
-+	 */
-+	call	1f
-+1:	popl	%edx
-+	subl	$1b, %edx
-+
-+	/*
-+	 * 2. Now on the top of stack is the return
-+	 * address in the caller of efi_call_phys(), then parameter 1,
-+	 * parameter 2, ..., param n. To make things easy, we save the return
-+	 * address of efi_call_phys in a global variable.
-+	 */
-+	popl	%ecx
-+	movl	%ecx, saved_return_addr(%edx)
-+	/* get the function pointer into ECX*/
-+	popl	%ecx
-+	movl	%ecx, efi_rt_function_ptr(%edx)
-+
-+	/*
-+	 * 3. Call the physical function.
-+	 */
-+	call	*%ecx
-+
-+	/*
-+	 * 4. Balance the stack. And because EAX contain the return value,
-+	 * we'd better not clobber it. We need to calculate our address
-+	 * again because %ecx and %edx are not preserved across EFI function
-+	 * calls.
-+	 */
-+	call	1f
-+1:	popl	%edx
-+	subl	$1b, %edx
-+
-+	movl	efi_rt_function_ptr(%edx), %ecx
-+	pushl	%ecx
-+
-+	/*
-+	 * 10. Push the saved return address onto the stack and return.
-+	 */
-+	movl	saved_return_addr(%edx), %ecx
-+	pushl	%ecx
-+	ret
-+ENDPROC(efi_call_phys)
-+.previous
-+
-+.data
-+saved_return_addr:
-+	.long 0
-+efi_rt_function_ptr:
-+	.long 0
-+
-diff --git a/arch/x86/boot/compressed/efi_stub_64.S b/arch/x86/boot/compressed/efi_stub_64.S
-new file mode 100644
-index 0000000..cedc60d
---- /dev/null
-+++ b/arch/x86/boot/compressed/efi_stub_64.S
-@@ -0,0 +1 @@
-+#include "../../platform/efi/efi_stub_64.S"
-diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
-index 67a655a..a055993 100644
---- a/arch/x86/boot/compressed/head_32.S
-+++ b/arch/x86/boot/compressed/head_32.S
-@@ -32,6 +32,28 @@
- 
- 	__HEAD
- ENTRY(startup_32)
-+#ifdef CONFIG_EFI_STUB
-+	/*
-+	 * We don't need the return address, so set up the stack so
-+	 * efi_main() can find its arugments.
-+	 */
-+	add	$0x4, %esp
-+
-+	call	efi_main
-+	cmpl	$0, %eax
-+	je	preferred_addr
-+	movl	%eax, %esi
-+	call	1f
-+1:
-+	popl	%eax
-+	subl	$1b, %eax
-+	subl	BP_pref_address(%esi), %eax
-+	add	BP_code32_start(%esi), %eax
-+	leal	preferred_addr(%eax), %eax
-+	jmp	*%eax
-+
-+preferred_addr:
-+#endif
- 	cld
- 	/*
- 	 * Test KEEP_SEGMENTS flag to see if the bootloader is asking
-diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
-index 35af09d..558d76c 100644
---- a/arch/x86/boot/compressed/head_64.S
-+++ b/arch/x86/boot/compressed/head_64.S
-@@ -199,6 +199,26 @@ ENTRY(startup_64)
- 	 * an identity mapped page table being provied that maps our
- 	 * entire text+data+bss and hopefully all of memory.
- 	 */
-+#ifdef CONFIG_EFI_STUB
-+	pushq	%rsi
-+	mov	%rcx, %rdi
-+	mov	%rdx, %rsi
-+	call	efi_main
-+	popq	%rsi
-+	cmpq	$0,%rax
-+	je	preferred_addr
-+	movq	%rax,%rsi
-+	call	1f
-+1:
-+	popq	%rax
-+	subq	$1b, %rax
-+	subq	BP_pref_address(%rsi), %rax
-+	add	BP_code32_start(%esi), %eax
-+	leaq	preferred_addr(%rax), %rax
-+	jmp	*%rax
-+
-+preferred_addr:
-+#endif
- 
- 	/* Setup data segments. */
- 	xorl	%eax, %eax
-diff --git a/arch/x86/boot/compressed/string.c b/arch/x86/boot/compressed/string.c
-index 19b3e69..ffb9c5c 100644
---- a/arch/x86/boot/compressed/string.c
-+++ b/arch/x86/boot/compressed/string.c
-@@ -1,2 +1,11 @@
- #include "misc.h"
-+
-+int memcmp(const void *s1, const void *s2, size_t len)
-+{
-+	u8 diff;
-+	asm("repe; cmpsb; setnz %0"
-+	    : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
-+	return diff;
-+}
-+
- #include "../string.c"
-diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
-index 93e689f..c4756f6 100644
---- a/arch/x86/boot/header.S
-+++ b/arch/x86/boot/header.S
-@@ -45,6 +45,11 @@ SYSSEG		= 0x1000		/* historical load address >> 4 */
- 
- 	.global bootsect_start
- bootsect_start:
-+#ifdef CONFIG_EFI_STUB
-+	# "MZ", MS-DOS header
-+	.byte 0x4d
-+	.byte 0x5a
-+#endif
- 
- 	# Normalize the start address
- 	ljmp	$BOOTSEG, $start2
-@@ -79,6 +84,14 @@ bs_die:
- 	# invoke the BIOS reset code...
- 	ljmp	$0xf000,$0xfff0
- 
-+#ifdef CONFIG_EFI_STUB
-+	.org	0x3c
-+	#
-+	# Offset to the PE header.
-+	#
-+	.long	pe_header
-+#endif /* CONFIG_EFI_STUB */
-+
- 	.section ".bsdata", "a"
- bugger_off_msg:
- 	.ascii	"Direct booting from floppy is no longer supported.\r\n"
-@@ -87,6 +100,141 @@ bugger_off_msg:
- 	.ascii	"Remove disk and press any key to reboot . . .\r\n"
- 	.byte	0
- 
-+#ifdef CONFIG_EFI_STUB
-+pe_header:
-+	.ascii	"PE"
-+	.word 	0
-+
-+coff_header:
-+#ifdef CONFIG_X86_32
-+	.word	0x14c				# i386
-+#else
-+	.word	0x8664				# x86-64
-+#endif
-+	.word	2				# nr_sections
-+	.long	0 				# TimeDateStamp
-+	.long	0				# PointerToSymbolTable
-+	.long	1				# NumberOfSymbols
-+	.word	section_table - optional_header	# SizeOfOptionalHeader
-+#ifdef CONFIG_X86_32
-+	.word	0x306				# Characteristics.
-+						# IMAGE_FILE_32BIT_MACHINE |
-+						# IMAGE_FILE_DEBUG_STRIPPED |
-+						# IMAGE_FILE_EXECUTABLE_IMAGE |
-+						# IMAGE_FILE_LINE_NUMS_STRIPPED
-+#else
-+	.word	0x206				# Characteristics
-+						# IMAGE_FILE_DEBUG_STRIPPED |
-+						# IMAGE_FILE_EXECUTABLE_IMAGE |
-+						# IMAGE_FILE_LINE_NUMS_STRIPPED
-+#endif
-+
-+optional_header:
-+#ifdef CONFIG_X86_32
-+	.word	0x10b				# PE32 format
-+#else
-+	.word	0x20b 				# PE32+ format
-+#endif
-+	.byte	0x02				# MajorLinkerVersion
-+	.byte	0x14				# MinorLinkerVersion
-+
-+	# Filled in by build.c
-+	.long	0				# SizeOfCode
-+
-+	.long	0				# SizeOfInitializedData
-+	.long	0				# SizeOfUninitializedData
-+
-+	# Filled in by build.c
-+	.long	0x0000				# AddressOfEntryPoint
-+
-+	.long	0x0000				# BaseOfCode
-+#ifdef CONFIG_X86_32
-+	.long	0				# data
-+#endif
-+
-+extra_header_fields:
-+#ifdef CONFIG_X86_32
-+	.long	0				# ImageBase
-+#else
-+	.quad	0				# ImageBase
-+#endif
-+	.long	0x1000				# SectionAlignment
-+	.long	0x200				# FileAlignment
-+	.word	0				# MajorOperatingSystemVersion
-+	.word	0				# MinorOperatingSystemVersion
-+	.word	0				# MajorImageVersion
-+	.word	0				# MinorImageVersion
-+	.word	0				# MajorSubsystemVersion
-+	.word	0				# MinorSubsystemVersion
-+	.long	0				# Win32VersionValue
-+
-+	#
-+	# The size of the bzImage is written in tools/build.c
-+	#
-+	.long	0				# SizeOfImage
-+
-+	.long	0x200				# SizeOfHeaders
-+	.long	0				# CheckSum
-+	.word	0xa				# Subsystem (EFI application)
-+	.word	0				# DllCharacteristics
-+#ifdef CONFIG_X86_32
-+	.long	0				# SizeOfStackReserve
-+	.long	0				# SizeOfStackCommit
-+	.long	0				# SizeOfHeapReserve
-+	.long	0				# SizeOfHeapCommit
-+#else
-+	.quad	0				# SizeOfStackReserve
-+	.quad	0				# SizeOfStackCommit
-+	.quad	0				# SizeOfHeapReserve
-+	.quad	0				# SizeOfHeapCommit
-+#endif
-+	.long	0				# LoaderFlags
-+	.long	0x1				# NumberOfRvaAndSizes
-+
-+	.quad	0				# ExportTable
-+	.quad	0				# ImportTable
-+	.quad	0				# ResourceTable
-+	.quad	0				# ExceptionTable
-+	.quad	0				# CertificationTable
-+	.quad	0				# BaseRelocationTable
-+
-+	# Section table
-+section_table:
-+	.ascii	".text"
-+	.byte	0
-+	.byte	0
-+	.byte	0
-+	.long	0
-+	.long	0x0				# startup_{32,64}
-+	.long	0				# Size of initialized data
-+						# on disk
-+	.long	0x0				# startup_{32,64}
-+	.long	0				# PointerToRelocations
-+	.long	0				# PointerToLineNumbers
-+	.word	0				# NumberOfRelocations
-+	.word	0				# NumberOfLineNumbers
-+	.long	0x60500020			# Characteristics (section flags)
-+
-+	#
-+	# The EFI application loader requires a relocation section
-+	# because EFI applications are relocatable and not having
-+	# this section seems to confuse it. But since we don't need
-+	# the loader to fixup any relocs for us just fill it with a
-+	# single dummy reloc.
-+	#
-+	.ascii	".reloc"
-+	.byte	0
-+	.byte	0
-+	.long	reloc_end - reloc_start
-+	.long	reloc_start
-+	.long	reloc_end - reloc_start		# SizeOfRawData
-+	.long	reloc_start			# PointerToRawData
-+	.long	0				# PointerToRelocations
-+	.long	0				# PointerToLineNumbers
-+	.word	0				# NumberOfRelocations
-+	.word	0				# NumberOfLineNumbers
-+	.long	0x42100040			# Characteristics (section flags)
-+#endif /* CONFIG_EFI_STUB */
- 
- 	# Kernel attributes; used by setup.  This is part 1 of the
- 	# header, from the old boot sector.
-@@ -318,3 +466,13 @@ die:
- setup_corrupt:
- 	.byte	7
- 	.string	"No setup signature found...\n"
-+
-+	.data
-+dummy:	.long	0
-+
-+	.section .reloc
-+reloc_start:
-+	.long	dummy - reloc_start
-+	.long	10
-+	.word	0
-+reloc_end:
-diff --git a/arch/x86/boot/string.c b/arch/x86/boot/string.c
-index 3cbc405..574dedf 100644
---- a/arch/x86/boot/string.c
-+++ b/arch/x86/boot/string.c
-@@ -111,3 +111,38 @@ unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int bas
- 
- 	return result;
- }
-+
-+/**
-+ * strlen - Find the length of a string
-+ * @s: The string to be sized
-+ */
-+size_t strlen(const char *s)
-+{
-+	const char *sc;
-+
-+	for (sc = s; *sc != '\0'; ++sc)
-+		/* nothing */;
-+	return sc - s;
-+}
-+
-+/**
-+ * strstr - Find the first substring in a %NUL terminated string
-+ * @s1: The string to be searched
-+ * @s2: The string to search for
-+ */
-+char *strstr(const char *s1, const char *s2)
-+{
-+	size_t l1, l2;
-+
-+	l2 = strlen(s2);
-+	if (!l2)
-+		return (char *)s1;
-+	l1 = strlen(s1);
-+	while (l1 >= l2) {
-+		l1--;
-+		if (!memcmp(s1, s2, l2))
-+			return (char *)s1;
-+		s1++;
-+	}
-+	return NULL;
-+}
-diff --git a/arch/x86/boot/tools/build.c b/arch/x86/boot/tools/build.c
-index fdc60a0..4e9bd6b 100644
---- a/arch/x86/boot/tools/build.c
-+++ b/arch/x86/boot/tools/build.c
-@@ -135,6 +135,9 @@ static void usage(void)
- 
- int main(int argc, char ** argv)
- {
-+#ifdef CONFIG_EFI_STUB
-+	unsigned int file_sz, pe_header;
-+#endif
- 	unsigned int i, sz, setup_sectors;
- 	int c;
- 	u32 sys_size;
-@@ -194,6 +197,42 @@ int main(int argc, char ** argv)
- 	buf[0x1f6] = sys_size >> 16;
- 	buf[0x1f7] = sys_size >> 24;
- 
-+#ifdef CONFIG_EFI_STUB
-+	file_sz = sz + i + ((sys_size * 16) - sz);
-+
-+	pe_header = *(unsigned int *)&buf[0x3c];
-+
-+	/* Size of code */
-+	*(unsigned int *)&buf[pe_header + 0x1c] = file_sz;
-+
-+	/* Size of image */
-+	*(unsigned int *)&buf[pe_header + 0x50] = file_sz;
-+
-+#ifdef CONFIG_X86_32
-+	/* Address of entry point */
-+	*(unsigned int *)&buf[pe_header + 0x28] = i;
-+
-+	/* .text size */
-+	*(unsigned int *)&buf[pe_header + 0xb0] = file_sz;
-+
-+	/* .text size of initialised data */
-+	*(unsigned int *)&buf[pe_header + 0xb8] = file_sz;
-+#else
-+	/*
-+	 * Address of entry point. startup_32 is at the beginning and
-+	 * the 64-bit entry point (startup_64) is always 512 bytes
-+	 * after.
-+	 */
-+	*(unsigned int *)&buf[pe_header + 0x28] = i + 512;
-+
-+	/* .text size */
-+	*(unsigned int *)&buf[pe_header + 0xc0] = file_sz;
-+
-+	/* .text size of initialised data */
-+	*(unsigned int *)&buf[pe_header + 0xc8] = file_sz;
-+#endif /* CONFIG_X86_32 */
-+#endif /* CONFIG_EFI_STUB */
-+
- 	crc = partial_crc32(buf, i, crc);
- 	if (fwrite(buf, 1, i, stdout) != i)
- 		die("Writing setup failed");
-diff --git a/arch/x86/include/asm/bootparam.h b/arch/x86/include/asm/bootparam.h
-index e020d88..2f90c51 100644
---- a/arch/x86/include/asm/bootparam.h
-+++ b/arch/x86/include/asm/bootparam.h
-@@ -64,6 +64,8 @@ struct setup_header {
- 	__u32	payload_offset;
- 	__u32	payload_length;
- 	__u64	setup_data;
-+	__u64	pref_address;
-+	__u32	init_size;
- } __attribute__((packed));
- 
- struct sys_desc_table {
-diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
-index 7093e4a..844f735 100644
---- a/arch/x86/include/asm/efi.h
-+++ b/arch/x86/include/asm/efi.h
-@@ -3,6 +3,8 @@
- 
- #ifdef CONFIG_X86_32
- 
-+#define EFI_LOADER_SIGNATURE	"EL32"
-+
- extern unsigned long asmlinkage efi_call_phys(void *, ...);
- 
- #define efi_call_phys0(f)		efi_call_phys(f)
-@@ -37,6 +39,8 @@ extern unsigned long asmlinkage efi_call_phys(void *, ...);
- 
- #else /* !CONFIG_X86_32 */
- 
-+#define EFI_LOADER_SIGNATURE	"EL64"
-+
- extern u64 efi_call0(void *fp);
- extern u64 efi_call1(void *fp, u64 arg1);
- extern u64 efi_call2(void *fp, u64 arg1, u64 arg2);
-diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
-index 4f13faf..68de2dc 100644
---- a/arch/x86/kernel/asm-offsets.c
-+++ b/arch/x86/kernel/asm-offsets.c
-@@ -67,4 +67,6 @@ void common(void) {
- 	OFFSET(BP_hardware_subarch, boot_params, hdr.hardware_subarch);
- 	OFFSET(BP_version, boot_params, hdr.version);
- 	OFFSET(BP_kernel_alignment, boot_params, hdr.kernel_alignment);
-+	OFFSET(BP_pref_address, boot_params, hdr.pref_address);
-+	OFFSET(BP_code32_start, boot_params, hdr.code32_start);
- }
-diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index afaf384..eca164b 100644
---- a/arch/x86/kernel/setup.c
-+++ b/arch/x86/kernel/setup.c
-@@ -750,12 +750,7 @@ void __init setup_arch(char **cmdline_p)
- #endif
- #ifdef CONFIG_EFI
- 	if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature,
--#ifdef CONFIG_X86_32
--		     "EL32",
--#else
--		     "EL64",
--#endif
--	 4)) {
-+		     EFI_LOADER_SIGNATURE, 4)) {
- 		efi_enabled = 1;
- 		efi_memblock_x86_reserve_range();
- 	}
-diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
-index 5cab48e..1156e9a 100644
---- a/arch/x86/platform/efi/efi_32.c
-+++ b/arch/x86/platform/efi/efi_32.c
-@@ -44,8 +44,12 @@ void efi_call_phys_prelog(void)
- {
- 	unsigned long cr4;
- 	unsigned long temp;
-+	unsigned long phys_addr, virt_addr;
- 	struct desc_ptr gdt_descr;
- 
-+	virt_addr = (unsigned long)_text;
-+	phys_addr = virt_addr - PAGE_OFFSET;
-+
- 	local_irq_save(efi_rt_eflags);
- 
- 	/*
-@@ -57,18 +61,18 @@ void efi_call_phys_prelog(void)
- 
- 	if (cr4 & X86_CR4_PAE) {
- 		efi_bak_pg_dir_pointer[0].pgd =
--		    swapper_pg_dir[pgd_index(0)].pgd;
--		swapper_pg_dir[0].pgd =
--		    swapper_pg_dir[pgd_index(PAGE_OFFSET)].pgd;
-+		    swapper_pg_dir[pgd_index(phys_addr)].pgd;
-+		swapper_pg_dir[pgd_index(phys_addr)].pgd =
-+		    swapper_pg_dir[pgd_index(virt_addr)].pgd;
- 	} else {
- 		efi_bak_pg_dir_pointer[0].pgd =
--		    swapper_pg_dir[pgd_index(0)].pgd;
-+		    swapper_pg_dir[pgd_index(phys_addr)].pgd;
- 		efi_bak_pg_dir_pointer[1].pgd =
--		    swapper_pg_dir[pgd_index(0x400000)].pgd;
--		swapper_pg_dir[pgd_index(0)].pgd =
--		    swapper_pg_dir[pgd_index(PAGE_OFFSET)].pgd;
--		temp = PAGE_OFFSET + 0x400000;
--		swapper_pg_dir[pgd_index(0x400000)].pgd =
-+		    swapper_pg_dir[pgd_index(phys_addr + 0x400000)].pgd;
-+		swapper_pg_dir[pgd_index(phys_addr)].pgd =
-+		    swapper_pg_dir[pgd_index(virt_addr)].pgd;
-+		temp = virt_addr + 0x400000;
-+		swapper_pg_dir[pgd_index(phys_addr + 0x400000)].pgd =
- 		    swapper_pg_dir[pgd_index(temp)].pgd;
- 	}
- 
-diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 2362a0b..37c3007 100644
---- a/include/linux/efi.h
-+++ b/include/linux/efi.h
-@@ -109,6 +109,14 @@ typedef struct {
- 	u32 imagesize;
- } efi_capsule_header_t;
- 
-+/*
-+ * Allocation types for calls to boottime->allocate_pages.
-+ */
-+#define EFI_ALLOCATE_ANY_PAGES		0
-+#define EFI_ALLOCATE_MAX_ADDRESS	1
-+#define EFI_ALLOCATE_ADDRESS		2
-+#define EFI_MAX_ALLOCATE_TYPE		3
-+
- typedef int (*efi_freemem_callback_t) (u64 start, u64 end, void *arg);
- 
- /*
-@@ -139,6 +147,57 @@ typedef struct {
- } efi_time_cap_t;
- 
- /*
-+ * EFI Boot Services table
-+ */
-+typedef struct {
-+	efi_table_hdr_t hdr;
-+	void *raise_tpl;
-+	void *restore_tpl;
-+	void *allocate_pages;
-+	void *free_pages;
-+	void *get_memory_map;
-+	void *allocate_pool;
-+	void *free_pool;
-+	void *create_event;
-+	void *set_timer;
-+	void *wait_for_event;
-+	void *signal_event;
-+	void *close_event;
-+	void *check_event;
-+	void *install_protocol_interface;
-+	void *reinstall_protocol_interface;
-+	void *uninstall_protocol_interface;
-+	void *handle_protocol;
-+	void *__reserved;
-+	void *register_protocol_notify;
-+	void *locate_handle;
-+	void *locate_device_path;
-+	void *install_configuration_table;
-+	void *load_image;
-+	void *start_image;
-+	void *exit;
-+	void *unload_image;
-+	void *exit_boot_services;
-+	void *get_next_monotonic_count;
-+	void *stall;
-+	void *set_watchdog_timer;
-+	void *connect_controller;
-+	void *disconnect_controller;
-+	void *open_protocol;
-+	void *close_protocol;
-+	void *open_protocol_information;
-+	void *protocols_per_handle;
-+	void *locate_handle_buffer;
-+	void *locate_protocol;
-+	void *install_multiple_protocol_interfaces;
-+	void *uninstall_multiple_protocol_interfaces;
-+	void *calculate_crc32;
-+	void *copy_mem;
-+	void *set_mem;
-+	void *create_event_ex;
-+} efi_boot_services_t;
-+
-+/*
-  * Types and defines for EFI ResetSystem
-  */
- #define EFI_RESET_COLD 0
-@@ -236,6 +295,24 @@ typedef efi_status_t efi_query_capsule_caps_t(efi_capsule_header_t **capsules,
- #define LINUX_EFI_CRASH_GUID \
-     EFI_GUID(  0xcfc8fc79, 0xbe2e, 0x4ddc, 0x97, 0xf0, 0x9f, 0x98, 0xbf, 0xe2, 0x98, 0xa0 )
- 
-+#define LOADED_IMAGE_PROTOCOL_GUID \
-+    EFI_GUID(  0x5b1b31a1, 0x9562, 0x11d2, 0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b )
-+
-+#define EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID \
-+    EFI_GUID(  0x9042a9de, 0x23dc, 0x4a38, 0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a )
-+
-+#define EFI_UGA_PROTOCOL_GUID \
-+    EFI_GUID(  0x982c298b, 0xf4fa, 0x41cb, 0xb8, 0x38, 0x77, 0xaa, 0x68, 0x8f, 0xb8, 0x39 )
-+
-+#define EFI_PCI_IO_PROTOCOL_GUID \
-+    EFI_GUID(  0x4cf5b200, 0x68b8, 0x4ca5, 0x9e, 0xec, 0xb2, 0x3e, 0x3f, 0x50, 0x2, 0x9a )
-+
-+#define EFI_FILE_INFO_ID \
-+    EFI_GUID(  0x9576e92, 0x6d3f, 0x11d2, 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b )
-+
-+#define EFI_FILE_SYSTEM_GUID \
-+    EFI_GUID(  0x964e5b22, 0x6459, 0x11d2, 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b )
-+
- typedef struct {
- 	efi_guid_t guid;
- 	unsigned long table;
-@@ -261,7 +338,7 @@ typedef struct {
- 	unsigned long stderr_handle;
- 	unsigned long stderr;
- 	efi_runtime_services_t *runtime;
--	unsigned long boottime;
-+	efi_boot_services_t *boottime;
- 	unsigned long nr_tables;
- 	unsigned long tables;
- } efi_system_table_t;
-@@ -275,6 +352,56 @@ struct efi_memory_map {
- 	unsigned long desc_size;
- };
- 
-+typedef struct {
-+	u32 revision;
-+	void *parent_handle;
-+	efi_system_table_t *system_table;
-+	void *device_handle;
-+	void *file_path;
-+	void *reserved;
-+	u32 load_options_size;
-+	void *load_options;
-+	void *image_base;
-+	__aligned_u64 image_size;
-+	unsigned int image_code_type;
-+	unsigned int image_data_type;
-+	unsigned long unload;
-+} efi_loaded_image_t;
-+
-+typedef struct {
-+	u64 revision;
-+	void *open_volume;
-+} efi_file_io_interface_t;
-+
-+typedef struct {
-+	u64 size;
-+	u64 file_size;
-+	u64 phys_size;
-+	efi_time_t create_time;
-+	efi_time_t last_access_time;
-+	efi_time_t modification_time;
-+	__aligned_u64 attribute;
-+	efi_char16_t filename[1];
-+} efi_file_info_t;
-+
-+typedef struct {
-+	u64 revision;
-+	void *open;
-+	void *close;
-+	void *delete;
-+	void *read;
-+	void *write;
-+	void *get_position;
-+	void *set_position;
-+	void *get_info;
-+	void *set_info;
-+	void *flush;
-+} efi_file_handle_t;
-+
-+#define EFI_FILE_MODE_READ	0x0000000000000001
-+#define EFI_FILE_MODE_WRITE	0x0000000000000002
-+#define EFI_FILE_MODE_CREATE	0x8000000000000000
-+
- #define EFI_INVALID_TABLE_ADDR		(~0UL)
- 
- /*
-@@ -385,6 +512,13 @@ extern int __init efi_setup_pcdp_console(char *);
- #define EFI_VARIABLE_RUNTIME_ACCESS     0x0000000000000004
- 
- /*
-+ * The type of search to perform when calling boottime->locate_handle
-+ */
-+#define EFI_LOCATE_ALL_HANDLES			0
-+#define EFI_LOCATE_BY_REGISTER_NOTIFY		1
-+#define EFI_LOCATE_BY_PROTOCOL			2
-+
-+/*
-  * EFI Device Path information
-  */
- #define EFI_DEV_HW			0x01
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index eaa90ac0eec..dbfdf86f9c9 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -139,7 +139,10 @@ stdenv.mkDerivation {
         + ")");
     license = "GPLv2";
     homepage = http://www.kernel.org/;
-    maintainers = [ lib.maintainers.eelco ];
+    maintainers = [
+      lib.maintainers.eelco
+      lib.maintainers.chaoflow
+    ];
     platforms = lib.platforms.linux;
   } // extraMeta;
 }
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix
index b08c4b9bb23..a6d03db9b86 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix
@@ -18,6 +18,11 @@ let
       # Enable the kernel's built-in memory tester.
       MEMTEST y
 
+      # Include the CFQ I/O scheduler in the kernel, rather than as a
+      # module, so that the initrd gets a good I/O scheduler.
+      IOSCHED_CFQ y
+      BLK_CGROUP y # required by CFQ
+
       # Disable some expensive (?) features.
       FTRACE n
       KPROBES n
@@ -181,6 +186,14 @@ let
       X86_CHECK_BIOS_CORRUPTION y
       X86_MCE y
 
+      # Allow up to 128 GiB of RAM in Xen domains.
+      XEN_MAX_DOMAIN_MEMORY 128
+
+      # PROC_EVENTS requires that the netlink connector is not built
+      # as a module.  This is required by libcgroup's cgrulesengd.
+      CONNECTOR y
+      PROC_EVENTS y
+
       ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
       ${extraConfig}
     '';
diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix
index 6f1a32e5c0f..557223e6260 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix
@@ -20,6 +20,11 @@ let
       # Enable the kernel's built-in memory tester.
       MEMTEST y
 
+      # Include the CFQ I/O scheduler in the kernel, rather than as a
+      # module, so that the initrd gets a good I/O scheduler.
+      IOSCHED_CFQ y
+      BLK_CGROUP y # required by CFQ
+
       # Disable some expensive (?) features.
       FTRACE n
       KPROBES n
@@ -77,8 +82,9 @@ let
       FB_GEODE y
 
       # Video configuration
-      # The intel drivers already require KMS
+      # Enable KMS for devices whose X.org driver supports it.
       DRM_I915_KMS y
+      DRM_RADEON_KMS y
       # Hybrid graphics support
       VGA_SWITCHEROO y
 
@@ -192,6 +198,15 @@ let
       CGROUP_MEM_RES_CTLR_SWAP? y
       DEVPTS_MULTIPLE_INSTANCES? y
 
+      # Enable staging drivers.  These are somewhat experimental, but
+      # they generally don't hurt.
+      STAGING y
+
+      # PROC_EVENTS requires that the netlink connector is not built
+      # as a module.  This is required by libcgroup's cgrulesengd.
+      CONNECTOR y
+      PROC_EVENTS y
+
       ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
       ${extraConfig}
     '';
@@ -200,7 +215,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.0.4";
+    version = "3.0.9";
   
     preConfigure = ''
       substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@@ -208,7 +223,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2";
-      sha256 = "1vypjcdii75h5f4zsw9lm8wzxd5ix0mk5p94c96hxv828mqqkmhk";
+      sha256 = "1dcn371za577fxw64vk9ry69bihf16l1hk6rs380qnhr6msxr478";
     };
 
     config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix
index 4f8d08340e6..0a44676b4a8 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix
@@ -20,6 +20,11 @@ let
       # Enable the kernel's built-in memory tester.
       MEMTEST y
 
+      # Include the CFQ I/O scheduler in the kernel, rather than as a
+      # module, so that the initrd gets a good I/O scheduler.
+      IOSCHED_CFQ y
+      BLK_CGROUP y # required by CFQ
+
       # Disable some expensive (?) features.
       FTRACE n
       KPROBES n
@@ -77,8 +82,9 @@ let
       FB_GEODE y
 
       # Video configuration
-      # The intel drivers already require KMS
+      # Enable KMS for devices whose X.org driver supports it.
       DRM_I915_KMS y
+      DRM_RADEON_KMS y
       # Hybrid graphics support
       VGA_SWITCHEROO y
 
@@ -192,6 +198,15 @@ let
       CGROUP_MEM_RES_CTLR_SWAP? y
       DEVPTS_MULTIPLE_INSTANCES? y
 
+      # Enable staging drivers.  These are somewhat experimental, but
+      # they generally don't hurt.
+      STAGING y
+
+      # PROC_EVENTS requires that the netlink connector is not built
+      # as a module.  This is required by libcgroup's cgrulesengd.
+      CONNECTOR y
+      PROC_EVENTS y
+
       ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
       ${extraConfig}
     '';
@@ -200,18 +215,15 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.1-rc8";
-
-    modDirVersion = "3.1.0-rc8";
+    version = "3.1.5";
 
     preConfigure = ''
       substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
     '';
   
     src = fetchurl {
-      url = "https://github.com/torvalds/linux/tarball/v${version}";
-      sha256 = "1sz6snv2wavzasrswaprkjpzpll4247v4br0x2i6sndl2nqa6jz7";
-      name = "v${version}.tar.gz";
+      url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2";
+      sha256 = "0wdcpfjv56r5cc67ddhprc9vhjxj2qibhp0bl96p3hbqjjpwfpl6";
     };
 
     config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
new file mode 100644
index 00000000000..0e3ace5c384
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -0,0 +1,237 @@
+args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
+, perl, mktemp, module_init_tools
+, ... }:
+
+let
+  configWithPlatform = kernelPlatform :
+    ''
+      # Don't include any debug features.
+      DEBUG_KERNEL n
+
+      # Support drivers that need external firmware.
+      STANDALONE n
+
+      # Make /proc/config.gz available.
+      IKCONFIG_PROC y
+
+      # Optimize with -O2, not -Os.
+      CC_OPTIMIZE_FOR_SIZE n
+
+      # Enable the kernel's built-in memory tester.
+      MEMTEST y
+
+      # Include the CFQ I/O scheduler in the kernel, rather than as a
+      # module, so that the initrd gets a good I/O scheduler.
+      IOSCHED_CFQ y
+      BLK_CGROUP y # required by CFQ
+
+      # Disable some expensive (?) features.
+      FTRACE n
+      KPROBES n
+      NUMA? n
+      PM_TRACE_RTC n
+
+      # Enable various subsystems.
+      ACCESSIBILITY y # Accessibility support
+      AUXDISPLAY y # Auxiliary Display support
+      DONGLE y # Serial dongle support
+      HIPPI? y
+      MTD_COMPLEX_MAPPINGS y # needed for many devices
+      SCSI_LOWLEVEL y # enable lots of SCSI devices
+      SCSI_LOWLEVEL_PCMCIA y
+      SPI y # needed for many devices
+      SPI_MASTER y
+      WAN y
+
+      # Networking options.
+      IP_PNP n
+      IPV6_PRIVACY y
+      NETFILTER_ADVANCED y
+      IP_VS_PROTO_TCP y
+      IP_VS_PROTO_UDP y
+      IP_VS_PROTO_ESP y
+      IP_VS_PROTO_AH y
+      IP_DCCP_CCID3 n # experimental
+      CLS_U32_PERF y
+      CLS_U32_MARK y
+
+      # Wireless networking.
+      IPW2100_MONITOR y # support promiscuous mode
+      IPW2200_MONITOR y # support promiscuous mode
+      HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
+      HOSTAP_FIRMWARE_NVRAM y
+      ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
+      ATH9K_AHB y # Ditto, AHB bus
+
+      # Some settings to make sure that fbcondecor works - in particular,
+      # disable tileblitting and the drivers that need it.
+
+      # Enable various FB devices.
+      FB y
+      FB_EFI y
+      FB_NVIDIA_I2C y # Enable DDC Support
+      FB_RIVA_I2C y
+      FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
+      FB_ATY_GX y # Mach64 GX support
+      FB_SAVAGE_I2C y
+      FB_SAVAGE_ACCEL y
+      FB_SIS_300 y
+      FB_SIS_315 y
+      FB_3DFX_ACCEL y
+      FB_GEODE y
+
+      # Video configuration
+      # Enable KMS for devices whose X.org driver supports it.
+      DRM_I915_KMS y
+      DRM_RADEON_KMS y
+      # Hybrid graphics support
+      VGA_SWITCHEROO y
+
+      # Sound.
+      SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
+      SND_HDA_INPUT_BEEP y # Support digital beep via input layer
+      SND_USB_CAIAQ_INPUT y
+      PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
+
+      # USB serial devices.
+      USB_SERIAL_GENERIC y # USB Generic Serial Driver
+      USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
+      USB_SERIAL_KEYSPAN_USA28 y
+      USB_SERIAL_KEYSPAN_USA28X y
+      USB_SERIAL_KEYSPAN_USA28XA y
+      USB_SERIAL_KEYSPAN_USA28XB y
+      USB_SERIAL_KEYSPAN_USA19 y
+      USB_SERIAL_KEYSPAN_USA18X y
+      USB_SERIAL_KEYSPAN_USA19W y
+      USB_SERIAL_KEYSPAN_USA19QW y
+      USB_SERIAL_KEYSPAN_USA19QI y
+      USB_SERIAL_KEYSPAN_USA49W y
+      USB_SERIAL_KEYSPAN_USA49WLC y
+
+      # Filesystem options - in particular, enable extended attributes and
+      # ACLs for all filesystems that support them.
+      EXT2_FS_XATTR y # Ext2 extended attributes
+      EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists
+      EXT2_FS_SECURITY y # Ext2 Security Labels
+      EXT2_FS_XIP y # Ext2 execute in place support
+      EXT4_FS_POSIX_ACL y
+      EXT4_FS_SECURITY y
+      REISERFS_FS_XATTR y
+      REISERFS_FS_POSIX_ACL y
+      REISERFS_FS_SECURITY y
+      JFS_POSIX_ACL y
+      JFS_SECURITY y
+      XFS_QUOTA y
+      XFS_POSIX_ACL y
+      XFS_RT y # XFS Realtime subvolume support
+      OCFS2_DEBUG_MASKLOG n
+      BTRFS_FS_POSIX_ACL y
+      UBIFS_FS_XATTR y
+      UBIFS_FS_ADVANCED_COMPR y
+      NFSD_V2_ACL y
+      NFSD_V3 y
+      NFSD_V3_ACL y
+      NFSD_V4 y
+      CIFS_XATTR y
+      CIFS_POSIX y
+
+      # Security related features.
+      STRICT_DEVMEM y # Filter access to /dev/mem
+      SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
+
+      # Misc. options.
+      8139TOO_8129 y
+      8139TOO_PIO n # PIO is slower
+      AIC79XX_DEBUG_ENABLE n
+      AIC7XXX_DEBUG_ENABLE n
+      AIC94XX_DEBUG n
+      B43_PCMCIA y
+      BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
+      BLK_DEV_IDEACPI y # IDE ACPI support
+      BLK_DEV_INTEGRITY y
+      BSD_PROCESS_ACCT_V3 y
+      BT_HCIUART_BCSP y
+      BT_HCIUART_H4 y # UART (H4) protocol support
+      BT_HCIUART_LL y
+      BT_L2CAP y
+      BT_SCO y # audio support
+      BT_RFCOMM m
+      BT_RFCOMM_TTY y # RFCOMM TTY support
+      CRASH_DUMP n
+      DMAR? n # experimental
+      DVB_DYNAMIC_MINORS y # we use udev
+      FUSION y # Fusion MPT device support
+      IDE_GD_ATAPI y # ATAPI floppy support
+      IRDA_ULTRA y # Ultra (connectionless) protocol
+      JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
+      JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
+      JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
+      JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
+      LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
+      LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
+      LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
+      LOGO n # not needed
+      MEDIA_ATTACH y
+      MEGARAID_NEWGEN y
+      MICROCODE_AMD y
+      MODVERSIONS y
+      MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
+      MTRR_SANITIZER y
+      NET_FC y # Fibre Channel driver support
+      PPP_MULTILINK y # PPP multilink support
+      REGULATOR y # Voltage and Current Regulator Support
+      SCSI_LOGGING y # SCSI logging facility
+      SERIAL_8250 y # 8250/16550 and compatible serial support
+      SLIP_COMPRESSED y # CSLIP compressed headers
+      SLIP_SMART y
+      THERMAL_HWMON y # Hardware monitoring support
+      USB_DEBUG n
+      USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
+      X86_CHECK_BIOS_CORRUPTION y
+      X86_MCE y
+
+      # Linux Containers
+      RT_GROUP_SCHED? y
+      CGROUP_DEVICE? y
+      CGROUP_MEM_RES_CTLR? y
+      CGROUP_MEM_RES_CTLR_SWAP? y
+      DEVPTS_MULTIPLE_INSTANCES? y
+
+      # Enable staging drivers.  These are somewhat experimental, but
+      # they generally don't hurt.
+      STAGING y
+
+      # PROC_EVENTS requires that the netlink connector is not built
+      # as a module.  This is required by libcgroup's cgrulesengd.
+      CONNECTOR y
+      PROC_EVENTS y
+
+      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
+      ${extraConfig}
+    '';
+in
+
+import ./generic.nix (
+
+  rec {
+    version = "3.2-rc1";
+
+    modDirVersion = "3.2.0-rc1";
+
+    preConfigure = ''
+      substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
+    '';
+  
+    src = fetchurl {
+      url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2";
+      sha256 = "0pp79njklvjzzr4wpyymqhkiq0xgz1sgil5sjms2xj583jg8c4wm";
+    };
+
+    config = configWithPlatform stdenv.platform;
+    configCross = configWithPlatform stdenv.cross.platform;
+
+    features.iwlwifi = true;
+  }
+
+  // removeAttrs args ["extraConfig"]
+)
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 585a8c0340b..9fb597be72c 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -36,24 +36,24 @@ let
       };
     };
 
-    makeAufs3StandalonePatch =  {version, rev, sha256}:
+  makeAufs3StandalonePatch = {version, rev, sha256}:
 
-      stdenv.mkDerivation {
-        name = "aufs3-standalone-${version}.patch";
+    stdenv.mkDerivation {
+      name = "aufs3-standalone-${version}.patch";
 
-        src = fetchgit {
-          url = git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git;
-          inherit sha256 rev;
-        };
-
-        phases = [ "unpackPhase" "installPhase" ];
-
-        #Instructions from http://aufs.git.sourceforge.net/git/gitweb.cgi?p=aufs/aufs3-standalone.git;a=blob;f=Documentation/filesystems/aufs/README;h=b8cf077635b323d1b454266366f05f476bbd09cb;hb=1067b9d8d64d23c70d905c9cd3c90a669e39c4d4
-        installPhase = ''
-          cat aufs3-base.patch aufs3-proc_map.patch aufs3-standalone.patch > $out
-        '';
+      src = fetchgit {
+        url = git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git;
+        inherit sha256 rev;
       };
 
+      phases = [ "unpackPhase" "installPhase" ];
+
+      # Instructions from http://aufs.git.sourceforge.net/git/gitweb.cgi?p=aufs/aufs3-standalone.git;a=blob;f=Documentation/filesystems/aufs/README;h=b8cf077635b323d1b454266366f05f476bbd09cb;hb=1067b9d8d64d23c70d905c9cd3c90a669e39c4d4
+      installPhase = ''
+        cat aufs3-base.patch aufs3-proc_map.patch aufs3-standalone.patch > $out
+      '';
+    };
+
 in
 
 rec {
@@ -297,12 +297,26 @@ rec {
   aufs3_0 = rec {
     name = "aufs3.0";
     version = "3.0";
-    utilRev = "a08d17d433567c7c2586c5fc2625a714b20fe155";
-    utilHash = "4772c1c6a36da7bbd448057c227a9cd1856ccf72748765cf85421ab0c4e34535";
+    utilRev = "cabe3601001ab3838215116c32715c9de9412e62";
+    utilHash = "7fc6cfe1e69a0b2438eaee056e15d42a2d6be396a637fcfb1b89858fcecc832f";
     patch = makeAufs3StandalonePatch {
       inherit version;
-      rev = "1067b9d8d64d23c70d905c9cd3c90a669e39c4d4";
-      sha256 = "b508cab5987a623f057ae5fdc006c909a6bae6151af6e12fe672bf97b1a7549d";
+      rev = "517b27621cdfb793959acac849dae9888338526a";
+      sha256 = "8085200ac78d0c1e082d4c721a09f4a4c1d96ae86e307075836d09c3e7d502df";
+    };
+    features.aufsBase = true;
+    features.aufs3 = true;
+  };
+
+  aufs3_1 = rec {
+    name = "aufs3.1";
+    version = "3.1";
+    utilRev = "cabe3601001ab3838215116c32715c9de9412e62";
+    utilHash = "7fc6cfe1e69a0b2438eaee056e15d42a2d6be396a637fcfb1b89858fcecc832f";
+    patch = makeAufs3StandalonePatch {
+      inherit version;
+      rev = "7386b57432ec5e73632a5375804239b02b6c00f0";
+      sha256 = "af4e9ad890e1b72d14170c97d8ead53291f09e275db600932724e6181530be2d";
     };
     features.aufsBase = true;
     features.aufs3 = true;
@@ -383,31 +397,6 @@ rec {
       patch = ./guruplug-mach-type.patch;
     };
 
-  tuxonice_2_6_34 = makeTuxonicePatch {
-    version = "3.2-rc2";
-    kernelVersion = "2.6.34";
-    sha256 = "0bagqinmky1kmvg3vw8cdysqklxrsfjm7gqrpxviq9jq8vyycviz";
-  };
-
-  tuxonice_2_6_35 = makeTuxonicePatch {
-    version = "3.2-rc2";
-    kernelVersion = "2.6.35";
-    sha256 = "00jbrqq6p1lyvli835wczc0vqsn0z73jpb2aak3ak0vgnvsxw37q";
-  };
-
-  tuxonice_2_6_36 = makeTuxonicePatch {
-    version = "3.2-rc2";
-    kernelVersion = "2.6.36";
-    sha256 = "1vcw3gpjdghnkli46j37pc6rp8mqk8dh688jv8rppzsry0ll7b7k";
-  };
-
-  tuxonice_2_6_37 = makeTuxonicePatch {
-    version = "3.2-rc2";
-    kernelVersion = "2.6.37";
-    url = "http://tuxonice.net/files/current-tuxonice-for-2.6.37.patch_0.bz2";
-    sha256 = "0acllabvbm9pmjnh0zx9mgnp47xbrl9ih6i037c85h0ymnjsxdhk";
-  };
-
   glibc_getline =
     {
       # Patch to work around conflicting types for the `getline' function
@@ -415,13 +404,4 @@ rec {
       name = "glibc-getline";
       patch = ./getline.patch;
     };
-
-  efi_stub = 
-    {
-      # Patch to enable making the kernel a bootable efi image to avoid
-      # needing a bootloader on efi systems
-      # From the x86/efi-stub branch of git://github.com/mfleming/linux-2.6.git
-      name = "efi-stub";
-      patch = ./efi-stub.patch;
-    };
 }
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index b8cd2b18bc7..e1b8c0d2836 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -1,9 +1,18 @@
-{stdenv, fetchurl, perl, bison, mktemp, linuxHeaders, linuxHeadersCross}:
+{
+  stdenv,
+  fetchurl,
+  perl,
+  bison,
+  mktemp,
+  linuxHeaders,
+  linuxHeadersCross,
+  kernel ? null
+}:
 
 assert stdenv.isLinux;
 
 let
-  version = "1.5.20";
+  version = "1.5.24";
   baseMakeFlags = ["V=1" "prefix=$out" "SHLIBDIR=$out/lib"];
 in
 
@@ -11,18 +20,16 @@ stdenv.mkDerivation {
   name = "klibc-${version}";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/libs/klibc/1.5/klibc-${version}.tar.bz2";
-    sha256 = "07683dn18r3k35d6pp0sn88pqcx7dldqx3m6f2gz45i1j094qp7m";
+    url = "http://ftp.eu.openbsd.org/pub/linux/libs/klibc/1.5/klibc-${version}.tar.bz2";
+    sha256 = "18lm32dlj9k2ky9wwk274zmc3jndgrb41b6qm82g3lza6wlw3yki";
   };
 
-  patches = [ ./make382.patch ];
-
   # Trick to make this build on nix. It expects to have the kernel sources
   # instead of only the linux kernel headers.
   # So it cannot run the 'make headers_install' it wants to run.
   # We don't install the headers, so klibc will not be useful as libc, but
   # usually in nixpkgs we only use the userspace tools comming with klibc.
-  prePatch = ''
+  prePatch = stdenv.lib.optionalString (kernel == null) ''
     sed -i -e /headers_install/d scripts/Kbuild.install
   '';
   
@@ -51,10 +58,18 @@ stdenv.mkDerivation {
     echo "CONFIG_AEABI=y" >> defconfig
     makeFlags=$(eval "echo $makeFlags")
 
+  '' + (if kernel == null then ''
     mkdir linux
     cp -prsd $linuxHeaders/include linux/
     chmod -R u+w linux/include/
-  ''; # */
+  '' else ''
+    tar xvf ${kernel.src}
+    mv linux* linux
+    cd linux
+    ln -sv ${kernel}/config .config
+    make prepare
+    cd ..
+  '');
   
   # Install static binaries as well.
   postInstall = ''
diff --git a/pkgs/os-specific/linux/klibc/make382.patch b/pkgs/os-specific/linux/klibc/make382.patch
deleted file mode 100644
index e9e9aba4e79..00000000000
--- a/pkgs/os-specific/linux/klibc/make382.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-To avoid an endless loop with gnumake 3.82
-http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg228690.html
-
-Index: packages/klibc/klibc-make.patch
---- klibc-1.5.19/scripts/Kbuild.include.orig   2010-08-19 09:39:45.986816591 
-0200
-+++ klibc-1.5.19/scripts/Kbuild.include        2010-08-19 09:49:15.010816591 
-0200
-@@ -127,7 +127,7 @@
- # >'< substitution is for echo to work, >$< substitution to preserve $ when reloading .cmd file
- # note: when using inline perl scripts [perl -e '...$$t=1;...'] in $(cmd_xxx) double $$ your perl vars
- #
--if_changed = $(if $(strip $(filter-out $(PHONY),$?)          \
-+if_changed = $(if $(strip $(filter-out $(PHONY) FORCE,$?)          \
- 		$(call arg-check, $(cmd_$(1)), $(cmd_$@)) ), \
- 	@set -e; \
- 	$(echo-cmd) $(cmd_$(1)); \
-@@ -135,7 +135,7 @@
- 
- # execute the command and also postprocess generated .d dependencies
- # file
--if_changed_dep = $(if $(strip $(filter-out $(PHONY),$?)  \
-+if_changed_dep = $(if $(strip $(filter-out $(PHONY) FORCE,$?)  \
- 		$(filter-out FORCE $(wildcard $^),$^)    \
- 	$(call arg-check, $(cmd_$(1)), $(cmd_$@)) ),     \
- 	@set -e; \
-@@ -147,7 +147,7 @@
- # Usage: $(call if_changed_rule,foo)
- # will check if $(cmd_foo) changed, or any of the prequisites changed,
- # and if so will execute $(rule_foo)
--if_changed_rule = $(if $(strip $(filter-out $(PHONY),$?)            \
-+if_changed_rule = $(if $(strip $(filter-out $(PHONY) FORCE,$?)            \
- 			$(call arg-check, $(cmd_$(1)), $(cmd_$@)) ),\
- 			@set -e; \
- 			$(rule_$(1)))
diff --git a/pkgs/os-specific/linux/libcg/default.nix b/pkgs/os-specific/linux/libcg/default.nix
deleted file mode 100644
index 221150dc891..00000000000
--- a/pkgs/os-specific/linux/libcg/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{stdenv, fetchurl, pam, yacc, flex}:
-
-stdenv.mkDerivation rec {
-  name = "libcgroup-0.36.2";
-  src = fetchurl {
-    url = "mirror://sourceforge/libcg/${name}.tar.bz2";
-    sha256 = "1qvkd976485vyshaq1cwjzg6w54c3djsaic024yx3sfp14f1gnvz";
-  };
-  buildInputs = [ pam yacc flex ];
-  meta = {
-    description = "library that abstracts the control group file system in Linux";
-    homepage = "http://libcg.sourceforge.net";
-    license = "LGPL";
-  };
-}
diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix
new file mode 100644
index 00000000000..aa73867122f
--- /dev/null
+++ b/pkgs/os-specific/linux/libcgroup/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pam, yacc, flex }:
+
+stdenv.mkDerivation rec {
+  name = "libcgroup-0.37.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libcg/${name}.tar.bz2";
+    sha256 = "03awrn49bb84a9vaha1kjdbpwdnrfwmd08mlajjilr6kwlnn620b";
+  };
+
+  buildInputs = [ pam ];
+
+  buildNativeInputs = [ yacc flex ];
+  
+  meta = {
+    description = "Library and tools to manage Linux's cgroup resource management system";
+    homepage = http://libcg.sourceforge.net/;
+    license = "LGPL";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix
index 41b440a4898..7b7e1c96ab5 100644
--- a/pkgs/os-specific/linux/libsmbios/default.nix
+++ b/pkgs/os-specific/linux/libsmbios/default.nix
@@ -1,13 +1,16 @@
 { stdenv, fetchurl, pkgconfig, libxml2, perl }:
 
-stdenv.mkDerivation rec {
-  name = "libsmbios-2.2.19";
+let
+  name = "libsmbios-2.2.28";
+in
+stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
     url = "http://linux.dell.com/libsmbios/download/libsmbios/${name}/${name}.tar.gz";
-    sha256 = "0f4wnjml734ssg583r448ypax7vf3f9n8gybzvzg170lc3byayhv";
+    sha256 = "03m0n834w49acwbf5cf9ync1ksnn2jkwaysvy7584y60qpmngb91";
   };
-  
+
   buildInputs = [ pkgconfig libxml2 perl ];
 
   # It tries to install some Python stuff even when Python is disabled.
@@ -16,13 +19,16 @@ stdenv.mkDerivation rec {
   # It forgets to install headers.
   postInstall =
     ''
-      cp -a src/include/* $out/include
-      cp -a out/public-include/* $out/include
-    ''; # */
+      cp -va "src/include/"* "$out/include/"
+      cp -va "out/public-include/"* "$out/include/"
+    '';
 
   meta = {
-    homepage = http://linux.dell.com/libsmbios/main/index.html;
-    description = "A library to obtain BIOS information";
-    license = "GPLv2+"; # alternatively, under the Open Software License version 2.1
+    homepage = "http://linux.dell.com/libsmbios/main";
+    description = "a library to obtain BIOS information";
+    license = stdenv.lib.licenses.gpl2Plus; # alternatively, under the Open Software License version 2.1
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index 0a80e7c8dd0..a88107ae73d 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "mdadm-3.1.2";
-  
+
   src = fetchurl {
     url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.bz2";
     sha256 = "0s2d2a01j8cizxqvbgd0sn5bpa1j46q8976078b3jq1q7i1ir0zz";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildNativeInputs = [ groff ];
 
-  preConfigure = "sed -e 's@/lib/udev@\${out}/lib/udev@' -i Makefile";
+  preConfigure = "sed -e 's@/lib/udev@\${out}/lib/udev@' -e 's@ -Werror @ @' -i Makefile";
 
   # Force mdadm to use /var/run/mdadm.map for its map file (or
   # /dev/.mdadm/map as a fallback).
diff --git a/pkgs/os-specific/linux/module-init-tools/default.nix b/pkgs/os-specific/linux/module-init-tools/default.nix
index d29b8bee5e4..79e1111d40d 100644
--- a/pkgs/os-specific/linux/module-init-tools/default.nix
+++ b/pkgs/os-specific/linux/module-init-tools/default.nix
@@ -1,8 +1,8 @@
-{stdenv, fetchurl, docbook2x}:
+{ stdenv, fetchurl, docbook2x, docbook_sgml_dtd_41 }:
 
 stdenv.mkDerivation rec {
   name = "module-init-tools-3.16";
-  
+
   src = fetchurl {
     url = "mirror://kernel/linux/utils/kernel/module-init-tools/${name}.tar.bz2";
     sha256 = "0jxnz9ahfic79rp93l5wxcbgh4pkv85mwnjlbv1gz3jawv5cvwp1";
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ docbook2x ];
 
+  SGML_CATALOG_FILES = "${docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat";
+
   patches = [ ./module-dir.patch ./docbook2man.patch ];
   
   postInstall = "rm $out/sbin/insmod.static"; # don't need it
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 830745ea6b7..180eb84e5e4 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -39,6 +39,7 @@ installPhase() {
     ln -snf libnvidia-tls.so.$versionNumber $out/lib/tls/libnvidia-tls.so.1
     ln -snf libXvMCNVIDIA.so.$versionNumber $out/lib/libXvMCNVIDIA_dynamic.so.1
     ln -snf libcuda.so.$versionNumber $out/lib/libcuda.so.1
+    ln -snf libcuda.so.1 $out/lib/libcuda.so
     ln -snf libvdpau_nvidia.so.$versionNumber $out/lib/libvdpau_nvidia.so
 
     patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.*
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index f2065e1aa01..5b829db09cd 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -7,7 +7,7 @@
 
 with stdenv.lib;
 
-let versionNumber = "280.13"; in
+let versionNumber = "290.10"; in
 
 stdenv.mkDerivation {
   name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
@@ -18,12 +18,12 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "16xcidshamxvc80sdnkph5rpgf72m5zz4x155amg2433kkhsy8mj";
+        sha256 = "1amdqmgi8rf8mafc5d8jnw6rk1bxrmxc5jm4wm2p8xqzm99qzglr";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "14x80qirwlfxhphzqvi92lpgs82qnzb7hq0vd02rkbwvvnkhgdxd";
+        sha256 = "01d4cci1ipnamrxisdvsxjr6d4qbj257b46y0glm6grnw11i3x2g";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 1e2d20c1edb..1782d439c4f 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, flex, cracklib, libxcrypt }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "linux-pam-1.1.1";
 
   src = fetchurl {
@@ -17,6 +17,17 @@ stdenv.mkDerivation {
   crossAttrs = {
     # Skip libxcrypt cross-building, as it fails for mips and armv5tel
     propagatedBuildInputs = [ flex.hostDrv cracklib.hostDrv ];
+    preConfigure = preConfigure + ''
+      ar x ${flex.hostDrv}/lib/libfl.a
+      mv libyywrap.o libyywrap-target.o
+      ar x ${flex}/lib/libfl.a
+      mv libyywrap.o libyywrap-host.o
+      export LDFLAGS="$LDFLAGS $PWD/libyywrap-target.o"
+      sed -e 's/@CC@/gcc/' -i doc/specs/Makefile.in
+    '';
+    postConfigure = ''
+      sed -e "s@ $PWD/libyywrap-target.o@ $PWD/libyywrap-host.o@" -i doc/specs/Makefile
+    ''; 
   };
 
   postInstall = ''
diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix
index aaa7d6f04e0..3d8ca36c3ed 100644
--- a/pkgs/os-specific/linux/powertop/default.nix
+++ b/pkgs/os-specific/linux/powertop/default.nix
@@ -6,6 +6,16 @@ stdenv.mkDerivation {
     url = http://www.lesswatts.org/projects/powertop/download/powertop-1.13.tar.gz;
     sha256 = "164dqp6msdaxpi2bmvwawasyrf1sfvanlc9ddp97v1wnjh46dj1b";
   };
-  patches = [./powertop-1.13.patch];
+  patches = [
+    ./powertop-1.13.patch
+    ./inotify_user.patch
+    ./modprobe_configs.patch
+  ];
   buildInputs = [ncurses gettext];
+  meta = {
+    description = "Analyze power consumption on Intel-based laptops";
+    license = "GPLv2";
+    maintainers = [ stdenv.lib.maintainers.chaoflow ];
+    platforms = stdenv.lib.platforms.linux;
+  };
 }
diff --git a/pkgs/os-specific/linux/powertop/inotify_user.patch b/pkgs/os-specific/linux/powertop/inotify_user.patch
new file mode 100644
index 00000000000..46caed050f4
--- /dev/null
+++ b/pkgs/os-specific/linux/powertop/inotify_user.patch
@@ -0,0 +1,28 @@
+From 89e46f3270e3b6d704959c4d0f44ae6bab8f7616 Mon Sep 17 00:00:00 2001
+From: Florian Friesdorf <flo@chaoflow.net>
+Date: Thu, 13 Oct 2011 10:14:34 +0200
+Subject: [PATCH] CONFIG_INOTIFY_USER instead of CONFIG_INOTIFY
+
+since 2.6.36 the former fully replaced the latter
+---
+ powertop.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/powertop.c b/powertop.c
+index 74eb328..8df3652 100644
+--- a/powertop.c
++++ b/powertop.c
+@@ -1191,8 +1191,8 @@ int main(int argc, char **argv)
+ 		suggest_kernel_config("CONFIG_CPU_FREQ_STAT", 1,
+ 				    _("Suggestion: Enable the CONFIG_CPU_FREQ_STAT kernel configuration option.\n"
+ 				      "This option allows PowerTOP to show P-state percentages \n" "P-states correspond to CPU frequencies."), 2);
+-		suggest_kernel_config("CONFIG_INOTIFY", 1,
+-				    _("Suggestion: Enable the CONFIG_INOTIFY kernel configuration option.\n"
++		suggest_kernel_config("CONFIG_INOTIFY_USER", 1,
++				    _("Suggestion: Enable the CONFIG_INOTIFY_USER kernel configuration option.\n"
+ 				      "This option allows programs to wait for changes in files and directories\n"
+ 				      "instead of having to poll for these changes"), 5);
+ 
+-- 
+1.7.6
+
diff --git a/pkgs/os-specific/linux/powertop/modprobe_configs.patch b/pkgs/os-specific/linux/powertop/modprobe_configs.patch
new file mode 100644
index 00000000000..3d6e2a28761
--- /dev/null
+++ b/pkgs/os-specific/linux/powertop/modprobe_configs.patch
@@ -0,0 +1,28 @@
+From 0002a70b83221a8a831d776836d13105ac886323 Mon Sep 17 00:00:00 2001
+From: Florian Friesdorf <flo@chaoflow.net>
+Date: Thu, 13 Oct 2011 14:57:02 +0200
+Subject: [PATCH] powertop tries to load configs, if /proc/config.gz is
+ missing
+
+---
+ config.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/config.c b/config.c
+index b2567f2..62ac978 100644
+--- a/config.c
++++ b/config.c
+@@ -44,6 +44,10 @@ static void read_kernel_config(void)
+ 	char filename[100];
+ 	if (configcount)
+ 		return;
++	if (access("/proc/config.gz", R_OK) != 0) {
++		file = popen("modprobe configs >/dev/null 2>&1", "r");
++		pclose(file);
++	}
+ 	if (access("/proc/config.gz", R_OK) == 0) {
+ 		file = popen("zcat /proc/config.gz 2> /dev/null", "r");
+ 		while (file && !feof(file)) {
+-- 
+1.7.6
+
diff --git a/pkgs/os-specific/linux/powertop/powertop-1.13.patch b/pkgs/os-specific/linux/powertop/powertop-1.13.patch
index d8a7d546c54..cf66b297190 100644
--- a/pkgs/os-specific/linux/powertop/powertop-1.13.patch
+++ b/pkgs/os-specific/linux/powertop/powertop-1.13.patch
@@ -1,7 +1,7 @@
 diff -ru powertop-1.13/Makefile powertop-1.13.new/Makefile
 --- powertop-1.13/Makefile
 +++ powertop-1.13.new/Makefile
-@@ -1,6 +1,6 @@
+@@ -1,8 +1,8 @@
  VERSION = 1.13
  
 -BINDIR=/usr/bin
@@ -10,6 +10,6 @@ diff -ru powertop-1.13/Makefile powertop-1.13.new/Makefile
 +BINDIR=${out}/bin
 +LOCALESDIR=${out}/share/locale
 +MANDIR=${out}/share/man/man8
- WARNFLAGS=-Wall  -W -Wshadow -W -Wformat -Wimplicit-function-declaration -Wimplicit-int
+ WARNFLAGS=-Wall -Wshadow -W -Wformat -Wimplicit-function-declaration -Wimplicit-int
  CFLAGS?=-Os -g ${WARNFLAGS}
  CC?=gcc
diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix
index 3f35d3304ce..821084c1b33 100644
--- a/pkgs/os-specific/linux/qemu-kvm/default.nix
+++ b/pkgs/os-specific/linux/qemu-kvm/default.nix
@@ -4,11 +4,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "qemu-kvm-0.15.0";
+  name = "qemu-kvm-0.15.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/kvm/${name}.tar.gz";
-    sha256 = "0y247bc2cyawliaiyk8k41kl3mcjvh52b9bgzvxv0h55zwdpg3l2";
+    sha256 = "0gkk96yid3nq8i4z8xbiarj0r9v7b2zavf5mnh0rc7kclzxa7mmf";
   };
 
   patches = [ ./smb-tmpdir.patch ];
diff --git a/pkgs/os-specific/linux/regionset/default.nix b/pkgs/os-specific/linux/regionset/default.nix
new file mode 100644
index 00000000000..699c4cd82b8
--- /dev/null
+++ b/pkgs/os-specific/linux/regionset/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "regionset-20030629";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/dvd/regionset.tar.gz";
+    sha256 = "0ssr7s0g60kq04y8v60rh2fzn9wp93al3v4rl0ybza1skild9v70";
+  };
+
+  installPhase = "mkdir -p $out/sbin; cp regionset $out/sbin";
+
+  meta = {
+    homepage = http://dvd.sourceforge.net/;
+    descriptions = "Tool for changing the region code setting of DVD players";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index e4722f26d2b..f14b249d514 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -1,22 +1,31 @@
-{ stdenv, fetchurl, pam, glibc }:
-   
+{ stdenv, fetchurl, pam ? null, glibcCross ? null }:
+
+let
+  glibc = if stdenv ? cross
+          then glibcCross
+          else assert stdenv ? glibc; stdenv.glibc;
+in
 stdenv.mkDerivation rec {
   name = "shadow-4.1.4.2";
-   
+
   src = fetchurl {
     url = "http://pkg-shadow.alioth.debian.org/releases/${name}.tar.bz2";
     sha256 = "1449ny7pdnwkavg92wvibapnkgdq5pas38nvl1m5xa37g5m7z64p";
   };
 
-  buildInputs = [ pam ];
+  buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam;
 
   patches = [ ./no-sanitize-env.patch ./su-name.patch ./keep-path.patch ];
 
-  preBuild =
+  # Assume System V `setpgrp (void)', which is the default on GNU variants
+  # (`AC_FUNC_SETPGRP' is not cross-compilation capable.)
+  preConfigure = "export ac_cv_func_setpgrp_void=yes";
+
+  preBuild = assert glibc != null;
     ''
       substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc}/sbin/nscd
     '';
-  
+
   meta = {
     homepage = http://pkg-shadow.alioth.debian.org/;
     description = "Suite containing authentication-related tools such as passwd and su";
diff --git a/pkgs/os-specific/linux/udev/173.nix b/pkgs/os-specific/linux/udev/173.nix
index ba96717e494..41b17777edc 100644
--- a/pkgs/os-specific/linux/udev/173.nix
+++ b/pkgs/os-specific/linux/udev/173.nix
@@ -44,7 +44,12 @@ stdenv.mkDerivation rec {
       rm -frv $out/share/gtk-doc
     '';
 
-  patches = [ ./custom-rules.patch ];
+  patches = [ ./custom-rules.patch ] ++
+    [(fetchurl {
+      url = https://bugs.archlinux.org/task/25356?getfile=7281;
+      sha256 = "01xib1pfdbwacgx8dqxgrf67a0mwkpm4kxy9f9v3df93v0m4pmbm";
+    })] ++
+    stdenv.lib.optional (stdenv.system == "armv5tel-linux") ./pre-accept4-kernel.patch;
 
   meta = {
     homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html;
diff --git a/pkgs/os-specific/linux/udev/pre-accept4-kernel.patch b/pkgs/os-specific/linux/udev/pre-accept4-kernel.patch
new file mode 100644
index 00000000000..2cf549d99a7
--- /dev/null
+++ b/pkgs/os-specific/linux/udev/pre-accept4-kernel.patch
@@ -0,0 +1,43 @@
+From:
+https://github.com/archlinuxarm/PKGBUILDs/blob/master/core/udev-oxnas/pre-accept4-kernel.patch
+
+diff -urN a/udev/udev-ctrl.c b/udev/udev-ctrl.c
+--- a/udev/udev-ctrl.c	2011-10-09 17:10:32.000000000 -0600
++++ b/udev/udev-ctrl.c	2011-10-25 15:11:09.000000000 -0600
+@@ -15,6 +15,7 @@
+ #include <stddef.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <fcntl.h>
+ #include <sys/types.h>
+ #include <sys/poll.h>
+ #include <sys/socket.h>
+@@ -182,6 +183,7 @@
+ 	struct ucred ucred;
+ 	socklen_t slen;
+ 	const int on = 1;
++	int flgs;
+ 
+ 	conn = calloc(1, sizeof(struct udev_ctrl_connection));
+ 	if (conn == NULL)
+@@ -189,13 +191,19 @@
+ 	conn->refcount = 1;
+ 	conn->uctrl = uctrl;
+ 
+-	conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK);
++//	conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK);
++	conn->sock = accept(uctrl->sock, NULL, NULL);
+ 	if (conn->sock < 0) {
+ 		if (errno != EINTR)
+ 			err(uctrl->udev, "unable to receive ctrl connection: %m\n");
+ 		goto err;
+ 	}
+ 
++// Since we don't have accept4
++	flgs = fcntl(conn->sock, F_GETFL, NULL);
++	if(flgs >= 0) fcntl(conn->sock, F_SETFL, flgs | O_NONBLOCK);
++	fcntl(conn->sock, F_SETFD, FD_CLOEXEC);
++
+ 	/* check peer credential of connection */
+ 	slen = sizeof(ucred);
+ 	if (getsockopt(conn->sock, SOL_SOCKET, SO_PEERCRED, &ucred, &slen) < 0) {
diff --git a/pkgs/os-specific/linux/upstart/default.nix b/pkgs/os-specific/linux/upstart/default.nix
index fba83235475..4e440770ef9 100644
--- a/pkgs/os-specific/linux/upstart/default.nix
+++ b/pkgs/os-specific/linux/upstart/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, dbus, libnih }:
 
 stdenv.mkDerivation rec {
-  name = "upstart-0.6.7";
+  name = "upstart-1.3";
   
   src = fetchurl {
-    url = "http://upstart.ubuntu.com/download/0.6/${name}.tar.gz";
-    sha256 = "1f1pds27cadi6ycii1fkn5bbs1brjqxa2b45wfn03ikc2azqxlr9";
+    url = "http://upstart.ubuntu.com/download/1.3/${name}.tar.gz";
+    md5 = "7820797b64878c27115fff6a7398a6a9";
   };
 
   buildInputs = [ pkgconfig dbus libnih ];
diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix
index b3093b22a25..96ae5b93aa8 100644
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/pkgs/os-specific/linux/usbutils/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   name = "usbutils-0.86";
   
   src = fetchurl {
-    url = "mirror://sourceforge/linux-usb/${name}.tar.gz";
+    url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.gz";
     sha256 = "1x0jkiwrgdb8qwy21iwhxpc8k61apxqp1901h866d1ydsakbxcmk";
   };
   
diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix
new file mode 100644
index 00000000000..c8924f91c57
--- /dev/null
+++ b/pkgs/os-specific/linux/v86d/default.nix
@@ -0,0 +1,32 @@
+{stdenv, fetchurl, klibc, kernel, withKlibc ? true}:
+
+stdenv.mkDerivation rec {
+  name = "v86d-0.1.10";
+
+  src = fetchurl {
+    url = "http://dev.gentoo.org/~spock/projects/uvesafb/archive/${name}.tar.bz2";
+    sha256 = "0p3kwqjis941pns9948dxfnjnl5lwd8f2b6x794whs7g32p68jb3";
+  };
+
+  buildInputs = stdenv.lib.optional withKlibc klibc;
+
+  configurePhase = ''
+    bash ./configure $configureFlags
+  '';
+
+  configureFlags = if withKlibc then [ "--with-klibc" ] else [ "--default" ];
+
+  makeFlags = [
+    "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/source"
+    "DESTDIR=$(out)"
+  ];
+
+  meta = {
+    description = "A userspace helper that runs x86 code in an emulated environment";
+    homepage = http://dev.gentoo.org/~spock/projects/uvesafb/;
+    license = "BSD";
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+}
+
diff --git a/pkgs/servers/http/apache-httpd/default.nix b/pkgs/servers/http/apache-httpd/default.nix
index 22f733e40c6..0d586b0c3a6 100644
--- a/pkgs/servers/http/apache-httpd/default.nix
+++ b/pkgs/servers/http/apache-httpd/default.nix
@@ -8,12 +8,12 @@ assert sslSupport -> openssl != null;
 assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 
 stdenv.mkDerivation rec {
-  version = "2.2.20";
+  version = "2.2.21";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha1 = "c8f00a505af6ed3f89f45b640217c388f5cd32b0";
+    sha1 = "c02f9b05da9a7e316ff37d9053dc76a57ba51cb4";
   };
 
   buildInputs = [perl apr aprutil pcre] ++
diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix
index 3fa253af397..08bc45443a3 100644
--- a/pkgs/servers/http/couchdb/default.nix
+++ b/pkgs/servers/http/couchdb/default.nix
@@ -1,4 +1,4 @@
-args @ {stdenv, fetchurl, erlang, spidermonkey, 
+args @ {stdenv, fetchurl, erlang, spidermonkey,
 	icu, getopt, curl, ...}:
 
 let s = import ./src-for-default.nix; in
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     sed -i -e "s|\`getopt|\`${getopt}/bin/getopt|" $out/bin/couchdb
   '';
- 
-  configureFlags = "--with-erlang=${erlang}/lib/erlang/usr/include"; 
+
+  configureFlags = "--with-erlang=${erlang}/lib/erlang/usr/include --with-js-include=${spidermonkey}/include --with-js-lib=${spidermonkey}/lib";
 
 }
diff --git a/pkgs/servers/http/couchdb/src-for-default.nix b/pkgs/servers/http/couchdb/src-for-default.nix
index f7dd2199b54..0c174feed8d 100644
--- a/pkgs/servers/http/couchdb/src-for-default.nix
+++ b/pkgs/servers/http/couchdb/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="1.0.1";
-   name="couchdb-1.0.1";
-   hash="07wb21qi471qbb6nqlmdmmvg4z8f7m9wn2bm22c7fig32gz5njmp";
-   url="mirror://apache/couchdb/1.0.1/apache-couchdb-${version}.tar.gz";
-   advertisedUrl="http://www.apache.org/dist/couchdb/1.0.1/apache-couchdb-1.0.1.tar.gz";
-  
-  
+   version="1.1.1";
+   name="couchdb-1.1.1";
+   hash="9d6592aacd4bc139f8c1ccb0ed80f30021cee50eb7f8a1feddf46b6eb963891c";
+   url="mirror://apache/couchdb/${version}/apache-couchdb-${version}.tar.gz";
+   advertisedUrl="http://www.apache.org/dist/couchdb/${version}/apache-couchdb-${version}.tar.gz";
+
+
 }
diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index 4d1d39ba417..6cdc57d11b5 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -1,15 +1,12 @@
-a :  
-let 
-  s = import ./src-for-default.nix;
-  buildInputs = with a; [
-    openssl zlib pcre libxml2 libxslt
-  ];
-in
-rec {
-  src = a.fetchUrlFromSrcInfo s;
+{ stdenv, fetchurl, openssl, zlib, pcre, libxml2, libxslt }:
+stdenv.mkDerivation rec {
+  name = "nginx-1.1.7";
+  src = fetchurl {
+    url = "http://nginx.org/download/${name}.tar.gz";
+    sha256 = "1y0bzmrgnyqw8ghc508nipy5k46byrxc2sycqp35fdx0jmjz3h51";
+  };
+  buildInputs = [ openssl zlib pcre libxml2 libxslt ];
 
-  inherit (s) name;
-  inherit buildInputs;
   configureFlags = [
     "--with-http_ssl_module"
     "--with-http_xslt_module"
@@ -21,18 +18,16 @@ rec {
     # "--with-http_perl_module" 
   ];
 
-  preConfigure = a.fullDepEntry ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.libxml2}/include/libxml2"
-  '' [];
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2"
+  '';
 
-  phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
-      
   meta = {
     description = "nginx - 'engine x' - reverse proxy and lightweight webserver";
     maintainers = [
-      a.lib.maintainers.raskin
+      stdenv.lib.maintainers.raskin
     ];
-    platforms = with a.lib.platforms; 
+    platforms = with stdenv.lib.platforms; 
       all;
   };
 }
diff --git a/pkgs/servers/http/nginx/src-for-default.nix b/pkgs/servers/http/nginx/src-for-default.nix
deleted file mode 100644
index 319427c0e02..00000000000
--- a/pkgs/servers/http/nginx/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
-   version="1.0.0";
-   name="nginx-1.0.0";
-   hash="00f0fjkdqi0xl1kcg6d91zmvj82n8w1znp5w9v152rymxv5ddqrx";
-   url="http://sysoev.ru/nginx/nginx-${version}.tar.gz";
-   advertisedUrl="http://sysoev.ru/nginx/nginx-1.0.0.tar.gz";
-  
-  
-}
diff --git a/pkgs/servers/http/nginx/src-info-for-default.nix b/pkgs/servers/http/nginx/src-info-for-default.nix
deleted file mode 100644
index 10ba1c8cd4b..00000000000
--- a/pkgs/servers/http/nginx/src-info-for-default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  downloadPage = "http://sysoev.ru/nginx/download.html";
-  baseName = "nginx";
-}
diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix
index 66e0f78f5ca..0208420d132 100644
--- a/pkgs/servers/http/tomcat/axis2/default.nix
+++ b/pkgs/servers/http/tomcat/axis2/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, apacheAnt, jdk, unzip}:
 
 stdenv.mkDerivation {
-  name = "axis2-1.5.4";
+  name = "axis2-1.6.1";
 
   src = fetchurl {
-    url = http://apache.mirror.easycolocate.nl/axis/axis2/java/core/1.5.4/axis2-1.5.4-bin.zip;
-    sha256 = "0mqnsj14g8aqmh3gjxgys6kwa7q8jkjgczb0hlcr4v2par0hdfng";
+    url = http://apache.mirror.versatel.nl//axis/axis2/java/core/1.6.1/axis2-1.6.1-bin.zip;
+    sha256 = "1a0p85qh9924dv3y7zivf62hy1jzdaxnndqh93g6lndmacfhkk64";
   };
 
   buildInputs = [ unzip apacheAnt jdk ];
diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/servers/identd/oidentd/default.nix
new file mode 100644
index 00000000000..04ad25b3fd3
--- /dev/null
+++ b/pkgs/servers/identd/oidentd/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "oidentd-2.0.8";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/ojnk/${name}.tar.gz";
+    sha256 = "0vzv2086rrxcaavrm3js7aqvyc0grgaqy78x61d8s7r8hz8vwk55";
+  };
+
+  meta = {
+    homepage = http://ojnk.sourceforge.net/;
+    description = "An implementation of the IDENT protocol";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/servers/mail/dovecot/2.0.nix b/pkgs/servers/mail/dovecot/2.0.nix
new file mode 100644
index 00000000000..80cb237f6df
--- /dev/null
+++ b/pkgs/servers/mail/dovecot/2.0.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl, openssl, pam, bzip2, zlib}:
+
+stdenv.mkDerivation {
+  name = "dovecot-2.0.15";
+
+  buildInputs = [openssl pam bzip2 zlib];
+
+  src = fetchurl {
+    url = http://dovecot.org/releases/2.0/dovecot-2.0.15.tar.gz;
+    sha256 = "03byp6alxxk65qfjjnqp6kcncs5cdiqgskx90nk9kcnynl1h6r33";
+  };
+
+  # It will hardcode this for /var/lib/dovecot.
+  # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626211
+  configureFlags = [ "--localstatedir=/var" ];
+
+  meta = {
+    homepage = http://dovecot.org/;
+    description = "Open source IMAP and POP3 email server written with security primarily in mind";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+  
+}
diff --git a/pkgs/servers/mail/postfix/db-linux3.patch b/pkgs/servers/mail/postfix/db-linux3.patch
new file mode 100644
index 00000000000..c9dd4646798
--- /dev/null
+++ b/pkgs/servers/mail/postfix/db-linux3.patch
@@ -0,0 +1,39 @@
+diff --git a/makedefs b/makedefs
+index b8b98c8..94443c0 100644
+--- a/makedefs
++++ b/makedefs
+@@ -341,20 +341,20 @@ EOF
+ 		esac
+ 		;;
+     Linux.3*)	SYSTYPE=LINUX3
+-		if [ -f /usr/include/db.h ]
+-		then
+-		    : we are all set
+-		elif [ -f /usr/include/db/db.h ]
+-		then
+-		    CCARGS="$CCARGS -I/usr/include/db"
+-		else
+-		    # On a properly installed system, Postfix builds
+-		    # by including <db.h> and by linking with -ldb
+-		    echo "No <db.h> include file found." 1>&2
+-		    echo "Install the appropriate db*-devel package first." 1>&2
+-		    echo "See the RELEASE_NOTES file for more information." 1>&2
+-		    exit 1
+-		fi
++		#if [ -f /usr/include/db.h ]
++		#then
++		    #: we are all set
++		#elif [ -f /usr/include/db/db.h ]
++		#then
++		    #CCARGS="$CCARGS -I/usr/include/db"
++		#else
++		    ## On a properly installed system, Postfix builds
++		    ## by including <db.h> and by linking with -ldb
++		    #echo "No <db.h> include file found." 1>&2
++		    #echo "Install the appropriate db*-devel package first." 1>&2
++		    #echo "See the RELEASE_NOTES file for more information." 1>&2
++		    #exit 1
++		#fi
+ 		SYSLIBS="-ldb"
+ 		for name in nsl resolv
+ 		do
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index acd3342775f..0fa2bf821a4 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, db4, glibc, openssl, cyrus_sasl
-, coreutils, findutils, gnused, gnugrep
+, coreutils, findutils, gnused, gnugrep, bison, perl
 }:
 
 assert stdenv.isLinux;
 
 stdenv.mkDerivation {
-  name = "postfix-2.2.11";
+  name = "postfix-2.8.6";
   
   src = fetchurl {
-    url = ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/postfix-2.2.11.tar.gz;
-    sha256 = "04hxpyd3h1f48fnppjwqqxbil13bcwidzpfkra2pgm7h42d9blq7";
+    url = ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/postfix-2.8.6.tar.gz;
+    sha256 = "1rfsfhna5hy5lc6hkg1zc2862pdc5c1y9z6aiy8rinlmzrfplhlb";
   };
 
   installTargets = ["non-interactive-package"];
@@ -26,8 +26,8 @@ stdenv.mkDerivation {
 
     mkdir $out/share/postfix/conf
     cp conf/* $out/share/postfix/conf
-    sed -e 's@PATH=.*@PATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:$out/sbin@' -i $out/share/postfix/conf/post-install
-    sed -e '2aPATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:$out/sbin' -i $out/share/postfix/conf/postfix-script
+    sed -e 's@PATH=.*@PATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:'$out'/sbin@' -i $out/share/postfix/conf/post-install $out/libexec/postfix/post-install
+    sed -e '2aPATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:'$out'/sbin' -i $out/share/postfix/conf/postfix-script $out/libexec/postfix/postfix-script
     chmod a+x $out/share/postfix/conf/{postfix-script,post-install}
   '';
 
@@ -43,12 +43,18 @@ stdenv.mkDerivation {
     export sample_directory=$out/share/postfix/doc/samples
     export readme_directory=$out/share/postfix/doc
 
-    make makefiles CCARGS='-DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -DHAS_DB -I${cyrus_sasl}/include/sasl' AUXLIBS='-lssl -lcrypto -lsasl2 -ldb'
+    make makefiles CCARGS='-DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${cyrus_sasl}/include/sasl' AUXLIBS='-lssl -lcrypto -lsasl2 -ldb -lnsl'
   '';
 
-  buildInputs = [db4 openssl cyrus_sasl];
+  buildInputs = [db4 openssl cyrus_sasl bison perl];
   
-  patches = [./postfix-2.2.9-db.patch ./postfix-2.2.9-lib.patch];
+  patches = [ ./postfix-2.2.9-db.patch  ./postfix-2.2.9-lib.patch ./db-linux3.patch ];
+
+  postPatch = ''
+    sed -i -e s,/usr/bin,/var/run/current-system/sw/bin, \
+      -e s,/usr/sbin,/var/run/current-system/sw/sbin, \
+      -e s,:/sbin,, src/util/sys_defs.h
+  '';
   
   inherit glibc;
 }
diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix
new file mode 100644
index 00000000000..4f689bae658
--- /dev/null
+++ b/pkgs/servers/mpd/clientlib.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libmpdclient-2.6";
+  src = fetchurl {
+    url = "mirror://sourceforge/musicpd/${name}.tar.bz2";
+    sha256 = "1j8kn0fawdsvczrkhf6xm2yp0h6w49b326i3c08zwvhskd3phljw";
+  };
+
+  meta = {
+    description = "Client library for MPD (music player daemon)";
+    homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki;
+    license = "GPLv2";
+    platforms = with stdenv.lib.platforms; linux;
+    maintainers = [ stdenv.lib.maintainers.mornfall ];
+  };
+}
diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix
index 330bcc2e863..ba7de83d939 100644
--- a/pkgs/servers/openafs-client/default.nix
+++ b/pkgs/servers/openafs-client/default.nix
@@ -1,63 +1,47 @@
-{ stdenv, fetchurl, autoconf, automake, flex, yacc,
+{ stdenv, fetchurl, which, autoconf, automake, flex, yacc,
   kernel, glibc, ncurses, perl, krb5 }:
 
 assert stdenv.isLinux;
 
-let
-  pname = "openafs";
-  version = "1.4.11";
-  name = "${pname}-${version}-${kernel.version}";
-  webpage = http://www.openafs.org;
-in
-
-stdenv.mkDerivation rec {
-  inherit name;
+stdenv.mkDerivation {
+  name = "openafs-1.6.0-${kernel.version}";
 
   src = fetchurl {
-    url = "${webpage}/dl/${pname}/${version}/${pname}-${version}-src.tar.gz";
-    sha256 = "ea5377119fd7b5317428644fa427066b9edbde395d997943a448426742d2c5c9";
+    url = http://www.openafs.org/dl/openafs/1.6.0/openafs-1.6.0-src.tar.bz2;
+    sha256 = "1rj40qp30hswr08p69jigya78ggbn4dc7qnnw2sfjpv52ywa68p7";
   };
 
-  buildInputs = [ autoconf automake flex yacc ncurses perl ];
+  buildInputs = [ autoconf automake flex yacc ncurses perl which ];
 
-  replace_usrbinenv = ./replace-usrbinenv;
-  replace_usrinclude = ./replace-usrinclude;
-  replace_usrbinperl = ./replace-usrbinperl;
-  replace_usrsrc = ./replace-usrsrc;
-
-  configurePhase = ''
+  preConfigure = ''
     ln -s ${kernel}/lib/modules/*/build $TMP/linux
 
-    echo "Replace ..."
-    for i in `cat ${replace_usrbinenv}`; do
-      substituteInPlace $i --replace "/usr/bin/env" $(type -tp env)
+    patchShebangs .
+    for i in `grep -l -R '/usr/\(include\|src\)' .`; do
+      echo "Patch /usr/include and /usr/src in $i"
+      substituteInPlace $i \
+        --replace "/usr/include" "${glibc}/include" \
+        --replace "/usr/src" "$TMP"
     done
-    for i in `cat ${replace_usrinclude}`; do
-      substituteInPlace $i --replace "/usr/include" "${glibc}/include"
-    done
-    for i in `cat ${replace_usrbinperl}`; do
-      substituteInPlace $i --replace "/usr/bin/perl" $(type -tp perl)
-    done
-    for i in `cat ${replace_usrsrc}`; do
-      substituteInPlace $i --replace "/usr/src" "$TMP"
-    done
-    echo "... done"
 
     ./regen.sh
 
-    ./configure \
-       --prefix=$out \
-       --with-linux-kernel-build=$TMP/linux \
-       --with-krb5-conf=${krb5}/bin/krb5-config \
-       --sysconfdir=/etc/static
-       #--with-afs-sysname=amd64_linux26 \
+    export KRB5_CONFIG=${krb5}/bin/krb5-config
 
-    substituteInPlace src/pinstall/install.c --replace "/bin/cp" $(type -tp cp)
+    configureFlagsArray=(
+      "--with-linux-kernel-build=$TMP/linux"
+      "--with-krb5"
+      "--sysconfdir=/etc/static"
+    )
   '';
 
   meta = {
-      description = "Open AFS client for Linux";
-      homepage = webpage;
-      license = "IPL";
+    description = "Open AFS client";
+    homepage = http://www.openafs.org;
+    license = stdenv.lib.licenses.ipl10;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [
+      z77z
+    ];
   };
 }
diff --git a/pkgs/servers/openafs-client/replace-usrbinenv b/pkgs/servers/openafs-client/replace-usrbinenv
deleted file mode 100644
index b014e899272..00000000000
--- a/pkgs/servers/openafs-client/replace-usrbinenv
+++ /dev/null
@@ -1,72 +0,0 @@
-src/tests/ptsmembersuser.pl
-src/tests/bossalvagevolume.pl
-src/tests/bosstop.pl
-src/tests/baduniq.pl
-src/tests/voslistvol.pl
-src/tests/aclremoveuser.pl
-src/tests/vosbackup.pl
-src/tests/bosaddhost.pl
-src/tests/vosremove.pl
-src/tests/bosexec.pl
-src/tests/boscreate.pl
-src/tests/bosremovehost.pl
-src/tests/reauth.pl
-src/tests/ptsexamineuser.pl
-src/tests/ptsmembersgroup.pl
-src/tests/bosremovekey.pl
-src/tests/voslistvldb.pl
-src/tests/bosshutdown.pl
-src/tests/bosadduser.pl
-src/tests/aclclearnegrights.pl
-src/tests/boslisthosts.pl
-src/tests/ptslistmax.pl
-src/tests/vosrestore.pl
-src/tests/acladdrights.pl
-src/tests/ptslistown.pl
-src/tests/bosstart.pl
-src/tests/vospartinfo.pl
-src/tests/bosrestartstopped.pl
-src/tests/voszap.pl
-src/tests/vosexamine.pl
-src/tests/acladdnegrights.pl
-src/tests/ptsdeletegroup.pl
-src/tests/bosdelete.pl
-src/tests/bosstatus.pl
-src/tests/aclcopy.pl
-src/tests/ptscreateuser.pl
-src/tests/vosrelease.pl
-src/tests/bosremoveuser.pl
-src/tests/ptsexaminegroup.pl
-src/tests/voslock.pl
-src/tests/vossyncserv.pl
-src/tests/ptsadduser.pl
-src/tests/bossalvagepart.pl
-src/tests/ptsdeleteuser.pl
-src/tests/voslistpart.pl
-src/tests/vosunlock.pl
-src/tests/boslistkeys.pl
-src/tests/voscreate.pl
-src/tests/vosunlockall.pl
-src/tests/vosdump.pl
-src/tests/vosaddsite.pl
-src/tests/acladdgroup.pl
-src/tests/acladduser.pl
-src/tests/afs-newcell.pl
-src/tests/bosaddkey.pl
-src/tests/ptsremove.pl
-src/tests/aclremovegroup.pl
-src/tests/vosremsite.pl
-src/tests/ptschown.pl
-src/tests/ptssetf.pl
-src/tests/afs-rmcell.pl
-src/tests/bosinstall.pl
-src/tests/boslistusers.pl
-src/tests/vossyncvldb.pl
-src/tests/vosdelentry.pl
-src/tests/vosmove.pl
-src/tests/run-suite.pl
-src/tests/vosrename.pl
-src/tests/ptscreategroup.pl
-src/tests/bosdeleterunning.pl
-src/tests/ptssetmax.pl
-src/tests/bossalvageserver.pl
diff --git a/pkgs/servers/openafs-client/replace-usrbinperl b/pkgs/servers/openafs-client/replace-usrbinperl
deleted file mode 100644
index d0742adf06b..00000000000
--- a/pkgs/servers/openafs-client/replace-usrbinperl
+++ /dev/null
@@ -1,16 +0,0 @@
-src/libafs/make_kbuild_makefile.pl
-src/mkdest.pl
-src/tools/install/write_fstab.pl
-src/tools/install/write_pam.pl
-src/tools/install/check_udebug.pl
-src/config/make_libafs_tree.pl
-src/config/make_vnode.pl
-src/packaging/Debian/afs-newcell
-src/packaging/Debian/afs-rootvol
-src/packaging/Debian/kernel-version
-src/packaging/MacOS/csrvdbmerge.pl
-src/packaging/MacOS/decode-panic
-src/packaging/MacOS/Uninstall
-src/packaging/RedHat/mockbuild.pl
-src/packaging/RedHat/openafs-buildfedora.pl
-src/packaging/RedHat/makesrpm.pl
diff --git a/pkgs/servers/openafs-client/replace-usrinclude b/pkgs/servers/openafs-client/replace-usrinclude
deleted file mode 100644
index 65cd5394912..00000000000
--- a/pkgs/servers/openafs-client/replace-usrinclude
+++ /dev/null
@@ -1,42 +0,0 @@
-acinclude.m4
-config.guess
-configure
-configure-libafs
-src/libafs/MakefileProto.NBSD.in
-src/libafs/MakefileProto.HPUX.in
-src/libafs/MakefileProto.FBSD.in
-src/libafs/MakefileProto.OBSD.in
-src/libafs/MakefileProto.DFBSD.in
-src/libafs/MakefileProto.AIX.in
-src/libafs/MakefileProto.DARWIN.in
-src/libafs/MakefileProto.SOLARIS.in
-src/libafs/Makefile.common.in
-src/libafs/MakefileProto.IRIX.in
-src/WINNT/kfw/inc/krb4/conf.h
-src/JAVA/libjafs/Makefile.in
-src/splint.cfg
-src/util/vice.h
-src/cf/osconf.m4
-src/vfsck/dir.c
-src/vfsck/main.c
-src/vfsck/utilities.c
-src/vfsck/vprintf.c
-src/vfsck/pass2.c
-src/vfsck/inode.c
-src/afsweb/apache_includes/1.2/buff.h
-src/afsweb/apache_includes/1.2/conf.h
-src/afsweb/apache_includes/1.3.1/buff.h
-src/afsweb/apache_includes/1.3.1/ap_config.h
-src/afsweb/apache_includes/buff.h
-src/afsweb/apache_includes/1.3.6/buff.h
-src/afsweb/apache_includes/1.3.6/ap_config.h
-src/afsweb/apache_includes/conf.h
-src/des/conf.h
-src/tests/OpenAFS/errtrans.pm
-src/wsadmin.lib/rt_r4.generic
-src/wsadmin.lib/pmax_31.generic
-src/wsadmin.lib/rt_r4.generic.dkload
-src/libuafs/Makefile.common.in
-src/afs/afs.h
-src/afs/IRIX/osi_vfs.h
-src/lwp/process.s
diff --git a/pkgs/servers/openafs-client/replace-usrsrc b/pkgs/servers/openafs-client/replace-usrsrc
deleted file mode 100644
index 42f2c270952..00000000000
--- a/pkgs/servers/openafs-client/replace-usrsrc
+++ /dev/null
@@ -1,11 +0,0 @@
-acinclude.m4
-configure
-configure-libafs
-src/libafs/MakefileProto.NBSD.in
-src/tools/install/make_rpm_source
-src/tools/install/openafs-tools-cmd-1.2.5-1.spec
-src/tools/install/openafs-tools-cmd-1.2.2-1.spec
-src/config/make_vnode.pl
-src/config/linux-version
-src/wsadmin.lib/pmax_31.generic
-src/afs/OBSD/osi_vfsops.c
diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix
new file mode 100644
index 00000000000..c67d2c8a010
--- /dev/null
+++ b/pkgs/servers/prayer/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, perl, openssl, db4, zlib, uwimap, htmlTidy, pam}:
+
+let
+  ssl = stdenv.lib.optionals uwimap.withSSL
+    "-e 's/CCLIENT_SSL_ENABLE.*= false/CCLIENT_SSL_ENABLE=true/'";
+in
+stdenv.mkDerivation rec {
+  name = "prayer-1.3.4";
+  
+  src = fetchurl {
+    url = "ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/${name}.tar.gz";
+    sha256 = "0a2nmrlwdq4n5019j3mw2xbbc61s7sssjih5ql6r5rvyrrr48szc";
+  };
+
+  buildInputs = [ openssl db4 zlib uwimap htmlTidy pam ];
+  buildNativeInputs = [ perl ];
+
+  NIX_LDFLAGS = "-lpam";
+
+  patches = [ ./install.patch ];
+  postPatch = ''
+    sed -i -e s/gmake/make/ -e 's/LDAP_ENABLE.*= true/LDAP_ENABLE=false/' \
+      ${ssl} \
+      -e 's/CCLIENT_LIBS=.*/CCLIENT_LIBS=-lc-client/' \
+      -e 's,^PREFIX .*,PREFIX='$out, \
+      Config
+    sed -i -e s,/usr/bin/perl,${perl}/bin/perl, \
+      templates/src/*.pl
+  '';
+
+  meta = {
+    homepage = http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/;
+    description = "Yet another Webmail interface for IMAP servers on Unix systems written in C";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/servers/prayer/install.patch b/pkgs/servers/prayer/install.patch
new file mode 100644
index 00000000000..439202dd955
--- /dev/null
+++ b/pkgs/servers/prayer/install.patch
@@ -0,0 +1,170 @@
+diff --git a/accountd/Makefile b/accountd/Makefile
+index c3e8107..7946776 100644
+--- a/accountd/Makefile
++++ b/accountd/Makefile
+@@ -75,6 +75,6 @@ clean:
+ 	-rm -f prayer-accountd test core *.o *~ \#*\# 
+ 
+ install:
+-	$(INSTALL) -m 755 -o ${RO_USER} -g ${RW_GROUP} \
++	$(INSTALL) -m 755 \
+ 	prayer-accountd ${BROOT}${BIN_DIR}
+ 
+diff --git a/files/Makefile b/files/Makefile
+index 743d0ed..7eff064 100644
+--- a/files/Makefile
++++ b/files/Makefile
+@@ -52,20 +52,20 @@ distclean:
+ 
+ install-cert:
+ 	if [ -f certs/prayer.pem ]; then \
+-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) \
++	$(INSTALL) \
+ 	-m $(PRIVATE_FILE) certs/prayer.pem ${BROOT}${PREFIX}/certs; \
+ 	fi
+ 
+ install-config: etc/prayer.cf
+-	$(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
++	$(INSTALL) -D -m $(PUBLIC_FILE) \
+ 	etc/prayer.cf ${BROOT}${PRAYER_CONFIG_FILE}
+ 
+ install-aconfig:
+-	$(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
++	$(INSTALL) -D -m $(PUBLIC_FILE) \
+ 	etc/prayer-accountd.cf ${BROOT}${ACCOUNTD_CONFIG_FILE}
+ 
+ install-motd:
+-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
++	$(INSTALL) -m $(PUBLIC_FILE) \
+ 	etc/motd.html ${BROOT}${PREFIX}/etc
+ 
+ install:
+@@ -83,6 +83,6 @@ install:
+ 	if [ ! -f $(BROOT)$(PREFIX)/etc/motd.html ]; then $(MAKE) install-motd; fi
+ 
+ redhat-install-init.d:
+-	install -D -o root -g root -m 755 \
++	install -D -m 755 \
+ 		./init.d/prayer $(BROOT)/etc/rc.d/init.d/prayer
+ 	#chkconfig prayer --level 2345 on
+diff --git a/files/install.sh b/files/install.sh
+index 8d1d1f4..0804a08 100755
+--- a/files/install.sh
++++ b/files/install.sh
+@@ -2,8 +2,6 @@
+ #
+ # $Cambridge: hermes/src/prayer/files/install.sh,v 1.7 2008/09/16 09:59:56 dpc22 Exp $
+ 
+-PATH=/bin:/sbin/:/usr/bin:/usr/sbin
+-
+ error=0
+ 
+ if [ "x$PREFIX" = "x" ]; then
+@@ -55,24 +53,20 @@ if [ $error != 0 ]; then
+     exit 1
+ fi
+ 
+-if [ ! -d ${VAR_PREFIX} -a `whoami` = "root" ]; then
+-    ${INSTALL} -d -o ${RW_USER} -g ${RW_GROUP} -m ${PRIVATE_DIR} ${VAR_PREFIX}
+-fi
+-
+ if [ ! -d ${PREFIX} ]; then
+-    ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}
++    ${INSTALL} -d -m ${PUBLIC_DIR} ${PREFIX}
+ fi
+ 
+ if [ ! -d ${PREFIX}/etc ]; then
+-    ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}/etc
++    ${INSTALL} -d -m ${PUBLIC_DIR} ${PREFIX}/etc
+ fi
+ 
+ if [ ! -d ${PREFIX}/certs ]; then
+-    ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PRIVATE_DIR} ${PREFIX}/certs
++    ${INSTALL} -d -m ${PRIVATE_DIR} ${PREFIX}/certs
+ fi
+ 
+ if [ ! -d ${BIN_DIR} ]; then
+-    ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BIN_DIR}
++    ${INSTALL} -d -m ${PUBLIC_DIR} ${BIN_DIR}
+ fi
+ 
+ for i in icons static
+@@ -83,5 +77,4 @@ do
+     fi
+     echo Copying ${i}
+     (tar cf - ${i}) | (cd ${PREFIX} ; tar xf -)
+-    (cd ${PREFIX}; chown -R ${RO_USER}:${RO_GROUP} ${i})
+ done
+diff --git a/servers/Makefile b/servers/Makefile
+index 021aed5..5ccbd08 100644
+--- a/servers/Makefile
++++ b/servers/Makefile
+@@ -107,13 +107,13 @@ clean:
+ 	-rm -f $(BIN) core *.o *.flc *~ \#*\#
+ 
+ install: all
+-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \
++	$(INSTALL) -m $(PUBLIC_DIR) -d \
+ 	  $(BROOT)$(BIN_DIR)
+-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
++	$(INSTALL) -m $(PUBLIC_EXEC) \
+ 	  prayer           $(BROOT)$(BIN_DIR)
+-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
++	$(INSTALL) -m $(PUBLIC_EXEC) \
+ 	  prayer-chroot           $(BROOT)$(BIN_DIR)
+-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
++	$(INSTALL) -m $(PUBLIC_EXEC) \
+ 	  prayer-session   $(BROOT)$(BIN_DIR)
+ 
+ prayer: $(PRAYER_OBJS) prayer_main.o
+diff --git a/templates/cam/Makefile b/templates/cam/Makefile
+index 9f4122a..396b628 100644
+--- a/templates/cam/Makefile
++++ b/templates/cam/Makefile
+@@ -124,7 +124,7 @@ _template_index.c:
+ 	$(COMPILE) $(TYPE) $@ $*
+ 
+ install:
+-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \
++	$(INSTALL) -m $(PUBLIC_DIR) -d \
+ 	  $(BROOT)$(PREFIX)/templates/$(TYPE)
+ 	cp *.t $(BROOT)$(PREFIX)/templates/$(TYPE)
+ 	cp *.vars $(BROOT)$(PREFIX)/templates/$(TYPE)
+diff --git a/templates/old/Makefile b/templates/old/Makefile
+index 31016cf..288a64c 100644
+--- a/templates/old/Makefile
++++ b/templates/old/Makefile
+@@ -123,7 +123,7 @@ _template_index.c:
+ 	$(COMPILE) $(TYPE) $@ $*
+ 
+ install:
+-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \
++	$(INSTALL) -m $(PUBLIC_DIR) -d \
+ 	  $(BROOT)$(PREFIX)/templates/$(TYPE)
+ 	cp *.t $(BROOT)$(PREFIX)/templates/$(TYPE)
+ 	cp *.vars $(BROOT)$(PREFIX)/templates/$(TYPE)
+diff --git a/utils/Makefile b/utils/Makefile
+index 9c79916..ef82481 100644
+--- a/utils/Makefile
++++ b/utils/Makefile
+@@ -72,15 +72,15 @@ clean:
+ 	-rm -f $(BIN) core *.o *.flc *~ \#*\#
+ 
+ install: all
+-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \
++	$(INSTALL) -m $(PUBLIC_DIR) -d \
+ 	  $(BROOT)$(BIN_DIR)
+-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
++	$(INSTALL) -m $(PUBLIC_EXEC) \
+ 	  prayer-ssl-prune $(BROOT)$(BIN_DIR)
+-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
++	$(INSTALL) -m $(PUBLIC_EXEC) \
+ 	  prayer-sem-prune $(BROOT)$(BIN_DIR)
+-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
++	$(INSTALL) -m $(PUBLIC_EXEC) \
+ 	  prayer-db-prune $(BROOT)$(BIN_DIR)
+-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
++	$(INSTALL) -m $(PUBLIC_EXEC) \
+ 	  prayer-cyclog    $(BROOT)$(BIN_DIR)
+ 
+ prayer-ssl-prune: $(PRUNE_OBJS)
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 41c819cbe3f..13d0af8987c 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,16 +1,19 @@
 { stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi
-, gconf, gtk, libX11, libICE, libSM, libXtst, libXi, intltool, gettext
+, gconf, gtk, intltool, gettext
 , alsaLib, libsamplerate, libsndfile, speex, bluez, udev
-, jackaudioSupport ? false, jackaudio ? null }:
+, jackaudioSupport ? false, jackaudio ? null
+, x11Support ? false, xlibs
+, xz, json_c
+}:
 
 assert jackaudioSupport -> jackaudio != null;
 
 stdenv.mkDerivation rec {
-  name = "pulseaudio-0.9.23";
+  name = "pulseaudio-1.1";
 
   src = fetchurl {
-    url = "http://freedesktop.org/software/pulseaudio/releases/${name}.tar.gz";
-    sha256 = "0kms3w1i48j9368amr8wv83gk4szrnglh1biyp8jyqyb2k388gmg";
+    url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-1.1.tar.xz";
+    sha256 = "1vpm0681zj2jvhbabvnmrmfxr3172k4x58kjb39y5g3fdw9k3rbg";
   };
 
   # Since `libpulse*.la' contain `-lgdbm', it must be propagated.
@@ -19,9 +22,11 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ pkgconfig gnum4 libtool intltool glib dbus avahi
       libsamplerate libsndfile speex alsaLib bluez udev
-      #gtk gconf libX11 libICE libSM libXtst libXi
+      xz json_c
+      #gtk gconf 
     ]
-    ++ stdenv.lib.optional jackaudioSupport jackaudio;
+    ++ stdenv.lib.optional jackaudioSupport jackaudio
+    ++ stdenv.lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ];
 
   preConfigure = ''
     # Change the `padsp' script so that it contains the full path to
@@ -32,6 +37,11 @@ stdenv.mkDerivation rec {
     # Move the udev rules under $(prefix).
     sed -i "src/Makefile.in" \
         -e "s|udevrulesdir[[:blank:]]*=.*$|udevrulesdir = $out/lib/udev/rules.d|g"
+
+   # don't install proximity-helper as root and setuid
+   sed -i "src/Makefile.in" \
+       -e "s|chown root|true |" \
+       -e "s|chmod r+s |true |"
   '';
 
   configureFlags = ''
@@ -41,7 +51,7 @@ stdenv.mkDerivation rec {
     ${if jackaudioSupport then "--enable-jack" else ""}
   '';
 
-  installFlags = "sysconfdir=$(out)/etc";
+  installFlags = "sysconfdir=$(out)/etc pulseconfdir=$(out)/etc/pulse";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix
index c76c52e5fcc..42d577c55fa 100644
--- a/pkgs/servers/samba/default.nix
+++ b/pkgs/servers/samba/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, readline, pam, openldap, popt, iniparser, libunwind, fam
-, acl, cups
+{ stdenv, fetchurl, readline, pam ? null, openldap ? null
+, popt, iniparser, libunwind
+, fam ? null , acl ? null, cups ? null
 , useKerberos ? false, kerberos ? null, winbind ? true
 
 # Eg. smbclient and smbspool require a smb.conf file.
@@ -14,39 +15,49 @@
 
 }:
 
-let
-
- useWith = flag: option: if flag then "--with-"+option else "";
- 
-in
+assert useKerberos -> kerberos != null;
 
 stdenv.mkDerivation rec {
-  name = "samba-3.6.0";
+  name = "samba-3.6.1";
 
   src = fetchurl {
     url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz";
-    sha256 = "0gzm09l75i95iibcxykc2h2m9haqx70jp1bpis1mhmvqwillbhg1";
+    sha256 = "0r6mbghja357xhpada5djg0gpczi50f18ap53hdn8b7y0amz5c65";
   };
 
+  patches =
+    [ # Fix for https://bugzilla.samba.org/show_bug.cgi?id=8541.
+      ./readlink.patch
+    ];
+
   buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ]
     ++ stdenv.lib.optional useKerberos kerberos;
 
   enableParallelBuilding = true;
 
-  preConfigure = "cd source3";
+  postPatch =
+    # XXX: Awful hack to allow cross-compilation.
+    '' sed -i source3/configure \
+           -e 's/^as_fn_error \("cannot run test program while cross compiling\)/$as_echo \1/g'
+    '';
 
-  configureFlags = ''
-    --with-pam
-    --with-cifsmount
-    --with-aio-support
-    --with-pam_smbpass
-    --disable-swat
-    --with-configdir=${configDir}
-    --with-fhs
-    --localstatedir=/var
-    ${useWith winbind "winbind"}
-    ${if stdenv.gcc.libc != null then "--with-libiconv=${stdenv.gcc.libc}" else ""}
-  '';
+  preConfigure =
+    '' cd source3
+       export samba_cv_CC_NEGATIVE_ENUM_VALUES=yes
+       export libreplace_cv_HAVE_GETADDRINFO=yes
+       export ac_cv_file__proc_sys_kernel_core_pattern=no # XXX: true on Linux, false elsewhere
+    '';
+
+  configureFlags =
+    stdenv.lib.optionals (pam != null) [ "--with-pam" "--with-pam_smbpass" ]
+    ++ [ "--with-aio-support"
+         "--disable-swat"
+         "--with-configdir=${configDir}"
+         "--with-fhs"
+         "--localstatedir=/var"
+       ]
+    ++ (stdenv.lib.optional winbind "--with-winbind")
+    ++ (stdenv.lib.optional (stdenv.gcc.libc != null) "--with-libiconv=${stdenv.gcc.libc}");
 
   # Need to use a DESTDIR because `make install' tries to write in /var and /etc.
   installFlags = "DESTDIR=$(TMPDIR)/inst";
diff --git a/pkgs/servers/samba/readlink.patch b/pkgs/servers/samba/readlink.patch
new file mode 100644
index 00000000000..84c0e021b1c
--- /dev/null
+++ b/pkgs/servers/samba/readlink.patch
@@ -0,0 +1,217 @@
+diff --git a/source3/include/smb.h b/source3/include/smb.h
+index 3a64af7..549ebb2 100644
+--- a/source3/include/smb.h
++++ b/source3/include/smb.h
+@@ -1714,6 +1714,7 @@ struct smb_file_time {
+ #define UCF_ALWAYS_ALLOW_WCARD_LCOMP	0x00000002
+ #define UCF_COND_ALLOW_WCARD_LCOMP	0x00000004
+ #define UCF_POSIX_PATHNAMES		0x00000008
++#define UCF_UNIX_NAME_LOOKUP		0x00000010
+ 
+ /*
+  * smb_filename
+diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
+index 25301e6..b2ed239 100644
+--- a/source3/smbd/filename.c
++++ b/source3/smbd/filename.c
+@@ -383,7 +383,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
+ 
+ 	if((!conn->case_sensitive || !(conn->fs_capabilities &
+ 				       FILE_CASE_SENSITIVE_SEARCH)) &&
+-	    stat_cache_lookup(conn, &smb_fname->base_name, &dirpath, &start,
++	    stat_cache_lookup(conn, posix_pathnames, &smb_fname->base_name, &dirpath, &start,
+ 			      &smb_fname->st)) {
+ 		goto done;
+ 	}
+@@ -977,26 +977,39 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
+ }
+ 
+ /****************************************************************************
+- Check a filename - possibly calling check_reduced_name.
+- This is called by every routine before it allows an operation on a filename.
+- It does any final confirmation necessary to ensure that the filename is
+- a valid one for the user to access.
++ Ensure a path is not vetod.
+ ****************************************************************************/
+ 
+-NTSTATUS check_name(connection_struct *conn, const char *name)
++NTSTATUS check_veto_path(connection_struct *conn, const char *name)
+ {
+ 	if (IS_VETO_PATH(conn, name))  {
+ 		/* Is it not dot or dot dot. */
+-		if (!((name[0] == '.') && (!name[1] ||
+-					(name[1] == '.' && !name[2])))) {
+-			DEBUG(5,("check_name: file path name %s vetoed\n",
++		if (!(ISDOT(name) || ISDOTDOT(name))) {
++			DEBUG(5,("check_veto_path: file path name %s vetoed\n",
+ 						name));
+ 			return map_nt_error_from_unix(ENOENT);
+ 		}
+ 	}
++	return NT_STATUS_OK;
++}
++
++/****************************************************************************
++ Check a filename - possibly calling check_reduced_name.
++ This is called by every routine before it allows an operation on a filename.
++ It does any final confirmation necessary to ensure that the filename is
++ a valid one for the user to access.
++****************************************************************************/
++
++NTSTATUS check_name(connection_struct *conn, const char *name)
++{
++	NTSTATUS status = check_veto_path(conn, name);
++
++	if (!NT_STATUS_IS_OK(status)) {
++		return status;
++	}
+ 
+ 	if (!lp_widelinks(SNUM(conn)) || !lp_symlinks(SNUM(conn))) {
+-		NTSTATUS status = check_reduced_name(conn,name);
++		status = check_reduced_name(conn,name);
+ 		if (!NT_STATUS_IS_OK(status)) {
+ 			DEBUG(5,("check_name: name %s failed with %s\n",name,
+ 						nt_errstr(status)));
+@@ -1314,6 +1327,12 @@ NTSTATUS filename_convert(TALLOC_CTX *ctx,
+ 		return status;
+ 	}
+ 
++	if ((ucf_flags & UCF_UNIX_NAME_LOOKUP) &&
++			VALID_STAT((*pp_smb_fname)->st) &&
++			S_ISLNK((*pp_smb_fname)->st.st_ex_mode)) {
++		return check_veto_path(conn, (*pp_smb_fname)->base_name);
++	}
++
+ 	status = check_name(conn, (*pp_smb_fname)->base_name);
+ 	if (!NT_STATUS_IS_OK(status)) {
+ 		DEBUG(3,("filename_convert: check_name failed "
+diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
+index c455ffe..02b5e40 100644
+--- a/source3/smbd/proto.h
++++ b/source3/smbd/proto.h
+@@ -336,6 +336,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
+ 		      const char *orig_path,
+ 		      struct smb_filename **smb_fname,
+ 		      uint32_t ucf_flags);
++NTSTATUS check_veto_path(connection_struct *conn, const char *name);
+ NTSTATUS check_name(connection_struct *conn, const char *name);
+ int get_real_filename(connection_struct *conn, const char *path,
+ 		      const char *name, TALLOC_CTX *mem_ctx,
+@@ -1037,6 +1038,7 @@ void stat_cache_add( const char *full_orig_name,
+ 		char *translated_path,
+ 		bool case_sensitive);
+ bool stat_cache_lookup(connection_struct *conn,
++			bool posix_paths,
+ 			char **pp_name,
+ 			char **pp_dirpath,
+ 			char **pp_start,
+diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
+index e2ccc74..e910982 100644
+--- a/source3/smbd/statcache.c
++++ b/source3/smbd/statcache.c
+@@ -150,6 +150,7 @@ void stat_cache_add( const char *full_orig_name,
+  * Look through the stat cache for an entry
+  *
+  * @param conn    A connection struct to do the stat() with.
++ * @param posix_paths Whether to lookup using stat() or lstat()
+  * @param name    The path we are attempting to cache, modified by this routine
+  *                to be correct as far as the cache can tell us. We assume that
+  *		  it is a talloc'ed string from top of stack, we free it if
+@@ -166,6 +167,7 @@ void stat_cache_add( const char *full_orig_name,
+  */
+ 
+ bool stat_cache_lookup(connection_struct *conn,
++			bool posix_paths,
+ 			char **pp_name,
+ 			char **pp_dirpath,
+ 			char **pp_start,
+@@ -181,6 +183,7 @@ bool stat_cache_lookup(connection_struct *conn,
+ 	char *name;
+ 	TALLOC_CTX *ctx = talloc_tos();
+ 	struct smb_filename smb_fname;
++	int ret;
+ 
+ 	*pp_dirpath = NULL;
+ 	*pp_start = *pp_name;
+@@ -283,7 +286,13 @@ bool stat_cache_lookup(connection_struct *conn,
+ 	ZERO_STRUCT(smb_fname);
+ 	smb_fname.base_name = translated_path;
+ 
+-	if (SMB_VFS_STAT(conn, &smb_fname) != 0) {
++	if (posix_paths) {
++		ret = SMB_VFS_LSTAT(conn, &smb_fname);
++	} else {
++		ret = SMB_VFS_STAT(conn, &smb_fname);
++	}
++
++	if (ret != 0) {
+ 		/* Discard this entry - it doesn't exist in the filesystem. */
+ 		memcache_delete(smbd_memcache(), STAT_CACHE,
+ 				data_blob_const(chk_name, strlen(chk_name)));
+diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
+index 0931fff..129ab01 100644
+--- a/source3/smbd/trans2.c
++++ b/source3/smbd/trans2.c
+@@ -2271,6 +2271,7 @@ static void call_trans2findfirst(connection_struct *conn,
+ 	TALLOC_CTX *ctx = talloc_tos();
+ 	struct dptr_struct *dirptr = NULL;
+ 	struct smbd_server_connection *sconn = req->sconn;
++	uint32_t ucf_flags = (UCF_SAVE_LCOMP | UCF_ALWAYS_ALLOW_WCARD_LCOMP);
+ 
+ 	if (total_params < 13) {
+ 		reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
+@@ -2314,6 +2315,7 @@ close_if_end = %d requires_resume_key = %d level = 0x%x, max_data_bytes = %d\n",
+ 				reply_nterror(req, NT_STATUS_INVALID_LEVEL);
+ 				goto out;
+ 			}
++			ucf_flags |= UCF_UNIX_NAME_LOOKUP;
+ 			break;
+ 		default:
+ 			reply_nterror(req, NT_STATUS_INVALID_LEVEL);
+@@ -2331,8 +2333,7 @@ close_if_end = %d requires_resume_key = %d level = 0x%x, max_data_bytes = %d\n",
+ 	ntstatus = filename_convert(ctx, conn,
+ 				    req->flags2 & FLAGS2_DFS_PATHNAMES,
+ 				    directory,
+-				    (UCF_SAVE_LCOMP |
+-					UCF_ALWAYS_ALLOW_WCARD_LCOMP),
++				    ucf_flags,
+ 				    &mask_contains_wcard,
+ 				    &smb_dname);
+ 	if (!NT_STATUS_IS_OK(ntstatus)) {
+@@ -5103,6 +5104,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
+ 	} else {
+ 		uint32_t name_hash;
+ 		char *fname = NULL;
++		uint32_t ucf_flags = 0;
+ 
+ 		/* qpathinfo */
+ 		if (total_params < 7) {
+@@ -5114,9 +5116,16 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
+ 
+ 		DEBUG(3,("call_trans2qfilepathinfo: TRANSACT2_QPATHINFO: level = %d\n", info_level));
+ 
+-		if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
+-			reply_nterror(req, NT_STATUS_INVALID_LEVEL);
+-			return;
++		if (INFO_LEVEL_IS_UNIX(info_level)) {
++			if (!lp_unix_extensions()) {
++				reply_nterror(req, NT_STATUS_INVALID_LEVEL);
++				return;
++			}
++			if (info_level == SMB_QUERY_FILE_UNIX_BASIC ||
++					info_level == SMB_QUERY_FILE_UNIX_INFO2 ||
++					info_level == SMB_QUERY_FILE_UNIX_LINK) {
++				ucf_flags |= UCF_UNIX_NAME_LOOKUP;
++			}
+ 		}
+ 
+ 		srvstr_get_path(req, params, req->flags2, &fname, &params[6],
+@@ -5131,7 +5140,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
+ 					conn,
+ 					req->flags2 & FLAGS2_DFS_PATHNAMES,
+ 					fname,
+-					0,
++					ucf_flags,
+ 					NULL,
+ 					&smb_fname);
+ 		if (!NT_STATUS_IS_OK(status)) {
diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix
index 2e2e24938a3..57b4a5ca17c 100644
--- a/pkgs/servers/sip/sipwitch/default.nix
+++ b/pkgs/servers/sip/sipwitch/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "sipwitch-1.1.1";
+  name = "sipwitch-1.1.3";
 
   src = fetchurl {
     url = "mirror://gnu/sipwitch/${name}.tar.gz";
-    sha256 = "14irv1zda6xjsrizc0dvy85fcjx3szbb94jkh3q4s20ywc4s41kx";
+    sha256 = "0g1vx8xsmna0c7sqck8pv44312r4qrk82ky3j99p82ckbqj1sqjv";
   };
 
   buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ];
diff --git a/pkgs/servers/sql/postgresql/8.3.x.nix b/pkgs/servers/sql/postgresql/8.3.x.nix
index 2c7b1808d45..b308e4e0d1e 100644
--- a/pkgs/servers/sql/postgresql/8.3.x.nix
+++ b/pkgs/servers/sql/postgresql/8.3.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, ncurses, readline }:
 
-let version = "8.3.12"; in
+let version = "8.3.16"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
   
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "0w7h09nx8pkpzznmz4wd1zv8dg3f6jv366rr8bf3s5g6vrvxcssr";
+    sha256 = "0i17da3jz44y2xikp99qs0dac9j84hghr8rg5n7hr86ippi90180";
   };
 
   buildInputs = [ zlib ncurses readline ];
diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index 416f4846fd5..c3a34b3d43b 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, ncurses, readline }:
 
-let version = "8.4.5"; in
+let version = "8.4.9"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
   
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "1grjazzhk0piwpb0bjmgi71wkzb8hk27h6g9l68h52lr5np2401h";
+    sha256 = "12n3x2q444hfhy9nbl14yfhd58im86jmlb9b0ihqzbmq1j6wnn0x";
   };
 
   buildInputs = [ zlib ncurses readline ];
diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index 53d2f572e31..d49555e8ba8 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, readline }:
 
-let version = "9.0.1"; in
+let version = "9.0.5"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
   
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "15iid8l7hgpa2zzdsd0msn0ps9qq1mxkzxx0fca5z117054ws42k";
+    sha256 = "016mnwpcyla49qr3gglgpyjwnq1ljjbs3q0s8vlfmazfkj0fxn2n";
   };
 
   buildInputs = [ zlib readline ];
diff --git a/pkgs/servers/sql/virtuoso/default.nix b/pkgs/servers/sql/virtuoso/default.nix
index bb9426ad947..8271ea8daf4 100644
--- a/pkgs/servers/sql/virtuoso/default.nix
+++ b/pkgs/servers/sql/virtuoso/default.nix
@@ -1,25 +1,15 @@
 { stdenv, fetchurl, libxml2, openssl, readline, gawk }:
 
 stdenv.mkDerivation rec {
-  name = "virtuoso-opensource-6.1.3";
+  name = "virtuoso-opensource-6.1.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/virtuoso/${name}.tar.gz";
-    sha256 = "0rj629qjsibpllazngbhzhsh90x6nidpn292qz1xdvirwvb2h3s2";
+    sha256 = "0khm81hvjh6p4l0ca4zj00fk41ixjv998k6y9g7mvq1338hr4gqm";
   };
 
   buildInputs = [ libxml2 openssl readline gawk ];
 
-  patchFlags = "-p0";
-
-  patches =
-    [ (fetchurl {
-        url = "http://bugsfiles.kde.org/attachment.cgi?id=63510";
-        name = "virtuoso-charset-fix.diff";
-        sha256 = "09kxjhsy3rbys0bcxpmgga4sa6qjyy79dyl4n8b0gp1hnzjskvkz";
-      })
-    ];
-
   CPP = "${stdenv.gcc}/bin/gcc -E";
 
   configureFlags = "
@@ -32,6 +22,7 @@ stdenv.mkDerivation rec {
     echo Moving documentation
     mkdir -pv $out/share/doc
     mv -v $out/share/virtuoso/doc $out/share/doc/${name}
+    echo Removing jars and empty directories
     find $out -name "*.a" -delete -o -name "*.jar" -delete -o -type d -empty -delete
     '';
   
diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix
index 0f2608465ff..6f752a7194f 100644
--- a/pkgs/servers/xinetd/default.nix
+++ b/pkgs/servers/xinetd/default.nix
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Secure replacement for inetd";
+    platforms = stdenv.lib.platforms.linux;
     homepage = http://xinetd.org;
     license = "free";
   };
diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix
index 2c029b764b0..8e430df5290 100644
--- a/pkgs/shells/ipython/default.nix
+++ b/pkgs/shells/ipython/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, buildPythonPackage, pythonPackages }:
 
-buildPythonPackage {
-  name = "ipython-0.10.1";
+buildPythonPackage rec {
+  name = "ipython-0.11";
   namePrefix = "";
 
   src = fetchurl {
-    url = "http://ipython.scipy.org/dist/0.10.1/ipython-0.10.1.tar.gz";
-    sha256 = "18zwrg25zn72w4rmcwxzcw11ibgp001fawm2sz189zv86z70fxi2";
+    url = "http://pypi.python.org/packages/source/i/ipython/${name}.tar.gz";
+    md5 = "efc899e752a4a4a67a99575cea1719ef";
   };
 
-  propagatedBuildInputs = [ pythonPackages.readline ];
+  propagatedBuildInputs = [ pythonPackages.readline pythonPackages.sqlite3 ];
 
   doCheck = false;
 
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 3e596c4ef0e..a1e8aafd7bc 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -11,6 +11,7 @@ rec {
   # Override the compiler in stdenv for specific packages.
   overrideGCC = stdenv: gcc: stdenv //
     { mkDerivation = args: stdenv.mkDerivation (args // { NIX_GCC = gcc; });
+      inherit gcc;
     };
 
     
@@ -301,7 +302,7 @@ rec {
               else
                 null;
           in
-            builtins.trace "@:drv:${toString drvPath}:${builtins.exprToString license}:@"
+            builtins.trace "@:drv:${toString drvPath}:${builtins.toString license}:@"
               val;
         in pkg // {
           outPath = printDrvPath pkg.outPath;
@@ -329,20 +330,24 @@ rec {
     { mkDerivation = args:
         let
           pkg = stdenv.mkDerivation args;
+          drv = builtins.unsafeDiscardStringContext pkg.drvPath;
           license =
             if pkg ? meta && pkg.meta ? license then
               pkg.meta.license
+            else if pkg ? outputHash then
+              # Fixed-output derivations such as source tarballs usually
+              # don't have licensing information, but that's OK.
+              null
             else
-              null;
+              builtins.trace
+                "warning: ${drv} lacks licensing information" null;
 
           validate = arg:
             if licensePred license then arg
-            else abort "
-              Error while building ${builtins.unsafeDiscardStringContext pkg.drvPath}:
-              The license predicate is not verified.
-
-              bad license: ${builtins.exprToString license}
-            ";
+            else abort ''
+              while building ${drv}:
+              license `${builtins.toString license}' does not pass the predicate.
+            '';
 
         in pkg // {
           outPath = validate pkg.outPath;
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index c4d6a3666d0..436b912d8d6 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -98,7 +98,8 @@ let
                || result.system == "powerpc-linux"
                || result.system == "armv5tel-linux"
                || result.system == "mips64-linux";
-        isSunOS = result.system == "i386-sunos";
+        isSunOS = result.system == "i686-solaris"
+               || result.system == "x86_64-solaris";
         isCygwin = result.system == "i686-cygwin";
 	isFreeBSD = result.system == "i686-freebsd"
 	       || result.system == "x86_64-freebsd";
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 1f2117ebba0..bdf342b2c64 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -1,10 +1,13 @@
-{system, allPackages ? import ../../..}:
+{ system, allPackages ? import ../../.. }:
 
 rec {
 
-  shell = "/bin/bash";
+  shell = 
+    if system == "i686-freebsd" || system == "x86_64-freebsd" then "/usr/local/bin/bash"
+    else "/bin/bash";
 
-  path = (if system == "i386-sunos" then [ "/usr/gnu" ] else []) ++
+  path = 
+    (if system == "i686-solaris" then [ "/usr/gnu" ] else []) ++
     (if system == "i686-netbsd" then [ "/usr/pkg" ] else []) ++
     ["/" "/usr" "/usr/local"];
 
@@ -88,6 +91,7 @@ rec {
       preHook =
         if system == "i686-darwin" || system == "powerpc-darwin" || system == "x86_64-darwin" then prehookDarwin else
         if system == "i686-freebsd" then prehookFreeBSD else
+        if system == "x86_64-freebsd" then prehookFreeBSD else
         if system == "i686-openbsd" then prehookOpenBSD else
 	if system == "i686-netbsd" then prehookNetBSD else
         prehookBase;
@@ -110,7 +114,7 @@ rec {
     name = "gcc-native";
     nativeTools = true;
     nativeLibc = true;
-    nativePrefix = if system == "i386-sunos" then "/usr/gnu" else "/usr";
+    nativePrefix = if system == "i686-solaris" then "/usr/gnu" else "/usr";
     stdenv = stdenvBoot0;
   };
 
diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix
index ceb3798f6de..71c7046b0b7 100644
--- a/pkgs/tools/X11/x11vnc/default.nix
+++ b/pkgs/tools/X11/x11vnc/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, openssl, zlib, libjpeg, xorg }:
+{ stdenv, fetchurl, openssl, zlib, libjpeg, xorg, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "x11vnc-0.9.12";
+  name = "x11vnc-0.9.13";
 
   src = fetchurl {
     url = "mirror://sourceforge/libvncserver/${name}.tar.gz";
-    sha256 = "60a7cceee2c9a5f1c854340b2bae13f975ac55906237042f81f795b28a154a79";
+    sha256 = "0fzib5xb1vbs8kdprr4z94v0fshj2c5hhaz69llaarwnc8p9z0pn";
   };
 
   buildInputs =
@@ -18,6 +18,13 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     configureFlags="--mandir=$out/share/man"
+
+    substituteInPlace x11vnc/unixpw.c \
+        --replace '"/bin/su"' '"/var/setuid-wrappers/su"' \
+        --replace '"/bin/true"' '"${coreutils}/bin/true"'
+        
+    substituteInPlace x11vnc/ssltools.h \
+        --replace xdpyinfo ${xorg.xdpyinfo}/bin/xdpyinfo
   '';
 
   meta = {
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index dd76bdd26e8..36aae068438 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -1,29 +1,31 @@
-{stdenv, fetchsvn, libX11, libXext, gettext, libICE, libXtst, libXi, libSM, xorgserver,
-autoconf, automake, cvs, libtool, nasm, utilmacros, pixman, xkbcomp, xkeyboard_config,
-fontDirectories, fontutil }:
+{ stdenv, fetchurl, libX11, libXext, gettext, libICE, libXtst, libXi, libSM, xorgserver
+, autoconf, automake, cvs, libtool, nasm, utilmacros, pixman, xkbcomp, xkeyboard_config
+, fontDirectories, fontutil, libgcrypt, gnutls, pam, flex, bison
+, fixesproto, damageproto, xcmiscproto, bigreqsproto, randrproto, renderproto
+, fontsproto, videoproto, compositeproto, scrnsaverproto, resourceproto
+, libxkbfile, libXfont, libpciaccess
+}:
+
+
 
 with stdenv.lib;
 
-stdenv.mkDerivation {
-  name = "tigervnc-svn-4232";
-  src = fetchsvn {
-    url = https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk;
-    rev = 4232;
-    sha256 = "070lsddgx6qj7bpw4p65w54fr7z46vp8wyshv9p0fh3k5izrfnxj";
+stdenv.mkDerivation rec {
+  name = "tigervnc-1.1.0";
+  
+  src = fetchurl {
+    url = "mirror://sourceforge/tigervnc/${name}.tar.gz";
+    sha256 = "1x30s12fwv9rk0fnwwn631qq0d8rpjjx53bvzlx8c91cba170jsr";
   };
 
-  preConfigure = ''
-    autoreconf -vfi
-  '';
-
   configureFlags = "--enable-nls";
 
   inherit fontDirectories;
 
   patchPhase = ''
-    sed -i -e 's,$(includedir)/pixman-1,${pixman}/include/pixman-1,' unix/xserver/hw/vnc/Makefile.am
-    sed -i -e '/^$pidFile/a$ENV{XKB_BINDIR}="${xkbcomp}/bin";' unix/vncserver 
-    sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver 
+    sed -i -e 's,$(includedir)/pixman-1,${if stdenv ? cross then pixman.hostDrv else pixman}/include/pixman-1,' unix/xserver/hw/vnc/Makefile.am
+    sed -i -e '/^$pidFile/a$ENV{XKB_BINDIR}="${if stdenv ? cross then xkbcomp.hostDrv else xkbcomp}/bin";' unix/vncserver 
+    sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${if stdenv ? cross then xkeyboard_config.hostDrv else xkeyboard_config}/etc/X11/xkb";' unix/vncserver 
 
     fontPath=
     for i in $fontDirectories; do
@@ -50,7 +52,7 @@ stdenv.mkDerivation {
     done
     patch -p1 < ../xserver18.patch
     autoreconf -vfi
-    ./configure --prefix=$out --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx
+    ./configure $configureFlags --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx
     make TIGERVNC_SRCDIR=`pwd`/../..
     popd
   '';
@@ -66,10 +68,24 @@ stdenv.mkDerivation {
     make TIGERVNC_SRCDIR=`pwd`/../.. install
   '';
 
-  buildInputs = [ libX11 libXext gettext libICE libXtst libXi libSM autoconf automake cvs
-    libtool nasm utilmacros fontutil ] ++ xorgserver.buildNativeInputs;
+  crossAttrs = {
+    buildInputs = (map (x : x.hostDrv) (buildInputs ++ [
+      fixesproto damageproto xcmiscproto bigreqsproto randrproto renderproto
+      fontsproto videoproto compositeproto scrnsaverproto resourceproto
+      libxkbfile libXfont libpciaccess
+    ]));
+  };
 
-  propagatedBuildInputs = xorgserver.propagatedBuildNativeInputs;
+  buildInputs =
+    [ libX11 libXext gettext libICE libXtst libXi libSM
+      nasm libgcrypt gnutls pam pixman
+    ];
+  
+  buildNativeInputs = 
+    [ autoconf automake cvs utilmacros fontutil libtool flex bison ] 
+      ++ xorgserver.buildNativeInputs;
+
+  propagatedBuildNativeInputs = xorgserver.propagatedBuildNativeInputs;
 
   meta = {
     homepage = http://www.tigervnc.org/;
diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix
index 49c56d075d3..f4e962f546c 100644
--- a/pkgs/tools/archivers/dar/default.nix
+++ b/pkgs/tools/archivers/dar/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, zlib, bzip2, openssl, attr }:
+{ stdenv, fetchurl, zlib, bzip2, openssl, attr, lzo, libgcrypt, e2fsprogs }:
 
 stdenv.mkDerivation rec {
-  name = "dar-2.3.10";
+  name = "dar-2.4.2";
   
   src = fetchurl {
     url = "mirror://sourceforge/dar/${name}.tar.gz";
-    sha256 = "04qzdcz97bzz414khfj82hn8s1i1ry7qxaikq8lj1069gvhc6qjn";
+    sha256 = "0cvcy9xccg4wmvbpxyacwppapbq03m3pwjk8b3xmdn2h8lr1pziq";
   };
 
-  buildInputs = [ zlib bzip2 openssl attr ];
+  buildInputs = [ zlib bzip2 openssl attr lzo libgcrypt e2fsprogs ];
 
   configureFlags = "--disable-dar-static";
 
diff --git a/pkgs/tools/backup/btar/default.nix b/pkgs/tools/backup/btar/default.nix
new file mode 100644
index 00000000000..2ec82ff4a68
--- /dev/null
+++ b/pkgs/tools/backup/btar/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, librsync }:
+
+stdenv.mkDerivation rec {
+  name = "btar-0.9.1";
+  src = fetchurl {
+    url = "http://vicerveza.homeunix.net/~viric/soft/btar/${name}.tar.gz";
+    sha256 = "1fmaq5z81zvs3gjrkwnqz8nb4a6dqij5cmw99jhcaxlnwl45y3vj";
+  };
+
+  buildInputs = [ librsync ];
+
+  installPhase = "make install PREFIX=$out";
+
+  meta = {
+    description = "Tar-compatible block-based archiver";
+    license = "GPLv3+";
+    homepage = http://viric.name/cgi-bin/btar;
+    platforms = with stdenv.lib.platforms; all;
+    maintainers = with stdenv.lib.maintainers; [viric];
+  };
+}
diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index 98d4c1d8c30..c4cc84ba34f 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, librsync, gnupg, boto, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "duplicity-0.6.14";
+  name = "duplicity-0.6.16";
 
   src = fetchurl {
-    url = http://code.launchpad.net/duplicity/0.6-series/0.6.14/+download/duplicity-0.6.14.tar.gz;
-    sha256 = "1h0gxi7hdz22fvah9mcavimfgahf31pixy1mx2mivncl14b45wf7";
+    url = http://code.launchpad.net/duplicity/0.6-series/0.6.16/+download/duplicity-0.6.16.tar.gz;
+    sha256 = "0n63857swqnq7i697p615dp37bsd5bj0gvlj5ng41584zzjmv328";
   };
 
   installPhase = ''
diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix
index ff5b260c9f3..20d5ae7715e 100644
--- a/pkgs/tools/cd-dvd/unetbootin/default.nix
+++ b/pkgs/tools/cd-dvd/unetbootin/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, makeWrapper, qt4, utillinux, coreutils, which, p7zip, mtools, syslinux }:
 
-let version = "485"; in
+let version = "563"; in
 
 stdenv.mkDerivation rec {
   name = "unetbootin-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/unetbootin/UNetbootin/${version}/unetbootin-source-${version}.tar.gz";
-    sha256 = "1nyzy1wrql0l6zkmrd1l3qqvbdkv0534axdz6vy3cyksp157jxc8";
+    sha256 = "1j4ka6rjf5akhcdb4pbfdrka9zflhch97b5i42zk1cf8hd6wx939";
   };
 
   sourceRoot = ".";
@@ -43,13 +43,13 @@ stdenv.mkDerivation rec {
     ''
       ensureDir $out/bin
       cp unetbootin $out/bin
-      
+
       ensureDir $out/share/unetbootin
       cp unetbootin_*.qm  $out/share/unetbootin
 
       ensureDir $out/share/applications
       cp unetbootin.desktop $out/share/applications
-      
+
       wrapProgram $out/bin/unetbootin \
           --prefix PATH : ${which}/bin:${p7zip}/bin:${mtools}/bin
     '';
diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix
index 1b489f9a5ca..4936bca1ba1 100644
--- a/pkgs/tools/cd-dvd/xorriso/default.nix
+++ b/pkgs/tools/cd-dvd/xorriso/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl }:
 
 stdenv.mkDerivation rec {
-  name = "xorriso-1.1.4";
+  name = "xorriso-1.1.8";
 
   src = fetchurl {
     url = "mirror://gnu/xorriso/${name}.tar.gz";
-    sha256 = "0zxmln5kw5prqrs8bahwz4lhvl914xphsjizlz3nr9y2l39350j8";
+    sha256 = "1pnmjk2nvxg54zrm4mha6vvgi6sl5xzznqcfzrlrvgsdy5liwb4x";
   };
 
   doCheck = true;
diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index 2a5574a829e..76d185f82d9 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -1,30 +1,38 @@
-a :  
-let 
+a :
+let
   fetchurl = a.fetchurl;
+  fetchgit = a.fetchgit;
 
-  version = a.lib.attrByPath ["version"] "0.19" a; 
+  version = a.lib.attrByPath ["version"] "0.19" a;
   buildInputs = with a; [
-    zlib libuuid acl 
+    zlib libuuid acl attr
   ];
 in
 
 assert a.libuuid != null;
 
 rec {
-  src = fetchurl {
-    url = "http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/btrfs-progs-${version}.tar.bz2";
-    sha256 = "1z3hmfgv7h489gnh55abm0gzyf2cgjkybhfc2rnm0cvsx01xv8zq";
+  srcDrv = fetchgit {
+    url="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git" ;
+    rev="fdb6c0402337d9607c7a39155088eaf033742752" ;
+    sha256="de7f9e04401bd747a831c48d312106e188adb32f32b6d64078ae6d2aab45b1f8" ;
   };
 
+  src = srcDrv + "/";
+
   inherit buildInputs;
   configureFlags = [];
-  makeFlags = ["prefix=$out"];
+  makeFlags = ["prefix=$out CFLAGS=-Os"];
+
+  patches = [];
+  phaseNames = ["fixMakefile" "doEnsureBtrfsImage" "doMakeInstall"];
+
+  fixMakefile = a.fullDepEntry ''
+    sed -e 's@^progs = @progs=@g' -i Makefile
+  '' ["minInit" "doUnpack"];
 
-  patches = [ ./glibc212.patch ];
-  phaseNames = ["doPatch" "doEnsureBtrfsImage" "doMakeInstall"];
-      
   doEnsureBtrfsImage = a.fullDepEntry (''
-    if ! grep 'progs = ' Makefile | grep btrfs-image; then 
+    if ! grep 'progs = ' Makefile | grep btrfs-image; then
       sed -e 's/progs = .*/& btrfs-image/' -i Makefile
     fi
   '') ["minInit" "doUnpack"];
diff --git a/pkgs/tools/filesystems/btrfsprogs/glibc212.patch b/pkgs/tools/filesystems/btrfsprogs/glibc212.patch
deleted file mode 100644
index 8bc1873f540..00000000000
--- a/pkgs/tools/filesystems/btrfsprogs/glibc212.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/btrfsck.c b/btrfsck.c
-index 73f1836..c1f47a1 100644
---- a/btrfsck.c
-+++ b/btrfsck.c
-@@ -21,6 +21,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <fcntl.h>
-+#include <sys/stat.h>
- #include "kerncompat.h"
- #include "ctree.h"
- #include "disk-io.h"
diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix
index c41121911e5..a39ba002d23 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://tuxera.com/opensource/${name}.tgz";
+    url = "http://pkgs.fedoraproject.org/repo/pkgs/ntfs-3g/ntfs-3g-2010.10.2.tgz/91405690f25822142cdcb43d03e62d3f/ntfs-3g-2010.10.2.tgz";
     sha256 = "0wcyks4nvi1kck8i2dgwfsy5zxhil0v0xam8zbg1p592xbqygiqp";
   };
 
diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix
index 7cadc0dd649..2283a0c1746 100644
--- a/pkgs/tools/filesystems/reiserfsprogs/default.nix
+++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "reiserfsprogs-3.6.21";
 
   src = fetchurl {
-    url = "http://www.kernel.org/pub/linux/utils/fs/reiserfs/${name}.tar.bz2";
+    url = "mirror://kernel/linux/utils/fs/reiserfs/${name}.tar.bz2";
     sha256 = "19mqzhh6jsf2gh8zr5scqi9pyk1fwivrxncd11rqnp2148c58jam";
   };
 
diff --git a/pkgs/tools/filesystems/relfs/default.nix b/pkgs/tools/filesystems/relfs/default.nix
index 2eb8e3a0b3b..56dad0c1e3d 100644
--- a/pkgs/tools/filesystems/relfs/default.nix
+++ b/pkgs/tools/filesystems/relfs/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchcvs, builderDefs, ocaml, fuse, postgresql, pcre
-, libuuid, gnomevfs, pkgconfig, GConf }:
+, libuuid, gnome_vfs, pkgconfig, GConf }:
 
 	let localDefs = builderDefs.passthru.function {
 	src = fetchcvs {
@@ -10,7 +10,7 @@
 	};
 		
 		buildInputs = [ocaml fuse postgresql pcre
-			libuuid gnomevfs pkgconfig GConf];
+			libuuid gnome_vfs pkgconfig GConf];
 		configureFlags = [];
 		    build = builderDefs.stringsWithDeps.fullDepEntry ("
 			cd deps 
diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix
new file mode 100644
index 00000000000..63e6afaa803
--- /dev/null
+++ b/pkgs/tools/graphics/mscgen/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, flex, bison, gd, libpng, freetype, zlib }:
+
+let
+  version = "0.20";
+in
+stdenv.mkDerivation {
+  name = "mscgen-${version}";
+
+  src = fetchurl {
+    url = "www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz";
+    sha256 = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23";
+  };
+
+  buildInputs = [ flex bison gd libpng freetype zlib ];
+
+  doCheck = true;
+  preCheck = ''
+    sed -i -e "s|#!/bin/bash|#!${stdenv.shell}|" test/renderercheck.sh
+  '';
+
+  meta = {
+    homepage = "http://www.mcternan.me.uk/mscgen/";
+    description = "convert Message Sequence Chart descriptions into PNG, SVG, or EPS images";
+    license = "GPLv2";
+
+    longDescription = ''
+      Mscgen is a small program that parses Message Sequence Chart
+      descriptions and produces PNG, SVG, EPS or server side image maps
+      (ismaps) as the output. Message Sequence Charts (MSCs) are a way
+      of representing entities and interactions over some time period
+      and are often used in combination with SDL. MSCs are popular in
+      Telecoms to specify how protocols operate although MSCs need not
+      be complicated to create or use. Mscgen aims to provide a simple
+      text language that is clear to create, edit and understand, which
+      can also be transformed into common image formats for display or
+      printing.
+    '';
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+}
diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix
new file mode 100644
index 00000000000..cc11427f65a
--- /dev/null
+++ b/pkgs/tools/misc/disper/default.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchurl, python}:
+
+stdenv.mkDerivation rec {
+  name = "disper-0.3.0";
+
+  buildInputs = [python];
+
+  preConfigure = ''
+    export makeFlags="PREFIX=$out"
+  '';
+
+  src = fetchurl {
+    url = http://ppa.launchpad.net/disper-dev/ppa/ubuntu/pool/main/d/disper/disper_0.3.0.tar.gz;
+    sha256 = "1mfqidm5c89nknzksabqgjygdp57xpszz7hy2dxh39hpgrsk3l58";
+  };
+
+  meta = {
+    description = "Disper is an on-the-fly display switch utility.";
+    homepage = http://willem.engen.nl/projects/disper/;
+  };
+
+}
diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/tools/misc/dtach/default.nix
new file mode 100644
index 00000000000..d203419cd69
--- /dev/null
+++ b/pkgs/tools/misc/dtach/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "dtach-0.8";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/dtach/dtach/0.8/dtach-0.8.tar.gz";
+    sha256 = "16614ebddf8ab2811d3dc0e7f329c7de88929ac6a9632d4cb4aef7fe11b8f2a9";
+  };
+
+  installPhase = ''
+    ensureDir $out/bin
+    cp dtach $out/bin/dtach
+  '';
+
+  meta = {
+    homepage = http://dtach.sourceforge.net/;
+    description = "A program that emulates the detach feature of screen";
+
+    longDescription = ''dtach is a tiny program that emulates the
+      detach feature of screen, allowing you to run a program in an
+      environment that is protected from the controlling terminal and
+      attach to it later. dtach does not keep track of the contents of
+      the screen, and thus works best with programs that know how to
+      redraw themselves.'';
+
+    license = stdenv.lib.licenses.gpl2Plus;
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.chaoflow ];
+  };
+}
diff --git a/pkgs/tools/misc/gource/default.nix b/pkgs/tools/misc/gource/default.nix
index 30e5a73685e..9ec8961f268 100644
--- a/pkgs/tools/misc/gource/default.nix
+++ b/pkgs/tools/misc/gource/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL_image, glew, mesa}:
  
 stdenv.mkDerivation {
-  name = "gource-0.28";
+  name = "gource-0.37";
   
   src = fetchurl {
-    url = http://gource.googlecode.com/files/gource-0.28.tar.gz;
-    sha256 = "09538vcf9n21qx4cmcjrki6ilayvm4x6s0zdf00mrd1h0bklhxn3";
+    url = http://gource.googlecode.com/files/gource-0.37.tar.gz;
+    sha256 = "03kd9nn65cl1p2jgn6pvpxmvnfscz3c8jqds90fsc0z37ij2iiyn";
   };
   
   buildInputs = [glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa];
diff --git a/pkgs/tools/misc/grub/1.9x.nix b/pkgs/tools/misc/grub/1.9x.nix
index 59c490b810c..14a4932f100 100644
--- a/pkgs/tools/misc/grub/1.9x.nix
+++ b/pkgs/tools/misc/grub/1.9x.nix
@@ -77,7 +77,11 @@ stdenv.mkDerivation rec {
 
     license = "GPLv3+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.gnu;
+    maintainers = with stdenv.lib.maintainers; [ ludo shlevy ];
+
+    platforms = if EFIsupport then
+      [ "i686-linux" "x86_64-linux" ]
+    else
+      stdenv.lib.platforms.gnu;
   };
 }
diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index d3ea7a38a74..cc8fbacca6f 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -2,11 +2,11 @@
 , libX11, libICE, perl, zip, unzip, gettext, slang}:
 
 stdenv.mkDerivation rec {
-  name = "mc-4.7.5.3";
+  name = "mc-4.8.0";
   
   src = fetchurl {
-    url = http://www.midnight-commander.org/downloads/mc-4.7.5.3.tar.bz2;
-    sha256 = "1di8fsdg6y98iq3846j145qjk4bf5rgjj2hxnxdbcwfp8p3v8x88";
+    url = http://www.midnight-commander.org/downloads/mc-4.8.0.tar.bz2;
+    sha256 = "dbf077b318c13fc6d465dc67bd43958f067b9ff7e21041975bd14927dfa31b52";
   };
   
   buildInputs = [ pkgconfig perl glib gpm slang zip unzip file gettext libX11 libICE e2fsprogs ];
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index f9a35b235fc..621bc79a277 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20110822";
+  name = "parallel-20111122";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "0ryj97b9w2mzvmnqhkh384s59v62gf0vlyj8qphiy34505x5pznb";
+    sha256 = "1czcflprhbhyj3mj7dc986gll0kfc6n8qiqazclph172rbq3acpd";
   };
 
   patchPhase =
diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix
new file mode 100644
index 00000000000..b6c69be2f09
--- /dev/null
+++ b/pkgs/tools/misc/qjoypad/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, libX11, libXtst, qt4 }:
+stdenv.mkDerivation rec {
+  name = "qjoypad-4.1.0";
+  src = fetchurl {
+    url = "mirror://sourceforge/qjoypad/${name}.tar.gz";
+    sha256 = "1jlm7i26nfp185xrl41kz5z6fgvyj51bjpz48cg27xx64y40iamm";
+  };
+  buildInputs = [ pkgconfig libX11 libXtst qt4 ];
+  patchPhase = ''
+    cd src
+    substituteInPlace config --replace /bin/bash /bin/sh
+    ensureDir $out
+    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${libX11}/lib"
+  '';
+  meta = {
+    description = "A program that lets you use gaming devices anywhere";
+    longDescription = ''
+      A simple Linux/QT program that lets you use your gaming devices
+      where you want them: in your games! QJoyPad takes input from a
+      gamepad or joystick and translates it into key strokes or mouse
+      actions, letting you control any XWindows program with your game
+      controller. This lets you play all those games that for some
+      reason don't have joystick support with your joystick. QJoyPad
+      also gives you the advantage of multiple saved layouts so you
+      can have a separate setting for every game, or for every class
+      of game! That way you can play your games the way you want, not
+      the way the programmers decided, and you can have the same
+      button be "fire" in every one of your space fighters. QJoyPad
+      gives you the freedom and flexibility to really take advantage
+      of gaming devices in Linux, and makes the Linux gaming
+      experience just a little bit nicer.
+    '';
+    homepage = http://qjoypad.sourceforge.net;
+    license = with stdenv.lib.licenses; gpl2;
+    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix
index 307c60bd611..95ced6784ae 100644
--- a/pkgs/tools/misc/recutils/default.nix
+++ b/pkgs/tools/misc/recutils/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, gettext, emacs, curl, check, bc }:
 
 stdenv.mkDerivation rec {
-  name = "recutils-1.3";
+  name = "recutils-1.4";
 
   src = fetchurl {
     url = "mirror://gnu/recutils/${name}.tar.gz";
-    sha256 = "0ywf939vw4zbpq6dmvw656fhkx8izma99pr1akzh8hs2rc9sp2pr";
+    sha256 = "1kakmzmkdkgqmvqfzrpkwjjkg492rk3k7xfgnwcjacap9l79z9pv";
   };
 
   doCheck = true;
diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix
index 658afb37c03..05ab7cc7ae7 100644
--- a/pkgs/tools/misc/time/default.nix
+++ b/pkgs/tools/misc/time/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation {
     sha256 = "0va9063fcn7xykv658v2s9gilj2fq4rcdxx2mn2mmy1v4ndafzp3";
   };
 
+  patches = [ ./max-resident.patch ];
+
   meta = {
     description = "GNU Time, a tool that runs programs and summarizes the system resources they use";
 
diff --git a/pkgs/tools/misc/time/max-resident.patch b/pkgs/tools/misc/time/max-resident.patch
new file mode 100644
index 00000000000..e593d833d5e
--- /dev/null
+++ b/pkgs/tools/misc/time/max-resident.patch
@@ -0,0 +1,16 @@
+Fix the "max resident" size reported by ‘time’ being off by a factor of 4. 
+
+From http://lists.gnu.org/archive/html/help-gnu-utils/2010-10/msg00002.html
+
+diff -ru -x '*~' time-1.7-orig/time.c time-1.7/time.c
+--- time-1.7-orig/time.c	1996-06-13 15:38:21.000000000 -0400
++++ time-1.7/time.c	2011-10-31 10:40:27.000000000 -0400
+@@ -392,7 +392,7 @@
+ 		       ptok ((UL) resp->ru.ru_ixrss) / MSEC_TO_TICKS (v));
+ 	      break;
+ 	    case 'M':		/* Maximum resident set size.  */
+-	      fprintf (fp, "%lu", ptok ((UL) resp->ru.ru_maxrss));
++              fprintf (fp, "%lu", (UL) resp->ru.ru_maxrss);
+ 	      break;
+ 	    case 'O':		/* Outputs.  */
+ 	      fprintf (fp, "%ld", resp->ru.ru_oublock);
diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index 10793753ab5..da54c185410 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -12,6 +12,12 @@ stdenv.mkDerivation rec {
 
   makeFlags = "PREFIX=\${out}";
 
+  crossAttrs = {
+    preBuild = ''
+      makeFlags=" $makeFlags CC=${stdenv.cross.config}-gcc "
+    '';
+  };
+
   buildInputs = [ ncurses libevent ];
 
   meta = {
diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix
new file mode 100644
index 00000000000..f5865020785
--- /dev/null
+++ b/pkgs/tools/networking/cntlm/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, which}:
+
+stdenv.mkDerivation {
+  name = "cntlm-0.35.1";
+
+  src = fetchurl {
+    url = mirror://sourceforge/cntlm/cntlm-0.35.1.tar.gz;
+    sha256 = "7b3fb7184e72cc3f1743bb8e503a5305e96458bc630a7e1ebfc9f3c07ffa6c5e";
+  };
+
+  buildInputs = [ which ];
+
+  installPhase = ''
+    ensureDir $out/bin; cp cntlm $out/bin/;
+    ensureDir $out/share/; cp COPYRIGHT README VERSION doc/cntlm.conf $out/share/;
+    ensureDir $out/man/; cp doc/cntlm.1 $out/man/;
+  '';
+
+  meta = {
+    description = "Cntlm is an NTLM/NTLMv2 authenticating HTTP proxy";
+    homepage = http://cntlm.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.qknight ];
+  };
+}
diff --git a/pkgs/tools/networking/curl/connect-timeout.patch b/pkgs/tools/networking/curl/connect-timeout.patch
deleted file mode 100644
index 1edb1f70b9b..00000000000
--- a/pkgs/tools/networking/curl/connect-timeout.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-diff -rc curl-7.19.3-orig/lib/connect.c curl-7.19.3/lib/connect.c
-*** curl-7.19.3-orig/lib/connect.c	2009-01-02 23:30:50.000000000 +0100
---- curl-7.19.3/lib/connect.c	2009-01-21 15:04:08.000000000 +0100
-***************
-*** 115,121 ****
-  singleipconnect(struct connectdata *conn,
-                  const Curl_addrinfo *ai, /* start connecting to this */
-                  long timeout_ms,
-!                 bool *connected);
-  
-  /*
-   * Curl_timeleft() returns the amount of milliseconds left allowed for the
---- 115,122 ----
-  singleipconnect(struct connectdata *conn,
-                  const Curl_addrinfo *ai, /* start connecting to this */
-                  long timeout_ms,
-!                 bool *connected,
-!                 bool *timed_out);
-  
-  /*
-   * Curl_timeleft() returns the amount of milliseconds left allowed for the
-***************
-*** 541,546 ****
---- 542,548 ----
-  {
-    curl_socket_t sockfd;
-    Curl_addrinfo *ai;
-+   bool timed_out;
-  
-    /* first close the failed socket */
-    sclose(conn->sock[sockindex]);
-***************
-*** 554,560 ****
-    ai = conn->ip_addr->ai_next;
-  
-    while(ai) {
-!     sockfd = singleipconnect(conn, ai, 0L, connected);
-      if(sockfd != CURL_SOCKET_BAD) {
-        /* store the new socket descriptor */
-        conn->sock[sockindex] = sockfd;
---- 556,562 ----
-    ai = conn->ip_addr->ai_next;
-  
-    while(ai) {
-!     sockfd = singleipconnect(conn, ai, 0L, connected, &timed_out);
-      if(sockfd != CURL_SOCKET_BAD) {
-        /* store the new socket descriptor */
-        conn->sock[sockindex] = sockfd;
-***************
-*** 714,720 ****
-  singleipconnect(struct connectdata *conn,
-                  const Curl_addrinfo *ai,
-                  long timeout_ms,
-!                 bool *connected)
-  {
-    struct Curl_sockaddr_ex addr;
-    char addr_buf[128];
---- 716,723 ----
-  singleipconnect(struct connectdata *conn,
-                  const Curl_addrinfo *ai,
-                  long timeout_ms,
-!                 bool *connected,
-!                 bool *timed_out)
-  {
-    struct Curl_sockaddr_ex addr;
-    char addr_buf[128];
-***************
-*** 730,735 ****
---- 733,740 ----
-    struct sockaddr_in6 * const sa6 = (void *)&addr.sa_addr;
-  #endif
-  
-+   *timed_out = FALSE;
-+ 
-    /*
-     * The Curl_sockaddr_ex structure is basically libcurl's external API
-     * curl_sockaddr structure with enough space available to directly hold
-***************
-*** 880,887 ****
-      infof(data, "connected\n");
-      return sockfd;
-    }
-!   else if(WAITCONN_TIMEOUT == rc)
-      infof(data, "Timeout\n");
-    else {
-      data->state.os_errno = error;
-      infof(data, "%s\n", Curl_strerror(conn, error));
---- 885,894 ----
-      infof(data, "connected\n");
-      return sockfd;
-    }
-!   else if(WAITCONN_TIMEOUT == rc) {
-!     *timed_out = TRUE;
-      infof(data, "Timeout\n");
-+   }
-    else {
-      data->state.os_errno = error;
-      infof(data, "%s\n", Curl_strerror(conn, error));
-***************
-*** 911,918 ****
-    int num_addr;
-    Curl_addrinfo *ai;
-    Curl_addrinfo *curr_addr;
-  
--   struct timeval after;
-    struct timeval before = Curl_tvnow();
-  
-    /*************************************************************
---- 918,925 ----
-    int num_addr;
-    Curl_addrinfo *ai;
-    Curl_addrinfo *curr_addr;
-+   bool timed_out;
-  
-    struct timeval before = Curl_tvnow();
-  
-    /*************************************************************
-***************
-*** 955,973 ****
-         curr_addr = curr_addr->ai_next, aliasindex++) {
-  
-      /* start connecting to the IP curr_addr points to */
-!     sockfd = singleipconnect(conn, curr_addr, timeout_per_addr, connected);
-  
-      if(sockfd != CURL_SOCKET_BAD)
-        break;
-  
-!     /* get a new timeout for next attempt */
-!     after = Curl_tvnow();
-!     timeout_ms -= Curl_tvdiff(after, before);
-!     if(timeout_ms < 0) {
-        failf(data, "connect() timed out!");
-        return CURLE_OPERATION_TIMEDOUT;
-      }
--     before = after;
-    }  /* end of connect-to-each-address loop */
-  
-    *sockconn = sockfd;    /* the socket descriptor we've connected */
---- 962,978 ----
-         curr_addr = curr_addr->ai_next, aliasindex++) {
-  
-      /* start connecting to the IP curr_addr points to */
-!     sockfd = singleipconnect(conn, curr_addr, timeout_per_addr, connected, &timed_out);
-  
-      if(sockfd != CURL_SOCKET_BAD)
-        break;
-  
-!     /* if this is the last address and it timed out, propagate the
-!        timeout to the caller */
-!     if(!curr_addr->ai_next && timed_out) {
-        failf(data, "connect() timed out!");
-        return CURLE_OPERATION_TIMEDOUT;
-      }
-    }  /* end of connect-to-each-address loop */
-  
-    *sockconn = sockfd;    /* the socket descriptor we've connected */
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 57ce663080a..7aee342f4a3 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -10,11 +10,11 @@ assert sslSupport -> openssl != null;
 assert scpSupport -> libssh2 != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.21.0";
+  name = "curl-7.22.0";
 
   src = fetchurl {
     url = "http://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "1fl7sh38i746b57aqjqjaykwq4rhm2p1phzrgnc2h6wm2k2b95gy";
+    sha256 = "04ji7v06f33y6plvikwj283ad6fxxxjpm7as9xw25c924f3dm85x";
   };
 
   # Zlib and OpenSSL must be propagated because `libcurl.la' contains
@@ -59,17 +59,6 @@ stdenv.mkDerivation rec {
     substituteInPlace configure --replace /usr/bin /no-such-path
   '';
 
-  patches = [
-    /* Fixes broken retry support when a timeout is used.  The
-       select() system call (used to wait for the connection to come
-       up) can return slightly before the computed deadline (a few
-       milliseconds).  Curl will think the problem is something else,
-       proceed with the next IP address (which usually doesn't exist),
-       then barf with a CURLE_COULDNT_CONNECT error, which is
-       considered non-transient so it won't retry. */
-    ./connect-timeout.patch
-  ];
-
   meta = {
     description = "A command line tool for transferring files with URL syntax";
     homepage = http://curl.haxx.se/;
diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix
new file mode 100644
index 00000000000..cdab68f22ea
--- /dev/null
+++ b/pkgs/tools/networking/dnstop/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, libpcap, ncurses }:
+
+stdenv.mkDerivation {
+  name = "dnstop-20110502";
+
+  src = fetchurl {
+    url = http://dns.measurement-factory.com/tools/dnstop/src/dnstop-20110502.tar.gz;
+    sha256 = "0ra3xjf7dwvq5xm6qbqd2al35vigibihy46rsz1860qrn3wycy12";
+  };
+
+  buildInputs = [ libpcap ncurses ];
+
+  preInstall = ''
+    ensureDir $out/share/man/man8 $out/bin
+  '';
+
+  meta = { 
+    description = "libpcap application that displays DNS traffic on your network";
+    homepage = "http://dns.measurement-factory.com/tools/dnstop";
+    license = "BSD";
+  };
+}
diff --git a/pkgs/tools/networking/imapproxy/default.nix b/pkgs/tools/networking/imapproxy/default.nix
new file mode 100644
index 00000000000..7af7f73aad9
--- /dev/null
+++ b/pkgs/tools/networking/imapproxy/default.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchurl, openssl, ncurses}:
+
+stdenv.mkDerivation rec {
+  name = "imapproxy-1.2.7";
+  src = fetchurl {
+    url = mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-1.2.7.tar.bz2;
+    sha256 = "0j5fq755sxiz338ia93jrkiy64crv30g37pir5pxfys57q7d92nx";
+  };
+
+  buildInputs = [ openssl ncurses ];
+
+  patchPhase = ''
+    sed -i -e 's/-o \(root\|bin\) -g \(sys\|bin\)//' Makefile.in
+  '';
+
+  meta = {
+    homepage = http://imapproxy.org/;
+    description = "It proxies IMAP transactions caching server connections";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix
index 19ef811713a..1039cadb3ee 100644
--- a/pkgs/tools/networking/miniupnpc/default.nix
+++ b/pkgs/tools/networking/miniupnpc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "miniupnpc-1.5";
+  name = "miniupnpc-1.6";
 
   src = fetchurl {
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "0mx950lfxcjpsfny8qcjx6phb74v4zw1rlj99xicd4icx5j0w3s4";
+    sha256 = "151rh46axl44y7bbflb43pnj52gvlfnkxfgrn2jvai5gwrbbgmmv";
   };
 
   installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
diff --git a/pkgs/tools/networking/mu0/default.nix b/pkgs/tools/networking/mu0/default.nix
new file mode 100644
index 00000000000..a772f237500
--- /dev/null
+++ b/pkgs/tools/networking/mu0/default.nix
@@ -0,0 +1,25 @@
+{ fetchurl, stdenv, sqlite, pkgconfig, xapian, glib, gmime }:
+
+stdenv.mkDerivation rec {
+  name = "mu0-0.9.7";
+
+  src = fetchurl {
+    url = http://mu0.googlecode.com/files/mu-0.9.7.tar.gz;
+    sha256 = "14nyn791ficyllj9idhiq3mncwnrg71lfxk126804dxba1l90r72";
+  };
+
+  buildInputs = [ sqlite pkgconfig xapian glib gmime ];
+
+  /* The tests don't pass */
+  doCheck = false;
+
+  meta = {
+    description = "mu is a collection of utilties for indexing and searching Maildirs";
+
+    licenses = [ "GPLv3+" ];
+
+    homepage = http://code.google.com/p/mu0/;
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index 28ca2f3d3ed..ef032eee390 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, glib }:
 
 let
-  name = "nbd-2.9.23";
+  name = "nbd-2.9.24";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://sourceforge/nbd/${name}.tar.bz2";
-    sha256 = "0ab44fe9e80c3f41bb1025ecda351a874affd46bf56ba4033ea03700c3b83803";
+    sha256 = "025cqsx6cwbr62javdvm5vx675ai0b1absbx4if1v5pp9hzrpxmq";
   };
 
   buildInputs = [pkgconfig glib];
diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix
index 8b7ca552545..a3b347f6423 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/pkgs/tools/networking/ntp/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux -> libcap != null;
  
 stdenv.mkDerivation rec {
-  name = "ntp-4.2.6p2";
+  name = "ntp-4.2.6p4";
   
   src = fetchurl {
     url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz";
-    sha256 = "1n79scfvgjk8hn1fr4q2kkk6xm83k68r4p488ai09nm20dwqp2a2";
+    sha256 = "1ww1hpy0yfmj13vs46d80hs48hy8ig6kn6p6d8q2syym02khxhyy";
   };
   
   configureFlags = ''
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index b9285a8c219..bfcc1c16dab 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ iproute lzo openssl ];
 
   configureFlags = ''
+    --enable-password-save
     --with-ifconfig-path=${nettools}/sbin/ifconfig
     --with-iproute-path=${iproute}/sbin/ip
     --with-route-path=${nettools}/sbin/route
diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix
index 848f2284fd3..4056c6429b0 100644
--- a/pkgs/tools/networking/p2p/rtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/rtorrent/default.nix
@@ -14,7 +14,10 @@ stdenv.mkDerivation {
 
   buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl ];
 
-  postInstall = "install -D -m 444 doc/rtorrent.1 $out/share/man/man1/rtorrent.1";
+  postInstall = ''
+    ensureDir $out/share/man/man1
+    mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1
+  '';
 
   meta = {
     homepage = "http://libtorrent.rakshasa.no/";
diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix
index 1c6c59acd9f..bce4b0687ba 100644
--- a/pkgs/tools/networking/p2p/seeks/default.nix
+++ b/pkgs/tools/networking/p2p/seeks/default.nix
@@ -1,18 +1,19 @@
 { fetchurl, stdenv, zlib, docbook2x, pcre, curl, libxml2, libevent, perl
-, pkgconfig, protobuf, tokyocabinet, opencv }:
+, pkgconfig, protobuf, tokyocabinet, tokyotyrant, opencv
+}:
 
-let version = "0.3.3"; in
+let version = "0.4.0"; in
 stdenv.mkDerivation {
   name = "seeks-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/seeks/solo/seeks-${version}.tar.gz";
-    sha256 = "1zsl6ixmkvjhy9r2cs22g4q31gg5fkhayvws5jra7jfgmzbrll5c";
+    url = "mirror://sourceforge/seeks/hippy/seeks-${version}.tar.gz";
+    sha256 = "1y91dmd0b0yj5036x8kk92iy88dsnzdwhhz23ba9lp96vpafd2ky";
   };
 
   buildInputs =
     [ zlib docbook2x pcre curl libxml2 libevent perl pkgconfig
-      protobuf tokyocabinet opencv
+      protobuf tokyocabinet tokyotyrant opencv
     ];
 
   configureFlags =
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 5d2e61df36b..98fc8e4d145 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -1,20 +1,22 @@
-{ stdenv, fetchurl, openssl }:
+{ stdenv, fetchurl, openssl, expat, libevent, ldns }:
 
 stdenv.mkDerivation rec {
-  name = "unbound-1.4.1";
+  name = "unbound-1.4.13";
 
   src = fetchurl {
     url = "http://unbound.net/downloads/${name}.tar.gz";
-    sha256 = "2573db422d7a856a3783b96698f2d5ca18a849d0bd6f0e36eb37a4f0a65b60e2";
+    sha256 = "04r379gma1ghr9zjc1fmncpw8kka4f0mpcmrzidsp264aqkxriw3";
   };
  
-  buildInputs = [openssl];
+  buildInputs = [openssl expat libevent ldns];
 
-  configureFlags = "--with-ssl=${openssl}";
+  configureFlags = [ "--with-ssl=${openssl}" "--with-libexpat=${expat}"
+    "--localstatedir=/var" ];
 
   meta = {
     description = "Unbound, a validating, recursive, and caching DNS resolver.";
     license = "BSD";
     homepage = http://www.unbound.net;
+    platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix
new file mode 100644
index 00000000000..7d72016cfe2
--- /dev/null
+++ b/pkgs/tools/networking/uwimap/default.nix
@@ -0,0 +1,38 @@
+{stdenv, fetchurl, pam, openssl}:
+
+stdenv.mkDerivation {
+  name = "uw-imap-2007";
+
+  src = fetchurl {
+    url = "ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz";
+    sha256 = "0a2a00hbakh0640r2wdpnwr8789z59wnk7rfsihh3j0vbhmmmqak";
+  };
+
+  makeFlags = "lnp"; # Linux with PAM modules
+
+  buildInputs = [ pam openssl ];
+
+  patchPhase = ''
+    sed -i -e s,/usr/local/ssl,${openssl}, \
+      src/osdep/unix/Makefile
+  '';
+
+  installPhase = ''
+    ensureDir $out/bin $out/lib $out/include
+    cp c-client/*.h c-client/linkage.c $out/include
+    cp c-client/c-client.a $out/lib/libc-client.a
+    cp mailutil/mailutil imapd/imapd dmail/dmail mlock/mlock mtest/mtest tmail/tmail \
+      tools/{an,ua} $out/bin
+  '';
+
+  meta = {
+    homepage = http://www.washington.edu/imap/;
+    description = "UW IMAP toolkit - IMAP-supporting software developed by the UW";
+    license = "Apache2";
+    platforms = with stdenv.lib.platforms; linux;
+  };
+
+  passthru = {
+    withSSL = true;
+  };
+}
diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix
index 3bf2b05dd56..72a31262e26 100644
--- a/pkgs/tools/networking/vde2/default.nix
+++ b/pkgs/tools/networking/vde2/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, openssl, libpcap }:
+{ stdenv, fetchurl, openssl, libpcap, python }:
 
 stdenv.mkDerivation rec {
-  name = "vde2-2.3.1";
+  name = "vde2-2.3.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/vde/vde2/2.3.1/${name}.tar.gz";
-    sha256 = "1vbrds8k1cn1fgvpkg2ck2227l5yy2f0qxk44sg3vymq0aiw8y37";
+    sha256 = "14xga0ib6p1wrv3hkl4sa89yzjxv7f1vfqaxsch87j6scdm59pr2";
   };
 
-  buildInputs = [ openssl libpcap ];
+  buildInputs = [ openssl libpcap python ];
 
   meta = {
     homepage = http://vde.sourceforge.net/;
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index b10d25ffc94..799c5e9dd85 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, gettext, perl, LWP, gnutls ? null }:
 
 stdenv.mkDerivation rec {
-  name = "wget-1.13.3";
+  name = "wget-1.13.4";
 
   src = fetchurl {
     url = "mirror://gnu/wget/${name}.tar.gz";
-    sha256 = "07wxl38qiy95k3hv2fd1sglgrlp6z920pr9mcfsj8dg7iaxbhppi";
+    sha256 = "1kadjg63x1mm741dxdidwsn1rz0f7dkzbq59v0iww87jr45p3ir4";
   };
 
-  preConfigure =
+  preConfigure = stdenv.lib.optionalString doCheck
     '' for i in "doc/texi2pod.pl" "tests/run-px" "util/rmold.pl"
        do
          sed -i "$i" -e 's|/usr/bin.*perl|${perl}/bin/perl|g'
@@ -21,16 +21,17 @@ stdenv.mkDerivation rec {
        done
     '';
 
-  buildInputs = [ gettext perl ]
-    ++ stdenv.lib.optional doCheck LWP
+  buildNativeInputs = [ gettext ];
+  buildInputs =
+    stdenv.lib.optionals doCheck [ perl LWP ]
     ++ stdenv.lib.optional (gnutls != null) gnutls;
 
   configureFlags =
     if gnutls != null
     then "--with-ssl=gnutls"
-    else "";
+    else "--without-ssl";
 
-  doCheck = true;
+  doCheck = (perl != null);
 
   meta = {
     description = "GNU Wget, a tool for retrieving files using HTTP, HTTPS, and FTP";
diff --git a/pkgs/tools/networking/wicd/wpa2-ttls b/pkgs/tools/networking/wicd/wpa2-ttls
index 7efdeffec84..c5ac798be5d 100644
--- a/pkgs/tools/networking/wicd/wpa2-ttls
+++ b/pkgs/tools/networking/wicd/wpa2-ttls
@@ -2,6 +2,7 @@ name = WPA2-TTLS
 author = various contributors
 version = 1
 require identity *Identity anonymous_identity *Anonymous_identity password *Password ca_cert *Path_to_CA_Cert
+protected password *Password
 -----
 ctrl_interface=/var/run/wpa_supplicant
 network={
diff --git a/pkgs/tools/package-management/disnix/activation-scripts/default.nix b/pkgs/tools/package-management/disnix/activation-scripts/default.nix
index 4e1442935ee..8725f5d1250 100644
--- a/pkgs/tools/package-management/disnix/activation-scripts/default.nix
+++ b/pkgs/tools/package-management/disnix/activation-scripts/default.nix
@@ -16,10 +16,10 @@ assert enableSubversionRepository -> subversion != null;
 assert enableEjabberdDump -> ejabberd != null;
 
 stdenv.mkDerivation {
-  name = "disnix-activation-scripts-0.2";
+  name = "disnix-activation-scripts-0.3pre29887";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/910903/download/1/disnix-activation-scripts-0.2.tar.gz;
-    sha256 = "0r7yqvh3jnbvpb6lmr10lm4r5pvi4jaw0c6rhlyl5q6nh3mxymnd";
+    url = http://hydra.nixos.org/build/1461490/download/1/disnix-activation-scripts-0.3pre29887.tar.gz;
+    sha256 = "034mx096iz9dqjsrxh6jkvcwch399gfsahrm6vfnswz9jfvfdcw0";
   };
   
   preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix
index fbb19159ef8..631db35a9b0 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, gettext, libiconv}:
 
 stdenv.mkDerivation {
-  name = "disnix-0.3pre27244";
+  name = "disnix-0.3pre29816";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/1083290/download/4/disnix-0.3pre27244.tar.gz;
-    sha256 = "1x7y34mxs26k019y9y8fsnzdk7wmjqfmybw99qgqqxy5kblvlzns";
+    url = http://hydra.nixos.org/build/1453079/download/4/disnix-0.3pre29816.tar.gz;
+    sha256 = "13gi0zs0a8pvgmgh3h431ydran3qf3px5m3d6vddd9b225kbkgwz";
   };
   buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ]
                 ++ stdenv.lib.optional (!stdenv.isLinux) libiconv
diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index 1a7ca571604..92914dd1cad 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -1,17 +1,17 @@
 {stdenv, fetchurl, disnix, socat, pkgconfig}:
 
 stdenv.mkDerivation {
-  name = "disnixos-0.2pre27672";
+  name = "disnixos-0.2pre29928";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/1153468/download/3/disnixos-0.2pre27672.tar.gz;
-    sha256 = "0z74p9fnvchvl78brj2p3r9h0wwvpl86zk0ynzqcf8ww0h71ws08";
+    url = http://hydra.nixos.org/build/1464065/download/3/disnixos-0.2pre29928.tar.gz;
+    sha256 = "0l7kszbpi8lzq95khi45fbq71l5csf8kamds4va6bxsyfwxrx6sm";
   };
   buildInputs = [ socat pkgconfig disnix ];
   dontStrip = true;
   NIX_STRIP_DEBUG = true;
   
   meta = {
-    description = "Provides complementary NixOS infrastructure deployment to NixOS";
+    description = "Provides complementary NixOS infrastructure deployment to Disnix";
     license = "LGPLv2.1+";
     maintainers = [ stdenv.lib.maintainers.sander ];
   };
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 6bc3f33750b..30487055669 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.0pre29200";
+  name = "nix-1.0pre30706";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/1320284/download/4/${name}.tar.bz2";
-    sha256 = "a10f65b52bcf72b9ec7bf5610e16de2d49c1cc4c008bf0a93281e8e2233fa1b1";
+    url = "http://hydra.nixos.org/build/1580753/download/4/${name}.tar.bz2";
+    sha256 = "2658a4fea95799d8719685a808ab354f0b5a3ce38af92117e1a15c394c261c5b";
   };
 
   buildNativeInputs = [ perl pkgconfig ];
@@ -31,9 +31,14 @@ stdenv.mkDerivation rec {
       ''
         --with-store-dir=${storeDir} --localstatedir=${stateDir}
         --with-bzip2=${bzip2.hostDrv} --with-sqlite=${sqlite.hostDrv}
+        --enable-gc
+        --with-dbi=${perlPackages.DBI}/lib/perl5/site_perl
+        --with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl
         --disable-init-state
         CFLAGS=-O3 CXXFLAGS=-O3
-      '';
+      '' + stdenv.lib.optionalString (
+          stdenv.cross ? nix && stdenv.cross.nix ? system
+      ) ''--with-system=${stdenv.cross.nix.system}'';
     doCheck = false;
   };
 
diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix
index e9c4f416509..d80b35e1a11 100644
--- a/pkgs/tools/system/fakeroot/default.nix
+++ b/pkgs/tools/system/fakeroot/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "fakeroot-1.14.5";
+  name = "fakeroot-1.18.1";
 
   src = fetchurl {
-    url = http://ftp.de.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.14.5.orig.tar.bz2;
-    sha256 = "0s5f785qsh057z05l9i5k1h9cbj9x26ki37l4wh4iyabjhschddh";
+    url = http://ftp.de.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.18.1.orig.tar.bz2;
+    sha256 = "0h5jsw715a9hv32cb1m1bajy26l7xxrbgrk6qk1b6m91lxh6rnw9";
   };
 
   meta = {
diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix
index 3c85fa59803..5a34813d8d9 100644
--- a/pkgs/tools/system/fdisk/default.nix
+++ b/pkgs/tools/system/fdisk/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, parted, libuuid, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "fdisk-1.2.5";
+  name = "fdisk-1.3.0a";
 
   src = fetchurl {
     url = "mirror://gnu/fdisk/${name}.tar.bz2";
-    sha256 = "1pwwblr85g4r6h5jwp8m5339v7f747z35bpnm945vjnw5mrch3lk";
+    sha256 = "1g2zvl560f7p1hd4q50d1msy6qp7949mdkagfy8ki8cayp8fp267";
   };
 
   buildInputs = [ parted libuuid gettext ];
diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix
index 87d6a4b073f..2330de1d11e 100644
--- a/pkgs/tools/system/freeipmi/default.nix
+++ b/pkgs/tools/system/freeipmi/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libgcrypt, readline }:
 
 stdenv.mkDerivation rec {
-  name = "freeipmi-1.0.6";
+  name = "freeipmi-1.0.9";
 
   src = fetchurl {
     url = "mirror://gnu/freeipmi/${name}.tar.gz";
-    sha256 = "1990y1qkx1g5pb5flgzk0n7ms6ipcams576bna9hpkgg1h0rcbb6";
+    sha256 = "00ix8cigf6nl5kg95hla43kf27jkb3lljhcihbfriwq0wrghcfx4";
   };
 
   buildInputs = [ libgcrypt readline ];
diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix
index 140e0008ed8..154f6acc09b 100644
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/pkgs/tools/system/smartmontools/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchurl}:
 
 let
-  name = "smartmontools-5.41";
+  name = "smartmontools-5.42";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://sourceforge/smartmontools/${name}.tar.gz";
-    sha256 = "173eb14e3253a30230f38c7e684085bcae7fa021efff58bdf94c2702ac76fa32";
+    sha256 = "b664d11e814e114ce3a32a4fa918c9e649c684e2897c007b2a8b92574decc374";
   };
 
   meta = {
diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix
index be41b88c9e3..abc04e96c32 100644
--- a/pkgs/tools/system/ts/default.nix
+++ b/pkgs/tools/system/ts/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
 
-  name = "ts-0.7.0";
+  name = "ts-0.7.2";
 
   installPhase=''make install "PREFIX=$out"'';
 
@@ -11,8 +11,8 @@ stdenv.mkDerivation {
   };
 
   src = fetchurl {
-    url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.7.0.tar.gz;
-    sha256 = "1m9nf0299idkh355afk2c9v9qqpxm4ram3gyf8a9qv4f9gg6hprp";
+    url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.7.2.tar.gz;
+    sha256 = "08f9ipg98d6ygzb4fzdm1z157llzh4akipmq14ycfd7l023vidik";
   };
 
   meta = {
diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix
index 07ce3de3d13..06e15d07ff0 100644
--- a/pkgs/tools/text/colordiff/default.nix
+++ b/pkgs/tools/text/colordiff/default.nix
@@ -9,5 +9,5 @@ stdenv.mkDerivation {
 
   buildInputs = [ perl /* xmlto */ ];
   dontBuild = 1; # do not build doc yet.
-  installPhase = ''make INSTALL_DIR=/bin MAN_DIR=/man DESTDIR="$out" install'';
+  installPhase = ''make INSTALL_DIR=/bin MAN_DIR=/share/man/man1 DESTDIR="$out" install'';
 }
diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/tools/text/odt2txt/default.nix
new file mode 100644
index 00000000000..b7134bf8e47
--- /dev/null
+++ b/pkgs/tools/text/odt2txt/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "odt2txt-0.4";
+
+  src = fetchurl {
+    url = "${meta.homepage}/${name}.tar.gz";
+    sha256 = "1y36s7w2ng0r4nismxb3hb3zvsim8aimvvblz9hgnanw3kwbvx55";
+  };
+
+  configurePhase="export makeFlags=\"DESTDIR=$out\"";
+
+  buildInputs = [ zlib ];
+
+  meta = {
+    description = "Simple .odt to .txt converter";
+    homepage = http://stosberg.net/odt2txt;
+    platforms = stdenv.lib.platforms.all;
+    lincense = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}
diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix
index 5f1fe24bc83..0d0576ee4a7 100644
--- a/pkgs/tools/text/wdiff/default.nix
+++ b/pkgs/tools/text/wdiff/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, which, screen }:
 
 let
-  name = "wdiff-1.0.1";
+  name = "wdiff-1.1.0";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://gnu/wdiff/${name}.tar.gz";
-    sha256 = "1jyg8vmdlazpcwii8a1ddbc0sxcklp9cvj5y0x9zqaybvwzg9r4l";
+    sha256 = "1lg5lz78xij4jjifv8fj68ixr9mha1c5vp8xzyg6rdx6ynkvnm5i";
   };
 
   # Required for the compile-time for the test suite.
diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix
index c02471d3e51..00dbe22aed3 100644
--- a/pkgs/tools/typesetting/docbook2x/default.nix
+++ b/pkgs/tools/typesetting/docbook2x/default.nix
@@ -1,10 +1,12 @@
 { fetchurl, stdenv, texinfo, perl
 , XMLSAX, XMLParser, XMLNamespaceSupport
-, groff, libxml2, libxslt, gnused, libiconv
+, groff, libxml2, libxslt, gnused, libiconv, opensp
+, docbook_xml_dtd_43
 , makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "docbook2X-0.8.8";
+  
   src = fetchurl {
     url = "mirror://sourceforge/docbook2x/${name}.tar.gz";
     sha256 = "0ifwzk99rzjws0ixzimbvs83x6cxqk1xzmg84wa1p7bs6rypaxs0";
@@ -15,7 +17,7 @@ stdenv.mkDerivation rec {
   patches = [ ./db2x_texixml-to-stdout.patch ];
 
   buildInputs = [ perl texinfo groff libxml2 libxslt makeWrapper
-                  XMLSAX XMLParser XMLNamespaceSupport
+                  XMLSAX XMLParser XMLNamespaceSupport opensp
   	        ] ++ (if libiconv != null then [libiconv] else []);
 
   postConfigure = ''
@@ -37,7 +39,7 @@ stdenv.mkDerivation rec {
 	--prefix PERL5LIB :						\
 	"${XMLNamespaceSupport}/lib/perl5/site_perl"			\
 	--prefix XML_CATALOG_FILES "\ "					\
-	"$out/share/docbook2X/dtd/catalog.xml\ $out/share/docbook2X/xslt/catalog.xml"
+	"$out/share/docbook2X/dtd/catalog.xml\ $out/share/docbook2X/xslt/catalog.xml\ ${docbook_xml_dtd_43}/xml/dtd/docbook/catalog.xml"
     done
 
     wrapProgram $out/bin/sgml2xml-isoent --prefix PATH : \
diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix
index f91b77fb928..aea28238665 100644
--- a/pkgs/tools/typesetting/pdf2djvu/default.nix
+++ b/pkgs/tools/typesetting/pdf2djvu/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.7";
+  version = "0.7.11";
   name = "pdf2djvu-${version}";
 
   src = fetchurl {
     url = "http://pdf2djvu.googlecode.com/files/pdf2djvu_${version}.tar.gz";
-    sha256 = "17fi5yq936hgjby5jp2hsb1inqqxab4mh58lkxvf1jkrrz658za5";
+    sha256 = "00gscd7l02jyr132vlj08ks0pgmh5ja785n3fdxa795cib45rbgq";
   };
 
   buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ];
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Creates djvu files from PDF files";
     homepage = http://code.google.com/p/pdf2djvu/;
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
   };
 }
diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
index d0ab00057f5..f6f32a7c5b7 100644
--- a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
+++ b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "ec2-ami-tools-1.3-53773";
+  name = "ec2-ami-tools-1.4.0.1";
   
   buildInputs = [ unzip makeWrapper ];
   
   src = fetchurl {
     url = http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.zip;
-    sha256 = "310e3b405c11b979b1cd210c5b4c32e97065d616f6bfa449c4e1e50420ce8002";
+    sha256 = "1fjg3gx5k0z8r4apg5whz3yxc3xnz7z5g6j93hf765lfriz1rccz";
   };
 
   # Amazon EC2 requires that disk images are writable.  If they're
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
       done
       
       sed -i 's|/bin/bash|${stdenv.shell}|' $out/lib/ec2/platform/base/pipeline.rb
-    ''; 
+    '';  # */
 
   meta = {
     homepage = http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88;
diff --git a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix
index d2cc7c527ec..d79afe7e90f 100644
--- a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix
+++ b/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip, makeWrapper, jre }:
 
 stdenv.mkDerivation {
-  name = "ec2-api-tools-1.4.2.2";
+  name = "ec2-api-tools-1.4.4.2";
   
   src = fetchurl {
     url = http://s3.amazonaws.com/ec2-downloads/ec2-api-tools.zip;
-    sha256 = "1e0f183c1e6d90338dbf427697908167a61c66dc7761ae5a73bb849f39f701fe";
+    sha256 = "03immxrrc7brbwm9nbp6dqw4bxpcb18l8rsj75nd6h2vanq2qlj4";
   };
 
   buildInputs = [ unzip makeWrapper ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 023a05230c0..c2254eea363 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -419,7 +419,7 @@ let
   bootchart = callPackage ../tools/system/bootchart { };
 
   btrfsProgs = builderDefsPackage (import ../tools/filesystems/btrfsprogs) {
-    inherit libuuid zlib acl;
+    inherit libuuid zlib acl attr fetchgit;
   };
 
   catdoc = callPackage ../tools/text/catdoc { };
@@ -464,6 +464,8 @@ let
 
   bsdiff = callPackage ../tools/compression/bsdiff { };
 
+  btar = callPackage ../tools/backup/btar { };
+
   bup = callPackage ../tools/backup/bup { };
 
   bzip2 = callPackage ../tools/compression/bzip2 { };
@@ -571,6 +573,8 @@ let
     # TODO i18n can be installed as well, implement it?
   };
 
+  dnstop = callPackage ../tools/networking/dnstop { };
+
   dhcp = callPackage ../tools/networking/dhcp { };
 
   dhcpcd = callPackage ../tools/networking/dhcpcd { };
@@ -581,6 +585,8 @@ let
 
   dirmngr = callPackage ../tools/security/dirmngr { };
 
+  disper = callPackage ../tools/misc/disper { };
+
   dmg2img = callPackage ../tools/misc/dmg2img { };
 
   docbook2x = callPackage ../tools/typesetting/docbook2x {
@@ -599,6 +605,8 @@ let
     zlib = zlibStatic;
   };
 
+  dtach = callPackage ../tools/misc/dtach { };
+
   duplicity = callPackage ../tools/backup/duplicity {
     inherit (pythonPackages) boto;
     gnupg = gnupg1;
@@ -637,7 +645,7 @@ let
   fcron = callPackage ../tools/system/fcron {  # see also cron
   };
 
-  fdisk = callPackage ../tools/system/fdisk { parted = parted_2_3; };
+  fdisk = callPackage ../tools/system/fdisk { };
 
   fdm = callPackage ../tools/networking/fdm {};
 
@@ -672,6 +680,8 @@ let
     guile = guile_1_8;
   };
 
+  freetds = callPackage ../development/libraries/freetds { };
+
   ftgl = callPackage ../development/libraries/ftgl { };
 
   fuppes = callPackage ../tools/networking/fuppes {
@@ -785,7 +795,7 @@ let
 
   grub2 = grub19x;
 
-  # grub2_efi = callPackage ../tools/misc/grub/1.9x.nix { EFIsupport = true; };
+  grub2_efi = callPackage ../tools/misc/grub/1.9x.nix { EFIsupport = true; };
 
   gssdp = callPackage ../development/libraries/gssdp {
     inherit (gnome) libsoup;
@@ -797,6 +807,8 @@ let
 
   gtkvnc = callPackage ../tools/admin/gtk-vnc {};
 
+  gtmess = callPackage ../applications/networking/instant-messengers/gtmess { };
+
   gupnp = callPackage ../development/libraries/gupnp {
     inherit (gnome) libsoup;
   };
@@ -831,9 +843,12 @@ let
 
   httpfs2 = callPackage ../tools/filesystems/httpfs { };
 
-  hydra = callPackage ../development/tools/misc/hydra {
-    nix = nixUnstable;
-  };
+  # FIXME: This Hydra snapshot is outdated and depends on the `nixPerl',
+  # which no longer exists.
+  #
+  # hydra = callPackage ../development/tools/misc/hydra {
+  #   nix = nixUnstable;
+  # };
 
   iasl = callPackage ../development/compilers/iasl { };
 
@@ -841,6 +856,8 @@ let
 
   iftop = callPackage ../tools/networking/iftop { };
 
+  imapproxy = callPackage ../tools/networking/imapproxy { };
+
   imapsync = callPackage ../tools/networking/imapsync {
     inherit (perlPackages) MailIMAPClient;
   };
@@ -897,12 +914,18 @@ let
 
   most = callPackage ../tools/misc/most { };
 
+  netperf = callPackage ../applications/networking/netperf { };
+
   ninka = callPackage ../development/tools/misc/ninka { };
 
   nodejs = callPackage ../development/web/nodejs {};
 
+  ldns = callPackage ../development/libraries/ldns { };
+
   lftp = callPackage ../tools/networking/lftp { };
 
+  libtirpc = callPackage ../development/libraries/ti-rpc { };
+
   libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
 
   logrotate = callPackage ../tools/system/logrotate { };
@@ -925,6 +948,8 @@ let
 
   lzop = callPackage ../tools/compression/lzop { };
 
+  mu0 = callPackage ../tools/networking/mu0 { };
+
   mailutils = callPackage ../tools/networking/mailutils {
     guile = guile_1_8;
   };
@@ -969,6 +994,8 @@ let
 
   mpage = callPackage ../tools/text/mpage { };
 
+  mscgen = callPackage ../tools/graphics/mscgen { };
+
   msf = builderDefsPackage (import ../tools/security/metasploit/3.1.nix) {
     inherit ruby makeWrapper;
   };
@@ -1003,11 +1030,7 @@ let
 
   namazu = callPackage ../tools/text/namazu { };
 
-  nbd = callPackage ../tools/networking/nbd {
-    glib = gtkLibs.glib.override {
-      stdenv = makeStaticBinaries stdenv;
-    };
-  };
+  nbd = callPackage ../tools/networking/nbd { };
 
   netcdf = callPackage ../development/libraries/netcdf { };
 
@@ -1065,6 +1088,8 @@ let
 
   obexftp = callPackage ../tools/bluetooth/obexftp { };
 
+  odt2txt = callPackage ../tools/text/odt2txt { };
+
   offlineimap = callPackage ../tools/networking/offlineimap {
     ssl = pythonPackages.ssl;
   };
@@ -1112,14 +1137,14 @@ let
 
   patchutils = callPackage ../tools/text/patchutils { };
 
-  parted = callPackage ../tools/misc/parted { };
-  parted_2_3 = callPackage ../tools/misc/parted/2.3.nix { };
+  parted = callPackage ../tools/misc/parted { hurd = null; };
+  parted_2_3 = callPackage ../tools/misc/parted/2.3.nix { hurd = null; };
 
   hurdPartedCross =
     if crossSystem != null && crossSystem.config == "i586-pc-gnu"
     then (callPackage ../tools/misc/parted {
         # Needs the Hurd's libstore.
-        hurd = hurdCrossIntermediate;
+        hurd = gnu.hurdCrossIntermediate;
 
         # The Hurd wants a libparted.a.
         enableStatic = true;
@@ -1195,6 +1220,8 @@ let
 
   proxytunnel = callPackage ../tools/misc/proxytunnel { };
 
+  cntlm = callPackage ../tools/networking/cntlm { };
+
   psmisc = callPackage ../os-specific/linux/psmisc { };
 
   pstoedit = callPackage ../tools/graphics/pstoedit { };
@@ -1224,6 +1251,8 @@ let
 
   qhull = callPackage ../development/libraries/qhull { };
 
+  qjoypad = callPackage ../tools/misc/qjoypad { };
+
   qshowdiff = callPackage ../tools/text/qshowdiff { };
 
   radvd = callPackage ../tools/networking/radvd { };
@@ -1237,7 +1266,7 @@ let
   reiserfsprogs = callPackage ../tools/filesystems/reiserfsprogs { };
 
   relfs = callPackage ../tools/filesystems/relfs {
-    inherit (gnome) gnomevfs GConf;
+    inherit (gnome) gnome_vfs GConf;
   };
 
   remind = callPackage ../tools/misc/remind { };
@@ -1636,23 +1665,26 @@ let
 
   ccl = builderDefsPackage ../development/compilers/ccl {};
 
-  clang = llvm.override {
-    buildClang = true;
+  clangBootUnwrapped = callPackage ../development/compilers/llvm/clang.nix { };
+
+  clangBoot = wrapClang clangBootUnwrapped;
+
+  clangUnwrapped = let clangBootStdenv = stdenvAdapters.overrideGCC stdenv clangBoot; in clangBootUnwrapped.override {
+    stdenv = clangBootStdenv;
+    llvm = llvm.override { stdenv = clangBootStdenv; };
   };
 
-  clangSVN = llvmSVN.override {
-    buildClang = true;
-  };
+  clang = wrapClang clangUnwrapped;
+
+  #Use this instead of stdenv to build with clang
+  clangStdenv = stdenvAdapters.overrideGCC stdenv clang;
 
   clean = callPackage ../development/compilers/clean { };
 
   cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
 
   dylan = callPackage ../development/compilers/gwydion-dylan {
-    dylan =
-      import ../development/compilers/gwydion-dylan/binary.nix {
-        inherit fetchurl stdenv;
-  };
+    dylan = callPackage ../development/compilers/gwydion-dylan/binary.nix {  };
   };
 
   ecl = callPackage ../development/compilers/ecl { };
@@ -1791,7 +1823,7 @@ let
       libpthreadCross =
         # FIXME: Don't explicitly refer to `i586-pc-gnu'.
         if crossSystem != null && crossSystem.config == "i586-pc-gnu"
-        then hurdLibpthreadCross
+        then gnu.libpthreadCross
         else null;
      });
     libc = libcCross;
@@ -1818,6 +1850,16 @@ let
     # bootstrapping a profiled compiler does not work in the sheevaplug:
     # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
     profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true;
+
+    # When building `gcc.hostDrv' (a "Canadian cross", with host == target
+    # and host != build), `cross' must be null but the cross-libc must still
+    # be passed.
+    cross = null;
+    libcCross = if crossSystem != null then libcCross else null;
+    libpthreadCross =
+      if crossSystem != null && crossSystem.config == "i586-pc-gnu"
+      then gnu.libpthreadCross
+      else null;
   }));
 
   gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc-4.6 {
@@ -2182,6 +2224,12 @@ let
         (if stdenv.isDarwin then ghc704Binary else ghc6121Binary)
         (x : x.ghc721Prefs) false false lowPrio);
 
+  haskellPackages_ghc722 =
+    recurseIntoAttrs
+      (haskellPackagesFun ../development/compilers/ghc/7.2.2.nix
+        (if stdenv.isDarwin then ghc704Binary else ghc6121Binary)
+        (x : x.ghc722Prefs) false false lowPrio);
+
   # Reasonably current HEAD snapshot. Should *always* be lowPrio.
   haskellPackages_ghcHEAD =
     haskellPackagesFun ../development/compilers/ghc/head.nix
@@ -2261,9 +2309,6 @@ let
 
   llvm = callPackage ../development/compilers/llvm { };
 
-  # Works partially
-  llvmSVN = callPackage ../development/compilers/llvm/svn-head.nix { };
-
   mitscheme = callPackage ../development/compilers/mit-scheme { };
 
   mlton = callPackage ../development/compilers/mlton { };
@@ -2278,6 +2323,8 @@ let
 
   nasm = callPackage ../development/compilers/nasm { };
 
+  nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { };
+
   ocaml = ocaml_3_11_1;
 
   ocaml_3_08_0 = callPackage ../development/compilers/ocaml/3.08.0.nix { };
@@ -2293,12 +2340,22 @@ let
 
     camlidl = callPackage ../development/tools/ocaml/camlidl { };
 
-    camlp5_strict = callPackage ../development/tools/ocaml/camlp5 { };
+    camlp5_5_strict = callPackage ../development/tools/ocaml/camlp5/5.15.nix { };
 
-    camlp5_transitional = callPackage ../development/tools/ocaml/camlp5 {
+    camlp5_5_transitional = callPackage ../development/tools/ocaml/camlp5/5.15.nix {
       transitional = true;
     };
 
+    camlp5_6_strict = callPackage ../development/tools/ocaml/camlp5 { };
+
+    camlp5_6_transitional = callPackage ../development/tools/ocaml/camlp5 {
+      transitional = true;
+    };
+
+    camlp5_strict = camlp5_6_strict;
+
+    camlp5_transitional = camlp5_6_transitional;
+
     camlzip = callPackage ../development/ocaml-modules/camlzip { };
 
     camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { };
@@ -2328,6 +2385,8 @@ let
 
     ocaml_expat = callPackage ../development/ocaml-modules/expat { };
 
+    ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { };
+
     ocaml_http = callPackage ../development/ocaml-modules/http { };
 
     ocaml_lwt = callPackage ../development/ocaml-modules/lwt { };
@@ -2348,8 +2407,10 @@ let
 
     ounit = callPackage ../development/ocaml-modules/ounit { };
 
+    ulex = callPackage ../development/ocaml-modules/ulex { };
+
     ulex08 = callPackage ../development/ocaml-modules/ulex/0.8 {
-      camlp5 = camlp5_transitional;
+      camlp5 = camlp5_5_transitional;
     };
   };
 
@@ -2358,6 +2419,8 @@ let
   ocamlPackages_3_11_1 = mkOcamlPackages ocaml_3_11_1 pkgs.ocamlPackages_3_11_1;
   ocamlPackages_3_12_0 = mkOcamlPackages ocaml_3_12_0 pkgs.ocamlPackages_3_12_0;
 
+  opa = let callPackage = newScope pkgs.ocamlPackages_3_12_0; in callPackage ../development/compilers/opa { };
+
   opencxx = callPackage ../development/compilers/opencxx {
     gcc = gcc33;
   };
@@ -2422,6 +2485,18 @@ let
     inherit stdenv binutils coreutils zlib;
   };
 
+  wrapClangWith = clangWrapper: glibc: baseClang: clangWrapper {
+    nativeTools = stdenv ? gcc && stdenv.gcc.nativeTools;
+    nativeLibc = stdenv ? gcc && stdenv.gcc.nativeLibc;
+    nativePrefix = if stdenv ? gcc then stdenv.gcc.nativePrefix else "";
+    clang = baseClang;
+    libc = glibc;
+    shell = bash;
+    inherit stdenv binutils coreutils zlib;
+  };
+
+  wrapClang = wrapClangWith (import ../build-support/clang-wrapper) glibc;
+
   wrapGCC = wrapGCCWith (import ../build-support/gcc-wrapper) glibc;
 
   wrapGCCCross =
@@ -2490,11 +2565,7 @@ let
 
   guile = guile_2_0;
 
-  io = builderDefsPackage (import ../development/interpreters/io) {
-    inherit sqlite zlib gmp libffi cairo ncurses freetype mesa
-      libpng libtiff libjpeg readline libsndfile libxml2
-      freeglut e2fsprogs libsamplerate pcre libevent libedit;
-  };
+  io = callPackage ../development/interpreters/io { };
 
   j = callPackage ../development/interpreters/j {};
 
@@ -2584,8 +2655,16 @@ let
     sw_vers = if stdenv.isDarwin then pkgs.darwinSwVersUtility else null;
   };
 
-  pythonFull = callPackage ../development/interpreters/python/wrapper.nix {
-    extraLibs = lib.attrValues python.modules;
+  pythonFull = python27Full;
+
+  python26Full = callPackage ../development/interpreters/python/wrapper.nix {
+    extraLibs = lib.attrValues python26.modules;
+    python = python26;
+  };
+
+  python27Full = callPackage ../development/interpreters/python/wrapper.nix {
+    extraLibs = lib.attrValues python27.modules;
+    python = python27;
   };
 
   pythonhomeWrapper = callPackage ../development/interpreters/python/pythonhome-wrapper.nix { };
@@ -2629,6 +2708,7 @@ let
 
   spidermonkey = callPackage ../development/interpreters/spidermonkey { };
   spidermonkey_1_8_0rc1 = callPackage ../development/interpreters/spidermonkey/1.8.0-rc1.nix { };
+  spidermonkey_185 = callPackage ../development/interpreters/spidermonkey/185-1.0.0.nix { };
 
   sysPerl = callPackage ../development/interpreters/sys-perl { };
 
@@ -2667,7 +2747,7 @@ let
 
   guileGnome = callPackage ../development/guile-modules/guile-gnome {
     gconf = gnome.GConf;
-    inherit (gnome) glib gnomevfs gtk libglade libgnome libgnomecanvas
+    inherit (gnome) glib gnome_vfs gtk libglade libgnome libgnomecanvas
       libgnomeui pango;
   };
 
@@ -2722,7 +2802,7 @@ let
   automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix {
     doCheck = !stdenv.isArm && !stdenv.isCygwin
       # Some of the parallel tests seem to hang on `i386-pc-solaris2.11'.
-      && stdenv.system != "i386-sunos";
+      && stdenv.system != "i686-solaris";
   };
 
   automoc4 = callPackage ../development/tools/misc/automoc4 { };
@@ -2762,6 +2842,8 @@ let
 
   byacc = callPackage ../development/tools/parsing/byacc { };
 
+  cbrowser = callPackage ../development/tools/misc/cbrowser { };
+
   ccache = callPackage ../development/tools/misc/ccache { };
 
   complexity = callPackage ../development/tools/misc/complexity { };
@@ -2893,21 +2975,6 @@ let
 
   ltrace = callPackage ../development/tools/misc/ltrace { };
 
-  mig = callPackage ../os-specific/gnu/mig
-    (if stdenv.isLinux
-     then {
-       # Build natively, but force use of a 32-bit environment because we're
-       # targeting `i586-pc-gnu'.
-       stdenv = (import ../stdenv {
-         system = "i686-linux";
-         stdenvType = "i686-linux";
-         allPackages = args:
-           import ./all-packages.nix ({ inherit config; } // args);
-         inherit platform;
-       }).stdenv;
-     }
-     else { });
-
   mk = callPackage ../development/tools/build-managers/mk { };
 
   noweb = callPackage ../development/tools/literate-programming/noweb { };
@@ -2992,6 +3059,8 @@ let
 
   gdb = callPackage ../development/tools/misc/gdb {
     readline = readline5;
+    hurd = gnu.hurdCross;
+    inherit (gnu) mig;
   };
 
   gdbCross = callPackage ../development/tools/misc/gdb {
@@ -3076,9 +3145,8 @@ let
   boost144 = callPackage ../development/libraries/boost/1.44.nix { };
   boost146 = callPackage ../development/libraries/boost/1.46.nix { };
   boost147 = callPackage ../development/libraries/boost/1.47.nix { };
-  # 1.47.0 doesn't compile on Darwin. The issue is probably trivial to
-  # fix, but no-one has done it yet.
-  boost = if stdenv.isDarwin then boost146 else boost147;
+  boost148 = callPackage ../development/libraries/boost/1.48.nix { };
+  boost = boost148;
 
   # A Boost build with all library variants enabled.  Very large (about 250 MB).
   boostFull = appendToName "full" (boost.override {
@@ -3155,6 +3223,8 @@ let
 
   cminpack = callPackage ../development/libraries/cminpack { };
 
+  cogl = callPackage ../development/libraries/cogl { };
+
   coin3d = callPackage ../development/libraries/coin3d { };
 
   commoncpp2 = callPackage ../development/libraries/commoncpp2 { };
@@ -3168,7 +3238,6 @@ let
   ctl = callPackage ../development/libraries/ctl { };
 
   cppunit = callPackage ../development/libraries/cppunit { };
-  cppunit_1_10 = callPackage ../development/libraries/cppunit/1.10.nix { };
 
   cracklib = callPackage ../development/libraries/cracklib { };
 
@@ -3392,14 +3461,17 @@ let
      in ({
        inherit stdenv fetchurl;
        gccCross = gccCrossStageStatic;
-       kernelHeaders = if crossGNU then hurdHeaders else linuxHeadersCross;
+       kernelHeaders = if crossGNU then gnu.hurdHeaders else linuxHeadersCross;
        installLocales = getConfig [ "glibc" "locales" ] false;
      }
 
      //
 
      (if crossGNU
-      then { inherit machHeaders hurdHeaders mig fetchgit; }
+      then {
+        inherit (gnu) machHeaders hurdHeaders libpthreadHeaders mig;
+        inherit fetchgit;
+      }
       else { }))));
 
   glibcCross = glibc212Cross;
@@ -3520,7 +3592,7 @@ let
 
   gtkLibs = pkgs.gtkLibs224;
 
-  inherit (pkgs.gtkLibs) glib gtk pango cairo;
+  inherit (pkgs.gtkLibs) glib gtk pango cairo gdk_pixbuf;
 
   gtkLibs1x = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs1x; in {
 
@@ -3534,20 +3606,14 @@ let
 
     glib = callPackage ../development/libraries/glib/2.20.x.nix { };
 
-    glibmm = callPackage ../development/libraries/glibmm/2.18.x.nix { };
-
     atk = callPackage ../development/libraries/atk/1.24.x.nix { };
 
     cairo = callPackage ../development/libraries/cairo { };
 
     pango = callPackage ../development/libraries/pango/1.24.x.nix { };
 
-    pangomm = callPackage ../development/libraries/pangomm/2.14.x.nix { };
-
     gtk = callPackage ../development/libraries/gtk+/2.16.x.nix { };
 
-    gtkmm = callPackage ../development/libraries/gtkmm/2.14.x.nix { };
-
   });
 
   gtkLibs224 = recurseIntoAttrs (let callPackage = pkgs.newScope pkgs.gtkLibs224; in {
@@ -3577,17 +3643,21 @@ let
   });
 
   gtkLibs3x = let callPackage = newScope pkgs.gtkLibs3x; in {
-    glib = callPackage ../development/libraries/glib/2.29.x.nix { };
+    glib = callPackage ../development/libraries/glib/2.30.x.nix { };
+
+    glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { };
 
     gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { };
 
-    atk = callPackage ../development/libraries/atk/2.1.x.nix { };
+    atk = callPackage ../development/libraries/atk/2.2.x.nix { };
+
+    atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { };
 
     cairo = callPackage ../development/libraries/cairo { };
 
     pango = callPackage ../development/libraries/pango/1.29.x.nix { };
 
-    gtk = callPackage ../development/libraries/gtk+/3.1.x.nix { };
+    gtk = callPackage ../development/libraries/gtk+/3.2.x.nix { };
 
     # Let hydra build gtk-3.x but do not show this to users yet
     recurseForRelease = true;
@@ -3636,7 +3706,9 @@ let
 
   hunspell = callPackage ../development/libraries/hunspell { };
 
-  hwloc = callPackage ../development/libraries/hwloc { };
+  hwloc = callPackage ../development/libraries/hwloc {
+    inherit (xlibs) libX11;
+  };
 
   hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };
 
@@ -3688,6 +3760,10 @@ let
 
   json_glib = callPackage ../development/libraries/json-glib { };
 
+  json_c = callPackage ../development/libraries/json-c { };
+
+  libjson = callPackage ../development/libraries/libjson { };
+
   judy = callPackage ../development/libraries/judy { };
 
   krb5 = callPackage ../development/libraries/kerberos/krb5.nix { };
@@ -3748,6 +3824,8 @@ let
     inherit (gnome) gtk glib libsoup;
   };
 
+  libchop = callPackage ../development/libraries/libchop { };
+
   libcm = callPackage ../development/libraries/libcm { };
 
   libctemplate = callPackage ../development/libraries/libctemplate { };
@@ -3784,6 +3862,8 @@ let
 
   libdv = callPackage ../development/libraries/libdv { };
 
+  libdvbpsi = callPackage ../development/libraries/libdvbpsi { };
+
   libdwg = callPackage ../development/libraries/libdwg { };
 
   libdvdcss = callPackage ../development/libraries/libdvdcss { };
@@ -3880,7 +3960,7 @@ let
   libspectre = callPackage ../development/libraries/libspectre { };
 
   libgsf = callPackage ../development/libraries/libgsf {
-    inherit (gnome) glib gnomevfs libbonobo;
+    inherit (gnome) glib gnome_vfs libbonobo;
   };
 
   libiconv = callPackage ../development/libraries/libiconv { };
@@ -4122,6 +4202,8 @@ let
 
   log4cxx = callPackage ../development/libraries/log4cxx { };
 
+  log4cplus = callPackage ../development/libraries/log4cplus { };
+
   loudmouth = callPackage ../development/libraries/loudmouth { };
 
   lzo = callPackage ../development/libraries/lzo { };
@@ -4204,6 +4286,7 @@ let
   neon029 = callPackage ../development/libraries/neon/0.29.nix {
     compressionSupport = true;
     sslSupport = true;
+    openssl = opensslNew;
   };
 
   nethack = builderDefsPackage (import ../games/nethack) {
@@ -4281,6 +4364,8 @@ let
 
   ortp = callPackage ../development/libraries/ortp { };
 
+  p11_kit = callPackage ../development/libraries/p11-kit { };
+
   pangoxsl = callPackage ../development/libraries/pangoxsl {
     inherit (gtkLibs) glib pango;
   };
@@ -4514,6 +4599,7 @@ let
   tnt = callPackage ../development/libraries/tnt { };
 
   tokyocabinet = callPackage ../development/libraries/tokyo-cabinet { };
+  tokyotyrant = callPackage ../development/libraries/tokyo-tyrant { };
 
   tremor = callPackage ../development/libraries/tremor { };
 
@@ -4544,7 +4630,7 @@ let
 
   webkit =
     builderDefsPackage ../development/libraries/webkit {
-      inherit (gnome28) gtkdoc libsoup;
+      inherit (gnome) gtkdoc libsoup;
       inherit (gtkLibs) gtk atk pango glib;
       inherit freetype fontconfig gettext gperf curl
         libjpeg libtiff libpng libxml2 libxslt sqlite
@@ -4558,7 +4644,7 @@ let
 
   webkitSVN =
     builderDefsPackage ../development/libraries/webkit/svn.nix {
-      inherit (gnome28) gtkdoc libsoup;
+      inherit (gnome) gtkdoc libsoup;
       inherit (gtkLibs) gtk atk pango glib;
       inherit freetype fontconfig gettext gperf curl
         libjpeg libtiff libpng libxml2 libxslt sqlite
@@ -4630,6 +4716,8 @@ let
 
   xvidcore = callPackage ../development/libraries/xvidcore { };
 
+  yajl = callPackage ../development/libraries/yajl { };
+
   zangband = builderDefsPackage (import ../games/zangband) {
     inherit ncurses flex bison autoconf automake m4 coreutils;
   };
@@ -4643,6 +4731,8 @@ let
     static = true;
   }));
 
+  zeromq = callPackage ../development/libraries/zeromq {};
+
   zvbi = callPackage ../development/libraries/zvbi {
     pngSupport = true;
   };
@@ -4799,7 +4889,6 @@ let
   setuptools = pythonPackages.setuptools;
 
   wxPython = pythonPackages.wxPython;
-  wxPython26 = pythonPackages.wxPython26;
   wxPython28 = pythonPackages.wxPython28;
 
   twisted = pythonPackages.twisted;
@@ -4841,12 +4930,15 @@ let
 
   dovecot = callPackage ../servers/mail/dovecot { };
   dovecot_1_1_1 = callPackage ../servers/mail/dovecot/1.1.1.nix { };
+  dovecot_2_0 = callPackage ../servers/mail/dovecot/2.0.nix { };
 
   ejabberd = callPackage ../servers/xmpp/ejabberd {
     erlang = erlangR13B ;
   };
 
-  couchdb = callPackage ../servers/http/couchdb { };
+  couchdb = callPackage ../servers/http/couchdb {
+    spidermonkey = spidermonkey_185;
+  };
 
   felix = callPackage ../servers/felix { };
 
@@ -4889,14 +4981,13 @@ let
   mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { };
 
   mpd = callPackage ../servers/mpd { };
+  mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { };
 
   miniHttpd = callPackage ../servers/http/mini-httpd {};
 
   myserver = callPackage ../servers/http/myserver { };
 
-  nginx = builderDefsPackage (import ../servers/http/nginx) {
-    inherit openssl pcre zlib libxml2 libxslt;
-  };
+  nginx = callPackage ../servers/http/nginx { };
 
   postfix = callPackage ../servers/mail/postfix { };
 
@@ -4944,6 +5035,8 @@ let
 
   nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official { };
 
+  oidentd = callPackage ../servers/identd/oidentd { };
+
   openfire = callPackage ../servers/xmpp/openfire { };
 
   postgresql = postgresql83;
@@ -4972,7 +5065,19 @@ let
 
   samba = callPackage ../servers/samba { };
 
-  shishi = callPackage ../servers/shishi { };
+  # A lightweight Samba, useful for non-Linux-based OSes.
+  samba_light = callPackage ../servers/samba {
+    pam = null;
+    fam = null;
+    cups = null;
+    acl = null;
+    openldap = null;
+  };
+
+  shishi = callPackage ../servers/shishi {
+    # GNU Shishi 1.0.0 fails to build with GnuTLS 3.x.
+    gnutls = gnutls2;
+  };
 
   sipwitch = callPackage ../servers/sip/sipwitch { };
 
@@ -5040,6 +5145,8 @@ let
 
   alsaUtils = callPackage ../os-specific/linux/alsa-utils { };
 
+  bcm43xx = callPackage ../os-specific/linux/firmware/bcm43xx { };
+
   bluez = callPackage ../os-specific/linux/bluez { };
 
   bridge_utils = callPackage ../os-specific/linux/bridge-utils { };
@@ -5091,6 +5198,8 @@ let
     inherit devicemapper;
   };
 
+  drbd = callPackage ../os-specific/linux/drbd { };
+
   libuuid =
     if crossSystem != null && crossSystem.config == "i586-pc-gnu"
     then (utillinuxng // {
@@ -5144,50 +5253,10 @@ let
 
   htop = callPackage ../os-specific/linux/htop { };
 
-  hurdCross = forceBuildDrv(import ../os-specific/gnu/hurd {
-    inherit fetchgit stdenv autoconf libtool texinfo machHeaders
-      mig glibcCross hurdPartedCross;
-    libuuid = libuuid.hostDrv;
-    automake = automake111x;
-    headersOnly = false;
-    cross = assert crossSystem != null; crossSystem;
-    gccCross = gccCrossStageFinal;
-  });
-
-  hurdCrossIntermediate = forceBuildDrv(import ../os-specific/gnu/hurd {
-    inherit fetchgit stdenv autoconf libtool texinfo machHeaders
-      mig glibcCross;
-    automake = automake111x;
-    headersOnly = false;
-    cross = assert crossSystem != null; crossSystem;
-
-    # The "final" GCC needs glibc and the Hurd libraries (libpthread in
-    # particular) so we first need an intermediate Hurd built with the
-    # intermediate GCC.
-    gccCross = gccCrossStageStatic;
-
-    # This intermediate Hurd is only needed to build libpthread, which needs
-    # libihash, and to build Parted, which needs libstore and
-    # libshouldbeinlibc.
-    buildTarget = "libihash libstore libshouldbeinlibc";
-    installTarget = "libihash-install libstore-install libshouldbeinlibc-install";
-  });
-
-  hurdHeaders = callPackage ../os-specific/gnu/hurd {
-    automake = automake111x;
-    headersOnly = true;
-    gccCross = null;
-    glibcCross = null;
-    libuuid = null;
-    hurdPartedCross = null;
-  };
-
-  hurdLibpthreadCross = forceBuildDrv(import ../os-specific/gnu/libpthread {
-    inherit fetchgit stdenv autoconf automake libtool
-      machHeaders hurdHeaders glibcCross;
-    hurd = hurdCrossIntermediate;
-    gccCross = gccCrossStageStatic;
-    cross = assert crossSystem != null; crossSystem;
+  # GNU/Hurd core packages.
+  gnu = recurseIntoAttrs (callPackage ../os-specific/gnu {
+    callPackage = newScope pkgs.gnu;
+    inherit platform crossSystem;
   });
 
   hwdata = callPackage ../os-specific/linux/hwdata { };
@@ -5228,7 +5297,7 @@ let
 
   libatasmart = callPackage ../os-specific/linux/libatasmart { };
 
-  libcgroup = callPackage ../os-specific/linux/libcg { };
+  libcgroup = callPackage ../os-specific/linux/libcgroup { };
 
   libnl = callPackage ../os-specific/linux/libnl { };
 
@@ -5429,12 +5498,6 @@ let
       ];
   };
 
-  linux_2_6_34_tuxonice = linux_2_6_34.override (attrs: {
-    kernelPatches = attrs.kernelPatches ++ [
-      kernelPatches.tuxonice_2_6_34
-    ];
-  });
-
   linux_2_6_35 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.35.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
@@ -5446,12 +5509,6 @@ let
         kernelPatches.sheevaplug_modules_2_6_35;
   };
 
-  linux_2_6_35_tuxonice = linux_2_6_35.override (attrs: {
-    kernelPatches = attrs.kernelPatches ++ [
-      kernelPatches.tuxonice_2_6_35
-    ];
-  });
-
   linux_nanonote_jz_2_6_34 = makeOverridable
     (import ../os-specific/linux/kernel/linux-nanonote-jz-2.6.34.nix) {
       inherit fetchurl fetchsvn stdenv perl mktemp module_init_tools ubootChooser;
@@ -5502,12 +5559,6 @@ let
       ];
   };
 
-  linux_2_6_36_tuxonice = linux_2_6_36.override (attrs: {
-    kernelPatches = attrs.kernelPatches ++ [
-      kernelPatches.tuxonice_2_6_36
-    ];
-  });
-
   linux_2_6_37 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.37.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
@@ -5519,12 +5570,6 @@ let
       ];
   };
 
-  linux_2_6_37_tuxonice = linux_2_6_37.override (attrs: {
-    kernelPatches = attrs.kernelPatches ++ [
-      kernelPatches.tuxonice_2_6_37
-    ];
-  });
-
   linux_2_6_38 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.38.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
@@ -5548,6 +5593,24 @@ let
       ];
   };
 
+  linux_2_6_39_powertop = linux_2_6_39.override {
+    extraConfig = ''
+        DEBUG_KERNEL y
+        PM_ADVANCED_DEBUG y
+        PM_RUNTIME y
+        TIMER_STATS y
+        USB_SUSPEND y
+        BACKTRACE_SELF_TEST n
+        CPU_NOTIFIER_ERROR_INJECT n
+        DEBUG_DEVRES n
+        DEBUG_NX_TEST n
+        DEBUG_STACK_USAGE n
+        DEBUG_STACKOVERFLOW n
+        RCU_TORTURE_TEST n
+        SCHEDSTATS n
+    '';
+  };
+
   linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
@@ -5559,17 +5622,61 @@ let
       ];
   };
 
+  linux_3_0_powertop = linux_3_0.override {
+    extraConfig = ''
+        DEBUG_KERNEL y
+        PM_ADVANCED_DEBUG y
+        PM_RUNTIME y
+        TIMER_STATS y
+        USB_SUSPEND y
+        BACKTRACE_SELF_TEST n
+        CPU_NOTIFIER_ERROR_INJECT n
+        DEBUG_DEVRES n
+        DEBUG_NX_TEST n
+        DEBUG_STACK_USAGE n
+        DEBUG_STACKOVERFLOW n
+        RCU_TORTURE_TEST n
+        SCHEDSTATS n
+    '';
+  };
+
   linux_3_1 = makeOverridable (import ../os-specific/linux/kernel/linux-3.1.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
       [ #kernelPatches.fbcondecor_2_6_38
         kernelPatches.sec_perm_2_6_24
-        kernelPatches.efi_stub
-        #kernelPatches.aufs2_1_2_6_38
+        kernelPatches.aufs3_1
         #kernelPatches.mips_restart_2_6_36
       ];
   };
 
+  linux_3_1_powertop = linux_3_1.override {
+    extraConfig = ''
+        DEBUG_KERNEL y
+        PM_ADVANCED_DEBUG y
+        PM_RUNTIME y
+        TIMER_STATS y
+        USB_SUSPEND y
+        BACKTRACE_SELF_TEST n
+        CPU_NOTIFIER_ERROR_INJECT n
+        DEBUG_DEVRES n
+        DEBUG_NX_TEST n
+        DEBUG_STACK_USAGE n
+        DEBUG_STACKOVERFLOW n
+        RCU_TORTURE_TEST n
+        SCHEDSTATS n
+    '';
+  };
+
+  linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) {
+    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+    kernelPatches =
+      [ #kernelPatches.fbcondecor_2_6_38
+        kernelPatches.sec_perm_2_6_24
+        #kernelPatches.aufs3_1
+        #kernelPatches.mips_restart_2_6_36
+      ];
+  };
   /* Linux kernel modules are inherently tied to a specific kernel.  So
      rather than provide specific instances of those packages for a
      specific kernel, we have a function that builds those packages
@@ -5584,30 +5691,22 @@ let
 
     ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { };
 
-    aufs = callPackage ../os-specific/linux/aufs { };
-
-    aufs2 = if kernel.features ? aufs2 then
-      callPackage ../os-specific/linux/aufs2 { }
+    aufs =
+      if kernel.features ? aufs2 then
+        callPackage ../os-specific/linux/aufs/2.nix { }
+      else if kernel.features ? aufs2_1 then
+        callPackage ../os-specific/linux/aufs/2.1.nix { }
+      else if kernel.features ? aufs3 then
+        callPackage ../os-specific/linux/aufs/3.nix { }
       else null;
 
-    aufs2_1 = if kernel.features ? aufs2_1 then
-      callPackage ../os-specific/linux/aufs2.1 { }
-      else null;
-
-    aufs3 = if kernel.features ? aufs3 then
-      callPackage ../os-specific/linux/aufs3 { }
-      else null;
-
-    aufs2_util = if kernel.features ? aufs2 then
-      callPackage ../os-specific/linux/aufs2-util { }
-      else null;
-
-    aufs2_1_util = if kernel.features ? aufs2_1 then
-      callPackage ../os-specific/linux/aufs2.1-util { }
-      else null;
-
-    aufs3_util = if kernel.features ? aufs3 then
-      callPackage ../os-specific/linux/aufs3-util { }
+    aufs_util =
+      if kernel.features ? aufs2 then
+        callPackage ../os-specific/linux/aufs-util/2.nix { }
+      else if kernel.features ? aufs2_1 then
+        callPackage ../os-specific/linux/aufs-util/2.1.nix { }
+      else if kernel.features ? aufs3 then
+        callPackage ../os-specific/linux/aufs-util/3.nix { }
       else null;
 
     blcr = callPackage ../os-specific/linux/blcr {
@@ -5649,6 +5748,10 @@ let
       inherit kernel perl;
     };
 
+    klibc = callPackage ../os-specific/linux/klibc {
+      linuxHeaders = glibc.kernelHeaders;
+    };
+
     splashutils =
       if kernel.features ? fbConDecor then pkgs.splashutils else null;
 
@@ -5683,6 +5786,8 @@ let
       inherit (gnome) gtkmm libglademm;
     };
 
+    v86d = callPackage ../os-specific/linux/v86d { };
+
     virtualbox = callPackage ../applications/virtualization/virtualbox {
       stdenv = stdenv_32bit;
       inherit (gnome) libIDL;
@@ -5704,21 +5809,21 @@ let
     recurseIntoAttrs (linuxPackagesFor linux_2_6_32_xen pkgs.linuxPackages_2_6_32_xen);
   linuxPackages_2_6_33 = recurseIntoAttrs (linuxPackagesFor linux_2_6_33 pkgs.linuxPackages_2_6_33);
   linuxPackages_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_2_6_34 pkgs.linuxPackages_2_6_34);
-  linuxPackages_2_6_34_tuxonice = recurseIntoAttrs (linuxPackagesFor linux_2_6_34_tuxonice pkgs.linuxPackages_2_6_34_tuxonice);
   linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35 pkgs.linuxPackages_2_6_35);
-  linuxPackages_2_6_35_tuxonice = recurseIntoAttrs (linuxPackagesFor linux_2_6_35_tuxonice pkgs.linuxPackages_2_6_35_tuxonice);
   linuxPackages_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_2_6_36 pkgs.linuxPackages_2_6_36);
-  linuxPackages_2_6_36_tuxonice = recurseIntoAttrs (linuxPackagesFor linux_2_6_36_tuxonice pkgs.linuxPackages_2_6_36_tuxonice);
   linuxPackages_2_6_37 = recurseIntoAttrs (linuxPackagesFor linux_2_6_37 pkgs.linuxPackages_2_6_37);
-  linuxPackages_2_6_37_tuxonice = recurseIntoAttrs (linuxPackagesFor linux_2_6_37_tuxonice pkgs.linuxPackages_2_6_37_tuxonice);
   linuxPackages_2_6_38 = recurseIntoAttrs (linuxPackagesFor linux_2_6_38 pkgs.linuxPackages_2_6_38);
   linuxPackages_2_6_38_ati = recurseIntoAttrs (linuxPackagesFor linux_2_6_38_ati pkgs.linuxPackages_2_6_38);
   linuxPackages_2_6_39 = recurseIntoAttrs (linuxPackagesFor linux_2_6_39 pkgs.linuxPackages_2_6_39);
+  linuxPackages_2_6_39_powertop = recurseIntoAttrs (linuxPackagesFor linux_2_6_39_powertop pkgs.linuxPackages_2_6_39_powertop);
   linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0);
+  linuxPackages_3_0_powertop = recurseIntoAttrs (linuxPackagesFor linux_3_0_powertop pkgs.linuxPackages_3_0_powertop);
   linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 pkgs.linuxPackages_3_1);
+  linuxPackages_3_1_powertop = recurseIntoAttrs (linuxPackagesFor linux_3_1_powertop pkgs.linuxPackages_3_1_powertop);
   linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34);
   linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35);
   linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36);
+  linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor linux_3_2 pkgs.linuxPackages_3_2);
 
   # The current default kernel / kernel modules.
   linux = linuxPackages.kernel;
@@ -5770,18 +5875,6 @@ let
 
   lvm2 = callPackage ../os-specific/linux/lvm2 { };
 
-  # In theory GNU Mach doesn't have to be cross-compiled.  However, since it
-  # has to be built for i586 (it doesn't work on x86_64), one needs a cross
-  # compiler for that host.
-  mach = callPackage ../os-specific/gnu/mach {
-    automake = automake111x;  };
-
-  machHeaders = callPackage ../os-specific/gnu/mach {
-    automake = automake111x;
-    headersOnly = true;
-    mig = null;
-  };
-
   mdadm = callPackage ../os-specific/linux/mdadm { };
 
   mingetty = callPackage ../os-specific/linux/mingetty { };
@@ -5856,6 +5949,8 @@ let
 
   powertop = callPackage ../os-specific/linux/powertop { };
 
+  prayer = callPackage ../servers/prayer { };
+
   procps = callPackage ../os-specific/linux/procps { };
 
   pwdutils = callPackage ../os-specific/linux/pwdutils { };
@@ -5868,6 +5963,8 @@ let
   radeonR600 = callPackage ../os-specific/linux/firmware/radeon-r600 { };
   radeonJuniper = callPackage ../os-specific/linux/firmware/radeon-juniper { };
 
+  regionset = callPackage ../os-specific/linux/regionset { };
+
   rfkill = callPackage ../os-specific/linux/rfkill { };
 
   rt2860fw = callPackage ../os-specific/linux/firmware/rt2860 { };
@@ -5959,7 +6056,7 @@ let
     tunctl = true; mconsole = true;
   };
 
-  untie = callPackage ../os-specific/linux/untie {};
+  untie = callPackage ../os-specific/linux/untie { };
 
   upower = callPackage ../os-specific/linux/upower {
     dbus_glib = pkgs.dbus_glib_0_94;
@@ -6024,6 +6121,7 @@ let
   wesnoth = callPackage ../games/wesnoth {
     inherit (gtkLibs) pango;
     lua = lua5;
+    boost = boost147;
   };
 
   wirelesstools = callPackage ../os-specific/linux/wireless-tools { };
@@ -6078,6 +6176,8 @@ let
 
   docbook5 = callPackage ../data/sgml+xml/schemas/docbook-5.0 { };
 
+  docbook_sgml_dtd_41 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix { };
+
   docbook_xml_dtd_412 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix { };
 
   docbook_xml_dtd_42 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix { };
@@ -6190,9 +6290,7 @@ let
 
   adobeReader = callPackage_i686 ../applications/misc/adobe-reader { };
 
-  amsn = callPackage ../applications/networking/instant-messengers/amsn {
-    libstdcpp = gcc33.gcc;
-  };
+  amsn = callPackage ../applications/networking/instant-messengers/amsn { };
 
   antiword = callPackage ../applications/office/antiword {};
 
@@ -6249,9 +6347,7 @@ let
 
   bitcoin = callPackage ../applications/misc/bitcoin {
     boost = boost144;
-    wxGTK = wxGTK290;
-    db4 = db47;
-    inherit (xlibs) libSM;
+    db4 = db48;
   };
 
   bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee {
@@ -6292,18 +6388,19 @@ let
 
   cdrtools = callPackage ../applications/misc/cdrtools { };
 
-  chatzilla =
-    xulrunnerWrapper {
-      launcher = "chatzilla";
-      application = callPackage ../applications/networking/irc/chatzilla { };
-    };
+  chatzilla = callPackage ../applications/networking/irc/chatzilla {
+    xulrunner = firefox36Pkgs.xulrunner;
+  };
 
   chrome = callPackage ../applications/networking/browsers/chromium {
     inherit (gnome) GConf;
     patchelf = patchelf06;
   };
 
-  chromeWrapper = wrapFirefox chrome "chrome" "";
+  chromeWrapper = wrapFirefox
+    { browser = chrome; browserName = "chrome"; desktopName = "Chrome";
+      icon = "${chrome}/libexec/chrome/product_logo_48.png";
+    };
 
   cinelerra = callPackage ../applications/video/cinelerra {
     inherit (gnome) esound;
@@ -6336,10 +6433,7 @@ let
 
   comical = callPackage ../applications/graphics/comical { };
 
-  conkeror = xulrunnerWrapper {
-    launcher = "conkeror";
-    application = callPackage ../applications/networking/browsers/conkeror { };
-  };
+  conkeror = callPackage ../applications/networking/browsers/conkeror { };
 
   cuneiform = builderDefsPackage (import ../tools/graphics/cuneiform) {
     inherit cmake patchelf;
@@ -6378,6 +6472,8 @@ let
     inherit (xlibs) libX11;
   };
 
+  dvb_apps  = callPackage ../applications/video/dvb-apps { };
+
   dvdauthor = callPackage ../applications/video/dvdauthor { };
 
   dwm = callPackage ../applications/window-managers/dwm {
@@ -6555,46 +6651,46 @@ let
 
   firefox = pkgs.firefoxPkgs.firefox;
 
-  firefoxWrapper = wrapFirefox pkgs.firefox "firefox" "";
+  firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };
 
-  firefoxPkgs = pkgs.firefox60Pkgs;
+  firefoxPkgs = pkgs.firefox80Pkgs;
 
   firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix {
     inherit (gtkLibs) gtk pango;
     inherit (gnome) libIDL;
   };
 
-  firefox36Wrapper = wrapFirefox firefox36Pkgs.firefox "firefox" "";
+  firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; };
 
   firefox50Pkgs = callPackage ../applications/networking/browsers/firefox/5.0.nix {
     inherit (gtkLibs) gtk pango;
     inherit (gnome) libIDL;
   };
 
-  firefox50Wrapper = wrapFirefox firefox50Pkgs.firefox "firefox" "";
-
-  firefox60Pkgs = callPackage ../applications/networking/browsers/firefox/6.0.nix {
-    inherit (gtkLibs) gtk pango;
-    inherit (gnome) libIDL;
-  };
-
-  firefox60Wrapper = wrapFirefox firefox60Pkgs.firefox "firefox" "";
+  firefox50Wrapper = wrapFirefox { browser = firefox50Pkgs.firefox; };
 
   firefox70Pkgs = callPackage ../applications/networking/browsers/firefox/7.0.nix {
     inherit (gtkLibs) gtk pango;
     inherit (gnome) libIDL;
   };
 
-  firefox70Wrapper = lowPrio (wrapFirefox firefox70Pkgs.firefox "firefox" "");
+  firefox70Wrapper = wrapFirefox { browser = firefox70Pkgs.firefox; };
 
-  firefox80bPkgs = callPackage ../applications/networking/browsers/firefox/8.0.nix {
+  firefox80Pkgs = callPackage ../applications/networking/browsers/firefox/8.0.nix {
+    inherit (gtkLibs) gtk pango;
+    inherit (gnome) libIDL;
+  };
+
+  firefox80Wrapper = wrapFirefox { browser = firefox80Pkgs.firefox; };
+
+  firefox90bPkgs = callPackage ../applications/networking/browsers/firefox/9.0.nix {
     inherit (gtkLibs) gtk pango;
     inherit (gnome) libIDL;
   };
 
   flac = callPackage ../applications/audio/flac { };
 
-  flashplayer = flashplayer10;
+  flashplayer = flashplayer11;
 
   flashplayer9 = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-9 {
     inherit (gtkLibs) atk;
@@ -6605,6 +6701,11 @@ let
     debug = getConfig ["flashplayer" "debug"] false;
   };
 
+  flashplayer11 = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 {
+    inherit (gtkLibs) atk gdk_pixbuf;
+    debug = getConfig ["flashplayer" "debug"] false;
+  };
+
   freecad = callPackage ../applications/graphics/freecad {
     boost = boost146;
   };
@@ -6660,6 +6761,12 @@ let
 
   qcad = callPackage ../applications/misc/qcad { };
 
+  libquvi = callPackage ../applications/video/quvi/library.nix { };
+
+  quvi = callPackage ../applications/video/quvi/tool.nix { };
+
+  quvi_scripts = callPackage ../applications/video/quvi/scripts.nix { };
+
   qjackctl = callPackage ../applications/audio/qjackctl { };
 
   gkrellm = callPackage ../applications/misc/gkrellm { };
@@ -6676,13 +6783,13 @@ let
     inherit (gnome) GConf;
   };
 
-  gnunet = callPackage ../applications/networking/p2p/gnunet {
+  gnunet08 = callPackage ../applications/networking/p2p/gnunet/0.8.nix {
     inherit (gnome) gtk libglade;
     guile = guile_1_8;
     gtkSupport = getConfig [ "gnunet" "gtkSupport" ] true;
   };
 
-  gnunet09 = lowPrio (callPackage ../applications/networking/p2p/gnunet/0.9.nix { });
+  gnunet = callPackage ../applications/networking/p2p/gnunet { };
 
   gocr = callPackage ../applications/graphics/gocr { };
 
@@ -6767,7 +6874,7 @@ let
     inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo
       python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify
       wirelesstools;
-    inherit (gnome) libIDL libgnomeui gnomevfs gtk pango;
+    inherit (gnome) libIDL libgnomeui gnome_vfs gtk pango;
     inherit (xlibs) pixman;
     inherit (pythonPackages) ply;
   });
@@ -6777,7 +6884,7 @@ let
     inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo
       python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify
       wirelesstools;
-    inherit (gnome) libIDL libgnomeui gnomevfs gtk pango;
+    inherit (gnome) libIDL libgnomeui gnome_vfs gtk pango;
     inherit (xlibs) pixman;
     inherit (pythonPackages) ply;
   });
@@ -6787,33 +6894,7 @@ let
        [ icecat3 icecatXulrunner3 ])
     // { inherit (icecat3) gtk isFirefox3Like meta; };
 
-  icecat3Wrapper = wrapFirefox icecat3Xul "icecat" "";
-
-  icecat4 = lowPrio (import ../applications/networking/browsers/icecat-4 {
-    inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo
-      python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify
-      wirelesstools;
-    inherit (gnome) libIDL libgnomeui gnomevfs gtk pango;
-    inherit (xlibs) pixman;
-    inherit (pythonPackages) ply;
-  });
-
-  icecatXulrunner4 = lowPrio (import ../applications/networking/browsers/icecat-4 {
-    application = "xulrunner";
-    inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo
-      python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify
-      wirelesstools;
-    inherit (gnome) libIDL libgnomeui gnomevfs gtk pango;
-    inherit (xlibs) pixman;
-    inherit (pythonPackages) ply;
-  });
-
-  icecat4Xul =
-    (symlinkJoin "icecat-with-xulrunner-${icecat4.version}"
-       [ icecat4 icecatXulrunner4 ])
-    // { inherit (icecat4) gtk meta; };
-
-  icecat4Wrapper = wrapFirefox icecat4Xul "icecat" "";
+  icecat3Wrapper = wrapFirefox { browser = icecat3Xul; browserName = "icecat"; desktopName = "IceCat"; };
 
   icewm = callPackage ../applications/window-managers/icewm {
     inherit (gtkLibs) gtk;
@@ -6940,7 +7021,11 @@ let
 
   mercurial = callPackage ../applications/version-management/mercurial {
     guiSupport = getConfig ["mercurial" "guiSupport"] false; # for hgk (gitk gui for hg)
-    inherit (pythonPackages) ssl;
+    inherit (pythonPackages) ssl curses;
+    # when used with hg-fast-export (git) mercurials files are using
+    # httplib.FakeSocket which is not provided after python 2.6.  (httplib2
+    # has removed it from its interface).
+    python = python27;
   };
 
   merkaartor = callPackage ../applications/misc/merkaartor { };
@@ -6954,7 +7039,7 @@ let
       which gettext makeWrapper file libidn sqlite docutils libnotify
       vala dbus_glib;
     inherit (gtkLibs) gtk glib;
-    inherit (gnome28) gtksourceview;
+    inherit (gnome) gtksourceview;
     inherit (webkit.passthru.args) libsoup;
     inherit (xlibs) kbproto xproto libXScrnSaver scrnsaverproto;
   };
@@ -6966,7 +7051,7 @@ let
   mmex = callPackage ../applications/office/mmex { };
 
   monodevelop = callPackage ../applications/editors/monodevelop {
-    inherit (gnome) gnomevfs libbonobo libglade libgnome GConf glib gtk;
+    inherit (gnome) gnome_vfs libbonobo libglade libgnome GConf glib gtk;
     mozilla = firefox;
     gtksharp = gtksharp2;
   };
@@ -7002,6 +7087,8 @@ let
 
   mpg321 = callPackage ../applications/audio/mpg321 { };
 
+  ncmpcpp = callPackage ../applications/audio/ncmpcpp { };
+
   MPlayer = callPackage ../applications/video/MPlayer { };
 
   MPlayerPlugin = browser:
@@ -7209,10 +7296,12 @@ let
 
   scribus = callPackage ../applications/office/scribus {
     inherit (gnome) libart_lgpl;
-    qt = qt3;
+    qt = qt4;
   };
 
-  seeks = callPackage ../tools/networking/p2p/seeks { };
+  seeks = callPackage ../tools/networking/p2p/seeks {
+    opencv = opencv_2_1;
+  };
 
   seg3d = callPackage ../applications/graphics/seg3d {
     wxGTK = wxGTK28.override { unicode = false; };
@@ -7282,7 +7371,7 @@ let
 
   surf = callPackage ../applications/misc/surf {
     inherit (gtkLibs) gtk glib;
-    libsoup = gnome28.libsoup;
+    libsoup = gnome.libsoup;
   };
 
   svk = perlPackages.SVK;
@@ -7323,17 +7412,7 @@ let
 
   thinkingRock = callPackage ../applications/misc/thinking-rock { };
 
-  thunderbird = thunderbird3;
-
-  thunderbird2 = callPackage ../applications/networking/mailreaders/thunderbird/2.x.nix {
-    inherit (gnome) libIDL;
-  };
-
-  thunderbird3 = callPackage ../applications/networking/mailreaders/thunderbird/3.x.nix {
-    inherit (gnome) libIDL;
-  };
-
-  thunderbird5 = callPackage ../applications/networking/mailreaders/thunderbird/5.x.nix {
+  thunderbird = callPackage ../applications/networking/mailreaders/thunderbird/7.x.nix {
     inherit (gnome) libIDL;
   };
 
@@ -7343,6 +7422,10 @@ let
 
   tla = callPackage ../applications/version-management/arch { };
 
+  torchat = callPackage ../applications/networking/instant-messengers/torchat {
+    wrapPython = pythonPackages.wrapPython;
+  };
+
   transmission = callPackage ../applications/networking/p2p/transmission { };
 
   trayer = callPackage ../applications/window-managers/trayer {
@@ -7367,11 +7450,13 @@ let
 
   uucp = callPackage ../tools/misc/uucp { };
 
+  uwimap = callPackage ../tools/networking/uwimap { };
+
   uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) {
     inherit pkgconfig webkit makeWrapper;
     inherit (gtkLibs) gtk glib;
     inherit (xlibs) libX11 kbproto;
-    inherit (gnome28) glib_networking libsoup;
+    inherit (gnome) glib_networking libsoup;
   };
 
   valknut = callPackage ../applications/networking/p2p/valknut {
@@ -7455,26 +7540,33 @@ let
 
   wordnet = callPackage ../applications/misc/wordnet { };
 
-  wrapFirefox = browser: browserName: nameSuffix: import ../applications/networking/browsers/firefox/wrapper.nix {
-    inherit stdenv nameSuffix makeWrapper makeDesktopItem browser browserName;
-    plugins =
-      let
-        enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true;
-        enableGnash = getConfig [ browserName "enableGnash" ] false;
-      in
-       assert !(enableGnash && enableAdobeFlash);
-       ([ ]
-        ++ lib.optional enableGnash gnash
-        ++ lib.optional enableAdobeFlash flashplayer
-        # RealPlayer is disabled by default for legal reasons.
-        ++ lib.optional (system != "i686-linux" && getConfig [browserName "enableRealPlayer"] false) RealPlayer
-        ++ lib.optional (getConfig [browserName "enableDjvu"] false) (djview4)
-        ++ lib.optional (getConfig [browserName "enableMPlayer"] false) (MPlayerPlugin browser)
-        ++ lib.optional (getConfig [browserName "enableGeckoMediaPlayer"] false) gecko_mediaplayer
-        ++ lib.optional (supportsJDK && getConfig [browserName "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin
-        ++ lib.optional (getConfig [browserName "enableGoogleTalkPlugin"] false) google_talk_plugin
-       );
-  };
+  wrapFirefox =
+    { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? ""
+    , icon ? "${browser}/lib/${browser.name}/icons/mozicon128.png" }:
+    import ../applications/networking/browsers/firefox/wrapper.nix {
+      inherit stdenv makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon;
+      plugins =
+        let
+          enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true;
+          enableGnash = getConfig [ browserName "enableGnash" ] false;
+        in
+         assert !(enableGnash && enableAdobeFlash);
+         ([ ]
+          ++ lib.optional enableGnash gnash
+          ++ lib.optional enableAdobeFlash flashplayer
+          # RealPlayer is disabled by default for legal reasons.
+          ++ lib.optional (system != "i686-linux" && getConfig [browserName "enableRealPlayer"] false) RealPlayer
+          ++ lib.optional (getConfig [browserName "enableDjvu"] false) (djview4)
+          ++ lib.optional (getConfig [browserName "enableMPlayer"] false) (MPlayerPlugin browser)
+          ++ lib.optional (getConfig [browserName "enableGeckoMediaPlayer"] false) gecko_mediaplayer
+          ++ lib.optional (supportsJDK && getConfig [browserName "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin
+          ++ lib.optional (getConfig [browserName "enableGoogleTalkPlugin"] false) google_talk_plugin
+         );
+      libs =
+        if getConfig [ browserName "enableQuakeLive" ] false
+        then with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]
+        else [ ];
+    };
 
   x11vnc = callPackage ../tools/X11/x11vnc { };
 
@@ -7599,6 +7691,8 @@ let
 
   ### GAMES
 
+  alienarena = callPackage ../games/alienarena { };
+
   asc = callPackage ../games/asc {
     lua = lua5;
     libsigcxx = libsigcxx12;
@@ -7842,6 +7936,8 @@ let
   # TODO: the corresponding nix file is missing
   # xracer = callPackage ../games/xracer { };
 
+  xonotic = callPackage ../games/xonotic { };
+
   xsokoban = builderDefsPackage (import ../games/xsokoban) {
     inherit (xlibs) libX11 xproto libXpm libXt;
   };
@@ -7865,9 +7961,16 @@ let
   #   import ../desktops/e17 { inherit callPackage pkgs; }
   # );
 
-  gnome28 = recurseIntoAttrs (import ../desktops/gnome-2.28 pkgs);
+  gnome2 = (callPackage ../desktops/gnome-2 {
+    callPackage = pkgs.newScope pkgs.gnome2;
+    self = pkgs.gnome2;
+  }  // pkgs.gtkLibs);
 
-  gnome = gnome28;
+  gnome3 = (import ../desktops/gnome-3 {
+    callPackage = pkgs.newScope pkgs.gnome3;
+  } // pkgs.gtkLibs3x);
+
+  gnome = recurseIntoAttrs gnome2;
 
   kde3 = recurseIntoAttrs {
 
@@ -7876,12 +7979,6 @@ let
       qt = qt3;
     };
 
-    kdebase = callPackage ../desktops/kde-3/kdebase {
-      stdenv = overrideGCC stdenv gcc43;
-      inherit (kde3) kdelibs;
-      qt = qt3;
-    };
-
     arts = callPackage ../development/libraries/arts {
       qt = qt3;
       inherit (gnome) glib;
@@ -7897,11 +7994,6 @@ let
       inherit (kde3) kdelibs;
     };
 
-    kile = callPackage ../applications/editors/kile/2.0.nix {
-      inherit (kde3) arts kdelibs;
-      qt = qt3;
-    };
-
     kphone = callPackage ../applications/networking/kphone {
       qt = qt3;
       stdenv = overrideGCC stdenv gcc42; # I'm to lazy to clean up header files
@@ -7914,7 +8006,7 @@ let
 
   };
 
-  kde4 = recurseIntoAttrs pkgs.kde45;
+  kde4 = recurseIntoAttrs pkgs.kde47;
 
   # TODO: merge with branches/drop-kde4.5 if you want to remove KDE SC 4.5
   # This branch removes kde45 and quite a few compatibility hacks
@@ -7964,7 +8056,7 @@ let
 
       kdiff3 = callPackage ../tools/text/kdiff3 { };
 
-      kile = callPackage ../applications/editors/kile/2.1.nix { };
+      kile = callPackage ../applications/editors/kile { };
 
       kmplayer = callPackage ../applications/video/kmplayer {
         inherit (pkgs.gtkLibs) pango;
@@ -7976,7 +8068,9 @@ let
         inherit (pkgs.gtkLibs) gdk_pixbuf;
       };
 
-      koffice = callPackage ../applications/office/koffice { };
+      koffice = callPackage ../applications/office/koffice {
+        boost = boost147;
+      };
 
       konq_plugins = callPackage ../applications/networking/browsers/konq-plugins { };
 
@@ -8115,7 +8209,7 @@ let
 
   coq = callPackage ../applications/science/logic/coq {
     inherit (ocamlPackages) findlib lablgtk;
-    camlp5 = ocamlPackages.camlp5_transitional;
+    camlp5 = ocamlPackages.camlp5_5_transitional;
   };
 
   cvc3 = callPackage ../applications/science/logic/cvc3 {};
@@ -8147,13 +8241,14 @@ let
   matita = callPackage ../applications/science/logic/matita {
     inherit (ocamlPackages) findlib lablgtk ocaml_expat gmetadom ocaml_http
             lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet ulex08 camlzip ocaml_pcre;
-    camlp5 = ocamlPackages.camlp5_transitional;
   };
 
   minisat = callPackage ../applications/science/logic/minisat {};
 
   opensmt = callPackage ../applications/science/logic/opensmt { };
 
+  picosat = callPackage ../applications/science/logic/picosat {};
+
   prover9 = callPackage ../applications/science/logic/prover9 { };
 
   satallax = callPackage ../applications/science/logic/satallax {};
@@ -8161,7 +8256,7 @@ let
   spass = callPackage ../applications/science/logic/spass {};
 
   ssreflect = callPackage ../applications/science/logic/ssreflect {
-    camlp5 = ocamlPackages.camlp5_transitional;
+    camlp5 = ocamlPackages.camlp5_5_transitional;
   };
 
   tptp = callPackage ../applications/science/logic/tptp {};
@@ -8212,6 +8307,8 @@ let
 
   ### SCIENCE / MISC
 
+  boinc = callPackage ../applications/science/misc/boinc { };
+
   golly = callPackage ../applications/science/misc/golly { };
 
   simgrid = callPackage ../applications/science/misc/simgrid { };
@@ -8406,6 +8503,11 @@ let
 
   saneBackends = callPackage ../misc/sane-backends {
     gt68xxFirmware = getConfig ["sane" "gt68xxFirmware"] null;
+    hotplugSupport = getConfig ["sane" "hotplugSupport"] true;
+  };
+
+  saneBackendsSnapshot = callPackage ../misc/sane-backends/snapshot.nix {
+    gt68xxFirmware = getConfig ["sane" "gt68xxFirmware"] null;
   };
 
   saneFrontends = callPackage ../misc/sane-front { };
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 738205ea23c..03d014569f9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -89,6 +89,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   ghc703Prefs  = super : super // super.haskellPlatformDefaults_2011_2_0_1 super;
   ghc704Prefs  = super : super // super.haskellPlatformDefaults_2011_2_0_1 super; # link
   ghc721Prefs  = super : super // super.haskellPlatformDefaults_future super;
+  ghc722Prefs  = super : super // super.haskellPlatformDefaults_future super;
   ghcHEADPrefs = super : super // super.haskellPlatformDefaults_future super; # link
 
   # GHC and its wrapper
@@ -103,7 +104,17 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
                                # top of this file.
 
   ghc = callPackage ../development/compilers/ghc/wrapper.nix {
-    ghc = ghc;
+    ghc = ghc; # refers to ghcPlain
+  };
+
+  # An experimental wrapper around ghcPlain that does not automatically
+  # pick up packages from the profile, but instead has a fixed set of packages
+  # in its global database. The set of packages can be specified as an
+  # argument to this function.
+
+  ghcWithPackages = pkgs : callPackage ../development/compilers/ghc/with-packages.nix {
+    ghc = ghc; # refers to ghcPlain
+    packages = pkgs self;
   };
 
   # This is the Cabal builder, the function we use to build most Haskell
@@ -126,30 +137,30 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     cgi          = self.cgi_3001_1_7_4; # 7.2 ok, 7.3 ok
     fgl          = self.fgl_5_4_2_4; # 7.2 ok, 7.3 ok
     GLUT         = self.GLUT_2_1_2_1; # 7.2 ok, 7.3 ok
-    haskellSrc   = self.haskellSrc_1_0_1_4; # 7.2 fails, 7.3 fails
+    haskellSrc   = self.haskellSrc_1_0_1_5; # 7.2 fails, 7.3 fails
     html         = self.html_1_0_1_2; # 7.2 ok, 7.3 ok
     HUnit        = self.HUnit_1_2_2_3; # 7.2 ok, 7.3 ok
-    network      = self.network_2_3_0_5; # 7.2 ok, 7.3 ok
+    network      = self.network_2_3_0_8; # 7.2 ok, 7.3 ok
     OpenGL       = self.OpenGL_2_2_3_0; # 7.2 ok, 7.3 ok
     parallel     = self.parallel_3_1_0_1; # 7.2 ok, 7.3 ok
-    parsec       = self.parsec_3_1_1; # 7.2 ok, 7.3 ok
+    parsec       = self.parsec_3_1_2; # 7.2 ok, 7.3 ok
     QuickCheck   = self.QuickCheck_2_4_0_1; # 7.2 ok, 7.3 ok
     regexBase    = self.regexBase_0_93_2; # 7.2 ok, 7.3 ok
     regexCompat  = self.regexCompat_0_93_1; # 7.2 ok, 7.3 ok
     regexPosix   = self.regexPosix_0_94_4; # 7.2 ok, 7.3 ok
     stm          = self.stm_2_2_0_1; # 7.2 ok, 7.3 ok
-    syb          = self.syb_0_3_3; # 7.2 ok, 7.3 ok
+    syb          = self.syb_0_3_6; # 7.2 ok, 7.3 ok
     xhtml        = self.xhtml_3000_2_0_1; # 7.2 ok, 7.3 ok
     zlib         = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok
-    HTTP         = self.HTTP_4000_1_2; # 7.2 ok, 7.3 ok
+    HTTP         = self.HTTP_4000_2_1; # 7.2 ok, 7.3 ok
     deepseq      = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok
-    text         = self.text_0_11_1_5; # 7.2 ok, 7.3 ok
+    text         = self.text_0_11_1_9; # 7.2 ok, 7.3 ok
     transformers = self.transformers_0_2_2_0; # 7.2 ok, 7.3 ok
     mtl          = self.mtl_2_0_1_0; # 7.2 ok, 7.3 ok
-    random       = self.random_1_0_0_3; # 7.2 ok, 7.3 ok
+    random       = self.random_1_0_1_1; # 7.2 ok, 7.3 ok
     cabalInstall = self.cabalInstall_0_10_2; # 7.2 fails, 7.3 fails
     alex         = self.alex_3_0_1; # 7.2 ok, 7.3 ok
-    happy        = self.happy_1_18_6; # 7.2 ok, 7.3 ok
+    happy        = self.happy_1_18_8; # 7.2 ok, 7.3 ok
     haddock      = self.haddock_2_9_2; # 7.2 fails, 7.3 fails
   };
 
@@ -193,8 +204,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     self : self.haskellPlatformArgs_2011_2_0_1 self // {
       haskellPlatform = self.haskellPlatform_2011_2_0_1;
       mtl1 = self.mtl_1_1_1_1;
-      text = self.text_0_11_1_5;
-      repaExamples = null;	# don't pick this version of 'repa-examples' during nix-env -u
+      text = self.text_0_11_1_9;
+      repaExamples = null;      # don't pick this version of 'repa-examples' during nix-env -u
     };
 
   haskellPlatform_2011_2_0_1 =
@@ -236,7 +247,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     self : self.haskellPlatformArgs_2011_2_0_0 self // {
       haskellPlatform = self.haskellPlatform_2011_2_0_0;
       mtl1 = self.mtl_1_1_1_1;
-      repaExamples = null;	# don't pick this version of 'repa-examples' during nix-env -u
+      repaExamples = null;      # don't pick this version of 'repa-examples' during nix-env -u
     };
 
   haskellPlatform_2011_2_0_0 =
@@ -274,7 +285,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   haskellPlatformDefaults_2010_2_0_0 =
     self : self.haskellPlatformArgs_2010_2_0_0 self // {
       haskellPlatform = self.haskellPlatform_2010_2_0_0;
-      repaExamples = null;	# don't pick this version of 'repa-examples' during nix-env -u
+      repaExamples = null;      # don't pick this version of 'repa-examples' during nix-env -u
     };
 
   haskellPlatform_2010_2_0_0 =
@@ -311,7 +322,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     self : self.haskellPlatformArgs_2010_1_0_0 self // {
       haskellPlatform = self.haskellPlatform_2010_1_0_0;
       extensibleExceptions = self.extensibleExceptions_0_1_1_0;
-      repaExamples = null;	# don't pick this version of 'repa-examples' during nix-env -u
+      repaExamples = null;      # don't pick this version of 'repa-examples' during nix-env -u
     };
 
   haskellPlatform_2010_1_0_0 =
@@ -349,7 +360,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     self : self.haskellPlatformArgs_2009_2_0_2 self // {
       haskellPlatform = self.haskellPlatform_2009_2_0_2;
       extensibleExceptions = self.extensibleExceptions_0_1_1_0;
-      repaExamples = null;	# don't pick this version of 'repa-examples' during nix-env -u
+      text = self.text_0_11_0_6;
+      repaExamples = null;      # don't pick this version of 'repa-examples' during nix-env -u
     };
 
   haskellPlatform_2009_2_0_2 =
@@ -359,10 +371,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   # Haskell libraries.
 
-  Agda = callPackage ../development/libraries/haskell/Agda {
-    syb = self.syb02;
-    haskellSrcExts = self.haskellSrcExts_1_9_6;
-  };
+  Agda = callPackage ../development/libraries/haskell/Agda {};
 
   ACVector = callPackage ../development/libraries/haskell/AC-Vector {};
 
@@ -386,12 +395,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   attoparsecEnumerator = callPackage ../development/libraries/haskell/attoparsec/enumerator.nix {};
 
-  attoparsecText = callPackage ../development/libraries/haskell/attoparsec-text {};
-
-  attoparsecTextEnumerator = callPackage ../development/libraries/haskell/attoparsec-text-enumerator {};
-
   authenticate = callPackage ../development/libraries/haskell/authenticate {};
 
+  base16Bytestring = callPackage ../development/libraries/haskell/base16-bytestring {};
+
   base64String = callPackage ../development/libraries/haskell/base64-string {};
 
   base64Bytestring = callPackage ../development/libraries/haskell/base64-bytestring {};
@@ -426,12 +433,18 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   Boolean = callPackage ../development/libraries/haskell/Boolean {};
 
+  bson = callPackage ../development/libraries/haskell/bson {};
+
   bytestringNums = callPackage ../development/libraries/haskell/bytestring-nums {};
 
+  bytestringLexing = callPackage ../development/libraries/haskell/bytestring-lexing {};
+
   bytestringMmap = callPackage ../development/libraries/haskell/bytestring-mmap {};
 
   bytestringTrie = callPackage ../development/libraries/haskell/bytestring-trie {};
 
+  cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {};
+
   cairo = callPackage ../development/libraries/haskell/cairo {
     inherit (pkgs) cairo zlib;
     libc = pkgs.stdenv.gcc.libc;
@@ -466,6 +479,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   colour = callPackage ../development/libraries/haskell/colour {};
 
+  compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {};
+
   ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {};
 
   controlMonadAttempt = callPackage ../development/libraries/haskell/control-monad-attempt {};
@@ -494,14 +509,20 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   cryptohash = callPackage ../development/libraries/haskell/cryptohash {};
 
+  cryptoPubkeyTypes = callPackage ../development/libraries/haskell/crypto-pubkey-types {};
+
   csv = callPackage ../development/libraries/haskell/csv {};
 
   cssText = callPackage ../development/libraries/haskell/css-text {};
 
+  curl = callPackage ../development/libraries/haskell/curl { curl = pkgs.curl; };
+
   dataAccessor = callPackage ../development/libraries/haskell/data-accessor/data-accessor.nix {};
 
   dataAccessorTemplate = callPackage ../development/libraries/haskell/data-accessor/data-accessor-template.nix {};
 
+  dataBinaryIeee754 = callPackage ../development/libraries/haskell/data-binary-ieee754 {};
+
   dataDefault = callPackage ../development/libraries/haskell/data-default {};
 
   dataenc = callPackage ../development/libraries/haskell/dataenc {};
@@ -541,6 +562,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   doubleConversion = callPackage ../development/libraries/haskell/double-conversion {};
 
+  download = callPackage ../development/libraries/haskell/download {};
+
+  downloadCurl = callPackage ../development/libraries/haskell/download-curl { tagsoup = self.tagsoup_0_10_1; };
+
   editline = callPackage ../development/libraries/haskell/editline {};
 
   emailValidate = callPackage ../development/libraries/haskell/email-validate {};
@@ -621,10 +646,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {};
   GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix {};
-  GLUT_2_2_2_0 = callPackage ../development/libraries/haskell/GLUT/2.2.2.0.nix {
-    OpenGL = self.OpenGL_2_4_0_1;
+  GLUT_2_2_2_1 = callPackage ../development/libraries/haskell/GLUT/2.2.2.1.nix {
+    OpenGL = self.OpenGL_2_4_0_2;
   };
-  GLUT22 = self.GLUT_2_2_2_0;
+  GLUT22 = self.GLUT_2_2_2_1;
   GLUT = self.GLUT_2_1_1_2;
 
   gtk = callPackage ../development/libraries/haskell/gtk {
@@ -646,13 +671,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     fgl = self.fgl_5_4_2_4;
   };
 
-  hakyll = callPackage ../development/libraries/haskell/hakyll {
-    hamlet = self.hamlet_0_8_2_1;
-  };
+  hakyll = callPackage ../development/libraries/haskell/hakyll {};
 
-  hamlet_0_8_2_1 = callPackage ../development/libraries/haskell/hamlet/0.8.2.1.nix {};
-  hamlet_0_10_2 = callPackage ../development/libraries/haskell/hamlet/0.10.2.nix {};
-  hamlet = self.hamlet_0_10_2;
+  hamlet = callPackage ../development/libraries/haskell/hamlet {};
 
   happstackData = callPackage ../development/libraries/haskell/happstack/happstack-data.nix {};
 
@@ -666,6 +687,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {};
 
+  hashtables = callPackage ../development/libraries/haskell/hashtables {};
+
   haskeline = callPackage ../development/libraries/haskell/haskeline {};
 
   haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {};
@@ -674,21 +697,20 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   haskellSrc_1_0_1_3 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.3.nix {};
   haskellSrc_1_0_1_4 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.4.nix {};
-  haskellSrc = self.haskellSrc_1_0_1_3;
+  haskellSrc_1_0_1_5 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.5.nix {};
+  haskellSrc = self.haskellSrc_1_0_1_5;
 
-  # The old version is required for Agda.
-  haskellSrcExts_1_11_1 = callPackage ../development/libraries/haskell/haskell-src-exts/1.11.1.nix {};
-  haskellSrcExts_1_9_6 = callPackage ../development/libraries/haskell/haskell-src-exts/1.9.6.nix {};
-  haskellSrcExts = self.haskellSrcExts_1_11_1;
+  haskellSrcExts = callPackage ../development/libraries/haskell/haskell-src-exts/default.nix {};
 
   haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {};
 
-  HTTP_3001_1_5 = callPackage ../development/libraries/haskell/HTTP/3001.1.5.nix {};
+  hastache = callPackage ../development/libraries/haskell/hastache {};
+
   HTTP_4000_0_6 = callPackage ../development/libraries/haskell/HTTP/4000.0.6.nix {};
   HTTP_4000_0_9 = callPackage ../development/libraries/haskell/HTTP/4000.0.9.nix {};
   HTTP_4000_1_1 = callPackage ../development/libraries/haskell/HTTP/4000.1.1.nix {};
-  HTTP_4000_1_2 = callPackage ../development/libraries/haskell/HTTP/4000.1.2.nix {};
-  HTTP = self.HTTP_4000_0_6;
+  HTTP_4000_2_1 = callPackage ../development/libraries/haskell/HTTP/4000.2.1.nix {};
+  HTTP = self.HTTP_4000_2_1;
 
   hackageDb = callPackage ../development/libraries/haskell/hackage-db {};
 
@@ -794,6 +816,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     parsec = self.parsec2;
   };
 
+  iteratee = callPackage ../development/libraries/haskell/iteratee {};
+
   ivor = callPackage ../development/libraries/haskell/ivor {};
 
   jpeg = callPackage ../development/libraries/haskell/jpeg {};
@@ -819,6 +843,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {};
 
+  libmpd = callPackage ../development/libraries/haskell/libmpd {};
+
   ListLike = callPackage ../development/libraries/haskell/ListLike {};
 
   ltk = callPackage ../development/libraries/haskell/ltk {};
@@ -843,6 +869,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   MonadCatchIOTransformers = callPackage ../development/libraries/haskell/MonadCatchIO-transformers {};
 
+  monadControl_OBSOLETE = callPackage ../development/libraries/haskell/monad-control/0.2.0.3.nix {};
+  monadControl2 = self.monadControl_OBSOLETE;
   monadControl = callPackage ../development/libraries/haskell/monad-control {};
 
   monadLoops = callPackage ../development/libraries/haskell/monad-loops {};
@@ -855,6 +883,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   MonadRandom = callPackage ../development/libraries/haskell/MonadRandom {};
 
+  mongoDB = callPackage ../development/libraries/haskell/mongoDB {
+    monadControl = self.monadControl2;
+  };
+
   mpppc = callPackage ../development/libraries/haskell/mpppc {};
 
   mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {};
@@ -878,14 +910,15 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   mwcRandom = callPackage ../development/libraries/haskell/mwc-random {};
 
+  NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {};
+
   neither = callPackage ../development/libraries/haskell/neither {};
 
   network_2_2_1_4 = callPackage ../development/libraries/haskell/network/2.2.1.4.nix {};
   network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {};
   network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {};
-  network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {};
-  network_2_3_0_6 = callPackage ../development/libraries/haskell/network/2.3.0.6.nix {};
-  network = self.network_2_3_0_6;
+  network_2_3_0_8 = callPackage ../development/libraries/haskell/network/2.3.0.8.nix {};
+  network = self.network_2_3_0_8;
 
   nixosTypes = callPackage ../development/libraries/haskell/nixos-types {};
 
@@ -905,8 +938,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix {};
   OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {};
-  OpenGL_2_4_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.1.nix {};
-  OpenGL24 = self.OpenGL_2_4_0_1;
+  OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {};
+  OpenGL24 = self.OpenGL_2_4_0_2;
   OpenGL = self.OpenGL_2_2_1_1;
 
   OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {};
@@ -925,15 +958,17 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   parallel_1_1_0_1 = callPackage ../development/libraries/haskell/parallel/1.1.0.1.nix {};
   parallel_2_2_0_1 = callPackage ../development/libraries/haskell/parallel/2.2.0.1.nix {};
   parallel_3_1_0_1 = callPackage ../development/libraries/haskell/parallel/3.1.0.1.nix {};
+  parallel_3_2_0_0 = callPackage ../development/libraries/haskell/parallel/3.2.0.0.nix {};
   parallel = self.parallel_1_1_0_1;
 
   parseargs = callPackage ../development/libraries/haskell/parseargs {};
 
   parsec_2_1_0_1 = callPackage ../development/libraries/haskell/parsec/2.1.0.1.nix {};
   parsec_3_1_1   = callPackage ../development/libraries/haskell/parsec/3.1.1.nix {};
+  parsec_3_1_2   = callPackage ../development/libraries/haskell/parsec/3.1.2.nix {};
   parsec2 = self.parsec_2_1_0_1;
-  parsec3 = self.parsec_3_1_1;
-  parsec  = self.parsec2;
+  parsec3 = self.parsec_3_1_2;
+  parsec  = self.parsec3;
 
   parsimony = callPackage ../development/libraries/haskell/parsimony {};
 
@@ -955,7 +990,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   primitive_0_3_1 = callPackage ../development/libraries/haskell/primitive/0.3.1.nix {};
   primitive_0_4_0_1 = callPackage ../development/libraries/haskell/primitive/0.4.0.1.nix {};
-  primitive = self.primitive_0_3_1;
+  primitive = self.primitive_0_4_0_1;
 
   processLeksah = callPackage ../development/libraries/haskell/leksah/process-leksah.nix {};
 
@@ -985,13 +1020,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {};
 
-  random_1_0_0_2_newtime = callPackage ../development/libraries/haskell/random/1.0.0.2.nix {
-    time = self.time_1_2_0_3;
-  };
-  random_1_0_0_3 = callPackage ../development/libraries/haskell/random/1.0.0.3.nix {};
-  random_1_0_1_0 = callPackage ../development/libraries/haskell/random/1.0.1.0.nix {};
+  random_1_0_1_1 = callPackage ../development/libraries/haskell/random/1.0.1.1.nix {};
   random = null; # core package until ghc-7.2.1
-  random_newtime = self.random_1_0_0_2_newtime;
 
   randomFu = callPackage ../development/libraries/haskell/random-fu {};
 
@@ -1041,9 +1071,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   regular = callPackage ../development/libraries/haskell/regular {};
 
-  repa = callPackage ../development/libraries/haskell/repa {
-    vector = self.vector_0_9;
-  };
+  repa = callPackage ../development/libraries/haskell/repa {};
 
   repaAlgorithms = callPackage ../development/libraries/haskell/repa-algorithms {};
 
@@ -1085,9 +1113,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {};
   syb_0_3   = callPackage ../development/libraries/haskell/syb/0.3.nix {};
-  syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {};
-  syb02     = self.syb_0_2_2;
-  syb03     = self.syb_0_3;
+  syb_0_3_6 = callPackage ../development/libraries/haskell/syb/0.3.6.nix {};
   syb       = null; # by default, we assume that syb ships with GHC, which is
                     # true for the older GHC versions
 
@@ -1152,6 +1178,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   tagsoup = callPackage ../development/libraries/haskell/tagsoup {};
 
+  tagsoup_0_10_1 = callPackage ../development/libraries/haskell/tagsoup/0.10.1nix {};
+
   Tensor = callPackage ../development/libraries/haskell/Tensor {};
 
   terminfo = callPackage ../development/libraries/haskell/terminfo {};
@@ -1170,14 +1198,16 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   testpack = callPackage ../development/libraries/haskell/testpack {};
 
-  texmath_0_4 = callPackage ../development/libraries/haskell/texmath/0.4.nix {};
-  texmath_0_5_0_1 = callPackage ../development/libraries/haskell/texmath/0.5.0.1.nix {};
-  texmath = self.texmath_0_5_0_1;
+  texmath = callPackage ../development/libraries/haskell/texmath {};
 
   text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {};
   text_0_11_0_6 = callPackage ../development/libraries/haskell/text/0.11.0.6.nix {};
-  text_0_11_1_5 = callPackage ../development/libraries/haskell/text/0.11.1.5.nix {};
-  text = self.text_0_11_1_5;
+  text_0_11_1_9 = callPackage ../development/libraries/haskell/text/0.11.1.9.nix {};
+  text = self.text_0_11_1_9;
+
+  thespian = callPackage ../development/libraries/haskell/thespian {};
+
+  thExtras = callPackage ../development/libraries/haskell/th-extras {};
 
   thLift = callPackage ../development/libraries/haskell/th-lift {};
 
@@ -1187,7 +1217,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   time_1_1_3   = callPackage ../development/libraries/haskell/time/1.1.3.nix {};
   time_1_2_0_3 = callPackage ../development/libraries/haskell/time/1.2.0.3.nix {};
   time_1_2_0_5 = callPackage ../development/libraries/haskell/time/1.2.0.5.nix {};
-  time_1_4 = callPackage ../development/libraries/haskell/time/1.4.nix {};
+  time_1_4_0_1 = callPackage ../development/libraries/haskell/time/1.4.0.1.nix {};
   # time is in the core package set. It should only be necessary to
   # pass it explicitly in rare circumstances.
   time = null;
@@ -1199,6 +1229,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {};
   transformers = self.transformers_0_2_2_0;
 
+  transformersBase = callPackage ../development/libraries/haskell/transformers-base {};
+
   tuple = callPackage ../development/libraries/haskell/tuple {};
 
   typeEquality = callPackage ../development/libraries/haskell/type-equality {};
@@ -1225,7 +1257,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   uulib = callPackage ../development/libraries/haskell/uulib {};
 
-  uuParsingLib = callPackage ../development/libraries/haskell/uu-parsinglib {};
+  uuParsinglib = callPackage ../development/libraries/haskell/uu-parsinglib {};
 
   vacuum = callPackage ../development/libraries/haskell/vacuum {};
 
@@ -1233,19 +1265,21 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   Vec = callPackage ../development/libraries/haskell/Vec {};
 
-  vector_0_7_1 = callPackage ../development/libraries/haskell/vector/0.7.1.nix {};
+  vector_0_7_1 = callPackage ../development/libraries/haskell/vector/0.7.1.nix {
+    primitive = self.primitive_0_3_1;
+  };
   vector_0_9 = callPackage ../development/libraries/haskell/vector/0.9.nix {
     primitive = self.primitive_0_4_0_1;
   };
-  vector = self.vector_0_7_1;
+  vector = self.vector_0_9;
 
   vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {};
 
   vectorSpace = callPackage ../development/libraries/haskell/vector-space {};
 
-  vty_4_6_0_4 = callPackage ../development/libraries/haskell/vty/4.6.0.4.nix {};
-  vty_4_7_0_4 = callPackage ../development/libraries/haskell/vty/4.7.0.4.nix {};
-  vty = self.vty_4_7_0_4;
+  vty = callPackage ../development/libraries/haskell/vty {
+    mtl = self.mtl2;
+  };
 
   wai = callPackage ../development/libraries/haskell/wai {};
 
@@ -1261,10 +1295,15 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   WebBits_2_0 = callPackage ../development/libraries/haskell/WebBits/2.0.nix {
     parsec = self.parsec2;
   };
-  WebBits = self.WebBits_2_0;
+  WebBits_2_1 = callPackage ../development/libraries/haskell/WebBits/2.1.nix {};
+  WebBits = self.WebBits_2_1;
 
-  WebBitsHtml_1_0_1 = callPackage ../development/libraries/haskell/WebBits-Html/1.0.1.nix {};
-  WebBitsHtml_1_0_2 = callPackage ../development/libraries/haskell/WebBits-Html/1.0.2.nix {};
+  WebBitsHtml_1_0_1 = callPackage ../development/libraries/haskell/WebBits-Html/1.0.1.nix {
+    WebBits = self.WebBits_2_0;
+  };
+  WebBitsHtml_1_0_2 = callPackage ../development/libraries/haskell/WebBits-Html/1.0.2.nix {
+    WebBits = self.WebBits_2_0;
+  };
   WebBitsHtml = self.WebBitsHtml_1_0_2;
 
   webRoutes = callPackage ../development/libraries/haskell/web-routes {};
@@ -1319,6 +1358,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   yst = callPackage ../development/libraries/haskell/yst {};
 
+  zeromqHaskell = callPackage ../development/libraries/haskell/zeromq-haskell {};
+
   zipArchive = callPackage ../development/libraries/haskell/zip-archive {};
 
   zipper = callPackage ../development/libraries/haskell/zipper {
@@ -1340,11 +1381,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   zlibEnum = callPackage ../development/libraries/haskell/zlib-enum {};
 
+  Zwaluw = callPackage ../development/libraries/haskell/Zwaluw {};
+
   # Compilers.
 
   AgdaExecutable = callPackage ../development/compilers/Agda-executable {};
 
-  ehc = callPackage ../development/compilers/ehc {};
+  uhc = callPackage ../development/compilers/uhc {};
 
   epic = callPackage ../development/compilers/epic {};
 
@@ -1353,7 +1396,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   idris = callPackage ../development/compilers/idris {};
 
   pakcs = callPackage ../development/compilers/pakcs {
-    syb = self.syb02;
+    syb = self.syb_0_2_2;
   };
 
   # Development tools.
@@ -1379,12 +1422,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix {};
   haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {};
   haddock_2_9_4 = callPackage ../development/tools/documentation/haddock/2.9.4.nix {};
-  haddock = self.haddock_2_7_2;
+  haddock = self.haddock_2_9_4;
 
   happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {};
   happy_1_18_5 = callPackage ../development/tools/parsing/happy/1.18.5.nix {};
   happy_1_18_6 = callPackage ../development/tools/parsing/happy/1.18.6.nix {};
-  happy = self.happy_1_18_4;
+  happy_1_18_8 = callPackage ../development/tools/parsing/happy/1.18.8.nix {};
+  happy = self.happy_1_18_8;
 
   happyMeta = callPackage ../development/tools/haskell/happy-meta {};
 
@@ -1394,6 +1438,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   hslogger = callPackage ../development/tools/haskell/hslogger {};
 
+  SourceGraph = callPackage ../development/tools/haskell/SourceGraph {};
+
   tar = callPackage ../development/tools/haskell/tar {};
 
   threadscope = callPackage ../development/tools/haskell/threadscope {};
@@ -1408,7 +1454,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   leksah = callPackage ../applications/editors/leksah {};
 
-  xmobar = callPackage ../applications/misc/xmobar {};
+  xmobar = callPackage ../applications/misc/xmobar {
+    parsec = self.parsec3;
+  };
 
   xmonad = callPackage ../applications/window-managers/xmonad {};
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ae902dabe5d..a73e8193817 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -292,7 +292,7 @@ rec {
     };
     buildInputs = [ TestWWWMechanizeCatalyst TestUseOk ];
     propagatedBuildInputs =
-      [ CatalystPluginAuthentication ClassAccessor CryptPasswdMD5 AuthenHtpasswd ];
+      [ CatalystPluginAuthentication ClassAccessor CryptPasswdMD5 AuthenHtpasswd HTMLForm ];
   };
 
   CatalystAuthenticationStoreDBIxClass = buildPerlPackage rec {
@@ -389,10 +389,10 @@ rec {
   };
 
   CatalystRuntime = buildPerlPackage rec{
-    name = "Catalyst-Runtime-5.80033";
+    name = "Catalyst-Runtime-5.90006";
     src = fetchurl {
       url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz";
-      sha256 = "1q542lrnvc0a11923awhk51fqzzxfa8zdkbch7z07dl8y81mwhl2";
+      sha256 = "01afjgcc5lqaw6gmzwym8n09q8nksj4jdl2z25m64sfiv1gdyx2w";
     };
     buildInputs = [ TestException ];
     propagatedBuildInputs =
@@ -405,9 +405,19 @@ rec {
         TextSimpleTable TimeHiRes TreeSimple TreeSimpleVisitorFactory
         URI TaskWeaken /* TextBalanced */ MROCompat MooseXTypes
         MooseXGetopt MooseXTypesCommon StringRewritePrefix
+        MooseXTypesLoadableClass Plack PlackMiddlewareReverseProxy
       ];
   };
 
+  CatalystPluginAccessLog = buildPerlPackage rec {
+    name = "Catalyst-Plugin-AccessLog-1.04";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz";
+      sha256 = "1cbbg6fviyv398lyhmv14ya0v0h0xs04d29zz9r49vzsbw6shy33";
+    };
+    propagatedBuildInputs = [ CatalystRuntime DateTime ];
+  };
+
   CatalystPluginAuthentication = buildPerlPackage rec {
     name = "Catalyst-Plugin-Authentication-0.10018";
     src = fetchurl {
@@ -516,10 +526,10 @@ rec {
   };
 
   CatalystViewDownload = buildPerlPackage rec {
-    name = "Catalyst-View-Download-0.06";
+    name = "Catalyst-View-Download-0.07";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz";
-      sha256 = "0l9jvc4sqchhpmhn70lm46k2avdsdk19i9wgas1awhzyr445c0b3";
+      sha256 = "1c6k4x6az0fkany16zlyaqhlp7bcx922vl4qzd3z707vs6pc06rz";
     };
     buildInputs = [  TestWWWMechanizeCatalyst TestUseOk ];
     propagatedBuildInputs = [ CatalystRuntime TextCSV XMLSimple ];
@@ -553,7 +563,17 @@ rec {
       sha256 = "0a2mhfgv0kqmaxf2crs8mqk44lyhd9qcwlpzhrc0b0dh4z503mr4";
     };
     propagatedBuildInputs = 
-      [ CatalystRuntime MooseXTraitsPluggable NamespaceAutoclean ListMoreUtils  ];
+      [ CatalystRuntime MooseXTraitsPluggable NamespaceAutoclean ListMoreUtils ];
+  };
+
+  CatalystXScriptServerStarman = buildPerlPackage rec {
+    name = "CatalystX-Script-Server-Starman-0.01";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/CatalystX/${name}.tar.gz";
+      sha256 = "18hpp35bjyw65x564m1m82mr0nmff6836vfjqdwf2lwsb4n8s4xr";
+    };
+    buildInputs = [ TestWWWMechanizeCatalyst ];
+    propagatedBuildInputs = [ CatalystRuntime Starman ];
   };
 
   CGICookieXS = buildPerlPackage rec {
@@ -719,13 +739,23 @@ rec {
   };
 
   ClassLoad = buildPerlPackage rec {
-    name = "Class-Load-0.08";
+    name = "Class-Load-0.12";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/Class/${name}.tar.gz";
-      sha256 = "0qyxa5dd75dxna7y995wx589p7smsybcqkg1rach2cg04yff0dh1";
+      sha256 = "0siw8hyqnmn0flk1hbd6fnnfqlhkgfr1d5442rri1d8a0rs1a36r";
     };
     buildInputs = [ TestFatal ];
-    propagatedBuildInputs = [ DataOptList ];
+    propagatedBuildInputs = [ DataOptList PackageStash ModuleRuntime ];
+  };
+
+  ClassLoadXS = buildModule rec {
+    name = "Class-Load-XS-0.03";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/Class/${name}.tar.gz";
+      sha256 = "1k3fffm4z6hvml5gqh27p7l78xs220s2d7ybd2a42akxrx8gk9r8";
+    };
+    buildInputs = [ TestFatal ];
+    propagatedBuildInputs = [ ClassLoad ];
   };
 
   ClassUnload = buildPerlPackage rec {
@@ -953,6 +983,14 @@ rec {
     propagatedBuildInputs = [TestException ClassAccessorChained];
   };
 
+  DataUUID = buildPerlPackage rec {
+    name = "Data-UUID-1.217";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/Data/${name}.tar.gz";
+      sha256 = "0vgykclw1mn06a53d8y3g7s7vanks8078dh2j4jb84djk0cw9h0q";
+    };
+  };
+
   DataVisitor = buildPerlPackage rec {
     name = "Data-Visitor-0.25";
     src = fetchurl {
@@ -1047,7 +1085,15 @@ rec {
 
   DBDSQLite = import ../development/perl-modules/DBD-SQLite {
     inherit fetchurl buildPerlPackage DBI;
-    inherit (pkgs) sqlite;
+
+    # sqlite-3.7.9 breaks DBDSQLite, overriding locally for now
+    sqlite = pkgs.lib.overrideDerivation pkgs.sqlite (args: {
+      name = "sqlite-3.7.7.1";
+      src = fetchurl {
+        url = http://www.sqlite.org/sqlite-autoconf-3070701.tar.gz;
+        sha256 = "1pvf72gb6yidc4zjml3k6kwhlvvhbgmbm8hfin9y5jvvbyr3dk3x";
+      };
+    });
   };
 
   DBDmysql = import ../development/perl-modules/DBD-mysql {
@@ -1074,17 +1120,17 @@ rec {
   };
 
   DBIxClass = buildPerlPackage rec {
-    name = "DBIx-Class-0.08195";
+    name = "DBIx-Class-0.08196";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/DBIx/${name}.tar.gz";
-      sha256 = "197q2pkkk6dpq1r76jcnzamk5dqac5k9n3wgq8dd5ak8sw6cj7p6";
+      url = "mirror://cpan/authors/id/A/AR/ARODLAND/${name}.tar.gz";
+      sha256 = "15k1kgbrsnkwr0ib6cyr114zk904lisy4k09gfiynag9wjhv47lm";
     };
     buildInputs = [ DBDSQLite TestException TestWarn ];
     propagatedBuildInputs = 
       [ PackageStash ClassAccessorGrouped ClassC3Componentised
         ClassInspector ConfigAny ContextPreserve DBI DataCompare
         DataDumperConcise DataPage HashMerge MROCompat ModuleFind
-        PathClass SQLAbstract ScopeGuard SubName TryTiny VariableMagic
+        PathClass SQLAbstract ScopeGuard SubName TryTiny
         NamespaceClean
       ];
   };
@@ -1109,17 +1155,18 @@ rec {
   };
 
   DBIxClassSchemaLoader = buildPerlPackage rec {
-    name = "DBIx-Class-Schema-Loader-0.07010";
+    name = "DBIx-Class-Schema-Loader-0.07014";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/DBIx/${name}.tar.gz";
-      sha256 = "08yy5lsrb7h1xzp7d1bqsgnjpa2d8ik14qhsq2d7v7r3f5fk5q3g";
+      sha256 = "0qrsh6i8p4mpx5bapn40cpsbvnvzivli71gymbiqjd0mjflbsjf6";
     };
     buildInputs = [ TestException TestMore TestWarn DBDSQLite ];
     propagatedBuildInputs = 
-      [ DataDump LinguaENInflectNumber LinguaENInflectPhrase ClassAccessor
-        ClassAccessorGrouped ClassC3Componentised MROCompat CarpClan 
-        DBIxClass ClassLoad ClassUnload FileSlurp ListMoreUtils 
-        NamespaceClean ScopeGuard TryTiny 
+      [ DataDump LinguaENInflectNumber LinguaENInflectPhrase
+        ClassAccessor ClassAccessorGrouped ClassC3Componentised
+        MROCompat CarpClan DBIxClass ClassLoad ClassUnload
+        ListMoreUtils NamespaceClean ScopeGuard TryTiny TaskWeaken
+        StringCamelCase StringToIdentifierEN
       ];
   };
 
@@ -1148,6 +1195,15 @@ rec {
     };
   };
 
+  DevelStackTraceAsHTML = buildPerlPackage rec {
+    name = "Devel-StackTrace-AsHTML-0.11";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/Devel/${name}.tar.gz";
+      sha256 = "0y0r42gszp3bxbs9j2nn3xgs8ij1cnadrywwwdc6r0y8m0siyapg";
+    };
+    propagatedBuildInputs = [ DevelStackTrace ];
+  };
+
   DevelSymdump = buildPerlPackage rec {
     name = "Devel-Symdump-2.08";
     src = fetchurl {
@@ -1268,6 +1324,14 @@ rec {
     };
   };
 
+  EncodeLocale = buildPerlPackage rec {
+    name = "Encode-Locale-1.02";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/Encode/${name}.tar.gz";
+      sha256 = "0h2kim6mg236s749wlg35lhv1zdkrkr0bm65spkg005cn0mbmi90";
+    };
+  };
+
   Error = buildPerlPackage rec {
     name = "Error-0.17016";
     src = fetchurl {
@@ -1377,6 +1441,15 @@ rec {
     propagatedBuildInputs = [ NumberCompare TextGlob ];
   };
 
+  FileListing = buildPerlPackage rec {
+    name = "File-Listing-6.03";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/File/${name}.tar.gz";
+      sha256 = "154hp49pcngsqrwi1pbw3fx82v7vql4dc9wh7qfj37vmy8sn1s93";
+    };
+    propagatedBuildInputs = [ HTTPDate ];
+  };
+
   FileModified = buildPerlPackage {
     name = "File-Modified-0.07";
     src = fetchurl {
@@ -1410,6 +1483,14 @@ rec {
     propagatedBuildInputs = [ClassInspector ParamsUtil];
   };
 
+  FilesysNotifySimple = buildPerlPackage rec {
+    name = "Filesys-Notify-Simple-0.08";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/Filesys/${name}.tar.gz";
+      sha256 = "042klyvi8fbkhmyg1h7883bbjdhiclmky9w2wfga7piq5il6nxgi";
+    };
+  };
+
   FileTemp = buildPerlPackage rec {
     name = "File-Temp-0.22";
     src = fetchurl {
@@ -1541,6 +1622,14 @@ rec {
     propagatedBuildInputs = [ Clone ];
   };
 
+  HashMultiValue = buildPerlPackage rec {
+    name = "Hash-MultiValue-0.10";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/Hash/${name}.tar.gz";
+      sha256 = "1n9klrg01myij2svcmdc212msmsr3cmsl2yw5k9my8j3s96b5yn1";
+    };
+  };
+
   HookLexWrap = buildPerlPackage rec {
     name = "Hook-LexWrap-0.22";
     src = fetchurl {
@@ -1550,6 +1639,15 @@ rec {
     buildInputs = [ pkgs.unzip ];
   };
 
+  HTMLForm = buildPerlPackage rec {
+    name = "HTML-Form-6.00";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz";
+      sha256 = "11s9mlybjm14sa6m3wcfjf9pv00yynv0yk4parx44ga9h1a6y6xl";
+    };
+    propagatedBuildInputs = [ HTMLParser HTTPMessage URI ];
+  };
+
   HTMLFormFu = buildPerlPackage rec {
     name = "HTML-FormFu-0.03007";
     src = fetchurl {
@@ -1568,11 +1666,11 @@ rec {
     ];
   };
 
-  HTMLParser = buildPerlPackage {
-    name = "HTML-Parser-3.56";
+  HTMLParser = buildPerlPackage rec {
+    name = "HTML-Parser-3.68";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.56.tar.gz;
-      sha256 = "0x1h42r54aq4yqpwi7mla4jzia9c5ysyqh8ir2nav833f9jm6g2h";
+      url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz";
+      sha256 = "1hhniqqpvi01vxsyvmcj677yg7a12zy0a3ynwxwg3ig6shn8a3j3";
     };
     propagatedBuildInputs = [HTMLTagset];
   };
@@ -1586,11 +1684,11 @@ rec {
     propagatedBuildInputs = [HTMLParser];
   };
 
-  HTMLTagset = buildPerlPackage {
-    name = "HTML-Tagset-3.10";
+  HTMLTagset = buildPerlPackage rec {
+    name = "HTML-Tagset-3.20";
     src = fetchurl {
-      url = mirror://cpan/authors/id/P/PE/PETDANCE/HTML-Tagset-3.10.tar.gz;
-      sha256 = "05k292qy7jzjlmmybis8nncpnwwa4jfkm7q3gq6866ydxrzds9xh";
+      url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz";
+      sha256 = "1qh8249wgr4v9vgghq77zh1d2zs176bir223a8gh3k9nksn7vcdd";
     };
   };
 
@@ -1652,6 +1750,23 @@ rec {
     propagatedBuildInputs = [ LWP ];
   };
 
+  HTTPCookies = buildPerlPackage rec {
+    name = "HTTP-Cookies-6.00";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz";
+      sha256 = "0758c3rj22z1bj7pbypmh1jadgd6w68nn8inhds96r39jhc79d9h";
+    };
+    propagatedBuildInputs = [ HTTPDate HTTPMessage ];
+  };
+
+  HTTPDate = buildPerlPackage rec {
+    name = "HTTP-Date-6.00";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz";
+      sha256 = "15nrnfir4xqdd3lm0s0jgh9zwxx5ylmvl63xqmj5wipzl4l76vs6";
+    };
+  };
+
   HTTPHeaderParserXS = buildPerlPackage rec {
     name = "HTTP-HeaderParser-XS-0.20";
     src = fetchurl {
@@ -1660,6 +1775,24 @@ rec {
     };
   };
 
+  HTTPMessage = buildPerlPackage rec {
+    name = "HTTP-Message-6.02";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz";
+      sha256 = "10ai2vabbx6yqsyz6rbi7hp4vljmlq9kyn74jvjp95la5v4b6c93";
+    };
+    propagatedBuildInputs = [ EncodeLocale HTMLParser HTTPDate IOCompress LWPMediaTypes URI ];
+  };
+
+  HTTPParserXS = buildPerlPackage rec {
+    name = "HTTP-Parser-XS-0.14";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz";
+      sha256 = "06srbjc380kvvj76r8n5c2y282j5zfgn0s0zmb9h3shwrynfqj05";
+    };
+    buildInputs = [ TestMore ];
+  };
+
   HTTPRequestAsCGI = buildPerlPackage rec {
     name = "HTTP-Request-AsCGI-1.2";
     src = fetchurl {
@@ -1670,12 +1803,12 @@ rec {
   };
 
   HTTPResponseEncoding = buildPerlPackage rec {
-    name = "HTTP-Response-Encoding-0.05";
+    name = "HTTP-Response-Encoding-0.06";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DA/DANKOGAI/${name}.tar.gz";
-      sha256 = "04gdl633g0s2ckn7zixcma2krbpfcd46jngg155qpdx5sdwfkm16";
+      url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz";
+      sha256 = "1am8lis8107s5npca1xgazdy5sknknzcqyhdmc220s4a4f77n5hh";
     };
-    propagatedBuildInputs = [LWP];
+    propagatedBuildInputs = [ LWP ];
   };
 
   HTTPServerSimple = buildPerlPackage rec {
@@ -1732,14 +1865,13 @@ rec {
     };
   };
 
-  IOSocketSSL = buildPerlPackage {
-    name = "IO-Socket-SSL-1.33";
+  IOSocketSSL = buildPerlPackage rec {
+    name = "IO-Socket-SSL-1.44";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-1.33.tar.gz;
-      sha256 = "1lpp2cs794d989b9gfhssjv1bkcs9lmrkjcpnxsavj7822izs4xj";
+      url = "mirror://cpan/modules/by-module/IO/${name}.tar.gz";
+      sha256 = "1xbgx1ij34a3dlwv94zjh3a02cj2lyhwzxcmv59harl784xn1mlg";
     };
-    propagatedBuildInputs = [NetSSLeay];
-    # TODO: IOSocketINET6
+    propagatedBuildInputs = [ URI NetSSLeay ];
   };
 
   IOString = buildPerlPackage rec {
@@ -1942,10 +2074,10 @@ rec {
   };
 
   LinguaENInflectPhrase = buildPerlPackage rec {
-    name = "Lingua-EN-Inflect-Phrase-0.04";
+    name = "Lingua-EN-Inflect-Phrase-0.10";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/Lingua/${name}.tar.gz";
-      sha256 = "12a74zkc1rybsvxwg8fxdjs6frfq7naky2ks4idcwd48lya3nw90";
+      sha256 = "1l7sjnibnvgb7a73cjhysmrg4j2bfcn0x5yrqmh0v23laj9fsbbm";
     };
     buildInputs = [ TestMore ];
     propagatedBuildInputs = 
@@ -2029,21 +2161,40 @@ rec {
     };
   };
 
-
   LWP = buildPerlPackage rec {
-    name = "libwww-perl-5.825";
+    name = "libwww-perl-6.03";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz";
-      sha256 = "1wb7br1n86571xz19l20cc5ysy1lx3rhvlk02g5517919z3jxvhw";
+      url = "mirror://cpan/modules/by-module/LWP/${name}.tar.gz";
+      sha256 = "1zlnz4ylk1y0rw56vlf9knawwjx72b1gm09yp06ccpgmmndif4dg";
     };
-    propagatedBuildInputs = [URI HTMLParser HTMLTagset];
+    propagatedBuildInputs =
+      [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPMessage LWPMediaTypes URI NetHTTP ];
+    doCheck = false; # tries to start a daemon
+  };
+
+  LWPMediaTypes = buildPerlPackage rec {
+    name = "LWP-MediaTypes-6.01";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/LWP/${name}.tar.gz";
+      sha256 = "1fhxql3xnhrlyzkjyss4swvhyh0r58cv2kwjcpj3mdbbg54ah9fz";
+    };
+  };
+
+  LWPProtocolHttps = buildPerlPackage rec {
+    name = "LWP-Protocol-https-6.02";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/LWP/${name}.tar.gz";
+      sha256 = "0y2an4v7g4jm8fsszk2489m179i28kx79ywwiywkwk1aw3yqh0y5";
+    };
+    patches = [ ../development/perl-modules/lwp-protocol-https-cert-file.patch ];
+    propagatedBuildInputs = [ LWP IOSocketSSL ];
+    doCheck = false; # tries to connect to https://www.apache.org/.
   };
 
   maatkit = import ../development/perl-modules/maatkit {
     inherit fetchurl buildPerlPackage stdenv DBDmysql;
   };
 
-
   MailIMAPClient = buildPerlPackage {
     name = "Mail-IMAPClient-2.2.9";
     src = fetchurl {
@@ -2108,17 +2259,48 @@ rec {
     propagatedBuildInputs = [ version ];
   };
 
+  ModulePluggable = buildPerlPackage rec {
+    name = "Module-Pluggable-3.9";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SI/SIMONW/${name}.tar.gz";
+      sha256 = "0psryh1dz828zly92db9zcv905n82in2awixzqngqhzg4y7fg4wc";
+    };
+    patches = [
+      # !!! merge this patch into Perl itself (which contains Module::Pluggable as well)
+      ../development/perl-modules/module-pluggable.patch
+    ];
+  };
+
+  ModulePluggableFast = buildPerlPackage {
+    name = "Module-Pluggable-Fast-0.18";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SR/SRI/Module-Pluggable-Fast-0.18.tar.gz;
+      sha256 = "140c311x2darrc2p1drbkafv7qwhzdcff4ad300n6whsx4dfp6wr";
+    };
+    propagatedBuildInputs = [UNIVERSALrequire];
+  };
+
+  ModuleRuntime = buildPerlPackage rec {
+    name = "Module-Runtime-0.011";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/Module/${name}.tar.gz";
+      sha256 = "0hbpn2jd11gsni77aw189ss4q83jlcvcxr49x9j28bh36hjgif7s";
+    };
+    propagatedBuildInputs = [ ParamsClassify ];
+  };
+
   Moose = buildPerlPackage rec {
-    name = "Moose-2.0202";
+    name = "Moose-2.0401";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz";
-      sha256 = "1xp0052ig06f5axw9djrq5ws8r9mcs4g1qs55yzgynl2hjrkazi4";
+      sha256 = "07mx4xqfl0bk21kk49gs86ba3wcviarfx9yhxxw96pmaxd0l932i";
     };
     buildInputs = [ TestFatal TestRequires ];
     propagatedBuildInputs =
       [ DataOptList DevelGlobalDestruction DistCheckConflicts EvalClosure
         ListMoreUtils MROCompat PackageDeprecationManager PackageStash
         PackageStashXS ParamsUtil SubExporter SubName TaskWeaken TryTiny
+        ClassLoad ClassLoadXS
       ];
   };
 
@@ -2209,14 +2391,13 @@ rec {
   };
 
   MooseXTraits = buildPerlPackage rec {
-    name = "MooseX-Traits-0.06";
+    name = "MooseX-Traits-0.11";
     src = fetchurl {
       url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz";
-      sha256 = "1iqp4xyyz8v8668v3v1nqf35pi30xvysyjq1d2hz9i7nh2zbvlwf";
+      sha256 = "0sqmpf2kw25847fwrrwpcfhrq694bgs8jbix7qxp9qyjm769np6n";
     };
-    propagatedBuildInputs = [
-      ClassMOP Moose TestException TestUseOk
-    ];
+    buildInputs = [ TestException TestUseOk ];
+    propagatedBuildInputs = [ ClassMOP Moose NamespaceAutoclean ];
   };
 
   MooseXTraitsPluggable = buildPerlPackage rec {
@@ -2231,10 +2412,10 @@ rec {
   };
 
   MooseXTypes = buildPerlPackage rec {
-    name = "MooseX-Types-0.28";
+    name = "MooseX-Types-0.30";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
-      sha256 = "0wjqdxd2qlzgrvi4z2rl82xns9kh7m4chf9yzkj5il9g9gprwl57";
+      sha256 = "1c9z30fbk2h11xkgq8v2idnpaqay3m7ig9bb8scnawgrm49v2f4l";
     };
     buildInputs = [ TestFatal TestRequires ];
     propagatedBuildInputs =
@@ -2251,6 +2432,15 @@ rec {
     propagatedBuildInputs = [ Moose MooseXTypes ];
   };
 
+  MooseXTypesLoadableClass = buildPerlPackage rec {
+    name = "MooseX-Types-LoadableClass-0.006";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz";
+      sha256 = "035d2gzq1j60skn39jav2jr6sbx1hq9vqmmfjfc3cvhahfzrygs4";
+    };
+    propagatedBuildInputs = [ ClassLoad Moose MooseXTypes NamespaceClean ];
+  };
+
   Mouse = buildPerlPackage rec {
     name = "Mouse-0.26";
     src = fetchurl {
@@ -2288,19 +2478,23 @@ rec {
   };
 
   NetAmazonEC2 = buildPerlPackage rec {
-    name = "Net-Amazon-EC2-0.14";
+    name = "Net-Amazon-EC2-0.14-stanaka-bc66577e13";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/J/JK/JKIM/${name}.tar.gz";
-      sha256 = "14am9m19ziyv12bjxljhfyl0zy120yf4gligsa9v26smb61fxyjr";
+      url = https://github.com/stanaka/net-amazon-ec2/zipball/bc66577e1312e828e252937d95f9f5f637af6a0b;
+      sha256 = "1c0k3addkaaf4zj7z87svm9xc3c06v0r06rf5rpqmps413lqisbn";
+      name  = "${name}.zip";
     };
+    buildInputs = [ pkgs.unzip ];
     patches =
       [ # In DescribeInstance requests, say "InstanceId.1" instead of
         # "InstanceId", as required by the Amazon spec.  EC2 tolerates
         # "InstanceId", but Nova doesn't.
         ../development/perl-modules/net-amazon-ec2-nova-compat.patch
+        # Support DescribeInstancesV6.
+        ../development/perl-modules/net-amazon-ec2-ipv6.patch
       ];
     propagatedBuildInputs =
-      [ DigestHMAC LWP Moose URI ParamsValidate XMLSimple Moose CryptSSLeay ];
+      [ DigestHMAC LWP LWPProtocolHttps Moose URI ParamsValidate XMLSimple ];
     doCheck = false; # wants to create actual EC2 instances (for $$$)
   };
 
@@ -2313,7 +2507,7 @@ rec {
     patches =
       [ ../development/perl-modules/net-amazon-mechanicalturk.patch ];
     propagatedBuildInputs =
-      [ DigestHMAC LWP URI XMLParser IOString CryptSSLeay ];
+      [ DigestHMAC LWP LWPProtocolHttps URI XMLParser IOString ];
     buildInputs = [ DBI DBDSQLite ];
   };
 
@@ -2327,6 +2521,14 @@ rec {
     doCheck = false;
   };
 
+  NetHTTP = buildPerlPackage rec {
+    name = "Net-HTTP-6.01";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/Net/${name}.tar.gz";
+      sha256 = "0ipad5y605fr968snxmp1sxrkvag9r5y0g8qvj9n7ca9nbwq7n3n";
+    };
+  };
+
   NetIP = buildPerlPackage {
     name = "Net-IP-1.25";
     src = fetchurl {
@@ -2336,10 +2538,10 @@ rec {
   };
 
   NetServer = buildPerlPackage rec {
-    name = "Net-Server-0.97";
+    name = "Net-Server-0.99";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/R/RH/RHANDOM/${name}.tar.gz";
-      sha256 = "13vhv13w06g6h6iqx440q1h6hwj0kpjdxcc3fl9crkwg5glygg2f";
+      url = "mirror://cpan/modules/by-module/Net/${name}.tar.gz";
+      sha256 = "0pdf2fvklpcxrdz3wwmhbvjs6kvzcvjw28f3pny8z17188lv06n1";
     };
     doCheck = false; # seems to hang waiting for connections
   };
@@ -2363,16 +2565,15 @@ rec {
     propagatedBuildInputs = [IOSocketSSL];
   };
 
-  NetSSLeay = buildPerlPackage {
-    name = "Net-SSLeay-1.36";
+  NetSSLeay = buildPerlPackage rec {
+    name = "Net-SSLeay-1.42";
     src = fetchurl {
-      url = mirror://cpan/authors/id/F/FL/FLORA/Net-SSLeay-1.36.tar.gz;
-      sha256 = "1kjk5kdwsklchxrv21m4ii80akbxrg3i6y4zwfb91an5cdr8jqp2";
+      url = "mirror://cpan/modules/by-module/Net/${name}.tar.gz";
+      sha256 = "17gxf0d1l0qlxn0d6gqz1dlzl6cdqv0jg47k0h1fcs45rlcpgjmn";
     };
-    buildInputs = [pkgs.openssl];
+    buildInputs = [ pkgs.openssl ];
     OPENSSL_PREFIX = pkgs.openssl;
-    # Test perform network access
-    doCheck = false;
+    doCheck = false; # Test performs network access.
   };
 
   NetTwitterLite = buildPerlPackage {
@@ -2387,17 +2588,6 @@ rec {
     propagatedBuildInputs = [JSONAny Encode LWP CryptSSLeay];
   };
 
-  nixPerl = buildPerlPackage {
-    name = "Nix-1.0pre29083";
-    src = fetchsvn {
-      url = https://svn.nixos.org/repos/nix/nix-perl/trunk;
-      rev = 29083;
-      sha256 = "02wfy4l355s57w7lrynbwx97nlxvasx3xfsn72gla0i8mg6pdgaw";
-    };
-    NIX_PREFIX = pkgs.nixUnstable;
-    doCheck = false; # tests currently don't work
-  };
-
   NumberCompare = buildPerlPackage rec {
     name = "Number-Compare-0.01";
     src = fetchurl {
@@ -2433,24 +2623,33 @@ rec {
   };
 
   PackageStash = buildPerlPackage rec {
-    name = "Package-Stash-0.31";
+    name = "Package-Stash-0.33";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz";
-      sha256 = "0m5mibmy49gjhb5kvgyg2cfzs4d1ghav75f19x80s3bv6vr0ls6x";
+      sha256 = "0md52rqgcnvspg3l2hvwc31jilq4gkbdwgr5h32gy1hmslaxhpzn";
     };
     buildInputs = [ TestFatal TestRequires ];
     propagatedBuildInputs = [ DistCheckConflicts PackageDeprecationManager PackageStashXS ];
   };
 
   PackageStashXS = buildPerlPackage rec {
-    name = "Package-Stash-XS-0.23";
+    name = "Package-Stash-XS-0.25";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz";
-      sha256 = "0dr86sbpb67dxbq64ix48f0n3dgac820ibci4xy4hbijja6lzwj6";
+      sha256 = "1i45mhd17sfq41j62r8kkx2d2f4mi0sp6vl86mmk8a4ssq85i73k";
     };
     buildInputs = [ TestFatal ];
   };
 
+  ParamsClassify = buildPerlPackage rec {
+    name = "Params-Classify-0.013";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/Params/${name}.tar.gz";
+      sha256 = "1d4ysd95flszrxrnjgy6s7b80jkagjsb939h42i2hix4q20sy0a1";
+    };
+    buildInputs = [ ExtUtilsParseXS ];
+  };
+
   ParamsUtil = buildPerlPackage rec {
     name = "Params-Util-1.01";
     src = fetchurl {
@@ -2574,6 +2773,28 @@ rec {
     };
   };
 
+  Plack = buildPerlPackage rec {
+    name = "Plack-0.9985";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz";
+      sha256 = "0cik1iwpwky7aliwi59z93ykd13ysp4xg5dps1vd4dhqylkn4ns8";
+    };
+    buildInputs = [ TestRequires TestTCP HTTPRequestAsCGI ];
+    propagatedBuildInputs =
+      [ LWP FileShareDir TryTiny DevelStackTrace DevelStackTraceAsHTML HTTPBody
+        HashMultiValue FilesysNotifySimple
+      ];
+  };
+
+  PlackMiddlewareReverseProxy = buildPerlPackage rec {
+    name = "Plack-Middleware-ReverseProxy-0.10";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/Plack/${name}.tar.gz";
+      sha256 = "0w9bl1z71frra0dgz4gsxskvj1c8dhjkhrj2gqwdds6jcqyny7mf";
+    };
+    propagatedBuildInputs = [ Plack YAML ];
+  };
+
   PPI = buildPerlPackage rec {
     name = "PPI-1.210";
     src = fetchurl {
@@ -2593,25 +2814,12 @@ rec {
     doCheck = false;
   };
 
-  ModulePluggable = buildPerlPackage rec {
-    name = "Module-Pluggable-3.9";
+  PSGI = buildPerlPackage rec {
+    name = "PSGI-1.03";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/S/SI/SIMONW/${name}.tar.gz";
-      sha256 = "0psryh1dz828zly92db9zcv905n82in2awixzqngqhzg4y7fg4wc";
+      url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz";
+      sha256 = "0b1k7smg50xfdhrjifa2gkkm52vna41alvbw8vb2pk99jmgnngh6";
     };
-    patches = [
-      # !!! merge this patch into Perl itself (which contains Module::Pluggable as well)
-      ../development/perl-modules/module-pluggable.patch
-    ];
-  };
-
-  ModulePluggableFast = buildPerlPackage {
-    name = "Module-Pluggable-Fast-0.18";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/S/SR/SRI/Module-Pluggable-Fast-0.18.tar.gz;
-      sha256 = "140c311x2darrc2p1drbkafv7qwhzdcff4ad300n6whsx4dfp6wr";
-    };
-    propagatedBuildInputs = [UNIVERSALrequire];
   };
 
   PadWalker = buildPerlPackage rec {
@@ -2809,6 +3017,18 @@ rec {
     ];
   };
 
+  Starman = buildPerlPackage rec {
+    name = "Starman-0.2014";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/Plack/${name}.tar.gz";
+      sha256 = "0hf3wpm2q4zcgjahjrpkkzy4fn74vkddg9yqs7p97xb290pvlbki";
+    };
+    patches = [ ../development/perl-modules/starman-dont-change-name.patch ];
+    buildInputs = [ TestRequires TestTCP ];
+    propagatedBuildInputs = [ Plack DataDump HTTPParserXS NetServer ];
+    doCheck = false; # binds to various TCP ports1
+  };
+
   StatisticsDescriptive = buildPerlPackage rec {
     name = "Statistics-Descriptive-3.0202";
     src = fetchurl {
@@ -2834,6 +3054,14 @@ rec {
     propagatedBuildInputs = [ StatisticsDescriptive StatisticsDistributions ];
   };
 
+  StringCamelCase = buildPerlPackage rec {
+    name = "String-CamelCase-0.02";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/String/${name}.tar.gz";
+      sha256 = "17kh8nap2z5g5rqcvw0m7mvbai7wr7h0al39w8l827zhqad8ss42";
+    };
+  };
+
   StringFormat = buildPerlPackage rec {
     name = "String-Format-1.16";
     src = fetchurl {
@@ -2858,6 +3086,16 @@ rec {
     };
   };
 
+  StringToIdentifierEN = buildPerlPackage rec {
+    name = "String-ToIdentifier-EN-0.06";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/String/${name}.tar.gz";
+      sha256 = "1rmldr7jf4jvkhzlv8hgp48lrmybvinmhv8kcnrpa8las0ijm4vm";
+    };
+    propagatedBuildInputs = 
+      [ LinguaENInflectPhrase TextUnidecode NamespaceClean ];
+  };
+
   SubExporter = buildPerlPackage rec {
     name = "Sub-Exporter-0.982";
     src = fetchurl {
@@ -2977,6 +3215,15 @@ rec {
     buildInputs = [TestPodCoverage];
   };
 
+  TaskPlack = buildPerlPackage rec {
+    name = "Task-Plack-0.25";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/Task/${name}.tar.gz";
+      sha256 = "1mk3z7xis1akf8245qgw5mnnsl7570kdidx83nj81kv410pw2v43";
+    };
+    propagatedBuildInputs = [ Plack PSGI ];
+  };
+
   TaskWeaken = buildPerlPackage {
     name = "Task-Weaken-1.02";
     src = fetchurl {
@@ -3162,14 +3409,6 @@ rec {
     };
   };
 
-  TestSimple = buildPerlPackage rec {
-    name = "Test-Simple-0.98";
-    src = fetchurl {
-      url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz";
-      sha256 = "1a0jrl3n2g05qn6c79pv5bnc1wlq36qccwdgf1pjrrvmrgi07cig";
-    };
-  };
-
   TestScript = buildPerlPackage rec {
     name = "Test-Script-1.07";
     src = fetchurl {
@@ -3179,6 +3418,22 @@ rec {
     propagatedBuildInputs = [ProbePerl IPCRun3];
   };
 
+  TestSharedFork = buildPerlPackage rec {
+    name = "Test-SharedFork-0.18";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz";
+      sha256 = "1wc41jzi780w75m2ry1038mzxyz7386r8rmhbnmj3krcdxy676cc";
+    };
+  };
+
+  TestSimple = buildPerlPackage rec {
+    name = "Test-Simple-0.98";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz";
+      sha256 = "1a0jrl3n2g05qn6c79pv5bnc1wlq36qccwdgf1pjrrvmrgi07cig";
+    };
+  };
+
   TestSubCalls = buildPerlPackage rec {
     name = "Test-SubCalls-1.09";
     src = fetchurl {
@@ -3188,6 +3443,15 @@ rec {
     propagatedBuildInputs = [ HookLexWrap ];
   };
 
+  TestTCP = buildPerlPackage rec {
+    name = "Test-TCP-1.13";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz";
+      sha256 = "00vbkynkdflqgdvywdxzgg3yx1w7nfb68py8l3lglq9jq4pq9wbb";
+    };
+    propagatedBuildInputs = [ TestMore TestSharedFork ];
+  };
+
   TestTester = buildPerlPackage {
     name = "Test-Tester-0.107";
     src = fetchurl {
@@ -3227,17 +3491,17 @@ rec {
   };
 
   TestWWWMechanizeCatalyst = buildPerlPackage rec {
-    name = "Test-WWW-Mechanize-Catalyst-0.45";
+    name = "Test-WWW-Mechanize-Catalyst-0.55";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/L/LB/LBROCARD/${name}.tar.gz";
-      sha256 = "0hixz0hibv2z87kdqvrphzgww0xibgg56w7bh299dgw2739hy4yf";
+      url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz";
+      sha256 = "0zdg4sxx231dj3qgbr58i63927gl4qzh0krignqxp8q6ck3hr63f";
     };
-    propagatedBuildInputs = [
-      CatalystRuntime TestWWWMechanize WWWMechanize
-      CatalystPluginSessionStateCookie
-    ];
-    buildInputs = [TestPod];
-    doCheck = false;
+    propagatedBuildInputs =
+      [ CatalystRuntime TestWWWMechanize WWWMechanize
+        CatalystPluginSessionStateCookie HTMLForm
+      ];
+    buildInputs = [ TestPod ];
+    doCheck = false; # listens on an external port
   };
 
   TextAligner = buildPerlPackage rec {
@@ -3333,6 +3597,14 @@ rec {
     propagatedBuildInputs = [TextAligner];
   };
 
+  TextUnidecode = buildPerlPackage rec {
+    name = "Text-Unidecode-0.04";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/Text/${name}.tar.gz";
+      sha256 = "01kbw5xshs906ikg0rgf51y9m6m26a4msv7ghcqwx7w2shgs0ga7";
+    };
+  };
+
   Throwable = buildPerlPackage rec {
     name = "Throwable-0.102080";
     src = fetchurl {
@@ -3435,10 +3707,10 @@ rec {
   };
 
   URI = buildPerlPackage rec {
-    name = "URI-1.51";
+    name = "URI-1.59";
     src = fetchurl {
       url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz";
-      sha256 = "0gfdphz0yhm62vn9cbw720i6pm1gingcir15dq8ppbnk6cylnyal";
+      sha256 = "1inanl9vs6q1bwvig1s8hdwagjw4484gs4s7pjnx5f4xb2dx526b";
     };
   };
 
diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index 259b9898f36..911dff97d0c 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -65,6 +65,7 @@ rec {
         IP_NF_MATCH_ADDRTYPE y
         IP_NF_TARGET_LOG y
         IP_NF_MANGLE y
+        IPV6 m
 
         # Fail to build
         DRM n
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index edf38bff72a..d9cc483ef3a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -156,6 +156,8 @@ let pythonPackages = python.modules // rec {
       sha1 = "00a033b0a593c3ca82927867950f73d88b831155";
     };
 
+    patches = [ ../development/python-modules/boto-1.9-python-2.7.patch ];
+
     meta = {
       homepage = http://code.google.com/p/boto/;
 
@@ -960,12 +962,12 @@ let pythonPackages = python.modules // rec {
     };
   });
 
-  nose = buildPythonPackage {
+  nose = buildPythonPackage rec {
     name = "nose-1.0.0";
 
     src = fetchurl {
-      url = http://somethingaboutorange.com/mrl/projects/nose/nose-1.0.0.tar.gz;
-      sha256 = "0qm6q232h5r071gwfkiszkmfqc60k7abl15bk495lcdkk62m91db";
+      url = "http://pypi.python.org/packages/source/n/nose/${name}.tar.gz";
+      md5 = "47a4784c817afa6ef11a505b574584ed";
     };
 
     # Fails with ‘This platform lacks a functioning sem_open
@@ -1358,6 +1360,17 @@ let pythonPackages = python.modules // rec {
     };
   };
 
+  ldap = buildPythonPackage rec {
+    name = "python-ldap-2.4.3";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/python-ldap/${name}.tar.gz";
+      sha256 = "17aysa9b4zjw00ikjirf4m37xbp2ifj1g0zjs14xzqqib3nh1yw8";
+    };
+
+    NIX_CFLAGS_COMPILE = "-I${pkgs.cyrus_sasl}/include/sasl";
+    propagatedBuildInputs = [pkgs.openldap pkgs.cyrus_sasl pkgs.openssl];
+  };
 
   pylint = buildPythonPackage rec {
     name = "pylint-0.23.0";
@@ -1963,6 +1976,22 @@ let pythonPackages = python.modules // rec {
     };
   };
 
+  virtualenv = buildPythonPackage rec {
+    name = "virtualenv-1.6.4";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/v/virtualenv/${name}.tar.gz";
+      md5 = "1072b66d53c24e019a8f1304ac9d9fc5";
+    };
+
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+      description = "a tool to create isolated Python environments";
+      homepage = http://www.virtualenv.org;
+      license = licenses.mit;
+      maintainers = [ maintainers.goibhniu ];
+    };
+  };
 
   vnc2flv = buildPythonPackage rec {
     name = "vnc2flv-20100207";
@@ -2024,20 +2053,12 @@ let pythonPackages = python.modules // rec {
   wxPython = wxPython28;
 
 
-  wxPython26 = import ../development/python-modules/wxPython/2.6.nix {
-    inherit (pkgs) stdenv fetchurl pkgconfig;
-    inherit pythonPackages;
-    wxGTK = pkgs.wxGTK26;
-  };
-
-
   wxPython28 = import ../development/python-modules/wxPython/2.8.nix {
     inherit (pkgs) stdenv fetchurl pkgconfig;
     inherit pythonPackages;
     wxGTK = pkgs.wxGTK28;
   };
 
-
   zbase32 = buildPythonPackage (rec {
     name = "zbase32-1.1.2";
 
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index de9532d712a..37af6543721 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -179,8 +179,9 @@ let
   };
 in {
   crossGNU = mapTestOnCross crossSystem {
-    hurdCross = nativePlatforms;
-    mach.hostDrv = nativePlatforms;
+    gnu.hurdCross = nativePlatforms;
+    gnu.mach.hostDrv = nativePlatforms;
+    gnu.mig = nativePlatforms;
 
     coreutils.hostDrv = nativePlatforms;
     ed.hostDrv = nativePlatforms;
@@ -189,12 +190,14 @@ in {
     boehmgc.hostDrv = nativePlatforms;
     findutils.hostDrv = nativePlatforms;
     gcc.hostDrv = nativePlatforms;
+    gcc46.hostDrv = nativePlatforms;
     gdb.hostDrv = nativePlatforms;
     gmp.hostDrv = nativePlatforms;
     gnugrep.hostDrv = nativePlatforms;
     gnumake.hostDrv = nativePlatforms;
     gnused.hostDrv = nativePlatforms;
     guile_1_8.hostDrv = nativePlatforms;
+    guile.hostDrv = nativePlatforms;
     libffi.hostDrv = nativePlatforms;
     libtool.hostDrv = nativePlatforms;
     libunistring.hostDrv = nativePlatforms;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 09be02ba915..7381c23de7e 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -301,8 +301,6 @@ with (import ./release-lib.nix);
   texLiveBeamer = linux;
   texLiveExtra = linux;
   texinfo = all;
-  thunderbird2 = linux;
-  thunderbird3 = linux;
   tightvnc = linux;
   time = linux;
   tinycc = ["i686-linux"];
@@ -385,8 +383,8 @@ with (import ./release-lib.nix);
 
   firefox36Pkgs.firefox = linux;
   firefox50Pkgs.firefox = linux;
-  firefox60Pkgs.firefox = linux;
   firefox70Pkgs.firefox = linux;
+  firefox80Pkgs.firefox = linux;
 
   gnome = {
     gnome_panel = linux;
@@ -437,29 +435,24 @@ with (import ./release-lib.nix);
   */
 
   linuxPackages_2_6_25 = {
-    aufs = linux;
     kernel = linux;
   };
 
   linuxPackages_2_6_27 = {
-    aufs = linux;
     kernel = linux;
     virtualbox = linux;
     virtualboxGuestAdditions = linux;
   };
 
   linuxPackages_2_6_28 = {
-    aufs = linux;
     kernel = linux;
   };
 
   linuxPackages_2_6_29 = {
-    aufs = linux;
     kernel = linux;
   };
 
   linuxPackages_2_6_31 = {
-    aufs = linux;
     kernel = linux;
   };