Merge remote-tracking branch 'upstream/master' into HEAD

2017-04-23 11:26:47 +02:00
parent 004ecac47b f45f2fb67a
commit 4fc9b1852a
150 changed files with 8832 additions and 4012 deletions
--- a/pkgs/development/compilers/cmucl/binary.nix
+++ b/pkgs/development/compilers/cmucl/binary.nix
@@ -2,7 +2,7 @@

 let
  inherit (stdenv) system;
-  version = "21a";
+  version = "21b";
  downloadUrl = arch:
    "http://common-lisp.net/project/cmucl/downloads/release/" +
    "${version}/cmucl-${version}-${arch}.tar.bz2";
@@ -13,7 +13,7 @@ let
  dist =
    if system == "i686-linux" then fetchDist {
        arch = "x86-linux";
-        sha256 = "0w8dcaiasfd4fbj340zaf6wcjfgc4wzkvr24gbxa5rr3aw10rl02";
+        sha256 = "13k3b5ygnbsq6n2i3r5i4ljw3r1qlskn2p5f4x9hrx6vfvbb3k7a";
      }
    else throw "Unsupported platform for cmucl.";
 in
--- a/pkgs/development/compilers/dale/default.nix
+++ b/pkgs/development/compilers/dale/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, libffi, llvm_35, perl }:

