Merge master into stdenv-updates

Conflicts: pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved) pkgs/top-level/all-packages.nix (trivial)
author: Vladimír Čunát <vcunat@gmail.com> 2014-01-12 12:27:06 +0100
committer: Vladimír Čunát <vcunat@gmail.com> 2014-01-12 12:29:24 +0100
commit: a2c316288c8f3714e57dc1037d7a993a2088ab18 (patch)
tree: ee4af0b96a5bc0e55b92c8d76465b333a698a260 /pkgs/development
parent: 51713fbbfcaf819f176df8f3ce75f57880aeb690 (diff)
parent: a0070a9157d7d145eed22160cec2562d24032013 (diff)
download: nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar
nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.gz
nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.bz2
nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.lz
nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.xz
nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.zst
nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.zip
121 files changed, 974 insertions, 325 deletions
diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
new file mode 100644
index 000000000000..96a3d2abfc66
--- /dev/null
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchurl, gcc, unzip, curl }:
+
+stdenv.mkDerivation {
+  name = "dmd-2.064.2";
+
+  src = fetchurl {
+    url = http://downloads.dlang.org/releases/2013/dmd.2.064.2.zip;
+    sha256 = "1i0jdybigffwyb7c43j0c4aayxx3b93zzqrjxyw6zgp06yhi06pm";
+  };
+
+  buildInputs = [ gcc unzip curl ];
+
+  configurePhase = "";
+  patchPhase = ''
+      cp src/VERSION src/dmd/
+      cp license.txt src/phobos/LICENSE_1_0.txt
+  '';
+  buildPhase = ''
+      cd src/dmd
+      make -f posix.mak INSTALL_DIR=$out
+      export DMD=$PWD/dmd
+      cd ../druntime 
+      make -f posix.mak INSTALL_DIR=$out DMD=$DMD
+      cd ../phobos
+      make -f posix.mak INSTALL_DIR=$out DMD=$DMD
+      cd ../..
+  '';
+
+  installPhase = ''
+      cd src/dmd
+      tee dmd.conf.default << EOF
+          [Environment]
+          DFLAGS=-I$out/import -L-L$out/lib
+      EOF
+
+      make -f posix.mak INSTALL_DIR=$out install
+      export DMD=$PWD/dmd
+      cd ../druntime 
+      make -f posix.mak INSTALL_DIR=$out install
+      cd ../phobos
+      make -f posix.mak INSTALL_DIR=$out install
+      cd ../..
+  '';
+
+  meta = {
+    description = "D language compiler";
+    homepage = http://dlang.org/;
+    license = "open source, see included files";
+    maintainers = with stdenv.lib.maintainers; [ vlstill ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/development/compilers/elm/elm-server.nix b/pkgs/development/compilers/elm/elm-server.nix
index 56924d589f4d..760a6f072de1 100644
--- a/pkgs/development/compilers/elm/elm-server.nix
+++ b/pkgs/development/compilers/elm/elm-server.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "elm-server";
-  version = "0.9.0.2";
-  sha256 = "0g362llb7jkwz8xhyhhsc8hz0vj7s7bgfz1az5qfh1cm4h8nynwr";
+  version = "0.10.1";
+  sha256 = "0rh01jm9h9zbslnzy6xg7bin76gdmypannh3ly40azplw9xmf2dn";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/compilers/rdmd/default.nix b/pkgs/development/compilers/rdmd/default.nix
new file mode 100644
index 000000000000..9177ad5e25b5
--- /dev/null
+++ b/pkgs/development/compilers/rdmd/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, writeText, lib, dmd }:
+
+stdenv.mkDerivation {
+  name = "rdmd-2.064";
+
+  src = fetchurl {
+    url = https://raw2.github.com/D-Programming-Language/tools/2.064/rdmd.d;
+    sha256 = "0b1g3ng6bkanvg00r6xb4ycpbh9x8b9dw589av665azxbcraqrs1";
+    name = "rdmd-src";
+  };
+
+  buildInputs = [ dmd ];
+
+  builder = writeText "drmd-builder.sh" ''
+      source $stdenv/setup
+      cp $src rdmd.d
+      dmd rdmd.d
+      mkdir -p $out/bin
+      cp rdmd $out/bin/
+  '';
+
+  meta = {
+    description = "rdmd wrapper for D language compiler";
+    homepage = http://dlang.org/rdmd.html;
+    license = lib.licenses.boost;
+    maintainers = with stdenv.lib.maintainers; [ vlstill ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/development/compilers/vala/15.2.nix b/pkgs/development/compilers/vala/15.2.nix
deleted file mode 100644
index 529ccea6bc80..000000000000
--- a/pkgs/development/compilers/vala/15.2.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}:
-
-stdenv.mkDerivation rec {
-
-  version = "0.15.2";
-  name = "vala-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/vala/0.15/${name}.tar.xz";
-    sha256 = "0g71zq6dpqrw2f40wfzdf18fdw41ymr17laqniy2kr622hkxdi8w";
-  };
-
-  nativeBuildInputs = [ yacc flex pkgconfig xz ];
-
-  buildInputs = [ glib ];
-
-  meta = {
-    description = "Compiler for the GObject type system";
-    homepage = "http://live.gnome.org/Vala";
-    license = "free-copyleft";
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.antono ];
-  };
-}
diff --git a/pkgs/development/compilers/vala/16.1.nix b/pkgs/development/compilers/vala/16.1.nix
deleted file mode 100644
index f054c59d2e4b..000000000000
--- a/pkgs/development/compilers/vala/16.1.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}:
-
-stdenv.mkDerivation rec {
-
-  version = "0.16.1";
-  name = "vala-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/vala/0.16/${name}.tar.xz";
-    sha256 = "1n708n9ixyy9qrzyv1wf4ybvcclx43ib9ki028wwpvkz6kv8zqlb";
-  };
-
-  nativeBuildInputs = [ yacc flex pkgconfig xz ];
-
-  buildInputs = [ glib ];
-
-  meta = {
-    description = "Compiler for the GObject type system";
-    homepage = "http://live.gnome.org/Vala";
-    license = "free-copyleft";
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.antono ];
-  };
-}
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 9af30230757e..95c37edb09a2 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -1,31 +1,31 @@
-{ stdenv, fetchurl, yacc, flex, pkgconfig, glib, dbus, dbus_tools
-, libiconvOrEmpty, libintlOrEmpty }:
+{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt
+, glib, libiconvOrEmpty, libintlOrEmpty
+}:
 
+let
+  major = "0.23";
+  minor = "1";
+  sha256 = "1m8f2d01r4jqp266mk29qsl68lzh7c258cqd5zzbpbryxszlzdfj";
+in
 stdenv.mkDerivation rec {
-  p_name  = "vala";
-  ver_maj = "0.19";
-  ver_min = "0";
+  name = "vala-${major}.${minor}";
 
-  src = fetchurl {
-    url = "mirror://gnome/sources/${p_name}/${ver_maj}/${name}.tar.xz";
-    sha256 = "1vn524hcnaggz8zx49mvf7p4z1mscrlj2syg7jjhph8nak5wi0bp";
+  meta = {
+    description = "Compiler for GObject type system";
+    homepage = "http://live.gnome.org/Vala";
+    license = stdenv.lib.licenses.lgpl21Plus;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ antono iyzsong ];
   };
-  name = "${p_name}-${ver_maj}.${ver_min}";
-
-  postPatch = "patchShebangs .";
-
-  nativeBuildInputs = [ yacc flex pkgconfig ];
 
-  buildInputs = [ glib ] ++ libiconvOrEmpty ++ libintlOrEmpty
-    ++ stdenv.lib.optional doCheck [ dbus dbus_tools ];
+  src = fetchurl {
+    url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz";
+    inherit sha256;
+  };
 
-  doCheck = false; # problems when launching dbus tests
+  nativeBuildInputs = [ pkgconfig flex bison libxslt ];
 
-  meta = {
-    description = "Compiler for the GObject type system";
-    homepage = "http://live.gnome.org/Vala";
-    license = "free-copyleft";
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.antono ];
-  };
+  buildInputs = [ glib ]
+    ++ libiconvOrEmpty
+    ++ libintlOrEmpty;
 }
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 428d97eaf794..eb7e925561c8 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,22 +1,36 @@
 {stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull,
-libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig, mesa, fltk,
-fftw, fftwSinglePrec, zlib, curl, qrupdate }:
+libX11, graphicsmagick, pcre, liblapack, pkgconfig, mesa, fltk,
+fftw, fftwSinglePrec, zlib, curl, qrupdate
+, qt ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null
+, suitesparse ? null, gnuplot ? null, openjdk ? null, python ? null
+}:
 
 let
-  version = "3.6.4";
+  version = "3.8.0";
 in
 stdenv.mkDerivation rec {
   name = "octave-${version}";
   src = fetchurl {
     url = "mirror://gnu/octave/${name}.tar.bz2";
-    sha256 = "0qn9s7jrjmrn6w3rvp8d7vfnymyv0spnxzrp9l7p8p8zb7wms67s";
+    sha256 = "1yclb8p4mcx9xcjajyynxfnc5spw90lp44d84v56ksrlvp3314si";
   };
 
   buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
     graphicsmagick pcre liblapack pkgconfig mesa fltk zlib curl
-    fftw fftwSinglePrec qrupdate ];
-
-  doCheck = true;
+    fftw fftwSinglePrec qrupdate ]
+    ++ (stdenv.lib.optional (qt != null) qt)
+    ++ (stdenv.lib.optional (ghostscript != null) ghostscript)
+    ++ (stdenv.lib.optional (llvm != null) llvm)
+    ++ (stdenv.lib.optional (hdf5 != null) hdf5)
+    ++ (stdenv.lib.optional (glpk != null) glpk)
+    ++ (stdenv.lib.optional (suitesparse != null) suitesparse)
+    ++ (stdenv.lib.optional (openjdk != null) openjdk)
+    ++ (stdenv.lib.optional (gnuplot != null) gnuplot)
+    ++ (stdenv.lib.optional (python != null) python)
+    ;
+
+  # there is a mysterious sh: command not found
+  doCheck = false;
 
   /* The build failed with a missing libranlib.la in hydra,
      but worked on my computer. I think they have concurrency problems */
