Changing my email address, to one I prefer.

svn path=/nixpkgs/trunk/; revision=30286

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.
@@ -475,9 +494,10 @@ 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
@@ -716,7 +736,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,6 +770,7 @@ 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)
@@ -921,6 +943,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 +986,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 +1023,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 +1039,34 @@ 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)
+       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 +1074,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 +1084,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)

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.";
 

pkgs/applications/editors/zile/default.nix

@@ -1,14 +1,14 @@
-{ 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 ];
+  buildInputs = [ ncurses boehmgc perl ];
   buildNativeInputs = [ help2man ];
 
   # Tests can't be run because most of them rely on the ability to

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"

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

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

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

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 '#displayFontT1' displayFontT2
     fi
   ";
 

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";
 

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;
+  };
+}

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()

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/;

pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/fix-2.7.0.patch

@@ -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
-

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 = {

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";
+  };
+}
+

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 = {

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+";
   };
 }

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";
   };
 }
-

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 ];
+  };
+}

pkgs/applications/version-management/fossil/default.nix

@@ -1,8 +1,8 @@
-{stdenv, fetchurl, zlib, openssl, tcl}:
+{stdenv, fetchurl, zlib, openssl, tcl, readline, sqlite}:
 
 let
-  version = "1.19";
-  filedate = "20110901182519";
+  version = "1.20";
+  filedate = "20111021125253";
 in
 
 stdenv.mkDerivation {
@@ -10,10 +10,10 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.fossil-scm.org/download/fossil-src-${filedate}.tar.gz";
-    sha256 = "14snmwjfl9xz52d8lfzsp4zciwfbi9fwk623bm5dxhn2fczzc960";
+    sha256 = "0m75kw77iray3kbjm1xfn8hr116fn11yv1wr7adcwy314cgj0vv3";
   };
 
-  buildInputs = [ zlib openssl ];
+  buildInputs = [ zlib openssl readline sqlite ];
   buildNativeInputs = [ tcl ];
 
   doCheck = true;

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 {
 
@@ -92,8 +92,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 {

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
   '';

pkgs/applications/version-management/git-and-tools/git-annex/default.nix

@@ -4,14 +4,14 @@
 }:
 
 let
-  version = "3.20110915";
+  version = "3.20111025";
 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 = "1ae0fd9551d3397d1b7e5bc1eba9aab47b803bac680c3d019ba6ef7cefe96d27";
   };
 
   buildInputs = [

pkgs/applications/version-management/git-and-tools/git/default.nix

@@ -8,15 +8,15 @@
 }:
 
 let
+  version = "1.7.7";
   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 = "1xkpyd6mff4m8kmk4vkwi7snr2ff2nmrmsa5hf9bk2a93v07p5ss";
   };
 
   patches = [ ./docbook2texi.patch ];

pkgs/applications/version-management/mercurial/default.nix

@@ -1,15 +1,16 @@
 { stdenv, fetchurl, python, makeWrapper, docutils
-, guiSupport ? false, tk ? null, ssl }:
+, guiSupport ? false, tk ? null, ssl, curses }:
 
 stdenv.mkDerivation rec {
-  name = "mercurial-1.9";
+  name = "mercurial-1.9.2";
 
   src = fetchurl {
     url = "http://mercurial.selenic.com/release/${name}.tar.gz";
-    sha256 = "1q1307rv5cyv7qalwkampy1h2f92j4d46v4x9647ljljs8f4n7ki";
+    sha256 = "481309264d8528a871aab013068c48fa3a6072b016a4095a22230cfdfb8bb9aa";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git
+  pythonPackages = [ ssl curses ];
 
   buildInputs = [ python makeWrapper docutils ];
 
@@ -31,7 +32,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
 

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.1";
 
   name = "subversion-${version}";
 
   src = fetchurl {
-    url = "http://subversion.tigris.org/downloads/${name}.tar.bz2";
-    sha1 = "6e3ed7c87d98fdf5f0a999050ab601dcec6155a1";
+    url = "mirror://apache/subversion//${name}.tar.bz2";
+    sha1 = "4bfaa8e33e9eaf26a504117cd91b23805518071a";
   };
 
   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

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

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

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    

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 "";
+}

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[@]}

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

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"
+}

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.

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/.

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

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

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/;
   };
 }

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
+    '';
+}

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

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.

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";
 }) ++
 []

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;
    }

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");

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)

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, $@) $<

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; all;
+  };
+}