-let version = "20170416";
+let version = "20170419";
    doCheck = false;
 in stdenv.mkDerivation {
  name = "dale-${version}";
@@ -8,8 +8,8 @@ in stdenv.mkDerivation {
  src = fetchFromGitHub {
    owner = "tomhrr";
    repo = "dale";
-    rev = "ecc5ea91efef8a263c7dddd6925983df5b5258b2";
-    sha256 = "0naly7jsfriiqf68q210ay9ppcvidbwwcxksy5zwy1m17aq5kxaw";
+    rev = "64e072d0520a134b9ae8038104fa977776b6e0af";
+    sha256 = "1apvq3v6ra8x0sj8gg9yavqsyxiggh2wnh1zbw2ccpg723bssl4a";
  };

  buildInputs = [ cmake libffi llvm_35 ] ++
@@ -28,8 +28,10 @@ in stdenv.mkDerivation {
      S-expressions for syntax and supports syntactic macros.
    '';
    homepage = "https://github.com/tomhrr/dale";
-    license = licenses.mit;
+    license = licenses.bsd3;
    maintainers = with maintainers; [ amiloradovsky ];
-    platforms = platforms.linux;  # fails on Darwin, linking vs. FFI
+    platforms = with platforms; [ "i686-linux" "x86_64-linux" ];
+    # failed on Darwin: linker couldn't find the FFI lib
+    # failed on AArch64: because LLVM 3.5 is failed there
  };
 }
--- a/pkgs/development/compilers/halvm/2.4.0.nix
+++ b/pkgs/development/compilers/halvm/2.4.0.nix
@@ -6,6 +6,7 @@ stdenv.mkDerivation rec {
  version = "2.4.0";
  name = "HaLVM-${version}";
  isHaLVM = true;
+  enableParallelBuilding = false;
  isGhcjs = false;
  src = fetchgit {
    rev = "65fad65966eb7e60f234453a35aeb564a09d2595";
@@ -31,7 +32,10 @@ stdenv.mkDerivation rec {
    patchShebangs .
  '';
  hardeningDisable = ["all"];
-  postInstall = "$out/bin/halvm-ghc-pkg recache";
+  postInstall = ''
+    patchShebangs $out/bin
+    $out/bin/halvm-ghc-pkg recache
+  '';
  passthru = {
    inherit bootPkgs;
    cross.config = "halvm";
--- a/pkgs/development/compilers/ocaml/4.04.nix
+++ b/pkgs/development/compilers/ocaml/4.04.nix
@@ -1,8 +1,8 @@
 import ./generic.nix {
  major_version = "4";
  minor_version = "04";
-  patch_version = "0";
-  sha256 = "1d2nk3kq4dyzz8dls45r13jprq5by3q8kshc8kvxzm8n4fnnvvb4";
+  patch_version = "1";
+  sha256 = "11f2kcldpad9h5ihi1crad5lvv2501iccb2g4c8m197fnjac8b12";

  # If the executable is stipped it does not work
  dontStrip = true;
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -21,42 +21,42 @@ let
    else
      throw "openjdk requires i686-linux or x86_64 linux";

-  update = "121";
-  build = "13";
+  update = "131";
+  build = "11";
  baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
  repover = "jdk8u${update}-b${build}";
  paxflags = if stdenv.isi686 then "msp" else "m";
  jdk8 = fetchurl {
             url = "${baseurl}/archive/${repover}.tar.gz";
-             sha256 = "1ns0lnl5n05k1kgp8d6fyyk6gx57sx7rmlcc33d3vxhr58560nbv";
+             sha256 = "1k401wsickbdy50yxjd26v8qm9519kxayaj3b103cr6ygp2rd9s6";
          };
  langtools = fetchurl {
             url = "${baseurl}/langtools/archive/${repover}.tar.gz";
-             sha256 = "0vj5mnqw80r4xqlmiab7wbrkhz3rl8ijhwqplkbs42wad75lvnh8";
+             sha256 = "1qj75bb17a9czvxz7rm246w97cavglrssx0l1mkbickx0i0wamm8";
          };
  hotspot = fetchurl {
             url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
-             sha256 = "0mcjjc34jvckg1f1x9v7gik3h5y4kx7skkfgzhknh14637jzb2hs";
+             sha256 = "0kh8rk5y3n4g3hyjzflc8nwc0kyakjivpwlpj1bncsm1sykw8lr8";
          };
  corba = fetchurl {
             url = "${baseurl}/corba/archive/${repover}.tar.gz";
-             sha256 = "0bxf1mrpmxgjmg40yi3ww7lh22f6h0nrvlvf5jwwzf4hb3a3998g";
+             sha256 = "0gqa58mwwyf6mbgp48j1akv1y8yq55zpwfziqrbdbpkcsaf603n7";
          };
  jdk = fetchurl {
             url = "${baseurl}/jdk/archive/${repover}.tar.gz";
-             sha256 = "10f641ngwiqr2z6hbz0xkyfh8h3z7kdxj5b1d30rgynzghf5wksr";
+             sha256 = "0ymvvi7srr9qkss20s1yg3x2mjw178bscrnxa6s8y82gsw02y820";
          };
  jaxws = fetchurl {
             url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
-             sha256 = "1bgjpivlxi0qlmhvz838zzkzz26d4ly8b0c963kx0lpabz8p99xi";
+             sha256 = "0507mxvir4s536pdz45pvmahwa6s3h2yhg6rwdzrb568ab06asmi";
          };
  jaxp = fetchurl {
             url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
-             sha256 = "17bcb5ic1ifk5rda1dzjd1483k9mah5npjg5dg77iyziq8kprvri";
+             sha256 = "0igbg8axk028kqs9q11m8hb5bg2fa0qcwffbpfbhilyw5gmf7cy8";
          };
  nashorn = fetchurl {
             url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
-             sha256 = "19fmlipqk9qiv7jc84b0z022q403nyp7b32a5qqqcn6aavdqnf7c";
+             sha256 = "0l63zm5a7ql3xvfxy5kzazq2184mpx0zyqzinjmq7v0q573g8xak";
          };
  openjdk8 = stdenv.mkDerivation {
    name = "openjdk-8u${update}b${build}";
--- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
  productVersion = "8";
-  patchVersion = "121";
+  patchVersion = "131";
  downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "0k1xyg000qmd96c2r2m8l84ygn6dmjf1ih5yjzq1zry5d0aczmpp";
-  sha256_x86_64 = "1g0hh9ccmsrdfa9493k31v2vd6yiymwd1nclgjh29wxfy41h5qwp";
+  sha256_i686 = "0m3i1n1im1nlwb06wlsdajv19cd3zhrjkw8zbyjfznydn6qs4s80";
+  sha256_x86_64 = "0dhj623ya01glcl3iir9ajifcrf6awhvpk936x9cxfj8zfyibck2";
  jceName = "jce_policy-8.zip";
  jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
  sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
--- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
  productVersion = "8";
-  patchVersion = "121";
+  patchVersion = "131";
  downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "0k1xyg000qmd96c2r2m8l84ygn6dmjf1ih5yjzq1zry5d0aczmpp";
-  sha256_x86_64 = "1g0hh9ccmsrdfa9493k31v2vd6yiymwd1nclgjh29wxfy41h5qwp";
+  sha256_i686 = "0m3i1n1im1nlwb06wlsdajv19cd3zhrjkw8zbyjfznydn6qs4s80";
+  sha256_x86_64 = "0dhj623ya01glcl3iir9ajifcrf6awhvpk936x9cxfj8zfyibck2";
  jceName = "jce_policy-8.zip";
  jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
  sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
--- a/pkgs/development/compilers/sbcl/1.2.5.nix
+++ b/pkgs/development/compilers/sbcl/1.2.5.nix
@@ -1,84 +0,0 @@
-{ stdenv, fetchurl, sbclBootstrap, clisp, which}:
-
-stdenv.mkDerivation rec {
-  name    = "sbcl-${version}";
-  version = "1.2.5";
-
-  src = fetchurl {
-    url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "0nmb9amygr5flzk2z9fa6wzwqknbgd2qrkybxkxkamvbdwyayvzr";
-  };
-
-  buildInputs = [ which ]
-    ++ (stdenv.lib.optional stdenv.isDarwin sbclBootstrap)
-    ++ (stdenv.lib.optional stdenv.isLinux clisp)
-    ;
-
-  patchPhase = ''
-    echo '"${version}.nixos"' > version.lisp-expr
-    echo "
-    (lambda (features)
-      (flet ((enable (x)
-               (pushnew x features))
-             (disable (x)
-               (setf features (remove x features))))
-        (enable :sb-thread))) " > customize-target-features.lisp
-
-    pwd
-
-    # SBCL checks whether files are up-to-date in many places..
-    # Unfortunately, same timestamp is not good enough
-    sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp
-    sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp
-    sed -i src/cold/slam.lisp -e \
-      '/file-write-date input/a)'
-    sed -i src/cold/slam.lisp -e \
-      '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))'
-    sed -i src/code/target-load.lisp -e \
-      '/date defaulted-fasl/a)'
-    sed -i src/code/target-load.lisp -e \
-      '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))'
-
-    # Fix software version retrieval
-    sed -e "s@/bin/uname@$(which uname)@g" -i src/code/*-os.lisp
-
-    # Fix the tests
-    sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp
-    sed -e '/deftest grent/inil' -i contrib/sb-posix/posix-tests.lisp
-    sed -e '/deftest .*ent.non-existing/,+5d' -i contrib/sb-posix/posix-tests.lisp
-    sed -e '/deftest \(pw\|gr\)ent/,+3d' -i contrib/sb-posix/posix-tests.lisp
-
-    sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp
-    sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp
-
-    # Use whatever `cc` the stdenv provides
-    substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc
-  '';
-
-  preBuild = ''
-    export INSTALL_ROOT=$out
-    mkdir -p test-home
-    export HOME=$PWD/test-home
-  '';
-
-  buildPhase = if stdenv.isLinux
-    then ''
-      sh make.sh clisp --prefix=$out
-    ''
-    else ''
-      sh make.sh --prefix=$out --xc-host='${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit'
-    '';
-
-  installPhase = ''
-    INSTALL_ROOT=$out sh install.sh
-  '';
-
-  meta = {
-    description = "Lisp compiler";
-    homepage = http://www.sbcl.org;
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-    inherit version;
-  };
-}
--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/pkgs/development/compilers/sbcl/bootstrap.nix
@@ -8,15 +8,20 @@ let
      sha256 = "006pr88053wclvbjfjdypnbiw8wymbzdzi7a6kbkpdfn4zf5943j";
    };
    x86_64-linux = rec {
-      version = "1.2.15";
+      version = "1.3.16";
      system = "x86-64-linux";
-      sha256 = "1bpbfz9x2w73hy2kh8p0kd4m1p6pin90h2zycq52r3bbz8yv47aw";
+      sha256 = "0sq2dylwwyqfwkbdvcgqwz3vay9v895zpb0fyzsiwy31d1x9pr2s";
    };
    i686-linux = rec {
      version = "1.2.7";
      system = "x86-linux";
      sha256 = "07f3bz4br280qvn85i088vpzj9wcz8wmwrf665ypqx181pz2ai3j";
    };
+    aarch64-linux = rec {
+      version = "1.3.16";
+      system = "arm64-linux";
+      sha256 = "0q1brz9c49xgdljzfx8rpxxnlwhadxkcy5kg0mcd9wnxygind1cl";
+    };
    armv7l-linux = rec {
      version = "1.2.14";
      system = "armhf-linux";
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -9,11 +9,11 @@

 stdenv.mkDerivation rec {
  name    = "sbcl-${version}";
-  version = "1.3.15";
+  version = "1.3.16";

  src = fetchurl {
    url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "11db8pkv3i8ajyb295dh9nl0niyrkh9gjqv4vlaa1dl1vzck5ddi";
+    sha256 = "0qw8kcn66sr1k7ilm6i66dk3ybym722ccxa4xi8w7bkhgc0ripdp";
  };

  patchPhase = ''
--- a/pkgs/development/compilers/scala/2.11.nix
+++ b/pkgs/development/compilers/scala/2.11.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:

 stdenv.mkDerivation rec {
-  name = "scala-2.11.10";
+  name = "scala-2.11.11";

  src = fetchurl {
    url = "http://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "10rs8ak3qyxggw24ga3gjcpl3x8r1b3ykrdfrym1n154b1rrs904";
+    sha256 = "02whsszxabyhyrbcmgg3figaxknmfzy4f3wmgrqqwik89jk7q0qj";
  };

  propagatedBuildInputs = [ jre ] ;
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:

 stdenv.mkDerivation rec {
-  name = "scala-2.12.1";
+  name = "scala-2.12.2";

  src = fetchurl {
    url = "http://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "0nf37ix3rrm50s7dacwlyr8fl1hgrbxbw5yz21qf58rj8n46ic2d";
+    sha256 = "1xd68q9h0vzqndar3r4mvabbd7naa25fbiciahkhxwgw8sr6hq8r";
  };

  propagatedBuildInputs = [ jre ] ;
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -686,8 +686,12 @@ self: super: {
    then appendConfigureFlag super.gtk "-fhave-quartz-gtk"
    else super.gtk;

-  # https://github.com/commercialhaskell/stack/issues/3001
-  stack = doJailbreak super.stack;
+  # The stack people don't bother making their own code compile in an LTS-based
+  # environment: https://github.com/commercialhaskell/stack/issues/3001.
+  stack = super.stack.overrideScope (self: super: {
+    store-core = self.store-core_0_3;
+    store = self.store_0_3_1;
+  });

  # The latest Hoogle needs versions not yet in LTS Haskell 7.x.
  hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_19_1; };
@@ -758,13 +762,6 @@ self: super: {
  # https://github.com/roelvandijk/terminal-progress-bar/issues/13
  terminal-progress-bar = doJailbreak super.terminal-progress-bar;

-  # https://github.com/NixOS/nixpkgs/issues/19612
-  wai-app-file-cgi = (dontCheck super.wai-app-file-cgi).overrideScope (self: super: {
-    http-client = self.http-client_0_5_5;
-    http-client-tls = self.http-client-tls_0_3_3_1;
-    http-conduit = self.http-conduit_2_2_3;
-  });
-
  # https://hydra.nixos.org/build/42769611/nixlog/1/raw
  # note: the library is unmaintained, no upstream issue
  dataenc = doJailbreak super.dataenc;
@@ -775,10 +772,6 @@ self: super: {
  # horribly outdated (X11 interface changed a lot)
  sindre = markBroken super.sindre;

-  # https://github.com/jmillikin/haskell-dbus/pull/7
-  # http://hydra.cryp.to/build/498404/log/raw
-  dbus = dontCheck (appendPatch super.dbus ./patches/hdbus-semicolons.patch);
-
  # Test suite occasionally runs for 1+ days on Hydra.
  distributed-process-tests = dontCheck super.distributed-process-tests;

--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -62,6 +62,7 @@ self: super: {

  # Setup: Can't find transitive deps for haddock
  doctest = dontHaddock super.doctest;
+  hsdns = dontHaddock super.hsdns;

  # Needs hashable on pre 7.10.x compilers.
  nats_1 = addBuildDepend super.nats_1 self.hashable;
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -63,6 +63,7 @@ self: super: {

  # Setup: Can't find transitive deps for haddock
  doctest = dontHaddock super.doctest;
+  hsdns = dontHaddock super.hsdns;

  # Needs hashable on pre 7.10.x compilers.
  nats_1 = addBuildDepend super.nats_1 self.hashable;
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -53,7 +53,7 @@ self: super: {
    postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
  });
  utf8-string = overrideCabal super.utf8-string (drv: {
-    postPatch = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
+    postPatch = "sed -i -e 's|base >= 4.3 && < 4.10|base|' utf8-string.cabal";
  });

  # bos/attoparsec#92
@@ -87,6 +87,7 @@ self: super: {
  llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general;

  # A bunch of jailbreaks due to 'base' bump
+  old-time = doJailbreak super.old-time;
  old-locale = doJailbreak super.old-locale;
  primitive = doJailbreak super.primitive;
  test-framework = doJailbreak super.test-framework;
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -37,8 +37,7 @@ core-packages:
  - ghcjs-base-0

 default-package-overrides:
-  - store < 0.4.1               # https://github.com/fpco/store/issues/104
-  # LTS Haskell 8.8
+  # LTS Haskell 8.11
  - abstract-deque ==0.3
  - abstract-par ==0.3.3
  - AC-Vector ==2.3.2
@@ -55,6 +54,7 @@ default-package-overrides:
  - aeson-better-errors ==0.9.1.0
  - aeson-casing ==0.1.0.5
  - aeson-compat ==0.3.6
+  - aeson-diff ==1.1.0.2
  - aeson-extra ==0.4.0.0
  - aeson-generic-compat ==0.0.1.0
  - aeson-injector ==1.0.7.0
@@ -65,6 +65,7 @@ default-package-overrides:
  - airship ==0.6.0
  - alarmclock ==0.4.0.2
  - alex ==3.2.1
+  - algebraic-graphs ==0.0.4
  - alternators ==0.1.1.1
  - ALUT ==2.4.0.2
  - amazonka ==1.4.5
@@ -165,18 +166,22 @@ default-package-overrides:
  - ansigraph ==0.3.0.2
  - app-settings ==0.2.0.11
  - appar ==0.1.4
+  - apportionment ==0.0.0.2
  - arbtt ==0.9.0.12
  - arithmoi ==0.4.3.0
  - array-memoize ==0.6.0
+  - arrow-extras ==0.1.0.1
  - arrow-list ==0.7
  - ascii-progress ==0.3.3.0
  - asciidiagram ==1.3.3
  - asn1-encoding ==0.9.5
  - asn1-parse ==0.9.4
  - asn1-types ==0.3.2
-  - async ==2.1.1
+  - async ==2.1.1.1
  - async-dejafu ==0.1.3.0
  - async-extra ==0.1.0.0
+  - async-refresh ==0.2.0
+  - async-refresh-tokens ==0.1.0
  - atom-basic ==0.2.4
  - atom-conduit ==0.4.0.1
  - atomic-primops ==0.8.0.4
@@ -184,6 +189,7 @@ default-package-overrides:
  - attoparsec ==0.13.1.0
  - attoparsec-binary ==0.2
  - attoparsec-expr ==0.1.1.2
+  - audacity ==0.0.1.1
  - authenticate ==1.3.3.2
  - authenticate-oauth ==1.6
  - auto ==0.4.3.1
@@ -195,9 +201,10 @@ default-package-overrides:
  - avers-server ==0.0.18.0
  - avwx ==0.3.0.2
  - b9 ==0.5.31
+  - backprop ==0.0.3.0
  - bake ==0.5
  - bank-holidays-england ==0.1.0.5
-  - base-compat ==0.9.2
+  - base-compat ==0.9.3
  - base-noprelude ==4.9.1.0
  - base-orphans ==0.5.4
  - base-prelude ==1.0.1.1
@@ -214,6 +221,7 @@ default-package-overrides:
  - bencode ==0.6.0.0
  - bento ==0.1.0
  - between ==0.11.0.0
+  - bibtex ==0.1.0.6
  - bifunctors ==5.4.1
  - bimap ==0.3.2
  - bimap-server ==0.1.0.1
@@ -260,6 +268,7 @@ default-package-overrides:
  - bloodhound ==0.12.1.0
  - blosum ==0.1.1.4
  - bmp ==1.2.6.3
+  - board-games ==0.1.0.6
  - boltzmann-samplers ==0.1.0.0
  - bookkeeping ==0.2.1.1
  - bool-extras ==0.4.0
@@ -278,6 +287,7 @@ default-package-overrides:
  - bson-lens ==0.1.1
  - btrfs ==0.1.2.3
  - buffer-builder ==0.2.4.4
+  - buffer-pipe ==0.0
  - bumper ==0.6.0.3
  - bv ==0.4.1
  - byteable ==0.1.1
@@ -304,6 +314,7 @@ default-package-overrides:
  - cache ==0.1.0.0
  - cacophony ==0.9.2
  - cairo ==0.13.3.1
+  - calendar-recycling ==0.0
  - call-stack ==0.1.0
  - camfort ==0.901
  - carray ==0.1.6.6
@@ -311,6 +322,7 @@ default-package-overrides:
  - case-insensitive ==1.2.0.8
  - cased ==0.1.0.0
  - cases ==0.1.3.2
+  - casing ==0.1.2.1
  - cassava ==0.4.5.1
  - cassava-conduit ==0.3.5.1
  - cassava-megaparsec ==0.1.0
@@ -345,12 +357,12 @@ default-package-overrides:
  - cipher-rc4 ==0.1.4
  - circle-packing ==0.1.0.5
  - clang-pure ==0.2.0.2
-  - clash-ghc ==0.7.0.1
-  - clash-lib ==0.7
-  - clash-prelude ==0.11
-  - clash-systemverilog ==0.7
-  - clash-verilog ==0.7
-  - clash-vhdl ==0.7
+  - clash-ghc ==0.7.1
+  - clash-lib ==0.7.1
+  - clash-prelude ==0.11.1
+  - clash-systemverilog ==0.7.1
+  - clash-verilog ==0.7.1
+  - clash-vhdl ==0.7.1
  - classy-prelude ==1.2.0.1
  - classy-prelude-conduit ==1.2.0
  - classy-prelude-yesod ==1.2.0
@@ -377,6 +389,7 @@ default-package-overrides:
  - codo-notation ==0.5.2
  - colorful-monoids ==0.2.1.0
  - colour ==2.3.3
+  - comfort-graph ==0.0.2
  - commutative ==0.0.1.4
  - comonad ==5
  - comonad-transformers ==4.0
@@ -384,10 +397,12 @@ default-package-overrides:
  - compactmap ==0.1.4.2
  - composition ==1.0.2.1
  - composition-extra ==2.0.0
+  - concise ==0.1.0.0
  - concurrency ==1.0.0.0
  - concurrent-output ==1.7.9
+  - concurrent-split ==0.0.1
  - concurrent-supply ==0.1.8
-  - conduit ==1.2.9
+  - conduit ==1.2.9.1
  - conduit-combinators ==1.1.1
  - conduit-connection ==0.1.0.3
  - conduit-extra ==1.1.15
@@ -418,7 +433,7 @@ default-package-overrides:
  - cookie ==0.4.2.1
  - countable ==1.0
  - courier ==0.1.1.4
-  - cpphs ==1.20.4
+  - cpphs ==1.20.5
  - cprng-aes ==0.6.1
  - cpu ==0.1.2
  - cpuinfo ==0.1.0.1
@@ -458,16 +473,25 @@ default-package-overrides:
  - cubicspline ==0.1.2
  - cue-sheet ==0.1.0
  - curl ==1.3.8
+  - cutter ==0.0
  - darcs ==2.12.5
  - data-accessor ==0.2.2.7
  - data-accessor-mtl ==0.2.0.4
+  - data-accessor-template ==0.2.1.13
+  - data-accessor-transformers ==0.2.1.7
  - data-binary-ieee754 ==0.4.4
+  - data-bword ==0.1.0.1
  - data-check ==0.1.0
+  - data-checked ==0.3
  - data-default ==0.7.1.1
  - data-default-class ==0.1.2.0
  - data-default-instances-containers ==0.0.1
  - data-default-instances-dlist ==0.0.1
  - data-default-instances-old-locale ==0.0.1
+  - data-dword ==0.3.1
+  - data-endian ==0.1.1
+  - data-fix ==0.0.4
+  - data-has ==0.2.1.0
  - data-hash ==0.2.0.1
  - data-inttrie ==0.1.2
  - data-lens-light ==0.1.2.2
@@ -475,7 +499,10 @@ default-package-overrides:
  - data-msgpack ==0.0.9
  - data-or ==1.0.0.5
  - data-ordlist ==0.4.7.0
+  - data-ref ==0.0.1.1
  - data-reify ==0.6.1
+  - data-serializer ==0.3
+  - data-textual ==0.3.0.2
  - datasets ==0.2.1
  - dataurl ==0.1.0.0
  - DAV ==1.3.1
@@ -487,7 +514,8 @@ default-package-overrides:
  - dejafu ==0.4.0.0
  - dependent-map ==0.2.4.0
  - dependent-sum ==0.4
-  - deriving-compat ==0.3.5
+  - derive ==2.6.2
+  - deriving-compat ==0.3.6
  - descriptive ==0.9.4
  - diagrams ==1.4
  - diagrams-builder ==0.8.0.1
@@ -503,6 +531,7 @@ default-package-overrides:
  - diagrams-solve ==0.1.0.1
  - diagrams-svg ==1.4.1
  - dice ==0.1
+  - dictionaries ==0.1.0.1
  - Diff ==0.3.4
  - diff3 ==0.3.0
  - digest ==0.0.1.2
@@ -512,7 +541,7 @@ default-package-overrides:
  - directory-tree ==0.12.1
  - discount ==0.1.1
  - disk-free-space ==0.1.0.1
-  - disposable ==0.2.0.3
+  - disposable ==0.2.0.4
  - distance ==0.1.0.0
  - distributed-closure ==0.3.4.0
  - distributed-process ==0.6.6
@@ -546,6 +575,7 @@ default-package-overrides:
  - DRBG ==0.5.5
  - drifter ==0.2.2
  - drifter-postgresql ==0.1.0
+  - dsp ==0.2.3.1
  - dual-tree ==0.2.0.9
  - dvorak ==0.1.0.0
  - dynamic-state ==0.2.2.0
@@ -559,6 +589,7 @@ default-package-overrides:
  - EdisonAPI ==1.3.1
  - EdisonCore ==1.3.1.1
  - edit-distance ==0.2.2.1
+  - edit-distance-vector ==1.0.0.4
  - editor-open ==0.6.0.0
  - effect-handlers ==0.1.0.8
  - effin ==0.3.0.2
@@ -582,21 +613,26 @@ default-package-overrides:
  - engine-io-wai ==1.0.6
  - EntrezHTTP ==1.0.3
  - entropy ==0.3.7
+  - enummapset ==0.5.2.1
  - enummapset-th ==0.6.1.1
+  - enumset ==0.0.4
  - envelope ==0.2.1.0
  - envparse ==0.4
  - envy ==1.3.0.2
  - epub-metadata ==4.5
  - eq ==4.0.4
+  - equal-files ==0.0.5.3
  - equivalence ==0.3.2
  - erf ==2.0.0.0
  - errors ==2.1.3
  - ersatz ==0.3.1
  - esqueleto ==2.5.1
+  - etc ==0.0.0.2
  - etcd ==1.0.5
-  - ether ==0.4.0.2
+  - ether ==0.4.1.0
  - euphoria ==0.8.0.0
  - event ==0.1.4
+  - event-list ==0.1.1.3
  - eventstore ==0.14.0.1
  - exact-combinatorics ==0.2.0.8
  - exact-pi ==0.4.1.2
@@ -609,16 +645,18 @@ default-package-overrides:
  - exhaustive ==1.1.3
  - exp-pairs ==0.1.5.2
  - expiring-cache-map ==0.0.6.1
+  - explicit-exception ==0.1.8
  - extensible ==0.3.7
  - extensible-effects ==1.11.0.4
  - extensible-exceptions ==0.1.1.4
-  - extra ==1.5.1
+  - extra ==1.5.2
  - extract-dependencies ==0.2.0.1
  - fail ==4.9.0.0
  - farmhash ==0.1.0.5
  - fast-builder ==0.0.0.6
  - fast-digits ==0.2.1.0
  - fast-logger ==2.4.10
+  - fast-math ==1.0.2
  - fasta ==0.10.4.2
  - fay ==0.23.1.16
  - fay-base ==0.20.0.1
@@ -643,6 +681,7 @@ default-package-overrides:
  - fingertree-psqueue ==0.3
  - finite-typelits ==0.1.1.0
  - fixed ==0.2.1.1
+  - fixed-length ==0.2
  - fixed-vector ==0.9.0.0
  - fixed-vector-hetero ==0.3.1.1
  - flac ==0.1.1
@@ -666,7 +705,7 @@ default-package-overrides:
  - format-numbers ==0.1.0.0
  - formatting ==6.2.4
  - fortran-src ==0.1.0.4
-  - foundation ==0.0.4
+  - foundation ==0.0.6
  - Frames ==0.1.9
  - free ==4.12.4
  - free-vl ==0.1.4
@@ -681,11 +720,12 @@ default-package-overrides:
  - fsnotify-conduit ==0.1.0.0
  - funcmp ==1.8
  - fuzzcheck ==0.1.1
+  - fuzzy ==0.1.0.0
  - gd ==3000.7.3
  - Genbank ==1.0.3
  - general-games ==1.0.5
  - generic-aeson ==0.2.0.8
-  - generic-deriving ==1.11.1
+  - generic-deriving ==1.11.2
  - generic-random ==0.4.1.0
  - generic-xmlpickler ==0.1.0.5
  - GenericPretty ==1.2.1
@@ -703,7 +743,7 @@ default-package-overrides:
  - ghc-syb-utils ==0.2.3
  - ghc-tcplugins-extra ==0.2
  - ghc-typelits-extra ==0.2.2
-  - ghc-typelits-knownnat ==0.2.3
+  - ghc-typelits-knownnat ==0.2.4
  - ghc-typelits-natnormalise ==0.5.2
  - ghcid ==0.6.6
  - ghcjs-base-stub ==0.1.0.2
@@ -717,7 +757,7 @@ default-package-overrides:
  - gi-gio ==2.0.11
  - gi-glib ==2.0.11
  - gi-gobject ==2.0.11
-  - gi-gtk ==3.0.11
+  - gi-gtk ==3.0.13
  - gi-javascriptcore ==3.0.11
  - gi-pango ==1.0.12
  - gi-soup ==2.4.11
@@ -737,6 +777,7 @@ default-package-overrides:
  - gitlib-test ==3.1.0.3
  - gitrev ==1.2.0
  - gitson ==0.5.2
+  - gl ==0.8.0
  - glabrous ==0.3.1
  - glaze ==0.2.0.2
  - glazier ==0.7.0.0
@@ -749,6 +790,7 @@ default-package-overrides:
  - gloss-rendering ==1.10.3.5
  - GLURaw ==2.0.0.3
  - GLUT ==2.7.0.11
+  - gnuplot ==0.5.4.1
  - gogol ==0.1.1
  - gogol-adexchange-buyer ==0.1.1
  - gogol-adexchange-seller ==0.1.1
@@ -875,7 +917,7 @@ default-package-overrides:
  - hackage-db ==1.22
  - hackage-security ==0.5.2.2
  - hackernews ==1.1.1.0
-  - haddock-library ==1.4.2
+  - haddock-library ==1.4.3
  - hailgun ==0.4.1.2
  - hailgun-simple ==0.1.0.0
  - hakyll ==4.9.5.1
@@ -896,12 +938,12 @@ default-package-overrides:
  - harp ==0.4.2
  - hasbolt ==0.1.1.2
  - hashable ==1.2.6.0
-  - hashable-time ==0.2
+  - hashable-time ==0.2.0.1
  - hashmap ==1.3.2
  - hashtables ==1.2.1.1
  - haskeline ==0.7.3.1
  - haskell-gi ==0.20.1
-  - haskell-gi-base ==0.20.1
+  - haskell-gi-base ==0.20.2
  - haskell-import-graph ==1.0.1
  - haskell-lexer ==1.0.1
  - haskell-names ==0.8.0
@@ -940,12 +982,13 @@ default-package-overrides:
  - HCodecs ==0.5
  - hdaemonize ==0.5.2
  - HDBC ==2.4.0.1
+  - HDBC-mysql ==0.7.1.0
  - HDBC-session ==0.1.1.0
  - hdevtools ==0.1.5.0
  - heap ==1.0.3
  - heaps ==0.3.3
  - hebrew-time ==0.1.1
-  - hedis ==0.9.7
+  - hedis ==0.9.8
  - here ==1.2.9
  - heredoc ==0.2.0.0
  - heterocephalus ==1.0.4.0
@@ -1010,6 +1053,7 @@ default-package-overrides:
  - hsass ==0.4.1
  - hsb2hs ==0.3.1
  - hscolour ==1.24.1
+  - hscurses ==1.4.2.0
  - hsdns ==1.7
  - hse-cpp ==0.2
  - hsebaysdk ==0.4.0.0
@@ -1021,13 +1065,15 @@ default-package-overrides:
  - hsinstall ==1.5
  - hslogger ==1.2.10
  - hslua ==0.4.1
+  - hslua-aeson ==0.1.0.3
  - hsndfile ==0.8.0
  - hsndfile-vector ==0.5.2
-  - HsOpenSSL ==0.11.4.4
+  - HsOpenSSL ==0.11.4.6
  - HsOpenSSL-x509-system ==0.1.0.3
  - hsp ==0.10.0
  - hspec ==2.4.3
  - hspec-attoparsec ==0.1.0.2
+  - hspec-checkers ==0.1.0.2
  - hspec-contrib ==0.4.0
  - hspec-core ==2.4.3
  - hspec-discover ==2.4.3
@@ -1041,6 +1087,7 @@ default-package-overrides:
  - hspec-wai ==0.8.0
  - hspec-wai-json ==0.8.0
  - hspec-webdriver ==1.2.0
+  - hsshellscript ==3.4.1
  - hstatistics ==0.3
  - hstatsd ==0.1
  - HStringTemplate ==0.8.5
@@ -1054,10 +1101,10 @@ default-package-overrides:
  - html-email-validate ==0.2.0.0
  - htoml ==1.0.0.3
  - HTTP ==4000.3.6
-  - http-api-data ==0.3.5
+  - http-api-data ==0.3.6
  - http-client ==0.5.6.1
-  - http-client-openssl ==0.2.0.4
-  - http-client-tls ==0.3.4
+  - http-client-openssl ==0.2.0.5
+  - http-client-tls ==0.3.4.1
  - http-common ==0.8.2.0
  - http-conduit ==2.2.3.1
  - http-date ==0.0.6.1
@@ -1067,6 +1114,7 @@ default-package-overrides:
  - http-streams ==0.8.4.0
  - http-types ==0.9.1
  - http2 ==1.6.3
+  - httpd-shed ==0.4.0.3
  - human-readable-duration ==0.2.0.3
  - HUnit ==1.5.0.0
  - HUnit-approx ==1.1
@@ -1104,6 +1152,7 @@ default-package-overrides:
  - ieee754 ==0.8.0
  - if ==0.1.0.0
  - IfElse ==0.85
+  - iff ==0.0.6
  - ignore ==0.1.1.0
  - ilist ==0.2.0.0
  - imagesize-conduit ==1.1
@@ -1120,13 +1169,14 @@ default-package-overrides:
  - inline-c-cpp ==0.1.0.0
  - inline-java ==0.6.1
  - inline-r ==0.9.0.1
-  - insert-ordered-containers ==0.2.0.0
+  - insert-ordered-containers ==0.2.1.0
  - instance-control ==0.1.1.1
  - integer-logarithms ==1.0.1
  - integration ==0.2.1
  - intero ==0.1.20
  - interpolate ==0.1.0
  - interpolatedstring-perl6 ==1.0.0
+  - interpolation ==0.1.0.1
  - IntervalMap ==0.5.2.0
  - intervals ==0.7.2
  - intro ==0.1.0.10
@@ -1140,7 +1190,7 @@ default-package-overrides:
  - io-storage ==0.3
  - io-streams ==1.3.6.1
  - io-streams-haproxy ==1.0.0.1
-  - ip6addr ==0.5.2
+  - ip6addr ==0.5.3
  - iproute ==1.7.1
  - IPv6Addr ==0.6.3
  - irc ==0.6.1.0
@@ -1158,6 +1208,7 @@ default-package-overrides:
  - ixset ==1.0.7
  - ixset-typed ==0.3.1
  - jailbreak-cabal ==1.3.2
+  - javascript-extras ==0.3.1.0
  - jmacro ==0.6.14
  - jmacro-rpc ==0.3.2
  - jmacro-rpc-happstack ==0.3.2
@@ -1168,6 +1219,7 @@ default-package-overrides:
  - js-flot ==0.8.3
  - js-jquery ==3.1.1
  - json ==0.9.1
+  - json-ast ==0.3.1
  - json-builder ==0.3
  - json-rpc-generic ==0.2.1.2
  - json-schema ==0.7.4.1
@@ -1210,8 +1262,10 @@ default-package-overrides:
  - language-thrift ==0.10.0.0
  - large-hashable ==0.1.0.4
  - largeword ==1.2.5
+  - latex ==0.1.0.3
  - lattices ==1.5.0
  - lazy-csv ==0.5.1
+  - lazyio ==0.1.0.4
  - lca ==0.3
  - leapseconds-announced ==2017
  - lens ==4.15.1
@@ -1221,9 +1275,10 @@ default-package-overrides:
  - lens-family ==1.2.1
  - lens-family-core ==1.2.1
  - lens-family-th ==0.5.0.0
+  - lens-labels ==0.1.0.1
  - lens-regex ==0.1.0
  - lens-simple ==0.1.0.9
-  - lentil ==1.0.8.0
+  - lentil ==1.0.9.0
  - leveldb-haskell ==0.6.4
  - lexer-applicative ==2.1.0.1
  - lhs2tex ==1.19
@@ -1250,6 +1305,7 @@ default-package-overrides:
  - list-prompt ==0.1.1.0
  - list-t ==1
  - ListLike ==4.5.1
+  - llvm-hs-pure ==4.0.0.0
  - lmdb ==0.2.5
  - loch-th ==0.2.1
  - log ==0.7
@@ -1274,12 +1330,14 @@ default-package-overrides:
  - machines-io ==0.2.0.13
  - machines-process ==0.2.0.8
  - magic ==1.1
+  - magicbane ==0.1.1
  - mainland-pretty ==0.4.1.4
  - makefile ==0.1.1.0
  - managed ==1.0.5
  - mandrill ==0.5.3.1
  - markdown ==0.1.16
  - markdown-unlit ==0.4.0
+  - markov-chain ==0.0.3.4
  - markup ==3.1.0
  - marvin ==0.2.3
  - marvin-interpolate ==1.1
@@ -1288,10 +1346,13 @@ default-package-overrides:
  - matplotlib ==0.4.3
  - matrices ==0.4.4
  - matrix ==0.3.5.0
-  - matrix-market-attoparsec ==0.1.0.5
+  - matrix-market-attoparsec ==0.1.0.7
  - maximal-cliques ==0.1.1
  - mbox ==0.3.3
+  - mbox-utility ==0.0
  - mcmc-types ==1.0.3
+  - mediabus ==0.3.2.1
+  - mediabus-rtp ==0.3.2.1
  - median-stream ==0.7.0.0
  - mega-sdist ==0.3.0.2
  - megaparsec ==5.2.0
@@ -1313,10 +1374,13 @@ default-package-overrides:
  - microlens-mtl ==0.1.10.0
  - microlens-platform ==0.3.8.0
  - microlens-th ==0.4.1.1
+  - midi ==0.2.2.1
+  - midi-music-box ==0.0.0.3
  - mighty-metropolis ==1.2.0
  - mime-mail ==0.4.13.1
  - mime-mail-ses ==0.3.2.3
  - mime-types ==0.1.0.7
+  - minio-hs ==0.2.1
  - mintty ==0.1.1
  - misfortune ==0.1.1.2
  - missing-foreign ==0.1.1
@@ -1324,6 +1388,7 @@ default-package-overrides:
  - mixed-types-num ==0.1.0.1
  - mmap ==0.5.9
  - mmorph ==1.0.9
+  - mnist-idx ==0.1.2.8
  - mockery ==0.3.4
  - modify-fasta ==0.8.2.3
  - monad-control ==1.0.1.0
@@ -1360,6 +1425,7 @@ default-package-overrides:
  - mono-traversable-instances ==0.1.0.0
  - monoid-extras ==0.4.2
  - monoid-subclasses ==0.4.3.1
+  - monoid-transformer ==0.0.3
  - monoidal-containers ==0.3.0.1
  - morte ==1.6.6
  - mountpoints ==1.0.2
@@ -1374,6 +1440,7 @@ default-package-overrides:
  - multiset-comb ==0.2.4.1
  - multistate ==0.7.1.1
  - murmur-hash ==0.1.0.9
+  - mushu ==0.1.1
  - MusicBrainz ==0.2.4
  - mustache ==2.1.3
  - mutable-containers ==0.3.3
@@ -1407,6 +1474,7 @@ default-package-overrides:
  - network-conduit-tls ==1.2.2
  - network-house ==0.1.0.2
  - network-info ==0.2.0.8
+  - network-ip ==0.3
  - network-msgpack-rpc ==0.0.3
  - network-multicast ==0.2.0
  - Network-NineP ==0.4.1
@@ -1424,13 +1492,17 @@ default-package-overrides:
  - nicify-lib ==1.0.1
  - NineP ==0.0.2.1
  - nix-paths ==1.0.0.1
+  - non-empty ==0.3
  - non-empty-sequence ==0.2.0.2
+  - non-negative ==0.1.1
  - nonce ==1.0.2
  - nondeterminism ==1.4
  - NoTrace ==0.3.0.1
  - nsis ==0.3.1
  - numbers ==3000.2.0.1
  - numeric-extras ==0.1
+  - numeric-prelude ==0.4.2
+  - numeric-quest ==0.2.0.1
  - NumInstances ==1.4
  - numtype-dk ==0.5.0.1
  - oanda-rest-api ==0.3.0.0
@@ -1443,6 +1515,7 @@ default-package-overrides:
  - old-locale ==1.0.0.7
  - old-time ==1.1.0.3
  - once ==0.2
+  - one-liner ==0.8.1
  - OneTuple ==0.2.1
  - oo-prototypes ==0.1.0.0
  - opaleye ==0.5.3.0
@@ -1461,7 +1534,7 @@ default-package-overrides:
  - optional-args ==1.0.1
  - options ==1.2.1.1
  - optparse-applicative ==0.13.2.0
-  - optparse-generic ==1.1.4
+  - optparse-generic ==1.1.5
  - optparse-helper ==0.2.1.1
  - optparse-simple ==0.0.3
  - optparse-text ==0.1.1.0
@@ -1477,7 +1550,7 @@ default-package-overrides:
  - pandoc-citeproc ==0.10.4.1
  - pandoc-types ==1.17.0.5
  - pango ==0.13.3.1
-  - parallel ==3.2.1.0
+  - parallel ==3.2.1.1
  - parallel-io ==0.3.3
  - parseargs ==0.2.0.8
  - parsec ==3.1.11
@@ -1527,7 +1600,7 @@ default-package-overrides:
  - pipes-category ==0.2.0.1
  - pipes-concurrency ==2.0.7
  - pipes-csv ==1.4.3
-  - pipes-extras ==1.0.8
+  - pipes-extras ==1.0.9
  - pipes-fluid ==0.5.0.3
  - pipes-group ==1.0.6
  - pipes-misc ==0.2.5.0
@@ -1550,8 +1623,10 @@ default-package-overrides:
  - pointedlist ==0.6.1
  - pointful ==1.0.9
  - pointless-fun ==1.1.0.6
+  - poly-arity ==0.1.0
  - polynomials-bernstein ==1.1.2
  - polyparse ==1.12
+  - pooled-io ==0.0.2.1
  - posix-paths ==0.2.1.1
  - posix-realtime ==0.0.0.4
  - post-mess-age ==0.2.1.0
@@ -1567,6 +1642,7 @@ default-package-overrides:
  - pred-set ==0.0.1
  - prednote ==0.36.0.4
  - prefix-units ==0.2.0
+  - prelude-compat ==0.0.0.1
  - prelude-extras ==0.4.0.3
  - prelude-safeenum ==0.1.1.2
  - preprocessor-tools ==1.0.1
@@ -1581,6 +1657,7 @@ default-package-overrides:
  - primes ==0.2.1.0
  - primitive ==0.6.1.0
  - printcess ==0.1.0.3
+  - probability ==0.2.5.1
  - process-extras ==0.7.1
  - product-profunctors ==0.7.1.0
  - profiteur ==0.4.2.2
@@ -1591,8 +1668,14 @@ default-package-overrides:
  - prometheus-client ==0.1.0.1
  - prometheus-metrics-ghc ==0.1.0.1
  - prompt ==0.1.1.2
+  - proto-lens ==0.2.0.1
+  - proto-lens-arbitrary ==0.1.0.2
+  - proto-lens-combinators ==0.1.0.6
+  - proto-lens-descriptors ==0.2.0.1
+  - proto-lens-optparse ==0.1.0.2
+  - proto-lens-protoc ==0.2.0.1
  - protobuf ==0.2.1.1
-  - protobuf-simple ==0.1.0.3
+  - protobuf-simple ==0.1.0.4
  - protocol-buffers ==2.4.0
  - protocol-buffers-descriptor ==2.4.0
  - protolude ==0.1.10
@@ -1631,6 +1714,7 @@ default-package-overrides:
  - random-tree ==0.6.0.5
  - range ==0.1.2.0
  - range-set-list ==0.1.2.0
+  - rank-product ==0.2.0.1
  - rank1dynamic ==0.3.3.0
  - Rasterific ==0.7.2.1
  - rasterific-svg ==0.3.2.1
@@ -1641,6 +1725,7 @@ default-package-overrides:
  - rawfilepath ==0.1.1
  - rawstring-qm ==0.2.3.0
  - rdf ==0.1.0.1
+  - rdtsc ==1.3.0.1
  - read-editor ==0.1.0.2
  - read-env-var ==0.1.0.1
  - readable ==0.3.1
@@ -1655,6 +1740,7 @@ default-package-overrides:
  - ref-fd ==0.4.0.1
  - refact ==0.3.0.2
  - references ==0.3.2.1
+  - refined ==0.1.2.1
  - reflection ==2.1.2
  - reform ==0.2.7.1
  - reform-blaze ==0.2.4.3
@@ -1674,7 +1760,7 @@ default-package-overrides:
  - regex-tdfa ==1.2.2
  - regex-tdfa-text ==1.0.0.3
  - reinterpret-cast ==0.1.0
-  - relational-query ==0.8.3.5
+  - relational-query ==0.8.3.6
  - relational-query-HDBC ==0.6.0.2
  - relational-record ==0.1.7.1
  - relational-schemas ==0.1.3.1
@@ -1722,6 +1808,8 @@ default-package-overrides:
  - safe-exceptions-checked ==0.1.0
  - safecopy ==0.9.3.1
  - SafeSemaphore ==0.10.1
+  - sample-frame ==0.0.3
+  - sample-frame-np ==0.0.4.1
  - sampling ==0.3.2
  - sandi ==0.4.0
  - sandman ==0.2.0.1
@@ -1730,7 +1818,7 @@ default-package-overrides:
  - scalpel ==0.5.0
  - scalpel-core ==0.5.0
  - scanner ==0.2
-  - scientific ==0.3.4.11
+  - scientific ==0.3.4.12
  - scotty ==0.11.0
  - scrape-changes ==0.1.0.5
  - scrypt ==0.5.0
@@ -1752,7 +1840,7 @@ default-package-overrides:
  - serf ==0.1.1.0
  - servant ==0.9.1.1
  - servant-aeson-specs ==0.5.2.0
-  - servant-auth-cookie ==0.4.3.3
+  - servant-auth-cookie ==0.4.4
  - servant-blaze ==0.7.1
  - servant-cassava ==0.8
  - servant-client ==0.9.1.1
@@ -1764,7 +1852,9 @@ default-package-overrides:
  - servant-lucid ==0.7.1
  - servant-mock ==0.8.1.1
  - servant-purescript ==0.6.0.0
+  - servant-ruby ==0.2.1.0
  - servant-server ==0.9.1.1
+  - servant-static-th ==0.1.0.3
  - servant-subscriber ==0.5.0.3
  - servant-swagger ==1.1.2
  - servant-swagger-ui ==0.2.2.2.2.8
@@ -1774,6 +1864,7 @@ default-package-overrides:
  - serversession-frontend-wai ==1.0
  - serversession-frontend-yesod ==1.0
  - servius ==1.2.0.2
+  - set-cover ==0.0.8
  - set-monad ==0.2.0.0
  - setenv ==0.1.1.3
  - setlocale ==1.0.0.4
@@ -1811,8 +1902,9 @@ default-package-overrides:
  - smoothie ==0.4.2.6
  - smtLib ==1.0.8
  - smtp-mail ==0.1.4.6
+  - snap-blaze ==0.2.1.5
  - snap-core ==1.0.2.0
-  - snap-server ==1.0.1.1
+  - snap-server ==1.0.2.0
  - snowflake ==0.1.1.1
  - soap ==0.2.3.3
  - soap-openssl ==0.1.0.2
@@ -1841,6 +1933,7 @@ default-package-overrides:
  - Spock-worker ==0.3.1.0
  - spool ==0.1
  - spoon ==0.3.1
+  - spreadsheet ==0.1.3.4
  - sql-words ==0.1.4.1
  - sqlite-simple ==0.4.13.0
  - sqlite-simple-errors ==0.6.0.0
@@ -1848,6 +1941,7 @@ default-package-overrides:
  - stache ==0.2.2
  - stack-run-auto ==0.1.1.4
  - stack-type ==0.1.0.0
+  - stackage-curator ==0.14.5
  - state-plus ==0.1.2
  - stateref ==0.3
  - statestack ==0.2.0.5
@@ -1863,6 +1957,7 @@ default-package-overrides:
  - stm-containers ==0.2.15
  - stm-delay ==0.1.1.1
  - stm-extras ==0.1.0.2
+  - stm-split ==0.0.1
  - stm-stats ==0.2.0.0
  - stm-supply ==0.2.0.0
  - STMonadTrans ==0.4.3
@@ -1870,6 +1965,10 @@ default-package-overrides:
  - storable-complex ==0.2.2
  - storable-endian ==0.2.6
  - storable-record ==0.0.3.1
+  - storable-tuple ==0.0.3.2
+  - storablevector ==0.2.12
+  - storablevector-carray ==0.0
+  - store ==0.4.2
  - store-core ==0.4
  - Strafunski-StrategyLib ==5.0.0.10
  - stratosphere ==0.4.2
@@ -1914,6 +2013,7 @@ default-package-overrides:
  - system-posix-redirect ==1.1.0.1
  - syz ==0.2.0.0
  - tabular ==0.2.2.7
+  - tagchup ==0.4.0.5
  - tagged ==0.8.5
  - tagged-binary ==0.2.0.0
  - tagged-identity ==0.1.1
@@ -1944,16 +2044,19 @@ default-package-overrides:
  - tasty-smallcheck ==0.8.1
  - tasty-stats ==0.2.0.2
  - tasty-tap ==0.0.4
-  - tasty-th ==0.1.5
+  - tasty-th ==0.1.7
  - Taxonomy ==1.0.2
  - TCache ==0.12.1
  - tce-conf ==1.3
  - tcp-streams ==0.6.0.0
  - tcp-streams-openssl ==0.6.0.0
+  - tdigest ==0.1
+  - tdigest-Chart ==0
  - telegram-api ==0.6.1.0
  - template ==0.2.0.10
  - temporary ==1.2.0.4
  - temporary-rc ==1.2.0.3
+  - termcolor ==0.2.0.0
  - terminal-progress-bar ==0.1.1
  - terminal-size ==0.3.2.1
  - terminfo ==0.4.0.2
@@ -1973,16 +2076,19 @@ default-package-overrides:
  - text-format ==0.3.1.1
  - text-generic-pretty ==1.2.1
  - text-icu ==0.7.0.1
+  - text-latin1 ==0.3
  - text-ldap ==0.1.1.8
  - text-manipulate ==0.2.0.1
  - text-metrics ==0.2.0
  - text-postgresql ==0.0.2.2
+  - text-printer ==0.5
  - text-region ==0.1.0.1
  - text-show ==3.4.1.1
  - text-show-instances ==3.5
  - text-zipper ==0.10
  - textlocal ==0.1.0.5
  - tf-random ==0.5
+  - tfp ==1.0.0.2
  - th-data-compat ==0.0.2.2
  - th-desugar ==1.6
  - th-expand-syns ==0.4.2.0
@@ -2002,6 +2108,7 @@ default-package-overrides:
  - through-text ==0.1.0.0
  - thumbnail-plus ==1.0.5
  - thyme ==0.3.5.5
+  - tibetan-utils ==0.1.1.2
  - tidal ==0.8.2
  - time-compat ==0.1.0.3
  - time-lens ==0.4.0.1
@@ -2031,7 +2138,7 @@ default-package-overrides:
  - tree-fun ==0.8.1.0
  - trifecta ==1.6.2.1
  - true-name ==0.1.0.2
-  - tsv2csv ==0.1.0.1
+  - tsv2csv ==0.1.0.2
  - ttrie ==0.1.2.1
  - tttool ==1.7.0.1
  - tuple ==0.3.0.2
@@ -2040,10 +2147,15 @@ default-package-overrides:
  - turtle ==1.3.2
  - turtle-options ==0.1.0.4
  - twitter-feed ==0.2.0.11
+  - twitter-types ==0.7.2.2
+  - twitter-types-lens ==0.7.2
  - type-aligned ==0.9.6
  - type-assertions ==0.1.0.0
+  - type-combinators ==0.2.4.3
  - type-eq ==0.5
  - type-fun ==0.1.1
+  - type-hint ==0.1
+  - type-level-integers ==0.0.1
  - type-level-kv-list ==1.1.0
  - type-level-numbers ==0.1.1.1
  - type-list ==0.5.0.0
@@ -2062,6 +2174,9 @@ default-package-overrides:
  - unbounded-delays ==0.1.0.10
  - uncertain ==0.3.1.0
  - unexceptionalio ==0.3.0
+  - unfoldable ==0.9.2
+  - unfoldable-restricted ==0.0.2
+  - unicode ==0.0
  - unicode-show ==0.1.0.2
  - unicode-transforms ==0.2.1
  - unification-fd ==0.10.0.1
@@ -2070,6 +2185,8 @@ default-package-overrides:
  - uniplate ==1.6.12
  - uniq-deep ==1.1.0.0
  - Unique ==0.4.6.1
+  - unique ==0
+  - unit-constraint ==0.0.0
  - units ==2.4
  - units-defs ==2.0.1.1
  - units-parser ==0.1.0.0
@@ -2085,6 +2202,7 @@ default-package-overrides:
  - Unixutils ==1.54.1
  - unlit ==0.4.0.0
  - unordered-containers ==0.2.8.0
+  - unsafe ==0.0
  - uri-bytestring ==0.2.3.1
  - uri-encode ==1.5.0.5
  - uri-templater ==0.2.1.0
@@ -2110,7 +2228,7 @@ default-package-overrides:
  - vcswrapper ==0.1.5
  - vector ==0.11.0.0
  - vector-algorithms ==0.7.0.1
-  - vector-binary-instances ==0.2.3.4
+  - vector-binary-instances ==0.2.3.5
  - vector-buffer ==0.4.1
  - vector-fftw ==0.1.3.7
  - vector-instances ==3.4
@@ -2130,13 +2248,14 @@ default-package-overrides:
  - vty ==5.15
  - wai ==3.2.1.1
  - wai-app-static ==3.1.6.1
+  - wai-cli ==0.1.1
  - wai-conduit ==3.0.0.3
  - wai-cors ==0.2.5
  - wai-eventsource ==3.0.0
  - wai-extra ==3.0.19.1
  - wai-handler-launch ==3.0.2.2
  - wai-logger ==2.3.0
-  - wai-middleware-auth ==0.1.1.2
+  - wai-middleware-auth ==0.1.2.0
  - wai-middleware-caching ==0.1.0.2
  - wai-middleware-caching-lru ==0.1.0.0
  - wai-middleware-caching-redis ==0.2.0.0
@@ -2145,6 +2264,7 @@ default-package-overrides:
  - wai-middleware-crowd ==0.1.4.2
  - wai-middleware-metrics ==0.2.4
  - wai-middleware-prometheus ==0.1.0.1
+  - wai-middleware-rollbar ==0.3.0
  - wai-middleware-static ==0.8.1
  - wai-middleware-throttle ==0.2.1.0
  - wai-middleware-verbs ==0.3.2
@@ -2157,7 +2277,7 @@ default-package-overrides:
  - wai-transformers ==0.0.7
  - wai-websockets ==3.0.1.1
  - waitra ==0.0.4.0
-  - warp ==3.2.11.1
+  - warp ==3.2.11.2
  - warp-tls ==3.2.3
  - wave ==0.1.4
  - wavefront ==0.7.1
@@ -2176,6 +2296,7 @@ default-package-overrides:
  - webpage ==0.0.5
  - webrtc-vad ==0.1.0.3
  - websockets ==0.10.0.0
+  - websockets-rpc ==0.0.2
  - websockets-snap ==0.10.2.0
  - weigh ==0.0.3
  - wikicfp-scraper ==0.1.0.8
@@ -2204,7 +2325,7 @@ default-package-overrides:
  - wordpass ==1.0.0.7
  - Workflow ==0.8.3
  - wrap ==0.0.0
-  - wreq ==0.5.0.0
+  - wreq ==0.5.0.1
  - writer-cps-full ==0.1.0.0
  - writer-cps-lens ==0.1.0.1
  - writer-cps-morph ==0.1.0.2
@@ -2227,6 +2348,7 @@ default-package-overrides:
  - xlsx ==0.4.3
  - xlsx-tabular ==0.2.2
  - xml ==1.3.14
+  - xml-basic ==0.1.1.3
  - xml-conduit ==1.4.0.4
  - xml-conduit-parse ==0.3.1.0
  - xml-conduit-writer ==0.1.1.1
@@ -2254,7 +2376,7 @@ default-package-overrides:
  - yesod-auth-basic ==0.1.0.2
  - yesod-auth-hashdb ==1.6.0.1
  - yesod-bin ==1.5.2.2
-  - yesod-core ==1.4.32
+  - yesod-core ==1.4.33
  - yesod-eventsource ==1.4.1
  - yesod-fay ==0.8.0
  - yesod-form ==1.4.11
@@ -2284,11 +2406,15 @@ default-package-overrides:
  - yi-rope ==0.8
  - yi-snippet ==0.13.5
  - yjtools ==0.9.18
+  - yoga ==0.0.0.1
+  - youtube ==0.2.1
  - zero ==0.1.4
  - zeromq4-haskell ==0.6.5
  - zip ==0.1.10
  - zip-archive ==0.3.0.5
  - zippers ==0.2.2
+  - ziptastic-client ==0.3.0.1
+  - ziptastic-core ==0.2.0.1
  - zlib ==0.6.1.2
  - zlib-bindings ==0.1.1.5
  - zlib-lens ==0.1.2.1
@@ -2321,6 +2447,8 @@ extra-packages:
  - seqid < 0.2                         # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
  - seqid-streams < 0.2                 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
  - split < 0.2                         # newer versions don't work with GHC 6.12.3
+  - store < 0.4                         # needed by stack 1.4.0
+  - store-core < 0.4                    # needed by stack 1.4.0
  - tar < 0.4.2.0                       # later versions don't work with GHC < 7.6.x
  - transformers == 0.4.3.*             # the latest version isn't supported by mtl yet
  - vector < 0.10.10                    # newer versions don't work with GHC 6.12.3
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -126,8 +126,7 @@ self: super: builtins.intersectAttrs super {
  glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.gtk2hs-buildtools) pkgs.glib) ["fortify"];
  gtk3 = disableHardening (super.gtk3.override { inherit (pkgs) gtk3; }) ["fortify"];
  gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk2) ["fortify"];
-  gtksourceview2 = (addPkgconfigDepend super.gtksourceview2 pkgs.gtk2).override { inherit (pkgs.gnome2) gtksourceview; };
-  gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; };
+  gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2;

  # Need WebkitGTK, not just webkit.
  webkit = super.webkit.override { webkit = pkgs.webkitgtk2; };
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -6,103 +6,13 @@

 let

-  inherit (stdenv.lib) fix' extends makeOverridable makeExtensible;
-  inherit (import ./lib.nix { inherit pkgs; }) overrideCabal;
+  inherit (stdenv.lib) extends makeExtensible;
+  inherit (import ./lib.nix { inherit pkgs; }) overrideCabal makePackageSet;

-  haskellPackages = self:
-    let
-
-      mkDerivationImpl = pkgs.callPackage ./generic-builder.nix {
-        inherit stdenv;
-        inherit (pkgs) fetchurl pkgconfig glibcLocales coreutils gnugrep gnused;
-        nodejs = pkgs.nodejs-slim;
-        jailbreak-cabal = if (self.ghc.cross or null) != null
-          then self.ghc.bootPkgs.jailbreak-cabal
-          else self.jailbreak-cabal;
-        inherit (self) ghc;
-        hscolour = overrideCabal self.hscolour (drv: {
-          isLibrary = false;
-          doHaddock = false;
-          hyperlinkSource = false;      # Avoid depending on hscolour for this build.
-          postFixup = "rm -rf $out/lib $out/share $out/nix-support";
-        });
-        cpphs = overrideCabal (self.cpphs.overrideScope (self: super: {
-          mkDerivation = drv: super.mkDerivation (drv // {
-            enableSharedExecutables = false;
-            enableSharedLibraries = false;
-            doHaddock = false;
-            useCpphs = false;
-          });
-        })) (drv: {
-            isLibrary = false;
-            postFixup = "rm -rf $out/lib $out/share $out/nix-support";
-        });
-      };
-
-      mkDerivation = makeOverridable mkDerivationImpl;
-
-      callPackageWithScope = scope: drv: args: (stdenv.lib.callPackageWith scope drv args) // {
-        overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args;
-      };
-
-      mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // scope;
-      defaultScope = mkScope self;
-      callPackage = drv: args: callPackageWithScope defaultScope drv args;
-
-      withPackages = packages: callPackage ./with-packages-wrapper.nix {
-        inherit (self) llvmPackages;
-        haskellPackages = self;
-        inherit packages;
-      };
-
-      haskellSrc2nix = { name, src, sha256 ? null }:
-        let
-          sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"'';
-        in pkgs.stdenv.mkDerivation {
-          name = "cabal2nix-${name}";
-          buildInputs = [ pkgs.cabal2nix ];
-          phases = ["installPhase"];
-          LANG = "en_US.UTF-8";
-          LOCALE_ARCHIVE = pkgs.lib.optionalString pkgs.stdenv.isLinux "${pkgs.glibcLocales}/lib/locale/locale-archive";
-          installPhase = ''
-            export HOME="$TMP"
-            mkdir -p "$out"
-            cabal2nix --compiler=${self.ghc.name} --system=${stdenv.system} ${sha256Arg} "${src}" > "$out/default.nix"
-          '';
-      };
-
-      hackage2nix = name: version: haskellSrc2nix {
-        name   = "${name}-${version}";
-        sha256 = ''$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' "${all-cabal-hashes}/${name}/${version}/${name}.json")'';
-        src    = "${all-cabal-hashes}/${name}/${version}/${name}.cabal";
-      };
-
-    in
-      import ./hackage-packages.nix { inherit pkgs stdenv callPackage; } self // {
-
-        inherit mkDerivation callPackage haskellSrc2nix hackage2nix;
-
-        callHackage = name: version: self.callPackage (self.hackage2nix name version);
-
-        # Creates a Haskell package from a source package by calling cabal2nix on the source.
-        callCabal2nix = name: src: self.callPackage (self.haskellSrc2nix { inherit src name; });
-
-        ghcWithPackages = selectFrom: withPackages (selectFrom self);
-
-        ghcWithHoogle = selectFrom:
-          let
-            packages = selectFrom self;
-            hoogle = callPackage ./hoogle.nix {
-              inherit packages;
-            };
-          in withPackages (packages ++ [ hoogle ]);
-
-        ghc = ghc // {
-          withPackages = self.ghcWithPackages;
-          withHoogle = self.ghcWithHoogle;
-        };
-
-      };
+  haskellPackages = makePackageSet {
+    package-set = import ./hackage-packages.nix;
+    inherit ghc;
+  };

  commonConfiguration = import ./configuration-common.nix { inherit pkgs; };
  nixConfiguration = import ./configuration-nix.nix { inherit pkgs; };
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -1,6 +1,7 @@
 { pkgs }:

 rec {
+  makePackageSet = pkgs.callPackage ./make-package-set.nix {};

  overrideCabal = drv: f: (drv.override (args: args // {
    mkDerivation = drv: (args.mkDerivation drv).override f;
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -0,0 +1,107 @@
+# This expression takes a file like `hackage-packages.nix` and constructs
+# a full package set out of that.
+
+# required dependencies:
+{ pkgs, stdenv, all-cabal-hashes }:
+
+# arguments:
+#  * ghc package to use
+#  * package-set: a function that takes { pkgs, stdenv, callPackage } as first arg and `self` as second
+{ ghc, package-set }:
+
+# return value: a function from self to the package set
+self: let
+
+  inherit (stdenv.lib) fix' extends makeOverridable;
+  inherit (import ./lib.nix { inherit pkgs; }) overrideCabal;
+
+  mkDerivationImpl = pkgs.callPackage ./generic-builder.nix {
+    inherit stdenv;
+    inherit (pkgs) fetchurl pkgconfig glibcLocales coreutils gnugrep gnused;
+    nodejs = pkgs.nodejs-slim;
+    jailbreak-cabal = if (self.ghc.cross or null) != null
+      then self.ghc.bootPkgs.jailbreak-cabal
+      else self.jailbreak-cabal;
+    inherit (self) ghc;
+    hscolour = overrideCabal self.hscolour (drv: {
+      isLibrary = false;
+      doHaddock = false;
+      hyperlinkSource = false;      # Avoid depending on hscolour for this build.
+      postFixup = "rm -rf $out/lib $out/share $out/nix-support";
+    });
+    cpphs = overrideCabal (self.cpphs.overrideScope (self: super: {
+      mkDerivation = drv: super.mkDerivation (drv // {
+        enableSharedExecutables = false;
+        enableSharedLibraries = false;
+        doHaddock = false;
+        useCpphs = false;
+      });
+    })) (drv: {
+        isLibrary = false;
+        postFixup = "rm -rf $out/lib $out/share $out/nix-support";
+    });
+  };
+
+  mkDerivation = makeOverridable mkDerivationImpl;
+
+  callPackageWithScope = scope: drv: args: (stdenv.lib.callPackageWith scope drv args) // {
+    overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args;
+  };
+
+  mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // scope;
+  defaultScope = mkScope self;
+  callPackage = drv: args: callPackageWithScope defaultScope drv args;
+
+  withPackages = packages: callPackage ./with-packages-wrapper.nix {
+    inherit (self) llvmPackages;
+    haskellPackages = self;
+    inherit packages;
+  };
+
+  haskellSrc2nix = { name, src, sha256 ? null }:
+    let
+      sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"'';
+    in pkgs.stdenv.mkDerivation {
+      name = "cabal2nix-${name}";
+      buildInputs = [ pkgs.cabal2nix ];
+      phases = ["installPhase"];
+      LANG = "en_US.UTF-8";
+      LOCALE_ARCHIVE = pkgs.lib.optionalString pkgs.stdenv.isLinux "${pkgs.glibcLocales}/lib/locale/locale-archive";
+      installPhase = ''
+        export HOME="$TMP"
+        mkdir -p "$out"
+        cabal2nix --compiler=${self.ghc.name} --system=${stdenv.system} ${sha256Arg} "${src}" > "$out/default.nix"
+      '';
+  };
+
+  hackage2nix = name: version: haskellSrc2nix {
+    name   = "${name}-${version}";
+    sha256 = ''$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' "${all-cabal-hashes}/${name}/${version}/${name}.json")'';
+    src    = "${all-cabal-hashes}/${name}/${version}/${name}.cabal";
+  };
+
+in package-set { inherit pkgs stdenv callPackage; } self // {
+
+    inherit mkDerivation callPackage haskellSrc2nix hackage2nix;
+
+    callHackage = name: version: self.callPackage (self.hackage2nix name version);
+
+    # Creates a Haskell package from a source package by calling cabal2nix on the source.
+    callCabal2nix = name: src: self.callPackage (self.haskellSrc2nix { inherit src name; });
+
+    ghcWithPackages = selectFrom: withPackages (selectFrom self);
+
+    ghcWithHoogle = selectFrom:
+      let
+        packages = selectFrom self;
+        hoogle = callPackage ./hoogle.nix {
+          inherit packages;
+        };
+      in withPackages (packages ++ [ hoogle ]);
+
+    ghc = ghc // {
+      withPackages = self.ghcWithPackages;
+      withHoogle = self.ghcWithHoogle;
+    };
+
+  }
--- a/pkgs/development/haskell-modules/patches/hdbus-semicolons.patch
+++ b/pkgs/development/haskell-modules/patches/hdbus-semicolons.patch
@@ -1,34 +0,0 @@
-From 8fd84b4d6ba257ac93a61bce3378777840e8bf80 Mon Sep 17 00:00:00 2001
-From: Nikolay Amiantov <ab@fmap.me>
-Date: Sat, 5 Nov 2016 14:27:04 +0300
-Subject: [PATCH] getSessionAddress: take first bus address from
- semicolon-separated variable
-
---
- lib/DBus/Address.hs | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lib/DBus/Address.hs b/lib/DBus/Address.hs
-index 72ac99d..596b18c 100644
--- a/lib/DBus/Address.hs
-+++ b/lib/DBus/Address.hs
-@@ -18,6 +18,7 @@ module DBus.Address where
- import qualified Control.Exception
- import           Data.Char (digitToInt, ord, chr)
- import           Data.List (intercalate)
-+import           Data.Maybe (listToMaybe)
- import qualified Data.Map
- import           Data.Map (Map)
- import qualified System.Environment
-@@ -152,7 +153,7 @@ getSystemAddress = do
- getSessionAddress :: IO (Maybe Address)
- getSessionAddress = do
- 	env <- getenv "DBUS_SESSION_BUS_ADDRESS"
-	return (env >>= parseAddress)
-+	return $ maybe Nothing listToMaybe (env >>= parseAddresses)
- 
- -- | Returns the address in the environment variable
- -- @DBUS_STARTER_ADDRESS@, which must be set.
-- 
-2.10.1
-
--- a/pkgs/development/interpreters/picolisp/default.nix
+++ b/pkgs/development/interpreters/picolisp/default.nix
@@ -3,10 +3,10 @@ with stdenv.lib;

 stdenv.mkDerivation rec {
  name = "picoLisp-${version}";
-  version = "16.6";
+  version = "16.12";
  src = fetchurl {
    url = "http://www.software-lab.de/${name}.tgz";
-    sha256 = "0y9b4wqpgx0j0igbp4h7k0bw3hvp7dnrhl3fsaagjpp305b003z3";
+    sha256 = "1k3x6mvk9b34iiyml142bzh3gf241f25ywjlaagbxzb9vklpws75";
  };
  buildInputs = optional stdenv.is64bit jdk;
  patchPhase = optionalString stdenv.isArm ''
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -26,7 +26,7 @@ with stdenv.lib;

 let
  majorVersion = "3.6";
-  minorVersion = "0";
+  minorVersion = "1";
  minorVersionSuffix = "";
  pythonVersion = majorVersion;
  version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
@@ -47,7 +47,7 @@ in stdenv.mkDerivation {

  src = fetchurl {
    url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
-    sha256 = "08inlbb2vb8lahw6wfq654lqk6l1x7ncpggp6a92vqw5yq2gkidh";
+    sha256 = "0ha03sbakxblzyvlramx5fj0ranzmzx4pa2png6nn8gczkfi0650";
  };

  NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
@@ -63,14 +63,6 @@ in stdenv.mkDerivation {
    substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
  '';

-  patches = [
-    (fetchpatch {
-      name = "glibc-2.25-failed-to-get-random-numbers.patch";
-      url = https://github.com/python/cpython/commit/ff558f5aba4.patch;
-      sha256 = "1k12gpn69np94cm942vaf40sv7gsxqf20rv1m3parzgi1gs4hqa3";
-    })
-  ];
-
  postPatch = ''
    # Determinism
    substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])"
--- a/pkgs/development/libraries/aspell/default.nix
+++ b/pkgs/development/libraries/aspell/default.nix
@@ -23,12 +23,27 @@ stdenv.mkDerivation rec {
    );
  '';

-  # Note: Users should define the `ASPELL_CONF' environment variable to
-  # `data-dir $HOME/.nix-profile/lib/aspell/' so that they can access
-  # dictionaries installed in their profile.
-  #
-  # We can't use `$out/etc/aspell.conf' for that purpose since Aspell
-  # doesn't expand environment variables such as `$HOME'.
+  postInstall = ''
+    local prog="$out/bin/aspell"
+    local hidden="$out/bin/.aspell-wrapped"
+    mv "$prog" "$hidden"
+    cat > "$prog" <<END
+    #! $SHELL -e
+    if [ -z "\$ASPELL_CONF" ]; then
+      for p in \$NIX_PROFILES; do
+        if [ -d "\$p/lib/aspell" ]; then
+          ASPELL_CONF="data-dir \$p/lib/aspell"
+        fi
+      done
+      if [ -z "\$ASPELL_CONF" ] && [ -d "\$HOME/.nix-profile/lib/aspell" ]; then
+        ASPELL_CONF="data-dir \$HOME/.nix-profile/lib/aspell"
+      fi
+      export ASPELL_CONF
+    fi
+    exec "$hidden" "\$@"
+    END
+    chmod +x "$prog"
+  '';

  meta = {
    description = "Spell checker for many languages";
--- a/pkgs/development/libraries/curlcpp/default.nix
+++ b/pkgs/development/libraries/curlcpp/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, curl }: 

-stdenv.mkDerivation {
-  name = "curlcpp-20160901";
+stdenv.mkDerivation rec {
+  name = "curlcpp-${version}";
+  version = "1.0";

  src = fetchFromGitHub {
    owner = "JosephP91";
    repo = "curlcpp";
-    rev = "98286da1d6c9f6158344a8e272eae5030cbf6c0e";
-    sha256 = "00nm2b8ik1yvaz5dp1b61jid841jv6zf8k5ma2nxbf1di1apqh0d";
+    rev = "${version}";
+    sha256 = "1akibhrmqsy0dlz9lq93508bhkh7r1l0aycbzy2x45a9gqxfdi4q";
  };

  buildInputs = [ cmake curl ];
@@ -15,9 +16,9 @@ stdenv.mkDerivation {
  meta = with stdenv.lib; {
    homepage = "http://josephp91.github.io/curlcpp/";
    description = "Object oriented C++ wrapper for CURL";
-    platforms = platforms.unix ;
+    platforms = platforms.unix;
    license = licenses.mit;
-    maintainers = [ maintainers.juliendehos ];
+    maintainers = with maintainers; [ juliendehos rszibele ];
  };
 }

--- a/pkgs/development/libraries/hivex/default.nix
+++ b/pkgs/development/libraries/hivex/default.nix
@@ -3,11 +3,11 @@

 stdenv.mkDerivation rec {
  name = "hivex-${version}";
-  version = "1.3.11";
+  version = "1.3.14";

  src = fetchurl {
    url = "http://libguestfs.org/download/hivex/${name}.tar.gz";
-    sha256 = "0y3nqykwy58divxkv7gmsb067dasyfz3apbp437hl57rgrndyfn6";
+    sha256 = "0aqv28prjcmc66znw0wgaxjijg5mjm44bgn1iil8a4dlbsgv4p7b";
  };

  patches = [ ./hivex-syms.patch ];
--- a/pkgs/development/libraries/hivex/hivex-syms.patch
+++ b/pkgs/development/libraries/hivex/hivex-syms.patch
@@ -1,6 +1,6 @@
-diff -rupN hivex-1.3.11/lib/Makefile.am hivex-1.3.11-new/lib/Makefile.am
--- hivex-1.3.11/lib/Makefile.am	2013-09-10 13:04:12.000000000 +0200
-+++ hivex-1.3.11-new/lib/Makefile.am	2014-11-06 01:31:05.956106861 +0100
+diff -rupN hivex-1.3.14/lib/Makefile.am hivex-1.3.14-new/lib/Makefile.am
+--- hivex-1.3.14/lib/Makefile.am	2013-09-10 13:04:12.000000000 +0200
+++ hivex-1.3.14-new/lib/Makefile.am	2014-11-06 01:31:05.956106861 +0100
@@ -40,8 +40,7 @@ libhivex_la_SOURCES = \
 
 libhivex_la_LIBADD =  ../gnulib/lib/libgnu.la $(LTLIBOBJS)
--- a/pkgs/development/libraries/hunspell/default.nix
+++ b/pkgs/development/libraries/hunspell/default.nix
@@ -1,16 +1,21 @@
-{ stdenv, fetchurl, ncurses, readline }:
+{ stdenv, fetchurl, ncurses, readline, autoreconfHook }:

 stdenv.mkDerivation rec {
-  name = "hunspell-1.3.3";
+  version = "1.6.1";
+  name = "hunspell-${version}";

  src = fetchurl {
-    url = "mirror://sourceforge/hunspell/${name}.tar.gz";
-    sha256 = "0v14ff9s37vkh45diaddndcrj0hmn67arh8xh8k79q9c1vgc1cm7";
+    url = "https://github.com/hunspell/hunspell/archive/v${version}.tar.gz";
+    sha256 = "0j9c20sj7bgd6f77193g1ihy8w905byk2gdhdc0r9dsh7irr7x9h";
  };

  outputs = [ "bin" "dev" "out" "man" ];

  buildInputs = [ ncurses readline ];
+  nativeBuildInputs = [ autoreconfHook ];
+
+  autoreconfFlags = "-vfi";
+
  configureFlags = [ "--with-ui" "--with-readline" ];

  hardeningDisable = [ "format" ];
--- a/pkgs/development/libraries/libbsd/darwin.patch
+++ b/pkgs/development/libraries/libbsd/darwin.patch
@@ -0,0 +1,675 @@
+diff --git a/configure.ac b/configure.ac
+index 5a432d4..a69ae0b 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -55,7 +55,7 @@ AS_CASE([$host_os],
+ )
+ 
+ # Checks for header files.
+-AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h])
+AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h stdio_ext.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_TYPE_UID_T
+@@ -143,6 +143,31 @@ AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge \
+                 pstat_getproc sysconf])
+ AM_CONDITIONAL(HAVE_GETENTROPY, [test "x$ac_cv_func_getentropy" = "xtrue"])
+ 
+HostOS=`echo "$host" | sed 's/.*-//'`
+os_is_macosx=false
+nonLinuxOS=false
+AC_SUBST(HostOS)
+case ${HostOS} in
+	darwin* | powerpc*-*-darwin* | freebsd* | netbsd* | openbsd*)
+		os_is_macosx=true
+		nonLinuxOS=true
+		echo HostOS="$HostOS"
+		;;
+	*)
+		echo host="$host"
+		echo HostOS="$HostOS"
+		os_is_macosx=false
+		nonLinuxOS=false
+		;;
+esac		
+AM_CONDITIONAL([IS_DARWIN], [test x$os_is_macosx = xtrue])
+AM_COND_IF([IS_DARWIN],
+	[AC_DEFINE([IS_DARWIN], [1], [Get HostOS Type is Darwin])])
+
+AM_CONDITIONAL([NON_LINUX], [test x$userdefine_gethostbyname_r = xtrue])
+AM_COND_IF([NON_LINUX],
+	[AC_DEFINE([NON_LINUX], [1], [Get HostOS Type])])
+
+ AC_CONFIG_FILES([
+ 	Makefile
+ 	include/Makefile
+diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h
+index ebb6160..ce882bf 100644
+--- a/include/bsd/libutil.h
+++ b/include/bsd/libutil.h
+@@ -39,7 +39,9 @@
+ #ifndef _LIBUTIL_H_
+ #define _LIBUTIL_H_
+ 
+#ifdef HAVE_FEATURES_H
+ #include <features.h>
+#endif
+ #include <sys/cdefs.h>
+ #include <sys/types.h>
+ #include <stdint.h>
+diff --git a/include/bsd/stdio.h b/include/bsd/stdio.h
+index 7697425..ef34c4f 100644
+--- a/include/bsd/stdio.h
+++ b/include/bsd/stdio.h
+@@ -44,12 +44,16 @@
+ __BEGIN_DECLS
+ const char *fmtcheck(const char *, const char *);
+ 
+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
+ /* XXX: The function requires cooperation from the system libc to store the
+  * line buffer in the FILE struct itself. */
+ char *fgetln(FILE *fp, size_t *lenp)
+ 	__attribute__((deprecated("This functions cannot be safely ported, "
+ 	                          "use getline(3) instead, as it is supported "
+ 	                          "by GNU and POSIX.1-2008.")));
+#else
+char *fgetln(FILE *fp, size_t *lenp);
+#endif
+ 
+ /*
+  * Note: We diverge from the FreeBSD, OpenBSD and DragonFlyBSD declarations,
+diff --git a/include/bsd/string.h b/include/bsd/string.h
+index ee2f953..a3ab077 100644
+--- a/include/bsd/string.h
+++ b/include/bsd/string.h
+@@ -37,11 +37,14 @@
+ #include <sys/types.h>
+ 
+ __BEGIN_DECLS
+-size_t strlcpy(char *dst, const char *src, size_t siz);
+-size_t strlcat(char *dst, const char *src, size_t siz);
+ char *strnstr(const char *str, const char *find, size_t str_len);
+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
+size_t bsd_strlcpy(char *dst, const char *src, size_t siz);
+size_t bsd_strlcat(char *dst, const char *src, size_t siz);
+void bsd_strmode(mode_t mode, char *str);
+#else
+ void strmode(mode_t mode, char *str);
+-
+#endif
+ void explicit_bzero(void *buf, size_t len);
+ __END_DECLS
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index ad83dbf..0f2a7ee 100644
+--- a/src/Makefile.am
+++ b/src/Makefile.am
+@@ -54,17 +54,21 @@ libbsd_la_DEPENDENCIES = \
+ 	libbsd.map
+ libbsd_la_LIBADD = \
+ 	$(CLOCK_GETTIME_LIBS)
+
+if IS_DARWIN
+libbsd_la_LDFLAGS = \
+	-Wl \
+	-version-number $(LIBBSD_ABI)
+else
+ libbsd_la_LDFLAGS = \
+ 	-Wl,--version-script=$(srcdir)/libbsd.map \
+ 	-version-number $(LIBBSD_ABI)
+endif
+
+ libbsd_la_SOURCES = \
+ 	arc4random.c \
+-	arc4random.h \
+-	arc4random_unix.h \
+-	arc4random_openbsd.h \
+ 	arc4random_uniform.c \
+ 	bsd_getopt.c \
+-	chacha_private.h \
+ 	closefrom.c \
+ 	dehumanize_number.c \
+ 	err.c \
+@@ -117,6 +121,15 @@ libbsd_la_SOURCES += \
+ 	$(nil)
+ endif
+ 
+noinst_HEADERS = \
+	arc4random.h \
+	arc4random_bsd.h \
+	arc4random_linux.h \
+	arc4random_unix.h \
+	arc4random_osx.h \
+	arc4random_openbsd.h \
+	chacha_private.h
+
+ libbsd_ctor_a_SOURCES = \
+ 	setproctitle_ctor.c \
+ 	$(nil)
+diff --git a/src/arc4random_bsd.h b/src/arc4random_bsd.h
+new file mode 100644
+index 0000000..ece2f85
+--- /dev/null
+++ b/src/arc4random_bsd.h
+@@ -0,0 +1,86 @@
+/*	$OpenBSD: arc4random_freebsd.h,v 1.2 2015/01/15 06:57:18 deraadt Exp $	*/
+
+/*
+ * Copyright (c) 1996, David Mazieres <dm@uun.org>
+ * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
+ * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
+ * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * Stub functions for portability.
+ */
+
+#include <sys/mman.h>
+
+#include <pthread.h>
+#include <signal.h>
+
+static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
+#define _ARC4_LOCK()   pthread_mutex_lock(&arc4random_mtx)
+#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)
+
+/*
+ * Unfortunately, pthread_atfork() is broken on FreeBSD (at least 9 and 10) if
+ * a program does not link to -lthr. Callbacks registered with pthread_atfork()
+ * appear to fail silently. So, it is not always possible to detect a PID
+ * wraparound.
+ */
+#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f))
+
+static inline void
+_getentropy_fail(void)
+{
+	raise(SIGKILL);
+}
+
+static volatile sig_atomic_t _rs_forked;
+
+static inline void
+_rs_forkhandler(void)
+{
+	_rs_forked = 1;
+}
+
+static inline void
+_rs_forkdetect(void)
+{
+	static pid_t _rs_pid = 0;
+	pid_t pid = getpid();
+
+	if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) {
+		_rs_pid = pid;
+		_rs_forked = 0;
+		if (rs)
+			memset(rs, 0, sizeof(*rs));
+	}
+}
+
+static inline int
+_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
+{
+	if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
+	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
+		return (-1);
+
+	if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
+	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
+		munmap(*rsp, sizeof(**rsp));
+		return (-1);
+	}
+
+	_ARC4_ATFORK(_rs_forkhandler);
+	return (0);
+}
+diff --git a/src/arc4random_linux.h b/src/arc4random_linux.h
+new file mode 100644
+index 0000000..d61a8db
+--- /dev/null
+++ b/src/arc4random_linux.h
+@@ -0,0 +1,86 @@
+/*	$OpenBSD: arc4random_linux.h,v 1.8 2014/08/13 06:04:10 deraadt Exp $	*/
+
+/*
+ * Copyright (c) 1996, David Mazieres <dm@uun.org>
+ * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
+ * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
+ * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * Stub functions for portability.
+ */
+
+#include <sys/mman.h>
+
+#include <pthread.h>
+#include <signal.h>
+
+static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
+#define _ARC4_LOCK()   pthread_mutex_lock(&arc4random_mtx)
+#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)
+
+#ifdef __GLIBC__
+extern void *__dso_handle;
+extern int __register_atfork(void (*)(void), void(*)(void), void (*)(void), void *);
+#define _ARC4_ATFORK(f) __register_atfork(NULL, NULL, (f), __dso_handle)
+#else
+#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f))
+#endif
+
+static inline void
+_getentropy_fail(void)
+{
+	raise(SIGKILL);
+}
+
+static volatile sig_atomic_t _rs_forked;
+
+static inline void
+_rs_forkhandler(void)
+{
+	_rs_forked = 1;
+}
+
+static inline void
+_rs_forkdetect(void)
+{
+	static pid_t _rs_pid = 0;
+	pid_t pid = getpid();
+
+	if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) {
+		_rs_pid = pid;
+		_rs_forked = 0;
+		if (rs)
+			memset(rs, 0, sizeof(*rs));
+	}
+}
+
+static inline int
+_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
+{
+	if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
+	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
+		return (-1);
+
+	if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
+	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
+		munmap(*rsp, sizeof(**rsp));
+		return (-1);
+	}
+
+	_ARC4_ATFORK(_rs_forkhandler);
+	return (0);
+}
+diff --git a/src/arc4random_osx.h b/src/arc4random_osx.h
+new file mode 100644
+index 0000000..14771a6
+--- /dev/null
+++ b/src/arc4random_osx.h
+@@ -0,0 +1,82 @@
+/*	$OpenBSD: arc4random_osx.h,v 1.10 2015/09/11 11:52:55 deraadt Exp $	*/
+
+/*
+ * Copyright (c) 1996, David Mazieres <dm@uun.org>
+ * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
+ * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
+ * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * Stub functions for portability.
+ */
+
+#include <sys/mman.h>
+
+#include <unistd.h>
+#include <pthread.h>
+#include <signal.h>
+
+static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
+#define _ARC4_LOCK()   pthread_mutex_lock(&arc4random_mtx)
+#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)
+
+#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f))
+
+static inline void
+_getentropy_fail(void)
+{
+	raise(SIGKILL);
+}
+
+static volatile sig_atomic_t _rs_forked;
+
+static inline void
+_rs_forkhandler(void)
+{
+	_rs_forked = 1;
+}
+
+static inline void
+_rs_forkdetect(void)
+{
+	static pid_t _rs_pid = 0;
+	pid_t pid = getpid();
+
+	if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) {
+		_rs_pid = pid;
+		_rs_forked = 0;
+		if (rs)
+			memset(rs, 0, sizeof(*rs));
+	}
+}
+
+static inline int
+_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
+{
+	if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
+	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
+		return (-1);
+
+	if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
+	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
+		munmap(*rsp, sizeof(**rsp));
+		*rsp = NULL;
+		return (-1);
+	}
+
+	_ARC4_ATFORK(_rs_forkhandler);
+	return (0);
+}
+diff --git a/src/fgetln.c b/src/fgetln.c
+index 4d1726e..9c73788 100644
+--- a/src/fgetln.c
+++ b/src/fgetln.c
+@@ -30,7 +30,9 @@
+ #include <sys/types.h>
+ #include <string.h>
+ 
+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
+ #include "local-link.h"
+#endif
+ 
+ #ifdef HAVE_GETLINE
+ struct filebuf {
+@@ -75,9 +77,11 @@ fgetln(FILE *stream, size_t *len)
+ 		return fb->buf;
+ 	}
+ }
+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
+ libbsd_link_warning(fgetln,
+                     "This functions cannot be safely ported, use getline(3) "
+                     "instead, as it is supported by GNU and POSIX.1-2008.")
+#endif
+ #else
+ #error "Function fgetln() needs to be ported."
+ #endif
+diff --git a/src/fpurge.c b/src/fpurge.c
+index 462535a..e7eb46f 100644
+--- a/src/fpurge.c
+++ b/src/fpurge.c
+@@ -26,9 +26,11 @@
+ 
+ #include <errno.h>
+ #include <stdio.h>
+#if HAVE___FPURGE
+ #include <stdio_ext.h>
+#endif
+ 
+-#ifdef HAVE___FPURGE
+#ifdef HAVE___FPURGE                   /* glibc >= 2.2, Haiku, Solaris >= 7 */
+ int
+ fpurge(FILE *fp)
+ {
+@@ -42,5 +44,55 @@ fpurge(FILE *fp)
+ 	return 0;
+ }
+ #else
+-#error "Function fpurge() needs to be ported."
+#define fp_ fp
+//#error "Function fpurge() needs to be ported."
+//#elif HAVE_FPURGE                   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin 1.7 */
+int
+fpurge(FILE *fp)
+{
+	if (fp == NULL || fileno(fp) < 0) {
+		errno = EBADF;
+		return EOF;
+	}
+
+  /* Call the system's fpurge function.  */
+# undef fpurge
+# if !HAVE_DECL_FPURGE
+  extern int fpurge (FILE *);
+# endif
+  int result = fpurge (fp);
+# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
+  if (result == 0)
+    /* Correct the invariants that fpurge broke.
+       <stdio.h> on BSD systems says:
+         "The following always hold: if _flags & __SRD, _w is 0."
+       If this invariant is not fulfilled and the stream is read-write but
+       currently reading, subsequent putc or fputc calls will write directly
+       into the buffer, although they shouldn't be allowed to.  */
+    if ((fp_->_flags & __SRD) != 0)
+      fp_->_w = 0;
+#endif
+  return result;
+}
+//#endif
+#endif
+
+#ifdef TEST
+int
+main()
+{
+	static FILE fp_bad;
+	FILE *fp;
+
+	if (fpurge(&fp_bad) == 0)
+		return 1;
+
+	fp = fopen("/dev/zero", "r");
+	if (fpurge(fp) < 0)
+		return 1;
+
+	fclose(fp);
+
+	return 0;
+}
+ #endif
+diff --git a/src/funopen.c b/src/funopen.c
+index 7d6ae31..9963162 100644
+--- a/src/funopen.c
+++ b/src/funopen.c
+@@ -137,6 +137,7 @@ funopen(const void *cookie,
+ 
+ 	return fopencookie(cookiewrap, mode, funcswrap);
+ }
+#elif defined(darwin) || defined(__APPLE__) || defined(MACOSX)
+ #else
+ #error "Function funopen() needs to be ported."
+ #endif
+diff --git a/src/getentropy.c b/src/getentropy.c
+index 3f11a1e..8a23a07 100644
+--- a/src/getentropy.c
+++ b/src/getentropy.c
+@@ -28,9 +28,7 @@
+ #include "getentropy_linux.c"
+ #elif defined(__GNU__)
+ #include "getentropy_hurd.c"
+-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+-#include "getentropy_bsd.c"
+-#elif defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
+ #include "getentropy_bsd.c"
+ #elif defined(__sun)
+ #include "getentropy_solaris.c"
+diff --git a/src/hash/sha512.h b/src/hash/sha512.h
+index 4f368a1..ab22fc1 100644
+--- a/src/hash/sha512.h
+++ b/src/hash/sha512.h
+@@ -29,7 +29,11 @@
+ #ifndef _SHA512_H_
+ #define _SHA512_H_
+ 
+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
+#include <stdint.h>
+#else
+ #include <sys/types.h>
+#endif
+ 
+ #define SHA512_DIGEST_LENGTH		64
+ 
+diff --git a/src/hash/sha512c.c b/src/hash/sha512c.c
+index c2a93be..f69013d 100644
+--- a/src/hash/sha512c.c
+++ b/src/hash/sha512c.c
+@@ -27,7 +27,11 @@
+ #include <sys/cdefs.h>
+ __FBSDID("$FreeBSD$");
+ 
+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
+#include <machine/endian.h>
+#else
+ #include <sys/endian.h>
+#endif
+ #include <sys/types.h>
+ 
+ #include <string.h>
+diff --git a/src/nlist.c b/src/nlist.c
+index 0cffe55..f785b61 100644
+--- a/src/nlist.c
+++ b/src/nlist.c
+@@ -27,6 +27,7 @@
+  * SUCH DAMAGE.
+  */
+ 
+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
+ #if defined(LIBC_SCCS) && !defined(lint)
+ static char sccsid[] = "@(#)nlist.c	8.1 (Berkeley) 6/4/93";
+ #endif /* LIBC_SCCS and not lint */
+@@ -409,3 +410,4 @@ elf_sym_to_nlist(struct nlist *nl, Elf_Sym *s, Elf_Shdr *shdr, int shnum)
+ 		nl->n_type |= N_EXT;
+ }
+ #endif /* _NLIST_DO_ELF */
+#endif
+diff --git a/src/setproctitle.c b/src/setproctitle.c
+index c18c61c..b1b1591 100644
+--- a/src/setproctitle.c
+++ b/src/setproctitle.c
+@@ -32,6 +32,11 @@
+ #include <unistd.h>
+ #include <string.h>
+ 
+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
+#define __asm__(x)
+extern char **environ;
+#endif
+
+ static struct {
+ 	/* Original value. */
+ 	const char *arg0;
+@@ -287,7 +292,14 @@ __asm__(".symver setproctitle_impl,setproctitle@@LIBBSD_0.5");
+  * for code linking against that version, and change the default to use the
+  * new version, so that new code depends on the implemented version. */
+ #ifdef HAVE_TYPEOF
+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
+//
+// HACK: even weak aliasing breaks in clang so just comment this out for now
+//
+// extern typeof(setproctitle_impl) setproctitle_stub __attribute__((weak, alias("setproctitle_impl")));
+#else
+ extern typeof(setproctitle_impl) setproctitle_stub __attribute__((alias("setproctitle_impl")));
+#endif
+ #else
+ void setproctitle_stub(const char *fmt, ...)
+ 	__attribute__((alias("setproctitle_impl")));
+diff --git a/src/strlcat.c b/src/strlcat.c
+index 21c8afb..e036132 100644
+--- a/src/strlcat.c
+++ b/src/strlcat.c
+@@ -27,7 +27,11 @@
+  * If retval >= siz, truncation occurred.
+  */
+ size_t
+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
+bsd_strlcat(char *dst, const char *src, size_t siz)
+#else
+ strlcat(char *dst, const char *src, size_t siz)
+#endif
+ {
+ 	char *d = dst;
+ 	const char *s = src;
+diff --git a/src/strlcpy.c b/src/strlcpy.c
+index 1719d35..c63591d 100644
+--- a/src/strlcpy.c
+++ b/src/strlcpy.c
+@@ -25,7 +25,11 @@
+  * Returns strlen(src); if retval >= siz, truncation occurred.
+  */
+ size_t
+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
+bsd_strlcpy(char *dst, const char *src, size_t siz)
+#else
+ strlcpy(char *dst, const char *src, size_t siz)
+#endif
+ {
+ 	char *d = dst;
+ 	const char *s = src;
+diff --git a/src/strmode.c b/src/strmode.c
+index 8d825ae..c1b5f8d 100644
+--- a/src/strmode.c
+++ b/src/strmode.c
+@@ -37,7 +37,11 @@ static char sccsid[] = "@(#)strmode.c	8.3 (Berkeley) 8/15/94";
+ #include <string.h>
+ 
+ void
+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
+bsd_strmode(mode_t mode, char *p)
+#else
+ strmode(mode_t mode, char *p)
+#endif
+ {
+ 	 /* print type */
+ 	switch (mode & S_IFMT) {
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, autoreconfHook }:

 stdenv.mkDerivation rec {
  name = "libbsd-${version}";
@@ -9,10 +9,16 @@ stdenv.mkDerivation rec {
    sha256 = "1a1l7afchlvvj2zfi7ajcg26bbkh5i98y2v5h9j5p1px9m7n6jwk";
  };

+  # darwin changes configure.ac which means we need to regenerate
+  # the configure scripts
+  nativeBuildInputs = [ autoreconfHook ];
+
+  patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ];
+
  meta = with stdenv.lib; {
    description = "Common functions found on BSD systems";
    homepage = http://libbsd.freedesktop.org/;
    license = licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
  };
 }
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -1,32 +1,45 @@
 { stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper
 , ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex
-, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen, libapparmor }:
+, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen, libapparmor
+, getopt, perlPackages, ocamlPackages }:

 stdenv.mkDerivation rec {
  name = "libguestfs-${version}";
-  version = "1.29.5";
+  version = "1.36.3";

  appliance = fetchurl {
-    url = "http://libguestfs.org/download/binaries/appliance/appliance-1.26.0.tar.xz";
-    sha256 = "1kzvgmy845kclvr93y6rdpss2q0p8yfqg14r0i1pi5r4zc68yvj4";
+    url = "http://libguestfs.org/download/binaries/appliance/appliance-1.36.1.tar.xz";
+    sha256 = "1klvr13gpg615hgjvviwpxlj839lbwwsrq7x100qg5zmmjfhl125";
  };

  src = fetchurl {
-    url = "http://libguestfs.org/download/1.29-development/libguestfs-${version}.tar.gz";
-    sha256 = "1il0p3irwcyfdm83935hj4bvxsx0kdfn8dvqmg2lbzap17jvzj8h";
+    url = "http://libguestfs.org/download/1.36-stable/libguestfs-${version}.tar.gz";
+    sha256 = "0dhb69b7svjgnrmbyvizdz5vsgsrr95ypz0qvp3kz83jyj6sa76m";
  };

  buildInputs = [
    makeWrapper pkgconfig autoreconfHook ncurses cpio gperf perl
    cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig
    systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong
-    SysVirt numactl xen libapparmor
-  ];
+    SysVirt numactl xen libapparmor getopt perlPackages.ModuleBuild
+  ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ]);

+  prePatch = ''
+    # build-time scripts
+    substituteInPlace run.in        --replace '#!/bin/bash' '#!/bin/sh'
+    substituteInPlace ocaml-link.sh --replace '#!/bin/bash' '#!/bin/sh'
+
+    # $(OCAMLLIB) is read-only "${ocamlPackages.ocaml}/lib/ocaml"
+    substituteInPlace ocaml/Makefile.am            --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml'
+    substituteInPlace ocaml/Makefile.in            --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml'
+    substituteInPlace v2v/test-harness/Makefile.am --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml'
+    substituteInPlace v2v/test-harness/Makefile.in --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml'
+  '';
  configureFlags = "--disable-appliance --disable-daemon";
  patches = [ ./libguestfs-syms.patch ];
  NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/";
+  installFlags = "REALLY_INSTALL=yes";

  postInstall = ''
    for bin in $out/bin/*; do
--- a/pkgs/development/libraries/libguestfs/libguestfs-syms.patch
+++ b/pkgs/development/libraries/libguestfs/libguestfs-syms.patch
@@ -1,7 +1,7 @@
-diff -rupN libguestfs-1.29.5/src/Makefile.am libguestfs-1.29.5-new/src/Makefile.am
--- libguestfs-1.29.5/src/Makefile.am	2014-11-05 16:43:08.000000000 +0100
-+++ libguestfs-1.29.5-new/src/Makefile.am	2014-11-05 20:07:45.760730596 +0100
-@@ -167,8 +167,7 @@ libguestfs_la_LIBADD = \
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+--- a/lib/Makefile.am
+++ b/lib/Makefile.am
+@@ -168,8 +168,7 @@ libguestfs_la_LIBADD = \
 # Force libtool to name the library 'libguestfs.so.0.$(MAX_PROC_NR).0'.
 # Include the version script to limit which symbols are exported.
 libguestfs_la_LDFLAGS = \
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -3,11 +3,12 @@
 assert !stdenv.isLinux || stdenv ? cross; # TODO: improve on cross

 stdenv.mkDerivation rec {
-  name = "libiconv-1.14";
+  name = "libiconv-${version}";
+  version = "1.15";

  src = fetchurl {
    url = "mirror://gnu/libiconv/${name}.tar.gz";
-    sha256 = "04q6lgl3kglmmhw59igq1n7v3rp1rpkypl366cy1k1yn2znlvckj";
+    sha256 = "0y1ij745r4p48mxq84rax40p10ln7fc7m243p8k8sia519i3dxfc";
  };

  patches = lib.optionals stdenv.isCygwin [
--- a/pkgs/development/libraries/libpst/default.nix
+++ b/pkgs/development/libraries/libpst/default.nix
@@ -2,11 +2,11 @@
  pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }:

 stdenv.mkDerivation rec {
-  name = "libpst-0.6.68";
+  name = "libpst-0.6.70";

  src = fetchurl {
      url = "http://www.five-ten-sg.com/libpst/packages/${name}.tar.gz";
-      sha256 = "06mcaga36i65n1ifr5pw6ghcb1cjfqwrmm1xmaw1sckqf2iqx2by";
+      sha256 = "1m378vxh1sf9ry8k11x773xpy5f6cab5gkzqglz0jp9hc431r60r";
    };

  buildInputs = [ autoreconfHook boost python2 libgsf pkgconfig bzip2
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -1,6 +1,9 @@
 { stdenv, fetchzip
 , boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff
 , libwebp, libxml2, proj, python2, scons, sqlite, zlib
+
+# supply a postgresql package to enable the PostGIS input plugin
+, postgresql ? null
 }:

 stdenv.mkDerivation rec {
@@ -21,6 +24,9 @@ stdenv.mkDerivation rec {
  buildInputs =
    [ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff
      libwebp libxml2 proj python2 sqlite zlib
+
+      # optional inputs
+      postgresql
    ];

  configurePhase = ''
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -6,13 +6,13 @@

 stdenv.mkDerivation rec {
  name = "mlt-${version}";
-  version = "6.2.0";
+  version = "6.4.1";

  src = fetchFromGitHub {
    owner = "mltframework";
    repo = "mlt";
    rev = "v${version}";
-    sha256 = "17jwz1lf9ilaxvgvhg7z86dhcsk95m4wlszy4gn7wab2ns5zhdm7";
+    sha256 = "0k9vj21n6qxdjd0vvj22cwi35igajjzh5fbjza766izdbijv2i2w";
  };

  buildInputs = [
--- a/pkgs/development/libraries/qtwebkit-plugins/default.nix
+++ b/pkgs/development/libraries/qtwebkit-plugins/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
  buildInputs = [ qtwebkit hunspell ];

  postPatch = ''
-    sed -i "s,-lhunspell,-lhunspell-1.3," src/spellcheck/spellcheck.pri
+    sed -i "s,-lhunspell,-lhunspell-1.6," src/spellcheck/spellcheck.pri
    sed -i "s,\$\$\[QT_INSTALL_PLUGINS\],$out/lib/qt5/plugins," src/src.pro
  '';

--- a/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/pkgs/development/ocaml-modules/batteries/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchzip, ocaml, findlib, ocamlbuild, qtest }:

-let version = "2.5.3"; in
+let version = "2.6.0"; in

 stdenv.mkDerivation {
  name = "ocaml-batteries-${version}";

  src = fetchzip {
    url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz";
-    sha256 = "047v05qy0526ad52hzhfa0giczhyzbmw9fwsn6l319icq77ms6jh";
+    sha256 = "1nnypfxm3zkahjkzll5qn4ngpqvbxlwg9qdp8qdqvq2vl76w0672";
  };

  buildInputs = [ ocaml findlib ocamlbuild qtest ];
--- a/pkgs/development/ocaml-modules/llvm/default.nix
+++ b/pkgs/development/ocaml-modules/llvm/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {

  patches = [ (fetchpatch {
    url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/llvm/llvm.3.9/files/cmake.patch;
-    sha256 = "1fcc6ylfiw1npdhx7mrsj7h0dx7cym7i9664kpr76zqazb52ikm9";
+    sha256 = "0vjap0xifgm59rwhjc48wi7jpbbif4dllsy4xs45sg95qq5qanp6";
  })];

  cmakeFlags = [ "-DLLVM_OCAML_OUT_OF_TREE=TRUE" ];
--- a/pkgs/development/ocaml-modules/menhir/default.nix
+++ b/pkgs/development/ocaml-modules/menhir/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocaml, findlib, ocamlbuild
-, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20170101" else "20140422"
+, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20170418" else "20140422"
 }@args:

 let
  sha256 =
  if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d"
-  else if version == "20170101" then "0ika46i9gn3sjvspa62fb5dnr20k783vg5fj30649q0ialv6yscr"
+  else if version == "20170418" then "0avxkighxfr9x3vh2dkc5r1k2w7q2dz005w7syyzr7qjybpavpii"
  else throw ("menhir: unknown version " ++ version);
 in

--- a/pkgs/development/ocaml-modules/menhir/generic.nix
+++ b/pkgs/development/ocaml-modules/menhir/generic.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
      and Yann Régis-Gianas.
    '';
    license = with licenses; [
-      qpl /* generator */
+      (if versionAtLeast version "20170418" then gpl2 else qpl) /* generator */
      lgpl2 /* library */
    ];
    platforms = ocaml.meta.platforms or [];
--- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
@@ -1,20 +1,28 @@
-{ stdenv, fetchurl, libvirt, ocaml, findlib }:
+{ stdenv, fetchgit, libvirt, autoconf, ocaml, findlib }:

 stdenv.mkDerivation rec {
  name = "ocaml-libvirt-${version}";
-  version = "0.6.1.4";
+  rev = "3169af3";
+  version = "0.6.1.4-rev.${rev}"; # libguestfs-1.34 needs ocaml-libvirt newer than the latest release 0.6.1.4

-  src = fetchurl {
-    url = "http://libvirt.org/sources/ocaml/ocaml-libvirt-${version}.tar.gz";
-    sha256 = "06q2y36ckb34n179bwczxkl82y3wrba65xb2acg8i04jpiyxadjd";
+  src = fetchgit {
+    url = "git://git.annexia.org/git/ocaml-libvirt.git";
+    rev = rev;
+    sha256 = "0z8p6q6k42rdrvy248siq922m1yszny1hfklf6djynvk2viyqdbg";
  };

  propagatedBuildInputs = [ libvirt ];

-  buildInputs = [ ocaml findlib ];
+  nativeBuildInputs = [ autoconf findlib ];
+
+  buildInputs = [ ocaml ];

  createFindlibDestdir = true;

+  preConfigure = ''
+    autoconf
+  '';
+
  buildPhase = if stdenv.cc.isClang then "make all opt CPPFLAGS=-Wno-error" else "make all opt";

  installPhase = "make install-opt";
--- a/pkgs/development/python-modules/typeguard/default.nix
+++ b/pkgs/development/python-modules/typeguard/default.nix
@@ -0,0 +1,38 @@
+{ buildPythonPackage
+, fetchPypi
+, pythonOlder
+, stdenv
+, setuptools_scm
+, pytest
+}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "typeguard";
+  version = "2.1.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0l3pih5ca469v7if255h5rqymirsw46bi6s7p885jxhq1gv6cfpk";
+  };
+
+  buildInputs = [ setuptools_scm ];
+
+  postPatch = ''
+    substituteInPlace setup.cfg --replace " --cov" ""
+  '';
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test .
+  '';
+
+  disabled = pythonOlder "3.3";
+
+  meta = with stdenv.lib; {
+    description = "This library provides run-time type checking for functions defined with argument type annotations";
+    homepage = "https://github.com/agronholm/typeguard";
+    license = licenses.mit;
+  };
+}
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -262,6 +262,7 @@ let
    h5 = [ pkgs.hdf5-cpp pkgs.which ];
    h5vc = [ pkgs.zlib.dev ];
    HiCseg = [ pkgs.gsl_1 ];