@@ -27,7 +41,7 @@ stdenv.mkDerivation rec {
   # Keep a copy of the octave tests detailed results in the output
   # derivation, because someone may care
   postInstall = ''
-    cp test/fntests.log $out/share/octave/${name}-fntests.log
+    cp test/fntests.log $out/share/octave/${name}-fntests.log || true
   '';
 
   passthru = {
@@ -38,7 +52,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://octave.org/;
     license = "GPLv3+";
-    maintainers = with stdenv.lib.maintainers; [viric];
+    maintainers = with stdenv.lib.maintainers; [viric raskin];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
new file mode 100644
index 000000000000..77a9392ba8bb
--- /dev/null
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, cmake, pkgconfig
+, jackaudio, libsndfile, fftw, curl
+, libXt, qt
+}:
+
+stdenv.mkDerivation rec {
+  name = "supercollider-3.6.6";
+
+  meta = {
+    description = "Programming language for real time audio synthesis";
+    homepage = "http://supercollider.sourceforge.net/";
+    license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.linux;
+  };
+
+  src = fetchurl {
+    url = "mirror://sourceforge/supercollider/Source/3.6/SuperCollider-3.6.6-Source.tar.bz2";
+    sha256 = "11khrv6jchs0vv0lv43am8lp0x1rr3h6l2xj9dmwrxcpdayfbalr";
+  };
+
+  # QGtkStyle unavailable
+  patchPhase = ''
+    substituteInPlace editors/sc-ide/widgets/code_editor/autocompleter.cpp \
+      --replace Q_WS_X11 Q_GTK_STYLE
+  '';
+
+  cmakeFlags = [
+    "-DSC_WII=OFF"
+    "-DSC_EL=OFF"
+  ];
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [
+    jackaudio libsndfile fftw curl
+    libXt qt
+  ];
+}
diff --git a/pkgs/development/libraries/accountservice/default.nix b/pkgs/development/libraries/accountservice/default.nix
new file mode 100644
index 000000000000..8cab9e39e19d
--- /dev/null
+++ b/pkgs/development/libraries/accountservice/default.nix
@@ -0,0 +1,13 @@
+{ stdenv, fetchurl, pkgconfig, glib, intltool, libtool, gobjectIntrospection, polkit }:
+
+stdenv.mkDerivation rec {
+  name = "accountsservice-0.6.35";
+  
+  src = fetchurl {
+    url = http://www.freedesktop.org/software/accountsservice/accountsservice-0.6.35.tar.xz;
+    sha256 = "0f1hzl6hw56xvwgmd4yvmdyj15xj1fafw45pzv3qarww7h0wg8b5";
+  };
+
+  buildInputs = [ pkgconfig glib intltool libtool gobjectIntrospection polkit ];
+
+}
diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix
new file mode 100644
index 000000000000..991c3e2fa4c0
--- /dev/null
+++ b/pkgs/development/libraries/exempi/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, expat, zlib, boost }:
+
+stdenv.mkDerivation rec {
+  name = "exempi-2.2.1";
+
+  src = fetchurl {
+    url = "http://libopenraw.freedesktop.org/download/${name}.tar.bz2";
+    sha256 = "00d6gycl0wcyd3c71y0jp033a64z203rq0p0y07aig0s0j0477kc";
+  };
+
+  configureFlags = [ "--with-boost=${boost}" ];
+
+  buildInputs = [ expat zlib boost ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix
new file mode 100644
index 000000000000..a9c8b19dc501
--- /dev/null
+++ b/pkgs/development/libraries/fdk-aac/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+let version = "0.1.3";
+in
+stdenv.mkDerivation {
+  name = "fdk-aac-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/opencore-amr/fdk-aac/fdk-aac-${version}.tar.gz";
+    sha256 = "138c1l6c571289czihk0vlcfbla7qlac2jd5yyps5dyg08l8gjx9";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A high-quality implementation of the AAC codec from Android";
+    homepage = "http://sourceforge.net/projects/opencore-amr/";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix
index 475da7c4c643..90f8f9299e75 100644
--- a/pkgs/development/libraries/ffmpeg/2.x.nix
+++ b/pkgs/development/libraries/ffmpeg/2.x.nix
@@ -1,35 +1,9 @@
-{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib, texinfo, perl
-, mp3Support ? true, lame ? null
-, speexSupport ? true, speex ? null
-, theoraSupport ? true, libtheora ? null
-, vorbisSupport ? true, libvorbis ? null
-, vpxSupport ? false, libvpx ? null
-, x264Support ? true, x264 ? null
-, xvidSupport ? true, xvidcore ? null
-, opusSupport ? true, libopus ? null
-, vdpauSupport ? true, libvdpau ? null
-, vaapiSupport ? true, libva ? null
-, faacSupport ? false, faac ? null
-, dc1394Support ? false, libdc1394 ? null
-, x11grabSupport ? false, libXext ? null, libXfixes ? null
-, playSupport ? true, SDL ? null
-, freetypeSupport ? true, freetype ? null, fontconfig ? null
+{ stdenv, fetchurl, config, pkgconfig, yasm, zlib, bzip2, alsaLib, texinfo, perl
+, lame, speex, libtheora, libvorbis, libvpx, x264, xvidcore, libopus
+, libvdpau, libva, faac, libdc1394, libXext, libXfixes, SDL
+, freetype, fontconfig, fdk_aac
 }:
 
-assert speexSupport -> speex != null;
-assert theoraSupport -> libtheora != null;
-assert vorbisSupport -> libvorbis != null;
-assert vpxSupport -> libvpx != null;
-assert x264Support -> x264 != null;
-assert xvidSupport -> xvidcore != null;
-assert opusSupport -> libopus != null;
-assert vdpauSupport -> libvdpau != null;
-assert vaapiSupport -> libva != null;
-assert faacSupport -> faac != null;
-assert x11grabSupport -> libXext != null && libXfixes != null;
-assert playSupport -> SDL != null;
-assert freetypeSupport -> freetype != null;
-
 stdenv.mkDerivation rec {
   name = "ffmpeg-2.1.1";
 
@@ -38,6 +12,23 @@ stdenv.mkDerivation rec {
     sha256 = "1qnspbpwa6cflsb6mkm84ay4nfx60ism6d7lgvnasidck9dmxydy";
   };
 
+  mp3Support = config.ffmpeg.mp3 or true;
+  speexSupport = config.ffmpeg.speex or true;
+  theoraSupport = config.ffmpeg.theora or true;
+  vorbisSupport = config.ffmpeg.vorbis or true;
+  vpxSupport = config.ffmpeg.vpx or false;
+  x264Support = config.ffmpeg.x264 or true;
+  xvidSupport = config.ffmpeg.xvid or true;
+  opusSupport = config.ffmpeg.opus or true;
+  vdpauSupport = config.ffmpeg.vdpau or true;
+  vaapiSupport = config.ffmpeg.vaapi or true;
+  faacSupport = config.ffmpeg.faac or false;
+  fdkAACSupport = config.ffmpeg.fdk or false;
+  dc1394Support = config.ffmpeg.dc1394 or false;
+  x11grabSupport = config.ffmpeg.x11grab or false;
+  playSupport = config.ffmpeg.play or true;
+  freetypeSupport = config.ffmpeg.freetype or true;
+
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
   # the resulting library is GPL'ed, so it can only be used in GPL'ed
   # applications.
@@ -62,7 +53,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
     ++ stdenv.lib.optional x11grabSupport "--enable-x11grab"
     ++ stdenv.lib.optional playSupport "--enable-ffplay"
-    ++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig";
+    ++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig"
+    ++ stdenv.lib.optional fdkAACSupport "--enable-libfdk_aac --enable-nonfree";
 
   buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ]
     ++ stdenv.lib.optional mp3Support lame
@@ -79,7 +71,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional dc1394Support libdc1394
     ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]
     ++ stdenv.lib.optional playSupport SDL
-    ++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ];
+    ++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ]
+    ++ stdenv.lib.optional fdkAACSupport fdk_aac;
 
   enableParallelBuilding = true;
 
@@ -100,5 +93,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.ffmpeg.org/;
     description = "A complete, cross-platform solution to record, convert and stream audio and video";
+    license = if (fdkAACSupport || faacSupport) then stdenv.lib.licenses.unfree else stdenv.lib.licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index 3c4c2703d6f4..abb782641dde 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "1iyncz8fqazw683dxjls3lf5pw3f5ma8kachkvjz7dsq57wxllbj";
   };
 
+  cmakeFlags = "-DTHREADSAFE=ON";
+
   nativeBuildInputs = [ cmake python ];
   buildInputs = [ zlib ];
 
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
new file mode 100644
index 000000000000..81207155625a
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, pkgconfig, python, gst-plugins-base, orc
+, faac, faad2, libass, libkate, libmms
+, libmodplug, mpeg2dec, mpg123 
+, openjpeg, libopus, librsvg
+, timidity, libvdpau, wayland
+, libwebp, xvidcore, gnutls
+}:
+
+stdenv.mkDerivation rec {
+  name = "gst-plugins-bad-1.2.2";
+
+  meta = {
+    homepage = "http://gstreamer.freedesktop.org";
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ iyzsong ];
+  };
+
+  src = fetchurl {
+    url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
+    sha256 = "63e78db11b482d0529a0bde01e2ac23fd32c7cb99a5508b53ee4ca1051871b2c";
+  };
+
+  nativeBuildInputs = [ pkgconfig python ];
+
+  buildInputs = [
+    gst-plugins-base orc
+    faac faad2 libass libkate libmms
+    libmodplug mpeg2dec mpg123 
+    openjpeg libopus librsvg
+    timidity libvdpau wayland
+    libwebp xvidcore gnutls
+  ];
+}
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
new file mode 100644
index 000000000000..01a75ce52112
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig, python, gstreamer, gobjectIntrospection
+, orc, alsaLib, libXv, pango, libtheora
+, cdparanoia, libvisual
+}:
+
+stdenv.mkDerivation rec {
+  name = "gst-plugins-base-1.2.2";
+
+  meta = {
+    description = "Base plugins and helper libraries";
+    homepage = "http://gstreamer.freedesktop.org";
+    license = stdenv.lib.licenses.lgpl2Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ iyzsong ];
+  };
+
+  src = fetchurl {
+    url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
+    sha256 = "fa90cf21eac0a77f9393100356aef99ae42072c31dc218d3ae2e7f86cd5ced69";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig python gobjectIntrospection
+  ];
+
+  buildInputs = [
+    orc alsaLib libXv pango libtheora
+    cdparanoia libvisual
+  ];
+
+  propagatedBuildInputs = [ gstreamer ];
+}
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
new file mode 100644
index 000000000000..5e7548627fe2
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pkgconfig, perl, bison, flex, python, gobjectIntrospection
+, glib 
+}:
+
+stdenv.mkDerivation rec {
+  name = "gstreamer-1.2.2";
+
+  meta = {
+    description = "Open source multimedia framework";
+    homepage = "http://gstreamer.freedesktop.org";
+    license = stdenv.lib.licenses.lgpl2Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ iyzsong ];
+  };
+
+  src = fetchurl {
+    url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
+    sha256 = "b9f12137ab663edc6c37429b38ca7911074b9c2a829267fe855d4e57d916a0b6";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig perl bison flex python gobjectIntrospection
+  ];
+
+  propagatedBuildInputs = [ glib ];
+}
diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
new file mode 100644
index 000000000000..1d02e6459ab2
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -0,0 +1,15 @@
+{ callPackage }:
+
+rec {
+  gstreamer = callPackage ./core { };
+
+  gst-plugins-base = callPackage ./base { inherit gstreamer; };
+
+  gst-plugins-good = callPackage ./good { inherit gst-plugins-base; };
+
+  gst-plugins-bad = callPackage ./bad { inherit gst-plugins-base; };
+
+  gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base; };
+
+  gst-libav = callPackage ./libav { inherit gst-plugins-base; };
+}
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
new file mode 100644
index 000000000000..616f63d7da7f
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgconfig, python
+, gst-plugins-base, orc, bzip2
+, libv4l, libdv, libavc1394, libiec61883
+, libvpx, speex, flac, taglib
+, cairo, gdk_pixbuf, aalib, libcaca
+, libsoup, pulseaudio
+}:
+
+stdenv.mkDerivation rec {
+  name = "gst-plugins-good-1.2.2";
+
+  meta = {
+    homepage = "http://gstreamer.freedesktop.org";
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ iyzsong ];
+  };
+
+  src = fetchurl {
+    url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
+    sha256 = "6c090f00e8e4588f12807bd9fbb06a03b84a512c93e84d928123ee4a42228a81";
+  };
+
+  nativeBuildInputs = [ pkgconfig python ];
+
+  buildInputs = [
+    gst-plugins-base orc bzip2
+    libv4l libdv libavc1394 libiec61883
+    libvpx speex flac taglib
+    cairo gdk_pixbuf aalib libcaca
+    libsoup pulseaudio
+  ];
+}
diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
index 820e8eb07c9e..820e8eb07c9e 100644
--- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
diff --git a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix
index 49c612f59e74..49c612f59e74 100644
--- a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix
index a433d717039f..a433d717039f 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
index 59ee86da86d4..59ee86da86d4 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
index a09f82797608..a09f82797608 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/v4l.patch b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/v4l.patch
index 22cff574134f..22cff574134f 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-good/v4l.patch
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/v4l.patch
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
index 769de911fd6a..769de911fd6a 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
diff --git a/pkgs/development/libraries/gstreamer/gst-python/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix
index e960aa90421b..e960aa90421b 100644
--- a/pkgs/development/libraries/gstreamer/gst-python/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix
diff --git a/pkgs/development/libraries/gstreamer/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
index 392e8e31f436..392e8e31f436 100644
--- a/pkgs/development/libraries/gstreamer/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
diff --git a/pkgs/development/libraries/gstreamer/gstreamer/setup-hook.sh b/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh
index ad184dc21e99..ad184dc21e99 100644
--- a/pkgs/development/libraries/gstreamer/gstreamer/setup-hook.sh
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh
diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/boost1.48.patch b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch
index c48eec68a640..c48eec68a640 100644
--- a/pkgs/development/libraries/gstreamer/qt-gstreamer/boost1.48.patch
+++ b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch
diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
index c3510a69a123..c3510a69a123 100644
--- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
new file mode 100644
index 000000000000..47be4c8f4a05
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, pkgconfig, python, yasm
+, gst-plugins-base, orc, bzip2
+, withSystemLibav ? true, libav ? null
+}:
+
+assert withSystemLibav -> libav != null;
+
+stdenv.mkDerivation rec {
+  name = "gst-libav-1.2.2";
+
+  meta = {
+    homepage = "http://gstreamer.freedesktop.org";
+    license = stdenv.lib.licenses.lgpl2Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ iyzsong ];
+  };
+
+  src = fetchurl {
+    url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
+    sha256 = "585eb7971006100ad771a852e07bd2f3e23bcc6eb0b1253a40b5a0e40e4e7418";
+  };
+
+  configureFlags = stdenv.lib.optionalString withSystemLibav
+    "--with-system-libav";
+
+  nativeBuildInputs = with stdenv.lib;
+    [ pkgconfig python ]
+    ++ optional (!withSystemLibav) yasm
+    ;
+
+  buildInputs = with stdenv.lib;
+    [ gst-plugins-base orc bzip2 ]
+    ++ optional withSystemLibav libav
+    ;
+}
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
new file mode 100644
index 000000000000..8dafbf013f37
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, python
+, gst-plugins-base, orc
+, a52dec, libcdio, libdvdread
+, lame, libmad, libmpeg2, x264
+}:
+
+stdenv.mkDerivation rec {
+  name = "gst-plugins-ugly-1.2.2";
+
+  meta = {
+    homepage = "http://gstreamer.freedesktop.org";
+    license = stdenv.lib.licenses.lgpl2Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ iyzsong ];
+  };
+
+  src = fetchurl {
+    url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
+    sha256 = "4b6aac272a5be0d68f365ef6fba0f829fc5c1d1d601bb4dd9e85f5289b2b56c3";
+  };
+
+  nativeBuildInputs = [ pkgconfig python ];
+
+  buildInputs = [
+    gst-plugins-base orc
+    a52dec libcdio libdvdread
+    lame libmad libmpeg2 x264
+  ];
+}
diff --git a/pkgs/development/libraries/gtk-sharp-1/default.nix b/pkgs/development/libraries/gtk-sharp-1/default.nix
index aad440bf6725..863ee6c038d6 100644
--- a/pkgs/development/libraries/gtk-sharp-1/default.nix
+++ b/pkgs/development/libraries/gtk-sharp-1/default.nix
@@ -23,7 +23,10 @@ stdenv.mkDerivation {
     md5 = "2651d14fe77174ab20b8af53d150ee11";
   };
 