pkgs/development/compilers/llvm/default.nix

@@ -1,66 +1,30 @@
-{ stdenv, fetchurl, gcc, flex, perl, libtool, groff
-, buildClang ? false }:
+{ stdenv, fetchurl, perl, groff, darwinSwVersUtility }:
+
+let version = "2.9"; 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}.tgz";
+    sha256 = "0y9pgdakn3n0vf8zs6fjxjw6972nyw4rkfwwza6b8a3ll77kc4k6";
   };
 
-  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++"
+    ];
 
   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;
-    };
-  }
-))

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";
   bootstrapFromC = ! (stdenv.isi686 || stdenv.isx86_64);
 in
 stdenv.mkDerivation {
@@ -15,23 +15,47 @@ stdenv.mkDerivation {
     if stdenv.isi686
     then fetchurl {
       url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-i386.tar.gz";
-      sha256 = "0cfj3bawjdnpa7cbqh2f23hfpjpmryypmzkhndvdbi79a65fl0n2";
+      sha256 = "1vqdy9f1lbzflr9bw0gjn4g4w3hdpnjrkiwj5aaah70flif5ndns";
     } 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 = "1l4zxqm5r1alc6y1cky62rn8h6i40qyiba081n6phwypwxr5sd0g";
     } else fetchurl {
       url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-c-${version}.tar.gz";
-      sha256 = "1g2mifrx0bvag0hlrbk81rkrlm1pbn688zw8b9d2i0sl5g2p1ril";
+      sha256 = "1661cybycfvjjyq92gb3n1cygxfmfjdhnh3d2ha3vy6xxk9d7za9";
     };
 
-  preConfigure = "cd src";
-  buildPhase =
-    if bootstrapFromC
-    then "./etc/make-liarc.sh --prefix=$out"
-    else "make compile-microcode";
+  configurePhase =
+    '' cd src
+       ./configure --prefix="$out"
 
-  buildInputs = [ gnum4 ];
+       cd ../doc
+       ./configure --prefix="$out"
+       cd ..
+     '';
+
+  buildPhase =
+    '' cd src
+       ${if bootstrapFromC
+         then "./etc/make-liarc.sh --prefix=$out"
+         else "make compile-microcode"}
+
+       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;

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 {

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,13 +7,14 @@
  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";
   };
 
+  buildNativeInputs = [ xz ];
   buildInputs =
     [ makeWrapper gawk readline libtool libunistring
       libffi pkgconfig

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 @@

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;
   };
 }

pkgs/development/interpreters/ruby/ruby-19.nix

@@ -18,7 +18,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.
@@ -44,8 +44,8 @@ stdenv.mkDerivation rec {
 
   passthru = rec {
     majorVersion = "1.9";
-    minorVersion = "2";
-    patchLevel = "290";
+    minorVersion = "3";
+    patchLevel = "0";
     libPath = "lib/ruby/${majorVersion}";
     gemPath = "lib/ruby/gems/${majorVersion}";
   };

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 { }))

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

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";

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.4";
 
   src = fetchurl {
     url = "mirror://gnu/gnutls/${name}.tar.xz";
-    sha256 = "0jy0j77inv6yr7s9mnhs5kvjjmhj0ifg35145s1qn3hd9ma36nii";
+    sha256 = "16mhr52c07xlkv5m5bxgr51ppjz0gqjw6rgv52ql4iyi569ffrx3";
   };
 
   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;

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";

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;

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;

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.5";
+  sha256 = "0zmc1bddpvjg11r5931hfx6va73jk1f3nb8nb1qfh86a4addp9id";
   buildDepends = [ StateVar transformers ];
   noHaddock = true;
   meta = {

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

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
+    ];
+  };
+})

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;

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;

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
+    ];
+  };
+})

pkgs/development/libraries/haskell/asn1-data/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "asn1-data";
-  version = "0.6.0";
-  sha256 = "0gk34x2frkk2s7d0i7ahwnjv9jcqdgx2sd1kp3d854548k171z3f";
+  version = "0.6.1";
+  sha256 = "1kj1h1z4ix8kdxq5838xk70sgz9rq0vdii5nli1rcycx3y2ipi84";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

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";