+    imager = [ pkgs.x11 ];
    iBMQ = [ pkgs.gsl_1 ];
    igraph = [ pkgs.gmp ];
    JavaGD = [ pkgs.jdk ];
@@ -832,7 +833,6 @@ let
    "flowVS"                          # depends on broken package r-flowCore-1.38.2
    "flowWorkspace"                   # depends on broken package r-flowCore-1.38.2
    "fmcsR"                           # depends on broken package ChemmineR-2.24.2
-    "ForestTools"                     # depends on broken package imager-0.31
    "fPortfolio"                      # depends on broken package Rsymphony-0.1-26
    "fracprolif"                      # build is broken
    "funModeling"                     # build is broken
@@ -888,7 +888,6 @@ let
    "IHW"                             # depends on broken package r-lpsymphony-1.0.2
    "IHWpaper"                        # depends on broken package r-lpsymphony-1.0.2
    "IlluminaHumanMethylation450k_db" # build is broken
-    "imager"                          # build is broken
    "immunoClust"                     # depends on broken package r-flowCore-1.38.2
    "inSilicoMerging"                 # build is broken
    "intansv"                         # build is broken
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -13,12 +13,12 @@ let
  optional = stdenv.lib.optional;
 in
 stdenv.mkDerivation rec {
-  version = "1.3.0";
+  version = "1.4.0";
  name = "radare2-${version}";

  src = fetchurl {
    url = "http://cloud.radare.org/get/${version}/${name}.tar.gz";
-    sha256 = "1kwp0i5sqk5almnx4g8claimqz8rwvv1fn8x66k4az1s8k7g9kiv";
+    sha256 = "bf6e9ad94fd5828d3936563b8b13218433fbf44231cacfdf37a7312ae2b3e93e";
  };


--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }:

 let
