Merge branch 'master' into staging

author: Vladimír Čunát <vcunat@gmail.com> 2017-12-15 21:40:23 +0100
committer: Vladimír Čunát <vcunat@gmail.com> 2017-12-15 21:40:23 +0100
commit: 24d81d6332bf95574367a1fab9c7b734e2807047 (patch)
tree: 6b71810cf703d14dbfb74a62c4f4b3014d5ed450 /pkgs/development
parent: 774559a0ca9cc28d797e2ba912abdfb77895c77b (diff)
parent: b256afac58b80adde2605eac434a04b9a23bbe95 (diff)
download: nixpkgs-24d81d6332bf95574367a1fab9c7b734e2807047.tar
nixpkgs-24d81d6332bf95574367a1fab9c7b734e2807047.tar.gz
nixpkgs-24d81d6332bf95574367a1fab9c7b734e2807047.tar.bz2
nixpkgs-24d81d6332bf95574367a1fab9c7b734e2807047.tar.lz
nixpkgs-24d81d6332bf95574367a1fab9c7b734e2807047.tar.xz
nixpkgs-24d81d6332bf95574367a1fab9c7b734e2807047.tar.zst
nixpkgs-24d81d6332bf95574367a1fab9c7b734e2807047.zip
77 files changed, 1659 insertions, 1640 deletions
diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix
index 792ecc739a5..4a2893c303f 100644
--- a/pkgs/development/compilers/chicken/default.nix
+++ b/pkgs/development/compilers/chicken/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, bootstrap-chicken ? null }:
 
 let
-  version = "4.11.0";
+  version = "4.13.0";
   platform = with stdenv;
     if isDarwin then "macosx"
     else if isCygwin then "cygwin"
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz";
-    sha256 = "12ddyiikqknpr8h6llsxbg2fz75xnayvcnsvr1cwv8xnjn7jpp73";
+    sha256 = "0hvckhi5gfny3mlva6d7y9pmx7cbwvq0r7mk11k3sdiik9hlkmdd";
   };
 
   setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh;
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index 62b2e7c1850..fd8930bc854 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -94,6 +94,9 @@ let
         # Change the #error on GCC > 4.9 to a #warning.
         sed -i $out/include/host_config.h -e 's/#error\(.*unsupported GNU version\)/#warning\1/'
 
+        # Fix builds with newer glibc version
+        sed -i "1 i#define _BITS_FLOATN_H" "$out/include/host_defines.h"
+
         # Ensure that cmake can find CUDA.
         mkdir -p $out/nix-support
         echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 8f2bbefc2bc..5015f490077 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,15 +1,14 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 let
-  version = "1.1.60";
-  release = "55";
+  version = "1.2.10";
 in stdenv.mkDerivation rec {
   inherit version;
   name = "kotlin-${version}";
 
   src = fetchurl {
-    url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}-release-${release}.zip";
-    sha256 = "04vlhpc92pg0bcgapd5w2b3039sgv52km8i0m4mc5yf0ik6hx1s9";
+    url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
+    sha256 = "1qr61i5fjd5p7bi05hplagmcxgb05k4xdh5yjjvaq8cij5l4b1wm";
   };
 
   propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix
new file mode 100644
index 00000000000..143e0344cf3
--- /dev/null
+++ b/pkgs/development/coq-modules/category-theory/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchgit, coq, ssreflect }:
+
+let param =
+  {
+    "8.6" = {
+      version = "20171214";
+      rev = "babf9c013506da1dbd67171e4a3ae87fdb7e9d00";
+      sha256 = "16fsf4cggx9s9fkijnpi4g614nmdb2yx7inzqqn070f8p959qcrd";
+    };
+
+    "8.7" = {
+      version = "20171214";
+      rev = "babf9c013506da1dbd67171e4a3ae87fdb7e9d00";
+      sha256 = "16fsf4cggx9s9fkijnpi4g614nmdb2yx7inzqqn070f8p959qcrd";
+    };
+
+  }."${coq.coq-version}"
+; in
+
+stdenv.mkDerivation rec {
+
+  name = "coq${coq.coq-version}-category-theory-${param.version}";
+
+  src = fetchgit {
+    url = git://github.com/jwiegley/category-theory.git;
+    inherit (param) rev sha256;
+  };
+
+  buildInputs = [ coq.ocaml coq.camlp5 coq.findlib ];
+  propagatedBuildInputs = [ coq ssreflect ];
+
+  enableParallelBuilding = false;
+
+  installPhase = ''
+    make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = git://github.com/jwiegley/category-theory.git;
+    description = "A formalization of category theory in Coq for personal study and practical work";
+    maintainers = with maintainers; [ jwiegley ];
+    platforms = coq.meta.platforms;
+  };
+
+}
diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix
new file mode 100644
index 00000000000..b27fbcc1587
--- /dev/null
+++ b/pkgs/development/coq-modules/coq-haskell/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchgit, coq, ssreflect }:
+
+let param =
+  {
+    "8.5" = {
+      version = "20171215";
+      rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968";
+      sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv";
+    };
+
+    "8.6" = {
+      version = "20171215";
+      rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968";
+      sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv";
+    };
+
+    "8.7" = {
+      version = "20171215";
+      rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968";
+      sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv";
+    };
+
+  }."${coq.coq-version}"
+; in
+
+stdenv.mkDerivation rec {
+
+  name = "coq${coq.coq-version}-coq-haskell-${param.version}";
+
+  src = fetchgit {
+    url = git://github.com/jwiegley/coq-haskell.git;
+    inherit (param) rev sha256;
+  };
+
+  buildInputs = [ coq.ocaml coq.camlp5 coq.findlib ];
+  propagatedBuildInputs = [ coq ssreflect ];
+
+  enableParallelBuilding = false;
+
+  installPhase = ''
+    make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = git://github.com/jwiegley/coq-haskell.git;
+    description = "A library for formalizing Haskell types and functions in Coq";
+    maintainers = with maintainers; [ jwiegley ];
+    platforms = coq.meta.platforms;
+  };
+
+}
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e807988f23f..961d250efb6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -95,7 +95,7 @@ self: super: {
       name = "git-annex-${drv.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + drv.version;
-      sha256 = "1bnnrwamw3d37fz7cwykxhi1ryy22dq8r6ld59gsbgcv23drqzax";
+      sha256 = "1fd7lyrwr60dp55swc5iwl0mkkzmdzpmj9qmx1qca2r7y9wc5w5k";
     };
   })).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@@ -513,14 +513,14 @@ self: super: {
   hslua_0_9_3 = super.hslua_0_9_3.override { lua5_1 = pkgs.lua5_3; };
   hslua-module-text = super.hslua-module-text.override { hslua = self.hslua_0_9_3; };
   texmath_0_10 = super.texmath_0_10.override { pandoc-types = self.pandoc-types_1_17_3; };
-  pandoc_2_0_4 = super.pandoc_2_0_4.override {
+  pandoc_2_0_5 = super.pandoc_2_0_5.override {
     doctemplates = self.doctemplates_0_2_1;
     pandoc-types = self.pandoc-types_1_17_3;
     skylighting = self.skylighting_0_4_4_1;
     texmath = self.texmath_0_10;
   };
   pandoc-citeproc_0_12_1 = super.pandoc-citeproc_0_12_1.override {
-    pandoc = self.pandoc_2_0_4;
+    pandoc = self.pandoc_2_0_5;
     pandoc-types = self.pandoc-types_1_17_3;
   };
 
@@ -642,7 +642,8 @@ self: super: {
     '';
   });
 
-  # Fine-tune the build.
+  # Build the latest git version instead of the official release. This isn't
+  # ideal, but Chris doesn't seem to make official releases any more.
   structured-haskell-mode = (overrideCabal super.structured-haskell-mode (drv: {
     src = pkgs.fetchFromGitHub {
       owner = "chrisdone";
@@ -1003,7 +1004,7 @@ self: super: {
   # Newer hpack's needs newer HUnit, but we cannot easily override the version
   # used in the build, so we take the easy way out and disable the test suite.
   hpack_0_20_0 = dontCheck super.hpack_0_20_0;
-  hpack_0_21_0 = dontCheck super.hpack_0_21_0;
+  hpack_0_21_2 = dontCheck super.hpack_0_21_2;
 
   # Stack 1.6.1 needs newer versions than LTS-9 provides.
   stack = super.stack.overrideScope (self: super: {
@@ -1016,4 +1017,7 @@ self: super: {
     unliftio = self.unliftio_0_2_0_0;
   });
 
+  # Hoogle needs a newer version than lts-9 provides.
+  hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_20_1; };
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 46a220b1a3c..515b8027cb8 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -37,7 +37,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 9.17
+  # LTS Haskell 9.18
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -170,6 +170,7 @@ default-package-overrides:
   - ansigraph ==0.3.0.4
   - ansi-terminal ==0.6.3.1
   - ansi-wl-pprint ==0.6.7.3
+  - apecs ==0.2.4.7
   - api-field-json-th ==0.1.0.2
   - appar ==0.1.4
   - apportionment ==0.0.0.2
@@ -232,7 +233,7 @@ default-package-overrides:
   - base-unicode-symbols ==0.2.2.4
   - basic-prelude ==0.6.1.1
   - bcrypt ==0.0.10
-  - bench ==1.0.6
+  - bench ==1.0.7
   - benchpress ==0.2.2.10
   - bencode ==0.6.0.0
   - bento ==0.1.0
@@ -251,7 +252,7 @@ default-package-overrides:
   - binary-search ==1.0.0.3
   - binary-tagged ==0.1.4.2
   - binary-typed ==1.0
-  - bindings-DSL ==1.0.23
+  - bindings-DSL ==1.0.24
   - bindings-GLFW ==3.1.2.3
   - bindings-libzip ==1.0.1
   - bioace ==0.0.1
@@ -327,7 +328,7 @@ default-package-overrides:
   - c2hs ==0.28.2
   - Cabal ==1.24.2.0
   - cabal-dependency-licenses ==0.2.0.0
-  - cabal-doctest ==1.0.3
+  - cabal-doctest ==1.0.4
   - cabal-file-th ==0.2.4
   - cabal-helper ==0.7.3.0
   - cabal-rpm ==0.11.2
@@ -404,7 +405,7 @@ default-package-overrides:
   - code-page ==0.1.3
   - codo-notation ==0.5.2
   - colorful-monoids ==0.2.1.0
-  - colour ==2.3.3
+  - colour ==2.3.4
   - comfort-graph ==0.0.2.1
   - commutative ==0.0.1.4
   - comonad ==5.0.2
@@ -422,7 +423,7 @@ default-package-overrides:
   - concurrent-split ==0.0.1
   - concurrent-supply ==0.1.8
   - conduit ==1.2.12.1
-  - conduit-combinators ==1.1.1
+  - conduit-combinators ==1.1.2
   - conduit-connection ==0.1.0.3
   - conduit-extra ==1.1.17
   - conduit-iconv ==0.1.1.2
@@ -516,7 +517,7 @@ default-package-overrides:
   - data-ordlist ==0.4.7.0
   - data-ref ==0.0.1.1
   - data-reify ==0.6.1
-  - data-serializer ==0.3
+  - data-serializer ==0.3.2
   - data-textual ==0.3.0.2
   - dataurl ==0.1.0.0
   - DAV ==1.3.1
@@ -781,9 +782,9 @@ default-package-overrides:
   - gi-gdk ==3.0.14
   - gi-gdkpixbuf ==2.0.14
   - gi-gio ==2.0.14
-  - gi-glib ==2.0.14
+  - gi-glib ==2.0.15
   - gi-gobject ==2.0.15
-  - gi-gtk ==3.0.17
+  - gi-gtk ==3.0.18
   - gi-javascriptcore ==3.0.14
   - ginger ==0.5.3.0
   - gio ==0.13.4.0
@@ -933,7 +934,7 @@ default-package-overrides:
   - groundhog-mysql ==0.8
   - groundhog-postgresql ==0.8.0.1
   - groundhog-sqlite ==0.8
-  - groundhog-th ==0.8.0.1
+  - groundhog-th ==0.8.0.2
   - group-by-date ==0.1.0.2
   - grouped-list ==0.2.1.3
   - groupoids ==4.0
@@ -941,6 +942,7 @@ default-package-overrides:
   - gtk ==0.14.7
   - gtk2hs-buildtools ==0.13.3.1
   - gtk3 ==0.14.8
+  - gym-http-api ==0.1.0.0
   - H ==0.9.0.1
   - h2c ==1.0.0
   - hackage-db ==1.22
@@ -959,7 +961,7 @@ default-package-overrides:
   - hamlet ==1.2.0
   - HandsomeSoup ==0.4.2
   - handwriting ==0.1.0.3
-  - hapistrano ==0.3.4.0
+  - hapistrano ==0.3.5.0
   - happstack-hsp ==7.3.7.3
   - happstack-jmacro ==7.0.12
   - happstack-server ==7.4.6.4
@@ -971,9 +973,9 @@ default-package-overrides:
   - hashable-time ==0.2.0.1
   - hashmap ==1.3.2
   - hashtables ==1.2.2.1
-  - haskeline ==0.7.4.0
+  - haskeline ==0.7.4.1
   - haskell-gi ==0.20.3
-  - haskell-gi-base ==0.20.5
+  - haskell-gi-base ==0.20.7
   - haskell-gi-overloading ==1.0
   - haskell-import-graph ==1.0.3
   - haskell-lexer ==1.0.1
@@ -1025,7 +1027,7 @@ default-package-overrides:
   - heaps ==0.3.5
   - heatshrink ==0.1.0.0
   - hebrew-time ==0.1.1
-  - hedgehog ==0.5
+  - hedgehog ==0.5.1
   - hedgehog-quickcheck ==0.1
   - hedis ==0.9.12
   - here ==1.2.11
@@ -1074,8 +1076,8 @@ default-package-overrides:
   - hp2pretty ==0.8.0.2
   - hpack ==0.18.1
   - hpc-coveralls ==1.0.10
-  - hPDB ==1.2.0.9
-  - hPDB-examples ==1.2.0.7
+  - hPDB ==1.2.0.10
+  - hPDB-examples ==1.2.0.8
   - HPDF ==1.4.10
   - hpio ==0.8.0.10
   - hpp ==0.4.1
@@ -1094,8 +1096,8 @@ default-package-overrides:
   - hsebaysdk ==0.4.0.0
   - hse-cpp ==0.2
   - hsemail ==2
-  - HSet ==0.0.1
   - hset ==2.2.0
+  - HSet ==0.0.1
   - hsexif ==0.6.1.5
   - hs-GeoIP ==0.3
   - hsignal ==0.2.7.5
@@ -1126,7 +1128,7 @@ default-package-overrides:
   - hspec-wai ==0.8.0
   - hspec-wai-json ==0.8.0
   - hspec-webdriver ==1.2.0
-  - hsshellscript ==3.4.2
+  - hsshellscript ==3.4.5
   - hstatistics ==0.3
   - hstatsd ==0.1
   - HStringTemplate ==0.8.6
@@ -1147,13 +1149,13 @@ default-package-overrides:
   - http-client-openssl ==0.2.1.1
   - http-client-tls ==0.3.5.1
   - http-common ==0.8.2.0
-  - http-conduit ==2.2.3.2
+  - http-conduit ==2.2.4
   - http-date ==0.0.6.1
   - httpd-shed ==0.4.0.3
   - http-link-header ==1.0.3
   - http-media ==0.6.4
   - http-reverse-proxy ==0.4.5
-  - http-streams ==0.8.5.3
+  - http-streams ==0.8.5.5
   - http-types ==0.9.1
   - human-readable-duration ==0.2.0.3
   - HUnit ==1.5.0.0
@@ -1258,7 +1260,7 @@ default-package-overrides:
   - jmacro-rpc-snap ==0.3
   - jni ==0.3.1
   - jose ==0.6.0.3
-  - jose-jwt ==0.7.7
+  - jose-jwt ==0.7.8
   - js-flot ==0.8.3
   - js-jquery ==3.2.1
   - json ==0.9.1
@@ -1334,7 +1336,7 @@ default-package-overrides:
   - licensor ==0.2.1
   - lifted-async ==0.9.3
   - lifted-base ==0.2.3.11
-  - lift-generics ==0.1.1
+  - lift-generics ==0.1.2
   - line ==3.1.0
   - linear ==1.20.7
   - linear-accelerate ==0.4.1
@@ -1400,8 +1402,8 @@ default-package-overrides:
   - median-stream ==0.7.0.0
   - med-module ==0.1.1
   - megaparsec ==5.3.1
-  - mega-sdist ==0.3.0.4
-  - memory ==0.14.9
+  - mega-sdist ==0.3.0.5
+  - memory ==0.14.10
   - MemoTrie ==0.6.8
   - mersenne-random-pure64 ==0.2.2.0
   - messagepack ==0.5.4
@@ -1470,9 +1472,9 @@ default-package-overrides:
   - monoid-extras ==0.4.2
   - monoid-subclasses ==0.4.4
   - monoid-transformer ==0.0.3
-  - mono-traversable ==1.0.4.0
+  - mono-traversable ==1.0.5.0
   - mono-traversable-instances ==0.1.0.0
-  - morte ==1.6.11
+  - morte ==1.6.12
   - mountpoints ==1.0.2
   - mstate ==0.2.7
   - mtl ==2.2.1
@@ -1515,7 +1517,7 @@ default-package-overrides:
   - network-carbon ==1.0.10
   - network-conduit-tls ==1.2.2
   - network-house ==0.1.0.2
-  - network-info ==0.2.0.8
+  - network-info ==0.2.0.9
   - network-ip ==0.3.0.2
   - network-msgpack-rpc ==0.0.3
   - network-multicast ==0.2.0
@@ -1533,8 +1535,8 @@ default-package-overrides:
   - nfc ==0.1.0
   - nicify-lib ==1.0.1
   - NineP ==0.0.2.1
-  - nix-paths ==1.0.0.1
-  - nonce ==1.0.4
+  - nix-paths ==1.0.1
+  - nonce ==1.0.5
   - nondeterminism ==1.4
   - non-empty ==0.3
   - non-empty-sequence ==0.2.0.2
@@ -1556,7 +1558,7 @@ default-package-overrides:
   - objective ==1.1.1
   - ObjectName ==1.1.0.1
   - octane ==0.20.2
-  - Octree ==0.5.4.3
+  - Octree ==0.5.4.4
   - oeis ==0.3.9
   - ofx ==0.4.2.0
   - old-locale ==1.0.0.7
@@ -1691,7 +1693,7 @@ default-package-overrides:
   - posix-realtime ==0.0.0.4
   - postgresql-binary ==0.12.1
   - postgresql-libpq ==0.9.3.1
-  - postgresql-schema ==0.1.13
+  - postgresql-schema ==0.1.14
   - postgresql-simple ==0.5.3.0
   - postgresql-simple-migration ==0.1.11.0
   - postgresql-simple-opts ==0.2.0.2
@@ -1718,7 +1720,7 @@ default-package-overrides:
   - prettyprinter-compat-annotated-wl-pprint ==1
   - prettyprinter-compat-ansi-wl-pprint ==1.0.1
   - prettyprinter-compat-wl-pprint ==1.0.0.1
-  - pretty-show ==1.6.13
+  - pretty-show ==1.6.14
   - pretty-simple ==2.0.1.0
   - pretty-types ==0.2.3.1
   - primes ==0.2.1.0
@@ -1855,7 +1857,7 @@ default-package-overrides:
   - result ==0.2.6.0
   - rethinkdb ==2.2.0.10
   - rethinkdb-client-driver ==0.0.25
-  - retry ==0.7.4.3
+  - retry ==0.7.5.0
   - rev-state ==0.1.2
   - rfc5051 ==0.1.0.3
   - rng-utils ==0.2.1
@@ -1887,7 +1889,7 @@ default-package-overrides:
   - scotty ==0.11.0
   - scrape-changes ==0.1.0.5
   - scrypt ==0.5.0
-  - SDL ==0.6.5.1
+  - SDL ==0.6.6.0
   - sdl2 ==2.2.0
   - sdl2-gfx ==0.2
   - sdl2-image ==2.0.0
@@ -2114,7 +2116,7 @@ default-package-overrides:
   - tasty-kat ==0.0.3
   - tasty-program ==1.0.5
   - tasty-quickcheck ==0.8.4
-  - tasty-rerun ==1.1.7
+  - tasty-rerun ==1.1.8
   - tasty-silver ==3.1.10
   - tasty-smallcheck ==0.8.1
   - tasty-stats ==0.2.0.3
@@ -2191,7 +2193,7 @@ default-package-overrides:
   - thumbnail-plus ==1.0.5
   - th-utilities ==0.2.0.1
   - thyme ==0.3.5.5
-  - tidal ==0.9.4
+  - tidal ==0.9.5
   - time-compat ==0.1.0.3
   - timeit ==1.0.0.0
   - timelens ==0.2.0.2
@@ -2209,7 +2211,7 @@ default-package-overrides:
   - tldr ==0.2.3
   - tls ==1.3.11
   - tls-debug ==0.4.4
-  - tls-session-manager ==0.0.0.1
+  - tls-session-manager ==0.0.0.2
   - tmp-postgres ==0.1.1.1
   - token-bucket ==0.1.0.1
   - torrent ==10000.1.1
@@ -2339,7 +2341,7 @@ default-package-overrides:
   - wai-app-static ==3.1.6.1
   - wai-cli ==0.1.1
   - wai-conduit ==3.0.0.3
-  - wai-cors ==0.2.5
+  - wai-cors ==0.2.6
   - wai-eventsource ==3.0.0
   - wai-extra ==3.0.20.2
   - wai-handler-launch ==3.0.2.3
@@ -2361,7 +2363,7 @@ default-package-overrides:
   - wai-routes ==0.10.0
   - wai-routing ==0.13.0
   - wai-session ==0.3.2
-  - wai-session-postgresql ==0.2.1.1
+  - wai-session-postgresql ==0.2.1.2
   - wai-slack-middleware ==0.2.0
   - waitra ==0.0.4.0
   - wai-transformers ==0.0.7
@@ -2387,7 +2389,7 @@ default-package-overrides:
   - websockets-rpc ==0.4.0
   - websockets-simple ==0.0.2
   - websockets-snap ==0.10.2.4
-  - weeder ==0.1.7
+  - weeder ==0.1.9
   - weigh ==0.0.7
   - wikicfp-scraper ==0.1.0.9
   - wild-bind ==0.1.0.3
@@ -2461,7 +2463,7 @@ default-package-overrides:
   - Yampa ==0.10.6.2
   - YampaSynth ==0.2
   - yesod ==1.4.5
-  - yesod-auth ==1.4.20
+  - yesod-auth ==1.4.21
   - yesod-auth-account ==1.4.3
   - yesod-auth-basic ==0.1.0.2
   - yesod-auth-fb ==1.8.1
@@ -8330,7 +8332,6 @@ dont-distribute-packages:
   type-level-bst:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-level-natural-number-induction:          [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-level-natural-number-operations:         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-of-html:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-ord-spine-cereal:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-ord:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 8146674a943..4ad0663600a 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -506,5 +506,6 @@ self: super: builtins.intersectAttrs super {
 
   # Break cyclic reference that results in an infinite recursion.
   partial-semigroup = dontCheck super.partial-semigroup;
+  colour = dontCheck super.colour;
 
 }
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 7446fdeb129..78e329a7f37 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5463,6 +5463,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Fin" = callPackage
+    ({ mkDerivation, base, clist, natural-induction, peano }:
+     mkDerivation {
+       pname = "Fin";
+       version = "0.2.0.0";
+       sha256 = "0w4gmfhpav73rkia3q7g6m4lncz1smhfa0rl2sr0602sc0694spr";
+       libraryHaskellDepends = [ base clist natural-induction peano ];
+       description = "Finite totally-ordered sets";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Finance-Quote-Yahoo" = callPackage
     ({ mkDerivation, base, bytestring, http-conduit, network
      , old-locale, time
@@ -8683,6 +8694,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HTTP_4000_3_9" = callPackage
+    ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
+     , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
+     , network, network-uri, parsec, pureMD5, split, test-framework
+     , test-framework-hunit, time, wai, warp
+     }:
+     mkDerivation {
+       pname = "HTTP";
+       version = "4000.3.9";
+       sha256 = "1zv38sjr1kv6vm35a8w5659ap9jpxpq5b9zjgablils8ca52p5h5";
+       libraryHaskellDepends = [
+         array base bytestring mtl network network-uri parsec time
+       ];
+       testHaskellDepends = [
+         base bytestring case-insensitive conduit conduit-extra deepseq
+         http-types httpd-shed HUnit mtl network network-uri pureMD5 split
+         test-framework test-framework-hunit wai warp
+       ];
+       homepage = "https://github.com/haskell/HTTP";
+       description = "A library for client-side HTTP";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HTTP-Simple" = callPackage
     ({ mkDerivation, base, HTTP, network }:
      mkDerivation {
@@ -11613,12 +11648,17 @@ self: {
      }) {};
 
   "ListT" = callPackage
-    ({ mkDerivation, base, transformers }:
+    ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck
+     , transformers, util
+     }:
      mkDerivation {
        pname = "ListT";
-       version = "0.1.0.0";
-       sha256 = "0x2xzasxgrvybyz4ksr41ary5k9l0qccbk2wh71kpwk9nhp4ybx0";
-       libraryHaskellDepends = [ base transformers ];
+       version = "0.1.2.0";
+       sha256 = "0ygj695w1xrv0kkpnm55gfjnks7xdbw6vrlqx1a5as4s36hq11zr";
+       libraryHaskellDepends = [ base transformers util ];
+       testHaskellDepends = [
+         base smallcheck tasty tasty-smallcheck transformers util
+       ];
        description = "List transformer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13508,21 +13548,6 @@ self: {
      }) {};
 
   "Octree" = callPackage
-    ({ mkDerivation, AC-Vector, base, markdown-unlit, QuickCheck }:
-     mkDerivation {
-       pname = "Octree";
-       version = "0.5.4.3";
-       sha256 = "0rdlf8cqpfz43j9xddc5pqp829nyirndkc2rc7h8f8ycpdzsmn2g";
-       revision = "1";
-       editedCabalFile = "1ysmpp7knrkxh68q6nq012877mn51sgzjrpls7d80pkg4pgkf42a";
-       libraryHaskellDepends = [ AC-Vector base QuickCheck ];
-       testHaskellDepends = [ AC-Vector base markdown-unlit QuickCheck ];
-       homepage = "https://github.com/mgajda/octree";
-       description = "Simple unbalanced Octree for storing data about 3D points";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Octree_0_5_4_4" = callPackage
     ({ mkDerivation, AC-Vector, base, QuickCheck }:
      mkDerivation {
        pname = "Octree";
@@ -13533,7 +13558,6 @@ self: {
        homepage = "https://github.com/mgajda/octree";
        description = "Simple unbalanced Octree for storing data about 3D points";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OddWord" = callPackage
@@ -15684,21 +15708,6 @@ self: {
     ({ mkDerivation, base, SDL }:
      mkDerivation {
        pname = "SDL";
-       version = "0.6.5.1";
-       sha256 = "1sa3zx3vrs1gbinxx33zwq0x2bsf3i964bff7419p7vzidn36k46";
-       revision = "1";
-       editedCabalFile = "0gj76j31i8rnlnvkf6hr8ljc6qmqqqcndy0bgrcppji78zg3ygi3";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base ];
-       librarySystemDepends = [ SDL ];
-       description = "Binding to libSDL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) SDL;};
-
-  "SDL_0_6_6_0" = callPackage
-    ({ mkDerivation, base, SDL }:
-     mkDerivation {
-       pname = "SDL";
        version = "0.6.6.0";
        sha256 = "0wpddhq5vwm2m1q8ja1p6draz4f40p1snmdshxwqnyyj3nchqz0z";
        enableSeparateDataOutput = true;
@@ -15706,7 +15715,6 @@ self: {
        librarySystemDepends = [ SDL ];
        description = "Binding to libSDL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL;};
 
   "SDL-gfx" = callPackage
@@ -28078,8 +28086,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "ansi-escape-codes";
-       version = "0.1.0.0";
-       sha256 = "0cd8nllv5p3jxm8cshfimkqwxhcnws7qyrgd8mc0hm4a55k5vhpd";
+       version = "0.3.0.0";
+       sha256 = "1aj7p937c48laz5kkhil45lgkjiivcidky6vxxp3q5yvkymsijvb";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/joegesualdo/ansi-escape-codes";
        description = "Haskell package to generate ANSI escape codes for styling strings in the terminal";
@@ -31236,6 +31244,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "attomail" = callPackage
+    ({ mkDerivation, base, bytestring, ConfigFile, directory, doctest
+     , email-validate, Glob, hsemail-ns, MissingH, mtl, network
+     , optparse-applicative, parsec, QuickCheck, random, text, time
+     , transformers, unix, unix-time
+     }:
+     mkDerivation {
+       pname = "attomail";
+       version = "0.1.0.2";
+       sha256 = "0yryvw8qcp0vgal4dn48xi7x42wl9b1bwfbh0chnvbi5rwnwspyr";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring ConfigFile directory email-validate hsemail-ns
+         MissingH mtl network optparse-applicative parsec random text time
+         transformers unix unix-time
+       ];
+       testHaskellDepends = [ base doctest Glob QuickCheck ];
+       description = "Minimal mail delivery agent (MDA) for local mail with maildir support";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "attoparsec" = callPackage
     ({ mkDerivation, array, base, bytestring, case-insensitive
      , containers, criterion, deepseq, directory, filepath, ghc-prim
@@ -34179,8 +34209,8 @@ self: {
     ({ mkDerivation, base, hspec, parsec }:
      mkDerivation {
        pname = "bbdb";
-       version = "0.6.1";
-       sha256 = "03fnm2xffpf1ldry6wc7haqy40zqfsjswhdwynmnnhbjn7mr5py7";
+       version = "0.8";
+       sha256 = "0p1aphzp55h4zlh3h8xnm6mxvsxyrab98ms8f07iqvp4p267kryw";
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base hspec parsec ];
        homepage = "https://github.com/henrylaxen/bbdb";
@@ -34427,24 +34457,6 @@ self: {
      }) {};
 
   "bench" = callPackage
-    ({ mkDerivation, base, criterion, optparse-applicative, silently
-     , text, turtle
-     }:
-     mkDerivation {
-       pname = "bench";
-       version = "1.0.6";
-       sha256 = "0ss5liap1f71i7igpszdpb6himl30gibydlknx9ka44dsrh7dhq9";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base criterion optparse-applicative silently text turtle
-       ];
-       homepage = "http://github.com/Gabriel439/bench";
-       description = "Command-line benchmark tool";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bench_1_0_7" = callPackage
     ({ mkDerivation, base, criterion, optparse-applicative, process
      , silently, text, turtle
      }:
@@ -34460,7 +34472,6 @@ self: {
        homepage = "http://github.com/Gabriel439/bench";
        description = "Command-line benchmark tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "benchmark-function" = callPackage
@@ -35681,25 +35692,12 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "bindings-DSL";
-       version = "1.0.23";
-       sha256 = "1rqhkk8hn1xjl3705dvakxx93q89vp0fw22v2cbrlapbir27cv7b";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/jwiegley/bindings-dsl/wiki";
-       description = "FFI domain specific language, on top of hsc2hs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bindings-DSL_1_0_24" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "bindings-DSL";
        version = "1.0.24";
        sha256 = "03n8z5qxrrq4l6h2f3xyav45f5v2gr112g4l4r4jw8yfvr8qyk93";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/jwiegley/bindings-dsl/wiki";
        description = "FFI domain specific language, on top of hsc2hs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bindings-EsounD" = callPackage
@@ -39400,7 +39398,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_29_1" = callPackage
+  "brick_0_30" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
      , data-clist, deepseq, dlist, microlens, microlens-mtl
      , microlens-th, stm, template-haskell, text, text-zipper
@@ -39408,8 +39406,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.29.1";
-       sha256 = "1jslqfsqgrg379x4zi44f5xxn2jh0syqd4zbnfg07y3zgy5i399z";
+       version = "0.30";
+       sha256 = "0annvmb68vazmk3cabk01n9i00lifijxmxkbq1280yhack2q0mzz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41278,25 +41276,12 @@ self: {
     ({ mkDerivation, base, Cabal, directory, filepath }:
      mkDerivation {
        pname = "cabal-doctest";
-       version = "1.0.3";
-       sha256 = "1qyqxmw5z1418jda3q5j04pknqirfrfrqigibbxi4n31ajwlfisc";
-       libraryHaskellDepends = [ base Cabal directory filepath ];
-       homepage = "https://github.com/phadej/cabal-doctest";
-       description = "A Setup.hs helper for doctests running";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cabal-doctest_1_0_4" = callPackage
-    ({ mkDerivation, base, Cabal, directory, filepath }:
-     mkDerivation {
-       pname = "cabal-doctest";
        version = "1.0.4";
        sha256 = "03sawamkp95jycq9sah72iw525pdndb3x4h489zf4s3ir9avds3d";
        libraryHaskellDepends = [ base Cabal directory filepath ];
        homepage = "https://github.com/phadej/cabal-doctest";
        description = "A Setup.hs helper for doctests running";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-file-th" = callPackage
@@ -43845,8 +43830,10 @@ self: {
     ({ mkDerivation, alg, base }:
      mkDerivation {
        pname = "category";
-       version = "0.1.2.0";
-       sha256 = "0f3ik57gc9x7ppxgbc487jazpj8wd14aaiwpnkqxkf9142kqv8nj";
+       version = "0.2.0.0";
+       sha256 = "1zl7jsc99wqdw6fibxr9l3zf7xprkh5q1681gx6d5kvj9cfahcav";
+       revision = "1";
+       editedCabalFile = "0j24ymqy443wx7r5w8xklqsp1x133pwlwfni92qm0im66flfdb44";
        libraryHaskellDepends = [ alg base ];
        description = "Categorical types and classes";
        license = stdenv.lib.licenses.bsd3;
@@ -45245,6 +45232,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "chell_0_4_0_2" = callPackage
+    ({ mkDerivation, ansi-terminal, base, bytestring, options, patience
+     , random, template-haskell, text, transformers
+     }:
+     mkDerivation {
+       pname = "chell";
+       version = "0.4.0.2";
+       sha256 = "10ingy9qnbmc8cqh4i9pskcw43l0mzk8f3d76b3qz3fig5ary3j9";
+       libraryHaskellDepends = [
+         ansi-terminal base bytestring options patience random
+         template-haskell text transformers
+       ];
+       homepage = "https://john-millikin.com/software/chell/";
+       description = "A simple and intuitive library for automated testing";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "chell-hunit" = callPackage
     ({ mkDerivation, base, chell, HUnit }:
      mkDerivation {
@@ -45262,8 +45267,8 @@ self: {
     ({ mkDerivation, base, chell, QuickCheck, random }:
      mkDerivation {
        pname = "chell-quickcheck";
-       version = "0.2.5";
-       sha256 = "02bkcnx5k6r5csdnnkvk4wfd0l36nxb87i1463ynw17n7ym9s4cs";
+       version = "0.2.5.1";
+       sha256 = "1iicsys9igx7m7n4l2b8djardmjy2ah5ibzp7kzs758h460fq53a";
        libraryHaskellDepends = [ base chell QuickCheck random ];
        homepage = "https://john-millikin.com/software/chell/";
        description = "QuickCheck support for the Chell testing library";
@@ -47221,14 +47226,12 @@ self: {
      }) {};
 
   "clist" = callPackage
-    ({ mkDerivation, base, base-unicode-symbols, peano }:
+    ({ mkDerivation, base, natural-induction, peano }:
      mkDerivation {
        pname = "clist";
-       version = "0.1.0.0";
-       sha256 = "1jvkv6dwx2gm59vczmiagpxb0614fz63jzqrqm81bdai8yb0gpzd";
-       revision = "1";
-       editedCabalFile = "00lxh1v7dcylvm62a2bgzncfcla0b4l1nkhx8q1m3201fzwba22m";
-       libraryHaskellDepends = [ base base-unicode-symbols peano ];
+       version = "0.3.0.0";
+       sha256 = "1wicpkc1rxyjnmnlsdh975d58fwfmfqwhkd50v044g4763i36bdr";
+       libraryHaskellDepends = [ base natural-induction peano ];
        homepage = "https://github.com/strake/clist.hs";
        description = "Counted list";
        license = "unknown";
@@ -48834,19 +48837,6 @@ self: {
      }) {};
 
   "colour" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "colour";
-       version = "2.3.3";
-       sha256 = "1qmn1778xzg07jg9nx4k1spdz2llivpblf6wwrps1qpqjhsac5cd";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base ];
-       homepage = "http://www.haskell.org/haskellwiki/Colour";
-       description = "A model for human colour/color perception";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "colour_2_3_4" = callPackage
     ({ mkDerivation, base, QuickCheck, random, test-framework
      , test-framework-quickcheck2
      }:
@@ -48862,7 +48852,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Colour";
        description = "A model for human colour/color perception";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "colour-accelerate" = callPackage
@@ -50007,6 +49996,8 @@ self: {
        pname = "computational-algebra";
        version = "0.5.1.0";
        sha256 = "1ivhfw60gv1gxv6fl8z2n3a468dkvrwff8kg1brypaixzwp589gx";
+       revision = "1";
+       editedCabalFile = "1yhxqqrfqdr9dgzxz7rqk2kisg571dplhhyhd0490jbmd4z40ly6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -50797,34 +50788,6 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-combinators";
-       version = "1.1.1";
-       sha256 = "0609miq03lq9visfb2dqqsxghmvgzm24pq39mqby1jnnah6yh8m0";
-       libraryHaskellDepends = [
-         base base16-bytestring base64-bytestring bytestring chunked-data
-         conduit conduit-extra filepath monad-control mono-traversable
-         mwc-random primitive resourcet text transformers transformers-base
-         unix unix-compat vector void
-       ];
-       testHaskellDepends = [
-         base base16-bytestring base64-bytestring bytestring chunked-data
-         conduit containers directory filepath hspec mono-traversable mtl
-         mwc-random QuickCheck safe silently text transformers vector
-       ];
-       homepage = "https://github.com/snoyberg/mono-traversable";
-       description = "Commonly used conduit functions, for both chunked and unchunked data";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "conduit-combinators_1_1_2" = callPackage
-    ({ mkDerivation, base, base16-bytestring, base64-bytestring
-     , bytestring, chunked-data, conduit, conduit-extra, containers
-     , directory, filepath, hspec, monad-control, mono-traversable, mtl
-     , mwc-random, primitive, QuickCheck, resourcet, safe, silently
-     , text, transformers, transformers-base, unix, unix-compat, vector
-     , void
-     }:
-     mkDerivation {
-       pname = "conduit-combinators";
        version = "1.1.2";
        sha256 = "0f31iphdi31m7cfd2szq06x3xdag1kkv2vbxh6bm2ax37k9sw2w4";
        libraryHaskellDepends = [
@@ -50841,7 +50804,6 @@ self: {
        homepage = "https://github.com/snoyberg/mono-traversable#readme";
        description = "Commonly used conduit functions, for both chunked and unchunked data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-connection" = callPackage
@@ -50895,7 +50857,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "conduit-extra_1_2_1" = callPackage
+  "conduit-extra_1_2_2" = callPackage
     ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
      , bytestring-builder, conduit, criterion, directory, exceptions
      , filepath, hspec, monad-control, network, primitive, process
@@ -50904,8 +50866,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-extra";
-       version = "1.2.1";
-       sha256 = "10sdnnjwk9wmj7fsjdnz4isbqibdhws54igy420c2q5m4alkzsgk";
+       version = "1.2.2";
+       sha256 = "04bc1vy9giwfdcavrhjbmzm31lrf5360swns38yg6brql4pa2vii";
        libraryHaskellDepends = [
          async attoparsec base blaze-builder bytestring conduit directory
          exceptions filepath monad-control network primitive process
@@ -51714,10 +51676,8 @@ self: {
     ({ mkDerivation, base, category }:
      mkDerivation {
        pname = "constraint";
-       version = "0.1.0.0";
-       sha256 = "0m3hkvilgwmdj3w7x42ypyakbf4p2bnd0rfcwi7kpwqw79rrbvsc";
-       revision = "1";
-       editedCabalFile = "0zy2nyp81dhcqp4n3mqws47ydijhgnxx36av31g6qsdgim9symf9";
+       version = "0.1.1.0";
+       sha256 = "15kkkbqy6vjhbjl1jdqrsazrhv5k2l2vqymdjjdn3l07cfnf9lzj";
        libraryHaskellDepends = [ base category ];
        description = "Reified constraints";
        license = stdenv.lib.licenses.bsd3;
@@ -56002,12 +55962,19 @@ self: {
      }) {};
 
   "cyclotomic" = callPackage
-    ({ mkDerivation, arithmoi, base, containers }:
+    ({ mkDerivation, arithmoi, base, containers, HUnit, QuickCheck
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , test-framework-smallcheck
+     }:
      mkDerivation {
        pname = "cyclotomic";
-       version = "0.4.4.1";
-       sha256 = "05rbigjqd6cp5g0kivz816vfnvvyn8jbfcds35kk46h8nwwsch2r";
+       version = "0.5.0.0";
+       sha256 = "1r8hsc2x59g5xwch417iaxd8cldm0bg00wvhjb48cb7d53lx3zf8";
        libraryHaskellDepends = [ arithmoi base containers ];
+       testHaskellDepends = [
+         base HUnit QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 test-framework-smallcheck
+       ];
        description = "A subfield of the complex numbers for exact calculation";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -56057,8 +56024,8 @@ self: {
      }:
      mkDerivation {
        pname = "d-bus";
-       version = "0.1.7";
-       sha256 = "00bd001hxh68cwrv2597qg8rpcdz0n96nn31qkqgyhbc4lni72af";
+       version = "0.1.8";
+       sha256 = "1s9md4865mzal0n69mmfbrd2xifhs8j40dl3vjympifw4li25l8q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -58145,25 +58112,6 @@ self: {
 
   "data-serializer" = callPackage
     ({ mkDerivation, base, binary, bytestring, cereal, data-endian
-     , parsers, semigroups, tasty, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "data-serializer";
-       version = "0.3";
-       sha256 = "0bjya0x10y55vaa86da89d5svwcckv8h10dzcyiv14q2rxxgmgn8";
-       libraryHaskellDepends = [
-         base binary bytestring cereal data-endian parsers semigroups
-       ];
-       testHaskellDepends = [
-         base binary bytestring cereal tasty tasty-quickcheck
-       ];
-       homepage = "https://github.com/mvv/data-serializer";
-       description = "Common API for serialization libraries";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "data-serializer_0_3_2" = callPackage
-    ({ mkDerivation, base, binary, bytestring, cereal, data-endian
      , parsers, semigroups, split, tasty, tasty-quickcheck
      }:
      mkDerivation {
@@ -58179,7 +58127,6 @@ self: {
        homepage = "https://github.com/mvv/data-serializer";
        description = "Common API for serialization libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-size" = callPackage
@@ -59991,14 +59938,14 @@ self: {
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
-  "dejafu_0_9_1_1" = callPackage
+  "dejafu_0_9_1_2" = callPackage
     ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
      , leancheck, random, ref-fd, transformers, transformers-base
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "0.9.1.1";
-       sha256 = "0ipi2i80xkprrmvapm9z4pfs7r05zk408fg7npcxq4i8k77rvz8z";
+       version = "0.9.1.2";
+       sha256 = "1cxskfl2wg3m9hja97yc0sjghskhs442l2jqwcynlhjr308g84as";
        libraryHaskellDepends = [
          base concurrency containers deepseq exceptions leancheck random
          ref-fd transformers transformers-base
@@ -60837,8 +60784,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.8.1";
-       sha256 = "1ysvk36vq6gciayxspq7vmb0apnclyhfv4q7p933j25k01ys9gkg";
+       version = "1.8.2";
+       sha256 = "1llr12rwnd39xs51faxxvrf9n9scwsz3j2ywqdfsrr3hiasq80aj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -62718,15 +62665,16 @@ self: {
 
   "disjoint-containers" = callPackage
     ({ mkDerivation, aeson, base, containers, doctest, QuickCheck
-     , quickcheck-classes, transformers
+     , quickcheck-classes, semigroups, transformers
      }:
      mkDerivation {
        pname = "disjoint-containers";
-       version = "0.2.2";
-       sha256 = "1g1rgmgjan7zwzm38iga5hn4yri54jvmlpzkjn4c57vgjm6wbl6p";
+       version = "0.2.3";
+       sha256 = "0a6y1m0jq3lxj5vwgn4j4ij8xgkrkxb4nr7n3ba98sv8iaf1q8gw";
        libraryHaskellDepends = [ aeson base containers transformers ];
        testHaskellDepends = [
          aeson base containers doctest QuickCheck quickcheck-classes
+         semigroups
        ];
        homepage = "https://github.com/andrewthad/disjoint-containers#readme";
        description = "Disjoint containers";
@@ -64010,18 +63958,17 @@ self: {
      }) {};
 
   "docker-build-cacher" = callPackage
-    ({ mkDerivation, base, containers, foldl, language-dockerfile
+    ({ mkDerivation, base, containers, foldl, language-docker
      , system-filepath, text, turtle
      }:
      mkDerivation {
        pname = "docker-build-cacher";
-       version = "1.7.1";
-       sha256 = "0b10irbr75y0hl9mzpp6ws72gk3vqzpy5axdqa7f45zaxam8iim9";
+       version = "1.8.2";
+       sha256 = "0kmr7b0i5wbcn6r2f2pi4ndnzr4kdi3yj2v1pxwqyv8v0d6h55gi";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base containers foldl language-dockerfile system-filepath text
-         turtle
+         base containers foldl language-docker system-filepath text turtle
        ];
        description = "Builds a services with docker and caches all of its intermediate stages";
        license = stdenv.lib.licenses.bsd3;
@@ -65104,6 +65051,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "drifter-postgresql_0_2_0" = callPackage
+    ({ mkDerivation, base, containers, drifter, either, mtl
+     , postgresql-simple, tasty, tasty-hunit, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "drifter-postgresql";
+       version = "0.2.0";
+       sha256 = "0nl26zzvj3wvz13xgjn1j70br69wlaj1ddaz10d9ib6n1brn6hcd";
+       libraryHaskellDepends = [
+         base containers drifter either mtl postgresql-simple time
+         transformers
+       ];
+       testHaskellDepends = [
+         base drifter either postgresql-simple tasty tasty-hunit text
+       ];
+       homepage = "http://github.com/michaelxavier/drifter-postgresql";
+       description = "PostgreSQL support for the drifter schema migration tool";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "drinkery" = callPackage
+    ({ mkDerivation, base, criterion, mtl, transformers }:
+     mkDerivation {
+       pname = "drinkery";
+       version = "0";
+       sha256 = "06ad33l3xv9paspb5ymr97zzb4dkdfq9sg40b3i62nf52gpjfdly";
+       libraryHaskellDepends = [ base mtl transformers ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/fumieval/drinkery#readme";
+       description = "Boozy streaming library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "drmaa" = callPackage
     ({ mkDerivation, base, directory, drmaa, inline-c }:
      mkDerivation {
@@ -65511,8 +65492,8 @@ self: {
      }:
      mkDerivation {
        pname = "dumb-cas";
-       version = "0.1.1.1";
-       sha256 = "0pimlspgrfv04hwz91krbcq0g01fhrp9vgi2sj1kc7wz9hcd1pva";
+       version = "0.1.2.0";
+       sha256 = "03zyv1p69lhxg3z86rlyywzh305kpld3a79kr6c5swsm3pw8mnh5";
        libraryHaskellDepends = [
          base containers decimal-literals hashable template-haskell
          unordered-containers
@@ -68338,6 +68319,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "engine-io-wai_1_0_7" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, either, engine-io
+     , http-types, mtl, text, transformers, transformers-compat
+     , unordered-containers, wai, wai-websockets, websockets
+     }:
+     mkDerivation {
+       pname = "engine-io-wai";
+       version = "1.0.7";
+       sha256 = "13aa7x94z32c2gfzwjxh9808alcwqhxmxgn42r4jyqfylis2p73a";
+       libraryHaskellDepends = [
+         attoparsec base bytestring either engine-io http-types mtl text
+         transformers transformers-compat unordered-containers wai
+         wai-websockets websockets
+       ];
+       homepage = "http://github.com/ocharles/engine.io";
+       description = "An @engine-io@ @ServerAPI@ that is compatible with @Wai@";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "engine-io-yesod" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , engine-io, http-types, text, unordered-containers, wai
@@ -71439,8 +71440,8 @@ self: {
     ({ mkDerivation, base, leancheck, speculate, template-haskell }:
      mkDerivation {
        pname = "extrapolate";
-       version = "0.2.4";
-       sha256 = "14i1kb4l1wnc47fp2if95yk5jrb4s0p81c8bgda7lwihas9x8h9r";
+       version = "0.3.0";
+       sha256 = "1mqhn515mq730frzcadw4m0zsizk1vkhcygazy6y03533mai0z2g";
        libraryHaskellDepends = [
          base leancheck speculate template-haskell
        ];
@@ -72578,6 +72579,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fee-estimate" = callPackage
+    ({ mkDerivation, base, QuickCheck }:
+     mkDerivation {
+       pname = "fee-estimate";
+       version = "0.1.0.0";
+       sha256 = "06qfc18dhkhxpy0rhs20kw83bf1mzq94wy6azv3zj2ik8shq501r";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base QuickCheck ];
+       executableHaskellDepends = [ base QuickCheck ];
+       testHaskellDepends = [ base QuickCheck ];
+       homepage = "https://github.com/sahabi/fee-estimate#readme";
+       description = "Short description of your package";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "feed" = callPackage
     ({ mkDerivation, base, HUnit, old-locale, old-time, test-framework
      , test-framework-hunit, time, time-locale-compat, utf8-string, xml
@@ -74037,15 +74054,13 @@ self: {
      }:
      mkDerivation {
        pname = "fitspec";
-       version = "0.4.3";
-       sha256 = "0kbv2bz4cf8bvv8i5ypcldcyxd6l7f6wwsb85vfmjqrq7kn2apr2";
+       version = "0.4.4";
+       sha256 = "15vmdipw3pz6x4x2c1ywf0h0jbiy14p557mx3hm2zhdpxn1bdwyr";
        libraryHaskellDepends = [
          base cmdargs leancheck template-haskell
        ];
-       testHaskellDepends = [ base cmdargs leancheck template-haskell ];
-       benchmarkHaskellDepends = [
-         base cmdargs leancheck pretty template-haskell
-       ];
+       testHaskellDepends = [ base leancheck ];
+       benchmarkHaskellDepends = [ base pretty ];
        homepage = "https://github.com/rudymatela/fitspec#readme";
        description = "refining property sets for testing Haskell programs";
        license = stdenv.lib.licenses.bsd3;
@@ -77188,8 +77203,8 @@ self: {
      }:
      mkDerivation {
        pname = "friday-juicypixels";
-       version = "0.1.2.1";
-       sha256 = "1x0s4m4zmmaz9sa000pwip6cagjza6c8w7i9zikpb8z7xn21i1na";
+       version = "0.1.2.2";
+       sha256 = "1sci0whrkjlm731z1qk7p7sg7vaw61brcb167w9f6fbkagn2f67l";
        libraryHaskellDepends = [ base friday JuicyPixels vector ];
        testHaskellDepends = [
          base bytestring file-embed friday hspec JuicyPixels
@@ -79179,8 +79194,8 @@ self: {
        pname = "generic-aeson";
        version = "0.2.0.9";
        sha256 = "1jw4rmfsky8r8551ddjy0i3va3dj37flzf23gxniyam7zy8kzh9l";
-       revision = "1";
-       editedCabalFile = "10dy6kdn48pfl6njdhv7zwfkb3qkwazl9238n2sz9gmw575gqnjn";
+       revision = "2";
+       editedCabalFile = "05hn4bjqrx1fimlwwbv9358806m4q1dkbfw886lpkkhbflr7jmn9";
        libraryHaskellDepends = [
          aeson attoparsec base generic-deriving mtl tagged text
          unordered-containers vector
@@ -79488,8 +79503,8 @@ self: {
        pname = "generic-xmlpickler";
        version = "0.1.0.5";
        sha256 = "1brnlgnbys811qy64aps2j03ks2p0rkihaqzaszfwl80cpsn05ym";
-       revision = "4";
-       editedCabalFile = "0zcrn8n12fk36iacg0c429ras6pbr96c1zxjbnf5jiq7ajwnd8ri";
+       revision = "5";
+       editedCabalFile = "18hs5adb6wfasazdlv2wf92xszyjw94i3v20w8058hl7q1ax9dv0";
        libraryHaskellDepends = [ base generic-deriving hxt text ];
        testHaskellDepends = [
          base hxt hxt-pickle-utils tasty tasty-hunit tasty-th
@@ -81018,6 +81033,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-prof_1_4_0_4" = callPackage
+    ({ mkDerivation, attoparsec, base, containers, directory, filepath
+     , process, scientific, tasty, tasty-hunit, temporary, text, time
+     }:
+     mkDerivation {
+       pname = "ghc-prof";
+       version = "1.4.0.4";
+       sha256 = "037g6ianbij9gx1324fbdmamqjkn6mmw9nvqh5bwpz33srf30lpn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base containers scientific text time
+       ];
+       executableHaskellDepends = [ base containers scientific text ];
+       testHaskellDepends = [
+         attoparsec base containers directory filepath process tasty
+         tasty-hunit temporary text
+       ];
+       homepage = "https://github.com/maoe/ghc-prof";
+       description = "Library for parsing GHC time and allocation profiling reports";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-prof-flamegraph" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -81955,27 +81994,6 @@ self: {
      }:
      mkDerivation {
        pname = "gi-glib";
-       version = "2.0.14";
-       sha256 = "09bmrrppbjcy90f66qdhsj2hz3x7ci80mrdgryajzqrin4zs7aqx";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers haskell-gi haskell-gi-base
-         haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ glib ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "GLib bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib;};
-
-  "gi-glib_2_0_15" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, glib
-     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-glib";
        version = "2.0.15";
        sha256 = "1gfkqvw2m5i5cg9c3y33l1wqxcr8s80w0sx8kdnnfial0c4ba6cz";
        setupHaskellDepends = [ base Cabal haskell-gi ];
@@ -81988,7 +82006,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GLib bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "gi-gobject" = callPackage
@@ -82150,30 +82167,6 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtk";
-       version = "3.0.17";
-       sha256 = "1rplvhn3lbss66yps6jrhd9f9m6znj8ybss0rpik3dxwgmac3rw3";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
-         gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base
-         haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ gtk3 ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Gtk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
-     }) {gtk3 = pkgs.gnome3.gtk;};
-
-  "gi-gtk_3_0_18" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
-     , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
-     , gi-pango, gtk3, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-gtk";
        version = "3.0.18";
        sha256 = "1fp84dba8hg6pvkdy0mip2pz9npx0kwp492gx8p1bgf119rqqfl1";
        setupHaskellDepends = [ base Cabal haskell-gi ];
@@ -82187,7 +82180,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Gtk bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {gtk3 = pkgs.gnome3.gtk;};
 
   "gi-gtk-hs" = callPackage
@@ -82810,6 +82803,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "git_0_2_1" = callPackage
+    ({ mkDerivation, base, byteable, bytedump, bytestring, containers
+     , cryptonite, hourglass, memory, patience, random, system-fileio
+     , system-filepath, tasty, tasty-quickcheck, unix-compat
+     , utf8-string, vector, zlib, zlib-bindings
+     }:
+     mkDerivation {
+       pname = "git";
+       version = "0.2.1";
+       sha256 = "0j0hzlxb58g0q8fibg09ppag6bnhk7ym3nyzmqpwjbr6hxkdidsz";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base byteable bytestring containers cryptonite hourglass memory
+         patience random system-fileio system-filepath unix-compat
+         utf8-string vector zlib zlib-bindings
+       ];
+       testHaskellDepends = [
+         base bytedump bytestring hourglass tasty tasty-quickcheck
+       ];
+       doCheck = false;
+       homepage = "https://github.com/vincenthz/hs-git";
+       description = "Git operations in haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "git-all" = callPackage
     ({ mkDerivation, base, cmdargs, hslogger, parallel-io, regex-posix
      , shelly, system-fileio, system-filepath, text, transformers, unix
@@ -82844,15 +82863,15 @@ self: {
      , persistent, persistent-sqlite, persistent-template, process
      , QuickCheck, random, regex-tdfa, resourcet, rsync, SafeSemaphore
      , sandi, securemem, shakespeare, socks, split, stm, stm-chans
-     , template-haskell, text, time, torrent, transformers, unix
-     , unix-compat, unordered-containers, utf8-string, uuid, wai
+     , tagsoup, template-haskell, text, time, torrent, transformers
+     , unix, unix-compat, unordered-containers, utf8-string, uuid, wai
      , wai-extra, warp, warp-tls, wget, which, yesod, yesod-core
-     , yesod-default, yesod-form, yesod-static
+     , yesod-form, yesod-static
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20171124";
-       sha256 = "066m5s0wp1sw5ngjwgvd4cq1nxnm6jybb4qsyjwm828k4mcwywp7";
+       version = "6.20171214";
+       sha256 = "06nmsibpb1ng058gkfdspwkmv8psgd144qrxchwf3d8lfdphpkih";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -82872,10 +82891,10 @@ self: {
          network-multicast network-uri old-locale optparse-applicative
          path-pieces persistent persistent-sqlite persistent-template
          process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi
-         securemem shakespeare socks split stm stm-chans template-haskell
-         text time torrent transformers unix unix-compat
+         securemem shakespeare socks split stm stm-chans tagsoup
+         template-haskell text time torrent transformers unix unix-compat
          unordered-containers utf8-string uuid wai wai-extra warp warp-tls
-         yesod yesod-core yesod-default yesod-form yesod-static
+         yesod yesod-core yesod-form yesod-static
        ];
        executableSystemDepends = [
          bup curl git gnupg lsof openssh perl rsync wget which
@@ -85030,6 +85049,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "goggles" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary
+     , bytestring, containers, cryptonite, exceptions, filepath, hspec
+     , http-client, http-client-tls, http-types, memory, mtl, pem
+     , QuickCheck, req, scientific, stm, text, time, transformers
+     , unix-time, x509, x509-store
+     }:
+     mkDerivation {
+       pname = "goggles";
+       version = "0.1.0.3";
+       sha256 = "0if045sxm1xss91hx2hi4hcjy2b4w7q0sas8h9ra75vmzxfn6hjz";
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring binary bytestring
+         containers cryptonite exceptions filepath hspec http-client
+         http-client-tls http-types memory mtl pem QuickCheck req scientific
+         stm text time transformers unix-time x509 x509-store
+       ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/ocramz/goggles";
+       description = "Interface to Google Cloud APIs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gogol" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit
      , conduit-extra, cryptonite, directory, exceptions, filepath
@@ -88285,22 +88327,6 @@ self: {
      }:
      mkDerivation {
        pname = "groundhog-th";
-       version = "0.8.0.1";
-       sha256 = "00vk26qa7r6znyz848rh66nn4blybprpqvvyh53h22i9ibrk2b1s";
-       libraryHaskellDepends = [
-         aeson base bytestring containers groundhog template-haskell text
-         time unordered-containers yaml
-       ];
-       description = "Type-safe datatype-database mapping library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "groundhog-th_0_8_0_2" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, groundhog
-     , template-haskell, text, time, unordered-containers, yaml
-     }:
-     mkDerivation {
-       pname = "groundhog-th";
        version = "0.8.0.2";
        sha256 = "13rxdmnbmsivp608xclkvjnab0dzhzyqc8zjrpm7ml9d5yc8v596";
        libraryHaskellDepends = [
@@ -88309,7 +88335,6 @@ self: {
        ];
        description = "Type-safe datatype-database mapping library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "group-by-date" = callPackage
@@ -88366,6 +88391,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "grouped-list_0_2_1_4" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, pointed
+     , QuickCheck, tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "grouped-list";
+       version = "0.2.1.4";
+       sha256 = "171n9mc7y3sxkcg1yx02c3snag13rkzf8n06fbc5ny7g15a8p79h";
+       libraryHaskellDepends = [ base containers deepseq pointed ];
+       testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
+       description = "Grouped lists. Equal consecutive elements are grouped.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "groupoid" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -89518,26 +89560,6 @@ self: {
      }:
      mkDerivation {
        pname = "hPDB";
-       version = "1.2.0.9";
-       sha256 = "1kcfizpsvs4nsq8yrqk6syvr9kbbff1krlc4azkpmw4s3r68hjs4";
-       libraryHaskellDepends = [
-         AC-Vector base bytestring containers deepseq directory ghc-prim
-         iterable mmap mtl Octree parallel QuickCheck tagged
-         template-haskell text unordered-containers vector zlib
-       ];
-       homepage = "https://github.com/BioHaskell/hPDB";
-       description = "Protein Databank file format library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hPDB_1_2_0_10" = callPackage
-    ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq
-     , directory, ghc-prim, iterable, mmap, mtl, Octree, parallel
-     , QuickCheck, tagged, template-haskell, text, unordered-containers
-     , vector, zlib
-     }:
-     mkDerivation {
-       pname = "hPDB";
        version = "1.2.0.10";
        sha256 = "10a5995872n6y849nhs9yl7zwp7ywfma3mabgywq7acmpppl5ka0";
        libraryHaskellDepends = [
@@ -89548,7 +89570,6 @@ self: {
        homepage = "https://github.com/BioHaskell/hPDB";
        description = "Protein Databank file format library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hPDB-examples" = callPackage
@@ -89559,32 +89580,6 @@ self: {
      }:
      mkDerivation {
        pname = "hPDB-examples";
-       version = "1.2.0.7";
-       sha256 = "06wqvr7msvvymkbzfc16zpk4klymhpgw95r8hvxaqrwph80y0c1k";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         AC-Vector base bytestring containers deepseq directory ghc-prim
-         GLUT hPDB iterable mtl Octree OpenGL QuickCheck template-haskell
-         text text-format vector
-       ];
-       testHaskellDepends = [
-         AC-Vector base bytestring containers deepseq directory ghc-prim
-         hPDB IfElse iterable mtl process template-haskell text time vector
-       ];
-       homepage = "https://github.com/BioHaskell/hPDB-examples";
-       description = "Examples for hPDB library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hPDB-examples_1_2_0_8" = callPackage
-    ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq
-     , directory, ghc-prim, GLUT, hPDB, IfElse, iterable, mtl, Octree
-     , OpenGL, process, QuickCheck, template-haskell, text, text-format
-     , time, vector
-     }:
-     mkDerivation {
-       pname = "hPDB-examples";
        version = "1.2.0.8";
        sha256 = "0zyfh2693cirr69qcmiwsmk4p8w8v6yacidcs22jcisay95v4qf6";
        isLibrary = false;
@@ -89601,7 +89596,6 @@ self: {
        homepage = "https://github.com/BioHaskell/hPDB-examples";
        description = "Examples for hPDB library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hPushover" = callPackage
@@ -92416,32 +92410,6 @@ self: {
      }:
      mkDerivation {
        pname = "hapistrano";
-       version = "0.3.4.0";
-       sha256 = "04wfaaj4qr9ysincnvcghm3bpi8l0z7a7b18zg674qaq3rsr3rn6";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base filepath mtl path process time transformers
-       ];
-       executableHaskellDepends = [
-         aeson async base optparse-applicative path path-io stm yaml
-       ];
-       testHaskellDepends = [
-         base directory filepath hspec mtl path path-io process temporary
-       ];
-       homepage = "https://github.com/stackbuilders/hapistrano";
-       description = "A deployment library for Haskell applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hapistrano_0_3_5_0" = callPackage
-    ({ mkDerivation, aeson, async, base, directory, filepath, hspec
-     , mtl, optparse-applicative, path, path-io, process, stm, temporary
-     , time, transformers, yaml
-     }:
-     mkDerivation {
-       pname = "hapistrano";
        version = "0.3.5.0";
        sha256 = "15cjssws55awwq8j0xz8f4dd0y826f99zdv6mpxfxq97fah7zlcc";
        isLibrary = true;
@@ -92459,7 +92427,6 @@ self: {
        homepage = "https://github.com/stackbuilders/hapistrano";
        description = "A deployment library for Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happindicator" = callPackage
@@ -94683,19 +94650,6 @@ self: {
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
        pname = "haskell-gi-base";
-       version = "0.20.5";
-       sha256 = "1854v6z8ragc5bbv4jc1qwbn85pw7z9gsqd17qizps6zmpx3gm9a";
-       libraryHaskellDepends = [ base bytestring containers text ];
-       libraryPkgconfigDepends = [ glib ];
-       homepage = "https://github.com/haskell-gi/haskell-gi-base";
-       description = "Foundation for libraries generated by haskell-gi";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib;};
-
-  "haskell-gi-base_0_20_7" = callPackage
-    ({ mkDerivation, base, bytestring, containers, glib, text }:
-     mkDerivation {
-       pname = "haskell-gi-base";
        version = "0.20.7";
        sha256 = "1w44ag3kvfhba3az11h15fg4xyx8a6zq3bj9d41afcv9rqmr2a7c";
        libraryHaskellDepends = [ base bytestring containers text ];
@@ -94703,7 +94657,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi-base";
        description = "Foundation for libraries generated by haskell-gi";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "haskell-gi-overloading_0_0" = callPackage
@@ -94930,6 +94883,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-lsp-client" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , haskell-lsp, lens, process, text, unix
+     }:
+     mkDerivation {
+       pname = "haskell-lsp-client";
+       version = "1.0.0.0";
+       sha256 = "1c4zjq5vh46gxw3jrfh1f3hk1cbjqg8j2dlz6axb75ir14kxgky1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers haskell-lsp lens process text
+       ];
+       executableHaskellDepends = [
+         base directory haskell-lsp lens process text unix
+       ];
+       homepage = "https://github.com/noughtmare/haskell-lsp-client#readme";
+       description = "A haskell package to build your own Language Server client";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "haskell-menu" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -95321,15 +95295,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskell-src-exts_1_20_0" = callPackage
+  "haskell-src-exts_1_20_1" = callPackage
     ({ mkDerivation, array, base, containers, cpphs, directory
      , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck
      , tasty, tasty-golden, tasty-smallcheck
      }:
      mkDerivation {
        pname = "haskell-src-exts";
-       version = "1.20.0";
-       sha256 = "0fsbcrjf4m8zd759hsqjm29mnarmkf44aln903g7ipj7rkxyl8lx";
+       version = "1.20.1";
+       sha256 = "1jsjl9hja2dpcfq4mzlfpwyr6axwnwgacfb7aa070kz4lbygzaa8";
        libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
        libraryToolDepends = [ happy ];
        testHaskellDepends = [
@@ -95509,14 +95483,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "haskell-tools-ast_1_0_0_1" = callPackage
+  "haskell-tools-ast_1_0_0_2" = callPackage
     ({ mkDerivation, base, ghc, mtl, references, template-haskell
      , uniplate
      }:
      mkDerivation {
        pname = "haskell-tools-ast";
-       version = "1.0.0.1";
-       sha256 = "0i84hv1hvsf7z9jl11m0ic0ja6m46dw58zjrdmllmmravnfw5j5g";
+       version = "1.0.0.2";
+       sha256 = "02g90k13yif22dpil39icx95xfm4ac13b8xc6n40wglci8fmy8pz";
        libraryHaskellDepends = [
          base ghc mtl references template-haskell uniplate
        ];
@@ -95598,15 +95572,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "haskell-tools-backend-ghc_1_0_0_1" = callPackage
+  "haskell-tools-backend-ghc_1_0_0_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th
      , haskell-tools-ast, mtl, references, safe, split, template-haskell
      , transformers, uniplate
      }:
      mkDerivation {
        pname = "haskell-tools-backend-ghc";
-       version = "1.0.0.1";
-       sha256 = "1cfwy1qcvk72pspvgf9yq3i8z0n2payhir9f2spvqyxxd6pgyvsa";
+       version = "1.0.0.2";
+       sha256 = "1h1ccqng5w25d0k0iw8w7jpdww3gnm4mzs8gzr0amlbw8azar29d";
        libraryHaskellDepends = [
          base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl
          references safe split template-haskell transformers uniplate
@@ -95627,8 +95601,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-builtin-refactorings";
-       version = "1.0.0.1";
-       sha256 = "0c3gnf8chg6c7cprx148x2h10miysq0d4m0q1snhhhnqpd9vxws0";
+       version = "1.0.0.2";
+       sha256 = "0ysn8fgyj89f7bnmijb1vcp9qckc7w7zjj209rlg2cx5qfs75dhn";
        libraryHaskellDepends = [
          base Cabal containers directory filepath ghc ghc-paths
          haskell-tools-ast haskell-tools-backend-ghc
@@ -95679,7 +95653,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskell-tools-cli_1_0_0_1" = callPackage
+  "haskell-tools-cli_1_0_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , directory, filepath, ghc, ghc-paths, Glob
      , haskell-tools-builtin-refactorings, haskell-tools-daemon
@@ -95688,8 +95662,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-cli";
-       version = "1.0.0.1";
-       sha256 = "0qh0fsrqxlc6bqsz2c11isywd451l0nxndk5p4s6hkq88m6yrkic";
+       version = "1.0.0.2";
+       sha256 = "11x0b85jixdpf1jps6y35v3gsh5yrnr1qvdwim75rzhkd73fxrwn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95743,7 +95717,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "haskell-tools-daemon_1_0_0_1" = callPackage
+  "haskell-tools-daemon_1_0_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, containers
      , deepseq, Diff, directory, filepath, fswatch, ghc, ghc-paths, Glob
      , haskell-tools-builtin-refactorings, haskell-tools-prettyprint
@@ -95753,8 +95727,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-daemon";
-       version = "1.0.0.1";
-       sha256 = "0hjafm57619xsfzzcqsyj2ksbhg70m011vv9q2w5rpbzk5jzrlk8";
+       version = "1.0.0.2";
+       sha256 = "0sczrldcby64cghivmd8ks9srdg84xk1h9rxxp1ywysjah86ir6x";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95800,7 +95774,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "haskell-tools-debug_1_0_0_1" = callPackage
+  "haskell-tools-debug_1_0_0_2" = callPackage
     ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings
      , haskell-tools-prettyprint, haskell-tools-refactor, references
@@ -95808,8 +95782,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-debug";
-       version = "1.0.0.1";
-       sha256 = "1j0v0hdkmd01cg4pk1as27ws8krgvpswmqfcj06dzkx81f0a4fn3";
+       version = "1.0.0.2";
+       sha256 = "1shgm21g0s0f0amlf42imfb2s6279s6aqfnb7gqkh22q8pamsvhj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95855,7 +95829,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "haskell-tools-demo_1_0_0_1" = callPackage
+  "haskell-tools-demo_1_0_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings
@@ -95865,8 +95839,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-demo";
-       version = "1.0.0.1";
-       sha256 = "121dggqzhv8w80xh8cjl8hqds511sgp8ai86fjfrqcvs3zwy16da";
+       version = "1.0.0.2";
+       sha256 = "1hmpjm5z7k4qbq3q1gl2qmqrprx3kd8n980gsmwk53i5lj17h7dp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95897,8 +95871,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-experimental-refactorings";
-       version = "1.0.0.1";
-       sha256 = "1rpyzl22jiwvjp2k3w7pg51i5n6idr9d29xqll25h17h56lzqa2j";
+       version = "1.0.0.2";
+       sha256 = "0avxnp5zdc3rafqg5arvnfljyhp3v2ass96z39458b4zmrxf2mgd";
        libraryHaskellDepends = [
          base Cabal containers directory filepath ghc ghc-paths
          haskell-tools-ast haskell-tools-backend-ghc
@@ -95936,14 +95910,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "haskell-tools-prettyprint_1_0_0_1" = callPackage
+  "haskell-tools-prettyprint_1_0_0_2" = callPackage
     ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl
      , references, split, text, uniplate
      }:
      mkDerivation {
        pname = "haskell-tools-prettyprint";
-       version = "1.0.0.1";
-       sha256 = "1jdrzwr8gc878s3nkqhqhcwpp4kadi1mi7wk704qn4lls61q59ia";
+       version = "1.0.0.2";
+       sha256 = "00r76y11l7sj8w76svxnjr4rxb99s47m6lv4jp0k1jdzyybzsjjf";
        libraryHaskellDepends = [
          base containers ghc haskell-tools-ast mtl references split text
          uniplate
@@ -95984,7 +95958,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "haskell-tools-refactor_1_0_0_1" = callPackage
+  "haskell-tools-refactor_1_0_0_2" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc
      , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc
      , haskell-tools-prettyprint, haskell-tools-rewrite, mtl, references
@@ -95992,8 +95966,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-refactor";
-       version = "1.0.0.1";
-       sha256 = "1d9w811n8dhnsgpvvh3v7wm0fywiv7qmd1652kjn4cazc4sfzyn5";
+       version = "1.0.0.2";
+       sha256 = "03pvjgwz9w79zk7rkx0pm09arbpijnljp3q2aykjpblh7lh6va95";
        libraryHaskellDepends = [
          base Cabal containers directory filepath ghc ghc-paths
          haskell-tools-ast haskell-tools-backend-ghc
@@ -96028,15 +96002,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "haskell-tools-rewrite_1_0_0_1" = callPackage
+  "haskell-tools-rewrite_1_0_0_2" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, ghc
      , haskell-tools-ast, haskell-tools-prettyprint, mtl, references
      , tasty, tasty-hunit
      }:
      mkDerivation {
        pname = "haskell-tools-rewrite";
-       version = "1.0.0.1";
-       sha256 = "1sv6z3qm6vyjpm7mh1clyikcvzgq3x9l1clgqi4vrs0lcr3npand";
+       version = "1.0.0.2";
+       sha256 = "1lq5xxsplr6w0jrwwih86jl8alvzlzg3dqfb0pimdi0z23jyqq4f";
        libraryHaskellDepends = [
          base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl
          references
@@ -99472,10 +99446,8 @@ self: {
      }:
      mkDerivation {
        pname = "hedgehog";
-       version = "0.5";
-       sha256 = "02dy5fmwmrjgwj6p8rvr53rg362qayavbc184gf2f9q196rgijpk";
-       revision = "1";
-       editedCabalFile = "13079sdirdzch3r199lyxa7xrcq4xpaayxhdvg8v0d27w9z1chln";
+       version = "0.5.1";
+       sha256 = "0fx3dq45azxrhihhq6hlb89zkj3y8fmnfdrsz1wbvih9a3dhiwx7";
        libraryHaskellDepends = [
          ansi-terminal async base bytestring concurrent-output containers
          directory exceptions lifted-async mmorph monad-control mtl
@@ -99491,31 +99463,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hedgehog_0_5_1" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, bytestring
-     , concurrent-output, containers, directory, exceptions
-     , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
-     , random, resourcet, stm, template-haskell, text, th-lift, time
-     , transformers, transformers-base, unix, wl-pprint-annotated
+  "hedgehog-checkers" = callPackage
+    ({ mkDerivation, base, containers, either, hedgehog, semigroupoids
+     , semigroups
      }:
      mkDerivation {
-       pname = "hedgehog";
-       version = "0.5.1";
-       sha256 = "0fx3dq45azxrhihhq6hlb89zkj3y8fmnfdrsz1wbvih9a3dhiwx7";
+       pname = "hedgehog-checkers";
+       version = "0.1.0.0";
+       sha256 = "0fr0jmvh3c6a1mvdppbjxxc1ps94p4kc1crxwdmw1487jlg2z8ps";
        libraryHaskellDepends = [
-         ansi-terminal async base bytestring concurrent-output containers
-         directory exceptions lifted-async mmorph monad-control mtl
-         pretty-show primitive random resourcet stm template-haskell text
-         th-lift time transformers transformers-base unix
-         wl-pprint-annotated
+         base containers hedgehog semigroupoids semigroups
        ];
-       testHaskellDepends = [
-         base containers pretty-show text transformers
-       ];
-       homepage = "https://hedgehog.qa";
-       description = "Hedgehog will eat all your bugs";
+       testHaskellDepends = [ base either hedgehog ];
+       homepage = "https://github.com/bitemyapp/hedgehog-checkers#readme";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hedgehog-checkers-lens" = callPackage
+    ({ mkDerivation, base, hedgehog, hedgehog-checkers, lens }:
+     mkDerivation {
+       pname = "hedgehog-checkers-lens";
+       version = "0.1.0.0";
+       sha256 = "0zfk967xzpwfh3y3ys8d0c3zcz251dnp41xha11613ji3yfk0wff";
+       libraryHaskellDepends = [ base hedgehog hedgehog-checkers lens ];
+       testHaskellDepends = [ base hedgehog hedgehog-checkers lens ];
+       homepage = "https://github.com/bitemyapp/hedgehog-checkers#readme";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedgehog-quickcheck" = callPackage
@@ -103145,8 +103118,8 @@ self: {
        pname = "hledger-iadd";
        version = "1.2.6";
        sha256 = "1l5vzhyya5h6sc3l74iy0mnys8bcjp6m5z0m3lqabk37ik31ld36";
-       revision = "6";
-       editedCabalFile = "06bk66lcd6ps370nwqns0dn00vxivg27hhln5bz57syjqlamfd0j";
+       revision = "7";
+       editedCabalFile = "1scbsb4y3b61bzc4m8qym9164i77ds2xgmmf4a15kpar9585chnv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -103438,6 +103411,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hlint_2_0_12" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs
+     , containers, cpphs, data-default, directory, extra, filepath
+     , haskell-src-exts, haskell-src-exts-util, hscolour, process
+     , refact, text, transformers, uniplate, unordered-containers
+     , vector, yaml
+     }:
+     mkDerivation {
+       pname = "hlint";
+       version = "2.0.12";
+       sha256 = "1cfq4g1h5c47nxqn7433jd40hajv5pq30p5rb132fc5sp68vx0by";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base bytestring cmdargs containers cpphs
+         data-default directory extra filepath haskell-src-exts
+         haskell-src-exts-util hscolour process refact text transformers
+         uniplate unordered-containers vector yaml
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/ndmitchell/hlint#readme";
+       description = "Source code suggestions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hlogger" = callPackage
     ({ mkDerivation, base, old-locale, time }:
      mkDerivation {
@@ -105085,15 +105085,15 @@ self: {
     ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit
      , conduit-extra, connection, containers, deepseq, directory, extra
      , filepath, haskell-src-exts, http-conduit, http-types, js-flot
-     , js-jquery, mmap, network, network-uri, old-locale, process
-     , process-extras, QuickCheck, resourcet, storable-tuple, tar
-     , template-haskell, text, time, transformers, uniplate, utf8-string
-     , vector, wai, wai-logger, warp, warp-tls, zlib
+     , js-jquery, mmap, network, network-uri, old-locale, process-extras
+     , QuickCheck, resourcet, storable-tuple, tar, template-haskell
+     , text, time, transformers, uniplate, utf8-string, vector, wai
+     , wai-logger, warp, warp-tls, zlib
      }:
      mkDerivation {
        pname = "hoogle";
-       version = "5.0.14";
-       sha256 = "1y5vjwp60s35h13bnhjh4ga731m3vz004dbg8w5s7mwnfk5akkz7";
+       version = "5.0.15";
+       sha256 = "0bfb3y4rasl8dzcivvhhpq6ijspn37i53rhzxc9gx4yvdnai57sb";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -105101,10 +105101,9 @@ self: {
          aeson base binary bytestring cmdargs conduit conduit-extra
          connection containers deepseq directory extra filepath
          haskell-src-exts http-conduit http-types js-flot js-jquery mmap
-         network network-uri old-locale process process-extras QuickCheck
-         resourcet storable-tuple tar template-haskell text time
-         transformers uniplate utf8-string vector wai wai-logger warp
-         warp-tls zlib
+         network network-uri old-locale process-extras QuickCheck resourcet
+         storable-tuple tar template-haskell text time transformers uniplate
+         utf8-string vector wai wai-logger warp warp-tls zlib
        ];
        executableHaskellDepends = [ base ];
        testTarget = "--test-option=--no-net";
@@ -105941,33 +105940,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hpack_0_21_0" = callPackage
+  "hpack_0_21_2" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
      , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
-     , HUnit, interpolate, mockery, pretty, QuickCheck, temporary, text
-     , transformers, unordered-containers, yaml
+     , HUnit, interpolate, mockery, pretty, QuickCheck, scientific
+     , temporary, text, transformers, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.21.0";
-       sha256 = "004n0p3ljvaindaxjnadija16fwkjfv6s80acpps2ky2frnfbplp";
+       version = "0.21.2";
+       sha256 = "1grsr2418z42bcvqnr788n3lpfbscqvvfcnglba9v95nl8lpfm0c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bifunctors bytestring Cabal containers cryptonite
-         deepseq directory filepath Glob pretty text transformers
+         deepseq directory filepath Glob pretty scientific text transformers
          unordered-containers yaml
        ];
        executableHaskellDepends = [
          aeson base bifunctors bytestring Cabal containers cryptonite
-         deepseq directory filepath Glob pretty text transformers
+         deepseq directory filepath Glob pretty scientific text transformers
          unordered-containers yaml
        ];
        testHaskellDepends = [
          aeson base bifunctors bytestring Cabal containers cryptonite
          deepseq directory filepath Glob hspec HUnit interpolate mockery
-         pretty QuickCheck temporary text transformers unordered-containers
-         yaml
+         pretty QuickCheck scientific temporary text transformers
+         unordered-containers yaml
        ];
        homepage = "https://github.com/sol/hpack#readme";
        description = "An alternative format for Haskell packages";
@@ -106479,8 +106478,10 @@ self: {
      }:
      mkDerivation {
        pname = "hprotoc";
-       version = "2.4.5";
-       sha256 = "0f4h9b5c6s523967hkqg6wz57g350awa26r2y2wlfr4f39qgjwx3";
+       version = "2.4.6";
+       sha256 = "05n8mgrbskdx2r78kvl1q8zzgha9jsds7gvajkc54wcgprfhv42z";
+       revision = "1";
+       editedCabalFile = "0bs5h6mq6yrwiwfq0l20b4an73myxq6gbaxjffdifscqzq8pdk94";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -106795,6 +106796,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) ruby;};
 
+  "hruby_0_3_5" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck
+     , ruby, scientific, stm, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hruby";
+       version = "0.3.5";
+       sha256 = "0ngl6irnbkrjs7mq8gz3v6gh98l724595vyibw5chzikjl183fj8";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring scientific stm text
+         unordered-containers vector
+       ];
+       librarySystemDepends = [ ruby ];
+       testHaskellDepends = [
+         aeson attoparsec base QuickCheck text vector
+       ];
+       description = "Embed a Ruby intepreter in your Haskell program !";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) ruby;};
+
   "hs-GeoIP" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, GeoIP }:
      mkDerivation {
@@ -110473,20 +110495,6 @@ self: {
     ({ mkDerivation, base, c2hs, directory, parsec, random, unix }:
      mkDerivation {
        pname = "hsshellscript";
-       version = "3.4.2";
-       sha256 = "04ihi45pi92ykhcn66ni6zybmzvmbl467yfr1dgidvj56xns33jw";
-       libraryHaskellDepends = [ base directory parsec random unix ];
-       libraryToolDepends = [ c2hs ];
-       homepage = "http://www.volker-wysk.de/hsshellscript/";
-       description = "Haskell for Unix shell scripting tasks";
-       license = "LGPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
-     }) {};
-
-  "hsshellscript_3_4_5" = callPackage
-    ({ mkDerivation, base, c2hs, directory, parsec, random, unix }:
-     mkDerivation {
-       pname = "hsshellscript";
        version = "3.4.5";
        sha256 = "0d66gsm7s2j4f60cjca6fsddg4i1m3l6rcyq29ywskifhfaxbgvx";
        libraryHaskellDepends = [ base directory parsec random unix ];
@@ -110494,7 +110502,7 @@ self: {
        homepage = "http://www.volker-wysk.de/hsshellscript/";
        description = "Haskell for Unix shell scripting tasks";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hssourceinfo" = callPackage
@@ -111766,36 +111774,6 @@ self: {
      }:
      mkDerivation {
        pname = "http-conduit";
-       version = "2.2.3.2";
-       sha256 = "1f0yqka43gp7vhv7yr4q6pqr8qw0qq2yh4y2lnayhc876zpw6ng3";
-       libraryHaskellDepends = [
-         aeson base bytestring conduit conduit-extra exceptions http-client
-         http-client-tls http-types lifted-base monad-control mtl resourcet
-         transformers
-       ];
-       testHaskellDepends = [
-         aeson base blaze-builder bytestring case-insensitive conduit
-         conduit-extra connection cookie data-default-class hspec
-         http-client http-types HUnit lifted-base network resourcet
-         streaming-commons temporary text time transformers utf8-string wai
-         wai-conduit warp warp-tls
-       ];
-       doCheck = false;
-       homepage = "http://www.yesodweb.com/book/http-conduit";
-       description = "HTTP client package with conduit interface and HTTPS support";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "http-conduit_2_2_4" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring
-     , case-insensitive, conduit, conduit-extra, connection, cookie
-     , data-default-class, exceptions, hspec, http-client
-     , http-client-tls, http-types, HUnit, lifted-base, monad-control
-     , mtl, network, resourcet, streaming-commons, temporary, text, time
-     , transformers, utf8-string, wai, wai-conduit, warp, warp-tls
-     }:
-     mkDerivation {
-       pname = "http-conduit";
        version = "2.2.4";
        sha256 = "1wcl3lpg4v1ylq9j77j9fmf6l9qbmp8dmj3a9829q19q6bbgza7l";
        libraryHaskellDepends = [
@@ -111814,7 +111792,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/http-conduit";
        description = "HTTP client package with conduit interface and HTTPS support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-conduit-browser" = callPackage
@@ -112312,43 +112289,10 @@ self: {
      }:
      mkDerivation {
        pname = "http-streams";
-       version = "0.8.5.3";
-       sha256 = "1qz55rxzd98d00qdp5hp60i5cc8f0hfir6dhq15z2jzj5bsz9nna";
-       revision = "1";
-       editedCabalFile = "0ki3gv5lhs69hj17ng4asyqaw4wcjjpwqda79az9wkizxyvbc0ay";
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring blaze-builder bytestring
-         case-insensitive directory HsOpenSSL http-common io-streams mtl
-         network network-uri openssl-streams text transformers
-         unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty attoparsec base base64-bytestring blaze-builder
-         bytestring case-insensitive directory ghc-prim HsOpenSSL hspec
-         hspec-expectations http-common HUnit io-streams lifted-base mtl
-         network network-uri openssl-streams snap-core snap-server
-         system-fileio system-filepath text transformers
-         unordered-containers
-       ];
-       homepage = "http://github.com/afcowie/http-streams/";
-       description = "An HTTP client using io-streams";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "http-streams_0_8_5_5" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
-     , base64-bytestring, blaze-builder, bytestring, Cabal
-     , case-insensitive, directory, ghc-prim, HsOpenSSL, hspec
-     , hspec-expectations, http-common, HUnit, io-streams, lifted-base
-     , mtl, network, network-uri, openssl-streams, snap-core
-     , snap-server, system-fileio, system-filepath, text, transformers
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "http-streams";
        version = "0.8.5.5";
        sha256 = "1g2ygxyfq2x923df5q83wkrwhy2631r33zvffgj3fn0zwr024hhf";
+       revision = "1";
+       editedCabalFile = "0mgj62khq2abq53y03qww66k74pxhnid8yiqrlhggj9cjv7m2my5";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-builder bytestring
@@ -112367,7 +112311,6 @@ self: {
        homepage = "http://github.com/afcowie/http-streams/";
        description = "An HTTP client using io-streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-test" = callPackage
@@ -117204,8 +117147,8 @@ self: {
      }:
      mkDerivation {
        pname = "influxdb";
-       version = "1.2.2.1";
-       sha256 = "1dsrj11vcf7jn1xwhjz7jz6fnpxc3k614na0hy5xxfnhib0mvm8r";
+       version = "1.2.2.2";
+       sha256 = "18aijaz7lv64zqkpydmny8nga48fg5lsbmphlk7b92hcfbp8vw4f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120984,31 +120927,6 @@ self: {
   "jose-jwt" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
      , containers, criterion, cryptonite, doctest, either, hspec, HUnit
-     , memory, mtl, QuickCheck, text, time, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "jose-jwt";
-       version = "0.7.7";
-       sha256 = "07mq4w4gvak8gahxdx3rwykwqqisxma8faxi4k0xfk6jcpai0snl";
-       revision = "1";
-       editedCabalFile = "1qphrj2fb11kv79j92818lcdzvcldm18gfd85fmlrqmfjmig34wq";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring cereal containers cryptonite
-         either memory mtl text time unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring cryptonite doctest either hspec HUnit memory
-         mtl QuickCheck text unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [ base bytestring criterion cryptonite ];
-       homepage = "http://github.com/tekul/jose-jwt";
-       description = "JSON Object Signing and Encryption Library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "jose-jwt_0_7_8" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
-     , containers, criterion, cryptonite, doctest, either, hspec, HUnit
      , memory, mtl, QuickCheck, text, time, transformers
      , transformers-compat, unordered-containers, vector
      }:
@@ -121029,7 +120947,6 @@ self: {
        homepage = "http://github.com/tekul/jose-jwt";
        description = "JSON Object Signing and Encryption Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jpeg" = callPackage
@@ -121791,8 +121708,8 @@ self: {
        pname = "json-schema";
        version = "0.7.4.1";
        sha256 = "15kwgpkryd865nls9zm6ya6jzmiygsb537ij7ps39dzasqbnl3an";
-       revision = "10";
-       editedCabalFile = "03h9hh2bmplgz62hsh5zk6i1i39k51jxifkcb2j8kgpbf85wb4gv";
+       revision = "11";
+       editedCabalFile = "0jnlgkr1dikkcy4ln942c14lmpj49287b74dqcc5rd6sgxcm7xq2";
        libraryHaskellDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -125564,6 +125481,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "language-docker" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, filepath, free
+     , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck
+     , split, template-haskell, text, th-lift, th-lift-instances
+     , transformers, unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "language-docker";
+       version = "1.0.0";
+       sha256 = "023gahxcy27rg03fyk87h4yirba2c23qv4fww9fwzi4f4m8inf81";
+       libraryHaskellDepends = [
+         aeson base bytestring directory filepath free Glob mtl parsec
+         pretty split template-haskell text th-lift th-lift-instances
+         transformers unordered-containers yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory filepath free Glob hspec HUnit mtl
+         parsec pretty process QuickCheck split template-haskell text
+         th-lift th-lift-instances transformers unordered-containers yaml
+       ];
+       homepage = "https://github.com/hadolint/language-docker#readme";
+       description = "Dockerfile parser, pretty-printer and embedded DSL";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "language-dockerfile" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath, free
      , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck
@@ -126134,33 +126076,35 @@ self: {
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
-  "language-puppet_1_3_12_1" = callPackage
+  "language-puppet_1_3_13" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
      , base16-bytestring, bytestring, case-insensitive, containers
-     , cryptonite, directory, exceptions, filecache, formatting, Glob
-     , hashable, hruby, hslogger, hspec, hspec-megaparsec, http-api-data
-     , http-client, HUnit, lens, lens-aeson, megaparsec, memory, mtl
+     , cryptonite, directory, exceptions, filecache, filepath
+     , formatting, Glob, hashable, hruby, hslogger, hspec
+     , hspec-megaparsec, http-api-data, http-client, HUnit, lens
+     , lens-aeson, megaparsec, memory, mtl, neat-interpolation
      , operational, optparse-applicative, parallel-io, parsec
-     , pcre-utils, process, random, regex-pcre-builtin, scientific
-     , semigroups, servant, servant-client, split, stm
+     , pcre-utils, process, protolude, random, regex-pcre-builtin
+     , scientific, semigroups, servant, servant-client, split, stm
      , strict-base-types, temporary, text, time, transformers, unix
      , unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.3.12.1";
-       sha256 = "1nznlw81qnnrvfpwrliyz88f1i6wmsg8kksjnwk5zv69q9nxg3z1";
+       version = "1.3.13";
+       sha256 = "1qngbjpyxd7m4jawc40095v84a8bgk4xk7an9lb1yzp739nvcln1";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
          case-insensitive containers cryptonite directory exceptions
-         filecache formatting hashable hruby hslogger hspec http-api-data
-         http-client lens lens-aeson megaparsec memory mtl operational
-         parsec pcre-utils process random regex-pcre-builtin scientific
-         semigroups servant servant-client split stm strict-base-types text
-         time transformers unix unordered-containers vector yaml
+         filecache filepath formatting hashable hruby hslogger hspec
+         http-api-data http-client lens lens-aeson megaparsec memory mtl
+         operational parsec pcre-utils process protolude random
+         regex-pcre-builtin scientific semigroups servant servant-client
+         split stm strict-base-types text time transformers unix
+         unordered-containers vector yaml
        ];
        executableHaskellDepends = [
          aeson ansi-wl-pprint base bytestring containers Glob hslogger
@@ -126170,8 +126114,9 @@ self: {
        ];
        testHaskellDepends = [
          ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens
-         megaparsec mtl scientific strict-base-types temporary text
-         transformers unix unordered-containers vector
+         megaparsec mtl neat-interpolation protolude scientific
+         strict-base-types temporary text transformers unix
+         unordered-containers vector
        ];
        homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
@@ -127093,6 +127038,20 @@ self: {
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
+  "leancheck_0_7_0" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "leancheck";
+       version = "0.7.0";
+       sha256 = "1mz6fwh3rbwkfx514imh044v1ng7065sd5bivcd94xw0cb530p3f";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/rudymatela/leancheck#readme";
+       description = "Cholesterol-free property-based testing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "leankit-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, colour, curl, split }:
      mkDerivation {
@@ -127828,6 +127787,34 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "lentil_1_0_9_1" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip
+     , filepath, hspec, natural-sort, optparse-applicative, parsec
+     , pipes, regex-tdfa, semigroups, terminal-progress-bar, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "lentil";
+       version = "1.0.9.1";
+       sha256 = "10a0y0n62n8indkhapscws3lj95riaxxdq04bcfah8ljvqy1b61r";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         ansi-wl-pprint base csv directory filemanip filepath natural-sort
+         optparse-applicative parsec pipes regex-tdfa semigroups
+         terminal-progress-bar text transformers
+       ];
+       testHaskellDepends = [
+         ansi-wl-pprint base csv directory filemanip filepath hspec
+         natural-sort optparse-applicative parsec pipes regex-tdfa
+         semigroups terminal-progress-bar text transformers
+       ];
+       homepage = "http://www.ariis.it/static/articles/lentil/page.html";
+       description = "frugal issue tracker";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lenz" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, hs-functors
      , transformers
@@ -128969,10 +128956,8 @@ self: {
      }:
      mkDerivation {
        pname = "lift-generics";
-       version = "0.1.1";
-       sha256 = "1jrh74a1c95cd70xr371fslqsjar8jb8mnlmapjb1dvg8722rkq7";
-       revision = "1";
-       editedCabalFile = "03vpmdgarz41zx1q51a4bx3x3qfvs7wfnqym8xiv4i9sxdr82yy8";
+       version = "0.1.2";
+       sha256 = "0kk05dp6n93jgxq4x1lrckjrca6lrwa7qklr3vpzc6iyrlbvv7qf";
        libraryHaskellDepends = [
          base generic-deriving ghc-prim template-haskell
        ];
@@ -128984,35 +128969,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lift-generics_0_1_2" = callPackage
-    ({ mkDerivation, base, base-compat, generic-deriving, ghc-prim
-     , hspec, template-haskell
+  "lifted-async" = callPackage
+    ({ mkDerivation, async, base, constraints, criterion, deepseq
+     , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit
+     , tasty-th, transformers-base
      }:
      mkDerivation {
-       pname = "lift-generics";
-       version = "0.1.2";
-       sha256 = "0kk05dp6n93jgxq4x1lrckjrca6lrwa7qklr3vpzc6iyrlbvv7qf";
+       pname = "lifted-async";
+       version = "0.9.3";
+       sha256 = "0qdlc64kf02g97rzpragm4943ppy2cx74kbjcpbv32jcyc3q75wp";
        libraryHaskellDepends = [
-         base generic-deriving ghc-prim template-haskell
+         async base constraints lifted-base monad-control transformers-base
        ];
        testHaskellDepends = [
-         base base-compat generic-deriving hspec template-haskell
+         async base HUnit lifted-base monad-control mtl tasty tasty-hunit
+         tasty-th
        ];
-       homepage = "https://github.com/RyanGlScott/lift-generics";
-       description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation";
+       benchmarkHaskellDepends = [ async base criterion deepseq ];
+       homepage = "https://github.com/maoe/lifted-async";
+       description = "Run lifted IO operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "lifted-async" = callPackage
+  "lifted-async_0_9_3_2" = callPackage
     ({ mkDerivation, async, base, constraints, criterion, deepseq
      , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit
      , tasty-th, transformers-base
      }:
      mkDerivation {
        pname = "lifted-async";
-       version = "0.9.3";
-       sha256 = "0qdlc64kf02g97rzpragm4943ppy2cx74kbjcpbv32jcyc3q75wp";
+       version = "0.9.3.2";
+       sha256 = "0c8y6m1kpkviq2zi1d2889hbzh7k46rly4mvmfkrzam45fqggrcj";
        libraryHaskellDepends = [
          async base constraints lifted-base monad-control transformers-base
        ];
@@ -129024,6 +129011,7 @@ self: {
        homepage = "https://github.com/maoe/lifted-async";
        description = "Run lifted IO operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lifted-base" = callPackage
@@ -131735,8 +131723,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-warper";
-       version = "1.7.4";
-       sha256 = "0jhlf35h4db34ggq5gm53m71wbr3pddy6b3bbvmy9cd22d58nr6r";
+       version = "1.8.0";
+       sha256 = "0b5kgni47ahvh4jkqkbhz3bd43frdqxvgz2x2d7f61848bqp80ip";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -133872,6 +133860,37 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "magicbane_0_1_4" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, classy-prelude
+     , conduit, conduit-combinators, data-default, data-has, ekg-core
+     , ekg-wai, envy, errors, fast-logger, http-api-data, http-client
+     , http-client-tls, http-conduit, http-date, http-link-header
+     , http-media, http-types, lifted-async, mime-types, monad-control
+     , monad-logger, monad-metrics, mtl, network, network-uri
+     , raw-strings-qq, refined, servant, servant-server, split
+     , string-conversions, text, transformers, unordered-containers, wai
+     , wai-cli, wai-middleware-metrics
+     }:
+     mkDerivation {
+       pname = "magicbane";
+       version = "0.1.4";
+       sha256 = "1zfj188iw6g0ym88p69wrf5avbipjxvijklphki5bj3rc7h8cyx0";
+       libraryHaskellDepends = [
+         aeson aeson-qq attoparsec base classy-prelude conduit
+         conduit-combinators data-default data-has ekg-core ekg-wai envy
+         errors fast-logger http-api-data http-client http-client-tls
+         http-conduit http-date http-link-header http-media http-types
+         lifted-async mime-types monad-control monad-logger monad-metrics
+         mtl network network-uri raw-strings-qq refined servant
+         servant-server split string-conversions text transformers
+         unordered-containers wai wai-cli wai-middleware-metrics
+       ];
+       homepage = "https://github.com/myfreeweb/magicbane#readme";
+       description = "A web framework that integrates Servant, ClassyPrelude, EKG, fast-logger, wai-cli…";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "magico" = callPackage
     ({ mkDerivation, base, hmatrix, transformers, utility-ht }:
      mkDerivation {
@@ -136383,27 +136402,6 @@ self: {
      }:
      mkDerivation {
        pname = "mega-sdist";
-       version = "0.3.0.4";
-       sha256 = "1qf7lhk2063lpkg2bm7x7sxxxf87laxjwsr4rw46hvjj2m8frh41";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base bytestring classy-prelude-conduit conduit-extra directory
-         filepath http-conduit optparse-simple tar-conduit temporary text
-         typed-process yaml
-       ];
-       homepage = "https://github.com/snoyberg/mega-sdist#readme";
-       description = "Handles uploading to Hackage from mega repos";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mega-sdist_0_3_0_5" = callPackage
-    ({ mkDerivation, base, bytestring, classy-prelude-conduit
-     , conduit-extra, directory, filepath, http-conduit, optparse-simple
-     , tar-conduit, temporary, text, typed-process, yaml
-     }:
-     mkDerivation {
-       pname = "mega-sdist";
        version = "0.3.0.5";
        sha256 = "1rdx74bxiwrcp0k8h8028b65nbcmgcbpg7jnzli91y8nzr2qql6c";
        isLibrary = false;
@@ -136416,7 +136414,6 @@ self: {
        homepage = "https://github.com/snoyberg/mega-sdist#readme";
        description = "Handles uploading to Hackage from mega repos";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "megaparsec" = callPackage
@@ -136819,23 +136816,6 @@ self: {
      }) {};
 
   "memory" = callPackage
-    ({ mkDerivation, base, basement, bytestring, deepseq, ghc-prim
-     , tasty, tasty-hunit, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "memory";
-       version = "0.14.9";
-       sha256 = "1v8fjw0dgnyw6jhrpzfyxf63ky1lyrfapb8x28lj25q2xw6zx8s5";
-       libraryHaskellDepends = [
-         base basement bytestring deepseq ghc-prim
-       ];
-       testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
-       homepage = "https://github.com/vincenthz/hs-memory";
-       description = "memory and related abstraction stuff";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "memory_0_14_10" = callPackage
     ({ mkDerivation, base, basement, bytestring, deepseq, foundation
      , ghc-prim, tasty, tasty-hunit, tasty-quickcheck
      }:
@@ -136852,7 +136832,6 @@ self: {
        homepage = "https://github.com/vincenthz/hs-memory";
        description = "memory and related abstraction stuff";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "memorypool" = callPackage
@@ -138731,8 +138710,8 @@ self: {
      }:
      mkDerivation {
        pname = "mmark";
-       version = "0.0.2.0";
-       sha256 = "0d5rvdb81239k8a6fyccad5mvlzq1k485dad2waxkidihakj6fk1";
+       version = "0.0.2.1";
+       sha256 = "0fadjmzdccmsysndi2khwyp5iycmxdk2caxqdnqrbn9c3pdcg4l7";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base containers data-default-class deepseq email-validate
@@ -138975,8 +138954,8 @@ self: {
      }:
      mkDerivation {
        pname = "modern-uri";
-       version = "0.1.1.1";
-       sha256 = "1nh0h1libpiw7lkh66almgh2r0gfa5mb9fancqy039rpyqkkfv1w";
+       version = "0.1.2.0";
+       sha256 = "0n8ihy43mc3m0j70nbr86bd1kgzbkcb0dx9g3ql40v66i66kfb29";
        libraryHaskellDepends = [
          base bytestring containers contravariant deepseq exceptions
          megaparsec profunctors QuickCheck template-haskell text
@@ -140864,30 +140843,6 @@ self: {
      }:
      mkDerivation {
        pname = "mono-traversable";
-       version = "1.0.4.0";
-       sha256 = "0qwmzjf25gradzajr4f9zw3a48m4hw26qvqnb134daqkyxpkzf13";
-       libraryHaskellDepends = [
-         base bytestring containers hashable split text transformers
-         unordered-containers vector vector-algorithms
-       ];
-       testHaskellDepends = [
-         base bytestring containers foldl hspec HUnit QuickCheck semigroups
-         text transformers unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [ base criterion mwc-random vector ];
-       homepage = "https://github.com/snoyberg/mono-traversable";
-       description = "Type classes for mapping, folding, and traversing monomorphic containers";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mono-traversable_1_0_5_0" = callPackage
-    ({ mkDerivation, base, bytestring, containers, criterion, foldl
-     , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split
-     , text, transformers, unordered-containers, vector
-     , vector-algorithms
-     }:
-     mkDerivation {
-       pname = "mono-traversable";
        version = "1.0.5.0";
        sha256 = "1zrn7wp938di4mdc8q0z4imgg2hky7ap98ralzf8rdgqfrrvfpa6";
        libraryHaskellDepends = [
@@ -140902,7 +140857,6 @@ self: {
        homepage = "https://github.com/snoyberg/mono-traversable#readme";
        description = "Type classes for mapping, folding, and traversing monomorphic containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mono-traversable-instances" = callPackage
@@ -141311,8 +141265,8 @@ self: {
      }:
      mkDerivation {
        pname = "morte";
-       version = "1.6.11";
-       sha256 = "10zwdf82hxjgxh7zs7wlnvyzjpaqalwj7rlg454jjlml59ifzvmw";
+       version = "1.6.12";
+       sha256 = "0g3nbh2ba1nqa8y7hnqdk149xsayyz46jrw749mdqlrcklxhvk9l";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -141334,7 +141288,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "morte_1_6_12" = callPackage
+  "morte_1_6_13" = callPackage
     ({ mkDerivation, alex, array, base, binary, code-page, containers
      , criterion, deepseq, Earley, http-client, http-client-tls
      , microlens, microlens-mtl, mtl, optparse-applicative, pipes
@@ -141343,8 +141297,8 @@ self: {
      }:
      mkDerivation {
        pname = "morte";
-       version = "1.6.12";
-       sha256 = "0g3nbh2ba1nqa8y7hnqdk149xsayyz46jrw749mdqlrcklxhvk9l";
+       version = "1.6.13";
+       sha256 = "03vjkp3ngbdhv5ib7jwdwx23bklm32m3gmvq63r2cxagydl1267m";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -141476,20 +141430,22 @@ self: {
      }) {};
 
   "movie-monad" = callPackage
-    ({ mkDerivation, base, gi-gdk, gi-gdkx11, gi-glib, gi-gobject
-     , gi-gst, gi-gstvideo, gi-gtk, gi-xlib, haskell-gi-base, MissingH
-     , process, text
+    ({ mkDerivation, base, filepath, gi-gdk, gi-gdkpixbuf, gi-glib
+     , gi-gobject, gi-gst, gi-gstvideo, gi-gtk, haskell-gi-base
+     , MissingH, network-uri, process, system-fileio, system-filepath
+     , text, time
      }:
      mkDerivation {
        pname = "movie-monad";
-       version = "0.0.1.0";
-       sha256 = "02sj8x49lw80nhzlwsnddj7r9w6xfv1vks4rpgds89pmkr4b5bvn";
+       version = "0.0.2.0";
+       sha256 = "0cf4hrakz6cw1c3izrrckhjjhn8hd8cn9gfh41v2xi8kcn6bbciw";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [
-         base gi-gdk gi-gdkx11 gi-glib gi-gobject gi-gst gi-gstvideo gi-gtk
-         gi-xlib haskell-gi-base MissingH process text
+         base filepath gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gst
+         gi-gstvideo gi-gtk haskell-gi-base MissingH network-uri process
+         system-fileio system-filepath text time
        ];
        homepage = "https://github.com/lettier/movie-monad";
        description = "Plays videos using GStreamer and GTK+";
@@ -144378,6 +144334,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "natural-induction" = callPackage
+    ({ mkDerivation, base, peano }:
+     mkDerivation {
+       pname = "natural-induction";
+       version = "0.2.0.0";
+       sha256 = "1brkmvkwpgqsxra210h8fkb9bpvawmbdwwvvhsd58kzmkd599alr";
+       libraryHaskellDepends = [ base peano ];
+       description = "Induction over natural numbers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "natural-number" = callPackage
     ({ mkDerivation, base, type-equality, type-level-natural-number
      , type-level-natural-number-induction
@@ -145688,25 +145655,12 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "network-info";
-       version = "0.2.0.8";
-       sha256 = "0xndvg776241fgjmynxfpy81f1csjmh8dg33yf0c8m71ychz3pzc";
-       libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/jystic/network-info";
-       description = "Access the local computer's basic network configuration";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "network-info_0_2_0_9" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "network-info";
        version = "0.2.0.9";
        sha256 = "0rmajccwhkf0p4inb8jjj0dzsksgn663w90km00xvf4mq3pkjab3";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/jystic/network-info";
        description = "Access the local computer's basic network configuration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-interfacerequest" = callPackage
@@ -146295,6 +146249,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "network-voicetext" = callPackage
+    ({ mkDerivation, base, bytestring, exceptions, http-client-tls
+     , http-conduit, http-types, resourcet, transformers, utf8-string
+     }:
+     mkDerivation {
+       pname = "network-voicetext";
+       version = "0.0.0.1";
+       sha256 = "0fhmrif3liw61f17kl6208m4bhvdy57h9cpzdnv0af0rjnxgr7ki";
+       libraryHaskellDepends = [
+         base bytestring exceptions http-client-tls http-conduit http-types
+         resourcet transformers utf8-string
+       ];
+       homepage = "https://github.com/zaneli/network-voicetext";
+       description = "VoiceText Web API wrapper";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "network-wai-router" = callPackage
     ({ mkDerivation, base, wai }:
      mkDerivation {
@@ -146915,22 +146886,6 @@ self: {
      }) {};
 
   "nix-paths" = callPackage
-    ({ mkDerivation, base, nix, process }:
-     mkDerivation {
-       pname = "nix-paths";
-       version = "1.0.0.1";
-       sha256 = "05gkx79p532zciqjrsq16231pmzb5rixxip9j0vdc85a5h2a4bbl";
-       revision = "1";
-       editedCabalFile = "17l6x5azdiklwmiwkk05zxg50gqgdq9n5a1nyfywy05b6h7m33il";
-       libraryHaskellDepends = [ base process ];
-       libraryToolDepends = [ nix ];
-       homepage = "https://github.com/peti/nix-paths";
-       description = "Knowledge of Nix's installation directories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
-     }) {inherit (pkgs) nix;};
-
-  "nix-paths_1_0_1" = callPackage
     ({ mkDerivation, base, nix, nix-hash, process }:
      mkDerivation {
        pname = "nix-paths";
@@ -146941,7 +146896,7 @@ self: {
        homepage = "https://github.com/peti/nix-paths";
        description = "Knowledge of Nix's installation directories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) nix; nix-hash = null;};
 
   "nixfromnpm" = callPackage
@@ -147408,22 +147363,6 @@ self: {
 
   "nonce" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, entropy, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "nonce";
-       version = "1.0.4";
-       sha256 = "1xkf107sbcm3pvm6r4xk4719sccaq2kzja6nf8bky9m7vpiilrji";
-       libraryHaskellDepends = [
-         base base64-bytestring bytestring entropy text transformers
-       ];
-       homepage = "https://github.com/prowdsponsor/nonce";
-       description = "Generate cryptographic nonces";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "nonce_1_0_5" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, entropy, text
      , transformers, unliftio, unliftio-core
      }:
      mkDerivation {
@@ -147437,7 +147376,6 @@ self: {
        homepage = "https://github.com/prowdsponsor/nonce";
        description = "Generate cryptographic nonces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nondeterminism" = callPackage
@@ -148716,6 +148654,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ochintin-daicho" = callPackage
+    ({ mkDerivation, base, bookkeeping, doctest, Glob, text }:
+     mkDerivation {
+       pname = "ochintin-daicho";
+       version = "0.1.0.0";
+       sha256 = "1fpchynm5pigskyk9gm2hy9kxidqvims832dq0x6lsxiaz0a3dzv";
+       libraryHaskellDepends = [ base bookkeeping text ];
+       testHaskellDepends = [ base doctest Glob ];
+       homepage = "https://github.com/arowM/haskell-ochintin-daicho#readme";
+       description = "A module to manage payroll books for Japanese companies";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "octane" = callPackage
     ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers
      , data-default-class, file-embed, http-client, http-client-tls
@@ -151861,7 +151812,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "pandoc_2_0_4" = callPackage
+  "pandoc_2_0_5" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , binary, blaze-html, blaze-markup, bytestring, Cabal
      , case-insensitive, cmark-gfm, containers, criterion, data-default
@@ -151876,8 +151827,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "2.0.4";
-       sha256 = "0zpcl7k405dyh83ng3ffch8bi1fjh7n53aycql07fmw84kbnc180";
+       version = "2.0.5";
+       sha256 = "0670fzvlgzcw9prswjyms49nlgbwbd2bj4xvhlr8had3yklml94i";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -152005,13 +151956,14 @@ self: {
   "pandoc-crossref" = callPackage
     ({ mkDerivation, base, containers, data-accessor
      , data-accessor-template, data-accessor-transformers, data-default
-     , directory, filepath, hspec, mtl, pandoc, pandoc-types
-     , roman-numerals, syb, template-haskell, text, utility-ht
+     , deepseq, directory, filepath, hspec, mtl, open-browser
+     , optparse-applicative, pandoc, pandoc-types, roman-numerals, syb
+     , template-haskell, temporary, text, utility-ht
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.2.7.0";
-       sha256 = "1nh9yi2p7i8ms45rfd5859639f8rh5vxnvdqrdi399rmnp74vj9k";
+       version = "0.3.0.0";
+       sha256 = "0fgds8i9fwxmfprbp4giv7qi4gzx373p07smfm7arpbimv239d6n";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -152023,9 +151975,9 @@ self: {
        ];
        executableHaskellDepends = [
          base containers data-accessor data-accessor-template
-         data-accessor-transformers data-default directory filepath mtl
-         pandoc pandoc-types roman-numerals syb template-haskell text
-         utility-ht
+         data-accessor-transformers data-default deepseq directory filepath
+         mtl open-browser optparse-applicative pandoc pandoc-types
+         roman-numerals syb template-haskell temporary text utility-ht
        ];
        testHaskellDepends = [
          base containers data-accessor data-accessor-template
@@ -152035,7 +151987,7 @@ self: {
        ];
        homepage = "https://github.com/lierdakil/pandoc-crossref#readme";
        description = "Pandoc filter for cross-references";
-       license = stdenv.lib.licenses.gpl2;
+       license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -153779,6 +153731,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "passman-core" = callPackage
+    ({ mkDerivation, aeson, async, base, bcrypt, bytestring, conduit
+     , conduit-extra, containers, cryptohash-md5, csv-conduit
+     , data-ordlist, directory, filepath, int-cast, memory
+     , passman-core-internal, QuickCheck, quickcheck-unicode, resourcet
+     , template-haskell, temporary, text, unix-compat, yaml
+     }:
+     mkDerivation {
+       pname = "passman-core";
+       version = "0.1.0.0";
+       sha256 = "1197mz7d2x84b2madpq1xgl241qhh47yfnwxpksad7dqc05k48da";
+       libraryHaskellDepends = [
+         aeson base bcrypt bytestring conduit conduit-extra containers
+         cryptohash-md5 csv-conduit data-ordlist directory filepath int-cast
+         memory passman-core-internal resourcet text unix-compat yaml
+       ];
+       testHaskellDepends = [
+         async base conduit filepath passman-core-internal QuickCheck
+         quickcheck-unicode template-haskell temporary text yaml
+       ];
+       homepage = "https://github.com/PasswordManager/passman-core#readme";
+       description = "Deterministic password generator core";
+       license = stdenv.lib.licenses.gpl3;
+       broken = true;
+     }) {passman-core-internal = null;};
+
   "passwords" = callPackage
     ({ mkDerivation, base, containers, MonadRandom, random }:
      mkDerivation {
@@ -154027,12 +154005,14 @@ self: {
     ({ mkDerivation, base, bytestring, path, safe-exceptions, text }:
      mkDerivation {
        pname = "path-text-utf8";
-       version = "0.0.0.2";
-       sha256 = "0m1rmzyjsiwb1k1rpj7mwjmbg6y9rmbv69bxqm0pbc6ylkh678ja";
+       version = "0.0.1.0";
+       sha256 = "0z7k6wj4p9192blrxnnmq79km4f6sm8lagp01vznc1gmy1p0w4cg";
+       revision = "1";
+       editedCabalFile = "1m04dyqqamh9lkkmcbf2dg7ivd5kb2dxqh9b844lr7mk5qganar6";
        libraryHaskellDepends = [
          base bytestring path safe-exceptions text
        ];
-       homepage = "https://github.com/chris-martin/path-text-utf8#readme";
+       homepage = "https://github.com/chris-martin/path-text-utf8";
        description = "Read and write UTF-8 text files";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -160312,28 +160292,6 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-schema";
-       version = "0.1.13";
-       sha256 = "03f4hfdp632wyhygh72c6k8xwpqy2ijv51zkx3d176pb1429l0fi";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base basic-prelude postgresql-simple shelly text
-       ];
-       executableHaskellDepends = [
-         base basic-prelude optparse-applicative shelly text time
-       ];
-       homepage = "https://github.com/mfine/postgresql-schema";
-       description = "PostgreSQL Schema Management";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "postgresql-schema_0_1_14" = callPackage
-    ({ mkDerivation, base, basic-prelude, optparse-applicative
-     , postgresql-simple, shelly, text, time
-     }:
-     mkDerivation {
-       pname = "postgresql-schema";
        version = "0.1.14";
        sha256 = "0wnmhh8pzs9hzsmqkvr89jbdbbd1j87fnly2c80rsd7wr5qcrpkk";
        isLibrary = true;
@@ -160348,7 +160306,6 @@ self: {
        homepage = "https://github.com/mfine/postgresql-schema";
        description = "PostgreSQL Schema Management";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-simple" = callPackage
@@ -161703,8 +161660,8 @@ self: {
      }:
      mkDerivation {
        pname = "pretty-show";
-       version = "1.6.13";
-       sha256 = "1kbx72ybrpw0kh5zsd2kdw143qykbmd9lgmsvj57659y0k5l7fjm";
+       version = "1.6.14";
+       sha256 = "1izjjcf185hdl1fsh9j6idcdghan6dzgd8a5x0k5xqx1i24yrpb2";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -161718,14 +161675,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "pretty-show_1_6_14" = callPackage
+  "pretty-show_1_6_15" = callPackage
     ({ mkDerivation, array, base, filepath, ghc-prim, happy
      , haskell-lexer, pretty
      }:
      mkDerivation {
        pname = "pretty-show";
-       version = "1.6.14";
-       sha256 = "1izjjcf185hdl1fsh9j6idcdghan6dzgd8a5x0k5xqx1i24yrpb2";
+       version = "1.6.15";
+       sha256 = "16ik7dhagyr3is5dmkihw109l4d0500vi55z46p8lhigmfwqpn2n";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -163746,6 +163703,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "protocol-buffers_2_4_6" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , directory, filepath, mtl, parsec, syb, utf8-string
+     }:
+     mkDerivation {
+       pname = "protocol-buffers";
+       version = "2.4.6";
+       sha256 = "19709wgz0vcc01hjiyxdf71v9dsz9v910l1328dixpkpjh6iqxls";
+       libraryHaskellDepends = [
+         array base binary bytestring containers directory filepath mtl
+         parsec syb utf8-string
+       ];
+       homepage = "https://github.com/k-bx/protocol-buffers";
+       description = "Parse Google Protocol Buffer specifications";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "protocol-buffers-descriptor" = callPackage
     ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
      mkDerivation {
@@ -163761,6 +163736,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "protocol-buffers-descriptor_2_4_6" = callPackage
+    ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
+     mkDerivation {
+       pname = "protocol-buffers-descriptor";
+       version = "2.4.6";
+       sha256 = "1jxjahr10wfsywv4g17i6a1x775zrmmahqjd8lqzggy5axisvx79";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring containers protocol-buffers
+       ];
+       homepage = "https://github.com/k-bx/protocol-buffers";
+       description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "protocol-buffers-descriptor-fork" = callPackage
     ({ mkDerivation, base, bytestring, containers
      , protocol-buffers-fork
@@ -164677,6 +164668,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "purescript-bridge_0_11_1_2" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath
+     , generic-deriving, hspec, hspec-expectations-pretty-diff, lens
+     , mtl, text, transformers
+     }:
+     mkDerivation {
+       pname = "purescript-bridge";
+       version = "0.11.1.2";
+       sha256 = "1ihm5x42aa0qda5k96i7m43cx3j8ywcxgm13y7dasll697zwl04w";
+       libraryHaskellDepends = [
+         base containers directory filepath generic-deriving lens mtl text
+         transformers
+       ];
+       testHaskellDepends = [
+         base containers hspec hspec-expectations-pretty-diff text
+       ];
+       description = "Generate PureScript data types from Haskell data types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "purescript-bundle-fast" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , optparse-applicative, text, vector
@@ -165869,15 +165881,17 @@ self: {
      }) {};
 
   "quickcheck-classes" = callPackage
-    ({ mkDerivation, aeson, base, prim-array, primitive, QuickCheck }:
+    ({ mkDerivation, aeson, base, prim-array, primitive, QuickCheck
+     , transformers, vector
+     }:
      mkDerivation {
        pname = "quickcheck-classes";
-       version = "0.2";
-       sha256 = "03j2647wnmp7fyxbjk80rrfc0k8i530dnyl1zlgkq11xwlyn54sr";
+       version = "0.3.1";
+       sha256 = "0xcjm55aprds4x1jlrj3izgwxpqv8z19sbiqfn8lvx6b8yc61f7f";
        libraryHaskellDepends = [
-         aeson base prim-array primitive QuickCheck
+         aeson base prim-array primitive QuickCheck transformers
        ];
-       testHaskellDepends = [ aeson base primitive QuickCheck ];
+       testHaskellDepends = [ aeson base primitive QuickCheck vector ];
        homepage = "https://github.com/andrewthad/quickcheck-classes#readme";
        description = "QuickCheck common typeclasses";
        license = stdenv.lib.licenses.bsd3;
@@ -167940,7 +167954,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rattletrap_3_1_0" = callPackage
+  "rattletrap_3_1_2" = callPackage
     ({ mkDerivation, aeson, base, bimap, binary, binary-bits
      , bytestring, containers, data-binary-ieee754, filepath, hspec
      , http-client, http-client-tls, template-haskell, temporary, text
@@ -167948,8 +167962,8 @@ self: {
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "3.1.0";
-       sha256 = "1yv24p76w6zz91qjx5xhrcp7r72lqijfh32gzyjavvs6p1rnq61w";
+       version = "3.1.2";
+       sha256 = "0b0f5lkh8m96qg3m8wgnhpamqjndspa6ysf0lq013qbk9nvlvla8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -171577,8 +171591,8 @@ self: {
      }:
      mkDerivation {
        pname = "repa-convert";
-       version = "4.2.3.1";
-       sha256 = "19b5z4al37vkxqnyn9a80ij3lj9vfr8fl06j15fkqc3nrkya7i48";
+       version = "4.2.3.2";
+       sha256 = "10fx1sa85na4xs31c5b3w4dih3xp4kzy68whpg91227ic5ah17ag";
        libraryHaskellDepends = [
          base bytestring double-conversion primitive repa-scalar text vector
        ];
@@ -171731,8 +171745,8 @@ self: {
      }:
      mkDerivation {
        pname = "repa-scalar";
-       version = "4.2.3.1";
-       sha256 = "1xwk583hvyssalc2y2n1a2pkmz2k2qsaawnghbh1d3n2ma6ncbfc";
+       version = "4.2.3.2";
+       sha256 = "1w5q7b38zy08s13nllwjisxx6mxx9pnqhh3v5ydi1b32hrkyfk7c";
        libraryHaskellDepends = [
          base bytestring double-conversion primitive time vector
        ];
@@ -172905,8 +172919,8 @@ self: {
      }:
      mkDerivation {
        pname = "retry";
-       version = "0.7.4.3";
-       sha256 = "0i47gmlljz00fwf2qwkrh24hgsyw5sz2npaighx4wxvykf00d390";
+       version = "0.7.5.0";
+       sha256 = "1rganxc2lhbg5pch58bi29cv4m7zsddgwnkkjry8spwp3y8sh46p";
        libraryHaskellDepends = [
          base data-default-class exceptions ghc-prim random transformers
        ];
@@ -172919,14 +172933,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "retry_0_7_5_0" = callPackage
+  "retry_0_7_5_1" = callPackage
     ({ mkDerivation, base, data-default-class, exceptions, ghc-prim
      , hspec, HUnit, mtl, QuickCheck, random, stm, time, transformers
      }:
      mkDerivation {
        pname = "retry";
-       version = "0.7.5.0";
-       sha256 = "1rganxc2lhbg5pch58bi29cv4m7zsddgwnkkjry8spwp3y8sh46p";
+       version = "0.7.5.1";
+       sha256 = "116fjfxdyqrk3079hqcil0dv7r2fw6x64pjwfxhckpxqavxza7sk";
        libraryHaskellDepends = [
          base data-default-class exceptions ghc-prim random transformers
        ];
@@ -173180,6 +173194,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rgb-color-model" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "rgb-color-model";
+       version = "0.2.0.0";
+       sha256 = "0vhqw2hylv0228g48b4q81fs0pjgmv68rzlasnz39g6yqddws97c";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/joegesualdo/rgb-color-model";
+       description = "Haskell types for working with RGB colors";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "rhine" = callPackage
     ({ mkDerivation, base, containers, dunai, free, time, transformers
      }:
@@ -178143,6 +178169,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "selda_0_1_11_2" = callPackage
+    ({ mkDerivation, base, bytestring, exceptions, hashable, mtl
+     , psqueues, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "selda";
+       version = "0.1.11.2";
+       sha256 = "0ahh54sz40d4gcfgx6fb0cy1447b3qlk9kir89wk3brzfaglyyn9";
+       libraryHaskellDepends = [
+         base bytestring exceptions hashable mtl psqueues text time
+         unordered-containers
+       ];
+       homepage = "https://selda.link";
+       description = "Type-safe, high-level EDSL for interacting with relational databases";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "selda-postgresql" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq
      , selda, text
@@ -178151,6 +178195,8 @@ self: {
        pname = "selda-postgresql";
        version = "0.1.7.0";
        sha256 = "0smx2hvpdxjcw58zchwmzcqz4xr5m1idv5y5rrj20df190r4l3l2";
+       revision = "1";
+       editedCabalFile = "0icxqqb4n1qbfpjlngs3lypnvjanwqrw3l8298my7b1wzj3iyw2m";
        libraryHaskellDepends = [
          base bytestring exceptions postgresql-libpq selda text
        ];
@@ -178615,15 +178661,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "sensu-run_0_4_0_2" = callPackage
+  "sensu-run_0_4_0_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, filepath, http-client
      , http-types, lens, network, optparse-applicative, process
      , temporary, text, time, unix, unix-compat, vector, wreq
      }:
      mkDerivation {
        pname = "sensu-run";
-       version = "0.4.0.2";
-       sha256 = "1hsl9p9gzbjlalnrlbia7bvi2rs159d3h5mv5zzi81c20y5ybkjk";
+       version = "0.4.0.3";
+       sha256 = "05gl6dannlfx49f24lhspyygq8j37wmsyp8nrlcpcsqbrbd3k82g";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -180086,6 +180132,8 @@ self: {
        pname = "servant-iCalendar";
        version = "0.1.0.1";
        sha256 = "15gqlb60r8msn3k1j8wjxq89qg6d790lnb751wabg2lsxybmdzas";
+       revision = "1";
+       editedCabalFile = "07jib9s2kg6srr1dj3l1bz0sp3fyikkvv7z0v2a62zl1c9z9xapx";
        libraryHaskellDepends = [
          base data-default http-media iCalendar servant
        ];
@@ -180386,7 +180434,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-purescript_0_9_0_1" = callPackage
+  "servant-purescript_0_9_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, http-types, lens, mainland-pretty, purescript-bridge
      , servant, servant-foreign, servant-server, servant-subscriber
@@ -180394,8 +180442,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-purescript";
-       version = "0.9.0.1";
-       sha256 = "11jpgqk1nmwjihghxbfv05fsb6n351822ryh6w08wdz3alsv4zk6";
+       version = "0.9.0.2";
+       sha256 = "1axj4rar4ncy20xiwa231hc67vpz6yi2vzddq8m6nswmdg6kja7p";
        libraryHaskellDepends = [
          aeson base bytestring containers directory filepath http-types lens
          mainland-pretty purescript-bridge servant servant-foreign
@@ -184260,6 +184308,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "singleton-typelits" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "singleton-typelits";
+       version = "0.0.0.0";
+       sha256 = "00f2nvs4avl3kxijcl7wb17ip1mcnb4fzqq5ckcz0a247qvv4yig";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/mniip/singleton-typelits";
+       description = "Singletons and induction over GHC TypeLits";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "singletons" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath, mtl
      , process, syb, tasty, tasty-golden, template-haskell, th-desugar
@@ -187983,7 +188043,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "sparkle_0_7" = callPackage
+  "sparkle_0_7_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, Cabal, choice
      , distributed-closure, filepath, inline-java, jni, jvm
      , jvm-streaming, process, regex-tdfa, singletons, streaming, text
@@ -187991,8 +188051,8 @@ self: {
      }:
      mkDerivation {
        pname = "sparkle";
-       version = "0.7";
-       sha256 = "01w4b2r4pdlip4nkyc0gwh9322a8046bf1hjprj4y51f209skb7z";
+       version = "0.7.1";
+       sha256 = "1494c6zwn8q3aj9x07r2iikkbnxf8r3aw823dip47sygc95wy39w";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -188285,8 +188345,8 @@ self: {
     ({ mkDerivation, base, cmdargs, containers, leancheck }:
      mkDerivation {
        pname = "speculate";
-       version = "0.3.1";
-       sha256 = "01w44hd53n770fm49x70k3c4pwvsvp641x7kdnafg6czy8500s2k";
+       version = "0.3.2";
+       sha256 = "0cf8121hfmyj1jrklf2i1bp2q4517627vgaz1flf363n93jnckfk";
        libraryHaskellDepends = [ base cmdargs containers leancheck ];
        testHaskellDepends = [ base leancheck ];
        benchmarkHaskellDepends = [ base leancheck ];
@@ -188802,6 +188862,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "spreadsheet_0_1_3_7" = callPackage
+    ({ mkDerivation, base, explicit-exception, transformers, utility-ht
+     }:
+     mkDerivation {
+       pname = "spreadsheet";
+       version = "0.1.3.7";
+       sha256 = "180vv2bka5b97gl1g6vdsri2yrfyy6ivdq4jw98qiw50pz66c2l4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base explicit-exception transformers utility-ht
+       ];
+       homepage = "http://www.haskell.org/haskellwiki/Spreadsheet";
+       description = "Read and write spreadsheets from and to CSV files in a lazy way";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sprinkles" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
      , Cabal, case-insensitive, cereal, classy-prelude, containers, curl
@@ -192143,6 +192221,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "streaming-bytestring_0_1_5" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl
+     , resourcet, smallcheck, streaming, tasty, tasty-smallcheck
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "streaming-bytestring";
+       version = "0.1.5";
+       sha256 = "0ih7ngqbign834i7z1hlqb0g0f3gphgrz6n8sdj81h36vmm6yd8j";
+       libraryHaskellDepends = [
+         base bytestring deepseq exceptions mmorph mtl resourcet streaming
+         transformers transformers-base
+       ];
+       testHaskellDepends = [
+         base bytestring smallcheck streaming tasty tasty-smallcheck
+         transformers
+       ];
+       homepage = "https://github.com/haskell-streaming/streaming-bytestring";
+       description = "effectful byte steams, or: bytestring io done right";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "streaming-cassava" = callPackage
     ({ mkDerivation, base, bytestring, cassava, hspec, mtl, QuickCheck
      , quickcheck-instances, streaming, streaming-bytestring, text
@@ -196769,8 +196870,8 @@ self: {
      }:
      mkDerivation {
        pname = "tart";
-       version = "0.1.1";
-       sha256 = "1a1nh093lklih1hq7lhkqp9l48wf66axlf1hsb8h2zmkv09z517h";
+       version = "0.1.2";
+       sha256 = "1ik86xbai9513gr9k60m55xf5pj5bdw3wbjc0gd260j9k9j4p73k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -197336,23 +197437,6 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-rerun";
-       version = "1.1.7";
-       sha256 = "18hz1xqinf59mzvd68ygj9333v0a32qxfcas7crn4iniq5zv71kj";
-       libraryHaskellDepends = [
-         base containers mtl optparse-applicative reducers split stm tagged
-         tasty transformers
-       ];
-       homepage = "http://github.com/ocharles/tasty-rerun";
-       description = "Run tests by filtering the test tree depending on the result of previous test runs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tasty-rerun_1_1_8" = callPackage
-    ({ mkDerivation, base, containers, mtl, optparse-applicative
-     , reducers, split, stm, tagged, tasty, transformers
-     }:
-     mkDerivation {
-       pname = "tasty-rerun";
        version = "1.1.8";
        sha256 = "0yg8cicfn3qaazvp4rbanzy3dyk95k3y1kkd4bykvkl9v4076788";
        libraryHaskellDepends = [
@@ -197362,7 +197446,6 @@ self: {
        homepage = "http://github.com/ocharles/tasty-rerun";
        description = "Run tests by filtering the test tree depending on the result of previous test runs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-silver" = callPackage
@@ -201866,8 +201949,8 @@ self: {
      }:
      mkDerivation {
        pname = "tidal";
-       version = "0.9.4";
-       sha256 = "1i290r4invm7haw1pcq2v60iz7wr73c6qfxkghx6kfgawyl0v3pn";
+       version = "0.9.5";
+       sha256 = "1p288qc8g6jxf8l1d1wkcq4aqgyx2wpv7fn7ff9mikgj1xjixhqc";
        libraryHaskellDepends = [
          base colour containers hashable hosc mersenne-random-pure64 mtl
          parsec safe text time websockets
@@ -201878,15 +201961,15 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "tidal_0_9_5" = callPackage
+  "tidal_0_9_6" = callPackage
     ({ mkDerivation, base, colour, containers, hashable, hosc
      , mersenne-random-pure64, mtl, parsec, safe, tasty, tasty-hunit
      , text, time, websockets
      }:
      mkDerivation {
        pname = "tidal";
-       version = "0.9.5";
-       sha256 = "1p288qc8g6jxf8l1d1wkcq4aqgyx2wpv7fn7ff9mikgj1xjixhqc";
+       version = "0.9.6";
+       sha256 = "1bldi0ygfn695x3an3qlsfzrbhmqcyhznkmsm5dsjmmh27zs1sx6";
        libraryHaskellDepends = [
          base colour containers hashable hosc mersenne-random-pure64 mtl
          parsec safe text time websockets
@@ -203285,25 +203368,11 @@ self: {
     ({ mkDerivation, auto-update, base, clock, psqueues, tls }:
      mkDerivation {
        pname = "tls-session-manager";
-       version = "0.0.0.1";
-       sha256 = "0bqv6wh771j7n8qqsh02v8c4byybfkr1027k6cz03mszvnz1q9k8";
-       revision = "1";
-       editedCabalFile = "0hnhxfqmvkkhf37rr2ir52xyd59070jjm6s6al0alsanid2m4p01";
-       libraryHaskellDepends = [ auto-update base clock psqueues tls ];
-       description = "In-memory TLS session manager";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tls-session-manager_0_0_0_2" = callPackage
-    ({ mkDerivation, auto-update, base, clock, psqueues, tls }:
-     mkDerivation {
-       pname = "tls-session-manager";
        version = "0.0.0.2";
        sha256 = "0rvmln545vghsx8zhxp44f0f6pzma8cylarmfhhysy55ipywr1n5";
        libraryHaskellDepends = [ auto-update base clock psqueues tls ];
        description = "In-memory TLS session manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tmapchan" = callPackage
@@ -203734,8 +203803,8 @@ self: {
      }:
      mkDerivation {
        pname = "top";
-       version = "0.2.2";
-       sha256 = "1j97n3a66983pxnajk11c4jm4ccckvmf4xjvfxbmqj23ixl6isfp";
+       version = "0.2.4";
+       sha256 = "0kqyhcd407jyxpb487bx5jqnzaycycp5i8yxasgl37g45cdgb4gr";
        libraryHaskellDepends = [
          acid-state async base bytestring containers data-default-class
          deepseq extra filepath flat hslogger mtl pipes pretty safecopy
@@ -206947,8 +207016,8 @@ self: {
      }:
      mkDerivation {
        pname = "type-of-html";
-       version = "1.2.0.0";
-       sha256 = "0mnpa297x8ikgarr7wf8lllkyif240fsjzjigs9rx86r65vfszgy";
+       version = "1.3.0.1";
+       sha256 = "1f6np6m3bqiigwq2859j7d4fiyzkmlyxv5gg11f53lx92f1qfaz2";
        libraryHaskellDepends = [
          base bytestring double-conversion ghc-prim text
        ];
@@ -206959,7 +207028,6 @@ self: {
        homepage = "https://github.com/knupfer/type-of-html";
        description = "High performance type driven html generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-operators" = callPackage
@@ -208981,8 +209049,8 @@ self: {
      }:
      mkDerivation {
        pname = "universum";
-       version = "0.8.0";
-       sha256 = "058c9fhf5lysswch8gwicpjjpqh6l03iz861vm913r3a8lam777f";
+       version = "0.9.1";
+       sha256 = "0hag6fk3dq06vhqprj7p1fzxjjb5iymdvmqv35pzjrj371phc8h0";
        libraryHaskellDepends = [
          base bytestring containers deepseq exceptions ghc-prim hashable
          microlens microlens-mtl mtl safe safe-exceptions stm text
@@ -210413,8 +210481,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "util";
-       version = "0.1.2.1";
-       sha256 = "1m0ljqgfbs5f45mi25h1hv4q2svhjlq17xprvmaq042334cbim0s";
+       version = "0.1.4.0";
+       sha256 = "1b4s199qwsb1yz8wjpqybi8na20b44kkjqq09kzqky6198nmqqd8";
        libraryHaskellDepends = [ base ];
        description = "Utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -212410,6 +212478,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "viewprof_0_0_0_12" = callPackage
+    ({ mkDerivation, base, brick, containers, ghc-prof, lens
+     , scientific, text, vector, vector-algorithms, vty
+     }:
+     mkDerivation {
+       pname = "viewprof";
+       version = "0.0.0.12";
+       sha256 = "0a9bf8smqjjwz4m0gqac9zf9qp6ka3dhy2qrflbg1k5spd0dqqh5";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base brick containers ghc-prof lens scientific text vector
+         vector-algorithms vty
+       ];
+       homepage = "https://github.com/maoe/viewprof";
+       description = "Text-based interactive GHC .prof viewer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "views" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -213391,31 +213479,6 @@ self: {
      }:
      mkDerivation {
        pname = "wai-cors";
-       version = "0.2.5";
-       sha256 = "0vkn5nws9vcjn809qv2jfhf9ckfcgvfhs1v3xx1b03iy0j59n215";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         attoparsec base base-unicode-symbols bytestring case-insensitive
-         http-types mtl transformers wai
-       ];
-       testHaskellDepends = [
-         base base-unicode-symbols directory filepath http-types network
-         process tasty tasty-hunit text wai wai-extra wai-websockets warp
-         websockets
-       ];
-       homepage = "https://github.com/larskuhtz/wai-cors";
-       description = "CORS for WAI";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai-cors_0_2_6" = callPackage
-    ({ mkDerivation, attoparsec, base, base-unicode-symbols, bytestring
-     , case-insensitive, directory, filepath, http-types, mtl, network
-     , process, tasty, tasty-hunit, text, transformers, wai, wai-extra
-     , wai-websockets, warp, websockets
-     }:
-     mkDerivation {
-       pname = "wai-cors";
        version = "0.2.6";
        sha256 = "11m9d8hn9pb9brprz0kglldmcqj83kjkjdwdpxdbl12430ii1ina";
        enableSeparateDataOutput = true;
@@ -213431,7 +213494,6 @@ self: {
        homepage = "https://github.com/larskuhtz/wai-cors";
        description = "CORS for WAI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-devel" = callPackage
@@ -214280,7 +214342,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "wai-middleware-rollbar_0_7_0" = callPackage
+  "wai-middleware-rollbar_0_8_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
      , containers, hostname, hspec, hspec-golden-aeson, http-client
      , http-conduit, http-types, lens, lens-aeson, network, QuickCheck
@@ -214288,8 +214350,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-middleware-rollbar";
-       version = "0.7.0";
-       sha256 = "0vs03d3xm8hmahd72znkk4zw0fz33mbs5pvqins6kyizcgi4j5f5";
+       version = "0.8.0";
+       sha256 = "07fms55rpa099hlmr02dsbij8pr81r9h4m7ll1bxq06zgyi7ajzd";
        libraryHaskellDepends = [
          aeson base bytestring case-insensitive hostname http-client
          http-conduit http-types network text time unordered-containers uuid
@@ -214718,29 +214780,6 @@ self: {
      }:
      mkDerivation {
        pname = "wai-session-postgresql";
-       version = "0.2.1.1";
-       sha256 = "0yab46s0xyd49s46skrgm9hk4pvzqv3sr8mzr58231jvn7lijyf9";
-       libraryHaskellDepends = [
-         base bytestring cereal cookie data-default entropy
-         postgresql-simple resource-pool text time transformers wai
-         wai-session
-       ];
-       testHaskellDepends = [
-         base bytestring data-default postgresql-simple text wai-session
-       ];
-       homepage = "https://github.com/hce/postgresql-session#readme";
-       description = "PostgreSQL backed Wai session store";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "wai-session-postgresql_0_2_1_2" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, cookie, data-default
-     , entropy, postgresql-simple, resource-pool, text, time
-     , transformers, wai, wai-session
-     }:
-     mkDerivation {
-       pname = "wai-session-postgresql";
        version = "0.2.1.2";
        sha256 = "10xc34a1l6g2lr8b4grvv17281689gdb8q1vh3kkip5lk7fp1m9r";
        libraryHaskellDepends = [
@@ -216402,26 +216441,6 @@ self: {
      }:
      mkDerivation {
        pname = "weeder";
-       version = "0.1.7";
-       sha256 = "0mvpy2qzwjdl204k3qfi1cjz44rknzyrc187wp9lvxv40mb2kyd6";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson base bytestring cmdargs deepseq directory extra filepath
-         foundation hashable process text unordered-containers vector yaml
-       ];
-       homepage = "https://github.com/ndmitchell/weeder#readme";
-       description = "Detect dead code";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "weeder_0_1_9" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cmdargs, deepseq
-     , directory, extra, filepath, foundation, hashable, process, text
-     , unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "weeder";
        version = "0.1.9";
        sha256 = "1k5q34zyw2ajy7k5imxygs86q0a245ax5ch4kgff12pfpyz0jmz7";
        isLibrary = false;
@@ -216433,7 +216452,6 @@ self: {
        homepage = "https://github.com/ndmitchell/weeder#readme";
        description = "Detect dead code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "weigh" = callPackage
@@ -221580,35 +221598,6 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth";
-       version = "1.4.20";
-       sha256 = "1p6kcx9g04x8vng12dc7kywxwnm74kpp5q4adcjcbzhgrvhrnvbj";
-       libraryHaskellDepends = [
-         aeson authenticate base base16-bytestring base64-bytestring binary
-         blaze-builder blaze-html blaze-markup byteable bytestring conduit
-         conduit-extra containers cryptonite data-default email-validate
-         file-embed http-client http-conduit http-types lifted-base memory
-         mime-mail network-uri nonce persistent persistent-template random
-         resourcet safe shakespeare template-haskell text time transformers
-         unordered-containers wai yesod-core yesod-form yesod-persistent
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Authentication for Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-auth_1_4_21" = callPackage
-    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
-     , base64-bytestring, binary, blaze-builder, blaze-html
-     , blaze-markup, byteable, bytestring, conduit, conduit-extra
-     , containers, cryptonite, data-default, email-validate, file-embed
-     , http-client, http-conduit, http-types, lifted-base, memory
-     , mime-mail, network-uri, nonce, persistent, persistent-template
-     , random, resourcet, safe, shakespeare, template-haskell, text
-     , time, transformers, unordered-containers, wai, yesod-core
-     , yesod-form, yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod-auth";
        version = "1.4.21";
        sha256 = "1qqwg9l65m9q3l8z0r1bnihqb5rbbp2c2w6gbk49kx9127rf4488";
        libraryHaskellDepends = [
@@ -221623,7 +221612,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Authentication for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-account" = callPackage
@@ -224401,6 +224389,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "yoga_0_0_0_2" = callPackage
+    ({ mkDerivation, base, bindings-DSL, ieee754 }:
+     mkDerivation {
+       pname = "yoga";
+       version = "0.0.0.2";
+       sha256 = "1gkql9c7dd7h0wfq98mfhgjmqlxkdf4b66qympc7r8vyx38jps1c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bindings-DSL ieee754 ];
+       executableHaskellDepends = [ base ];
+       description = "Bindings to Facebook's Yoga layout library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yoko" = callPackage
     ({ mkDerivation, base, bifunctors, containers, invariant, kinds
      , mtl, records, semigroups, template-haskell, th-sccs, type-cereal
@@ -224957,6 +224960,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) zeromq;};
 
+  "zeromq4-haskell_0_7_0" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, exceptions
+     , monad-control, QuickCheck, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, transformers, transformers-base, zeromq
+     }:
+     mkDerivation {
+       pname = "zeromq4-haskell";
+       version = "0.7.0";
+       sha256 = "17q756mldxx9b8a2nx9lvjrgvbmgjbnp896sqcgnijq7wr751m2q";
+       libraryHaskellDepends = [
+         async base bytestring containers exceptions monad-control
+         semigroups transformers transformers-base
+       ];
+       libraryPkgconfigDepends = [ zeromq ];
+       testHaskellDepends = [
+         async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       homepage = "https://gitlab.com/twittner/zeromq-haskell/";
+       description = "Bindings to ZeroMQ 4.x";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) zeromq;};
+
   "zeroth" = callPackage
     ({ mkDerivation, base, Cabal, derive, directory, filepath
      , haskell-src-exts, hskeleton, monoid-record, process, syb
@@ -225496,19 +225522,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "zm_0_3_1" = callPackage
+  "zm_0_3_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, convertible
      , cryptonite, deepseq, doctest, either, filemanip, flat, memory
-     , model, mtl, pretty, tasty, tasty-hunit, tasty-quickcheck, text
-     , timeit, transformers
+     , model, pretty, tasty, tasty-hunit, tasty-quickcheck, text, timeit
+     , transformers
      }:
      mkDerivation {
        pname = "zm";
-       version = "0.3.1";
-       sha256 = "0cdggfyzb0h3xfjm91l3rx28yq1ksxfprn1wp1mdj1zm7y0paiiv";
+       version = "0.3.2";
+       sha256 = "02f7qm3l3xmdpv6w0hxhnzimxc1pab921c0rzprj4l5mvv69adx0";
        libraryHaskellDepends = [
          base bytestring containers convertible cryptonite deepseq either
-         flat memory model mtl pretty text transformers
+         flat memory model pretty text transformers
        ];
        testHaskellDepends = [
          base bytestring containers doctest filemanip flat model pretty
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index ed2c4db20f7..5aaa18e5ac6 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -1,23 +1,25 @@
-{ stdenv, fetchurl, unzip, ant, jdk, makeWrapper }:
+{ stdenv, fetchurl, jdk, makeWrapper }:
 
-let version = "1.8.0"; in
+let version = "1.9.0.273"; in
 
 stdenv.mkDerivation {
   name = "clojure-${version}";
 
   src = fetchurl {
-    url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip";
-    sha256 = "1nip095fz5c492sw15skril60i1vd21ibg6szin4jcvyy3xr6cym";
+    url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
+    sha256 = "0xmrq3xvr002jgq8m1j0y5ld0rcr49608g3gqxgyxzjqswacglb4";
   };
 
-  buildInputs = [ unzip ant jdk makeWrapper ];
-
-  buildPhase = "ant jar";
+  buildInputs = [ jdk makeWrapper ];
 
   installPhase = ''
-    mkdir -p $out/share/java $out/bin
-    install -t $out/share/java clojure.jar
-    makeWrapper ${jdk.jre}/bin/java $out/bin/clojure --add-flags "-cp $out/share/java/clojure.jar clojure.main"
+    pwd
+    ls -la
+    mkdir -p $out/libexec $out/bin
+    cp -f deps.edn example-deps.edn $out
+    cp -f clojure-tools-${version}.jar $out/libexec
+    sed -i -e "s@PREFIX@$out@g" clojure
+    cp -f clj clojure $out/bin
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/audio/lv2/unstable.nix b/pkgs/development/libraries/audio/lv2/unstable.nix
index 595dd9e0a53..4a632d07006 100644
--- a/pkgs/development/libraries/audio/lv2/unstable.nix
+++ b/pkgs/development/libraries/audio/lv2/unstable.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "lv2-unstable-${version}";
-  version = "2016-10-23";
+  version = "2017-07-08";
 
   src = fetchgit {
     url = "http://lv2plug.in/git/cgit.cgi/lv2.git";
-    rev = "b36868f3b96a436961c0c51b5b2dd71d05da9b12";
-    sha256 = "1sx39j0gary2nayzv7xgqcra7z1rcw9hrafkji05aksdwf7q0pdm";
+    rev = "39c7c726cd52b2863fcea356cafe1bcab2ba7f37";
+    sha256 = "1gp2rd99dfmpibvpixrqn115mrhybzf3if3h8bssf6siyi13f29r";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix
index b0b0c6bc59a..63e3ae36028 100644
--- a/pkgs/development/libraries/audio/raul/default.nix
+++ b/pkgs/development/libraries/audio/raul/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "raul-unstable-${rev}";
-  rev = "2016-09-20";
+  rev = "2017-07-23";
 
   src = fetchgit {
     url = "http://git.drobilla.net/cgit.cgi/raul.git";
-    rev = "f8bf77d3c3b77830aedafb9ebb5cdadfea7ed07a";
-    sha256 = "1lby508fb0n8ks6iz959sh18fc37br39d6pbapwvbcw5nckdrxwj";
+    rev = "4db870b2b20b0a608ec0283139056b836c5b1624";
+    sha256 = "04fajrass3ymr72flx5js5vxc601ccrmx8ny8scp0rw7j0igyjdr";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index fe06bcfab6d..40df40480f3 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -14,13 +14,13 @@ let
         else throw "Unsupported system!";
 in stdenv.mkDerivation rec {
   name = "aws-sdk-cpp-${version}";
-  version = "1.1.18";
+  version = "1.3.22";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-sdk-cpp";
     rev = version;
-    sha256 = "1i85zpns3gj5by45ppg4rfk9csix8mjazpyj6dqic40b2wshnw8c";
+    sha256 = "0sdgy8kqhxnw7n0sw4m3p3ay7yic3rhad5ab8m5lbx61ad9bq3c2";
   };
 
   # FIXME: might be nice to put different APIs in different outputs
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 9773ef8b896..1e59e8f1d65 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -4,21 +4,13 @@
 let inherit (stdenv) lib system; in
 
 stdenv.mkDerivation rec {
-  name = "gpgme-1.9.0";
+  name = "gpgme-1.10.0";
 
   src = fetchurl {
     url = "mirror://gnupg/gpgme/${name}.tar.bz2";
-    sha256 = "1ssc0gs02r4fasabk7c6v6r865k2j02mpb5g1vkpbmzsigdzwa8v";
+    sha256 = "14q619lxbk64vz7lih5gjb928qm28jrnn1h3yhsrrff3jw8yv3qs";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff_plain;h=5d4f977dac542340c877fdd4b1304fa8f6e058e6";
-      sha256 = "0swpxzd3x3b6h2ry2py9j8l0xp3vdw8rixxhgfavzia5p869qyyx";
-      name = "qgpgme-format-security.patch";
-    })
-  ];
-
   outputs = [ "out" "dev" "info" ];
   outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool
 
diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix
index e1acacc328c..4d6af866990 100644
--- a/pkgs/development/libraries/hwloc/default.nix
+++ b/pkgs/development/libraries/hwloc/default.nix
@@ -1,16 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, cairo, expat, ncurses, libX11
-, pciutils, numactl }:
+{ stdenv, fetchurl, pkgconfig, expat, ncurses, pciutils, numactl
+, cairo, libX11
+, x11Support ? (!stdenv.isCygwin)
+}:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "hwloc-1.11.6";
+  name = "hwloc-1.11.8";
 
   src = fetchurl {
     url = "http://www.open-mpi.org/software/hwloc/v1.11/downloads/${name}.tar.bz2";
-    sha256 = "1yl7dm2qplwmnidd712zy12qfvxk28k8ccs694n42ybwdjwzg1bn";
+    sha256 = "0karxv4r1r8sa7ki5aamlxdvyvz0bvzq4gdhq0yi5nc4a0k11vzc";
   };
 
+  hardeningDisable = [ "format" ];
+
+  configureFlags = [
+    "--localstatedir=/var"
+  ];
+
   # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo.
   nativeBuildInputs = [ pkgconfig ];
 
@@ -18,7 +26,7 @@ stdenv.mkDerivation rec {
   # derivation and set optional dependencies to `null'.
   buildInputs = stdenv.lib.filter (x: x != null)
    ([ expat ncurses ]
-     ++  (optionals (!stdenv.isCygwin) [ cairo libX11 ])
+     ++  (optionals x11Support [ cairo libX11 ])
      ++  (optionals stdenv.isLinux [ numactl ]));
 
   propagatedBuildInputs =
@@ -37,7 +45,7 @@ stdenv.mkDerivation rec {
              test -d "$numalibdir"
          fi
 
-         sed -i "$out/lib/libhwloc.la" \
+         sed -i "$lib/lib/libhwloc.la" \
              -e "s|-lnuma|-L$numalibdir -lnuma|g"
       '';
 
@@ -45,6 +53,8 @@ stdenv.mkDerivation rec {
   # fail on some build machines.
   doCheck = false;
 
+  outputs = [ "out" "lib" "dev" "doc" "man" ];
+
   meta = {
     description = "Portable abstraction of hierarchical architectures for high-performance computing";
     longDescription = ''
diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix
index 36f1b7bd532..1a5a4baf808 100644
--- a/pkgs/development/libraries/liblscp/default.nix
+++ b/pkgs/development/libraries/liblscp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "liblscp-${version}";
-  version = "0.5.8";
+  version = "0.6.0";
 
   src = fetchurl {
-    url = "http://download.linuxsampler.org/packages/${name}.tar.gz";
-    sha256 = "00cfafkw1n80sdjwm9zdsg5vx287wqpgpbajd3zmiz415wzr84dn";
+    url = "https://download.linuxsampler.org/packages/${name}.tar.gz";
+    sha256 = "1rl7ssdzj0z3658yvdijmb27n2lcwmplx4qxg5mwrm07pvs7i75k";
   };
 
   nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix
new file mode 100644
index 00000000000..fad72105912
--- /dev/null
+++ b/pkgs/development/libraries/libva-utils/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig
+, libdrm, libva
+}:
+
+stdenv.mkDerivation rec {
+  name = "libva-utils-${version}";
+  inherit (libva) version;
+
+  src = fetchFromGitHub {
+    owner  = "01org";
+    repo   = "libva-utils";
+    rev    = version;
+    sha256 = "02n51cvp8bzzjk4fargwvgh7z71y8spg24hqgaawbp3p3ahh7xxi";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  buildInputs = [ libdrm libva ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "VAAPI tools: Video Acceleration API";
+    homepage = http://www.freedesktop.org/wiki/Software/vaapi;
+    license = licenses.mit;
+    maintainers = with maintainers; [ garbas ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index 031ac781651..dca548a6f9d 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -1,36 +1,43 @@
-{ stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig
+, libXext, libdrm, libXfixes, wayland, libffi, libX11
 , mesa_noglu
 , minimal ? true, libva
 }:
 
 stdenv.mkDerivation rec {
-  name = "libva-${version}";
-  version = "1.7.3";
-
-  src = fetchurl {
-    url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
-    sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12";
+  name = "libva-${lib.optionalString (!minimal) "full-"}${version}";
+  version = "2.0.0";
+
+  src = fetchFromGitHub {
+    owner  = "01org";
+    repo   = "libva";
+    rev    = version;
+    sha256 = "1x8rlmv5wfqjz3j87byrxb4d9vp5b4lrrin2fx254nwl3aqy15hy";
   };
 
-  outputs = [ "bin" "dev" "out" ];
+  outputs = [ "dev" "out" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
   buildInputs = [ libdrm ]
     ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ];
   # TODO: share libs between minimal and !minimal - perhaps just symlink them
 
-  configureFlags =
-    [ "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" ] ++
-    lib.optionals (!minimal) [ "--enable-glx" ];
+  enableParallelBuilding = true;
+
+  configureFlags = [
+    "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri"
+  ] ++ lib.optionals (!minimal) [ "--enable-glx" ];
 
-  installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ];
+  installFlags = [
+    "dummy_drv_video_ladir=$(out)/lib/dri"
+  ];
 
   meta = with stdenv.lib; {
+    description = "VAAPI library: Video Acceleration API";
     homepage = http://www.freedesktop.org/wiki/Software/vaapi;
     license = licenses.mit;
-    description = "VAAPI library: Video Acceleration API";
-    platforms = platforms.unix;
     maintainers = with maintainers; [ garbas ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/taglib/1.9.nix b/pkgs/development/libraries/taglib/1.9.nix
index 71b8a764eed..1caa8a376fb 100644
--- a/pkgs/development/libraries/taglib/1.9.nix
+++ b/pkgs/development/libraries/taglib/1.9.nix
@@ -8,10 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "06n7gnbcqa3r6c9gv00y0y1r48dyyazm6yj403i7ma0r2k6p3lvj";
   };
 
-  cmakeFlags = "-DWITH_ASF=ON -DWITH_MP4=ON";
+  nativeBuildInputs = [ cmake ];
 
   buildInputs = [ zlib ];
-  nativeBuildInputs = [ cmake ];
 
   meta = {
     homepage = http://developer.kde.org/~wheeler/taglib.html;
diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix
index b038f133be7..e4d7b426854 100644
--- a/pkgs/development/libraries/taglib/default.nix
+++ b/pkgs/development/libraries/taglib/default.nix
@@ -8,16 +8,17 @@ stdenv.mkDerivation rec {
     sha256 = "0ssjcdjv4qf9liph5ry1kngam1y7zp8fzr9xv4wzzrma22kabldn";
   };
 
-  cmakeFlags = [ "-DWITH_ASF=ON" "-DWITH_MP4=ON" ];
+  nativeBuildInputs = [ cmake ];
 
   buildInputs = [ zlib ];
-  nativeBuildInputs = [ cmake ];
+
+  cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
 
   meta = with stdenv.lib; {
     homepage = http://taglib.org/;
     repositories.git = git://github.com/taglib/taglib.git;
-    shortDescription = "A library for reading and editing audio file metadata.";
-    description = ''
+    description = "A library for reading and editing audio file metadata.";
+    longDescription = ''
       TagLib is a library for reading and editing the meta-data of several
       popular audio formats. Currently it supports both ID3v1 and ID3v2 for MP3
       files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC,
diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix
index 49f638a7bc5..edb2a8214dd 100644
--- a/pkgs/development/libraries/vaapi-intel/default.nix
+++ b/pkgs/development/libraries/vaapi-intel/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, gnum4, pkgconfig, python2
+{ stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkgconfig, python2
 , intel-gpu-tools, libdrm, libva, libX11, mesa_noglu, wayland, libXext
 }:
 
 stdenv.mkDerivation rec {
   name = "intel-vaapi-driver-${version}";
-  version = "1.8.2";
+  inherit (libva) version;
 
-  src = fetchurl {
-    url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2";
-    sha256 = "00mpcvininwr5c4wyhp16s4bddg7vclxxjm2sfq5h7lifjcxyv46";
+  src = fetchFromGitHub {
+    owner  = "01org";
+    repo   = "libva-intel-driver";
+    rev    = version;
+    sha256 = "1832nnva3d33wv52bj59bv62q7a807sdxjqqq0my7l9x7a4qdkzz";
   };
 
   patchPhase = ''
@@ -25,10 +27,12 @@ stdenv.mkDerivation rec {
     "--enable-wayland"
   ];
 
-  nativeBuildInputs = [ gnum4 pkgconfig python2 ];
+  nativeBuildInputs = [ autoreconfHook gnum4 pkgconfig python2 ];
 
   buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext mesa_noglu wayland ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = http://cgit.freedesktop.org/vaapi/intel-driver/;
     license = licenses.mit;
diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix
index 90ee8d905a6..80e34ecd06a 100644
--- a/pkgs/development/ocaml-modules/alcotest/default.nix
+++ b/pkgs/development/ocaml-modules/alcotest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, opam, jbuilder
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, jbuilder
 , cmdliner, astring, fmt, result
 }:
 
@@ -12,7 +12,7 @@ let param =
   } else {
     version = "0.7.2";
     sha256 = "1qgsz2zz5ky6s5pf3j3shc4fjc36rqnjflk8x0wl1fcpvvkr52md";
-    buildInputs = [ ocamlbuild opam topkg ];
+    buildInputs = [ ocamlbuild topkg ];
     inherit (topkg) buildPhase installPhase;
   };
 in
diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix
index feeb94a5c46..65a310c9cf0 100644
--- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix
+++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix
@@ -1,6 +1,4 @@
-{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, cstruct, zarith, ounit, result, topkg, opam }:
-
-let ocamlFlags = "-I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/"; in
+{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, cstruct, zarith, ounit, result, topkg }:
 
 buildOcaml rec {
   name = "asn1-combinators";
@@ -15,20 +13,17 @@ buildOcaml rec {
     sha256 = "0hpn049i46sdnv2i6m7r6m6ch0jz8argybh71wykbvcqdby08zxj";
   };
 
-  buildInputs = [ ocaml findlib ounit topkg opam ];
+  buildInputs = [ ocaml findlib ounit topkg ];
   propagatedBuildInputs = [ result cstruct zarith ];
 
   createFindlibDestdir = true;
 
-  buildPhase = "ocaml ${ocamlFlags} pkg/pkg.ml build --tests true";
+  buildPhase = "${topkg.run} build --tests true";
 
-  installPhase = ''
-    opam-installer --script --prefix=$out | sh
-    ln -s $out/lib/asn1-combinators $out/lib/ocaml/${ocaml.version}/site-lib
-  '';
+  inherit (topkg) installPhase;
 
   doCheck = true;
-  checkPhase = "ocaml ${ocamlFlags} pkg/pkg.ml test";
+  checkPhase = "${topkg.run} test";
 
   meta = {
     homepage = https://github.com/mirleft/ocaml-asn1-combinators;
diff --git a/pkgs/development/ocaml-modules/astring/default.nix b/pkgs/development/ocaml-modules/astring/default.nix
index d172b0f7463..97c59d8581f 100644
--- a/pkgs/development/ocaml-modules/astring/default.nix
+++ b/pkgs/development/ocaml-modules/astring/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg, opam}:
+{ stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg }:
 
 buildOcaml rec {
   version = "0.8.3";
@@ -11,16 +11,9 @@ buildOcaml rec {
 
   unpackCmd = "tar -xf $curSrc";
 
-  buildInputs = [ ocaml findlib ocamlbuild topkg opam ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg ];
 
-  buildPhase = ''
-    ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build
-  '';
-
-  installPhase = ''
-    opam-installer --script --prefix=$out astring.install | sh
-    ln -s $out/lib/astring $out/lib/ocaml/${ocaml.version}/site-lib/
-  '';
+  inherit (topkg) buildPhase installPhase;
 
   meta = {
     homepage = http://erratique.ch/software/astring;
diff --git a/pkgs/development/ocaml-modules/bos/default.nix b/pkgs/development/ocaml-modules/bos/default.nix
index f8590de2b15..3cb9b405d5a 100644
--- a/pkgs/development/ocaml-modules/bos/default.nix
+++ b/pkgs/development/ocaml-modules/bos/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg
 , astring, fmt, fpath, logs, rresult
 }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
 	unpackCmd = "tar xjf $src";
 
-	buildInputs = [ ocaml findlib ocamlbuild opam topkg ];
+	buildInputs = [ ocaml findlib ocamlbuild topkg ];
 	propagatedBuildInputs = [ astring fmt fpath logs rresult ];
 
 	inherit (topkg) buildPhase installPhase;
diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix
index 2e2abe897e0..4b055a130fd 100644
--- a/pkgs/development/ocaml-modules/cmdliner/default.nix
+++ b/pkgs/development/ocaml-modules/cmdliner/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, result }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }:
 
 let
   pname = "cmdliner";
@@ -17,20 +17,11 @@ stdenv.mkDerivation rec {
 
   unpackCmd = "tar xjf $src";
 
-  nativeBuildInputs = [ ocamlbuild opam topkg ];
+  nativeBuildInputs = [ ocamlbuild topkg ];
   buildInputs = [ ocaml findlib ];
   propagatedBuildInputs = [ result ];
 
-  createFindlibDestdir = true;
-
-  buildPhase = ''
-    ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build
-  '';
-
-  installPhase = ''
-    opam-installer --script --prefix=$out | sh
-    ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/
-  '';
+  inherit (topkg) buildPhase installPhase;
 
   meta = with stdenv.lib; {
     homepage = http://erratique.ch/software/cmdliner;
diff --git a/pkgs/development/ocaml-modules/cow/default.nix b/pkgs/development/ocaml-modules/cow/default.nix
index eaf07818aeb..4832f5c39af 100644
--- a/pkgs/development/ocaml-modules/cow/default.nix
+++ b/pkgs/development/ocaml-modules/cow/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, ocaml, findlib
-, ocamlbuild, topkg, opam
+, ocamlbuild, topkg
 , uri, xmlm, omd, ezjsonm }:
 
 stdenv.mkDerivation rec {
@@ -13,9 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0snhabg7rfrrcq2ksr3qghiawd61cw3y4kp6rl7vs87j4cnk3kr2";
   };
 
-  createFindlibDestdir = true;
-
-  buildInputs = [ ocaml opam ocamlbuild findlib topkg ];
+  buildInputs = [ ocaml ocamlbuild findlib topkg ];
   propagatedBuildInputs = [ xmlm uri ezjsonm omd ];
 
   inherit (topkg) buildPhase installPhase;
diff --git a/pkgs/development/ocaml-modules/cpuid/default.nix b/pkgs/development/ocaml-modules/cpuid/default.nix
index 1bdf70e86c5..37400856f1a 100644
--- a/pkgs/development/ocaml-modules/cpuid/default.nix
+++ b/pkgs/development/ocaml-modules/cpuid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, ocb-stubblr }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ocb-stubblr }:
 
 stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-cpuid-0.1.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   unpackCmd = "tar xjf $src";
 
-  buildInputs = [ ocaml findlib ocamlbuild opam topkg ocb-stubblr ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg ocb-stubblr ];
 
   inherit (topkg) buildPhase installPhase;
 
diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/pkgs/development/ocaml-modules/decompress/default.nix
index 389a136aae6..70ec7fd34ae 100644
--- a/pkgs/development/ocaml-modules/decompress/default.nix
+++ b/pkgs/development/ocaml-modules/decompress/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg, opam
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg
 }:
 
 if !stdenv.lib.versionAtLeast ocaml.version "4.03"
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 		sha256 = "0hfs5zrvimzvjwdg57vrxx9bb7irvlm07dk2yv3s5qhj30zimd08";
 	};
 
-	buildInputs = [ ocaml findlib ocamlbuild topkg opam ];
+	buildInputs = [ ocaml findlib ocamlbuild topkg ];
 
 	inherit (topkg) buildPhase installPhase;
 
diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix
index 0d6ab72fade..2e7996f55d9 100644
--- a/pkgs/development/ocaml-modules/fmt/default.nix
+++ b/pkgs/development/ocaml-modules/fmt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, cmdliner, result, uchar }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner, result, uchar }:
 
 stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-fmt-0.8.4";
@@ -10,13 +10,11 @@ stdenv.mkDerivation {
 
   unpackCmd = "tar xjf $src";
 
-  buildInputs = [ ocaml findlib ocamlbuild opam topkg cmdliner ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ];
   propagatedBuildInputs = [ result uchar ];
 
   inherit (topkg) buildPhase installPhase;
 
-  createFindlibDestdir = true;
-
   meta = {
     homepage = http://erratique.ch/software/fmt;
     license = stdenv.lib.licenses.isc;
diff --git a/pkgs/development/ocaml-modules/fpath/default.nix b/pkgs/development/ocaml-modules/fpath/default.nix
index c5382ddd265..f812ab1d48c 100644
--- a/pkgs/development/ocaml-modules/fpath/default.nix
+++ b/pkgs/development/ocaml-modules/fpath/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, astring }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, astring }:
 
 stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-fpath-0.7.2";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   unpackCmd = "tar xjf $src";
 
-  buildInputs = [ ocaml findlib ocamlbuild opam topkg ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg ];
 
   propagatedBuildInputs = [ astring ];
 
diff --git a/pkgs/development/ocaml-modules/functoria/default.nix b/pkgs/development/ocaml-modules/functoria/default.nix
index 2d8c00c7238..150d8db16a0 100644
--- a/pkgs/development/ocaml-modules/functoria/default.nix
+++ b/pkgs/development/ocaml-modules/functoria/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg
 , bos, cmdliner, ocamlgraph
 }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
 	unpackCmd = "tar xjf $src";
 
-	buildInputs = [ ocaml findlib ocamlbuild opam topkg ];
+	buildInputs = [ ocaml findlib ocamlbuild topkg ];
 	propagatedBuildInputs = [ bos cmdliner ocamlgraph ];
 
 	inherit (topkg) buildPhase installPhase;
diff --git a/pkgs/development/ocaml-modules/integers/default.nix b/pkgs/development/ocaml-modules/integers/default.nix
index e76c3aadc03..f7d22baf3e9 100644
--- a/pkgs/development/ocaml-modules/integers/default.nix
+++ b/pkgs/development/ocaml-modules/integers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
 
 stdenv.mkDerivation {
 	name = "ocaml${ocaml.version}-integers-0.2.2";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
 	unpackCmd = "tar xjf $src";
 
-	buildInputs = [ ocaml findlib ocamlbuild topkg opam ];
+	buildInputs = [ ocaml findlib ocamlbuild topkg ];
 
 	inherit (topkg) buildPhase installPhase;
 
diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix
index 2bdaf655648..0599a5f19fe 100644
--- a/pkgs/development/ocaml-modules/jsonm/default.nix
+++ b/pkgs/development/ocaml-modules/jsonm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam, uutf }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf }:
 
 let version = "1.0.1"; in
 
@@ -10,13 +10,11 @@ stdenv.mkDerivation {
     sha256 = "1176dcmxb11fnw49b7yysvkjh0kpzx4s48lmdn5psq9vshp5c29w";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild topkg opam ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg ];
   propagatedBuildInputs = [ uutf ];
 
   unpackCmd = "tar xjf $src";
 
-  createFindlibDestdir = true;
-
   inherit (topkg) buildPhase installPhase;
 
   meta = {
diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/pkgs/development/ocaml-modules/logs/default.nix
index ab0b6c8579b..aead4b4756f 100644
--- a/pkgs/development/ocaml-modules/logs/default.nix
+++ b/pkgs/development/ocaml-modules/logs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild
 , topkg, result, lwt, cmdliner, fmt }:
 let
   pname = "logs";
@@ -18,18 +18,13 @@ stdenv.mkDerivation rec {
 
   unpackCmd = "tar xjf $src";
 
-  buildInputs = [ ocaml findlib ocamlbuild opam topkg fmt cmdliner lwt ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg fmt cmdliner lwt ];
   propagatedBuildInputs = [ result ];
 
-  buildPhase = ''
-    ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build \
-      --with-js_of_ocaml false
-    '';
+  buildPhase = "${topkg.run} build --with-js_of_ocaml false";
 
   inherit (topkg) installPhase;
 
-  createFindlibDestdir = true;
-
   meta = with stdenv.lib; {
     description = "Logging infrastructure for OCaml";
     homepage = "${webpage}";
diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix
index 534bb4de48c..69921537f5b 100644
--- a/pkgs/development/ocaml-modules/mtime/default.nix
+++ b/pkgs/development/ocaml-modules/mtime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam, js_of_ocaml
+{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, js_of_ocaml
 , jsooSupport ? true
 }:
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   unpackCmd = "tar xjf $src";
 
-  buildInputs = [ ocaml findlib ocamlbuild opam topkg ]
+  buildInputs = [ ocaml findlib ocamlbuild topkg ]
   ++ stdenv.lib.optional jsooSupport js_of_ocaml;
 
   buildPhase = "${topkg.buildPhase} --with-js_of_ocaml ${boolToString jsooSupport}";
diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix
index a7fa59e1446..cfe3f37800d 100644
--- a/pkgs/development/ocaml-modules/nocrypto/default.nix
+++ b/pkgs/development/ocaml-modules/nocrypto/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, opam, topkg
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg
 , cpuid, ocb-stubblr
 , cstruct, zarith, ppx_sexp_conv, sexplib
 , cstruct-lwt ? null
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     sha256 = "0nhnlpbqh3mf9y2cxivlvfb70yfbdpvg6jslzq64xblpgjyg443p";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild topkg opam cpuid ocb-stubblr
+  buildInputs = [ ocaml findlib ocamlbuild topkg cpuid ocb-stubblr
     ppx_sexp_conv ];
   propagatedBuildInputs = [ cstruct zarith sexplib ] ++ optional withLwt cstruct-lwt;
 
@@ -28,8 +28,6 @@ stdenv.mkDerivation rec {
   '';
   inherit (topkg) installPhase;
 
-  createFindlibDestdir = true;
-
   meta = {
     homepage = https://github.com/mirleft/ocaml-nocrypto;
     description = "Simplest possible crypto to support TLS";
diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix
index 950395bd7ea..dcc57fddaf6 100644
--- a/pkgs/development/ocaml-modules/notty/default.nix
+++ b/pkgs/development/ocaml-modules/notty/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildOcaml, fetchpatch, fetchFromGitHub, findlib, topkg, opam, ocb-stubblr
+{ stdenv, buildOcaml, fetchpatch, fetchFromGitHub, findlib, topkg, ocb-stubblr
 , result, uucp, uuseg, uutf
 , lwt     ? null }:
 
@@ -24,7 +24,7 @@ buildOcaml rec {
     sha256 = "0pklplbnjbsjriqj73pc8fsadg404px534w7zknz2617zb44m6x6";
   })];
 
-  buildInputs = [ findlib opam topkg ocb-stubblr ];
+  buildInputs = [ findlib topkg ocb-stubblr ];
   propagatedBuildInputs = [ result uucp uuseg uutf ] ++
                           optional withLwt lwt;
 
diff --git a/pkgs/development/ocaml-modules/ocb-stubblr/default.nix b/pkgs/development/ocaml-modules/ocb-stubblr/default.nix
index bb4b24cec67..4071cb8a639 100644
--- a/pkgs/development/ocaml-modules/ocb-stubblr/default.nix
+++ b/pkgs/development/ocaml-modules/ocb-stubblr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, opam, topkg, astring }:
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, astring }:
 
 stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-ocb-stubblr-0.1.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   patches = [ ./pkg-config.patch ];
 
-  buildInputs = [ ocaml findlib ocamlbuild opam topkg ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg ];
 
   propagatedBuildInputs = [ astring ];
 
diff --git a/pkgs/development/ocaml-modules/octavius/default.nix b/pkgs/development/ocaml-modules/octavius/default.nix
index f1668160df1..57e3c9bfa74 100644
--- a/pkgs/development/ocaml-modules/octavius/default.nix
+++ b/pkgs/development/ocaml-modules/octavius/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
 
 if !stdenv.lib.versionAtLeast ocaml.version "4.03"
 then throw "octavius is not available for OCaml ${ocaml.version}" else
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
 	unpackCmd = "tar xjf $src";
 
-	buildInputs = [ ocaml findlib ocamlbuild topkg opam ];
+	buildInputs = [ ocaml findlib ocamlbuild topkg ];
 
 	inherit (topkg) buildPhase installPhase;
 
diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix
index 5deef60520b..05c25c81d5a 100644
--- a/pkgs/development/ocaml-modules/otfm/default.nix
+++ b/pkgs/development/ocaml-modules/otfm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uutf, result }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf, result }:
 
 let
   pname = "otfm";
@@ -17,12 +17,10 @@ stdenv.mkDerivation rec {
     sha256 = "054s82539k3kc9na6s47g3scsl04icjahpas7pv5351jmsgqcq3k";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild opam topkg ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg ];
 
   propagatedBuildInputs = [ uutf result ];
 
-  createFindlibDestdir = true;
-
   unpackCmd = "tar xjf $src";
 
   inherit (topkg) buildPhase installPhase;
diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix
index 39e7ce754d2..189b3adf873 100644
--- a/pkgs/development/ocaml-modules/otr/default.nix
+++ b/pkgs/development/ocaml-modules/otr/default.nix
@@ -1,7 +1,6 @@
-{stdenv, buildOcaml, fetchFromGitHub, ocamlbuild, findlib, topkg, ocaml, opam,
- ppx_tools, ppx_sexp_conv, cstruct, ppx_cstruct, sexplib, result, nocrypto, astring}:
-
-let ocamlFlags = "-I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/"; in
+{ stdenv, buildOcaml, fetchFromGitHub, ocamlbuild, findlib, topkg, ocaml
+, ppx_tools, ppx_sexp_conv, cstruct, ppx_cstruct, sexplib, result, nocrypto, astring
+}:
 
 buildOcaml rec {
   name = "otr";
@@ -16,23 +15,15 @@ buildOcaml rec {
     sha256 = "07zzix5mfsasqpqdx811m0x04gp8mq1ayf4b64998k98027v01rr";
   };
 
-  buildInputs = [ ocamlbuild findlib topkg ppx_tools ppx_sexp_conv opam ppx_cstruct ];
+  buildInputs = [ ocamlbuild findlib topkg ppx_tools ppx_sexp_conv ppx_cstruct ];
   propagatedBuildInputs = [ cstruct sexplib result nocrypto astring ];
 
-  buildPhase = ''
-    ocaml ${ocamlFlags} pkg/pkg.ml build \
-      --tests true
-  '';
+  buildPhase = "${topkg.run} build --tests true";
 
-  installPhase = ''
-    opam-installer --prefix=$out --script | sh
-    ln -s $out/lib/otr $out/lib/ocaml/${ocaml.version}/site-lib
-  '';
+  inherit (topkg) installPhase;
 
   doCheck = true;
-  checkPhase = "ocaml ${ocamlFlags} pkg/pkg.ml test";
-
-  createFindlibDestdir = true;
+  checkPhase = "${topkg.run} test";
 
   meta = with stdenv.lib; {
     homepage = https://github.com/hannesm/ocaml-otr;
diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
index 10f9df04f38..fb06fd7f935 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, opam, topkg, cppo
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg, cppo
 , ppx_import, ppx_deriving, yojson, ounit
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "1pwfnq7z60nchba4gnf58918ll11w3gj5i88qhz1p2jm45hxqgnw";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild opam cppo ounit ppx_import ];
+  buildInputs = [ ocaml findlib ocamlbuild cppo ounit ppx_import ];
 
   propagatedBuildInputs = [ ppx_deriving yojson ];
 
diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix
index bb4bbef516c..2e3a627a3d1 100644
--- a/pkgs/development/ocaml-modules/ptime/default.nix
+++ b/pkgs/development/ocaml-modules/ptime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg, result, opam, js_of_ocaml }:
+{ stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg, result, js_of_ocaml }:
 
 buildOcaml rec {
   version = "0.8.3";
@@ -11,13 +11,11 @@ buildOcaml rec {
 
   unpackCmd = "tar -xf $curSrc";
 
-  buildInputs = [ ocaml findlib ocamlbuild topkg opam js_of_ocaml ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg js_of_ocaml ];
 
   propagatedBuildInputs = [ result ];
 
-  buildPhase = ''
-    ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build --with-js_of_ocaml true
-  '';
+  buildPhase = "${topkg.run} build --with-js_of_ocaml true";
 
   inherit (topkg) installPhase;
 
diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix
index 5a720aead80..920ee05244a 100644
--- a/pkgs/development/ocaml-modules/react/default.nix
+++ b/pkgs/development/ocaml-modules/react/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, topkg, ocamlbuild, opam }:
+{ stdenv, fetchurl, ocaml, findlib, topkg, ocamlbuild }:
 
 stdenv.mkDerivation {
   name = "ocaml-react-1.2.1";
@@ -9,9 +9,7 @@ stdenv.mkDerivation {
   };
 
   unpackCmd = "tar xjf $src";
-  buildInputs = [ ocaml findlib topkg ocamlbuild opam ];
-
-  createFindlibDestdir = true;
+  buildInputs = [ ocaml findlib topkg ocamlbuild ];
 
   inherit (topkg) buildPhase installPhase;
 
diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix
index f9951b56da2..d1a796a58e5 100644
--- a/pkgs/development/ocaml-modules/rresult/default.nix
+++ b/pkgs/development/ocaml-modules/rresult/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
 
 stdenv.mkDerivation rec {
 	name = "ocaml${ocaml.version}-rresult-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
 	unpackCmd = "tar xjf $src";
 
-	buildInputs = [ ocaml findlib ocamlbuild topkg opam ];
+	buildInputs = [ ocaml findlib ocamlbuild topkg ];
 
 	inherit (topkg) buildPhase installPhase;
 
diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix
index ecd806ecadc..9a655e05513 100644
--- a/pkgs/development/ocaml-modules/topkg/default.nix
+++ b/pkgs/development/ocaml-modules/topkg/default.nix
@@ -1,9 +1,25 @@
+/* Topkg is a packager for distributing OCaml software. This derivation
+provides facilities to describe derivations for OCaml libraries
+using topkg.
+The `buildPhase` and `installPhase` attributes can be reused directly
+in many cases. When more fine-grained control on how to run the “topkg”
+build system is required, the attribute `run` can be used.
+*/
 { stdenv, fetchurl, ocaml, findlib, ocamlbuild, result, opam }:
 
 if !stdenv.lib.versionAtLeast ocaml.version "4.01"
 then throw "topkg is not available for OCaml ${ocaml.version}"
 else
 
+let
+/* This command allows to run the “topkg” build system.
+ * It is usually called with `build` or `test` as argument.
+ * Packages that use `topkg` may call this command as part of
+ *  their `buildPhase` or `checkPhase`.
+*/
+  run = "ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml";
+in
+
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-topkg-${version}";
   version = "0.9.1";
@@ -13,14 +29,15 @@ stdenv.mkDerivation rec {
     sha256 = "1slrzbmyp81xhgsfwwqs2d6gxzvqx0gcp34rq00h5iblhcq7myx6";
   };
 
-  nativeBuildInputs = [ opam ];
   buildInputs = [ ocaml findlib ocamlbuild ];
   propagatedBuildInputs = [ result ];
 
   unpackCmd = "tar xjf ${src}";
-  buildPhase = "ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build";
+  buildPhase = "${run} build";
   createFindlibDestdir = true;
-  installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
+  installPhase = "${opam}/bin/opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
+
+  passthru = { inherit run; };
 
   meta = {
     homepage = http://erratique.ch/software/topkg;
diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix
index 1b90a539ac8..4230d098e0d 100644
--- a/pkgs/development/ocaml-modules/tsdl/default.nix
+++ b/pkgs/development/ocaml-modules/tsdl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkgconfig, opam, ocb-stubblr }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkgconfig, ocb-stubblr }:
 
 if !stdenv.lib.versionAtLeast ocaml.version "4.02"
 then throw "tsdl is not available for OCaml ${ocaml.version}"
@@ -19,11 +19,9 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ ocaml findlib ocamlbuild topkg result opam ocb-stubblr ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg result ocb-stubblr ];
   propagatedBuildInputs = [ SDL2 ctypes ];
 
-  createFindlibDestdir = true;
-
   unpackCmd = "tar xjf $src";
 
   preConfigure = ''
diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix
index 89d9d545e57..60429ca4b40 100644
--- a/pkgs/development/ocaml-modules/uucd/default.nix
+++ b/pkgs/development/ocaml-modules/uucd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, xmlm, topkg }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, xmlm, topkg }:
 
 let
   pname = "uucd";
@@ -13,9 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0cdyg6vaic4n58w80qriwvaq1c40ng3fh74ilxrwajbq163k055q";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild opam topkg ];
-
-  createFindlibDestdir = true;
+  buildInputs = [ ocaml findlib ocamlbuild topkg ];
 
   unpackCmd = "tar xjf $src";
 
diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix
index cf5b0549233..66f1ebeba94 100644
--- a/pkgs/development/ocaml-modules/uucp/default.nix
+++ b/pkgs/development/ocaml-modules/uucp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uchar, uutf, uunf }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, uunf }:
 
 let
   pname = "uucp";
@@ -17,12 +17,10 @@ stdenv.mkDerivation {
     sha256 = "0qgbrx3lnrzii8a9f0hv4kp73y57q6fr79hskxxxs70q68j2xpfm";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild opam topkg uutf uunf ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg uutf uunf ];
 
   propagatedBuildInputs = [ uchar ];
 
-  createFindlibDestdir = true;
-
   unpackCmd = "tar xjf $src";
 
   buildPhase = "${topkg.buildPhase} --with-cmdliner false";
diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix
index 5a1689eaeeb..b295143c0bc 100644
--- a/pkgs/development/ocaml-modules/uuidm/default.nix
+++ b/pkgs/development/ocaml-modules/uuidm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam, cmdliner }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner }:
 
 stdenv.mkDerivation rec {
   version = "0.9.6";
@@ -10,12 +10,10 @@ stdenv.mkDerivation rec {
 
   unpackCmd = "tar -xf $curSrc";
 
-  buildInputs = [ ocaml findlib ocamlbuild topkg opam cmdliner ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ];
 
   inherit (topkg) buildPhase installPhase;
 
-  createFindlibDestdir = true;
-
   meta = with stdenv.lib; {
     description = "An OCaml module implementing 128 bits universally unique identifiers version 3, 5 (name based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122";
     homepage = http://erratique.ch/software/uuidm;
diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix
index d65f002ebef..e70a539302f 100644
--- a/pkgs/development/ocaml-modules/uunf/default.nix
+++ b/pkgs/development/ocaml-modules/uunf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uchar, uutf, cmdliner }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner }:
 let
   pname = "uunf";
   webpage = "http://erratique.ch/software/${pname}";
@@ -15,12 +15,10 @@ stdenv.mkDerivation rec {
     sha256 = "0c5lwica5668ybsffllk6x4p921nw4pljimgqikhf17k5hvyjsbr";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild opam topkg uutf cmdliner ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg uutf cmdliner ];
 
   propagatedBuildInputs = [ uchar ];
 
-  createFindlibDestdir = true;
-
   unpackCmd = "tar xjf $src";
 
   inherit (topkg) buildPhase installPhase;
diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix
index f55b757eb26..f27612510c3 100644
--- a/pkgs/development/ocaml-modules/uuseg/default.nix
+++ b/pkgs/development/ocaml-modules/uuseg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uchar, uucp, uutf, cmdliner }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uucp, uutf, cmdliner }:
 
 let
   pname = "uuseg";
@@ -15,11 +15,9 @@ stdenv.mkDerivation rec {
     sha256 = "01q8ljjgi7d73x7ms489b5my83xds4jax1vbjhwwjdai01friscc";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild opam cmdliner topkg uutf ];
+  buildInputs = [ ocaml findlib ocamlbuild cmdliner topkg uutf ];
   propagatedBuildInputs = [ uucp uchar ];
 
-  createFindlibDestdir = true;
-
   unpackCmd = "tar xjf $src";
 
   inherit (topkg) buildPhase installPhase;
diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix
index 93e3fd9c9d2..95ec93d8584 100644
--- a/pkgs/development/ocaml-modules/uutf/default.nix
+++ b/pkgs/development/ocaml-modules/uutf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, cmdliner , topkg, uchar }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, cmdliner , topkg, uchar }:
 let
   pname = "uutf";
   webpage = "http://erratique.ch/software/${pname}";
@@ -13,11 +13,9 @@ stdenv.mkDerivation rec {
     sha256 = "1gp96dcggq7s84934vimxh89caaxa77lqiff1yywbwkilkkjcfqj";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild topkg opam cmdliner ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ];
   propagatedBuildInputs = [ uchar ];
 
-  createFindlibDestdir = true;
-
   unpackCmd = "tar xjf $src";
 
   inherit (topkg) buildPhase installPhase;
diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix
index 0ef3ef4939b..8a8668df74e 100644
--- a/pkgs/development/ocaml-modules/vg/default.nix
+++ b/pkgs/development/ocaml-modules/vg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg
 , uchar, result, gg, uutf, otfm
 , js_of_ocaml, js_of_ocaml-ocamlbuild, js_of_ocaml-ppx,
   pdfBackend ? true, # depends on uutf and otfm
@@ -26,14 +26,12 @@ stdenv.mkDerivation rec {
     sha256 = "1czd2fq85hy24w5pllarsq4pvbx9rda5zdikxfxdng8s9kff2h3f";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild opam topkg ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg ];
 
   propagatedBuildInputs = [ uchar result gg ]
                           ++ optionals pdfBackend [ uutf otfm ]
                           ++ optionals htmlcBackend [ js_of_ocaml js_of_ocaml-ocamlbuild js_of_ocaml-ppx ];
 
-  createFindlibDestdir = true;
-
   unpackCmd = "tar xjf $src";
 
   buildPhase = topkg.buildPhase
diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix
index 7f5bcb03ad6..9d3a0b1bb4d 100644
--- a/pkgs/development/ocaml-modules/xmlm/default.nix
+++ b/pkgs/development/ocaml-modules/xmlm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
 let
   pname = "xmlm";
   webpage = "http://erratique.ch/software/${pname}";
@@ -30,19 +30,12 @@ stdenv.mkDerivation rec {
     inherit (param) sha256;
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild opam ] ++ param.buildInputs;
-
-  createFindlibDestdir = true;
+  buildInputs = [ ocaml findlib ocamlbuild ] ++ param.buildInputs;
 
   unpackCmd = "tar xjf $src";
 
   inherit (param) buildPhase;
-
-  installPhase = ''
-    opam-installer --script --prefix=$out ${pname}.install > install.sh
-    sh install.sh
-    ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/
-  '';
+  inherit (topkg) installPhase;
 
   meta = with stdenv.lib; {
     description = "An OCaml streaming codec to decode and encode the XML data format";
diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix
index 2d1ac11f3b5..d3ea1f151d3 100644
--- a/pkgs/development/python-modules/blessed/default.nix
+++ b/pkgs/development/python-modules/blessed/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, buildPythonPackage, fetchPypi, six, wcwidth }:
+{ stdenv, buildPythonPackage, fetchPypi, six, wcwidth, pytest, mock
+, glibcLocales }:
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
@@ -10,6 +11,12 @@ buildPythonPackage rec {
     sha256 = "0fv9f0074kxy1849h0kwwxw12sifpq3bv63pcz900zzjsigi4hi3";
   };
 
+  checkInputs = [ pytest mock glibcLocales ];
+
+  checkPhase = ''
+    LANG=en_US.utf-8 py.test blessed/tests
+  '';
+
   propagatedBuildInputs = [ wcwidth six ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/fix_swiftclient_mocking.patch b/pkgs/development/python-modules/fix_swiftclient_mocking.patch
deleted file mode 100644
index 027ef56b317..00000000000
--- a/pkgs/development/python-modules/fix_swiftclient_mocking.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f37947a7e083532676a9f2ed079dff6bdc19a8e9 Mon Sep 17 00:00:00 2001
-From: Sabari Kumar Murugesan <smurugesan@vmware.com>
-Date: Tue, 15 Sep 2015 14:22:11 -0700
-Subject: [PATCH] Fix swift store tests for latest swiftclient
-
-The latest swiftclient (2.6.0) breaks some of the swift store
-tests as a mock function's parameters got changed.
-
-Change-Id: I36512fbe642f4f12cf1382fdf0e37eccbf1acba4
----
- glance_store/tests/unit/test_swift_store.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/glance_store/tests/unit/test_swift_store.py b/glance_store/tests/unit/test_swift_store.py
-index f738cf9..3fe4699 100644
---- a/glance_store/tests/unit/test_swift_store.py
-+++ b/glance_store/tests/unit/test_swift_store.py
-@@ -92,7 +92,7 @@ def fake_head_container(url, token, container, **kwargs):
-     def fake_put_container(url, token, container, **kwargs):
-         fixture_containers.append(container)
- 
--    def fake_post_container(url, token, container, headers, http_conn=None):
-+    def fake_post_container(url, token, container, headers, **kwargs):
-         for key, value in six.iteritems(headers):
-             fixture_container_headers[key] = value
- 
diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix
new file mode 100644
index 00000000000..7b90f10338c
--- /dev/null
+++ b/pkgs/development/python-modules/gssapi/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, pkgs, lib, buildPythonPackage, fetchPypi, six, enum34, decorator,
+nose, shouldbe, gss, krb5Full, which, darwin }:
+
+buildPythonPackage rec {
+  pname = "gssapi";
+  version = "1.2.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1q6ccpz6anl9vggwxdq32wp6xjh2lyfbf7av6jqnmvmyqdfwh3b9";
+  };
+
+  LD_LIBRARY_PATH="${pkgs.krb5Full}/lib";
+
+  buildInputs = [ krb5Full which nose shouldbe ]
+  ++ ( if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.GSS ] else [ gss ] );
+
+  propagatedBuildInputs =  [ decorator enum34 six ];
+
+  doCheck = false; # No such file or directory: '/usr/sbin/kadmin.local'
+
+  meta = with stdenv.lib; {
+    homepage = https://pypi.python.org/pypi/gssapi;
+    description = "Python GSSAPI Wrapper";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/development/python-modules/inflection/default.nix b/pkgs/development/python-modules/inflection/default.nix
new file mode 100644
index 00000000000..bccf49c56ad
--- /dev/null
+++ b/pkgs/development/python-modules/inflection/default.nix
@@ -0,0 +1,23 @@
+{ lib, fetchPypi, buildPythonPackage, pytest } :
+
+buildPythonPackage rec {
+  pname = "inflection";
+  version = "0.3.1";
+
+  src = fetchPypi {
+   inherit pname version;
+   sha256 = "1jhnxgnw8y3mbzjssixh6qkc7a3afc4fygajhqrqalnilyvpzshq";
+  };
+
+  checkInputs = [ pytest ];
+  # Suppress overly verbose output if tests run successfully
+  checkPhase = ''pytest >/dev/null || pytest'';
+
+  meta = {
+   homepage = https://github.com/jpvanhal/inflection;
+   description = "A port of Ruby on Rails inflector to Python";
+   maintainers = with lib.maintainers; [ NikolaMandic ilya-kolpakov ];
+   license = lib.licenses.mit;
+  };
+}
+
diff --git a/pkgs/development/python-modules/jsondate/default.nix b/pkgs/development/python-modules/jsondate/default.nix
new file mode 100644
index 00000000000..7888a6df23c
--- /dev/null
+++ b/pkgs/development/python-modules/jsondate/default.nix
@@ -0,0 +1,22 @@
+{ lib, fetchFromGitHub, buildPythonPackage, six }:
+
+buildPythonPackage rec {
+  version = "0.1.3";
+  pname = "jsondate";
+
+  src = fetchFromGitHub {
+    owner = "ilya-kolpakov";
+    repo = "jsondate";
+    rev = "refs/tags/v${version}";
+    sha256 = "0nhvi48nc0bmad5ncyn6c9yc338krs3xf10bvv55xgz25c5gdgwy";
+    fetchSubmodules = true; # Fetching by tag does not work otherwise
+  };
+
+  propagatedBuildInputs = [ six ];
+
+  meta = {
+    homepage = "https://github.com/ilya-kolpakov/jsondate";
+    description = "JSON with datetime handling";
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix
deleted file mode 100644
index 7405f7f74cd..00000000000
--- a/pkgs/development/python-modules/keystoneauth1/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ buildPythonPackage, isPyPy, fetchPypi, python
-, pbr, testtools, testresources, testrepository, mock
-, pep8, fixtures, mox3, requests-mock
-, iso8601, requests, six, stevedore, webob, oslo-config
-, pyyaml, betamax, oauthlib
-}:
-
-buildPythonPackage rec {
-  pname = "keystoneauth1";
-  version = "3.2.0";
-  name = "${pname}-${version}";
-  disabled = isPyPy; # a test fails
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0rg3harfyvai34lrjiqnl1crmvswjvj8nsviasnz4b9pcvp3d03n";
-  };
-
-  buildInputs = [ pbr  ];
-  checkInputs = [ pyyaml betamax oauthlib testtools testresources
-                  testrepository mock pep8 fixtures mox3 requests-mock ];
-  propagatedBuildInputs = [ iso8601 requests six stevedore webob ];
-
-  doCheck = true;
-  # 1. oslo-config
-  # 2. oslo-utils
-  # 3. requests-kerberos
-  preCheck = ''
-    rm keystoneauth1/tests/unit/loading/test_{session,conf,adapter}.py
-    rm keystoneauth1/tests/unit/access/test_v{2,3}_access.py
-    rm keystoneauth1/tests/unit/extras/kerberos/test_fedkerb_loading.py
-  '';
-  postPatch = ''
-    sed -i 's@python@${python.interpreter}@' .testr.conf
-    substituteInPlace requirements.txt --replace "argparse" ""
-  '';
-}
diff --git a/pkgs/development/python-modules/keystoneclient/default.nix b/pkgs/development/python-modules/keystoneclient/default.nix
deleted file mode 100644
index a856f4db793..00000000000
--- a/pkgs/development/python-modules/keystoneclient/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, python
-
-, pbr, testtools, testresources, testrepository
-, requests-mock, fixtures, openssl, oslotest, pep8
-
-, oslo-serialization, oslo-config, oslo-i18n, oslo-utils
-, Babel, prettytable, requests, six, iso8601, stevedore
-, netaddr, debtcollector, bandit, webob, mock, pycrypto
-}:
-
-buildPythonPackage rec {
-  pname = "keystoneclient";
-  version = "1.8.1";
-  name = pname + "-" + version;
-
-  src = fetchFromGitHub {
-    owner = "openstack";
-    repo = "python-keystoneclient";
-    rev = version;
-    sha256 = "0yayn1hb3mncqb0isy8vy6d519xya7mhf5pcbn60fzdqjrkj2prq";
-  };
-
-  PBR_VERSION = "${version}";
-
-  buildInputs = [
-    pbr testtools testresources testrepository requests-mock fixtures openssl
-    oslotest pep8
-  ];
-  propagatedBuildInputs = [
-    oslo-serialization oslo-config oslo-i18n oslo-utils
-    Babel prettytable requests six iso8601 stevedore
-    netaddr debtcollector bandit webob mock pycrypto
-  ];
-
-  postPatch = ''
-    sed -i 's@python@${python.interpreter}@' .testr.conf
-    sed -ie '/argparse/d' requirements.txt
-    '';
-
-  doCheck = false; # The checkPhase below is broken
-
-  checkPhase = ''
-    patchShebangs run_tests.sh
-    ./run_tests.sh
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/openstack/python-novaclient/;
-    description = "Client library and command line tool for the OpenStack Nova API";
-    license = licenses.asl20;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/development/python-modules/os-testr/default.nix b/pkgs/development/python-modules/os-testr/default.nix
deleted file mode 100644
index baafc44d10d..00000000000
--- a/pkgs/development/python-modules/os-testr/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, python,
-  pbr, Babel, testrepository, subunit, testtools,
-  coverage, oslosphinx, oslotest, testscenarios, six, ddt 
-}:
-buildPythonPackage rec {
-  version = "0.8.2";
-  pname = "os-testr";
-  name = "${pname}-${version}";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "d8a60bd56c541714a5cab4d1996c8ddfdb5c7c35393d55be617803048c170837";
-  };
-
-  patchPhase = ''
-    sed -i 's@python@${python.interpreter}@' .testr.conf
-    sed -i 's@python@${python.interpreter}@' os_testr/tests/files/testr-conf
-  '';
-
-  checkPhase = ''
-    export PATH=$PATH:$out/bin
-    ${python.interpreter} setup.py test
-  '';
-
-  propagatedBuildInputs = [ pbr Babel testrepository subunit testtools ];
-  buildInputs = [ coverage oslosphinx oslotest testscenarios six ddt ];
-
-  meta = with stdenv.lib; {
-    description = "A testr wrapper to provide functionality for OpenStack projects";
-    homepage  = http://docs.openstack.org/developer/os-testr/;
-    license = licenses.asl20;
-  };
-}
diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix
deleted file mode 100644
index de91a507f17..00000000000
--- a/pkgs/development/python-modules/oslo-config/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, pbr, six, netaddr, stevedore, mock,
-debtcollector, rfc3986, pyyaml, oslo-i18n }:
-
-buildPythonPackage rec {
-  pname = "oslo.config";
-  version = "4.13.2";
-  name = "${pname}-${version}";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "882e5f1dcc0e5b0d7af877b2df0e2692113c5975db8cbbbf0dd3d2b905aefc0b";
-  };
-
-  propagatedBuildInputs = [ pbr six netaddr stevedore debtcollector rfc3986 pyyaml oslo-i18n ];
-  buildInputs = [ mock ];
-
-  # TODO: circular import on oslo-i18n
-  doCheck = false;
-
-  postPatch = ''
-    substituteInPlace requirements.txt --replace "argparse" ""
-  '';
-
-  meta = with lib; {
-    description = "Oslo Configuration API";
-    homepage = "https://docs.openstack.org/oslo.config/latest/";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ makefu ];
-  };
-
-
-}
diff --git a/pkgs/development/python-modules/pyrax/default.nix b/pkgs/development/python-modules/pyrax/default.nix
deleted file mode 100644
index 1337b3c32ad..00000000000
--- a/pkgs/development/python-modules/pyrax/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib, buildPythonPackage, fetchurl, requests, novaclient, keyring,
-  rackspace-novaclient, six, isPy3k, pytest, glibcLocales }:
-buildPythonPackage rec {
-  pname = "pyrax";
-  version = "1.9.8";
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "mirror://pypi/p/pyrax/${name}.tar.gz";
-    sha256 = "1x98jzyxnvha81pgx3jpfixljhs7zik89yfp8q06kwpx8ws99nz9";
-  };
-
-  # no good reason given in commit why limited, and seems to work
-  patchPhase = ''
-      substituteInPlace "setup.py"                                     \
-              --replace "python-novaclient==2.27.0" "python-novaclient"
-    '';
-
-  disabled = isPy3k;
-  propagatedBuildInputs = [ requests novaclient keyring rackspace-novaclient six ];
-
-  LC_ALL = "en_US.UTF-8";
-  buildInputs = [ pytest glibcLocales ];
-
-  checkPhase = ''
-    py.test tests/unit
-  '';
-
-  meta = {
-    homepage = https://github.com/rackspace/pyrax;
-    license = lib.licenses.asl20;
-    description = "Python API to interface with Rackspace";
-    maintainers = with lib.maintainers; [ teh ];
-  };
-}
diff --git a/pkgs/development/python-modules/quandl/allow-requests-v2.18.patch b/pkgs/development/python-modules/quandl/allow-requests-v2.18.patch
new file mode 100644
index 00000000000..c4d14319a8b
--- /dev/null
+++ b/pkgs/development/python-modules/quandl/allow-requests-v2.18.patch
@@ -0,0 +1,12 @@
+diff --git a/setup.py b/setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -18,7 +18,7 @@ from version import VERSION  # NOQA
+ install_requires = [
+     'pandas >= 0.14',
+     'numpy >= 1.8',
+-    'requests >= 2.7.0, < 2.18',  # Version 2.18 appears to break pulling data.
++    'requests >= 2.7.0', # Works fine
+     'inflection >= 0.3.1',
+     'python-dateutil',
+     'six',
diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix
new file mode 100644
index 00000000000..e85e9c4e0f8
--- /dev/null
+++ b/pkgs/development/python-modules/quandl/default.nix
@@ -0,0 +1,59 @@
+{
+  lib, fetchFromGitHub, buildPythonPackage, isPy3k,
+  # runtime dependencies
+  pandas, numpy, requests, inflection, python-dateutil, six, more-itertools,
+  # test suite dependencies
+  nose, unittest2, flake8, httpretty, mock, factory_boy, jsondate,
+  # additional runtime dependencies are required on Python 2.x
+  pyOpenSSL ? null, ndg-httpsclient ? null, pyasn1 ? null
+}:
+
+buildPythonPackage rec {
+  pname = "quandl";
+  version = "3.2.1";
+  sha256 = "0vc0pzs2px9yaqkqcmd2m1b2bq1iils8fs0xbl0989hjq791a4jr";
+
+  patches = [ ./allow-requests-v2.18.patch ];
+
+  # Tests do not work with fetchPypi
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = "quandl-python";
+    rev = "refs/tags/v${version}";
+    inherit sha256;
+    fetchSubmodules = true; # Fetching by tag does not work otherwise
+  };
+
+  doCheck = true;
+
+  checkInputs = [
+    nose
+    unittest2
+    flake8
+    httpretty
+    mock
+    factory_boy
+    jsondate
+  ];
+
+  propagatedBuildInputs = [
+    pandas
+    numpy
+    requests
+    inflection
+    python-dateutil
+    six
+    more-itertools
+  ] ++ lib.optional (!isPy3k) [
+    pyOpenSSL
+    ndg-httpsclient
+    pyasn1
+  ];
+
+  meta = {
+    homepage = "https://github.com/quandl/quandl-python";
+    description = "Quandl Python client library";
+    maintainers = [ lib.maintainers.ilya-kolpakov ];
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/development/python-modules/rackspace-novaclient/default.nix b/pkgs/development/python-modules/rackspace-novaclient/default.nix
deleted file mode 100644
index 3993503e956..00000000000
--- a/pkgs/development/python-modules/rackspace-novaclient/default.nix
+++ /dev/null
@@ -1,166 +0,0 @@
-{ buildPythonPackage, fetchurl, isPy3k, requests, novaclient, six, lib }:
-let
-os-virtual-interfacesv2-python-novaclient-ext = buildPythonPackage rec {
-  pname = "os_virtual_interfacesv2_python_novaclient_ext";
-  version = "0.20";
-  name = pname + "-" + version;
-
-  src = fetchurl {
-    url = "mirror://pypi/o/os-virtual-interfacesv2-python-novaclient-ext/${name}.tar.gz";
-    sha256 = "17a4r8psxmfikgmzh709absbn5jsh1005whibmwhysj9fi0zyfbd";
-  };
-
-  propagatedBuildInputs = [ six novaclient ];
-
-  meta = {
-    homepage = https://github.com/rackerlabs/os_virtual_interfacesv2_ext;
-    license = lib.licenses.asl20;
-    description = "Adds Virtual Interfaces support to python-novaclient";
-  };
-};
-
-ip-associations-python-novaclient-ext = buildPythonPackage rec {
-  pname = "ip_associations_python_novaclient_ext";
-  version = "0.2";
-  name = pname + "-" + version;
-
-  src = fetchurl {
-    url = "mirror://pypi/i/ip_associations_python_novaclient_ext/${name}.tar.gz";
-    sha256 = "0dxfkfjhzskafmb01y8hzbcpvc4cd6fas1s50dzcmg29w4z6qmz4";
-  };
-
-  propagatedBuildInputs = [ six novaclient ];
-
-  meta = {
-    homepage = https://github.com/rackerlabs/ip_associations_python_novaclient_ext;
-    license = lib.licenses.asl20;
-    description = "Adds Rackspace ip_associations support to python-novaclient";
-  };
-};
-
-rackspace-auth-openstack = buildPythonPackage rec {
-  pname = "rackspace-auth-openstack";
-  version = "1.3";
-  name = pname + "-" + version;
-
-  src = fetchurl {
-    url = "mirror://pypi/r/rackspace-auth-openstack/${name}.tar.gz";
-    sha256 = "1kaiyvgwmavw2mh0s32yjk70xsziynjdhi01qn9a8kljn7p6kh64";
-  };
-
-  propagatedBuildInputs = [ six novaclient ];
-
-  meta = {
-    homepage = https://pypi.python.org/pypi/rackspace-auth-openstack;
-    license = lib.licenses.asl20;
-    description = "Rackspace Auth Plugin for OpenStack Clients.";
-  };
-};
-rax-default-network-flags-python-novaclient-ext = buildPythonPackage rec {
-  pname = "rax_default_network_flags_python_novaclient_ext";
-  version = "0.4.0";
-  name = pname + "-" + version;
-
-  src = fetchurl {
-    url = "mirror://pypi/r/rax_default_network_flags_python_novaclient_ext/${name}.tar.gz";
-    sha256 = "00b0csb58k6rr1is68bkkw358mms8mmb898bm8bbr8g7j2fz8aw5";
-  };
-
-  propagatedBuildInputs = [ six novaclient ];
-
-  meta = {
-    homepage = https://pypi.python.org/simple/rax-default-network-flags-python-novaclient-ext;
-    license = lib.licenses.asl20;
-    description = "Novaclient Extension for Instance Default Network Flags";
-  };
-};
-os-networksv2-python-novaclient-ext = buildPythonPackage rec {
-  pname = "os_networksv2_python_novaclient_ext";
-  version = "0.26";
-  name = pname + "-" + version;
-
-  src = fetchurl {
-    url = "mirror://pypi/o/os_networksv2_python_novaclient_ext/${name}.tar.gz";
-    sha256 = "06dzqmyrwlq7hla6dk699z18c8v27qr1gxqknimwxlwqdlhpafk1";
-  };
-
-  propagatedBuildInputs = [ six novaclient ];
-
-  meta = {
-    homepage = https://pypi.python.org/pypi/os_networksv2_python_novaclient_ext;
-    license = lib.licenses.asl20;
-    description = "Adds rackspace networks support to python-novaclient";
-  };
-};
-
-rax-scheduled-images-python-novaclient-ext = buildPythonPackage rec {
-  pname = "rax_scheduled_images_python_novaclient_ext";
-  version = "0.3.1";
-  name = pname + "-" + version;
-
-  src = fetchurl {
-    url = "mirror://pypi/r/rax_scheduled_images_python_novaclient_ext/${name}.tar.gz";
-    sha256 = "1nvwjgrkp1p1d27an393qf49pszm1nvqa2ychhbqmp0bnabwyw7i";
-  };
-
-  propagatedBuildInputs = [ six novaclient ];
-
-  meta = {
-    homepage = https://pypi.python.org/pypi/rax_scheduled_images_python_novaclient_ext;
-    license = lib.licenses.asl20;
-    description = "Extends python-novaclient to use RAX-SI, the Rackspace Nova API Scheduled Images extension";
-  };
-};
-
-os-diskconfig-python-novaclient-ext = buildPythonPackage rec {
-  pname = "os_diskconfig_python_novaclient_ext";
-  version = "0.1.3";
-  name = pname + "-" + version;
-
-  src = fetchurl {
-    url = "mirror://pypi/o/os_diskconfig_python_novaclient_ext/${name}.tar.gz";
-    sha256 = "0xayy5nlkgl9yr0inqkwirlmar8pv1id29r59lj70g5plwrr5lg7";
-  };
-
-  propagatedBuildInputs = [ six novaclient ];
-
-  meta = {
-    homepage = https://pypi.python.org/pypi/os_diskconfig_python_novaclient_ext;
-    license = lib.licenses.asl20;
-    description = "Disk Config extension for python-novaclient";
-  };
-};
-
-in
-buildPythonPackage rec {
-  pname = "rackspace-novaclient";
-  version = "2.1";
-  name = pname + "-" + version;
-
-  src = fetchurl {
-    url = "mirror://pypi/r/rackspace-novaclient/${name}.tar.gz";
-    sha256 = "1rzaa328hzm8hs9q99gvjr64x47fmcq4dv4656rzxq5s4gv49z12";
-  };
-
-  disabled = isPy3k;
-  propagatedBuildInputs = [
-    requests
-    novaclient
-    six
-    # extensions
-    ip-associations-python-novaclient-ext
-    os-diskconfig-python-novaclient-ext
-    os-networksv2-python-novaclient-ext
-    os-virtual-interfacesv2-python-novaclient-ext
-    rackspace-auth-openstack
-    rax-default-network-flags-python-novaclient-ext
-    rax-scheduled-images-python-novaclient-ext
-  ];
-
-  meta = {
-    homepage = https://pypi.python.org/pypi/rackspace-novaclient/;
-    license = lib.licenses.asl20;
-    description = "Metapackage to install python-novaclient and Rackspace extensions";
-    maintainers = with lib.maintainers; [ teh ];
-  };
-}
diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix
index e7b56cb3f35..66e2595f8d2 100644
--- a/pkgs/development/python-modules/raven/default.nix
+++ b/pkgs/development/python-modules/raven/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "raven";
-  version = "6.3.0";
+  version = "6.4.0";
   name = pname + "-" + version;
 
   src = fetchurl {
     url = "mirror://pypi/r/raven/${name}.tar.gz";
-    sha256 = "1wgddbd092vih6k6mknp68vvm1pp12fikjqzglw6mnyw8njnbr7k";
+    sha256 = "00m985w9fja2jf8dpvdhygcr26rwabxkgvcc2v5j6v7d6lrvpvdq";
   };
 
   # way too many dependencies to run tests
diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
index 258f84e8c72..c2e454d08cd 100644
--- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
@@ -1,20 +1,25 @@
-{ stdenv, buildPythonPackage, fetchurl, python,
-  unittest2, scripttest, pytz, pylint, tempest-lib, mock, testtools,
-  pbr, tempita, decorator, sqlalchemy, six, sqlparse 
+{ stdenv, buildPythonPackage, fetchPypi, python
+, unittest2, scripttest, pytz, pylint, mock
+, testtools, pbr, tempita, decorator, sqlalchemy
+, six, sqlparse, testrepository
 }:
 buildPythonPackage rec {
   pname = "sqlalchemy-migrate";
-  name = "${pname}-${version}";
   version = "0.11.0";
 
-  src = fetchurl {
-    url = "mirror://pypi/s/sqlalchemy-migrate/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "0ld2bihp9kmf57ykgzrfgxs4j9kxlw79sgdj9sfn47snw3izb2p6";
   };
 
-  checkInputs = [ unittest2 scripttest pytz pylint mock testtools tempest-lib ];
+  checkInputs = [ unittest2 scripttest pytz pylint mock testtools testrepository ];
   propagatedBuildInputs = [ pbr tempita decorator sqlalchemy six sqlparse ];
 
+  prePatch = ''
+    sed -i -e /tempest-lib/d \
+           -e /testtools/d \
+      test-requirements.txt
+  '';
   checkPhase = ''
     export PATH=$PATH:$out/bin
     echo sqlite:///__tmp__ > test_db.cfg
diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix
index 1955320fd26..326282a39c3 100644
--- a/pkgs/development/python-modules/stevedore/default.nix
+++ b/pkgs/development/python-modules/stevedore/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, oslosphinx, pbr, six, argparse }:
+{ stdenv, buildPythonPackage, fetchPypi, pbr, six, argparse }:
 
 buildPythonPackage rec {
   pname = "stevedore";
@@ -12,7 +12,6 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  buildInputs = [ oslosphinx ];
   propagatedBuildInputs = [ pbr six argparse ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix
new file mode 100644
index 00000000000..adcda4c8324
--- /dev/null
+++ b/pkgs/development/tools/analysis/retdec/default.nix
@@ -0,0 +1,113 @@
+{ stdenv, fetchFromGitHub, fetchurl,
+# Native build inputs
+cmake,
+autoconf, automake, libtool,
+pkgconfig,
+bison, flex,
+groff,
+perl,
+python,
+# Runtime tools
+time,
+upx,
+# Build inputs
+ncurses,
+libffi,
+libxml2,
+zlib,
+}:
+
+let
+  release = "3.0";
+
+  rapidjson = fetchFromGitHub {
+    owner = "Tencent";
+    repo = "rapidjson";
+    rev = "v1.1.0";
+    sha256 = "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab";
+  };
+  jsoncpp = fetchFromGitHub {
+    owner = "open-source-parsers";
+    repo = "jsoncpp";
+    rev = "1.8.3";
+    sha256 = "05gkmg6r94q8a0qdymarcjlnlvmy9s365m9jhz3ysvi71cr31lkz";
+  };
+  googletest = fetchFromGitHub {
+    owner = "google";
+    repo = "googletest";
+    rev = "release-1.8.0";
+    sha256 = "0bjlljmbf8glnd9qjabx73w6pd7ibv43yiyngqvmvgxsabzr8399";
+  };
+  tinyxml2 = fetchFromGitHub {
+    owner = "leethomason";
+    repo = "tinyxml2";
+    rev = "5.0.1";
+    sha256 = "015g8520a0c55gwmv7pfdsgfz2rpdmh3d1nq5n9bd65n35492s3q";
+  };
+  yara = fetchurl {
+     url = "https://github.com/avast-tl/yara/archive/v1.0-retdec.zip";
+     sha256 = "1bjrkgp1sgld2y7gvwrlrz5fs16521ink6xyq72v7yxj3vfa9gps";
+  };
+  openssl = fetchurl {
+    url = "https://www.openssl.org/source/openssl-1.1.0f.tar.gz";
+    sha256 = "0r97n4n552ns571diz54qsgarihrxvbn7kvyv8wjyfs9ybrldxqj";
+  };
+
+  retdec-support = fetchurl {
+    url = "https://github.com/avast-tl/retdec-support/releases/download/2017-12-12/retdec-support_2017-12-12.tar.xz";
+    sha256 = "6376af57a77147f1363896963d8c1b3745ddb9a6bcec83d63a5846c3f78aeef9";
+  };
+in stdenv.mkDerivation rec {
+  name = "retdec-${version}";
+  version = "${release}.0";
+
+  src = fetchFromGitHub {
+    owner = "avast-tl";
+    repo = "retdec";
+    name = "retdec-${release}";
+    rev = "refs/tags/v${release}";
+    sha256 = "0cpc5lxg8qphdzl3gg9dx992ar35r8ik8wyysr91l2qvfhx93wks";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ cmake autoconf automake libtool pkgconfig bison flex groff perl python ];
+
+  buildInputs = [ ncurses libffi libxml2 zlib ];
+
+  prePatch = ''
+    find . -wholename "*/deps/rapidjson/CMakeLists.txt" -print0 | \
+      xargs -0 sed -i -e 's|GIT_REPOSITORY.*|URL ${rapidjson}|'
+    find . -wholename "*/deps/jsoncpp/CMakeLists.txt" -print0 | \
+      xargs -0 sed -i -e 's|GIT_REPOSITORY.*|URL ${jsoncpp}|'
+    find . -wholename "*/deps/googletest/CMakeLists.txt" -print0 | \
+      xargs -0 sed -i -e 's|GIT_REPOSITORY.*|URL ${googletest}|'
+    find . -wholename "*/deps/tinyxml2/CMakeLists.txt" -print0 | \
+      xargs -0 sed -i -e 's|GIT_REPOSITORY.*|URL ${tinyxml2}|'
+
+    find . -wholename "*/yaracpp/deps/CMakeLists.txt" -print0 | \
+      xargs -0 sed -i -e 's|URL .*|URL ${yara}|'
+
+    find . -wholename "*/deps/openssl/CMakeLists.txt" -print0 | \
+      xargs -0 sed -i -e 's|OPENSSL_URL .*)|OPENSSL_URL ${openssl})|'
+
+    chmod +x cmake/*.sh
+    patchShebangs cmake/*.sh
+
+    sed -i cmake/install-share.sh \
+      -e 's|WGET_PARAMS.*|cp ${retdec-support} "$INSTALL_PATH/$ARCH_NAME"|' \
+      -e '/echo "RUN: wget/,+7d'
+
+    substituteInPlace scripts/unpack.sh --replace '	upx -d' '	${upx}/bin/upx -d'
+    substituteInPlace scripts/config.sh --replace /usr/bin/time ${time}/bin/time
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "A retargetable machine-code decompiler based on LLVM";
+    inherit (src.meta) homepage;
+    license = licenses.mit;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
+
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 5f6e35fc75f..f44187a0ac1 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.93";
+  version = "2.95";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "1wk62lmll0abbgl3drmrf5kg8hya3glkwx7h0gfhcna3vjb95ll1";
+    sha256 = "08pmsxsk5qbs7h3m1ya7xbik95n58ak8m4p01y97l49kc70bj2hv";
   };
 
   buildCommand = ''
diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix
index 874f8dcd96a..2f220001070 100644
--- a/pkgs/development/tools/coursier/default.nix
+++ b/pkgs/development/tools/coursier/default.nix
@@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  phases = "installPhase";
+  unpackPhase = ":";
 
   installPhase = ''
     mkdir -p $out/bin
     cp ${src} $out/bin/coursier
     chmod +x $out/bin/coursier
-    wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin ;
+    wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/misc/epm/default.nix b/pkgs/development/tools/misc/epm/default.nix
index 9d84011e365..8d2e6785900 100644
--- a/pkgs/development/tools/misc/epm/default.nix
+++ b/pkgs/development/tools/misc/epm/default.nix
@@ -1,16 +1,22 @@
-{stdenv, fetchurl, rpm}:
+{stdenv, fetchFromGitHub, rpm}:
 
 stdenv.mkDerivation rec {
   name = "epm-${version}";
-  version = "4.2";
+  version = "4.4";
 
-  src = fetchurl {
-    url = "http://www.msweet.org/files/project2/epm-4.2-source.tar.bz2";
-    sha256 = "13imglm1fgd7p5y9lc0xsl6x4cdjsk5lnan5sn8f7m4jwbx8kik6";
+  src = fetchFromGitHub {
+    repo = "epm";
+    owner = "michaelrsweet";
+    rev = "v${version}";
+    sha256 = "0kaw7v2m20qirapkps4dna6nf9xibnwljvvv0l9vpvi920kw7j7p";
   };
 
   buildInputs = [ rpm ];
 
+  preInstall = ''
+    sed -i 's/README/README.md/' Makefile
+  '';
+
   meta = with stdenv.lib; {
     description = "The ESP Package Manager generates distribution archives for a variety of platforms";
     homepage = http://www.msweet.org/projects.php?Z2;
diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix
index 391c653b98a..6c30768d900 100644
--- a/pkgs/development/tools/scalafmt/default.nix
+++ b/pkgs/development/tools/scalafmt/default.nix
@@ -1,29 +1,37 @@
-{ stdenv, fetchurl, unzip, jre }:
+{ stdenv, jdk, jre, coursier, makeWrapper }:
 
-stdenv.mkDerivation rec {
-  version = "0.6.8";
+let
   baseName = "scalafmt";
-  name = "${baseName}-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/scalameta/scalafmt/releases/download/v${version}/${baseName}.tar.gz";
-    sha256 = "1iaanrxk5lhxx1zj9gbxzgqbnyy1azfrab984mga7di5z1hs02s2";
+  version = "1.3.0";
+  deps = stdenv.mkDerivation {
+    name = "${baseName}-deps-${version}";
+    buildCommand = ''
+      export COURSIER_CACHE=$(pwd)
+      ${coursier}/bin/coursier fetch com.geirsson:scalafmt-cli_2.12:${version} > deps
+      mkdir -p $out/share/java
+      cp $(< deps) $out/share/java/
+    '';
+    outputHashMode = "recursive";
+    outputHashAlgo = "sha256";
+    outputHash     = "0q1vw6drpdrfifbm3266igpml0phdk6pl0gd3b5amysigx83m251";
   };
+in
+stdenv.mkDerivation rec {
+  name = "${baseName}-${version}";
 
-  unpackPhase = "tar xvzf $src";
+  buildInputs = [ jdk makeWrapper deps ];
 
-  installPhase = ''
-    mkdir -p "$out/bin"
-    mkdir -p "$out/lib"
+  doCheck = true;
 
-    cp cli/target/scala-2.11/scalafmt.jar "$out/lib/${name}.jar"
+  phases = [ "installPhase" "checkPhase" ];
 
-    cat > "$out/bin/${baseName}" << EOF
-    #!${stdenv.shell}
-    exec ${jre}/bin/java -jar "$out/lib/${name}.jar" "\$@"
-    EOF
+  installPhase = ''
+    makeWrapper ${jre}/bin/java $out/bin/${baseName} \
+      --add-flags "-cp $CLASSPATH org.scalafmt.cli.Cli"
+  '';
 
-    chmod a+x "$out/bin/${baseName}"
+  checkPhase = ''
+    $out/bin/${baseName} --version | grep -q "${version}"
   '';
 
   meta = with stdenv.lib; {
author	Vladimír Čunát <vcunat@gmail.com>	2017-12-15 21:40:23 +0100
committer	Vladimír Čunát <vcunat@gmail.com>	2017-12-15 21:40:23 +0100
commit	24d81d6332bf95574367a1fab9c7b734e2807047 (patch)
tree	6b71810cf703d14dbfb74a62c4f4b3014d5ed450 /pkgs/development
parent	774559a0ca9cc28d797e2ba912abdfb77895c77b (diff)
parent	b256afac58b80adde2605eac434a04b9a23bbe95 (diff)
download	nixpkgs-24d81d6332bf95574367a1fab9c7b734e2807047.tar nixpkgs-24d81d6332bf95574367a1fab9c7b734e2807047.tar.gz nixpkgs-24d81d6332bf95574367a1fab9c7b734e2807047.tar.bz2 nixpkgs-24d81d6332bf95574367a1fab9c7b734e2807047.tar.lz nixpkgs-24d81d6332bf95574367a1fab9c7b734e2807047.tar.xz nixpkgs-24d81d6332bf95574367a1fab9c7b734e2807047.tar.zst nixpkgs-24d81d6332bf95574367a1fab9c7b734e2807047.zip