Merge remote-tracking branch 'origin/master' into stdenv-updates

pkgs/development/compilers/gcc/4.6/default.nix

@@ -278,7 +278,7 @@ stdenv.mkDerivation ({
         [ "--with-host-libstdcxx=-lstdc++ -lgcc_s" ];
 
   configureFlags = "
-    ${if enableMultilib then "" else "--disable-multilib"}
+    ${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"}
     ${if enableShared then "" else "--disable-shared"}
     ${if enablePlugin then "--enable-plugin" else ""}
     ${if ppl != null then "--with-ppl=${ppl}" else ""}

pkgs/development/compilers/ghc/7.6.2.nix

@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
+
+stdenv.mkDerivation rec {
+  version = "7.6.2";
+
+  name = "ghc-${version}";
+
+  src = fetchurl {
+    url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2";
+    sha256 = "d5f45184abeacf7e9c6b4f63c7101a5c1d7b4fe9007901159e2287ecf38de533";
+  };
+
+  buildInputs = [ ghc perl gmp ncurses ];
+
+  enableParallelBuilding = true;
+
+  buildMK = ''
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+  '';
+
+  preConfigure = ''
+    echo "${buildMK}" > mk/build.mk
+    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+  '';
+
+  configureFlags = [
+    "--with-gcc=${stdenv.gcc}/bin/gcc"
+  ];
+
+  # required, because otherwise all symbols from HSffi.o are stripped, and
+  # that in turn causes GHCi to abort
+  stripDebugFlags=["-S" "--keep-file-symbols"];
+
+  meta = {
+    homepage = "http://haskell.org/ghc";
+    description = "The Glasgow Haskell Compiler";
+    maintainers = [
+      stdenv.lib.maintainers.marcweber
+      stdenv.lib.maintainers.andres
+      stdenv.lib.maintainers.simons
+    ];
+    platforms = ghc.meta.platforms;
+  };
+
+}

pkgs/development/compilers/ghc/head.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ghc, perl, gmp, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "7.7.20121106";
+  version = "7.7.20121213";
   name = "ghc-${version}";
 
   src = fetchurl {
     url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
-    sha256 = "1n3xj8arkzfvs3q1ymxsnbzs23ndsp8pl67sqirl837pkgcmq263";
+    sha256 = "0z9ld6271jzv3mx02vqaakirj79pm2vzxnv5a178r6v874qbzx3p";
   };
 
   buildInputs = [ ghc perl gmp ncurses ];

pkgs/development/compilers/ghc/with-packages.nix

@@ -64,6 +64,13 @@ stdenv.mkDerivation rec {
           ln -s $f $out/etc/bash_completion.d/
           echo -n .
         done
+	for s in 1 2 3 4 5 6 7 8 9; do
+	  for f in "$currentPath/share/man/man$s/"*; do
+	    mkdir -p $out/share/man/man$s
+            ln -sv $f $out/share/man/man$s/
+            echo -n .
+	  done
+       done
         for f in "$currentPkgDir/"*.conf; do
           ln -s $f $linkedPkgDir
           echo -n .

pkgs/development/compilers/gwt/2.4.0.nix

@@ -1,12 +1,14 @@
-{stdenv, fetchurl, unzip}:
+{ stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation {
   name = "gwt-java-2.4.0";
-  src = fetchurl { 
-    url=http://google-web-toolkit.googlecode.com/files/gwt-2.4.0.zip; 
-    sha1 = "a91ac20db0ddd5994ac3cbfb0e8061d5bbf66f88"; 
+
+  src = fetchurl {
+    url=http://google-web-toolkit.googlecode.com/files/gwt-2.4.0.zip;
+    sha1 = "a91ac20db0ddd5994ac3cbfb0e8061d5bbf66f88";
   };
-  buildInputs = [unzip]; 
+
+  buildInputs = [ unzip ];
 
   installPhase = ''
     ensureDir $out
@@ -18,4 +20,4 @@ stdenv.mkDerivation {
     homepage = http://code.google.com/webtoolkit/;
     description = "Google Web Toolkit (GWT) is a development toolkit for building and optimizing complex browser-based applications.";
   };
- }
+}

pkgs/development/compilers/gwt/builder.sh

@@ -1,31 +0,0 @@
-source $stdenv/setup
-
-tar xfvj $src
-mkdir -p $out
-cp -av $name $out
-
-# Create wrapper scripts so that the GWT compiler/host work
-
-libPath="$libstdcpp5/lib:$glib/lib:$gtk/lib:$atk/lib:$pango/lib:$libX11/lib:$libXt/lib:$out/$name/mozilla-1.7.12"
-
-mkdir -p $out/bin
-
-cat > $out/bin/gwt-compile <<EOF
-#!/bin/sh
-
-export LD_LIBRARY_PATH=$libPath
-export LIBXCB_ALLOW_SLOPPY_LOCK=1 # Workaround for bug in Java AWT implementation
-
-$jdk/bin/java -Xmx256m -cp "\$CLASSPATH:$out/$name/gwt-user.jar:$out/$name/gwt-dev-linux.jar" com.google.gwt.dev.Compiler \$@
-EOF
-chmod 755 $out/bin/gwt-compile
-
-cat > $out/bin/gwt-shell <<EOF
-#!/bin/sh
-
-export LD_LIBRARY_PATH=$libPath
-export LIBXCB_ALLOW_SLOPPY_LOCK=1 # Workaround for bug in Java AWT implementation
-
-$jdk/bin/java -Xmx256m -cp "\$CLASSPATH:$out/$name/gwt-user.jar:$out/$name/gwt-dev-linux.jar" com.google.gwt.dev.GWTShell \$@
-EOF
-chmod 755 $out/bin/gwt-shell

pkgs/development/compilers/gwt/default.nix

@@ -1,14 +0,0 @@
-{stdenv, fetchurl, glib, gtk, pango, atk, libX11, libXt, libstdcpp5, jdk}:
-
-stdenv.mkDerivation {
-  name = "gwt-linux-1.7.1";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://google-web-toolkit.googlecode.com/files/gwt-linux-1.7.1.tar.bz2;
-    sha256 = "0lgirr9lr0qsfvw61hqzracdllqklb4qkzbk5x3lc4r64mms5b3g";
-  };
-
-  inherit glib gtk pango atk libX11 libXt libstdcpp5 jdk;
-  buildInputs = [glib gtk pango atk libX11 libXt libstdcpp5];
-}

pkgs/development/compilers/julia/default.nix

@@ -1,14 +1,14 @@
 { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib
  , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
  , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack
- , tcl, tk, xproto, libX11
+ , tcl, tk, xproto, libX11, git
  } :
 let
   realGcc = stdenv.gcc.gcc;
 in
 stdenv.mkDerivation rec {
   pname = "julia";
-  date = "20121209";
+  date = "20130205";
   name = "${pname}-git-${date}";
 
   grisu_ver = "1.1.1";
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
   clp_ver = "1.14.5";
   lighttpd_ver = "1.4.29";
   patchelf_ver = "0.6";
+  pcre_ver = "8.31";
 
   grisu_src = fetchurl {
     url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz";
@@ -57,16 +58,20 @@ stdenv.mkDerivation rec {
     url = "http://hydra.nixos.org/build/1524660/download/2/patchelf-${patchelf_ver}.tar.bz2";
     sha256 = "00bw29vdsscsili65wcb5ay0gvg1w0ljd00sb5xc6br8bylpyzpw";
   };
+  pcre_src = fetchurl {
+    url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${pcre_ver}.tar.bz2";
+    sha256 = "0g4c0z4h30v8g8qg02zcbv7n67j5kz0ri9cfhgkpwg276ljs0y2p";
+  };
 
   src = fetchgit {
     url = "git://github.com/JuliaLang/julia.git";
-    rev = "27b950f62aeb3664ab76e5d827b30b4885a9efb9";
-    sha256 = "0khx8ln2zq3vpj0g66hnsdhw04hxl79fq43rc06ggsmc1j4xrifb";
+    rev = "efc696bf74eec7605b4da19f6f1605ba99959ed3";
+    sha256 = "19if7aj3mrp84dg9g2d3zbhasrq0nz28djl9a01m0y4y9bfymp7s";
   };
 
   buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib
     fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf
-    openblas liblapack tcl tk xproto libX11 
+    openblas liblapack tcl tk xproto libX11 git
     ];
 
   configurePhase = ''
@@ -79,7 +84,7 @@ stdenv.mkDerivation rec {
       cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')"
     }
 
-    for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${clp_src}" "${patchelf_src}" ; do
+    for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${clp_src}" "${patchelf_src}" "${pcre_src}" ; do
       copy_kill_hash "$i" deps
     done
     copy_kill_hash "${dsfmt_src}" deps/random
@@ -105,18 +110,9 @@ stdenv.mkDerivation rec {
 
   preBuild = ''
     mkdir -p usr/lib
-    ln -s libuv.a usr/lib/uv.a
   '';
 
   preInstall = ''
-    make -C deps install-tk-wrapper
-  '';
-
-  postInstall = ''
-   (
-   cd $out/share/julia/test/ 
-   $out/bin/julia runtests.jl all
-   ) || true
   '';
 
   meta = {

pkgs/development/compilers/opencxx/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libtool, gcc, patches ? []}:
+{ stdenv, fetchurl, libtool, gcc, patches ? []}:
 
 stdenv.mkDerivation {
   name = "opencxx-2.8";

pkgs/development/compilers/strategoxt/0.18.nix

@@ -4,20 +4,6 @@ rec {
 
   inherit aterm;
 
-  atermStatic = stdenv.mkDerivation ( rec {
-    name = "${aterm.name}-static";
-    configureFlags = "--enable-shared=no --enable-static=yes";
-
-    inherit (aterm) src meta patches; 
-  } // ( if stdenv.system == "i686-cygwin" then { inherit (sdf) CFLAGS; } else {} ) ) ;
-  
-  sdfStatic = stdenv.mkDerivation ( rec {
-    name = "${sdf.name}-static";
-    configureFlags = "--enable-shared=no --enable-static=yes";
-
-    inherit (sdf) src buildInputs preConfigure meta; 
-  } // ( if stdenv.system == "i686-cygwin" then { inherit (sdf) CFLAGS; } else {} ) ) ;
-  
   sdf = stdenv.mkDerivation ( rec {
     name = "sdf2-bundle-2.4";
 

pkgs/development/interpreters/clojure/default.nix

@@ -1,17 +1,22 @@
-{stdenv, fetchurl, unzip, ant}:
+{stdenv, fetchurl, unzip, ant, version ? "1.4.0" }:
 
-stdenv.mkDerivation rec {
-  version = "1.4.0";
+let 
+  src_hashes = {
+    "1.4.0" = "27a5a151d5cc1bc3e52dff47c66111e637fefeb42d9bedfa1284a1a31d080171";
+    "1.5.0-RC1" = "111jm0nxkvqr1vrwcpvr70v5paasp8msrj5h8zm1c144c8zc1vln";
+  };
+in 
+stdenv.mkDerivation {
   name = "clojure-${version}";
 
   src = fetchurl {
     url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip";
-    sha256 = "27a5a151d5cc1bc3e52dff47c66111e637fefeb42d9bedfa1284a1a31d080171";
+    sha256 = (builtins.getAttr version src_hashes); 
   };
 
   buildInputs = [ unzip ant ];
 
-  buildPhase = "ant";
+  buildPhase = "ant jar";
 
   installPhase = "
     mkdir -p $out/lib/java

pkgs/development/interpreters/python/python-linkme-wrapper.sh

@@ -14,13 +14,12 @@ PROG=$(basename "$0")
 SITES=
 
 pypath() {
-  BIN=$(dirname "$1")
-  BIN=$(realpath -s "$BIN")
+  BIN=$(realpath -s "$(dirname "$1")")
   ENV=$(dirname "$BIN")
   SITE="$ENV/lib/python2.7/site-packages"
   SITES="$SITES${SITES:+:}$SITE"
 
-  PRG=$BIN/$(readlink "$1")
+  PRG="$BIN"/$(readlink "$1")
 
   if test -L "$PRG"; then
     pypath "$PRG"
@@ -31,4 +30,4 @@ pypath $(realpath -s "$0")
 
 export PYTHONPATH="$PYTHONPATH${PYTHONPATH:+:}$SITES"
 
-exec $BIN/$PROG "$@"
+exec "$BIN/$PROG" "$@"

pkgs/development/interpreters/ruby/gem.nix

@@ -44,6 +44,8 @@ let
 
     propagatedUserEnvPkgs = requiredGems;
 
+    passthru.isRubyGem = true;
+
   };
   mb = stdenv.lib.maybeAttr;
   patchedGem = a: stdenv.mkDerivation (removeAttrs (stdenv.lib.mergeAttrsByFuncDefaults

pkgs/development/libraries/arts/default.nix

@@ -1,31 +0,0 @@
-{stdenv, fetchurl, pkgconfig, glib, kdelibs, libX11, libXext, zlib, libjpeg
-, libpng, perl, qt3}:
-
-stdenv.mkDerivation {
-  name = "arts-1.5.10";
-
-  src = fetchurl {
-    url = mirror://kde/stable/3.5.10/src/arts-1.5.10.tar.bz2;
-    sha256 = "0ffcm24lkgg3sm89q4zsj8za5h5d9j1195pmbjhx4hj0xcwkiqlj";
-  };
-
-  KDEDIR = kdelibs;
-  
-  configureFlags = ''
-    --with-extra-includes=${libjpeg}/include
-    --with-extra-libs=${libjpeg}/lib
-    --x-includes=${libX11}/include
-    --x-libraries=${libX11}/lib
-    --disable-dependency-tracking
-    --enable-final
-  '';
-
-  nativeBuildInputs = [ pkgconfig perl ];
-
-  buildInputs =
-    [glib kdelibs libX11 libXext zlib libjpeg libpng qt3];
-
-  meta = {
-    homepage = http://www.arts-project.org/;
-  };
-}

pkgs/development/libraries/boost/1.47.nix

@@ -56,7 +56,7 @@ stdenv.mkDerivation {
   };
 
   # See <http://svn.boost.org/trac/boost/ticket/4688>.
-  patches = [ ./boost_filesystem.patch ];
+  patches = [ ./boost_filesystem_1_47_0.patch ];
 
   enableParallelBuilding = true;
 

pkgs/development/libraries/boost/1.49-headers.nix

@@ -1,26 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation {
-  name = "boost-headers-1.49.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/boost/boost_1_49_0.tar.bz2";
-    sha256 = "0g0d33942rm073jgqqvj3znm3rk45b2y2lplfjpyg9q7amzqlx6x";
-  };
-
-  phases = [ "installPhase" ];
-
-  installPhase = ''
-    mkdir -p $out/include
-    tar xvf $src -C $out/include --strip-components=1 boost_1_49_0/boost
-  '';
-
-  meta = {
-    homepage = "http://boost.org/";
-    description = "Boost C++ Library Collection";
-    license = "boost-license";
-
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.viric ];
-  };
-}

pkgs/development/libraries/boost/1.53-headers.nix

@@ -1,18 +1,18 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "boost-headers-1.52.0";
+  name = "boost-headers-1.53.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2";
-    sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2";
+    url = "mirror://sourceforge/boost/boost_1_53_0.tar.bz2";
+    sha256 = "15livg6y1l3gdsg6ybvp3y4gp0w3xh1rdcq5bjf0qaw804dh92pq";
   };
 
   phases = [ "installPhase" ];
 
   installPhase = ''
     mkdir -p $out/include
-    tar xf $src -C $out/include --strip-components=1 boost_1_52_0/boost
+    tar xf $src -C $out/include --strip-components=1 boost_1_53_0/boost
   '';
 
   meta = {

pkgs/development/libraries/boost/1.53.nix

@@ -38,7 +38,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "boost-1.52.0";
+  name = "boost-1.53.0";
 
   meta = {
     homepage = "http://boost.org/";
@@ -50,8 +50,8 @@ stdenv.mkDerivation {
   };
 
   src = fetchurl {
-    url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2";
-    sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2";
+    url = "mirror://sourceforge/boost/boost_1_53_0.tar.bz2";
+    sha256 = "15livg6y1l3gdsg6ybvp3y4gp0w3xh1rdcq5bjf0qaw804dh92pq";
   };
 
   enableParallelBuilding = true;

pkgs/development/libraries/directfb/default.nix

@@ -1,5 +1,5 @@
-{stdenv, fetchurl, perl, zlib, libjpeg, freetype, libpng, giflib
-, enableX11 ? true, libX11, xproto, xextproto, libXext, renderproto, libXrender
+{ stdenv, fetchurl, pkgconfig, perl, zlib, libjpeg, freetype, libpng, giflib
+, enableX11 ? true, xlibs
 , enableSDL ? true, SDL }:
 
 let s = import ./src-for-default.nix; in
@@ -10,16 +10,14 @@ stdenv.mkDerivation {
     sha256 = s.hash;
   };
 
-  patches = [ ./ftbfs.patch ];
-
   nativeBuildInputs = [ perl ];
 
-  buildInputs = [ zlib libjpeg freetype giflib libpng ]
+  buildInputs = [ pkgconfig zlib libjpeg freetype giflib libpng ]
     ++ stdenv.lib.optional enableSDL SDL
-    ++ stdenv.lib.optionals enableX11 [
-      xproto libX11 libXext xextproto
-      renderproto libXrender
-    ];
+    ++ stdenv.lib.optionals enableX11 (with xlibs; [
+      xproto libX11 libXext #xextproto
+      #renderproto libXrender
+    ]);
 
   NIX_LDFLAGS="-lgcc_s";
 
@@ -31,7 +29,7 @@ stdenv.mkDerivation {
     "--enable-fbdev"
     "--enable-mmx"
     "--enable-sse"
-    "--enable-sysfs"
+    #"--enable-sysfs" # not recognized
     "--with-software"
     "--with-smooth-scaling"
     ] ++ stdenv.lib.optionals enableX11 [

pkgs/development/libraries/directfb/ftbfs.patch

@@ -1,25 +0,0 @@
-From: André Draszik <andre.draszik@st.com>
-Date: Wed, 28 Sep 2011 17:36:00 +0000 (+0100)
-Subject: generic_stretch_blit: fix compilation due to undefined reference to DSPF_ARGBF88871
-X-Git-Url: http://git.directfb.org/?p=core%2FDirectFB.git;a=commitdiff_plain;h=ef5e1398fe4037b63d6513e450f107fcfe91047f
-
-generic_stretch_blit: fix compilation due to undefined reference to DSPF_ARGBF88871
-
-../../../../DirectFB/src/gfx/generic/generic_stretch_blit.c: In function 'stretch_hvx':
-../../../../DirectFB/src/gfx/generic/generic_stretch_blit.c:444:21: error: 'DSPF_ARGBF88871' undeclared (first use in this function)
-../../../../DirectFB/src/gfx/generic/generic_stretch_blit.c:444:21: note: each undeclared identifier is reported only once for each function it appears in
----
-
-diff --git a/src/gfx/generic/generic_stretch_blit.c b/src/gfx/generic/generic_stretch_blit.c
-index 65076f4..6dd987b 100644
---- a/src/gfx/generic/generic_stretch_blit.c
-+++ b/src/gfx/generic/generic_stretch_blit.c
-@@ -441,7 +441,7 @@ stretch_hvx( CardState *state, DFBRectangle *srect, DFBRectangle *drect )
-                     }
-                     break;
- 
--               case DSPF_ARGBF88871:
-+               case DSPF_RGBAF88871:
-                     if (state->blittingflags & DSBLIT_SRC_PREMULTIPLY) {
-                          for (i=0; i<gfxs->Blut->num_entries; i++) {
-                               int alpha = entries[i].a + 1;

pkgs/development/libraries/ffmpeg/1.1.nix

@@ -7,6 +7,7 @@
 , x264Support ? true, x264 ? null
 , xvidSupport ? true, xvidcore ? null
 , vdpauSupport ? true, libvdpau ? null
+, vaapiSupport ? true, libva ? null
 , faacSupport ? false, faac ? null
 , dc1394Support ? false, libdc1394 ? null
 , x11grabSupport ? false, libXext ? null, libXfixes ? null
@@ -19,6 +20,7 @@ assert vpxSupport -> libvpx != null;
 assert x264Support -> x264 != null;
 assert xvidSupport -> xvidcore != null;
 assert vdpauSupport -> libvdpau != null;
+assert vaapiSupport -> libva != null;
 assert faacSupport -> faac != null;
 assert x11grabSupport -> libXext != null && libXfixes != null;
 
@@ -39,6 +41,7 @@ stdenv.mkDerivation rec {
     "--enable-swscale"
     "--disable-ffplay"
     "--enable-shared"
+    "--enable-avresample"
     "--enable-runtime-cpudetect"
   ]
     ++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
@@ -62,6 +65,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional x264Support x264
     ++ stdenv.lib.optional xvidSupport xvidcore
     ++ stdenv.lib.optional vdpauSupport libvdpau
+    ++ stdenv.lib.optional vaapiSupport libva
     ++ stdenv.lib.optional faacSupport faac
     ++ stdenv.lib.optional dc1394Support libdc1394
     ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ];

pkgs/development/libraries/gnu-efi/default.nix

@@ -2,12 +2,13 @@
 , fetchurl
 }:
 
-stdenv.mkDerivation {
-  name = "gnu-efi-3.0r";
+let version = "3.0s"; in stdenv.mkDerivation {
+
+  name = "gnu-efi-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gnu-efi/gnu-efi_3.0r.orig.tar.gz";
-    sha256 = "1zi298wsg8v29xj4azcawqfjbxqi2w7l60agf7x2ph2lnqlga2v5";
+    url = "mirror://sourceforge/gnu-efi/gnu-efi_${version}.orig.tar.gz";
+    sha256 = "18bpswzkj81dadq1b7n2s9g0cz60l34ggzxlq21mb8va10j9zmhh";
   };
 
   meta = {

pkgs/development/libraries/goffice/0.10.nix

@@ -3,11 +3,11 @@
 , cairo, gconf, libgnomeui }:
 
 stdenv.mkDerivation rec {
-  name = "goffice-0.9.3";
+  name = "goffice-0.10.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/goffice/0.9/${name}.tar.xz";
-    sha256 = "0l9achvmbmhn2p5qd0nl7vxn5c3nf1ndzlyknczzyiaa6d5zj91h";
+    url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
+    sha256 = "7e7577f69203b03c4966906bcaabc6e87a629efb1684630c2bee7907bed08439";
   };
 
   buildInputs = [

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

@@ -15,6 +15,7 @@ cabal.mkDerivation (self: {
     xhtml zlib
   ];
   buildTools = [ alex happy ];
+  jailbreak = true;
   meta = {
     homepage = "http://wiki.portal.chalmers.se/agda/";
     description = "A dependently typed functional programming language and proof assistant";

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Diff";
-  version = "0.2.0";
-  sha256 = "15hdkrzwajnfcx8bj4jdcy4jli115g9v20msw1xyc9wnwrmbz97k";
+  version = "0.3.0";
+  sha256 = "0k7fj4icnh25x21cmrnbqq0sjgxrr2ffhn8bz89qmy5h9dznvy98";
   meta = {
     description = "O(ND) diff algorithm in haskell";
     license = self.stdenv.lib.licenses.bsd3;

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HSH";
-  version = "2.0.4";
-  sha256 = "1ddpazmk82716hqd1riqs7vnl4aildgwkjgk80iam49df9p5b8v8";
+  version = "2.1.0";
+  sha256 = "0gz2hzdvf0gqv33jihn67bvry38c6hkjapb1prxmb3w12lisr4l5";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

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

@@ -1,14 +1,14 @@
-{ cabal, blazeBuilder, deepseq, filepath, mtl, parsec, syb
-, sybWithClass, text, time, utf8String
+{ cabal, blazeBuilder, deepseq, filepath, mtl, parsec, syb, text
+, time, utf8String, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "HStringTemplate";
-  version = "0.6.12";
-  sha256 = "02jx02qbs4jxpf1s8nzc9lbaz0flkfcy6xj475v77i45xc1hc71p";
+  version = "0.7.0";
+  sha256 = "0xxxikgjw1dhx7kx3mjyvgh70m9avcd1kbp2bpig6gjwswk0mmai";
   buildDepends = [
-    blazeBuilder deepseq filepath mtl parsec syb sybWithClass text time
-    utf8String
+    blazeBuilder deepseq filepath mtl parsec syb text time utf8String
+    void
   ];
   meta = {
     description = "StringTemplate implementation in Haskell";

pkgs/development/libraries/haskell/HTTP/4000.2.8.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HTTP";
-  version = "4000.2.6";
-  sha256 = "0rycwrn9cq9mrsgxkbx373zjvmzg4hd8hzclya6ipd3jda1w5r92";
+  version = "4000.2.8";
+  sha256 = "0p0cwzjw2102bsyfaga6m8b53s6qnhd6byg2j2qla653f6kjlsh8";
   buildDepends = [ mtl network parsec ];
   meta = {
     homepage = "https://github.com/haskell/HTTP";

pkgs/development/libraries/haskell/SDL-ttf/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "SDL-ttf";
-  version = "0.6.1";
-  sha256 = "0n6vbigkjfvvk98bp7ys14snpd1zmbz69ndhhpnrn02h363vwkal";
+  version = "0.6.2";
+  sha256 = "0jajnbqnhdd4i8pj8j27m53zwgfs1v06kiwy0s0zml02fdkq8j4a";
   buildDepends = [ SDL ];
   extraLibraries = [ SDL_ttf ];
   meta = {

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "SMTPClient";
-  version = "1.0.4";
-  sha256 = "12m0qv8bf0s52yz07sipxlvas8k3xvi1d4lw6960q0nxr40ijyy2";
+  version = "1.1.0";
+  sha256 = "07njj24c43iz33c641d5ish62h13lhpvn2mx5pv5i6s3fm3bxsfk";
   buildDepends = [ extensibleExceptions hsemail network ];
   meta = {
     description = "A simple SMTP client library";

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

@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "attoparsec";
-  version = "0.10.3.0";
-  sha256 = "1l4cnfgnynrprfvx0p3n6kca8arsmvb1yxb9ir782rrk537jci50";
+  version = "0.10.4.0";
+  sha256 = "0inkcrl40j9kgcmmi0xkcszayqjd5yn7i9fyvv0ywfqwpl6lxf5n";
   buildDepends = [ deepseq text ];
   meta = {
     homepage = "https://github.com/bos/attoparsec";
-    description = "Fast combinator parsing for bytestrings";
+    description = "Fast combinator parsing for bytestrings and text";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];

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

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "authenticate";
-  version = "1.3.2";
-  sha256 = "1bvgfri0c2nyz06r59rm3slpvm1b0s242s4mznmndpdclgg33d9m";
+  version = "1.3.2.4";
+  sha256 = "1xakp54g5dyppzpm1q3bbx6g4pvs7p2903pyq6bya1n82zsk7yg7";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive
     conduit httpConduit httpTypes monadControl network resourcet

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

@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "base64-bytestring";
-  version = "1.0.0.0";
-  sha256 = "0z0r0lrpka3qrq45ajzyxsjc2as7zp6bq7z7sd56rwiziw7vp7vm";
+  version = "1.0.0.1";
+  sha256 = "0l1v4ddjdsgi9nqzyzcxxj76rwar3lzx8gmwf2r54bqan3san9db";
   meta = {
     homepage = "https://github.com/bos/base64-bytestring";
-    description = "Fast base64 encoding and deconding for ByteStrings";
+    description = "Fast base64 encoding and decoding for ByteStrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];

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

@@ -1,10 +1,10 @@
-{ cabal, semigroupoids, semigroups }:
+{ cabal, semigroupoids, semigroups, tagged }:
 
 cabal.mkDerivation (self: {
   pname = "bifunctors";
-  version = "3.0.3";
-  sha256 = "1nmrwc9n9qkj9w9c38ja0had32isr6v35j1v19fhqdwk5ddbpxp4";
-  buildDepends = [ semigroupoids semigroups ];
+  version = "3.2";
+  sha256 = "03bszf1127iw5kimjbag5gmgzz7h2qzcd9f7jb53jpiadfhjfx0a";
+  buildDepends = [ semigroupoids semigroups tagged ];
   meta = {
     homepage = "http://github.com/ekmett/bifunctors/";
     description = "Haskell 98 bifunctors";

pkgs/development/libraries/haskell/bmp/1.2.4.1.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bmp";
-  version = "1.2.3.4";
-  sha256 = "134nfchsw4q1k3kr09i5w8jxbr659as4523gs5m2dch15wrmrhf6";
+  version = "1.2.4.1";
+  sha256 = "1ipy8v5n5dmajnai2cf7591chklxcbhpvwjdgvdwglipds2hjpap";
   buildDepends = [ binary ];
   meta = {
     homepage = "http://code.ouroborus.net/bmp";

pkgs/development/libraries/haskell/case-insensitive/default.nix

@@ -1,10 +1,10 @@
-{ cabal, hashable, text }:
+{ cabal, deepseq, hashable, text }:
 
 cabal.mkDerivation (self: {
   pname = "case-insensitive";
-  version = "0.4.0.4";
-  sha256 = "1xzpri688vbd6fvvxczqx8bv53009ygzws7vbjmj2q97wcm8nmwd";
-  buildDepends = [ hashable text ];
+  version = "1.0";
+  sha256 = "1x437b5yyh930a5dr642lvfdgpx12w4ms70whiw1ffjjhssb88zk";
+  buildDepends = [ deepseq hashable text ];
   meta = {
     homepage = "https://github.com/basvandijk/case-insensitive";
     description = "Case insensitive string comparison";

pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude-conduit";
-  version = "0.4.3";
-  sha256 = "0ny4si6z6i6g6khcg9d3m9wks42sqh8i8kpgghhdwd37v32l3f34";
+  version = "0.5.0";
+  sha256 = "1c1j9cxj08nz1pkrdxhphk6zyn1dxf3wbl8phcrzi8qk6q1vi0bi";
   buildDepends = [
     classyPrelude conduit monadControl resourcet transformers void
     xmlConduit

pkgs/development/libraries/haskell/classy-prelude/default.nix

@@ -1,13 +1,13 @@
-{ cabal, basicPrelude, hashable, systemFilepath, text, transformers
-, unorderedContainers, vector
+{ cabal, basicPrelude, hashable, liftedBase, systemFilepath, text
+, transformers, unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude";
-  version = "0.4.3";
-  sha256 = "1k2iszja03s8azypl8lpkdjvvqsgzg73cl1wp4jl2fqp1psqv36q";
+  version = "0.5.0";
+  sha256 = "187a1p2x7jw53iramdq3v2m8h451k5nrjrmnv5sz4c8x9jmj04dp";
   buildDepends = [
-    basicPrelude hashable systemFilepath text transformers
+    basicPrelude hashable liftedBase systemFilepath text transformers
     unorderedContainers vector
   ];
   meta = {

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

@@ -1,10 +1,10 @@
-{ cabal, transformers }:
+{ cabal, tagged, transformers, transformersCompat }:
 
 cabal.mkDerivation (self: {
   pname = "contravariant";
-  version = "0.2.0.2";
-  sha256 = "0142s1c914zbfnvysvcc9s3bv8qs6wimnqcmxca1gxaxqvyfkf3p";
-  buildDepends = [ transformers ];
+  version = "0.4";
+  sha256 = "1nqslc9vcx6v6c33fn7mvb1xhr33yl3ja92p788zx8z1drx9cqc3";
+  buildDepends = [ tagged transformers transformersCompat ];
   meta = {
     homepage = "http://github.com/ekmett/contravariant/";
     description = "Haskell 98 contravariant functors";

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "criterion";
-  version = "0.6.2.0";
-  sha256 = "1xd90qb026niq2sn7ks8bn92ifb6255saic68bzg6kzj7ydwwdmx";
+  version = "0.6.2.1";
+  sha256 = "08gbs61qqsq0kh2r33kzm9mmbs3ar5krmp1a0cf21c012k6k55z5";
   buildDepends = [
     aeson deepseq filepath hastache mtl mwcRandom parsec statistics
     time transformers vector vectorAlgorithms

pkgs/development/libraries/haskell/diagrams/contrib.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-contrib";
-  version = "0.6.0.2";
-  sha256 = "1lj99a46r12zjwmpkn7vj04wapfgdlmw05jwb5lnhy9hxqgcsgng";
+  version = "0.6.0.3";
+  sha256 = "0j0wmf2nksqh3rqmzyw468bp25zikc5icif5f3rfi1v06ghsk0i5";
   buildDepends = [
     colour dataDefault diagramsLib forceLayout lens mtl vectorSpace
   ];

pkgs/development/libraries/haskell/digestive-functors-heist/default.nix

@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.6.0.0";
   sha256 = "17qndqsk09fvnvyhhw3xbbjjhfyyp4sivc898vqllyyky0wqmrdk";
   buildDepends = [ digestiveFunctors heist mtl text xmlhtml ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/jaspervdj/digestive-functors";
     description = "Heist frontend for the digestive-functors library";

pkgs/development/libraries/haskell/digestive-functors/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors";
-  version = "0.6.0.0";
-  sha256 = "1h56nl1rszm098gwrdhm5w63mrnfjp1brfrk5hlj238nmj0djgcd";
+  version = "0.6.0.1";
+  sha256 = "1ni1hfmpz14yvgjphwz64hqhg7xbhvvqbdnapspipplvnl0rcmhi";
   buildDepends = [ mtl text ];
   meta = {
     homepage = "http://github.com/jaspervdj/digestive-functors";

pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "distributed-process-simplelocalnet";
-  version = "0.2.0.8";
-  sha256 = "01kzqfbrkl9zzknw0gbdh1c1lss911lphagn2sw6nzl9xpnhjqk0";
+  version = "0.2.0.9";
+  sha256 = "0bkb26bfpmyhh26hgznnw073kvk78ws6lqi86pxrgnnm9sx5mi21";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/distributed-process/default.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "distributed-process";
-  version = "0.4.1";
-  sha256 = "1ysm2rq7ldxb5w6m04vf5q3zrgvg99z7kszjqj17r17ps61v898f";
+  version = "0.4.2";
+  sha256 = "16w8jp66903vn089ysqdn534v0744cr2m6wkqd77zri6a0caaa6c";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

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

@@ -0,0 +1,18 @@
+{ cabal, binary, executablePath, filepath, ghcPaths, ioStorage
+, time, xdgBasedir
+}:
+
+cabal.mkDerivation (self: {
+  pname = "dyre";
+  version = "0.8.11";
+  sha256 = "0sg5csshznbbyvq72s4sps7bkjlkfxiwcy4i3ip83lrxjw1msvr8";
+  buildDepends = [
+    binary executablePath filepath ghcPaths ioStorage time xdgBasedir
+  ];
+  meta = {
+    homepage = "http://github.com/willdonnelly/dyre";
+    description = "Dynamic reconfiguration in Haskell";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/edit-distance/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "edit-distance";
-  version = "0.2.1.1";
-  sha256 = "1d8h38cn3azvsp2dp5gycglm5bwwd8plbag8ypi38yj6c35a82yn";
+  version = "0.2.1.2";
+  sha256 = "08dxsp1ar8mr4xrjy37lzl0s1rjnqsdq30p09nclip5pyhcw7g44";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ random ];

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

@@ -1,13 +1,16 @@
-{ cabal, semigroupoids, semigroups, transformers }:
+{ cabal, MonadRandom, mtl, semigroupoids, semigroups, transformers
+}:
 
 cabal.mkDerivation (self: {
   pname = "either";
-  version = "3.0.3";
-  sha256 = "02kpb8xd19n00ll61haqr6k3hy8qmbdf73gr4zs59q9xh0739qxc";
-  buildDepends = [ semigroupoids semigroups transformers ];
+  version = "3.4";
+  sha256 = "05nbp8gp50wq592k6dsrpzp6wmqjn9pz6mkizqfb65z1wvd1xiz2";
+  buildDepends = [
+    MonadRandom mtl semigroupoids semigroups transformers
+  ];
   meta = {
     homepage = "http://github.com/ekmett/either/";
-    description = "Haskell 98 either monad transformer";
+    description = "An either monad transformer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };

pkgs/development/libraries/haskell/email-validate/default.nix

@@ -1,10 +1,10 @@
-{ cabal, parsec, ranges }:
+{ cabal, attoparsec }:
 
 cabal.mkDerivation (self: {
   pname = "email-validate";
-  version = "0.3.2";
-  sha256 = "0cshrl0if1ivn7c0ggm21r58pzsyp7l5wk3dgl86n6zla9dwdmhq";
-  buildDepends = [ parsec ranges ];
+  version = "1.0.0";
+  sha256 = "0sj1cvn9ap0m8d4cg4cqavvmkd74vp86lyyra9g6f17815sxdbsg";
+  buildDepends = [ attoparsec ];
   meta = {
     homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct";
     description = "Validating an email address string against RFC 5322";

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "errors";
-  version = "1.3.1";
-  sha256 = "0vfpnpkiz362bvjyaf35spfk3h6vw7xi1x3f8agzs7kmxrdvrfik";
+  version = "1.4.1";
+  sha256 = "18npfwr6byh0aib9qxpynr2gf0v92c0xbxky4a733jbdrwli5c40";
   buildDepends = [ either safe transformers ];
   meta = {
     description = "Simplified error-handling";

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

@@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
   buildDepends = [
     Diff filepath HUnit mtl parsec split time utf8String xml
   ];
+  jailbreak = true;
   meta = {
     description = "Interface for versioning file stores";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/ghc-heap-view/default.nix

@@ -0,0 +1,14 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "ghc-heap-view";
+  version = "0.4.2.0";
+  sha256 = "0c9yz47j0ddy0l04dabglc99hl7n9wwnz4xj9r8ljafag6l221gp";
+  buildDepends = [ transformers ];
+  meta = {
+    description = "Extract the heap representation of Haskell values and thunks";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})

pkgs/development/libraries/haskell/ghc-vis/default.nix

@@ -0,0 +1,20 @@
+{ cabal, cairo, deepseq, fgl, ghcHeapView, graphviz, gtk, mtl
+, svgcairo, text, transformers, xdot
+}:
+
+cabal.mkDerivation (self: {
+  pname = "ghc-vis";
+  version = "0.6";
+  sha256 = "0gvfs0f6fjg4bzq9q6rrhin6gk1pbyw9qbigi90cz1fg10nq7nzi";
+  buildDepends = [
+    cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text
+    transformers xdot
+  ];
+  meta = {
+    homepage = "http://felsin9.de/nnis/ghc-vis";
+    description = "Live visualization of data structures in GHCi";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})

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

@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gitit";
-  version = "0.10.1.2";
-  sha256 = "1dy1wdnld6cxx5xqfszywi4f7xv143ar2dq4nb0dnd1dgd5hgmak";
+  version = "0.10.2";
+  sha256 = "07zdc1qx429rmisb39gdamwn9b1jblvjg7py4fcxx3qj01b6mvxx";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gloss";
-  version = "1.7.8.1";
-  sha256 = "0bi60zprgq1dd6prshvgqyyp13l6n5f171aryxg254kjagvrm3lf";
+  version = "1.7.8.2";
+  sha256 = "0jf49vdms8jzygkwch5k8s611pay0xqwq1lc0p476d37rzb8qpn4";
   buildDepends = [ bmp GLUT OpenGL ];
   jailbreak = true;
   meta = {

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

@@ -1,13 +1,14 @@
-{ cabal, colour, dlist, fgl, filepath, polyparse, text
+{ cabal, colour, dlist, fgl, filepath, polyparse, temporary, text
 , transformers, wlPprintText
 }:
 
 cabal.mkDerivation (self: {
   pname = "graphviz";
-  version = "2999.15.0.1";
-  sha256 = "137d8n20fbpdz7az79gqharsfl293pl3xn444338i6blfi47ssdy";
+  version = "2999.16.0.0";
+  sha256 = "1g4q4wyj5amz9xvgnqn143p5nq6m4a0lggxz7jn9l2hwp41bx1g8";
   buildDepends = [
-    colour dlist fgl filepath polyparse text transformers wlPprintText
+    colour dlist fgl filepath polyparse temporary text transformers
+    wlPprintText
   ];
   meta = {
     homepage = "http://projects.haskell.org/graphviz/";

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

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "4.1.2.1";
-  sha256 = "1d9bbqy1dix60w72zc3g4y7454avngfyl2i8gj99bdqin2wwcgp8";
+  version = "4.1.4.0";
+  sha256 = "0nhr7ai03hx2qjxlqml0js43iwxhcbpdqkwdvw8pqs396yrjwxdj";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -15,6 +15,7 @@ cabal.mkDerivation (self: {
     filepath httpConduit httpTypes lrucache mtl pandoc parsec random
     regexBase regexTdfa snapCore snapServer tagsoup text time
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://jaspervdj.be/hakyll";
     description = "A static website compiler library";

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "1.1.3.1";
-  sha256 = "04qqsjrn0fh9y4z7gjf3g60w69gqxhzq7dqkraq97p3w45fijm1i";
+  version = "1.1.6.2";
+  sha256 = "00asrmyb4k9xpsbwwafm3rj1lisssrc3hj3dsr827w9x86xxargy";
   buildDepends = [
     blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
   ];

pkgs/development/libraries/haskell/happstack/happstack-server.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-server";
-  version = "7.1.1";
-  sha256 = "0q12l93kq5ixvam682ys3a6i3q59amz9cyr1bb06f2zf8qr57b7a";
+  version = "7.1.4";
+  sha256 = "0vnawm2m7lr7yvpd30divczxl90fayjvsysr7l1lq76qgxjsd576";
   buildDepends = [
     base64Bytestring blazeHtml extensibleExceptions filepath hslogger
     html monadControl mtl network parsec sendfile syb systemFilepath

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hashtables";
-  version = "1.0.1.8";
-  sha256 = "0skrzvzasm0hg4631nhfppsb7mn60pnxk4v31gipzz780sbx9zi8";
+  version = "1.1.0.2";
+  sha256 = "0d103cvr168hgyghm6fp67r4lz1p592x45igwld6xq3nyxjxnbp9";
   buildDepends = [ hashable primitive vector ];
   meta = {
     homepage = "http://github.com/gregorycollins/hashtables";

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

@@ -1,13 +1,13 @@
 { cabal, blazeBuilder, filepath, ieee754, mtl, syb, text
-, utf8String
+, transformers, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "hastache";
-  version = "0.4.2";
-  sha256 = "1ad691qxnnx0a6ik0cjdzd8aw7z88p06zckbb3cb1r8pk6m0g7vi";
+  version = "0.5.0";
+  sha256 = "1c1pphw7qx5l5fdfqchihvp2yrwwb0ln8dfshkvd1giv8cjmbyn8";
   buildDepends = [
-    blazeBuilder filepath ieee754 mtl syb text utf8String
+    blazeBuilder filepath ieee754 mtl syb text transformers utf8String
   ];
   meta = {
     homepage = "http://github.com/lymar/hastache";

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

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "heist";
-  version = "0.10.2.1";
-  sha256 = "14lp27vlzv6qqv325x2vqqvphw5ads5ywjqpjramv3hhd275fn3d";
+  version = "0.11.0.1";
+  sha256 = "0d5nn0kfs7hbgs4b77i8c8pq2q5hldqk08dacva7xlxvjrlxsyn6";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
     filepath hashable MonadCatchIOTransformers mtl random text time

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

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hoogle";
-  version = "4.2.14";
-  sha256 = "1ymmf8zxp2nbygnavhr3ay0fidhd3vhrdqb7mg0qgk8y9kx25brj";
+  version = "4.2.15";
+  sha256 = "0mhxdbbzq7hl5zxz3dhxyrs5q08y8hxwsm19ba0gx47qvg3znzki";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

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

@@ -2,15 +2,15 @@
 
 cabal.mkDerivation (self: {
   pname = "hsdns";
-  version = "1.5";
-  sha256 = "2788d1ad5ef07ae5f356a460fb92316118f3a4d9c779ec27fb8243602bcf6399";
+  version = "1.6";
+  sha256 = "1vf3crkhs7z572bqdf7p2hfcqkjxvnyg0w0cf8b7kyfxzn8bj3fa";
   buildDepends = [ network ];
   extraLibraries = [ adns ];
   noHaddock = true;
   meta = {
-    homepage = "http://gitorious.org/hsdns";
+    homepage = "http://github.com/peti/hsdns";
     description = "Asynchronous DNS Resolver";
-    license = "LGPL";
+    license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
       self.stdenv.lib.maintainers.andres

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hsemail";
-  version = "1.7.4";
-  sha256 = "0nigv0zbkm90m5jskfc5a4zx2d3gyqj1y472jplrgd76s15alsmw";
+  version = "1.7.5";
+  sha256 = "0ls6y48bndwgb7ng29wxim4h36rs6b07dqi6ic4hqgbb7lg6fma4";
   buildDepends = [ mtl parsec ];
   meta = {
     homepage = "http://gitorious.org/hsemail";

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

@@ -4,15 +4,14 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec";
-  version = "1.4.3";
-  sha256 = "0i963fxamyyi3afac67rkw4340i3xqs1q3lvcy69mq0czbdvgjmc";
+  version = "1.4.4";
+  sha256 = "09wrvdlqzpa3vjcnirnzpj8nsvqnn5xbilnxaqmjm2agbl8xfj5r";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     ansiTerminal filepath hspecExpectations HUnit QuickCheck setenv
     silently time transformers
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://hspec.github.com/";
     description = "Behavior-Driven Development for Haskell";

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

@@ -2,10 +2,10 @@
 
 cabal.mkDerivation (self: {
   pname = "hsyslog";
-  version = "1.4";
-  sha256 = "f3bf4bf47565cb0245afb0e8ffa3f79635b02f0032081845a5999964d828f4db";
+  version = "1.5";
+  sha256 = "1dpcawnl3a5lw2w8gc9920sjrw43qmq1k2zws8rx2q0r6ps7nhgp";
   meta = {
-    homepage = "http://gitorious.org/hsyslog";
+    homepage = "http://github.com/peti/hsyslog";
     description = "FFI interface to syslog(3) from POSIX.1-2001.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

pkgs/development/libraries/haskell/http-conduit/default.nix

@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "1.8.7";
-  sha256 = "12v5rxp4dx6glyijygpp7r7b5b6mscclgfp2cbii78m3hgld097i";
+  version = "1.8.7.1";
+  sha256 = "1m0f9snc2zxj8hvxw3ngw0h78ckvdlxxfjvrryk93blfwbamssi5";
   buildDepends = [
     asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
     blazeBuilderConduit caseInsensitive certificate conduit cookie

pkgs/development/libraries/haskell/http-reverse-proxy/default.nix

@@ -1,15 +1,15 @@
-{ cabal, blazeBuilder, caseInsensitive, classyPreludeConduit
-, conduit, dataDefault, httpConduit, httpTypes, liftedBase
-, monadControl, network, networkConduit, text, wai, warp, word8
+{ cabal, blazeBuilder, caseInsensitive, classyPrelude, conduit
+, dataDefault, httpConduit, httpTypes, liftedBase, monadControl
+, network, networkConduit, text, wai, warp, word8
 }:
 
 cabal.mkDerivation (self: {
   pname = "http-reverse-proxy";
-  version = "0.1.1.1";
-  sha256 = "0xg6xw0j61db75smys2fgjn0nzv2dy8c1ha4m828ssnxlic98lk2";
+  version = "0.1.1.2";
+  sha256 = "179j6zfmx3g6gc7mzhzhl7ymxkijg9vahjvwjwm0wm15vna52iqa";
   buildDepends = [
-    blazeBuilder caseInsensitive classyPreludeConduit conduit
-    dataDefault httpConduit httpTypes liftedBase monadControl network
+    blazeBuilder caseInsensitive classyPrelude conduit dataDefault
+    httpConduit httpTypes liftedBase monadControl network
     networkConduit text wai warp word8
   ];
   meta = {

pkgs/development/libraries/haskell/http-types/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-types";
-  version = "0.7.3.0.1";
-  sha256 = "1s2dh75jpf2yllw503hjw0x2anhc4c71vz5yylri8nxzx1zs18rq";
+  version = "0.8.0";
+  sha256 = "14d1gzgwhinkwx3lmc6hvqj6ivjrvy4m6fm2walnyk1zv24zli75";
   buildDepends = [ blazeBuilder caseInsensitive text ];
   meta = {
     homepage = "https://github.com/aristidb/http-types";

pkgs/development/libraries/haskell/language-haskell-extract/default.nix

@@ -1,10 +1,10 @@
-{ cabal, haskellSrcExts, regexPosix }:
+{ cabal, regexPosix }:
 
 cabal.mkDerivation (self: {
   pname = "language-haskell-extract";
-  version = "0.2.3";
-  sha256 = "0fz1nin596ihlh77pafzpdf46br1k3pxcxyml2rvly6g0h3yjgpr";
-  buildDepends = [ haskellSrcExts regexPosix ];
+  version = "0.2.4";
+  sha256 = "1nxcs7g8a1sp91bzpy4cj6s31k5pvc3gvig04cbrggv5cvjidnhl";
+  buildDepends = [ regexPosix ];
   meta = {
     homepage = "http://github.com/finnsson/template-helper";
     description = "Module to automatically extract functions from the local code";

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

@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "3.8.2";
-  sha256 = "1spz4nyv1f7kf4bnw8qgqaks5kc4m0slzw0czj1wh1232w2sz15m";
+  version = "3.8.5";
+  sha256 = "09z2izh7mqj75yh9f0pb8ky9vnzs9zx2z2mz1ik7l8wid43gm6vn";
   buildDepends = [
     bifunctors comonad comonadsFd comonadTransformers contravariant
     distributive filepath genericDeriving hashable

pkgs/development/libraries/haskell/math-functions/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "math-functions";
-  version = "0.1.1.2";
-  sha256 = "09q9647zxvvg7wi81r14qhhy64d1mwgy8kg0zkhdvg4rzw9j669v";
+  version = "0.1.3.0";
+  sha256 = "06wxr8fbhmsgkpyx2vimx9l6apk0p27mwrxrvbjk0b7m9vsg3ay5";
   buildDepends = [ erf vector ];
   meta = {
     homepage = "https://github.com/bos/math-functions";

pkgs/development/libraries/haskell/mime-types/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mime-types";
-  version = "0.1.0.2";
-  sha256 = "1pkhr8k23386qwa1wmlrcilz75di2l8n5kc4n8pnia05p49akfcs";
+  version = "0.1.0.3";
+  sha256 = "0mzhkqcjlnrs9mwn2crsr1m2mf6pgygs1s3ks8akz1618v6jm6y1";
   buildDepends = [ text ];
   meta = {
     homepage = "https://github.com/yesodweb/wai";

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monadcryptorandom";
-  version = "0.5";
-  sha256 = "19sb9mgfvmmmx1sn0aiq6dn5nl0201xwgs6xqakn7pz5vsqcww2b";
+  version = "0.5.1";
+  sha256 = "10waxc0i7hcqlgb9iwcdz0xqkym4ihavgwq466xlaqzzhcpp38d6";
   buildDepends = [ cryptoApi mtl tagged transformers ];
   meta = {
     homepage = "https://github.com/TomMD/monadcryptorandom";

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

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pandoc";
-  version = "1.10.0.5";
-  sha256 = "05mjgvxk3wxfssf4aviigdm6jb73a6bp8lwz86aabdgkgh2i6n54";
+  version = "1.10.1";
+  sha256 = "127pxs1w99nr6hdancaajm20w3vgmch4xlj0v7221y7i9qcr1y1y";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/postgresql-libpq/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "postgresql-libpq";
-  version = "0.8.2.1";
-  sha256 = "0fjy451gc9lg3kcglq4s5s3hja8ni3adh4jmxd01kfyvyhwggv4d";
+  version = "0.8.2.2";
+  sha256 = "1mmsfgia318p34l8jx8hihb160sx2wpg2h5r741akcs50v6p5878";
   extraLibraries = [ postgresql ];
   meta = {
     homepage = "http://github.com/lpsmith/postgresql-libpq";

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "profunctors";
-  version = "3.2";
-  sha256 = "0c7242pk5hfz67cwjy0l7skqyz20akw9j2w7cb8iggcbbb27bgyc";
+  version = "3.3";
+  sha256 = "0cvar0qr2yf0lmqwhiy2ibajiq9cmqy2ikwn8l5mdxxh5q5rwgjj";
   buildDepends = [ comonad tagged ];
   meta = {
     homepage = "http://github.com/ekmett/profunctors/";

pkgs/development/libraries/haskell/project-template/default.nix

@@ -1,15 +1,14 @@
-{ cabal, base64Bytestring, base64Conduit, classyPreludeConduit
-, conduit, mtl, resourcet, systemFileio, systemFilepath, text
-, transformers
+{ cabal, base64Bytestring, base64Conduit, classyPrelude, conduit
+, mtl, resourcet, systemFileio, systemFilepath, text, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "project-template";
-  version = "0.1.1";
-  sha256 = "186hqfhhl77yq9gqiw59jbnkk7xmpljqfwwilzjkjknf3ifhs5na";
+  version = "0.1.3";
+  sha256 = "1nsc4i3s9a7d0nysswhylvnr79z0ax9biiwr7b6jn7jzx0f2bdmm";
   buildDepends = [
-    base64Bytestring base64Conduit classyPreludeConduit conduit mtl
-    resourcet systemFileio systemFilepath text transformers
+    base64Bytestring base64Conduit classyPrelude conduit mtl resourcet
+    systemFileio systemFilepath text transformers
   ];
   meta = {
     homepage = "https://github.com/fpco/haskell-ide";

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "reflection";
-  version = "1.1.6";
-  sha256 = "1ihyx1a8pk1czam0qm1znl851dn4y6jip6s30girgghrvvxmblkw";
+  version = "1.1.7";
+  sha256 = "073v9y09fvh7nsfqp1jp2ncrq0xkcv5fvikl769ghv2ycgkfxl4z";
   buildDepends = [ tagged ];
   meta = {
     homepage = "http://github.com/ekmett/reflection";

pkgs/development/libraries/haskell/repa-io/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "repa-io";
-  version = "3.2.3.1";
-  sha256 = "19dnz8xa18yydprnwzgdcbrndi6akwc53rs1104z0awffh83iynm";
+  version = "3.2.3.2";
+  sha256 = "116qxq0jsq3hbj0hxjxfr9sl29vzj1rpfbzfxgc243v1hh4rdjfr";
   buildDepends = [ binary bmp repa vector ];
   jailbreak = true;
   meta = {

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "semigroupoids";
-  version = "3.0.1";
-  sha256 = "12k2yryr31lxhwq42cx05kswljmbli8p8c2wknigzkkam63d8k5h";
+  version = "3.0.2";
+  sha256 = "0k137iafw0srgmy4qwx3cbx00519c0h91nmszdbx6pzpvf6m5fwm";
   buildDepends = [ comonad contravariant semigroups transformers ];
   meta = {
     homepage = "http://github.com/ekmett/semigroupoids";

pkgs/development/libraries/haskell/shakespeare-css/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "1.0.2";
-  sha256 = "02sk9ql357ybj1h5a4xjn06di5zdafibabhy32j5vs9kpyamvck3";
+  version = "1.0.2.1";
+  sha256 = "1ik0128gwziv1dajz2g73rk1yac0ymd1w59q3g8c9g8ibwxn9hca";
   buildDepends = [ parsec shakespeare text transformers ];
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";

pkgs/development/libraries/haskell/shakespeare-js/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-js";
-  version = "1.1.1";
-  sha256 = "1xzhb3ipax2489311hmiaxp9i44099bsbclcj3ds0rhdfa62xarg";
+  version = "1.1.2";
+  sha256 = "0iwajn0d0yngzp10j9qbb2gpq1g7r390yqd7pj5dri35rjc6mr8n";
   buildDepends = [ aeson shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare";
-  version = "1.0.2";
-  sha256 = "1n7qymrn2f83a11zdh2950pf8rsqnc52blwi02amjxsvy2piidzm";
+  version = "1.0.3.1";
+  sha256 = "08w1g19k9v9dvdy45j32kdic8vjhc10ad4g20q5ya0id4cd13qfs";
   buildDepends = [ parsec text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";

pkgs/development/libraries/haskell/snap/core.nix

@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap-core";
-  version = "0.9.2.2";
-  sha256 = "0svahih2piaj87xfysgjvqqh11gmwz9icrh2g819h68kzh10imlf";
+  version = "0.9.3.1";
+  sha256 = "1q2lk70l0hk4l6ksjnal1bfkby0i08gdzvj9cscvxs4njxmgdapq";
   buildDepends = [
     attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
     bytestringMmap caseInsensitive deepseq enumerator filepath HUnit

pkgs/development/libraries/haskell/snap/server.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap-server";
-  version = "0.9.2.4";
-  sha256 = "1kwmrlk9dr033h6q05afnr916wnw5wlxrr87z1myv0a6nzqmdhzl";
+  version = "0.9.3.1";
+  sha256 = "0wagx1zy52fi4fldbzpsvk5hpdrma9lwsip9zrrbszxf446amd53";
   buildDepends = [
     attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
     caseInsensitive enumerator MonadCatchIOTransformers mtl network

pkgs/development/libraries/haskell/snap/snap.nix

@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap";
-  version = "0.10.0.1";
-  sha256 = "14j9lgcdyxh7n4yidfvn1r94nziljiqz6nsqgq114v34bnn6l2yn";
+  version = "0.11.1";
+  sha256 = "0dd66496fjfp80i6whl356sqk7n03rx4ycsah7x11fc9rvplmr3q";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -19,7 +19,6 @@ cabal.mkDerivation (self: {
     snapCore snapServer stm syb text time transformers
     unorderedContainers vector vectorAlgorithms xmlhtml
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://snapframework.com/";
     description = "Top-level package for the Snap Web Framework";

pkgs/development/libraries/haskell/split/0.2.1.2.nix

@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "split";
+  version = "0.2.1.2";
+  sha256 = "0wjw4j9wgk66h7filzfh0py9b0wwmaynvwqvd6kinxgms86fpvyi";
+  meta = {
+    description = "Combinator library for splitting lists";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})

pkgs/development/libraries/haskell/string-qq/default.nix

@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "string-qq";
+  version = "0.0.2";
+  sha256 = "0662m3i5xrdrr95w829bszkhp88mj9iy1zya54vk2sl5hz9wlmwp";
+  meta = {
+    description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
+    license = self.stdenv.lib.licenses.publicDomain;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/stylish-haskell/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "stylish-haskell";
-  version = "0.5.5.2";
-  sha256 = "1whl8qdqyw2saic70kav8srg4f6bcn77mc86m0vk8i8n5mb3q4ny";
+  version = "0.5.6.0";
+  sha256 = "1cy40b7csna3fwq0bm5mx9d09x52vj517mf38yn8ymd0afff67sb";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "texmath";
-  version = "0.6.1.2";
-  sha256 = "1izsjy30saz2il16dwx8sh2s30b1pfgcpq6023v135w1bdrzrnmq";
+  version = "0.6.1.3";
+  sha256 = "1f2hka9jwlrm9dvw7z3896yfpdzxs2vaw0vbcmj5p401mvzc8w05";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ parsec syb xml ];

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tls";
-  version = "1.1.1";
-  sha256 = "0ji83b5z3v6f6a6rgyj5xkjh9vvsqckr7ymzjnhb4zqf0mgymypq";
+  version = "1.1.2";
+  sha256 = "1vg1mnz6cxxgs48pbpjp4hwyvsysxyzvjfy4p1vd23lwc32cdjqg";
   buildDepends = [
     cereal certificate cryptohash cryptoPubkey cryptoRandomApi mtl
     network

pkgs/development/libraries/haskell/vty-ui/default.nix

@@ -0,0 +1,20 @@
+{ cabal, filepath, mtl, QuickCheck, random, regexBase, stm, text
+, time, vector, vty
+}:
+
+cabal.mkDerivation (self: {
+  pname = "vty-ui";
+  version = "1.6";
+  sha256 = "0chwgzzk2pl9kppd9r6h2azbqc668xpdrrk5y415yi8wcw61s0bc";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    filepath mtl QuickCheck random regexBase stm text time vector vty
+  ];
+  meta = {
+    homepage = "http://jtdaugherty.github.com/vty-ui/";
+    description = "An interactive terminal user interface library for Vty";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

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

@@ -1,13 +1,15 @@
-{ cabal, deepseq, mtl, parallel, parsec, terminfo, utf8String
-, vector
+{ cabal, deepseq, mtl, parallel, parsec, stringQq, terminfo
+, utf8String, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "vty";
-  version = "4.7.0.20";
-  sha256 = "15slw4zpvfkx9qwj2g5ndcxwbw0kkhyq8frvh9kharqd0zqzgqzb";
+  version = "4.7.3";
+  sha256 = "0x059mzw6v2xf92fdhy0ilyqbics2as6dqrdr6njpp0m6qykkybb";
+  isLibrary = true;
+  isExecutable = true;
   buildDepends = [
-    deepseq mtl parallel parsec terminfo utf8String vector
+    deepseq mtl parallel parsec stringQq terminfo utf8String vector
   ];
   meta = {
     homepage = "https://github.com/coreyoconnor/vty";

pkgs/development/libraries/haskell/wai-extra/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "1.3.2";
-  sha256 = "1089sfb4jyi17rw6nivpy96gbc90nyawr35jzwlzl41gzxxmv503";
+  version = "1.3.2.1";
+  sha256 = "13w3nhz59h4j25fsy95221y71k300plhs4vjqz2wxaigpv9sc2y7";
   buildDepends = [
     ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
     conduit dataDefault dateCache fastLogger httpTypes network

pkgs/development/libraries/haskell/wai-test/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-test";
-  version = "1.3.0";
-  sha256 = "15y0aw5c4sh1mns4ss39l0wsxrd1b6yq6m5r638x23zl6y7d9j40";
+  version = "1.3.0.1";
+  sha256 = "0yy0bvkrny4kj77wvn0cflwha6yijfxvnj530ps7xnzv1qm8qn1l";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie
     httpTypes HUnit text transformers wai

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai";
-  version = "1.3.0.1";
-  sha256 = "0z6byx71awhjb7fycz1ixsyzzlsrv1i69qwjrfzh9y5wnbchj9yl";
+  version = "1.3.0.2";
+  sha256 = "1ijxdnl76kkm2qck5qiwdwqvwkbpw8zbilfaz67sfbz3ccwls2fc";
   buildDepends = [
     blazeBuilder conduit httpTypes network text transformers vault
   ];