-  version = "1.4.15";
+  version = "1.6.2";
  name = "electron-${version}";

  meta = with stdenv.lib; {
@@ -17,7 +17,7 @@ let

    src = fetchurl {
      url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
-      sha256 = "07b9jdbjrf3siv205wd1dphq6ly0hkaapzvj87d2yjfiyzv3cbsl";
+      sha256 = "1dhyr8zkisnhjzk2v2zi8zp0jqg0v3g095xa430af6i1rm0qhs13";
      name = "${name}.zip";
    };

@@ -45,7 +45,7 @@ let

    src = fetchurl {
      url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip";
-      sha256 = "0p8gkyq4qczzia26wrnbs91vdqzxhgq515cmsrwvhw87mc9fka4k";
+      sha256 = "11jfh4xvdrpda5ni08kl6wcg67ww9viagszk8gi00z0rlczrsbkf";
      name = "${name}.zip";
    };

--- a/pkgs/development/tools/misc/icon-naming-utils/default.nix
+++ b/pkgs/development/tools/misc/icon-naming-utils/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {

  meta = with stdenv.lib; {
    homepage = http://tango.freedesktop.org/Standard_Icon_Naming_Specification;
-    platforms = platforms.linux;
+    platforms = with platforms; linux ++ darwin;
  };
 }
--- a/pkgs/development/tools/ocaml/jbuilder/default.nix
+++ b/pkgs/development/tools/ocaml/jbuilder/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchzip, ocaml, opam }:

 stdenv.mkDerivation {
-  name = "jbuilder-1.0+beta5";
+  name = "jbuilder-1.0+beta7";
  src = fetchzip {
-    url = http://github.com/janestreet/jbuilder/archive/1.0+beta5.tar.gz;
-    sha256 = "00kh83n3216g1n7rhh14mcmw9bj5vzq7kiixm1abrc09dhwh4m7a";
+    url = http://github.com/janestreet/jbuilder/archive/1.0+beta7.tar.gz;
+    sha256 = "10qjqs6gv9y8s580gvssjm56xw72pcxd5lkpzqpz6cz4390d45i8";
  };

  buildInputs = [ ocaml ];
--- a/pkgs/development/web/nodejs/v7.nix
+++ b/pkgs/development/web/nodejs/v7.nix
@@ -10,11 +10,11 @@ let
  baseName = if enableNpm then "nodejs" else "nodejs-slim";
 in
  stdenv.mkDerivation (nodejs // rec {
-    version = "7.7.3";
+    version = "7.9.0";
    name = "${baseName}-${version}";
    src = fetchurl {
      url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "1pqfrvz06nz88jdp1vsrxfy5z0v8yas1c6pkvl45afvl3zqxlhal";
+      sha256 = "0abaz5z0cv7amd6blm4cm91asj30ydf0lq3j0wdg6aa9i15pcsd5";
    };

  })