Merge staging into master

author: Frederik Rietdijk <fridh@fridh.nl> 2018-06-23 08:23:59 +0200
committer: Frederik Rietdijk <fridh@fridh.nl> 2018-06-23 08:23:59 +0200
commit: cdfbfc1d0940255ec491ba25d214a0046ddaa686 (patch)
tree: d195401e65bae635e89d975850277e9531c66708 /pkgs/development
parent: 48110c12956cdccc9aab638a489d2c96511fc41a (diff)
parent: 95eb2fa40e6f0edd625abdafe7d7b76e0c722263 (diff)
13 files changed, 1581 insertions, 945 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 69d98f761bdd1..20a908858e9c1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1053,6 +1053,10 @@ self: super: {
 
   # dhall-json requires a very particular dhall version
   dhall-json_1_2_0 = super.dhall-json_1_2_0.override { dhall = self.dhall_1_14_0; };
+
+  # https://github.com/fpco/streaming-commons/issues/49
+  streaming-commons = dontCheck super.streaming-commons;
+
 }
 
 //
@@ -1071,14 +1075,3 @@ self: super: {
 in {
   inherit amazonka amazonka-core amazonka-test;
 })
-
-//
-
-# The actual Cabal library gets built while building its `Setup.hs`.
-(let
-  inherit (pkgs.lib) filterAttrs flip mapAttrs hasPrefix;
-  cabals = filterAttrs (n: v: hasPrefix "Cabal_" n) super;
-  fixCabal = n: v: addSetupDepends v [ self.mtl self.parsec ];
-in
-  mapAttrs fixCabal cabals
-)
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 437ff2d9d65ac..d87a84c3c7787 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,7 +38,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 11.13
+  # LTS Haskell 11.14
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -66,7 +66,7 @@ default-package-overrides:
   - aeson ==1.2.4.0
   - aeson-better-errors ==0.9.1.0
   - aeson-casing ==0.1.0.5
-  - aeson-compat ==0.3.7.1
+  - aeson-compat ==0.3.8
   - aeson-diff ==1.1.0.5
   - aeson-extra ==0.4.1.0
   - aeson-generic-compat ==0.0.1.2
@@ -203,7 +203,7 @@ default-package-overrides:
   - asn1-parse ==0.9.4
   - asn1-types ==0.3.2
   - assert-failure ==0.1.2.2
-  - astro ==0.4.2.0
+  - astro ==0.4.2.1
   - async ==2.1.1.1
   - async-extra ==0.2.0.0
   - async-refresh ==0.2.0.2
@@ -216,9 +216,11 @@ default-package-overrides:
   - attoparsec ==0.13.2.2
   - attoparsec-binary ==0.2
   - attoparsec-expr ==0.1.1.2
+  - attoparsec-ip ==0.0.1
   - attoparsec-iso8601 ==1.0.0.0
   - attoparsec-path ==0.0.0.1
   - attoparsec-time ==1
+  - attoparsec-uri ==0.0.4
   - audacity ==0.0.2
   - authenticate ==1.3.4
   - authenticate-oauth ==1.6
@@ -296,7 +298,7 @@ default-package-overrides:
   - blastxml ==0.3.2
   - blaze-bootstrap ==0.1.0.1
   - blaze-builder ==0.4.1.0
-  - blaze-html ==0.9.0.1
+  - blaze-html ==0.9.1.1
   - blaze-markup ==0.8.2.1
   - blaze-svg ==0.3.6.1
   - blaze-textual ==0.2.1.0
@@ -325,7 +327,7 @@ default-package-overrides:
   - bson-lens ==0.1.1
   - btrfs ==0.1.2.3
   - buchhaltung ==0.0.7
-  - buffer-builder ==0.2.4.5
+  - buffer-builder ==0.2.4.6
   - buffer-pipe ==0.0
   - butcher ==1.3.0.0
   - bv ==0.5
@@ -568,7 +570,7 @@ default-package-overrides:
   - dependent-sum ==0.4
   - dependent-sum-template ==0.0.0.6
   - deque ==0.2.1
-  - deriving-compat ==0.4.2
+  - deriving-compat ==0.4.3
   - descriptive ==0.9.4
   - dhall ==1.11.1
   - dhall-json ==1.0.13
@@ -588,7 +590,7 @@ default-package-overrides:
   - disposable ==0.2.0.4
   - distance ==0.1.0.0
   - distributed-closure ==0.4.0
-  - distributed-process ==0.7.3
+  - distributed-process ==0.7.4
   - distributed-process-lifted ==0.3.0.1
   - distributed-process-monad-control ==0.5.1.3
   - distributed-process-simplelocalnet ==0.2.4
@@ -880,6 +882,7 @@ default-package-overrides:
   - grouped-list ==0.2.2.0
   - groups ==0.4.1.0
   - gtk2hs-buildtools ==0.13.4.0
+  - gym-http-api ==0.1.0.1
   - H ==0.9.0.1
   - h2c ==1.0.0
   - hackage-db ==2.0
@@ -892,7 +895,7 @@ default-package-overrides:
   - hamilton ==0.1.0.2
   - HandsomeSoup ==0.4.2
   - handwriting ==0.1.0.3
-  - hapistrano ==0.3.5.6
+  - hapistrano ==0.3.5.7
   - happstack-jmacro ==7.0.12
   - happstack-server ==7.5.1
   - happstack-server-tls ==7.1.6.5
@@ -986,7 +989,7 @@ default-package-overrides:
   - hmatrix-backprop ==0.1.2.0
   - hmatrix-gsl ==0.18.2.0
   - hmatrix-gsl-stats ==0.4.1.7
-  - hmatrix-morpheus ==0.1.1.1
+  - hmatrix-morpheus ==0.1.1.2
   - hmatrix-repa ==0.1.2.2
   - hmatrix-special ==0.4.0.1
   - hmatrix-vector-sized ==0.1.1.0
@@ -1018,8 +1021,8 @@ default-package-overrides:
   - hsdns ==1.7.1
   - hsebaysdk ==0.4.0.0
   - hsemail ==2
-  - HSet ==0.0.1
   - hset ==2.2.0
+  - HSet ==0.0.1
   - hsexif ==0.6.1.5
   - hs-GeoIP ==0.3
   - hsignal ==0.2.7.5
@@ -1027,7 +1030,7 @@ default-package-overrides:
   - HSlippyMap ==3.0.1
   - hslogger ==1.2.10
   - hslua ==0.9.5.2
-  - hslua-aeson ==0.3.0.1
+  - hslua-aeson ==0.3.0.2
   - hslua-module-text ==0.1.2.1
   - hsndfile ==0.8.0
   - hsndfile-vector ==0.5.2
@@ -1066,10 +1069,10 @@ default-package-overrides:
   - html-email-validate ==0.2.0.0
   - html-entity-map ==0.1.0.0
   - htoml ==1.0.0.3
-  - HTTP ==4000.3.11
+  - HTTP ==4000.3.12
   - http2 ==1.6.3
   - http-api-data ==0.3.7.2
-  - http-client ==0.5.12.1
+  - http-client ==0.5.13
   - http-client-openssl ==0.2.1.1
   - http-client-tls ==0.3.5.3
   - http-common ==0.8.2.0
@@ -1167,6 +1170,7 @@ default-package-overrides:
   - io-storage ==0.3
   - io-streams ==1.5.0.1
   - io-streams-haproxy ==1.0.0.2
+  - ip ==1.2.1
   - ip6addr ==0.5.3
   - iproute ==1.7.5
   - IPv6Addr ==1.0.3
@@ -1180,7 +1184,7 @@ default-package-overrides:
   - islink ==0.1.0.0
   - iso3166-country-codes ==0.20140203.8
   - iso639 ==0.1.0.3
-  - iso8601-time ==0.1.4
+  - iso8601-time ==0.1.5
   - iterable ==3.0
   - ixset ==1.0.7
   - ixset-typed ==0.3.1.1
@@ -1235,7 +1239,7 @@ default-package-overrides:
   - language-haskell-extract ==0.2.4
   - language-java ==0.2.9
   - language-javascript ==0.6.0.11
-  - language-puppet ==1.3.17
+  - language-puppet ==1.3.18
   - lapack-carray ==0.0.2
   - lapack-ffi ==0.0.2
   - lapack-ffi-tools ==0.1.0.1
@@ -1327,6 +1331,7 @@ default-package-overrides:
   - markdown ==0.1.17.1
   - markdown-unlit ==0.5.0
   - markov-chain ==0.0.3.4
+  - markup ==4.0.4
   - marvin-interpolate ==1.1.2
   - massiv ==0.1.6.1
   - massiv-io ==0.1.4.0
@@ -1463,7 +1468,7 @@ default-package-overrides:
   - netlib-carray ==0.0.1.1
   - netlib-ffi ==0.0.1
   - netpbm ==1.0.2
-  - nettle ==0.2.0
+  - nettle ==0.2.1
   - netwire ==5.0.3
   - netwire-input ==0.0.7
   - netwire-input-glfw ==0.0.10
@@ -1610,7 +1615,7 @@ default-package-overrides:
   - picosat ==0.1.4
   - pid1 ==0.1.2.0
   - pinboard ==0.9.12.10
-  - pinch ==0.3.2.0
+  - pinch ==0.3.3.0
   - pipes ==4.3.9
   - pipes-aeson ==0.4.1.8
   - pipes-attoparsec ==0.5.1.5
@@ -1669,7 +1674,7 @@ default-package-overrides:
   - prettyclass ==1.0.0.0
   - pretty-class ==1.0.1.1
   - pretty-hex ==1.0
-  - prettyprinter ==1.2.0.1
+  - prettyprinter ==1.2.1
   - prettyprinter-ansi-terminal ==1.1.1.2
   - prettyprinter-compat-annotated-wl-pprint ==1
   - prettyprinter-compat-ansi-wl-pprint ==1.0.1
@@ -1722,7 +1727,8 @@ default-package-overrides:
   - QuickCheck ==2.10.1
   - quickcheck-arbitrary-adt ==0.3.1.0
   - quickcheck-assertions ==0.3.0
-  - quickcheck-combinators ==0.0.2
+  - quickcheck-classes ==0.4.12
+  - quickcheck-combinators ==0.0.4
   - quickcheck-instances ==0.3.18
   - quickcheck-io ==0.2.0
   - quickcheck-properties ==0.1
@@ -1788,7 +1794,7 @@ default-package-overrides:
   - regex-tdfa-text ==1.0.0.3
   - reinterpret-cast ==0.1.0
   - relational-query ==0.11.1.0
-  - relational-query-HDBC ==0.6.7.0
+  - relational-query-HDBC ==0.6.7.1
   - relational-record ==0.2.1.2
   - relational-schemas ==0.1.6.1
   - rematch ==0.2.0.0
@@ -1860,6 +1866,7 @@ default-package-overrides:
   - semigroupoid-extras ==5
   - semigroupoids ==5.2.2
   - semigroups ==0.18.4
+  - semirings ==0.1.3.0
   - semiring-simple ==1.0.0.1
   - semver ==0.3.3.1
   - sendfile ==0.7.9
@@ -1915,7 +1922,7 @@ default-package-overrides:
   - shortcut-links ==0.4.2.0
   - should-not-typecheck ==2.1.0
   - show-combinators ==0.1.0.0
-  - show-prettyprint ==0.2.0.2
+  - show-prettyprint ==0.2.2
   - signal ==0.1.0.4
   - silently ==1.2.5
   - simple ==0.11.2
@@ -1931,11 +1938,11 @@ default-package-overrides:
   - skein ==1.0.9.4
   - skeletons ==0.4.0
   - skylighting ==0.6
-  - slack-web ==0.2.0.4
+  - slack-web ==0.2.0.5
   - slave-thread ==1.0.2
   - slug ==0.1.7
   - smallcheck ==1.1.4
-  - smoothie ==0.4.2.8
+  - smoothie ==0.4.2.9
   - smtp-mail ==0.1.4.6
   - snap ==1.1.0.0
   - snap-blaze ==0.2.1.5
@@ -1966,14 +1973,14 @@ default-package-overrides:
   - split ==0.2.3.3
   - splitmix ==0
   - Spock ==0.12.0.0
-  - Spock-api ==0.12.0.0
-  - Spock-api-server ==0.12.0.0
+  - Spock-api ==0.12.0.1
+  - Spock-api-server ==0.12.0.1
   - Spock-core ==0.12.0.0
   - Spock-lucid ==0.4.0.1
   - Spock-worker ==0.3.1.0
   - spoon ==0.3.1
   - spreadsheet ==0.1.3.7
-  - sqlite-simple ==0.4.15.0
+  - sqlite-simple ==0.4.16.0
   - sql-words ==0.1.6.1
   - squeal-postgresql ==0.1.1.4
   - srcloc ==0.5.1.2
@@ -2006,7 +2013,7 @@ default-package-overrides:
   - storable-tuple ==0.0.3.3
   - storablevector ==0.2.13
   - store ==0.4.3.2
-  - store-core ==0.4.3
+  - store-core ==0.4.4
   - Strafunski-StrategyLib ==5.0.1.0
   - stratosphere ==0.19.1
   - streaming ==0.2.1.0
@@ -2132,7 +2139,7 @@ default-package-overrides:
   - threads ==0.5.1.6
   - threads-extras ==0.1.0.2
   - threepenny-editors ==0.5.6
-  - threepenny-gui ==0.8.2.3
+  - threepenny-gui ==0.8.2.4
   - threepenny-gui-flexbox ==0.4.2
   - th-reify-compat ==0.0.1.4
   - th-reify-many ==0.1.8
@@ -2248,6 +2255,7 @@ default-package-overrides:
   - uri-bytestring-aeson ==0.1.0.6
   - uri-encode ==1.5.0.5
   - uri-templater ==0.3.1.0
+  - urlpath ==8.1.0
   - userid ==0.1.3.2
   - users ==0.5.0.0
   - users-postgresql-simple ==0.5.0.2
@@ -2257,7 +2265,7 @@ default-package-overrides:
   - utility-ht ==0.0.14
   - uuid ==1.3.13
   - uuid-types ==1.0.3
-  - vado ==0.0.9
+  - vado ==0.0.10
   - validation ==1
   - validationt ==0.2.0.0
   - validity ==0.4.0.4
@@ -2340,7 +2348,7 @@ default-package-overrides:
   - web-routes-th ==0.22.6.3
   - web-routes-wai ==0.24.3.1
   - webrtc-vad ==0.1.0.3
-  - websockets ==0.12.5.0
+  - websockets ==0.12.5.1
   - websockets-rpc ==0.6.0
   - websockets-simple ==0.0.6.3
   - websockets-snap ==0.10.3.0
@@ -2644,6 +2652,7 @@ dont-distribute-packages:
   accelerate-fourier-benchmark:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-llvm-ptx:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-yices:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  boolector:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ccelerate-cuda:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cublas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cufft:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 3dd023f343020..9ac88dca83e36 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -98,7 +98,7 @@ let
                         else "package-conf";
 
   # the target dir for haddock documentation