-  patches = [ ./dllmap-glue.patch ];
+  patches = [
+    ./dllmap-glue.patch
+    ./glib-include.patch
+  ];
 
   buildInputs = [
     pkgconfig mono glib pango gtk GConf libglade libgnomecanvas
diff --git a/pkgs/development/libraries/gtk-sharp-1/glib-include.patch b/pkgs/development/libraries/gtk-sharp-1/glib-include.patch
new file mode 100644
index 000000000000..e8f4b0ef5af3
--- /dev/null
+++ b/pkgs/development/libraries/gtk-sharp-1/glib-include.patch
@@ -0,0 +1,24 @@
+diff -ru gtk-sharp-1.0.6.orig/glib/glue/list.c gtk-sharp-1.0.6/glib/glue/list.c
+--- gtk-sharp-1.0.6.orig/glib/glue/list.c	2014-01-09 10:58:06.727352451 +0000
++++ gtk-sharp-1.0.6/glib/glue/list.c	2014-01-09 11:00:34.256583614 +0000
+@@ -20,7 +20,7 @@
+  */
+ 
+ 
+-#include <glib/glist.h>
++#include <glib.h>
+ 
+ /* Forward declarations */
+ gpointer gtksharp_list_get_data (GList *l);
+diff -ru gtk-sharp-1.0.6.orig/glib/glue/slist.c gtk-sharp-1.0.6/glib/glue/slist.c
+--- gtk-sharp-1.0.6.orig/glib/glue/slist.c	2014-01-09 10:58:06.727352451 +0000
++++ gtk-sharp-1.0.6/glib/glue/slist.c	2014-01-09 11:00:47.572695223 +0000
+@@ -20,7 +20,7 @@
+  */
+ 
+ 
+-#include <glib/gslist.h>
++#include <glib.h>
+ 
+ /* Forward declarations */
+ gpointer gtksharp_slist_get_data (GSList *l);
diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix
new file mode 100644
index 000000000000..54023f29a07f
--- /dev/null
+++ b/pkgs/development/libraries/gtkspell/3.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, intltool}:
+
+stdenv.mkDerivation rec {
+  name = "gtkspell-${version}";
+  version = "3.0.4";
+  
+  src = fetchurl {
+    url = "mirror://sourceforge/gtkspell/gtkspell3-${version}.tar.gz";
+    sha256 = "19z48gfbraasrxai7qdkxxvky0kwifkkzqz0jqcskhcr1ikqxgzs";
+  };
+  
+  buildInputs = [ aspell pkgconfig gtk3 enchant intltool ];
+  propagatedBuildInputs = [ enchant ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/haskell/DRBG/default.nix b/pkgs/development/libraries/haskell/DRBG/default.nix
index 0d479b815153..81f0455bd5a5 100644
--- a/pkgs/development/libraries/haskell/DRBG/default.nix
+++ b/pkgs/development/libraries/haskell/DRBG/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "DRBG";
-  version = "0.5.1";
-  sha256 = "0mqgll5rf0h0yrdng1w9i8pis4yv9f4qffkh4c0g1ng5lxa9l747";
+  version = "0.5.2";
+  sha256 = "0c8w8h2mxpk2avj6321q9a1smzp970cyn87aj98vn8dln7h9cqsi";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
index 9b044f6dbab5..dfaa69bca93f 100644
--- a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
+++ b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
@@ -1,10 +1,10 @@
-{ cabal, extensibleExceptions, mtl }:
+{ cabal, extensibleExceptions, MonadCatchIOTransformers }:
 
 cabal.mkDerivation (self: {
   pname = "MonadCatchIO-mtl";
-  version = "0.3.0.5";
-  sha256 = "01c2xif4aly2lmg2qkri791ignq3r2qg4xbc8m06cdm6gh5a2dqp";
-  buildDepends = [ extensibleExceptions mtl ];
+  version = "0.3.1.0";
+  sha256 = "0qarf73c8zq8dgvxdiwqybpjfy8gba9vf4k0skiwyk5iphilxhhq";
+  buildDepends = [ extensibleExceptions MonadCatchIOTransformers ];
   meta = {
     homepage = "http://darcsden.com/jcpetruzza/MonadCatchIO-mtl";
     description = "Monad-transformer version of the Control.Exception module";
diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix
index 9ac3036ffb51..883e7767c6d3 100644
--- a/pkgs/development/libraries/haskell/RSA/default.nix
+++ b/pkgs/development/libraries/haskell/RSA/default.nix
@@ -14,6 +14,7 @@ cabal.mkDerivation (self: {
     binary cryptoApi cryptoPubkeyTypes DRBG pureMD5 QuickCheck SHA
     tagged testFramework testFrameworkQuickcheck2
   ];
+  doCheck = false;
   meta = {
     description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix
index 343412700842..c2cbe154424a 100644
--- a/pkgs/development/libraries/haskell/SHA/default.nix
+++ b/pkgs/development/libraries/haskell/SHA/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "SHA";
-  version = "1.6.1";
-  sha256 = "1v3a2skkbr64y7x1aqpq1qz03isc42l9hd1viqcsv4qlld595fgx";
+  version = "1.6.2.1";
+  sha256 = "0knzwqgwshr9b0rf8mf6xmgp3qxv4yavg0zy9xz4zmgm5319mvla";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ binary ];
diff --git a/pkgs/development/libraries/haskell/aeson-pretty/default.nix b/pkgs/development/libraries/haskell/aeson-pretty/default.nix
index d51274c83e94..1b568541a133 100644
--- a/pkgs/development/libraries/haskell/aeson-pretty/default.nix
+++ b/pkgs/development/libraries/haskell/aeson-pretty/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "aeson-pretty";
-  version = "0.7";
-  sha256 = "0zkqs3f4mr0v0j582h9ssq7dxgfkk59s7y66b640hc4zf0b5p7g7";
+  version = "0.7.1";
+  sha256 = "0gmm1kmdbanfyfdyij1gnazycp1x9703qfa5hgrz39j9046zg3y6";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/alsa-mixer/default.nix b/pkgs/development/libraries/haskell/alsa-mixer/default.nix
new file mode 100644
index 000000000000..67ab0275e788
--- /dev/null
+++ b/pkgs/development/libraries/haskell/alsa-mixer/default.nix
@@ -0,0 +1,15 @@
+{ cabal, alsaCore, alsaLib, c2hs }:
+
+cabal.mkDerivation (self: {
+  pname = "alsa-mixer";
+  version = "0.1.2";
+  sha256 = "081f3a62f83a269d72e0b0fac8bae8c81e9ec342d592fa25abe57f7206cf4414";
+  buildDepends = [ alsaCore ];
+  buildTools = [ c2hs ];
+  extraLibraries = [ alsaLib ];
+  meta = {
+    description = "Bindings to the ALSA simple mixer API";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.stdenv.lib.platforms.linux;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/attoparsec/0.11.1.0.nix b/pkgs/development/libraries/haskell/attoparsec/0.11.1.0.nix
new file mode 100644
index 000000000000..bd7bdc745b28
--- /dev/null
+++ b/pkgs/development/libraries/haskell/attoparsec/0.11.1.0.nix
@@ -0,0 +1,20 @@
+{ cabal, deepseq, QuickCheck, scientific, testFramework
+, testFrameworkQuickcheck2, text
+}:
+
+cabal.mkDerivation (self: {
+  pname = "attoparsec";
+  version = "0.11.1.0";
+  sha256 = "09mks6lbzmqmdz6s10lvdklmc0mydd1sk5hphhnybp3yr4pvh7jc";
+  buildDepends = [ deepseq scientific text ];
+  testDepends = [
+    QuickCheck testFramework testFrameworkQuickcheck2 text
+  ];
+  meta = {
+    homepage = "https://github.com/bos/attoparsec";
+    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 ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/boomerang/default.nix b/pkgs/development/libraries/haskell/boomerang/default.nix
index 3e65c0a2dd4a..af0dbd338989 100644
--- a/pkgs/development/libraries/haskell/boomerang/default.nix
+++ b/pkgs/development/libraries/haskell/boomerang/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "boomerang";
-  version = "1.4.0";
-  sha256 = "1z6sx2r886jms59ah31is0fqkwix2kwxmpnrc6bb2r6xazznxfc9";
+  version = "1.4.1";
+  sha256 = "0pmaysp6vw6cnxh3px47pwflm4fc83idld09bpnfnh2jkscp630a";
   buildDepends = [ mtl text ];
   meta = {
     description = "Library for invertible parsing and printing";
diff --git a/pkgs/development/libraries/haskell/cassava/default.nix b/pkgs/development/libraries/haskell/cassava/default.nix
index 822cd41e4daf..0d4022062934 100644
--- a/pkgs/development/libraries/haskell/cassava/default.nix
+++ b/pkgs/development/libraries/haskell/cassava/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cassava";
-  version = "0.2.2.0";
-  sha256 = "0jv8lb9z7yf8rddyac0frsw4d1gchrgx8l9rryhl88gs7jss7dh7";
+  version = "0.3.0.0";
+  sha256 = "0s297664if9zp2y441jihcrmdfgdicjgncyx0rpddlr789vkbs9s";
   buildDepends = [
     attoparsec blazeBuilder deepseq text unorderedContainers vector
   ];
diff --git a/pkgs/development/libraries/haskell/charset/default.nix b/pkgs/development/libraries/haskell/charset/default.nix
index 829c35b75632..6907a33744ff 100644
--- a/pkgs/development/libraries/haskell/charset/default.nix
+++ b/pkgs/development/libraries/haskell/charset/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "charset";
-  version = "0.3.5.1";
-  sha256 = "0bf9s5r2j9bkwmjxzvj5c2c7bhnf5gyh2kkx67lmy8xqalfxgmwn";
+  version = "0.3.6";
+  sha256 = "1g8m8nd5f100jlhvs6hbny96wy8iaggmp1lv36a5jxc54gmyxjd1";
   buildDepends = [ semigroups unorderedContainers ];
   meta = {
     homepage = "http://github.com/ekmett/charset";
diff --git a/pkgs/development/libraries/haskell/cipher-aes128/default.nix b/pkgs/development/libraries/haskell/cipher-aes128/default.nix
index c8be6bcb0dcf..8bb093eb0f81 100644
--- a/pkgs/development/libraries/haskell/cipher-aes128/default.nix
+++ b/pkgs/development/libraries/haskell/cipher-aes128/default.nix
@@ -2,12 +2,14 @@
 
 cabal.mkDerivation (self: {
   pname = "cipher-aes128";
-  version = "0.5";
-  sha256 = "14rwnz0nwmy1zch1ywjxf2fgfs1xj84l4n785rhb6npmx6k7rmqd";
+  version = "0.6.2";
+  sha256 = "0rj56p8rcnvk95jc4fx4pxv25yk85vfad7v0znsgzp2hpw4h4ihb";
+  isLibrary = true;
+  isExecutable = true;
   buildDepends = [ cereal cryptoApi tagged ];
   meta = {
     homepage = "https://github.com/TomMD/cipher-aes128";
-    description = "AES128 using AES-NI when available";
+    description = "AES and common modes using AES-NI when available";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
diff --git a/pkgs/development/libraries/haskell/concreteTyperep/default.nix b/pkgs/development/libraries/haskell/concreteTyperep/default.nix
new file mode 100644
index 000000000000..20894b844ac6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/concreteTyperep/default.nix
@@ -0,0 +1,18 @@
+{ cabal, binary, hashable, QuickCheck, testFramework
+, testFrameworkQuickcheck2
+}:
+
+cabal.mkDerivation (self: {
+  pname = "concrete-typerep";
+  version = "0.1.0.2";
+  sha256 = "07wy8drg4723zdy2172jrcvd5ir2c4ggcfz1n33jhm9iv3cl2app";
+  buildDepends = [ binary hashable ];
+  testDepends = [
+    binary hashable QuickCheck testFramework testFrameworkQuickcheck2
+  ];
+  meta = {
+    description = "Binary and Hashable instances for TypeRep";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix
index aa786fa97840..5741d4b3c2e7 100644
--- a/pkgs/development/libraries/haskell/crypto-api/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-api/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-api";
-  version = "0.12.2.2";
-  sha256 = "0qmv8vizrbjs3k2f78r6ykyilps4zp7xxpzdxw7rngh154wqgv1k";
+  version = "0.13";
+  sha256 = "00zw9cymjhsdiy2p4prjvmmy7xnk12qggdpvxrp0hjnwlakfvyb2";
   buildDepends = [ cereal entropy tagged transformers ];
   meta = {
     homepage = "https://github.com/TomMD/crypto-api";
diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix
index 1dc356b7f465..4450c3f4c617 100644
--- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     cereal conduit cryptoApi cryptocipher cryptohashCryptoapi hspec
     skein transformers
   ];
+  patchPhase = ''
+    sed -i -e 's|crypto-api >=.*|crypto-api|' crypto-conduit.cabal
+  '';
   jailbreak = true;
   doCheck = false;
   meta = {
diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-mtl.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-mtl.nix
new file mode 100644
index 000000000000..ce550d02beb5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-mtl.nix
@@ -0,0 +1,14 @@
+{ cabal, dataAccessor, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "data-accessor-mtl";
+  version = "0.2.0.3";
+  sha256 = "1aksmm4ykb96khgq5y4vd40zbn4c73hgl21xvyc295cwxsyrbvbk";
+  buildDepends = [ dataAccessor mtl ];
+  meta = {
+    homepage = "http://www.haskell.org/haskellwiki/Record_access";
+    description = "Use Accessor to access state in mtl State monad class";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix
index 672cd60e7a57..60a0e729725b 100644
--- a/pkgs/development/libraries/haskell/diagrams/contrib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-contrib";
-  version = "1.0.0.1";
-  sha256 = "0h0rgy2wlmqicrq4zqr1pdff7b7l7ylm1z82iy3adxf38ca2r6y2";
+  version = "1.1";
+  sha256 = "1f2rcqmcf94ykas4qjfcksh89z2p0hr4s1zkcx0izphrazjyj9gq";
   buildDepends = [
     arithmoi circlePacking colour dataDefault dataDefaultClass
     diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec
diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
index e6590ecc2dda..7a0cd53218de 100644
--- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix
+++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams";
-  version = "1.0";
-  sha256 = "0l7d8l06g6nn6bkkwdn8ra9ir1dnqj6qsgdzd9jk78dqq5ihp7bg";
+  version = "1.0.0.1";
+  sha256 = "0nlh4n5ykymjkyi9n0r5l1caq1f26mijw7smnj78mv3d40qcrnv1";
   buildDepends = [
     diagramsContrib diagramsCore diagramsLib diagramsSvg
   ];
diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix
index 1b091d871bb8..5e55f3a6d59c 100644
--- a/pkgs/development/libraries/haskell/errors/default.nix
+++ b/pkgs/development/libraries/haskell/errors/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "errors";
-  version = "1.4.4";
-  sha256 = "1mhh5xna5nppqg8aw93iil7nsnpx5j6r21a12bx4mmip8nzr6480";
+  version = "1.4.5";
+  sha256 = "16m4psk1150319bd2hrswpp2h90l1hhh7w13arfhy4ylh8vscm4q";
   buildDepends = [ either safe transformers ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix
index 77ecd7110592..0e9a2dae8b48 100644
--- a/pkgs/development/libraries/haskell/fast-logger/default.nix
+++ b/pkgs/development/libraries/haskell/fast-logger/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fast-logger";
-  version = "2.1.0";
-  sha256 = "116xdk455vlgyj3ck3bpzyavbfwq9asj2hlyjazb8vb1f9byxxkf";
+  version = "2.1.2";
+  sha256 = "0kz31jfhc40wlw3b49zcsn97y6vc9qqnaci743mgjskv4zbqaf34";
   buildDepends = [ blazeBuilder filepath text ];
   testDepends = [ hspec ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/foldl/default.nix b/pkgs/development/libraries/haskell/foldl/default.nix
index 44312abb35be..efc0aa61d3d3 100644
--- a/pkgs/development/libraries/haskell/foldl/default.nix
+++ b/pkgs/development/libraries/haskell/foldl/default.nix
@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, text }:
 
 cabal.mkDerivation (self: {
   pname = "foldl";
-  version = "1.0.0";
-  sha256 = "0r9lkyw33231nfl9ly25hk2i7k3c8ssmng473xvk76zkcrksj131";
+  version = "1.0.1";
+  sha256 = "194dkpjh0964cmh4mg35qffkg8dx8d821aj8k6khb40fq5s8smjy";
+  buildDepends = [ text ];
   meta = {
     description = "Composable, streaming, and efficient left folds";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix
index a0816b5e7aa4..6c1082b0f4b3 100644
--- a/pkgs/development/libraries/haskell/force-layout/default.nix
+++ b/pkgs/development/libraries/haskell/force-layout/default.nix
@@ -1,10 +1,12 @@
-{ cabal, lens, newtype, vectorSpace, vectorSpacePoints }:
+{ cabal, dataDefaultClass, lens, vectorSpace, vectorSpacePoints }:
 
 cabal.mkDerivation (self: {
   pname = "force-layout";
-  version = "0.2.0.1";
-  sha256 = "1fvkfgjwsh0cr6ay4djxc8wg0vqfw2vcq3clqjz0zi8zyyjpv8rx";
-  buildDepends = [ lens newtype vectorSpace vectorSpacePoints ];
+  version = "0.3";
+  sha256 = "1v4jgh08ppvfxc8w13wc9iiwk5hh2q9n7m5xb9vl59bmxdx81kai";
+  buildDepends = [
+    dataDefaultClass lens vectorSpace vectorSpacePoints
+  ];
   meta = {
     description = "Simple force-directed layout";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/gloss-raster/default.nix b/pkgs/development/libraries/haskell/gloss-raster/default.nix
new file mode 100644
index 000000000000..a055dd5adf24
--- /dev/null
+++ b/pkgs/development/libraries/haskell/gloss-raster/default.nix
@@ -0,0 +1,14 @@
+{ cabal, gloss, repa, llvm }:
+
+cabal.mkDerivation (self: {
+  pname = "gloss-raster";
+  version = "1.8.1.1";
+  sha256 = "0qqk2fizmv1zdvi8lljxiqdwlmfzni4qzsdvm2jbvgg5qjx9l9qp";
+  buildDepends = [ gloss repa llvm ];
+  meta = {
+    homepage = "http://gloss.ouroborus.net";
+    description = "Parallel rendering of raster images";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index f7f318e502aa..36e56de639c3 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "4.4.2.0";
-  sha256 = "10rkqnrj9gi4h25wfh1w4giqiir2d63vb85ysbxpc97rkbz3fwsg";
+  version = "4.4.3.0";
+  sha256 = "1ngjzqgyhdfkzikyg6cicqdb6cpw2bbfr4g73vgmzlg8spy1cyg5";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -26,6 +26,9 @@ cabal.mkDerivation (self: {
     testFrameworkHunit testFrameworkQuickcheck2 text time
   ];
   doCheck = false;
+  patchPhase = ''
+    sed -i -e 's|pandoc-citeproc >=.*,|pandoc-citeproc,|' hakyll.cabal
+  '';
   meta = {
     homepage = "http://jaspervdj.be/hakyll";
     description = "A static website compiler library";
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index e12d848f00f9..88651c62b590 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-server";
-  version = "7.3.1";
-  sha256 = "0yk4ylyyc8pz7j5lxibah356f986w932ncxp4y612rqcd0abzrq4";
+  version = "7.3.2";
+  sha256 = "11wnnadxy1j786p81nkvd28vgpjjhm1amy34k5r0ynz0nkanfp3z";
   buildDepends = [
     base64Bytestring blazeHtml extensibleExceptions filepath hslogger
     html monadControl mtl network parsec sendfile syb systemFilepath
diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
index 9049664f3048..f991bb585862 100644
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "highlighting-kate";
-  version = "0.5.5.1";
-  sha256 = "173g7dss3v3acbn6b5ajmc1n1v4wx2395cckw8n61myl7mzzbrry";
+  version = "0.5.6";
+  sha256 = "1nd1ima3x7bb3lhkpzfw1qbl8g8mwp1ixk2w7nf2p1200c5zs49d";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ blazeHtml filepath mtl parsec regexPcre ];
diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix
index 89a6622cf1ce..7e57f0d21e1a 100644
--- a/pkgs/development/libraries/haskell/hledger-lib/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix
@@ -1,20 +1,20 @@
 { cabal, cmdargs, csv, dataPprint, filepath, HUnit, mtl, parsec
-, prettyShow, regexCompatTdfa, regexpr, safe, split, testFramework
+, prettyShow, regexpr, regexTdfa, safe, split, testFramework
 , testFrameworkHunit, time, transformers, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger-lib";
-  version = "0.22";
-  sha256 = "059dbwmafwy25pbr9311lknhyjlycdhhal4ng9i56bgd334l2wx3";
+  version = "0.22.1";
+  sha256 = "0kaa778swx4vw0rkhxd3h9h9qj13rzz24x92z139vad1n722gcw1";
   buildDepends = [
-    cmdargs csv dataPprint filepath HUnit mtl parsec prettyShow
-    regexCompatTdfa regexpr safe split time transformers utf8String
+    cmdargs csv dataPprint filepath HUnit mtl parsec prettyShow regexpr
+    regexTdfa safe split time transformers utf8String
   ];
   testDepends = [
-    cmdargs csv dataPprint filepath HUnit mtl parsec prettyShow
-    regexCompatTdfa regexpr safe split testFramework testFrameworkHunit
-    time transformers
+    cmdargs csv dataPprint filepath HUnit mtl parsec prettyShow regexpr
+    regexTdfa safe split testFramework testFrameworkHunit time
+    transformers
   ];
   meta = {
     homepage = "http://hledger.org";
diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix
index f846dba7fc87..21dc845b1175 100644
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-web/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger-web";
-  version = "0.22";
-  sha256 = "0bd1cb6988ainkzi034a4g4xnslqc6djv74gbq58aaxjqn4m7m80";
+  version = "0.22.1";
+  sha256 = "0nqw7scnhcip2bg832p9v0rqk01gn4xwj9bqsvsvmh31fh9ldchw";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix
index 47a5ed381f6b..17db54329911 100644
--- a/pkgs/development/libraries/haskell/hledger/default.nix
+++ b/pkgs/development/libraries/haskell/hledger/default.nix
@@ -1,13 +1,13 @@
 { cabal, cmdargs, csv, dataPprint, filepath, haskeline, hledgerLib
-, HUnit, mtl, parsec, prettyShow, regexCompatTdfa, regexpr, safe
-, shakespeareText, split, tabular, testFramework
-, testFrameworkHunit, text, time, transformers, utf8String
+, HUnit, mtl, parsec, prettyShow, regexpr, safe, shakespeareText
+, split, tabular, testFramework, testFrameworkHunit, text, time
+, transformers, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger";
-  version = "0.22";
-  sha256 = "1fwi1a2nvhfjinif7gy7rv00gn7kazwzmhsskpim2a7bg99sfxb9";
+  version = "0.22.1";
+  sha256 = "1mlh5dlbfkqz41i7zaa4cybf75cg5mrp6sj48kwns0liaqyvav58";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -16,9 +16,8 @@ cabal.mkDerivation (self: {
   ];
   testDepends = [
     cmdargs csv dataPprint filepath haskeline hledgerLib HUnit mtl
-    parsec prettyShow regexCompatTdfa regexpr safe shakespeareText
-    split tabular testFramework testFrameworkHunit text time
-    transformers
+    parsec prettyShow regexpr safe shakespeareText split tabular
+    testFramework testFrameworkHunit text time transformers
   ];
   meta = {
     homepage = "http://hledger.org";
diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
index b461b5a1fd41..7744a705efc3 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -1,22 +1,22 @@
 { cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive
 , cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes
-, parsec, random, safe, tagsoup, text, time, transformers, uniplate
-, wai, warp
+, parsec, random, safe, shake, tagsoup, text, time, transformers
+, uniplate, wai, warp
 }:
 
 cabal.mkDerivation (self: {
   pname = "hoogle";
-  version = "4.2.26";
-  sha256 = "07nc58vqdj5x3h6d7z8ilbff0pkqd3r7g789xyaalnh6wjkd7380";
+  version = "4.2.28";
+  sha256 = "0dd8qsspbcb76ld9v61x2jjsyxakrasww69gzzprb4dxzm58lsid";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson binary blazeBuilder Cabal caseInsensitive cmdargs conduit
-    deepseq filepath haskellSrcExts httpTypes parsec random safe
+    deepseq filepath haskellSrcExts httpTypes parsec random safe shake
     tagsoup text time transformers uniplate wai warp
   ];
   testDepends = [ filepath ];
-  doCheck = false;
+  testTarget = "--test-option=--no-net";
   meta = {
     homepage = "http://www.haskell.org/hoogle/";
     description = "Haskell API Search";
diff --git a/pkgs/development/libraries/haskell/hslua/default.nix b/pkgs/development/libraries/haskell/hslua/default.nix
index 3d1505a7e805..a0b336f24f39 100644
--- a/pkgs/development/libraries/haskell/hslua/default.nix
+++ b/pkgs/development/libraries/haskell/hslua/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hslua";
-  version = "0.3.9";
-  sha256 = "0rs9hfc1k7wihgvp6vizccwppv5nd9mszp7a2y7pwjrprapwj07c";
+  version = "0.3.10";
+  sha256 = "1d79sp9xmzbq74jk7kj81j0z4vm813fkkxkpbyzg07x649i6q0v2";
   buildDepends = [ mtl ];
   pkgconfigDepends = [ lua ];
   configureFlags = "-fsystem-lua";
diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix
index 071471d906e2..820a6549d348 100644
--- a/pkgs/development/libraries/haskell/hxt/default.nix
+++ b/pkgs/development/libraries/haskell/hxt/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hxt";
-  version = "9.3.1.2";
-  sha256 = "0v4j9z65sbjs44n1ijy14f0l2swva6jqz89x2ibf89q8bx36sj6n";
+  version = "9.3.1.3";
+  sha256 = "1ynca1d0wzql3vny9wxi47bim64h1l56gdamwkfhh4snajqkamwd";
   buildDepends = [
     binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema
     hxtUnicode mtl network parsec
diff --git a/pkgs/development/libraries/haskell/idna/default.nix b/pkgs/development/libraries/haskell/idna/default.nix
index 1d5bc92bf6f1..125083de890d 100644
--- a/pkgs/development/libraries/haskell/idna/default.nix
+++ b/pkgs/development/libraries/haskell/idna/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "idna";
-  version = "0.2";
-  sha256 = "0gl1mn2fjyxdpzl024imspf7hk4xvj9r8mvisqnlkdsng8i5jnyz";
+  version = "0.3.0";
+  sha256 = "04w2mp9wa4mzdz4njx47j081jia8y000b46cw8vmx44fx8gv1zwp";
   buildDepends = [ punycode stringprep text ];
   meta = {
     description = "Implements IDNA (RFC 3490)";
diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix
index 83f87f7c8b5d..1103651f0d0c 100644
--- a/pkgs/development/libraries/haskell/liblastfm/default.nix
+++ b/pkgs/development/libraries/haskell/liblastfm/default.nix
@@ -1,14 +1,14 @@
 { cabal, aeson, cereal, contravariant, cryptoApi, httpConduit
-, httpTypes, network, pureMD5, semigroups, text, void
+, httpTypes, network, pureMD5, semigroups, tagged, text, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "liblastfm";
-  version = "0.3.0.0";
-  sha256 = "131p51yi17qfgk8h5b0rx2jyl37w4spafxmlcws1s5pk6bwy75jf";
+  version = "0.3.2.0";
+  sha256 = "09xsjkwknfvdd3zb7a1qbch45ri6knkn33wl6xbi48sw5i79lxnv";
   buildDepends = [
     aeson cereal contravariant cryptoApi httpConduit httpTypes network
-    pureMD5 semigroups text void
+    pureMD5 semigroups tagged text void
   ];
   meta = {
     description = "Lastfm API interface";
diff --git a/pkgs/development/libraries/haskell/lifted-async/default.nix b/pkgs/development/libraries/haskell/lifted-async/default.nix
index fa48f289a4ca..9eab08955f57 100644
--- a/pkgs/development/libraries/haskell/lifted-async/default.nix
+++ b/pkgs/development/libraries/haskell/lifted-async/default.nix
@@ -1,15 +1,14 @@
-{ cabal, async, HUnit, liftedBase, monadControl, mtl, testFramework
-, testFrameworkHunit, testFrameworkTh, transformersBase
+{ cabal, async, HUnit, liftedBase, monadControl, mtl, tasty
+, tastyHunit, tastyTh, transformersBase
 }:
 
 cabal.mkDerivation (self: {
   pname = "lifted-async";
-  version = "0.1.0.1";
-  sha256 = "03b89cixfin7ksdjh12g0pfrmgzw9mnx6nyvywv3rjc1sra3b8f0";
+  version = "0.1.1";
+  sha256 = "0hkqiplnvy14m881n4bzamvy1432bxy4k1j4rwl824w5fn2h5i74";
   buildDepends = [ async liftedBase monadControl transformersBase ];
   testDepends = [
-    HUnit liftedBase monadControl mtl testFramework testFrameworkHunit
-    testFrameworkTh
+    async HUnit liftedBase monadControl mtl tasty tastyHunit tastyTh
   ];
   meta = {
     homepage = "https://github.com/maoe/lifted-async";
diff --git a/pkgs/development/libraries/haskell/mmorph/default.nix b/pkgs/development/libraries/haskell/mmorph/default.nix
index c4379499fad9..702aca476fd0 100644
--- a/pkgs/development/libraries/haskell/mmorph/default.nix
+++ b/pkgs/development/libraries/haskell/mmorph/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mmorph";
-  version = "1.0.0";
-  sha256 = "10r8frcn6ar56n1vxy8rkys8j52f8xkqan8qxqanka1150k6khqk";
+  version = "1.0.1";
+  sha256 = "15a4isvxb4my72hzndgfy66792r9fpkn9vnmr2fnv9d9vl058y14";
   buildDepends = [ transformers ];
   meta = {
     description = "Monad morphisms";
diff --git a/pkgs/development/libraries/haskell/mueval/default.nix b/pkgs/development/libraries/haskell/mueval/default.nix
index f4b3b4a78edb..06d2f58ce171 100644
--- a/pkgs/development/libraries/haskell/mueval/default.nix
+++ b/pkgs/development/libraries/haskell/mueval/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mueval";
-  version = "0.9.1";
-  sha256 = "1f668z7rpdj2m239f5i54v7kd7wsvx3qvvhwyiavf28cmk32mxpq";
+  version = "0.9.1.1";
+  sha256 = "0p9qf8lb3c1y87qpl9b4n6v6bjrb9fw3yfg4p7niqdz31454d2pz";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -13,7 +13,7 @@ cabal.mkDerivation (self: {
     utf8String
   ];
   meta = {
-    homepage = "http://code.haskell.org/mubot/";
+    homepage = "https://github.com/gwern/mueval";
     description = "Safely evaluate pure Haskell expressions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/network/2.4.2.1.nix b/pkgs/development/libraries/haskell/network/2.4.2.2.nix
index 33a79a7eccf0..390529b6a761 100644
--- a/pkgs/development/libraries/haskell/network/2.4.2.1.nix
+++ b/pkgs/development/libraries/haskell/network/2.4.2.2.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network";
-  version = "2.4.2.1";
-  sha256 = "1rm8zlpy6738wxagk1xmlvawn807cd4xf2fn0hgjqj12scviz60p";
+  version = "2.4.2.2";
+  sha256 = "0bxfy6irh5050ykhwfwzl5fnqi74j7x6k4ni7ahw2zwjy3qafc5x";
   buildDepends = [ parsec ];
   testDepends = [
     HUnit testFramework testFrameworkHunit testFrameworkQuickcheck2
diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
index bbfd6430d4f2..62044cc9f5f6 100644
--- a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pandoc-citeproc";
-  version = "0.2";
-  sha256 = "0ghdkzml2rcvjf1wlpsa6ih117x56qlb3ajpbwnpwm3y4wm0jm2d";
+  version = "0.3.0.1";
+  sha256 = "1w8ljf0mc5a3bqv0hymg2daafkrlzdzar23l4yqakjr21n75nvlx";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -16,7 +16,7 @@ cabal.mkDerivation (self: {
     temporary texmath text time vector yaml
   ];
   testDepends = [
-    aeson aesonPretty filepath pandoc pandocTypes temporary text yaml
+    aeson filepath pandoc pandocTypes temporary text yaml
   ];
   doCheck = false;
   meta = {
diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index b42fc3633f09..6d30e638fcb5 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -1,20 +1,21 @@
 { cabal, aeson, alex, ansiTerminal, attoparsec, base64Bytestring
-, blazeHtml, blazeMarkup, dataDefault, Diff, extensibleExceptions
-, filepath, happy, highlightingKate, hslua, HTTP, httpConduit
-, httpTypes, HUnit, mtl, network, pandocTypes, parsec, QuickCheck
-, random, syb, tagsoup, temporary, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, texmath, text, time
-, unorderedContainers, vector, xml, yaml, zipArchive, zlib
+, binary, blazeHtml, blazeMarkup, dataDefault, Diff
+, extensibleExceptions, filepath, happy, highlightingKate, hslua
+, HTTP, httpConduit, httpTypes, HUnit, mtl, network, pandocTypes
+, parsec, QuickCheck, random, syb, tagsoup, temporary
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
+, texmath, text, time, unorderedContainers, vector, xml, yaml
+, zipArchive, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "pandoc";
-  version = "1.12.2.1";
-  sha256 = "1xyvhfsz0cy5f7cwpz4kl0l87vylb8860c06wvk49z9fh2xkg6lf";
+  version = "1.12.3";
+  sha256 = "007pcb93s1frcyx3x4shcb6bynysy7g0hvrqlxs4991a7jp360bl";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    aeson alex attoparsec base64Bytestring blazeHtml blazeMarkup
+    aeson alex attoparsec base64Bytestring binary blazeHtml blazeMarkup
     dataDefault extensibleExceptions filepath happy highlightingKate
     hslua HTTP httpConduit httpTypes mtl network pandocTypes parsec
     random syb tagsoup temporary texmath text time unorderedContainers
diff --git a/pkgs/development/libraries/haskell/parsec/3.1.4.nix b/pkgs/development/libraries/haskell/parsec/3.1.5.nix
index 82032dda61c8..9d1174db056f 100644
--- a/pkgs/development/libraries/haskell/parsec/3.1.4.nix
+++ b/pkgs/development/libraries/haskell/parsec/3.1.5.nix
@@ -2,9 +2,10 @@
 
 cabal.mkDerivation (self: {
   pname = "parsec";
-  version = "3.1.4";
-  sha256 = "0milmi4q5jdcmmwjqa4lcs1vcw5frkrlrxc8q17lkas3p2m10kh5";
+  version = "3.1.5";
+  sha256 = "1f1wg4qxp1ss2160sa3vbqff18fabwhqjkyfj4sgyfmwf9fj8wn5";
   buildDepends = [ mtl text ];
+  jailbreak = true;
   meta = {
     homepage = "http://www.cs.uu.nl/~daan/parsec.html";
     description = "Monadic parser combinators";
diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
index 33cb2e0340a1..fc59c2477edd 100644
--- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-sqlite";
-  version = "1.3.0";
-  sha256 = "04h0k3zf1jpa8y37naqjmh38jx32y61mg22rsmqjjpz1b0m0pwgb";
+  version = "1.3.0.1";
+  sha256 = "0nfih7g32pmh0hq798r4mxkkrp2zjkqb38zwhdyrdbszk6ryzx9l";
   buildDepends = [
     aeson conduit monadControl monadLogger persistent text transformers
   ];
diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index b004a18af154..60ae9a40ca36 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -4,13 +4,15 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-template";
-  version = "1.3.0";
-  sha256 = "0amg5xncxgpc19yhj3gi7ldw126dy725pxj7kp43lbgggap0yfv9";
+  version = "1.3.1";
+  sha256 = "148gznxqzd5743l0r3pc9g14gvanxpl6nfla2lhb2xsa162b2hjx";
   buildDepends = [
     aeson monadControl monadLogger persistent text transformers
     unorderedContainers
   ];
-  testDepends = [ aeson hspec persistent QuickCheck text ];
+  testDepends = [
+    aeson hspec persistent QuickCheck text transformers
+  ];
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";
     description = "Type-safe, non-relational, multi-backend persistence";
diff --git a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
index 50f169928db5..484f21045672 100644
--- a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-attoparsec";
-  version = "0.3.0";
-  sha256 = "1jsgssfs0ndn8aayc0rxyb4vlp2fny8npmnvym7v1yhp2qv84c7b";
+  version = "0.3.1";
+  sha256 = "1bvz5fxy2mfz3swiv9jfmhxl1psmm3c7nfi58pggam52lz20va2h";
   buildDepends = [ attoparsec pipes pipesParse text transformers ];
   testDepends = [
     attoparsec HUnit mmorph pipes pipesParse QuickCheck testFramework
diff --git a/pkgs/development/libraries/haskell/pipes/default.nix b/pkgs/development/libraries/haskell/pipes/default.nix
index d9d923987090..766393d7b45e 100644
--- a/pkgs/development/libraries/haskell/pipes/default.nix
+++ b/pkgs/development/libraries/haskell/pipes/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes";
-  version = "4.0.1";
-  sha256 = "0q2i58w4nlf23di6rjrv543nmj5d5nkz29q9aciw89zx5x5m22h9";
+  version = "4.0.2";
+  sha256 = "18hcpklryyq9f6iwycxzi3sd6gyd9h0gy0ckg4rl7rhgy73hzgcz";
   buildDepends = [ mmorph mtl transformers void ];
   testDepends = [
     mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers
diff --git a/pkgs/development/libraries/haskell/pointedlist/default.nix b/pkgs/development/libraries/haskell/pointedlist/default.nix
new file mode 100644
index 000000000000..881beafaca0f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pointedlist/default.nix
@@ -0,0 +1,13 @@
+{ cabal, binary, derive }:
+
+cabal.mkDerivation (self: {
+  pname = "pointedlist";
+  version = "0.6";
+  sha256 = "16sfw77w46f7rjd1lpdfzi1bdgf81siy2sj71xqkqbsz6cvkjakg";
+  buildDepends = [ binary derive ];
+  meta = {
+    description = "A zipper-like comonad which works as a list, tracking a position";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/poppler/default.nix b/pkgs/development/libraries/haskell/poppler/default.nix
new file mode 100644
index 000000000000..5af2ead5e8e0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/poppler/default.nix
@@ -0,0 +1,20 @@
+{ cabal, cairo, gdk_pixbuf, glib, gtk, gtk2hsBuildtools, libc, mtl
+, pango, popplerGlib
+}:
+
+cabal.mkDerivation (self: {
+  pname = "poppler";
+  version = "0.12.2.2";
+  sha256 = "1ln5akiarv1ng5gjrzf8bnkm556xzl50m209qvi5nk98g7fyhqs7";
+  buildDepends = [ cairo glib gtk mtl ];
+  buildTools = [ gtk2hsBuildtools ];
+  extraLibraries = [ libc ];
+  pkgconfigDepends = [ cairo gdk_pixbuf glib gtk pango popplerGlib ];
+  meta = {
+    homepage = "http://www.haskell.org/gtk2hs/";
+    description = "Binding to the Poppler";
+    license = self.stdenv.lib.licenses.gpl2;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/pretty-show/1.6.3.nix b/pkgs/development/libraries/haskell/pretty-show/1.6.5.nix
index 6979213cc297..60a191da2511 100644
--- a/pkgs/development/libraries/haskell/pretty-show/1.6.3.nix
+++ b/pkgs/development/libraries/haskell/pretty-show/1.6.5.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pretty-show";
-  version = "1.6.3";
-  sha256 = "161zhbsqa86s1gqa7ss8pimw2msdlvgjlldh6ryizc17579dfcfw";
+  version = "1.6.5";
+  sha256 = "0yn20gh2xwzvfwb9fdzxqqbbb6vvd4rlv5ancw4vc8p2kgfhwxf3";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath haskellLexer ];
diff --git a/pkgs/development/libraries/haskell/scientific/default.nix b/pkgs/development/libraries/haskell/scientific/default.nix
index 8494168df15d..646687af96a1 100644
--- a/pkgs/development/libraries/haskell/scientific/default.nix
+++ b/pkgs/development/libraries/haskell/scientific/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "scientific";
-  version = "0.1.0.1";
-  sha256 = "0s401gxwap4xwz9rxypc76rs5w344s3an45295ybf3id6yal5140";
+  version = "0.2.0.1";
+  sha256 = "0xwxds884pqywjbc4j6qkx27nbi64sihig8ps9v884sk08021wrp";
   buildDepends = [ deepseq hashable text ];
   testDepends = [ smallcheck tasty tastySmallcheck text ];
   doCheck = false;
diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix
index 91897bd5a66f..411140459ed7 100644
--- a/pkgs/development/libraries/haskell/shake/default.nix
+++ b/pkgs/development/libraries/haskell/shake/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shake";
-  version = "0.10.10";
-  sha256 = "0xj5r0rj0ybhll9zymipkj338axv11klbpxirdbpdqjh1iaa9yl7";
+  version = "0.11";
+  sha256 = "0w0m94ahr2pzgrknk023vpabjydaj2ir8372rca3b4xik6idaag2";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix
index 6f73537e8b67..aed1b98986bc 100644
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ b/pkgs/development/libraries/haskell/shelly/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shelly";
-  version = "1.3.2";
-  sha256 = "1n6kj9sw6d1nwg7lz1pgmjn8pjxxr76m5sxybv4hacakid3glddh";
+  version = "1.4.0.1";
+  sha256 = "0hra0dk1zma15jd1cag04lcvw6cmddhghi4gpajrrvyij0pi6ij7";
   buildDepends = [
     mtl systemFileio systemFilepath text time unixCompat
   ];
diff --git a/pkgs/development/libraries/haskell/smtp-mail/default.nix b/pkgs/development/libraries/haskell/smtp-mail/default.nix
index e07ed9e236b3..814a89f70c2c 100644
--- a/pkgs/development/libraries/haskell/smtp-mail/default.nix
+++ b/pkgs/development/libraries/haskell/smtp-mail/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "smtp-mail";
-  version = "0.1.4.3";
-  sha256 = "0kpm42n7s3rvkn9i3s8wvkdrq2d85qy422y6p2r4s7nivh6sx1dk";
+  version = "0.1.4.4";
+  sha256 = "055b736sr9w4dxf1p5xjfsisqxk49kz4d3hyqwgdvi8zzvi31vp6";
   buildDepends = [
     base16Bytestring base64Bytestring cryptohash filepath mimeMail
     network text
diff --git a/pkgs/development/libraries/haskell/stringprep/default.nix b/pkgs/development/libraries/haskell/stringprep/default.nix
index f1654751f753..3fbdf196d5e5 100644
--- a/pkgs/development/libraries/haskell/stringprep/default.nix
+++ b/pkgs/development/libraries/haskell/stringprep/default.nix
@@ -1,10 +1,14 @@
-{ cabal, ranges, text, textIcu }:
+{ cabal, QuickCheck, tasty, tastyQuickcheck, tastyTh, text, textIcu
+}:
 
 cabal.mkDerivation (self: {
   pname = "stringprep";
-  version = "0.1.5";
-  sha256 = "1a25b18kd1zx06gi677g3xvsm49izhhf26z2dfljkjfykf05kqmp";
-  buildDepends = [ ranges text textIcu ];
+  version = "1.0.0";
+  sha256 = "0ha4cvzdppd514xh9315v3nvrn1q4xd74gifdqpszw98hj2mw0b0";
+  buildDepends = [ text textIcu ];
+  testDepends = [
+    QuickCheck tasty tastyQuickcheck tastyTh text textIcu
+  ];
   meta = {
     description = "Implements the \"StringPrep\" algorithm";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/symbol/default.nix b/pkgs/development/libraries/haskell/symbol/default.nix
index 7b1c2d3821ce..e5564b758ad0 100644
--- a/pkgs/development/libraries/haskell/symbol/default.nix
+++ b/pkgs/development/libraries/haskell/symbol/default.nix
@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "symbol";
-  version = "0.2.0";
-  sha256 = "13vr6j3wkxbdbd27xklnidfkpkjwl0kldf69z470bm5indvaaxfd";
+  version = "0.2.1";
+  sha256 = "1g9rpz40v6wnmp671wvbbinzvvxkibdnny4i6ai28pn3sxa6fgkj";
   buildDepends = [ deepseq syb ];
   jailbreak = true;
   meta = {
-    homepage = "http://www.eecs.harvard.edu/~mainland/";
+    homepage = "http://www.cs.drexel.edu/~mainland/";
     description = "A 'Symbol' type for fast symbol comparison";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix
index f61dedb7b8c5..d2c402138868 100644
--- a/pkgs/development/libraries/haskell/system-fileio/default.nix
+++ b/pkgs/development/libraries/haskell/system-fileio/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "system-fileio";
-  version = "0.3.11";
-  sha256 = "0hnjrzhzbqx9l93c8dnl5b54f72ki584cn3jh8m6z56x2lrs24zb";
+  version = "0.3.12";
+  sha256 = "0mfkny5fwksrwkvz59f5xnb7b47rmm4cbiygmri5wklnc3vdn0hs";
   buildDepends = [ systemFilepath text time ];
   meta = {
     homepage = "https://john-millikin.com/software/haskell-filesystem/";
diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix
index 84ca453c6c16..2e060e252dd9 100644
--- a/pkgs/development/libraries/haskell/system-filepath/default.nix
+++ b/pkgs/development/libraries/haskell/system-filepath/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "system-filepath";
-  version = "0.4.8";
-  sha256 = "15x0yxakqqrdqvghr0l4pzvy5a68xxdv1c75d3qwx604665j3xkw";
+  version = "0.4.9";
+  sha256 = "0qxbibq6lj7gyw62crp774pv2a8cm83rllw5yjjsg372nk4m1is0";
   buildDepends = [ deepseq text ];
   meta = {
     homepage = "https://john-millikin.com/software/haskell-filesystem/";
diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
index a129ae46a35a..8dd3f5c6fc96 100644
--- a/pkgs/development/libraries/haskell/texmath/default.nix
+++ b/pkgs/development/libraries/haskell/texmath/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "texmath";
-  version = "0.6.5.2";
-  sha256 = "1pvaf40avjx43ydhi9n6vkkjw9gk5apws4bgqqq2g601kvmi163l";
+  version = "0.6.6";
+  sha256 = "0mbimlvqsfx6w4dvilidy5cd9732kf6bnfnn6n7rnmq88avxxnmc";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ pandocTypes parsec syb xml ];
diff --git a/pkgs/development/libraries/haskell/text/1.0.0.0.nix b/pkgs/development/libraries/haskell/text/1.1.0.0.nix
index fe740864970b..87a89c43be4e 100644
--- a/pkgs/development/libraries/haskell/text/1.0.0.0.nix
+++ b/pkgs/development/libraries/haskell/text/1.1.0.0.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "text";
-  version = "1.0.0.0";
-  sha256 = "13i7xn5xl8lc5hcd08i4n0qp9rx51588jnjn4c68gp87vw1gwvjn";
+  version = "1.1.0.0";
+  sha256 = "14mssz27f5ivhwcl9gvbw0s1mjh7hw9gviwxnimqiqzh4jlavwc0";
   buildDepends = [ deepseq ];
   testDepends = [
     deepseq HUnit QuickCheck random testFramework testFrameworkHunit
diff --git a/pkgs/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix
index c10feac4ba68..04c8b0bd51a0 100644
--- a/pkgs/development/libraries/haskell/th-lift/default.nix
+++ b/pkgs/development/libraries/haskell/th-lift/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "th-lift";
-  version = "0.6";
-  sha256 = "0nsxrmilp2g0nx4s9iigj2llza6phphcfr4j9gvmqmx6kf2z9vns";
+  version = "0.6.1";
+  sha256 = "0m1ips0n06jnjr5lssq7x4jaa5878sw03l8iaprya37bnkxxak5d";
   meta = {
     description = "Derive Template Haskell's Lift class for datatypes";
     license = "unknown";
diff --git a/pkgs/development/libraries/haskell/threads/default.nix b/pkgs/development/libraries/haskell/threads/default.nix
index 0683ba62d4b0..932ef113fa70 100644
--- a/pkgs/development/libraries/haskell/threads/default.nix
+++ b/pkgs/development/libraries/haskell/threads/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "threads";
-  version = "0.5.0.3";
-  sha256 = "1da5p65qf1w746flqnl7pxd05pdh8psi6psi0zsqqxmiykw4zvrf";
+  version = "0.5.1.1";
+  sha256 = "196yjkq7wgjcck9wqj4f3x3k47ls9yiay3k6d8k7kzixc2xc621z";
   buildDepends = [ baseUnicodeSymbols stm ];
   testDepends = [
     baseUnicodeSymbols concurrentExtra HUnit stm testFramework
diff --git a/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix b/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix
index feb186209b7b..6612003fa2e6 100644
--- a/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix
+++ b/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix
@@ -1,14 +1,14 @@
-{ cabal, wai, waiExtra, fcgi }:
+{ cabal, fcgi, wai, waiExtra }:
 
 cabal.mkDerivation (self: {
   pname = "wai-handler-fastcgi";
   version = "2.0.0";
   sha256 = "1pqiqx1wq2iv705f8bd4sxmjmmkkxiw4g6a9dpwnawwb5n0d88nl";
-  buildDepends = [
-    wai waiExtra fcgi
-  ];
+  buildDepends = [ wai waiExtra ];
+  extraLibraries = [ fcgi ];
   meta = {
-    description = "A WAI handler that out to the libfcgi C library";
+    homepage = "http://www.yesodweb.com/book/web-application-interface";
+    description = "Wai handler to fastcgi";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
   };
diff --git a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix
index 602d95f45df5..ee6c19b0d930 100644
--- a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix
+++ b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "web-routes-boomerang";
-  version = "0.28.0";
-  sha256 = "1xp8p0fkwirrpssb9lnxl7fmlmrql28r2ywaa99gw9cdqxifzbbl";
+  version = "0.28.1";
+  sha256 = "1a655d73fr7b9k033wyqgc8waq7ii3s5rh0w3nkb1phxl9ldg0pi";
   buildDepends = [ boomerang mtl parsec text webRoutes ];
   meta = {
     description = "Library for maintaining correctness and composability of URLs within an application";
diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix
index ce767e7b5f5b..76fbf12540af 100644
--- a/pkgs/development/libraries/haskell/web-routes/default.nix
+++ b/pkgs/development/libraries/haskell/web-routes/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "web-routes";
-  version = "0.27.3";
-  sha256 = "06a3b88gzbn7dr7hff2fjy1q7sxc479ha4g1wqsbjrb2ajrp376q";
+  version = "0.27.4";
+  sha256 = "1n9gdaxzy22m3fmrq3j1jkm16c4wvffjbh19xckfpva53zdhsal4";
   buildDepends = [
     blazeBuilder httpTypes mtl parsec split text utf8String
   ];
diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index 9ad9f944b4af..3354161baef0 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, curl}:
+{stdenv, fetchurl, curl, libgcrypt}:
 
 stdenv.mkDerivation rec {
-  name = "libmicrohttpd-0.9.24";
+  name = "libmicrohttpd-0.9.33";
 
   src = fetchurl {
     url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
-    sha256 = "0cp2ac6wbk493zslbvbmb5z96h18k496f9id8d2ji7hbdrwzfk6h";
+    sha256 = "0nfm3h7mfb03hf4kfyap8dr35shm6sppsq6da03853sljy27wn6r";
   };
 
-  buildInputs = [ curl ];
+  buildInputs = [ curl libgcrypt ];
 
   preCheck =
     # Since `localhost' can't be resolved in a chroot, work around it.
diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix
index 17393fab0745..6c6c0812c43c 100644
--- a/pkgs/development/libraries/libwnck/3.x.nix
+++ b/pkgs/development/libraries/libwnck/3.x.nix
@@ -1,15 +1,15 @@
 {stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool}:
 
 stdenv.mkDerivation {
-  name = "libwnck-3.2.1";
+  name = "libwnck-3.4.7";
 
   src = fetchurl {
-    url = mirror://gnome/sources/libwnck/3.2/libwnck-3.2.1.tar.xz;
-    sha256 = "1nm34rpr0n559x1ba4kmxbhqclvvnlz0g8xqbbj709q9irnmifpa";
+    url = mirror://gnome/sources/libwnck/3.4/libwnck-3.4.7.tar.xz;
+    sha256 = "d48ac9c7f50c0d563097f63d07bcc83744c7d92a1b4ef65e5faeab32b5ccb723";
   };
 
+  patches = [ ./install_introspection_to_prefix.patch ];
+
   buildInputs = [ pkgconfig intltool ];
   propagatedBuildInputs = [ libX11 gtk3 ];
-
-  configureFlags = [ "--disable-introspection" ];
 }
diff --git a/pkgs/development/libraries/libwnck/install_introspection_to_prefix.patch b/pkgs/development/libraries/libwnck/install_introspection_to_prefix.patch
new file mode 100644
index 000000000000..1bcf4a12ea31
--- /dev/null
+++ b/pkgs/development/libraries/libwnck/install_introspection_to_prefix.patch
@@ -0,0 +1,12 @@
+--- libwnck-3.4.7/configure	2013-08-20 14:46:14.000000000 +0000
++++ libwnck-3.4.7-fix/configure	2014-01-05 17:18:56.665427787 +0000
+@@ -16150,7 +16150,7 @@ $as_echo "$found_introspection" >&6; }
+        INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+-       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
++       INTROSPECTION_GIRDIR="${datadir}/gir-1.0"
+-       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
++       INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0"
+        INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+        INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+        INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 66e98a9d961f..64c07d9cb2e2 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -17,11 +17,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.15.3";
+  version = "3.15.3.1";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_3_RTM/src/${name}.tar.gz";
-    sha1 = "1d0f6707eda35f6c7be92fe2b0537dc090a8f203";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_3_1_RTM/src/${name}.tar.gz";
+    sha1 = "4e0f81a1f770447dc5440201a579151b601463e2";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];
diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index 8366636a2513..67be64921e75 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -1,15 +1,19 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, libiconv, pkgconfig, libffi, libtasn1 }:
 
 stdenv.mkDerivation rec {
-  name = "p11-kit-0.7";
+  name = "p11-kit-0.20.1";
 
   src = fetchurl {
     url = "${meta.homepage}releases/${name}.tar.gz";
-    sha256 = "1vj86kc7ir1djlb5akrr3w4x4k7h34pq2l4abwgqmcwxbm4j0lln";
+    sha256 = "0lsaxd1rg74ax1vkclq7r52b43rhy14mn5i14xqvb8dzlgq4hiaj";
   };
 
   postInstall = "rm -frv $out/share/gtk-doc";
 
+  configureFlags = "--without-libtasn1";
+
+  buildInputs = [ libiconv pkgconfig libffi libtasn1 ];
+
   meta = {
     homepage = http://p11-glue.freedesktop.org/;
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 0db3722e6aaa..1f1ab5d72823 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -32,7 +32,7 @@ let
 
     cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON";
 
-    patches = [ ./datadir_env.patch ];
+    patches = [ ./datadir_env.patch ./poppler-glib.patch ];
 
     # XXX: The Poppler/Qt4 test suite refers to non-existent PDF files
     # such as `../../../test/unittestcases/UseNone.pdf'.
diff --git a/pkgs/development/libraries/poppler/poppler-glib.patch b/pkgs/development/libraries/poppler/poppler-glib.patch
new file mode 100644
index 000000000000..09f5a145b847
--- /dev/null
+++ b/pkgs/development/libraries/poppler/poppler-glib.patch
@@ -0,0 +1,19 @@
+diff -rupN a/poppler-glib.pc.cmake b/poppler-glib.pc.cmake
+--- a/poppler-glib.pc.cmake	2013-08-17 01:20:41.000000001 +0200
++++ b/poppler-glib.pc.cmake	2014-01-01 09:30:50.000000001 +0100
+@@ -10,4 +10,4 @@ Requires: glib-2.0 >= @GLIB_REQUIRED@ go
+ @PC_REQUIRES_PRIVATE@
+ 
+ Libs: -L${libdir} -lpoppler-glib
+-Cflags: -I${includedir}/poppler/glib
++Cflags: -I${includedir}/poppler/glib -I${includedir}/poppler
+diff -rupN a/poppler-glib.pc.in b/poppler-glib.pc.in
+--- a/poppler-glib.pc.in	2013-08-17 01:20:41.000000001 +0200
++++ b/poppler-glib.pc.in	2014-01-01 09:27:17.000000001 +0100
+@@ -10,4 +10,5 @@ Requires: glib-2.0 >= @GLIB_REQUIRED@ go
+ @PC_REQUIRES_PRIVATE@
+ 
+ Libs: -L${libdir} -lpoppler-glib
+-Cflags: -I${includedir}/poppler/glib
++Cflags: -I${includedir}/poppler/glib -I${includedir}/poppler
++
diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix
index f78a6073b713..c5e26c1dfad5 100644
--- a/pkgs/development/libraries/pupnp/default.nix
+++ b/pkgs/development/libraries/pupnp/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "libupnp-1.6.6";
+  name = "libupnp-1.6.19";
 
   src = fetchurl {
     url = "mirror://sourceforge/pupnp/${name}.tar.bz2";
-    sha256 = "1cxvn0v8lcc5p70jc3j50a7rm12am6xr0l2fibi8075jqazcmmsq";
+    sha256 = "0amjv4lypvclmi4vim2qdyw5xa6v4x50zjgf682vahqjc0wjn55k";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 4d30671c4880..5ceedd674f53 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system);
 
-  target = if cpu == "i686" then "P6" else 
+  target = if cpu == "i686" then "P2" else 
     if cpu == "x86_64" then "CORE2" else
      # allow autodetect
       "";
diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index 8a7592547c20..e758fe34c362 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -40,6 +40,6 @@ stdenv.mkDerivation {
     description = "HTTP client library based on APR";
     license = stdenv.lib.licenses.asl20 ;
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
new file mode 100644
index 000000000000..60bf24dfd784
--- /dev/null
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchurl, pkgconfig, gtk, spice_protocol, intltool, celt_0_5_1
+, openssl, pulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib
+, cyrus_sasl, python, pygtk, autoconf, automake, libtool }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "spice-gtk-0.22";
+
+  src = fetchurl {
+    url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2";
+    sha256 = "0fpsn6qhy9a701lmd4yym6qz6zhpp8xp6vw42al0b4592pcybs85";
+  };
+
+  buildInputs = [
+    gtk spice_protocol celt_0_5_1 openssl pulseaudio pixman gobjectIntrospection
+    libjpeg_turbo zlib cyrus_sasl python pygtk
+  ];
+
+  nativeBuildInputs = [ pkgconfig intltool libtool autoconf automake ];
+
+  NIX_CFLAGS_COMPILE = "-fno-stack-protector";
+
+  preConfigure = ''
+    substituteInPlace gtk/Makefile.am \
+      --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0'
+
+    autoreconf -v --force --install
+    intltoolize -f
+  '';
+
+  configureFlags = [
+    "--disable-maintainer-mode"
+    "--with-gtk=2.0"
+  ];
+
+  dontDisableStatic = true; # Needed by the coroutine test
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "A GTK+2 and GTK+3 SPICE widget";
+    longDescription = ''
+      spice-gtk is a GTK+2 and GTK+3 SPICE widget. It features glib-based
+      objects for SPICE protocol parsing and a gtk widget for embedding
+      the SPICE display into other applications such as virt-manager.
+      Python bindings are available too.
+    '';
+
+    homepage = http://www.spice-space.org/;
+    license = licenses.lgpl21;
+
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/zeromq/2.x.nix b/pkgs/development/libraries/zeromq/2.x.nix
index 06beb9254f95..67b1151dc849 100644
--- a/pkgs/development/libraries/zeromq/2.x.nix
+++ b/pkgs/development/libraries/zeromq/2.x.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libuuid ];
 
   meta = {
+    branch = "2";
     homepage = "http://www.zeromq.org";
     description = "The Intelligent Transport Layer";
   };
diff --git a/pkgs/development/libraries/zeromq/3.x.nix b/pkgs/development/libraries/zeromq/3.x.nix
index fbb3b5ad74f7..6ee49cb5082e 100644
--- a/pkgs/development/libraries/zeromq/3.x.nix
+++ b/pkgs/development/libraries/zeromq/3.x.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libuuid ];
 
   meta = {
+    branch = "3";
     homepage = "http://www.zeromq.org";
     description = "The Intelligent Transport Layer";
   };
diff --git a/pkgs/development/lisp-modules/stumpwm/default.nix b/pkgs/development/lisp-modules/stumpwm/default.nix
index a41ee799d8a0..ae0dab1ec9d4 100644
--- a/pkgs/development/lisp-modules/stumpwm/default.nix
+++ b/pkgs/development/lisp-modules/stumpwm/default.nix
@@ -19,14 +19,17 @@ buildLispPackage rec {
       ${x.deployConfigScript}
       export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$PWD/"
       ./autogen.sh
-      configureFlags=" --with-lisp=$NIX_LISP --with-$NIX_LISP=$(which common-lisp.sh) "
+      configureFlags=" --with-lisp=$NIX_LISP --with-$NIX_LISP=$(which common-lisp.sh) --with-contrib-dir=$out/lib/common-lisp/stumpwm/contrib/"
     '';
-    installPhase=x.installPhase + ''
+    installPhase = with pkgs; x.installPhase + ''
       make install
 
       if [ "$NIX_LISP" = "sbcl" ]; then
         wrapProgram "$out"/bin/stumpwm --set SBCL_HOME "${clwrapper.lisp}/lib/sbcl"
       fi;
+
+      mv $out/lib/common-lisp/stumpwm/contrib/stumpish $out/bin/stumpish
+      wrapProgram "$out"/bin/stumpish --prefix PATH : "${xlibs.xprop}/bin:${coreutils}/bin:${gnugrep}/bin:${gnused}/bin:${rlwrap}/bin:${ncurses}/bin"
     '';
     postInstall = ''false'';
   };
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index ffbe906a9007..903db3e252cc 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -1,15 +1,13 @@
 { stdenv, fetchurl, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo }:
  
 stdenv.mkDerivation rec {
-  name = "pygobject-3.0.4";
-   
+  name = "pygobject-3.10.2";
+
   src = fetchurl {
-    url = "mirror://gnome/sources/pygobject/3.0/${name}.tar.xz";
-    sha256 = "f457b1d7f6b8bfa727593c3696d2b405da66b4a8d34cd7d3362ebda1221f0661";
+    url = "mirror://gnome/sources/pygobject/3.10/${name}.tar.xz";
+    sha256 = "75608f2c4052f0277508fc79debef026d9e84cb9261de2b922387c093d32c326";
   };
 
-  configureFlags = "--disable-introspection";
-
   buildInputs = [ python pkgconfig glib gobjectIntrospection pycairo cairo ];
 
   meta = {
diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/4.x.nix
index 7d9679349e8e..ab870492da61 100644
--- a/pkgs/development/python-modules/pyqt/default.nix
+++ b/pkgs/development/python-modules/pyqt/4.x.nix
@@ -1,32 +1,29 @@
 { stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "PyQt-x11-gpl-4.10.1";
-  
+  name = "PyQt-x11-gpl-4.10.3";
+
   src = fetchurl {
-    urls = [
-      "http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz"
-      "http://pkgs.fedoraproject.org/lookaside/pkgs/PyQt4/PyQt-x11-gpl-4.10.1.tar.gz/e5973c4ec0b0469f329bc00209d2ad9c/PyQt-x11-gpl-4.10.1.tar.gz"
-    ];
-    sha256 = "05psk23x6bc83hrkw7h88a14jxhvfbxms0c8yrdar8xqvkv8cdb2";
+    url = "mirror://sourceforge/pyqt/PyQt4/PyQt-4.10.3/PyQt-x11-gpl-4.10.3.tar.gz";
+    sha256 = "0c7nifx3w0b9w1k0g9dvav1rv1lvd7awmq0zkqn3n8clyfzbw4x7";
   };
-  
+
   configurePhase = ''
     mkdir -p $out
     lndir ${pythonDBus} $out
 
     export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages
-    
+
     substituteInPlace configure.py \
       --replace 'install_dir=pydbusmoddir' "install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'"
-  
+
     configureFlagsArray=( \
       --confirm-license --bindir $out/bin \
       --destdir $out/lib/${python.libPrefix}/site-packages \
       --plugin-destdir $out/lib/qt4/plugins --sipdir $out/share/sip \
       --dbus=$out/include/dbus-1.0 --verbose)
 
-    python configure.py $configureFlags "''${configureFlagsArray[@]}"
+    ${python.executable} configure.py $configureFlags "''${configureFlagsArray[@]}"
   '';
 
   buildInputs = [ python pkgconfig makeWrapper qt4 lndir ];
@@ -40,7 +37,7 @@ stdenv.mkDerivation rec {
   ''; # */
 
   enableParallelBuilding = true;
-  
+
   meta = {
     description = "Python bindings for Qt";
     license = "GPL";
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 952cbe1ff4d6..8ddf0e9329f6 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       wrapPythonPrograms
     '';
 
-  doCheck = true;
+  doCheck = stdenv.system != "x86_64-darwin";
 
   checkPhase = ''
     ${python}/bin/${python.executable} setup.py test
diff --git a/pkgs/development/python-modules/python-sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index 6d79cf53a6b5..72693a0b5d30 100644
--- a/pkgs/development/python-modules/python-sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -1,28 +1,27 @@
 { stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
-  name = "sip-4.14.6";
-  
+  name = "sip-4.15.4";
+
   src = fetchurl {
-    urls = [
-      "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${name}.tar.gz"
-      "http://pkgs.fedoraproject.org/repo/pkgs/sip/${name}.tar.gz/d6493b9f0a7911566545f694327314c4/${name}.tar.gz"
-    ];
-    sha256 = "1bwdd5xhrx8dx8rr86r043ddlbg7gd1vh0pm2nxw5l1yprwa7paa";
+    url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz";
+    sha256 = "0a12lmqkf342yg42ygnjm1fyldcx9pzhy7z68p4ms4ydfcl78jsr";
   };
 
   configurePhase = stdenv.lib.optionalString stdenv.isDarwin ''
     # prevent sip from complaining about python not being built as a framework
     sed -i -e 1564,1565d siputils.py
   '' + ''
-    python ./configure.py -d $out/lib/${python.libPrefix}/site-packages \
+    ${python.executable} ./configure.py \
+      -d $out/lib/${python.libPrefix}/site-packages \
       -b $out/bin -e $out/include
   '';
-  
+
   buildInputs = [ python ];
-  
+
   meta = with stdenv.lib; {
     description = "Creates C++ bindings for Python modules";
+    homepage    = "http://www.riverbankcomputing.co.uk/";
     license     = licenses.gpl2Plus;
     maintainers = with maintainers; [ lovek323 sander urkud ];
     platforms   = platforms.all;
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 5081b9352676..d0d7e7b39b24 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.57";
-  sha256 = "0mwd3qh4ncbbwmaspnxl0hmirjclkqm8zhvchc55fgnskrfbidhq";
+  version = "1.58";
+  sha256 = "0xsp0f87583pcjdfhngbc9465yisk2m3sn6904s0szprkpi2p03x";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];
diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix
new file mode 100644
index 000000000000..d4847afc786b
--- /dev/null
+++ b/pkgs/development/tools/misc/d-feet/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, pkgconfig, fetchurl, itstool, intltool, libxml2, glib, gtk3
+, pango, gdk_pixbuf, atk, pep8, python, makeWrapper
+, pygobject3, gobjectIntrospection, libwnck3
+, gnome_icon_theme }:
+
+let
+  version = "${major}.8";
+  major = "0.3";
+in
+
+stdenv.mkDerivation rec {
+  name = "d-feet-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz";
+    sha256 = "e8423feb18fdff9b1465bf8442b78994ba13c12f8fa3b08e6a2f05768b4feee5";
+  };
+
+  buildInputs = [
+    pkgconfig libxml2 itstool intltool glib gtk3 pep8 python
+    makeWrapper pygobject3 libwnck3
+  ];
+
+  postInstall =
+    ''
+      wrapProgram $out/bin/d-feet \
+        --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \
+        --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+        --prefix LD_LIBRARY_PATH : "${gtk3}/lib:${atk}/lib:${libwnck3}/lib" \
+        --prefix XDG_DATA_DIRS : "${gnome_icon_theme}/share:$out/share"
+    '';
+
+  meta = {
+    description = "D-Feet is an easy to use D-Bus debugger";
+
+    longDescription = ''
+      D-Feet can be used to inspect D-Bus interfaces of running programs
+      and invoke methods on those interfaces.
+    '';
+
+    homepage = https://wiki.gnome.org/action/show/Apps/DFeet;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = with stdenv.lib.maintainers; [ ktosiek ];
+  };
+}
diff --git a/pkgs/development/tools/misc/icon-naming-utils/default.nix b/pkgs/development/tools/misc/icon-naming-utils/default.nix
index 7a03eb7b1280..7f8dafad4af5 100644
--- a/pkgs/development/tools/misc/icon-naming-utils/default.nix
+++ b/pkgs/development/tools/misc/icon-naming-utils/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, XMLSimple}:
+{stdenv, fetchurl, perl, XMLSimple, librsvg}:
 
 stdenv.mkDerivation rec {
   name = "icon-naming-utils-0.8.90";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "071fj2jm5kydlz02ic5sylhmw6h2p3cgrm3gwdfabinqkqcv4jh4";
   };
   
-  buildInputs = [perl XMLSimple];
+  buildInputs = [perl XMLSimple librsvg];
 
   postInstall =
     ''
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
           --replace '/bin/perl' '/bin/perl -I${XMLSimple}/lib/perl5/site_perl'
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://tango.freedesktop.org/Standard_Icon_Naming_Specification;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/parsing/happy/1.19.2.nix b/pkgs/development/tools/parsing/happy/1.19.2.nix
index eaf027b591dc..4173d6d6c111 100644
--- a/pkgs/development/tools/parsing/happy/1.19.2.nix
+++ b/pkgs/development/tools/parsing/happy/1.19.2.nix
@@ -8,6 +8,7 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildDepends = [ mtl ];
   buildTools = [ perl ];
+  patchPhase = "sed -i -e '/^import Data.Monoid/d' Setup.lhs";
   meta = {
     homepage = "http://www.haskell.org/happy/";
     description = "Happy is a parser generator for Haskell";
diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix
index bdd11b88da5b..884091c1636c 100644
--- a/pkgs/development/tools/profiling/systemtap/default.nix
+++ b/pkgs/development/tools/profiling/systemtap/default.nix
@@ -1,9 +1,9 @@
-{ fetchurl, stdenv, linux, elfutils, latex2html, xmlto, docbook_xml_dtd_412
+{ fetchurl, stdenv, elfutils, latex2html, xmlto, docbook_xml_dtd_412
 , libxml2, docbook_xsl, libxslt, texLive, texLiveExtra, ghostscript, pkgconfig
 , gtkmm, libglademm, boost, perl, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "systemtap-1.2-${linux.version}";
+  name = "systemtap-1.2";
 
   src = fetchurl {
     url = "http://sources.redhat.com/systemtap/ftp/releases/${name}.tar.gz";
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index ae990ca32459..7c10bcb51dec 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -6,7 +6,7 @@ let
     ln -sv /usr/sbin/dtrace $out/bin
   '';
 
-  version = "0.10.22";
+  version = "0.10.24";
 
   # !!! Should we also do shared libuv?
   deps = {
@@ -27,7 +27,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha1 = "d7c6a39dfa714eae1f8da7a00c9a07efd74a03b3";
+    sha256 = "0yip81va8nd3kzj64385avcx7ck13a2xcdj3amzwnhk830rxf331";
   };
 
   configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps);
author	Vladimír Čunát <vcunat@gmail.com>	2014-01-12 12:27:06 +0100
committer	Vladimír Čunát <vcunat@gmail.com>	2014-01-12 12:29:24 +0100
commit	a2c316288c8f3714e57dc1037d7a993a2088ab18 (patch)
tree	ee4af0b96a5bc0e55b92c8d76465b333a698a260 /pkgs/development
parent	51713fbbfcaf819f176df8f3ce75f57880aeb690 (diff)
parent	a0070a9157d7d145eed22160cec2562d24032013 (diff)
download	nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.gz nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.bz2 nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.lz nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.xz nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.zst nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.zip