pkgs/development/libraries/haskell/base16-bytestring/default.nix

@@ -0,0 +1,17 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "base16-bytestring";
+  version = "0.1.1.2";
+  sha256 = "1isxyl52vh0lg195wq9nkr3hlmbw3d3c9aymxlz8hynz0hh1q1z0";
+  meta = {
+    homepage = "http://github.com/mailrank/base16-bytestring";
+    description = "Fast base16 (hex) encoding and deconding for ByteStrings";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

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";

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.1";
+  sha256 = "0hm2jnz9n68njdrrq73a558qxl2jwcvxmy62mvf2v9q96wyp07yj";
   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 = [

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 = {

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
+    ];
+  };
+})

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.4.0";
+  sha256 = "019fc094w2ica9ims83jacy2digbygaww5wb73xyrj3vgjw774xq";
   meta = {
     description = "A binary serialization library";
     license = self.stdenv.lib.licenses.bsd3;

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.3";
-  sha256 = "1gg26d1arf588zjhdzs8r26k40v6m679l8k2vw28l8j3q5m11p71";
+  version = "1.0.0";
+  sha256 = "1i4s1yvl765cfj7ya5rsvzqnijf307zh4i4pzcgncmr37mlkfjz2";
   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";

pkgs/development/libraries/haskell/clientsession/default.nix

@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "clientsession";
-  version = "0.7.3.1";
-  sha256 = "0q16brla4m5g7dmgln3awx964ms7pi1s2r21idmc0mk4rnw2rpi7";
+  version = "0.7.3.3";
+  sha256 = "0cfj225hzn8fsffwnq5zq55dh9m5av1i58b4njhna7miiz6b4jsq";
   buildDepends = [
     base64Bytestring cereal cryptoApi cryptocipher skein
   ];

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";

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";

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
+    ];
+  };
+})

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";

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 ];

pkgs/development/libraries/haskell/curl/default.nix

@@ -0,0 +1,17 @@
+{ cabal, curl }:
+
+cabal.mkDerivation (self: {
+  pname = "curl";
+  version = "1.3.7";
+  sha256 = "0i6d7732p5gn1bcvavbxcg4wd18j425mi1yjg0b29zzz3yl0qhgi";
+  extraLibraries = [ curl ];
+  meta = {
+    description = "Haskell binding to libcurl";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

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
+    ];
+  };
+})

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
+    ];
+  };
+})

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.15";
+  sha256 = "06yzf2xaadmdhgidzyp7qywd8d401f4n1qlfyx0q72nafgnlvr6v";
   buildDepends = [ text transformers ];
   meta = {
     homepage = "https://john-millikin.com/software/enumerator/";

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";

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;

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.0.2";
+  sha256 = "01fd5yl5wdw09xqslmx8h563k2v8dglc60902kia8b5h62xjr1w6";
+  buildDepends = [ bmp GLUT OpenGL ];
   meta = {
     homepage = "http://gloss.ouroborus.net";
     description = "Painless 2D vector graphics, animations and simulations";

pkgs/development/libraries/haskell/hakyll/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "3.2.0.9";
-  sha256 = "1gb10bvzlm8qn6ap7cxykscbhbs2jsfqgsw53r8vd8k5bfgm5jv6";
+  version = "3.2.0.10";
+  sha256 = "1hdivw1smfkxza5jl8gm84gnzb5a9sgc2lcas3hikv968p9c1yry";
   buildDepends = [
     binary blazeHtml cryptohash hamlet mtl pandoc parsec regexBase
     regexPcre snapCore snapServer tagsoup time

pkgs/development/libraries/haskell/hamlet/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "0.10.3";
-  sha256 = "1xkk8hcmfnn9y14fsrab3cv8xknhf8j6hkv668yshg8bjzz1smva";
+  version = "0.10.4";
+  sha256 = "10ik9rbj9srb1f7vavs5siidyybzbr4fpy3akv90qldd2xyifhxa";
   buildDepends = [
     blazeBuilder blazeHtml failure parsec shakespeare text
   ];

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 = [

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";

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";

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";

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;

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.3";
-  sha256 = "0jciah0k6i4aa21hgpl1nqfyjkmm5kg5zmzmxwynvwckncy17ihg";
+  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

pkgs/development/libraries/haskell/hmatrix/default.nix

@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
     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";

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";

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";