Merge branch 'master' into staging

33 files changed, 1056 insertions, 544 deletions

diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 39a06a4b1dc..7162f85e05d 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm_39, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "0.20.3";
+  version = "0.20.4";
   name = "crystal-${version}-1";
   arch =
     {
@@ -14,15 +14,15 @@ stdenv.mkDerivation rec {
     url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-1-${arch}.tar.gz";
     sha256 =
       {
-        "x86_64-linux" = "c656dc8092a6161262f527df441aaab4ea9dd9a836a013f7155c6378b26b8cd7";
-        "i686-linux" = "85edfa1dda5e712341869bab87f6de0f7c6860e2a04dec2f00e8dc6aa1418611";
-        "x86_64-darwin" = "0088972c5cad9543f262976ae6c8ee1dbcbefdee3a8bedae851998bfa7098637";
+        "x86_64-linux" = "cdc11c30235f8bd3b89e1fc13b56838f99d585715fb66563d6599026f5393e37";
+        "i686-linux" = "93e7df2bea3220728987a49a2f93d1c615e2ccae63843e0259a5d891c53a0b80";
+        "x86_64-darwin" = "3fd291a4a5c9eccdea933a9df25446c90d80660a17e89f83503fcb5b6deba03e";
       }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
   };
 
   src = fetchurl {
     url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz";
-    sha256 = "5372ba2a35d885345207047a51b9389f9190fd12389847e7f7298618bcf59ad6";
+    sha256 = "fd099f278b71bbb5cad1927c93933d1feba554fbf8f6f4ab9165f535765f5e31";
   };
 
   # crystal on Darwin needs libiconv to build
diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index c3eaf705986..eed702f8512 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "nim-${version}";
-  version = "0.15.2";
+  version = "0.16.0";
 
   src = fetchurl {
     url = "http://nim-lang.org/download/${name}.tar.xz";
-    sha256 = "12pyzjx7x4hclzrf3zf6r1qjlp60bzsaqrz0rax2rak2c8qz4pch";
+    sha256 = "0rsibhkc5n548bn9yyb9ycrdgaph5kq84sfxc9gabjs7pqirh6cy";
   };
 
   buildInputs  = [ makeWrapper ];
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 4d9668da2e3..7b8d5a3d1ef 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -4,7 +4,6 @@
 let
   rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
 in
-
 rec {
   rustc = callPackage ./rustc.nix {
     shortVersion = "1.14";
@@ -16,6 +15,7 @@ rec {
 
     patches = [
       ./patches/disable-lockfile-check-stable.patch
+      ./patches/darwin-disable-fragile-tcp-tests.patch
     ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
 
     inherit targets;
diff --git a/pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch b/pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch
new file mode 100644
index 00000000000..5c51886b4d8
--- /dev/null
+++ b/pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch
@@ -0,0 +1,36 @@
+From 0becb0b7cff0176279fc9f94c91299d788a43941 Mon Sep 17 00:00:00 2001
+From: Moritz Ulrich <moritz@tarn-vedra.de>
+Date: Sun, 8 Jan 2017 10:28:17 +0100
+Subject: [PATCH] Disable libstd::net::tcp::{ttl, timeouts} on Darwin
+
+---
+ src/libstd/net/tcp.rs | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
+index 0e7c5b0671..189c31b958 100644
+--- a/src/libstd/net/tcp.rs
++++ b/src/libstd/net/tcp.rs
+@@ -1022,7 +1022,10 @@ mod tests {
+ 
+     // FIXME: re-enabled bitrig/openbsd tests once their socket timeout code
+     //        no longer has rounding errors.
+-    #[cfg_attr(any(target_os = "bitrig", target_os = "netbsd", target_os = "openbsd"), ignore)]
++  #[cfg_attr(any(target_os = "bitrig",
++                 target_os = "netbsd",
++                 target_os = "openbsd",
++                 target_os = "macos"), ignore)]
+     #[test]
+     fn timeouts() {
+         let addr = next_test_ip4();
+@@ -1101,6 +1104,7 @@ mod tests {
+         assert_eq!(false, t!(stream.nodelay()));
+     }
+ 
++    #[cfg_attr(target_os = "macos", ignore)]
+     #[test]
+     fn ttl() {
+         let ttl = 100;
+-- 
+2.11.0
+
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ff53f1ce2ca..3c48be53141 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -58,6 +58,8 @@ self: super: {
       rev = drv.version;
     };
   })).overrideScope (self: super: {
+    # https://github.com/bitemyapp/esqueleto/issues/8
+    esqueleto = self.esqueleto_2_4_3;
     # https://github.com/yesodweb/yesod/issues/1324
     yesod-persistent = self.yesod-persistent_1_4_1_1;
     # https://github.com/prowdsponsor/esqueleto/issues/137
@@ -1140,4 +1142,8 @@ self: super: {
 
   # https://github.com/krisajenkins/elm-export/pull/22
   elm-export = doJailbreak super.elm-export;
+
+  turtle_1_3_0 = super.turtle_1_3_0.overrideScope (self: super: {
+    optparse-applicative = self.optparse-applicative_0_13_0_0;
+  });
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index f093c0e427e..c6fcf0bff07 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -35,7 +35,7 @@ self: super: {
   xhtml = null;
 
   # jailbreak-cabal can use the native Cabal library.
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
+  jailbreak-cabal = super.jailbreak-cabal_1_3_2.override { Cabal = null; };
 
   # haddock: No input file(s).
   nats = dontHaddock super.nats;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 97d6bc5695e..d07a9be0c4e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2015,6 +2015,7 @@ extra-packages:
   - containers < 0.5                    # required to build alex with GHC 6.12.3
   - control-monad-free < 0.6            # newer versions don't compile with anything but GHC 7.8.x
   - deepseq == 1.3.0.1                  # required to build Cabal with GHC 6.12.3
+  - esqueleto < 2.5                     # needed for git-annex: https://github.com/bitemyapp/esqueleto/issues/8
   - generic-deriving == 1.10.5.*        # new versions don't compile with GHC 7.10.x
   - gloss < 1.9.3                       # new versions don't compile with GHC 7.8.x
   - haddock < 2.17                      # required on GHC 7.10.x
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 1922fb3efc3..453ce86a060 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -10122,6 +10122,8 @@ self: {
        pname = "JuicyPixels";
        version = "3.2.8";
        sha256 = "038c6547d543442a93b2028be4b84c225bb7a6fa913e1fc57325c58d043d5644";
+       revision = "1";
+       editedCabalFile = "5211841fbb8a9a7fe19ce715a749149ab03c28344531bc3163f8580b611a2e3e";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq mtl primitive
          transformers vector zlib
@@ -17204,16 +17206,17 @@ self: {
      }) {};
 
   "Unique" = callPackage
-    ({ mkDerivation, base, containers, extra, hashable
-     , unordered-containers
+    ({ mkDerivation, base, containers, extra, hashable, hspec
+     , QuickCheck, unordered-containers
      }:
      mkDerivation {
        pname = "Unique";
-       version = "0.4.5";
-       sha256 = "207488edc9915f826c7ef72386fccbad265a32394364fa9bcba73209e150e58b";
+       version = "0.4.6";
+       sha256 = "4fd37ceafe74b95af73f01ccc64a5c1e3282e6b74ab2dd193507aac289ae2480";
        libraryHaskellDepends = [
          base containers extra hashable unordered-containers
        ];
+       testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "It provides the functionality like unix \"uniq\" utility";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17778,24 +17781,26 @@ self: {
      }) {advapi32 = null; gdi32 = null; shell32 = null; 
          shfolder = null; user32 = null; winmm = null;};
 
-  "Win32_2_4_0_0" = callPackage
-    ({ mkDerivation, advapi32, base, bytestring, gdi32, shell32
-     , shfolder, shlwapi, user32, winmm
+  "Win32_2_5_0_0" = callPackage
+    ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32
+     , msimg32, ntdll, shell32, shfolder, shlwapi, user32, winmm
      }:
      mkDerivation {
        pname = "Win32";
-       version = "2.4.0.0";
-       sha256 = "e99e020ddd510f3b7012e15346284288a4535c88b369fafa91584e0d9a86cecb";
-       libraryHaskellDepends = [ base bytestring ];
+       version = "2.5.0.0";
+       sha256 = "45d7fd5f251ba418d649100cfea9d924b7ef42a8c35df5bb373fd6dd687d2694";
+       libraryHaskellDepends = [ base bytestring filepath ];
        librarySystemDepends = [
-         advapi32 gdi32 shell32 shfolder shlwapi user32 winmm
+         advapi32 gdi32 imm32 msimg32 ntdll shell32 shfolder shlwapi user32
+         winmm
        ];
        homepage = "https://github.com/haskell/win32";
        description = "A binding to part of the Win32 library";
        license = stdenv.lib.licenses.bsd3;
        platforms = stdenv.lib.platforms.none;
-     }) {advapi32 = null; gdi32 = null; shell32 = null; 
-         shfolder = null; shlwapi = null; user32 = null; winmm = null;};
+     }) {advapi32 = null; gdi32 = null; imm32 = null; msimg32 = null; 
+         ntdll = null; shell32 = null; shfolder = null; shlwapi = null; 
+         user32 = null; winmm = null;};
 
   "Win32-console" = callPackage
     ({ mkDerivation, base, Win32 }:
@@ -20720,8 +20725,8 @@ self: {
        pname = "aeson-utils";
        version = "0.3.0.2";
        sha256 = "71814b1be8849f945395eb81217a2ad464f2943134c50c09afd8a3126add4b1f";
-       revision = "3";
-       editedCabalFile = "38b41ff11ca87f3f1d64c141382f6fbb11f28447056f7e11b93516c4c09520f0";
+       revision = "4";
+       editedCabalFile = "48548049168c1e48d31414994dcea638dec56dba620c1752b41d4fa975b7020e";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring scientific text
        ];
@@ -25174,6 +25179,28 @@ self: {
        license = "GPL";
      }) {};
 
+  "analyze" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, cassava
+     , exceptions, foldl, free, hashable, lucid, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "analyze";
+       version = "0.1.0.0";
+       sha256 = "af261961e6229173ff4e54c46b7bed8ba4b5ced5ad18888bc7c804fc316b4445";
+       libraryHaskellDepends = [
+         aeson base binary bytestring cassava exceptions foldl free hashable
+         lucid text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring exceptions foldl QuickCheck tasty tasty-hunit
+         tasty-quickcheck text unordered-containers vector
+       ];
+       homepage = "https://github.com/ejconlon/analyze#readme";
+       description = "making data science easy and safe with data frames";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "analyze-client" = callPackage
     ({ mkDerivation, base, bytestring, http-conduit
      , MonadCatchIO-transformers, mtl, snap, snap-core, time
@@ -28898,8 +28925,8 @@ self: {
        pname = "avers";
        version = "0.0.17.1";
        sha256 = "1b45d8aa036b3c2ec7ea180327ff3cdce28dc1e1ef319c062be79f0ffa7626f5";
-       revision = "4";
-       editedCabalFile = "00eb4a4386d3ed82d29c7f33c3c813074d33e25ce0c60872ca0a0cb78c3bd76c";
+       revision = "5";
+       editedCabalFile = "319f1526093b829e5cbb6fe1591f77f3f5be25da83df7790e37741272e711b24";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -28925,6 +28952,8 @@ self: {
        pname = "avers-api";
        version = "0.0.17.0";
        sha256 = "affeffe0ac3c3eb15823fdb4c61654783ef8aff076bfb20b55c3df34be088182";
+       revision = "1";
+       editedCabalFile = "6ce2a1a63ecf6fcc5cd1d25ce3ee5b2756ebea0a78b7cc3a94fe73b3097668e3";
        libraryHaskellDepends = [
          aeson avers base bytestring cookie http-api-data servant text time
          vector
@@ -32955,32 +32984,32 @@ self: {
      }) {};
 
   "biohazard" = callPackage
-    ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring
-     , bytestring-mmap, containers, deepseq, directory, exceptions
-     , filepath, hashable, hmatrix, iteratee, ListLike
-     , nonlinear-optimization, primitive, random, scientific, stm
-     , strict, template-haskell, text, transformers, unix
-     , unordered-containers, Vec, vector, vector-algorithms
-     , vector-th-unbox, zlib
+    ({ mkDerivation, aeson, aeson-pretty, async, attoparsec, base
+     , base-prelude, binary, bytestring, bytestring-mmap, containers
+     , directory, exceptions, filepath, hashable, hybrid-vectors
+     , iteratee, ListLike, nonlinear-optimization, primitive, process
+     , random, scientific, shake, stm, template-haskell, text
+     , transformers, unix, unordered-containers, vector
+     , vector-algorithms, vector-binary-instances, vector-th-unbox, zlib
      }:
      mkDerivation {
        pname = "biohazard";
-       version = "0.6.6.1";
-       sha256 = "ad458331686a5a0ac2ace70d63ddccd3cbd76aba2da6c4a38b8b70540789e28f";
+       version = "0.6.9";
+       sha256 = "b69e935377daf170cea90cfb5d7cc765527d5b606d1dacf30b93cccfb2228628";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson async attoparsec base binary bytestring bytestring-mmap
-         containers deepseq directory exceptions filepath iteratee ListLike
-         nonlinear-optimization primitive random scientific stm
-         template-haskell text transformers unix unordered-containers Vec
-         vector vector-algorithms vector-th-unbox zlib
+         aeson aeson-pretty async attoparsec base base-prelude binary
+         bytestring bytestring-mmap containers directory exceptions filepath
+         hashable hybrid-vectors iteratee ListLike nonlinear-optimization
+         primitive random scientific stm template-haskell text transformers
+         unix unordered-containers vector vector-algorithms
+         vector-binary-instances vector-th-unbox zlib
        ];
        executableHaskellDepends = [
-         aeson async base binary bytestring containers directory filepath
-         hashable hmatrix iteratee nonlinear-optimization primitive random
-         strict text transformers unix unordered-containers Vec vector
-         vector-algorithms vector-th-unbox
+         aeson aeson-pretty async base binary bytestring containers
+         directory filepath process random shake stm text transformers unix
+         unordered-containers vector vector-algorithms vector-th-unbox
        ];
        homepage = "http://github.com/udo-stenzel/biohazard";
        description = "bioinformatics support library";
@@ -33862,8 +33891,8 @@ self: {
        pname = "blank-canvas";
        version = "0.6";
        sha256 = "2a0e5c4fc50b1ce43e56b1a11056186c21d565e225da36f90c58f8c0a70f48b3";
-       revision = "8";
-       editedCabalFile = "b39980789d8a226fb984088b3ab9e63c96bd81f2ee7806bf124d420c4479fedc";
+       revision = "9";
+       editedCabalFile = "14307379cfd353cceede81149b2cae2f357d27ee23816203fd1757804e6b5b48";
        libraryHaskellDepends = [
          aeson base base-compat base64-bytestring bytestring colour
          containers data-default-class http-types kansas-comet mime-types
@@ -34670,8 +34699,8 @@ self: {
        pname = "bogocopy";
        version = "0.1.0.2";
        sha256 = "4b2d4e376b8908805a09404fac4a7b73efd3f4549a515eb8e180fe46221de834";
-       revision = "1";
-       editedCabalFile = "9b68ad2f64094297c4631e652ab247e8d83c64b64b7f40528232b8c474a4dee4";
+       revision = "2";
+       editedCabalFile = "bf8d78b2879369efdce0953e4613ca0dd1712c4e051adc5e5f66feda39757a5a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -34679,7 +34708,7 @@ self: {
          transformers unix
        ];
        homepage = "https://github.com/phlummox/bogocopy";
-       description = "Simple project template from stack";
+       description = "Copy a directory tree, making zero-size sparse copies of big files";
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
@@ -35373,16 +35402,16 @@ self: {
 
   "brick" = callPackage
     ({ mkDerivation, base, containers, contravariant, data-default
-     , deepseq, microlens, microlens-mtl, microlens-th, template-haskell
-     , text, text-zipper, transformers, vector, vty
+     , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm
+     , template-haskell, text, text-zipper, transformers, vector, vty
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.15.2";
-       sha256 = "7407473d133588df46c43480a2b41a50a04a7f0e63a996c6422a07592b8ca85e";
+       version = "0.16";
+       sha256 = "ebc1dea2d4891e7a66d3b3ee965b6ed16c9ad74ab5143836fa7e1c81dc0c19ff";
        libraryHaskellDepends = [
-         base containers contravariant data-default deepseq microlens
-         microlens-mtl microlens-th template-haskell text text-zipper
+         base containers contravariant data-default deepseq dlist microlens
+         microlens-mtl microlens-th stm template-haskell text text-zipper
          transformers vector vty
        ];
        homepage = "https://github.com/jtdaugherty/brick/";
@@ -39052,8 +39081,8 @@ self: {
        pname = "cassava-megaparsec";
        version = "0.1.0";
        sha256 = "8d77229766aec5e9e31e145138be981cca791699a3d66010619604827c590702";
-       revision = "3";
-       editedCabalFile = "1be19f40219b8f6a9e91dc3bfe8905a3ccc920f56dbf82c14f74d05c4c7378c9";
+       revision = "4";
+       editedCabalFile = "ce616d726f30d6015744bc8087cadb575f16c1e51d20b507dcd75dbeca25119e";
        libraryHaskellDepends = [
          base bytestring cassava containers megaparsec unordered-containers
          vector
@@ -39308,6 +39337,8 @@ self: {
        pname = "cayley-client";
        version = "0.3.1";
        sha256 = "c2d8eeeebf3814a10abfadb032132c8f1deff393909312d17755a9547463ebf7";
+       revision = "1";
+       editedCabalFile = "2f59497bc4c4e60596223f1f64ccb621a5f7906c06fac51780875c9c8923bdde";
        libraryHaskellDepends = [
          aeson attoparsec base binary bytestring exceptions http-client
          http-conduit lens lens-aeson mtl text transformers
@@ -40037,6 +40068,19 @@ self: {
        license = "LGPL";
      }) {};
 
+  "charsetdetect-ae_1_1_0_2" = callPackage
+    ({ mkDerivation, base, bytestring }:
+     mkDerivation {
+       pname = "charsetdetect-ae";
+       version = "1.1.0.2";
+       sha256 = "1393fae432a88fbc5fda643cf545a91469a341218e72464960bde48b27ba0fbe";
+       libraryHaskellDepends = [ base bytestring ];
+       homepage = "http://github.com/aelve/charsetdetect-ae";
+       description = "Character set detection using Mozilla's Universal Character Set Detector";
+       license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "chart-histogram" = callPackage
     ({ mkDerivation, base, Chart }:
      mkDerivation {
@@ -42148,8 +42192,8 @@ self: {
      }:
      mkDerivation {
        pname = "clit";
-       version = "0.2.0.1";
-       sha256 = "64e698fb189b3ab06c52d43aa0a5da99104b46e8024687d13664610d795fe504";
+       version = "0.2.0.2";
+       sha256 = "f8c363812b610c79d0fe7275404fca65e073c4bcd11c53afafcffd485c4e47db";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -43296,6 +43340,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "colorless" = callPackage
+    ({ mkDerivation, base, megaparsec, pregame }:
+     mkDerivation {
+       pname = "colorless";
+       version = "0.0.0";
+       sha256 = "1ae808ffc4522981fd50833e5384173b72dae3c6b9e609f9dbfa791b625ee22c";
+       libraryHaskellDepends = [ base megaparsec pregame ];
+       homepage = "http://github.com/jxv/colorless#readme";
+       description = "Yet another IDL for RPC";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "colors" = callPackage
     ({ mkDerivation, base, lens, linear, profunctors }:
      mkDerivation {
@@ -43766,6 +43822,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "compactmap_0_1_4_2" = callPackage
+    ({ mkDerivation, base, containers, hspec, QuickCheck, vector }:
+     mkDerivation {
+       pname = "compactmap";
+       version = "0.1.4.2";
+       sha256 = "36fd80c2f29446bba183c3b7182de9d869a1718c456ae3463ea66b332e6cf6ec";
+       libraryHaskellDepends = [ base vector ];
+       testHaskellDepends = [ base containers hspec QuickCheck ];
+       description = "A read-only memory-efficient key-value store";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "compare-type" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -44110,26 +44179,26 @@ self: {
   "computational-algebra" = callPackage
     ({ mkDerivation, algebra, algebraic-prelude, arithmoi, base
      , constraints, containers, control-monad-loop, convertible, deepseq
-     , dlist, entropy, equational-reasoning, hashable, heaps, hmatrix
-     , hspec, HUnit, hybrid-vectors, lens, matrix, monad-loops
-     , MonadRandom, mono-traversable, monomorphic, mtl, parallel, primes
-     , process, QuickCheck, quickcheck-instances, reflection, semigroups
-     , singletons, sized, smallcheck, tagged, template-haskell
-     , test-framework, test-framework-hunit, text, type-natural, unamb
-     , unordered-containers, vector
+     , dlist, entropy, equational-reasoning, ghc-typelits-knownnat
+     , hashable, heaps, hmatrix, hspec, HUnit, hybrid-vectors, lens
+     , matrix, monad-loops, MonadRandom, mono-traversable, monomorphic
+     , mtl, parallel, primes, process, QuickCheck, quickcheck-instances
+     , reflection, semigroups, singletons, sized, smallcheck, tagged
+     , template-haskell, test-framework, test-framework-hunit, text
+     , type-natural, unamb, unordered-containers, vector
      }:
      mkDerivation {
        pname = "computational-algebra";
-       version = "0.4.0.0";
-       sha256 = "cb9fd9a9115a911f43837fedfdc96f91c07a3240eccbd64b111b73844562e9f6";
+       version = "0.5.0.0";
+       sha256 = "fce631557cfcef120382e91744279f5e7a61c0afaae95cf2159195f7e57fda49";
        libraryHaskellDepends = [
          algebra algebraic-prelude arithmoi base constraints containers
          control-monad-loop convertible deepseq dlist entropy
-         equational-reasoning hashable heaps hmatrix hybrid-vectors lens
-         matrix monad-loops MonadRandom mono-traversable monomorphic mtl
-         parallel primes reflection semigroups singletons sized tagged
-         template-haskell text type-natural unamb unordered-containers
-         vector
+         equational-reasoning ghc-typelits-knownnat hashable heaps hmatrix
+         hybrid-vectors lens matrix monad-loops MonadRandom mono-traversable
+         monomorphic mtl parallel primes reflection semigroups singletons
+         sized tagged template-haskell text type-natural unamb
+         unordered-containers vector
        ];
        testHaskellDepends = [
          algebra base constraints containers convertible deepseq
@@ -49350,8 +49419,8 @@ self: {
      }:
      mkDerivation {
        pname = "damnpacket";
-       version = "1.0.2";
-       sha256 = "b00c792670558fc2849f932232361fe4b59c7ce62009e5efbab71a162438ea05";
+       version = "1.1.0";
+       sha256 = "68284ed9c5cd54c5697f8202bcb8001d22497a5b225489729a660c4ba8a3bd1f";
        libraryHaskellDepends = [
          attoparsec base bytestring fail html-entities template-haskell text
          th-lift-instances
@@ -51912,6 +51981,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dcpu16" = callPackage
+    ({ mkDerivation, base, bytestring, containers, filepath
+     , optparse-applicative, parsec, sdl2, spool, vector
+     }:
+     mkDerivation {
+       pname = "dcpu16";
+       version = "0.1.0.0";
+       sha256 = "d3838fcd4838a668319791c4996a2af7e11f6a0496485c61389f40e376f335bc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers parsec sdl2 spool vector
+       ];
+       executableHaskellDepends = [ base filepath optparse-applicative ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/githubuser/dcpu16#readme";
+       description = "Initial project template from stack";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ddate" = callPackage
     ({ mkDerivation, base, dates, time }:
      mkDerivation {
@@ -55471,6 +55560,20 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "distance" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "distance";
+       version = "0.1.0.0";
+       sha256 = "007cfb1c56ff8e8f905dad7c1630630162ffb8520925f028cf82e93ba7cd4a58";
+       revision = "1";
+       editedCabalFile = "b8629453e8a81834e23eb577c6b304891ff60f36b956d03e59da854ba8adda47";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/agrafix/distance#readme";
+       description = "Useful distance datatype and functions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "distributed-closure" = callPackage
     ({ mkDerivation, base, binary, bytestring, constraints, hspec
      , QuickCheck, syb, template-haskell
@@ -56711,17 +56814,17 @@ self: {
      }) {};
 
   "dom-parser" = callPackage
-    ({ mkDerivation, base, containers, data-default, hspec, lens, mtl
-     , open-union, semigroups, shakespeare, text, transformers, type-fun
-     , xml-conduit, xml-lens
+    ({ mkDerivation, base, case-insensitive, containers, data-default
+     , hspec, lens, mtl, open-union, scientific, semigroups, shakespeare
+     , text, transformers, type-fun, xml-conduit, xml-lens
      }:
      mkDerivation {
        pname = "dom-parser";
-       version = "1.0.0";
-       sha256 = "6d48ca6cd564919af8574cc91c97f050f50747f358e159797895fd0517dc9583";
+       version = "2.0.0";
+       sha256 = "9de203857330d7d3b27e18e458a7548dc4e449bff3b7b95de2d40a1556cccf38";
        libraryHaskellDepends = [
-         base containers lens mtl open-union semigroups text transformers
-         type-fun xml-conduit xml-lens
+         base case-insensitive containers lens mtl open-union scientific
+         semigroups text transformers type-fun xml-conduit xml-lens
        ];
        testHaskellDepends = [
          base data-default hspec lens semigroups shakespeare text
@@ -58437,8 +58540,8 @@ self: {
     ({ mkDerivation, base, process }:
      mkDerivation {
        pname = "echo";
-       version = "0.1";
-       sha256 = "a7211a9da1fa10dc7d95e89d2c68dadf063b3826d81e42eb085df91c46353e4d";
+       version = "0.1.1";
+       sha256 = "e1fc1756f255e47db28c6c0520c43fe45ac0c1093009f378683273ebe02851c6";
        libraryHaskellDepends = [ base process ];
        homepage = "https://github.com/RyanGlScott/echo";
        description = "A cross-platform, cross-console way to handle echoing terminal input";
@@ -60249,6 +60352,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "entangle" = callPackage
+    ({ mkDerivation, base, containers, matrix, mtl, quipper-core }:
+     mkDerivation {
+       pname = "entangle";
+       version = "0.1.1";
+       sha256 = "2836f6645c71d68ad1fcc30b0f3186bc9cf85f0703f3c89da58564cd05eedabc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers matrix mtl quipper-core
+       ];
+       executableHaskellDepends = [ base matrix quipper-core ];
+       description = "An application (and library) to convert quipper circuits into Qpmc models";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "entropy" = callPackage
     ({ mkDerivation, base, bytestring, unix }:
      mkDerivation {
@@ -61114,7 +61233,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "esqueleto" = callPackage
+  "esqueleto_2_4_3" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
      , hspec, HUnit, monad-control, monad-logger, persistent
      , persistent-sqlite, persistent-template, QuickCheck, resourcet
@@ -61141,6 +61260,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "esqueleto" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
+     , hspec, HUnit, monad-control, monad-logger, persistent
+     , persistent-sqlite, persistent-template, QuickCheck, resourcet
+     , tagged, text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "esqueleto";
+       version = "2.5.0";
+       sha256 = "2cba54c813bb506024889b29ceb75079e31e4172dc79cfa1e48c84337e064fa2";
+       libraryHaskellDepends = [
+         base blaze-html bytestring conduit monad-logger persistent
+         resourcet tagged text transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base conduit containers hspec HUnit monad-control monad-logger
+         persistent persistent-sqlite persistent-template QuickCheck
+         resourcet text transformers
+       ];
+       homepage = "https://github.com/bitemyapp/esqueleto";
+       description = "Type-safe EDSL for SQL queries on persistent backends";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ess" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -63233,8 +63377,8 @@ self: {
        pname = "fay";
        version = "0.23.1.16";
        sha256 = "c46ef8cb7980bcf62ef7ccc9897e9c4246e6bec8cafc06d49ebe1d5bcd618a64";
-       revision = "2";
-       editedCabalFile = "c164132b3489ae1511bda64e9fb8fde6d05fdc4a1fcc0ff327efd9ce3b1d81ce";
+       revision = "3";
+       editedCabalFile = "636e2fbbe689dde982c327a7fc33871804ec66e47105d6cbffd6ce09716c241f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -65085,20 +65229,20 @@ self: {
      }) {};
 
   "fixfile" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
+    ({ mkDerivation, array, base, bytestring, cereal, containers
      , directory, exceptions, filepath, hashable, hashtables, lens, mtl
      , QuickCheck, tasty, tasty-quickcheck, temporary, vector
      }:
      mkDerivation {
        pname = "fixfile";
-       version = "0.6.0.0";
-       sha256 = "37183ade31510ba1c3801adf5df112f7ef6291b478934d0c51839510e536888c";
+       version = "0.7.0.0";
+       sha256 = "b49027c747a7112256aec9b9ac33f4617c3ec0cfdd5943d7c81c6c9885f10b70";
        libraryHaskellDepends = [
-         array base binary bytestring containers directory filepath hashable
+         array base bytestring cereal containers directory filepath hashable
          hashtables lens mtl temporary vector
        ];
        testHaskellDepends = [
-         base binary bytestring directory exceptions lens mtl QuickCheck
+         base bytestring cereal directory exceptions lens mtl QuickCheck
          tasty tasty-quickcheck temporary
        ];
        homepage = "https://github.com/revnull/fixfile";
@@ -65226,6 +65370,8 @@ self: {
        pname = "flac";
        version = "0.1.1";
        sha256 = "58b7287cb39bdfc39cf7aab95b87d81111234fed502a8d1743ecfbcef001873e";
+       revision = "1";
+       editedCabalFile = "482d7352bb284c86021b513c37837746fe8a293146c3cf0d91b91dbc4a34ae34";
        libraryHaskellDepends = [
          base bytestring containers data-default-class directory exceptions
          filepath mtl text transformers vector wave
@@ -66039,15 +66185,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "foldl_1_2_2" = callPackage
+  "foldl_1_2_3" = callPackage
     ({ mkDerivation, base, bytestring, comonad, containers
      , contravariant, mwc-random, primitive, profunctors, text
      , transformers, vector
      }:
      mkDerivation {
        pname = "foldl";
-       version = "1.2.2";
-       sha256 = "c869deb0dc7d41d496539968968ff6045022d1286dfb2c1d53f61dc974f455eb";
+       version = "1.2.3";
+       sha256 = "fb081168f7736a04dc68db348d2e0bc58d535da5ed74c4394a022dbaa46d3f25";
        libraryHaskellDepends = [
          base bytestring comonad containers contravariant mwc-random
          primitive profunctors text transformers vector
@@ -66086,8 +66232,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl-statistics";
-       version = "0.1.4.1";
-       sha256 = "7abd5ed3ee0295de589484b0973f2531ae1956bf4ec1f237956c046bca106b28";
+       version = "0.1.4.2";
+       sha256 = "1cfa6d6d36ff40529319a6f790bf130b6b4d650f1b8db5ee739cf4b44d5c8be0";
        libraryHaskellDepends = [
          base foldl math-functions profunctors semigroups
        ];
@@ -68995,8 +69141,8 @@ self: {
        pname = "generic-aeson";
        version = "0.2.0.8";
        sha256 = "de29fa648b9eb6c9e678b0715a530efaf70aac8f1ad8becc22d7ef1411ded5cb";
-       revision = "2";
-       editedCabalFile = "1796cd85bd71d6f83a9dfd2f56cbb90c0059591e4e3bbf6e38864435f726c971";
+       revision = "3";
+       editedCabalFile = "ed9572e401789a0bff470b31f6cb127e77a43a831ba07b5eb5705a3b770d2263";
        libraryHaskellDepends = [
          aeson attoparsec base generic-deriving mtl tagged text
          unordered-containers vector
@@ -71990,7 +72136,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "gipeda_0_3_3_0" = callPackage
+  "gipeda_0_3_3_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cassava
      , concurrent-output, containers, directory, extra, file-embed
      , filepath, gitlib, gitlib-libgit2, scientific, shake, split
@@ -71998,8 +72144,8 @@ self: {
      }:
      mkDerivation {
        pname = "gipeda";
-       version = "0.3.3.0";
-       sha256 = "9b3f111ed3b980a5b9a721948df16c6a05b28f3a805657d0cfa271e356169744";
+       version = "0.3.3.1";
+       sha256 = "be7aafd3390c5d498c39482ff862a302c3bf2d7cecdba4940141297728bbb143";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -76927,8 +77073,8 @@ self: {
      }:
      mkDerivation {
        pname = "gopher-proxy";
-       version = "0.1.0.2";
-       sha256 = "6f06b79fb6edf8df020e104feba3db960fc9e6ca4198d860de1702d752053fdd";
+       version = "0.1.1.1";
+       sha256 = "8d85cc17d211d6c7600ff8b1da3bd0b5fbbe0bcd2ffd6629719a94674b4acf4d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -80598,6 +80744,8 @@ self: {
        pname = "haddock-api";
        version = "2.17.3";
        sha256 = "8d35a256c2ee07083c1e1a8b08e536069ffdad27598bed69d88847fb51234dc7";
+       revision = "1";
+       editedCabalFile = "5d33603e8e6befb2c2ed2dd8c5029b78e1377a387b165671105cadb9cb7df4f8";
        libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
          ghc ghc-boot ghc-paths haddock-library transformers xhtml
@@ -81096,8 +81244,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.9.2.0";
-       sha256 = "20f1e5be71290445626ccf716e6b312bf3f5ebf780ce9481d574a83681ef2e3f";
+       version = "4.9.3.0";
+       sha256 = "f15c6cd2118501fa6be44e3cb3d9f37a22fced0fd1ebd64236277e2daf622e7a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -81124,7 +81272,6 @@ self: {
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) utillinux;};
 
   "hakyll-R" = callPackage
@@ -84664,8 +84811,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-ast";
-       version = "0.4.1.0";
-       sha256 = "00aed2236a37a582ff761b0a83946e3bdfa9027098c18d75ad7e34577a775ac5";
+       version = "0.4.1.1";
+       sha256 = "857c0f5b57d129aa49fd8b5375703638c4cd1e5cd4c85d5160d7ad13d308f88e";
        libraryHaskellDepends = [
          base ghc mtl references template-haskell uniplate
        ];
@@ -84736,8 +84883,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-backend-ghc";
-       version = "0.4.1.0";
-       sha256 = "5607c50d38a26db49abd936fee9aac96bf332496bc7cbb9fe20e10bf929e63f6";
+       version = "0.4.1.1";
+       sha256 = "d01fe6e236fb57e7d79b35ada30e8aa0ff56f626444f25bd907bb8e785de3006";
        libraryHaskellDepends = [
          base bytestring containers ghc haskell-tools-ast mtl references
          safe split template-haskell transformers uniplate
@@ -84756,8 +84903,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-cli";
-       version = "0.4.1.0";
-       sha256 = "43ec482527444bd15382c93a866d50cdde39ecd53968eabc041dcbbc3a55872a";
+       version = "0.4.1.1";
+       sha256 = "7c843bcd923987679d17359b2881173af72b5beea8b66db241058c69d2a1530f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -84783,8 +84930,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-daemon";
-       version = "0.4.1.0";
-       sha256 = "b028a4c3e9a0701e563d1c12b45fe7bfdad1705232f4170cc23632967437de2c";
+       version = "0.4.1.1";
+       sha256 = "c1334b480b4c7ed5fb918ad887ee50a4eaa610b8c626ae00154eecdf2bb11dc1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -84810,8 +84957,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-debug";
-       version = "0.4.1.0";
-       sha256 = "aae428cb78d3923eecdc2a183ed397578b3dc38c29af77bba44dadaf50dd66ef";
+       version = "0.4.1.1";
+       sha256 = "092da28a3924ec7855f910123cc6d3adaf02c8aea28c09d370ca40e4b66df02c";
        libraryHaskellDepends = [
          base ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc
          haskell-tools-prettyprint haskell-tools-refactor references
@@ -84831,8 +84978,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-demo";
-       version = "0.4.1.0";
-       sha256 = "9a65654bd6d95a6a5ea2ec2ed46a64d2d6aebd74fad864deeda0980b2a50f0e6";
+       version = "0.4.1.1";
+       sha256 = "97e23bce841240eb60f9d959922e5e262dd2d5351954ac1b183aa96910fe0b2b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -84858,8 +85005,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-prettyprint";
-       version = "0.4.1.0";
-       sha256 = "9ca7aecc1e36ea004e2017cf5a7afcc9b6ad4300a9efdffcc68275498bb254a7";
+       version = "0.4.1.1";
+       sha256 = "2d0b5df63f5709359ad5bbc7c67475bf511cc732f1ad682c71506b196519eae8";
        libraryHaskellDepends = [
          base containers ghc haskell-tools-ast mtl references split uniplate
        ];
@@ -84879,8 +85026,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-refactor";
-       version = "0.4.1.0";
-       sha256 = "743e02a1485686df0e6fe6fef2fee473b099cda89323a7b5e35bb9bf17481366";
+       version = "0.4.1.1";
+       sha256 = "a6f1cf8f908f10424919ded1077abe4f15c423548830c4c1a0c117f8a8d8e894";
        libraryHaskellDepends = [
          base Cabal containers directory filepath ghc ghc-paths
          haskell-tools-ast haskell-tools-backend-ghc
@@ -84907,8 +85054,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-rewrite";
-       version = "0.4.1.0";
-       sha256 = "bfa733c82af102a594c7c8ce3d044465f02874a685e0b39e8cc48d3659758282";
+       version = "0.4.1.1";
+       sha256 = "17b2523cbf0b13fc83a28e3b2a55dc7a9118c26ee87c180ec3db46f6571668c8";
        libraryHaskellDepends = [
          base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl
          references
@@ -90108,8 +90255,8 @@ self: {
      }:
      mkDerivation {
        pname = "hindent";
-       version = "5.2.1";
-       sha256 = "0c3118ccf087bea9dfaa9cbcb76bd6ed35919acd2fa511c741e97277b6b01c53";
+       version = "5.2.2";
+       sha256 = "1fc9a92a501552b17219a13fd691e380cc2e2bbf4d768788f13b47639ff4237d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90877,6 +91024,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hjsonpointer_1_1_0_0" = callPackage
+    ({ mkDerivation, aeson, base, hashable, hspec, http-types
+     , QuickCheck, semigroups, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hjsonpointer";
+       version = "1.1.0.0";
+       sha256 = "af2ea643f97d8ed1aca85651b8b65dbabc4967753f0024255baa36d410177dfa";
+       libraryHaskellDepends = [
+         aeson base hashable QuickCheck semigroups text unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         aeson base hspec http-types QuickCheck text unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/seagreen/hjsonpointer";
+       description = "JSON Pointer library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hjsonschema" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , directory, file-embed, filepath, hjsonpointer, http-client
@@ -90904,26 +91073,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hjsonschema_1_2_0_2" = callPackage
+  "hjsonschema_1_3_0_0" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
-     , directory, file-embed, filepath, hjsonpointer, hspec, http-client
-     , http-types, pcre-heavy, profunctors, QuickCheck, scientific
-     , semigroups, text, unordered-containers, vector, wai-app-static
-     , warp
+     , directory, file-embed, filepath, hashable, hjsonpointer, hspec
+     , http-client, http-types, pcre-heavy, profunctors, protolude
+     , QuickCheck, scientific, semigroups, text, unordered-containers
+     , vector, wai-app-static, warp
      }:
      mkDerivation {
        pname = "hjsonschema";
-       version = "1.2.0.2";
-       sha256 = "dc6aa03f842609ed43910510a3d5bf58bab38e94d3117ec9f669ef50ce33dd00";
+       version = "1.3.0.0";
+       sha256 = "ad54c4ee176376ef2fb7a92b5d6f35e70900fbc032000438fc37d3bdd7df819b";
        libraryHaskellDepends = [
-         aeson base bytestring containers file-embed filepath hjsonpointer
-         http-client http-types pcre-heavy profunctors QuickCheck scientific
-         semigroups text unordered-containers vector
+         aeson base bytestring containers file-embed filepath hashable
+         hjsonpointer http-client http-types pcre-heavy profunctors
+         protolude QuickCheck scientific semigroups text
+         unordered-containers vector
        ];
        testHaskellDepends = [
          aeson async base bytestring directory filepath hjsonpointer hspec
-         profunctors QuickCheck semigroups text unordered-containers vector
-         wai-app-static warp
+         profunctors protolude QuickCheck semigroups text
+         unordered-containers vector wai-app-static warp
        ];
        homepage = "https://github.com/seagreen/hjsonschema";
        description = "JSON Schema library";
@@ -91118,7 +91288,7 @@ self: {
      mkDerivation {
        pname = "hledger-diff";
        version = "0.2.0.7";
-       sha256 = "1x7ngm0h9hsbf4p8vx1h4z1w9hlqkqfa39v2dvmlxrcx6rs8dzsl";
+       sha256 = "54ff8674369de54eeb6e62a7a11c9e98c2c4c32730f48d2e714bc304417df6f4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hledger-lib text time ];
@@ -93880,6 +94050,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hpc-coveralls_1_0_7" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs
+     , containers, curl, directory, directory-tree, hpc, HUnit, process
+     , pureMD5, regex-posix, retry, safe, split, transformers
+     }:
+     mkDerivation {
+       pname = "hpc-coveralls";
+       version = "1.0.7";
+       sha256 = "1e3ca630dd142ffa474268e8e7cc95c4d15ad7521affaec0ac28e3cd53452584";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring Cabal cmdargs containers curl directory
+         directory-tree hpc process pureMD5 retry safe split transformers
+       ];
+       executableHaskellDepends = [
+         aeson async base bytestring Cabal cmdargs containers curl directory
+         directory-tree hpc process pureMD5 regex-posix retry safe split
+         transformers
+       ];
+       testHaskellDepends = [ base HUnit ];
+       homepage = "https://github.com/guillaume-nargeot/hpc-coveralls";
+       description = "Coveralls.io support for Haskell.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hpc-strobe" = callPackage
     ({ mkDerivation, base, filepath, hpc }:
      mkDerivation {
@@ -101298,6 +101495,8 @@ self: {
        pname = "hybrid-vectors";
        version = "0.2.1";
        sha256 = "2edcd8fcfedc76a944ac690bfc257f2974100df6484c6c20883d27773836cca2";
+       revision = "1";
+       editedCabalFile = "f07302db04c6d19bf5ab00c084e0ec4fb72955b7bd258e77b4881a21a263e3c4";
        libraryHaskellDepends = [ base deepseq primitive vector ];
        homepage = "http://github.com/ekmett/hybrid-vectors";
        description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors";
@@ -106695,8 +106894,10 @@ self: {
     ({ mkDerivation, base, Cabal }:
      mkDerivation {
        pname = "jailbreak-cabal";
-       version = "1.3.2";
-       sha256 = "1x2h54sx4ycik34q8f9g698xc2b7fai18918cd08qx7w7ny8nai1";
+       version = "1.3.1";
+       sha256 = "610d8dbd04281eee3d5da05c9eef45bfd1a1ddca20dfe54f283e15ddf6d5c235";
+       revision = "1";
+       editedCabalFile = "ad923093f40ae8a7b7faa64a4e65a8545057987e5efe8baafec455fbcc85a52c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base Cabal ];
@@ -106706,6 +106907,22 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "jailbreak-cabal_1_3_2" = callPackage
+    ({ mkDerivation, base, Cabal }:
+     mkDerivation {
+       pname = "jailbreak-cabal";
+       version = "1.3.2";
+       sha256 = "212a8bbc3dfc748c4063282414a2726709d651322f3984c9989179d2352950f4";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base Cabal ];
+       homepage = "https://github.com/peti/jailbreak-cabal#readme";
+       description = "Strip version restrictions from build dependencies in Cabal files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "jalaali" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -107542,10 +107759,10 @@ self: {
      }:
      mkDerivation {
        pname = "json-api";
-       version = "0.1.1.1";
-       sha256 = "d5af631049fe2096c29f79b956f3c3b419b11f097278f131beee31a5369e2516";
+       version = "0.1.1.2";
+       sha256 = "b5bab272ea259c5868d65ab1dbb2967c557219c95fe8aef7d6cd7cd6e8075d24";
        libraryHaskellDepends = [
-         aeson base containers data-default lens-aeson text
+         aeson base containers data-default lens lens-aeson text
          unordered-containers url
        ];
        testHaskellDepends = [
@@ -108014,8 +108231,8 @@ self: {
        pname = "json-schema";
        version = "0.7.4.1";
        sha256 = "560d6a17d6eab734f43d329e51967e3ed62f8df2a6fea4a92d06359fe77d7c96";
-       revision = "5";
-       editedCabalFile = "ec1615227a46ff11cc6dca76df0564ace2a8ff8069e9c84cea0064cd908d0eb3";
+       revision = "6";
+       editedCabalFile = "b6211ab8989ce7d576cac285b7d17f2e50ee79139545e2e84b2dd319904360b2";
        libraryHaskellDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -109774,8 +109991,8 @@ self: {
      }:
      mkDerivation {
        pname = "kicad-data";
-       version = "0.3.0.0";
-       sha256 = "6270a5f62dad9920ca169c1c8867f6ba0d2d36e64299cada90d526b4c73d3ee7";
+       version = "0.4.0";
+       sha256 = "a55a3cc07dd96b4de4a2a9bbe8f1fc9e1a73da6bd999fe145a31f2e4f2731e25";
        libraryHaskellDepends = [
          base ieee754 lens-family parsec parsec-numbers pretty-compact
        ];
@@ -112604,6 +112821,24 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ldapply" = callPackage
+    ({ mkDerivation, base, bytestring, docopt, interpolatedstring-perl6
+     , LDAP, ldif, unordered-containers
+     }:
+     mkDerivation {
+       pname = "ldapply";
+       version = "0.1.0";
+       sha256 = "5c99e6f200c58aeb897a3a8f2e283ad2caba73c6f7eba919102912715891d04b";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring docopt interpolatedstring-perl6 LDAP ldif
+         unordered-containers
+       ];
+       description = "LDIF idempotent apply tool";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ldif" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, containers, directory
      , filepath, HUnit, parsec, rosezipper
@@ -113056,8 +113291,8 @@ self: {
        pname = "lens";
        version = "4.15.1";
        sha256 = "5cfaa64cb1b9787193c2247a1ed1c248104ba5fadb91cec6432e648e41b1bea6";
-       revision = "3";
-       editedCabalFile = "d23792e0e14306446fe13c8de692b46cbf0aedd22ea22248d70c9dc71646716f";
+       revision = "4";
+       editedCabalFile = "e055de1a2d30bf9122947afbc5e342b06a0f4a512fece45f5b9132f7beb11539";
        libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring comonad containers
          contravariant distributive exceptions filepath free ghc-prim
@@ -113108,8 +113343,8 @@ self: {
        pname = "lens-aeson";
        version = "1.0.0.5";
        sha256 = "65faad5b75852209b4c6df43ae1f7460c2b94bf3bbc10b5cd529f43c743a5d9f";
-       revision = "3";
-       editedCabalFile = "d511d27175ba60166923027642b159100332d57db118fb7055cf512fbd0bd7d1";
+       revision = "4";
+       editedCabalFile = "6fde3d7feb42ad58f74e89202ec01d0397bd1c8bf00b2042edaa293479d70385";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring lens scientific text
          unordered-containers vector
@@ -114775,6 +115010,8 @@ self: {
        pname = "linear";
        version = "1.20.5";
        sha256 = "61d8b7242f1e7c27925df7ffe1aa8b1fd732e61598f3af48b9999d8fb464cc0d";
+       revision = "1";
+       editedCabalFile = "59fb06c2c7326ffedc00c3b54a89fecf6bf664e9bea0845f5cd933249c0113d5";
        libraryHaskellDepends = [
          adjunctions base base-orphans binary bytes cereal containers
          deepseq distributive ghc-prim hashable lens reflection
@@ -116633,8 +116870,8 @@ self: {
        pname = "log-domain";
        version = "0.10.3.1";
        sha256 = "36f427506218358b20a2066d5fb38406816fabac18ca26c807a416a795643815";
-       revision = "1";
-       editedCabalFile = "ff544f4bf06996c1775f8c59c0cbf949a60ef50c6ec9404c851bc885612e2498";
+       revision = "2";
+       editedCabalFile = "d5c0d4af0c551eb4b014ce825c1ff6a92fa947225992a89ec9f4b67ece705c6f";
        libraryHaskellDepends = [
          base binary bytes cereal comonad deepseq distributive hashable
          hashable-extras safecopy semigroupoids semigroups vector
@@ -117471,6 +117708,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lrucaching_0_3_1" = callPackage
+    ({ mkDerivation, base, base-compat, containers, deepseq, hashable
+     , hspec, psqueues, QuickCheck, transformers, vector
+     }:
+     mkDerivation {
+       pname = "lrucaching";
+       version = "0.3.1";
+       sha256 = "2f287ea60d721f58474dc105dec953f98ce9a41dd1897647ef68a48605b132d6";
+       libraryHaskellDepends = [
+         base base-compat deepseq hashable psqueues vector
+       ];
+       testHaskellDepends = [
+         base containers deepseq hashable hspec QuickCheck transformers
+       ];
+       homepage = "https://github.com/cocreature/lrucaching#readme";
+       description = "LRU cache";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ls-usb" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, base-unicode-symbols
      , cmdtheline, text, usb, usb-id-database, vector
@@ -118419,6 +118676,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "madlang" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-megaparsec
+     , lens, megaparsec, mtl, mwc-random, optparse-generic, text
+     }:
+     mkDerivation {
+       pname = "madlang";
+       version = "0.1.0.1";
+       sha256 = "b0df75127de969328701adb376673409c82b37c1f3c92b2b0d84b5de2be80ae6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-wl-pprint base lens megaparsec mtl mwc-random optparse-generic
+         text
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base hspec hspec-megaparsec megaparsec mtl text
+       ];
+       homepage = "https://github.com/vmchale/madlang#readme";
+       description = "Randomized templating language DSL";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mage" = callPackage
     ({ mkDerivation, array, base, containers, mtl, ncurses, random }:
      mkDerivation {
@@ -119607,29 +119887,29 @@ self: {
 
   "marvin" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, configurator
-     , directory, filepath, hashable, hslogger, lens, mono-traversable
-     , mtl, mustache, network-uri, optparse-applicative
-     , optparse-generic, pcre-light, random, template-haskell, text
-     , text-format, unordered-containers, vector, websockets, wreq, wuss
+     , directory, filepath, hashable, lens, lifted-async, lifted-base
+     , marvin-interpolate, monad-logger, mono-traversable, mtl, mustache
+     , network-uri, optparse-applicative, random, stm, text, text-icu
+     , unordered-containers, vector, websockets, wreq, wuss
      }:
      mkDerivation {
        pname = "marvin";
-       version = "0.0.4";
-       sha256 = "76c0af008fd2b2c691abe29541b392fe47f59f8a004b837bb8e398f916df1bae";
+       version = "0.0.5";
+       sha256 = "bb2de5f531e8f670476af97795f4e13dd06335fedf212e196787e635c97a217d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson async base bytestring configurator hashable hslogger lens
-         mono-traversable mtl network-uri optparse-generic pcre-light random
-         template-haskell text text-format unordered-containers vector
-         websockets wreq wuss
+         aeson async base bytestring configurator hashable lens lifted-async
+         lifted-base marvin-interpolate monad-logger mono-traversable mtl
+         network-uri optparse-applicative random stm text text-icu
+         unordered-containers vector websockets wreq wuss
        ];
        executableHaskellDepends = [
          aeson base bytestring configurator directory filepath
          mono-traversable mustache optparse-applicative text
        ];
-       homepage = "https://github.com/JustusAdam/marvin#readme";
-       description = "A modular bot for slack";
+       homepage = "https://marvin.readthedocs.io";
+       description = "A modular chat bot";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -119640,8 +119920,8 @@ self: {
      }:
      mkDerivation {
        pname = "marvin-interpolate";
-       version = "0.3.0";
-       sha256 = "053a9fa6ada9b29a18d8e6d7da51b9ee4bc440cd53c6882eb6dc05f425022d85";
+       version = "0.4.0";
+       sha256 = "cc7a97fe7e9d43065d59d21827e40e127b9adaf250715cd7dbfe0e8480bfa766";
        libraryHaskellDepends = [
          base haskell-src-meta mtl parsec template-haskell text
        ];
@@ -121277,15 +121557,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "microlens-aeson_2_1_1_2" = callPackage
+  "microlens-aeson_2_2_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens
      , scientific, tasty, tasty-hunit, text, unordered-containers
      , vector
      }:
      mkDerivation {
        pname = "microlens-aeson";
-       version = "2.1.1.2";
-       sha256 = "f1295f2b6b4db3118b445551ae585650e9ddb2d40bd50194514e478710840f79";
+       version = "2.2.0";
+       sha256 = "c25b8fefcd321f348c5948a0f65d30ecad4070e3f1f7720bacb022b57c6386d4";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring microlens scientific text
          unordered-containers vector
@@ -122592,8 +122872,8 @@ self: {
     ({ mkDerivation, base, doctest, Glob }:
      mkDerivation {
        pname = "modular-arithmetic";
-       version = "1.2.1.1";
-       sha256 = "5b1592ef852596e8c4e1ac5e8f213ee0272a8e0bf6c3d431a86bbeaff35cb700";
+       version = "1.2.1.2";
+       sha256 = "921f31f72589c07be9e64fcc68e90a41651817404ee796f56d0f299287b9a176";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest Glob ];
        homepage = "https://github.com/TikhonJelvis/modular-arithmetic";
@@ -124245,14 +124525,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "monoid-subclasses_0_4_3" = callPackage
+  "monoid-subclasses_0_4_3_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
      , quickcheck-instances, tasty, tasty-quickcheck, text, vector
      }:
      mkDerivation {
        pname = "monoid-subclasses";
-       version = "0.4.3";
-       sha256 = "568fd54e1fe35557129bc8cd1a751343dfde61a63fab0baadc38683101aed0cd";
+       version = "0.4.3.1";
+       sha256 = "a170d07916b694601a7da2924656e5f8a5ad27afa0e548f4683b154e122783cd";
        libraryHaskellDepends = [
          base bytestring containers primes text vector
        ];
@@ -126911,6 +127191,8 @@ self: {
        pname = "nanovg";
        version = "0.5.2.0";
        sha256 = "22e31d227770e55123aadb2750c35895f4d635327c7be1ef1ea2655d86180f5d";
+       revision = "1";
+       editedCabalFile = "ab822c8c3baab11820f06e9c34ba59c97789625020fabf476338cc17b2e74853";
        libraryHaskellDepends = [ base bytestring containers text vector ];
        librarySystemDepends = [ freeglut GLEW mesa ];
        libraryToolDepends = [ c2hs ];
@@ -132914,12 +133196,16 @@ self: {
      }) {};
 
   "overload" = callPackage
-    ({ mkDerivation, base, simple-effects, template-haskell }:
+    ({ mkDerivation, base, containers, simple-effects, template-haskell
+     , th-expand-syns
+     }:
      mkDerivation {
        pname = "overload";
-       version = "0.1.0.0";
-       sha256 = "ed48aa71ec612bb280529f26e94f0babe5ca346be3bf0a2cbd34a22d25308322";
-       libraryHaskellDepends = [ base simple-effects template-haskell ];
+       version = "0.1.0.1";
+       sha256 = "6583c3c90021bc42bf93d8a287fd81970270f05f423b961a35ac06e11f35af6e";
+       libraryHaskellDepends = [
+         base containers simple-effects template-haskell th-expand-syns
+       ];
        homepage = "https://gitlab.com/LukaHorvat/overload";
        description = "Finite overloading";
        license = stdenv.lib.licenses.mit;
@@ -134338,6 +134624,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "parsec-numeric" = callPackage
+    ({ mkDerivation, base, bytestring, parsec, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-th, text
+     }:
+     mkDerivation {
+       pname = "parsec-numeric";
+       version = "0.1.0.0";
+       sha256 = "7bdd9ae4aa63695e3072c73d99b85ef1572ffe9f5a07621edaa9515393a6e52f";
+       libraryHaskellDepends = [ base parsec ];
+       testHaskellDepends = [
+         base bytestring parsec tasty tasty-hunit tasty-quickcheck tasty-th
+         text
+       ];
+       homepage = "https://github.com/AndrewRademacher/parsec-numeric";
+       description = "Parsec combinators for parsing Haskell numeric types";
+       license = "unknown";
+     }) {};
+
   "parsec-parsers" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, parsec
      , parsers
@@ -134955,14 +135259,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "path-io_1_2_1" = callPackage
+  "path-io_1_2_2" = callPackage
     ({ mkDerivation, base, containers, directory, exceptions, filepath
      , hspec, path, temporary, time, transformers, unix-compat
      }:
      mkDerivation {
        pname = "path-io";
-       version = "1.2.1";
-       sha256 = "41582c65c6ceb05522bbacb0fc242f542d1e42e61bc5c9858b9153e8c334339f";
+       version = "1.2.2";
+       sha256 = "72255f9d014285c87dd4c537f445a5448b2b64e81c4ee4759464b4b0e401fe46";
        libraryHaskellDepends = [
          base containers directory exceptions filepath path temporary time
          transformers unix-compat
@@ -135395,20 +135699,20 @@ self: {
 
   "pdf-slave" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
-     , containers, exceptions, haskintex, HaTeX, optparse-applicative
-     , pdf-slave-template, shelly, system-filepath, text, transformers
-     , unordered-containers, yaml
+     , containers, directory, exceptions, haskintex, HaTeX
+     , optparse-applicative, pdf-slave-template, shelly, system-filepath
+     , text, transformers, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "pdf-slave";
-       version = "1.2.3.0";
-       sha256 = "46700a44e9f6ee7fbfecfd23201211a9c99d3a74c9fa9d8a467980b7390a5ae4";
+       version = "1.3.0.0";
+       sha256 = "0020adc44e21938637c5fe7f69bf7ff714b5773654a74ff2c0ff544bf934f5b9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base base64-bytestring bytestring containers exceptions
-         haskintex HaTeX pdf-slave-template shelly system-filepath
-         unordered-containers yaml
+         aeson base base64-bytestring bytestring containers directory
+         exceptions haskintex HaTeX pdf-slave-template shelly
+         system-filepath unordered-containers yaml
        ];
        executableHaskellDepends = [
          aeson base bytestring optparse-applicative pdf-slave-template
@@ -137349,7 +137653,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "pinboard_0_9_12_1" = callPackage
+  "pinboard_0_9_12_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hspec
      , http-client, http-client-tls, http-types, monad-logger, mtl
      , network, profunctors, QuickCheck, random, safe-exceptions
@@ -137358,8 +137662,8 @@ self: {
      }:
      mkDerivation {
        pname = "pinboard";
-       version = "0.9.12.1";
-       sha256 = "dd6303ec05b38e9b2af196d4efee5ee174fef62c960c2ad15943faef9d96d237";
+       version = "0.9.12.2";
+       sha256 = "f9c5dbf3206d0c0075704feb4582c58a5eb3ef4704ca7a2000c5c8d49dbeeec9";
        libraryHaskellDepends = [
          aeson base bytestring containers http-client http-client-tls
          http-types monad-logger mtl network profunctors random
@@ -138201,6 +138505,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-random_1_0_0_3" = callPackage
+    ({ mkDerivation, base, mwc-random, pipes, vector }:
+     mkDerivation {
+       pname = "pipes-random";
+       version = "1.0.0.3";
+       sha256 = "729c3359e4f76048b0a9c656e4739c369619b8abce546a741f8d55e2a7b31193";
+       libraryHaskellDepends = [ base mwc-random pipes vector ];
+       description = "Producers for handling randomness";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-rt" = callPackage
     ({ mkDerivation, base, mwc-random, pipes, time }:
      mkDerivation {
@@ -139748,8 +140064,8 @@ self: {
      }:
      mkDerivation {
        pname = "pontarius-xmpp";
-       version = "0.5.3";
-       sha256 = "70b34c6cc581183752e04c967bd6b383b0d4a813badd412ece35bcc5bff991fd";
+       version = "0.5.4";
+       sha256 = "cea2e6207811d718e8a9c3ef7abb71ec4aba6ee77e9f749d9902b62a4b48b13a";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring binary bytestring conduit
          containers crypto-api crypto-random cryptohash cryptohash-cryptoapi
@@ -144328,8 +144644,8 @@ self: {
      }:
      mkDerivation {
        pname = "qr-imager";
-       version = "0.2.1.1";
-       sha256 = "e7abcdff646835141b8ea2c53ef414467ddc07afef20d2cce48aadc0096001f4";
+       version = "0.2.1.2";
+       sha256 = "0830675a25f49cdb3322304feb90e0779536fdbcea805e5ddca2328ae5a07c39";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -144821,8 +145137,8 @@ self: {
        pname = "quickcheck-instances";
        version = "0.3.12";
        sha256 = "ddd5b988da50eff7f56737bff516fba52309f7461297698f04f1e8aaee9f9bf3";
-       revision = "1";
-       editedCabalFile = "ef9ca080de8bb79d892628abe3ccbd92a61f77fffa633942ee3e4da0d8819657";
+       revision = "2";
+       editedCabalFile = "4321c16dfe0d3c08bba1425d1058261b4b8b553ea5c5c01bd982c9d9e23b39ec";
        libraryHaskellDepends = [
          array base bytestring containers hashable old-time QuickCheck
          scientific text time unordered-containers vector
@@ -145185,6 +145501,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "quipper-core" = callPackage
+    ({ mkDerivation, base, containers, mtl, primes, random
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "quipper-core";
+       version = "0.8.0.1";
+       sha256 = "17d0361ed260f16cce989175164d3b81ba0af1c5970bf91a4aebcca21ef0e163";
+       libraryHaskellDepends = [
+         base containers mtl primes random template-haskell
+       ];
+       homepage = "http://www.mathstat.dal.ca/~selinger/quipper/";
+       description = "An embedded, scalable functional programming language for quantum computing";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "quipper-rendering" = callPackage
+    ({ mkDerivation, base, containers, directory, easyrender, mtl
+     , primes, process, quipper-core, random, template-haskell, unix
+     }:
+     mkDerivation {
+       pname = "quipper-rendering";
+       version = "0.8";
+       sha256 = "c73ecbaad5d95e78f4b86fb39d764512ac2d025876bed86564fe3bb3a890107c";
+       libraryHaskellDepends = [
+         base containers directory easyrender mtl primes process
+         quipper-core random template-haskell unix
+       ];
+       homepage = "http://www.mathstat.dal.ca/~selinger/quipper/";
+       description = "An embedded, scalable functional programming language for quantum computing";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "quiver" = callPackage
     ({ mkDerivation, base, mmorph, transformers }:
      mkDerivation {
@@ -145533,16 +145882,17 @@ self: {
 
   "raft" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
-     , containers, data-default, ghc-prim, mtl, parallel, scientific
-     , split, text, time, tostring, zlib
+     , cereal, containers, data-default, ghc-prim, mtl, parallel
+     , scientific, split, stm, text, time, tostring, zlib
      }:
      mkDerivation {
        pname = "raft";
-       version = "0.3.7.2";
-       sha256 = "40c46755aa43abd764d59610b7b8a7af75b5e5efe7c509c34ede6a157ee2a0e9";
+       version = "0.3.11.0";
+       sha256 = "e8aff884bcc2cdc6d8200f834a9d9f8b2d38646895af4e03589c6ae6e07e8465";
        libraryHaskellDepends = [
-         aeson attoparsec base binary bytestring containers data-default
-         ghc-prim mtl parallel scientific split text time tostring zlib
+         aeson attoparsec base binary bytestring cereal containers
+         data-default ghc-prim mtl parallel scientific split stm text time
+         tostring zlib
        ];
        homepage = "https://bitbucket.org/functionally/raft";
        description = "Miscellaneous Haskell utilities for data structures and data manipulation";
@@ -146497,8 +146847,8 @@ self: {
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "2.1.3";
-       sha256 = "a349c7c6f45ab64c0ff85b877f99a7ec4d5a8946c0d2224b033b6014b518bea1";
+       version = "2.1.4";
+       sha256 = "e5513105bba4917caa18a41499b38a0d98114761207170674a9c559fb85ff0dc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -147935,8 +148285,8 @@ self: {
      }:
      mkDerivation {
        pname = "references";
-       version = "0.3.2.0";
-       sha256 = "67a5434a1b6b6021e4ac3c9c8c42521cf5bf922d07d26e925821e3fd4e5121fd";
+       version = "0.3.2.1";
+       sha256 = "184020e17d1f3e86bb9e350f9c4076a838f580c23d943801245ded92edd27624";
        libraryHaskellDepends = [
          array base containers directory either filepath instance-control
          mtl template-haskell text transformers uniplate
@@ -147944,6 +148294,7 @@ self: {
        testHaskellDepends = [
          array base containers directory either filepath HUnit
          instance-control lens mtl template-haskell text transformers
+         uniplate
        ];
        homepage = "https://github.com/lazac/references";
        description = "Selectors for reading and updating data";
@@ -148326,6 +148677,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "refty" = callPackage
+    ({ mkDerivation, aeson, base, containers, text }:
+     mkDerivation {
+       pname = "refty";
+       version = "0.1.0.1";
+       sha256 = "621883d618e539b9938327e2faf09d36628a81db9ab051c7a4c07b644b7f5d28";
+       libraryHaskellDepends = [ aeson base containers text ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/oreshinya/refty";
+       description = "Formatted JSON generator for API server inspired by normalizr";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "regex-applicative" = callPackage
     ({ mkDerivation, base, containers, smallcheck, tasty, tasty-hunit
      , tasty-smallcheck, transformers
@@ -149969,22 +150333,20 @@ self: {
      }) {};
 
   "req" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring
-     , case-insensitive, connection, data-default-class, hspec
-     , hspec-core, http-api-data, http-client, http-client-tls
+    ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder
+     , bytestring, case-insensitive, connection, data-default-class
+     , hspec, hspec-core, http-api-data, http-client, http-client-tls
      , http-types, mtl, QuickCheck, text, time, transformers
      , unordered-containers
      }:
      mkDerivation {
        pname = "req";
-       version = "0.1.0";
-       sha256 = "c93bae94d0b640f0d459a3da79c6021f7d8403099e9f08c35a2cddf64eea2269";
-       revision = "2";
-       editedCabalFile = "c4d0fc2e312c85a8dc3e7aefb49341ad57662ac1dac6625304f9aa3cf2016160";
+       version = "0.2.0";
+       sha256 = "e64e56622f1ec06df83e2c8516effa49058b4d7196c28127ab98190cc320ebbc";
        libraryHaskellDepends = [
-         aeson base blaze-builder bytestring case-insensitive connection
-         data-default-class http-api-data http-client http-client-tls
-         http-types mtl text time transformers
+         aeson authenticate-oauth base blaze-builder bytestring
+         case-insensitive connection data-default-class http-api-data
+         http-client http-client-tls http-types mtl text time transformers
        ];
        testHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive
@@ -150005,6 +150367,8 @@ self: {
        pname = "req-conduit";
        version = "0.1.0";
        sha256 = "689a8592555b39859ab0d2e50b111217112d51077553dc7103d84afc865ca447";
+       revision = "1";
+       editedCabalFile = "2f7008556081fcfb641b008c499f0c12958f7ccdfbc62b8aa2c1459c7efb3e81";
        libraryHaskellDepends = [
          base bytestring conduit http-client req resourcet transformers
        ];
@@ -150383,8 +150747,8 @@ self: {
        pname = "rest-core";
        version = "0.39";
        sha256 = "d760d0547fc1a99cd949dde08b7945fb93af24f4e55d45ecf410c352d5005404";
-       revision = "3";
-       editedCabalFile = "3b6cf8a675a2bf1f3e22fcf1a39e1658ce112e21b918ad28ace73cdf5dc70aa2";
+       revision = "4";
+       editedCabalFile = "261e22e228e0d1f042f24a0a9e784a7ed3ea44342006cb79cb7e4021f0e46b9a";
        libraryHaskellDepends = [
          aeson aeson-utils base base-compat bytestring case-insensitive
          errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat
@@ -150464,8 +150828,8 @@ self: {
        pname = "rest-gen";
        version = "0.20.0.0";
        sha256 = "81a9486136f91773371858f9d3e248b80458e7d55aab11f17cc158c3ce68d542";
-       revision = "3";
-       editedCabalFile = "b1de24d30b40005298357ecadb54055f9842d8c1e3673feeb453a067a9f9a812";
+       revision = "4";
+       editedCabalFile = "df0abba48ce1b506060711b616a027680314c92960bdefca0f548eecc058e062";
        libraryHaskellDepends = [
          aeson base base-compat blaze-html Cabal code-builder directory
          fclabels filepath hashable haskell-src-exts HStringTemplate hxt
@@ -150525,8 +150889,8 @@ self: {
        pname = "rest-stringmap";
        version = "0.2.0.6";
        sha256 = "66e5a32f04cfcf9826296b3c053c22caa745fd890ccc6ea9199c34529507524a";
-       revision = "4";
-       editedCabalFile = "5ba1b7bef91969bc4d1319ab72e78b4063e1bbc9620787e7306b95b1390f9897";
+       revision = "5";
+       editedCabalFile = "40fd386dc256a7a2b53e188b69b202f6623a5baa93c04ac2fe5c5389adb250f1";
        libraryHaskellDepends = [
          aeson base containers hashable hxt json-schema tostring
          unordered-containers
@@ -150544,8 +150908,8 @@ self: {
        pname = "rest-types";
        version = "1.14.1.1";
        sha256 = "b7e08e65bbae20bd891f0905c9c785184182172094673ab13e66499e4fe3969a";
-       revision = "1";
-       editedCabalFile = "8e9eca95758568488ae115f3a807ef05d309e193ecac3e740569eb43de37fc22";
+       revision = "2";
+       editedCabalFile = "6f8ff48a58cd55fc871ee536eccd895b0f29a18fd52429791bff578ff8497a20";
        libraryHaskellDepends = [
          aeson base base-compat case-insensitive generic-aeson
          generic-xmlpickler hxt json-schema rest-stringmap text uuid
@@ -155973,8 +156337,8 @@ self: {
      }:
      mkDerivation {
        pname = "serokell-util";
-       version = "0.1.3.0";
-       sha256 = "ddf321ba0126fde5757f186c5080f3a7ffb7539582040aab263165f83cafcc78";
+       version = "0.1.3.1";
+       sha256 = "5765de74022ed024a407a3869892294d50e3027f7cf79ef9b63fca0b61c8b306";
        libraryHaskellDepends = [
          acid-state aeson aeson-extra base base16-bytestring
          base64-bytestring binary binary-orphans bytestring cereal
@@ -158217,8 +158581,8 @@ self: {
     ({ mkDerivation, base, basic-prelude, directory, shake }:
      mkDerivation {
        pname = "shakers";
-       version = "0.0.7";
-       sha256 = "f7859e7adbccb740c176fc186ca332f576be65265b87641d5ac30d2d34adfbdb";
+       version = "0.0.8";
+       sha256 = "13495dad7f64f7f6fd79d86c138ceb517659e28fd138169d1df957892036ab51";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base basic-prelude directory shake ];
@@ -158620,8 +158984,8 @@ self: {
      }:
      mkDerivation {
        pname = "shellmate";
-       version = "0.3.4";
-       sha256 = "b2db36ff28c21d78bdac8142e35b4ab002d70193f55f7e603c8c3d0eb49c0ce8";
+       version = "0.3.4.1";
+       sha256 = "a66fb8d53eac5736dd7d69c7835af60ca2afff389c65e0972ab199b0983a6430";
        libraryHaskellDepends = [
          base bytestring directory filepath process temporary transformers
          unix
@@ -159038,8 +159402,8 @@ self: {
      }:
      mkDerivation {
        pname = "sibe";
-       version = "0.2.0.3";
-       sha256 = "324abe72b361aaef1286bbe8e76dda18e431010db60aa1ea018f95e045fe91ea";
+       version = "0.2.0.4";
+       sha256 = "104038b009602b8cd3a9a9211d2c67cf585c7c5e3d69a2a16df0348fa5958ddc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -161219,8 +161583,33 @@ self: {
        ];
        description = "A type-safe interface to communicate with an SMT solver";
        license = stdenv.lib.licenses.gpl3;
-       broken = true;
-     }) {smtlib2-quickcheck = null;};
+     }) {};
+
+  "smtlib2-quickcheck" = callPackage
+    ({ mkDerivation, base, containers, dependent-map, dependent-sum
+     , mtl, QuickCheck, smtlib2
+     }:
+     mkDerivation {
+       pname = "smtlib2-quickcheck";
+       version = "1.0";
+       sha256 = "267f701b359e81d0a053e7c04a294d98ecc8d795dfe540c812b0832df278ac4c";
+       libraryHaskellDepends = [
+         base containers dependent-map dependent-sum mtl QuickCheck smtlib2
+       ];
+       description = "Helper functions to create SMTLib expressions in QuickCheck";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
+  "smtlib2-timing" = callPackage
+    ({ mkDerivation, base, dependent-sum, mtl, smtlib2, time }:
+     mkDerivation {
+       pname = "smtlib2-timing";
+       version = "1.0";
+       sha256 = "253ace562bd79b48a51d7b5272d70b27abf0e7ae1a3468b9e477901bdd430289";
+       libraryHaskellDepends = [ base dependent-sum mtl smtlib2 time ];
+       description = "Get timing informations for SMT queries";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
 
   "smtp-mail" = callPackage
     ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
@@ -164982,8 +165371,8 @@ self: {
        pname = "stache";
        version = "0.1.8";
        sha256 = "a8617924e087b02c3afb3308a8a1102828e352dba7545648703e5d0c2c3c35b2";
-       revision = "1";
-       editedCabalFile = "642777f5664ae40b2e5308ca771a505226b0015414203658432e002c846e5ad7";
+       revision = "2";
+       editedCabalFile = "293e587834fd528a8f1869027b1de5f3ea492597350688a86db36c18453757d9";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory exceptions
          filepath megaparsec mtl template-haskell text unordered-containers
@@ -165008,8 +165397,8 @@ self: {
        pname = "stache";
        version = "0.2.0";
        sha256 = "0952d6849a297d3ef020feaeb128be4af7d25ab97fa948eb0339a7f75d0a1831";
-       revision = "1";
-       editedCabalFile = "5b22600a5b101c5c86d688d05773c7506e9cc373637ef7a2a1abe43a28db0703";
+       revision = "2";
+       editedCabalFile = "4899a9a2a56b3e2524b0166f8875f7f823419c64ec1f2a74f2ff7b6010472d01";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory exceptions
          filepath megaparsec mtl template-haskell text unordered-containers
@@ -173562,6 +173951,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "text-show-instances_3_5" = callPackage
+    ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
+     , containers, directory, generic-deriving, ghc-boot-th, ghc-prim
+     , haskeline, hoopl, hpc, hspec, old-locale, old-time, pretty
+     , QuickCheck, quickcheck-instances, random, semigroups, tagged
+     , template-haskell, terminfo, text, text-show, th-orphans, time
+     , transformers, transformers-compat, unix, unordered-containers
+     , vector, xhtml
+     }:
+     mkDerivation {
+       pname = "text-show-instances";
+       version = "3.5";
+       sha256 = "0c7dbf6e6742460be0d08777ab3759434c12c5b65f273be35afbe0c945690342";
+       libraryHaskellDepends = [
+         base base-compat bifunctors binary bytestring containers directory
+         ghc-boot-th haskeline hoopl hpc old-locale old-time pretty random
+         semigroups tagged template-haskell terminfo text text-show time
+         transformers transformers-compat unix unordered-containers vector
+         xhtml
+       ];
+       testHaskellDepends = [
+         base base-compat bifunctors binary bytestring containers directory
+         generic-deriving ghc-boot-th ghc-prim haskeline hoopl hpc hspec
+         old-locale old-time pretty QuickCheck quickcheck-instances random
+         semigroups tagged template-haskell terminfo text text-show
+         th-orphans time transformers transformers-compat unix
+         unordered-containers vector xhtml
+       ];
+       homepage = "https://github.com/RyanGlScott/text-show-instances";
+       description = "Additional instances for text-show";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-stream-decode" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, hspec, text }:
      mkDerivation {
@@ -175241,13 +175664,13 @@ self: {
      }) {};
 
   "time-patterns" = callPackage
-    ({ mkDerivation, base, intervals, lens, thyme, vector-space }:
+    ({ mkDerivation, base, intervals, time }:
      mkDerivation {
        pname = "time-patterns";
-       version = "0.1.3.2";
-       sha256 = "3c2beb5b4f69213699cdc9e2f88872d1d406eb04c93ad3678e09b6746aa40a61";
-       libraryHaskellDepends = [ base intervals lens thyme vector-space ];
-       homepage = "https://bitbucket.org/jfmueller/time-patterns";
+       version = "0.1.4.1";
+       sha256 = "5114525b97e376303540feea7b7d780d6c13d558d130a8d95d8577db5e004f41";
+       libraryHaskellDepends = [ base intervals time ];
+       homepage = "https://github.com/j-mueller/time-patterns";
        description = "Patterns for recurring events";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176191,6 +176614,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "toboggan" = callPackage
+    ({ mkDerivation, base, clit, directory, madlang, optparse-generic
+     , text
+     }:
+     mkDerivation {
+       pname = "toboggan";
+       version = "0.1.0.0";
+       sha256 = "72281351961f1d55149379c273b72e4e4d7a5134c432351044a17317152f3a67";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base clit directory madlang optparse-generic text
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/vmchale/toboggan#readme";
+       description = "Twitter bot generator";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "todos" = callPackage
     ({ mkDerivation, ansi-terminal, base, base-unicode-symbols
      , containers, data-hash, dates, directory, dyre, filepath, Glob
@@ -177724,7 +178166,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tttool_1_6_1_4" = callPackage
+  "tttool_1_7_0_1" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , directory, executable-path, filepath, hashable, haskeline, HPDF
      , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec
@@ -177733,8 +178175,8 @@ self: {
      }:
      mkDerivation {
        pname = "tttool";
-       version = "1.6.1.4";
-       sha256 = "66f14d6abe28e2d2a1a61cbef0fe8ace0c376b2e2a8b918b17d422634faee8ee";
+       version = "1.7.0.1";
+       sha256 = "b41fc9b2899a625a0a364dd8fc4ef8f7c070ec7cbcbf5ef2acfc256cfb434fe6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -183020,6 +183462,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vector_0_12_0_0" = callPackage
+    ({ mkDerivation, base, deepseq, ghc-prim, HUnit, primitive
+     , QuickCheck, random, template-haskell, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, transformers
+     }:
+     mkDerivation {
+       pname = "vector";
+       version = "0.12.0.0";
+       sha256 = "27bf375d0efbff61acaeb75a2047afcbdac930191069a59da4a474b9bf80ec95";
+       libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
+       testHaskellDepends = [
+         base HUnit QuickCheck random template-haskell test-framework
+         test-framework-hunit test-framework-quickcheck2 transformers
+       ];
+       homepage = "https://github.com/haskell/vector";
+       description = "Efficient Arrays";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vector-algorithms" = callPackage
     ({ mkDerivation, base, bytestring, containers, primitive
      , QuickCheck, vector
@@ -183062,6 +183524,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vector-binary-instances_0_2_3_4" = callPackage
+    ({ mkDerivation, base, binary, tasty, tasty-quickcheck, vector }:
+     mkDerivation {
+       pname = "vector-binary-instances";
+       version = "0.2.3.4";
+       sha256 = "f3cef04ff645bbf25198c2c0c33d0c13e44bfe63602e1e694c2be9abf0e57d00";
+       libraryHaskellDepends = [ base binary vector ];
+       testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
+       homepage = "https://github.com/bos/vector-binary-instances";
+       description = "Instances of Data.Binary and Data.Serialize for vector";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vector-buffer" = callPackage
     ({ mkDerivation, base, deepseq, vector }:
      mkDerivation {
@@ -183218,6 +183694,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vector-instances_3_4" = callPackage
+    ({ mkDerivation, base, comonad, hashable, keys, pointed
+     , semigroupoids, semigroups, vector
+     }:
+     mkDerivation {
+       pname = "vector-instances";
+       version = "3.4";
+       sha256 = "1b0246ef0cf8372d61d5c7840d857f49299af2304b5107510377255ed4dd5381";
+       libraryHaskellDepends = [
+         base comonad hashable keys pointed semigroupoids semigroups vector
+       ];
+       homepage = "http://github.com/ekmett/vector-instances";
+       description = "Orphan Instances for 'Data.Vector'";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vector-instances-collections" = callPackage
     ({ mkDerivation, base, collections-api, template-haskell, vector }:
      mkDerivation {
@@ -186245,6 +186738,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "web-push" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
+     , cryptonite, exceptions, http-client, http-types, jose, memory
+     , random, text, time, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "web-push";
+       version = "0.1.0.0";
+       sha256 = "5772499993225207a60755f08e9e8774c17e6b06c7f933ba83789549d8beb871";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring binary bytestring cryptonite
+         exceptions http-client http-types jose memory random text time
+         transformers unordered-containers
+       ];
+       homepage = "https://github.com/sarthakbagaria/web-push#readme";
+       description = "Helper functions to send messages using Web Push protocol";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "web-routes" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, exceptions
      , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck
diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix
index 1f25a2031f2..29d63f1d004 100644
--- a/pkgs/development/interpreters/ceptre/default.nix
+++ b/pkgs/development/interpreters/ceptre/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, mlton }:
 
 stdenv.mkDerivation rec {
-  name = "ceptre-2016-01-01";
+  name = "ceptre-2016-11-27";
 
   src = fetchgit {
     url = https://github.com/chrisamaphone/interactive-lp;
-    rev = "b3d21489d4994f03d2982de273eea90bc7fba5d0";
-    sha256 = "1qpyasr3jg4i2x547yq1dzksvjagvnrmkdd00s108wvw9npc2jj1";
+    rev = "e436fda2ccd44e9c9d226feced9d204311deacf5";
+    sha256 = "174pxfnw3qyn2w8qxmx45fa68iddf106mkfi0kcmyqxzsc9jprh8";
   };
 
   nativeBuildInputs = [ mlton ];
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 226f819ded9..904ad97648e 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -18,11 +18,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "4.0.3";
+  version = "4.2.0";
   name = "octave-${version}";
   src = fetchurl {
-    url = "mirror://gnu/octave/${name}.tar.xz";
-    sha256 = "11day29k4yfvxh4101x5yf26ld992x5n6qvmhjjk6mzsd26fqayw";
+    url = "mirror://gnu/octave/${name}.tar.gz";
+    sha256 = "0rsmg5i3b5yfvkvrl9mqvn3f2n1a6vqg45phpja1qlzkh8vsffs4";
   };
 
   buildInputs = [ gfortran readline ncurses perl flex texinfo qhull
diff --git a/pkgs/development/interpreters/spidermonkey/31.nix b/pkgs/development/interpreters/spidermonkey/31.nix
index 585ebc120d8..ae3e742e2ef 100644
--- a/pkgs/development/interpreters/spidermonkey/31.nix
+++ b/pkgs/development/interpreters/spidermonkey/31.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, perl, python2, zip, libffi, nspr, icu, readline }:
+{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, nspr, icu, readline }:
 
 stdenv.mkDerivation rec {
   version = "31.5.0";
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "1q8icql5hh1g3gzg5fp4rl9rfagyhm9gilfn3dgi7qn4i1mrfqsd";
   };
 
-  buildInputs = [ pkgconfig perl python2 zip libffi readline nspr icu ];
+  buildInputs = [ libffi readline nspr icu ];
+  nativeBuildInputs = [ pkgconfig perl python2 zip gnused_422 ];
 
   postUnpack = "sourceRoot=\${sourceRoot}/js/src";
 
diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix
index 89c02f26200..b4823817d4b 100644
--- a/pkgs/development/interpreters/spidermonkey/38.nix
+++ b/pkgs/development/interpreters/spidermonkey/38.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, perl, python2, zip, libffi, readline, icu, zlib, nspr }:
+{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, nspr }:
 
 stdenv.mkDerivation rec {
   version = "38.2.1.rc0";
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "0p4bmbpgkfsj54xschcny0a118jdrdgg0q29rwxigg3lh5slr681";
   };
 
-  buildInputs = [ pkgconfig perl python2 zip libffi readline icu zlib nspr ];
+  buildInputs = [ libffi readline icu zlib nspr ];
+  nativeBuildInputs = [ pkgconfig perl python2 zip gnused_422 ];
 
   postUnpack = "sourceRoot=\${sourceRoot}/js/src";
 
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 5b40f27674d..7df72bc0560 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
   ] ++ libintlOrEmpty ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     CoreGraphics
     CoreText
+    ApplicationServices
     Carbon
   ]);
 
@@ -56,9 +57,6 @@ stdenv.mkDerivation rec {
     ++ optionals xcbSupport [ libxcb xcbutil ]
     ++ optional gobjectSupport glib
     ++ optional glSupport mesa_noglu
-    ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
-      ApplicationServices
-    ])
     ; # TODO: maybe liblzo but what would it be for here?
 
   configureFlags = if stdenv.isDarwin then [
diff --git a/pkgs/development/libraries/gmock/default.nix b/pkgs/development/libraries/gmock/default.nix
deleted file mode 100644
index 139cfab6e0c..00000000000
--- a/pkgs/development/libraries/gmock/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, cmake, fetchzip }:
-
-stdenv.mkDerivation rec {
-  name = "gmock-${version}";
-  version = "1.7.0";
-
-  src = fetchzip {
-    url = "https://googlemock.googlecode.com/files/gmock-${version}.zip";
-    sha256 = "04n9p6pf3mrqsabrsncv32d3fqvd86zmcdq3gyni7liszgfk0paz";
-  };
-
-  buildInputs = [ cmake ];
-
-  buildPhase = ''
-    # avoid building gtest
-    make gmock gmock_main
-  '';
-
-  installPhase = ''
-    mkdir -p $out/lib
-    cp -v libgmock.a libgmock_main.a $out/lib
-    cp -v -r ../include $out
-    cp -v -r ../src $out
-  '';
-
-  meta = {
-    description = "Google mock: Google's framework for writing C++ mock classes";
-    homepage = https://code.google.com/p/googlemock/;
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.auntie ];
-    platforms = stdenv.lib.platforms.unix;
-  };
-
-  passthru = { source = src; };
-}
diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix
index ee505b54e7e..ca2fb728262 100644
--- a/pkgs/development/libraries/grib-api/default.nix
+++ b/pkgs/development/libraries/grib-api/default.nix
@@ -1,32 +1,60 @@
-{ fetchurl, stdenv, curl,
-  netcdf, jasper, openjpeg }:
+{ fetchurl, stdenv,
+  cmake, netcdf, gfortran, jasper, libpng,
+  enablePython ? false, pythonPackages }:
 
 stdenv.mkDerivation rec{
   name = "grib-api-${version}";
-  version = "1.14.4";
+  version = "1.19.0";
 
   src = fetchurl {
-    url = https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-1.14.4-Source.tar.gz;
-    sha256 = "1w8z9y79wakhwv1r4rb4dwlh9pbyw367klcm6laxz91hhvfrpfq8";
+    url = "https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-${version}-Source.tar.gz";
+    sha256 = "07cj9mw5bb249lxx1m9nmfdqb8b2a8cm7s6x62cdwca3sp16dv6a";
   };
 
-  buildInputs = [ netcdf
+  preConfigure = ''
+    # Fix "no member named 'inmem_' in 'jas_image_t'"
+    substituteInPlace "src/grib_jasper_encoding.c" --replace "image.inmem_    = 1;" ""
+  '';
+
+  buildInputs = [ cmake
+                  netcdf
+                  gfortran
                   jasper
-                  openjpeg
-                  curl     # Used for downloading during make test
+                  libpng
+                ] ++ stdenv.lib.optionals enablePython [
+                  pythonPackages.python
                 ];
+
+  cmakeFlags = [ "-DENABLE_PYTHON=${if enablePython then "ON" else "OFF"}"
+                 "-DENABLE_PNG=ON"
+                 "-DENABLE_FORTRAN=ON"
+               ];
+
+  enableParallelBuilding = true;
+
   doCheck = true;
 
+  # Only do tests that don't require downloading 120MB of testdata
+  # We fix the darwin checkPhase, which searches for libgrib_api.dylib
+  # in /nix/store by setting DYLD_LIBRARY_PATH
+  checkPhase = stdenv.lib.optionalString (stdenv.isDarwin) ''
+    substituteInPlace "tests/include.sh" --replace "set -ea" "set -ea; export DYLD_LIBRARY_PATH=$(pwd)/lib"
+  '' + ''
+    ctest -R "t_definitions|t_calendar|t_unit_tests" -VV
+  '';
+
+
   meta = with stdenv.lib; {
     homepage = "https://software.ecmwf.int/wiki/display/GRIB/Home";
     license = licenses.asl20;
+    platforms = with platforms; linux ++ darwin;
     description = "ECMWF Library for the GRIB file format";
     longDescription = ''
       The ECMWF GRIB API is an application program interface accessible from C,
       FORTRAN and Python programs developed for encoding and decoding WMO FM-92
       GRIB edition 1 and edition 2 messages.
     '';
-
+    maintainers = with maintainers; [ knedlsepp ];
   };
 }
 
diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix
index e516e4a475a..84b1fa9757c 100644
--- a/pkgs/development/libraries/gtest/default.nix
+++ b/pkgs/development/libraries/gtest/default.nix
@@ -1,11 +1,14 @@
-{ stdenv, cmake, callPackage }:
-let
-  source = callPackage ./source.nix { };
-in
+{ stdenv, cmake, fetchFromGitHub }:
 stdenv.mkDerivation rec {
-  name = "gtest-${source.version}";
+  name = "gtest-${version}";
+  version = "1.8.0";
 
-  src = source;
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "googletest";
+    rev = "release-${version}";
+    sha256 = "0bjlljmbf8glnd9qjabx73w6pd7ibv43yiyngqvmvgxsabzr8399";
+  };
 
   buildInputs = [ cmake ];
 
@@ -17,9 +20,13 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/lib
-    cp -v libgtest.a libgtest_main.a $out/lib
-    cp -v -r ../include $out
-    cp -v -r ../src $out
+    cp -v googlemock/gtest/libgtest.a googlemock/gtest/libgtest_main.a googlemock/libgmock.a googlemock/libgmock_main.a $out/lib
+    ln -s $out/lib/libgmock.a $out/lib/libgoogletest.a
+    mkdir -p $out/include
+    cp -v -r ../googlemock/include/gmock $out/include
+    cp -v -r ../googletest/include/gtest $out/include
+    mkdir -p $out/src
+    cp -v -r ../googlemock/src/* ../googletest/src/* $out/src
   '';
 
   meta = with stdenv.lib; {
@@ -27,8 +34,6 @@ stdenv.mkDerivation rec {
     homepage = https://code.google.com/p/googletest/;
     license = licenses.bsd3;
     platforms = platforms.all;
-    maintainers = with maintainers; [ zoomulator ];
+    maintainers = with maintainers; [ zoomulator ivan-tkatchev ];
   };
-
-  passthru = { inherit source; };
 }
diff --git a/pkgs/development/libraries/gtest/source.nix b/pkgs/development/libraries/gtest/source.nix
deleted file mode 100644
index d8787efdcf2..00000000000
--- a/pkgs/development/libraries/gtest/source.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ fetchurl, stdenv, unzip, ... }:
-
-stdenv.mkDerivation rec {
-  name = "gtest-src-${version}";
-  version = "1.7.0";
-
-  src = fetchurl {
-    url = "https://googletest.googlecode.com/files/gtest-${version}.zip";
-    sha256 = "03fnw3bizw9bcx7l5qy1vz7185g33d5pxqcb6aqxwlrzv26s2z14";
-  };
-
-  buildInputs = [ unzip ];
-
-  buildCommand = ''
-    unpackPhase
-    cd gtest-${version}
-    mkdir $out
-    cp -r * $out
-  '';
-
-  passthru = { inherit version; };
-}
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 409307fb52b..ebd0f79cd47 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf
-, bzip2, libcroco, libintlOrEmpty
+, bzip2, libcroco, libintlOrEmpty, darwin
 , withGTK ? false, gtk3 ? null
 , gobjectIntrospection ? null, enableIntrospection ? false }:
 
@@ -22,7 +22,10 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3;
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ]
+    ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+      ApplicationServices
+    ]);
 
   configureFlags = [ "--enable-introspection=auto" ]
     ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix
index a2e5d153060..960c8cc2494 100644
--- a/pkgs/development/libraries/lirc/default.nix
+++ b/pkgs/development/libraries/lirc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper, python3, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "lirc-0.9.3";
+  name = "lirc-0.9.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/lirc/${name}.tar.bz2";
@@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
 
   preBuild = "patchShebangs .";
 
-  buildInputs = [ alsaLib help2man pkgconfig xlibsWrapper python3 libxslt ];
+  nativeBuildInputs = [ pkgconfig help2man ];
+
+  buildInputs = [ alsaLib xlibsWrapper python3 libxslt ];
 
   configureFlags = [
     "--with-driver=devinput"
diff --git a/pkgs/development/libraries/loki/default.nix b/pkgs/development/libraries/loki/default.nix
new file mode 100644
index 00000000000..2ff927048ad
--- /dev/null
+++ b/pkgs/development/libraries/loki/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "loki-${version}";
+  version = "0.1.7";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/loki-lib/Loki/Loki%20${version}/loki-${version}.tar.gz";
+    sha256 = "1xhwna961fl4298ac5cc629x5030zlw31vx4h8zws290amw5860g";
+  };
+
+  buildPhase = ''
+    substituteInPlace Makefile.common --replace /usr $out
+    make build-shared
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "A C++ library of designs, containing flexible implementations of common design patterns and idioms";
+    homepage = http://loki-lib.sourceforge.net;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix
index 70368133706..307bf1b27db 100644
--- a/pkgs/development/libraries/physics/fastnlo/default.nix
+++ b/pkgs/development/libraries/physics/fastnlo/default.nix
@@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ boost lhapdf root yoda ];
 
+  CXXFLAGS="-std=c++11"; # for yoda
+
+  configureFlags = [
+    "--with-yoda=${yoda}"
+  ];
+
   enableParallelBuilding = true;
 
   meta = {
diff --git a/pkgs/development/libraries/physics/mcgrid/default.nix b/pkgs/development/libraries/physics/mcgrid/default.nix
index 033bf2f214f..aabe132e73b 100644
--- a/pkgs/development/libraries/physics/mcgrid/default.nix
+++ b/pkgs/development/libraries/physics/mcgrid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fastnlo, rivet, sherpa }:
+{ stdenv, fetchurl, fastnlo, rivet, pkgconfig, sherpa }:
 
 stdenv.mkDerivation rec {
   name = "mcgrid-${version}";
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ fastnlo rivet ];
+  propagatedNativeBuildInputs = [ pkgconfig ];
 
   preConfigure = ''
     substituteInPlace mcgrid.pc.in \
diff --git a/pkgs/development/libraries/physics/rivet/darwin.patch b/pkgs/development/libraries/physics/rivet/darwin.patch
new file mode 100644
index 00000000000..2d397f1da6c
--- /dev/null
+++ b/pkgs/development/libraries/physics/rivet/darwin.patch
@@ -0,0 +1,33 @@
+diff --git a/include/Rivet/Tools/osdir.hh b/include/Rivet/Tools/osdir.hh
+index 05f06ca..59af7de 100644
+--- a/include/Rivet/Tools/osdir.hh
++++ b/include/Rivet/Tools/osdir.hh
+@@ -21,7 +21,7 @@
+ 
+ /// @cond OSDIR
+ 
+-#if defined(unix) || defined(__unix) || defined(__unix__)
++#if defined(unix) || defined(__unix) || defined(__unix__) || defined(__APPLE__)
+ #define OSLINK_OSDIR_POSIX
+ #elif defined(_WIN32)
+ #define OSLINK_OSDIR_WINDOWS
+@@ -32,18 +32,7 @@
+ #include <string>
+ 
+ #if defined(OSLINK_OSDIR_NOTSUPPORTED)
+-
+-namespace oslink
+-{
+-	class directory
+-	{
+-		public:
+-			directory(const std::string&)		{ }
+-			operator void*() const				{ return (void*)0; }
+-			std::string next()					{ return ""; }
+-	};
+-}
+-
++#error Platform misdetected or oslink is not implemented
+ #elif defined(OSLINK_OSDIR_POSIX)
+ 
+ #include <sys/types.h>
diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix
index 91b5881d1a8..a82c14fee77 100644
--- a/pkgs/development/libraries/physics/rivet/default.nix
+++ b/pkgs/development/libraries/physics/rivet/default.nix
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
 
   pythonPath = []; # python wrapper support
 
+  patches = [
+    ./darwin.patch # configure relies on impure sw_vers to -Dunix
+  ];
+
   latex = texlive.combine { inherit (texlive)
     scheme-basic
     collection-pstricks
diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix
index 5a3738564d7..f74aea9dbd5 100644
--- a/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/pkgs/development/libraries/protobuf/generic-v3.nix
@@ -18,8 +18,11 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     rm -rf gmock
-    cp -r ${gmock.source} gmock
+    cp -r ${gmock.src}/googlemock gmock
+    cp -r ${gmock.src}/googletest googletest
     chmod -R a+w gmock
+    chmod -R a+w googletest
+    ln -s ../googletest gmock/gtest
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace src/google/protobuf/testing/googletest.cc \
       --replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix
index 47f66c83ff5..498263458b5 100644
--- a/pkgs/development/libraries/protobuf/generic.nix
+++ b/pkgs/development/libraries/protobuf/generic.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     rm -rf gtest
-    cp -r ${gtest.source} gtest
+    cp -r ${gtest.src}/googletest gtest
     chmod -R a+w gtest
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace src/google/protobuf/testing/googletest.cc \
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index d5f4389169b..928ff5f788b 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -1,18 +1,23 @@
-{ stdenv, fetchurl, qt4, qmake4Hook }:
+{ stdenv, fetchurl, unzip
+, qt4 ? null, qmake4Hook ? null
+, withQt5 ? false, qtbase ? null, qmakeHook ? null
+}:
 
 stdenv.mkDerivation rec {
   pname = "qscintilla";
-  version = "2.9";
+  version = "2.9.4";
 
-  name = "${pname}-${version}";
+  name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla-gpl-${version}.tar.gz";
-    sha256 = "d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417";
+    url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla_gpl-${version}.zip";
+    sha256 = "04678skipydx68zf52vznsfmll2v9aahr66g50lcqbr6xsmgr1yi";
   };
 
-  buildInputs = [ qt4 ];
-  nativeBuildInputs = [ qmake4Hook ];
+  buildInputs = if withQt5 then [ qtbase ] else [ qt4 ];
+  nativeBuildInputs = [ unzip ] ++ (if withQt5 then [ qmakeHook ] else [ qmake4Hook ]);
+
+  enableParallelBuilding = true;
 
   preConfigure = ''
     cd Qt4Qt5
@@ -23,7 +28,7 @@ stdenv.mkDerivation rec {
            qscintilla.pro
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A Qt port of the Scintilla text editing library";
     longDescription = ''
       QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor
@@ -40,7 +45,8 @@ stdenv.mkDerivation rec {
       background colours and multiple fonts.
     '';
     homepage = http://www.riverbankcomputing.com/software/qscintilla/intro;
-    license = stdenv.lib.licenses.gpl2; # and gpl3 and commercial
-    platforms = stdenv.lib.platforms.unix;
+    license = with licenses; [ gpl2 gpl3 ]; # and commercial
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ peterhoeg ];
   };
 }
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 75f872ef35a..dca6483dc84 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     urls =
-      [ "http://www.zlib.net/${name}.tar.gz"  # old versions vanish from here
+      [ "http://www.zlib.net/fossils/${name}.tar.gz"  # stable archive path
         "mirror://sourceforge/libpng/zlib/${version}/${name}.tar.gz"
       ];
     sha256 = "05w0jwsqib44jz5jazh7cqz311z4g7znnzn6w6v8g1z4iilryzld";
diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index 6386d3176a9..6e80f0907bc 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -3,15 +3,13 @@
 # TODO: Look at the hardcoded paths to kernel, modules etc.
 stdenv.mkDerivation rec {
   name = "elfutils-${version}";
-  version = "0.165";
+  version = "0.168";
 
   src = fetchurl {
-    url = "http://fedorahosted.org/releases/e/l/elfutils/${version}/${name}.tar.bz2";
-    sha256 = "0wp91hlh9n0ismikljf63558rzdwim8w1s271grsbaic35vr5z57";
+    url = "https://sourceware.org/elfutils/ftp/${version}/${name}.tar.bz2";
+    sha256 = "0xn2fbgda1i703csfs35frvm7l068ybmay4ssrykqdx17f4hg3dq";
   };
 
-  patches = [ ./glibc-2.21.patch ];
-
   hardeningDisable = [ "format" ];
 
   # We need bzip2 in NativeInputs because otherwise we can't unpack the src,
@@ -68,7 +66,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = https://fedorahosted.org/elfutils/;
+    homepage = https://sourceware.org/elfutils/;
     description = "A set of utilities to handle ELF objects";
     platforms = lib.platforms.linux;
     license = lib.licenses.gpl3;
diff --git a/pkgs/development/tools/misc/elfutils/glibc-2.21.patch b/pkgs/development/tools/misc/elfutils/glibc-2.21.patch
deleted file mode 100644
index f67632741e5..00000000000
--- a/pkgs/development/tools/misc/elfutils/glibc-2.21.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From b9d70fb9fb0bd0bf84eb2302cba1691aea74c42e Mon Sep 17 00:00:00 2001
-From: Mark Wielaard <mjw@redhat.com>
-Date: Wed, 13 Jan 2016 17:16:48 +0100
-Subject: [PATCH] libelf: Add ELF compression types and defines to libelf.h for
- older glibc.
-
-Older glibc elf.h might not define the new ELF compression defines and
-types. If not just define them in libelf.h directly to make the libelf
-headers work on older glibc systems.
-
-Also include a testcase to check the libelf headers build against the
-system elf.h.
-
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=810885
-
-Signed-off-by: Mark Wielaard <mjw@redhat.com>
----
- libelf/ChangeLog               |  5 +++++
- libelf/libelf.h                | 28 ++++++++++++++++++++++++++++
- tests/ChangeLog                |  8 ++++++++
- tests/Makefile.am              |  9 +++++++--
- tests/system-elf-libelf-test.c | 35 +++++++++++++++++++++++++++++++++++
- 5 files changed, 83 insertions(+), 2 deletions(-)
- create mode 100644 tests/system-elf-libelf-test.c
-
-diff --git a/libelf/ChangeLog b/libelf/ChangeLog
-index 3a1fe91..aabf6f6 100644
---- a/libelf/ChangeLog
-+++ b/libelf/ChangeLog
-@@ -1,3 +1,8 @@
-+2016-01-13  Mark Wielaard  <mjw@redhat.com>
-+
-+	* libelf.h: Check SHF_COMPRESSED is defined. If not define it and the
-+	associated ELF compression types/defines.
-+
- 2015-11-26  Mark Wielaard  <mjw@redhat.com>
- 
- 	* elf_compress.c (__libelf_decompress_elf): New function, extracted
-diff --git a/libelf/libelf.h b/libelf/libelf.h
-index 364e776..c0d6389 100644
---- a/libelf/libelf.h
-+++ b/libelf/libelf.h
-@@ -35,6 +35,34 @@
- /* Get the ELF types.  */
- #include <elf.h>
- 
-+#ifndef SHF_COMPRESSED
-+ /* Older glibc elf.h might not yet define the ELF compression types.  */
-+ #define SHF_COMPRESSED      (1 << 11)  /* Section with compressed data. */
-+
-+ /* Section compression header.  Used when SHF_COMPRESSED is set.  */
-+
-+ typedef struct
-+ {
-+   Elf32_Word   ch_type;        /* Compression format.  */
-+   Elf32_Word   ch_size;        /* Uncompressed data size.  */
-+   Elf32_Word   ch_addralign;   /* Uncompressed data alignment.  */
-+ } Elf32_Chdr;
-+
-+ typedef struct
-+ {
-+   Elf64_Word   ch_type;        /* Compression format.  */
-+   Elf64_Word   ch_reserved;
-+   Elf64_Xword  ch_size;        /* Uncompressed data size.  */
-+   Elf64_Xword  ch_addralign;   /* Uncompressed data alignment.  */
-+ } Elf64_Chdr;
-+
-+ /* Legal values for ch_type (compression algorithm).  */
-+ #define ELFCOMPRESS_ZLIB       1          /* ZLIB/DEFLATE algorithm.  */
-+ #define ELFCOMPRESS_LOOS       0x60000000 /* Start of OS-specific.  */
-+ #define ELFCOMPRESS_HIOS       0x6fffffff /* End of OS-specific.  */
-+ #define ELFCOMPRESS_LOPROC     0x70000000 /* Start of processor-specific.  */
-+ #define ELFCOMPRESS_HIPROC     0x7fffffff /* End of processor-specific.  */
-+#endif
- 
- /* Known translation types.  */
- typedef enum
-diff --git a/tests/ChangeLog b/tests/ChangeLog
-index 366aea9..234ae56 100644
---- a/tests/ChangeLog
-+++ b/tests/ChangeLog
-@@ -1,3 +1,11 @@
-+2016-01-13  Mark Wielaard  <mjw@redhat.com>
-+
-+	* system-elf-libelf-test.c: New test.
-+	* Makefile.am (TESTS): Add system-elf-libelf-test, if !STANDALONE.
-+	(check_PROGRAMS): Likewise.
-+	(system_elf_libelf_test_CPPFLAGS): New variable.
-+	(system_elf_libelf_test_LDADD): Likewise.
-+
- 2016-01-08  Mark Wielaard  <mjw@redhat.com>
- 
- 	* elfputzdata.c (main): Fix parentheses in strncmp test.
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index d09a6d7..7b9e108 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -136,8 +136,8 @@ export ELFUTILS_DISABLE_DEMANGLE = 1
- endif
- 
- if !STANDALONE
--check_PROGRAMS += msg_tst md5-sha1-test
--TESTS += msg_tst md5-sha1-test
-+check_PROGRAMS += msg_tst md5-sha1-test system-elf-libelf-test
-+TESTS += msg_tst md5-sha1-test system-elf-libelf-test
- endif
- 
- if LZMA
-@@ -473,6 +473,11 @@ elfgetzdata_LDADD = $(libelf)
- elfputzdata_LDADD = $(libelf)
- zstrptr_LDADD = $(libelf)
- 
-+# We want to test the libelf header against the system elf.h header.
-+# Don't include any -I CPPFLAGS.
-+system_elf_libelf_test_CPPFLAGS =
-+system_elf_libelf_test_LDADD = $(libelf)
-+
- if GCOV
- check: check-am coverage
- .PHONY: coverage
-diff --git a/tests/system-elf-libelf-test.c b/tests/system-elf-libelf-test.c
-new file mode 100644
-index 0000000..7dfe498
---- /dev/null
-+++ b/tests/system-elf-libelf-test.c
-@@ -0,0 +1,35 @@
-+/* Explicit test compiling with system elf.h header plus libelf header.
-+
-+   Copyright (C) 2016 Red Hat, Inc.
-+   This file is part of elfutils.
-+
-+   This file is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+
-+   elfutils is distributed in the hope that it will be useful, but
-+   WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+#include <elf.h>
-+#include <stddef.h>
-+#include "../libelf/libelf.h"
-+
-+int
-+main (void)
-+{
-+  /* Trivial test, this is really a compile test anyway.  */
-+  if (elf_version (EV_CURRENT) == EV_NONE)
-+    return -1;
-+
-+  /* This will obviously fail. It is just to check that Elf32_Chdr and
-+     elf32_getchdr are available (both at compile time and runtime).  */
-+  Elf32_Chdr *chdr = elf32_getchdr (NULL);
-+
-+  return chdr == NULL ? 0 : -1;
-+}
--- 
-1.8.3.1
-
diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index d609b3b664c..664b83b7e7c 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "global-${version}";
-  version = "6.5.5";
+  version = "6.5.6";
 
   src = fetchurl {
     url = "mirror://gnu/global/${name}.tar.gz";
-    sha256 = "0yyg91qw8399lnxfai4bxkh9yq71qdwp9kvadgzp05cdqni44nxw";
+    sha256 = "018m536k5y6lks1a6gqn3bsp7r8zk017znqj9kva1nm8d7x9lbqj";
   };
 
   nativeBuildInputs = [ libtool makeWrapper ];
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index e3d2c4950bc..dbd53c65050 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -3,7 +3,7 @@
 , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt
 , guile, perl, postgresql92, aws-sdk-cpp, nukeReferences, git, boehmgc
 , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
-, rpm, dpkg, cdrkit, fetchpatch }:
+, rpm, dpkg, cdrkit, fetchpatch, pixz }:
 
 with stdenv;
 
@@ -61,21 +61,17 @@ let
   };
 in releaseTools.nixBuild rec {
   name = "hydra-${version}";
-  version = "2016-04-15";
+  version = "2016-12-09";
+
+  inherit stdenv;
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "hydra";
-    rev = "177bf25d648092826a75369191503a3f2bb763a4";
-    sha256 = "0ngipzm2i2vz5ygfd70hh82d027snpl85r8ncn1rxlkak0g8fxsl";
+    rev = "de55303197d997c4fc5503b52b1321ae9528583d";
+    sha256 = "0nimqsbpjxfwha6d5gp6a7jh50i83z1llmx30da4bscsic8z1xly";
   };
 
-  patches = [(fetchpatch {
-    name = "cmath.diff";
-    url = https://github.com/vcunat/hydra/commit/3c6fca1ba299.diff; # https://github.com/NixOS/hydra/pull/337
-    sha256 = "02m9q304ay45s7xfkm2y7lppakrkx3hrq39mm6348isnbqmbarc0";
-  })];
-
   buildInputs =
     [ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx
       gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt
@@ -96,7 +92,7 @@ in releaseTools.nixBuild rec {
     ];
 
   hydraPath = lib.makeBinPath (
-    [ libxslt sqlite subversion openssh nixUnstable coreutils findutils
+    [ sqlite subversion openssh nixUnstable coreutils findutils pixz
       gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar
     ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
 
@@ -108,7 +104,7 @@ in releaseTools.nixBuild rec {
   configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
 
   preHook = ''
-    PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$PATH
+    PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH
     PERL5LIB=$(pwd)/src/lib:$PERL5LIB;
   '';
 
diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix
new file mode 100644
index 00000000000..9f8f2df358a
--- /dev/null
+++ b/pkgs/development/tools/tora/default.nix
@@ -0,0 +1,67 @@
+{ stdenv, lib, fetchFromGitHub, cmake, ecm, makeQtWrapper
+, boost, doxygen, openssl, mysql, postgresql, graphviz, loki, qscintilla, qtbase }:
+
+let
+  qscintillaLib = (qscintilla.override { withQt5 = true; });
+
+in stdenv.mkDerivation rec {
+  name = "tora-${version}";
+  version = "3.1";
+
+  src = fetchFromGitHub {
+    owner  = "tora-tool";
+    repo   = "tora";
+    rev    = "v${version}";
+    sha256 = "0wninl10bcgiljf6wnhn2rv8kmzryw78x5qvbw8s2zfjlnxjsbn7";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [
+    cmake ecm makeQtWrapper
+    boost doxygen graphviz loki mysql openssl postgresql qscintillaLib qtbase
+  ];
+
+  preConfigure = ''
+    sed -i \
+      's|defaultGvHome = "/usr/bin"|defaultGvHome = "${lib.getBin graphviz}/bin"|' \
+      src/widgets/toglobalsetting.cpp
+
+    sed -i \
+      's|/usr/bin/dot|${lib.getBin graphviz}/bin/dot|' \
+      extlibs/libermodel/dotgraph.cpp
+  '';
+
+  cmakeFlags = [
+    "-DWANT_INTERNAL_LOKI=0"
+    "-DWANT_INTERNAL_QSCINTILLA=0"
+    # cmake/modules/FindQScintilla.cmake looks in qtbase and for the wrong library name
+    "-DQSCINTILLA_INCLUDE_DIR=${qscintillaLib}/include"
+    "-DQSCINTILLA_LIBRARY=${qscintillaLib}/lib/libqscintilla2.so"
+    "-DENABLE_DB2=0"
+    "-DENABLE_ORACLE=0"
+    "-DENABLE_TERADATA=0"
+    "-DQT5_BUILD=1"
+    "-Wno-dev"
+  ];
+
+  # these libraries are only searched for at runtime so we need to force-link them
+  NIX_LDFLAGS = [
+    "-lgvc"
+    "-lmysqlclient"
+    "-lecpg"
+    "-lssl"
+  ];
+
+  postFixup = ''
+    wrapQtProgram $out/bin/tora \
+      --prefix PATH : ${lib.getBin graphviz}/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Tora SQL tool";
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms = platforms.linux;
+    license = licenses.asl20;
+  };
+}