-  docdir = docoutput: docoutput + "/share/doc";
+  docdir = docoutput: docoutput + "/share/doc/" + pname + "-" + version;
 
   newCabalFileUrl = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal";
   newCabalFile = fetchurl {
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 6042f24771f73..55cd821e1a2cc 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2492,6 +2492,7 @@ self: {
        pname = "Cabal";
        version = "2.2.0.1";
        sha256 = "0yqa6fm9jvr0ka6b1mf17bf43092dc1bai6mqyiwwwyz0h9k1d82";
+       setupHaskellDepends = [ mtl parsec ];
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
          mtl parsec pretty process text time transformers unix
@@ -3605,22 +3606,23 @@ self: {
   "DOH" = callPackage
     ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers
      , filepath, http-client, http-client-tls, http-types
-     , interpolatedstring-perl6, lens, mtl, QuickCheck
-     , quickcheck-instances, text, time, unordered-containers, uri
+     , interpolatedstring-perl6, lens, mtl, network-uri, QuickCheck
+     , quickcheck-instances, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "DOH";
-       version = "0.1.2.0";
-       sha256 = "1l70h2213lmpy8mkac4iy9wfcqiqcsp1dvgx9lby470hn77jmg3w";
+       version = "0.1.4.0";
+       sha256 = "1rpmsl07m4qy33axhw39qxay6bw299cs4zqa8nq6w4bcqz44fqav";
        libraryHaskellDepends = [
          aeson aeson-casing base bytestring containers filepath http-client
-         http-client-tls http-types lens mtl text time unordered-containers
-         uri
+         http-client-tls http-types lens mtl network-uri text time
+         unordered-containers
        ];
        testHaskellDepends = [
          aeson aeson-casing base bytestring containers filepath http-client
          http-client-tls http-types interpolatedstring-perl6 lens mtl
-         QuickCheck quickcheck-instances text time unordered-containers uri
+         network-uri QuickCheck quickcheck-instances text time
+         unordered-containers
        ];
        description = "Complete API bindings for DigitalOcean API V2";
        license = stdenv.lib.licenses.mit;
@@ -8069,13 +8071,19 @@ self: {
      }) {};
 
   "HNumeric" = callPackage
-    ({ mkDerivation, base, normaldistribution, random }:
+    ({ mkDerivation, base, math-functions, parallel, parallel-io
+     , random
+     }:
      mkDerivation {
        pname = "HNumeric";
-       version = "0.4.0.0";
-       sha256 = "1vr2i6xm4ix9iym41cp04ipf38hv6n76baf38c8mf25b5cibfblf";
-       libraryHaskellDepends = [ base normaldistribution random ];
-       testHaskellDepends = [ base normaldistribution random ];
+       version = "0.5.0.2";
+       sha256 = "1z6r9z7s89z9bihiy37scjrb8k3gb6zi7fl77d3sdldy2x0ajgrh";
+       libraryHaskellDepends = [
+         base math-functions parallel parallel-io random
+       ];
+       testHaskellDepends = [
+         base math-functions parallel parallel-io random
+       ];
        description = "Haskell Numeric Library with pure functionality, R & MATLAB Syntax";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -8581,28 +8589,6 @@ self: {
      }:
      mkDerivation {
        pname = "HTTP";
-       version = "4000.3.11";
-       sha256 = "0idnclf1gnvqsygppanr0gj6dfvxj1rsz8q7hhahfw82v0wjplps";
-       libraryHaskellDepends = [
-         array base bytestring mtl network network-uri parsec time
-       ];
-       testHaskellDepends = [
-         base bytestring case-insensitive conduit conduit-extra deepseq
-         http-types httpd-shed HUnit mtl network network-uri pureMD5 split
-         test-framework test-framework-hunit wai warp
-       ];
-       description = "A library for client-side HTTP";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HTTP_4000_3_12" = callPackage
-    ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
-     , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
-     , network, network-uri, parsec, pureMD5, split, test-framework
-     , test-framework-hunit, time, wai, warp
-     }:
-     mkDerivation {
-       pname = "HTTP";
        version = "4000.3.12";
        sha256 = "140r6qy1ay25piv0z3hih11zhigyi08nkwc32097j43pjff6mzx3";
        libraryHaskellDepends = [
@@ -8615,7 +8601,6 @@ self: {
        ];
        description = "A library for client-side HTTP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HTTP-Simple" = callPackage
@@ -10005,8 +9990,8 @@ self: {
      }:
      mkDerivation {
        pname = "HsYAML";
-       version = "0.1.1.0";
-       sha256 = "1dih7i0c1fayqrz9x27hfhvg0rb0w1m70a702qhbyjr5jczlh6rb";
+       version = "0.1.1.1";
+       sha256 = "1qxblx2s67n4jmnzai00hqp92iz3kvmzl1pqyx6l9zgllmh94zrh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -10237,6 +10222,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "IPv6Addr_1_0_4" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network
+     , network-info, random, test-framework, test-framework-hunit, text
+     }:
+     mkDerivation {
+       pname = "IPv6Addr";
+       version = "1.0.4";
+       sha256 = "1hgb0jygywhz74mndbk94v7pw9h4wfy902wxhnhdd9rb51dcb0d9";
+       libraryHaskellDepends = [
+         aeson attoparsec base iproute network network-info random text
+       ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit text
+       ];
+       description = "Library to deal with IPv6 address text representations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "IPv6DB" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger
      , hedis, hspec, http-client, http-types, IPv6Addr, mtl
@@ -16970,20 +16974,6 @@ self: {
     ({ mkDerivation, aeson, base, deepseq, hvect, reroute }:
      mkDerivation {
        pname = "Spock-api";
-       version = "0.12.0.0";
-       sha256 = "005ydqf5nq527n3axm8mdi3igsjx76kghabxzfawa9m45yyvrzcc";
-       revision = "1";
-       editedCabalFile = "0w0xah0lirgrs1xvlw5z6saa3wvzdl5r3yq3zxipg7kmrfxgbfbz";
-       libraryHaskellDepends = [ aeson base deepseq hvect reroute ];
-       description = "Another Haskell web framework for rapid development";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "Spock-api_0_12_0_1" = callPackage
-    ({ mkDerivation, aeson, base, deepseq, hvect, reroute }:
-     mkDerivation {
-       pname = "Spock-api";
        version = "0.12.0.1";
        sha256 = "0mg5r6rdcgy1yc1lx739bwhlndwyfb9hx0dcwqii7a5sy20qy960";
        libraryHaskellDepends = [ aeson base deepseq hvect reroute ];
@@ -17012,18 +17002,6 @@ self: {
     ({ mkDerivation, base, hvect, mtl, Spock-api, Spock-core }:
      mkDerivation {
        pname = "Spock-api-server";
-       version = "0.12.0.0";
-       sha256 = "1kiin49jgdbw38cf4x89f00hpdxd2bq4plfasxqyqx9qh8344wr9";
-       libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ];
-       description = "Another Haskell web framework for rapid development";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "Spock-api-server_0_12_0_1" = callPackage
-    ({ mkDerivation, base, hvect, mtl, Spock-api, Spock-core }:
-     mkDerivation {
-       pname = "Spock-api-server";
        version = "0.12.0.1";
        sha256 = "14si03c1xcjfhmjpv717x4ipbd5x7h2sqrld7nnh0pgajzfx8m08";
        libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ];
@@ -19086,6 +19064,8 @@ self: {
        pname = "WordNet";
        version = "1.1.0";
        sha256 = "0b44xxkihafzsw25xx484xxw17zlzzqbj0bx8cs2nvf3p7jxd02k";
+       revision = "2";
+       editedCabalFile = "08i5izbni7xism94h6ncmdvfy88gny2vybapv0fkzgw3wyf6arhq";
        libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
@@ -19098,6 +19078,8 @@ self: {
        pname = "WordNet-ghc74";
        version = "0.1.3";
        sha256 = "1ab5wybawa3dfq89dn0g3zdhsqd03bcm3qky2d4z6irw7afdqrr8";
+       revision = "1";
+       editedCabalFile = "1wdx2xv6zxvwkz3jkkd4vcdf9hyyivbfwyln9dd30m67ip7illp3";
        libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
@@ -21826,34 +21808,6 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-compat";
-       version = "0.3.7.1";
-       sha256 = "1jya3lm9imclhb8qqihv39hhb62vvs3qpws7pc5fc23vwg0hsx2r";
-       revision = "3";
-       editedCabalFile = "1smql0v6b9f4pb3jnrm8kspyq2ygvznk1wkhzp0x7bjd7psrnmy9";
-       libraryHaskellDepends = [
-         aeson attoparsec attoparsec-iso8601 base base-compat bytestring
-         containers exceptions hashable scientific tagged text time
-         time-locale-compat unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base base-compat base-orphans bytestring
-         containers exceptions hashable QuickCheck quickcheck-instances
-         scientific tagged tasty tasty-hunit tasty-quickcheck text time
-         time-locale-compat unordered-containers vector
-       ];
-       description = "Compatibility layer for aeson";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "aeson-compat_0_3_8" = callPackage
-    ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base
-     , base-compat, base-orphans, bytestring, containers, exceptions
-     , hashable, QuickCheck, quickcheck-instances, scientific, tagged
-     , tasty, tasty-hunit, tasty-quickcheck, text, time
-     , time-locale-compat, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "aeson-compat";
        version = "0.3.8";
        sha256 = "0j4v13pgk21zy8hqkbx8hw0n05jdl17qphxz9rj4h333pr547r3i";
        libraryHaskellDepends = [
@@ -21869,7 +21823,6 @@ self: {
        ];
        description = "Compatibility layer for aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-decode" = callPackage
@@ -22004,12 +21957,14 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-filthy";
-       version = "0.1.1";
-       sha256 = "1jv3avgbjrpgp7sfamvrlk04gbiczbjbqw6m88i9b6m45gxs7zaq";
+       version = "0.1.2";
+       sha256 = "1sph4iq87vl66rbxvhhh5j699yskpb8zs1mvc3nvp60nyg1145b8";
        libraryHaskellDepends = [
          aeson base bytestring text unordered-containers
        ];
-       testHaskellDepends = [ base doctest ];
+       testHaskellDepends = [
+         aeson base bytestring doctest text unordered-containers
+       ];
        description = "Several newtypes and combinators for dealing with less-than-cleanly JSON input";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23102,6 +23057,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "alarmclock_0_5_0_1" = callPackage
+    ({ mkDerivation, async, base, clock, hspec, stm, time
+     , unbounded-delays
+     }:
+     mkDerivation {
+       pname = "alarmclock";
+       version = "0.5.0.1";
+       sha256 = "0l357h9admskcqap4dq5niafpvr1dkf3wvrw166rd2568dp061a6";
+       libraryHaskellDepends = [
+         async base clock stm time unbounded-delays
+       ];
+       testHaskellDepends = [
+         async base clock hspec stm time unbounded-delays
+       ];
+       description = "Wake up and perform an action at a certain time";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "alea" = callPackage
     ({ mkDerivation, base, optparse-applicative, random, text }:
      mkDerivation {
@@ -23199,8 +23173,8 @@ self: {
     ({ mkDerivation, base, deepseq, template-haskell, text }:
      mkDerivation {
        pname = "alex-tools";
-       version = "0.3.1";
-       sha256 = "11b7lw8kzzkpaqr6rdh5rcdh21mj5xz2qd9m04rsryvqlxa2y87g";
+       version = "0.4";
+       sha256 = "0qyh3dr5nh7whv3qh431l8x4lx3nzkildlyl3xgnaxpbs8gr8sgi";
        libraryHaskellDepends = [ base deepseq template-haskell text ];
        description = "A set of functions for a common use case of Alex";
        license = stdenv.lib.licenses.isc;
@@ -27415,18 +27389,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "apecs_0_3_0_2" = callPackage
+  "apecs_0_4_0_0" = callPackage
     ({ mkDerivation, async, base, containers, criterion, linear, mtl
      , QuickCheck, template-haskell, vector
      }:
      mkDerivation {
        pname = "apecs";
-       version = "0.3.0.2";
-       sha256 = "1j9vw55z9igpjmll99x0pxz792m0w0n1r8w1sy96kj0jqk5y2l5i";
+       version = "0.4.0.0";
+       sha256 = "0wpjs90q9nwknbn6shk7bazc0kdhllhvg13432h2hckqbmrfp836";
        libraryHaskellDepends = [
          async base containers mtl template-haskell vector
        ];
-       testHaskellDepends = [ base containers QuickCheck vector ];
+       testHaskellDepends = [
+         base containers criterion linear QuickCheck vector
+       ];
        benchmarkHaskellDepends = [ base criterion linear ];
        description = "A fast ECS for game engine programming";
        license = stdenv.lib.licenses.bsd3;
@@ -29529,23 +29505,6 @@ self: {
      }:
      mkDerivation {
        pname = "astro";
-       version = "0.4.2.0";
-       sha256 = "1bj7zmgr4i23ig5jwc9w2sc967569325gdjwyrf6xm100hzw5zc6";
-       libraryHaskellDepends = [ base matrix time ];
-       testHaskellDepends = [
-         base HUnit QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2 time
-       ];
-       description = "Amateur astronomical computations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "astro_0_4_2_1" = callPackage
-    ({ mkDerivation, base, HUnit, matrix, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, time
-     }:
-     mkDerivation {
-       pname = "astro";
        version = "0.4.2.1";
        sha256 = "0agy9a91n1sy6rgdgwvdz354x452j2lg7nr3by7z9r22rwdxwpfs";
        libraryHaskellDepends = [ base matrix time ];
@@ -29555,7 +29514,6 @@ self: {
        ];
        description = "Amateur astronomical computations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "astview" = callPackage
@@ -32297,22 +32255,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "backprop_0_2_4_0" = callPackage
+  "backprop_0_2_5_0" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, directory
-     , hmatrix, lens, microlens, mwc-random, primitive, reflection
-     , simple-reflect, time, transformers, type-combinators, vector
+     , hmatrix, microlens, microlens-th, mwc-random, primitive
+     , reflection, simple-reflect, time, transformers, vector, vinyl
      }:
      mkDerivation {
        pname = "backprop";
-       version = "0.2.4.0";
-       sha256 = "0l53ixz171nv92wgmrj7zcv458svg3b3zrxn3a8rx5aphb3m9vwc";
+       version = "0.2.5.0";
+       sha256 = "1xbbmv6cp9n21x2bqpr0p4cls994mchxp7hd7k6ib83avr0vwbda";
        libraryHaskellDepends = [
          base containers deepseq microlens primitive reflection
-         simple-reflect transformers type-combinators vector
+         simple-reflect transformers vector vinyl
        ];
        benchmarkHaskellDepends = [
-         base criterion deepseq directory hmatrix lens mwc-random time
-         vector
+         base criterion deepseq directory hmatrix microlens microlens-th
+         mwc-random time vector
        ];
        description = "Heterogeneous automatic differentation";
        license = stdenv.lib.licenses.bsd3;
@@ -32634,8 +32592,8 @@ self: {
      }:
      mkDerivation {
        pname = "barbies";
-       version = "0.1.0.1";
-       sha256 = "1mflfgwcz5krncfx5gx60n1j5x624y55kskmrp3nns4ihlrk6m7a";
+       version = "0.1.2.0";
+       sha256 = "1n8m6qi30fz5xx67v0l7dsirrpd8h0smb7qd8d1q3w83yi606kvl";
        libraryHaskellDepends = [ base bifunctors ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "Classes for working with types that can change clothes";
@@ -33137,33 +33095,31 @@ self: {
      }) {};
 
   "baserock-schema" = callPackage
-    ({ mkDerivation, algebraic-graphs, base, bytestring, docopt, errors
-     , flippers, gitlab-api, hspec, microlens-platform, mtl, QuickCheck
-     , rio, yaml, yaml-pretty-extras
+    ({ mkDerivation, aeson, base, etc, gitlab-api, hashable, hspec
+     , lens-aeson, microlens-platform, QuickCheck, rio
+     , yaml-pretty-extras
      }:
      mkDerivation {
        pname = "baserock-schema";
-       version = "0.0.2.0";
-       sha256 = "02lz48177jrnn7fwk7kjlh38a6kv7f197skf69mx0xgs88xjwrn9";
+       version = "0.0.3.4";
+       sha256 = "19r072s5032wcs4j647naixmk3j7h4ppniar78f6hxlkcz1hsc10";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         algebraic-graphs base errors flippers microlens-platform mtl rio
-         yaml yaml-pretty-extras
+         aeson base microlens-platform rio yaml-pretty-extras
        ];
        executableHaskellDepends = [
-         algebraic-graphs base docopt errors flippers gitlab-api
-         microlens-platform mtl rio yaml yaml-pretty-extras
+         aeson base etc gitlab-api hashable lens-aeson microlens-platform
+         rio yaml-pretty-extras
        ];
        testHaskellDepends = [
-         algebraic-graphs base bytestring errors flippers hspec
-         microlens-platform mtl QuickCheck rio yaml yaml-pretty-extras
+         aeson base hspec microlens-platform QuickCheck rio
+         yaml-pretty-extras
        ];
        description = "Baserock Definitions Schema";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {gitlab-api = null;};
+     }) {};
 
   "basex-client" = callPackage
     ({ mkDerivation, base, network, pureMD5, utf8-string }:
@@ -37327,27 +37283,6 @@ self: {
      }:
      mkDerivation {
        pname = "blaze-html";
-       version = "0.9.0.1";
-       sha256 = "0r0acv47nh75bmf7kjyfvhcwz8f02rn9x0a1l80pzgyczfrsmkmf";
-       libraryHaskellDepends = [
-         base blaze-builder blaze-markup bytestring text
-       ];
-       testHaskellDepends = [
-         base blaze-builder blaze-markup bytestring containers HUnit
-         QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2 text
-       ];
-       description = "A blazingly fast HTML combinator library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "blaze-html_0_9_1_1" = callPackage
-    ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring
-     , containers, HUnit, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text
-     }:
-     mkDerivation {
-       pname = "blaze-html";
        version = "0.9.1.1";
        sha256 = "06xv8fqhclfjj61z74cgggn4lmx1s7diakxg84mnkgfvk11983pa";
        libraryHaskellDepends = [
@@ -37360,7 +37295,6 @@ self: {
        ];
        description = "A blazingly fast HTML combinator library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blaze-html-contrib" = callPackage
@@ -38321,6 +38255,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "boolector" = callPackage
+    ({ mkDerivation, base, boolector, c2hs, containers, mtl }:
+     mkDerivation {
+       pname = "boolector";
+       version = "0.0.0.1";
+       sha256 = "00ngv3asmn58bli7hb3033yn98zj0680m2skid2021p3kv4km3c4";
+       libraryHaskellDepends = [ base containers mtl ];
+       librarySystemDepends = [ boolector ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [ base ];
+       testSystemDepends = [ boolector ];
+       description = "Haskell bindings for the Boolector SMT solver";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) boolector;};
+
   "boolexpr" = callPackage
     ({ mkDerivation, base, parsec }:
      mkDerivation {
@@ -39117,8 +39067,8 @@ self: {
        pname = "brittany";
        version = "0.11.0.0";
        sha256 = "1fgcim4q5y7csk8c038rm97w6b8bgynmi6h1dwyr2hsmzw9hxa26";
-       revision = "1";
-       editedCabalFile = "1v5k1gsy9d1xrw1qw1mdhm00ryalnd3dp531sc44lx8brgxypywf";
+       revision = "2";
+       editedCabalFile = "1f20w6zzbygnpa7f6xbaqxx34l62r53ikywg2snn0zkfizf3lcgx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39479,8 +39429,8 @@ self: {
      }:
      mkDerivation {
        pname = "buffer-builder";
-       version = "0.2.4.5";
-       sha256 = "08g47zaqrh40lvkwijpx3x8xflpnjvrijd9bsfv0m94139xrncmc";
+       version = "0.2.4.6";
+       sha256 = "0r2xn5rc9kg99zcx5x8p15mm6isk0vdr4szc0vyywbj1k96kwf2l";
        libraryHaskellDepends = [
          base bytestring mtl text unordered-containers vector
        ];
@@ -39933,8 +39883,8 @@ self: {
      }:
      mkDerivation {
        pname = "butter";
-       version = "0.1.0.2";
-       sha256 = "13by76xgxkjqfdgsfdsc20r8nfcjwg00wp3yr1jwcjq2acqxm3ak";
+       version = "0.1.0.6";
+       sha256 = "0r215qycck6w6286w0y69ghpzmcp1bl23j44arabrh2p39lb4h46";
        libraryHaskellDepends = [
          aeson base bytestring containers forkable-monad free HUnit
          network-simple stm template-haskell text transformers
@@ -45878,8 +45828,8 @@ self: {
     ({ mkDerivation, base, criterion, QuickCheck, random }:
      mkDerivation {
        pname = "cl3";
-       version = "1.0.0.0";
-       sha256 = "1a15nbx0q260bs5bh10vckvlbzfgjs5f676r3drki77hggkidvjh";
+       version = "1.0.0.1";
+       sha256 = "0wgmzygjwyb6djlmxj9k7ffwp60jf3lai8jki525r4as5rggyypi";
        libraryHaskellDepends = [ base random ];
        testHaskellDepends = [ base QuickCheck ];
        benchmarkHaskellDepends = [ base criterion ];
@@ -46916,8 +46866,8 @@ self: {
      }:
      mkDerivation {
        pname = "clifm";
-       version = "0.5.0.0";
-       sha256 = "1j3a3d17y3cxzq5c01j2vylgdc4380vg2bs2s44k9yxjpry1dv28";
+       version = "0.5.2.1";
+       sha256 = "0prbasvk804mzdwjzprj7v1s1wjzlqjih0pdzi1vdskfqjcyy9n2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -49685,14 +49635,13 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "composition-prelude_1_5_0_0" = callPackage
-    ({ mkDerivation, base, cpphs }:
+  "composition-prelude_1_5_0_5" = callPackage
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "composition-prelude";
-       version = "1.5.0.0";
-       sha256 = "01rbbqnwmm615af1yrg4afk4dvv24y2k52m6c1rz9xkyyg8ii0hq";
+       version = "1.5.0.5";
+       sha256 = "0nap1qfvp7zjw2z0fz1z700wx27wlgihavp2x4h5jz9jc80ssmra";
        libraryHaskellDepends = [ base ];
-       libraryToolDepends = [ cpphs ];
        description = "Higher-order function combinators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50473,6 +50422,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "conduit_1_3_0_3" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, directory
+     , exceptions, filepath, gauge, hspec, kan-extensions
+     , mono-traversable, mtl, mwc-random, primitive, QuickCheck
+     , resourcet, safe, silently, split, text, transformers, unix
+     , unliftio, unliftio-core, vector
+     }:
+     mkDerivation {
+       pname = "conduit";
+       version = "1.3.0.3";
+       sha256 = "1sangm0qqi9dzlq95746a3kl14k8b09592a423shxjf2a0b1yx5v";
+       libraryHaskellDepends = [
+         base bytestring directory exceptions filepath mono-traversable mtl
+         primitive resourcet text transformers unix unliftio-core vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers directory exceptions filepath hspec
+         mono-traversable mtl QuickCheck resourcet safe silently split text
+         transformers unliftio vector
+       ];
+       benchmarkHaskellDepends = [
+         base containers deepseq gauge hspec kan-extensions mwc-random
+         transformers vector
+       ];
+       description = "Streaming data processing library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-algorithms" = callPackage
     ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
      , conduit-combinators, conduit-extra, containers, criterion
@@ -51670,15 +51648,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "containers_0_5_11_0" = callPackage
+  "containers_0_6_0_1" = callPackage
     ({ mkDerivation, array, base, ChasingBottoms, criterion, deepseq
      , ghc-prim, HUnit, QuickCheck, random, test-framework
      , test-framework-hunit, test-framework-quickcheck2, transformers
      }:
      mkDerivation {
        pname = "containers";
-       version = "0.5.11.0";
-       sha256 = "0j29w09kvcn1c0yi4clmrdbgs2gqmpxs2m7q80ib2ix1smm25kaq";
+       version = "0.6.0.1";
+       sha256 = "0smc1g58l968jxcjxhxcd4qpfm4zk7zr6r4q6wf6ay75av9rf4d7";
        libraryHaskellDepends = [ array base deepseq ghc-prim ];
        testHaskellDepends = [
          array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck
@@ -51737,10 +51715,8 @@ self: {
     ({ mkDerivation, containers }:
      mkDerivation {
        pname = "containers-verified";
-       version = "0.5.11.0";
-       sha256 = "01qcsxrrg2zjqnd1r4i2m8a1wb9nyyss32rckfs7wni42ladzj07";
-       revision = "3";
-       editedCabalFile = "092g7yj27pxpap1qh4spp2yvb1y22jaca9s4x36rnkafvqn0yyl3";
+       version = "0.6.0.1";
+       sha256 = "08cwfn71ffvjfp252l3whic90rqyq1jvrk0m9xp54kh3g2rdqma9";
        libraryHaskellDepends = [ containers ];
        description = "Formally verified drop-in replacement of containers";
        license = stdenv.lib.licenses.mit;
@@ -59928,14 +59904,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "dejafu_1_9_1_0" = callPackage
+  "dejafu_1_10_1_0" = callPackage
     ({ mkDerivation, base, concurrency, containers, contravariant
      , deepseq, exceptions, leancheck, profunctors, random, transformers
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "1.9.1.0";
-       sha256 = "1bkyy3dsd24gwzng87w85j42wkmycjkqg78nvcragdhvjh1bsv3v";
+       version = "1.10.1.0";
+       sha256 = "17ib90sy40ynlpjagq7f2r2kw040qjgrhwnbncyicaravips3vva";
        libraryHaskellDepends = [
          base concurrency containers contravariant deepseq exceptions
          leancheck profunctors random transformers
@@ -60331,8 +60307,8 @@ self: {
      }:
      mkDerivation {
        pname = "derive";
-       version = "2.6.3";
-       sha256 = "06m3m1jsvms1nvgm6b83p28ma61h8ldagl7a3fsjp8hswpr0hgpj";
+       version = "2.6.4";
+       sha256 = "08vhs17h6lzgdr2b0iyl8scilfivvir5fav1qxxpqmdm7f8f8dis";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -60480,8 +60456,8 @@ self: {
      }:
      mkDerivation {
        pname = "deriving-compat";
-       version = "0.4.2";
-       sha256 = "0vwpir5sd0x0r5ml83qg9hrwyq1s2psalpl8m007mh3hr8d4wgvz";
+       version = "0.4.3";
+       sha256 = "1c3m6x05q5d0vzkjp2x3m8nlfl9qq6qglncsz69cmd637nhjxp10";
        libraryHaskellDepends = [
          base containers ghc-boot-th ghc-prim template-haskell
          th-abstraction transformers transformers-compat
@@ -60725,6 +60701,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dfinity-radix-tree" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bloomfilter
+     , BoundedChan, bytestring, cmdargs, conduit, containers
+     , cryptohash-sha256, data-default-class, deepseq, ghc-prim
+     , lens-simple, leveldb-haskell, lrucaching, resourcet, semigroups
+     , serialise, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "dfinity-radix-tree";
+       version = "0.0.0";
+       sha256 = "1ksxg3qf7g5hnsrcl3bfcdq81v05xk787g4ry4qj3vlkwss5pcnc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base16-bytestring bloomfilter BoundedChan bytestring conduit
+         containers cryptohash-sha256 data-default-class deepseq ghc-prim
+         lens-simple leveldb-haskell lrucaching resourcet semigroups
+         serialise
+       ];
+       executableHaskellDepends = [
+         aeson base base16-bytestring bytestring cmdargs cryptohash-sha256
+         data-default-class resourcet text unordered-containers
+       ];
+       description = "A Merkleized key–value data store";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "dfrac" = callPackage
     ({ mkDerivation, base, scientific }:
      mkDerivation {
@@ -61317,10 +61320,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-core";
-       version = "1.4.1";
-       sha256 = "0zirk4v8qbyv0zbalh28ms9njafnj4z579dvrjvxbg6gqqcx3mcl";
-       revision = "2";
-       editedCabalFile = "1q5h4gsin9p6cx0nypjyp6a1rmpr76n4dvw8hscack4gp9a8pjvl";
+       version = "1.4.1.1";
+       sha256 = "10mnicfyvawy3jlpgf656fx2y4836x04p3z1lpgyyr1nkvwyk0m1";
        libraryHaskellDepends = [
          adjunctions base containers distributive dual-tree lens linear
          monoid-extras mtl profunctors semigroups unordered-containers
@@ -61624,8 +61625,8 @@ self: {
        pname = "diagrams-solve";
        version = "0.1.1";
        sha256 = "17agchqkmj14b17sw50kzxq4hm056g5d8yy0wnqn5w8h1d0my7x4";
-       revision = "1";
-       editedCabalFile = "1aabxq020ycmwynm96dvqh9xbvcsw7s4593kca35i4zl2kzg14bb";
+       revision = "2";
+       editedCabalFile = "1zgpx0jmgfr3mg77w3nz08cmgzlwfav2c6bcn68f53z829a6y5lf";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base deepseq tasty tasty-hunit tasty-quickcheck
@@ -61983,6 +61984,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "diffmap" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "diffmap";
+       version = "0.1.0.0";
+       sha256 = "0i6dyvp8ds1wz9jm7nva076pc18mz24fiz50gqgq3xv76aghl0i0";
+       libraryHaskellDepends = [ base containers ];
+       description = "diff on maps";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "difftodo" = callPackage
     ({ mkDerivation, base, bytestring, diff-parse, highlighter2
      , optparse-applicative, pretty-show, process, protolude, tasty
@@ -63101,30 +63113,6 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process";
-       version = "0.7.3";
-       sha256 = "1m771siv3dvrc1i3pxl3iqrnz63wvq6i80wyvi5m64m16xgiisg5";
-       revision = "1";
-       editedCabalFile = "0vrk3lrrsc7rrzrkfqcc5q36clr8cy51v6dv4hpmi89fyngx6lz5";
-       libraryHaskellDepends = [
-         base binary bytestring containers data-accessor deepseq
-         distributed-static exceptions hashable mtl network-transport random
-         rank1dynamic stm syb template-haskell time transformers
-       ];
-       benchmarkHaskellDepends = [
-         base binary bytestring network-transport-tcp
-       ];
-       description = "Cloud Haskell: Erlang-style concurrency in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "distributed-process_0_7_4" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers
-     , data-accessor, deepseq, distributed-static, exceptions, hashable
-     , mtl, network-transport, network-transport-tcp, random
-     , rank1dynamic, stm, syb, template-haskell, time, transformers
-     }:
-     mkDerivation {
-       pname = "distributed-process";
        version = "0.7.4";
        sha256 = "01ck0vhy8rrilyph6ijpxdmh9jijfbx2ri7k2hmacbblwj4bzafq";
        libraryHaskellDepends = [
@@ -63137,7 +63125,6 @@ self: {
        ];
        description = "Cloud Haskell: Erlang-style concurrency in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-async" = callPackage
@@ -64194,14 +64181,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "docker-build-cacher_1_9_4" = callPackage
+  "docker-build-cacher_2_0_0" = callPackage
     ({ mkDerivation, base, containers, foldl, language-docker
      , system-filepath, text, turtle
      }:
      mkDerivation {
        pname = "docker-build-cacher";
-       version = "1.9.4";
-       sha256 = "1p62q8hq19zgjwaqgclkjqh6ylpbr5jxw82f36xzqximws1jsmkp";
+       version = "2.0.0";
+       sha256 = "1y5w6l75fvszx33f254a6sncvb3wab0iq7dci3qbj7s2147vl63n";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -66274,8 +66261,8 @@ self: {
      }:
      mkDerivation {
        pname = "eap";
-       version = "0.9.0.1";
-       sha256 = "0z7ab3i16424gpxwjhc4x7c55yhvzx5qjm80f2klpf94zz4w37ab";
+       version = "0.9.0.2";
+       sha256 = "0bgx7sxpmvhd84j7kkqznazw7p1fl862w7jxlap473g2q5365kqc";
        libraryHaskellDepends = [
          base binary bytestring cryptonite memory mtl pretty-hex
        ];
@@ -67556,14 +67543,14 @@ self: {
      }) {};
 
   "elf" = callPackage
-    ({ mkDerivation, base, binary, bytestring }:
+    ({ mkDerivation, base, binary, bytestring, containers, hspec }:
      mkDerivation {
        pname = "elf";
-       version = "0.28";
-       sha256 = "0mzikwgd3dnzjgj1xa69lgrs38pnvwffvblckrqnwf0h7fd149wy";
-       enableSeparateDataOutput = true;
+       version = "0.29";
+       sha256 = "1b4g98fk1p8mk0zdh6fwzm3vnzcrhvpysx4g4ahcbgbr4bqhjra2";
        libraryHaskellDepends = [ base binary bytestring ];
-       description = "Parser for ELF object format";
+       testHaskellDepends = [ base bytestring containers hspec ];
+       description = "An Elf parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -68168,8 +68155,8 @@ self: {
      }:
      mkDerivation {
        pname = "emailparse";
-       version = "0.2.0.9";
-       sha256 = "13fg4sly6a3v8xy9prrn9nh3ly14y8k2jghr9b7dmyi7pvmlpss7";
+       version = "0.2.0.10";
+       sha256 = "0w6jkimaiy1ld6aydmq5jz4g248awkj4wnpq6knpn0wfxjsqz0r8";
        libraryHaskellDepends = [
          attoparsec base bytestring either either-unwrap mime MissingH
          strptime text text-icu time word8
@@ -71350,8 +71337,8 @@ self: {
      }:
      mkDerivation {
        pname = "expressions";
-       version = "0.1.7";
-       sha256 = "0pg5hxnxj0zm4s4miw9xjqw2yipd29lqj00svhrsf1pqkb5n98x0";
+       version = "0.1.8";
+       sha256 = "18ys1937sf8lw07mavg4r7f5l6j9sygmx7szp5lxvs12l95x0jfb";
        libraryHaskellDepends = [
          attoparsec base containers free lattices singletons text
          transformers
@@ -71368,8 +71355,8 @@ self: {
      }:
      mkDerivation {
        pname = "expressions-z3";
-       version = "0.1.5";
-       sha256 = "07ah8bb7pv1jzj4aa783s8axh909hnysfy21x9slwgc8nwlx6rcr";
+       version = "0.1.6";
+       sha256 = "0la7acpr9vd67crgj87920wlckyhzvilz9jv86ms1hiwwmvl1c7a";
        libraryHaskellDepends = [
          base containers expressions list-t singletons transformers z3
        ];
@@ -71759,6 +71746,17 @@ self: {
        license = "GPL";
      }) {};
 
+  "facts" = callPackage
+    ({ mkDerivation, base, exceptions, mtl, template-haskell }:
+     mkDerivation {
+       pname = "facts";
+       version = "0.0.1.0";
+       sha256 = "12ifja6vgm8hafs23fzb2jfk0jiz4nss1if5b86950y3mc995rfx";
+       libraryHaskellDepends = [ base exceptions mtl template-haskell ];
+       description = "Refined types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "factual-api" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , curl, dataenc, hoauth, HTTP, MissingH, text, unordered-containers
@@ -72289,6 +72287,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fastly" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, bytestring-lexing, hspec
+     , http-client, http-client-tls, http-types, iproute, mtl
+     , old-locale, text, thyme, unordered-containers, wai
+     }:
+     mkDerivation {
+       pname = "fastly";
+       version = "0.1.0.0";
+       sha256 = "0b23dh7cfbjmynqbzc44kz5809dg3zx8i32sdglb1b0nxhabnp7b";
+       libraryHaskellDepends = [
+         aeson base bytestring bytestring-lexing http-client http-client-tls
+         http-types iproute mtl old-locale text thyme unordered-containers
+         wai
+       ];
+       testHaskellDepends = [ base hspec text ];
+       description = "A highly experimental Fastly API client";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fastparser" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-lexing, containers
      , criterion, kan-extensions, microlens, thyme, transformers
@@ -74140,6 +74157,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "firebase-database" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
+     , generic-random, HsOpenSSL, hspec, http-client, http-client-tls
+     , http-streams, http-types, io-streams, lens, mtl, nano-http
+     , QuickCheck, split, string-conversions, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "firebase-database";
+       version = "0.0.1";
+       sha256 = "1pwf4jb2kajs21dlq7qz90s3xzv05h1mblra1yszq3gkvz8afalh";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring generic-random HsOpenSSL
+         http-client http-client-tls http-streams http-types io-streams lens
+         mtl nano-http split string-conversions text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base bytestring generic-random HsOpenSSL hspec
+         http-client http-client-tls http-streams http-types io-streams lens
+         mtl nano-http QuickCheck split string-conversions text
+         unordered-containers
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       description = "Google Firebase Database SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {nano-http = null;};
+
   "firefly" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, bytestring
      , case-insensitive, containers, cookie, http-types, mtl, regex-pcre
@@ -74823,21 +74868,22 @@ self: {
      }) {};
 
   "flat" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, cpu, deepseq
-     , derive, dlist, ghc-prim, mono-traversable, pretty, primitive
-     , tasty, tasty-hunit, tasty-quickcheck, text, transformers, vector
+    ({ mkDerivation, array, base, bytestring, containers, deepseq
+     , dlist, doctest, filemanip, ghc-prim, mono-traversable, pretty
+     , primitive, quickcheck-instances, tasty, tasty-hunit
+     , tasty-quickcheck, text, vector
      }:
      mkDerivation {
        pname = "flat";
-       version = "0.3";
-       sha256 = "10kn80qydxmfkbgx0j35f478i781lhn52c76ijsww5iccm889ykw";
+       version = "0.3.2";
+       sha256 = "0489w132m6j47m0jf1svwvql3fmw58iz9l2rqnhn4c5gg91wj53q";
        libraryHaskellDepends = [
-         array base bytestring containers cpu deepseq dlist ghc-prim
-         mono-traversable pretty primitive text transformers vector
+         array base bytestring containers deepseq dlist ghc-prim
+         mono-traversable pretty primitive text vector
        ];
        testHaskellDepends = [
-         base bytestring containers cpu deepseq derive ghc-prim pretty tasty
-         tasty-hunit tasty-quickcheck text
+         base bytestring containers deepseq doctest filemanip ghc-prim
+         quickcheck-instances tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Principled and efficient bit-oriented binary serialization";
        license = stdenv.lib.licenses.bsd3;
@@ -76176,8 +76222,8 @@ self: {
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "forkable-monad";
-       version = "0.2.0.2";
-       sha256 = "19a4wagdj2d66w7ka9s480rq3d0i3n5q0zyi2v9sckb6lj3lx175";
+       version = "0.2.0.3";
+       sha256 = "0qnl3bvqiwh6d7lm3w06is5ivh025c7024695m7fzajvzbpk67jp";
        libraryHaskellDepends = [ base transformers ];
        description = "An implementation of forkIO for monad stacks";
        license = stdenv.lib.licenses.bsd3;
@@ -78326,8 +78372,8 @@ self: {
      }:
      mkDerivation {
        pname = "funflow";
-       version = "1.0.0";
-       sha256 = "1lcww83dzhbmml5l4yrypbw18l8x1m3pzblcnmgd90a9874gmq0f";
+       version = "1.0.1";
+       sha256 = "114fi0z54cl93ympb1vir1fc55q8ijbg09ax4v8k05nmb916p2s0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -79084,6 +79130,20 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "gdp" = callPackage
+    ({ mkDerivation, base, lawful }:
+     mkDerivation {
+       pname = "gdp";
+       version = "0.0.0.2";
+       sha256 = "1gqs19wjyng0nacwvi7sjxnhnxjy2az0jwjyy6w2r5g4w9dgykr1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base lawful ];
+       executableHaskellDepends = [ base ];
+       description = "Reason about invariants and preconditions with ghosts of departed proofs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gearbox" = callPackage
     ({ mkDerivation, base, GLUT, OpenGLRaw, Vec }:
      mkDerivation {
@@ -80879,8 +80939,8 @@ self: {
      }:
      mkDerivation {
        pname = "geodetics";
-       version = "0.0.5";
-       sha256 = "1fpfdn4bhdqjnrhiqd8yg5j4vs3rwlsr6nav3cjrvrhynlmqlcaq";
+       version = "0.0.6";
+       sha256 = "0hp5p6m6szj1h5hzmrs3pyj4cfvcvkgdc95s5xa0lcxc3z8bn7g2";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base dimensional ];
        testHaskellDepends = [
@@ -84404,6 +84464,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "gitlab-api" = callPackage
+    ({ mkDerivation, aeson, base, hspec, http-conduit, http-types
+     , microlens-platform, rio, yaml
+     }:
+     mkDerivation {
+       pname = "gitlab-api";
+       version = "0.0.0.2";
+       sha256 = "1lfwsqhncj3sp7h6ixmm0yv9vnby9qfi2y4q980d9d473mzvy7rv";
+       libraryHaskellDepends = [
+         aeson base http-conduit http-types microlens-platform rio yaml
+       ];
+       testHaskellDepends = [ base hspec rio ];
+       description = "Gitlab Web API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gitlib" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, conduit
      , conduit-combinators, containers, directory, exceptions, filepath
@@ -84743,6 +84819,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "glabrous_0_3_6" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+     , cereal, cereal-text, directory, either, hspec, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "glabrous";
+       version = "0.3.6";
+       sha256 = "1ba1smngfq6xqwcbfg10sy2qjxh7miyd8qbfmmv14klzwimk44ri";
+       libraryHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring cereal cereal-text
+         either text unordered-containers
+       ];
+       testHaskellDepends = [
+         base directory either hspec text unordered-containers
+       ];
+       description = "A template DSL library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "glade" = callPackage
     ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools
      , libglade
@@ -88937,15 +89034,15 @@ self: {
   "greskell" = callPackage
     ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover
      , greskell-core, hint, hspec, semigroups, text, transformers
-     , unordered-containers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "greskell";
-       version = "0.1.1.0";
-       sha256 = "1mf1fgp1i3pxayhgkc4jmx3fjx3s16vcn9n2jbg750d6nif6yyxi";
+       version = "0.2.0.0";
+       sha256 = "0zj7gcj4a4msgnzafhy7wh5npwfc5rnn4lnmr5h33q7impws1fgz";
        libraryHaskellDepends = [
          aeson base greskell-core semigroups text transformers
-         unordered-containers
+         unordered-containers vector
        ];
        testHaskellDepends = [
          aeson base bytestring doctest doctest-discover greskell-core hint
@@ -88957,23 +89054,48 @@ self: {
      }) {};
 
   "greskell-core" = callPackage
-    ({ mkDerivation, aeson, base, doctest, doctest-discover, hspec
-     , QuickCheck, scientific, semigroups, text, unordered-containers
+    ({ mkDerivation, aeson, base, bytestring, containers, doctest
+     , doctest-discover, hashable, hspec, QuickCheck, scientific
+     , semigroups, text, unordered-containers, uuid, vector
      }:
      mkDerivation {
        pname = "greskell-core";
-       version = "0.1.1.0";
-       sha256 = "0in0ilj337zm00qg0qxcmiai8xvlni5vz4sz0h0dmc3pmg57zmh0";
+       version = "0.1.2.0";
+       sha256 = "1246z4zz5jzwbjikkrld3j667kp26v1b135xd62r3akcplxagzd9";
        libraryHaskellDepends = [
-         aeson base scientific semigroups text unordered-containers
+         aeson base containers hashable scientific semigroups text
+         unordered-containers uuid vector
        ];
        testHaskellDepends = [
-         aeson base doctest doctest-discover hspec QuickCheck text
+         aeson base bytestring doctest doctest-discover hspec QuickCheck
+         text unordered-containers vector
        ];
        description = "Haskell binding for Gremlin graph query language - core data types and tools";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "greskell-websocket" = callPackage
+    ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
+     , greskell-core, hashtables, hspec, safe-exceptions, stm, text
+     , unordered-containers, uuid, vector, websockets
+     }:
+     mkDerivation {
+       pname = "greskell-websocket";
+       version = "0.1.0.0";
+       sha256 = "171pr07dlsvkmj0jqr60dc6a4g8sfqaz0hvwwfagzklg31m961mq";
+       libraryHaskellDepends = [
+         aeson async base base64-bytestring bytestring greskell-core
+         hashtables safe-exceptions stm text unordered-containers uuid
+         vector websockets
+       ];
+       testHaskellDepends = [
+         aeson base bytestring greskell-core hspec unordered-containers uuid
+         vector
+       ];
+       description = "Haskell client for Gremlin Server using WebSocket serializer";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "grid" = callPackage
     ({ mkDerivation, base, cereal, containers, QuickCheck
      , test-framework, test-framework-quickcheck2
@@ -89731,8 +89853,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk-sni-tray";
-       version = "0.1.3.1";
-       sha256 = "1wsq7d47px11c64k38nqxms408yd4il35ai8r53p76qnd04s8saw";
+       version = "0.1.3.2";
+       sha256 = "0rqv0a6d1si4l0rl8c0w2i5hz4g4saafbvm93mhw35dixdvaqdsw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92042,8 +92164,8 @@ self: {
      }:
      mkDerivation {
        pname = "hadolint";
-       version = "1.7.2";
-       sha256 = "15z8xyx9dd3wb2fdrbhh5kmd32njr586h76x0rdp4kddij7a5x56";
+       version = "1.7.5";
+       sha256 = "0a0m67flsnnbh9ch6pb135avvriy0scpfx39f38d9zwr8lrrs5p3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -93458,32 +93580,6 @@ self: {
      }:
      mkDerivation {
        pname = "hapistrano";
-       version = "0.3.5.6";
-       sha256 = "0viv359hv3wzdhnfzmq4ynbxyr3a347q7ixarwff85nn9zx7kw2c";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base filepath formatting gitrev mtl path process time transformers
-       ];
-       executableHaskellDepends = [
-         aeson async base formatting gitrev optparse-applicative path
-         path-io stm yaml
-       ];
-       testHaskellDepends = [
-         base directory filepath hspec mtl path path-io process temporary
-       ];
-       description = "A deployment library for Haskell applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hapistrano_0_3_5_7" = callPackage
-    ({ mkDerivation, aeson, async, base, directory, filepath
-     , formatting, gitrev, hspec, mtl, optparse-applicative, path
-     , path-io, process, stm, temporary, time, transformers, yaml
-     }:
-     mkDerivation {
-       pname = "hapistrano";
        version = "0.3.5.7";
        sha256 = "0fis5g2fg0x5pw7r0p7qy090v90gzqza5qjnpzinnq1yipmr872p";
        isLibrary = true;
@@ -93501,7 +93597,6 @@ self: {
        ];
        description = "A deployment library for Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happindicator" = callPackage
@@ -94587,8 +94682,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasbolt-extras";
-       version = "0.0.0.10";
-       sha256 = "1h1cz15x531y0h7ss79jbhziypjwwjl70w5hrpcljdfy1kkcgd2m";
+       version = "0.0.0.11";
+       sha256 = "1x0dm5x4jr1k619s7ad78bb717c8572s8pakailf8g2wsyc340gr";
        libraryHaskellDepends = [
          base containers free hasbolt lens mtl neat-interpolation
          template-haskell text th-lift-instances
@@ -96388,6 +96483,8 @@ self: {
        pname = "haskell-src-exts";
        version = "1.19.1";
        sha256 = "0wd93cqzdk1wq8csha8c8sphksi2jb3gr9g8rk3m9mkkfs3b5xgh";
+       revision = "1";
+       editedCabalFile = "120jvvksnzj3dfgxx1774asalw4wn2i507n3lyhfp95k9z1ny5rh";
        libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
        libraryToolDepends = [ happy ];
        testHaskellDepends = [
@@ -96527,6 +96624,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-src-meta_0_8_0_3" = callPackage
+    ({ mkDerivation, base, haskell-src-exts, HUnit, pretty, syb
+     , template-haskell, test-framework, test-framework-hunit
+     , th-orphans
+     }:
+     mkDerivation {
+       pname = "haskell-src-meta";
+       version = "0.8.0.3";
+       sha256 = "08jq156zv4m0fjq6712n99c1jwxnpa6kj6sq8ch0r1l0a1ay6ww4";
+       libraryHaskellDepends = [
+         base haskell-src-exts pretty syb template-haskell th-orphans
+       ];
+       testHaskellDepends = [
+         base haskell-src-exts HUnit pretty template-haskell test-framework
+         test-framework-hunit
+       ];
+       description = "Parse source to template-haskell abstract syntax";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-src-meta-mwotton" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, haskell-src-exts
      , pretty, syb, template-haskell
@@ -98382,25 +98500,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hasql_1_3_0_1" = callPackage
+  "hasql_1_3_0_2" = callPackage
     ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring
      , bytestring-strict-builder, contravariant, contravariant-extras
      , criterion, data-default-class, dlist, hashable, hashtables
      , loch-th, mtl, placeholders, postgresql-binary, postgresql-libpq
      , profunctors, QuickCheck, quickcheck-instances, rebase, rerebase
-     , semigroups, tasty, tasty-hunit, tasty-quickcheck, text
-     , text-builder, transformers, vector
+     , tasty, tasty-hunit, tasty-quickcheck, text, text-builder
+     , transformers, vector
      }:
      mkDerivation {
        pname = "hasql";
-       version = "1.3.0.1";
-       sha256 = "07v79w80k0xrvr4whlcx205a9fpdvlbqdzhq911r7sh3df10kg8f";
+       version = "1.3.0.2";
+       sha256 = "12xq08y54r6fia9nk4cp9gqflmml7b0zd8xhgnx3ylycl8r52h8m";
        libraryHaskellDepends = [
          attoparsec base base-prelude bytestring bytestring-strict-builder
          contravariant contravariant-extras data-default-class dlist
          hashable hashtables loch-th mtl placeholders postgresql-binary
-         postgresql-libpq profunctors semigroups text text-builder
-         transformers vector
+         postgresql-libpq profunctors text text-builder transformers vector
        ];
        testHaskellDepends = [
          bug data-default-class QuickCheck quickcheck-instances rebase
@@ -104507,8 +104624,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "2.1.5";
-       sha256 = "00kib9b80s0bhdv267dgybl68knmzzmq7n0maygzc0kxc9k1bwj1";
+       version = "2.1.6";
+       sha256 = "1sxdbb9zqhydx304v2as4y3r1yaqbgy9vcbygsaz3dy6rkifn23v";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -104603,8 +104720,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlrdb-core";
-       version = "0.1.1.1";
-       sha256 = "1c74v3fq1cw6fq33rmmmm6hb595a8f6iyv934w8kww74g79qli7d";
+       version = "0.1.2.0";
+       sha256 = "1j3ds4kkr1ns7y46b3s29bhi63n31ggvcq4mlyp2xafw2z4nbyl3";
        libraryHaskellDepends = [
          base bytestring hashable hedis lens mtl profunctors random time
          unordered-containers
@@ -104753,7 +104870,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hmatrix-backprop_0_1_2_2" = callPackage
+  "hmatrix-backprop_0_1_2_3" = callPackage
     ({ mkDerivation, backprop, base, finite-typelits
      , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog
      , hmatrix, hmatrix-vector-sized, microlens, microlens-platform
@@ -104761,8 +104878,8 @@ self: {
      }:
      mkDerivation {
        pname = "hmatrix-backprop";
-       version = "0.1.2.2";
-       sha256 = "130lby9nx21mcn85qy86xgmzjm9qyb98b0fhgafkyr2fgfnnqphj";
+       version = "0.1.2.3";
+       sha256 = "1x833a48czc2hphswxgwf1ihkgxz13w3bz2d2zs9dqq8xkzdf4mx";
        libraryHaskellDepends = [
          backprop base ghc-typelits-knownnat ghc-typelits-natnormalise
          hmatrix hmatrix-vector-sized microlens vector vector-sized
@@ -104878,27 +104995,6 @@ self: {
      }:
      mkDerivation {
        pname = "hmatrix-morpheus";
-       version = "0.1.1.1";
-       sha256 = "1y7ckwgv20j72ji0n30jj0iiibx9i3k053jh2cp17q1lnks836vj";
-       libraryHaskellDepends = [ base hmatrix ];
-       librarySystemDepends = [ blas liblapack ];
-       testHaskellDepends = [
-         base hmatrix HUnit MonadRandom test-framework test-framework-hunit
-         test-framework-quickcheck2
-       ];
-       benchmarkHaskellDepends = [ base criterion hmatrix ];
-       description = "Low-level machine learning auxiliary functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) blas; inherit (pkgs) liblapack;};
-
-  "hmatrix-morpheus_0_1_1_2" = callPackage
-    ({ mkDerivation, base, blas, criterion, hmatrix, HUnit, liblapack
-     , MonadRandom, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "hmatrix-morpheus";
        version = "0.1.1.2";
        sha256 = "19q52n5j1n5db7b2pv0iabh1xygpybgiszswginab5khc01fxwzj";
        libraryHaskellDepends = [ base hmatrix ];
@@ -110111,29 +110207,6 @@ self: {
      }:
      mkDerivation {
        pname = "hslua-aeson";
-       version = "0.3.0.1";
-       sha256 = "0h4l38bag7kd4d66iprv9hj36q8czqsxr5v6xgmn91wz4cadb42w";
-       revision = "1";
-       editedCabalFile = "02p97fsn7g6n0l5i9k0mrffqhw2a3y74vi0zaynsl224r4vwqsbp";
-       libraryHaskellDepends = [
-         aeson base hashable hslua scientific text unordered-containers
-         vector
-       ];
-       testHaskellDepends = [
-         aeson base hashable hslua hspec HUnit ieee754 QuickCheck
-         quickcheck-instances scientific text unordered-containers vector
-       ];
-       description = "Allow aeson data types to be used with lua";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hslua-aeson_0_3_0_2" = callPackage
-    ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit
-     , ieee754, QuickCheck, quickcheck-instances, scientific, text
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hslua-aeson";
        version = "0.3.0.2";
        sha256 = "0qfqq2xz5jqws1bh7iwznnv50kgqc1v5xxvnrraqkmz7hh4wyam2";
        libraryHaskellDepends = [
@@ -110146,7 +110219,6 @@ self: {
        ];
        description = "Allow aeson data types to be used with lua";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hslua-module-text" = callPackage
@@ -112532,8 +112604,8 @@ self: {
      }:
      mkDerivation {
        pname = "htoml-megaparsec";
-       version = "2.0.0.0";
-       sha256 = "0szpk1zszpvd0hs4jljjnlrr60159b33rqxhb1bgbbap2nxzxsgs";
+       version = "2.0.0.1";
+       sha256 = "0ahwlsqh98lv6hpf9lwsf1i99w0vdw1bsgy947s9gadrg8nbx849";
        libraryHaskellDepends = [
          base composition-prelude containers deepseq megaparsec mtl text
          time unordered-containers vector
@@ -112723,35 +112795,6 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.5.12.1";
-       sha256 = "0gnnkcy2d2v1k44ip59s7l86jgigllsp3lsqsac08zr19lr1clab";
-       revision = "1";
-       editedCabalFile = "03x2ms2nl3jjm2sfk8dwy02v920czhmdlkyfy3kqc1sg4nw2134y";
-       libraryHaskellDepends = [
-         array base blaze-builder bytestring case-insensitive containers
-         cookie deepseq exceptions filepath ghc-prim http-types memory
-         mime-types network network-uri random stm streaming-commons text
-         time transformers
-       ];
-       testHaskellDepends = [
-         async base blaze-builder bytestring case-insensitive containers
-         deepseq directory hspec http-types monad-control network
-         network-uri streaming-commons text time transformers zlib
-       ];
-       doCheck = false;
-       description = "An HTTP client engine";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "http-client_0_5_13" = callPackage
-    ({ mkDerivation, array, async, base, blaze-builder, bytestring
-     , case-insensitive, containers, cookie, deepseq, directory
-     , exceptions, filepath, ghc-prim, hspec, http-types, memory
-     , mime-types, monad-control, network, network-uri, random, stm
-     , streaming-commons, text, time, transformers, zlib
-     }:
-     mkDerivation {
-       pname = "http-client";
        version = "0.5.13";
        sha256 = "12q0w3avdkddrp7cgvwkmmfxdi4cz1ajic8jlrgp2plhn8ggnag2";
        libraryHaskellDepends = [
@@ -112768,7 +112811,6 @@ self: {
        doCheck = false;
        description = "An HTTP client engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-client-auth" = callPackage
@@ -114021,12 +114063,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hunit-dejafu_1_2_0_4" = callPackage
+  "hunit-dejafu_1_2_0_5" = callPackage
     ({ mkDerivation, base, dejafu, exceptions, HUnit }:
      mkDerivation {
        pname = "hunit-dejafu";
-       version = "1.2.0.4";
-       sha256 = "017hdbimpi2wpwdyis3gmwrzxszafws6jxwi4jwm44psnqpl9hry";
+       version = "1.2.0.5";
+       sha256 = "17k7sg2ifvmikzjlzhawc65afq32lva5p79szva6xplghh689xv6";
        libraryHaskellDepends = [ base dejafu exceptions HUnit ];
        description = "Deja Fu support for the HUnit test framework";
        license = stdenv.lib.licenses.mit;
@@ -114466,8 +114508,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-dsv";
-       version = "0.2";
-       sha256 = "1jkkhkk7rpskxnbiaz7a520nf19f3hl8vxi5gl5k6nvjw6z0zy1q";
+       version = "0.2.1";
+       sha256 = "1kb8dc05dfslpqnjw42qnnxg16xfd2jz17ag9vgmci88rnsanaxv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -118506,7 +118548,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "influxdb_1_6_0_3" = callPackage
+  "influxdb_1_6_0_4" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
      , cabal-doctest, clock, containers, doctest, foldl, http-client
      , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck
@@ -118516,8 +118558,8 @@ self: {
      }:
      mkDerivation {
        pname = "influxdb";
-       version = "1.6.0.3";
-       sha256 = "06ywpr2wpc8kx4kjkmpq6lapbpqwq3c0sxla21v58psj033ihzl9";
+       version = "1.6.0.4";
+       sha256 = "191w8f52r5qgmrsj131sx5kjqzfcrh3z4wbh2kdv9hyfp717hz2r";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -120795,25 +120837,12 @@ self: {
     ({ mkDerivation, base, hspec, HUnit, time }:
      mkDerivation {
        pname = "iso8601-time";
-       version = "0.1.4";
-       sha256 = "09h1jfdj9fv1nsryhka2mgl8nig9840f5kv06vyyh7l4l1z767bn";
-       libraryHaskellDepends = [ base time ];
-       testHaskellDepends = [ base hspec HUnit time ];
-       description = "Convert to/from the ISO 8601 time format";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "iso8601-time_0_1_5" = callPackage
-    ({ mkDerivation, base, hspec, HUnit, time }:
-     mkDerivation {
-       pname = "iso8601-time";
        version = "0.1.5";
        sha256 = "1j7h1xix7vpb88dnksis14rnvw0p528m3d54fg3h51765d5l9kgj";
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base hspec HUnit time ];
        description = "Convert to/from the ISO 8601 time format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "isobmff-builder" = callPackage
@@ -123128,8 +123157,8 @@ self: {
        pname = "json-schema";
        version = "0.7.4.1";
        sha256 = "15kwgpkryd865nls9zm6ya6jzmiygsb537ij7ps39dzasqbnl3an";
-       revision = "15";
-       editedCabalFile = "07a5qvmg6bz54k5f608d8lvaay97s6df503rq047sjwa6dipcm0x";
+       revision = "16";
+       editedCabalFile = "0mn7aj3rr4vpg99kcpvgq1qvdl28dx9yld2b9pb79wdva9x69c2h";
        libraryHaskellDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -123735,22 +123764,32 @@ self: {
      }) {};
 
   "jvm-binary" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, criterion
-     , directory, filepath, tasty, tasty-discover, tasty-hspec
-     , tasty-quickcheck, text, vector
+    ({ mkDerivation, attoparsec, base, binary, bytestring, containers
+     , criterion, data-binary-ieee754, deepseq, deriving-compat
+     , directory, filepath, generic-random
+     , hspec-expectations-pretty-diff, mtl, QuickCheck, tasty
+     , tasty-discover, tasty-hspec, tasty-quickcheck, template-haskell
+     , text, vector
      }:
      mkDerivation {
        pname = "jvm-binary";
-       version = "0.0.2";
-       sha256 = "1hdqhp84il50c6wimdvxwdd95gw580hskhmrnn2snqcwj7n1ywfh";
+       version = "0.1.0";
+       sha256 = "0s64cwr86ipl7gpcgdgx50l7mm5h91njgir4mn2d82fzzq08x881";
        libraryHaskellDepends = [
-         base binary bytestring containers text vector
+         attoparsec base binary bytestring containers data-binary-ieee754
+         deepseq deriving-compat mtl template-haskell text vector
        ];
        testHaskellDepends = [
-         base binary bytestring containers directory filepath tasty
-         tasty-discover tasty-hspec tasty-quickcheck text
+         attoparsec base binary bytestring containers data-binary-ieee754
+         deepseq deriving-compat directory filepath generic-random
+         hspec-expectations-pretty-diff mtl QuickCheck tasty tasty-discover
+         tasty-hspec tasty-quickcheck template-haskell text vector
+       ];
+       benchmarkHaskellDepends = [
+         attoparsec base binary bytestring containers criterion
+         data-binary-ieee754 deepseq deriving-compat mtl template-haskell
+         text vector
        ];
-       benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "A library for reading Java class-files";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127066,15 +127105,15 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "language-docker_6_0_1" = callPackage
+  "language-docker_6_0_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , free, Glob, hspec, HUnit, megaparsec, mtl, prettyprinter, process
      , QuickCheck, split, template-haskell, text, th-lift, time
      }:
      mkDerivation {
        pname = "language-docker";
-       version = "6.0.1";
-       sha256 = "01dfs90300h03mlwn05a7k2gsffyxxkjypyykbnc9ky2cx6vwfax";
+       version = "6.0.2";
+       sha256 = "0690i0cd1208g72ckqhiw7grs9m4wx1kp4w516c7x0ibrv9ri8ap";
        libraryHaskellDepends = [
          base bytestring containers free megaparsec mtl prettyprinter split
          template-haskell text th-lift time
@@ -127429,17 +127468,17 @@ self: {
      }) {};
 
   "language-lua" = callPackage
-    ({ mkDerivation, alex, array, base, bytestring, criterion, deepseq
-     , directory, filepath, happy, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck, text
+    ({ mkDerivation, alex, alex-tools, array, base, bytestring
+     , criterion, deepseq, directory, filepath, happy, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "language-lua";
-       version = "0.10.0";
-       sha256 = "0qiwzprwj7kfppa0a3h1ir1bxwwfq48wl31hv1c724p5vyv1480c";
-       revision = "2";
-       editedCabalFile = "08c0ivrp357lpxhxqq78z8wqnhwdd3gycsn6yhmf8xnk8bv6yz7h";
-       libraryHaskellDepends = [ array base bytestring deepseq text ];
+       version = "0.11.0";
+       sha256 = "1b65bfjdx7287d65s2ki05yfps8k0w6jfq4avna4z37cqssa0z59";
+       libraryHaskellDepends = [
+         alex-tools array base bytestring deepseq text
+       ];
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [
          base bytestring deepseq directory filepath QuickCheck tasty
@@ -127665,8 +127704,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.3.17";
-       sha256 = "0n71grhaw59z3vqkys499kx06q10fn6l5r4sfim17vyxdy0bz8xq";
+       version = "1.3.18";
+       sha256 = "1cdzs5m6xwrsnchbj66ij844wd869by0jjih8jwap2rmnx9ckxbi";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -127688,8 +127727,8 @@ self: {
        ];
        testHaskellDepends = [
          base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl
-         protolude scientific strict-base-types temporary text transformers
-         unordered-containers vector
+         pcre-utils protolude scientific strict-base-types temporary text
+         transformers unordered-containers vector
        ];
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
@@ -131190,8 +131229,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, safe }:
      mkDerivation {
        pname = "lines-of-action";
-       version = "0.0.0";
-       sha256 = "0m047q5x6lqgmw3kfai24jk8x44vib4xmflz7n2xq7b791k1fkrg";
+       version = "0.0.1";
+       sha256 = "1sikhdahhxqi9i285zphbpnz60vyxjdhvz2qd70hmy7x3ckymb42";
        libraryHaskellDepends = [ base containers mtl safe ];
        description = "Lines of Action, 2-player strategy board game";
        license = stdenv.lib.licenses.mit;
@@ -131454,6 +131493,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "linux-namespaces_0_1_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, unix }:
+     mkDerivation {
+       pname = "linux-namespaces";
+       version = "0.1.3.0";
+       sha256 = "1rvkzfmd07sz46k059ly80cjgwx67igfw8zsw8c6ljsp3hsdn4hl";
+       libraryHaskellDepends = [ base bytestring unix ];
+       description = "Work with linux namespaces: create new or enter existing ones";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "linux-perf" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, directory
      , filepath, ghc-events, mtl, pretty, process, unix
@@ -136572,6 +136623,24 @@ self: {
   "markup" = callPackage
     ({ mkDerivation, attoparsec-uri, base, blaze-html, blaze-markup
      , clay, comonad, lucid, mmorph, monad-control, monad-logger, mtl
+     , path-extra, resourcet, text, transformers-base, urlpath
+     }:
+     mkDerivation {
+       pname = "markup";
+       version = "4.0.4";
+       sha256 = "1brk619d2abryvwyw9pj7g4axs1rc6p51cf4yf5q1p6f0zvi2dyb";
+       libraryHaskellDepends = [
+         attoparsec-uri base blaze-html blaze-markup clay comonad lucid
+         mmorph monad-control monad-logger mtl path-extra resourcet text
+         transformers-base urlpath
+       ];
+       description = "Abstraction for HTML-embedded content";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "markup_4_2_0" = callPackage
+    ({ mkDerivation, attoparsec-uri, base, blaze-html, blaze-markup
+     , clay, comonad, lucid, mmorph, monad-control, monad-logger, mtl
      , path, path-extra, resourcet, text, transformers-base, urlpath
      }:
      mkDerivation {
@@ -136585,6 +136654,7 @@ self: {
        ];
        description = "Abstraction for HTML-embedded content";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markup-preview" = callPackage
@@ -137484,25 +137554,25 @@ self: {
      }) {};
 
   "mbug" = callPackage
-    ({ mkDerivation, base, bytestring, directory, extra, http-client
-     , http-client-tls, optparse-applicative, process, scalpel-core
-     , tagsoup, text, th-printf, time, xdg-basedir
+    ({ mkDerivation, base, bytestring, directory, extra, formatting
+     , http-client, http-client-tls, optparse-applicative, process
+     , scalpel-core, tagsoup, text, time, xdg-basedir
      }:
      mkDerivation {
        pname = "mbug";
-       version = "1.1";
-       sha256 = "1chz9za1zbdw1awm252img4krmya1zq3jb4alrsplf2ijb2c80ls";
+       version = "1.2";
+       sha256 = "0rzfayssvifwb7p8m00lv8s1m5paa86nc6ndwi6ih34lhi30qcr8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring directory extra http-client http-client-tls
-         optparse-applicative process scalpel-core tagsoup text th-printf
-         time xdg-basedir
+         base bytestring directory extra formatting http-client
+         http-client-tls optparse-applicative process scalpel-core tagsoup
+         text time xdg-basedir
        ];
        executableHaskellDepends = [
-         base bytestring directory extra http-client http-client-tls
-         optparse-applicative process scalpel-core tagsoup text th-printf
-         time xdg-basedir
+         base bytestring directory extra formatting http-client
+         http-client-tls optparse-applicative process scalpel-core tagsoup
+         text time xdg-basedir
        ];
        description = "download bugs mailboxes";
        license = stdenv.lib.licenses.gpl3;
@@ -138439,6 +138509,29 @@ self: {
        license = "GPL";
      }) {};
 
+  "menoh" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, filepath
+     , JuicyPixels, menoh, monad-control, optparse-applicative
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "menoh";
+       version = "0.1.1";
+       sha256 = "0cbkhafibm65yn4222kfy8j6zkw6q6k3962hwjhbvp2n57avh789";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers monad-control transformers vector
+       ];
+       libraryPkgconfigDepends = [ menoh ];
+       executableHaskellDepends = [
+         base filepath JuicyPixels optparse-applicative vector
+       ];
+       description = "Haskell binding for Menoh DNN inference library";
+       license = stdenv.lib.licenses.mit;
+     }) {menoh = null;};
+
   "mercury-api" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, clock, directory
      , hashable, HUnit, optparse-applicative, text, unordered-containers
@@ -139367,10 +139460,8 @@ self: {
      }:
      mkDerivation {
        pname = "midi-util";
-       version = "0.2";
-       sha256 = "1vnpc4ja72a1p6b44ypx0pirg2wnin9jfnfmcq715f599dyxaapr";
-       revision = "2";
-       editedCabalFile = "0nl8vrrffm8780pj8kadchq2sdyglvnl91bn1yrflh4pqlm2jzq8";
+       version = "0.2.0.1";
+       sha256 = "0s37csd1x039q0cb487pd811jz7h0i26chvvbmwffh11bc2icjzc";
        libraryHaskellDepends = [
          base containers event-list midi non-negative
        ];
@@ -143996,6 +144087,67 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "multipool" = callPackage
+    ({ mkDerivation, base, bytestring, hashable, monad-logger, mtl
+     , persistent, resource-pool, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "multipool";
+       version = "0.1.0.1";
+       sha256 = "1mcdsn4ja9w8bnxrz4dglwbzq6bxg5xq2iik8da49n8l8ah2xq78";
+       libraryHaskellDepends = [
+         base bytestring hashable monad-logger mtl persistent resource-pool
+         text unordered-containers
+       ];
+       testHaskellDepends = [
+         base bytestring hashable monad-logger mtl persistent resource-pool
+         text unordered-containers
+       ];
+       description = "Generalized system for reading and writing to distributed systems that have primary/replica topologies";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "multipool-persistent" = callPackage
+    ({ mkDerivation, base, mtl, multipool, persistent, unliftio-core
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "multipool-persistent";
+       version = "0.1.0.1";
+       sha256 = "0nw56wpgwvzk8ib3av42zkpj5xviw3m3qlig791rl4074yj60wn2";
+       libraryHaskellDepends = [
+         base mtl multipool persistent unliftio-core unordered-containers
+       ];
+       testHaskellDepends = [
+         base mtl multipool persistent unliftio-core unordered-containers
+       ];
+       description = "Read and write from appropriate persistent sql instances in replicated environments";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "multipool-persistent-postgresql" = callPackage
+    ({ mkDerivation, base, monad-logger, mtl, multipool
+     , multipool-persistent, persistent, persistent-postgresql
+     , postgresql-common-persistent, unliftio-core, unordered-containers
+     }:
+     mkDerivation {
+       pname = "multipool-persistent-postgresql";
+       version = "0.1.0.1";
+       sha256 = "11y8hr9f5f7ni7nxz1h6bi7jn3pj09ngjrqgliwihx60ind2dk6q";
+       libraryHaskellDepends = [
+         base monad-logger mtl multipool multipool-persistent persistent
+         persistent-postgresql postgresql-common-persistent unliftio-core
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         base monad-logger mtl multipool multipool-persistent persistent
+         persistent-postgresql postgresql-common-persistent unliftio-core
+         unordered-containers
+       ];
+       description = "Read and write appropriately from both master and replicated postgresql instances";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "multirec" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -146106,6 +146258,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "neat-interpolation_0_3_2_2" = callPackage
+    ({ mkDerivation, base, base-prelude, HTF, megaparsec
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "neat-interpolation";
+       version = "0.3.2.2";
+       sha256 = "0ffcr6q9bmvlmz5j8s0q08pbqzcfz9pkh8gz52arzscflpncbj5n";
+       libraryHaskellDepends = [
+         base base-prelude megaparsec template-haskell text
+       ];
+       testHaskellDepends = [ base-prelude HTF ];
+       description = "A quasiquoter for neat and simple multiline text interpolation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "needle" = callPackage
     ({ mkDerivation, base, containers, haskell-src-meta, mtl, parsec
      , parsec-extra, template-haskell, text, vector
@@ -146708,8 +146877,32 @@ self: {
      }:
      mkDerivation {
        pname = "nettle";
-       version = "0.2.0";
-       sha256 = "1plv9r86ljgjvvb8ny8zayrcdrmy7cd8jfvq4vp56b407dqq8092";
+       version = "0.2.1";
+       sha256 = "0d7phckzar2mzazw15g6ca60izmrdyxjv114ag305lbh6ly76wah";
+       libraryHaskellDepends = [
+         base byteable bytestring crypto-cipher-types securemem tagged
+       ];
+       libraryPkgconfigDepends = [ nettle ];
+       testHaskellDepends = [
+         array base bytestring crypto-cipher-tests crypto-cipher-types HUnit
+         QuickCheck tagged test-framework test-framework-hunit
+         test-framework-quickcheck2
+       ];
+       description = "safe nettle binding";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) nettle;};
+
+  "nettle_0_3_0" = callPackage
+    ({ mkDerivation, array, base, byteable, bytestring
+     , crypto-cipher-tests, crypto-cipher-types, HUnit, nettle
+     , QuickCheck, securemem, tagged, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "nettle";
+       version = "0.3.0";
+       sha256 = "0pbxpxr9xdw3ha5lm9vnsbsvq0kzzsqv6gfk041ijllf1sc0hgyg";
        libraryHaskellDepends = [
          base byteable bytestring crypto-cipher-types securemem tagged
        ];
@@ -148866,6 +149059,16 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "non-empty-containers" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "non-empty-containers";
+       version = "0.1.0.0";
+       sha256 = "021rfs019kb3h9zz2ycdg7ia65b1hr2rlxzihcdkqywklvxvykxw";
+       libraryHaskellDepends = [ base containers ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "non-empty-sequence" = callPackage
     ({ mkDerivation, base, containers, semigroups }:
      mkDerivation {
@@ -148953,6 +149156,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "nonemptymap" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "nonemptymap";
+       version = "0.0.2.0";
+       sha256 = "0h08xki7z69xrni2r6l7b5wyg6sfdm0hfq2l35q50yac83srfs0v";
+       libraryHaskellDepends = [ base containers ];
+       description = "A NonEmptyMap Implementation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "nonfree" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -149713,12 +149927,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "numhask_0_2_2_0" = callPackage
+  "numhask_0_2_3_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "numhask";
-       version = "0.2.2.0";
-       sha256 = "0i0acm03qirj6xnpyv87v4vss7bmcnzkv8j7rymvshp92nrxihgd";
+       version = "0.2.3.0";
+       sha256 = "1d4sc2gwra18zw9f063d28alf69nf0ikzsfxgc10z1zgy5bfyxny";
        libraryHaskellDepends = [ base ];
        description = "numeric classes";
        license = stdenv.lib.licenses.bsd3;
@@ -149748,33 +149962,29 @@ self: {
 
   "numhask-histogram" = callPackage
     ({ mkDerivation, base, containers, doctest, foldl, numhask-prelude
-     , numhask-range, protolude, tasty, tdigest
+     , numhask-range, tdigest
      }:
      mkDerivation {
        pname = "numhask-histogram";
-       version = "0.1.2.1";
-       sha256 = "0pjl4xqfi9kr56sr83ais1mx9k3rz739axr9wrj0n1xzdp4q9yr9";
+       version = "0.1.3.0";
+       sha256 = "1d4b1iv6czhc9747p5df3qlbj34nzlz608qp975cg31i63inz2ix";
        libraryHaskellDepends = [
          base containers foldl numhask-prelude numhask-range tdigest
        ];
-       testHaskellDepends = [ base doctest protolude tasty ];
+       testHaskellDepends = [ base doctest numhask-prelude ];
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "numhask-prelude" = callPackage
-    ({ mkDerivation, base, doctest, numhask, protolude, QuickCheck
-     , tasty, tasty-quickcheck
-     }:
+    ({ mkDerivation, base, doctest, numhask, protolude }:
      mkDerivation {
        pname = "numhask-prelude";
-       version = "0.0.5.1";
-       sha256 = "0bpisfh0ngxbxpb080fpd02bjvl451n0rqdr1c3zxyljv6xnkbvj";
-       libraryHaskellDepends = [
-         base numhask protolude QuickCheck tasty tasty-quickcheck
-       ];
-       testHaskellDepends = [ base doctest QuickCheck tasty ];
+       version = "0.1.0.1";
+       sha256 = "0px2ijdzll1912h652dvncvjhapwrg2z1dni87w2afzk477mpwdi";
+       libraryHaskellDepends = [ base numhask protolude ];
+       testHaskellDepends = [ doctest ];
        description = "A numeric prelude";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149798,24 +150008,43 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "numhask-range_0_2_2_1" = callPackage
+  "numhask-range_0_2_3_1" = callPackage
     ({ mkDerivation, adjunctions, base, distributive, doctest
-     , numhask-prelude, protolude, QuickCheck, semigroupoids, tasty
+     , numhask-prelude, numhask-test, protolude, QuickCheck
+     , semigroupoids, tasty
      }:
      mkDerivation {
        pname = "numhask-range";
-       version = "0.2.2.1";
-       sha256 = "1bay0jsarz7d2kbgi3zvdl2dip9arv9qdlk41szgvsbgqbadxjxf";
+       version = "0.2.3.1";
+       sha256 = "1zfw49cgjwbx6v6ljqbl46d1nkiah0p79pjargjsfpfks9ra2qkc";
        libraryHaskellDepends = [
          adjunctions base distributive numhask-prelude protolude QuickCheck
          semigroupoids
        ];
-       testHaskellDepends = [ base doctest numhask-prelude tasty ];
+       testHaskellDepends = [
+         base doctest numhask-prelude numhask-test tasty
+       ];
        description = "Numbers that are range representations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "numhask-test" = callPackage
+    ({ mkDerivation, base, numhask-prelude, QuickCheck, tasty
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "numhask-test";
+       version = "0.1.0.0";
+       sha256 = "1czcgnqxxm835q9m2iw3xyd8qwjpgdpjs1n9zzpd5sk6rklcjx6y";
+       libraryHaskellDepends = [
+         base numhask-prelude QuickCheck tasty tasty-quickcheck
+       ];
+       testHaskellDepends = [ base numhask-prelude QuickCheck tasty ];
+       description = "Laws and tests for numhask";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "nums" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -150067,6 +150296,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "o-clock_1_0_0" = callPackage
+    ({ mkDerivation, base, deepseq, doctest, gauge, ghc-prim, Glob
+     , hedgehog, markdown-unlit, tasty, tasty-hedgehog, tasty-hspec
+     , tiempo, time-units, type-spec
+     }:
+     mkDerivation {
+       pname = "o-clock";
+       version = "1.0.0";
+       sha256 = "18wmy90fn514dmjsyk8n6q4p1nvks6lbi0077s00p6hv247p353j";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ghc-prim ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base doctest Glob hedgehog markdown-unlit tasty tasty-hedgehog
+         tasty-hspec type-spec
+       ];
+       benchmarkHaskellDepends = [ base deepseq gauge tiempo time-units ];
+       description = "Type-safe time library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "oanda-rest-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , Decimal, hlint, hspec, http-client, http-conduit, HUnit, lens
@@ -150502,24 +150754,23 @@ self: {
      }) {};
 
   "odpic-raw" = callPackage
-    ({ mkDerivation, base, c2hs, conduit, hspec, monad-control
-     , monad-logger, odpic, QuickCheck, resourcet, text, time
-     , unliftio-core
+    ({ mkDerivation, base, bytestring, c2hs, conduit, Decimal, hspec
+     , odpic, resourcet, time
      }:
      mkDerivation {
        pname = "odpic-raw";
-       version = "0.2.1";
-       sha256 = "0py56g2d05b11yw7wi5lmaglixzk63kwlpnnwk3v1vy8daky73w6";
+       version = "0.3.0";
+       sha256 = "0s4n82kddl4xwjaj98xmgisip68l2ib6ca7z4nqfy8lzchvmls6j";
        libraryHaskellDepends = [
-         base conduit monad-control resourcet text time unliftio-core
+         base bytestring conduit Decimal resourcet time
        ];
        librarySystemDepends = [ odpic ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [
-         base conduit hspec monad-logger QuickCheck resourcet text
+         base bytestring conduit Decimal hspec resourcet time
        ];
        description = "Oracle Database Bindings";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) odpic;};
 
@@ -152245,8 +152496,8 @@ self: {
      }:
      mkDerivation {
        pname = "optparse-applicative-simple";
-       version = "1.0.2";
-       sha256 = "0kn740shja07mpaj9hy5blw1bcgy6ncpfyz3rqy3cglh2fzswsk2";
+       version = "1.0.3";
+       sha256 = "07v47fa2yc3rxdn1lbgbsq8ggfd7zlknz2ib8wf628g95n0dl7ya";
        libraryHaskellDepends = [
          attoparsec attoparsec-data base-prelude optparse-applicative text
        ];
@@ -153608,10 +153859,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.3.2.0";
-       sha256 = "0pydgdpm8fqj4dbv5swbyxkh1bkmqzj3gcas9r04vvzh6mmr22ia";
-       revision = "1";
-       editedCabalFile = "1x19k4jb8ld8kp4fkcmxj5maw3w3dqv5axh5ay6m6qr5kl77ijgp";
+       version = "0.3.2.1";
+       sha256 = "0rxinqgfri1zlq1di4dx949migm3j76lvb10hvmpa4rxz0fkq0l6";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -154009,8 +154258,8 @@ self: {
     ({ mkDerivation, base, gitrev, template-haskell }:
      mkDerivation {
        pname = "panic";
-       version = "0.4.0.0";
-       sha256 = "12m18s4d8xvwwf4vhv4p544h03abgkjx7bfwl22gxr1y8f7gb8wl";
+       version = "0.4.0.1";
+       sha256 = "0hidfg8yzp5vzq8y422c442b45jkr8a9s38s8n78wyi5811fpp0m";
        libraryHaskellDepends = [ base gitrev template-haskell ];
        description = "A convenient way to panic";
        license = stdenv.lib.licenses.isc;
@@ -155214,6 +155463,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "parsix" = callPackage
+    ({ mkDerivation, base, bytestring, containers, fingertree, mtl
+     , parsers, prettyprinter, prettyprinter-ansi-terminal, QuickCheck
+     , tasty, tasty-hunit, tasty-quickcheck, text, transformers
+     }:
+     mkDerivation {
+       pname = "parsix";
+       version = "0.1.0.1";
+       sha256 = "0qpn5vjgp0392nb6nirp92s2g5jxr4jcpg35j0w1mg5ym5ra4mm1";
+       libraryHaskellDepends = [
+         base bytestring containers fingertree mtl parsers prettyprinter
+         prettyprinter-ansi-terminal text transformers
+       ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-hunit tasty-quickcheck text
+       ];
+       description = "Parser combinators with slicing, error recovery, and syntax highlighting";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "partage" = callPackage
     ({ mkDerivation, base, containers, data-lens-light, data-partition
      , dawg-ord, HUnit, mmorph, mtl, pipes, PSQueue, random, tasty
@@ -158585,27 +158854,6 @@ self: {
 
   "pinch" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "pinch";
-       version = "0.3.2.0";
-       sha256 = "0r0pxdhzlmfg8h13fi10bvy1wxvsk1ckzzlcxbpg6zrly9n0z4m1";
-       libraryHaskellDepends = [
-         array base bytestring containers deepseq ghc-prim hashable text
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec hspec-discover QuickCheck text
-         unordered-containers vector
-       ];
-       description = "An alternative implementation of Thrift for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pinch_0_3_3_0" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
      , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, semigroups
      , text, unordered-containers, vector
      }:
@@ -158623,7 +158871,6 @@ self: {
        ];
        description = "An alternative implementation of Thrift for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pinchot" = callPackage
@@ -159665,6 +159912,8 @@ self: {
        pname = "pipes-safe";
        version = "2.2.9";
        sha256 = "160qba0r8lih186qfrpvnx1m2j632x5b7n1x53mif9aag41n9w8p";
+       revision = "1";
+       editedCabalFile = "08jxmxfhxfi3v19bvvmfs50c74ci6v36503knsb4qdscx9lr864d";
        libraryHaskellDepends = [
          base containers exceptions monad-control mtl pipes primitive
          transformers transformers-base
@@ -161964,6 +162213,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "postgresql-common" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, postgresql-simple }:
+     mkDerivation {
+       pname = "postgresql-common";
+       version = "0.1.0.1";
+       sha256 = "16b90sxn9f9rxrdr2l5gqcs6307djqaqzr31lnb4qa95dz72fl7n";
+       libraryHaskellDepends = [
+         attoparsec base bytestring postgresql-simple
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring postgresql-simple
+       ];
+       description = "Library for sharing common PostgreSQL types across Haskell PostgreSQL libraries";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "postgresql-common-persistent" = callPackage
+    ({ mkDerivation, base, bytestring, persistent, postgresql-common
+     , text
+     }:
+     mkDerivation {
+       pname = "postgresql-common-persistent";
+       version = "0.1.0.0";
+       sha256 = "1kjmrnigc00362f1b55gw6k67i13rqpjaklz8v9z5jd78ac3xnq6";
+       libraryHaskellDepends = [
+         base bytestring persistent postgresql-common text
+       ];
+       testHaskellDepends = [
+         base bytestring persistent postgresql-common text
+       ];
+       description = "Persistent compatibility for postgresql-common";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "postgresql-config" = callPackage
     ({ mkDerivation, aeson, base, bytestring, monad-control, mtl
      , postgresql-simple, resource-pool, time
@@ -162548,8 +162831,8 @@ self: {
     ({ mkDerivation, potoki-core }:
      mkDerivation {
        pname = "potoki";
-       version = "2";
-       sha256 = "17w7i1glzn2kvq61f1f9xcfz7z7hmwzjl08xh32hp6nir21ycmq5";
+       version = "2.0.1";
+       sha256 = "1asn43c0n0f4f694y3q3hkjmf4rhdh4gsax25syyb57bicp0mw8h";
        libraryHaskellDepends = [ potoki-core ];
        description = "Simple streaming in IO";
        license = stdenv.lib.licenses.mit;
@@ -162573,24 +162856,24 @@ self: {
      }) {};
 
   "potoki-core" = callPackage
-    ({ mkDerivation, acquire, attoparsec, base, base-prelude
-     , bytestring, directory, foldl, hashable, profunctors, ptr
-     , QuickCheck, quickcheck-instances, random, rerebase, stm, tasty
-     , tasty-hunit, tasty-quickcheck, text, transformers, unagi-chan
+    ({ mkDerivation, acquire, attoparsec, base, bytestring, directory
+     , foldl, hashable, ilist, profunctors, ptr, QuickCheck
+     , quickcheck-instances, random, rerebase, stm, tasty, tasty-hunit
+     , tasty-quickcheck, text, transformers, unagi-chan
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "potoki-core";
-       version = "2";
-       sha256 = "13zgqw4csypx5m97xfpbxxxic7rxms0xrz6wz5kk5x2pn6i9mgjl";
+       version = "2.1";
+       sha256 = "04i94rk7skcvaqyapl88iw1npz84jhd1gr17darjvwxyvdvrm1h0";
        libraryHaskellDepends = [
-         acquire attoparsec base base-prelude bytestring directory foldl
-         hashable profunctors ptr stm text transformers unagi-chan
+         acquire attoparsec base bytestring directory foldl hashable
+         profunctors ptr stm text transformers unagi-chan
          unordered-containers vector
        ];
        testHaskellDepends = [
-         attoparsec QuickCheck quickcheck-instances random rerebase tasty
-         tasty-hunit tasty-quickcheck
+         acquire attoparsec foldl ilist QuickCheck quickcheck-instances
+         random rerebase tasty tasty-hunit tasty-quickcheck
        ];
        description = "Low-level components of \"potoki\"";
        license = stdenv.lib.licenses.mit;
@@ -162598,21 +162881,34 @@ self: {
      }) {};
 
   "potoki-hasql" = callPackage
-    ({ mkDerivation, base, bytestring, hasql, potoki, potoki-core
+    ({ mkDerivation, acquire, base, bytestring, hasql, potoki-core
      , profunctors, text, vector
      }:
      mkDerivation {
        pname = "potoki-hasql";
-       version = "1.5";
-       sha256 = "1pxl1fcw1khp4gbhpranv685ri67995d76nisx7ba7l2vg438mn8";
+       version = "1.6";
+       sha256 = "1na6nc9cbimhwzwppz48ssffhdx0j223pmkk8wkjkj9xpzpnx2w1";
        libraryHaskellDepends = [
-         base bytestring hasql potoki potoki-core profunctors text vector
+         acquire base bytestring hasql potoki-core profunctors text vector
        ];
        description = "Integration of \"potoki\" and \"hasql\"";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "potoki-zlib" = callPackage
+    ({ mkDerivation, acquire, base, bytestring, potoki-core, zlib }:
+     mkDerivation {
+       pname = "potoki-zlib";
+       version = "0.3";
+       sha256 = "0baayjaw3x5hfx6xdhiq3j8j012x6nrlql8fc6r51xpk3blwg588";
+       libraryHaskellDepends = [
+         acquire base bytestring potoki-core zlib
+       ];
+       description = "Streaming ZLib decompression";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "potrace" = callPackage
     ({ mkDerivation, base, bindings-potrace, bytestring, containers
      , data-default, JuicyPixels, vector
@@ -163662,30 +163958,6 @@ self: {
      }:
      mkDerivation {
        pname = "prettyprinter";
-       version = "1.2.0.1";
-       sha256 = "0rh5bb6inq4yvv6r53sc1q3msmpvjcq8fw4sn3vwivrq44c7nf8i";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base text ];
-       testHaskellDepends = [
-         base bytestring doctest pgp-wordlist tasty tasty-hunit
-         tasty-quickcheck text
-       ];
-       benchmarkHaskellDepends = [
-         ansi-wl-pprint base containers criterion deepseq mtl QuickCheck
-         random text transformers
-       ];
-       description = "A modern, easy to use, well-documented, extensible prettyprinter";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "prettyprinter_1_2_1" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
-     , criterion, deepseq, doctest, mtl, pgp-wordlist, QuickCheck
-     , random, tasty, tasty-hunit, tasty-quickcheck, text, transformers
-     }:
-     mkDerivation {
-       pname = "prettyprinter";
        version = "1.2.1";
        sha256 = "1kvza7jp5n833m8rj0bc35bd2p8wx3fq0iqflm9nbh3wm05kwrg7";
        isLibrary = true;
@@ -163701,7 +163973,6 @@ self: {
        ];
        description = "A modern, easy to use, well-documented, extensible pretty-printer";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prettyprinter-ansi-terminal" = callPackage
@@ -166733,6 +167004,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pusher-http-haskell_1_5_1_5" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , cryptonite, hashable, hspec, http-client, http-types, memory
+     , QuickCheck, scientific, text, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "pusher-http-haskell";
+       version = "1.5.1.5";
+       sha256 = "0bidqvyx5ss3zgw2ypbwnii1vqfqp0kwyf31h53pvza7c3xrpq4x";
+       libraryHaskellDepends = [
+         aeson base base16-bytestring bytestring cryptonite hashable
+         http-client http-types memory text time transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base base16-bytestring bytestring cryptonite hspec
+         http-client http-types QuickCheck scientific text time transformers
+         unordered-containers vector
+       ];
+       description = "Haskell client library for the Pusher HTTP API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pusher-ws" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , hashable, http-conduit, lens, lens-aeson, network, scientific
@@ -167839,23 +168135,11 @@ self: {
     ({ mkDerivation, base, QuickCheck, unfoldable-restricted }:
      mkDerivation {
        pname = "quickcheck-combinators";
-       version = "0.0.2";
-       sha256 = "0r8vf4dgczga2c0lkz4z6a22naxw44yfdj1wvfqncv9x18r7pkbz";
-       libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ];
-       description = "Simple type-level combinators for augmenting QuickCheck instances";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "quickcheck-combinators_0_0_4" = callPackage
-    ({ mkDerivation, base, QuickCheck, unfoldable-restricted }:
-     mkDerivation {
-       pname = "quickcheck-combinators";
        version = "0.0.4";
        sha256 = "0i5hv58b8vgqbmwb7j8c9xr6qv0v5n2zjh3a9rab8x6hsdlb0mvv";
        libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ];
        description = "Simple type-level combinators for augmenting QuickCheck instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-instances" = callPackage
@@ -168653,8 +168937,8 @@ self: {
      }:
      mkDerivation {
        pname = "radius";
-       version = "0.5.0.1";
-       sha256 = "0mrgcrhi99imclc400lp666gimxv4gkg4svjr49p9aip5dx03bjh";
+       version = "0.5.0.2";
+       sha256 = "08y57j4235ajkf3z05p8lcixgr2x1m6mih5l0bfic4gxfvs818wc";
        libraryHaskellDepends = [
          base binary bytestring cryptonite iproute memory
        ];
@@ -172279,6 +172563,8 @@ self: {
        pname = "regex-tdfa";
        version = "1.2.3";
        sha256 = "1n80ssz9k73s444b4hda6fhp1vyzg0fc5fvz0309fi9dh6xpxcc9";
+       revision = "1";
+       editedCabalFile = "05ygcwwi8zjd40r05kavbmlx6nw6gyb2yicaarwd45sxs1zk73rz";
        libraryHaskellDepends = [
          array base bytestring containers ghc-prim mtl parsec regex-base
        ];
@@ -172853,27 +173139,54 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-query_0_11_3_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, dlist
+     , names-th, persistable-record, product-isomorphic
+     , quickcheck-simple, sql-words, template-haskell, text
+     , th-reify-compat, time, time-locale-compat, transformers
+     }:
+     mkDerivation {
+       pname = "relational-query";
+       version = "0.11.3.0";
+       sha256 = "1g7jvhp5vv17hbddc2p6j39gfg638y2b0jjky9jxrcjkww1ii16p";
+       libraryHaskellDepends = [
+         array base bytestring containers dlist names-th persistable-record
+         product-isomorphic sql-words template-haskell text th-reify-compat
+         time time-locale-compat transformers
+       ];
+       testHaskellDepends = [
+         base containers product-isomorphic quickcheck-simple transformers
+       ];
+       description = "Typeful, Modular, Relational, algebraic query engine";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "relational-query-HDBC" = callPackage
     ({ mkDerivation, base, containers, convertible, dlist, HDBC
      , HDBC-session, names-th, persistable-record, product-isomorphic
-     , relational-query, relational-schemas, sql-words, template-haskell
-     , th-data-compat, transformers
+     , QuickCheck, quickcheck-simple, relational-query
+     , relational-schemas, sql-words, template-haskell, th-data-compat
+     , transformers
      }:
      mkDerivation {
        pname = "relational-query-HDBC";
-       version = "0.6.7.0";
-       sha256 = "1g10z6076lrlal3ismvz4q4pxpawy749zwxpyvvfdhld2qqhg74c";
+       version = "0.6.7.1";
+       sha256 = "011zvhwkdl7py1mdb5n65zc98xdfm013lpqc2kd37v9pvn11g28s";
        libraryHaskellDepends = [
          base containers convertible dlist HDBC HDBC-session names-th
          persistable-record product-isomorphic relational-query
          relational-schemas sql-words template-haskell th-data-compat
          transformers
        ];
+       testHaskellDepends = [
+         base convertible HDBC QuickCheck quickcheck-simple
+       ];
        description = "HDBC instance of relational-query and typed query interface for HDBC";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "relational-query-HDBC_0_6_7_1" = callPackage
+  "relational-query-HDBC_0_6_8_0" = callPackage
     ({ mkDerivation, base, containers, convertible, dlist, HDBC
      , HDBC-session, names-th, persistable-record, product-isomorphic
      , QuickCheck, quickcheck-simple, relational-query
@@ -172882,8 +173195,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query-HDBC";
-       version = "0.6.7.1";
-       sha256 = "011zvhwkdl7py1mdb5n65zc98xdfm013lpqc2kd37v9pvn11g28s";
+       version = "0.6.8.0";
+       sha256 = "1piriqd6rngbdlf9bx9zabbmpn255iqs29z6f8pkxr5qn3q33dzz";
        libraryHaskellDepends = [
          base containers convertible dlist HDBC HDBC-session names-th
          persistable-record product-isomorphic relational-query
@@ -172915,6 +173228,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-record_0_2_2_0" = callPackage
+    ({ mkDerivation, base, persistable-record
+     , persistable-types-HDBC-pg, product-isomorphic, relational-query
+     , relational-query-HDBC
+     }:
+     mkDerivation {
+       pname = "relational-record";
+       version = "0.2.2.0";
+       sha256 = "1nmkjq5jrs38d0mmdpy8ygkjncg3j5yjbkcv7mxrm8wlqdijdg8b";
+       libraryHaskellDepends = [
+         base persistable-record persistable-types-HDBC-pg
+         product-isomorphic relational-query relational-query-HDBC
+       ];
+       description = "Meta package of Relational Record";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "relational-record-examples" = callPackage
     ({ mkDerivation, base, HDBC, HDBC-session, HDBC-sqlite3
      , persistable-record, relational-query, relational-query-HDBC
@@ -172922,8 +173253,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-record-examples";
-       version = "0.5.0.0";
-       sha256 = "0p49sb8ssvhbhmq4wicj7b46q53vibw686rr3xfy6iz82j64mklb";
+       version = "0.5.1.0";
+       sha256 = "0xsd1syrs1fsxkkbc7zb0dwl9wqjyf31n44h4b3la93pcjv4dl7q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -173925,26 +174256,30 @@ self: {
      }) {};
 
   "require" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, megaparsec, tasty
-     , tasty-hspec, text, universum
+    ({ mkDerivation, base, bytestring, criterion, directory, inliterate
+     , megaparsec, optparse-generic, tasty, tasty-hspec, text, universum
      }:
      mkDerivation {
        pname = "require";
-       version = "0.2.1";
-       sha256 = "0cf19mcjmqn50gz2fc32b67s8za6bb7i2k0h6sj25b457xv9rdx2";
+       version = "0.3.2";
+       sha256 = "0f84rq90srzx1zhcygmwk4zfcdgmgxg634nh7kp79fgam0vy7b7b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring megaparsec text universum
+         base bytestring directory inliterate megaparsec optparse-generic
+         text universum
        ];
        executableHaskellDepends = [
-         base bytestring megaparsec text universum
+         base bytestring directory inliterate megaparsec optparse-generic
+         text universum
        ];
        testHaskellDepends = [
-         base bytestring megaparsec tasty tasty-hspec text universum
+         base bytestring directory inliterate megaparsec optparse-generic
+         tasty tasty-hspec text universum
        ];
        benchmarkHaskellDepends = [
-         base bytestring criterion megaparsec text universum
+         base bytestring criterion directory inliterate megaparsec
+         optparse-generic text universum
        ];
        description = "Scrap your qualified import clutter";
        license = stdenv.lib.licenses.asl20;
@@ -175043,6 +175378,39 @@ self: {
        license = "unknown";
      }) {};
 
+  "riak_1_1_2_5" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, bifunctors, binary
+     , blaze-builder, bytestring, containers, criterion
+     , data-default-class, deepseq, enclosed-exceptions, exceptions
+     , hashable, HUnit, mersenne-random-pure64, monad-control, mtl
+     , network, process, protocol-buffers, pureMD5, QuickCheck, random
+     , resource-pool, riak-protobuf, semigroups, stm, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, time, transformers
+     , transformers-base, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "riak";
+       version = "1.1.2.5";
+       sha256 = "1ln7qm6rl8nr4fc1109pk0jmnqhw4dm3q2jfmvd4a34whplzwln7";
+       libraryHaskellDepends = [
+         aeson async attoparsec base bifunctors binary blaze-builder
+         bytestring containers data-default-class deepseq
+         enclosed-exceptions exceptions hashable mersenne-random-pure64
+         monad-control network protocol-buffers pureMD5 random resource-pool
+         riak-protobuf semigroups stm text time transformers
+         transformers-base unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers data-default-class HUnit mtl
+         process QuickCheck riak-protobuf semigroups tasty tasty-hunit
+         tasty-quickcheck template-haskell text yaml
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion semigroups ];
+       description = "A Haskell client for the Riak decentralized data store";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "riak-protobuf" = callPackage
     ({ mkDerivation, array, base, parsec, protocol-buffers
      , protocol-buffers-descriptor
@@ -175223,19 +175591,46 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rio_0_1_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, directory
+     , exceptions, filepath, hashable, hspec, microlens, mtl, primitive
+     , process, text, time, typed-process, unix, unliftio
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "rio";
+       version = "0.1.3.0";
+       sha256 = "1bb20lc2kjk3ly54zkp00p80rysrvcqgkhl4lprgcq70svf5xk3i";
+       libraryHaskellDepends = [
+         base bytestring containers deepseq directory exceptions filepath
+         hashable microlens mtl primitive process text time typed-process
+         unix unliftio unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers deepseq directory exceptions filepath
+         hashable hspec microlens mtl primitive process text time
+         typed-process unix unliftio unordered-containers vector
+       ];
+       description = "A standard library for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rio-orphans" = callPackage
-    ({ mkDerivation, base, exceptions, hspec, monad-control, resourcet
-     , rio, transformers-base
+    ({ mkDerivation, base, exceptions, fast-logger, hspec
+     , monad-control, monad-logger, resourcet, rio, transformers-base
      }:
      mkDerivation {
        pname = "rio-orphans";
-       version = "0.1.0.0";
-       sha256 = "09wy9h6smh532lrh13qzmni91yfb702x8i97r24d3ny6i3krzqi7";
+       version = "0.1.1.0";
+       sha256 = "0klbshdsv3gq3l7g1d6gq2wxdqjlqxbnwk1lbg5dpbz7yrnjr3by";
        libraryHaskellDepends = [
-         base exceptions monad-control resourcet rio transformers-base
+         base exceptions fast-logger monad-control monad-logger resourcet
+         rio transformers-base
        ];
        testHaskellDepends = [
-         base exceptions hspec monad-control resourcet rio transformers-base
+         base exceptions fast-logger hspec monad-control monad-logger
+         resourcet rio transformers-base
        ];
        description = "Orphan instances for the RIO type in the rio package";
        license = stdenv.lib.licenses.mit;
@@ -177035,6 +177430,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "safe-buffer-monad" = callPackage
+    ({ mkDerivation, base, hspec, mtl, safe-exceptions, stm, unliftio
+     }:
+     mkDerivation {
+       pname = "safe-buffer-monad";
+       version = "0.1.0";
+       sha256 = "0l82m3llk6haxzswk8hxkhn1gn37y0zzzan1dnkcg35gk7a9vakd";
+       libraryHaskellDepends = [ base mtl safe-exceptions stm ];
+       testHaskellDepends = [
+         base hspec mtl safe-exceptions stm unliftio
+       ];
+       description = "A monadic buffer resilient to exceptions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "safe-coerce" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -178086,7 +178496,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) z3;};
 
-  "sbv_7_8" = callPackage
+  "sbv_7_9" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers
      , crackNum, data-binary-ieee754, deepseq, directory, doctest
      , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty
@@ -178095,8 +178505,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbv";
-       version = "7.8";
-       sha256 = "12k47j4xv08dl61qfz2g3dla8rwsx6s7yy5mfnv21c5d2x2bxk6i";
+       version = "7.9";
+       sha256 = "0x57ppvlzvaqsd3aazx8gqcrqgjiqs06ch5rkkjsd0c9nifpb04m";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base containers crackNum data-binary-ieee754 deepseq
@@ -180025,16 +180435,19 @@ self: {
 
   "self-extract" = callPackage
     ({ mkDerivation, base, binary, bytestring, Cabal, extra, file-embed
-     , path, path-io, process, unix-compat
+     , path, path-io, process, unix-compat, ztar
      }:
      mkDerivation {
        pname = "self-extract";
-       version = "0.2.1";
-       sha256 = "0as9qxqh1pc695ds7kah5x241psnmfsp9hz2ilvvl73yanfg7j90";
+       version = "0.3.1";
+       sha256 = "01kzvjzb6rh86jzvh4n4802bvzgjz34rwmcrpm4aqzxpca9ax556";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring Cabal extra file-embed path path-io process
-         unix-compat
+         unix-compat ztar
        ];
+       executableHaskellDepends = [ base ];
        description = "A Haskell library to make self-extracting executables";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -180965,6 +181378,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant_0_14" = callPackage
+    ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat
+     , bytestring, Cabal, cabal-doctest, case-insensitive, doctest
+     , hspec, hspec-discover, http-api-data, http-media, http-types
+     , mmorph, mtl, natural-transformation, network-uri, QuickCheck
+     , quickcheck-instances, singleton-bool, string-conversions, tagged
+     , text, vault
+     }:
+     mkDerivation {
+       pname = "servant";
+       version = "0.14";
+       sha256 = "0akady8lnv5vz9c339cx97p91a1zvplsidjrcc7da6xqwwlaj94k";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         aeson attoparsec base base-compat bytestring case-insensitive
+         http-api-data http-media http-types mmorph mtl
+         natural-transformation network-uri singleton-bool
+         string-conversions tagged text vault
+       ];
+       testHaskellDepends = [
+         aeson aeson-compat base base-compat bytestring doctest hspec
+         QuickCheck quickcheck-instances string-conversions text
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "A family of combinators for defining webservices APIs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-JuicyPixels" = callPackage
     ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant
      , servant-server, wai, warp
@@ -181015,8 +181457,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "servant-auth";
-       version = "0.3.1.0";
-       sha256 = "0fa8r5rwrihsadzv74npb16yfvw3lzn3faajw660n5vxz36l56ia";
+       version = "0.3.2.0";
+       sha256 = "12s1m7vqp0ka8nani4cnrb6fad2y5mxji95bba2b6b07ih8xbd3v";
        libraryHaskellDepends = [ base ];
        description = "Authentication combinators for servant";
        license = stdenv.lib.licenses.bsd3;
@@ -181031,8 +181473,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-client";
-       version = "0.3.2.0";
-       sha256 = "1504cdqcq6fzr8f483662xdxcp99fpsxbizva1gqk248ymrxi2i5";
+       version = "0.3.3.0";
+       sha256 = "1pxkwpg1in3anamfvrp8gd7iihng0ikhl4k7ymz5d75ma1qwa2j9";
        libraryHaskellDepends = [
          base bytestring containers servant servant-auth servant-client-core
          text
@@ -181086,8 +181528,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-docs";
-       version = "0.2.9.0";
-       sha256 = "173gmbgyka6hg6hgchkaw96wv4nb7qr3qwypym520k6zi7cn8b9l";
+       version = "0.2.10.0";
+       sha256 = "0j1ynnrb6plrhpb2vzs2p7a9jb41llp0j1jwgap7hjhkwhyc7wxd";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base lens servant servant-auth servant-docs text
@@ -181142,31 +181584,25 @@ self: {
      , bytestring, bytestring-conversion, case-insensitive, cookie
      , crypto-api, data-default-class, entropy, hspec, hspec-discover
      , http-api-data, http-client, http-types, jose, lens, lens-aeson
-     , markdown-unlit, monad-time, mtl, QuickCheck, servant-auth
-     , servant-server, tagged, text, time, transformers
+     , markdown-unlit, monad-time, mtl, QuickCheck, servant
+     , servant-auth, servant-server, tagged, text, time, transformers
      , unordered-containers, wai, warp, wreq
      }:
      mkDerivation {
        pname = "servant-auth-server";
-       version = "0.3.2.0";
-       sha256 = "1ykjjd1lqivavsxdg8akj9vfh4miblslcwdyhlrgz2ci2f31wify";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.4.0.0";
+       sha256 = "0fwa3v7nkyhrwxrp4sf0aikh5mgkdpn2grz8sr4sszhswp2js4ip";
        libraryHaskellDepends = [
          aeson base base64-bytestring blaze-builder bytestring
          bytestring-conversion case-insensitive cookie crypto-api
          data-default-class entropy http-api-data http-types jose lens
-         monad-time mtl servant-auth servant-server tagged text time
+         monad-time mtl servant servant-auth servant-server tagged text time
          unordered-containers wai
        ];
-       executableHaskellDepends = [
-         aeson base markdown-unlit mtl servant-auth servant-server
-         transformers warp
-       ];
        testHaskellDepends = [
          aeson base bytestring case-insensitive hspec http-client http-types
-         jose lens lens-aeson mtl QuickCheck servant-server time wai warp
-         wreq
+         jose lens lens-aeson markdown-unlit mtl QuickCheck servant-auth
+         servant-server time transformers wai warp wreq
        ];
        testToolDepends = [ hspec-discover ];
        description = "servant-server/servant-auth compatibility";
@@ -181180,8 +181616,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-swagger";
-       version = "0.2.9.0";
-       sha256 = "10vldaywdjshb21ifw418i68i2nnvm0l89plyk7hkf7br2qnfwjc";
+       version = "0.2.10.0";
+       sha256 = "04ndbbhdmpgb8yshki6q2j46a5q8fzvlb4nn8x8gv0mqkriq79sh";
        libraryHaskellDepends = [
          base lens servant servant-auth servant-swagger swagger2 text
        ];
@@ -181325,6 +181761,8 @@ self: {
        pname = "servant-blaze";
        version = "0.8";
        sha256 = "155f20pizgkhn0hczwpxwxw1i99h0l6kfwwhs2r6bmr305aqisj6";
+       revision = "1";
+       editedCabalFile = "1sw72b1x6diyk13mwxfmv50nix0n2lf7cv55p4n2d4bs7r5388q3";
        libraryHaskellDepends = [ base blaze-html http-media servant ];
        testHaskellDepends = [ base blaze-html servant-server wai warp ];
        description = "Blaze-html support for servant";
@@ -181339,8 +181777,8 @@ self: {
        pname = "servant-cassava";
        version = "0.10";
        sha256 = "03jnyghwa5kjbl5j55njmp7as92flw91zs9cgdvb4jrsdy85sb4v";
-       revision = "2";
-       editedCabalFile = "11f5azqs007dfk5zr6sa43cri809k7jlf680gf3d7zcwhlf3xiq4";
+       revision = "3";
+       editedCabalFile = "1asq4w9dbl0ccwqdpvkhbh5fkvwd73iqd09a776ynf0vq3k05kh6";
        libraryHaskellDepends = [
          base base-compat bytestring cassava http-media servant vector
        ];
@@ -181432,6 +181870,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-client_0_14" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, bytestring, containers
+     , exceptions, generics-sop, hspec, hspec-discover, http-api-data
+     , http-client, http-media, http-types, HUnit, markdown-unlit
+     , monad-control, mtl, network, QuickCheck, semigroupoids, servant
+     , servant-client-core, servant-server, stm, text, time
+     , transformers, transformers-base, transformers-compat, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-client";
+       version = "0.14";
+       sha256 = "0jr2057y7vp6d2jcnisawkajinnqm68h024crh929r9fdka0p1n6";
+       libraryHaskellDepends = [
+         base base-compat bytestring containers exceptions http-client
+         http-media http-types monad-control mtl semigroupoids
+         servant-client-core stm text time transformers transformers-base
+         transformers-compat
+       ];
+       testHaskellDepends = [
+         aeson base base-compat bytestring generics-sop hspec http-api-data
+         http-client http-types HUnit markdown-unlit mtl network QuickCheck
+         servant servant-client-core servant-server text transformers
+         transformers-compat wai warp
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "automatical derivation of querying functions for servant webservices";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-client-core" = callPackage
     ({ mkDerivation, base, base-compat, base64-bytestring, bytestring
      , containers, deepseq, exceptions, generics-sop, hspec
@@ -181454,6 +181922,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-client-core_0_14" = callPackage
+    ({ mkDerivation, base, base-compat, base64-bytestring, bytestring
+     , containers, deepseq, exceptions, free, generics-sop, hspec
+     , hspec-discover, http-api-data, http-media, http-types
+     , network-uri, QuickCheck, safe, servant, text
+     }:
+     mkDerivation {
+       pname = "servant-client-core";
+       version = "0.14";
+       sha256 = "0qnazinjb19hpajxp9fam1pz9lcl1brjw84fcymh7i6sbwvk60kn";
+       libraryHaskellDepends = [
+         base base-compat base64-bytestring bytestring containers exceptions
+         free generics-sop http-api-data http-media http-types network-uri
+         safe servant text
+       ];
+       testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ];
+       testToolDepends = [ hspec-discover ];
+       description = "Core functionality and class for client function generation for servant APIs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-csharp" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath
      , heredocs, http-types, lens, mtl, servant, servant-foreign
@@ -181521,6 +182011,8 @@ self: {
        pname = "servant-dhall";
        version = "0.1";
        sha256 = "12rr4xknj44ynswzpx11dgymki86gfhhs2gcg0pjfg9w0k416mi9";
+       revision = "1";
+       editedCabalFile = "19rqigavivhzdakf9dwqa5s5q855r1q4xrimip913lq9ircrqz54";
        libraryHaskellDepends = [
          base base-compat bytestring dhall formatting http-media megaparsec
          prettyprinter servant text
@@ -181543,8 +182035,8 @@ self: {
        pname = "servant-docs";
        version = "0.11.2";
        sha256 = "1x6lvpvlm1lh51y2pmldrjdjjrs5qnq44m2abczr75fjjy6hla3b";
-       revision = "3";
-       editedCabalFile = "16hbrgp5r6mjhcncz8y2gq8q6z3h2b9sl0fzl0yi0w0vp7whgpm5";
+       revision = "4";
+       editedCabalFile = "0fflpj4miwpq5w6xm26678jvhibxzjri53680v8kwm9y92l6h9ga";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -181717,8 +182209,8 @@ self: {
        pname = "servant-foreign";
        version = "0.11.1";
        sha256 = "01cq938b4szvnapf8c4ir8j09aq25jwgnp3jbfxnja027c1v3735";
-       revision = "1";
-       editedCabalFile = "1g9631l7cw0kgnsidi943fnzkvddjnm3vgm11ha5vh10pczvn6rb";
+       revision = "2";
+       editedCabalFile = "19g405wqhhadyb70sgkm5ddprp9qb84pphszp3fzq2r4h5n2pc2i";
        libraryHaskellDepends = [
          base base-compat http-types lens servant text
        ];
@@ -181734,8 +182226,8 @@ self: {
        pname = "servant-generate";
        version = "0.1";
        sha256 = "0i71d95yfrlj5m5wr8ksxq8nkvwbsj81d4qm3j24pcgf6a32rrcw";
-       revision = "1";
-       editedCabalFile = "1viavg5pijjsdcmmdi7ibr9cvfz3r3b646jxxvmya10ss3zvlzh4";
+       revision = "2";
+       editedCabalFile = "00y5ji53sz59wys4nk2xcdpggydvkkqdxnm0aqj5raxzmakqnraq";
        libraryHaskellDepends = [ base servant servant-server ];
        description = "Utilities for generating mock server implementations";
        license = stdenv.lib.licenses.bsd3;
@@ -181757,6 +182249,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "servant-generic_0_1_0_2" = callPackage
+    ({ mkDerivation, base, network-uri, servant, servant-server, text
+     , warp
+     }:
+     mkDerivation {
+       pname = "servant-generic";
+       version = "0.1.0.2";
+       sha256 = "0pv0hgw85gmamvv8cd1yz03b56yfja8r1xrkvlzgb5lpw1ghxn0s";
+       libraryHaskellDepends = [ base servant servant-server ];
+       testHaskellDepends = [
+         base network-uri servant servant-server text warp
+       ];
+       description = "Specify Servant APIs with records";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-github" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cryptonite, hspec
      , http-api-data, http-client, http-client-tls, http-link-header
@@ -181876,8 +182385,8 @@ self: {
        pname = "servant-js";
        version = "0.9.3.2";
        sha256 = "1p37520x85rg7rnhazby0x6qas2sh5d79gygmaa5f7jalhkyrq02";
-       revision = "1";
-       editedCabalFile = "11q54f0hx8ggfsrklaf8dk1gra597097gl60j667bmy8266l33ad";
+       revision = "2";
+       editedCabalFile = "1mz21yf77nzfb30hlqncyx3jwr50ab7qh0m0cv8pds6s76s6k9sj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -181931,6 +182440,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-lucid_0_8_1" = callPackage
+    ({ mkDerivation, base, http-media, lucid, servant, servant-server
+     , text, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-lucid";
+       version = "0.8.1";
+       sha256 = "0g8icz12ydyxyv710fhixswdphiri0b44pw5p0dr21cvwbaxawb6";
+       libraryHaskellDepends = [ base http-media lucid servant text ];
+       testHaskellDepends = [ base lucid servant-server wai warp ];
+       description = "Servant support for lucid";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-match" = callPackage
     ({ mkDerivation, base, bytestring, hspec, http-types, network-uri
      , servant, text, utf8-string
@@ -181979,8 +182503,8 @@ self: {
        pname = "servant-mock";
        version = "0.8.4";
        sha256 = "1705fw63lrzw79w1ypcdlf35d8qxx247q8isiqh28wzmc4j3kmnr";
-       revision = "1";
-       editedCabalFile = "0izm1slx384cgfaf16r3w1h6cqpssahphb9b0ccy2m04ysgy7chp";
+       revision = "2";
+       editedCabalFile = "0brnvssfcg105kkkj646wih8apnhd5gvy25c576i93x0nxb0n39j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -182006,8 +182530,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-multipart";
-       version = "0.11.1";
-       sha256 = "06wnmazi4f2lgk2ziyh0wjnjl5gs88rsb0f6bpphxkv7wy3agv4q";
+       version = "0.11.2";
+       sha256 = "0w58gab42l3sz7min2pgv6ihfjz28gys5yky0p83kj5smwhys5nx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -182048,6 +182572,8 @@ self: {
        pname = "servant-nix";
        version = "0.1";
        sha256 = "1bg2pxfq5g4imppsn9snlw2mzl8qrdr1hpxk7pppwp9cpcy3bsvg";
+       revision = "1";
+       editedCabalFile = "0h4x2rjyrg6ah9cil6zsci6wra8gmvb1kv2zq6zs7mqw9426vvfb";
        libraryHaskellDepends = [
          base bytestring hnix http-media servant text
        ];
@@ -182241,6 +182767,8 @@ self: {
        pname = "servant-quickcheck";
        version = "0.0.7.2";
        sha256 = "0zsf68c44yijmgkcd2qmcwz9p0kiix6dzhk3g4ifz60s6kv3jfbh";
+       revision = "1";
+       editedCabalFile = "1slgq8q0hmh904ssn5sfmi6mbpd3vkqvc59m3g9kfgzf5j70py2h";
        libraryHaskellDepends = [
          aeson base base-compat-batteries bytestring case-insensitive clock
          data-default-class hspec http-client http-media http-types mtl
@@ -182391,6 +182919,43 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-server_0_14" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, base64-bytestring
+     , bytestring, Cabal, cabal-doctest, containers, directory, doctest
+     , exceptions, filepath, hspec, hspec-discover, hspec-wai
+     , http-api-data, http-media, http-types, monad-control, mtl
+     , network, network-uri, QuickCheck, resourcet, safe, servant
+     , should-not-typecheck, string-conversions, tagged, temporary, text
+     , transformers, transformers-base, transformers-compat, wai
+     , wai-app-static, wai-extra, warp, word8
+     }:
+     mkDerivation {
+       pname = "servant-server";
+       version = "0.14";
+       sha256 = "03vkr4xscll4wg09qfp4fdl9aazkx61zfsk3qv4isixvg1c2iwps";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base base-compat base64-bytestring bytestring containers exceptions
+         filepath http-api-data http-media http-types monad-control mtl
+         network network-uri resourcet servant string-conversions tagged
+         text transformers transformers-base transformers-compat wai
+         wai-app-static word8
+       ];
+       executableHaskellDepends = [ aeson base servant text wai warp ];
+       testHaskellDepends = [
+         aeson base base-compat base64-bytestring bytestring directory
+         doctest hspec hspec-wai http-types mtl QuickCheck resourcet safe
+         servant should-not-typecheck string-conversions temporary text
+         transformers transformers-compat wai wai-extra
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "A family of combinators for defining webservices APIs and serving them";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-smsc-ru" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-client
      , http-client-tls, HUnit, mtl, QuickCheck, quickcheck-text
@@ -182590,8 +183155,8 @@ self: {
        pname = "servant-swagger";
        version = "1.1.5";
        sha256 = "02m51kgwa2cp72wfq6a96zncywryrnxq778jh2cqmpzjrhml8yjg";
-       revision = "2";
-       editedCabalFile = "1q45dgawmi46q9ps2z7y7kbwvl8pjbzq58s7jzrh096aaiv5141a";
+       revision = "3";
+       editedCabalFile = "0bjsaqrf3pjiv247mvrybwrsaklh23npwrycvmm8f2y1hraadv8d";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson base bytestring hspec http-media insert-ordered-containers
@@ -182642,6 +183207,8 @@ self: {
        pname = "servant-swagger-ui";
        version = "0.3.0.3.13.2";
        sha256 = "0llkcag9bnhvni6ddar966i0pwql93s5icvw6pxa9ra5v14v7p5n";
+       revision = "1";
+       editedCabalFile = "1ka19i4r7s85qlpk5sm90gm5yf82nd03clgyqzm8w8jn7y3fji19";
        libraryHaskellDepends = [
          base bytestring file-embed-lzma servant servant-server
          servant-swagger-ui-core swagger2 text
@@ -182658,10 +183225,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-swagger-ui-core";
-       version = "0.3";
-       sha256 = "1ji54q9x787dr5l81qn0shw2n3b8k9aglli03gxfbvs0l7ga5xrd";
-       revision = "1";
-       editedCabalFile = "1dh2ra39x2syzg4lw1cklr7hgr52gp72f4iy5zw4zwgy27hbq48v";
+       version = "0.3.1";
+       sha256 = "05lnm9p86rd9rxsz7f1zm5vkqzjcq2fd8an7c8y5fk4kxj6rydxb";
        libraryHaskellDepends = [
          base blaze-markup bytestring http-media servant servant-blaze
          servant-server swagger2 text transformers transformers-compat
@@ -182679,6 +183244,8 @@ self: {
        pname = "servant-swagger-ui-jensoleg";
        version = "0.3";
        sha256 = "1ymw2lkfn0bkmddvpmv0ikv45fqac2zidnli8bfyp92jf0b5dnik";
+       revision = "1";
+       editedCabalFile = "1r097cz7kl3kknkp23ss3yl97nq6zzn0p9nxrxgxs5d9d62nb0rg";
        libraryHaskellDepends = [
          base bytestring file-embed-lzma servant servant-server
          servant-swagger-ui-core swagger2 text
@@ -182695,6 +183262,8 @@ self: {
        pname = "servant-swagger-ui-redoc";
        version = "0.3.0.1.21.2";
        sha256 = "1p3mq7m5hvid7g7jwpf2jz923512wlprh6gikq5x2vcb14d40qwl";
+       revision = "1";
+       editedCabalFile = "11lldvcppw71a7i963lymsqy74dkl46zhqnp30g33mfmbvgbwh23";
        libraryHaskellDepends = [
          base bytestring file-embed-lzma servant servant-server
          servant-swagger-ui-core swagger2 text
@@ -182779,8 +183348,8 @@ self: {
        pname = "servant-yaml";
        version = "0.1.0.0";
        sha256 = "011jxvr2i65bf0kmdn0sxkqgfz628a0sfhzphr1rqsmh8sqdj5y9";
-       revision = "19";
-       editedCabalFile = "1hlfly2j0c3c4sbzbkbzvwgvfnngkmx0r67ddv4ccg2if6pc5nqv";
+       revision = "20";
+       editedCabalFile = "0g13cchj5wnjpypsj9fgwk4ypy8xzzwrpry2f9zlsyp0lvkqjqrw";
        libraryHaskellDepends = [
          base bytestring http-media servant yaml
        ];
@@ -184870,22 +185439,6 @@ self: {
      }:
      mkDerivation {
        pname = "show-prettyprint";
-       version = "0.2.0.2";
-       sha256 = "1snkahqn081rnm6qs54hwgc3y2pwgadrvh8a81lw7rl1mfp261kg";
-       libraryHaskellDepends = [
-         ansi-wl-pprint base prettyprinter trifecta
-       ];
-       testHaskellDepends = [ base doctest ];
-       description = "Robust prettyprinter for output of auto-generated Show instances";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "show-prettyprint_0_2_2" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter
-     , trifecta
-     }:
-     mkDerivation {
-       pname = "show-prettyprint";
        version = "0.2.2";
        sha256 = "0mdgx484vgf2lif4a58vm8yl8zghxh0533038r76l5xlkc5qczgh";
        libraryHaskellDepends = [
@@ -184894,7 +185447,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Robust prettyprinter for output of auto-generated Show instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "show-type" = callPackage
@@ -186380,6 +186932,8 @@ self: {
        pname = "siphon";
        version = "0.8.1";
        sha256 = "0f0i6clnlzkmks7l7pjxyvv2xq7lcd45fmdpzr7xqfwdn17mq6sx";
+       revision = "2";
+       editedCabalFile = "0kw20g5qghyh1nh9x8dm70frx3jl89npylr2aypvw8igffwsj531";
        libraryHaskellDepends = [
          attoparsec base bytestring colonnade streaming text transformers
          vector
@@ -186982,30 +187536,6 @@ self: {
      }:
      mkDerivation {
        pname = "slack-web";
-       version = "0.2.0.4";
-       sha256 = "1wbqz6shqm39ivmw7k2pwslaygxf4rxxbkiczxzpvd29y5pm81ah";
-       libraryHaskellDepends = [
-         aeson base containers errors http-api-data http-client
-         http-client-tls megaparsec mtl servant servant-client
-         servant-client-core text time transformers
-       ];
-       testHaskellDepends = [
-         aeson base containers errors hspec http-api-data megaparsec text
-         time
-       ];
-       description = "Bindings for the Slack web API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "slack-web_0_2_0_5" = callPackage
-    ({ mkDerivation, aeson, base, containers, errors, hspec
-     , http-api-data, http-client, http-client-tls, megaparsec, mtl
-     , servant, servant-client, servant-client-core, text, time
-     , transformers
-     }:
-     mkDerivation {
-       pname = "slack-web";
        version = "0.2.0.5";
        sha256 = "1bplhq3qd4hssp6s6710fgxdbmwm0gknsgs0p4n3hz3w30rp6b56";
        libraryHaskellDepends = [
@@ -187500,25 +188030,12 @@ self: {
     ({ mkDerivation, aeson, base, linear, text, vector }:
      mkDerivation {
        pname = "smoothie";
-       version = "0.4.2.8";
-       sha256 = "0fy0rygg2r73zfcgxmamlz1xfbpfxbljxcwjx9rnp0c8v9aq2m2s";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ aeson base linear text vector ];
-       description = "Smooth curves via several interpolation modes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "smoothie_0_4_2_9" = callPackage
-    ({ mkDerivation, aeson, base, linear, text, vector }:
-     mkDerivation {
-       pname = "smoothie";
        version = "0.4.2.9";
        sha256 = "0kra42nh86dfp66ngr4bmb8d530nh7b9pra1vlykc0sx9b1zpjnk";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ aeson base linear text vector ];
        description = "Smooth curves via several interpolation modes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smsaero" = callPackage
@@ -189885,8 +190402,8 @@ self: {
     ({ mkDerivation, base, split, WAVE }:
      mkDerivation {
        pname = "soundgen";
-       version = "0.1.0.1";
-       sha256 = "0vjl992xsb06ry6bbyi9zbgiyf5117zr5hpdmpjcy9d2g0bzi2q2";
+       version = "0.1.1.0";
+       sha256 = "198nxjskmlqdn1wnw5zjwxqqs3b03qv2v48g1pzf9llcgvcy37vf";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base split WAVE ];
@@ -191359,26 +191876,6 @@ self: {
   "sqlite-simple" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
      , blaze-textual, bytestring, containers, direct-sqlite, HUnit, Only
-     , semigroups, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "sqlite-simple";
-       version = "0.4.15.0";
-       sha256 = "1qk9dzrqfyjavyl9p0l24hbncp2c1faxx0yvjz5iq3s4dl6fswf0";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder blaze-textual bytestring containers
-         direct-sqlite Only semigroups text time transformers
-       ];
-       testHaskellDepends = [
-         base base16-bytestring bytestring direct-sqlite HUnit text time
-       ];
-       description = "Mid-Level SQLite client library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "sqlite-simple_0_4_16_0" = callPackage
-    ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
-     , blaze-textual, bytestring, containers, direct-sqlite, HUnit, Only
      , semigroups, template-haskell, text, time, transformers
      }:
      mkDerivation {
@@ -191395,7 +191892,6 @@ self: {
        ];
        description = "Mid-Level SQLite client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sqlite-simple-errors" = callPackage
@@ -192132,8 +192628,8 @@ self: {
      }:
      mkDerivation {
        pname = "stack-prism";
-       version = "0.1.6";
-       sha256 = "1nwxjhwpjg40kp55g017918dmzxjzj0q0pndhr7gdjnd2d1w4fj9";
+       version = "0.1.7";
+       sha256 = "0a09x8b78j08cn0l492hj6yx15fhs6bipaiwgjqsax37ynnrxhqz";
        libraryHaskellDepends = [
          base profunctors tagged template-haskell transformers
        ];
@@ -192550,8 +193046,8 @@ self: {
      }:
      mkDerivation {
        pname = "stackage2nix";
-       version = "0.7.0";
-       sha256 = "0g3abhr63jnqw231k6kai9c5gqh15dyxrr78fqw5ga98l3p2b8jl";
+       version = "0.7.1";
+       sha256 = "1yiz7gbzv8bqil6zgp28n18lj34mdpg6xx0bzk8x9956zxsiwhis";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -193170,8 +193666,8 @@ self: {
      }:
      mkDerivation {
        pname = "status-notifier-item";
-       version = "0.2.2.0";
-       sha256 = "19v7n1hv9ldrcv8h5wcv7lvshwzry0zm9qhvzspb5zvdawgy32zh";
+       version = "0.2.2.1";
+       sha256 = "0i81hrmrhf4qpwhxbvg681kq4r96nhzhspc3jgi04h4ayx7c0vx0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -193310,28 +193806,29 @@ self: {
 
   "steeloverseer" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring
-     , containers, directory, filepath, fsnotify, hspec, mtl
-     , optparse-applicative, process, regex-tdfa, resourcet, semigroups
-     , stm, streaming, text, yaml
+     , containers, directory, exceptions, filepath, fsnotify, hspec
+     , managed, mtl, optparse-applicative, process, regex-tdfa
+     , semigroups, stm, streaming, text, unix, yaml
      }:
      mkDerivation {
        pname = "steeloverseer";
-       version = "2.0.1.0";
-       sha256 = "0njsj7kyyf4vkk4i2yy93swlhiz5xkrdam2dd060qfi7ya8n3h6x";
+       version = "2.0.2.0";
+       sha256 = "1jj8akshhns3azi9vgfclg9xhbl40nyr1lmf12pisw3mzbd7ld28";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson ansi-terminal async base bytestring containers fsnotify mtl
-         process regex-tdfa resourcet semigroups stm streaming text yaml
+         aeson ansi-terminal async base bytestring containers exceptions
+         fsnotify managed mtl process regex-tdfa semigroups stm streaming
+         text unix yaml
        ];
        executableHaskellDepends = [
-         async base bytestring directory filepath fsnotify mtl
-         optparse-applicative regex-tdfa resourcet semigroups stm streaming
-         text yaml
+         async base bytestring directory exceptions filepath fsnotify
+         managed mtl optparse-applicative regex-tdfa semigroups stm
+         streaming text yaml
        ];
        testHaskellDepends = [
-         async base bytestring fsnotify hspec mtl regex-tdfa resourcet
-         semigroups stm streaming text yaml
+         async base bytestring exceptions fsnotify hspec managed mtl
+         regex-tdfa semigroups stm streaming text yaml
        ];
        description = "A file watcher and development tool";
        license = stdenv.lib.licenses.bsd3;
@@ -194089,8 +194586,8 @@ self: {
      }:
      mkDerivation {
        pname = "store-core";
-       version = "0.4.3";
-       sha256 = "0fx4ylhqm79pi6k8qzby6nb0d7nlq5za8n3fir1v97wl34vmr3gf";
+       version = "0.4.4";
+       sha256 = "1489ydwmq3vd9lz193m5w277wvb9g74ssc1ncfjdry2g0y6czbjv";
        libraryHaskellDepends = [
          base bytestring ghc-prim primitive text transformers
        ];
@@ -194836,21 +195333,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "streamly_0_2_1" = callPackage
+  "streamly_0_3_0" = callPackage
     ({ mkDerivation, atomic-primops, base, containers, deepseq
-     , exceptions, gauge, hspec, lifted-base, lockfree-queue
-     , monad-control, mtl, QuickCheck, random, stm, transformers
-     , transformers-base
+     , exceptions, gauge, heaps, hspec, lockfree-queue, monad-control
+     , mtl, QuickCheck, random, transformers, transformers-base
      }:
      mkDerivation {
        pname = "streamly";
-       version = "0.2.1";
-       sha256 = "157zxg03ibgxdrghpcdyj22fd7zd02fmgnib13yf0jwwc400c4gp";
+       version = "0.3.0";
+       sha256 = "0ssp66w8qbfbx9p6hdgvddp3d82i1b4b0n9jbji6cyvf7v8b7m1k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         atomic-primops base containers exceptions lifted-base
-         lockfree-queue monad-control mtl stm transformers transformers-base
+         atomic-primops base containers exceptions heaps lockfree-queue
+         monad-control mtl transformers transformers-base
        ];
        testHaskellDepends = [
          base containers exceptions hspec mtl QuickCheck random transformers
@@ -199205,6 +199701,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tar-conduit_0_2_3_1" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-combinators
+     , conduit-extra, containers, criterion, deepseq, directory
+     , filepath, hspec, QuickCheck, safe-exceptions, text, unix, weigh
+     }:
+     mkDerivation {
+       pname = "tar-conduit";
+       version = "0.2.3.1";
+       sha256 = "0z108pzvh4r87dykapxl36bhby4jhkya53dy2pglb891m54wswpc";
+       libraryHaskellDepends = [
+         base bytestring conduit conduit-combinators directory filepath
+         safe-exceptions text unix
+       ];
+       testHaskellDepends = [
+         base bytestring conduit conduit-combinators conduit-extra
+         containers deepseq directory filepath hspec QuickCheck weigh
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring conduit conduit-combinators containers criterion
+         deepseq directory filepath hspec
+       ];
+       description = "Extract and create tar files using conduit for streaming";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tardis" = callPackage
     ({ mkDerivation, base, mmorph, mtl }:
      mkDerivation {
@@ -199437,12 +199959,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tasty-dejafu_1_2_0_5" = callPackage
+  "tasty-dejafu_1_2_0_6" = callPackage
     ({ mkDerivation, base, dejafu, random, tagged, tasty }:
      mkDerivation {
        pname = "tasty-dejafu";
-       version = "1.2.0.5";
-       sha256 = "1xx72sw7rc4lg1wy5fpfjpxiwqynchlvvcyz4mb7dac6a3rbynf3";
+       version = "1.2.0.6";
+       sha256 = "193bf26vccbs0wpdhcqi0pi8mw806acrk1hpr2a7jl70jfwxhp98";
        libraryHaskellDepends = [ base dejafu random tagged tasty ];
        description = "Deja Fu support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
@@ -202965,6 +203487,23 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
+  "th-abstraction_0_2_7_0" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
+     mkDerivation {
+       pname = "th-abstraction";
+       version = "0.2.7.0";
+       sha256 = "1233x853gcc18xm0d8ysf7rlkg9aphy2j6hn78yxchalglfwjixf";
+       revision = "1";
+       editedCabalFile = "1fafzr80vbnamqq72rwnhk1ih3iyxzb8j2xfdgn691irv4fv6839";
+       libraryHaskellDepends = [
+         base containers ghc-prim template-haskell
+       ];
+       testHaskellDepends = [ base containers template-haskell ];
+       description = "Nicer interface for reified information about data types";
+       license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-alpha" = callPackage
     ({ mkDerivation, base, containers, derive, mmorph, mtl, tasty
      , tasty-hunit, tasty-quickcheck, template-haskell, th-desugar
@@ -203879,30 +204418,6 @@ self: {
   "threepenny-gui" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , data-default, deepseq, exceptions, file-embed, filepath, hashable
-     , network-uri, safe, snap-core, snap-server, stm, template-haskell
-     , text, transformers, unordered-containers, vault, vector
-     , websockets, websockets-snap
-     }:
-     mkDerivation {
-       pname = "threepenny-gui";
-       version = "0.8.2.3";
-       sha256 = "17lh51ifw29a641xhkpcclnpxl7jvp6dmx9rbxqn5wgqclvi5qwb";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson async base bytestring containers data-default deepseq
-         exceptions file-embed filepath hashable network-uri safe snap-core
-         snap-server stm template-haskell text transformers
-         unordered-containers vault vector websockets websockets-snap
-       ];
-       description = "GUI framework that uses the web browser as a display";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "threepenny-gui_0_8_2_4" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, containers
-     , data-default, deepseq, exceptions, file-embed, filepath, hashable
      , safe, snap-core, snap-server, stm, template-haskell, text
      , transformers, unordered-containers, vault, vector, websockets
      , websockets-snap
@@ -203922,7 +204437,6 @@ self: {
        ];
        description = "GUI framework that uses the web browser as a display";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threepenny-gui-contextmenu" = callPackage
@@ -208294,6 +208808,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "turtle_1_5_9" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
+     , containers, criterion, directory, doctest, exceptions, foldl
+     , hostname, managed, optional-args, optparse-applicative, process
+     , semigroups, stm, system-fileio, system-filepath, temporary, text
+     , time, transformers, unix, unix-compat
+     }:
+     mkDerivation {
+       pname = "turtle";
+       version = "1.5.9";
+       sha256 = "13x2qk8j2qxqqk60y17h7g1p76gj3xxyc4g78mb4d4ajq6smk91x";
+       libraryHaskellDepends = [
+         ansi-wl-pprint async base bytestring clock containers directory
+         exceptions foldl hostname managed optional-args
+         optparse-applicative process semigroups stm system-fileio
+         system-filepath temporary text time transformers unix unix-compat
+       ];
+       testHaskellDepends = [ base doctest system-filepath temporary ];
+       benchmarkHaskellDepends = [ base criterion text ];
+       description = "Shell programming, Haskell-style";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "turtle-options" = callPackage
     ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle
      }:
@@ -208770,8 +209308,8 @@ self: {
      }:
      mkDerivation {
        pname = "twitter-conduit";
-       version = "0.2.3";
-       sha256 = "1xspyig287y2x9y0f6390jd8zmzc2nf2zcsnjd9y69a1qjchviv9";
+       version = "0.3.0";
+       sha256 = "1p3cas4yy8k0knf5mljmjjzzknwhcaw1x08z7q4jlc9y06323by1";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson attoparsec authenticate-oauth base bytestring conduit
@@ -209867,8 +210405,8 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck }:
      mkDerivation {
        pname = "typenums";
-       version = "0.1.1";
-       sha256 = "1n8fwcpwk5qpjljvwi2mfh0rg7sv58cvlzk165bj3bqcac2ffrq4";
+       version = "0.1.1.1";
+       sha256 = "0zkm10hwdwh4msl60nzm81d409xlch03rb5vv38zhkd3hzqs104v";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Type level numbers using existing Nat functionality";
@@ -210129,6 +210667,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ua-parser_0_7_5_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, criterion, data-default
+     , deepseq, file-embed, filepath, HUnit, pcre-light, tasty
+     , tasty-hunit, tasty-quickcheck, text, yaml
+     }:
+     mkDerivation {
+       pname = "ua-parser";
+       version = "0.7.5.0";
+       sha256 = "08nbzzhndxba039rl5s4ap5ndnfj774546xzvqf9ph8r05dmr690";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base bytestring data-default file-embed pcre-light text yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring data-default file-embed filepath HUnit
+         pcre-light tasty tasty-hunit tasty-quickcheck text yaml
+       ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring criterion data-default deepseq file-embed
+         filepath pcre-light text yaml
+       ];
+       description = "A library for parsing User-Agent strings, official Haskell port of ua-parser";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "uacpid" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, hslogger
      , mtl, network, process, regex-compat, time, time-locale-compat
@@ -212570,6 +213134,25 @@ self: {
 
   "urlpath" = callPackage
     ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph
+     , monad-control, monad-control-aligned, monad-logger, mtl
+     , path-extra, resourcet, split, strict, text, transformers
+     , transformers-base, vector
+     }:
+     mkDerivation {
+       pname = "urlpath";
+       version = "8.1.0";
+       sha256 = "0gv5mjhhmxq5zppda431vddpcl138qglxiyksj588d4zzg3kd8iy";
+       libraryHaskellDepends = [
+         attoparsec-uri base exceptions mmorph monad-control
+         monad-control-aligned monad-logger mtl path-extra resourcet split
+         strict text transformers transformers-base vector
+       ];
+       description = "Painfully simple URL deployment";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "urlpath_9_0_0" = callPackage
+    ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph
      , monad-control, monad-control-aligned, monad-logger, mtl, path
      , path-extra, resourcet, split, strict, text, transformers
      , transformers-base, vector
@@ -212585,6 +213168,7 @@ self: {
        ];
        description = "Painfully simple URL deployment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urn" = callPackage
@@ -213439,29 +214023,6 @@ self: {
      }:
      mkDerivation {
        pname = "vado";
-       version = "0.0.9";
-       sha256 = "0y48niwv78xydjnz26rfja509blp0km279mypr2yzwm0xdif3s2s";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base directory filepath process text
-       ];
-       executableHaskellDepends = [
-         attoparsec base directory filepath process text
-       ];
-       testHaskellDepends = [
-         attoparsec base directory filepath process QuickCheck text
-       ];
-       description = "Runs commands on remote machines using ssh";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "vado_0_0_10" = callPackage
-    ({ mkDerivation, attoparsec, base, directory, filepath, process
-     , QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "vado";
        version = "0.0.10";
        sha256 = "04rdjhc1ny2xwmwvbf70bwjgyv5kzl8s83m79qr3i04vicax14gd";
        isLibrary = true;
@@ -213477,7 +214038,6 @@ self: {
        ];
        description = "Runs commands on remote machines using ssh";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "valid-names" = callPackage
@@ -213873,6 +214433,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "valor" = callPackage
+    ({ mkDerivation, base, checkers, hspec, hspec-checkers, QuickCheck
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "valor";
+       version = "0.0.0.1";
+       sha256 = "1cjkfalsrpw579bg12ldmzjmmkj9l7b35j2vp37qqgd39m1dm29a";
+       libraryHaskellDepends = [ base text transformers ];
+       testHaskellDepends = [
+         base checkers hspec hspec-checkers QuickCheck text transformers
+       ];
+       description = "Simple general structured validation library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "value-supply" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -215237,6 +215813,8 @@ self: {
        pname = "vinyl";
        version = "0.7.0";
        sha256 = "1gch1cx10466j2cyj7q4x0s3g9sjy35l5j9mvq4sfnf4sql1cfps";
+       revision = "1";
+       editedCabalFile = "0g5b9g7mkjib4ar1v6jfn5m15vj1zg7qn4ffhz03labh3zlkw7zz";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [
          base doctest hspec lens should-not-typecheck singletons
@@ -215257,6 +215835,8 @@ self: {
        pname = "vinyl";
        version = "0.8.1.1";
        sha256 = "0gwgsk7xf64291s6crvzlry1bvcvwaqmvxpl605id4bb099kqfnh";
+       revision = "1";
+       editedCabalFile = "0mb694y03r185r0p473zh6bl4j0l4na9km0r3x8czjil7x9yb0vr";
        libraryHaskellDepends = [ array base ghc-prim ];
        testHaskellDepends = [
          base doctest hspec lens microlens should-not-typecheck singletons
@@ -217842,6 +218422,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wasm" = callPackage
+    ({ mkDerivation, alex, array, base, base64-bytestring, bytestring
+     , cereal, containers, deepseq, directory, filepath, happy, ieee754
+     , mtl, optparse-applicative, tasty, tasty-hunit, text, transformers
+     , utf8-string, vector
+     }:
+     mkDerivation {
+       pname = "wasm";
+       version = "1.0.0";
+       sha256 = "0l5llqc05fr7zkva3ll8hy0qxx19r17qs6zcp098yz6vsnkavzx6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base bytestring cereal containers deepseq ieee754 mtl text
+         transformers utf8-string vector
+       ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [
+         base base64-bytestring bytestring optparse-applicative
+       ];
+       testHaskellDepends = [
+         base bytestring directory filepath mtl tasty tasty-hunit text
+       ];
+       testToolDepends = [ alex happy ];
+       description = "WebAssembly Language Toolkit and Interpreter";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "watchdog" = callPackage
     ({ mkDerivation, base, mtl, time }:
      mkDerivation {
@@ -218876,40 +219484,6 @@ self: {
      }:
      mkDerivation {
        pname = "websockets";
-       version = "0.12.5.0";
-       sha256 = "19vp0mjpib66980q12iv7xkc6j82nkwlyiir0n964nyzl478v3rd";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base base64-bytestring binary bytestring
-         bytestring-builder case-insensitive containers entropy network
-         random SHA streaming-commons text
-       ];
-       testHaskellDepends = [
-         attoparsec base base64-bytestring binary bytestring
-         bytestring-builder case-insensitive containers entropy HUnit
-         network QuickCheck random SHA streaming-commons test-framework
-         test-framework-hunit test-framework-quickcheck2 text
-       ];
-       benchmarkHaskellDepends = [
-         attoparsec base base64-bytestring binary bytestring
-         bytestring-builder case-insensitive containers criterion entropy
-         network random SHA text
-       ];
-       doCheck = false;
-       description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "websockets_0_12_5_1" = callPackage
-    ({ mkDerivation, attoparsec, base, base64-bytestring, binary
-     , bytestring, bytestring-builder, case-insensitive, containers
-     , criterion, entropy, HUnit, network, QuickCheck, random, SHA
-     , streaming-commons, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text
-     }:
-     mkDerivation {
-       pname = "websockets";
        version = "0.12.5.1";
        sha256 = "1v9zmd34bmh0y02njff4n1vkp1d5jdpq9dlva0z7sr0glv8c3drz";
        isLibrary = true;
@@ -218933,7 +219507,6 @@ self: {
        doCheck = false;
        description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "websockets-rpc" = callPackage
@@ -219109,8 +219682,8 @@ self: {
      }:
      mkDerivation {
        pname = "weeder";
-       version = "1.0.5";
-       sha256 = "0blaknr11j95sxdm6k2pyfmq1f2llg4hdmy24rvjy9jb82d3vrsi";
+       version = "1.0.6";
+       sha256 = "07i84ypb0n1qnfcv5y2aksicl36lmxd2bmlmdn2riqj9bhy98vij";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -219481,6 +220054,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wild-bind_0_1_2_1" = callPackage
+    ({ mkDerivation, base, containers, hspec, microlens, QuickCheck
+     , semigroups, stm, text, transformers
+     }:
+     mkDerivation {
+       pname = "wild-bind";
+       version = "0.1.2.1";
+       sha256 = "1jklfafgv9i2xzsrcz77wzf5p4sxz6cgk1nw3ydzsar5f3jyqxmf";
+       libraryHaskellDepends = [
+         base containers semigroups text transformers
+       ];
+       testHaskellDepends = [
+         base hspec microlens QuickCheck stm transformers
+       ];
+       description = "Dynamic key binding framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wild-bind-indicator" = callPackage
     ({ mkDerivation, base, containers, gtk, text, transformers
      , wild-bind
@@ -219533,6 +220125,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wild-bind-x11_0_2_0_4" = callPackage
+    ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl
+     , semigroups, stm, text, time, transformers, wild-bind, X11
+     }:
+     mkDerivation {
+       pname = "wild-bind-x11";
+       version = "0.2.0.4";
+       sha256 = "0wfhva3xkjykf6nl4ghvmp7lx2g0isg09hhb4m44qg0cgv7rzh5z";
+       libraryHaskellDepends = [
+         base containers fold-debounce mtl semigroups stm text transformers
+         wild-bind X11
+       ];
+       testHaskellDepends = [
+         async base hspec text time transformers wild-bind X11
+       ];
+       description = "X11-specific implementation for WildBind";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wilton-ffi" = callPackage
     ({ mkDerivation, aeson, base, bytestring, utf8-string }:
      mkDerivation {
@@ -219604,34 +220216,34 @@ self: {
      }) {};
 
   "winery" = callPackage
-    ({ mkDerivation, base, binary, bytestring, cassava, containers
-     , deepseq, fast-builder, gauge, hashable, mtl, prettyprinter
+    ({ mkDerivation, base, binary, bytestring, cassava, containers, cpu
+     , deepseq, fingertree, gauge, hashable, mtl, prettyprinter
      , prettyprinter-ansi-terminal, serialise, text, transformers
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "winery";
-       version = "0.1";
-       sha256 = "1i8myd2adkwsini5lvs8418yipr8lx3plsp02f0ja4w726f0d6br";
+       version = "0.1.1";
+       sha256 = "10f6il6vf7p6613xg9jk1s8rd0hppmirpazhibplsqscr6nnjaar";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers fast-builder hashable mtl prettyprinter
-         prettyprinter-ansi-terminal text transformers unordered-containers
-         vector
+         base bytestring containers cpu fingertree hashable mtl
+         prettyprinter prettyprinter-ansi-terminal text transformers
+         unordered-containers vector
        ];
        executableHaskellDepends = [
-         base bytestring containers fast-builder hashable mtl prettyprinter
-         prettyprinter-ansi-terminal text transformers unordered-containers
-         vector
+         base bytestring containers cpu fingertree hashable mtl
+         prettyprinter prettyprinter-ansi-terminal text transformers
+         unordered-containers vector
        ];
        testHaskellDepends = [
-         base bytestring containers fast-builder hashable mtl prettyprinter
-         prettyprinter-ansi-terminal text transformers unordered-containers
-         vector
+         base bytestring containers cpu fingertree hashable mtl
+         prettyprinter prettyprinter-ansi-terminal text transformers
+         unordered-containers vector
        ];
        benchmarkHaskellDepends = [
-         base binary bytestring cassava containers deepseq fast-builder
+         base binary bytestring cassava containers cpu deepseq fingertree
          gauge hashable mtl prettyprinter prettyprinter-ansi-terminal
          serialise text transformers unordered-containers vector
        ];
@@ -228415,6 +229027,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ztar" = callPackage
+    ({ mkDerivation, base, bytestring, directory, extra, filepath, path
+     , path-io, QuickCheck, tar, tasty, tasty-quickcheck, zip, zlib
+     }:
+     mkDerivation {
+       pname = "ztar";
+       version = "0.1.0";
+       sha256 = "12jndqj9ls67wdx840c25zrvms2s3prbb59scc9dgi93zb6s0k9d";
+       libraryHaskellDepends = [
+         base bytestring directory filepath path tar zip zlib
+       ];
+       testHaskellDepends = [
+         base extra path path-io QuickCheck tasty tasty-quickcheck
+       ];
+       description = "Creating and extracting arbitrary archives";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "zuramaru" = callPackage
     ({ mkDerivation, base, cmdargs, containers, distributive, doctest
      , either, extensible, extra, lens, megaparsec, mono-traversable
diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index 803ff2b20d112..38e8dfd24c4e7 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -52,13 +52,10 @@ let
       This index includes documentation for many Haskell modules.
     '';
 
-  # Packages like base and bytestring are null. These must be removed
-  # to prevent eval errors.
-  nonNullPackages = builtins.filter (p: p != null) packages;
   # TODO: closePropagation is deprecated; replace
   docPackages = lib.closePropagation
     # we grab the doc outputs
-    (map (lib.getOutput "doc") nonNullPackages);
+    (map (lib.getOutput "doc") packages);
 
 in
 stdenv.mkDerivation {
@@ -70,10 +67,10 @@ stdenv.mkDerivation {
   inherit docPackages;
 
   buildPhase = ''
-    ${lib.optionalString (nonNullPackages != [] -> docPackages == [])
+    ${lib.optionalString (packages != [] -> docPackages == [])
        ("echo WARNING: localHoogle package list empty, even though"
        + " the following were specified: "
-       + lib.concatMapStringsSep ", " (p: p.name) nonNullPackages)}
+       + lib.concatMapStringsSep ", " (p: p.name) packages)}
     mkdir -p $out/share/doc/hoogle
 
     echo importing builtin packages
@@ -89,9 +86,10 @@ stdenv.mkDerivation {
     ${lib.concatMapStringsSep "\n" (el: ''
         ln -sfn ${el.haddockDir} "$out/share/doc/hoogle/${el.name}"
       '')
-      (builtins.map (p: { haddockDir = if p ? haddockDir then p.haddockDir p else null;
-                          name = p.pname; })
-        docPackages)}
+      (lib.filter (el: el.haddockDir != null)
+        (builtins.map (p: { haddockDir = if p ? haddockDir then p.haddockDir p else null;
+                            name = p.pname; })
+          docPackages))}
 
     echo building hoogle database
     hoogle generate --database $out/share/doc/hoogle/default.hoo --local=$out/share/doc/hoogle
diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index 59394d3ccc887..73b979e9ca4fa 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -7,10 +7,8 @@ rec {
     version = "2.0.5";
     isStable = true;
     sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
-  } // {
-    # 64-bit ARM isn't supported upstream
-    meta = meta // {
-      platforms = lib.filter (p: p != "aarch64-linux") meta.platforms;
+    meta = genericMeta // {
+      platforms = lib.filter (p: p != "aarch64-linux") genericMeta.platforms;
     };
   };
 
@@ -20,13 +18,12 @@ rec {
     sha256 = "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs";
   };
 
-
-  meta = with stdenv.lib; {
+  genericMeta = with stdenv.lib; {
     description = "High-performance JIT compiler for Lua 5.1";
     homepage    = http://luajit.org;
     license     = licenses.mit;
     platforms   = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers ; [ thoughtpolice smironov vcunat andir ];
+    maintainers = with maintainers; [ thoughtpolice smironov vcunat andir ];
   };
 
   generic =
@@ -37,6 +34,7 @@ rec {
         url = "http://luajit.org/download/LuaJIT-${version}.tar.gz";
         inherit sha256;
       })
+    , meta ? genericMeta
     }:
 
     stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix
index e4e61c9428367..4f0ba439417f2 100644
--- a/pkgs/development/libraries/libcollectdclient/default.nix
+++ b/pkgs/development/libraries/libcollectdclient/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, collectd }:
 with stdenv.lib;
 
-overrideDerivation collectd (oldAttrs: {
+collectd.overrideAttrs (oldAttrs: {
   name = "libcollectdclient-${collectd.version}";
   buildInputs = [ ];
 
@@ -16,7 +16,6 @@ overrideDerivation collectd (oldAttrs: {
 
   postInstall = "rm -rf $out/{bin,etc,sbin,share}";
 
-}) // {
   meta = with stdenv.lib; {
     description = "C Library for collectd, a daemon which collects system performance statistics periodically";
     homepage = http://collectd.org;
@@ -24,4 +23,4 @@ overrideDerivation collectd (oldAttrs: {
     platforms = platforms.linux; # TODO: collectd may be linux but the C client may be more portable?
     maintainers = [ maintainers.sheenobu maintainers.bjornfor ];
   };
-}
+})
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 335400b80efc0..5323b757b2bcf 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }:
+{ stdenv, fetchurl, fetchpatch, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }:
 
 stdenv.mkDerivation rec {
   name = "libtorrent-rasterbar-${version}";
@@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
       sha256 = "0vbw7wcw8x9787rq5fwaibpvvspm3237l8ahbf20gjpzxhn4yfwc";
     };
 
+patches = [
+  (fetchpatch {
+    url = "https://github.com/arvidn/libtorrent/commit/64d6b4900448097b0157abb328621dd211e2947d.patch";
+    sha256 = "0d4h0g129rsgm8xikybxypgv6nnya7ap7kskl7q78p4h6y2a0fhc";
+  })
+];
+
   nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
   buildInputs = [ boost openssl zlib python libiconv geoip ];
 
diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
index 9541d62e16015..5c42f7bc3289f 100644
--- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
+++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
@@ -23,7 +23,7 @@ let
     "armv7a-unknown-linux-androideabi" = {
       arch = "arm";
       triple = "arm-linux-androideabi";
-      gccVer = "4.8";
+      gccVer = "4.9";
     };
     "aarch64-unknown-linux-android" = {
       arch = "arm64";
diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index 6a647192e0919..150d8d758699c 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, ncurses5, p7zip, lib, makeWrapper
+{ stdenv, fetchurl, zlib, ncurses5, unzip, lib, makeWrapper
 , coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which
 , platformTools, python3, libcxx, version, sha256
 }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   phases = "buildPhase";
 
-  nativeBuildInputs = [ p7zip makeWrapper file ];
+  nativeBuildInputs = [ unzip makeWrapper file ];
 
   buildCommand = let
     bin_path = "$out/bin";
@@ -32,11 +32,8 @@ stdenv.mkDerivation rec {
     ]) + ":${platformTools}/platform-tools";
   in ''
     mkdir -pv $out/libexec
-    mkdir -pv $out/lib64
-    ln -s ${ncurses5.out}/lib/libncursesw.so.5 $out/lib64/libtinfo.so.5
-    ln -s ${ncurses5.out}/lib/libncurses.so.5 $out/lib64/libncurses.so.5
     cd $out/libexec
-    7z x $src
+    unzip -qq $src
 
     patchShebangs ${pkg_path}
 
@@ -58,11 +55,16 @@ stdenv.mkDerivation rec {
     }
     cd ${pkg_path}
 
-    find $out \( \
+    # Steps to reduce output size
+    rm -rf docs sources tests
+    # We only support cross compiling with gcc for now
+    rm -rf toolchains/*-clang* toolchains/llvm*
+
+    find ${pkg_path}/toolchains \( \
         \( -type f -a -name "*.so*" \) -o \
         \( -type f -a -perm -0100 \) \
         \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
-                          --set-rpath $out/lib64:${stdenv.lib.makeLibraryPath [ libcxx.out zlib.out ncurses5 ]} {} \;
+                          --set-rpath ${stdenv.lib.makeLibraryPath [ libcxx zlib ncurses5 ]} {} \;
     # fix ineffective PROGDIR / MYNDKDIR determination
     for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py"}
     do
diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
index 3b5da19da9e1d..44fa961b992ff 100644
--- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix
+++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
@@ -49,7 +49,12 @@ stdenv.mkDerivation rec {
         -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r8e.patch }
     cd ${pkg_path}
 
-    find $out \( \
+    # Steps to reduce output size
+    rm -rf docs sources tests
+    # We only support cross compiling with gcc for now
+    rm -rf toolchains/*-clang* toolchains/llvm-*
+
+    find ${pkg_path}/toolchains \( \
         \( -type f -a -name "*.so*" \) -o \
         \( -type f -a -perm -0100 \) \
         \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index d6d6b8a0cadcf..7c050698391b8 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -226,7 +226,7 @@ rec {
 
   androidndk_10e = import ./androidndk.nix {
     inherit (buildPackages)
-      p7zip makeWrapper;
+      unzip makeWrapper;
     inherit (pkgs)
       stdenv fetchurl zlib ncurses5 lib python3 libcxx
       coreutils file findutils gawk gnugrep gnused jdk which;
@@ -237,7 +237,7 @@ rec {
 
   androidndk_16b = import ./androidndk.nix {
     inherit (buildPackages)
-      p7zip makeWrapper;
+       unzip makeWrapper;
     inherit (pkgs)
       stdenv fetchurl zlib ncurses5 lib python3 libcxx
       coreutils file findutils gawk gnugrep gnused jdk which;
@@ -246,9 +246,9 @@ rec {
     sha256 = "00frcnvpcsngv00p6l2vxj4cwi2mwcm9lnjvm3zv4wrp6pss9pmw";
   };
 
-  androidndk = import ./androidndk.nix {
+  androidndk_17 = import ./androidndk.nix {
     inherit (buildPackages)
-      p7zip makeWrapper;
+      unzip makeWrapper;
     inherit (pkgs)
       stdenv fetchurl zlib ncurses5 lib python3 libcxx
       coreutils file findutils gawk gnugrep gnused jdk which;
@@ -256,6 +256,7 @@ rec {
     version = "17";
     sha256 = "1jj3zy958zsidywqd5nwdyrnr72rf9zhippkl8rbqxfy8wxq2gds";
   };
+  androidndk = androidndk_17;
 
   androidndk_r8e = import ./androidndk_r8e.nix {
     inherit (buildPackages)
@@ -276,7 +277,7 @@ rec {
     inherit androidsdk;
   };
 
-  androidndkPkgs = import ./androidndk-pkgs.nix {
+  androidndkPkgs_17 = import ./androidndk-pkgs.nix {
     inherit (buildPackages)
       makeWrapper;
     inherit (pkgs)
@@ -286,10 +287,11 @@ rec {
     # but for splicing messing up on infinite recursion for the variants we
     # *dont't* use. Using this workaround, but also making a test to ensure
     # these two really are the same.
-    buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk;
-    inherit androidndk;
-    targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs;
+    buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk_17;
+    androidndk = androidndk_17;
+    targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs_17;
   };
+  androidndkPkgs = androidndkPkgs_17;
 
   androidndkPkgs_10e = import ./androidndk-pkgs.nix {
     inherit (buildPackages)
diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix
index 94261b10e3d05..37d8f3a513434 100644
--- a/pkgs/development/python-modules/thumbor/default.nix
+++ b/pkgs/development/python-modules/thumbor/default.nix
@@ -1,26 +1,19 @@
 { buildPythonPackage, stdenv, tornado, pycrypto, pycurl, pytz
 , pillow, derpconf, python_magic, pexif, libthumbor, opencv, webcolors
-, piexif, futures, statsd, thumborPexif, fetchPypi, fetchpatch, isPy3k, lib
+, piexif, futures, statsd, thumborPexif, fetchPypi, isPy3k, lib
 }:
 
 buildPythonPackage rec {
   pname = "thumbor";
-  version = "6.4.2";
+  version = "6.5.1";
 
   disabled = isPy3k; # see https://github.com/thumbor/thumbor/issues/1004
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0y9mf78j80vjh4y0xvgnybc1wqfcwm5s19xhsfgkn12hh8pmh14d";
+    sha256 = "0yalqwpxb6m0dz2qfnyv1pqqd5dd020wl7hc0n0bvsvxg1ib9if0";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/thumbor/thumbor/commit/4f2bc99451409e404f7fa0f3e4a3bdaea7b49869.patch";
-      sha256 = "0qqw1n1pfd8f8cn168718gzwf4b35j2j9ajyw643xpf92s0iq2cc";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace "setup.py" \
       --replace '"argparse",' "" ${lib.optionalString isPy3k ''--replace '"futures",' ""''}
author	Frederik Rietdijk <fridh@fridh.nl>	2018-06-23 08:23:59 +0200
committer	Frederik Rietdijk <fridh@fridh.nl>	2018-06-23 08:23:59 +0200
commit	cdfbfc1d0940255ec491ba25d214a0046ddaa686 (patch)
tree	d195401e65bae635e89d975850277e9531c66708 /pkgs/development
parent	48110c12956cdccc9aab638a489d2c96511fc41a (diff)
parent	95eb2fa40e6f0edd625abdafe7d7b76e0c722263 (diff)