Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv

Conflicts: pkgs/tools/security/gnupg/default.nix
author: Eelco Dolstra <eelco.dolstra@logicblox.com> 2014-10-09 10:57:57 +0200
committer: Eelco Dolstra <eelco.dolstra@logicblox.com> 2014-10-09 10:57:57 +0200
commit: 811de3bfaabc39a7a7d22ba34053cfb1a2c4e219 (patch)
tree: 631d4305b76e948baefb54741fe2ea3c4dd9fe8b /pkgs/development
parent: c34932ef86628b8b30284882d8baaef4c56320dd (diff)
parent: a2c7804903cdd41d1905fa954bd2dba5e165e793 (diff)
download: nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar
nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.gz
nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.bz2
nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.lz
nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.xz
nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.zst
nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.zip
361 files changed, 3607 insertions, 1595 deletions
diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index b77c7e47667..07a4ceefd4d 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "ats2-${version}";
-  version = "0.1.2";
+  version = "0.1.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
-    sha256 = "1266hl03d4w13qrimq6jsxcmw1mjivl27l3lhf9ddqlz0vy97j6a";
+    sha256 = "157k703zsdf0gr7mwz08rdldfgwfsm5ipg36xcc8092fcjs5ryqp";
   };
 
   buildInputs = [ gmp ];
diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index 0d8d8e3d6d7..bdf850df8cb 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "compcert-${version}";
-  version = "2.3pl2";
+  version = "2.4";
 
   src = fetchurl {
     url    = "http://compcert.inria.fr/release/${name}.tgz";
-    sha256 = "1cq4my646ll1mszs5mbzwk4vp8l8qnsc96fpcv2pl35aw5i6jqm8";
+    sha256 = "1qrb1cplx3v5wxn1c46kx67v1j52yznvjm2hkrsdybphhki2pyia";
   };
 
   buildInputs = [ coq ocaml ocamlPackages.menhir ];
@@ -15,13 +15,12 @@ stdenv.mkDerivation rec {
   configurePhase = "./configure -prefix $out -toolprefix ${gcc}/bin/ " +
     (if stdenv.isDarwin then "ia32-macosx" else "ia32-linux");
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Formally verified C compiler";
     homepage    = "http://compcert.inria.fr";
-    license     = stdenv.lib.licenses.inria;
-    platforms   = stdenv.lib.platforms.linux ++
-                  stdenv.lib.platforms.darwin;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice
-                    stdenv.lib.maintainers.jwiegley ];
+    license     = licenses.inria;
+    platforms   = platforms.linux ++
+                  platforms.darwin;
+    maintainers = with maintainers; [ thoughtpolice jwiegley vbgl ];
   };
 }
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index d38040a48b3..40244cab94f 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -153,7 +153,6 @@ let version = "4.9.1";
           " --disable-libssp --disable-nls" +
           " --without-headers" +
           " --disable-threads " +
-          " --disable-libmudflap " +
           " --disable-libgomp " +
           " --disable-libquadmath" +
           " --disable-shared" +
diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index 73492fc65b7..e9c69261fbc 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -17,11 +17,11 @@ assert a.stdenv.gcc.libc != null ;
 
 rec {
   src = a.fetchurl {
-    sha256 = "1vsicv81ml7d92c87bckgkpvcshi6hzdnj44k0j6zs5mj8pzp8br";
-    url="http://gnu.spinellicreations.com/gcl/gcl-2.6.10.tar.gz";
+    sha256 = "177vz8z74mky5nrq6qlfvnzvb1prw8jmlv4cwfx8w7k3k818y1a4";
+    url="http://gnu.spinellicreations.com/gcl/gcl-2.6.11.tar.gz";
   };
 
-  name = "gcl-2.6.10";
+  name = "gcl-2.6.11";
   inherit buildInputs;
   configureFlags = [
     "--enable-ansi"
diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix
new file mode 100644
index 00000000000..d710f672995
--- /dev/null
+++ b/pkgs/development/compilers/gforth/default.nix
@@ -0,0 +1,10 @@
+{ stdenv, fetchurl, m4 }:
+
+stdenv.mkDerivation rec {
+  name = "gforth-0.7.3";
+  src = fetchurl {
+    url = "http://ftp.gnu.org/gnu/gforth/gforth-0.7.3.tar.gz";
+    sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig";
+  };
+  buildInputs = [ m4 ];
+}
\ No newline at end of file
diff --git a/pkgs/development/compilers/go/1.1.nix b/pkgs/development/compilers/go/1.1.nix
index dfb545bb368..e54d12ef9c5 100644
--- a/pkgs/development/compilers/go/1.1.nix
+++ b/pkgs/development/compilers/go/1.1.nix
@@ -51,6 +51,8 @@ stdenv.mkDerivation {
     sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
     # Disable the hostname test
     sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
+    # ParseInLocation fails the test
+    sed -i '/TestParseInSydney/areturn' src/pkg/time/time_test.go
   '' + stdenv.lib.optionalString removeGodocExternals ''
     sed -i -e '/googleapi/d' -e '/javascript">$/,+6d' lib/godoc/godoc.html 
   '';
diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix
index b519b96415b..8567337be0b 100644
--- a/pkgs/development/compilers/go/1.2.nix
+++ b/pkgs/development/compilers/go/1.2.nix
@@ -50,6 +50,8 @@ stdenv.mkDerivation {
     sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
     # Disable the hostname test
     sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
+    # ParseInLocation fails the test
+    sed -i '/TestParseInSydney/areturn' src/pkg/time/time_test.go
   '';
 
   patches = [ ./cacert-1.2.patch ];
diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix
index 1dcdd89b5bf..ca117baca78 100644
--- a/pkgs/development/compilers/go/1.3.nix
+++ b/pkgs/development/compilers/go/1.3.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }:
+{ stdenv, lib, fetchurl, fetchhg, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl }:
 
 assert stdenv.gcc.gcc != null;
 
@@ -6,17 +6,26 @@ let
   loader386 = "${glibc}/lib/ld-linux.so.2";
   loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
   loaderArm = "${glibc}/lib/ld-linux.so.3";
+  srcs = {
+    golang = fetchurl {
+      url = https://storage.googleapis.com/golang/go1.3.2.src.tar.gz;
+      sha256 = "1yq6xygc5lhn3b9d4sbddlf8dzi3wihyzjwyc8rhiwrb3hj8hx1y";
+    };
+    tools = fetchhg {
+      url = https://code.google.com/p/go.tools/;
+      rev = "e1c276c4e679";
+      sha256 = "0x62njflwkd99i2ixbksg6mjppl1wfg86f0g3swn350l1h0xzp76";
+    };
+  };
 in
 
 stdenv.mkDerivation {
-  name = "go-1.3.1";
+  name = "go-1.3.2";
 
-  src = fetchurl {
-    url = https://storage.googleapis.com/golang/go1.3.1.src.tar.gz;
-    sha256 = "fdfa148cc12f1e4ea45a5565261bf43d8a2e7d1fad4a16aed592d606223b93a8";
-  };
+  src = srcs.golang;
 
-  buildInputs = [ bison bash makeWrapper ] ++ lib.optionals stdenv.isLinux [ glibc ] ;
+  # perl is used for testing go vet
+  buildInputs = [ bison bash makeWrapper perl ] ++ lib.optionals stdenv.isLinux [ glibc ] ;
 
   # I'm not sure what go wants from its 'src', but the go installation manual
   # describes an installation keeping the src.
@@ -24,6 +33,10 @@ stdenv.mkDerivation {
     mkdir -p $out/share
     cd $out/share
   '';
+  postUnpack = ''
+    mkdir -p $out/share/go/src/pkg/code.google.com/p/
+    cp -rv --no-preserve=mode,ownership ${srcs.tools} $out/share/go/src/pkg/code.google.com/p/go.tools
+  '';
 
   prePatch = ''
     # Ensure that the source directory is named go
@@ -46,6 +59,8 @@ stdenv.mkDerivation {
     # Disable the hostname test
     sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
     sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go
+    # ParseInLocation fails the test
+    sed -i '/TestParseInSydney/areturn' src/pkg/time/format_test.go
   '' + lib.optionalString stdenv.isLinux ''
     sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
     sed -i 's,/lib/ld-linux.so.3,${loaderArm},' src/cmd/5l/asm.c
@@ -81,6 +96,12 @@ stdenv.mkDerivation {
     ./all.bash
     cd -
 
+    # Build extra tooling
+    # TODO: Fix godoc tests
+    TOOL_ROOT=code.google.com/p/go.tools/cmd
+    go install -v $TOOL_ROOT/cover $TOOL_ROOT/vet $TOOL_ROOT/godoc
+    go test -v    $TOOL_ROOT/cover $TOOL_ROOT/vet # $TOOL_ROOT/godoc
+
     # Copy the emacs configuration for Go files.
     mkdir -p "$out/share/emacs/site-lisp"
     cp ./misc/emacs/* $out/share/emacs/site-lisp/
diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index d2f24390318..1873b58e802 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ cmake pkgconfig boost libunwind mariadb libmemcached pcre libevent gd curl
-      libxml2 icu flex bison openssl zlib php expat libcap oniguruma
-      libdwarf libmcrypt tbb gperftools bzip2 openldap readline
+    [ cmake pkgconfig boost boost.lib libunwind mariadb libmemcached pcre
+      libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
+      oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
       libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml
     ];
 
diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
index e60c4dd5b4b..2af8ec1b022 100644
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@@ -31,6 +31,5 @@ cabal.mkDerivation (self: {
     description = "Functional Programming Language with Dependent Types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    broken = true;
   };
 })
diff --git a/pkgs/development/compilers/idris/wrapper.nix b/pkgs/development/compilers/idris/wrapper.nix
index fce5c0c89f3..2985b33c170 100644
--- a/pkgs/development/compilers/idris/wrapper.nix
+++ b/pkgs/development/compilers/idris/wrapper.nix
@@ -6,5 +6,6 @@ runCommand "idris-wrapper" {} ''
   ln -s ${idris_plain}/bin/idris $out/bin
       wrapProgram $out/bin/idris \
         --suffix NIX_CFLAGS_COMPILE : '"-I${gmp}/include -L${gmp}/lib -L${boehmgc}/lib"' \
-        --suffix PATH : ${gcc}/bin
+        --suffix PATH : ${gcc}/bin \
+        --suffix PATH : ${idris_plain}/bin
 ''
diff --git a/pkgs/development/compilers/lessc/default.nix b/pkgs/development/compilers/lessc/default.nix
index 1d2bd5e7d0b..266e9eb5255 100644
--- a/pkgs/development/compilers/lessc/default.nix
+++ b/pkgs/development/compilers/lessc/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "lessc-${version}";
-  version = "1.4.0";
+  version = "1.4.2";
 
   src = fetchgit {
     url = https://github.com/less/less.js.git;
     rev = "refs/tags/v${version}";
-    sha256 = "12nzaz7v1bnqzylh4zm1srrj7w7f45fqj4sihxyg0bknfvfwdc56";
+    sha256 = "1v3b4f1np3mxkj0irh1pk52r26nzpf4k2ax14cbn7mxx16mqjp50";
   };
 
   phases = [ "installPhase" ];
@@ -19,10 +19,11 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/bin/lessc --replace "/usr/bin/env node" ${nodejs}/bin/node
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "LESS to CSS compiler";
     homepage = http://lesscss.org/;
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/development/compilers/mezzo/default.nix b/pkgs/development/compilers/mezzo/default.nix
new file mode 100644
index 00000000000..183640f5985
--- /dev/null
+++ b/pkgs/development/compilers/mezzo/default.nix
@@ -0,0 +1,29 @@
+{stdenv, fetchurl, ocaml, findlib, menhir, yojson, ulex, pprint, fix, functory}:
+
+stdenv.mkDerivation {
+
+  name = "mezzo-0.0.m8";
+
+  src = fetchurl {
+    url = https://github.com/protz/mezzo/archive/m8.tar.gz;
+    sha256 = "17mfapgqp8ssa5x9blv72zg9l561zbiwv3ikwi6nl9dd36lwkkc6";
+  };
+
+  buildInputs = [ ocaml findlib yojson menhir ulex pprint fix functory ];
+
+  createFindlibDestdir = true;
+
+  postInstall = ''
+    mkdir $out/bin
+    cp mezzo $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://protz.github.io/mezzo/;
+    description = "A programming language in the ML tradition, which places strong emphasis on the control of aliasing and access to mutable memory";
+    license = licenses.gpl2;
+    platforms = ocaml.meta.platforms;
+  };
+}
+
+
diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
index 23b5883c009..68b4a22220e 100644
--- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
+++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
@@ -3,9 +3,9 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "3.0";
+  version = "3.1";
   
-  date = "February2011";
+  date = "April2012";
   
   name = "nvidia-cg-toolkit-${version}";
   
@@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86_64.tgz";
-        sha256 = "07gmnzfsla3vf1kf00cj86p87h6wrdbp6ri4ycslc5kmfxsq7ypq";
+        sha256 = "e8ff01e6cc38d1b3fd56a083f5860737dbd2f319a39037528fb1a74a89ae9878";
       }
     else if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86.tgz";
-        sha256 = "0hr8l0r20akbfm5j0vqv4ghl0acwjf5996pxnfxlajacl9w58nam";
+        sha256 = "cef3591e436f528852db0e8c145d3842f920e0c89bcfb219c466797cb7b18879";
       }
     else throw "nvidia-cg-toolkit does not support platform ${stdenv.system}";
     
@@ -35,11 +35,6 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/lib/"
     [ "$system" == "x86_64-linux" ] && cp -v lib64/* "$out/lib/"
     [ "$system" == "i686-linux" ] && cp -v lib/* "$out/lib/"
-    for mandir in man1 man3 manCg manCgFX
-    do
-        mkdir -p "$out/share/man/$mandir/"
-        cp -v share/man/$mandir/* "$out/share/man/$mandir/"
-    done
     mkdir -p "$out/share/doc/$name/"
     cp -v -r local/Cg/* "$out/share/doc/$name/"
   '';
diff --git a/pkgs/development/compilers/ocaml/4.02.0.nix b/pkgs/development/compilers/ocaml/4.02.0.nix
new file mode 100644
index 00000000000..b6753cc6297
--- /dev/null
+++ b/pkgs/development/compilers/ocaml/4.02.0.nix
@@ -0,0 +1,74 @@
+let
+  safeX11 = stdenv: !(stdenv.isArm || stdenv.isMips);
+in
+
+{ stdenv, fetchurl, ncurses, buildEnv, libX11, xproto, useX11 ? safeX11 stdenv }:
+
+assert useX11 -> !stdenv.isArm && !stdenv.isMips;
+
+let
+   useNativeCompilers = !stdenv.isMips;
+   inherit (stdenv.lib) optionals optionalString;
+in
+
+stdenv.mkDerivation rec {
+
+  x11env = buildEnv { name = "x11env"; paths = [libX11 xproto]; };
+  x11lib = x11env + "/lib";
+  x11inc = x11env + "/include";
+
+  name = "ocaml-4.02.0";
+
+  src = fetchurl {
+    url = "http://caml.inria.fr/pub/distrib/ocaml-4.02/${name}.tar.xz";
+    sha256 = "1ml5r8vzbwqhnq8jlps6jfgf0vym4nyrnr95mrbym6v5j2gabmw7";
+  };
+
+  prefixKey = "-prefix ";
+  configureFlags = optionals useX11 [ "-x11lib" x11lib
+                                      "-x11include" x11inc ];
+
+  buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
+  buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ];
+  installTargets = "install" + optionalString useNativeCompilers " installopt";
+  preConfigure = ''
+    CAT=$(type -tp cat)
+    sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
+  '';
+  postBuild = ''
+    mkdir -p $out/include
+    ln -sv $out/lib/ocaml/caml $out/include/caml
+  '';
+
+  passthru = {
+    nativeCompilers = useNativeCompilers;
+  };
+
+  meta = {
+    homepage = http://caml.inria.fr/ocaml;
+    license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    description = "Most popular variant of the Caml language";
+
+    longDescription =
+      ''
+        OCaml is the most popular variant of the Caml language.  From a
+        language standpoint, it extends the core Caml language with a
+        fully-fledged object-oriented layer, as well as a powerful module
+        system, all connected by a sound, polymorphic type system featuring
+        type inference.
+
+        The OCaml system is an industrial-strength implementation of this
+        language, featuring a high-performance native-code compiler (ocamlopt)
+        for 9 processor architectures (IA32, PowerPC, AMD64, Alpha, Sparc,
+        Mips, IA64, HPPA, StrongArm), as well as a bytecode compiler (ocamlc)
+        and an interactive read-eval-print loop (ocaml) for quick development
+        and portability.  The OCaml distribution includes a comprehensive
+        standard library, a replay debugger (ocamldebug), lexer (ocamllex) and
+        parser (ocamlyacc) generators, a pre-processor pretty-printer (camlp4)
+        and a documentation generator (ocamldoc).
+      '';
+
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+  };
+
+}
diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index ca5eadc8a64..d654ebe6b0a 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -1,14 +1,17 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "orc-0.4.21";
+  name = "orc-0.4.22";
 
   src = fetchurl {
     url = "http://gstreamer.freedesktop.org/src/orc/${name}.tar.xz";
-    sha256 = "187wrnq0ficwjj4y3yqci5fxcdkiazfs6k5js26k5b26hipzmham";
+    sha256 = "0dgrbjm94y9l63s3srlddjcdxgrv6iazmvwh630jrw159dzhgjh4";
   };
 
-  doCheck = stdenv.is64bit; # see https://bugzilla.gnome.org/show_bug.cgi?id=728129#c7
+  # building memcpy_speed.log
+  # ../test-driver: line 107:  4495 Segmentation fault      "$@" > $log_file 2>&1
+  # FAIL: memcpy_speed
+  doCheck = false; # see https://bugzilla.gnome.org/show_bug.cgi?id=728129#c7
 
   meta = {
     description = "The Oil Runtime Compiler";
@@ -17,5 +20,6 @@ stdenv.mkDerivation rec {
     # under the 3-clause BSD license. The rest is 2-clause BSD license.
     license = stdenv.lib.licenses.bsd3;
     platform = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }
diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index 9c0af4ec9ab..76bb811dd66 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}:
 
 let
-  version = "5.5.1";
+  version = "5.5.2";
 in
 
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz";
-    sha256 = "16i0ir5mydl7381aijihkll19khp3z8dq0g2ja6k0pcbpkd0k06g";
+    sha256 = "10m680qdad6bd50bav9xjsgmsxw8yxg55vr7grbg0gvykzl2pzbk";
   };
 
   meta = {
diff --git a/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch b/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch
index fea35d24960..21e6576e4e3 100644
--- a/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch
+++ b/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch
@@ -1,8 +1,8 @@
 diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs
-index 7a3e912..ced75fa 100644
+index 6332485..9500a23 100644
 --- a/src/librustc/back/link.rs
 +++ b/src/librustc/back/link.rs
-@@ -856,24 +856,15 @@
+@@ -383,18 +383,9 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri
  
  pub fn get_cc_prog(sess: &Session) -> String {
      match sess.opts.cg.linker {
@@ -22,11 +22,17 @@ index 7a3e912..ced75fa 100644
 -    }.to_string()
  }
  
- pub fn get_ar_prog(sess: &Session) -> String {
-     match sess.opts.cg.ar {
-         Some(ref ar) => (*ar).clone(),
--        None => "ar".to_string()
-+        None => "@arPath@".to_string()
-     }
- }
+ pub fn remove(sess: &Session, path: &Path) {
+diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs
+index 060dda5..fecf76b 100644
+--- a/src/librustc_back/archive.rs
++++ b/src/librustc_back/archive.rs
+@@ -53,7 +53,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>,
+           paths: &[&Path]) -> ProcessOutput {
+     let ar = match *maybe_ar_prog {
+         Some(ref ar) => ar.as_slice(),
+-        None => "ar"
++        None => "@arPath@"
+     };
+     let mut cmd = Command::new(ar);
  
diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index f3dd7ef3c75..f81539fad9a 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -1,4 +1,6 @@
-{stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper}:
+{ stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper
+, tzdata, git
+}:
 
 assert stdenv.gcc.gcc != null;
 
@@ -16,19 +18,19 @@ assert stdenv.gcc.gcc != null;
 
 */
 
-with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-79a5448f4"; });
+with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-a2e7c4da9"; });
 
 let snapshot = if stdenv.system == "i686-linux"
-      then "6f5464c9ab191d93bfea0894ca7c6f90c3506f2b"
+      then "555aca74f9a268f80cab2df1147dc6406403e9e4"
       else if stdenv.system == "x86_64-linux"
-      then "72c92895fa9a1dba7880073f2b2b5d0e3e1a2ab6"
+      then "6a43c2f6c8ba2cbbcb9da1f7b58f748aef99f431"
       else if stdenv.system == "i686-darwin"
-      then "545fc45a0071142714639c6be377e6d308c3a4e1"
+      then "331bd7ef519cbb424188c546273e8c7d738f0894"
       else if stdenv.system == "x86_64-darwin"
-      then "8b44fbbbd1ba519d2e83d0d5ce1f6053d3cab8c6"
+      then "2c83a79a9febfe1d326acb17c3af76ba053c6ca9"
       else abort "no-snapshot for platform ${stdenv.system}";
-    snapshotDate = "2014-09-10";
-    snapshotRev = "6faa4f3";
+    snapshotDate = "2014-10-04";
+    snapshotRev = "749ff5e";
     snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2";
 
 in stdenv.mkDerivation {
@@ -38,8 +40,8 @@ in stdenv.mkDerivation {
 
   src = fetchgit {
     url = https://github.com/rust-lang/rust;
-    rev = "79a5448f41dcc6ab52663105a6b02fc5af4c503e";
-    sha256 = "0v2ahwgb1ls3g4ch6005azjmfh8bs0v0nbmmfpn53zgiiywad2ji";
+    rev = "a2e7c4da9b331d337fba0b3911c6d3d7f48e8305";
+    sha256 = "1lpncqx3lfyjk6llfc7pd1iqxzfhj32hjqvj09zks73r4isc02n4";
   };
 
   # We need rust to build rust. If we don't provide it, configure will try to download it.
@@ -66,10 +68,16 @@ in stdenv.mkDerivation {
   patches = [ ./hardcode_paths.HEAD.patch ./local_stage0.HEAD.patch ];
   postPatch = ''
     substituteInPlace src/librustc/back/link.rs \
-      --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc" \
+      --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc"
+    substituteInPlace src/librustc_back/archive.rs \
       --subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar"
   '';
 
-  buildInputs = [ which file perl curl python27 makeWrapper ];
-  enableParallelBuilding = true;
+  buildInputs = [ which file perl curl python27 makeWrapper git ];
+
+  enableParallelBuilding = false; # disabled due to rust-lang/rust#16305
+
+  preCheck = "export TZDIR=${tzdata}/share/zoneinfo";
+
+  doCheck = true;
 }
diff --git a/pkgs/development/coq-modules/containers/default.nix b/pkgs/development/coq-modules/containers/default.nix
new file mode 100644
index 00000000000..8c20d64d8c7
--- /dev/null
+++ b/pkgs/development/coq-modules/containers/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, coq}:
+
+stdenv.mkDerivation {
+
+  name = "coq-containers-${coq.coq-version}";
+
+  src = fetchurl {
+    url = http://coq.inria.fr/pylons/contribs/files/Containers/v8.4/Containers.tar.gz;
+    sha256 = "1y9x2lwrskv2231z9ac3kv4bmg6h1415xpp4gl7v5w90ba6p6w8w";
+  };
+
+  buildInputs = [ coq.ocaml coq.camlp5 ];
+  propagatedBuildInputs = [ coq ];
+
+  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+  meta = with stdenv.lib; {
+    homepage = http://coq.inria.fr/pylons/pylons/contribs/view/Containers/v8.4;
+    description = "A typeclass-based Coq library of finite sets/maps";
+    maintainers = with maintainers; [ vbgl ];
+    platforms = coq.meta.platforms;
+    broken = true; /* the source hash is wrong */
+  };
+
+}
diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
new file mode 100644
index 00000000000..ca8bd6481ef
--- /dev/null
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl, coq, ssreflect}:
+
+stdenv.mkDerivation {
+
+  name = "coq-mathcomp-1.5";
+
+  src = fetchurl {
+    url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.5.tar.gz;
+    sha256 = "1297svwi18blrlyd8vsqilar2h5nfixlvlifdkbx47aljq4m5bam";
+  };
+
+  propagatedBuildInputs = [ coq ssreflect ];
+
+  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+  meta = with stdenv.lib; {
+    homepage = http://ssr.msr-inria.inria.fr/;
+    license = licenses.cecill-b;
+    maintainers = [ maintainers.vbgl ];
+    platforms = coq.meta.platforms;
+    hydraPlatforms = [];
+  };
+
+}
diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix
new file mode 100644
index 00000000000..912ff7071f8
--- /dev/null
+++ b/pkgs/development/coq-modules/ssreflect/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl, coq}:
+
+assert coq.coq-version == "8.4";
+
+stdenv.mkDerivation {
+
+  name = "coq-ssreflect-1.5";
+
+  src = fetchurl {
+    url = http://ssr.msr-inria.inria.fr/FTP/ssreflect-1.5.tar.gz;
+    sha256 = "0hm1ha7sxqfqhc7iwhx6zdz3nki4rj5nfd3ab24hmz8v7mlpinds";
+  };
+
+  buildInputs = [ coq.ocaml coq.camlp5 ];
+  propagatedBuildInputs = [ coq ];
+
+  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+  meta = with stdenv.lib; {
+    homepage = http://ssr.msr-inria.inria.fr/;
+    license = licenses.cecill-b;
+    maintainers = with maintainers; [ vbgl ];
+    platforms = coq.meta.platforms;
+  };
+
+}
diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index 568551bb5ba..e723133e256 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -26,8 +26,8 @@ rec {
   doDeploy = (a.simplyShare installSuffix);
   doBuild = a.fullDepEntry (''
     cd $out/share/${installSuffix}
-    make LISP=${a.sbcl}/bin/sbcl
-    make LISP=${a.sbcl}/bin/sbcl regression
+    make LISP='${a.sbcl}/bin/sbcl --dynamic-space-size 2000'
+    make LISP='${a.sbcl}/bin/sbcl --dynamic-space-size 2000' regression
     mkdir -p "$out/bin"
     cp saved_acl2 "$out/bin/acl2"
   '') ["doDeploy" "addInputs" "defEnsureDir"];
diff --git a/pkgs/development/interpreters/clisp/2.44.1.nix b/pkgs/development/interpreters/clisp/2.44.1.nix
index 7b811732a62..521933b0ed1 100644
--- a/pkgs/development/interpreters/clisp/2.44.1.nix
+++ b/pkgs/development/interpreters/clisp/2.44.1.nix
@@ -3,12 +3,12 @@
 , libffi, libffcall, coreutils }:
         
 stdenv.mkDerivation rec {
-  v = "2.49";
+  v = "2.44.1";
   name = "clisp-${v}";
   
   src = fetchurl {
     url = "mirror://gnu/clisp/release/${v}/${name}.tar.gz";
-    sha256 = "0rp82nqp5362isl9i34rwgg04cidz7izljd9d85pqcw1qr964bxx";
+    sha256 = "0rkp6j6rih4s5d9acifh7pi4b9xfgcspif512l269dqy9qgyy4j1";
   };
 
   buildInputs =
diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index 8f0b4a238b3..9a5d2417df7 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils }:
+{ stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils, curl, bash, cacert }:
 
 let
   version = "1.0.0";
@@ -20,6 +20,8 @@ stdenv.mkDerivation {
 
     substituteInPlace Makefile \
       --replace "/usr/local" $out
+    substituteInPlace bin/mix \
+      --replace "/usr/bin/env elixir" "$out/bin/elixir"
   '';
 
   postFixup = ''
@@ -29,7 +31,8 @@ stdenv.mkDerivation {
     for f in $out/bin/*
     do
       wrapProgram $f \
-      --prefix PATH ":" "${erlang}/bin:${coreutils}/bin"
+      --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl}/bin:${bash}/bin" \
+      --set CURL_CA_BUNDLE "${cacert}/etc/ca-bundle.crt"
     done
   '';
 
diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix
index 83ea79d67f3..a7378e69c3a 100644
--- a/pkgs/development/interpreters/erlang/R17.nix
+++ b/pkgs/development/interpreters/erlang/R17.nix
@@ -10,11 +10,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}";
-  version = "17.1";
+  version = "17.3";
 
   src = fetchurl {
     url = "http://www.erlang.org/download/otp_src_${version}.tar.gz";
-    sha256 = "0mn3p5rwvjfsxjnn1vrm0lxdq40wq9bmd9nibl6hqbfcnnrga1mq";
+    sha256 = "1r3n7drzgmwcv46n4lzic9ki19psgx1vjgnmjp5g85k06kmh7gnl";
   };
 
   buildInputs =
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   postInstall = let
     manpages = fetchurl {
       url = "http://www.erlang.org/download/otp_doc_man_${version}.tar.gz";
-      sha256 = "1aza6hxhh7ag2frsa0hg6il6ancjrbazvgz7jc2p7qrmy5vh48sa";
+      sha256 = "1dys0903snk0ppip8hfckfd656pl9z3s4vqqv3yk4i2rn30dmarz";
     };
   in ''
     ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call
diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix
index 0b4bfacb6de..d9ce07f16f7 100644
--- a/pkgs/development/interpreters/falcon/default.nix
+++ b/pkgs/development/interpreters/falcon/default.nix
@@ -1,34 +1,21 @@
-a :  
-let 
-  fetchurl = a.fetchurl;
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, zlib, sqlite }:
 
-  version = a.lib.attrByPath ["version"] "0.9.2" a; 
-  buildInputs = with a; [
-    cmake 
-  ];
-in
-rec {
-  src = fetchurl {
-    url = "http://www.falconpl.org/project_dl/_official_rel/Falcon-${version}.tar.gz";
-    sha256 = "0p32syiz2nc6lmmzi0078g4nzariw5ymdjkmhw6iamc0lkkb9x3i";
-  };
-
-  inherit buildInputs;
-  configureFlags = [];
+stdenv.mkDerivation rec {
+  name = "faclon-${version}";
+  version = "2013-09-19";
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doDeploy"];
+  src = fetchFromGitHub {
+    owner = "falconpl";
+    repo = "falcon";
+    rev = "095141903c4ebab928ce803055f9bda363215c37";
+    sha256 = "1x3gdcz1gqhi060ngqi0ghryf69v8bn50yrbzfad8bhblvhzzdlf";
+  };
 
-  doDeploy = a.fullDepEntry (''
-    ./build.sh -i -p $out
-  '') ["minInit" "addInputs" "doFixInterpreter" "defEnsureDir"];
-     
-  doFixInterpreter = a.fullDepEntry (''
-    sed -e "s@/bin/bash@$shell@" -i build.sh
-  '') ["minInit" "doUnpack"];
+  buildInputs = [ cmake pkgconfig pcre zlib sqlite ];
 
-  name = "falcon-" + version;
-  meta = {
+  meta = with stdenv.lib; {
     description = "Programming language with macros and syntax at once";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index fdfb5d8ca30..c611577adfb 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "groovy-${version}";
-  version = "2.3.6";
+  version = "2.3.7";
 
   src = fetchurl {
     url = "http://dl.bintray.com/groovy/maven/groovy-binary-${version}.zip";
-    sha256 = "0yvk6x1f68avl52zzwx9p3faiqr98rfps70vql05j6kd7syyp0ah";
+    sha256 = "09957vi33c8bgk6z4wnidch5sz3s183yh6xba8cdjy5f7jpzmmiq";
   };
 
   installPhase = ''
diff --git a/pkgs/development/interpreters/lua-5/zip.nix b/pkgs/development/interpreters/lua-5/zip.nix
new file mode 100644
index 00000000000..f6460be1662
--- /dev/null
+++ b/pkgs/development/interpreters/lua-5/zip.nix
@@ -0,0 +1,28 @@
+{ pkgs, stdenv, fetchurl, lua5_1, zziplib }:
+
+stdenv.mkDerivation rec {
+  version = "1.2.3";
+  name = "lua-zip-${version}";
+  isLibrary = true;
+  src = fetchurl {
+    url = "https://github.com/luaforge/luazip/archive/0b8f5c958e170b1b49f05bc267bc0351ad4dfc44.zip";
+    sha256 = "beb9260d606fdd5304aa958d95f0d3c20be7ca0a2cff44e7b75281c138a76a50";
+  };
+
+  buildInputs = [ pkgs.unzip lua5_1 zziplib ];
+
+  preBuild = ''
+    makeFlagsArray=(
+      PREFIX=$out
+      LUA_LIBDIR="$out/lib/lua/${lua5_1.luaversion}"
+      LUA_INC="-I${lua5_1}/include");
+  '';
+
+  patches = [ ./zip.patch ];
+
+  meta = {
+    homepage = "https://github.com/luaforge/luazip";
+    hydraPlatforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.mit;
+  };
+}
diff --git a/pkgs/development/interpreters/lua-5/zip.patch b/pkgs/development/interpreters/lua-5/zip.patch
new file mode 100644
index 00000000000..c3f88f451e8
--- /dev/null
+++ b/pkgs/development/interpreters/lua-5/zip.patch
@@ -0,0 +1,23 @@
+--- a/Makefile	2007-10-30 01:59:10.000000000 +0300
++++ b/Makefile	2014-09-18 11:04:53.176320021 +0400
+@@ -6,10 +6,6 @@
+
+ include $(CONFIG)
+
+-ifeq "$(LUA_VERSION_NUM)" "500"
+-COMPAT_O= $(COMPAT_DIR)/compat-5.1.o
+-endif
+-
+ SRCS= src/lua$T.c
+ OBJS= src/lua$T.o $(COMPAT_O)
+
+@@ -19,9 +15,6 @@
+ src/$(LIBNAME): $(OBJS)
+ 	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS) -lzzip
+
+-$(COMPAT_DIR)/compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c
+-	$(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
+-
+ install: src/$(LIBNAME)
+ 	mkdir -p $(LUA_LIBDIR)
+ 	cp src/$(LIBNAME) $(LUA_LIBDIR)
diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix
new file mode 100644
index 00000000000..21d203f8e63
--- /dev/null
+++ b/pkgs/development/interpreters/nix-exec/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, nix }: let
+  version = "1.0.0";
+in stdenv.mkDerivation {
+  name = "nix-exec-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz";
+
+    sha256 = "0w89ma69iil1ki68zvs1l0ii0d87in64791l3a4yzyv9d3ncl3w6";
+  };
+
+  buildInputs = [ pkgconfig nix ];
+
+  meta = {
+    description = "Run programs defined in nix expressions";
+
+    homepage = https://github.com/shlevy/nix-exec;
+
+    license = stdenv.lib.licenses.mit;
+
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+
+    platforms = nix.meta.platforms;
+  };
+}
diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.4/default.nix
index 0b3ca739092..8f9647c2134 100644
--- a/pkgs/development/interpreters/pypy/2.3/default.nix
+++ b/pkgs/development/interpreters/pypy/2.4/default.nix
@@ -6,8 +6,8 @@ assert zlibSupport -> zlib != null;
 
 let
 
-  majorVersion = "2.3";
-  version = "${majorVersion}.1";
+  majorVersion = "2.4";
+  version = "${majorVersion}.0";
   pythonVersion = "2.7";
   libPrefix = "pypy${majorVersion}";
 
@@ -18,7 +18,7 @@ let
 
     src = fetchurl {
       url = "https://bitbucket.org/pypy/pypy/get/release-${version}.tar.bz2";
-      sha256 = "0fg4l48c7n59n5j3b1dgcsr927xzylkfny4a6pnk6z0pq2bhvl9z";
+      sha256 = "1lhk86clnkj305dxa6xr9wjib6ckf6xxl6qj0bq20vqh80nfq3by";
     };
 
     buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 makeWrapper ]
@@ -70,7 +70,8 @@ let
        # disable sqlite3 due to https://bugs.pypy.org/issue1740
        # disable test_multiprocessing due to transient errors
        # disable test_os because test_urandom_failure fails
-      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_sqlite -test_socket -test_os -test_shutil -test_mhlib -test_multiprocessing' lib-python
+       # disable test_urllib2net and test_urllibnet because it requires networking (example.com)
+      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not (test_sqlite or test_urllib2net or test_urllibnet or test_socket or test_os or test_shutil or test_mhlib or test_multiprocessing)' lib-python
     '';
 
     installPhase = ''
diff --git a/pkgs/development/interpreters/pypy/2.3/setup-hook.sh b/pkgs/development/interpreters/pypy/2.4/setup-hook.sh
index 7d325828d0e..b9f5a38dcc6 100644
--- a/pkgs/development/interpreters/pypy/2.3/setup-hook.sh
+++ b/pkgs/development/interpreters/pypy/2.4/setup-hook.sh
@@ -1,12 +1,12 @@
 addPythonPath() {
-    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.3/site-packages
+    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.4/site-packages
 }
 
 toPythonPath() {
     local paths="$1"
     local result=
     for i in $paths; do
-        p="$i/lib/pypy2.3/site-packages"
+        p="$i/lib/pypy2.4/site-packages"
         result="${result}${result:+:}$p"
     done
     echo $result
diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
index e778c796bb3..78567b1979f 100644
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@@ -16,7 +16,7 @@ g: # Get dependencies from patched gems
     autotest_rails = g.autotest_rails_4_2_1;
     aws_sdk = g.aws_sdk_1_53_0;
     aws_sdk_v1 = g.aws_sdk_v1_1_53_0;
-    backports = g.backports_3_6_0;
+    backports = g.backports_3_6_1;
     bitbucket_backup = g.bitbucket_backup_0_3_1;
     blankslate = g.blankslate_2_1_2_4;
     builder = g.builder_3_2_2;
@@ -46,6 +46,7 @@ g: # Get dependencies from patched gems
     ethon = g.ethon_0_7_1;
     eventmachine = g.eventmachine_1_0_3;
     eventmachine_tail = g.eventmachine_tail_0_6_4;
+    excon = g.excon_0_39_5;
     execjs = g.execjs_2_2_1;
     fakes3 = g.fakes3_0_1_5_2;
     faraday = g.faraday_0_9_0;
@@ -57,6 +58,8 @@ g: # Get dependencies from patched gems
     gettext = g.gettext_3_1_4;
     gh = g.gh_0_13_2;
     gherkin = g.gherkin_2_12_2;
+    heroku = g.heroku_3_10_3;
+    heroku_api = g.heroku_api_0_3_19;
     highline = g.highline_1_6_21;
     hike = g.hike_1_2_3;
     hitimes = g.hitimes_1_2_2;
@@ -96,6 +99,7 @@ g: # Get dependencies from patched gems
     net_http_pipeline = g.net_http_pipeline_1_0_1;
     net_sftp = g.net_sftp_2_1_2;
     net_ssh = g.net_ssh_2_9_1;
+    netrc = g.netrc_0_7_7;
     nix = g.nix_0_1_1;
     nokogiri = g.nokogiri_1_6_3_1;
     ntlm_http = g.ntlm_http_0_1_1;
@@ -120,10 +124,11 @@ g: # Get dependencies from patched gems
     rdoc = g.rdoc_4_1_2;
     redcarpet = g.redcarpet_3_1_2;
     remote_syslog = g.remote_syslog_1_6_14;
+    rest_client = g.rest_client_1_6_7;
     riemann_dash = g.riemann_dash_0_2_9;
     right_aws = g.right_aws_3_1_0;
     right_http_connection = g.right_http_connection_1_5_0;
-    rjb = g.rjb_1_4_9;
+    rjb = g.rjb_1_5_0;
     rkelly_remix = g.rkelly_remix_0_0_6;
     rmail = g.rmail_1_0_0;
     rspec = g.rspec_2_14_1;
@@ -132,7 +137,7 @@ g: # Get dependencies from patched gems
     rspec_mocks = g.rspec_mocks_2_14_6;
     rubyzip = g.rubyzip_1_1_6;
     safe_yaml = g.safe_yaml_1_0_3;
-    sass = g.sass_3_4_4;
+    sass = g.sass_3_4_5;
     selenium_webdriver = g.selenium_webdriver_2_43_0;
     servolux = g.servolux_0_10_0;
     sinatra = g.sinatra_1_4_5;
@@ -150,9 +155,9 @@ g: # Get dependencies from patched gems
     thread_safe = g.thread_safe_0_3_4;
     tilt = g.tilt_1_4_1;
     timers = g.timers_4_0_1;
-    tins = g.tins_1_3_2;
+    tins = g.tins_1_3_3;
     toml = g.toml_0_1_1;
-    travis = g.travis_1_7_1;
+    travis = g.travis_1_7_2;
     trollop = g.trollop_2_0;
     typhoeus = g.typhoeus_0_6_9;
     tzinfo = g.tzinfo_1_2_2;
@@ -168,7 +173,7 @@ g: # Get dependencies from patched gems
     xml_simple = g.xml_simple_1_1_2;
     yajl_ruby = g.yajl_ruby_1_2_1;
   };
-  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''compass'' ''cucumber'' ''erubis'' ''execjs'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jekyll'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''rdoc'' ''remote_syslog'' ''riemann-dash'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''terminal-notifier'' ''thin'' ''travis'' ''trollop'' ''uglifier'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ''yajl-ruby'' ];
+  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''compass'' ''cucumber'' ''erubis'' ''execjs'' ''fakes3'' ''foreman'' ''gettext'' ''heroku'' ''iconv'' ''jekyll'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''rdoc'' ''remote_syslog'' ''riemann-dash'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''terminal-notifier'' ''thin'' ''travis'' ''trollop'' ''uglifier'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ''yajl-ruby'' ];
   gems = {
     ZenTest_4_10_1 = {
       basename = ''ZenTest'';
@@ -318,7 +323,7 @@ database compatibility and query generation.'';
 	check out Buildr!'';
       };
       name = ''atoulme-Antwrap-0.7.4'';
-      requiredGems = [ g.rjb_1_4_9 ];
+      requiredGems = [ g.rjb_1_5_0 ];
       sha256 = ''0sh9capkya88qm9mvixwly32fwb2c4nzif9j9vv0f73rqw8kz4j4'';
     };
     autotest_rails_4_2_1 = {
@@ -359,16 +364,16 @@ application.'';
       requiredGems = [ g.nokogiri_1_6_3_1 g.json_1_8_1 ];
       sha256 = ''00yagrm2d5agwkfgkv4rqbxymwmgjmv5n8hah3xhrc90q1ywr7hw'';
     };
-    backports_3_6_0 = {
+    backports_3_6_1 = {
       basename = ''backports'';
       meta = {
         description = ''Backports of Ruby features for older Ruby.'';
         homepage = ''http://github.com/marcandre/backports'';
-        longDescription = ''Essential backports that enable many of the nice features of Ruby 1.8.7 up to 2.0.0 for earlier versions.'';
+        longDescription = ''Essential backports that enable many of the nice features of Ruby 1.8.7 up to 2.1.0 for earlier versions.'';
       };
-      name = ''backports-3.6.0'';
+      name = ''backports-3.6.1'';
       requiredGems = [  ];
-      sha256 = ''1pinn0m4fmq124adc6xjl2hk9799xq5jw4bva82cdzd4h2hwrgq5'';
+      sha256 = ''182fzzmzhjknnh8r6196lnws5fik86wnsn64a382w0fqb2vz98bq'';
     };
     bitbucket_backup_0_3_1 = {
       basename = ''bitbucket_backup'';
@@ -562,7 +567,7 @@ for those one-off tasks, with a language that's a joy to use.
         longDescription = ''Compass is a Sass-based Stylesheet Framework that streamlines the creation and maintenance of CSS.'';
       };
       name = ''compass-1.0.1'';
-      requiredGems = [ g.sass_3_4_4 g.compass_core_1_0_1 g.compass_import_once_1_0_5 g.chunky_png_1_3_1 g.rb_fsevent_0_9_4 g.rb_inotify_0_9_5 ];
+      requiredGems = [ g.sass_3_4_5 g.compass_core_1_0_1 g.compass_import_once_1_0_5 g.chunky_png_1_3_1 g.rb_fsevent_0_9_4 g.rb_inotify_0_9_5 ];
       sha256 = ''0cxb6nbj37wz2zwwb4pkbvg9pg0ymamxx9v400h9ibvlb5n0ri40'';
     };
     compass_core_1_0_1 = {
@@ -573,7 +578,7 @@ for those one-off tasks, with a language that's a joy to use.
         longDescription = ''The Compass core stylesheet library and minimum required ruby extensions. This library can be used stand-alone without the compass ruby configuration file or compass command line tools.'';
       };
       name = ''compass-core-1.0.1'';
-      requiredGems = [ g.sass_3_4_4 g.multi_json_1_10_1 ];
+      requiredGems = [ g.sass_3_4_5 g.multi_json_1_10_1 ];
       sha256 = ''0zhbmgjq6s9j2qdx3cz0v8s216mh8g0ymk4fzmq3c4an9rryl1zx'';
     };
     compass_import_once_1_0_5 = {
@@ -584,7 +589,7 @@ for those one-off tasks, with a language that's a joy to use.
         longDescription = ''Changes the behavior of Sass's @import directive to only import a file once.'';
       };
       name = ''compass-import-once-1.0.5'';
-      requiredGems = [ g.sass_3_4_4 ];
+      requiredGems = [ g.sass_3_4_5 ];
       sha256 = ''0bn7gwbfz7jvvdd0qdfqlx67fcb83gyvxqc7dr9fhcnks3z8z5rq'';
     };
     cucumber_1_3_17 = {
@@ -775,6 +780,17 @@ using TCP/IP, especially if custom protocols are required.'';
       requiredGems = [ g.eventmachine_1_0_3 ];
       sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61'';
     };
+    excon_0_39_5 = {
+      basename = ''excon'';
+      meta = {
+        description = ''speed, persistence, http(s)'';
+        homepage = ''https://github.com/excon/excon'';
+        longDescription = ''EXtended http(s) CONnections'';
+      };
+      name = ''excon-0.39.5'';
+      requiredGems = [  ];
+      sha256 = ''04dgrjq6b955bv2bps0g59gvn089mz8339nhlqksjf9jimgjglcq'';
+    };
     execjs_2_2_1 = {
       basename = ''execjs'';
       meta = {
@@ -883,7 +899,7 @@ So you can use GNU gettext tools for maintaining.
         longDescription = ''multi-layer client for the github api v3'';
       };
       name = ''gh-0.13.2'';
-      requiredGems = [ g.faraday_0_9_0 g.backports_3_6_0 g.multi_json_1_10_1 g.addressable_2_3_6 g.net_http_persistent_2_9_4 g.net_http_pipeline_1_0_1 ];
+      requiredGems = [ g.faraday_0_9_0 g.backports_3_6_1 g.multi_json_1_10_1 g.addressable_2_3_6 g.net_http_persistent_2_9_4 g.net_http_pipeline_1_0_1 ];
       sha256 = ''17scqa35j6ghpykzk986gnd6dvbrh8nn60ib04hb2gbyh9dns1dj'';
     };
     gherkin_2_12_2 = {
@@ -897,6 +913,28 @@ So you can use GNU gettext tools for maintaining.
       requiredGems = [ g.multi_json_1_10_1 ];
       sha256 = ''1mxfgw15pii1jmq00xxbyp77v71mh3bp99ndgwzfwkxvbcisha25'';
     };
+    heroku_3_10_3 = {
+      basename = ''heroku'';
+      meta = {
+        description = ''Client library and CLI to deploy apps on Heroku.'';
+        homepage = ''http://heroku.com/'';
+        longDescription = ''Client library and command-line tool to deploy and manage apps on Heroku.'';
+      };
+      name = ''heroku-3.10.3'';
+      requiredGems = [ g.heroku_api_0_3_19 g.launchy_2_4_2 g.netrc_0_7_7 g.rest_client_1_6_7 g.rubyzip_0_9_9 ];
+      sha256 = ''04j9rndygkf5gkv2w5a29wvn683viskhaqyj4fsvnj02qfhfrvnr'';
+    };
+    heroku_api_0_3_19 = {
+      basename = ''heroku_api'';
+      meta = {
+        description = ''Ruby Client for the Heroku API'';
+        homepage = ''http://github.com/heroku/heroku.rb'';
+        longDescription = ''Ruby Client for the Heroku API'';
+      };
+      name = ''heroku-api-0.3.19'';
+      requiredGems = [ g.excon_0_39_5 g.multi_json_1_10_1 ];
+      sha256 = ''08wddhsnvjyb2a1wl85gbb00rjb1xs26pjlkd068635hi6wmx2id'';
+    };
     highline_1_6_21 = {
       basename = ''highline'';
       meta = {
@@ -1035,7 +1073,7 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
         homepage = ''https://github.com/jekyll/jekyll-sass-converter'';
       };
       name = ''jekyll-sass-converter-1.2.1'';
-      requiredGems = [ g.sass_3_4_4 ];
+      requiredGems = [ g.sass_3_4_5 ];
       sha256 = ''1w221nzcpaqh2llflciwhbzw1sqxjavwwzbri9n4qkj057a73ar1'';
     };
     jekyll_watch_1_1_1 = {
@@ -1461,6 +1499,17 @@ The server will respond in-order.'';
       requiredGems = [  ];
       sha256 = ''1vscp4r58jisiigqc6d6752w19m1m6hmi3jkzmp3ydxai7h3jb2j'';
     };
+    netrc_0_7_7 = {
+      basename = ''netrc'';
+      meta = {
+        description = ''Library to read and write netrc files.'';
+        homepage = ''https://github.com/geemus/netrc'';
+        longDescription = ''This library can read and update netrc files, preserving formatting including comments and whitespace.'';
+      };
+      name = ''netrc-0.7.7'';
+      requiredGems = [  ];
+      sha256 = ''1y64v93hsxdwgx3dfkyzdki3zqd1slm42dmi23v0zy3kap4vpard'';
+    };
     nix_0_1_1 = {
       basename = ''nix'';
       meta = {
@@ -1769,6 +1818,17 @@ from the command-line.'';
       requiredGems = [ g.servolux_0_10_0 g.file_tail_1_0_12 g.eventmachine_1_0_3 g.eventmachine_tail_0_6_4 g.syslog_protocol_0_9_2 g.em_resolv_replace_1_1_3 ];
       sha256 = ''1f2yjyqhbdc4vlx52zli1b33f6yn8qc1kd4n0dpv27zswj9qfdkr'';
     };
+    rest_client_1_6_7 = {
+      basename = ''rest_client'';
+      meta = {
+        description = ''Simple HTTP and REST client for Ruby, inspired by microframework syntax for specifying actions.'';
+        homepage = ''http://github.com/archiloque/rest-client'';
+        longDescription = ''A simple HTTP and REST client for Ruby, inspired by the Sinatra microframework style of specifying actions: get, put, post, delete.'';
+      };
+      name = ''rest-client-1.6.7'';
+      requiredGems = [ g.mime_types_2_3 ];
+      sha256 = ''0nn7zalgidz2yj0iqh3xvzh626krm2al79dfiij19jdhp0rk8853'';
+    };
     riemann_dash_0_2_9 = {
       basename = ''riemann_dash'';
       meta = {
@@ -1777,7 +1837,7 @@ from the command-line.'';
         longDescription = ''HTTP dashboard for the distributed event system Riemann.'';
       };
       name = ''riemann-dash-0.2.9'';
-      requiredGems = [ g.erubis_2_7_0 g.sinatra_1_4_5 g.sass_3_4_4 g.webrick_1_3_1 g.multi_json_1_3_6 ];
+      requiredGems = [ g.erubis_2_7_0 g.sinatra_1_4_5 g.sass_3_4_5 g.webrick_1_3_1 g.multi_json_1_3_6 ];
       sha256 = ''0ws5wmjbv8w9lcr3i2mdinj2qm91p6c85k6c067i67cf0p90jxq3'';
     };
     right_aws_3_1_0 = {
@@ -1859,6 +1919,18 @@ algorithm for low-level network errors.
       requiredGems = [  ];
       sha256 = ''062f7bjwz6iz6da49nzzbbx4xn8ahqqha2smqvqhbf0i7kd5v0yz'';
     };
+    rjb_1_5_0 = {
+      basename = ''rjb'';
+      meta = {
+        description = ''Ruby Java bridge'';
+        homepage = ''http://rjb.rubyforge.org/'';
+        longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
+'';
+      };
+      name = ''rjb-1.5.0'';
+      requiredGems = [  ];
+      sha256 = ''0hjc0l3241lqrfracgb7gmsyd54v0lzplqfv9kfzk8km61pkjlfb'';
+    };
     rkelly_remix_0_0_6 = {
       basename = ''rkelly_remix'';
       meta = {
@@ -1990,7 +2062,7 @@ RKelly[https://github.com/tenderlove/rkelly] JavaScript parser.'';
       requiredGems = [  ];
       sha256 = ''063bykyk40s3rhy1dxfbvl69s179n1iny418z4wqjbvhrmjn18wl'';
     };
-    sass_3_4_4 = {
+    sass_3_4_5 = {
       basename = ''sass'';
       meta = {
         description = ''A powerful but elegant CSS compiler that makes CSS fun again.'';
@@ -2001,9 +2073,9 @@ RKelly[https://github.com/tenderlove/rkelly] JavaScript parser.'';
       command line tool or a web-framework plugin.
 '';
       };
-      name = ''sass-3.4.4'';
+      name = ''sass-3.4.5'';
       requiredGems = [  ];
-      sha256 = ''0xvdj5lb062z1byq7s8f8zmp5kkjhghih5rfdb1q61mmmbmy9lw7'';
+      sha256 = ''1rd07m2gprzgd6a4vnrlnyx5lkslfn30hcgfav86rb82a8zqmxah'';
     };
     selenium_webdriver_2_43_0 = {
       basename = ''selenium_webdriver'';
@@ -2134,7 +2206,7 @@ management.
         longDescription = ''This library uses ANSI escape sequences to control the attributes of terminal output'';
       };
       name = ''term-ansicolor-1.3.0'';
-      requiredGems = [ g.tins_1_3_2 ];
+      requiredGems = [ g.tins_1_3_3 ];
       sha256 = ''1a2gw7gmpmx57sdpyhjwl0zn4bqp7jyjz7aslpvvphd075layp4b'';
     };
     terminal_notifier_1_6_1 = {
@@ -2224,16 +2296,16 @@ management.
       requiredGems = [  ];
       sha256 = ''1ygkm4ava7x6ap61qz6pn79193g6g29248fa04mwknsz6acfjs2y'';
     };
-    tins_1_3_2 = {
+    tins_1_3_3 = {
       basename = ''tins'';
       meta = {
         description = ''Useful stuff.'';
         homepage = ''http://flori.github.com/tins'';
         longDescription = ''All the stuff that isn't good/big enough for a real library.'';
       };
-      name = ''tins-1.3.2'';
+      name = ''tins-1.3.3'';
       requiredGems = [  ];
-      sha256 = ''1i27zj1bhmgq19f3i5i08njprfnlv3yi5frm8ax6w0b342p6v8ly'';
+      sha256 = ''14jnsg15wakdk1ljh2iv9yvzk8nb7gpzd2zw4yvjikmffqjyqvna'';
     };
     toml_0_1_1 = {
       basename = ''toml'';
@@ -2246,16 +2318,16 @@ management.
       requiredGems = [ g.parslet_1_5_0 ];
       sha256 = ''1m5dv66qnbbg0r2zpp45hzq2nkmc4qaq0xmqw8j1kwkrpiwihwp8'';
     };
-    travis_1_7_1 = {
+    travis_1_7_2 = {
       basename = ''travis'';
       meta = {
         description = ''Travis CI client'';
         homepage = ''https://github.com/travis-ci/travis.rb'';
         longDescription = ''CLI and Ruby client library for Travis CI'';
       };
-      name = ''travis-1.7.1'';
-      requiredGems = [ g.faraday_0_9_0 g.faraday_middleware_0_9_1 g.highline_1_6_21 g.backports_3_6_0 g.gh_0_13_2 g.launchy_2_4_2 g.pry_0_9_12_6 g.typhoeus_0_6_9 g.pusher_client_0_6_0 g.addressable_2_3_6 ];
-      sha256 = ''1h0xajfzkz7pdrbhs2650nl5www8qfmgazmmmw0bcr3dai5kimdf'';
+      name = ''travis-1.7.2'';
+      requiredGems = [ g.faraday_0_9_0 g.faraday_middleware_0_9_1 g.highline_1_6_21 g.backports_3_6_1 g.gh_0_13_2 g.launchy_2_4_2 g.pry_0_9_12_6 g.typhoeus_0_6_9 g.pusher_client_0_6_0 g.addressable_2_3_6 ];
+      sha256 = ''0zl9b48dv0v0gmrj6xyprhysa4g0r3yz8a6f99h0qgwiw2l2xxcc'';
     };
     trollop_2_0 = {
       basename = ''trollop'';
diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix
index 98e1edee387..f53e42f0bde 100644
--- a/pkgs/development/interpreters/self/default.nix
+++ b/pkgs/development/interpreters/self/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     description = "A prototype-based dynamic object-oriented programming language, environment, and virtual machine";
     homepage = "http://selflanguage.org/";
     license = stdenv.lib.licenses.bsd3;
-    maintainer = [ stdenv.lib.maintainers.doublec ];
+    maintainers = [ stdenv.lib.maintainers.doublec ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index 4c2739d00ec..512a17e6d3e 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1s0ylyrx74vgw6vsg6xxk4b07jrxh8pqcmxcbkx46v01nczv3ixj";
   };
 
-  buildInputs = [ cmake boost gmp mpfr ];
+  buildInputs = [ cmake boost boost.lib gmp mpfr ];
 
   doCheck = false;
 
diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/development/libraries/LASzip/default.nix
new file mode 100644
index 00000000000..df9d126ad71
--- /dev/null
+++ b/pkgs/development/libraries/LASzip/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, cmake }:
+
+stdenv.mkDerivation rec {
+  version = "2.2.0";
+  name = "LASzip-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/LASzip/LASzip/archive/v${version}.tar.gz";
+    sha256 = "b8e8cc295f764b9d402bc587f3aac67c83ed8b39f1cb686b07c168579c61fbb2";
+  };
+  
+  buildInputs = [cmake];
+
+  meta = {
+    description = "Turn quickly bulky LAS files into compact LAZ files without information loss";
+    homepage = http://www.laszip.org;
+    license = stdenv.lib.licenses.lgpl2;
+    maintainers = [ stdenv.lib.maintainers.michelk ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix
index 7b85d29c81b..7914dac4933 100644
--- a/pkgs/development/libraries/accountsservice/default.nix
+++ b/pkgs/development/libraries/accountsservice/default.nix
@@ -2,11 +2,12 @@
 , libtool, gobjectIntrospection, polkit, systemd, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "accountsservice-0.6.37";
+  name = "accountsservice-${version}";
+  version = "0.6.38";
   
   src = fetchurl {
-    url = http://www.freedesktop.org/software/accountsservice/accountsservice-0.6.37.tar.xz;
-    sha256 = "1hd58lrl698ij7w1xk3fpj8zp7h6m2hpzvfmbw9sfx4xvhv13cmh";
+    url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
+    sha256 = "1ad32qv57rx9yzrvzsw0d0lh0j7adlh664lachv621wb8ya22crn";
   };
 
   buildInputs = [ pkgconfig glib intltool libtool makeWrapper
@@ -24,7 +25,10 @@ stdenv.mkDerivation rec {
       --run "${coreutils}/bin/mkdir -p /var/lib/AccountsService/icons"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "D-Bus interface for user account query and manipulation";
+    homepage = http://www.freedesktop.org/wiki/Software/AccountsService;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/contextfile b/pkgs/development/libraries/agda/TotalParserCombinators/contextfile
new file mode 100644
index 00000000000..1d211f397af
--- /dev/null
+++ b/pkgs/development/libraries/agda/TotalParserCombinators/contextfile
@@ -0,0 +1,213 @@
+
+Context:
+
+[Updated code to reflect changes to Agda.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20140425121055
+ Ignore-this: 54d80fd647cb897eef85f57e9172f7db
+] 
+
+[Workaround for (possible) Agda bug.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20140228200347
+ Ignore-this: b17884ad17a3bdb7faff678622365a8
+] 
+
+[Updated code to reflect changes to library API.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20130307134644
+ Ignore-this: 50d070a22a6796b9acdf19d44ba5de16
+] 
+
+[Updated code to reflect changes to Agda and the library API.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20130228122951
+ Ignore-this: 761dc4d85683a59cc3667a8706c88093
+] 
+
+[Turned _◇_ into a constructor.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20120316125431
+ Ignore-this: 41b492c3106a575f28f146253f78a5ae
+] 
+
+[Updated code to reflect changes to Agda.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20120316125416
+ Ignore-this: e77d817d8b391c3b4806119d10848eb3
+] 
+
+[Updated code to reflect changes to Agda.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20120215103344
+ Ignore-this: 467716429d5553cd122722108ea82a08
+] 
+
+[Modified a comment.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20120215103319
+ Ignore-this: e57d4911f692f8a96a80017d910efc5f
+] 
+
+[Updated code to reflect change to library API.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20111006160229
+ Ignore-this: 5359da54e7e6e0f92983fa3ecaccebf3
+] 
+
+[Updated code to reflect changes to Agda and the library API.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20111003170117
+ Ignore-this: cbdd35172e372779e12642985cf17268
+] 
+
+[Rolled back addition of inversion lemmas.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110930150912
+ Ignore-this: 9c9b083f0afcf95aaaa55a01d871274e
+] 
+
+[Added inversion lemmas, implemented other lemmas using these lemmas.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110930150842
+ Ignore-this: 19b832c3f9e14d1e713b5911c094a130
+ + This change was a response to a change to Agda's pattern matching
+   machinery. Subsequently the machinery was made more liberal again,
+   making this change unnecessary.
+] 
+
+[Updated code to reflect changes to library API.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110517220158
+ Ignore-this: ea9771a5014a25cb20afc2118638f8b5
+] 
+
+[Updated code to reflect changes to Agda.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110512124425
+ Ignore-this: 97b154661679f574f6ab914583b14580
+] 
+
+[Proved that many constructions preserve various preorders.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110313012617
+ Ignore-this: 8008efaff967c228448baa33b82edb81
+] 
+
+[Updated code to reflect changes to library API.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110313002106
+ Ignore-this: 94799ba1ae411e59fd8c6c7eac3b8dfb
+] 
+
+[Simplified TotalRecognisers.LeftRecursion.MatchingParentheses.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110118102159
+ Ignore-this: 1e01a8092b0c0124979ffc5fe17a245c
+] 
+
+[Added TotalRecognisers.LeftRecursion.MatchingParentheses.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110118102146
+ Ignore-this: 13a3bc91425364e26c3047561655bb25
+] 
+
+[Added a simplifying backend.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101229012716
+ Ignore-this: 9ac7ae21cd44c099633678a994fb9a3
+] 
+
+[Fixed another "bug" in the deep simplifier.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101229010854
+ Ignore-this: e258adf963436ef715242db23c6808e
+ + Sometimes the first layer of bind's right-hand argument was not
+   simplified.
+] 
+
+[Made simplify₁ public and changed its type.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228235603
+ Ignore-this: d39b8453a15089126261e098080223c6
+] 
+
+[Deep simplification no longer adds casts.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228192850
+ Ignore-this: 2ba016825adfa3a1e36922869eabfd39
+] 
+
+[The first constructor in a simplified parser can no longer be a cast.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228175822
+ Ignore-this: ce3e38cc0b9a096aa436655c9013ae97
+] 
+
+[Modified the outline.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228173414
+ Ignore-this: f8866e69f6d1a344e79fb6f708dfa4c
+] 
+
+[Added an example: a right recursive expression grammar.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228173159
+ Ignore-this: 9a4d732b451cca08ba19aac5d115c678
+] 
+
+[Rearranged the code.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228172209
+ Ignore-this: 50fa29406d0f150669ff3feec4dbe513
+] 
+
+[Renamed same-bag/set to (initial-bag-)cong.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228170706
+ Ignore-this: dd3ce43d77dde74cc2428d2568dd2d30
+] 
+
+[Added TotalParserCombinators.Force.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228153638
+ Ignore-this: 3b6ff6ea20df0c1293494f06845d17eb
+] 
+
+[Proved that uses of subst can be erased.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228153621
+ Ignore-this: f503ba495b923ae521718b6957167128
+] 
+
+[The deep simplifier no longer skips layers.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228141138
+ Ignore-this: 733a4a4a9aa0f890ad1740ecfc6a599f
+] 
+
+[Documented that the deep simplifier misses every second layer.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228121910
+ Ignore-this: 8a0baf25b12f63f8748dbc1d16affacf
+] 
+
+[The simplifier now applies the token-bind rule more often.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101227165413
+ Ignore-this: 40132fa6f19602886bbe29aadd8a683c
+] 
+
+[Switched back to deep simplification, now with a proper proof.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101227125434
+ Ignore-this: ccc46e82f6f9c6c2a27ddb43d315f7dd
+] 
+
+[Simplified the soundness proof.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101227123839
+ Ignore-this: fb6826dd9836e34fc3bfdce2928ba13d
+] 
+
+[Made some _≈[_]P_ constructors conditionally coinductive.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101227123827
+ Ignore-this: f521f70475403697229051b62343a080
+ + The structure of the soundness proof was also changed.
+] 
+
+[Unified And, AsymmetricChoice and Not.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101225103109
+ Ignore-this: 5ae8b80e1505fe6e707bb2307d22688c
+] 
+
+[Modified some comments.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101225101051
+ Ignore-this: e812d8c3e9720895c368f7a286f8315c
+] 
+
+[Modified a comment.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101223202647
+ Ignore-this: 16ea5dc01a4cbe0fe38714b2e4b7ff6
+] 
+
+[Updated code to reflect changes to library API.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101107162658
+ Ignore-this: 9e38a10a9997c9825ece6ad9f871b673
+] 
+
+[Added an alternative backend for TotalRecognisers.Simple.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101020183743
+ Ignore-this: a111a89e0c237e132b649561000f53d6
+] 
+
+[TAG Code corresponding to the paper "Total Parser Combinators" (4).
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20100928013815
+ Ignore-this: 45ccc28373ed3974047315613eb14833
+] 
diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix
new file mode 100644
index 00000000000..6b0a63066b2
--- /dev/null
+++ b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, agda, fetchdarcs, AgdaStdlib }:
+
+agda.mkDerivation (self: rec {
+  version = "2014-09-27";
+  name = "TotalParserCombinators-${version}";
+
+  src = fetchdarcs {
+    url = "http://www.cse.chalmers.se/~nad/repos/parser-combinators.code/";
+    context = ./contextfile;
+    sha256 = "1rb8prqqp4dnz9s83ays7xfvpqs0n20vl1bg2zlg5si171j9rd4i";
+  };
+
+  buildDepends = [ AgdaStdlib ];
+  everythingFile = "TotalParserCombinators.agda";
+  sourceDirectories = [];
+  topSourceDirectories = [ "../$sourceRoot" ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.cse.chalmers.se/~nad/publications/danielsson-parser-combinators.html";
+    description = "A monadic parser combinator library which guarantees termination of parsing";
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/agda/agda-base/default.nix b/pkgs/development/libraries/agda/agda-base/default.nix
new file mode 100644
index 00000000000..cf73d7dea06
--- /dev/null
+++ b/pkgs/development/libraries/agda/agda-base/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, agda, fetchurl }:
+
+agda.mkDerivation (self: rec {
+  version = "0.1";
+  name = "agda-base-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/pcapriotti/agda-base/archive/v${version}.tar.gz";
+    sha256 = "124h06p7jdiqr2x6r46sfab9r0cgb0fznr2qs5i1psl5yf3z74h8";
+  };
+
+  sourceDirectories = [ "./." ];
+  everythingFile = "README.agda";
+
+  meta = {
+    homepage = "https://github.com/pcapriotti/agda-base";
+    description = "Base library for HoTT in Agda";
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
new file mode 100644
index 00000000000..fa8ed9e80a7
--- /dev/null
+++ b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, agda, fetchsvn }:
+
+agda.mkDerivation (self: rec {
+  version = "18437";
+  name = "agda-iowa-stdlib-${version}";
+
+  src = fetchsvn {
+    url = "https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib";
+    rev = version;
+    sha256 = "1g6pwvrcir53ppf6wd8s62gizc3qy35mp229b66mh53abg4brik2";
+  };
+
+  sourceDirectories = [ "./." ];
+  buildPhase = ''
+    patchShebangs find-deps.sh
+    make
+  '';
+
+  meta = {
+    homepage = "https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib/";
+    description = "Agda standard library developed at Iowa";
+    license = stdenv.lib.licenses.free;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix
new file mode 100644
index 00000000000..9b67c5dbb5b
--- /dev/null
+++ b/pkgs/development/libraries/agda/agda-prelude/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, agda, fetchgit }:
+
+agda.mkDerivation (self: rec {
+  version = "d598f35d88596c5a63766a7188a0c0144e467c8c";
+  name = "agda-prelude-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/UlfNorell/agda-prelude.git";
+    rev = version;
+    sha256 = "bdcffb675d0ad1bafa2b47f581b6a9b90347ae739b6218f89f365fda2cc4f8c8";
+  };
+
+  topSourceDirectories = [ "src" ];
+  everythingFile = "src/Prelude.agda";
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/UlfNorell/agda-prelude";
+    description = "Programming library for Agda";
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/agda/pretty/contextfile b/pkgs/development/libraries/agda/pretty/contextfile
new file mode 100644
index 00000000000..4ad31c2e7fa
--- /dev/null
+++ b/pkgs/development/libraries/agda/pretty/contextfile
@@ -0,0 +1,7 @@
+
+Context:
+
+[TAG Correct-by-Construction Pretty-Printing (2013-06-14)
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20130614153155
+ Ignore-this: a64ae32de9e22d60d64ef3da19847e00
+] 
diff --git a/pkgs/development/libraries/agda/pretty/default.nix b/pkgs/development/libraries/agda/pretty/default.nix
new file mode 100644
index 00000000000..1bcb9f8459b
--- /dev/null
+++ b/pkgs/development/libraries/agda/pretty/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, agda, fetchdarcs, AgdaStdlib }:
+
+agda.mkDerivation (self: rec {
+  version = "2014-09-27";
+  name = "pretty-${version}";
+
+  src = fetchdarcs {
+    url = "http://www.cse.chalmers.se/~nad/repos/pretty/";
+    context = ./contextfile;
+    sha256 = "067pv55r3wlchbgjpx3ha5hyzr29y6xsix0ywwgirm8njcc8nv16";
+  };
+
+  buildDepends = [ AgdaStdlib ];
+  everythingFile = "Pretty.agda";
+  sourceDirectories = [];
+  topSourceDirectories = [ "../$sourceRoot" ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.cse.chalmers.se/~nad/publications/danielsson-correct-pretty.html";
+    description = "Correct-by-Construction Pretty-Printing";
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index 1dc4b1d77ba..76477d38b6d 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -14,11 +14,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "apr-util-1.5.3";
+  name = "apr-util-1.5.4";
 
   src = fetchurl {
     url = "mirror://apache/apr/${name}.tar.bz2";
-    sha256 = "0s1rpqjy5xr03k9s4xrsm5wvhj5286vlkf6jvqayw99yy5sb3vbq";
+    sha256 = "0bn81pfscy9yjvbmyx442svf43s6dhrdfcsnkpxz43fai5qk5kx6";
   };
 
   configureFlags = ''
@@ -48,5 +48,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://apr.apache.org/;
     description = "A companion library to APR, the Apache Portable Runtime";
+    maintainers = [ stdenv.lib.maintainers.eelco ];
   };
 }
diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix
new file mode 100644
index 00000000000..229db910ffd
--- /dev/null
+++ b/pkgs/development/libraries/assimp/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, unzip, cmake, boost }:
+
+let
+  major = "3";
+  minor = "1";
+  revision = "1";
+  version = "${major}.${minor}.${revision}";
+in
+stdenv.mkDerivation {
+  name = "assimp-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/assimp/assimp-${major}.${minor}/assimp-${version}_no_test_models.zip";
+    sha256 = "17nyzsqzqpafamhi779f1bkh5mfgj8rpas034x3v9a0hdy3jg66s";
+  };
+
+  buildInputs = [ unzip cmake boost ];
+
+  meta = with stdenv.lib; {
+    description = "Open Asset Import Library is a library to import various 3D model formats";
+    homepage = http://assimp.sourceforge.net/;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ emery ];
+    platfroms = platforms.linux;
+    inherit version;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix
index aad3656cde8..269e7472280 100644
--- a/pkgs/development/libraries/audio/raul/default.nix
+++ b/pkgs/development/libraries/audio/raul/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "raul-svn-${rev}";
-  rev = "5205";
+  rev = "5449";
 
   src = fetchsvn {
     url = "http://svn.drobilla.net/lad/trunk/raul";
     rev = rev;
-    sha256 = "1rkl7vxhwf6d0qfl2ymfd1qwmh9cl1xv6kkz893xg0blpvzcdmp3";
+    sha256 = "02ph1hikp1iynwbxbiaf28brkwig7n4lsb3djaivnf14arg5vmzx";
   };
 
   buildInputs = [ boost gtk pkgconfig python ];
diff --git a/pkgs/development/libraries/boost/1.55.nix b/pkgs/development/libraries/boost/1.55.nix
index cdbf98f4483..2c02ce13e8d 100644
--- a/pkgs/development/libraries/boost/1.55.nix
+++ b/pkgs/development/libraries/boost/1.55.nix
@@ -40,7 +40,7 @@ let
   withToolset = stdenv.lib.optionalString (toolset != null) " --with-toolset=${toolset}";
 in
 
-stdenv.mkDerivation {
+let res = stdenv.mkDerivation {
   name = "boost-1.55.0";
 
   meta = {
@@ -98,4 +98,4 @@ stdenv.mkDerivation {
       ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install
     '';
   };
-}
+}; in res // { lib = res; }
diff --git a/pkgs/development/libraries/boost/1.56.nix b/pkgs/development/libraries/boost/1.56.nix
new file mode 100644
index 00000000000..212b6ca0dee
--- /dev/null
+++ b/pkgs/development/libraries/boost/1.56.nix
@@ -0,0 +1,146 @@
+{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames
+, toolset ? null
+, enableRelease ? true
+, enableDebug ? false
+, enableSingleThreaded ? false
+, enableMultiThreaded ? true
+, enableShared ? true
+, enableStatic ? false
+, enablePIC ? false
+, enableExceptions ? false
+, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))
+}:
+
+# We must build at least one type of libraries
+assert !enableShared -> enableStatic;
+
+with stdenv.lib;
+let
+
+  variant = concatStringsSep ","
+    (optional enableRelease "release" ++
+     optional enableDebug "debug");
+
+  threading = concatStringsSep ","
+    (optional enableSingleThreaded "single" ++
+     optional enableMultiThreaded "multi");
+
+  link = concatStringsSep ","
+    (optional enableShared "shared" ++
+     optional enableStatic "static");
+
+  runtime-link = if enableShared then "shared" else "static";
+
+  # To avoid library name collisions
+  layout = if taggedLayout then "tagged" else "system";
+
+  cflags = if enablePIC && enableExceptions then
+             "cflags=\"-fPIC -fexceptions\" cxxflags=-fPIC linkflags=-fPIC"
+           else if enablePIC then
+             "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC"
+           else if enableExceptions then
+             "cflags=-fexceptions"
+           else
+             "";
+
+  withToolset = stdenv.lib.optionalString (toolset != null) "--with-toolset=${toolset}";
+
+  genericB2Flags = [
+    "--prefix=$out"
+    "--libdir=$lib/lib"
+    "-j$NIX_BUILD_CORES"
+    "--layout=${layout}"
+    "variant=${variant}"
+    "threading=${threading}"
+    "runtime-link=${runtime-link}"
+    "link=${link}"
+    "${cflags}"
+  ] ++ optional (variant == "release") "debug-symbols=off";
+
+  nativeB2Flags = [
+    "-sEXPAT_INCLUDE=${expat}/include"
+    "-sEXPAT_LIBPATH=${expat}/lib"
+  ] ++ optional (toolset != null) "toolset=${toolset}";
+  nativeB2Args = concatStringsSep " " (genericB2Flags ++ nativeB2Flags);
+
+  crossB2Flags = [
+    "-sEXPAT_INCLUDE=${expat.crossDrv}/include"
+    "-sEXPAT_LIBPATH=${expat.crossDrv}/lib"
+    "--user-config=user-config.jam"
+    "toolset=gcc-cross"
+    "--without-python"
+  ];
+  crossB2Args = concatMapStringsSep " " (genericB2Flags ++ crossB2Flags);
+
+  builder = b2Args: ''
+    ./b2 ${b2Args}
+  '';
+
+  installer = b2Args: ''
+    # boostbook is needed by some applications
+    mkdir -p $out/share/boostbook
+    cp -a tools/boostbook/{xsl,dtd} $out/share/boostbook/
+
+    # Let boost install everything else
+    ./b2 ${b2Args} install
+  '';
+
+  commonConfigureFlags = [
+    "--libdir=$(lib)/lib"
+  ];
+in
+
+stdenv.mkDerivation {
+  name = "boost-1.56.0";
+
+  meta = {
+    homepage = "http://boost.org/";
+    description = "Collection of C++ libraries";
+    license = "boost-license";
+
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ simons wkennington ];
+  };
+
+  src = fetchurl {
+    url = "mirror://sourceforge/boost/boost_1_56_0.tar.bz2";
+    sha256 = "07gz62nj767qzwqm3xjh11znpyph8gcii0cqhnx7wvismyn34iqk";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ icu expat zlib bzip2 python ]
+    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+  configureScript = "./bootstrap.sh";
+  configureFlags = commonConfigureFlags ++ [
+    "--with-icu=${icu}"
+    "--with-python=${python}/bin/python"
+  ] ++ optional (toolset != null) "--with-toolset=${toolset}";
+
+  buildPhase = ''
+    ${stdenv.lib.optionalString (toolset == "clang") "unset NIX_ENFORCE_PURITY"}
+  '' + builder nativeB2Args;
+
+  installPhase = installer nativeB2Args;
+
+  outputs = [ "out" "lib" ];
+
+  crossAttrs = rec {
+    buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ];
+    # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
+    # override them.
+    propagatedBuildInputs = buildInputs;
+    # We want to substitute the contents of configureFlags, removing thus the
+    # usual --build and --host added on cross building.
+    preConfigure = ''
+      export configureFlags="--prefix=$out --without-icu ${concatStringsSep " " commonConfigureFlags}"
+      set -x
+      cat << EOF > user-config.jam
+      using gcc : cross : $crossConfig-g++ ;
+      EOF
+    '';
+    buildPhase = builder crossB2Args;
+    installPhase = installer crossB2Args;
+  };
+}
diff --git a/pkgs/development/libraries/boost/header-only-wrapper.nix b/pkgs/development/libraries/boost/header-only-wrapper.nix
deleted file mode 100644
index 96c9216a371..00000000000
--- a/pkgs/development/libraries/boost/header-only-wrapper.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, boost }:
-
-let
-  version = stdenv.lib.removePrefix "boost-" boost.name;
-  pkgid = stdenv.lib.replaceChars ["-" "."] ["_" "_"] boost.name;
-in
-
-stdenv.mkDerivation {
-  name = "boost-headers-${version}";
-
-  src = boost.src;
-
-  phases = [ "installPhase" ];
-
-  installPhase = ''
-    mkdir -p $out/include
-    tar xf $src -C $out/include --strip-components=1 ${pkgid}/boost
-  '';
-
-  preferLocalBuild = true;
-
-  meta = {
-    homepage = "http://boost.org/";
-    description = "Boost C++ Library Collection";
-    license = "boost-license";
-
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.viric stdenv.lib.maintainers.simons ];
-  };
-}
diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix
index 64dd821c43f..e603b904dda 100644
--- a/pkgs/development/libraries/botan/default.nix
+++ b/pkgs/development/libraries/botan/default.nix
@@ -9,8 +9,9 @@ let
   helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
     [];
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  buildInputs = [ boost.lib ]
+    ++ map (n: builtins.getAttr n x)
+      (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="botan";
     tarBaseName="Botan";
diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix
index 677172dd3ac..be541a1d8ec 100644
--- a/pkgs/development/libraries/botan/unstable.nix
+++ b/pkgs/development/libraries/botan/unstable.nix
@@ -9,8 +9,9 @@ let
   helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
     [];
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  buildInputs = [ boost.lib ]
+    ++ map (n: builtins.getAttr n x)
+      (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="botan";
     tarBaseName="Botan";
diff --git a/pkgs/development/libraries/clutter-gtk/0.10.8.nix b/pkgs/development/libraries/clutter-gtk/0.10.8.nix
index e5f5a455c89..d3754ecd6c6 100644
--- a/pkgs/development/libraries/clutter-gtk/0.10.8.nix
+++ b/pkgs/development/libraries/clutter-gtk/0.10.8.nix
@@ -4,7 +4,10 @@ stdenv.mkDerivation rec {
   name = "clutter-gtk-0.10.8";
 
   src = fetchurl {
-    url = "http://source.clutter-project.org/sources/clutter-gtk/0.10/${name}.tar.bz2";
+    urls = [
+      "http://download.gnome.org/sources/clutter-gtk/0.10/${name}.tar.bz2"
+      "http://source.clutter-project.org/sources/clutter-gtk/0.10/${name}.tar.bz2"
+      ];
     sha256 = "0508x1jfnlq0zhgscysvfa7i7ljkzm23d2myikvdjwc8ar8zjrvq";
   };
 
diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix
index 43849bf8ed8..3ce9dc38b3c 100644
--- a/pkgs/development/libraries/cpp-netlib/default.nix
+++ b/pkgs/development/libraries/cpp-netlib/default.nix
@@ -12,17 +12,17 @@ stdenv.mkDerivation rec {
     md5 = "0765cf203f451394df98e6ddf7bf2541";
   };
 
-  buildInputs = [ cmake boost openssl ];
+  buildInputs = [ cmake boost boost.lib openssl ];
 
   cmakeFlags = [ "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=RELEASE" ];
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A collection of open-source libraries for high level network programming";
     homepage    = http://cpp-netlib.org;
-    license     = stdenv.lib.licenses.boost;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
-    platforms   = stdenv.lib.platforms.all;
+    license     = licenses.boost;
+    maintainers = with maintainers; [ shlevy ];
+    platforms   = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/development/libraries/dotconf/default.nix
index 2c22af1684d..74e4b6c5666 100644
--- a/pkgs/development/libraries/dotconf/default.nix
+++ b/pkgs/development/libraries/dotconf/default.nix
@@ -1,18 +1,24 @@
-{ fetchurl, stdenv }:
+{ fetchFromGitHub, stdenv, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
   name = "dotconf-" + version;
-  version = "1.0.13";
+  version = "1.3";
 
-  src = fetchurl {
-    url = "http://www.azzit.de/dotconf/download/v1.0/dotconf-1.0.13.tar.gz";
-    sha256 = "0rcvi743jgnrq2p5gknnvsqiv47479y5gyc2g9pz7bp7v7bzlmc9";
+  src = fetchFromGitHub {
+    owner = "williamh";
+    repo = "dotconf";
+    rev = "v${version}";
+    sha256 = "1sc95hw5k2xagpafny0v35filmcn05k1ds5ghkldfpf6xw4hakp7";
   };
 
-  meta = {
-    description = "A configuration parser library";
+  buildInputs = [ autoconf automake libtool ];
+
+  preConfigure = "autoreconf --install";
 
+  meta = with stdenv.lib; {
+    description = "A configuration parser library";
+    maintainers = with maintainers; [ pSub ];
     homepage = http://www.azzit.de/dotconf/;
-    license = stdenv.lib.licenses.lgpl21Plus;
+    license = licenses.lgpl21Plus;
   };
 }
diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix
index 39a332223ea..5c029adbf84 100644
--- a/pkgs/development/libraries/enet/default.nix
+++ b/pkgs/development/libraries/enet/default.nix
@@ -1,16 +1,17 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "enet-1.3.9";
-  
+  name = "enet-1.3.12";
+
   src = fetchurl {
     url = "http://enet.bespin.org/download/${name}.tar.gz";
-    sha256 = "0z4blmkyfjrkvgr12adjx7nnjrx4mvcm4zj8jp581m6rral7nf9y";
+    sha256 = "02qxgsn20m306hg3pklfa35mjlc2fqcsd1x4pi3xnbfy1nyir1d5";
   };
 
   meta = {
     homepage = http://enet.bespin.org/;
     description = "Simple and robust network communication layer on top of UDP";
-    license = "BSD";
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }
diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix
index 991c3e2fa4c..4fb184f8d60 100644
--- a/pkgs/development/libraries/exempi/default.nix
+++ b/pkgs/development/libraries/exempi/default.nix
@@ -1,18 +1,19 @@
 { stdenv, fetchurl, expat, zlib, boost }:
 
 stdenv.mkDerivation rec {
-  name = "exempi-2.2.1";
+  name = "exempi-2.2.2";
 
   src = fetchurl {
     url = "http://libopenraw.freedesktop.org/download/${name}.tar.bz2";
-    sha256 = "00d6gycl0wcyd3c71y0jp033a64z203rq0p0y07aig0s0j0477kc";
+    sha256 = "01vcd1mfn2s0iiq2cjyzgvnxx6kcq9cwra1iipijhs0vwvjx0yhf";
   };
 
   configureFlags = [ "--with-boost=${boost}" ];
 
-  buildInputs = [ expat zlib boost ];
+  buildInputs = [ expat zlib boost boost.lib ];
 
   meta = with stdenv.lib; {
+    homepage = http://libopenraw.freedesktop.org/wiki/Exempi/;
     platforms = platforms.linux;
     license = licenses.bsd3;
   };
diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix
index 26ff5dd245e..f75c2117084 100644
--- a/pkgs/development/libraries/fcgi/default.nix
+++ b/pkgs/development/libraries/fcgi/default.nix
@@ -12,9 +12,11 @@ stdenv.mkDerivation rec {
 
   postInstall = "ln -s . $out/include/fastcgi";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "FastCGI  is a language independent, scalable, open extension to CG";
     homepage = http://www.fastcgi.com/;
     license = "FastCGI see LICENSE.TERMS";
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/ffmpeg/0.10.nix b/pkgs/development/libraries/ffmpeg/0.10.nix
index 8ffe2daebf6..556a41e2dca 100644
--- a/pkgs/development/libraries/ffmpeg/0.10.nix
+++ b/pkgs/development/libraries/ffmpeg/0.10.nix
@@ -21,11 +21,11 @@ assert vdpauSupport -> libvdpau != null;
 assert faacSupport -> faac != null;
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-0.10.14";
+  name = "ffmpeg-0.10.15";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "1frkz3971zc2a60ras5ia26b2h8wbh017x1x80q8cfw0ycrpbxqy";
+    sha256 = "0p9x559fpj4zxll7rn3kwdig6y66c3ahv3pddmz23lljq5rvyvcb";
   };
 
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
@@ -83,5 +83,6 @@ stdenv.mkDerivation rec {
     description = "A complete, cross-platform solution to record, convert and stream audio and video";
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.unix;
+    branch = "0.10";
   };
 }
diff --git a/pkgs/development/libraries/ffmpeg/0.6.nix b/pkgs/development/libraries/ffmpeg/0.6.nix
index 053843d5313..79ab5f1c980 100644
--- a/pkgs/development/libraries/ffmpeg/0.6.nix
+++ b/pkgs/development/libraries/ffmpeg/0.6.nix
@@ -73,5 +73,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.ffmpeg.org/;
     description = "A complete, cross-platform solution to record, convert and stream audio and video";
+    branch = "0.6";
   };
 }
diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix
index e9488530b5c..1dadf1be127 100644
--- a/pkgs/development/libraries/ffmpeg/1.x.nix
+++ b/pkgs/development/libraries/ffmpeg/1.x.nix
@@ -101,5 +101,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.ffmpeg.org/;
     description = "A complete, cross-platform solution to record, convert and stream audio and video";
     maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+    branch = "1";
   };
 }
diff --git a/pkgs/development/libraries/ffmpeg/2.3.x.nix b/pkgs/development/libraries/ffmpeg/2.3.x.nix
new file mode 100644
index 00000000000..2b4b0569b55
--- /dev/null
+++ b/pkgs/development/libraries/ffmpeg/2.3.x.nix
@@ -0,0 +1,109 @@
+{ stdenv, fetchurl, config, pkgconfig, yasm, zlib, bzip2, alsaLib, texinfo, perl
+, lame, speex, libass, libtheora, libvorbis, libvpx, x264, xvidcore, libopus
+, libvdpau, libva, faac, libdc1394, libXext, libXfixes, SDL
+, freetype, fontconfig, fdk_aac, gnutls
+}:
+
+stdenv.mkDerivation rec {
+  version = "2.3.3";
+  name = "ffmpeg-${version}";
+
+  src = fetchurl {
+    url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
+    sha256 = "0ik4c06anh49r5b0d3rq9if4zl6ysjsa341655kzw22fl880sk5v";
+  };
+
+  subtitleSupport = config.ffmpeg.subtitle or true;
+  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 true;
+  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;
+  gnutlsSupport = config.ffmpeg.gnutls 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.
+  configureFlags = [
+    "--enable-gpl"
+    "--enable-postproc"
+    "--enable-swscale"
+    "--enable-shared"
+    "--enable-avresample"
+    "--enable-runtime-cpudetect"
+  ]
+    ++ stdenv.lib.optional (!stdenv.isDarwin && subtitleSupport) "--enable-libass"
+    ++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
+    ++ stdenv.lib.optional speexSupport "--enable-libspeex"
+    ++ stdenv.lib.optional theoraSupport "--enable-libtheora"
+    ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis"
+    ++ stdenv.lib.optional vpxSupport "--enable-libvpx"
+    ++ stdenv.lib.optional x264Support "--enable-libx264"
+    ++ stdenv.lib.optional xvidSupport "--enable-libxvid"
+    ++ stdenv.lib.optional opusSupport "--enable-libopus"
+    ++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
+    ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"
+    ++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
+    ++ stdenv.lib.optional x11grabSupport "--enable-x11grab"
+    ++ stdenv.lib.optional (!stdenv.isDarwin && playSupport) "--enable-ffplay"
+    ++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig"
+    ++ stdenv.lib.optional fdkAACSupport "--enable-libfdk_aac --enable-nonfree"
+    ++ stdenv.lib.optional gnutlsSupport "--enable-gnutls";
+
+  buildInputs = [ pkgconfig lame yasm zlib bzip2 texinfo perl ]
+    ++ stdenv.lib.optional mp3Support lame
+    ++ stdenv.lib.optional speexSupport speex
+    ++ stdenv.lib.optional theoraSupport libtheora
+    ++ stdenv.lib.optional vorbisSupport libvorbis
+    ++ stdenv.lib.optional vpxSupport libvpx
+    ++ stdenv.lib.optional x264Support x264
+    ++ stdenv.lib.optional xvidSupport xvidcore
+    ++ stdenv.lib.optional opusSupport libopus
+    ++ stdenv.lib.optional vdpauSupport libvdpau
+    ++ stdenv.lib.optional vaapiSupport libva
+    ++ stdenv.lib.optional faacSupport faac
+    ++ stdenv.lib.optional dc1394Support libdc1394
+    ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]
+    ++ stdenv.lib.optional (!stdenv.isDarwin && playSupport) SDL
+    ++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ]
+    ++ stdenv.lib.optional fdkAACSupport fdk_aac
+    ++ stdenv.lib.optional gnutlsSupport gnutls
+    ++ stdenv.lib.optional (!stdenv.isDarwin && subtitleSupport) libass
+    ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
+
+  enableParallelBuilding = true;
+
+  crossAttrs = {
+    dontSetConfigureCross = true;
+    configureFlags = configureFlags ++ [
+      "--cross-prefix=${stdenv.cross.config}-"
+      "--enable-cross-compile"
+      "--target_os=linux"
+      "--arch=${stdenv.cross.arch}"
+      ];
+  };
+
+  passthru = {
+    inherit vdpauSupport;
+  };
+
+  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;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+    branch = "2.3";
+  };
+}
diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix
index 8114eb4752d..3c712f32084 100644
--- a/pkgs/development/libraries/ffmpeg/2.x.nix
+++ b/pkgs/development/libraries/ffmpeg/2.x.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.3.3";
+  version = "2.4.2";
   name = "ffmpeg-${version}";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "0ik4c06anh49r5b0d3rq9if4zl6ysjsa341655kzw22fl880sk5v";
+    sha256 = "0zps80jyjvkmgmjvp9s7drbddr820hcw4w5r78hkbs5xsylr0kwp";
   };
 
   subtitleSupport = config.ffmpeg.subtitle or true;
diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix
index c394fd07028..6f78c198f40 100644
--- a/pkgs/development/libraries/ffms/default.nix
+++ b/pkgs/development/libraries/ffms/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, zlib, ffmpeg, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "ffms-2.19";
+  name = "ffms-2.20";
 
   src = fetchurl {
-    url = https://codeload.github.com/FFMS/ffms2/tar.gz/2.19;
+    url = https://codeload.github.com/FFMS/ffms2/tar.gz/2.20;
     name = "${name}.tar.gz";
-    sha256 = "0498si8bzwyxxq0f1yc6invzb1lv1ab436gwzn9418839x8pj4vg";
+    sha256 = "183klnhl57zf0i8xlr7yvj89ih83pzd48c37qpr57hjn4wbq1n67";
   };
 
   NIX_CFLAGS_COMPILE = "-fPIC";
@@ -17,5 +17,6 @@ stdenv.mkDerivation rec {
     homepage = http://code.google.com/p/ffmpegsource/;
     description = "Libav/ffmpeg based source library for easy frame accurate access";
     license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
index 59071ce9e22..e3938663c9b 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
+++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
@@ -20,7 +20,7 @@
   <xsl:template match="/fontconfig">
 
     <fontconfig>
-      <xsl:copy-of select="child::node()[name() != 'dir' and name() != 'cachedir' and name() != 'include']" />
+      <xsl:apply-templates select="child::node()[name() != 'dir' and name() != 'cachedir' and name() != 'include']" />
 
       <include ignore_missing="yes">/etc/fonts/conf.d</include>
       <include><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include>
@@ -40,4 +40,12 @@
 
   </xsl:template>
 
+
+  <!-- New fontconfig >=2.11 doesn't like xml:space added by xsl:copy-of -->
+  <xsl:template match="node()|@*">
+    <xsl:copy>
+      <xsl:apply-templates select="node()|@*[name() != 'xml:space']"/>
+    </xsl:copy>
+  </xsl:template>
+
 </xsl:stylesheet>
diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix
index 71e5b91a26f..23795e9633e 100644
--- a/pkgs/development/libraries/fribidi/default.nix
+++ b/pkgs/development/libraries/fribidi/default.nix
@@ -2,15 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "fribidi-${version}";
-  version = "0.19.2";
+  version = "0.19.6";
   
   src = fetchurl {
-    url = "http://fribidi.org/download/${name}.tar.gz";
-    sha256 = "0xs1yr22zw9a1qq9ygsrqam0vzqdvb0ndzvjb3i2zda8drc93ks9";
+    url = "http://fribidi.org/download/${name}.tar.bz2";
+    sha256 = "0zg1hpaml34ny74fif97j7ngrshlkl3wk3nja3gmlzl17i1bga6b";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://fribidi.org/;
     description = "GNU implementation of the Unicode Bidirectional Algorithm (bidi)";
+    license = licenses.gpl2;
   };
 }
diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix
index 40e0388d749..6639f2e498b 100644
--- a/pkgs/development/libraries/ganv/default.nix
+++ b/pkgs/development/libraries/ganv/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, fetchsvn, graphviz, gtk, gtkmm, pkgconfig, python }:
+{ stdenv, fetchurl, graphviz, gtk, gtkmm, pkgconfig, python }:
 
 stdenv.mkDerivation rec {
-  name = "ganv-svn-${rev}";
-  rev = "5318";
+  name = "ganv-${version}";
+  version = "1.4.2";
 
-  src = fetchsvn {
-    url = "http://svn.drobilla.net/lad/trunk/ganv";
-    rev = rev;
-    sha256 = "0wi87ks2xjma979d9hy82wmlm06g4sr0pm3b1n3zv27y52wrf7fl";
+  src = fetchurl {
+    url = "http://download.drobilla.net/${name}.tar.bz2";
+    sha256 = "0g7s5mp14qgbfjdql0k1s8464r21g47ssn5dws6jazsnw6njhl0l";
   };
 
   buildInputs = [ graphviz gtk gtkmm pkgconfig python ];
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 7c78ca3ed6f..c397013750b 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
-, postgresql, mysql, libgeotiff }:
+, postgresql, mysql, libgeotiff, python, pythonPackages}:
 
-composableDerivation.composableDerivation {} (fixed: {
-  name = "gdal-1.7.1";
+composableDerivation.composableDerivation {} (fixed: rec {
+  name = "gdal-1.11.0";
 
   src = fetchurl {
-    url = ftp://ftp.remotesensing.org/gdal/gdal171.zip;
-    md5 = "f5592cff69b239166c9b64ff81943b1a";
+    url = "http://download.osgeo.org/gdal/1.11.0/${name}.tar.gz";
+    md5 = "9fdf0f2371a3e9863d83e69951c71ec4";
   };
 
-  buildInputs = [ unzip libjpeg libtiff ];
+  buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy];
 
   # don't use optimization for gcc >= 4.3. That's said to be causeing segfaults
   preConfigure = "export CFLAGS=-O0; export CXXFLAGS=-O0";
@@ -22,6 +22,7 @@ composableDerivation.composableDerivation {} (fixed: {
     "--with-pg=${postgresql}/bin/pg_config"
     "--with-mysql=${mysql}/bin/mysql_config"
     "--with-geotiff=${libgeotiff}"
+    "--with-python"    # optional
   ];
 
   meta = {
diff --git a/pkgs/development/libraries/gdome2/default.nix b/pkgs/development/libraries/gdome2/default.nix
index 516fb932983..f16a39e6ab0 100644
--- a/pkgs/development/libraries/gdome2/default.nix
+++ b/pkgs/development/libraries/gdome2/default.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation {
     description = "DOM C library developped for the Gnome project";
     license = stdenv.lib.licenses.lgpl21Plus;
     maintainers = [ stdenv.lib.maintainers.roconnor ];
+    broken = true;
   };
 }
diff --git a/pkgs/development/libraries/gettext/0.17.nix b/pkgs/development/libraries/gettext/0.17.nix
index ef0a1d41bd6..3ea70bea80b 100644
--- a/pkgs/development/libraries/gettext/0.17.nix
+++ b/pkgs/development/libraries/gettext/0.17.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "gettext-0.17";
-  
+
   src = fetchurl {
     url = "mirror://gnu/gettext/${name}.tar.gz";
     sha256 = "1fipjpaxxwifdw6cbr7mkxp1yvy643i38nhlh7124bqnisxki5i0";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
-  
+
   meta = {
     description = "GNU gettext, a well integrated set of translation tools and documentation";
 
@@ -48,5 +48,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/gettext/;
 
     maintainers = [ ];
+    branch = "0.17";
   };
 }
\ No newline at end of file
diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/5.0.nix
index 4dc8132805c..4dc8132805c 100644
--- a/pkgs/development/libraries/giflib/default.nix
+++ b/pkgs/development/libraries/giflib/5.0.nix
diff --git a/pkgs/development/libraries/giflib/5.1.nix b/pkgs/development/libraries/giflib/5.1.nix
new file mode 100644
index 00000000000..3ff71255b85
--- /dev/null
+++ b/pkgs/development/libraries/giflib/5.1.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }:
+
+stdenv.mkDerivation {
+  name = "giflib-5.1.0";
+  src = fetchurl {
+    url = mirror://sourceforge/giflib/giflib-5.1.0.tar.bz2;
+    sha256 = "06wd32akyawppar9mqdvyhcw47ssdfcj39lryim2w4v83i7nkv2s";
+  };
+
+  buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ];
+  meta = {
+    description = "giflib is a library for reading and writing gif images";
+    platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+}
diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix
index b35fe1e7855..010a2aee88e 100644
--- a/pkgs/development/libraries/glm/default.nix
+++ b/pkgs/development/libraries/glm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "glm-0.9.5.1";
+  name = "glm-0.9.5.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/ogl-math/${name}/${name}.zip";
-    sha256 = "1x8bpmqdszzkg21r411w7cy4mqd5dcvb9jghc8h3xrx7ldbicqjg";
+    sha256 = "0ndwaw2mp7pzcwwm4dghbv5qqax5a8c5plnwdgnpc9adm79gj1rl";
   };
 
   buildInputs = [ unzip ];
@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
     homepage = http://glm.g-truc.net/;
     license = licenses.mit;
     platforms = platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }
diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix
index 4e271a8c678..9ab31e51157 100644
--- a/pkgs/development/libraries/gloox/default.nix
+++ b/pkgs/development/libraries/gloox/default.nix
@@ -9,14 +9,14 @@ assert sslSupport -> openssl != null;
 assert idnSupport -> libidn != null;
 
 let
-  version = "1.0.10";
+  version = "1.0.11";
 in
 stdenv.mkDerivation rec {
   name = "gloox-${version}";
 
   src = fetchurl {
     url = "http://camaya.net/download/gloox-${version}.tar.bz2";
-    sha256 = "300e756af97d43f3f70f1e68e4d4c7129d587dface61633f50d2c490876f58a3";
+    sha256 = "1hrkvn4ddzmydvpr541l6pi8nr0k6xi9g7yxdp84ns7v463kjrq9";
   };
 
   buildInputs = [ ]
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A portable high-level Jabber/XMPP library for C++";
     homepage = "http://camaya.net/gloox";
-    license = [ "GPLv3" ];
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }
diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix
index a8a3943e409..6564fc51186 100644
--- a/pkgs/development/libraries/gmime/default.nix
+++ b/pkgs/development/libraries/gmime/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, zlib, libgpgerror }:
 
 stdenv.mkDerivation rec {
-  name = "gmime-2.6.19";
+  name = "gmime-2.6.20";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gmime/2.6/${name}.tar.xz";
-    sha256 = "0jm1fgbjgh496rsc0il2y46qd4bqq2ln9168p4zzh68mk4ml1yxg";
+    sha256 = "0rfzbgsh8ira5p76kdghygl5i3fvmmx4wbw5rp7f8ajc4vxp18g0";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix
index d79293eced1..cf62b6a224b 100644
--- a/pkgs/development/libraries/gmm/default.nix
+++ b/pkgs/development/libraries/gmm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "gmm-3.0";
+  name = "gmm-4.3";
 
   src = fetchurl {
-    url = http://download.gna.org/getfem/stable/gmm-3.0.tar.gz;
-    sha256 = "1lc34w68s0rhii6caklvq2pyc3jaa4g6kza948ya8ha6rr8d1ypp";
+    url = http://download.gna.org/getfem/stable/gmm-4.3.tar.gz;
+    sha256 = "0wpp3k73wd3rblsrwxl6djq6m11fx3q5wgw0pl41m9liswsw6din";
   };
 
   meta = { 
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index ae3b53b4f44..a84d96edca9 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -11,16 +11,24 @@ let
     "${gnupg}/bin/gpg2";
 in
 stdenv.mkDerivation rec {
-  name = "gpgme-1.4.3";
-  
+  name = "gpgme-1.5.1";
+
   src = fetchurl {
     url = "ftp://ftp.gnupg.org/gcrypt/gpgme/${name}.tar.bz2";
-    sha256 = "15h429h6pd67iiv580bjmwbkadpxsdppw0xrqpcm4dvm24jc271d";
+    sha256 = "1qqi9bxwxxsc4r15j7drclgp0w8jk9nj3h2fsivk4c7brvw3lbvc";
   };
-  
+
   propagatedBuildInputs = [ libgpgerror glib libassuan pth ];
 
   nativeBuildInputs = [ pkgconfig gnupg ];
 
   configureFlags = "--with-gpg=${gpgPath}";
+
+  meta = {
+    homepage = "http://www.gnupg.org/related_software/gpgme";
+    description = "Library for making GnuPG easier to use";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+  };
 }
diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
new file mode 100644
index 00000000000..057fa7cc83a
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, gst_all_1, boost, glib, qt4, cmake
+, automoc4, flex, bison, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-1.2.0";
+  pname = "qt-gstreamer";
+
+  src = fetchurl {
+    url = "http://gstreamer.freedesktop.org/src/${pname}/${name}.tar.xz";
+    sha256 = "9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4";
+  };
+
+  buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base glib qt4 ];
+  propagatedBuildInputs = [ boost ];
+  nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ];
+
+  cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF";
+}
diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix
index 54023f29a07..c9098fc0850 100644
--- a/pkgs/development/libraries/gtkspell/3.nix
+++ b/pkgs/development/libraries/gtkspell/3.nix
@@ -2,17 +2,21 @@
 
 stdenv.mkDerivation rec {
   name = "gtkspell-${version}";
-  version = "3.0.4";
-  
+  version = "3.0.6";
+
   src = fetchurl {
     url = "mirror://sourceforge/gtkspell/gtkspell3-${version}.tar.gz";
-    sha256 = "19z48gfbraasrxai7qdkxxvky0kwifkkzqz0jqcskhcr1ikqxgzs";
+    sha256 = "1hqaddgzxjw9lpsphankld6a8bpm92hfv46kp99cgmj82rdjwdq1";
   };
-  
+
   buildInputs = [ aspell pkgconfig gtk3 enchant intltool ];
   propagatedBuildInputs = [ enchant ];
 
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
+  meta = {
+    homepage = "http://gtkspell.sourceforge.net/";
+    description = "Word-processor-style highlighting GtkTextView widget";
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }
diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix
index 53eea4f738d..d7a8474bd5b 100644
--- a/pkgs/development/libraries/haskell/Boolean/default.nix
+++ b/pkgs/development/libraries/haskell/Boolean/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Boolean";
-  version = "0.2.1";
-  sha256 = "0vi09icwc254mbx85lf1n81mx4hr2sdf61a4njaqa91cf046sjlr";
+  version = "0.2.2";
+  sha256 = "1awi9ff2gb9gddalzn2hgp8klvcsizicqpd7xb5fds5j3278qrdz";
   meta = {
     description = "Generalized booleans and numbers";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/HPDF/default.nix b/pkgs/development/libraries/haskell/HPDF/default.nix
index 7dcdbaa8cf9..d34e590e9e6 100644
--- a/pkgs/development/libraries/haskell/HPDF/default.nix
+++ b/pkgs/development/libraries/haskell/HPDF/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Generation of PDF documents";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTF/default.nix b/pkgs/development/libraries/haskell/HTF/default.nix
index 5908498bd0a..76ba94e8bfc 100644
--- a/pkgs/development/libraries/haskell/HTF/default.nix
+++ b/pkgs/development/libraries/haskell/HTF/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HTF";
-  version = "0.12.0.0";
-  sha256 = "1mbil44gbcl52f84dphxkdvxsyz8bhc532mlq37aqr1bmj54rv0i";
+  version = "0.12.1.0";
+  sha256 = "1symg1y6i47rd1jshj84cwpn5vgmvh6v07jidjg5w5w3syyxqnz4";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/MonadPrompt/default.nix b/pkgs/development/libraries/haskell/MonadPrompt/default.nix
index 3221cbe7f55..412f24450c4 100644
--- a/pkgs/development/libraries/haskell/MonadPrompt/default.nix
+++ b/pkgs/development/libraries/haskell/MonadPrompt/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "MonadPrompt";
-  version = "1.0.0.3";
-  sha256 = "0v6svyiajri7c463bz1a1x1nin5s9s7c3s7y0gjc4cn7lhgdsvf2";
+  version = "1.0.0.5";
+  sha256 = "1nmy7dfzrkd8yfv5i9vlmjq9khnyi76ayvkzgcf783v5hfzcn4mh";
   buildDepends = [ mtl ];
   meta = {
     description = "MonadPrompt, implementation & examples";
diff --git a/pkgs/development/libraries/haskell/ShellCheck/default.nix b/pkgs/development/libraries/haskell/ShellCheck/default.nix
deleted file mode 100644
index 8beca12325b..00000000000
--- a/pkgs/development/libraries/haskell/ShellCheck/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, json, mtl, parsec, QuickCheck, regexCompat }:
-
-cabal.mkDerivation (self: {
-  pname = "ShellCheck";
-  version = "0.3.4";
-  sha256 = "07fw8c33p7h1kvg899dwnvqpxpywcidhbw9jhjd8xsma7kz471iw";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ json mtl parsec QuickCheck regexCompat ];
-  testDepends = [ json mtl parsec QuickCheck regexCompat ];
-  meta = {
-    homepage = "http://www.shellcheck.net/";
-    description = "Shell script analysis tool";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ad/default.nix b/pkgs/development/libraries/haskell/ad/default.nix
index d53d11385f4..afe8992aeea 100644
--- a/pkgs/development/libraries/haskell/ad/default.nix
+++ b/pkgs/development/libraries/haskell/ad/default.nix
@@ -1,17 +1,17 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, comonad, dataReify, doctest, erf, filepath, free, mtl
-, nats, reflection, tagged, transformers
+{ cabal, comonad, dataReify, doctest, erf, filepath, free, nats
+, reflection, tagged, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "ad";
-  version = "4.2.0.1";
-  sha256 = "06vjllcrnr4dv5h3xkcy5zhnhyamp6b6jahpnh2y0i6mp2bdw0pz";
+  version = "4.2.1";
+  sha256 = "05ndr26lsc4xa18vfb3qdjcp03gsq2bhc8dc0yr5g1x9dybq6dx2";
   buildDepends = [
-    comonad dataReify erf free mtl nats reflection tagged transformers
+    comonad dataReify erf free nats reflection tagged transformers
   ];
-  testDepends = [ doctest filepath mtl ];
+  testDepends = [ doctest filepath ];
   meta = {
     homepage = "http://github.com/ekmett/ad";
     description = "Automatic Differentiation";
diff --git a/pkgs/development/libraries/haskell/aeson-qq/default.nix b/pkgs/development/libraries/haskell/aeson-qq/default.nix
index 95452b91360..d7c86d853fa 100644
--- a/pkgs/development/libraries/haskell/aeson-qq/default.nix
+++ b/pkgs/development/libraries/haskell/aeson-qq/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "aeson-qq";
-  version = "0.7.3";
-  sha256 = "1d5wl38gkqc2dbk626f7vdcc2i3faannac13zdc9py0kbcniw231";
+  version = "0.7.4";
+  sha256 = "0wnc9pdjvd15gfkdxzf084393vwmxv2xaxdchzgal1qhwa1mak4v";
   buildDepends = [ aeson haskellSrcMeta parsec text vector ];
   testDepends = [ aeson haskellSrcMeta hspec parsec text vector ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/aeson-utils/default.nix b/pkgs/development/libraries/haskell/aeson-utils/default.nix
index db783c012bc..ee0df96618c 100644
--- a/pkgs/development/libraries/haskell/aeson-utils/default.nix
+++ b/pkgs/development/libraries/haskell/aeson-utils/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Utilities for working with Aeson";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/aws/default.nix b/pkgs/development/libraries/haskell/aws/default.nix
index f527d9aac40..8f0818f43d6 100644
--- a/pkgs/development/libraries/haskell/aws/default.nix
+++ b/pkgs/development/libraries/haskell/aws/default.nix
@@ -3,16 +3,17 @@
 { cabal, aeson, attoparsec, base16Bytestring, base64Bytestring
 , blazeBuilder, byteable, caseInsensitive, cereal, conduit
 , conduitExtra, cryptohash, dataDefault, errors, filepath
-, httpConduit, httpTypes, liftedBase, monadControl, mtl, network
-, QuickCheck, quickcheckInstances, resourcet, safe, scientific
-, tagged, tasty, tastyQuickcheck, text, time, transformers
-, unorderedContainers, utf8String, vector, xmlConduit
+, httpClient, httpConduit, httpTypes, liftedBase, monadControl, mtl
+, network, QuickCheck, quickcheckInstances, resourcet, safe
+, scientific, tagged, tasty, tastyQuickcheck, text, time
+, transformers, transformersBase, unorderedContainers, utf8String
+, vector, xmlConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "aws";
-  version = "0.10.3";
-  sha256 = "042vx5nhafvgw0crymkw8pyhiawhpxwj03n1k538y2wr181hmz5f";
+  version = "0.10.5";
+  sha256 = "1d82q2477wp08zavlkzsksalbkiczz3vzy17ijk2z5xsw5yslqnj";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -23,8 +24,9 @@ cabal.mkDerivation (self: {
     unorderedContainers utf8String vector xmlConduit
   ];
   testDepends = [
-    aeson errors mtl QuickCheck quickcheckInstances tagged tasty
-    tastyQuickcheck text transformers
+    aeson errors httpClient liftedBase monadControl mtl QuickCheck
+    quickcheckInstances resourcet tagged tasty tastyQuickcheck text
+    time transformers transformersBase
   ];
   jailbreak = true;
   doCheck = false;
diff --git a/pkgs/development/libraries/haskell/basic-prelude/default.nix b/pkgs/development/libraries/haskell/basic-prelude/default.nix
index ab462229aa5..d5a33db11ac 100644
--- a/pkgs/development/libraries/haskell/basic-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/basic-prelude/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "basic-prelude";
-  version = "0.3.8";
-  sha256 = "0lywnsds0q1nr466s3pc2izfr58kp23z7ing9k7dlgbmh9cqxypg";
+  version = "0.3.9";
+  sha256 = "0f2l8xryagl1f0d30gq1hhydjnn77qhhwgg9l44gvqn30y2n66h7";
   buildDepends = [
     hashable liftedBase ReadArgs safe systemFilepath text transformers
     unorderedContainers vector
diff --git a/pkgs/development/libraries/haskell/blank-canvas/default.nix b/pkgs/development/libraries/haskell/blank-canvas/default.nix
new file mode 100644
index 00000000000..47c343f49b8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/blank-canvas/default.nix
@@ -0,0 +1,22 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, base64Bytestring, colour, dataDefaultClass
+, httpTypes, kansasComet, scotty, stm, text, transformers, vector
+, wai, waiExtra, warp
+}:
+
+cabal.mkDerivation (self: {
+  pname = "blank-canvas";
+  version = "0.5";
+  sha256 = "05kfyjp9vncyzsvq018ilb8vh7fyzbc06nlx35jk3dzj6i6x5bgs";
+  buildDepends = [
+    aeson base64Bytestring colour dataDefaultClass httpTypes
+    kansasComet scotty stm text transformers vector wai waiExtra warp
+  ];
+  meta = {
+    homepage = "https://github.com/ku-fpg/blank-canvas/wiki";
+    description = "HTML5 Canvas Graphics Library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix
index 478ec8355d9..4dd5376cad3 100644
--- a/pkgs/development/libraries/haskell/blaze-builder/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-builder";
-  version = "0.3.3.3";
-  sha256 = "1kzm2crwan11wrg8ky2gc29c7xpi9fm34xhz5gf5xlc3vy423y8s";
+  version = "0.3.3.4";
+  sha256 = "12xgmi8bc3h3cfk31rrfaklmwvyxgdwzwmxzw22yxd0dd8g11hg5";
   buildDepends = [ text ];
   meta = {
     homepage = "http://github.com/meiersi/blaze-builder";
diff --git a/pkgs/development/libraries/haskell/boomerang/default.nix b/pkgs/development/libraries/haskell/boomerang/default.nix
index b5d5bc74f80..3747b2cc877 100644
--- a/pkgs/development/libraries/haskell/boomerang/default.nix
+++ b/pkgs/development/libraries/haskell/boomerang/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "boomerang";
-  version = "1.4.3";
-  sha256 = "1i72mrl8n2cbrdi05zn37y1339r13vzvmrcc1zbkcak4c7r004zw";
+  version = "1.4.4";
+  sha256 = "0ik2wxcvz2y3bn3r2p9kzjiy78vjhxyz4fn3nkaz5wl3jmh4gydf";
   buildDepends = [ mtl text ];
   meta = {
     description = "Library for invertible parsing and printing";
diff --git a/pkgs/development/libraries/haskell/bv/default.nix b/pkgs/development/libraries/haskell/bv/default.nix
index 4a2be6244e7..1e12288624f 100644
--- a/pkgs/development/libraries/haskell/bv/default.nix
+++ b/pkgs/development/libraries/haskell/bv/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bv";
-  version = "0.2.2";
-  sha256 = "0d5hscjakp7dwifa4l8xikyip45y402kf9pbmpfmmnybja23zhg0";
+  version = "0.3.0";
+  sha256 = "0r2bp39ilwq3zx38spbx5qrpccwm255ax2skab3i7jxjmf7yj025";
   isLibrary = true;
   isExecutable = true;
   meta = {
@@ -13,7 +13,6 @@ cabal.mkDerivation (self: {
     description = "Bit-vector arithmetic library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cabal-cargs/default.nix b/pkgs/development/libraries/haskell/cabal-cargs/default.nix
index 2f2b59b597a..c96fab45c19 100644
--- a/pkgs/development/libraries/haskell/cabal-cargs/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-cargs/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal-cargs";
-  version = "0.7.2";
-  sha256 = "03095w08ff3g57qzx9dziv61q9x1rvqyph4lvxkccd1is2g1wywb";
+  version = "0.7.3";
+  sha256 = "10707nja5j9hbx5yj7pq8s9zgfx21n36r4xhs71g70g6hwpciqjb";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/cabalg/default.nix b/pkgs/development/libraries/haskell/cabalg/default.nix
new file mode 100644
index 00000000000..62dea42b3d5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cabalg/default.nix
@@ -0,0 +1,19 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, doctest, filepath }:
+
+cabal.mkDerivation (self: {
+  pname = "cabalg";
+  version = "0.2.9";
+  sha256 = "02brl9b1g3cyw5nmk0mih073kbszpc6g2nqgs0sh93h7y5naf5kp";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ filepath ];
+  testDepends = [ doctest filepath ];
+  meta = {
+    description = "alias for cabal install from given git repo";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ dmalikov ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/cassava/default.nix b/pkgs/development/libraries/haskell/cassava/default.nix
index c8cb347f10a..0ae9782a33b 100644
--- a/pkgs/development/libraries/haskell/cassava/default.nix
+++ b/pkgs/development/libraries/haskell/cassava/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cassava";
-  version = "0.4.1.0";
-  sha256 = "0whky3mavmprr8cgnzlg2ich99w09bdlks8rg6z9m1x86q66ivw2";
+  version = "0.4.2.0";
+  sha256 = "1v1izdjd4maqrlpm4cf2xpackpjp1i4vg1s7mzq90dwa6r9572x3";
   buildDepends = [
     attoparsec blazeBuilder deepseq text unorderedContainers vector
   ];
diff --git a/pkgs/development/libraries/haskell/clock/default.nix b/pkgs/development/libraries/haskell/clock/default.nix
index 3c064d1db2d..60bea4fed83 100644
--- a/pkgs/development/libraries/haskell/clock/default.nix
+++ b/pkgs/development/libraries/haskell/clock/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "clock";
-  version = "0.4.0.1";
-  sha256 = "1bn6dalank30l680iifyam0mg9izxbyscgq0vmr1aw5brba5kv6j";
+  version = "0.4.1.1";
+  sha256 = "0xbhx16sa0rwidaljp8lklb5ifhdc8cccbyznrpxqqwh8icm5pjp";
   meta = {
     homepage = "http://corsis.github.com/clock/";
     description = "High-resolution clock functions: monotonic, realtime, cputime";
diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix
index 829f7be4fba..a3c7cd1773f 100644
--- a/pkgs/development/libraries/haskell/cmdargs/default.nix
+++ b/pkgs/development/libraries/haskell/cmdargs/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cmdargs";
-  version = "0.10.9";
-  sha256 = "12phn22iri2v65gbxzl580mikkj05rwx4sjn5c31f871wp0538my";
+  version = "0.10.10";
+  sha256 = "17glliishfxc01ippgzb8v12i40id2b6l18rqp6wfygbb7f93rvv";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath transformers ];
diff --git a/pkgs/development/libraries/haskell/code-builder/default.nix b/pkgs/development/libraries/haskell/code-builder/default.nix
index 77883f5a07a..92cc3f0f9d8 100644
--- a/pkgs/development/libraries/haskell/code-builder/default.nix
+++ b/pkgs/development/libraries/haskell/code-builder/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Simple system for generating code";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/compdata-param/default.nix b/pkgs/development/libraries/haskell/compdata-param/default.nix
new file mode 100644
index 00000000000..2ab1ecd9131
--- /dev/null
+++ b/pkgs/development/libraries/haskell/compdata-param/default.nix
@@ -0,0 +1,20 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, compdata, HUnit, mtl, testFramework, testFrameworkHunit
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "compdata-param";
+  version = "0.8.0.2";
+  sha256 = "0496i1vnawl7m7ymvf5hl3kxy352rnhxy2gni4xkfz36psnnr7fs";
+  buildDepends = [ compdata mtl transformers ];
+  testDepends = [
+    compdata HUnit mtl testFramework testFrameworkHunit transformers
+  ];
+  meta = {
+    description = "Parametric Compositional Data Types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix
index e0b3bdfa542..8443a4909fc 100644
--- a/pkgs/development/libraries/haskell/conduit-extra/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit-extra";
-  version = "1.1.3.4";
-  sha256 = "0j27lzdklyq2kv10yfpd16a9sl00iyalmcy8jj9r87r7jpvj949p";
+  version = "1.1.4";
+  sha256 = "117mzy0qm8w2kzjcshcwcfbx01ybbhn63vdgzllc7cb9x4cj2ibv";
   buildDepends = [
     attoparsec blazeBuilder conduit filepath monadControl network
     primitive resourcet stm streamingCommons text transformers
diff --git a/pkgs/development/libraries/haskell/diagrams/gtk.nix b/pkgs/development/libraries/haskell/diagrams/gtk.nix
new file mode 100644
index 00000000000..c169c9e0e48
--- /dev/null
+++ b/pkgs/development/libraries/haskell/diagrams/gtk.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, cairo, diagramsCairo, diagramsLib, gtk }:
+
+cabal.mkDerivation (self: {
+  pname = "diagrams-gtk";
+  version = "1.0.1.3";
+  sha256 = "1bcgplmg01sp7iwhgx7ircbn9bj15m42w6vkh539sd65y01z3hc8";
+  buildDepends = [ cairo diagramsCairo diagramsLib gtk ];
+  meta = {
+    homepage = "http://projects.haskell.org/diagrams/";
+    description = "Backend for rendering diagrams directly to GTK windows";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/dimensional-tf/default.nix b/pkgs/development/libraries/haskell/dimensional-tf/default.nix
index c93a564c3e3..b6e3f40f937 100644
--- a/pkgs/development/libraries/haskell/dimensional-tf/default.nix
+++ b/pkgs/development/libraries/haskell/dimensional-tf/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dimensional-tf";
-  version = "0.3";
-  sha256 = "0z3k9962zz652bk2azv9lcms1j06v60hid3iach043dpg5r083qg";
+  version = "0.3.0.1";
+  sha256 = "0gnaylxhjcyvsibq15bw9k4c846l2329yvvl79cdw2jqggfnzxw6";
   buildDepends = [ numtypeTf time ];
   meta = {
     homepage = "http://dimensional.googlecode.com/";
diff --git a/pkgs/development/libraries/haskell/engine-io-snap/default.nix b/pkgs/development/libraries/haskell/engine-io-snap/default.nix
index 70c7a1c7d4f..b37ef7c2bc1 100644
--- a/pkgs/development/libraries/haskell/engine-io-snap/default.nix
+++ b/pkgs/development/libraries/haskell/engine-io-snap/default.nix
@@ -1,18 +1,19 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, attoparsecEnumerator, engineIo, snapCore
-, unorderedContainers, websockets, websocketsSnap
+{ cabal, attoparsecEnumerator, engineIo, MonadCatchIOTransformers
+, snapCore, unorderedContainers, websockets, websocketsSnap
 }:
 
 cabal.mkDerivation (self: {
   pname = "engine-io-snap";
-  version = "1.0.1";
-  sha256 = "1hw3gmi23fdcgvz817b95bf23wa7qyg10axsnvan5qxr73pwp5iv";
+  version = "1.0.2";
+  sha256 = "0x2sb3b825ds1g2g15yyqxdrw6bh968ivmyd1933l47649qbs0xr";
   buildDepends = [
-    attoparsecEnumerator engineIo snapCore unorderedContainers
-    websockets websocketsSnap
+    attoparsecEnumerator engineIo MonadCatchIOTransformers snapCore
+    unorderedContainers websockets websocketsSnap
   ];
   meta = {
+    homepage = "http://github.com/ocharles/engine.io";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
diff --git a/pkgs/development/libraries/haskell/engine-io/default.nix b/pkgs/development/libraries/haskell/engine-io/default.nix
index f1f9d06c76a..9e3d6a5b5b1 100644
--- a/pkgs/development/libraries/haskell/engine-io/default.nix
+++ b/pkgs/development/libraries/haskell/engine-io/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "engine-io";
-  version = "1.1.2";
-  sha256 = "1ry6rklrij7x1z8mw31vh41lc0axzj8l0lhmjsmhs554nv50062f";
+  version = "1.2.0";
+  sha256 = "07k5zc8zbjpcj3iql0kcs4zrw5g24cngkp9yanpdmnhi18ms45dv";
   buildDepends = [
     aeson async attoparsec base64Bytestring either monadLoops mwcRandom
     stm text transformers unorderedContainers vector websockets
diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix
index 1d90a926993..c3b4850f5b2 100644
--- a/pkgs/development/libraries/haskell/esqueleto/default.nix
+++ b/pkgs/development/libraries/haskell/esqueleto/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "esqueleto";
-  version = "1.4.4";
-  sha256 = "00s52f8l5pbsab83fq8d03xhispyp9mqsh5vvzwiki6kspkj26a0";
+  version = "2.0.2";
+  sha256 = "1r8w3h36fhj77llcfgiq6ww634jymz8fpm86fm17arj7m7ll6rq3";
   buildDepends = [
     conduit monadLogger persistent resourcet tagged text transformers
     unorderedContainers
@@ -24,6 +24,5 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix
index 1e3ba43cb3e..90e3c5dadfc 100644
--- a/pkgs/development/libraries/haskell/fay/default.nix
+++ b/pkgs/development/libraries/haskell/fay/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fay";
-  version = "0.20.1.4";
-  sha256 = "022q9ac12hviamgl959v68k5mmr1i0wfisxxqa435l2y3g3yszb1";
+  version = "0.20.2.0";
+  sha256 = "1xblfsd1rj38nlw0dl56zvvnad3l0bpsncv1k5vjs4h8cmwl1ik2";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/foldl/default.nix b/pkgs/development/libraries/haskell/foldl/default.nix
index 2f04330a315..bd0cd070d11 100644
--- a/pkgs/development/libraries/haskell/foldl/default.nix
+++ b/pkgs/development/libraries/haskell/foldl/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "foldl";
-  version = "1.0.6";
-  sha256 = "1i4pm48x7f8l4gqbb2bgqshx5cx44acr24l75czliq656sqm405i";
+  version = "1.0.7";
+  sha256 = "0mqxibifrlfqnibzy9b2rncy4dyljdz35560ni3rwi8hkyix74a9";
   buildDepends = [ primitive text transformers vector ];
   meta = {
     description = "Composable, streaming, and efficient left folds";
diff --git a/pkgs/development/libraries/haskell/formatting/default.nix b/pkgs/development/libraries/haskell/formatting/default.nix
index 1345ac76243..04fd9185081 100644
--- a/pkgs/development/libraries/haskell/formatting/default.nix
+++ b/pkgs/development/libraries/haskell/formatting/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "formatting";
-  version = "5.2";
-  sha256 = "0lmbzm98idy7bzpvaqnk9j6181vakk553smqkf959gn5jdj95z3k";
+  version = "5.4";
+  sha256 = "017fm3pqr2nqpcqmpldr74cvb641hxvybhvnwv8a8vv4ry1vdrk9";
   buildDepends = [ scientific text textFormat time ];
   meta = {
     description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
diff --git a/pkgs/development/libraries/haskell/fsnotify/default.nix b/pkgs/development/libraries/haskell/fsnotify/default.nix
index 3d308f6a88f..4db72b35234 100644
--- a/pkgs/development/libraries/haskell/fsnotify/default.nix
+++ b/pkgs/development/libraries/haskell/fsnotify/default.nix
@@ -1,18 +1,19 @@
-{ stdenv, cabal, Cabal, Glob, hspec, QuickCheck, random
-, systemFileio, systemFilepath, text, time, uniqueid
-, hinotify, hfsevents
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, async, hinotify, systemFileio, systemFilepath, tasty
+, tastyHunit, temporaryRc, text, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "fsnotify";
-  version = "0.0.11";
-  sha256 = "03m911pncyzgfdx4aj38azbbmj25fdm3s9l1w27zv0l730fy8ywq";
-  buildDepends = [ systemFileio systemFilepath text time ] ++
-    (if stdenv.isDarwin then [ hfsevents ] else [ hinotify ]);
+  version = "0.1.0.3";
+  sha256 = "0m6jyg45azk377jklgwyqrx95q174cxd5znpyh9azznkh09wq58z";
+  buildDepends = [
+    async hinotify systemFileio systemFilepath text time
+  ];
   testDepends = [
-    Cabal Glob hspec QuickCheck random systemFileio
-    systemFilepath text time uniqueid
-  ] ++ (if stdenv.isDarwin then [ hfsevents ] else [ hinotify ]);
+    async systemFileio systemFilepath tasty tastyHunit temporaryRc
+  ];
   doCheck = false;
   meta = {
     description = "Cross platform library for file change notification";
diff --git a/pkgs/development/libraries/haskell/generic-aeson/default.nix b/pkgs/development/libraries/haskell/generic-aeson/default.nix
index 4ad9ab11fad..7cea462a1cb 100644
--- a/pkgs/development/libraries/haskell/generic-aeson/default.nix
+++ b/pkgs/development/libraries/haskell/generic-aeson/default.nix
@@ -16,5 +16,6 @@ cabal.mkDerivation (self: {
     description = "Derivation of Aeson instances using GHC generics";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ghc-mod/4.1.6.nix b/pkgs/development/libraries/haskell/ghc-mod/4.1.6.nix
deleted file mode 100644
index a9c06e80f8a..00000000000
--- a/pkgs/development/libraries/haskell/ghc-mod/4.1.6.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, convertible, deepseq, doctest, emacs, filepath
-, ghcSybUtils, hlint, hspec, ioChoice, syb, time, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-mod";
-  version = "4.1.6";
-  sha256 = "093wafaizr2xf7vmzj6f3vs8ch0vpcmwlrja6af6hshgaj2d80qs";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    Cabal convertible deepseq filepath ghcSybUtils hlint ioChoice syb
-    time transformers
-  ];
-  testDepends = [
-    Cabal convertible deepseq doctest filepath ghcSybUtils hlint hspec
-    ioChoice syb time transformers
-  ];
-  buildTools = [ emacs ];
-  doCheck = false;
-  configureFlags = "--datasubdir=${self.pname}-${self.version}";
-  postInstall = ''
-    cd $out/share/$pname-$version
-    make
-    rm Makefile
-    cd ..
-    mkdir -p "$out/share/emacs"
-    mv $pname-$version emacs/site-lisp
-    mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped
-    cat - > $out/bin/ghc-mod <<EOF
-    #! ${self.stdenv.shell}
-    COMMAND=\$1
-    shift
-    eval exec $out/bin/.ghc-mod-wrapped \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
-    EOF
-    chmod +x $out/bin/ghc-mod
-  '';
-  meta = {
-    homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
-    description = "Happy Haskell Programming";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.bluescreen303
-      self.stdenv.lib.maintainers.ocharles
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghc-mod/5.0.1.2.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index 1a4ada4d3dc..af4b76f7b78 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/5.0.1.2.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -1,21 +1,21 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, Cabal, convertible, deepseq, djinnGhc, doctest, emacs
-, filepath, ghcPaths, ghcSybUtils, haskellSrcExts, hlint, hspec
-, ioChoice, makeWrapper, monadControl, monadJournal, mtl, split
-, syb, text, time, transformers, transformersBase
+{ cabal, async, Cabal, convertible, deepseq, djinnGhc, doctest
+, emacs, filepath, ghcPaths, ghcSybUtils, haskellSrcExts, hlint
+, hspec, ioChoice, makeWrapper, monadControl, monadJournal, mtl
+, split, syb, text, time, transformers, transformersBase
 }:
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "5.0.1.2";
-  sha256 = "0hs2d6h3g077prm2mdr40k7m1cdc0h01agbcvs4h6y27nls3kyjx";
+  version = "5.1.0.2";
+  sha256 = "0jdni0n5qzz0ncaa3ja4b6vcfykbl7swiafak4wyvm9izssjh8ra";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    Cabal convertible deepseq djinnGhc filepath ghcPaths ghcSybUtils
-    haskellSrcExts hlint ioChoice monadControl monadJournal mtl split
-    syb text time transformers transformersBase
+    async Cabal convertible deepseq djinnGhc filepath ghcPaths
+    ghcSybUtils haskellSrcExts hlint ioChoice monadControl monadJournal
+    mtl split syb text time transformers transformersBase
   ];
   testDepends = [
     Cabal convertible deepseq djinnGhc doctest filepath ghcPaths
diff --git a/pkgs/development/libraries/haskell/ghc-parser/default.nix b/pkgs/development/libraries/haskell/ghc-parser/default.nix
new file mode 100644
index 00000000000..1cbfe4a19f3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ghc-parser/default.nix
@@ -0,0 +1,20 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, cpphs, happy }:
+
+cabal.mkDerivation (self: {
+  pname = "ghc-parser";
+  version = "0.1.3.0";
+  sha256 = "13p09mj92jh4y0v2r672d49fmlz3l5r2r1lqg0jjy6kj045wcfdn";
+  buildTools = [ cpphs happy ];
+  patchPhase = ''
+    substituteInPlace build-parser.sh --replace "/bin/bash" "$SHELL"
+  '';
+  meta = {
+    homepage = "https://github.com/gibiansky/IHaskell";
+    description = "Haskell source parser from GHC";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ edwtjo ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix
index 8c87bcc0dc5..6605c43e4dd 100644
--- a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix
+++ b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghcjs-dom";
-  version = "0.1.0.0";
-  sha256 = "0qm43bd4m7w14p6ag643h09pll4fp09j1mzjyqvp0dhal03dc723";
+  version = "0.1.1.0";
+  sha256 = "0ywxkp13n78skbcr0d1m5mgz23xds27sdfxswfc9zjcsb513w3gg";
   buildDepends = [ ghcjsBase mtl text ];
   meta = {
     description = "DOM library that supports both GHCJS and WebKitGTK";
diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
index 0e0f147bab9..e1ce7b180f0 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -11,8 +11,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gitit";
-  version = "0.10.5";
-  sha256 = "0p2x2l729rwals0kx8ymk6j3fqvlyjvrj6mmh8slcg93h4smwb4j";
+  version = "0.10.5.1";
+  sha256 = "0wi40f34xqqz0q8m14g7ay6yk37c3fkdijydv0di43i20bxixjhv";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/gloss-accelerate/default.nix b/pkgs/development/libraries/haskell/gloss-accelerate/default.nix
index 66e6805ab54..172d5f31526 100644
--- a/pkgs/development/libraries/haskell/gloss-accelerate/default.nix
+++ b/pkgs/development/libraries/haskell/gloss-accelerate/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gloss-accelerate";
-  version = "1.8.0.0";
-  sha256 = "1hcqgsdk5pjqdr2j4i5614a1r56zfxqx5nc3xpnc4yw6hssan280";
+  version = "1.8.15.0";
+  sha256 = "1nj2rnp2bg3xmi4xbaws9jc7qx3b4qqg9fyvfv13xdav28d7iqb0";
   buildDepends = [ accelerate accelerateCuda gloss ];
   meta = {
     description = "Extras to interface Gloss and Accelerate";
diff --git a/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix b/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix
index 2a51b17dcd5..1a21c2632ee 100644
--- a/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix
+++ b/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gloss-raster-accelerate";
-  version = "1.8.0.0";
-  sha256 = "17545lb99iszhmx8f8fan0dm76ps6bc977zs2ramycnybzbb3kyc";
+  version = "1.8.15.0";
+  sha256 = "1fs3ybrzkykslac1zzh6g73lfdfysn6y2fr1pra9hd0a7x5a8j10";
   buildDepends = [ accelerate accelerateCuda gloss glossAccelerate ];
   meta = {
     description = "Parallel rendering of raster images using Accelerate";
diff --git a/pkgs/development/libraries/haskell/haskell-generate/default.nix b/pkgs/development/libraries/haskell/haskell-generate/default.nix
index ad482d33d7b..342e8d7c932 100644
--- a/pkgs/development/libraries/haskell/haskell-generate/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-generate/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskell-generate";
-  version = "0.2";
-  sha256 = "0bkaarc40lcw3v2y6qdf91rx21v3w82y62kaadhmmh5ikq99pybw";
+  version = "0.2.1";
+  sha256 = "1b7jy4a83lv9zwkzsgbipv7vlzcj27g1h3az7nxxc2gbmyrc15f4";
   buildDepends = [ haskellSrcExts transformers ];
   testDepends = [ doctest filepath ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/haskintex/default.nix b/pkgs/development/libraries/haskell/haskintex/default.nix
index 776d5198bc7..d5a9a5ff3a2 100644
--- a/pkgs/development/libraries/haskell/haskintex/default.nix
+++ b/pkgs/development/libraries/haskell/haskintex/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskintex";
-  version = "0.5.0.0";
-  sha256 = "1ixb8lwgk2bkm36c173x8y2a14ylax5bdrqw4blxm4qia7xidc5i";
+  version = "0.5.0.1";
+  sha256 = "14x1n7x0dqcj14qkv0lmf2jcrswyjjjygqj5vdj6w29a8v9zr296";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/haskoin/default.nix b/pkgs/development/libraries/haskell/haskoin/default.nix
index 120111f35f0..d063cc919fc 100644
--- a/pkgs/development/libraries/haskell/haskoin/default.nix
+++ b/pkgs/development/libraries/haskell/haskoin/default.nix
@@ -18,6 +18,7 @@ cabal.mkDerivation (self: {
     mtl pbkdf QuickCheck split testFramework testFrameworkHunit
     testFrameworkQuickcheck2 text
   ];
+  doCheck = false;
   meta = {
     homepage = "http://github.com/haskoin/haskoin";
     description = "Implementation of the Bitcoin protocol";
diff --git a/pkgs/development/libraries/haskell/here/default.nix b/pkgs/development/libraries/haskell/here/default.nix
new file mode 100644
index 00000000000..2179ad0d85f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/here/default.nix
@@ -0,0 +1,20 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+# The file was later edited to add the state patch.
+# https://github.com/np/here/commit/3c16a4e4ce16c08904454972c0d9b43007d1c0cc
+
+{ cabal, haskellSrcMeta, mtl, parsec, fetchpatch }:
+
+cabal.mkDerivation (self: {
+  pname = "here";
+  version = "1.2.5";
+  sha256 = "0r7hjsvbx7vshbdhi60955mdfnq6arg5ihfz9f2zyilh4l5cyzwb";
+  buildDepends = [ haskellSrcMeta mtl parsec ];
+  patches = [ (fetchpatch { url = "https://github.com/np/here/commit/3c16a4e4ce16c08904454972c0d9b43007d1c0cc.patch"; sha256 = "1qibwbcpnl1cg35zvvdd2k8nr6bgd36qbla3naim3g08qaapm82h"; }) ];
+  meta = with self.stdenv.lib; {
+    homepage = "https://github.com/tmhedberg/here";
+    description = "Here docs & interpolated strings via quasiquotation";
+    license = licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with maintainers; [ edwtjo ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hindent/default.nix b/pkgs/development/libraries/haskell/hindent/default.nix
index 5e8f55b373f..ca76bda7c34 100644
--- a/pkgs/development/libraries/haskell/hindent/default.nix
+++ b/pkgs/development/libraries/haskell/hindent/default.nix
@@ -1,14 +1,14 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, dataDefault, haskellSrcExts, mtl, text }:
+{ cabal, dataDefault, haskellSrcExts, monadLoops, mtl, text }:
 
 cabal.mkDerivation (self: {
   pname = "hindent";
-  version = "3.0";
-  sha256 = "1fvpyg8pb4g023v25lhizcsfd15zw5q4f23qq0ci9h7mg3axlsdx";
+  version = "3.4";
+  sha256 = "060l4dkqz4fma005yai6mdv2bdr2lp59z289j7rv1ygr6p8pqhci";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ dataDefault haskellSrcExts mtl text ];
+  buildDepends = [ dataDefault haskellSrcExts monadLoops mtl text ];
   meta = {
     description = "Extensible Haskell pretty printer";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/hinotify/default.nix b/pkgs/development/libraries/haskell/hinotify/default.nix
index 5fac7a396ff..2513922781b 100644
--- a/pkgs/development/libraries/haskell/hinotify/default.nix
+++ b/pkgs/development/libraries/haskell/hinotify/default.nix
@@ -10,6 +10,6 @@ cabal.mkDerivation (self: {
     homepage = "https://github.com/kolmodin/hinotify.git";
     description = "Haskell binding to inotify";
     license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
+    platforms = self.stdenv.lib.platforms.linux;
   };
 })
diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix
index aacf7c020f8..ce0eec94488 100644
--- a/pkgs/development/libraries/haskell/hint/default.nix
+++ b/pkgs/development/libraries/haskell/hint/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hint";
-  version = "0.4.2.0";
-  sha256 = "08cq9zyyry7cxc30jmsdgrnvw6v2jbxnxcwcjs3bh77rds947mmd";
+  version = "0.4.2.1";
+  sha256 = "0nc545y1v3s1897f3ims7m37wnn288xyz1zb9sxqs6immdxyly0g";
   buildDepends = [
     exceptions extensibleExceptions filepath ghcMtl ghcPaths mtl random
     utf8String
diff --git a/pkgs/development/libraries/haskell/http-common/default.nix b/pkgs/development/libraries/haskell/http-common/default.nix
index da60083936c..61c76e55842 100644
--- a/pkgs/development/libraries/haskell/http-common/default.nix
+++ b/pkgs/development/libraries/haskell/http-common/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-common";
-  version = "0.7.1.1";
-  sha256 = "1a0szaqs1halrv4kx57g2hd4vcdhks7pfal0hyq19af2pncaz1h8";
+  version = "0.7.2.0";
+  sha256 = "0w83qz35aaxc2k3qqpamh8anqxr7w3vym5qh40w1a8n4x00pm960";
   buildDepends = [
     base64Bytestring blazeBuilder caseInsensitive mtl network text
     transformers unorderedContainers
diff --git a/pkgs/development/libraries/haskell/http-streams/default.nix b/pkgs/development/libraries/haskell/http-streams/default.nix
index 910851bde34..c4d3686ceb9 100644
--- a/pkgs/development/libraries/haskell/http-streams/default.nix
+++ b/pkgs/development/libraries/haskell/http-streams/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-streams";
-  version = "0.7.2.0";
-  sha256 = "0h7fjnpday34skhafv2v0ybhfv0x915prfb4qa0ld4gm50scsinz";
+  version = "0.7.2.2";
+  sha256 = "093ldljnabkmi67vj1qnvdlpjk1mpgqwrzdl9cq93v64sqbfwkjw";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeBuilder caseInsensitive
     HsOpenSSL httpCommon ioStreams mtl network opensslStreams text
@@ -24,6 +24,7 @@ cabal.mkDerivation (self: {
     snapCore snapServer systemFileio systemFilepath text transformers
     unorderedContainers
   ];
+  jailbreak = true;
   doCheck = false;
   meta = {
     homepage = "http://research.operationaldynamics.com/projects/http-streams/";
diff --git a/pkgs/development/libraries/haskell/hxt-pickle-utils/default.nix b/pkgs/development/libraries/haskell/hxt-pickle-utils/default.nix
index 60b43b0bad4..6ebb0ba0d89 100644
--- a/pkgs/development/libraries/haskell/hxt-pickle-utils/default.nix
+++ b/pkgs/development/libraries/haskell/hxt-pickle-utils/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Utility functions for using HXT picklers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/io-streams/default.nix b/pkgs/development/libraries/haskell/io-streams/default.nix
index 4b5d9bab9be..6d1d3cbfb6b 100644
--- a/pkgs/development/libraries/haskell/io-streams/default.nix
+++ b/pkgs/development/libraries/haskell/io-streams/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "io-streams";
-  version = "1.1.4.6";
-  sha256 = "0vn6vlgfapmyd9y87i9i0y480w8w81xd3lnhh66a6lalskd4bjdw";
+  version = "1.2.0.0";
+  sha256 = "1lisvwy4pj0ywm1i61qan3vxisl4xazz7z8i8iybww1dv3j6mrn2";
   buildDepends = [
     attoparsec blazeBuilder network primitive text time transformers
     vector zlibBindings
diff --git a/pkgs/development/libraries/haskell/ixset/default.nix b/pkgs/development/libraries/haskell/ixset/default.nix
index c77950c68f0..eb118834e34 100644
--- a/pkgs/development/libraries/haskell/ixset/default.nix
+++ b/pkgs/development/libraries/haskell/ixset/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Efficient relational queries on Haskell sets";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix b/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix
index f787073f080..28498da53d6 100644
--- a/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix
+++ b/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix
@@ -16,6 +16,7 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     hydraPlatforms = self.stdenv.lib.platforms.none;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
     broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix b/pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix
index 9ff082e3239..2ad9bd83d75 100644
--- a/pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix
+++ b/pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Snap backend for jmacro-rpc";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/jmacro-rpc/default.nix b/pkgs/development/libraries/haskell/jmacro-rpc/default.nix
index d1e302b1bc9..ec2c3d8a960 100644
--- a/pkgs/development/libraries/haskell/jmacro-rpc/default.nix
+++ b/pkgs/development/libraries/haskell/jmacro-rpc/default.nix
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/jmacro/default.nix b/pkgs/development/libraries/haskell/jmacro/default.nix
index 32d4d3747ef..9f2fee5f7da 100644
--- a/pkgs/development/libraries/haskell/jmacro/default.nix
+++ b/pkgs/development/libraries/haskell/jmacro/default.nix
@@ -19,5 +19,6 @@ cabal.mkDerivation (self: {
     description = "QuasiQuotation library for programmatic generation of Javascript code";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/json-rpc/default.nix b/pkgs/development/libraries/haskell/json-rpc/default.nix
index bbf443f7145..1062a0b3523 100644
--- a/pkgs/development/libraries/haskell/json-rpc/default.nix
+++ b/pkgs/development/libraries/haskell/json-rpc/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "json-rpc";
-  version = "0.2.0.1";
-  sha256 = "0kk2wpgnkdhphf9za2whmn4f6qlly5hzr071bx7xjqwqbpfhwplm";
+  version = "0.2.0.2";
+  sha256 = "00ha6hjg9ccwa48ab5ibnkiiri7ki3rv7ms2h9qbwr30lxyb0r88";
   buildDepends = [
     aeson async conduit conduitExtra deepseq hashable mtl stm
     stmConduit text unorderedContainers
diff --git a/pkgs/development/libraries/haskell/json-schema/default.nix b/pkgs/development/libraries/haskell/json-schema/default.nix
index 5dfe40089b7..0c06cb107d5 100644
--- a/pkgs/development/libraries/haskell/json-schema/default.nix
+++ b/pkgs/development/libraries/haskell/json-schema/default.nix
@@ -22,5 +22,6 @@ cabal.mkDerivation (self: {
     description = "Types and type classes for defining JSON schemas";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/jwt/default.nix b/pkgs/development/libraries/haskell/jwt/default.nix
new file mode 100644
index 00000000000..d9e4ce8f0dd
--- /dev/null
+++ b/pkgs/development/libraries/haskell/jwt/default.nix
@@ -0,0 +1,28 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, base64Bytestring, cryptohash, dataDefault
+, httpTypes, HUnit, network, QuickCheck, scientific, tasty
+, tastyHunit, tastyQuickcheck, tastyTh, text, time
+, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "jwt";
+  version = "0.4.0";
+  sha256 = "0kfdrl795h7nyai1gk056kjbw2c5n3bc30aq9466pky5jv6ywlbz";
+  buildDepends = [
+    aeson base64Bytestring cryptohash dataDefault httpTypes network
+    scientific text time unorderedContainers
+  ];
+  testDepends = [
+    aeson base64Bytestring cryptohash dataDefault httpTypes HUnit
+    network QuickCheck scientific tasty tastyHunit tastyQuickcheck
+    tastyTh text time unorderedContainers
+  ];
+  meta = {
+    homepage = "https://bitbucket.org/ssaasen/haskell-jwt";
+    description = "JSON Web Token (JWT) decoding and encoding";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/kansas-comet/default.nix b/pkgs/development/libraries/haskell/kansas-comet/default.nix
new file mode 100644
index 00000000000..1c01d567d75
--- /dev/null
+++ b/pkgs/development/libraries/haskell/kansas-comet/default.nix
@@ -0,0 +1,21 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, dataDefault, scotty, stm, text, time, transformers
+, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "kansas-comet";
+  version = "0.3.1";
+  sha256 = "0xbapi4clmkighxh0jb12zpzgrz9sqyfpwdkvrj6cdq6i6a22qx1";
+  buildDepends = [
+    aeson dataDefault scotty stm text time transformers
+    unorderedContainers
+  ];
+  meta = {
+    homepage = "https://github.com/ku-fpg/kansas-comet/";
+    description = "A JavaScript push mechanism based on the comet idiom";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/language-c-inline/default.nix b/pkgs/development/libraries/haskell/language-c-inline/default.nix
index fa1c8af9680..ba06bf860bd 100644
--- a/pkgs/development/libraries/haskell/language-c-inline/default.nix
+++ b/pkgs/development/libraries/haskell/language-c-inline/default.nix
@@ -4,12 +4,10 @@
 
 cabal.mkDerivation (self: {
   pname = "language-c-inline";
-  version = "0.7.6.0";
-  sha256 = "01imdfjqkx49pcwplvmd5lqbal5hq1cx11zcig3na1x46ggiavah";
+  version = "0.7.6.1";
+  sha256 = "0giyclrkxbigqpgrvlz896nsiqi7fghm79pzcxmxn7vslmardn4a";
   buildDepends = [ filepath languageCQuote mainlandPretty ];
   testDepends = [ languageCQuote ];
-  noHaddock = true;
-  doCheck = false;
   meta = {
     homepage = "https://github.com/mchakravarty/language-c-inline/";
     description = "Inline C & Objective-C code in Haskell for language interoperability";
diff --git a/pkgs/development/libraries/haskell/language-java/0.2.6.nix b/pkgs/development/libraries/haskell/language-java/0.2.6.nix
new file mode 100644
index 00000000000..316a95481a5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/language-java/0.2.6.nix
@@ -0,0 +1,25 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, alex, cpphs, filepath, HUnit, mtl, parsec, QuickCheck, syb
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
+}:
+
+cabal.mkDerivation (self: {
+  pname = "language-java";
+  version = "0.2.6";
+  sha256 = "1rwkc71c77v1lm5vnfkf7wr4lzvkpdylwz8wia40xwyxidq9qv27";
+  buildDepends = [ cpphs parsec syb ];
+  testDepends = [
+    filepath HUnit mtl QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2
+  ];
+  buildTools = [ alex ];
+  doCheck = false;
+  meta = {
+    homepage = "http://github.com/vincenthz/language-java";
+    description = "Manipulating Java source: abstract syntax, lexer, parser, and pretty-printer";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/language-java/default.nix b/pkgs/development/libraries/haskell/language-java/0.2.7.nix
index dc35a8867ba..dc35a8867ba 100644
--- a/pkgs/development/libraries/haskell/language-java/default.nix
+++ b/pkgs/development/libraries/haskell/language-java/0.2.7.nix
diff --git a/pkgs/development/libraries/haskell/lens-aeson/default.nix b/pkgs/development/libraries/haskell/lens-aeson/default.nix
index d19b0bf6dd7..ddf643b899a 100644
--- a/pkgs/development/libraries/haskell/lens-aeson/default.nix
+++ b/pkgs/development/libraries/haskell/lens-aeson/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lens-aeson";
-  version = "1";
-  sha256 = "0zpfpba97kr92lzrmdfk08f3cl42alhx0d73w8sbbwxnnvv4489r";
+  version = "1.0.0.1";
+  sha256 = "1gkplcvi570bd824q4zswi1ajb3730b7qng48g1zpjskvikn32qn";
   buildDepends = [
     aeson attoparsec lens scientific text unorderedContainers vector
   ];
diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index b6c68f3ce00..69367fc1fe1 100644
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -25,6 +25,9 @@ cabal.mkDerivation (self: {
     testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text
     transformers unorderedContainers vector
   ];
+  patchPhase = ''
+    configureFlags="-f-test-hlint"
+  '';
   meta = {
     homepage = "http://github.com/ekmett/lens/";
     description = "Lenses, Folds and Traversals";
diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix
index 176f80048c4..2558d18d748 100644
--- a/pkgs/development/libraries/haskell/liblastfm/default.nix
+++ b/pkgs/development/libraries/haskell/liblastfm/default.nix
@@ -2,27 +2,26 @@
 
 { cabal, aeson, cereal, contravariant, cryptoApi, hspec
 , hspecExpectationsLens, httpClient, httpClientTls, HUnit, lens
-, network, profunctors, pureMD5, semigroups, text, void, xmlConduit
-, xmlHtmlConduitLens
+, lensAeson, networkUri, profunctors, pureMD5, semigroups, text
+, void, xmlConduit, xmlHtmlConduitLens
 }:
 
 cabal.mkDerivation (self: {
   pname = "liblastfm";
-  version = "0.4.0.0";
-  sha256 = "0dr1nvb7sxlp1fihvnwz9lyfmaynbj39npah2ndvlgnzz670j0z9";
+  version = "0.4.1.0";
+  sha256 = "06w8rj2f2r0v15w6498px07krsqh1amcr6q22y3jlvaibm9mrvcw";
   buildDepends = [
     aeson cereal contravariant cryptoApi httpClient httpClientTls
-    network profunctors pureMD5 semigroups text void xmlConduit
+    networkUri profunctors pureMD5 semigroups text void xmlConduit
   ];
   testDepends = [
     aeson cereal contravariant cryptoApi hspec hspecExpectationsLens
-    httpClient httpClientTls HUnit lens network profunctors pureMD5
-    text void xmlConduit xmlHtmlConduitLens
+    httpClient httpClientTls HUnit lens lensAeson networkUri
+    profunctors pureMD5 text void xmlConduit xmlHtmlConduitLens
   ];
   meta = {
     description = "Lastfm API interface";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/0.8.0.5.nix
index b54068d924c..f7f83cd973e 100644
--- a/pkgs/development/libraries/haskell/libmpd/default.nix
+++ b/pkgs/development/libraries/haskell/libmpd/0.8.0.5.nix
@@ -21,5 +21,6 @@ cabal.mkDerivation (self: {
     description = "An MPD client library";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/libmpd/0.9.0.1.nix b/pkgs/development/libraries/haskell/libmpd/0.9.0.1.nix
new file mode 100644
index 00000000000..6dc0aede069
--- /dev/null
+++ b/pkgs/development/libraries/haskell/libmpd/0.9.0.1.nix
@@ -0,0 +1,24 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, attoparsec, dataDefault, filepath, hspec, mtl, network
+, QuickCheck, text, time, utf8String
+}:
+
+cabal.mkDerivation (self: {
+  pname = "libmpd";
+  version = "0.9.0.1";
+  sha256 = "11smm8ai7053hljlxi5l2fkqxrqr1xrh6sxg2r0dlsvmmln7smrd";
+  buildDepends = [
+    attoparsec dataDefault filepath mtl network text time utf8String
+  ];
+  testDepends = [
+    attoparsec dataDefault filepath hspec mtl network QuickCheck text
+    time utf8String
+  ];
+  meta = {
+    homepage = "http://github.com/vimus/libmpd-haskell#readme";
+    description = "An MPD client library";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/lzma-enumerator/default.nix b/pkgs/development/libraries/haskell/lzma-enumerator/default.nix
index 34604a6fc66..7a1ee231957 100644
--- a/pkgs/development/libraries/haskell/lzma-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/lzma-enumerator/default.nix
@@ -20,5 +20,6 @@ cabal.mkDerivation (self: {
     description = "Enumerator interface for lzma/xz compression";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    broken = self.stdenv.isi686;
   };
 })
diff --git a/pkgs/development/libraries/haskell/markdown/default.nix b/pkgs/development/libraries/haskell/markdown/default.nix
index a19ecf0408c..9727b7264d4 100644
--- a/pkgs/development/libraries/haskell/markdown/default.nix
+++ b/pkgs/development/libraries/haskell/markdown/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "markdown";
-  version = "0.1.10";
-  sha256 = "1n453xsarrrshn4pidlhknazjpsjh1nnygfir54z17rxcrvgprr1";
+  version = "0.1.11";
+  sha256 = "1v5bqwzh0v17ylgnbl16bw4n9shyrff7nabwnzzhs2wmqp85n3js";
   buildDepends = [
     attoparsec blazeHtml conduit conduitExtra dataDefault text
     transformers xssSanitize
diff --git a/pkgs/development/libraries/haskell/mersenne-random/default.nix b/pkgs/development/libraries/haskell/mersenne-random/default.nix
new file mode 100644
index 00000000000..ec7a54c9ed2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/mersenne-random/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "mersenne-random";
+  version = "1.0.0.1";
+  sha256 = "193qz3wn7lz18aywddr9qyn8v08ifv2yxwr68c67p5mn8vr8mvmw";
+  meta = {
+    homepage = "http://code.haskell.org/~dons/code/mersenne-random";
+    description = "Generate high quality pseudorandom numbers using a SIMD Fast Mersenne Twister";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/miniutter/default.nix b/pkgs/development/libraries/haskell/miniutter/default.nix
index 2400721a656..b58449b22ad 100644
--- a/pkgs/development/libraries/haskell/miniutter/default.nix
+++ b/pkgs/development/libraries/haskell/miniutter/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "miniutter";
-  version = "0.4.4.0";
-  sha256 = "1pfgbvnxh3c9b489i121p5bg785bp9ivfwizjfwc9w3r6spgppvk";
+  version = "0.4.4.1";
+  sha256 = "1raq5dq6mx56ddyq5hnh9r2yflry6prcjf17p15ds1w5r8cp8yx1";
   buildDepends = [ binary minimorph text ];
   testDepends = [ HUnit testFramework testFrameworkHunit text ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/monad-journal/default.nix b/pkgs/development/libraries/haskell/monad-journal/default.nix
index f7c48f691ed..d65eecc6a30 100644
--- a/pkgs/development/libraries/haskell/monad-journal/default.nix
+++ b/pkgs/development/libraries/haskell/monad-journal/default.nix
@@ -5,13 +5,13 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-journal";
-  version = "0.2.3.2";
-  sha256 = "02356yapx5g6lam72kdyhndq5lcyhd2zsjvvcndiyhqik6csi457";
+  version = "0.4.0.2";
+  sha256 = "0biz564lgddzd6hygb7jd3rh8xa7qmzby4q3fyfa9fizmdcwf9j8";
   buildDepends = [
     either monadControl mtl transformers transformersBase
   ];
   meta = {
-    homepage = "https://github.com/phaazon/monad-journal";
+    homepage = "http://github.com/phaazon/monad-journal";
     description = "Pure logger typeclass and monad transformer";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/multipart/default.nix b/pkgs/development/libraries/haskell/multipart/default.nix
index def73364e31..82cad64df04 100644
--- a/pkgs/development/libraries/haskell/multipart/default.nix
+++ b/pkgs/development/libraries/haskell/multipart/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "HTTP multipart split out of the cgi package";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/openssl-streams/default.nix b/pkgs/development/libraries/haskell/openssl-streams/default.nix
index 28609f9e0f6..5ae373fbac2 100644
--- a/pkgs/development/libraries/haskell/openssl-streams/default.nix
+++ b/pkgs/development/libraries/haskell/openssl-streams/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "openssl-streams";
-  version = "1.1.0.2";
-  sha256 = "0h3jxxdls0p1xxr02rfag7j9y13ll3xgzx2ldv1nsfcv3rzw2pfy";
+  version = "1.2.0.0";
+  sha256 = "01hdrsdrp2x7i5zydn2b0blzir7vqvn63n9sf9pwcgnkk6s5j1wc";
   buildDepends = [ HsOpenSSL ioStreams network ];
   testDepends = [
     HsOpenSSL HUnit ioStreams network testFramework testFrameworkHunit
diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
index 76ab2fc41b4..feb273fbdeb 100644
--- a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
@@ -1,20 +1,20 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, aesonPretty, attoparsec, filepath, hexpat
+{ cabal, aeson, aesonPretty, attoparsec, dataDefault, filepath
 , hsBibutils, mtl, pandoc, pandocTypes, parsec, rfc5051, split, syb
-, tagsoup, temporary, text, time, vector, yaml
+, tagsoup, temporary, text, time, vector, xmlConduit, yaml
 }:
 
 cabal.mkDerivation (self: {
   pname = "pandoc-citeproc";
-  version = "0.5";
-  sha256 = "00azhpll0xnb9nnkh7c3hbfk0fzmvh5cgdxlgx7jvaglrmsnvzw3";
+  version = "0.6";
+  sha256 = "1whi8mrbhfi8wr3qbj1lkgc1pngn8151jjri409hshl1mng4aq5b";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    aeson aesonPretty attoparsec filepath hexpat hsBibutils mtl pandoc
-    pandocTypes parsec rfc5051 split syb tagsoup temporary text time
-    vector yaml
+    aeson aesonPretty attoparsec dataDefault filepath hsBibutils mtl
+    pandoc pandocTypes parsec rfc5051 split syb tagsoup temporary text
+    time vector xmlConduit yaml
   ];
   testDepends = [
     aeson filepath pandoc pandocTypes temporary text yaml
diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index c8ef8ba2271..0fa41e250b4 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -31,6 +31,7 @@ cabal.mkDerivation (self: {
     pandocTypes QuickCheck syb testFramework testFrameworkHunit
     testFrameworkQuickcheck2 text zipArchive
   ];
+  configureFlags = "-fhttps -fmake-pandoc-man-pages";
   jailbreak = true;
   doCheck = false;
   meta = {
diff --git a/pkgs/development/libraries/haskell/persistent-mysql/default.nix b/pkgs/development/libraries/haskell/persistent-mysql/default.nix
index c76624e52c3..dd895b937ce 100644
--- a/pkgs/development/libraries/haskell/persistent-mysql/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-mysql/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-mysql";
-  version = "2.0.1";
-  sha256 = "02hqklndyzff8swcll5n7ck6iy9ci50kj1s5l1r43kcgh7cqili3";
+  version = "2.0.5";
+  sha256 = "1zhva0wikp3d57fsz5phqwi0b3vbgnapf6bw46xmmrp8r21zsnk5";
   buildDepends = [
     aeson blazeBuilder conduit monadControl monadLogger mysql
     mysqlSimple persistent resourcet text transformers
diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
index 3838d2e67ad..8a8b0989e72 100644
--- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-postgresql";
-  version = "2.0.1";
-  sha256 = "1szvnakbg7bwyld3wcm9b0fn3083z95kpygqnx1hd7nc21hl6dch";
+  version = "2.0.5";
+  sha256 = "1awdxh354y2hxsiijwvc2x7ficrcwmg27ai2mi79a0b2ylrxc9pk";
   buildDepends = [
     aeson blazeBuilder conduit monadControl monadLogger persistent
     postgresqlLibpq postgresqlSimple resourcet text time transformers
diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
index c2f2f341e5e..db5965d378f 100644
--- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-sqlite";
-  version = "2.0.1";
-  sha256 = "1ygyghifss29fdkyk5fhq9f1nkw1wgmlcsdh18sff5vvvk7vfa2l";
+  version = "2.0.5";
+  sha256 = "1x65pni93xgsbfwaknd9fgqccz0gbn1ky6k55l2ss5ab92apqy8i";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index 44e4d1f3246..7060eddc17e 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-template";
-  version = "2.0.2.2";
-  sha256 = "1qar8xh4nbprnvqzgy4byc882hkfyxr7apbj0wzfs7smpla1ghlx";
+  version = "2.0.5";
+  sha256 = "0mf18n07r2bvvf5448xq4pzylpprkbc1wb86339gaxnax321ipap";
   buildDepends = [
     aeson monadControl monadLogger pathPieces persistent tagged text
     transformers unorderedContainers
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 8a1c16a63c5..588f6163b65 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "2.0.2";
-  sha256 = "047k5bycpyvjyri7k6skc775m2akspzlr08ya2lv53q81yv912xi";
+  version = "2.0.5.1";
+  sha256 = "14xzqr9f0ggqkakpq6badbrnwr6nhzq61ga7d2m0d0lni039vdax";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
     exceptions fastLogger liftedBase monadControl monadLogger mtl
diff --git a/pkgs/development/libraries/haskell/pipes-binary/default.nix b/pkgs/development/libraries/haskell/pipes-binary/default.nix
index 94f899c6a8d..ea9fe83eab7 100644
--- a/pkgs/development/libraries/haskell/pipes-binary/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-binary/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-binary";
-  version = "0.4.0.2";
-  sha256 = "1lbz2hybglkmm7dawg16pma2yr732yy1agh5b9vwlw2ik92hrm58";
+  version = "0.4.0.3";
+  sha256 = "0r56h5f9i6hy4zb2bhfi26y7y3z0j4nacdb2dgkxmh5mqjd33f0q";
   buildDepends = [
     binary pipes pipesBytestring pipesParse transformers
   ];
diff --git a/pkgs/development/libraries/haskell/pipes-csv/default.nix b/pkgs/development/libraries/haskell/pipes-csv/default.nix
index c18d2297f67..e26526fb046 100644
--- a/pkgs/development/libraries/haskell/pipes-csv/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-csv/default.nix
@@ -19,5 +19,6 @@ cabal.mkDerivation (self: {
     description = "Fast, streaming csv parser";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pipes-http/default.nix b/pkgs/development/libraries/haskell/pipes-http/default.nix
index b5b9a8859ad..5406a579799 100644
--- a/pkgs/development/libraries/haskell/pipes-http/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-http/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "HTTP client with pipes interface";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pipes-text/default.nix b/pkgs/development/libraries/haskell/pipes-text/default.nix
index deef6e0fdb6..ec4a8e96786 100644
--- a/pkgs/development/libraries/haskell/pipes-text/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-text/default.nix
@@ -18,5 +18,6 @@ cabal.mkDerivation (self: {
     description = "Text pipes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pipes-zlib/default.nix b/pkgs/development/libraries/haskell/pipes-zlib/default.nix
index 9a4ed04892b..58894ce6dd6 100644
--- a/pkgs/development/libraries/haskell/pipes-zlib/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-zlib/default.nix
@@ -4,12 +4,12 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-zlib";
-  version = "0.4.0.1";
-  sha256 = "1k91q5hci4hk2kzaqfvg1nwbklqyg83wwhm3sdfhdn2famj0mls0";
+  version = "0.4.1";
+  sha256 = "0wjx51d3inhsjzqf16l46mhh0mdsa8fk7x1vvp2apg9s6zfw624k";
   buildDepends = [ pipes transformers zlib zlibBindings ];
   meta = {
     homepage = "https://github.com/k0001/pipes-zlib";
-    description = "Zlib compression and decompression for Pipes streams";
+    description = "Zlib and GZip compression and decompression for Pipes streams";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix
index f8bb4d4a6db..20739bc4515 100644
--- a/pkgs/development/libraries/haskell/purescript/default.nix
+++ b/pkgs/development/libraries/haskell/purescript/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "purescript";
-  version = "0.5.5";
-  sha256 = "19a2ra37cxh56gd1k43y9fg2cdp848yimybsx8728in39m8cjbxw";
+  version = "0.5.6.2";
+  sha256 = "1zb5jvgwldzvvw1ga125p5048rwkrb636kn7pcf070m615k9w055";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix
index 4cdbed03762..73506a3ba75 100644
--- a/pkgs/development/libraries/haskell/random-fu/default.nix
+++ b/pkgs/development/libraries/haskell/random-fu/default.nix
@@ -1,16 +1,16 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, erf, mathFunctions, monadLoops, mtl, randomShuffle
-, randomSource, rvar, syb, transformers, vector
+{ cabal, erf, logfloat, mathFunctions, monadLoops, mtl
+, randomShuffle, randomSource, rvar, syb, transformers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "random-fu";
-  version = "0.2.6.0";
-  sha256 = "1mi1hr3hxlnyjf01hgn7xinr1m0rax26759zbkhf5xn04ps0g01p";
+  version = "0.2.6.1";
+  sha256 = "04fi92szpjyg0ffgxfayz00vpiqi67hzyahhin12wvw3pxbyyp9g";
   buildDepends = [
-    erf mathFunctions monadLoops mtl randomShuffle randomSource rvar
-    syb transformers vector
+    erf logfloat mathFunctions monadLoops mtl randomShuffle
+    randomSource rvar syb transformers vector
   ];
   meta = {
     homepage = "https://github.com/mokus0/random-fu";
diff --git a/pkgs/development/libraries/haskell/regular-xmlpickler/default.nix b/pkgs/development/libraries/haskell/regular-xmlpickler/default.nix
index 35a3f32847e..4b4fe43102a 100644
--- a/pkgs/development/libraries/haskell/regular-xmlpickler/default.nix
+++ b/pkgs/development/libraries/haskell/regular-xmlpickler/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Generic generation of HXT XmlPickler instances using Regular";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/rest-client/default.nix b/pkgs/development/libraries/haskell/rest-client/default.nix
index 0712742717b..248acc36226 100644
--- a/pkgs/development/libraries/haskell/rest-client/default.nix
+++ b/pkgs/development/libraries/haskell/rest-client/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "rest-client";
-  version = "0.4";
-  sha256 = "18mvmp4c5zznph8q5ash6224wig5kwvb6v19dkn39n4l72cdq7wm";
+  version = "0.4.0.1";
+  sha256 = "1bn2kgyr6q0wxlp3kman20wn7jgz5dc6m8rq5xf0mknpbh8rrnpc";
   buildDepends = [
     aesonUtils caseInsensitive dataDefault exceptionTransformers
     httpConduit httpTypes hxt hxtPickleUtils monadControl mtl primitive
@@ -19,5 +19,6 @@ cabal.mkDerivation (self: {
     description = "Utility library for use in generated API client libraries";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/rest-core/default.nix b/pkgs/development/libraries/haskell/rest-core/default.nix
index 53c3ede3ec1..1da4832cdc3 100644
--- a/pkgs/development/libraries/haskell/rest-core/default.nix
+++ b/pkgs/development/libraries/haskell/rest-core/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "rest-core";
-  version = "0.32";
-  sha256 = "130kz1gsrbamw8gs4vc0fqfjh1gi7i52xxmj4fg1vl2dr77gf6my";
+  version = "0.33";
+  sha256 = "05m8cvkm0nsi1yixk0dj5j6nvzzzs07i0pmyaj0ww6v5vkmcgmfb";
   buildDepends = [
     aeson aesonUtils either errors fclabels hxt hxtPickleUtils
     jsonSchema mtl multipart random restStringmap restTypes safe split
@@ -23,5 +23,6 @@ cabal.mkDerivation (self: {
     description = "Rest API library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/rest-gen/default.nix b/pkgs/development/libraries/haskell/rest-gen/default.nix
index 3a21393c210..229c3f5c7bf 100644
--- a/pkgs/development/libraries/haskell/rest-gen/default.nix
+++ b/pkgs/development/libraries/haskell/rest-gen/default.nix
@@ -2,28 +2,30 @@
 
 { cabal, aeson, blazeHtml, Cabal, codeBuilder, fclabels, filepath
 , hashable, haskellSrcExts, hslogger, HStringTemplate, HUnit, hxt
-, jsonSchema, restCore, safe, scientific, split, tagged
+, jsonSchema, restCore, safe, scientific, semigroups, split, tagged
 , testFramework, testFrameworkHunit, text, uniplate
 , unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "rest-gen";
-  version = "0.15.0.2";
-  sha256 = "1k33bhjy909ffc5bnk3fb8vi8pvylb7rh6m95f70x5h6wgq4lhjg";
+  version = "0.16";
+  sha256 = "05qpj4zhihmb2cdgw3vx7ir0mqga1w6qidc4vwdjq6dy8d81sdmc";
   buildDepends = [
     aeson blazeHtml Cabal codeBuilder fclabels filepath hashable
     haskellSrcExts hslogger HStringTemplate hxt jsonSchema restCore
-    safe scientific split tagged text uniplate unorderedContainers
-    vector
+    safe scientific semigroups split tagged text uniplate
+    unorderedContainers vector
   ];
   testDepends = [
-    haskellSrcExts HUnit restCore testFramework testFrameworkHunit
+    fclabels haskellSrcExts HUnit restCore testFramework
+    testFrameworkHunit
   ];
   jailbreak = true;
   meta = {
     description = "Documentation and client generation from rest definition";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/rest-happstack/default.nix b/pkgs/development/libraries/haskell/rest-happstack/default.nix
index 93397e82363..523bb685561 100644
--- a/pkgs/development/libraries/haskell/rest-happstack/default.nix
+++ b/pkgs/development/libraries/haskell/rest-happstack/default.nix
@@ -4,12 +4,13 @@
 
 cabal.mkDerivation (self: {
   pname = "rest-happstack";
-  version = "0.2.10.2";
-  sha256 = "18i2q3kvsyrh41gdclrzpnsjy1p9cgl3d9jsvcqqnzrv519vzdig";
+  version = "0.2.10.3";
+  sha256 = "05sakr88j6rlwnghzd00g3c3895wpjxi36n9pdbpv0fpm0hh86yv";
   buildDepends = [ happstackServer mtl restCore restGen utf8String ];
   meta = {
     description = "Rest driver for Happstack";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/rest-snap/default.nix b/pkgs/development/libraries/haskell/rest-snap/default.nix
index 8e9bc69eb01..efb4f8e1fed 100644
--- a/pkgs/development/libraries/haskell/rest-snap/default.nix
+++ b/pkgs/development/libraries/haskell/rest-snap/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "rest-snap";
-  version = "0.1.17.13";
-  sha256 = "13c143dzxhfrshn19ylqfmhnxjirixfif8d1fmzagz1v893narkz";
+  version = "0.1.17.14";
+  sha256 = "0fd6d85gzp9mr7y7bgfk9wscrhrych9q7cssps8m5l03n83d8asp";
   buildDepends = [
     caseInsensitive restCore safe snapCore unorderedContainers
     uriEncode utf8String
@@ -16,5 +16,6 @@ cabal.mkDerivation (self: {
     description = "Rest driver for Snap";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/rest-stringmap/default.nix b/pkgs/development/libraries/haskell/rest-stringmap/default.nix
index c1f0c13cbc2..9c1e98c0655 100644
--- a/pkgs/development/libraries/haskell/rest-stringmap/default.nix
+++ b/pkgs/development/libraries/haskell/rest-stringmap/default.nix
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "Maps with stringy keys that can be transcoded to JSON and XML";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/rest-types/default.nix b/pkgs/development/libraries/haskell/rest-types/default.nix
index 41b8044b593..65e221b43cd 100644
--- a/pkgs/development/libraries/haskell/rest-types/default.nix
+++ b/pkgs/development/libraries/haskell/rest-types/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "rest-types";
-  version = "1.10.2";
-  sha256 = "1j8fpv4xdhbf1awy0v9zn9a3sjwl42l6472wczp3wwwcpsi65d9q";
+  version = "1.11";
+  sha256 = "16ki6sqi88s8ykwdhsk0xparvv90zzj4jidk0mhsd2wi3l4w1l6i";
   buildDepends = [
     aeson genericAeson hxt jsonSchema mtl regular regularXmlpickler
     restStringmap text uuid
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "Silk Rest Framework Types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/rest-wai/default.nix b/pkgs/development/libraries/haskell/rest-wai/default.nix
index d23d81da33d..f986237426c 100644
--- a/pkgs/development/libraries/haskell/rest-wai/default.nix
+++ b/pkgs/development/libraries/haskell/rest-wai/default.nix
@@ -1,20 +1,21 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, caseInsensitive, httpTypes, mimeTypes, mtl, restCore
-, restTypes, text, unorderedContainers, utf8String, wai
+{ cabal, caseInsensitive, httpTypes, mimeTypes, mtl, restCore, text
+, unorderedContainers, utf8String, wai
 }:
 
 cabal.mkDerivation (self: {
   pname = "rest-wai";
-  version = "0.1.0.3";
-  sha256 = "08pprgn9xnd3ipr6clify3snm4ahshlws869mfvziplc4hdcnb59";
+  version = "0.1.0.4";
+  sha256 = "1pxjf0fmsfiywr81zl5xbl6si0x74a7zmz6d5vqv5pvxmpgwgcbg";
   buildDepends = [
-    caseInsensitive httpTypes mimeTypes mtl restCore restTypes text
+    caseInsensitive httpTypes mimeTypes mtl restCore text
     unorderedContainers utf8String wai
   ];
   meta = {
     description = "Rest driver for WAI applications";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/rvar/default.nix b/pkgs/development/libraries/haskell/rvar/default.nix
index ecb2a2c9db1..0802c8ba3f5 100644
--- a/pkgs/development/libraries/haskell/rvar/default.nix
+++ b/pkgs/development/libraries/haskell/rvar/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "rvar";
-  version = "0.2.0.1";
-  sha256 = "17wgd4gc1hn04dck168nkyzn9jyipgbysxsznyzy2z36vafqqqbm";
+  version = "0.2.0.2";
+  sha256 = "1n24fl27mrm7cndp8b646b9c5hjm3hf5m12y9ni0f850dd739jm4";
   buildDepends = [ MonadPrompt mtl randomSource transformers ];
   meta = {
     homepage = "https://github.com/mokus0/random-fu";
diff --git a/pkgs/development/libraries/haskell/sdl2/default.nix b/pkgs/development/libraries/haskell/sdl2/default.nix
new file mode 100644
index 00000000000..d60a69ae928
--- /dev/null
+++ b/pkgs/development/libraries/haskell/sdl2/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, SDL2 }:
+
+cabal.mkDerivation (self: {
+  pname = "sdl2";
+  version = "1.1.1";
+  sha256 = "0kqs211ksp25pgkzy9rz8zcfi3pqrbl1zmbjh1vx8r2lkf79z1y5";
+  extraLibraries = [ SDL2 ];
+  pkgconfigDepends = [ SDL2 ];
+  meta = {
+    description = "Low-level bindings to SDL2";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix
index 610c7c22590..42dbb2079c8 100644
--- a/pkgs/development/libraries/haskell/shake/default.nix
+++ b/pkgs/development/libraries/haskell/shake/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shake";
-  version = "0.13.2";
-  sha256 = "0ibq0y0dxxahfwgcvamjfhbl5mrqmj7ryzf8bfmqky843fg7dyna";
+  version = "0.13.4";
+  sha256 = "05w78d2hdw13f3i876iq1b5j137p4vr759da273p8k6alk4mi3am";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -19,7 +19,7 @@ cabal.mkDerivation (self: {
     transformers unorderedContainers utf8String
   ];
   meta = {
-    homepage = "https://github.com/ndmitchell/shake";
+    homepage = "https://github.com/ndmitchell/shake#readme";
     description = "Build system library, like Make, but more accurate dependencies";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/shell-conduit/default.nix b/pkgs/development/libraries/haskell/shell-conduit/default.nix
new file mode 100644
index 00000000000..23ce1522254
--- /dev/null
+++ b/pkgs/development/libraries/haskell/shell-conduit/default.nix
@@ -0,0 +1,22 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, conduit, conduitExtra, controlMonadLoop, filepath
+, monadControl, monadsTf, resourcet, semigroups, split, text, these
+, transformers, transformersBase
+}:
+
+cabal.mkDerivation (self: {
+  pname = "shell-conduit";
+  version = "3.0";
+  sha256 = "07x920j52zjqh3lpfam5f1nhsgqbcgz458dbrwxsmsn3cnqf2qd6";
+  buildDepends = [
+    conduit conduitExtra controlMonadLoop filepath monadControl
+    monadsTf resourcet semigroups split text these transformers
+    transformersBase
+  ];
+  meta = {
+    description = "Write shell scripts with Conduit";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/shellmate/default.nix b/pkgs/development/libraries/haskell/shellmate/default.nix
index 6f059a75352..dcc7211f869 100644
--- a/pkgs/development/libraries/haskell/shellmate/default.nix
+++ b/pkgs/development/libraries/haskell/shellmate/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Simple interface for shell scripting in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/socket-io/default.nix b/pkgs/development/libraries/haskell/socket-io/default.nix
index 0a7d4b1c230..c64c7c48edc 100644
--- a/pkgs/development/libraries/haskell/socket-io/default.nix
+++ b/pkgs/development/libraries/haskell/socket-io/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "socket-io";
-  version = "1.1.0";
-  sha256 = "1ffip6jlp3i6pz8gbk8m2ra2q8568mgwgi988yh046w787yf9kpw";
+  version = "1.1.1";
+  sha256 = "0zr5kj519hw90rlicang5f573dd325rxv24psf12fxl6vmyxx1zc";
   buildDepends = [
     aeson attoparsec engineIo mtl stm text transformers
     unorderedContainers vector
diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix
index 3f0d47dfc2a..f42634473bb 100644
--- a/pkgs/development/libraries/haskell/streaming-commons/default.nix
+++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "streaming-commons";
-  version = "0.1.4.2";
-  sha256 = "0ghm3a64q84bfyp1qp452jw4ns52nd5jz8fk308vljfpakv30qyf";
+  version = "0.1.5";
+  sha256 = "1gmr8yv6r87y1826rc3y3i8darwsaisqpbhjx1bn3m070g9fhqlp";
   buildDepends = [
     blazeBuilder network random stm text transformers zlib
   ];
diff --git a/pkgs/development/libraries/haskell/system-argv0/default.nix b/pkgs/development/libraries/haskell/system-argv0/default.nix
new file mode 100644
index 00000000000..6f0eb038b60
--- /dev/null
+++ b/pkgs/development/libraries/haskell/system-argv0/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, systemFilepath, text }:
+
+cabal.mkDerivation (self: {
+  pname = "system-argv0";
+  version = "0.1.1";
+  sha256 = "1ijfry2r3cypp3zmws6dczk21m4n86fkxjld7yl19gjp46fxllbd";
+  buildDepends = [ systemFilepath text ];
+  meta = {
+    homepage = "https://john-millikin.com/software/haskell-filesystem/";
+    description = "Get argv[0] as a FilePath";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/tables/default.nix b/pkgs/development/libraries/haskell/tables/default.nix
index 53b178066eb..b8159a777d4 100644
--- a/pkgs/development/libraries/haskell/tables/default.nix
+++ b/pkgs/development/libraries/haskell/tables/default.nix
@@ -21,5 +21,6 @@ cabal.mkDerivation (self: {
     description = "In-memory storage with multiple keys using lenses and traversals";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/tasty-program/default.nix b/pkgs/development/libraries/haskell/tasty-program/default.nix
new file mode 100644
index 00000000000..60a88315f72
--- /dev/null
+++ b/pkgs/development/libraries/haskell/tasty-program/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, filepath, tasty }:
+
+cabal.mkDerivation (self: {
+  pname = "tasty-program";
+  version = "1.0.1";
+  sha256 = "04q2pp7hwqiiry17dd3ng0i6ikqzpg7hfgf0ckcg33xw450kpx9n";
+  buildDepends = [ filepath tasty ];
+  meta = {
+    homepage = "https://github.com/jstolarek/tasty-program";
+    description = "Use tasty framework to test whether a program executes correctly";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/tostring/default.nix b/pkgs/development/libraries/haskell/tostring/default.nix
index 0c181e2b076..825361354d2 100644
--- a/pkgs/development/libraries/haskell/tostring/default.nix
+++ b/pkgs/development/libraries/haskell/tostring/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "The ToString class";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/unix-memory/default.nix b/pkgs/development/libraries/haskell/unix-memory/default.nix
index caaf6c1bde5..c8fa0d244fb 100644
--- a/pkgs/development/libraries/haskell/unix-memory/default.nix
+++ b/pkgs/development/libraries/haskell/unix-memory/default.nix
@@ -1,17 +1,12 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, HUnit, mtl, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2
-}:
+{ cabal, mtl, QuickCheck, tasty, tastyHunit, tastyQuickcheck }:
 
 cabal.mkDerivation (self: {
   pname = "unix-memory";
-  version = "0.1.1";
-  sha256 = "02jmccs7mcg2lhpnb1ps7ycxzmn46b4drf994vv0pawwjrkrhnhk";
-  testDepends = [
-    HUnit mtl QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
+  version = "0.1.2";
+  sha256 = "1r8s7z39d31h1n7rcincy156lbsvamr6jicx52kv8simb9gvarpp";
+  testDepends = [ mtl QuickCheck tasty tastyHunit tastyQuickcheck ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-unix-memory";
     description = "Unix memory syscalls";
diff --git a/pkgs/development/libraries/haskell/uri-encode/default.nix b/pkgs/development/libraries/haskell/uri-encode/default.nix
index 7a86bcd2f65..91afed019cb 100644
--- a/pkgs/development/libraries/haskell/uri-encode/default.nix
+++ b/pkgs/development/libraries/haskell/uri-encode/default.nix
@@ -13,5 +13,6 @@ cabal.mkDerivation (self: {
     description = "Unicode aware uri-encoding";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vado/default.nix b/pkgs/development/libraries/haskell/vado/default.nix
index e116dd529cf..fc95d494e36 100644
--- a/pkgs/development/libraries/haskell/vado/default.nix
+++ b/pkgs/development/libraries/haskell/vado/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vado";
-  version = "0.0.1";
-  sha256 = "11b8glzzpzhm8cfw3vyvvvz3h0xid5r3prwhnvplajr7v3r562h2";
+  version = "0.0.2";
+  sha256 = "15kdqgpdy501g4hpldq44s7qgh4xchl6acnr95i5fj8ky4vgwfi0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ attoparsec filepath text ];
@@ -15,7 +15,5 @@ cabal.mkDerivation (self: {
     description = "Runs commands on remote machines using ssh";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/vty/5.2.1.nix b/pkgs/development/libraries/haskell/vty/5.2.3.nix
index 6034807929e..f4685d3e50c 100644
--- a/pkgs/development/libraries/haskell/vty/5.2.1.nix
+++ b/pkgs/development/libraries/haskell/vty/5.2.3.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vty";
-  version = "5.2.1";
-  sha256 = "15xg7yznizscvyjlnivakrzk60l0a0pigax7sgnn2ab79rfzcxww";
+  version = "5.2.3";
+  sha256 = "0afgysliv7bi3x46cj8bcmahfc1lz2niyfmvnzrf9brhxf7l9y76";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -23,12 +23,12 @@ cabal.mkDerivation (self: {
     testFramework testFrameworkHunit testFrameworkSmallcheck text
     utf8String vector
   ];
-  jailbreak = true;
   doCheck = false;
   meta = {
     homepage = "https://github.com/coreyoconnor/vty";
     description = "A simple terminal UI library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wai-util/default.nix b/pkgs/development/libraries/haskell/wai-util/default.nix
new file mode 100644
index 00000000000..fc9b964b26d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/wai-util/default.nix
@@ -0,0 +1,22 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, blazeBuilder, caseInsensitive, conduit, httpAccept
+, httpTypes, mimeMail, network, resourcet, text, transformers, wai
+, waiExtra
+}:
+
+cabal.mkDerivation (self: {
+  pname = "wai-util";
+  version = "0.7";
+  sha256 = "1lmx4f7174hzy4a60r2hq9vm9xhbg8vnb9cyi77zyb5p59s53p73";
+  buildDepends = [
+    aeson blazeBuilder caseInsensitive conduit httpAccept httpTypes
+    mimeMail network resourcet text transformers wai waiExtra
+  ];
+  meta = {
+    homepage = "https://github.com/singpolyma/wai-util";
+    description = "Collection of utility functions for use with WAI";
+    license = "unknown";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/wai-websockets/default.nix b/pkgs/development/libraries/haskell/wai-websockets/default.nix
index a60a6e9dda0..d225b70f0e7 100644
--- a/pkgs/development/libraries/haskell/wai-websockets/default.nix
+++ b/pkgs/development/libraries/haskell/wai-websockets/default.nix
@@ -1,20 +1,20 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, blazeBuilder, caseInsensitive, fileEmbed, httpTypes
-, ioStreams, network, text, transformers, wai, waiAppStatic, warp
-, websockets
+, network, text, transformers, wai, waiAppStatic, warp, websockets
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-websockets";
-  version = "3.0.0.1";
-  sha256 = "01rbwyx2ks6hdaw5qw7dibidyw4bh85s2gzqy4rhmxpdcnmxxmnz";
+  version = "3.0.0.2";
+  sha256 = "1p0ylwc19g63z4qijnis1x5wys5h2avim6s2fn7m2ihrlc3pkhsb";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    blazeBuilder caseInsensitive fileEmbed httpTypes ioStreams network
-    text transformers wai waiAppStatic warp websockets
+    blazeBuilder caseInsensitive fileEmbed httpTypes network text
+    transformers wai waiAppStatic warp websockets
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/yesodweb/wai";
     description = "Provide a bridge betweeen WAI and the websockets package";
diff --git a/pkgs/development/libraries/haskell/webdriver/default.nix b/pkgs/development/libraries/haskell/webdriver/default.nix
index d3a041d9a8d..1f73dda79ed 100644
--- a/pkgs/development/libraries/haskell/webdriver/default.nix
+++ b/pkgs/development/libraries/haskell/webdriver/default.nix
@@ -25,5 +25,6 @@ cabal.mkDerivation (self: {
     description = "a Haskell client for the Selenium WebDriver protocol";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/websockets-snap/default.nix b/pkgs/development/libraries/haskell/websockets-snap/default.nix
index bd68d64b757..72bd7feb781 100644
--- a/pkgs/development/libraries/haskell/websockets-snap/default.nix
+++ b/pkgs/development/libraries/haskell/websockets-snap/default.nix
@@ -1,17 +1,13 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, blazeBuilder, enumerator, ioStreams, mtl, snapCore
-, snapServer, websockets
-}:
+{ cabal, enumerator, mtl, snapCore, snapServer, websockets }:
 
 cabal.mkDerivation (self: {
   pname = "websockets-snap";
-  version = "0.8.2.2";
-  sha256 = "1r5y5czpxrc06i7w3y3fa4dlqmxdypcc8yplg28cv4k3mkfa1hf4";
-  buildDepends = [
-    blazeBuilder enumerator ioStreams mtl snapCore snapServer
-    websockets
-  ];
+  version = "0.9.0.0";
+  sha256 = "051y62xga7drrfllv10giyr49z1z9ql8681dgwynmdad5x6asf85";
+  buildDepends = [ enumerator mtl snapCore snapServer websockets ];
+  jailbreak = true;
   meta = {
     description = "Snap integration for the websockets library";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix
index 5db1ec41613..f4d056f6656 100644
--- a/pkgs/development/libraries/haskell/websockets/default.nix
+++ b/pkgs/development/libraries/haskell/websockets/default.nix
@@ -1,24 +1,25 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, attoparsec, base64Bytestring, binary, blazeBuilder
-, caseInsensitive, entropy, HUnit, ioStreams, mtl, network
-, QuickCheck, random, SHA, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, text
+, caseInsensitive, entropy, HUnit, mtl, network, QuickCheck, random
+, SHA, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
+, text
 }:
 
 cabal.mkDerivation (self: {
   pname = "websockets";
-  version = "0.8.2.6";
-  sha256 = "074d0wkxy2qyi8w9cjgbalqi8b21wf5ak71lcnh94iw76dfxbizf";
+  version = "0.9.0.1";
+  sha256 = "0advbw1z0g53n8az34287fix16a457jv8z6s0g1l8lr4a8b74x0w";
   buildDepends = [
     attoparsec base64Bytestring binary blazeBuilder caseInsensitive
-    entropy ioStreams mtl network random SHA text
+    entropy mtl network random SHA text
   ];
   testDepends = [
     attoparsec base64Bytestring binary blazeBuilder caseInsensitive
-    entropy HUnit ioStreams mtl network QuickCheck random SHA
-    testFramework testFrameworkHunit testFrameworkQuickcheck2 text
+    entropy HUnit mtl network QuickCheck random SHA testFramework
+    testFrameworkHunit testFrameworkQuickcheck2 text
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://jaspervdj.be/websockets";
     description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index 179ce9d3ad7..f15d96df005 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -12,8 +12,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.3.4.4";
-  sha256 = "0h2yk36w0yi303svg7jrlg12s05mbxn4l3pbk558wchgjgy8xaz4";
+  version = "1.3.4.6";
+  sha256 = "17lp99pinq72if527ml4sfqvvjn7kmkcc5jq1l9vsbfgqckmqcff";
   buildDepends = [
     aeson attoparsecConduit authenticate base16Bytestring
     base64Bytestring binary blazeBuilder blazeHtml blazeMarkup byteable
diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix
index 37c7e4e3b37..8a5d21a30aa 100644
--- a/pkgs/development/libraries/haskell/yesod-bin/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix
@@ -12,8 +12,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-bin";
-  version = "1.2.12.8";
-  sha256 = "0fxqwahk23c23l7qrwz3inf8xh8chfn9g8x2h7mn0dsj939l59ws";
+  version = "1.2.13";
+  sha256 = "11378w4r48d41cdigcmrcqzrl70vxxqdwq3j1da6dbmdx7nksxfk";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index f05477ab8f7..e27f751e6b1 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -13,8 +13,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.2.20";
-  sha256 = "1gx0xbyx3mydmiwxypzgmpm5ywrxynqyb1myym0mdaxm6dd1v31k";
+  version = "1.2.20.1";
+  sha256 = "188mfw9ag6287azb633xznwrbsavy5k12ycg2aahrxd84g6xjnan";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
     caseInsensitive cereal clientsession conduit conduitExtra cookie
diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index 80347f5be6e..d2e7b45e57e 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.3.15.4";
-  sha256 = "0a3wrc16jxqan0is3nk015k32bgi9fdglzkxpyaqlig6iaafbpil";
+  version = "1.3.16";
+  sha256 = "0dqmp0df0ahayvg4f4fvn6kwpr3b5d5qfzvk3vwk8bnivk6jrwj5";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable
     dataDefault emailValidate hamlet networkUri persistent resourcet
diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix
index 9cc7a380f66..f344e592962 100644
--- a/pkgs/development/libraries/haskell/yesod-test/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-test/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-test";
-  version = "1.2.5";
-  sha256 = "0qk6qqigrqygczsnfrpg7psfz6gy5rqm9lfbhzaw64n4jklmzw3n";
+  version = "1.2.6";
+  sha256 = "0509kd0qwwd83fnw2zr156l01h4hi4hd9lfkjx7dp8ky6506515f";
   buildDepends = [
     attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive
     cookie hspec htmlConduit httpTypes HUnit monadControl network
diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix
index 95516dadacf..9ae1a5cf88a 100644
--- a/pkgs/development/libraries/hunspell/default.nix
+++ b/pkgs/development/libraries/hunspell/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, readline }:
 
 stdenv.mkDerivation rec {
-  name = "hunspell-1.3.2";
+  name = "hunspell-1.3.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/hunspell/${name}.tar.gz";
-    sha256 = "1gfxdajnqk2civkshkfjx5ldg7kjdgj76m5khpsbjk4lxsjd9vdl";
+    sha256 = "0v14ff9s37vkh45diaddndcrj0hmn67arh8xh8k79q9c1vgc1cm7";
   };
 
   propagatedBuildInputs = [ ncurses readline ];
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
         * Delphi, Java (JNA, JNI), Perl, .NET, Python, Ruby ([1], [2]), UNO.
     '';
     platforms = platforms.all;
-    maintainers = [ maintainers.urkud ];
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }
diff --git a/pkgs/development/libraries/indilib/0_9_9.nix b/pkgs/development/libraries/indilib/0_9_9.nix
new file mode 100644
index 00000000000..f9447b14364
--- /dev/null
+++ b/pkgs/development/libraries/indilib/0_9_9.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, cmake, cfitsio, libusb1, zlib, boost, libnova, libjpeg, gsl, pkgconfig }:
+
+stdenv.mkDerivation {
+  name = "indilib-0.9.9";
+
+  src = fetchurl {
+    url = mirror://sourceforge/indi/libindi_0.9.9.tar.gz;
+    sha256 = "720b9096baef1489fd7d7d4a236177863a7f7cec86809f21d291b0d9758e4039";
+  };
+
+  propagatedBuildInputs = [ cfitsio libusb1 zlib boost libnova libjpeg gsl ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  preConfigure = ''
+    cmakeFlags+=" -DUDEVRULES_INSTALL_DIR=$out/etc/udev/rules.d"
+  '';
+
+  meta = {
+    homepage = http://indi.sf.net;
+  };
+}
diff --git a/pkgs/development/libraries/java/commons/bcel/default.nix b/pkgs/development/libraries/java/commons/bcel/default.nix
new file mode 100644
index 00000000000..0bcd164a525
--- /dev/null
+++ b/pkgs/development/libraries/java/commons/bcel/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  version = "5.2";
+  name    = "commons-bcel-${version}";
+
+  src = fetchurl {
+    url    = "mirror://apache/commons/bcel/binaries/bcel-${version}.tar.gz";
+    sha256 = "13ppnd6afljdjq21jpn4ik2h1yxq8k2kg21ghi0lyb1yap1rd7k6";
+  };
+
+  installPhase = ''
+    tar xf ${src}
+    mkdir -p $out/share/java
+    cp bcel-5.2.jar $out/share/java/
+  '';
+
+  meta = {
+    homepage    = "http://commons.apache.org/proper/commons-bcel/";
+    description = "Gives users a convenient way to analyze, create, and manipulate (binary) Java class files";
+    maintainers = with stdenv.lib.maintainers; [ copumpkin ];
+    license     = stdenv.lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix
new file mode 100644
index 00000000000..2c20d9a9b36
--- /dev/null
+++ b/pkgs/development/libraries/java/commons/compress/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "1.8.1";
+  name    = "commons-compress-${version}";
+
+  src = fetchurl {
+    url    = "mirror://apache/commons/compress/binaries/${name}-bin.tar.gz";
+    sha256 = "11viabgf34r3zx1avj51n00hzmx89kym3i90l6a5v5dbfh61h0lp";
+  };
+
+  installPhase = ''
+    tar xf ${src}
+    mkdir -p $out/share/java
+    cp *.jar $out/share/java/
+  '';
+
+  meta = {
+    homepage    = "http://commons.apache.org/proper/commons-compress";
+    description = "Allows manipulation of ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE and Z files.";
+    maintainers = with stdenv.lib.maintainers; [ copumpkin ];
+    license     = stdenv.lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/development/libraries/java/commons/fileupload/default.nix
new file mode 100644
index 00000000000..ebb8a7d7f9d
--- /dev/null
+++ b/pkgs/development/libraries/java/commons/fileupload/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  version = "1.3.1";
+  name    = "commons-fileupload-${version}";
+
+  src = fetchurl {
+    url    = "mirror://apache/commons/fileupload/binaries/${name}-bin.tar.gz";
+    sha256 = "1jy7w2j2ay56mpq4ij3331cf9zgpkm832ydr63svb35j0ymnky72";
+  };
+  installPhase = ''
+    tar xf ${src}
+    mkdir -p $out/share/java
+    cp lib/*.jar $out/share/java/
+  '';
+
+  meta = {
+    homepage    = "http://commons.apache.org/proper/commons-fileupload";
+    description = "Makes it easy to add robust, high-performance, file upload capability to your servlets and web applications.";
+    maintainers = with stdenv.lib.maintainers; [ copumpkin ];
+    license     = stdenv.lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix
new file mode 100644
index 00000000000..5c80bcadf4b
--- /dev/null
+++ b/pkgs/development/libraries/java/commons/io/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "2.4";
+  name    = "commons-io-${version}";
+
+  src = fetchurl {
+    url    = "mirror://apache/commons/io/binaries/${name}-bin.tar.gz";
+    sha256 = "0m5xmjfr9k2zmbrz425q530jd0lm6368c4wm3jsjlsrqmqjpsvz1";
+  };
+
+  installPhase = ''
+    tar xf ${src}
+    mkdir -p $out/share/java
+    cp *.jar $out/share/java/
+  '';
+
+  meta = {
+    homepage    = "http://commons.apache.org/proper/commons-io";
+    description = "A library of utilities to assist with developing IO functionality";
+    maintainers = with stdenv.lib.maintainers; [ copumpkin ];
+    license     = stdenv.lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/pkgs/development/libraries/java/commons/lang/default.nix
new file mode 100644
index 00000000000..82806871a62
--- /dev/null
+++ b/pkgs/development/libraries/java/commons/lang/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "3.3.2";
+  name    = "commons-lang-${version}";
+
+  src = fetchurl {
+    url    = "mirror://apache/commons/lang/binaries/commons-lang3-${version}-bin.tar.gz";
+    sha256 = "1fmcx52h4cd2b7bplm7wy3725vh8bix64j3ykkxcn357y4j8ddzr";
+  };
+
+  installPhase = ''
+    tar xf ${src}
+    mkdir -p $out/share/java
+    cp *.jar $out/share/java/
+  '';
+
+  meta = {
+    homepage    = "http://commons.apache.org/proper/commons-lang";
+    description = "Provides additional methods to manipulate standard Java library classes";
+    maintainers = with stdenv.lib.maintainers; [ copumpkin ];
+    license     = stdenv.lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/development/libraries/java/commons/math/default.nix b/pkgs/development/libraries/java/commons/math/default.nix
new file mode 100644
index 00000000000..ed04e2f410b
--- /dev/null
+++ b/pkgs/development/libraries/java/commons/math/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "3.3";
+  name    = "commons-math-${version}";
+
+  src = fetchurl {
+    url    = "mirror://apache/commons/math/binaries/commons-math3-${version}-bin.tar.gz";
+    sha256 = "1xs71c4vbai6zr84982g4ggv6c18dhkilkzw9n1irjqnjbgm5kzc";
+  };
+
+  installPhase = ''
+    tar xf ${src}
+    mkdir -p $out/share/java
+    cp *.jar $out/share/java/
+  '';
+
+  meta = {
+    homepage    = "http://commons.apache.org/proper/commons-math/";
+    description = "A library of lightweight, self-contained mathematics and statistics components";
+    maintainers = with stdenv.lib.maintainers; [ copumpkin ];
+    license     = stdenv.lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/development/libraries/java/jakarta-bcel/builder.sh b/pkgs/development/libraries/java/jakarta-bcel/builder.sh
deleted file mode 100755
index 9ead7cfebde..00000000000
--- a/pkgs/development/libraries/java/jakarta-bcel/builder.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-source $stdenv/setup
-
-tar zxvf $src
-cd bcel-5.1
-mkdir -p $out/share/java/
-cp bcel-5.1.jar $out/share/java/
diff --git a/pkgs/development/libraries/java/jakarta-bcel/default.nix b/pkgs/development/libraries/java/jakarta-bcel/default.nix
deleted file mode 100644
index 1ff88a36247..00000000000
--- a/pkgs/development/libraries/java/jakarta-bcel/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, regexp}:
-
-stdenv.mkDerivation {
-  name = "jakarta-bcel-5.1";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://tarballs.nixos.org/bcel-5.1.tar.gz;
-    md5 = "318f22e4f5f59b68cd004db83a7d65dc";
-  };
-
-  inherit regexp;
-  buildInputs = [stdenv];
-}
diff --git a/pkgs/development/libraries/java/jakarta-commons/file-upload/builder.sh b/pkgs/development/libraries/java/jakarta-commons/file-upload/builder.sh
deleted file mode 100755
index d95feb5eeb4..00000000000
--- a/pkgs/development/libraries/java/jakarta-commons/file-upload/builder.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-set -e
-source $stdenv/setup
-
-tar zxvf $src
-mkdir -p $out
-mv $name/* $out
diff --git a/pkgs/development/libraries/java/jakarta-commons/file-upload/default.nix b/pkgs/development/libraries/java/jakarta-commons/file-upload/default.nix
deleted file mode 100644
index a609532f282..00000000000
--- a/pkgs/development/libraries/java/jakarta-commons/file-upload/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{stdenv, fetchurl} :
-
-stdenv.mkDerivation {
-  name = "commons-fileupload-1.0";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://archive.apache.org/dist/jakarta/commons/fileupload/binaries/commons-fileupload-1.0.tar.gz;
-    md5 = "5618b26b1a5c006d7236fb4465e907b6";
-  };
-}
\ No newline at end of file
diff --git a/pkgs/development/libraries/java/jakarta-regexp/default.nix b/pkgs/development/libraries/java/jakarta-regexp/default.nix
deleted file mode 100644
index 55c3beff70a..00000000000
--- a/pkgs/development/libraries/java/jakarta-regexp/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, fetchurl}:
-
-# I want some provides mechanism for jar files. These
-# jars can then be added to the CLASSPATH by a dependent package.
-
-stdenv.mkDerivation {
-  name = "jakarta-regexp-1.4";
-  builder = ./java-bin-builder.sh;
-
-  src = fetchurl {
-    url = http://tarballs.nixos.org/jakarta-regexp-1.4.tar.gz;
-    md5 = "d903d84c949df848009f3bf205b32c97";
-  };
-
-  jars = ["jakarta-regexp-1.4.jar"];
-
-  buildInputs = [stdenv];
-}
diff --git a/pkgs/development/libraries/java/jakarta-regexp/java-bin-builder.sh b/pkgs/development/libraries/java/jakarta-regexp/java-bin-builder.sh
deleted file mode 100755
index c26173ab457..00000000000
--- a/pkgs/development/libraries/java/jakarta-regexp/java-bin-builder.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-source $stdenv/setup
-
-tar zxvf $src
-cd jakarta-regexp-1.4
-mkdir -p $out/share/java/
-cp jakarta-regexp-1.4.jar $out/share/java/
diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix
index 6f874450fc5..49598cfae68 100644
--- a/pkgs/development/libraries/kdevplatform/default.nix
+++ b/pkgs/development/libraries/kdevplatform/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, perl, phonon,
+{ stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, phonon,
   gettext, pkgconfig, apr, aprutil, boost, qjson, grantlee }:
 
 stdenv.mkDerivation rec {
-  name = "kdevplatform-1.6.0";
+  name = "kdevplatform-1.7.0";
 
   src = fetchurl {
-    url = "mirror://kde/stable/kdevelop/4.6.0/src/${name}.tar.xz";
-    sha256 = "cdf7c88ca8860258f46e41d2107c826a307212fd041345bee54fbd70c9794f80";
+    url = "mirror://kde/stable/kdevelop/4.7.0/src/${name}.tar.xz";
+    sha256 = "bfd765019511c5c9abc19bc412c75d7abd468f1a077ce4bc471cd6704b9f53f7";
   };
 
   propagatedBuildInputs = [ kdelibs qt4 phonon ];
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index eeb09a68afb..e1b4798dc0c 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "krb5";
-  version = "1.11.3";
+  version = "1.12.2";
   name = "${pname}-${version}";
   webpage = http://web.mit.edu/kerberos/;
 in
@@ -11,8 +11,8 @@ stdenv.mkDerivation (rec {
   inherit name;
 
   src = fetchurl {
-    url = "${webpage}/dist/krb5/1.11/${name}-signed.tar";
-    sha256 = "1daiaxgkxcryqs37w28v4x1vajqmay4l144d1zd9c2d7jjxr9gcs";
+    url = "${webpage}dist/krb5/1.12/${name}-signed.tar";
+    sha256 = "0i1p9xx5s9q0sqnnz7f3rba07882zciw0mwc6yvv7hmm0w0iig89";
   };
 
   buildInputs = [ perl ncurses yacc ];
diff --git a/pkgs/development/libraries/lesstif/c-bad_integer_cast.patch b/pkgs/development/libraries/lesstif/c-bad_integer_cast.patch
deleted file mode 100644
index 620d702f0f0..00000000000
--- a/pkgs/development/libraries/lesstif/c-bad_integer_cast.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- lesstif2-0.94.4.orig/include/Motif-2.1/XmI/XpmI.h
-+++ lesstif2-0.94.4/include/Motif-2.1/XmI/XpmI.h
-@@ -217,8 +217,8 @@
- FUNC(xpmHashSlot, xpmHashAtom *, (xpmHashTable *table, char *s));
- FUNC(xpmHashIntern, int, (xpmHashTable *table, char *tag, void *data));
- 
--#define HashAtomData(i) ((void *)i)
--#define HashColorIndex(slot) ((unsigned int)((*slot)->data))
-+#define HashAtomData(i) ((void *)(uintptr_t)i)
-+#define HashColorIndex(slot) ((uintptr_t)((*slot)->data))
- #define USE_HASHTABLE (cpp > 2 && ncolors > 4)
- 
- /* I/O utility */
diff --git a/pkgs/development/libraries/lesstif/c-linkage.patch b/pkgs/development/libraries/lesstif/c-linkage.patch
deleted file mode 100644
index 343d9f789b8..00000000000
--- a/pkgs/development/libraries/lesstif/c-linkage.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/include/Motif-2.1/Xm/VendorSP.h  2006-07-07 15:58:04.000000000 +0200
-+++ b/include/Motif-2.1/Xm/VendorSP.h  2006-07-07 15:58:19.000000000 +0200
-@@ -30,10 +30,6 @@
- #include <Xm/VendorS.h>
- #include <X11/ShellP.h>
- 
--#ifdef __cplusplus
--extern "C" {
--#endif
--
- XMLIBEXPORT extern Cardinal _XmFilterResources(XtResource *resources,
-                                   Cardinal numResources,
-                                   WidgetClass filterClass,
-@@ -57,9 +53,4 @@
- 
- XMLIBEXPORT extern VendorShellClassRec  vendorShellClassRec;
- 
--
--#ifdef __cplusplus
--}
--#endif
--
- #endif /* _XM_VENDORSP_H */
diff --git a/pkgs/development/libraries/lesstif/c-unsigned_int.patch b/pkgs/development/libraries/lesstif/c-unsigned_int.patch
deleted file mode 100644
index a682d9704c3..00000000000
--- a/pkgs/development/libraries/lesstif/c-unsigned_int.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- lesstif2-0.94.4.orig/lib/Xm-2.1/Xpmcreate.c
-+++ lesstif2-0.94.4/lib/Xm-2.1/Xpmcreate.c
-@@ -1265,10 +1265,10 @@
-     register char *src;
-     register char *dst;
-     register unsigned int *iptr;
--    register unsigned int x, y, i;
-+    register unsigned int x, y;
-     register char *data;
-     Pixel pixel, px;
--    int nbytes, depth, ibu, ibpp;
-+    int nbytes, depth, ibu, ibpp, i;
- 
-     data = image->data;
-     iptr = pixelindex;
---- lesstif2-0.94.4.orig/lib/Xm-2.1/Xpmscan.c
-+++ lesstif2-0.94.4/lib/Xm-2.1/Xpmscan.c
-@@ -672,8 +672,8 @@
-     char *dst;
-     unsigned int *iptr;
-     char *data;
--    unsigned int x, y, i;
--    int bits, depth, ibu, ibpp, offset;
-+    unsigned int x, y;
-+    int bits, depth, ibu, ibpp, offset, i;
-     unsigned long lbt;
-     Pixel pixel, px;
- 
-@@ -684,6 +684,9 @@
-     ibpp = image->bits_per_pixel;
-     offset = image->xoffset;
- 
-+    if (image->bitmap_unit < 0)
-+	    return (XpmNoMemory);
-+
-     if ((image->bits_per_pixel | image->depth) == 1) {
- 	ibu = image->bitmap_unit;
- 	for (y = 0; y < height; y++)
diff --git a/pkgs/development/libraries/lesstif/c-xim_chained_list_crash.patch b/pkgs/development/libraries/lesstif/c-xim_chained_list_crash.patch
deleted file mode 100644
index 10bdf8d0b97..00000000000
--- a/pkgs/development/libraries/lesstif/c-xim_chained_list_crash.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru lesstif2-0.94.4-old/lib/Xm-2.1/XmIm.c lesstif2-0.94.4/lib/Xm-2.1/XmIm.c
---- lesstif2-0.94.4-old/lib/Xm-2.1/XmIm.c	2004-10-20 21:32:11.000000000 +0200
-+++ lesstif2-0.94.4/lib/Xm-2.1/XmIm.c	2007-03-28 14:39:27.000000000 +0200
-@@ -133,7 +133,10 @@
- 		p->next = q->next;
- 	}
- 
--	XtFree((char *)stuff);
-+	/* if count!=0 then someone uses the stuff as orig_xim
-+	   so unlink it but not free it */
-+	if (!stuff->count)
-+		XtFree((char *)stuff);
- }
- 
- /*
-@@ -1060,6 +1063,8 @@
- 		   XCloseIM(stuff->xim);
- 		DEBUGOUT(_LtDebug(__FILE__, w, "XCloseIM(%p)\n", stuff->xim));
- 		stuff->orig_xim->xim = NULL;
-+		/* stuff->orig_xim is now useless */
-+		XtFree(stuff->orig_xim);
- 	} else {
- 		DEBUGOUT(_LtDebug(__FILE__, w, "XmImCloseXIM(%p), count -> %d\n",
- 			stuff->xim, stuff->orig_xim->count));
diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix
index 8d01c2f2f43..f5c959bba7a 100644
--- a/pkgs/development/libraries/lesstif/default.nix
+++ b/pkgs/development/libraries/lesstif/default.nix
@@ -3,8 +3,8 @@
 stdenv.mkDerivation {
   name = "lesstif-0.95.0-p2";
   src = fetchurl {
-    url = mirror://sourceforge/lesstif/lesstif-0.95.0.tar.bz2;
-    md5 = "ab895165c149d7f95843c7584b1c7ad4";
+    url = mirror://sourceforge/lesstif/lesstif-0.95.2.tar.bz2;
+    sha256 = "1qzpxjjf7ri1jzv71mvq5m9g8hfaj5yzwp30rwxlm6n2b24a6jpb";
   };
   buildInputs = [xlibsWrapper];
   propagatedBuildInputs = [libXp libXau];
@@ -15,11 +15,7 @@ stdenv.mkDerivation {
   # in Debian, so we assume they have been sent upstream.
   #
   patches = [
-    ./c-bad_integer_cast.patch    
-    ./c-linkage.patch             
-    ./c-unsigned_int.patch
     ./c-missing_xm_h.patch        
-    ./c-xim_chained_list_crash.patch
     ./c-render_table_crash.patch 
     ./c-xpmpipethrough.patch
     ];
diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix
new file mode 100644
index 00000000000..c67b3701ec9
--- /dev/null
+++ b/pkgs/development/libraries/libLAS/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip }:
+
+stdenv.mkDerivation rec {
+  name = "libLAS-1.8.0";
+
+  src = fetchurl {
+
+    url = "http://download.osgeo.org/liblas/${name}.tar.bz2";
+    md5 = "599881281d45db4ce9adb2d75458391e";
+  };
+
+  buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip];
+
+
+  meta = {
+    description = "LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset";
+    homepage = http://www.liblas.org;
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.michelk ];
+  };
+}
diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index f0eea80e89d..34352484738 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -1,37 +1,47 @@
-{stdenv, fetchgit, autoconf, automake, libtool, libaacs ? null, jdk ? null, ant ? null, withAACS ? false}:
+{ stdenv, fetchurl, pkgconfig
+, withAACS ? false, libaacs ? null, jdk ? null, ant ? null
+, withMetadata ? true, libxml2 ? null
+, withFonts ? true, freetype ? null
+}:
 
 assert withAACS -> jdk != null && ant != null && libaacs != null;
+assert withMetadata -> libxml2 != null;
+assert withFonts -> freetype != null;
 
 # Info on how to use:
 # https://wiki.archlinux.org/index.php/BluRay
 
-let baseName = "libbluray";
-    version  = "0.2.1";
+stdenv.mkDerivation rec {
+  baseName = "libbluray";
+  version  = "0.6.0";
+  name = "${baseName}-${version}";
 
-in
-
-stdenv.mkDerivation {
-  name = "${baseName}-${version}p1";
-
-  src = fetchgit {
-    url = git://git.videolan.org/libbluray.git;
-    rev = "3b9a9f044644a6abe9cb09377f714ded9fdd6c87";
-    sha256 = "551b623e76c2dba44b5490fb42ccdc491b28cd42841de28237b8edbed0f0711c";
+  src = fetchurl {
+    url = "ftp://ftp.videolan.org/pub/videolan/${baseName}/${version}/${name}.tar.bz2";
+    sha256 = "0zsk16p7rxwbyizm87i7x2fcy3gwjfnlfd2gi2n17fv6gajvsyv2";
   };
 
-  nativeBuildInputs = [autoconf automake libtool];
-  buildInputs = stdenv.lib.optionals withAACS [jdk ant libaacs];
-  NIX_LDFLAGS = stdenv.lib.optionalString withAACS "-laacs";
+  nativeBuildInputs = with stdenv.lib;
+                      [pkgconfig]
+                      ++ optional withAACS ant
+                      ;
 
-  preConfigure = "./bootstrap";
-  configureFlags = ["--disable-static"] ++ stdenv.lib.optionals withAACS ["--enable-bdjava" "--with-jdk=${jdk}"];
+  buildInputs =  with stdenv.lib;
+                 optionals withAACS [jdk libaacs]
+              ++ optional withMetadata libxml2
+              ++ optional withFonts freetype
+              ;
 
-  # From Handbrake
-  patches = [ ./A01-filter-dup.patch ];
+  configureFlags =  with stdenv.lib;
+                    optionals withAACS ["--enable-bdjava" "--with-jdk=${jdk}"]
+                 ++ optional (! withMetadata) "--without-libxml2"
+                 ++ optional (! withFonts) "--without-freetype"
+                 ;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.videolan.org/developers/libbluray.html;
     description = "Library to access Blu-Ray disks for video playback";
-    license = stdenv.lib.licenses.lgpl21;
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.abbradar ];
   };
 }
diff --git a/pkgs/development/libraries/libchamplain/0.6.nix b/pkgs/development/libraries/libchamplain/0.6.nix
deleted file mode 100644
index a2b35a72651..00000000000
--- a/pkgs/development/libraries/libchamplain/0.6.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, glib, gtk, cairo, clutter, sqlite
-, clutter_gtk_0_10, libsoup /*, libmenphis */ }:
-
-stdenv.mkDerivation rec {
-  name = "libchamplain-0.6.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libchamplain/0.6/${name}.tar.gz";
-    sha256 = "1l1in4khnral157j46aq2d26nviz23icnm353587vcwjhdbw86sg";
-  };
-
-  buildInputs = [ pkgconfig ];
-
-  # These all appear in `champlain{,-gtk}-0.6.pc'.
-  propagatedBuildInputs =
-    [ glib gtk cairo clutter clutter_gtk_0_10 sqlite libsoup ];
-
-  configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
-
-  meta = {
-    homepage = http://projects.gnome.org/libchamplain/;
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    description = "libchamplain, a C library providing a ClutterActor to display maps";
-
-    longDescription =
-      '' libchamplain is a C library providing a ClutterActor to display
-         maps.  It also provides a Gtk+ widget to display maps in Gtk+
-         applications.  Python and Perl bindings are also available.  It
-         supports numerous free map sources such as OpenStreetMap,
-         OpenCycleMap, OpenAerialMap, and Maps for free.
-      '';
-
-     maintainers = [ ];
-     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-  };
-}
diff --git a/pkgs/development/libraries/libchardet/default.nix b/pkgs/development/libraries/libchardet/default.nix
new file mode 100644
index 00000000000..f7834c56b63
--- /dev/null
+++ b/pkgs/development/libraries/libchardet/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation rec {
+  name = "libchardet-1.0.4";
+  
+  src = fetchurl {
+    url = "ftp://ftp.oops.org/pub/oops/libchardet/${name}.tar.bz2";
+    sha256 = "0cvwba4la25qw70ap8jd5r743a9jshqd26nnbh5ph68zj1imlgzl";
+  };
+
+  nativeBuildInputs = [ perl ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Mozilla's Universal Charset Detector C/C++ API";
+    homepage = ftp://ftp.oops.org/pub/oops/libchardet/index.html;
+    license = licenses.mpl11;
+    maintainers = [ maintainers.abbradar ];
+  };
+}
diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix
index 659f22b9b3b..f913ab8e493 100644
--- a/pkgs/development/libraries/libedit/default.nix
+++ b/pkgs/development/libraries/libedit/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, groff }:
 
 stdenv.mkDerivation rec {
-  name = "libedit-20130712-3.1";
+  name = "libedit-20140620-3.1";
 
   src = fetchurl {
     url = "http://www.thrysoee.dk/editline/${name}.tar.gz";
-    sha256 = "0dwav34041sariyl00nr106xmn123bnxir4qpn5y47vgssfim6sx";
+    sha256 = "1wnapwcpl4yq8p95j898jl0hsr39if28qzm5a7zwkbplihm9nax2";
   };
 
   # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
@@ -15,10 +15,7 @@ stdenv.mkDerivation rec {
     sed -i ${stdenv.lib.optionalString (stdenv.isDarwin && stdenv.gcc.nativeTools) "''"} s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc
   '';
 
-  # taken from gentoo http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/libedit/files/
-  patches = [ ./freebsd.patch ./freebsd_weak_ref.patch ];
-
-  configureFlags = "--enable-widec";
+  configureFlags = [ "--enable-widec" ];
 
   propagatedBuildInputs = [ ncurses ];
 
diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix
index 7a005c9fda2..9f42a1c8c3e 100644
--- a/pkgs/development/libraries/libfm/default.nix
+++ b/pkgs/development/libraries/libfm/default.nix
@@ -1,13 +1,19 @@
-{ stdenv, fetchurl, glib, gtk, intltool, menu-cache, pango, pkgconfig, vala }:
-
+{ stdenv, fetchurl, glib, gtk, intltool, menu-cache, pango, pkgconfig, vala
+, extraOnly ? false }:
+let name = "libfm-1.2.2.1";
+    inherit (stdenv.lib) optional;
+in
 stdenv.mkDerivation {
-  name = "libfm-1.2.0";
+  name = if extraOnly then "libfm-extra-1.2.2.1" else "libfm-1.2.2.1";
   src = fetchurl {
-    url = "mirror://sourceforge/pcmanfm/libfm-1.2.0.tar.xz";
-    sha256 = "08pwdrmfm9rl41lj2niyjqq2bdvydxk7v2shjxh5gk1xwj238lgh";
+    url = "mirror://sourceforge/pcmanfm/libfm-1.2.2.1.tar.xz";
+    sha256 = "0aa37arr0h2nppjh7ppf00np2d8mb43imvfq9b7wq5cnzpvs7c6v";
   };
 
-  buildInputs = [ glib gtk intltool menu-cache pango pkgconfig vala ];
+  buildInputs = [ glib gtk intltool pango pkgconfig vala ]
+                ++ optional (!extraOnly) menu-cache;
+
+  configureFlags = optional extraOnly "--with-extra-only";
 
   meta = with stdenv.lib; {
     homepage = "http://blog.lxde.org/?cat=28/";
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index fb5cace4b49..4cfeff00dc5 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, bash, gettext }:
 
 stdenv.mkDerivation (rec {
-  name = "libgpg-error-1.12";
+  name = "libgpg-error-1.16";
 
   src = fetchurl {
     url = "mirror://gnupg/libgpg-error/${name}.tar.bz2";
-    sha256 = "0pz58vr12qihq2f0bypjxsb6cf6ajq5258fmfm8s6lvwm3b9xz6a";
+    sha256 = "16xv59zcr177gvgj97vg0rm4rixrpb4lz1q9fji3xay47i83gm62";
   };
 
   # If architecture-dependent MO files aren't available, they're generated
@@ -17,7 +17,8 @@ stdenv.mkDerivation (rec {
   patches = [ ./no-build-timestamp.patch ];
 
   meta = {
-    description = "Libgpg-error, a small library that defines common error values for all GnuPG components";
+    homepage = "https://www.gnupg.org/related_software/libgpg-error/index.html";
+    description = "A small library that defines common error values for all GnuPG components";
 
     longDescription = ''
       Libgpg-error is a small library that defines common error values
@@ -26,10 +27,9 @@ stdenv.mkDerivation (rec {
       Daemon and possibly more in the future.
     '';
 
-    homepage = http://gnupg.org;
-
     license = stdenv.lib.licenses.lgpl2Plus;
     platforms = stdenv.lib.platforms.all;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }
 
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index dc041490f78..d739b094874 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "1w2bfy6619fgrigasgmx3lnill8c99lq7blmy2bpp0qqqqwdb93d";
+    sha256 = "0ij80nixichihv3iic7cgdq3irssk8waz1c25m6yypjl4kg6n3k0";
   };
   
   nativeBuildInputs = [ pkgconfig gettext ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       MTP, and other vendor specific protocols for controlling and transferring data
       from digital cameras. 
     '';
-    version = "2.5.5";
+    version = "2.5.5.1";
     # XXX: the homepage claims LGPL, but several src files are lgpl21Plus
     license = stdenv.lib.licenses.lgpl21Plus; 
     platforms = with stdenv.lib.platforms; unix;
diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix
index db1aa4a7473..11b3bf4f6d5 100644
--- a/pkgs/development/libraries/libharu/default.nix
+++ b/pkgs/development/libraries/libharu/default.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation {
         name = "linpng15.patch";
 
         src = fetchurl {
-          url = https://github.com/tony2001/libharu/commit/e5bf8b01f6c3d5e3fe0e26ac5345e0da10c03934.diff;
-          sha256 = "1993vskpycyr43rwdp8f688fc5zvllrqq935r7rhsgbqbipkk73h";
+          url = https://github.com/libharu/libharu/commit/e5bf8b01f6c3d5e3fe0e26ac5345e0da10c03934.diff;
+          sha256 = "07k2x5d4pvpf8a5hvfb9pj0dpjgcvv8sdvxwx3wzbwqsf9swwrxb";
         };
 
         nativeBuildInputs = [ patchutils ];
@@ -26,9 +26,9 @@ stdenv.mkDerivation {
         buildCommand = "filterdiff -x '*/CHANGES' $src > $out";
       })
       (fetchurl {
-        url = https://github.com/tony2001/libharu/commit/b472b64ab44d834eb29d237f31bf12396fee9aca.diff;
+        url = https://github.com/libharu/libharu/commit/b472b64ab44d834eb29d237f31bf12396fee9aca.diff;
         name = "endless-loop.patch";
-        sha256 = "1c95mn6a5wddznqgrsaf3xsh27lz8q0pzc0a7ampxpscq0w6c9fq";
+        sha256 = "1jrajz6zdch2pyzjkhmhm1b6ms8dk62snps7fwphnpvndrm4h4rr";
       })
     ];
 
diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix
index c2008700804..7ecac071ce4 100644
--- a/pkgs/development/libraries/libmpeg2/default.nix
+++ b/pkgs/development/libraries/libmpeg2/default.nix
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
     homepage = http://libmpeg2.sourceforge.net/;
     description = "A free library for decoding mpeg-2 and mpeg-1 video streams";
     license = stdenv.lib.licenses.gpl2;
-    maintainer = with stdenv.lib.maintainers; [ fuuzetsu ];
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }
diff --git a/pkgs/development/libraries/libmsgpack/CMakeLists.patch b/pkgs/development/libraries/libmsgpack/CMakeLists.patch
new file mode 100644
index 00000000000..657c30d5fe9
--- /dev/null
+++ b/pkgs/development/libraries/libmsgpack/CMakeLists.patch
@@ -0,0 +1,12 @@
+diff -r 791a4edd7e1d CMakeLists.txt
+--- a/CMakeLists.txt	Sun Oct 05 13:14:14 2014 +0100
++++ b/CMakeLists.txt	Sun Oct 05 13:20:12 2014 +0100
+@@ -158,7 +158,7 @@
+ INSTALL (TARGETS msgpack msgpack-static DESTINATION lib)
+ INSTALL (DIRECTORY src/msgpack DESTINATION include)
+ INSTALL (FILES src/msgpack.h src/msgpack.hpp DESTINATION include)
+-INSTALL (FILES msgpack.pc DESTINATION lib/pkgconfig)
++INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION lib/pkgconfig)
+ 
+ # Doxygen
+ FIND_PACKAGE (Doxygen)
diff --git a/pkgs/development/libraries/libmsgpack/default.nix b/pkgs/development/libraries/libmsgpack/default.nix
index ab9dbd48ea4..d9f4bfcc750 100644
--- a/pkgs/development/libraries/libmsgpack/default.nix
+++ b/pkgs/development/libraries/libmsgpack/default.nix
@@ -1,25 +1,16 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, ruby, scatterOutputHook }:
+{ stdenv, fetchurl, cmake}:
 
 stdenv.mkDerivation rec {
-  version = "0.5.8";
+  version = "0.5.9";
   name = "libmsgpack-${version}";
 
   src = fetchurl {
     url = "https://github.com/msgpack/msgpack-c/archive/cpp-${version}.tar.gz";
-    sha256 = "1h6k9kdbfavmw3by5kk3raszwa64hn9k8yw9rdhvl5m8g2lks89k";
+    sha256 = "0xy204srq5grng7p17hwdxpfzbsfrn89gi4c3k62a23p4f9z0szq";
   };
 
-  nativeBuildInputs = [ scatterOutputHook ];
-  buildInputs = [ autoconf automake libtool ruby ];
-
-  outputs = [ "out" "bin" ];
-
-  preConfigure = ''
-    sed -i s,glibtoolize,libtoolize, ./bootstrap
-    ./bootstrap
-  '';
-
-  enableParallelBuilding = true;
+  buildInputs = [ cmake ];
+  patches = [ ./CMakeLists.patch ];
 
   meta = with stdenv.lib; {
     description = "MessagePack implementation for C and C++";
diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix
index 492538f1802..57b8b2fc66e 100644
--- a/pkgs/development/libraries/libogg/default.nix
+++ b/pkgs/development/libraries/libogg/default.nix
@@ -1,11 +1,8 @@
 { stdenv, fetchurl }:
 
-let
+stdenv.mkDerivation rec {
   name = "libogg-1.3.2";
-in
-stdenv.mkDerivation {
-  inherit name;
-  
+
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/ogg/${name}.tar.xz";
     sha256 = "16z74q422jmprhyvy7c9x909li8cqzmvzyr8cgbm52xcsp6pqs1z";
diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix
index ff04c7181df..fae6f9ba556 100644
--- a/pkgs/development/libraries/libpng/12.nix
+++ b/pkgs/development/libraries/libpng/12.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The official reference implementation for the PNG file format";
     homepage = http://www.libpng.org/pub/png/libpng.html;
-    license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
+    license = stdenv.lib.licenses.libpng;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+    branch = "1.2";
   };
 }
diff --git a/pkgs/development/libraries/libpng/15.nix b/pkgs/development/libraries/libpng/15.nix
index 15351798633..177c534ffaf 100644
--- a/pkgs/development/libraries/libpng/15.nix
+++ b/pkgs/development/libraries/libpng/15.nix
@@ -3,11 +3,11 @@
 assert zlib != null;
 
 stdenv.mkDerivation rec {
-  name = "libpng-1.5.18";
+  name = "libpng-1.5.19";
 
   src = fetchurl {
     url = "mirror://sourceforge/libpng/${name}.tar.xz";
-    sha256 = "119m71p60iq3yn2n8ckl4j4cxvbpddj6sgdpa6g05jzyg7vw54y0";
+    sha256 = "1s990cdsdlbb78aq4sj2vq2849p2nbbbnbk5p8f9w45rn0v5q98y";
   };
 
   propagatedBuildInputs = [ zlib ];
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The official reference implementation for the PNG file format";
     homepage = http://www.libpng.org/pub/png/libpng.html;
-    license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
+    license = stdenv.lib.licenses.libpng;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+    branch = "1.5";
   };
 }
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 3f8622535db..06fff495f54 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -30,8 +30,8 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch";
     homepage = http://www.libpng.org/pub/png/libpng.html;
-    license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
+    license = licenses.libpng;
     platforms = platforms.all;
-    maintainers = [ maintainers.vcunat ];
+    maintainers = [ maintainers.vcunat maintainers.fuuzetsu ];
   };
 }
diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index 754893894b6..dcef77d5919 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libsodium-0.4.5";
+  name = "libsodium-0.7.0";
 
   src = fetchurl {
     url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz";
-    sha256 = "0cmcw479p866r6cjh20wzjr84pdn0mfswr5h57mw1siyylnj1mbs";
+    sha256 = "0s4iis5h7yh27kamwic3rddyp5ra941bcqcawa37grjvl78zzjjc";
   };
 
   NIX_LDFLAGS = "-lssp";
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 0745313b41e..becca407ce9 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "1a3yxwjs4qb0rwx6cfpvar0a8jmavb6ik580b27md08jhvq80if7";
   };
 
-  buildInputs = [ boost pkgconfig openssl zlib python libiconvOrNull geoip ];
+  buildInputs = [ boost boost.lib pkgconfig openssl zlib python libiconvOrNull geoip ];
 
   configureFlags = [ 
     "--with-boost=${boost}/include/boost" 
-    "--with-boost-libdir=${boost}/lib" 
+    "--with-boost-libdir=${boost.lib}/lib" 
     "--enable-python-binding"
     "--with-libgeoip=system"
     "--with-libiconv=yes"
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index c562467802f..f6bdbdb3c75 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -2,8 +2,8 @@
 , libvpx, check, libconfig, pkgconfig }:
 
 let
-  version = "f83fcbb13c0";
-  date = "20140811";
+  version = "900d72f951";
+  date = "20140921";
 in
 stdenv.mkDerivation rec {
   name = "tox-core-${date}-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "https://github.com/irungentoo/toxcore/tarball/${version}";
     name = "${name}.tar.gz";
-    sha256 = "09g74h3qnx9adyxxvzay8m2idbgbln7m4kkm7sg9925mvi5abb1w";
+    sha256 = "1fwgflizb21mp4jwkfac7mgmahlly1f3ldbma6h8h6a2qf3pkn2r";
   };
 
   NIX_LDFLAGS = "-lgcc_s";
@@ -36,11 +36,15 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    autoconf libtool automake libsodium ncurses libopus
-    libvpx check libconfig pkgconfig
+    autoconf libtool automake libsodium ncurses
+    libconfig pkgconfig
+  ] ++ stdenv.lib.optionals (!stdenv.isArm) [
+    libopus
   ];
 
-  doCheck = false;  # certian tests fail, upstream advice is to wait
+  propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isArm) [ libvpx ];
+
+  doCheck = !stdenv.isArm;
 
   meta = {
     description = "P2P FOSS instant messaging application aimed to replace Skype with crypto";
diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index 0dd99605b33..80381743100 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -1,11 +1,8 @@
 { stdenv, fetchurl, libogg, pkgconfig }:
 
-let
+stdenv.mkDerivation rec {
   name = "libvorbis-1.3.4";
-in
-stdenv.mkDerivation {
-  inherit name;
-  
+
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz";
     sha256 = "0wpk87jnhngcl3nc5i39flkycx1sjzilx8jjx4zc4p8r55ylj19g";
diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix
index 6800541d923..2346e4b7501 100644
--- a/pkgs/development/libraries/libwebp/default.nix
+++ b/pkgs/development/libraries/libwebp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpng, libjpeg, giflib, libtiff }:
 
 stdenv.mkDerivation rec {
-  name = "libwebp-0.4.0";
+  name = "libwebp-0.4.1";
 
   src = fetchurl {
-    url = "http://webp.googlecode.com/files/${name}.tar.gz";
-    sha256 = "0sadjkx8m6sf064r5gngjvz4b5246q3j27dlaml5b1k3x5vkb49i";
+    url = "http://downloads.webmproject.org/releases/webp/${name}.tar.gz";
+    sha256 = "09yhfhb90hlhr0vq8ajnpk9rxvmb1bkiywcqm7xahl35yvk4ddh0";
   };
 
   buildInputs = [ libpng libjpeg giflib libtiff ];
diff --git a/pkgs/development/libraries/libyaml-cpp/0.3.x.nix b/pkgs/development/libraries/libyaml-cpp/0.3.x.nix
deleted file mode 100644
index f94ca128228..00000000000
--- a/pkgs/development/libraries/libyaml-cpp/0.3.x.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, fetchurl, cmake, boostHeaders}:
-
-stdenv.mkDerivation {
-  name = "libyaml-cpp-0.3.0";
-
-  src = fetchurl {
-    url = http://yaml-cpp.googlecode.com/files/yaml-cpp-0.3.0.tar.gz;
-    sha256 = "10kv25zgq96ybxc6c19lzpax1xi5lpxrdqa9x52nffsql6skil1c";
-  };
-
-  buildInputs = [ cmake boostHeaders ];
-
-  meta = {
-    homepage = http://code.google.com/p/yaml-cpp/;
-    description = "A YAML parser and emitter for C++";
-    license = stdenv.lib.licenses.mit;
-  };
-}
diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix
index fb81dc425f1..1ba31a7a6d5 100644
--- a/pkgs/development/libraries/libyaml-cpp/default.nix
+++ b/pkgs/development/libraries/libyaml-cpp/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, boostHeaders}:
+{ stdenv, fetchurl, cmake, boost }:
 
 stdenv.mkDerivation {
   name = "libyaml-cpp-0.5.1";
@@ -8,11 +8,13 @@ stdenv.mkDerivation {
     sha256 = "01kg0h8ksp162kdhyzn67vnlxpj5zjbks84sh50pv61xni990z1y";
   };
 
-  buildInputs = [ cmake boostHeaders ];
+  buildInputs = [ cmake boost ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://code.google.com/p/yaml-cpp/;
     description = "A YAML parser and emitter for C++";
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix
index 8e2e202f432..3131b6b2918 100644
--- a/pkgs/development/libraries/menu-cache/default.nix
+++ b/pkgs/development/libraries/menu-cache/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, fetchurl, glib, pkgconfig }:
+{ stdenv, fetchurl, glib, pkgconfig, libfm-extra }:
 
+let name = "menu-cache-0.7.0";
+in
 stdenv.mkDerivation {
-  name = "menu-cache-0.5.1";
+  inherit name;
   src = fetchurl {
-    url = "mirror://sourceforge/lxde/menu-cache-0.5.1.tar.gz";
-    sha256 = "08m1msgbl6j7j72cwcg18klb99jif8h1phkcnbplxkdf3w15irh8";
+    url = "mirror://sourceforge/lxde/${name}.tar.xz";
+    sha256 = "0wwkk4jrcl2sp11bspabplchh4ipi1zyn39j3skyzgbm8k40gkhk";
   };
 
-  buildInputs = [ glib pkgconfig ];
+  buildInputs = [ glib pkgconfig libfm-extra ];
 
   meta = with stdenv.lib; {
     homepage = "http://blog.lxde.org/?tag=menu-cache";
diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix
index 8fc160ae11d..dd40a396244 100644
--- a/pkgs/development/libraries/mythes/default.nix
+++ b/pkgs/development/libraries/mythes/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, hunspell, pkgconfig, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mythes-1.2.3";
+  name = "mythes-1.2.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/hunspell/${name}.tar.gz";
-    sha256 = "0f5q7yiwg9bw4a5zxg0dapqdfc2grfb4ss34ifir3mhhy4q3jf4j";
+    sha256 = "0prh19wy1c74kmzkkavm9qslk99gz8h8wmjvwzjc6lf8v2az708y";
   };
 
   buildInputs = [ hunspell ];
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 38eb4a93f24..630d1890409 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -11,11 +11,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.16.4";
+  version = "3.16.5";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_4_RTM/src/${name}.tar.gz";
-    sha256 = "adcd1e655fd9508e7f13847452fd5887a835eff882e3f0d3c42dfcd651650b77";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_5_RTM/src/${name}.tar.gz";
+    sha256 = "e744b9fb2a6291d7eaf1b3f0157082f4214984db33f896e4adf3141340d64196";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];
diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix
index 08069533713..d12423ffc27 100644
--- a/pkgs/development/libraries/oniguruma/default.nix
+++ b/pkgs/development/libraries/oniguruma/default.nix
@@ -1,16 +1,17 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "onig-5.9.4";
-  
+  name = "onig-5.9.5";
+
   src = fetchurl {
-    url = http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.4.tar.gz;
-    sha256 = "15q62c2id918fj2i7xbdrcc79xrdafdc75lhhld98rgq3y8j30lq";
+    url = http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.5.tar.gz;
+    sha256 = "12j3fsdb8hbhnj29hysal9l7i7s71l0ln3lx8hjpxx5535wawjcz";
   };
-  
+
   meta = {
     homepage = http://www.geocities.jp/kosako3/oniguruma/;
     description = "Regular expressions library";
-    license = "BSD";
+    license = stdenv.lib.licenses.bsd2;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 930d7b86f06..768e87f5ad2 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "pcre-8.35";
+  name = "pcre-8.36";
 
   src = fetchurl {
     url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2";
-    sha256 = "0nw66r92dr24vy9k4lw17bkv8x5nlzn6wx9hq4y2dvzgig3w2qd9";
+    sha256 = "1fs5p1z67m9f4xnyil3s4lhgyld78f7m4d1yawpyhh0cvrbk90zg";
   };
 
   # The compiler on Darwin crashes with an internal error while building the
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
new file mode 100644
index 00000000000..1e1fc7ea3b8
--- /dev/null
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -0,0 +1,150 @@
+{ enableMultiThreading ? false
+, enableG3toG4         ? false
+, enableInventor       ? false
+, enableGDML           ? false
+, enableQT             ? false
+, enableXM             ? false
+, enableOpenGLX11      ? false
+, enableRaytracerX11   ? false
+
+# Standard build environment with cmake.
+, stdenv, fetchurl, cmake
+
+# Optional system packages, otherwise internal GEANT4 packages are used.
+, clhep ? null
+, expat ? null
+, zlib  ? null
+
+# For enableGDML.
+, xercesc ? null
+
+# For enableQT.
+, qt ? null # qt4SDK or qt5SDK
+
+# For enableXM.
+, motif ? null # motif or lesstif
+
+# For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11.
+, mesa   ? null
+, x11    ? null
+, libXmu ? null
+}:
+
+# G4persistency library with support for GDML
+assert enableGDML -> xercesc != null;
+
+# If enableQT, Qt4/5 User Interface and Visualization drivers.
+assert enableQT -> qt != null;
+
+# Motif User Interface and Visualisation drivers.
+assert enableXM -> motif != null;
+
+# OpenGL/X11 User Interface and Visualisation drivers.
+assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> mesa   != null;
+assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> x11    != null;
+assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null;
+
+let
+  buildGeant4 =
+    { version, src, multiThreadingCapable ? false }:
+
+    stdenv.mkDerivation rec {
+      inherit version src;
+      name = "geant4-${version}";
+
+      # The data directory holds not just interaction cross section data, but other
+      # files which the installer needs to write, so we link to the previously installed
+      # data instead. This assumes the default data installation location of $out/share.
+      preConfigure = ''
+        mkdir -p $out/share/Geant4-${version}
+        ln -s ${g4data}/Geant4-${version}/data $out/share/Geant4-${version}/data
+      '';
+
+      multiThreadingFlag = if multiThreadingCapable then "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" else "";
+
+      cmakeFlags = ''
+        ${multiThreadingFlag}
+        -DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}
+        -DGEANT4_USE_G3TOG4=${if enableG3toG4 then "ON" else "OFF"}
+        -DGEANT4_USE_QT=${if enableQT then "ON" else "OFF"}
+        -DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}
+        -DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}
+        -DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}
+        -DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}
+        -DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}
+        -DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}
+        -DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}
+      '';
+
+      g4data = installData {
+        inherit version src;
+      };
+
+      enableParallelBuilding = true;
+      buildInputs = [ cmake clhep expat zlib xercesc qt motif mesa x11 libXmu ];
+      propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif mesa x11 libXmu ];
+
+      setupHook = ./setup-hook.sh;
+
+      # Set the myriad of envars required by Geant4 if we use a nix-shell.
+      shellHook = ''
+        source $out/nix-support/setup-hook
+      '';
+
+      meta = {
+        description = "A toolkit for the simulation of the passage of particles through matter.";
+        longDescription = ''
+          Geant4 is a toolkit for the simulation of the passage of particles through matter.
+          Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science.
+          The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278.
+        '';
+        homepage = http://www.geant4.org;
+        license = stdenv.lib.licenses.g4sl;
+        maintainers = [ ];
+        platforms = stdenv.lib.platforms.all;
+      };
+    };
+
+  installData = 
+    { version, src }:
+ 
+    stdenv.mkDerivation rec {
+      inherit version src;
+      name = "g4data-${version}";
+
+      cmakeFlags = ''
+        -DGEANT4_INSTALL_DATA="ON"
+      '';
+
+      buildInputs = [ cmake expat ];
+
+      enableParallelBuilding = true;
+      buildPhase = ''
+        make G4EMLOW G4NDL G4NEUTRONXS G4PII G4SAIDDATA PhotonEvaporation RadioactiveDecay RealSurface
+      '';
+
+      installPhase = ''
+        mkdir -p $out/Geant4-${version}
+        cp -R data/ $out/Geant4-${version}
+      '';
+
+      meta = {
+        description = "Data files for the Geant4 toolkit.";
+        homepage = http://www.geant4.org;
+        license = stdenv.lib.licenses.g4sl;
+        maintainers = [ ];
+        platforms = stdenv.lib.platforms.all;
+      };
+    }; 
+
+  fetchGeant4 = import ./fetch.nix {
+    inherit stdenv fetchurl;
+  };
+
+in {
+  v10_0_2 = buildGeant4 {
+    inherit (fetchGeant4.v10_0_2) version src;
+    multiThreadingCapable = true;
+  };
+} 
+ 
diff --git a/pkgs/development/libraries/physics/geant4/fetch.nix b/pkgs/development/libraries/physics/geant4/fetch.nix
new file mode 100644
index 00000000000..0e5dd54c6ae
--- /dev/null
+++ b/pkgs/development/libraries/physics/geant4/fetch.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+let
+  fetch = { version, src ? builtins.getAttr stdenv.system sources, sources ? null }:
+  {
+    inherit version src;
+  };
+
+in {
+  v10_0_2 = fetch {
+    version = "10.0.2";
+
+    src = fetchurl{
+      url = "http://geant4.cern.ch/support/source/geant4.10.00.p02.tar.gz";
+      sha256 = "9d615200901f1a5760970e8f5970625ea146253e4f7c5ad9df2a9cf84549e848";
+    };  
+  };
+}
+
diff --git a/pkgs/development/libraries/physics/geant4/g4py/configure.patch b/pkgs/development/libraries/physics/geant4/g4py/configure.patch
new file mode 100644
index 00000000000..886618abd34
--- /dev/null
+++ b/pkgs/development/libraries/physics/geant4/g4py/configure.patch
@@ -0,0 +1,12 @@
+--- environments/g4py/configure	2014-03-17 22:47:05.000000000 +1100
++++ environments/g4py/configure	2014-09-01 15:33:46.523637686 +1000
+@@ -4,9 +4,6 @@
+ # ======================================================================
+ export LANG=C
+ 
+-PATH=/bin:/usr/bin
+-export PATH
+-
+ # ======================================================================
+ # testing the echo features
+ # ======================================================================
diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix
new file mode 100644
index 00000000000..f90b2e6c4ae
--- /dev/null
+++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix
@@ -0,0 +1,70 @@
+{ stdenv, fetchurl
+
+# The target version of Geant4
+, geant4
+
+# Python (obviously) and boost::python for wrapping.
+, python
+, boost
+}:
+
+let
+  buildG4py = 
+    { version, src, geant4}:
+
+    stdenv.mkDerivation rec {
+      inherit version src geant4;
+      name = "g4py-${version}";
+
+      # ./configure overwrites $PATH, which clobbers everything.
+      patches = [ ./configure.patch ];
+      patchFlags = "-p0";
+
+      configurePhase = ''
+        export PYTHONPATH=$PYTHONPATH:${geant4}/lib64:$prefix
+
+        source ${geant4}/share/Geant4-*/geant4make/geant4make.sh
+        cd environments/g4py
+
+        ./configure linux64 --prefix=$prefix \
+                            --with-g4install-dir=${geant4} \
+                            --with-python-incdir=${python}/include/python${python.majorVersion} \
+                            --with-python-libdir=${python}/lib \
+                            --with-boost-incdir=${boost}/include \
+                            --with-boost-libdir=${boost}/lib
+      '';
+
+      enableParallelBuilding = true;
+      buildInputs = [ geant4 boost python ];
+
+      setupHook = ./setup-hook.sh;
+
+      # Make sure we set PYTHONPATH
+      shellHook = ''
+        source $out/nix-support/setup-hook
+      '';
+
+      meta = {
+        description = "Python bindings and utilities for Geant4.";
+        longDescription = ''
+          Geant4 is a toolkit for the simulation of the passage of particles through matter.      
+          Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science.
+          The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278.
+        '';
+        homepage = http://www.geant4.org;
+        license = stdenv.lib.licenses.g4sl;
+        maintainers = [ ];
+        platforms = stdenv.lib.platforms.all;
+      }; 
+    };
+
+    fetchGeant4 = import ../fetch.nix {
+      inherit stdenv fetchurl;
+    };  
+
+in {
+  v10_0_2 = buildG4py {
+    inherit (fetchGeant4.v10_0_2) version src;
+    geant4 = geant4.v10_0_2;
+  };  
+} 
diff --git a/pkgs/development/libraries/physics/geant4/g4py/setup-hook.sh b/pkgs/development/libraries/physics/geant4/g4py/setup-hook.sh
new file mode 100644
index 00000000000..8abfb461fc0
--- /dev/null
+++ b/pkgs/development/libraries/physics/geant4/g4py/setup-hook.sh
@@ -0,0 +1 @@
+export PYTHONPATH=$PYTHONPATH:@out@/lib
diff --git a/pkgs/development/libraries/physics/geant4/setup-hook.sh b/pkgs/development/libraries/physics/geant4/setup-hook.sh
new file mode 100644
index 00000000000..0b775d43283
--- /dev/null
+++ b/pkgs/development/libraries/physics/geant4/setup-hook.sh
@@ -0,0 +1 @@
+source @out@/bin/geant4.sh
diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix
index 8899980affa..9eb068bebb0 100644
--- a/pkgs/development/libraries/quazip/default.nix
+++ b/pkgs/development/libraries/quazip/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   configurePhase = "cd quazip && qmake quazip.pro";
 
-  installFlags = "INSTALL_ROOT=$out";
+  installFlags = "INSTALL_ROOT=$(out)";
 
   buildInputs = [ zlib qt5 ];
 
diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index 9aab09094a0..938778734e0 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, gfortran, tolerateCpuTimingInaccuracy ? true, shared ? false
-, cpuConfig ? if stdenv.isi686 then "-b 32 -A 18 -V 1" else "-b 64 -A 31 -V 192"
+, cpuConfig ? if stdenv.isi686 then "-b 32 -A 18 -V 1" else "-b 64 -A 31 -V 384"
 }:
 
 # Atlas detects the CPU and optimizes its build accordingly. This is great when
@@ -15,13 +15,18 @@
 #   |---------------------------------------------+------------------------|
 #   | -b 32                                       | -b 64                  |
 #   | -A 18  (Pentium II)                         | -A 31 (Athlon K7)      |
-#   | -V 1 (No SIMD: Pentium II doesn't have SSE) | -V 192 (SSE1 and SSE2) |
+#   | -V 1 (No SIMD: Pentium II doesn't have SSE) | -V 384 (SSE1 and SSE2) |
 #
 # Users who want to compile a highly optimized version of ATLAS that's suitable
 # for their local machine can override these settings accordingly.
+#
+# The -V flags can change with each release as new instruction sets are added
+# because upstream thinks it's a good idea to add entries at the start of an
+# enum, rather than the end. If the build suddenly fails with messages about
+# missing instruction sets, you may need to poke around in the source a bit.
 
 let
-  version = "3.10.1";
+  version = "3.10.2";
 
   optionalString = stdenv.lib.optionalString;
   optional = stdenv.lib.optional;
@@ -32,7 +37,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/math-atlas/atlas${version}.tar.bz2";
-    sha256 = "11ncgdc7kzb2y2gqb3sgarm5saj9fr07r3h2yh2h5bja429b85d2";
+    sha256 = "0bqh4bdnjdyww4mcpg6kn0x7338mfqbdgysn97dzrwwb26di7ars";
   };
 
   buildInputs = [ gfortran ];
@@ -67,5 +72,7 @@ stdenv.mkDerivation {
       portable performance. At present, it provides C and Fortran77 interfaces to a
       portably efficient BLAS implementation, as well as a few routines from LAPACK.
     '';
+
+    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
   };
 }
diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix
index f5394fffdaa..0fd3caffd5c 100644
--- a/pkgs/development/libraries/simgear/default.nix
+++ b/pkgs/development/libraries/simgear/default.nix
@@ -1,51 +1,27 @@
-x@{builderDefsPackage
-  , plib, freeglut, xproto, libX11, libXext, xextproto, libXi , inputproto
-  , libICE, libSM, libXt, libXmu, mesa, boost, zlib, libjpeg , freealut
-  , openscenegraph, openal, expat, cmake, apr
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+{ stdenv, fetchurl, plib, freeglut, xproto, libX11, libXext, xextproto, libXi
+, inputproto, libICE, libSM, libXt, libXmu, mesa, boost, zlib, libjpeg, freealut
+, openscenegraph, openal, expat, cmake, apr
+}:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="simgear";
-    version="3.0.0";
-    name="${baseName}-${version}";
-    extension="tar.bz2";
-    url="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${name}.${extension}";
-    hash="05l0wvi0s4a98ihmjbpcc66rj6qy3hrsqkjs388bddf2ws3qyi09";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
+stdenv.mkDerivation rec {
+  name = "simgear-${version}";
+  version = "3.0.0";
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  src = fetchurl {
+    url = "http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${name}.tar.bz2";
+    sha256 = "1ssrcmvk3a4dv0k4vjzndmirwmdgzk689d7wpmjm423nydmwajh0";
+  };
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = [ "doCmake" "doMakeInstall" ];
+  buildInputs = [ plib freeglut xproto libX11 libXext xextproto libXi inputproto
+                  libICE libSM libXt libXmu mesa boost zlib libjpeg freealut
+                  openscenegraph openal expat cmake apr ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Simulation construction toolkit";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.lgpl2;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "ftp://ftp.goflyflightgear.com/simgear/Source/";
-    };
+    homepage = https://gitorious.org/fg/simgear;
+    maintainers = with maintainers; [ raskin ];
+    platforms = platforms.linux;
+    license = licenses.lgpl2;
   };
-}) x
+}
 
diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix
index a7db634dbd0..69617c0345e 100644
--- a/pkgs/development/libraries/slang/default.nix
+++ b/pkgs/development/libraries/slang/default.nix
@@ -1,17 +1,26 @@
-{stdenv, fetchurl, ncurses, pcre, libpng, zlib, readline}:
+{ stdenv, fetchurl, ncurses, pcre, libpng, zlib, readline }:
 
-stdenv.mkDerivation {
-  name = "slang-2.2.1";
+stdenv.mkDerivation rec {
+  name = "slang-2.3.0";
   src = fetchurl {
-    url = ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.2/slang-2.2.1.tar.bz2;
-    sha256 = "1qgfg6i5lzmw8j9aqd8pgz3vnhn80giij9bpgm5r3gmna2h0rzfj";
+    url = "http://www.jedsoft.org/releases/slang/${name}.tar.gz";
+    sha256 = "0aqd2cjabj6nhd4r3dc4vhqif2bf3dmqnrn2gj0xm4gqyfd177jy";
   };
+
   # Fix some wrong hardcoded paths
   preConfigure = ''
     sed -i -e "s|/usr/lib/terminfo|${ncurses}/lib/terminfo|" configure
-    sed -i -e "s|/usr/lib/terminfo|${ncurses}/lib/terminfo|" src/sltermin.c    
+    sed -i -e "s|/usr/lib/terminfo|${ncurses}/lib/terminfo|" src/sltermin.c
     sed -i -e "s|/bin/ln|ln|" src/Makefile.in
   '';
   configureFlags = "--with-png=${libpng} --with-z=${zlib} --with-pcre=${pcre} --with-readline=${readline}";
   buildInputs = [ncurses pcre libpng zlib readline];
+
+  meta = {
+    description = "A multi-platform programmer's library designed to allow a developer to create robust software";
+    homepage = http://www.jedsoft.org/slang/;
+    license = stdenv.lib.licenses.gpl2Plus;
+    platform = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+  };
 }
diff --git a/pkgs/development/libraries/sodium/default.nix b/pkgs/development/libraries/sodium/default.nix
index 266675614ce..7e51d411bc4 100644
--- a/pkgs/development/libraries/sodium/default.nix
+++ b/pkgs/development/libraries/sodium/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="sodium";
-    version="0.7.0";
+    version="1.0.0";
     name="${baseName}-${version}";
-    hash="0s4iis5h7yh27kamwic3rddyp5ra941bcqcawa37grjvl78zzjjc";
-    url="http://download.dnscrypt.org/libsodium/releases/libsodium-0.7.0.tar.gz";
-    sha256="0s4iis5h7yh27kamwic3rddyp5ra941bcqcawa37grjvl78zzjjc";
+    hash="19f9vf0shfp4rc4l791r6xjg06z4i8psj1zkjkm3z5b640yzxlff";
+    url="http://download.dnscrypt.org/libsodium/releases/libsodium-1.0.0.tar.gz";
+    sha256="19f9vf0shfp4rc4l791r6xjg06z4i8psj1zkjkm3z5b640yzxlff";
   };
   buildInputs = [
   ];
diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/pkgs/development/libraries/sphinxbase/default.nix
index 1841fcbe4a1..1b4cf69f704 100644
--- a/pkgs/development/libraries/sphinxbase/default.nix
+++ b/pkgs/development/libraries/sphinxbase/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation (rec {
-  name = "sphinxbase-0.7";
+  name = "sphinxbase-0.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/cmusphinx/${name}.tar.gz";
-    sha256 = "1v3kfzw42ahxmr002i6wqigs832958vgghrv5dd62zazajdbk71q";
+    sha256 = "1a3c91g6rcfb2k8qyfhnd7s68ds6pxwv61xfp0ai1arbhx28jw2m";
   };
 
   buildInputs = [ pkgconfig bison ];
@@ -18,8 +18,11 @@ stdenv.mkDerivation (rec {
   meta = {
     description = "Support Library for Pocketsphinx";
     homepage = http://cmusphinx.sourceforge.net;
-    license = "free-non-copyleft";
+    license = stdenv.lib.licenses.bsd2;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
+
 } // (stdenv.lib.optionalAttrs multipleOutputs {
   outputs = [ "out" "lib" "headers" ];
 
@@ -31,4 +34,3 @@ stdenv.mkDerivation (rec {
     cp -av $out/include $headers
   '';
 }))
-
diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix
index 4ec8c4befc6..7ef48d09725 100644
--- a/pkgs/development/libraries/telepathy/qt/default.nix
+++ b/pkgs/development/libraries/telepathy/qt/default.nix
@@ -2,15 +2,13 @@
 , telepathy_farstream, telepathy_glib, pythonDBus }:
 
 stdenv.mkDerivation rec {
-  name = "telepathy-qt-0.9.4";
+  name = "telepathy-qt-0.9.5";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz";
-    sha256 = "1wk13rwpas1crj19xsbgl1c4qzri616xxa1hyhnykv4nkwxdpcgi";
+    sha256 = "13lwh23ad9bg7hx1mj4xjc2lb8nlaaw8hbrmx5gg8nz5xxc4hiwk";
   };
 
-  patches = [ ./farstream-0.2.diff ];
-
   nativeBuildInputs = [ cmake pkgconfig python libxslt ];
   propagatedBuildInputs = [ qt4 dbus_glib telepathy_farstream telepathy_glib pythonDBus ];
 
@@ -22,4 +20,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
   doCheck = false; # giving up for now
+
+  meta = {
+    platforms = stdenv.lib.platforms.linux;
+  };
 }
diff --git a/pkgs/development/libraries/telepathy/qt/farstream-0.2.diff b/pkgs/development/libraries/telepathy/qt/farstream-0.2.diff
deleted file mode 100644
index 86d392fe1ac..00000000000
--- a/pkgs/development/libraries/telepathy/qt/farstream-0.2.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urB telepathy-qt/cmake/modules/FindFarstream.cmake new/cmake/modules/FindFarstream.cmake
---- telepathy-qt/cmake/modules/FindFarstream.cmake      2012-04-25 22:14:22.275967164 +0200
-+++ new/cmake/modules/FindFarstream.cmake       2012-10-07 12:19:46.543103512 +0200
-@@ -23,9 +23,9 @@
-     # in the find_path() and find_library() calls
-     find_package(PkgConfig)
-     if (FARSTREAM_MIN_VERSION)
--        PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1>=${FARSTREAM_MIN_VERSION})
-+        PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2>=${FARSTREAM_MIN_VERSION})
-     else (FARSTREAM_MIN_VERSION)
--        PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1)
-+        PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2)
-     endif (FARSTREAM_MIN_VERSION)
-     set(FARSTREAM_DEFINITIONS ${PC_FARSTREAM_CFLAGS_OTHER})
- endif (NOT WIN32)
-@@ -34,10 +34,10 @@
-    PATHS
-    ${PC_FARSTREAM_INCLUDEDIR}
-    ${PC_FARSTREAM_INCLUDE_DIRS}
--   PATH_SUFFIXES farstream-0.1
-+   PATH_SUFFIXES farstream-0.2
-    )
- 
--find_library(FARSTREAM_LIBRARIES NAMES farstream-0.1
-+find_library(FARSTREAM_LIBRARIES NAMES farstream-0.2
-    PATHS
-    ${PC_FARSTREAM_LIBDIR}
-    ${PC_FARSTREAM_LIBRARY_DIRS}
diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix
index 0e0625a2cbb..9d16edb0f2e 100644
--- a/pkgs/development/libraries/vtk/default.nix
+++ b/pkgs/development/libraries/vtk/default.nix
@@ -6,7 +6,7 @@ with stdenv.lib;
 let
   os = stdenv.lib.optionalString;
   majorVersion = "5.10";
-  minorVersion = "0";
+  minorVersion = "1";
   version = "${majorVersion}.${minorVersion}";
 in
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   name = "vtk-${os (qtLib != null) "qvtk-"}${version}";
   src = fetchurl {
     url = "${meta.homepage}files/release/${majorVersion}/vtk-${version}.tar.gz";
-    md5 = "a0363f78910f466ba8f1bd5ab5437cb9";
+    sha256 = "1fxxgsa7967gdphkl07lbfr6dcbq9a72z5kynlklxn7hyp0l18pi";
   };
 
   buildInputs = [ cmake mesa libX11 xproto libXt ]
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 82cff159a56..fa3cdc82c41 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "webkitgtk-2.4.4";
+  name = "webkitgtk-2.4.6";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "1f9sypnnxxcml9vj79g9hf2di52pg5kggyc3wgsy3q9a6mzgrjsq";
+    sha256 = "0mqlq4ivh921k92xjsp5pdvbg9vf75qjliqmx81qwrm2sjl4mvvg";
   };
 
   patches = [ ./webcore-svg-libxml-cflags.patch ];
diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix
new file mode 100644
index 00000000000..2a44cdfca0b
--- /dev/null
+++ b/pkgs/development/lua-modules/generic/default.nix
@@ -0,0 +1,24 @@
+lua:
+
+{ buildInputs ? [], disabled ? false, ... } @ attrs:
+
+if disabled then
+  throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}"
+else
+  lua.stdenv.mkDerivation ({
+
+      preBuild = ''
+        makeFlagsArray=(
+          PREFIX=$out
+          LUA_LIBDIR="$out/lib/lua/${lua.luaversion}"
+          LUA_INC="-I${lua}/include");
+      '';
+    }
+    //
+    attrs
+    //
+    {
+      name = "lua${lua.luaversion}-" + attrs.name;
+      buildInputs = buildInputs ++ [ lua ];
+    }
+  )
diff --git a/pkgs/development/lua-modules/luasql.patch b/pkgs/development/lua-modules/luasql.patch
new file mode 100644
index 00000000000..e91840101ee
--- /dev/null
+++ b/pkgs/development/lua-modules/luasql.patch
@@ -0,0 +1,37 @@
+--- a/config	2013-02-18 19:36:44.000000000 +0400
++++ b/config	2014-10-01 08:36:37.104254404 +0400
+@@ -1,12 +1,12 @@
+ # $Id: config,v 1.10 2008/05/30 17:21:18 tomas Exp $
+ 
+ # Driver (leave uncommented ONLY the line with the name of the driver)
+-T= mysql
++#T= mysql
+ #T= oci8
+ #T= odbc
+ #T= postgres
+ #T= sqlite
+-#T=sqlite3
++T=sqlite3
+ #T=firebird
+ 
+ # Installation directories
+@@ -37,8 +37,8 @@
+ ######## MySQL
+ #DRIVER_LIBS= -L/usr/local/mysql/lib -lmysqlclient -lz
+ #DRIVER_INCS= -I/usr/local/mysql/include
+-DRIVER_LIBS= -L/usr/lib -lmysqlclient -lz
+-DRIVER_INCS= -I/usr/include/mysql
++#DRIVER_LIBS= -L/usr/lib -lmysqlclient -lz
++#DRIVER_INCS= -I/usr/include/mysql
+ ######## Oracle OCI8
+ #DRIVER_LIBS= -L/home/oracle/OraHome1/lib -lz -lclntsh
+ #DRIVER_INCS= -I/home/oracle/OraHome1/rdbms/demo -I/home/oracle/OraHome1/rdbms/public
+@@ -51,7 +51,7 @@
+ #DRIVER_LIBS= -lsqlite
+ #DRIVER_INCS=
+ ######## SQLite3 
+-#DRIVER_LIBS= -L/opt/local/lib -lsqlite3
++DRIVER_LIBS= -lsqlite3
+ #DRIVER_INCS= -I/opt/local/include
+ ######## ODBC
+ #DRIVER_LIBS= -L/usr/local/lib -lodbc
diff --git a/pkgs/development/lua-modules/zip.patch b/pkgs/development/lua-modules/zip.patch
new file mode 100644
index 00000000000..c3f88f451e8
--- /dev/null
+++ b/pkgs/development/lua-modules/zip.patch
@@ -0,0 +1,23 @@
+--- a/Makefile	2007-10-30 01:59:10.000000000 +0300
++++ b/Makefile	2014-09-18 11:04:53.176320021 +0400
+@@ -6,10 +6,6 @@
+
+ include $(CONFIG)
+
+-ifeq "$(LUA_VERSION_NUM)" "500"
+-COMPAT_O= $(COMPAT_DIR)/compat-5.1.o
+-endif
+-
+ SRCS= src/lua$T.c
+ OBJS= src/lua$T.o $(COMPAT_O)
+
+@@ -19,9 +15,6 @@
+ src/$(LIBNAME): $(OBJS)
+ 	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS) -lzzip
+
+-$(COMPAT_DIR)/compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c
+-	$(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
+-
+ install: src/$(LIBNAME)
+ 	mkdir -p $(LUA_LIBDIR)
+ 	cp src/$(LIBNAME) $(LUA_LIBDIR)
diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index cbcff8178e3..2b3bb333948 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
     mkdir -pv $out
     tar xf $src
     mv */* $out
+
+    # so that it doesn't fail because of read-only permissions set
+    patch -p1 -d $out < ${ ./make-standalone-toolchain.patch }
+
     find $out \( \
         \( -type f -a -name "*.so*" \) -o \
         \( -type f -a -perm +0100 \) \
diff --git a/pkgs/development/mobile/androidenv/make-standalone-toolchain.patch b/pkgs/development/mobile/androidenv/make-standalone-toolchain.patch
new file mode 100644
index 00000000000..afc3470aaba
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/make-standalone-toolchain.patch
@@ -0,0 +1,13 @@
+diff -ru android-ndk-r9d.old/build/tools/make-standalone-toolchain.sh android-ndk-r9d/build/tools/make-standalone-toolchain.sh
+--- android-ndk-r9d.old/build/tools/make-standalone-toolchain.sh	2014-09-25 11:42:09.990500975 +0200
++++ android-ndk-r9d/build/tools/make-standalone-toolchain.sh	2014-09-25 11:43:06.097501636 +0200
+@@ -252,6 +252,9 @@
+ # Now copy the GCC toolchain prebuilt binaries
+ run copy_directory "$TOOLCHAIN_PATH" "$TMPDIR"
+ 
++# Making it writable again
++chmod -R +w "$TMPDIR"
++
+ # Replace soft-link mcld by real file
+ ALL_LDS=`find $TMPDIR -name "*mcld"`
+ for LD in $ALL_LDS; do
diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix
index ad6569d9478..0d221a8952b 100644
--- a/pkgs/development/mobile/xcodeenv/default.nix
+++ b/pkgs/development/mobile/xcodeenv/default.nix
@@ -1,8 +1,8 @@
-{stdenv, version ? "5.0"}:
+{stdenv, version ? "5.0", xcodeBaseDir ? "/Applications/Xcode.app"}:
 
 rec {
   xcodewrapper = import ./xcodewrapper.nix {
-    inherit stdenv version;
+    inherit stdenv version xcodeBaseDir;
   };
 
   buildApp = import ./build-app.nix {
diff --git a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
index fd375d6213c..4545ea8dae1 100644
--- a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
+++ b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
@@ -1,4 +1,4 @@
-{stdenv, version}:
+{stdenv, version, xcodeBaseDir}:
 
 stdenv.mkDerivation {
   name = "xcode-wrapper-"+version;
@@ -6,14 +6,14 @@ stdenv.mkDerivation {
     mkdir -p $out/bin
     cd $out/bin
     ln -s /usr/bin/xcode-select
-    ln -s /usr/bin/xcodebuild
-    ln -s /usr/bin/xcrun
     ln -s /usr/bin/security
     ln -s /usr/bin/codesign
-    ln -s "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app/Contents/MacOS/iPhone Simulator"
+    ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild"
+    ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcrun"
+    ln -s "${xcodeBaseDir}/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app/Contents/MacOS/iPhone Simulator"
 
     cd ..
-    ln -s "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs"
+    ln -s "${xcodeBaseDir}/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs"
 
     # Check if we have the xcodebuild version that we want
     if [ -z "$($out/bin/xcodebuild -version | grep -x 'Xcode ${version}')" ]
diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix
index 59f30de5e84..565176276f9 100644
--- a/pkgs/development/ocaml-modules/biniou/default.nix
+++ b/pkgs/development/ocaml-modules/biniou/default.nix
@@ -4,6 +4,9 @@ let
   version = "1.0.9";
   webpage = "http://mjambon.com/${pname}.html";
 in
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
+
 stdenv.mkDerivation rec {
 
   name = "${pname}-${version}";
@@ -23,10 +26,11 @@ stdenv.mkDerivation rec {
     mkdir $out/bin
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve";
     homepage = "${webpage}";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.vbgl ];
     platforms = ocaml.meta.platforms;
   };
 }
diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/pkgs/development/ocaml-modules/camomile/0.8.2.nix
index 674c6c0367b..adbdc936d1e 100644
--- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix
+++ b/pkgs/development/ocaml-modules/camomile/0.8.2.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib}:
+{stdenv, fetchurl, ocaml, findlib, camlp4}:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     sha256 = "0x43pjxx70kgip86mmdn08s97k4qzdqc8i79xfyyx28smy1bsa00";
   };
 
-  buildInputs = [ocaml findlib];
+  buildInputs = [ocaml findlib camlp4];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix
index 332230615d1..ecdc5bef295 100644
--- a/pkgs/development/ocaml-modules/camomile/default.nix
+++ b/pkgs/development/ocaml-modules/camomile/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib}:
+{stdenv, fetchurl, ocaml, findlib, camlp4}:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     sha256 = "003ikpvpaliy5hblhckfmln34zqz0mk3y2m1fqvbjngh3h2np045";
   };
 
-  buildInputs = [ocaml findlib];
+  buildInputs = [ocaml findlib camlp4];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix
index 3a00f0c3888..2dfd7ba1286 100644
--- a/pkgs/development/ocaml-modules/cmdliner/default.nix
+++ b/pkgs/development/ocaml-modules/cmdliner/default.nix
@@ -5,6 +5,9 @@ let
   version = "0.9.5";
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
 in
+
+assert stdenv.lib.versionAtLeast ocaml_version "3.12";
+
 stdenv.mkDerivation {
 
   name = "ocaml-${pname}-${version}";
@@ -31,6 +34,7 @@ stdenv.mkDerivation {
     homepage = http://erratique.ch/software/cmdliner;
     description = "An OCaml module for the declarative definition of command line interfaces";
     license = licenses.bsd3;
+    maintainers = [ maintainers.vbgl ];
     platforms = ocaml.meta.platforms;
   };
 }
diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix
index 1f9e2b44e00..cfb353bfe3e 100644
--- a/pkgs/development/ocaml-modules/cryptokit/default.nix
+++ b/pkgs/development/ocaml-modules/cryptokit/default.nix
@@ -4,6 +4,8 @@ let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
 in
 
+assert stdenv.lib.versionAtLeast ocaml_version "3.12";
+
 stdenv.mkDerivation {
   name = "cryptokit-1.9";
 
diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix
index 7178452e3dd..09679ced744 100644
--- a/pkgs/development/ocaml-modules/csv/default.nix
+++ b/pkgs/development/ocaml-modules/csv/default.nix
@@ -1,4 +1,7 @@
 {stdenv, fetchurl, ocaml, findlib}:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
+
 stdenv.mkDerivation {
 
   name = "ocaml-csv-1.3.3";
@@ -18,10 +21,11 @@ stdenv.mkDerivation {
 
   installPhase = "ocaml setup.ml -install";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A pure OCaml library to read and write CSV files";
     homepage = "https://forge.ocamlcore.org/projects/csv/";
-    license = stdenv.lib.licenses.lgpl21;
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.vbgl ];
     platforms = ocaml.meta.platforms;
   };
 }
diff --git a/pkgs/development/ocaml-modules/easy-format/default.nix b/pkgs/development/ocaml-modules/easy-format/default.nix
index d01a4edf26e..0554b67f1d7 100644
--- a/pkgs/development/ocaml-modules/easy-format/default.nix
+++ b/pkgs/development/ocaml-modules/easy-format/default.nix
@@ -17,11 +17,10 @@ stdenv.mkDerivation rec {
 
   createFindlibDestdir = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A high-level and functional interface to the Format module of the OCaml standard library";
     homepage = "${webpage}";
-    license = "bsd";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.vbgl ];
   };
 }
-
-
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index af85a0a8f94..8a7045e263a 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -26,4 +26,25 @@ stdenv.mkDerivation
   dontAddPrefix = true;  
 
   createFindlibDestdir = true;
+
+  meta = {
+    homepage = http://ocsigen.org/eliom/;
+    description = "Ocaml Framework for programming Web sites and client/server Web applications";
+
+    longDescription =''Eliom is a framework for programming Web sites
+    and client/server Web applications. It introduces new concepts to
+    simplify programming common behaviours and uses advanced static
+    typing features of OCaml to check many properties of the Web site
+    at compile time. If you want to write a Web application, Eliom
+    makes possible to write the whole application as a single program
+    (client and server parts). A syntax extension is used to
+    distinguish both parts and the client side is compiled to JS using
+    Ocsigen Js_of_ocaml.'';
+
+    license = stdenv.lib.licenses.lgpl21;
+
+    platforms = ocaml.meta.platforms;
+
+    maintainers = [ stdenv.lib.maintainers.gal_bolle ];
+  };
 }
diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix
index 7bc7e398948..9f5f8119fb6 100644
--- a/pkgs/development/ocaml-modules/extlib/default.nix
+++ b/pkgs/development/ocaml-modules/extlib/default.nix
@@ -1,4 +1,6 @@
-{stdenv, fetchurl, ocaml, findlib, minimal ? true}:
+{stdenv, fetchurl, ocaml, findlib, camlp4, minimal ? true}:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
 
 stdenv.mkDerivation {
   name = "ocaml-extlib-1.6.1";
@@ -8,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "1jmfj2w0f3ap0swz8k3qqmrl6x2y4gkmg88vv024xnmliiiv7m48";
   };
 
-  buildInputs = [ocaml findlib];
+  buildInputs = [ocaml findlib camlp4];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/fix/default.nix b/pkgs/development/ocaml-modules/fix/default.nix
new file mode 100644
index 00000000000..b0429e0e910
--- /dev/null
+++ b/pkgs/development/ocaml-modules/fix/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, ocaml, findlib}:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
+
+stdenv.mkDerivation {
+
+  name = "ocaml-fix-20130611";
+
+  src = fetchurl {
+    url = http://gallium.inria.fr/~fpottier/fix/fix-20130611.tar.gz;
+    sha256 = "1phlqcs1nb93x9cf0w0hnq2ck4dmn71zm4mxf60w96vb9yb9qzp0";
+  };
+
+  buildInputs = [ ocaml findlib ];
+
+  createFindlibDestdir = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://gallium.inria.fr/~fpottier/fix/;
+    description = "A simple OCaml module for computing the least solution of a system of monotone equations";
+    license = licenses.cecill-c;
+    maintainers = [ maintainers.vbgl ];
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/functory/default.nix b/pkgs/development/ocaml-modules/functory/default.nix
new file mode 100644
index 00000000000..35dd542af9e
--- /dev/null
+++ b/pkgs/development/ocaml-modules/functory/default.nix
@@ -0,0 +1,27 @@
+{stdenv, fetchurl, ocaml, findlib}:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
+
+stdenv.mkDerivation {
+
+  name = "ocaml-functory-0.5";
+
+  src = fetchurl {
+    url = https://www.lri.fr/~filliatr/functory/download/functory-0.5.tar.gz;
+    sha256 = "1j17rhifdjv1z262dma148ywg34x0zjn8vczdrnkwajsm4qg1hw3";
+  };
+
+  buildInputs = [ ocaml findlib ];
+
+  installTargets = "ocamlfind-install";
+
+  createFindlibDestdir = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://www.lri.fr/~filliatr/functory/;
+    description = "A distributed computing library for Objective Caml which facilitates distributed execution of parallelizable computations in a seamless fashion";
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.vbgl ];
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix
index 365fcc677cc..7272e668aa2 100644
--- a/pkgs/development/ocaml-modules/javalib/default.nix
+++ b/pkgs/development/ocaml-modules/javalib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, which, ocaml, findlib, camlzip, extlib}:
+{stdenv, fetchurl, which, ocaml, findlib, camlzip, extlib, camlp4}:
 let
   pname = "javalib";
   version = "2.3";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "1i8djcanzm250mwilm3jfy37cz0k0x7jbnrz8a5vvdi91kyzh52j";
   };
 
-  buildInputs = [ which ocaml findlib camlzip extlib ];
+  buildInputs = [ which ocaml findlib camlp4 ];
 
   patches = [ ./configure.sh.patch ./Makefile.config.example.patch ];
 
@@ -33,10 +33,11 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ camlzip extlib ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A library that parses Java .class files into OCaml data structures";
     homepage = "${webpage}";
-    license = stdenv.lib.licenses.lgpl3;
+    license = licenses.lgpl3;
+    maintainers = [ maintainers.vbgl ];
     platforms = ocaml.meta.platforms;
   };
 }
diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
new file mode 100644
index 00000000000..5fb9969e62e
--- /dev/null
+++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
@@ -0,0 +1,37 @@
+{stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview}:
+
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+  pname = "lablgtk";
+  version = "2.14.0";
+in
+
+stdenv.mkDerivation (rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://forge.ocamlcore.org/frs/download.php/561/${name}.tar.gz";
+    sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9";
+  };
+
+  buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview];
+
+  configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib";
+  buildFlags = "world";
+
+  preInstall = ''
+    mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib
+    export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH
+  '';
+
+  meta = {
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.z77z
+      stdenv.lib.maintainers.roconnor
+    ];
+    homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html;
+    description = "LablGTK is is an Objective Caml interface to gtk+";
+    license = stdenv.lib.licenses.lgpl21Plus;
+  };
+})
diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix
index c2f50c4e5b8..7499be9c5dd 100644
--- a/pkgs/development/ocaml-modules/lablgtk/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview}:
+{stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview, camlp4}:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -6,6 +6,8 @@ let
   version = "2.16.0";
 in
 
+assert stdenv.lib.versionAtLeast ocaml_version "3.12";
+
 stdenv.mkDerivation (rec {
   name = "${pname}-${version}";
   src = fetchurl {
@@ -13,7 +15,7 @@ stdenv.mkDerivation (rec {
     sha256 = "a0ea9752eb257dadcfc2914408fff339d4c34357802f02c63329dd41b777de2f";
   };
 
-  buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview];
+  buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview camlp4];
 
   configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib";
   buildFlags = "world";
diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
index 94395f601aa..f77bd3acc62 100644
--- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, glib, gtk, pango }: 
+{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, glib, gtk, pango }:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -9,21 +9,22 @@ in
 stdenv.mkDerivation {
   name = "${pname}-${version}";
 
-  src = fetchurl { 
+  src = fetchurl {
     url = "http://cgit.freedesktop.org/cairo-ocaml/snapshot/cairo-ocaml-${version}.zip";
-    sha256 = "2d59678e322c331e3f4bc02a77240fce4a0917acb0d3ae75953a6ac62d70a125";
+    sha256 = "0l4p9bp6kclr570mxma8wafibr1g5fsjj8h10yr4b507g0hmlh0l";
   };
 
   patches = [ ./META.patch ];
 
-  buildInputs = [ocaml automake gnum4 autoconf unzip pkgconfig findlib freetype lablgtk cairo gdk_pixbuf gtk pango ];
+  buildInputs = [ ocaml automake gnum4 autoconf unzip pkgconfig
+                  findlib freetype lablgtk cairo gdk_pixbuf gtk pango ];
 
   createFindlibDestdir = true;
 
  preConfigure = ''
    aclocal -I support
    autoconf
-   export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE `pkg-config --cflags cairo gdk-pixbuf glib  gtk+ pango`" 
+   export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE `pkg-config --cflags cairo gdk-pixbuf glib gtk+ pango`"
    export LABLGTKDIR=${lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2
    cp ${lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2/pango.ml ./src
    cp ${lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2/gaux.ml ./src
@@ -39,6 +40,6 @@ stdenv.mkDerivation {
     homepage = http://cairographics.org/cairo-ocaml;
     description = "ocaml bindings for cairo library";
     license = stdenv.lib.licenses.gpl2;
-#    maintainers = [ stdenv.lib.maintainers.roconnor ];
+    platforms = ocaml.meta.platforms;
   };
 }
diff --git a/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix b/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix
index e96f3f179a9..09cfe1c350d 100644
--- a/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix
@@ -1,15 +1,23 @@
-{ocaml, findlib, stdenv, fetchurl}:
-
+{ocaml, findlib, stdenv, fetchurl, ocaml_sexplib}:
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
 stdenv.mkDerivation {
-  name = "ocaml-ipaddr-2.4.0";
+  name = "ocaml-ipaddr-2.5.0";
   
   src = fetchurl {
-    url = https://github.com/mirage/ocaml-ipaddr/archive/2.4.0.tar.gz;
-    sha256 = "0g7qg35w3vzcg37798rhbx7iia83286md3gj5gdhs1qgizlg56wx";
+    url = https://github.com/mirage/ocaml-ipaddr/archive/2.5.0.tar.gz;
+    sha256 = "0zpslxzjs5zdw20j3jaf6fr0w2imnidhrzggmnvwp198r76aq917";
   };
 
   buildInputs = [ocaml findlib];
+  propagatedBuildInputs = [ocaml_sexplib];
 
   createFindlibDestdir = true;
+
+  meta = with stdenv.lib; {
+    description = "An OCaml library for manipulation of IP (and MAC) address representations";
+    license = licenses.isc;
+    maintainers = [ maintainers.vbgl ];
+    platforms = ocaml.meta.platforms;
+  };
   
 }
diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
index 9f411dd2a6f..98747e2a193 100644
--- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     sha256 = "0bxqxzd5sd7siz57vhzb8bmiz1ddhgdv49gcsmwwfmd16mj4cryi";
   };
 
-  buildInputs = [ ocaml findlib ocamlPackages.lablgtk ];
+  buildInputs = [ ocaml findlib ocamlPackages.lablgtk ocamlPackages.camlp4 ];
 
   patches = ./destdir.patch;
 
diff --git a/pkgs/development/ocaml-modules/ocamlnet/configure.patch b/pkgs/development/ocaml-modules/ocamlnet/configure.patch
deleted file mode 100644
index 38b240f3c2c..00000000000
--- a/pkgs/development/ocaml-modules/ocamlnet/configure.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Naur ocamlnet-3.6.3.ori/configure ocamlnet-3.6.3/configure
---- ocamlnet-3.6.3.ori/configure	2013-01-14 00:04:59.000000000 +0000
-+++ ocamlnet-3.6.3/configure	2013-06-02 21:33:08.000000000 +0000
-@@ -642,59 +642,6 @@
- 	exit 1
-     fi
- 
--    printf "%s" "Checking whether lablgtk2 has GMain.Io.remove... "
--    mkdir -p tmp
--    cat <<EOF >tmp/gtk.ml
--let _ = GMain.Io.remove;;
--EOF
--
--    if ocamlfind ocamlc -package lablgtk2 -c tmp/gtk.ml >/dev/null 2>/dev/null;
--    then
--        echo "yes"
--    else
--        echo "no"
--        echo "Your version of lablgtk2 is too old!"
--	exit 1
--    fi
--    
--    printf "%s" "Checking whether lablgtk2 has GMain.Io.add_watch with list support... "
--    mkdir -p tmp
--    cat <<'EOF' >tmp/gtk.ml
--open GMain.Io
--let _ = (add_watch : cond:condition list -> callback:(condition list -> bool) -> ?prio:int -> channel -> id);;
--exit 0
--EOF
--    # Note: this newer API is never broken in the sense checked below, i.e.
--    # such lablgtk2 versions do not exist.
--    if ocamlfind ocamlc -package unix,lablgtk2 -linkpkg -o tmp/gtk tmp/gtk.ml >/dev/null 2>/dev/null && tmp/gtk; then
--        echo "yes"
--        gtk2_io_add_watch_supports_lists="-ppopt -DGTK2_IO_ADD_WATCH_SUPPORTS_LISTS"
--    else
--        echo "no"
--        printf "%s" "Checking whether lablgtk2's GMain.Io.add_watch is broken... "
--        mkdir -p tmp
--        cat <<'EOF' >tmp/gtk.ml
--GMain.Main.init();;
--let ch = GMain.Io.channel_of_descr (Unix.stdout) in
--let w = GMain.Io.add_watch
--          ~cond:`OUT ~callback:(fun () -> true) ch in
--(* add_watch is broken when it just returns Val_unit, and ok when it
-- * returns a positive int
-- *)
--if (Obj.magic w : int) > 0 then
--  exit 0
--else
--  exit 1
--EOF
--	if ocamlfind ocamlc -package unix,lablgtk2 -linkpkg -o tmp/gtk tmp/gtk.ml >/dev/null 2>/dev/null && tmp/gtk; then
--            echo "no"
--        else
--            echo "yes"
--            echo "You should apply the patch-ab-ml_glib.c to lablgtk2 to fix this!"
--	    exit 1
--        fi
--    fi
--
-     for f in Makefile uq_gtk.ml uq_gtk.mli uq_gtk_helper.ml; do
- 	rm -f src/equeue-gtk2/$f
- 	ln -s ../equeue-gtk1/$f src/equeue-gtk2
diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix
index f1bf39a283d..06e54a67733 100644
--- a/pkgs/development/ocaml-modules/ocamlnet/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix
@@ -5,19 +5,17 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "ocamlnet-3.7.3";
+  name = "ocamlnet-3.7.6";
 
   src = fetchurl {
-    url = http://download.camlcity.org/download/ocamlnet-3.7.3.tar.gz;
-    sha256 = "0s24icyrxkqqai91rgxpf52s1fx70j7p12c8vq9vcmvdhll6kp2d";
+    url = http://download.camlcity.org/download/ocamlnet-3.7.6.tar.gz;
+    sha256 = "0z17kxn1cyn1x5wgajw737m9rsjwji823rxdwvv8a5239xd1whji";
   };
 
   buildInputs = [ncurses ocaml findlib ocaml_pcre camlzip openssl ocaml_ssl cryptokit];
 
   propagatedbuildInputs = [ncurses ocaml_pcre camlzip openssl ocaml_ssl cryptokit];
 
-  patches = [ ./configure.patch ];
-
   createFindlibDestdir = true;
 
   dontAddPrefix = true;
diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix
index 43ec474cf5e..5807ceb256b 100644
--- a/pkgs/development/ocaml-modules/ounit/default.nix
+++ b/pkgs/development/ocaml-modules/ounit/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib}:
+{stdenv, fetchurl, ocaml, findlib, camlp4}:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     sha256 = "1qw8k2czy0bxhsf25kfpgywhpqmg7bi57rmyhlnmbddmvc61pg76";
   };
 
-  buildInputs = [ocaml findlib];
+  buildInputs = [ocaml findlib camlp4];
 
   dontAddPrefix = true;
 
diff --git a/pkgs/development/ocaml-modules/pprint/default.nix b/pkgs/development/ocaml-modules/pprint/default.nix
new file mode 100644
index 00000000000..18cc4817b13
--- /dev/null
+++ b/pkgs/development/ocaml-modules/pprint/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchurl, ocaml, findlib}:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
+
+stdenv.mkDerivation {
+
+  name = "ocaml-pprint-20140424";
+
+  src = fetchurl {
+    url = http://gallium.inria.fr/~fpottier/pprint/pprint-20140424.tar.gz;
+    sha256 = "0sc9q89dnyarcg24czyhr6ams0ylqvia3745s6rfwd2nldpygsdk";
+  };
+
+  buildInputs = [ ocaml findlib ];
+
+  createFindlibDestdir = true;
+
+  dontBuild = true;
+  installFlags = "-C src";
+
+  meta = with stdenv.lib; {
+    homepage = http://gallium.inria.fr/~fpottier/pprint/;
+    description = "An OCaml adaptation of Wadler’s and Leijen’s prettier printer";
+    license = licenses.cecill-c;
+    maintainers = [ maintainers.vbgl ];
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix
index ef3ab9a46b9..534a7684cec 100644
--- a/pkgs/development/ocaml-modules/sawja/default.nix
+++ b/pkgs/development/ocaml-modules/sawja/default.nix
@@ -1,4 +1,7 @@
-{stdenv, fetchurl, which, perl, ocaml, findlib, javalib }:
+{stdenv, fetchurl, which, perl, ocaml, findlib, javalib, camlp4 }:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
+
 let
   pname = "sawja";
   version = "1.5";
@@ -13,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "0i8qgqkw9vgj6k2g6npss268ivxdkzx5qj2a52jbd8ih59rn68cm";
   };
 
-  buildInputs = [ which perl ocaml findlib javalib ];
+  buildInputs = [ which perl ocaml findlib camlp4 ];
 
   patches = [ ./configure.sh.patch ./Makefile.config.example.patch ];
 
@@ -26,10 +29,11 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ javalib ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A library written in OCaml, relying on Javalib to provide a high level representation of Java bytecode programs";
     homepage = "${webpage}";
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.vbgl ];
     platforms = ocaml.meta.platforms;
   };
 }
diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix
new file mode 100644
index 00000000000..3dbb0ea8e81
--- /dev/null
+++ b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix
@@ -0,0 +1,29 @@
+{stdenv, fetchurl, ocaml, findlib, typeconv, camlp4}:
+
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+in
+
+assert stdenv.lib.versionOlder "3.12" ocaml_version;
+
+stdenv.mkDerivation {
+  name = "ocaml-sexplib-108.08.00";
+
+  src = fetchurl {
+    url = https://ocaml.janestreet.com/ocaml-core/108.08.00/individual/sexplib-108.08.00.tar.gz;
+    sha256 = "11z1k1d7dbb5m957klgalimpr0r602xp5zkkbgbffib1bphasarg";
+  };
+
+  buildInputs = [ocaml findlib];
+  propagatedBuildInputs = [typeconv camlp4];
+
+  createFindlibDestdir = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://ocaml.janestreet.com/;
+    description = "Library for serializing OCaml values to and from S-expressions";
+    license = licenses.asl20;
+    maintainers = [ maintainers.vbgl ];
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/sexplib/default.nix b/pkgs/development/ocaml-modules/sexplib/default.nix
index 7c40b5e6cfb..a32c6a0e2ce 100644
--- a/pkgs/development/ocaml-modules/sexplib/default.nix
+++ b/pkgs/development/ocaml-modules/sexplib/default.nix
@@ -1,22 +1,29 @@
-{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv}:
+{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, camlp4}:
+
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+in
+
+assert stdenv.lib.versionOlder "4.00" ocaml_version;
 
 stdenv.mkDerivation {
-  name = "ocaml-sexplib-7.0.5";
+  name = "ocaml-sexplib-111.25.0";
 
   src = fetchurl {
-    url = "http://forge.ocamlcore.org/frs/download.php/832/sexplib-7.0.5.tar.gz";
-    sha256 = "b1022da052254581aae51fb634345920364439f715a2c786abcd0b828c2ce697";
+    url = https://ocaml.janestreet.com/ocaml-core/111.25.00/individual/sexplib-111.25.00.tar.gz;
+    sha256 = "0qh0zqp5nakqpmmhh4x7cg03vqj3j2bj4zj0nqdlksai188p9ila";
   };
 
-  patches = [ ./sexp-3.10-compat.patch ./sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch ];
-  buildInputs = [ocaml findlib ocaml_typeconv ];
+  buildInputs = [ocaml findlib];
+  propagatedBuildInputs = [ocaml_typeconv camlp4];
 
   createFindlibDestdir = true;
 
-  meta = {
-    homepage = "http://forge.ocamlcore.org/projects/sexplib/";
+  meta = with stdenv.lib; {
+    homepage = https://ocaml.janestreet.com/;
     description = "Library for serializing OCaml values to and from S-expressions";
-    license = "LGPL";
+    license = licenses.asl20;
+    maintainers = [ maintainers.vbgl ];
     platforms = ocaml.meta.platforms;
   };
 }
diff --git a/pkgs/development/ocaml-modules/sexplib/sexp-3.10-compat.patch b/pkgs/development/ocaml-modules/sexplib/sexp-3.10-compat.patch
deleted file mode 100644
index 45e2abc6186..00000000000
--- a/pkgs/development/ocaml-modules/sexplib/sexp-3.10-compat.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-diff -ur orig/sexplib-7.0.5/lib/conv.ml sexplib-7.0.5/lib/conv.ml
---- orig/sexplib-7.0.5/lib/conv.ml	2012-03-20 17:41:54.000000000 +0100
-+++ sexplib-7.0.5/lib/conv.ml	2012-03-26 20:04:58.128032729 +0200
-@@ -665,7 +665,7 @@
-         | Parse_error pe ->
-             let ppos =
-               match pe.parse_state with
--              | `Sexp { parse_pos } | `Annot { parse_pos } -> parse_pos
-+              | `Sexp { parse_pos = parse_pos } | `Annot { parse_pos = parse_pos } -> parse_pos
-             in
-             List [
-               Atom "Sexplib.Sexp.Parse_error";
-diff -ur orig/sexplib-7.0.5/lib/pre_sexp.ml sexplib-7.0.5/lib/pre_sexp.ml
---- orig/sexplib-7.0.5/lib/pre_sexp.ml	2012-03-20 17:41:54.000000000 +0100
-+++ sexplib-7.0.5/lib/pre_sexp.ml	2012-03-26 20:04:58.129032741 +0200
-@@ -172,13 +172,7 @@
- (* Output of S-expressions to file *)
- 
- let save_of_output ?perm output_function file sexp =
--  let tmp_name, oc =
--    let temp_dir =
--      if Filename.is_relative file then "."
--      else Filename.dir_sep
--    in
--    Filename.open_temp_file ~temp_dir file "tmp"
--  in
-+  let tmp_name, oc = Filename.open_temp_file file "tmp" in
-   try
-     output_function oc sexp;
-     close_out oc;
-@@ -316,9 +310,9 @@
-     else if text_char < 0 then fail "text_char < 0"
-     else if global_offset < 0 then fail "global_offset < 0"
-     else if buf_pos < 0 then fail "buf_pos < 0"
--    else { text_line; text_char; global_offset; buf_pos }
-+    else { text_line = text_line; text_char = text_char; global_offset = global_offset; buf_pos = buf_pos }
- 
--  let with_buf_pos t buf_pos = { t with buf_pos }
-+  let with_buf_pos t buf_pos = { t with buf_pos = buf_pos }
- end
- 
- type ('a, 't) parse_result =
-@@ -347,11 +341,11 @@
- 
- exception Parse_error of parse_error
- 
--let bump_text_line { parse_pos } =
-+let bump_text_line { parse_pos = parse_pos } =
-   parse_pos.Parse_pos.text_line <- parse_pos.Parse_pos.text_line + 1;
-   parse_pos.Parse_pos.text_char <- 0
- 
--let bump_text_pos { parse_pos } =
-+let bump_text_pos { parse_pos = parse_pos } =
-   parse_pos.Parse_pos.text_char <- parse_pos.Parse_pos.text_char + 1
- 
- let bump_pos_cont state str ~max_pos ~pos cont =
-@@ -378,18 +372,18 @@
-   parse_pos.Parse_pos.buf_pos <- buf_pos;
-   parse_pos.Parse_pos.global_offset <- parse_pos.Parse_pos.global_offset + len
- 
--let mk_parse_pos { parse_pos } buf_pos =
-+let mk_parse_pos { parse_pos = parse_pos } buf_pos =
-   set_parse_pos parse_pos buf_pos;
-   parse_pos
- 
- let raise_parse_error parse_state location buf_pos err_msg =
-   begin
-     match parse_state with
--    | `Sexp { parse_pos } | `Annot { parse_pos } ->
-+    | `Sexp { parse_pos = parse_pos } | `Annot { parse_pos = parse_pos } ->
-         set_parse_pos parse_pos buf_pos;
-         parse_pos.Parse_pos.text_char <- parse_pos.Parse_pos.text_char + 1;
-   end;
--  let parse_error = { location; err_msg; parse_state } in
-+  let parse_error = { location = location; err_msg = err_msg; parse_state = parse_state } in
-   raise (Parse_error parse_error)
- 
- let raise_unexpected_char parse_state location buf_pos c =
-@@ -657,7 +651,7 @@
-     let max_pos = check_str_bounds "parse" ~pos ~len str in \
-     let state = \
-       { \
--        parse_pos; \
-+        parse_pos = parse_pos; \
-         pstack = INIT_PSTACK; \
-         pbuf = Buffer.create 128; \
-       } \
-@@ -681,20 +675,20 @@
- 
- let mk_annot_pos
-       ({ Parse_pos.text_line = line; text_char = col } as parse_pos) pos =
--  { Annot.line; col; offset = get_glob_ofs parse_pos pos }
-+  { Annot.line = line; col = col; offset = get_glob_ofs parse_pos pos }
- 
- let mk_annot_pos1
-       ({ Parse_pos.text_line = line; text_char = col } as parse_pos) pos =
--  { Annot.line; col = col + 1; offset = get_glob_ofs parse_pos pos }
-+  { Annot.line = line; col = col + 1; offset = get_glob_ofs parse_pos pos }
- 
--let add_annot_pos { parse_pos; pstack } pos =
-+let add_annot_pos { parse_pos = parse_pos; pstack = pstack } pos =
-   pstack.Annot.positions <- mk_annot_pos parse_pos pos :: pstack.Annot.positions
- 
--let add_annot_pos1 { parse_pos; pstack } pos =
-+let add_annot_pos1 { parse_pos = parse_pos; pstack = pstack } pos =
-   pstack.Annot.positions <-
-     mk_annot_pos1 parse_pos pos :: pstack.Annot.positions
- 
--let get_annot_range { parse_pos; pstack } pos =
-+let get_annot_range { parse_pos = parse_pos; pstack = pstack } pos =
-   let start_pos =
-     match pstack.Annot.positions with
-     | [] -> assert false  (* impossible *)
-@@ -708,7 +702,7 @@
-       offset = get_glob_ofs parse_pos pos;
-     }
-   in
--  { Annot.start_pos; end_pos }
-+  { Annot.start_pos = start_pos; end_pos = end_pos }
- 
- let mk_annot_atom parse_state str pos =
-   Annot.Atom (get_annot_range parse_state pos, Atom str)
-@@ -780,7 +774,7 @@
-   let rec loop this_parse ~pos ~len ~is_incomplete =
-     if len > 0 then
-       match this_parse ~pos ~len buf with
--      | Done (sexp, ({ Parse_pos.buf_pos } as parse_pos)) ->
-+      | Done (sexp, ({ Parse_pos.buf_pos = buf_pos } as parse_pos)) ->
-           rev_sexps_ref := sexp :: !rev_sexps_ref;
-           let n_parsed = buf_pos - pos in
-           let this_parse = mk_this_parse ~parse_pos my_parse in
-@@ -813,7 +807,7 @@
- 
- let of_string_bigstring loc this_parse ws_buf get_len get_sub str =
-   match this_parse str with
--  | Done (_, { Parse_pos.buf_pos }) when buf_pos <> get_len str ->
-+  | Done (_, { Parse_pos.buf_pos = buf_pos }) when buf_pos <> get_len str ->
-       let prefix_len = min (get_len str - buf_pos) 20 in
-       let prefix = get_sub str buf_pos prefix_len in
-       let msg =
-@@ -874,7 +868,7 @@
-       failwith (sprintf "Sexplib.Sexp.gen_load_sexp: end of file: %s" file)
-     else
-       match this_parse ~pos:0 ~len buf with
--      | Done (sexp, ({ Parse_pos.buf_pos } as parse_pos))
-+      | Done (sexp, ({ Parse_pos.buf_pos = buf_pos } as parse_pos))
-         when strict ->
-           let rec strict_loop this_parse ~pos ~len =
-             match this_parse ~pos ~len buf with
-@@ -938,7 +932,7 @@
- 
-   let get_conv_exn ~file ~exc annot_sexp =
-     let range = get_range annot_sexp in
--    let { start_pos = { line; col } } = range in
-+    let { start_pos = { line = line; col = col } } = range in
-     let loc = sprintf "%s:%d:%d" file line col in
-     Of_sexp_error (Annot.Conv_exn (loc, exc), get_sexp annot_sexp)
- end
-@@ -1003,7 +997,7 @@
-   let sexp = of_string str in
-   try f sexp
-   with Of_sexp_error (exc, sub_sexp) ->
--    raise (Of_string_conv_exn.E { Of_string_conv_exn.exc; sexp; sub_sexp })
-+    raise (Of_string_conv_exn.E { Of_string_conv_exn.exc = exc; sexp = sexp; sub_sexp = sub_sexp })
- 
- let of_string_conv_exn str f = gen_of_string_conv_exn of_string str f
- let of_bigstring_conv_exn bstr f = gen_of_string_conv_exn of_bigstring bstr f
diff --git a/pkgs/development/ocaml-modules/sexplib/sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch b/pkgs/development/ocaml-modules/sexplib/sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch
deleted file mode 100644
index 02e13e39445..00000000000
--- a/pkgs/development/ocaml-modules/sexplib/sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Patch from the fedora repository.
-
---- sexplib-7.0.5.old/myocamlbuild.ml	2012-03-20 16:41:54.000000000 +0000
-+++ sexplib-7.0.5/myocamlbuild.ml	2012-07-30 11:38:21.829869635 +0100
-@@ -438,7 +438,13 @@
-                    BaseEnvLight.var_choose cond_specs env
-                  in
-                    flag tags & spec)
--              t.flags
-+              t.flags;
-+
-+            flag ["ocaml"; "compile"; "byte"; "use_toploop"] (S[A"-I"; A"+compiler-libs"]);
-+            flag ["ocaml"; "link"; "byte"; "use_toploop"] (S[A"-I"; A"+compiler-libs"; A"+compiler-libs/ocamltoplevel.cma"]);
-+            flag ["ocaml"; "compile"; "native"; "use_toploop"] (S[A"-I"; A"+compiler-libs"]);
-+            flag ["ocaml"; "link"; "native"; "use_toploop"] (S[A"-I"; A"+compiler-libs"; A"+compiler-libs/ocamltoplevel.cmxa"]);
-+
-         | _ -> 
-             ()
-   
---- sexplib-7.0.5.old/_tags	2012-03-20 16:41:54.000000000 +0000
-+++ sexplib-7.0.5/_tags	2012-07-30 11:37:01.749255839 +0100
-@@ -49,6 +49,7 @@
- <lib_test/*.ml{,i}>: pkg_camlp4.extend
- # Library sexplib_top
- "top": include
-+<top/*.ml{,i}>: use_toploop
- # Executable sexp_test
- "lib_test/sexp_test.byte": use_sexplib
- "lib_test/sexp_test.byte": pkg_unix
diff --git a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix
index e8ec8e6f5da..94377a646c1 100644
--- a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix
+++ b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix
@@ -1,5 +1,7 @@
 {stdenv, fetchurl, ocaml, findlib, twt, ocaml_sqlite3 }:
 
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
+
 stdenv.mkDerivation {
   name = "ocaml-sqlite3EZ-0.1.0";
 
@@ -14,10 +16,11 @@ stdenv.mkDerivation {
 
   createFindlibDestdir = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://github.com/mlin/ocaml-sqlite3EZ;
     description = "A thin wrapper for sqlite3-ocaml with a simplified interface";
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
+    maintainers = [ maintainers.vbgl ];
     platforms = ocaml.meta.platforms;
   };
 }
diff --git a/pkgs/development/ocaml-modules/twt/default.nix b/pkgs/development/ocaml-modules/twt/default.nix
index c06449f68b4..0dc7170552c 100644
--- a/pkgs/development/ocaml-modules/twt/default.nix
+++ b/pkgs/development/ocaml-modules/twt/default.nix
@@ -20,10 +20,11 @@ stdenv.mkDerivation {
 
   installFlags = "PREFIX=$(out)";
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://people.csail.mit.edu/mikelin/ocaml+twt/;
     description = "“The Whitespace Thing” for OCaml";
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
+    maintainers = [ maintainers.vbgl ];
     platforms = ocaml.meta.platforms;
   };
 }
diff --git a/pkgs/development/ocaml-modules/typeconv/108.08.00.nix b/pkgs/development/ocaml-modules/typeconv/108.08.00.nix
new file mode 100644
index 00000000000..805a8926e18
--- /dev/null
+++ b/pkgs/development/ocaml-modules/typeconv/108.08.00.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchurl, ocaml, findlib, camlp4}:
+
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+in
+
+assert stdenv.lib.versionOlder "3.12" ocaml_version;
+
+stdenv.mkDerivation {
+  name = "ocaml-typeconv-108.08.00";
+
+  src = fetchurl {
+    url = https://ocaml.janestreet.com/ocaml-core/108.08.00/individual/type_conv-108.08.00.tar.gz;
+    sha256 = "08ysikwwp69zvc147lzzg79nwlrzrk738rj0ggcfadi8h5il42sl";
+  };
+
+  buildInputs = [ocaml findlib camlp4];
+
+  createFindlibDestdir = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://ocaml.janestreet.com/;
+    description = "Support library for OCaml preprocessor type conversions";
+    #license = licenses.apl20; invalid license
+    platforms = ocaml.meta.platforms;
+    maintainers = with maintainers; [ z77z ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/typeconv/3.0.5.nix b/pkgs/development/ocaml-modules/typeconv/3.0.5.nix
deleted file mode 100644
index 299e7729b91..00000000000
--- a/pkgs/development/ocaml-modules/typeconv/3.0.5.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{stdenv, fetchurl, ocaml, findlib}:
-
-# note: works only with ocaml >3.12
-
-stdenv.mkDerivation {
-  name = "ocaml-typeconv-3.0.5";
-
-  src = fetchurl {
-    url = "http://forge.ocamlcore.org/frs/download.php/821/type_conv-3.0.5.tar.gz";
-    sha256 = "90ac6c401a600a23012a3f513def6f67d4979b11bd551f4d0af78f0f0b479198";
-  };
-
-  buildInputs = [ocaml findlib ]; 
-
-  createFindlibDestdir = true;
-
-  meta = {
-    homepage = "http://forge.ocamlcore.org/projects/type-conv/";
-    description = "Support library for OCaml preprocessor type conversions";
-    license = "LGPL";
-    platforms = ocaml.meta.platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/typeconv/default.nix b/pkgs/development/ocaml-modules/typeconv/default.nix
index 33e30f5d5c8..359f906ce34 100644
--- a/pkgs/development/ocaml-modules/typeconv/default.nix
+++ b/pkgs/development/ocaml-modules/typeconv/default.nix
@@ -1,4 +1,10 @@
-{stdenv, fetchurl, ocaml, findlib}:
+{stdenv, fetchurl, ocaml, findlib, camlp4}:
+
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+in
+
+assert stdenv.lib.versionOlder "4.00" ocaml_version;
 
 stdenv.mkDerivation {
   name = "ocaml-typeconv-109.60.01";
@@ -8,7 +14,7 @@ stdenv.mkDerivation {
     sha256 = "0lpxri68glgq1z2pp02rp45cb909xywbff8d4idljrf6fzzil2zx";
   };
 
-  buildInputs = [ocaml findlib ]; 
+  buildInputs = [ocaml findlib camlp4];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix
index 02ac7f381e5..648f0a9cd17 100644
--- a/pkgs/development/ocaml-modules/tyxml/default.nix
+++ b/pkgs/development/ocaml-modules/tyxml/default.nix
@@ -1,29 +1,24 @@
-{stdenv, fetchurl, ocaml, findlib, ocaml_oasis}:
+{stdenv, fetchurl, ocaml, findlib, ocaml_oasis, camlp4}:
 
 stdenv.mkDerivation {
-  name = "tyxml-3.0.0";
+  name = "tyxml-3.1.1";
 
   src = fetchurl {
-    url = http://ocsigen.org/download/tyxml-3.0.0.tar.gz;
-    sha256 = "0cvbmyg4g0lg4f23032cjlxqklisccbjgj47117wm6gva8xi7xa3";
+    url = http://github.com/ocsigen/tyxml/archive/3.1.1.tar.gz;
+    sha256 = "1r8im382r68kn8qy0857nv3y7h42i6ajyclxzmigfai7v2xdd05z";
     };
 
-  buildInputs = [ocaml findlib ocaml_oasis];
+  buildInputs = [ocaml findlib ocaml_oasis camlp4];
 
   createFindlibDestdir = true;
 
-  configurePhase = ''
-  make setup-dev.exe
-  ./setup-dev.exe -configure --prefix $out
-  '';
-
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://ocsigen.org/tyxml/;
     description = "A library that makes it almost impossible for your OCaml programs to generate wrong XML ouput, using static typing";
-    license = "LGPL";
+    license = licenses.lgpl21;
     platforms = ocaml.meta.platforms;
-    maintainers = [
-      stdenv.lib.maintainers.gal_bolle
+    maintainers = with maintainers; [
+      gal_bolle vbgl
       ];
   };
 
diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix
index 1d0f5c6cd50..476f0e9bbe8 100644
--- a/pkgs/development/ocaml-modules/uucd/default.nix
+++ b/pkgs/development/ocaml-modules/uucd/default.nix
@@ -30,10 +30,11 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ xmlm ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "An OCaml module to decode the data of the Unicode character database from its XML representation";
     homepage = "${webpage}";
     platforms = ocaml.meta.platforms;
-    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ maintainers.vbgl ];
+    license = licenses.bsd3;
   };
 }
diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix
index c807bbd4463..ece5fb5e3e3 100644
--- a/pkgs/development/ocaml-modules/uunf/default.nix
+++ b/pkgs/development/ocaml-modules/uunf/default.nix
@@ -5,6 +5,9 @@ let
   webpage = "http://erratique.ch/software/${pname}";
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
 in
+
+assert stdenv.lib.versionAtLeast ocaml_version "3.12";
+
 stdenv.mkDerivation rec {
 
   name = "ocaml-${pname}-${version}";
@@ -28,10 +31,11 @@ stdenv.mkDerivation rec {
     ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "An OCaml module for normalizing Unicode text";
     homepage = "${webpage}";
     platforms = ocaml.meta.platforms;
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.vbgl ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix
index 862236c169b..26dc9742aeb 100644
--- a/pkgs/development/ocaml-modules/uutf/default.nix
+++ b/pkgs/development/ocaml-modules/uutf/default.nix
@@ -5,6 +5,9 @@ let
   webpage = "http://erratique.ch/software/${pname}";
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
 in
+
+assert stdenv.lib.versionAtLeast ocaml_version "3.12";
+
 stdenv.mkDerivation rec {
 
   name = "ocaml-${pname}-${version}";
@@ -28,10 +31,11 @@ stdenv.mkDerivation rec {
     ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Non-blocking streaming Unicode codec for OCaml";
     homepage = "${webpage}";
     platforms = ocaml.meta.platforms;
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.vbgl ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix
index bd19ab716f6..dacaeea49f4 100644
--- a/pkgs/development/ocaml-modules/xmlm/default.nix
+++ b/pkgs/development/ocaml-modules/xmlm/default.nix
@@ -5,6 +5,9 @@ let
   webpage = "http://erratique.ch/software/${pname}";
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
 in
+
+assert stdenv.lib.versionAtLeast ocaml_version "3.12";
+
 stdenv.mkDerivation rec {
 
   name = "ocaml-${pname}-${version}";
@@ -28,10 +31,11 @@ stdenv.mkDerivation rec {
     ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "An OCaml streaming codec to decode and encode the XML data format";
     homepage = "${webpage}";
     platforms = ocaml.meta.platforms;
-    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ maintainers.vbgl ];
+    license = licenses.bsd3;
   };
 }
diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix
index 562d25550da..0b40b68a7e8 100644
--- a/pkgs/development/ocaml-modules/yojson/default.nix
+++ b/pkgs/development/ocaml-modules/yojson/default.nix
@@ -25,10 +25,11 @@ stdenv.mkDerivation {
     mkdir $out/bin
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "An optimized parsing and printing library for the JSON format";
     homepage = "${webpage}";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.vbgl ];
     platforms = ocaml.meta.platforms;
   };
 }
diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix
new file mode 100644
index 00000000000..928a5d33f8f
--- /dev/null
+++ b/pkgs/development/pharo/launcher/default.nix
@@ -0,0 +1,71 @@
+{ stdenv, fetchurl, bash, pharo-vm, unzip, makeDesktopItem }:
+
+stdenv.mkDerivation rec {
+  version = "0.2.1-2014.09.29";
+  name = "pharo-launcher-${version}";
+  src = fetchurl {
+    url = "http://files.pharo.org/platform/launcher/blessed/PharoLauncher-user-${version}.zip";
+    md5 = "10945989c2b323c7f09a3b4e42ee7f2d";
+  };
+
+  executable-name = "pharo-launcher";
+
+  desktopItem = makeDesktopItem {
+    name = "Pharo";
+    exec = "${executable-name}";
+    icon = "pharo";
+    comment = "Launcher for Pharo distributions";
+    desktopName = "Pharo";
+    genericName = "Pharo";
+    categories = "Development;";
+  };
+
+  # because upstream tarball has no top-level directory.
+  sourceRoot = ".";
+
+  buildInputs = [ bash pharo-vm unzip ];
+
+  installPhase = ''
+    mkdir -p $prefix/share/pharo-launcher
+    mkdir -p $prefix/bin
+
+    mv PharoLauncher.image $prefix/share/pharo-launcher/pharo-launcher.image
+    mv PharoLauncher.changes $prefix/share/pharo-launcher/pharo-launcher.changes
+
+    mkdir -p $prefix/share/applications
+    cp "${desktopItem}/share/applications/"* $out/share/applications
+
+    cat > $prefix/bin/${executable-name} <<EOF
+    #!${bash}/bin/bash
+
+    exec ${pharo-vm}/bin/pharo-vm-x $prefix/share/pharo-launcher/pharo-launcher.image
+    EOF
+    chmod +x $prefix/bin/${executable-name}
+  '';
+
+  meta = {
+    description = "Launcher for Pharo distributions";
+    longDescription = ''
+
+      Pharo's goal is to deliver a clean, innovative, free open-source
+      Smalltalk-inspired environment. By providing a stable and small
+      core system, excellent dev tools, and maintained releases, Pharo
+      is an attractive platform to build and deploy mission critical
+      applications.
+
+      The Pharo Launcher is a cross-platform application that
+        - lets you manage your Pharo images (launch, rename, copy and delete);
+        - lets you download image templates (i.e., zip archives) from many
+          different sources (e.g., Jenkins, files.pharo.org);
+        - lets you create new images from any template.
+
+      The idea behind the Pharo Launcher is that you should be able to
+      access it very rapidly from your OS application launcher. As a
+      result, launching any image is never more than 3 clicks away.
+    '';
+    homepage = http://pharo.org;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.DamienCassou ];
+    platforms = pharo-vm.meta.platforms;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix
index 361785374bb..62c282949aa 100644
--- a/pkgs/development/pharo/vm/default.nix
+++ b/pkgs/development/pharo/vm/default.nix
@@ -1,11 +1,14 @@
 { stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xlibs, alsaLib }:
 
 stdenv.mkDerivation rec {
-  name = "pharo-vm-core-i386-2014.06.25";
+
+  version = "2014.09.20";
+
+  name = "pharo-vm-core-i386-${version}";
   system = "x86_32-linux";
   src = fetchurl {
-    url = http://files.pharo.org/vm/src/vm-unix-sources/blessed/pharo-vm-2014.08.14.tar.bz2;
-    md5 = "8e9e8dfde4f4bb69aac4590ecf82dd3b";
+    url = "http://files.pharo.org/vm/src/vm-unix-sources/blessed/pharo-vm-${version}.tar.bz2";
+    md5 = "f4183566aeeb7cb9d0d7832b4e40b573";
   };
 
   sources10Zip = fetchurl {
@@ -73,8 +76,6 @@ stdenv.mkDerivation rec {
     unzip ${sources30Zip} -d $prefix/lib/pharo-vm/
   '';
 
-  patches = [ patches/pharo-is-not-squeak.patch patches/fix-executable-name.patch patches/fix-cmake-root-directory.patch ];
- 
   buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xlibs.libX11 xlibs.libICE xlibs.libSM alsaLib ];
 
   meta = {
diff --git a/pkgs/development/pharo/vm/patches/fix-cmake-root-directory.patch b/pkgs/development/pharo/vm/patches/fix-cmake-root-directory.patch
deleted file mode 100644
index 27cce4d6f4c..00000000000
--- a/pkgs/development/pharo/vm/patches/fix-cmake-root-directory.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From: Damien Cassou <damien.cassou@gmail.com>
-Subject: Fix use of absolute paths in cmake files
-
-* build/directories.cmake
-* build/CMakeLists.txt
-* build/vm-sound-ALSA/CMakeLists.txt
-* build/vm-sound-null/CMakeLists.txt
-* build/vm-display-null/CMakeLists.txt
-* build/vm-display-X11/CMakeLists.txt
---- a/build/CMakeLists.txt
-+++ b/build/CMakeLists.txt
-@@ -71,7 +71,7 @@
- list(APPEND LINKLIBS m)
- list(APPEND LINKLIBS dl)
- list(APPEND LINKLIBS pthread)
--set(EXECUTABLE_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results")
-+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results")
- add_subdirectory("vm-display-null")
- add_subdirectory("vm-display-X11")
- add_subdirectory("vm-sound-ALSA")
---- a/build/directories.cmake
-+++ b/build/directories.cmake
-@@ -1,12 +1,12 @@
--set(topDir "/builds/workspace/Pharo-vm-unix-sources/cog")
--set(buildDir "/builds/workspace/Pharo-vm-unix-sources/cog/build")
-+set(topDir "${CMAKE_SOURCE_DIR}/..")
-+set(buildDir "${CMAKE_SOURCE_DIR}/../build")
- set(thirdpartyDir "${buildDir}/thirdParty")
--set(platformsDir "/builds/workspace/Pharo-vm-unix-sources/cog/platforms")
--set(srcDir "/builds/workspace/Pharo-vm-unix-sources/cog/src")
-+set(platformsDir "${CMAKE_SOURCE_DIR}/../platforms")
-+set(srcDir "${CMAKE_SOURCE_DIR}/../src")
- set(srcPluginsDir "${srcDir}/plugins")
- set(srcVMDir "${srcDir}/vm")
- set(platformName "unix")
- set(targetPlatform ${platformsDir}/${platformName})
- set(crossDir "${platformsDir}/Cross")
- set(platformVMDir "${targetPlatform}/vm")
--set(outputDir "/builds/workspace/Pharo-vm-unix-sources/cog/results")
-+set(outputDir "${CMAKE_SOURCE_DIR}/../results")
---- a/build/vm-display-X11/CMakeLists.txt
-+++ b/build/vm-display-X11/CMakeLists.txt
-@@ -11,7 +11,7 @@
- include_directories(${crossDir}/plugins/FilePlugin)
- include_directories(${targetPlatform}/plugins/B3DAcceleratorPlugin)
- include_directories(${crossDir}/plugins/B3DAcceleratorPlugin)
--set(LIBRARY_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results")
-+set(LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results")
- list(APPEND LINKLIBS SM)
- list(APPEND LINKLIBS ICE)
- list(APPEND LINKLIBS GL)
---- a/build/vm-display-null/CMakeLists.txt
-+++ b/build/vm-display-null/CMakeLists.txt
-@@ -11,7 +11,7 @@
- include_directories(${crossDir}/plugins/FilePlugin)
- include_directories(${targetPlatform}/plugins/B3DAcceleratorPlugin)
- include_directories(${crossDir}/plugins/B3DAcceleratorPlugin)
--set(LIBRARY_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results")
-+set(LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results")
- target_link_libraries(vm-display-null ${LINKLIBS})
- set_target_properties(vm-display-null PROPERTIES PREFIX "" SUFFIX "" 
- 			LINK_FLAGS -m32)
---- a/build/vm-sound-ALSA/CMakeLists.txt
-+++ b/build/vm-sound-ALSA/CMakeLists.txt
-@@ -11,7 +11,7 @@
- include_directories(${crossDir}/plugins/FilePlugin)
- include_directories(${targetPlatform}/plugins/B3DAcceleratorPlugin)
- include_directories(${crossDir}/plugins/B3DAcceleratorPlugin)
--set(LIBRARY_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results")
-+set(LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results")
- target_link_libraries(vm-sound-ALSA ${LINKLIBS})
- set_target_properties(vm-sound-ALSA PROPERTIES PREFIX "" SUFFIX "" 
- 			LINK_FLAGS -m32)
---- a/build/vm-sound-null/CMakeLists.txt
-+++ b/build/vm-sound-null/CMakeLists.txt
-@@ -11,7 +11,7 @@
- include_directories(${crossDir}/plugins/FilePlugin)
- include_directories(${targetPlatform}/plugins/B3DAcceleratorPlugin)
- include_directories(${crossDir}/plugins/B3DAcceleratorPlugin)
--set(LIBRARY_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results")
-+set(LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results")
- target_link_libraries(vm-sound-null ${LINKLIBS})
- set_target_properties(vm-sound-null PROPERTIES PREFIX "" SUFFIX "" 
- 			LINK_FLAGS -m32)
diff --git a/pkgs/development/pharo/vm/patches/fix-executable-name.patch b/pkgs/development/pharo/vm/patches/fix-executable-name.patch
deleted file mode 100644
index b32ed7a32d2..00000000000
--- a/pkgs/development/pharo/vm/patches/fix-executable-name.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Change the name of the executable file from Squeak to Pharo
---- a/platforms/unix/vm-display-X11/sqUnixX11.c
-+++ b/platforms/unix/vm-display-X11/sqUnixX11.c
-@@ -153,8 +153,8 @@
- /*** Variables -- X11 Related ***/
- 
- /* name of Squeak windows in Xrm and the WM */
--#define xResClass	"Squeak"
--#define xResName	"squeak"
-+#define xResClass	"pharo-vm"
-+#define xResName	"Pharo"
- 
- char		*displayName= 0;	/* name of display, or 0 for $DISPLAY */
- Display		*stDisplay= null;	/* Squeak display */
diff --git a/pkgs/development/pharo/vm/patches/pharo-is-not-squeak.patch b/pkgs/development/pharo/vm/patches/pharo-is-not-squeak.patch
deleted file mode 100644
index c06916c96ee..00000000000
--- a/pkgs/development/pharo/vm/patches/pharo-is-not-squeak.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-pharo --help must talk about Pharo and not about Squeak
---- a/platforms/unix/vm-display-X11/sqUnixX11.c
-+++ b/platforms/unix/vm-display-X11/sqUnixX11.c
-@@ -7075,8 +7075,8 @@
-   printf("  -lazy                 go to sleep when main window unmapped\n");
-   printf("  -mapdelbs             map Delete key onto Backspace\n");
-   printf("  -nointl               disable international keyboard support\n");
--  printf("  -notitle              disable the Squeak window title bar\n");
--  printf("  -title <t>            use t as the Squeak window title instead of the image name\n");
-+  printf("  -notitle              disable the Pharo window title bar\n");
-+  printf("  -title <t>            use t as the Pharo window title instead of the image name\n");
-   printf("  -ldtoms <n>           launch drop timeout milliseconds\n");
-   printf("  -noxdnd               disable X drag-and-drop protocol support\n");
-   printf("  -optmod <n>           map Mod<n> to the Option key\n");
-@@ -7095,7 +7095,7 @@
- static void display_printUsageNotes(void)
- {
-   printf("  Using `unix:0' for <dpy> may improve local display performance.\n");
--  printf("  -xshm only works when Squeak is running on the X server host.\n");
-+  printf("  -xshm only works when Pharo is running on the X server host.\n");
- }
- 
- 
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 4c9c53aab83..6ec7934e563 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -161,11 +161,12 @@ if disabled then throw "${name} not supported for interpreter ${python.executabl
 
   shellHook = attrs.shellHook or ''
     if test -e setup.py; then
-       mkdir -p /tmp/$name/lib/${python.libPrefix}/site-packages
+       tmp_path=/tmp/`pwd | md5sum | cut -f 1 -d " "`-$name
+       mkdir -p $tmp_path/lib/${python.libPrefix}/site-packages
        ${preShellHook}
-       export PATH="/tmp/$name/bin:$PATH"
-       export PYTHONPATH="/tmp/$name/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
-       ${python}/bin/${python.executable} setup.py develop --prefix /tmp/$name
+       export PATH="$tmp_path/bin:$PATH"
+       export PYTHONPATH="$tmp_path/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
+       ${python}/bin/${python.executable} setup.py develop --prefix $tmp_path
        ${postShellHook}
     fi
   '';
diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index dec94a912e0..f7ca5f2ec93 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 let
-  baseVersion = "3.1";
+  baseVersion = "3.2";
   revision = "0";
   version = "${baseVersion}.${revision}";
 in
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz";
-    sha256 = "c8c648f4988b707393e0f1958a8868718f27e59263f05f3b6599fa62290c2bbf";
+    sha256 = "0giilb0sl71w2p0vlaj4f9qjyaa4llbflp4m1dfdal30facbwizd";
   };
 
   # This property can be used in a nix development environment to refer to the Qt package
diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index e986944d45d..2f1f2651063 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -38,7 +38,7 @@
 
 let
 
-  inherit (pkgs) R fetchurl stdenv curl;
+  inherit (pkgs) R fetchurl stdenv;
 
   buildRPackage = import ./generic-builder.nix R;
 
@@ -2479,7 +2479,7 @@ let self = _self // overrides; _self = with self; {
   jpeg = derive { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; };
   JPSurv = derive { name="JPSurv"; version="1.0.1"; sha256="11hfji0nyfmw1d7y2cijpp7ivlv5s9k8g771kmgwy14wflkyf7g2"; depends=[]; };
   jSonarR = derive { name="jSonarR"; version="1.0"; sha256="1369v79y2679p1c1s6pfi0zdj21zbbln3a4gqsxivx82m0lwqprp"; depends=[RCurl]; };
-  jsonlite = derive { name="jsonlite"; version="0.9.10"; sha256="0w49mv4fabzgc86gv2jn9apwf9k6bk1s1p3mjmaxpmw95wgjpc9r"; depends=[]; };
+  jsonlite = derive { name="jsonlite"; version="0.9.11"; sha256="4e6d86dfd1584ed2b96b1eb6c067b07847df5fff673d07ffacca6399c330552e"; depends=[]; };
   jtrans = derive { name="jtrans"; version="0.1"; sha256="1wcrjyifsnpk9jfmwc1cx30qp5vavwl87i0avbbls8cmji7z0nay"; depends=[]; };
   JudgeIt = derive { name="JudgeIt"; version="1.5.1"; sha256="1jssz1x9gw9hjpqlqbvlxa99icl8gffzl6qya0cnaxr50p82hdag"; depends=[]; };
   Julia = derive { name="Julia"; version="1.0"; sha256="0df72mjkfsaz7wbrg3l6fcypwm59hdxxndjv1b833xa4qpq5301g"; depends=[]; };
@@ -4252,7 +4252,7 @@ let self = _self // overrides; _self = with self; {
   rcqp = derive { name="rcqp"; version="0.3"; sha256="0vxcgchnxdsdamclcshjbkn00ysmfmqp586a36wsyv3zqrd6rg7p"; depends=[plyr]; };
   Rcsdp = derive { name="Rcsdp"; version="0.1.53"; sha256="0x91hyx6z9f4zd7djxlq7dnznmr9skyzwbbcbjyid9hxbcfyvhcp"; depends=[]; };
   rCUR = derive { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5vl7v2k1024f42f7526g2p2lx"; depends=[MASS Matrix lattice]; };
-  RCurl = derive { name="RCurl"; version="1.95-4.3"; sha256="1gyjarnxwz3ldpm1vwq9ls6al66rvs7yshzhrl1fv9lbm1qi8yfg"; depends=[bitops curl]; };
+  RCurl = derive { name="RCurl"; version="1.95-4.3"; sha256="1gyjarnxwz3ldpm1vwq9ls6al66rvs7yshzhrl1fv9lbm1qi8yfg"; depends=[bitops pkgs.curl]; };
   Rd2roxygen = derive { name="Rd2roxygen"; version="1.4"; sha256="09dxgp65zac5b9mxbjrvy3ihdwski98xva5afq659b8yfvkviq4g"; depends=[roxygen2 formatR]; };
   rda = derive { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvwpqsj6f7vljqqfzh2l6kcj43vjj"; depends=[]; };
   rdatamarket = derive { name="rdatamarket"; version="0.6.4"; sha256="16a1yxvf841505a8gh7jf09fx6ipysymrpvsd4b07xdg5hvbzx25"; depends=[zoo RCurl RJSONIO]; };
@@ -4387,11 +4387,11 @@ let self = _self // overrides; _self = with self; {
   Rgbp = derive { name="Rgbp"; version="1.0.6"; sha256="1j4j7g9z7p592f82k0yvibrydynkd9v1ldil2vf3ikc650bn2l02"; depends=[sn]; };
   RGCCA = derive { name="RGCCA"; version="2.0"; sha256="0mcp51z5jkn7yxmspp5cvmmvq0cwh7hj66g7wjmxsi74dwxcinvg"; depends=[MASS]; };
   rgcvpack = derive { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; };
-  rgdal = derive { name="rgdal"; version="0.8-16"; sha256="17qk7kd0l0l52nyf6drr0gv4b0ibkggyn6g3ky9flsjy05b3wg8j"; depends=[sp]; };
+  rgdal = derive { name="rgdal"; version="0.8-16"; sha256="17qk7kd0l0l52nyf6drr0gv4b0ibkggyn6g3ky9flsjy05b3wg8j"; depends=[sp pkgs.gdal pkgs.proj]; };
   RGENERATE = derive { name="RGENERATE"; version="1.1"; sha256="1da3b50cfv5jb63ijzbnr226jadbww2bapcxzx8am7zydm6gqnss"; depends=[RMAWGEN]; };
   RGenetics = derive { name="RGenetics"; version="0.1"; sha256="0x5sspd67hh08qm62whlnnd838m0np29q3bfzgwp6j85lhil3jrx"; depends=[]; };
   rgenoud = derive { name="rgenoud"; version="5.7-12"; sha256="17gzkn4laylnksy8h2w8c0whcxpchsx7bwjzk1q5sfqxswclqq0g"; depends=[]; };
-  rgeos = derive { name="rgeos"; version="0.3-6"; sha256="134cppgg5349i5qs9k2161fakd15l1fx1x6mgv28c5vic2xdm4wl"; depends=[sp]; };
+  rgeos = derive { name="rgeos"; version="0.3-6"; sha256="134cppgg5349i5qs9k2161fakd15l1fx1x6mgv28c5vic2xdm4wl"; depends=[sp pkgs.geos]; };
   rgexf = derive { name="rgexf"; version="0.14.3.11"; sha256="16mil1csyzkaywcdrjzz5r60n4xhhinxawg30skc7d9awkf26qfa"; depends=[XML Rook igraph]; };
   rggobi = derive { name="rggobi"; version="2.1.20"; sha256="1a7l68h3m9cq14k7y96ijgh0iz3d6j4j2anxg50pykz20lnykr9g"; depends=[RGtk2]; };
   RGIFT = derive { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; };
@@ -4450,7 +4450,19 @@ let self = _self // overrides; _self = with self; {
   Rivivc = derive { name="Rivivc"; version="0.9"; sha256="0gl3040pp9nqm4g2ympnx80z64zfnn1hfsxka8ynd2cqhjn3b5i1"; depends=[signal]; };
   RJaCGH = derive { name="RJaCGH"; version="2.0.2"; sha256="1fy8wsnv7diwg2w7j61scm6vd35a5jb36i9pzh5m7jz6yqsank50"; depends=[]; };
   rjags = derive { name="rjags"; version="3-13"; sha256="0npfyphi8z25h7w4frplbyjgib1gawz7ib9gz5w6h2i0pricm53r"; depends=[coda]; };
-  rJava = derive { name="rJava"; version="0.9-6"; sha256="008g6s6rcb5lnz5y2a2rs4iq85a4nl522g714s1w1r153qcc0jz0"; depends=[]; };
+  rJava = buildRPackage {
+    name = "rJava-0.9-6";
+    src = fetchurl {
+      url = "mirror://cran/src/contrib/rJava_0.9-6.tar.gz";
+      sha256 ="008g6s6rcb5lnz5y2a2rs4iq85a4nl522g714s1w1r153qcc0jz0";
+    };
+    propagatedBuildInputs = [pkgs.jdk pkgs.lzma pkgs.bzip2 pkgs.pcre pkgs.icu pkgs.libzip];
+    preConfigure = ''
+    export JAVA_CPPFLAGS=-I${pkgs.jdk}/include/
+    export JAVA_HOME=${pkgs.jdk}
+    '';
+    meta.hydraPlatforms = R.meta.hydraPlatforms;
+  };
   rJavax = derive { name="rJavax"; version="0.3"; sha256="0sv2fjinp4wmdfvcpgm4hv8v3fkiiv84ywqyr4hz86j50ncd79km"; depends=[rJava]; };
   RJDBC = derive { name="RJDBC"; version="0.2-4"; sha256="14nqz4gx24gcjmnd3hrhvfs5f68c3nqhb6nypv9gvk19dx1jayg0"; depends=[DBI rJava]; };
   rje = derive { name="rje"; version="1.9"; sha256="1dyd34z6lb0p6zmyax5dpzflgc9a4saka33mvdfcxi5pj0rnygaz"; depends=[]; };
@@ -5841,7 +5853,7 @@ let self = _self // overrides; _self = with self; {
   xlsx = derive { name="xlsx"; version="0.5.7"; sha256="0qxkdpf1dvi0x7fy65abjx2j60rdx7fv5yi8l2wdm0f2631pnwin"; depends=[rJava xlsxjars]; };
   xlsxjars = derive { name="xlsxjars"; version="0.6.0"; sha256="0mjfvd433iz742gn3avaq48172yi5hhd0ajc3v22y1j4k9w82pr7"; depends=[rJava]; };
   Xmisc = derive { name="Xmisc"; version="0.1.0"; sha256="1iyv9gp7fw3r7s3v9srd799nhwgpn5851v3n2xfwpcvj9kczrd5r"; depends=[]; };
-  XML = derive { name="XML"; version="3.98-1.1"; sha256="0n9i6746211wihglbpsgalj2cyvggn4rv6a4fbavqwnjw3h1hwwl"; depends=[]; };
+  XML = derive { name="XML"; version="3.98-1.1"; sha256="0n9i6746211wihglbpsgalj2cyvggn4rv6a4fbavqwnjw3h1hwwl"; depends=[pkgs.libxml2]; };
   XML2R = derive { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[XML RCurl plyr]; };
   XNomial = derive { name="XNomial"; version="1.0.1"; sha256="134bwglqhgah7v3w6ir65dch2dwp5h4vldw521ba74l5v9b2j2h4"; depends=[]; };
   xoi = derive { name="xoi"; version="0.61-1"; sha256="0ypy0rb0f0bns41vjzyln04k3hypgr3wysqbdi0b0r14ip5rb47k"; depends=[qtl]; };
diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix
index cf60f1af767..fb7d8e74e45 100644
--- a/pkgs/development/tools/analysis/findbugs/default.nix
+++ b/pkgs/development/tools/analysis/findbugs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "findbugs-2.0.3";
+  name = "findbugs-3.0.0";
 
   src = fetchurl {
-    url = mirror://sourceforge/findbugs/findbugs-2.0.3.tar.gz;
-    sha256 = "17s93vszc5s2b7pwi0yk8d6w54gandxrr7vflhzmpbl6sxj2mfjr";
+    url = mirror://sourceforge/findbugs/findbugs-3.0.0.tar.gz;
+    sha256 = "0csz6drzdz867r2p2wa4cvick6bv9dpz2yym9wrvp3fnxabmgiri";
   };
 
   buildPhase = ''
diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix
index a40215592f4..62182d0b845 100644
--- a/pkgs/development/tools/analysis/spin/default.nix
+++ b/pkgs/development/tools/analysis/spin/default.nix
@@ -1,13 +1,14 @@
 {stdenv, fetchurl, yacc }:
 
 stdenv.mkDerivation rec {
-  version = "6.3.2";
   name = "spin-${version}";
+  version = "6.4.1";
+  url-version = stdenv.lib.replaceChars ["."] [""] version;
 
   src = fetchurl {
-    url = http://spinroot.com/spin/Src/spin632.tar.gz;
+    url = "http://spinroot.com/spin/Src/spin${url-version}.tar.gz";
     curlOpts = "--user-agent 'Mozilla/5.0'";
-    sha256 = "1llsv1mnwr99hvsm052i3wwpa3dm5j12s5p10hizi6i9hlp00b5y";
+    sha256 = "02r2jazb2hnhcqcjnmlj6sjd9dvyfalgi99bzncwfadixf3hmpvn";
   };
 
   buildInputs = [ yacc ];
@@ -16,10 +17,10 @@ stdenv.mkDerivation rec {
 
   installPhase = "install -D spin $out/bin/spin";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Formal verification tool for distributed software systems";
     homepage = http://spinroot.com/;
     license = "free";
-    maintainers = [ stdenv.lib.maintainers.mornfall ];
+    maintainers = with maintainers; [ mornfall pSub ];
   };
 }
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index aaeee026d0a..64f3b7d60ab 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, gdb }:
 
 stdenv.mkDerivation rec {
-  name = "valgrind-3.9.0";
+  name = "valgrind-3.10.0";
 
   src = fetchurl {
     url = "http://valgrind.org/downloads/${name}.tar.bz2";
-    sha256 = "1w6n5qvxy2ssbczcl1c2yd2ggjn3ipay2hvpn10laly2dfh73bz6";
+    sha256 = "1jgd42vsx0bcblp91bd61hd5wpy0gghh09wxgm65m666vy17y103";
   };
 
   patches = [ ./glibc-2.19.patch ];
diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix
new file mode 100644
index 00000000000..5538eae4104
--- /dev/null
+++ b/pkgs/development/tools/boost-build/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "boost-build-2.0-m12";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/boost/${name}.tar.bz2";
+    sha256 = "10sbbkx2752r4i1yshyp47nw29lyi1p34sy6hj7ivvnddiliayca";
+  };
+
+  patchPhase = ''
+    grep -r '/usr/share/boost-build' \
+      | awk '{split($0,a,":"); print a[1];}' \
+      | xargs sed -i "s,/usr/share/boost-build,$out/share/boost-build,"
+  '';
+
+  buildPhase = ''
+    cd jam_src
+    ./build.sh
+  '';
+
+  installPhase = ''
+    # Install Bjam
+    mkdir -p $out/bin
+    cd "$(ls | grep bin)"
+    cp -a bjam $out/bin
+
+    # Bjam is B2
+    ln -s bjam $out/bin/b2
+
+    # Install the shared files (don't include jam_src)
+    cd ../..
+    rm -rf jam_src
+    mkdir -p $out/share
+    cp -a . $out/share/boost-build
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.boost.org/boost-build2/;
+    license = "boost-license";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/development/tools/build-managers/apache-maven/builder.sh b/pkgs/development/tools/build-managers/apache-maven/builder.sh
new file mode 100644
index 00000000000..03e4a041402
--- /dev/null
+++ b/pkgs/development/tools/build-managers/apache-maven/builder.sh
@@ -0,0 +1,17 @@
+source $stdenv/setup
+
+unpackPhase
+
+mkdir -p $out
+cp -r $name/* $out
+
+wrapProgram $out/bin/mvn --set JAVA_HOME "$jdk"
+
+# Add the maven-axis and JIRA plugin by default when using maven 1.x
+if [ -e $out/bin/maven ]
+then
+  export OLD_HOME=$HOME
+  export HOME=.
+  $out/bin/maven plugin:download -DgroupId=maven-plugins -DartifactId=maven-axis-plugin -Dversion=0.7
+  export HOME=OLD_HOME
+fi
diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix
new file mode 100644
index 00000000000..69dbf46bcdd
--- /dev/null
+++ b/pkgs/development/tools/build-managers/apache-maven/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, jdk, makeWrapper }:
+
+assert jdk != null;
+
+stdenv.mkDerivation {
+  name = "apache-maven-3.2.3";
+
+  builder = ./builder.sh;
+
+  src = fetchurl {
+    url = mirror://apache/maven/maven-3/3.2.3/binaries/apache-maven-3.2.3-bin.tar.gz;
+    sha256 = "1vd81bhj68mhnkb0zlarshlk61i2n160pyxxmrc739p3vsm08gxz";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  inherit jdk;
+
+  meta = with stdenv.lib; {
+    description = "Build automation tool (used primarily for Java projects)";
+    homepage = http://maven.apache.org/;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/development/tools/build-managers/cargo/common.nix b/pkgs/development/tools/build-managers/cargo/common.nix
new file mode 100644
index 00000000000..e60efc18d29
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cargo/common.nix
@@ -0,0 +1,52 @@
+{stdenv, fetchurl, zlib}:
+
+with stdenv.lib;
+
+rec {
+  platform = if stdenv.system == "i686-linux"
+    then "i686-unknown-linux-gnu"
+    else if stdenv.system == "x86_64-linux"
+    then "x86_64-unknown-linux-gnu"
+    else if stdenv.system == "i686-darwin"
+    then "i686-apple-darwin"
+    else if stdenv.system == "x86_64-darwin"
+    then "x86_64-apple-darwin"
+    else throw "no snapshot to boostrap for this platform (missing platform url suffix)";
+
+  snapshotHash = if stdenv.system == "i686-linux"
+    then "c92895421e6fa170dbd713e74334b8c3cf22b817"
+    else if stdenv.system == "x86_64-linux"
+    then "66ee4126f9e4820cd82e78181931f8ea365904de"
+    else if stdenv.system == "i686-darwin"
+    then "e2364b1f1ece338b9fc4c308c472fc2413bff04e"
+    else if stdenv.system == "x86_64-darwin"
+    then "09f92f06ab4f048acf71d83dc0426ff1509779a9"
+    else throw "no snapshot for platform ${stdenv.system}";
+
+  snapshotDate = "2014-09-19";
+  snapshotName = "cargo-nightly-${platform}.tar.gz";
+
+  snapshot = stdenv.mkDerivation {
+    name = "cargo-snapshot-${snapshotDate}";
+    src = fetchurl {
+      url = "https://static-rust-lang-org.s3.amazonaws.com/cargo-dist/${snapshotDate}/${snapshotName}";
+      sha1 = snapshotHash;
+    };
+    dontStrip = true;
+    installPhase = ''
+      mkdir -p "$out"
+      cp -r bin "$out/bin"
+    '' + (if stdenv.isLinux then ''
+      patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker}" \
+               --set-rpath "${stdenv.gcc.gcc}/lib/:${stdenv.gcc.gcc}/lib64/:${zlib}/lib" \
+               "$out/bin/cargo"
+    '' else "");
+  };
+
+  meta = {
+    homepage = http://crates.io;
+    description = "Downloads your Rust project's dependencies and builds your project";
+    license = [ licenses.mit licenses.asl20 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix
new file mode 100644
index 00000000000..e86b19ca33e
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cargo/snapshot.nix
@@ -0,0 +1,7 @@
+{ stdenv, fetchurl, zlib }:
+
+/* Cargo binary snapshot */
+
+with ((import ./common.nix) { inherit stdenv fetchurl zlib; });
+
+snapshot // { inherit meta; }
diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index 99353a1a192..49e1dcb29c3 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -3,17 +3,17 @@
 
 stdenv.mkDerivation rec {
   pname = "leiningen";
-  version = "2.4.2";
+  version = "2.5.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
-    sha256 = "1qdq3v7wv9jacw4bipgx24knlipw6zdcx43yd1qyw6zwaad51ckw";
+    sha256 = "1drl35313xp2gg5y52wp8414i2fm806rhgcsghl4igrm3afrv85x";
   };
 
   jarsrc = fetchurl {
     url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.jar";
-    sha256 = "0n4kpmzw9nvppq758lhnrr7xps5j6gwmdm98m772cj7j4vixsrzb";
+    sha256 = "0fd7yqrj9asx1n3nszli7hr4fj47v2pdr9msk5g75955pw7yavp9";
   };
 
   patches = [ ./lein-fix-jar-path.patch ];
diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index e173f827664..07268867044 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -2,7 +2,7 @@
 
 let
   name = "scons";
-  version = "2.3.3";
+  version = "2.3.4";
 in
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/scons/${name}-${version}.tar.gz";
-    sha256 = "1qn0gk4k796a6vwsq62w80d6w96r9xh6kz7aa14xb6md2884x9v3";
+    sha256 = "0hdlci43wjz8maryj83mz04ir6rwcdrrzpd7cpzvdlzycqhdfmsb";
   };
 
   buildInputs = [python makeWrapper];
diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index a5d7d260804..e1f7f19dd56 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -1,12 +1,13 @@
 { stdenv, fetchurl, pkgconfig, perl, python, libxml2Python, libxslt, which
-, docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils, dblatex, gettext }:
+, docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils, dblatex, gettext, itstool }:
 
-stdenv.mkDerivation {
-  name = "gtk-doc-1.18";
+stdenv.mkDerivation rec {
+  name = "gtk-doc-${version}";
+  version = "1.21";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gtk-doc/1.18/gtk-doc-1.18.tar.xz;
-    sha256 = "084scak99ppgqk5lkziskhcsd3jmcgf7a98ddwhciq8vaqf5jnvq";
+    url = "mirror://gnome/sources/gtk-doc/${version}/${name}.tar.xz";
+    sha256 = "0gpfh25qxsic7n25pfl74mjp38hdm3pr4islhlaxv3p05q0lv4sx";
   };
 
   # maybe there is a better way to pass the needed dtd and xsl files
@@ -27,6 +28,13 @@ stdenv.mkDerivation {
 
   buildInputs =
    [ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
-     gnome_doc_utils dblatex gettext which
+     gnome_doc_utils dblatex gettext which itstool
    ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.gtk.org/gtk-doc;
+    description = "Tools to extract documentation embedded in GTK+ and GNOME source code";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ pSub ];
+  };
 }
diff --git a/pkgs/development/tools/haskell/BNFC/default.nix b/pkgs/development/tools/haskell/BNFC/default.nix
index f335aebc570..4acc8f38f17 100644
--- a/pkgs/development/tools/haskell/BNFC/default.nix
+++ b/pkgs/development/tools/haskell/BNFC/default.nix
@@ -1,24 +1,25 @@
-{ cabal, mtl, fetchpatch, alex, happy }:
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, alex, deepseq, filepath, happy, hspec, HUnit, mtl
+, QuickCheck, temporary
+}:
 
 cabal.mkDerivation (self: {
   pname = "BNFC";
-  version = "2.6.0.3";
-  sha256 = "0i38rwslkvnicnlxbrxybnwkgfin04lnr4q12lcvli4ldp2ylfjq";
+  version = "2.7.0.1";
+  sha256 = "18009jrpd5kcaz06j4ksay4c7c65m4zrc7jrp3rjx81bs6gkrwk1";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ mtl ];
+  buildDepends = [ deepseq filepath mtl ];
+  testDepends = [
+    deepseq filepath hspec HUnit mtl QuickCheck temporary
+  ];
   buildTools = [ alex happy ];
-  patches = [ (fetchpatch { url = "https://github.com/BNFC/bnfc/pull/3.patch"; sha256 = "1i87crwva5m3v095lv3zxs38pr6nmly58krlr6sxpwnakpr0pxsp"; }) ];
-  patchFlags = "-p2";
-  preConfigure = "runhaskell Setup.lhs clean";
   meta = {
     homepage = "http://bnfc.digitalgrammars.com/";
     description = "A compiler front-end generator";
-    license = "GPL";
+    license = self.stdenv.lib.licenses.gpl2;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = with self.stdenv.lib.maintainers; [ andres simons ];
   };
 })
diff --git a/pkgs/development/tools/haskell/cabal-bounds/default.nix b/pkgs/development/tools/haskell/cabal-bounds/default.nix
index 368c421221b..b0bf11bb2a0 100644
--- a/pkgs/development/tools/haskell/cabal-bounds/default.nix
+++ b/pkgs/development/tools/haskell/cabal-bounds/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal-bounds";
-  version = "0.8.6";
-  sha256 = "0q7fpblhxba4np5a9igwmcvmkkvka9f85nccxw0m2lvwbjrs51xq";
+  version = "0.8.7";
+  sha256 = "03kp59nhdyq3bl91akd38iwvwwy3zgvadx85lwl3827nr6s774qk";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index db7e472934c..07ba2a4a09e 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.69";
-  sha256 = "0430086lh1h7w8wxc42aqrdjb8i12vz8m0jr1q2c45h3k6brb5r5";
+  version = "1.70";
+  sha256 = "0jc66x6p6blcz1pk4pkdh93dx17658pr0i5h4w3zynv4c2jgy138";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/tools/haskell/cake3/default.nix b/pkgs/development/tools/haskell/cake3/default.nix
index 5b948f510bf..fba7d2e4d2a 100644
--- a/pkgs/development/tools/haskell/cake3/default.nix
+++ b/pkgs/development/tools/haskell/cake3/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cake3";
-  version = "0.5.1.0";
-  sha256 = "0kqx8xr0ynbn7fhfz11is7lbi32dfladsx32bcpspykqj1bjv954";
+  version = "0.5.2.0";
+  sha256 = "0wr797r7sg8f48r2pjl2nw70vcdkiamqghz2zpfr6awy9018fhgw";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/tools/haskell/codex/default.nix b/pkgs/development/tools/haskell/codex/default.nix
index a2f9c119700..b3c1ba9fa66 100644
--- a/pkgs/development/tools/haskell/codex/default.nix
+++ b/pkgs/development/tools/haskell/codex/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "codex";
-  version = "0.1.0.4";
-  sha256 = "1wnrjmf2iypnmdsmjxbjg7kqn8802yhd9vbdc4vg19pqspir87wz";
+  version = "0.1.0.5";
+  sha256 = "0hlx72dan9qvwrpp6rkyr6y9zk2lafa15va098w38r7658jymfy0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/tools/haskell/graphmod/default.nix b/pkgs/development/tools/haskell/graphmod/default.nix
new file mode 100644
index 00000000000..6165e46dd5b
--- /dev/null
+++ b/pkgs/development/tools/haskell/graphmod/default.nix
@@ -0,0 +1,18 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, dotgen, filepath, haskellLexer }:
+
+cabal.mkDerivation (self: {
+  pname = "graphmod";
+  version = "1.2.5";
+  sha256 = "1rmrsfvajzrak7jlhwnvhrgszgyg1b6z5wp21k0d7pv2cbfdkp8s";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ dotgen filepath haskellLexer ];
+  meta = {
+    homepage = "http://github.com/yav/graphmod/wiki";
+    description = "Present the module dependencies of a program as a \"dot\" graph";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/tools/haskell/ihaskell/default.nix b/pkgs/development/tools/haskell/ihaskell/default.nix
new file mode 100644
index 00000000000..f6505384128
--- /dev/null
+++ b/pkgs/development/tools/haskell/ihaskell/default.nix
@@ -0,0 +1,49 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+# This file was later edited to add patches, disable testing.
+# Also patch the profile config to point to the ihaskell kernel exe
+
+{ cabal, aeson, base64Bytestring, cereal, classyPrelude, cmdargs
+, filepath, ghcParser, ghcPaths, haskeline, haskellSrcExts, here
+, hlint, hspec, HTTP, HUnit, MissingH, monoTraversable, mtl, parsec
+, random, setenv, shelly, split, stm, strict, systemArgv0
+, systemFilepath, tar, text, transformers, unorderedContainers
+, utf8String, uuid, vector, zeromq4Haskell, fetchpatch
+}:
+
+cabal.mkDerivation (self: {
+  pname = "ihaskell";
+  version = "0.4.2.0";
+  sha256 = "012rmasdc167w6gl18ysr53737j4p4afk0qcsv81hif92vvg5j1c";
+  isLibrary = true;
+  isExecutable = true;
+  patches = [ (fetchpatch { url = "https://github.com/gibiansky/IHaskell/pull/288.patch"; sha256 = "022zdz4wnyra6cfa7mq0w2ycsb007cvppn2f1360nr3fa5s9wibg"; }) ];
+  prePatch = ''
+    tar xvf profile/profile.tar -C profile
+    sed -i -e '1iexe = "'$out'/bin/IHaskell".replace(" ", "\\ ")\' profile/ipython_config.py
+  '';
+  doCheck = false;
+  buildDepends = [
+    aeson base64Bytestring cereal classyPrelude cmdargs filepath
+    ghcParser ghcPaths haskeline haskellSrcExts here hlint hspec HTTP
+    HUnit MissingH monoTraversable mtl parsec random shelly split stm
+    strict systemArgv0 systemFilepath tar text transformers
+    unorderedContainers utf8String uuid vector zeromq4Haskell
+  ];
+  testDepends = [ # let's keep these anyway
+    aeson base64Bytestring cereal classyPrelude cmdargs filepath
+    ghcParser ghcPaths haskeline haskellSrcExts here hlint hspec HTTP
+    HUnit MissingH monoTraversable mtl parsec random setenv shelly
+    split stm strict systemArgv0 systemFilepath tar text transformers
+    unorderedContainers utf8String uuid vector zeromq4Haskell
+  ];
+  postInstall = ''
+    patchShebangs .
+  '';
+  meta = with self.stdenv.lib; {
+    homepage = "http://gibiansky.github.io/IHaskell/";
+    description = "A Haskell backend kernel for the IPython project";
+    license = licenses.mit;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with maintainers; [ edwtjo ];
+  };
+})
diff --git a/pkgs/development/tools/haskell/ihaskell/use-classy-prelude.patch b/pkgs/development/tools/haskell/ihaskell/use-classy-prelude.patch
new file mode 100644
index 00000000000..b2c1362b62f
--- /dev/null
+++ b/pkgs/development/tools/haskell/ihaskell/use-classy-prelude.patch
@@ -0,0 +1,34 @@
+From fad4e38079e91b13bf1e94732b7494504071b224 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
+Date: Sun, 28 Sep 2014 09:27:40 +0200
+Subject: [PATCH] catMaybes, explicitly use ClassyPrelude
+
+---
+ src/IHaskell/Eval/Completion.hs | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/IHaskell/Eval/Completion.hs b/src/IHaskell/Eval/Completion.hs
+index 790c903..93d7ac1 100644
+--- a/src/IHaskell/Eval/Completion.hs
++++ b/src/IHaskell/Eval/Completion.hs
+@@ -141,7 +141,7 @@ getTrueModuleName name = do
+       onlyImportDecl _ = Nothing
+ 
+   -- Get all imports that we use.
+-  imports <- catMaybes <$> map onlyImportDecl <$> getContext
++  imports <- ClassyPrelude.catMaybes <$> map onlyImportDecl <$> getContext
+ 
+   -- Find the ones that have a qualified name attached.
+   -- If this name isn't one of them, it already is the true name.
+@@ -178,7 +178,7 @@ completionType line loc target
+     = Empty
+ 
+   -- When in a string, complete filenames.
+-  | cursorInString line loc 
++  | cursorInString line loc
+     = FilePath (getStringTarget lineUpToCursor) (getStringTarget lineUpToCursor)
+ 
+   -- Complete module names in imports and elsewhere.
+-- 
+2.1.0
+
diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
new file mode 100644
index 00000000000..f98de4af229
--- /dev/null
+++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
@@ -0,0 +1,26 @@
+{ stdenv, makeWrapper, ihaskell, ipython, ghc }:
+
+stdenv.mkDerivation rec {
+
+  name = "ihaskell-" + ihaskell.version ;
+
+  buildInputs = [ makeWrapper ];
+
+  preferLocalBuild = true;
+
+  buildCommand = ''
+    makeWrapper "${ihaskell}/bin/IHaskell" "$out/bin/ihaskell" \
+      --prefix PATH : "${ghc}/bin:${ihaskell}/bin:${ipython}/bin" \
+      --prefix LD_LIBRARY_PATH : "${ihaskell}/lib/ghc-${ghc.version}/${name}/" \
+      --add-flags "--ipython=${ipython}/bin/ipython" \
+      --set PROFILE_DIR "\$HOME/.ipython/profile_haskell" \
+      --set PROFILE_TAR "$(find ${ihaskell} -iname "profile.tar")" \
+      --set PROFILE_INIT "\$([ ! -d \$PROFILE_DIR ] && mkdir -p \$PROFILE_DIR && tar xvf \$PROFILE_TAR -C \$PROFILE_DIR)" \
+      --prefix GHC_PACKAGE_PATH : "\$(${ghc.GHCGetPackages} ${ghc.version}|sed -e 's, -package-db ,:,g'|cut -b 2-):${ihaskell}/lib/ghc-${ghc.version}/package.conf.d/${name}.installedconf" \
+      --set GHC_PACKAGE_PATH "\$GHC_PACKAGE_PATH:" # always end with : to include base packages
+  '';
+
+  meta = {
+    description = ihaskell.meta.description;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix
index 34bc45e7471..22b52975cde 100644
--- a/pkgs/development/tools/haskell/keter/default.nix
+++ b/pkgs/development/tools/haskell/keter/default.nix
@@ -11,8 +11,8 @@
 
 cabal.mkDerivation (self: {
   pname = "keter";
-  version = "1.3.3";
-  sha256 = "1i4yjzqp8if0h88k8ga0dvqbrh57nvcr9dbfbj1sdw40pd74yb3i";
+  version = "1.3.4";
+  sha256 = "127sv155kgwz64adylfn2dmpnqh833pa53lnc8ahhwa63xwf9pzk";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/tools/haskell/uuagc/cabal.nix b/pkgs/development/tools/haskell/uuagc/cabal.nix
index 1a735a2471e..ab85b50688b 100644
--- a/pkgs/development/tools/haskell/uuagc/cabal.nix
+++ b/pkgs/development/tools/haskell/uuagc/cabal.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "uuagc-cabal";
-  version = "1.0.5.0";
-  sha256 = "0p3rc1gszd62wwzzqz0hmj6jdmwdnpx92rdf6mgd7w63ic1wdxj5";
+  version = "1.0.6.0";
+  sha256 = "02xqj4vz7hir0llxl8n517qv22jlmilknhqzx4l55gccffg7zj6w";
   buildDepends = [ Cabal filepath mtl uulib ];
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
diff --git a/pkgs/development/tools/misc/ShellCheck/default.nix b/pkgs/development/tools/misc/ShellCheck/default.nix
index 8beca12325b..d93383171dd 100644
--- a/pkgs/development/tools/misc/ShellCheck/default.nix
+++ b/pkgs/development/tools/misc/ShellCheck/default.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "Shell script analysis tool";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix
index c4f4caa3b65..3fdb75b3fdf 100644
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@@ -3,18 +3,18 @@
 let
   libphutil = fetchgit {
     url    = "git://github.com/facebook/libphutil.git";
-    rev    = "49f08a756a54f12405d3704c0f978b71c7b13811";
-    sha256 = "b32267fe19c6e9532887388815b8553519e2844bc5b839b5ad35efeab6b07fb8";
+    rev    = "6c29d5c8d169084927df75b18761312195080550";
+    sha256 = "5891e5d7688a2f026e02a2684a2002c0715f0492fd8475bdcb8fab2066eff37a";
   };
   arcanist = fetchgit {
     url    = "git://github.com/facebook/arcanist.git";
-    rev    = "4c0edd296e3301fffdda33c447f6fcafe7d1de01";
-    sha256 = "a9f162fb6b47bcf628130e0e8988ab650278b3a6606fa425e4707241ed22dd3e";
+    rev    = "a70a00a960ff4a7e30e20b4db1c68c081f16eaa0";
+    sha256 = "37d9b80fbfc694df86a4bf75a540f81aa2e65f463d301d1f8a5930ecae8ba9fc";
   };
 in
 stdenv.mkDerivation rec {
   name    = "arcanist-${version}";
-  version = "20140812";
+  version = "20140924";
 
   src = [ arcanist libphutil ];
   buildInputs = [ php makeWrapper flex ];
diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix
index aa8e70b5edc..3c8c2fbec61 100644
--- a/pkgs/development/tools/misc/babeltrace/default.nix
+++ b/pkgs/development/tools/misc/babeltrace/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, libuuid, popt }:
 
 stdenv.mkDerivation rec {
-  name = "babeltrace-1.2.1";
+  name = "babeltrace-1.2.3";
 
   src = fetchurl {
     url = "http://www.efficios.com/files/babeltrace/${name}.tar.bz2";
-    sha256 = "1pwg0y57iy4c8wynb6bj7f6bxaiclmxcm4f3nllpw9brhbdzygc1";
+    sha256 = "1b47d4i4f3gjb37m62k6hq0jlag4qkmblx6lcjf4s902h6bscvvr";
   };
 
   buildInputs = [ pkgconfig glib libuuid popt ];
diff --git a/pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch b/pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch
new file mode 100644
index 00000000000..4284245f485
--- /dev/null
+++ b/pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch
@@ -0,0 +1,16 @@
+diff --git a/Makefile b/Makefile
+index cc8882e..97b11ee 100644
+--- a/Makefile
++++ b/Makefile
+@@ -184,11 +184,6 @@ $(foreach src,$(COMMON_SRCS),$(eval $(call common_obj,$(src))))
+ # Applet rules
+ #
+ define applet_obj
+-$(SRCDIR)/$(1:%.asm=%.cpp): $(SRCDIR)/$(1)
+-	@echo APPLET $(1:%.asm=%)
+-	$$(Q)$$(ARMAS) -o $$(@:%.o=%.obj) $$<
+-	$$(Q)$$(ARMOBJCOPY) -O binary $$(@:%.o=%.obj) $$(@:%.o=%.bin)
+-	$$(Q)appletgen $(1:%.asm=%) $(SRCDIR) $(OBJDIR)
+ $(OBJDIR)/$(1:%.asm=%.o): $(SRCDIR)/$(1:%.asm=%.cpp)
+ 	@echo CPP APPLET $$<
+ 	$$(Q)$$(CXX) $$(COMMON_CXXFLAGS) -c -o $$(@) $$(<:%.asm=%.cpp)
diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix
index f0b6d81e69e..71148755a75 100644
--- a/pkgs/development/tools/misc/bossa/default.nix
+++ b/pkgs/development/tools/misc/bossa/default.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
     sha256 = "01y8r45fw02rps9q995mv82bxrm6p0mysv4wir5glpagrhnyw7md";
   };
 
+  patches = [ ./bossa-no-applet-build.patch ];
+
   nativeBuildInputs = [ bin2c ];
   buildInputs = [ wxGTK libX11 readline ];
 
diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix
index 51f5ed6091f..3ec898e0459 100644
--- a/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/pkgs/development/tools/misc/coccinelle/default.nix
@@ -14,7 +14,7 @@ in stdenv.mkDerivation {
   };
 
   buildInputs = with ocamlPackages; [
-    ocaml findlib menhir
+    ocaml findlib menhir ocamlPackages.camlp4
     ocaml_pcre pycaml
     python ncurses pkgconfig
     makeWrapper
diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index e8e50999f3e..caf9dc489b5 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "help2man-1.46.2";
+  name = "help2man-1.46.3";
 
   src = fetchurl {
     url = "mirror://gnu/help2man/${name}.tar.xz";
-    sha256 = "0483cpizy0mqngibv56p6p8jxwh8678qksf5zs5wh963r3n1s6cj";
+    sha256 = "0hi94a6ai96yw0v8xgjzpp5c6jr33ifmbn2mkp7wz7rgmwxxqsd6";
   };
 
   buildInputs = [ makeWrapper perl gettext LocaleGettext ];
diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix
index 5b66ea75f65..fc9446408de 100644
--- a/pkgs/development/tools/neoload/default.nix
+++ b/pkgs/development/tools/neoload/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeTextFile, jre, makeWrapper, licenseAccepted ? false }:
+{ stdenv, fetchurl, writeTextFile, jre, makeWrapper, fontsConf, licenseAccepted ? false }:
 
 # If you happen to use this software on the XMonad window manager, you will have issues with
 # grey windows, no resizing, menus not showing and other glitches.
@@ -62,6 +62,7 @@ in stdenv.mkDerivation rec {
 
     export HOME=`pwd`
     export INSTALL4J_JAVA_HOME=${jre}
+    export FONTCONFIG_FILE=${fontsConf}
     bash -ic './installer -q -varfile response.varfile'
 
     sed -i 's/Xmx450m/Xmx900m/;s/Xss192k/Xss384k/' $out/lib/neoload/conf/agent.properties
diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix
new file mode 100644
index 00000000000..bd2466c8854
--- /dev/null
+++ b/pkgs/development/tools/ocaml/camlp4/default.nix
@@ -0,0 +1,46 @@
+{stdenv, fetchurl, which, ocaml}:
+let
+  ocaml_version = (stdenv.lib.getVersion ocaml);
+in
+
+assert stdenv.lib.versionAtLeast ocaml_version "4.02";
+
+stdenv.mkDerivation {
+  name = "camlp4-4.02.0+1";
+  src = fetchurl {
+    url = https://github.com/ocaml/camlp4/archive/4.02.0+1.tar.gz;
+    sha256 = "0055f4jiz82rgn581xhq3mr4qgq2qgdxqppmp8i2x1xnsim4h9pn";
+  };
+
+  buildInputs = [ which ocaml ];
+
+  dontAddPrefix = true;
+
+  preConfigure = ''
+    configureFlagsArray=(
+      --bindir=$out/bin
+      --libdir=$out/lib/ocaml/${ocaml_version}/site-lib
+      --pkgdir=$out/lib/ocaml/${ocaml_version}/site-lib
+    )
+  '';
+
+  postConfigure = ''
+    substituteInPlace camlp4/META.in \
+    --replace +camlp4 $out/lib/ocaml/${ocaml_version}/site-lib/camlp4
+    substituteInPlace camlp4/config/Camlp4_config.ml \
+    --replace \
+      "Filename.concat ocaml_standard_library" \
+      "Filename.concat \"$out/lib/ocaml/${ocaml_version}/site-lib\""
+  '';
+
+
+  makePhase = "make all";
+
+  installTargets = "install install-META";
+
+  meta = with stdenv.lib; {
+    description = "A software system for writing extensible parsers for programming languages";
+    homepage = https://github.com/ocaml/camlp4;
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/development/tools/ocaml/camlp5/5.15.nix b/pkgs/development/tools/ocaml/camlp5/5.15.nix
index 7247041cb1d..97099d1b492 100644
--- a/pkgs/development/tools/ocaml/camlp5/5.15.nix
+++ b/pkgs/development/tools/ocaml/camlp5/5.15.nix
@@ -8,6 +8,8 @@ let
   metafile = ./META;
 in
 
+assert !stdenv.lib.versionOlder "4.00" ocaml_version;
+
 stdenv.mkDerivation {
 
   name = "${pname}${if transitional then "_transitional" else ""}-${version}";
diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix
index 8691e1b9d11..1c811b21758 100644
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -7,11 +7,11 @@ in
 
 stdenv.mkDerivation {
 
-  name = "camlp5${if transitional then "_transitional" else ""}-6.11";
+  name = "camlp5${if transitional then "_transitional" else ""}-6.12";
 
   src = fetchurl {
-    url = http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-6.11.tgz;
-    sha256 = "0dxb5id6imq502sic75l786q94dhplqx6yyhjkkw19kf64fiqlk5";
+    url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.12.tgz;
+    sha256 = "00jwgp6w4g64lfqjx77xziy532091fy00c42fsy0b4i892rch5mp";
   };
 
   buildInputs = [ ocaml ];
@@ -25,17 +25,17 @@ stdenv.mkDerivation {
 
   postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml_version}/site-lib/camlp5/META";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Preprocessor-pretty-printer for OCaml";
     longDescription = ''
       Camlp5 is a preprocessor and pretty-printer for OCaml programs.
       It also provides parsing and printing tools.
     '';
     homepage = http://pauillac.inria.fr/~ddr/camlp5/;
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
     platforms = ocaml.meta.platforms;
-    maintainers = [
-      stdenv.lib.maintainers.z77z
+    maintainers = with maintainers; [
+      z77z vbgl
     ];
   };
 }
diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix
index 04475959f3d..49a63b616c7 100644
--- a/pkgs/development/tools/ocaml/cppo/default.nix
+++ b/pkgs/development/tools/ocaml/cppo/default.nix
@@ -4,6 +4,7 @@ let
   version = "0.9.4";
   webpage = "http://mjambon.com/${pname}.html";
 in
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
 stdenv.mkDerivation rec {
 
   name = "${pname}-${version}";
@@ -23,15 +24,13 @@ stdenv.mkDerivation rec {
     mkdir $out/bin
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "The C preprocessor for OCaml";
     longDescription = ''
       Cppo is an equivalent of the C preprocessor targeted at the OCaml language and its variants.
     '';
     homepage = "${webpage}";
-    license = "bsd";
+    maintainers = [ maintainers.vbgl ];
+    license = licenses.bsd3;
   };
 }
-
-
-
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index 623b84bafd1..30fabf19362 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -1,4 +1,7 @@
 {stdenv, fetchurl, ocaml, findlib, yojson, menhir}:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
+
 stdenv.mkDerivation {
 
   name = "merlin-1.7.1";
@@ -12,10 +15,10 @@ stdenv.mkDerivation {
 
   prefixKey = "--prefix ";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "An editor-independent tool to ease the development of programs in OCaml";
     homepage = "http://the-lambda-church.github.io/merlin/";
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
+    maintainers = [ maintainers.vbgl ];
   };
 }
-
diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix
index 88b7451e0f0..0a402d4ba46 100644
--- a/pkgs/development/tools/ocaml/ocamlify/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlify/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, ounit}:
+{stdenv, fetchurl, ocaml, findlib}:
 
 stdenv.mkDerivation {
   name = "ocamlify-0.0.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "1f0fghvlbfryf5h3j4as7vcqrgfjb4c8abl5y0y5h069vs4kp5ii";
   };
 
-  buildInputs = [ocaml findlib ounit];
+  buildInputs = [ocaml findlib];
 
   configurePhase = "ocaml setup.ml -configure --prefix $out";
   buildPhase     = "ocaml setup.ml -build";
diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix
index d72df18f899..65359049a96 100644
--- a/pkgs/development/tools/ocaml/ocamlmod/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, ounit}:
+{stdenv, fetchurl, ocaml, findlib}:
 
 stdenv.mkDerivation {
   name = "ocamlmod-0.0.7";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "11kg7wh0gy492ma5c6bcjh6frv1a9lh9f26hiys2i0d1ky8s0ad3";
   };
 
-  buildInputs = [ocaml findlib ounit];
+  buildInputs = [ocaml findlib];
 
   configurePhase = "ocaml setup.ml -configure --prefix $out";
   buildPhase     = "ocaml setup.ml -build";
diff --git a/pkgs/development/tools/ocaml/opam/1.0.0.nix b/pkgs/development/tools/ocaml/opam/1.0.0.nix
index 4c74063d116..52c710a86b8 100644
--- a/pkgs/development/tools/ocaml/opam/1.0.0.nix
+++ b/pkgs/development/tools/ocaml/opam/1.0.0.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }:
 
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12.1";
+
 let
   srcs = {
     cudf = fetchurl {
diff --git a/pkgs/development/tools/parsing/Ebnf2ps/default.nix b/pkgs/development/tools/parsing/Ebnf2ps/default.nix
index b3d4c125bb9..4b4eae915f5 100644
--- a/pkgs/development/tools/parsing/Ebnf2ps/default.nix
+++ b/pkgs/development/tools/parsing/Ebnf2ps/default.nix
@@ -4,13 +4,13 @@
 
 cabal.mkDerivation (self: {
   pname = "Ebnf2ps";
-  version = "1.0.11";
-  sha256 = "0n0maihalnrks3l7ay1i16p6i7f69xv33jxhlsyshzck0v64qivb";
+  version = "1.0.12";
+  sha256 = "1rd0pxj2bfx06z1p0sy8kdhyfg1y51gn1bhr71j33czls6m9ry8c";
   isLibrary = false;
   isExecutable = true;
   buildTools = [ happy ];
   meta = {
-    homepage = "http://www.informatik.uni-freiburg.de/~thiemann/haskell/ebnf2ps/";
+    homepage = "https://github.com/FranklinChen/Ebnf2ps";
     description = "Peter's Syntax Diagram Drawing Tool";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix
index 23b7d9e692c..c155cd30944 100644
--- a/pkgs/development/tools/slimerjs/default.nix
+++ b/pkgs/development/tools/slimerjs/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="slimerjs";
-    version="0.9.2";
+    version="0.9.3";
     name="${baseName}-${version}";
-    hash="0817f3aq0gn04q4hq43xk4av02d86s2001lg5s5p38phd2jvh703";
-    url="http://download.slimerjs.org/releases/0.9.2/slimerjs-0.9.2.zip";
-    sha256="0817f3aq0gn04q4hq43xk4av02d86s2001lg5s5p38phd2jvh703";
+    hash="17vfnz6njn8zk39ywpg7bd9wp98ppxjvna6gn2443ylgh428v707";
+    url="http://download.slimerjs.org/releases/0.9.3/slimerjs-0.9.3.zip";
+    sha256="17vfnz6njn8zk39ywpg7bd9wp98ppxjvna6gn2443ylgh428v707";
   };
   buildInputs = [
     unzip zip
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 3b2929f178d..bd9ccf4947b 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     else
       fetchurl {
         url    = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_i686.deb";
-        sha256 = "047zij0lvrlpyg6icnp4knl0q87icsavbd2g98bkcp79yh2y91d0";
+        sha256 = "1d4w0ni6mkb378v6rd7b188fw38vi8qql7pkwzsykr6389krbkbq";
       };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix
new file mode 100644
index 00000000000..b1ff7064003
--- /dev/null
+++ b/pkgs/development/web/grails/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchurl, unzip
+# If jdkPath is null, require JAVA_HOME in runtime environment, else store
+# JAVA_HOME=${jdkPath} into grails.
+, jdkPath ? null
+, coreutils, ncurses, gnused, gnugrep  # for purity
+}:
+
+let
+  binpath = stdenv.lib.makeSearchPath "bin"
+    ([ coreutils ncurses gnused gnugrep ]
+    ++ stdenv.lib.optional (jdkPath != null) jdkPath);
+in
+stdenv.mkDerivation rec {
+  name = "grails-2.4.3";
+
+  src = fetchurl {
+    url = "http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/${name}.zip";
+    sha256 = "0lqkv0hsiiqa36pfnq5wv7s7nsp9xadmh1ri039bn0llpfck4742";
+  };
+
+  buildInputs = [ unzip ];
+
+  buildPhase = "true";
+
+  installPhase = ''
+    mkdir -p "$out"
+    cp -vr . "$out"
+    # Remove (for now) uneeded Windows .bat files
+    rm -f "$out"/bin/*.bat
+    # Improve purity
+    sed -i -e '2iPATH=${binpath}:\$PATH' "$out"/bin/grails
+  '' + stdenv.lib.optionalString (jdkPath != null) ''
+    # Inject JDK path into grails
+    sed -i -e '2iJAVA_HOME=${jdkPath}' "$out"/bin/grails
+  '';
+
+  preferLocalBuild = true;
+
+  meta = with stdenv.lib; {
+    description = "Full stack, web application framework for the JVM";
+    longDescription = ''
+      Grails is an Open Source, full stack, web application framework for the
+      JVM. It takes advantage of the Groovy programming language and convention
+      over configuration to provide a productive and stream-lined development
+      experience.
+    '';
+    homepage = http://grails.org/;
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
author	Eelco Dolstra <eelco.dolstra@logicblox.com>	2014-10-09 10:57:57 +0200
committer	Eelco Dolstra <eelco.dolstra@logicblox.com>	2014-10-09 10:57:57 +0200
commit	811de3bfaabc39a7a7d22ba34053cfb1a2c4e219 (patch)
tree	631d4305b76e948baefb54741fe2ea3c4dd9fe8b /pkgs/development
parent	c34932ef86628b8b30284882d8baaef4c56320dd (diff)
parent	a2c7804903cdd41d1905fa954bd2dba5e165e793 (diff)
download	nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.gz nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.bz2 nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.lz nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.xz nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.zst nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.zip