summary refs log tree commit diff
path: root/pkgs/development/haskell-modules
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix5
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix15
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix17
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-head.nix4
-rw-r--r--pkgs/development/haskell-modules/configuration-ghcjs.nix13
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix.yaml128
-rw-r--r--pkgs/development/haskell-modules/configuration-nix.nix12
-rw-r--r--pkgs/development/haskell-modules/generic-builder.nix6
-rw-r--r--pkgs/development/haskell-modules/generic-stack-builder.nix2
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix2235
-rw-r--r--pkgs/development/haskell-modules/make-package-set.nix2
11 files changed, 1475 insertions, 964 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7251ace30a71..c7e7cd4f4c3f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1095,4 +1095,9 @@ self: super: {
   stylish-cabal = super.stylish-cabal.override { hspec = self.hspec_2_4_8; hspec-core = self.hspec-core_2_4_8; };
   hspec_2_4_8 = super.hspec_2_4_8.override { hspec-core = self.hspec-core_2_4_8; hspec-discover = self.hspec-discover_2_4_8; };
 
+  # musl fixes
+  # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test
+  unix-time = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.unix-time else super.unix-time;
+  # dontCheck: printf double rounding behavior
+  prettyprinter = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.prettyprinter else super.prettyprinter;
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index ed324e018552..39c5a177b928 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -4,8 +4,8 @@ with haskellLib;
 
 self: super: {
 
-  # Use the latest LLVM.
-  inherit (pkgs) llvmPackages;
+  # This compiler version needs llvm 5.x.
+  llvmPackages = pkgs.llvmPackages_5;
 
   # Disable GHC 8.4.x core libraries.
   array = null;
@@ -51,11 +51,12 @@ self: super: {
   # https://github.com/xmonad/xmonad-contrib/issues/235
   xmonad-contrib = doJailbreak (appendPatch super.xmonad-contrib ./patches/xmonad-contrib-ghc-8.4.1-fix.patch);
 
-  # This package desperately needs a maintainer.
-  xmobar = super.xmobar.overrideScope (self: super: {
-    hinotify = self.hinotify_0_3_9;  # https://github.com/jaor/xmobar/issues/356
-    dbus = self.dbus_0_10_15;        # https://github.com/jaor/xmobar/issues/346
-  });
+  # Our xmonad claims that it's version 0.14, which is outside of this
+  # package's version constraints.
+  xmonad-extras = doJailbreak super.xmonad-extras;
+
+  # https://github.com/jaor/xmobar/issues/356
+  xmobar = super.xmobar.overrideScope (self: super: { hinotify = self.hinotify_0_3_9; });
   hinotify_0_3_9 = dontCheck (doJailbreak super.hinotify_0_3_9); # allow async 2.2.x
 
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index bc540cbe36d6..42712df3295b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -4,8 +4,8 @@ with haskellLib;
 
 self: super: {
 
-  # Use the latest LLVM.
-  inherit (pkgs) llvmPackages;
+  # This compiler version needs llvm 5.x.
+  llvmPackages = pkgs.llvmPackages_5;
 
   # Disable GHC 8.6.x core libraries.
   array = null;
@@ -44,4 +44,17 @@ self: super: {
   # Use to be a core-library, but no longer is since GHC 8.4.x.
   hoopl = self.hoopl_3_10_2_2;
 
+  # lts-12.x versions do not compile.
+  primitive = self.primitive_0_6_4_0;
+  tagged = self.tagged_0_8_6;
+
+  # Over-specified constraints.
+  async = doJailbreak super.async;                           # base >=4.3 && <4.12, stm >=2.2 && <2.5
+  ChasingBottoms = doJailbreak super.ChasingBottoms;         # base >=4.2 && <4.12, containers >=0.3 && <0.6
+  hashable = doJailbreak super.hashable;                     # base >=4.4 && <4.1
+  hashable-time = doJailbreak super.hashable-time;           # base >=4.7 && <4.12
+  integer-logarithms = doJailbreak super.integer-logarithms; # base >=4.3 && <4.12
+  tar = doJailbreak super.tar;                               # containers >=0.2 && <0.6
+  test-framework = doJailbreak super.test-framework;         # containers >=0.1 && <0.6
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index 93a39beb8a9d..99f4cd87ce56 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -4,8 +4,8 @@ with haskellLib;
 
 self: super: {
 
-  # Use the latest LLVM.
-  inherit (pkgs) llvmPackages;
+  # This compiler version needs llvm 5.x.
+  llvmPackages = pkgs.llvmPackages_5;
 
   # Disable GHC 8.7.x core libraries.
   array = null;
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index f1a60f5ea878..c79406a94727 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -23,6 +23,11 @@ self: super:
       };
   in stage1 // stage2 // {
 
+  # GHCJS does not ship with the same core packages as GHC.
+  # https://github.com/ghcjs/ghcjs/issues/676
+  stm = self.stm_2_4_5_0;
+  ghc-compact = self.ghc-compact_0_1_0_0;
+
   network = addBuildTools super.network (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);
   zlib = addBuildTools super.zlib (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);
   unix-compat = addBuildTools super.unix-compat (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);
@@ -121,7 +126,6 @@ self: super:
   });
 
   ghcjs-dom-jsffi = overrideCabal super.ghcjs-dom-jsffi (drv: {
-    setupHaskellDepends = (drv.setupHaskellDepends or []) ++ [ self.buildHaskellPackages.Cabal_1_24_2_0 ];
     libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ [ self.ghcjs-base self.text ];
     isLibrary = true;
   });
@@ -197,4 +201,11 @@ self: super:
 
   base-orphans = dontCheck super.base-orphans;
   distributive = dontCheck super.distributive;
+
+  # https://github.com/glguy/th-abstraction/issues/53
+  th-abstraction = dontCheck super.th-abstraction;
+  # https://github.com/dreixel/syb/issues/21
+  syb = dontCheck super.syb;
+  # https://github.com/ghcjs/ghcjs/issues/677
+  hspec-core = dontCheck super.hspec-core;
 }
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 1daaf3409b5a..f50b02a7a956 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,7 +43,7 @@ core-packages:
 default-package-overrides:
   # Newer versions require contravariant-1.5.*, which many builds refuse at the moment.
   - base-compat-batteries ==0.10.1
-  # LTS Haskell 12.0
+  # LTS Haskell 12.1
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -217,7 +217,7 @@ default-package-overrides:
   - authenticate ==1.3.4
   - authenticate-oauth ==1.6
   - auto ==0.4.3.1
-  - autoexporter ==1.1.9
+  - autoexporter ==1.1.10
   - auto-update ==0.1.4
   - avro ==0.3.2.0
   - avwx ==0.3.0.2
@@ -232,7 +232,7 @@ default-package-overrides:
   - base64-string ==0.2
   - base-compat ==0.10.4
   - base-compat-batteries ==0.10.1
-  - basement ==0.0.7
+  - basement ==0.0.8
   - base-orphans ==0.7
   - base-prelude ==1.3
   - base-unicode-symbols ==0.2.2.4
@@ -302,7 +302,7 @@ default-package-overrides:
   - boundingboxes ==0.2.3
   - bower-json ==1.0.0.1
   - boxes ==0.1.5
-  - brick ==0.37.1
+  - brick ==0.37.2
   - brittany ==0.11.0.0
   - broadcast-chan ==0.1.1
   - bsb-http-chunked ==0.0.0.2
@@ -424,7 +424,7 @@ default-package-overrides:
   - composable-associations-aeson ==0.1.0.0
   - composition ==1.0.2.1
   - composition-extra ==2.0.0
-  - composition-prelude ==1.5.0.6
+  - composition-prelude ==1.5.0.8
   - compressed ==3.11
   - concise ==0.1.0.1
   - concurrency ==1.6.0.0
@@ -495,7 +495,7 @@ default-package-overrides:
   - crypto-random ==0.0.9
   - crypto-random-api ==0.2.0
   - crypt-sha512 ==0
-  - csg ==0.1.0.3
+  - csg ==0.1.0.4
   - csp ==1.4.0
   - css-syntax ==0.0.7
   - css-text ==0.1.3.0
@@ -557,13 +557,13 @@ default-package-overrides:
   - Decimal ==0.5.1
   - declarative ==0.5.2
   - deepseq-generics ==0.2.0.0
-  - dejafu ==1.11.0.1
+  - dejafu ==1.11.0.3
   - dependent-map ==0.2.4.0
   - dependent-sum ==0.4
   - dependent-sum-template ==0.0.0.6
   - deque ==0.2.1
-  - deriving-compat ==0.5
-  - derulo ==1.0.2
+  - deriving-compat ==0.5.1
+  - derulo ==1.0.3
   - detour-via-sci ==1.0.0
   - df1 ==0.1.1
   - dhall ==1.15.1
@@ -653,7 +653,7 @@ default-package-overrides:
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
   - email-validate ==2.3.2.6
-  - enclosed-exceptions ==1.0.2
+  - enclosed-exceptions ==1.0.3
   - entropy ==0.4.1.1
   - enummapset ==0.5.2.2
   - enumset ==0.0.4.1
@@ -677,7 +677,7 @@ default-package-overrides:
   - eventful-sqlite ==0.2.0
   - eventful-test-helpers ==0.2.0
   - event-list ==0.1.2
-  - eventstore ==1.1.4
+  - eventstore ==1.1.5
   - every ==0.0.1
   - exact-combinatorics ==0.2.0.8
   - exact-pi ==0.4.1.3
@@ -695,7 +695,7 @@ default-package-overrides:
   - exp-pairs ==0.1.6.0
   - extensible ==0.4.9
   - extensible-exceptions ==0.1.1.4
-  - extra ==1.6.8
+  - extra ==1.6.9
   - extractable-singleton ==0.0.1
   - extrapolate ==0.3.1
   - facts ==0.0.1.0
@@ -729,7 +729,7 @@ default-package-overrides:
   - FindBin ==0.0.5
   - find-clumpiness ==0.2.3.1
   - fingertree ==0.1.4.1
-  - finite-typelits ==0.1.3.0
+  - finite-typelits ==0.1.4.2
   - first-class-patterns ==0.3.2.4
   - fixed ==0.2.1.1
   - fixed-length ==0.2
@@ -741,7 +741,7 @@ default-package-overrides:
   - flay ==0.4
   - flexible-defaults ==0.0.2
   - floatshow ==0.2.4
-  - flow ==1.0.13
+  - flow ==1.0.14
   - fmlist ==0.9.2
   - fn ==0.3.0.2
   - focus ==0.1.5.2
@@ -757,7 +757,7 @@ default-package-overrides:
   - forma ==1.1.0
   - format-numbers ==0.1.0.0
   - formatting ==6.3.6
-  - foundation ==0.0.20
+  - foundation ==0.0.21
   - free ==5.0.2
   - freenect ==1.2.1
   - freer-simple ==1.1.0.0
@@ -819,12 +819,12 @@ default-package-overrides:
   - ghcjs-codemirror ==0.0.0.2
   - ghc-parser ==0.2.0.2
   - ghc-paths ==0.1.0.9
-  - ghc-prof ==1.4.1.2
+  - ghc-prof ==1.4.1.3
   - ghc-syntax-highlighter ==0.0.2.0
   - ghc-tcplugins-extra ==0.3
-  - ghc-typelits-extra ==0.2.5
-  - ghc-typelits-knownnat ==0.5
-  - ghc-typelits-natnormalise ==0.6.1
+  - ghc-typelits-extra ==0.2.6
+  - ghc-typelits-knownnat ==0.5.1
+  - ghc-typelits-natnormalise ==0.6.2
   - ghost-buster ==0.1.1.0
   - gi-atk ==2.0.15
   - gi-cairo ==1.0.17
@@ -841,7 +841,7 @@ default-package-overrides:
   - gi-pango ==1.0.16
   - giphy-api ==0.6.0.1
   - github ==0.19
-  - github-release ==1.2.1
+  - github-release ==1.2.2
   - github-types ==0.2.1
   - github-webhooks ==0.10.0
   - gitrev ==1.3.1
@@ -888,7 +888,7 @@ default-package-overrides:
   - hamtsolo ==1.0.3
   - HandsomeSoup ==0.4.2
   - handwriting ==0.1.0.3
-  - hapistrano ==0.3.5.7
+  - hapistrano ==0.3.5.8
   - happstack-server ==7.5.1.1
   - happy ==1.19.9
   - hasbolt ==0.1.3.0
@@ -911,14 +911,14 @@ default-package-overrides:
   - haskell-src-exts-simple ==1.20.0.0
   - haskell-src-exts-util ==0.2.3
   - haskell-src-meta ==0.8.0.3
-  - haskell-tools-ast ==1.1.0.1
-  - haskell-tools-backend-ghc ==1.1.0.1
-  - haskell-tools-builtin-refactorings ==1.1.0.1
-  - haskell-tools-debug ==1.1.0.1
-  - haskell-tools-demo ==1.1.0.1
-  - haskell-tools-prettyprint ==1.1.0.1
-  - haskell-tools-refactor ==1.1.0.1
-  - haskell-tools-rewrite ==1.1.0.1
+  - haskell-tools-ast ==1.1.0.2
+  - haskell-tools-backend-ghc ==1.1.0.2
+  - haskell-tools-builtin-refactorings ==1.1.0.2
+  - haskell-tools-debug ==1.1.0.2
+  - haskell-tools-demo ==1.1.0.2
+  - haskell-tools-prettyprint ==1.1.0.2
+  - haskell-tools-refactor ==1.1.0.2
+  - haskell-tools-rewrite ==1.1.0.2
   - haskey ==0.3.0.2
   - haskey-btree ==0.3.0.0
   - haskey-mtl ==0.3.1.0
@@ -973,7 +973,7 @@ default-package-overrides:
   - hmpfr ==0.4.4
   - Hoed ==0.5.1
   - hoopl ==3.10.2.2
-  - hOpenPGP ==2.7
+  - hOpenPGP ==2.7.1
   - hopenpgp-tools ==0.21.1
   - hopfli ==0.2.2.1
   - hostname ==1.0
@@ -995,8 +995,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-functors ==0.1.2.0
   - hs-GeoIP ==0.3
@@ -1044,7 +1044,7 @@ default-package-overrides:
   - http2 ==1.6.3
   - http-api-data ==0.3.8.1
   - http-client ==0.5.13.1
-  - http-client-openssl ==0.2.1.1
+  - http-client-openssl ==0.2.2.0
   - http-client-tls ==0.3.5.3
   - http-common ==0.8.2.0
   - http-conduit ==2.3.2
@@ -1065,7 +1065,7 @@ default-package-overrides:
   - hw-conduit ==0.2.0.3
   - hw-diagnostics ==0.0.0.5
   - hweblib ==0.6.3
-  - hw-excess ==0.2.0.0
+  - hw-excess ==0.2.0.2
   - hw-fingertree-strict ==0.1.1.1
   - hw-hedgehog ==0.1.0.1
   - hw-hspec-hedgehog ==0.1.0.5
@@ -1127,7 +1127,7 @@ default-package-overrides:
   - IntervalMap ==0.6.0.0
   - intervals ==0.8.1
   - intro ==0.3.1.0
-  - invariant ==0.5
+  - invariant ==0.5.1
   - invertible ==0.2.0.5
   - invertible-grammar ==0.1.1
   - io-choice ==0.0.6
@@ -1164,7 +1164,7 @@ default-package-overrides:
   - js-flot ==0.8.3
   - js-jquery ==3.3.1
   - json ==0.9.2
-  - json-feed ==1.0.2
+  - json-feed ==1.0.3
   - json-rpc-client ==0.2.5.0
   - json-rpc-generic ==0.2.1.4
   - json-rpc-server ==0.2.6.0
@@ -1188,17 +1188,17 @@ default-package-overrides:
   - kraken ==0.1.0
   - l10n ==0.1.0.1
   - labels ==0.3.3
-  - lackey ==1.0.4
+  - lackey ==1.0.5
   - LambdaHack ==0.8.3.0
   - lame ==0.1.1
   - language-c ==0.8.1
   - language-c-quote ==0.12.2
-  - language-docker ==6.0.3
+  - language-docker ==6.0.4
   - language-ecmascript ==0.19
   - language-haskell-extract ==0.2.4
   - language-java ==0.2.9
   - language-javascript ==0.6.0.11
-  - language-puppet ==1.3.19
+  - language-puppet ==1.3.19.1
   - lapack-carray ==0.0.2
   - lapack-ffi ==0.0.2
   - lapack-ffi-tools ==0.1.0.1
@@ -1300,7 +1300,7 @@ default-package-overrides:
   - median-stream ==0.7.0.0
   - med-module ==0.1.1
   - megaparsec ==6.5.0
-  - mega-sdist ==0.3.3
+  - mega-sdist ==0.3.3.1
   - memory ==0.14.16
   - MemoTrie ==0.6.9
   - mercury-api ==0.1.0.1
@@ -1309,7 +1309,7 @@ default-package-overrides:
   - messagepack-rpc ==0.5.1
   - metrics ==0.4.1.1
   - mfsolve ==0.3.2.0
-  - microformats2-parser ==1.0.1.8
+  - microformats2-parser ==1.0.1.9
   - microlens ==0.4.9.1
   - microlens-aeson ==2.3.0
   - microlens-contra ==0.1.0.1
@@ -1505,7 +1505,7 @@ default-package-overrides:
   - pandoc-types ==1.17.5.1
   - pango ==0.13.5.0
   - papillon ==0.1.0.6
-  - parallel ==3.2.1.1
+  - parallel ==3.2.2.0
   - parallel-io ==0.3.3
   - parseargs ==0.2.0.8
   - parsec ==3.1.13.0
@@ -1610,7 +1610,7 @@ default-package-overrides:
   - prettyprinter-compat-wl-pprint ==1.0.0.1
   - prettyprinter-convert-ansi-wl-pprint ==1.1
   - pretty-show ==1.7
-  - pretty-simple ==2.1.0.0
+  - pretty-simple ==2.1.0.1
   - pretty-types ==0.2.3.1
   - primes ==0.2.1.0
   - primitive ==0.6.3.0
@@ -1676,10 +1676,10 @@ default-package-overrides:
   - rank2classes ==1.1.0.1
   - Rasterific ==0.7.3
   - rasterific-svg ==0.3.3.1
-  - ratel ==1.0.4
-  - ratel-wai ==1.0.2
+  - ratel ==1.0.5
+  - ratel-wai ==1.0.3
   - ratio-int ==0.1.2
-  - rattletrap ==4.1.1
+  - rattletrap ==4.1.2
   - rawfilepath ==0.2.4
   - rawstring-qm ==0.2.3.0
   - raw-strings-qq ==1.1
@@ -1713,7 +1713,7 @@ default-package-overrides:
   - regex-tdfa-text ==1.0.0.3
   - reinterpret-cast ==0.1.0
   - relational-query ==0.12.0.1
-  - relational-query-HDBC ==0.7.0.0
+  - relational-query-HDBC ==0.7.0.1
   - relational-record ==0.2.2.0
   - relational-schemas ==0.1.6.2
   - renderable ==0.2.0.1
@@ -1754,7 +1754,7 @@ default-package-overrides:
   - safe-money ==0.6
   - SafeSemaphore ==0.10.1
   - saltine ==0.1.0.1
-  - salve ==1.0.3
+  - salve ==1.0.4
   - sample-frame ==0.0.3
   - sample-frame-np ==0.0.4.1
   - sampling ==0.3.3
@@ -1762,8 +1762,8 @@ default-package-overrides:
   - sandman ==0.2.0.1
   - say ==0.1.0.0
   - sbp ==2.3.16
-  - SCalendar ==1.1.0
   - scalendar ==1.2.0
+  - SCalendar ==1.1.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
@@ -1824,10 +1824,10 @@ default-package-overrides:
   - servant-tracing ==0.1.0.2
   - servant-websockets ==1.1.0
   - servant-yaml ==0.1.0.0
-  - serverless-haskell ==0.6.1
+  - serverless-haskell ==0.6.2
   - serversession ==1.0.1
   - serversession-frontend-wai ==1.0
-  - servius ==1.2.0.3
+  - servius ==1.2.1.0
   - ses-html ==0.4.0.0
   - set-cover ==0.0.9
   - setenv ==0.1.1.3
@@ -1887,7 +1887,7 @@ default-package-overrides:
   - speculation ==1.5.0.3
   - speedy-slice ==0.3.0
   - sphinx ==0.6.0.2
-  - Spintax ==0.3.2
+  - Spintax ==0.3.3
   - splice ==0.6.1.1
   - split ==0.2.3.3
   - splitmix ==0.0.1
@@ -1927,7 +1927,7 @@ default-package-overrides:
   - store ==0.5.0
   - store-core ==0.4.4
   - Strafunski-StrategyLib ==5.0.1.0
-  - stratosphere ==0.24.1
+  - stratosphere ==0.24.3
   - streaming ==0.2.1.0
   - streaming-attoparsec ==1.0.0
   - streaming-bytestring ==0.1.6
@@ -1947,7 +1947,7 @@ default-package-overrides:
   - string-qq ==0.0.2
   - stringsearch ==0.3.6.6
   - string-transform ==1.1.0
-  - strive ==5.0.5
+  - strive ==5.0.6
   - structs ==0.1.1
   - stylish-haskell ==0.9.2.0
   - summoner ==1.0.4
@@ -2184,7 +2184,7 @@ default-package-overrides:
   - vector-bytes-instances ==0.1.1
   - vector-instances ==3.4
   - vector-mmap ==0.0.3
-  - vector-sized ==1.0.3.0
+  - vector-sized ==1.0.4.0
   - vector-space ==0.13
   - vector-split ==1.0.0.2
   - vector-th-unbox ==0.2.1.6
@@ -2192,7 +2192,7 @@ default-package-overrides:
   - verbosity ==0.2.3.0
   - versions ==3.4.0.1
   - ViennaRNAParser ==1.3.3
-  - viewprof ==0.0.0.18
+  - viewprof ==0.0.0.19
   - vinyl ==0.8.1.1
   - vivid ==0.3.0.2
   - vivid-osc ==0.3.0.0
@@ -2205,7 +2205,7 @@ default-package-overrides:
   - wai-conduit ==3.0.0.4
   - wai-cors ==0.2.6
   - wai-eventsource ==3.0.0
-  - wai-extra ==3.0.22.1
+  - wai-extra ==3.0.23.0
   - wai-handler-launch ==3.0.2.4
   - wai-logger ==2.3.2
   - wai-middleware-caching ==0.1.0.2
@@ -2221,7 +2221,7 @@ default-package-overrides:
   - wai-slack-middleware ==0.2.0
   - wai-transformers ==0.1.0
   - wai-websockets ==3.0.1.2
-  - warp ==3.2.22
+  - warp ==3.2.23
   - warp-tls ==3.2.4.3
   - warp-tls-uid ==0.2.0.5
   - wave ==0.1.5
@@ -2269,7 +2269,7 @@ default-package-overrides:
   - writer-cps-mtl ==0.1.1.4
   - writer-cps-transformers ==0.1.1.3
   - ws ==0.0.4
-  - wuss ==1.1.9
+  - wuss ==1.1.10
   - X11 ==1.9
   - X11-xft ==0.3.1
   - x11-xim ==0.0.9.0
@@ -2303,22 +2303,22 @@ default-package-overrides:
   - xml-types ==0.3.6
   - xss-sanitize ==0.3.6
   - xxhash-ffi ==0.2.0.0
-  - yaml ==0.8.31.1
+  - yaml ==0.8.32
   - yeshql ==4.1.0.0
   - yeshql-core ==4.1.0.0
   - yeshql-hdbc ==4.1.0.0
   - yesod ==1.6.0
   - yesod-alerts ==0.1.2.0
-  - yesod-auth ==1.6.3
+  - yesod-auth ==1.6.4.1
   - yesod-auth-fb ==1.9.0
   - yesod-auth-hashdb ==1.7
   - yesod-bin ==1.6.0.3
-  - yesod-core ==1.6.5
+  - yesod-core ==1.6.6
   - yesod-csp ==0.2.4.0
   - yesod-eventsource ==1.6.0
   - yesod-fb ==0.5.0
-  - yesod-form ==1.6.1
-  - yesod-form-bootstrap4 ==1.0.0
+  - yesod-form ==1.6.2
+  - yesod-form-bootstrap4 ==1.0.2
   - yesod-gitrepo ==0.3.0
   - yesod-gitrev ==0.2.0.0
   - yesod-newsfeed ==1.6.1.0
@@ -2327,7 +2327,7 @@ default-package-overrides:
   - yesod-recaptcha2 ==0.2.4
   - yesod-sitemap ==1.6.0
   - yesod-static ==1.6.0
-  - yesod-test ==1.6.4
+  - yesod-test ==1.6.5
   - yesod-text-markdown ==0.1.10
   - yesod-websockets ==0.3.0
   - yes-precure5-command ==5.5.3
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 682e1bc91ef8..4e62d4705063 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -421,16 +421,6 @@ self: super: builtins.intersectAttrs super {
   # so disable this on Darwin only
   ${if pkgs.stdenv.isDarwin then null else "GLUT"} = addPkgconfigDepend (appendPatch super.GLUT ./patches/GLUT.patch) pkgs.freeglut;
 
-  idris = overrideCabal super.idris (drv: {
-    # https://github.com/idris-lang/Idris-dev/issues/2499
-    librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
-
-    # tests and build run executable, so need to set LD_LIBRARY_PATH
-    preBuild = ''
-      export LD_LIBRARY_PATH="$PWD/dist/build:$LD_LIBRARY_PATH"
-    '';
-  });
-
   libsystemd-journal = overrideCabal super.libsystemd-journal (old: {
     librarySystemDepends = old.librarySystemDepends or [] ++ [ pkgs.systemd ];
   });
@@ -452,7 +442,7 @@ self: super: builtins.intersectAttrs super {
     then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa
     else dontCheck super.fsnotify;
 
-  hidapi = addExtraLibrary super.hidapi pkgs.libudev;
+  hidapi = addExtraLibrary super.hidapi pkgs.udev;
 
   hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; };
 
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index d1304c796949..80274f515c52 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -160,6 +160,9 @@ let
     "--enable-library-for-ghci" # TODO: Should this be configurable?
   ] ++ optionals (enableDeadCodeElimination && (stdenv.lib.versionOlder "8.0.1" ghc.version)) [
      "--ghc-option=-split-sections"
+  ] ++ optionals dontStrip [
+    "--disable-library-stripping"
+    "--disable-executable-stripping"
   ] ++ optionals isGhcjs [
     "--ghcjs"
   ] ++ optionals isCross ([
@@ -391,6 +394,9 @@ stdenv.mkDerivation ({
         local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile )
         mv $packageConfFile $packageConfDir/$pkgId.conf
       done
+
+      # delete confdir if there are no libraries
+      find $packageConfDir -maxdepth 0 -empty -delete;
     ''}
     ${optionalString isGhcjs ''
       for exeDir in "$out/bin/"*.jsexe; do
diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index 9ea9dae02db1..591de1236d42 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -27,7 +27,7 @@ in stdenv.mkDerivation (args // {
 
   buildInputs =
     buildInputs ++
-    optional stdenv.isLinux glibcLocales ++
+    optional (stdenv.hostPlatform.libc == "glibc") glibcLocales ++
     [ ghc pkgconfig stack ];
 
   STACK_PLATFORM_VARIANT="nix";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 43bf0faf0784..5816f295e0d6 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2891,6 +2891,7 @@ self: {
        libraryHaskellDepends = [ base parsec text vector ];
        executableHaskellDepends = [ base cmdargs either-unwrap ];
        testHaskellDepends = [ base hspec hspec-discover parsec text ];
+       testToolDepends = [ hspec-discover ];
        description = "Libary for parsing Clustal tools output";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -5019,8 +5020,8 @@ self: {
     ({ mkDerivation, base, cudart, hspec, inline-c }:
      mkDerivation {
        pname = "FAI";
-       version = "0.1.0.10";
-       sha256 = "0hg1598cb44p8bk3a70qahxsvfs8qfm08zzp516b6wg54ky26npg";
+       version = "0.1.0.17";
+       sha256 = "06z0ikx9i8z9hm7mlmlvdhy57k5dn7qayg2cpas767zvvxjiaayy";
        libraryHaskellDepends = [ base inline-c ];
        librarySystemDepends = [ cudart ];
        testHaskellDepends = [ base hspec inline-c ];
@@ -6051,6 +6052,7 @@ self: {
          array base bytestring containers directory filepath hpp JuicyPixels
          linear OpenGL OpenGLRaw transformers vector
        ];
+       libraryToolDepends = [ hpp ];
        description = "Miscellaneous OpenGL utilities";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10133,8 +10135,8 @@ self: {
      }:
      mkDerivation {
        pname = "IPv6DB";
-       version = "0.2.6";
-       sha256 = "1dshvq3amnwfvf50g4gs93rc307sk1hi3snjhflzjz0dfn8xa2d4";
+       version = "0.3.0";
+       sha256 = "0dz0ar75nd04l1cbca7iz9laqv24mach7ajr4k5ibl2717kczkpa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -10149,7 +10151,7 @@ self: {
        testHaskellDepends = [
          aeson base hspec http-client http-types vector
        ];
-       description = "A RESTful Web Service for IPv6-related data";
+       description = "A RESTful microService for IPv6-related data";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -13310,14 +13312,19 @@ self: {
      }) {};
 
   "OTP" = callPackage
-    ({ mkDerivation, base, Crypto, time }:
+    ({ mkDerivation, base, bytestring, cryptohash-sha1
+     , cryptohash-sha256, cryptohash-sha512, tasty, tasty-hunit, time
+     }:
      mkDerivation {
        pname = "OTP";
-       version = "0.0.0.1";
-       sha256 = "0vcxyfk1vx30cfngq5cv3lc34x0sxsirykhbi4ygw5pvd9ylzadb";
-       libraryHaskellDepends = [ base Crypto time ];
-       testHaskellDepends = [ base Crypto time ];
-       description = "HMAC-Based and Time-Based One-Time Passwords";
+       version = "0.1.0.0";
+       sha256 = "1r7vpc0bv89d70j6pc3z3vam93gahl4j0y5w8smknxwjliwqxkcb";
+       libraryHaskellDepends = [
+         base bytestring cryptohash-sha1 cryptohash-sha256 cryptohash-sha512
+         time
+       ];
+       testHaskellDepends = [ base bytestring tasty tasty-hunit time ];
+       description = "HMAC-Based and Time-Based One-Time Passwords (HOTP & TOTP)";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -13386,8 +13393,8 @@ self: {
      }:
      mkDerivation {
        pname = "Octree";
-       version = "0.6.0.0";
-       sha256 = "1inyjclxx856gxrxdph649s5kdy2xf0lwr8g57rkqnpqpmprj797";
+       version = "0.6.0.1";
+       sha256 = "00f4ck5ln8svjjs5by6k82dg9xrjfckg6whccncmd86rql59n74z";
        libraryHaskellDepends = [ base deepseq lens linear QuickCheck ];
        testHaskellDepends = [ base deepseq lens linear QuickCheck ];
        benchmarkHaskellDepends = [
@@ -15599,12 +15606,13 @@ self: {
      }) {};
 
   "SDL" = callPackage
-    ({ mkDerivation, base, SDL }:
+    ({ mkDerivation, base, Cabal, SDL }:
      mkDerivation {
        pname = "SDL";
-       version = "0.6.6.0";
-       sha256 = "0wpddhq5vwm2m1q8ja1p6draz4f40p1snmdshxwqnyyj3nchqz0z";
+       version = "0.6.7.0";
+       sha256 = "00y67v80a8l09i3k76z09lg25kw72ivl09nag8ckdlk4a0cfnzfq";
        enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ SDL ];
        description = "Binding to libSDL";
@@ -15612,12 +15620,13 @@ self: {
      }) {inherit (pkgs) SDL;};
 
   "SDL-gfx" = callPackage
-    ({ mkDerivation, base, SDL, SDL_gfx }:
+    ({ mkDerivation, base, Cabal, SDL, SDL_gfx }:
      mkDerivation {
        pname = "SDL-gfx";
-       version = "0.6.0.2";
-       sha256 = "1i8dfyi0cdhm2mad7fk2dd8qdc3lpbjw52s67vyxi4r1b8rka05b";
+       version = "0.6.1.0";
+       sha256 = "0sicq48cp9j5b5hpa1s53y505ny0snn2k73f15a4gwh1n5abdxzm";
        enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ SDL_gfx ];
        description = "Binding to libSDL_gfx";
@@ -15625,14 +15634,13 @@ self: {
      }) {inherit (pkgs) SDL_gfx;};
 
   "SDL-image" = callPackage
-    ({ mkDerivation, base, SDL, SDL_image }:
+    ({ mkDerivation, base, Cabal, SDL, SDL_image }:
      mkDerivation {
        pname = "SDL-image";
-       version = "0.6.1.2";
-       sha256 = "1ybdwlqi5nqzpsbh2md5mxhwmjn910iqysf6nykwjxlmvhcjk281";
-       revision = "1";
-       editedCabalFile = "0syx3032z15mnvi2apqsml065xk1i5i9jixwv022a9mimlk710vy";
+       version = "0.6.2.0";
+       sha256 = "1gxwrvswgwjw6g7ym52gik22l9l3ljy592phv97jdmcf3gi6qcg1";
        enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ SDL_image ];
        description = "Binding to libSDL_image";
@@ -15640,14 +15648,13 @@ self: {
      }) {inherit (pkgs) SDL_image;};
 
   "SDL-mixer" = callPackage
-    ({ mkDerivation, base, SDL, SDL_mixer }:
+    ({ mkDerivation, base, Cabal, SDL, SDL_mixer }:
      mkDerivation {
        pname = "SDL-mixer";
-       version = "0.6.2.0";
-       sha256 = "1fhray79d80dk2aj9mx3ks05mm48sd832g8zgxli226jx471fs8r";
-       revision = "1";
-       editedCabalFile = "193wigk1c7i4lxkwkj4kd2fzymwg586ky9h7fpsa1cqmz12sc5wz";
+       version = "0.6.3.0";
+       sha256 = "0k26hqgdh789ka3mv4dsk6rin6x6vwcs6hjmnsqq7j3mnrh1342r";
        enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ SDL_mixer ];
        description = "Binding to libSDL_mixer";
@@ -15668,12 +15675,13 @@ self: {
      }) {inherit (pkgs) smpeg;};
 
   "SDL-ttf" = callPackage
-    ({ mkDerivation, base, SDL, SDL_ttf }:
+    ({ mkDerivation, base, Cabal, SDL, SDL_ttf }:
      mkDerivation {
        pname = "SDL-ttf";
-       version = "0.6.2.2";
-       sha256 = "16blaa55jiyrailhv9cjrr7wrp8m6pssj0jfz2p6631g4vqy888n";
+       version = "0.6.3.0";
+       sha256 = "1hh5v1b5b8yyv1vhgbymn6rwpjpdccmqz2wy1wmjqzcfffdszmag";
        enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ SDL_ttf ];
        description = "Binding to libSDL_ttf";
@@ -16782,8 +16790,8 @@ self: {
     ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }:
      mkDerivation {
        pname = "Spintax";
-       version = "0.3.2";
-       sha256 = "0j7hkdskc66h02yxrw6aah1drqrwxdhq9c33w5mg0rg0gj0j1rpp";
+       version = "0.3.3";
+       sha256 = "04vb07r26p4rxgsym5zhqsnyx4sr2a112sa31mdda5hjpy9j3pr1";
        libraryHaskellDepends = [
          attoparsec base extra mtl mwc-random text
        ];
@@ -20906,8 +20914,8 @@ self: {
        pname = "active";
        version = "0.2.0.13";
        sha256 = "1yw029rh0gb63bhwwjynbv173mny14is4cyjkrlvzvxwb0fi96jx";
-       revision = "5";
-       editedCabalFile = "0hwla9xz275qzgn9n07311ksl3j40izidki1nbhmrmmmfjin57cv";
+       revision = "6";
+       editedCabalFile = "0zq9j2hgapb9blvmd9y8kmczizw4a18kksnfqd1py1jzx7hr46n3";
        libraryHaskellDepends = [
          base lens linear semigroupoids semigroups vector
        ];
@@ -23005,6 +23013,7 @@ self: {
        testHaskellDepends = [
          aeson base tasty tasty-discover tasty-hunit
        ];
+       testToolDepends = [ tasty-discover ];
        description = "A client implementing the Algolia search API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29044,6 +29053,7 @@ self: {
          base hedgehog HUnit safe-exceptions tasty tasty-discover
          tasty-hedgehog tasty-hunit universum
        ];
+       testToolDepends = [ tasty-discover ];
        description = "Async combinators";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29919,6 +29929,7 @@ self: {
        testHaskellDepends = [
          attoparsec base hspec markdown-unlit QuickCheck text
        ];
+       testToolDepends = [ markdown-unlit ];
        description = "An Attoparsec compatibility layer for Parsec";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -30300,8 +30311,8 @@ self: {
     ({ mkDerivation, base, Cabal, directory, filepath }:
      mkDerivation {
        pname = "autoexporter";
-       version = "1.1.9";
-       sha256 = "0hm0njnfgjfbnpjjqmhim773zbzgkfq96caxckcv8vkrj78l839v";
+       version = "1.1.10";
+       sha256 = "0rf28h7nzm5ngcrj1900d0vgwbfr1y3s4q7wwbvdw2mg29rw4f0r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal directory filepath ];
@@ -32414,23 +32425,11 @@ self: {
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "basement";
-       version = "0.0.7";
-       sha256 = "0w2g4k9bs2ph00p0fgrmcrng8ypdz6xis0r10g380nzkg2rvj0dm";
-       libraryHaskellDepends = [ base ghc-prim ];
-       description = "Foundation scrap box of array & string";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "basement_0_0_8" = callPackage
-    ({ mkDerivation, base, ghc-prim }:
-     mkDerivation {
-       pname = "basement";
        version = "0.0.8";
        sha256 = "194jw567di4q2758943q9rrwkbf9gl261my7qc21i9xhyabipx67";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Foundation scrap box of array & string";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "basen-bytestring" = callPackage
@@ -32680,8 +32679,8 @@ self: {
      }:
      mkDerivation {
        pname = "battleplace";
-       version = "0.1.0.5";
-       sha256 = "0n0ry8gssd6rnhgsj0q24bbf8ad8wqjqmkxdrn0lxmd6bgj52bv9";
+       version = "0.1.0.6";
+       sha256 = "01w1im8p4mxbbq8h12kbqzqzr8db41hjprcjlfs1x6wz263ipg1v";
        libraryHaskellDepends = [
          aeson base bytestring cereal data-default hashable memory servant
          text vector
@@ -32694,8 +32693,8 @@ self: {
     ({ mkDerivation, base, battleplace, servant, servant-client }:
      mkDerivation {
        pname = "battleplace-api";
-       version = "0.1.0.1";
-       sha256 = "1pi1vcniyrpq1xfrizhvgw7xbrc332649zg4jl1fjbqn4l4xqrlg";
+       version = "0.1.0.2";
+       sha256 = "148bl4r7fhqrbr8fr4hsgqbyykb7w8q2hi1d8pzk20nkvsrh62ss";
        libraryHaskellDepends = [
          base battleplace servant servant-client
        ];
@@ -33232,16 +33231,15 @@ self: {
      }) {};
 
   "bench-graph" = callPackage
-    ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, csv
-     , directory, filepath, split, text, transformers, Unique
+    ({ mkDerivation, base, Chart, Chart-diagrams, csv, directory
+     , filepath, split, text, transformers
      }:
      mkDerivation {
        pname = "bench-graph";
-       version = "0.1.0";
-       sha256 = "0cmb15q4yrgi8f78ijgn8h51g2f183maslffh4l4dxmi2aqn7z8q";
+       version = "0.1.3";
+       sha256 = "15xsaqxms61p8d5r0lsxhlrdfh451ha6fpldcmh8vcw0q4yb1q47";
        libraryHaskellDepends = [
-         base bytestring Chart Chart-diagrams csv directory filepath
-         transformers Unique
+         base Chart Chart-diagrams csv directory filepath transformers
        ];
        testHaskellDepends = [ base split text ];
        description = "Plot and compare benchmarks";
@@ -33545,8 +33543,8 @@ self: {
      }:
      mkDerivation {
        pname = "bhoogle";
-       version = "0.1.2.9";
-       sha256 = "0cgvwmk9ck9xvpa11vvdd703bx2wd1czcin3g68zyy416v6xwyki";
+       version = "0.1.3.1";
+       sha256 = "1v1g1lq86zsr6qf3c48pblrqz8g321dzn7v5gh3ddm6fpd5sdbp4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -35717,6 +35715,7 @@ self: {
          scientific semigroups string-conversions tagged test-framework
          test-framework-quickcheck2 text tf-random time transformers
        ];
+       testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [
          aeson base base16-bytestring blockchain-restful-address-index-api
          bytestring cereal criterion data-default-class deepseq either
@@ -38131,8 +38130,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.37.1";
-       sha256 = "04rpiafw7a30drbk8gmp01m6l3iawayy1ma1hn8m257rh2zk66qy";
+       version = "0.37.2";
+       sha256 = "176rq7xpwww1c3h7hm6n6z7sxbd3wc2zhxvnk65llk9lipc6rf3w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38145,7 +38144,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_37_2" = callPackage
+  "brick_0_38" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
      , data-clist, deepseq, dlist, microlens, microlens-mtl
      , microlens-th, QuickCheck, stm, template-haskell, text
@@ -38153,8 +38152,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.37.2";
-       sha256 = "176rq7xpwww1c3h7hm6n6z7sxbd3wc2zhxvnk65llk9lipc6rf3w";
+       version = "0.38";
+       sha256 = "03jczlp361al1vjqd6pi88plmzh83w4jjbzlx80d3m5n9lqpzx56";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38945,6 +38944,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) bullet;};
 
+  "bulletproofs" = callPackage
+    ({ mkDerivation, arithmoi, base, containers, cryptonite, memory
+     , protolude, QuickCheck, tasty, tasty-discover, tasty-hunit
+     , tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "bulletproofs";
+       version = "0.1.0";
+       sha256 = "1axm943r0hx5g8a36s4166sf1ifppbd8m6nx25xn7lf27fvsbw9q";
+       revision = "1";
+       editedCabalFile = "08wgmhrlfv99zcgwd7mqjaz5hnhz4h3a3afzdxnclvzmmqd30njv";
+       libraryHaskellDepends = [
+         arithmoi base containers cryptonite memory protolude text
+       ];
+       testHaskellDepends = [
+         arithmoi base containers cryptonite memory protolude QuickCheck
+         tasty tasty-discover tasty-hunit tasty-quickcheck text
+       ];
+       testToolDepends = [ tasty-discover ];
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "bumper" = callPackage
     ({ mkDerivation, base, Cabal, containers, fclabels, process
      , regex-compat, split, strict
@@ -39785,8 +39806,8 @@ self: {
     ({ mkDerivation, base, Cabal, HUnit, QuickCheck, safe }:
      mkDerivation {
        pname = "byteunits";
-       version = "0.4.0.1";
-       sha256 = "012n5gry1a3x4qwqbndgzrq0f90hvgkal48c8s9dylh1n6pi871l";
+       version = "0.4.0.2";
+       sha256 = "1mdkpmqwszllz2yyhssic02k5g7m8hwnd5wghi4vf970g6m6skpp";
        libraryHaskellDepends = [ base safe ];
        testHaskellDepends = [ base Cabal HUnit QuickCheck ];
        description = "Human friendly conversion between byte units (KB, MB, GB...)";
@@ -40918,8 +40939,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.9.3";
-       sha256 = "10l1k8rilf032v6pchwhxaq53mr0d08h6xkllidc3c7wfkzcx7qj";
+       version = "2.10.1";
+       sha256 = "1xwfr53flc2cv7gk583ycmiw7v9x93v1gvhiy6ilqw8a8915vncb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -40962,6 +40983,27 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "cabal2spec_2_2_0" = callPackage
+    ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty
+     , tasty-golden, time
+     }:
+     mkDerivation {
+       pname = "cabal2spec";
+       version = "2.2.0";
+       sha256 = "0pcai2ikp6gna1h60dihclq7apj9jczwz4n0lnfc9fr176gzsprp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base Cabal filepath time ];
+       executableHaskellDepends = [
+         base Cabal filepath optparse-applicative
+       ];
+       testHaskellDepends = [ base Cabal filepath tasty tasty-golden ];
+       description = "Convert Cabal files into rpm spec files";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "cabalQuery" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, MissingH
      , pretty
@@ -42359,6 +42401,8 @@ self: {
        pname = "casr-logbook";
        version = "0.3.0";
        sha256 = "1hbrvwpr5crrnqwsi9i2pcw89rpy5fy3dg40al1318lmxp6miznh";
+       revision = "1";
+       editedCabalFile = "03llwc37nhb4syw8a7wsp8n1135x57q9xacakfzw2rm5gby7hywm";
        libraryHaskellDepends = [
          base containers digit lens lucid text time
        ];
@@ -42518,6 +42562,8 @@ self: {
        pname = "casr-logbook-types";
        version = "0.0.2";
        sha256 = "1dnbmxgfpx953sk9rmpxqzs9mgzgmyp2r55ll9knrfijavfr3arv";
+       revision = "1";
+       editedCabalFile = "1klq48y2wis4zaqs3lbs3bm8whqaglcayasf9qfrqjjzddjd20ms";
        libraryHaskellDepends = [ base containers digit lens time ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
@@ -45685,6 +45731,7 @@ self: {
        sha256 = "18r8lgzyscxnw6xdxg0jxvp2977i02fjh3n5p89fnd8qrh0r2kl4";
        libraryHaskellDepends = [ base mtl text ];
        testHaskellDepends = [ base hspec hspec-discover mtl text ];
+       testToolDepends = [ hspec-discover ];
        description = "CSS preprocessor as embedded Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -45719,6 +45766,7 @@ self: {
          web-routes-happstack web-routes-hsp web-routes-th xss-sanitize
        ];
        librarySystemDepends = [ openssl ];
+       libraryToolDepends = [ hsx2hs ];
        description = "A secure, reliable content management system (CMS) and blogging platform";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45885,6 +45933,7 @@ self: {
          uuid-orphans web-plugins web-routes web-routes-happstack
          web-routes-th
        ];
+       libraryToolDepends = [ hsx2hs ];
        description = "support for CMS/Blogging in clckwrks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45903,6 +45952,7 @@ self: {
          base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro
          mtl text web-plugins
        ];
+       libraryToolDepends = [ hsx2hs ];
        description = "simple bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46403,6 +46453,7 @@ self: {
          aeson base cassava deepseq hashable hspec markdown-unlit persistent
          QuickCheck text vector
        ];
+       testToolDepends = [ markdown-unlit ];
        description = "Integers bounded by a closed interval";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -48941,8 +48992,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "composition-prelude";
-       version = "1.5.0.6";
-       sha256 = "13rjy6i48nsy3nqk79b4cqgiapjg11knzkzajmxy6ps6iq308vjn";
+       version = "1.5.0.8";
+       sha256 = "1pgpjmb5pnnil98h6xrr9vmxxn8hgh20k9gjzm3jqzmx0l6dyspc";
        libraryHaskellDepends = [ base ];
        description = "Higher-order function combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -50292,6 +50343,7 @@ self: {
          pretty-show QuickCheck scientific string-conversions
          unordered-containers vector
        ];
+       testToolDepends = [ hspec-discover ];
        description = "parser for config files, shell variables, command line args";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50477,6 +50529,7 @@ self: {
        testHaskellDepends = [
          base data-default doctest markdown-unlit pretty-show
        ];
+       testToolDepends = [ markdown-unlit ];
        description = "Tools for functors from Hask^k to Hask";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50845,8 +50898,8 @@ self: {
      }:
      mkDerivation {
        pname = "consumers";
-       version = "2.1.1.0";
-       sha256 = "0p52j96kcgrdiccx48j24jdfsfhwi3n3x2rq75n660qrqiab2gf2";
+       version = "2.1.2.0";
+       sha256 = "1fgnb4q5bbad6rmknclvwv79s593r054x7iafrhj3czrfzg94dfx";
        libraryHaskellDepends = [
          base containers exceptions extra hpqtypes lifted-base
          lifted-threads log-base monad-control monad-time mtl stm time
@@ -52799,6 +52852,7 @@ self: {
          hspec-discover HTTP http-types lens lifted-async lifted-base
          monad-control mtl text transformers transformers-base
        ];
+       testToolDepends = [ hspec-discover ];
        description = "HTTP Racing Library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54107,8 +54161,8 @@ self: {
      }:
      mkDerivation {
        pname = "csg";
-       version = "0.1.0.3";
-       sha256 = "17ysbi3585ag7a098lv7wjr4xsjm8mm3zz5hfvz2ahis2g151ipx";
+       version = "0.1.0.4";
+       sha256 = "1dril9ayqng04s6jnh28r8by604kkygbjiblp2c4px0bqvz3g5cx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -56548,8 +56602,8 @@ self: {
        pname = "data-interval";
        version = "1.3.0";
        sha256 = "1i00cci7lzvkxqd1l8dacn7i0mrnccbs23mdciz6nrhlvlgsfiy9";
-       revision = "1";
-       editedCabalFile = "09n6gklg64lgn4x1f48ga9ynssyl4fm8x376blls1mx1xg6kgbz6";
+       revision = "2";
+       editedCabalFile = "16frb3rlkca5z30lwhw8vpwi4g1y42scvg8v41lvih90jq82pg2s";
        libraryHaskellDepends = [
          base containers deepseq extended-reals hashable lattices
        ];
@@ -57086,10 +57140,8 @@ self: {
     ({ mkDerivation, base, hashable, unordered-containers }:
      mkDerivation {
        pname = "data-standards";
-       version = "0.1.0.0";
-       sha256 = "014fk5lsj35iax9amgcn0r9kifyr2ar3afi4zs651l1xl7csmywz";
-       revision = "1";
-       editedCabalFile = "0g4hlyzkski4zha53w6asanjnk9s2jp5dgql353szm4flldfsx07";
+       version = "0.1.0.1";
+       sha256 = "0nx8hgv653nh138f9s2x36hwv92sbj5wzl4isaylxn12qqlwx94d";
        libraryHaskellDepends = [ base hashable unordered-containers ];
        description = "A collection of standards representable by simple data types";
        license = stdenv.lib.licenses.mpl20;
@@ -58610,8 +58662,8 @@ self: {
      }:
      mkDerivation {
        pname = "decimal-arithmetic";
-       version = "0.5.0.0";
-       sha256 = "0l740xpnqs5m67hwp3p6l5mzyhs9si39mp5z2x57mnrhvjdydq1j";
+       version = "0.5.1.0";
+       sha256 = "0ig25l60ix79v4yl2kix8wkhfvsdniaxrzk49hfwqiblwz17kxla";
        libraryHaskellDepends = [ base binary binary-bits deepseq mtl ];
        testHaskellDepends = [ base binary doctest hspec QuickCheck ];
        description = "An implementation of the General Decimal Arithmetic Specification";
@@ -58874,8 +58926,8 @@ self: {
     ({ mkDerivation, base, containers, foldl }:
      mkDerivation {
        pname = "deferred-folds";
-       version = "0.5.1";
-       sha256 = "0fyfm59fyz30mn5w7y47l2vx6d0ap5vijadlfff1j07ak6lnq1x3";
+       version = "0.6";
+       sha256 = "1qp99fbx14y49lsh269jdc5mazz30rqwr1if3gc1qn4m5d8dsqir";
        libraryHaskellDepends = [ base containers foldl ];
        description = "Abstractions over deferred folds";
        license = stdenv.lib.licenses.mit;
@@ -59020,31 +59072,14 @@ self: {
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "1.11.0.1";
-       sha256 = "04a4nnipb7qlw0kz4gy7flzndas3zppjxjbp8vvpcc7n5mqcj89x";
-       libraryHaskellDepends = [
-         base concurrency containers contravariant deepseq exceptions
-         leancheck profunctors random transformers
-       ];
-       description = "A library for unit-testing concurrent programs";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "dejafu_1_11_0_2" = callPackage
-    ({ mkDerivation, base, concurrency, containers, contravariant
-     , deepseq, exceptions, leancheck, profunctors, random, transformers
-     }:
-     mkDerivation {
-       pname = "dejafu";
-       version = "1.11.0.2";
-       sha256 = "0v4vbka3s8hmxvhf7kpfbncv4fr0mks01xd8phg3sqw07qyc871l";
+       version = "1.11.0.3";
+       sha256 = "192a0wv2kdk1js56lm6ikp9mx08fkb0wkxl1yba03p7dfnlj6bnx";
        libraryHaskellDepends = [
          base concurrency containers contravariant deepseq exceptions
          leancheck profunctors random transformers
        ];
        description = "A library for unit-testing concurrent programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deka" = callPackage
@@ -59574,6 +59609,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "deriveJsonNoPrefix" = callPackage
+    ({ mkDerivation, aeson, base, hspec, template-haskell, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "deriveJsonNoPrefix";
+       version = "0.1.0.1";
+       sha256 = "1zwk181c8fv0cv6w3daz3gyb0rwp2cm56piv19iz2vfv3jk9rqqs";
+       libraryHaskellDepends = [ aeson base template-haskell ];
+       testHaskellDepends = [
+         aeson base hspec template-haskell text unordered-containers
+       ];
+       description = "Derive ToJSON/FromJSON instances in a more prefix-friendly manner";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "deriving-compat" = callPackage
     ({ mkDerivation, base, base-compat, base-orphans, containers
      , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
@@ -59582,8 +59633,8 @@ self: {
      }:
      mkDerivation {
        pname = "deriving-compat";
-       version = "0.5";
-       sha256 = "1777569bgb7p1xn9ch90jbg2mk4gph04mzmw3r8c6kq84db1484m";
+       version = "0.5.1";
+       sha256 = "18mkmwm147h601zbdn2lna357z2picpnsxrmkw2jc863chban5vy";
        libraryHaskellDepends = [
          base containers ghc-boot-th ghc-prim template-haskell
          th-abstraction transformers transformers-compat
@@ -59624,8 +59675,8 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "derulo";
-       version = "1.0.2";
-       sha256 = "0kyh5fcbv6337baz2prghak5w4x29ms0ccybbp1qkq0cvmvfwrvq";
+       version = "1.0.3";
+       sha256 = "1z2yv4476a42xndws1zqw0kmiy4wqw1ydqgp7hf7rk3s067wz33m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -59876,25 +59927,25 @@ self: {
     ({ 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
+     , lens-simple, leveldb-haskell, lrucaching, mtl, resourcet
+     , semigroups, serialise, text, unordered-containers
      }:
      mkDerivation {
        pname = "dfinity-radix-tree";
-       version = "0.1.0";
-       sha256 = "14q9ick40mz5a0bdz1s7ga4fhw27hkidrsf543nmgm14q5w8q2nf";
+       version = "0.1.1";
+       sha256 = "1s9yqmx1nlj62xn2khr0y6gwdjrbknz6yk2inir76gbklsc9fw4s";
        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
+         lens-simple leveldb-haskell lrucaching mtl resourcet semigroups
          serialise
        ];
        executableHaskellDepends = [
-         aeson base base16-bytestring bytestring cmdargs cryptohash-sha256
-         data-default-class leveldb-haskell resourcet text
-         unordered-containers
+         aeson base base16-bytestring bytestring cmdargs containers
+         cryptohash-sha256 data-default-class leveldb-haskell mtl resourcet
+         text unordered-containers
        ];
        description = "A generic data integrity layer";
        license = stdenv.lib.licenses.gpl3;
@@ -60341,6 +60392,8 @@ self: {
        pname = "diagrams-builder";
        version = "0.8.0.3";
        sha256 = "1g8anclzfm88nd6z539g5f2h6yfb538hdl59sbiqv0vk1c4sr01s";
+       revision = "1";
+       editedCabalFile = "0cdnriavw7y0cr12n60vd0hwcyi09vkx5zjr47af3bj00lq1v9hk";
        configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ];
        isLibrary = true;
        isExecutable = true;
@@ -61354,8 +61407,8 @@ self: {
      }:
      mkDerivation {
        pname = "digit";
-       version = "0.5.2";
-       sha256 = "18y3dln42avvzj8cxz7hkg6w106zhf64aywx23crywjhilcl5ha0";
+       version = "0.6";
+       sha256 = "13cm8xk3szfcyfdzp108rzwkvwwws34bpla2viyqcr0sivmzdck8";
        libraryHaskellDepends = [
          base lens papa parsers scientific semigroupoids semigroups
          template-haskell
@@ -62770,6 +62823,26 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "distribution-opensuse" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, containers
+     , deepseq, Diff, extra, foldl, hashable, hsemail, mtl, parsec-class
+     , pretty, text, time, turtle
+     }:
+     mkDerivation {
+       pname = "distribution-opensuse";
+       version = "1.0.0";
+       sha256 = "0zy0whx8badksaqqkswslrgrz57mpx3pfjjhrqrvn7088anwb7rr";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base binary bytestring containers deepseq Diff extra foldl
+         hashable hsemail mtl parsec-class pretty text time turtle
+       ];
+       executableHaskellDepends = [ base containers text turtle ];
+       description = "Types, functions, and tools to manipulate the openSUSE distribution";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "distribution-plot" = callPackage
     ({ mkDerivation, base, Chart, Chart-cairo, colour, containers
      , data-default-class, distribution, lens
@@ -65435,8 +65508,8 @@ self: {
     ({ mkDerivation, base, Cabal, dimensions, QuickCheck, time }:
      mkDerivation {
        pname = "easytensor";
-       version = "1.0.0.0";
-       sha256 = "0qi7p82s5av0x9xqll4sjwh82x4r6bijypqh29f7xmk4y6dzs19c";
+       version = "1.0.0.1";
+       sha256 = "0ih92gikf67bq9p599vdb9p9dh4b8p7a687n3xiv3q9qm4pdc8aa";
        libraryHaskellDepends = [ base dimensions ];
        testHaskellDepends = [ base Cabal dimensions QuickCheck ];
        benchmarkHaskellDepends = [ base dimensions time ];
@@ -65779,6 +65852,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "edges" = callPackage
+    ({ mkDerivation, base, cereal, contravariant, deferred-folds, foldl
+     , monad-par, pointed, potoki, potoki-cereal, primitive
+     , primitive-extras, profunctors, QuickCheck, quickcheck-instances
+     , rerebase, semigroupoids, tasty, tasty-hunit, tasty-quickcheck
+     , text, vector
+     }:
+     mkDerivation {
+       pname = "edges";
+       version = "0.4.0.1";
+       sha256 = "1a599zi2im1ics8gnb0v0iv2rpzwzl8i2qfglgi1cxzdhcymn5sa";
+       libraryHaskellDepends = [
+         base cereal contravariant deferred-folds foldl monad-par pointed
+         potoki potoki-cereal primitive primitive-extras profunctors
+         QuickCheck semigroupoids text vector
+       ];
+       testHaskellDepends = [
+         cereal foldl QuickCheck quickcheck-instances rerebase tasty
+         tasty-hunit tasty-quickcheck
+       ];
+       description = "Tools for efficient immutable graphs";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "edis" = callPackage
     ({ mkDerivation, base, bytestring, cereal, hedis }:
      mkDerivation {
@@ -65803,6 +65900,7 @@ self: {
          base comonad doctest QuickCheck tasty tasty-discover
          tasty-quickcheck uniplate
        ];
+       testToolDepends = [ tasty-discover ];
        description = "A monad for rewriting things";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65947,6 +66045,7 @@ self: {
        testHaskellDepends = [
          base hspec hspec-discover HUnit QuickCheck
        ];
+       testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers.";
        license = stdenv.lib.licenses.mit;
@@ -66013,6 +66112,8 @@ self: {
        pname = "effects";
        version = "0.2.3";
        sha256 = "174mlzs1n2zw2jzxn95lkr8f2m2rjigvgpqljrvim9bsb991dhc0";
+       revision = "1";
+       editedCabalFile = "1vwywcrvb4qm3z7smxd9snvcwikyifl7fn8pxgiwchihm0ajnbvw";
        libraryHaskellDepends = [ base containers newtype-generics void ];
        description = "Computational Effects";
        license = stdenv.lib.licenses.bsd3;
@@ -66188,8 +66289,8 @@ self: {
      }:
      mkDerivation {
        pname = "eigen";
-       version = "2.1.7";
-       sha256 = "080dv9hxjfqaarj0vzmaxjc382a3aqp4z69k6nl4vs09g2i1cfg4";
+       version = "3.3.4.1";
+       sha256 = "0kpbnl5yrsp9923al5g9x48yf88m4vsdryq69g8fmlh0wdqkdapa";
        libraryHaskellDepends = [
          base binary bytestring primitive transformers vector
        ];
@@ -67344,28 +67445,6 @@ self: {
      }:
      mkDerivation {
        pname = "enclosed-exceptions";
-       version = "1.0.2";
-       sha256 = "1wc9h6zdnb5impvvml6vnjapajjanw7zgpnzg7c0v7115nwfm6vv";
-       revision = "1";
-       editedCabalFile = "0rjm8g2bm9a7qzklkp0rh5az4qh8nsl0hl119gjik671knygkdj0";
-       libraryHaskellDepends = [
-         base deepseq lifted-base monad-control transformers
-         transformers-base
-       ];
-       testHaskellDepends = [
-         async base deepseq hspec lifted-base monad-control QuickCheck stm
-         transformers transformers-base
-       ];
-       description = "Catching all exceptions from within an enclosed computation";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "enclosed-exceptions_1_0_3" = callPackage
-    ({ mkDerivation, async, base, deepseq, hspec, lifted-base
-     , monad-control, QuickCheck, stm, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "enclosed-exceptions";
        version = "1.0.3";
        sha256 = "1fghjj7nkiddrf03ks8brjpr5x25yi9fs7xg6adbi4mc2gqr6vdg";
        libraryHaskellDepends = [
@@ -67378,7 +67457,6 @@ self: {
        ];
        description = "Catching all exceptions from within an enclosed computation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "encode-string" = callPackage
@@ -68367,6 +68445,26 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "errors-ext_0_4_2" = callPackage
+    ({ mkDerivation, base, binary-ext, bytestring, conduit, errors
+     , exceptions, HUnit, monad-control, monad-loops, mtl, transformers
+     }:
+     mkDerivation {
+       pname = "errors-ext";
+       version = "0.4.2";
+       sha256 = "064nvpc8yy3n6nvc7cmxmgblmarg4wlvawj0k7bc3mj6h0rnavj0";
+       libraryHaskellDepends = [
+         base errors exceptions monad-control mtl transformers
+       ];
+       testHaskellDepends = [
+         base binary-ext bytestring conduit errors exceptions HUnit
+         monad-control monad-loops mtl transformers
+       ];
+       description = "`bracket`-like functions for `ExceptT` over `IO` monad";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ersaconcat" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, HTTP
      , network-uri, process, QuickCheck, tagsoup, template-haskell
@@ -69469,8 +69567,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventstore";
-       version = "1.1.4";
-       sha256 = "0xhhw5dxq1h4w7dpngrhnaipzhfpzvs4y7jdvimzk86hvgv0mmfj";
+       version = "1.1.5";
+       sha256 = "1c8iiq943smldh5yvjpfycfjzy8hnsb2dmvcnbzk41cpcdq2zkx8";
        libraryHaskellDepends = [
          aeson array base bifunctors bytestring cereal clock connection
          containers dns dotnet-timespan ekg-core exceptions fast-logger
@@ -70433,6 +70531,8 @@ self: {
        pname = "extended-reals";
        version = "0.2.3.0";
        sha256 = "170nxxza6lkczh05qi2qxr8nbr3gmdjpfvl1m703gjq9xwrwg2kw";
+       revision = "1";
+       editedCabalFile = "114s55sx0wq0zq9mgxrhaz4kd87c80zf8s35ani3h4dh1bb33j9w";
        libraryHaskellDepends = [ base deepseq hashable ];
        testHaskellDepends = [
          base deepseq HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -70547,6 +70647,7 @@ self: {
          base containers deepseq extensible-effects HUnit lens QuickCheck
          stm tasty tasty-discover tasty-hunit
        ];
+       testToolDepends = [ tasty-discover ];
        description = "Message passing concurrency as extensible-effect";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -70592,8 +70693,8 @@ self: {
      }:
      mkDerivation {
        pname = "extra";
-       version = "1.6.8";
-       sha256 = "1kngk46nkrjkpqaj845c6r823r8aawlk1ir693lr6rskhy1k7dlp";
+       version = "1.6.9";
+       sha256 = "0xxcpb00pgwi9cmy6a7ghh6rblxry42p8pz5ssfgj20fs1xwzj1b";
        libraryHaskellDepends = [
          base clock directory filepath process time unix
        ];
@@ -72328,8 +72429,8 @@ self: {
      }:
      mkDerivation {
        pname = "ffmpeg-light";
-       version = "0.12.2.0";
-       sha256 = "005q3is5n6lpridfszw3c3la15byc0sbq1b1lwsw59jyffgc587c";
+       version = "0.12.2.1";
+       sha256 = "1azzm32rvx48vab3i3cnf520nbvcazx18pi36ilgc97nih15lwjw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -72774,12 +72875,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "filepath_1_4_2" = callPackage
+  "filepath_1_4_2_1" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "filepath";
-       version = "1.4.2";
-       sha256 = "0bnryq00xbcsswxmahl42x85bfh23mxsap0gq8q0dm1v67ij7a0q";
+       version = "1.4.2.1";
+       sha256 = "04jlcaaab4fvlkgpss2mfmr5ixnp1k8f8051nqf8avfg0qan6hqb";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Library for manipulating FilePaths in a cross platform way";
@@ -73139,8 +73240,8 @@ self: {
        pname = "finite-field";
        version = "0.9.0";
        sha256 = "026l5qrc7vsm2s19z10xx30lrsfkwwcymyznyy5hrcrwqj9wf643";
-       revision = "1";
-       editedCabalFile = "0npwa4gv94b87y4bam9valnjlsy3rbhk7n7hdc1mx1bwkn4acyds";
+       revision = "2";
+       editedCabalFile = "11zivn1cjwxc7xy8q50raz1wpfgl0b459ai0f4j304rv7yiwrhdp";
        libraryHaskellDepends = [
          base deepseq hashable singletons template-haskell
        ];
@@ -73157,23 +73258,11 @@ self: {
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
        pname = "finite-typelits";
-       version = "0.1.3.0";
-       sha256 = "17a82djlpapdzw34afv79w99jrpy5nlbdw1k1xjs59bvvqv36wyv";
-       libraryHaskellDepends = [ base deepseq ];
-       description = "A type inhabited by finitely many values, indexed by type-level naturals";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "finite-typelits_0_1_4_0" = callPackage
-    ({ mkDerivation, base, deepseq }:
-     mkDerivation {
-       pname = "finite-typelits";
-       version = "0.1.4.0";
-       sha256 = "1kq48lq4v2iq4zqyynr2zzps4wgzh4c6aad157r156jlgyn4nkc4";
+       version = "0.1.4.2";
+       sha256 = "0iyp9fyd2ki9qcmk9infz9p6rjhsx9jrs3f5yz0yqs8vj5na81yj";
        libraryHaskellDepends = [ base deepseq ];
        description = "A type inhabited by finitely many values, indexed by type-level naturals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "firebase-database" = callPackage
@@ -73705,6 +73794,7 @@ self: {
        testHaskellDepends = [
          base hspec hspec-discover mtl template-haskell transformers
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Opininated testing framework for mtl style (spies, stubs, and mocks)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74225,8 +74315,8 @@ self: {
     ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
      mkDerivation {
        pname = "flow";
-       version = "1.0.13";
-       sha256 = "0dg29g1d7xi14yf4yjxiy9cmslqgz5c4z141q4bzqn6ms0rwrxx7";
+       version = "1.0.14";
+       sha256 = "0k6j0mh3lr2fpvjs2jl1agybng32g9z8w3qf5b542ydjl02nvk08";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest QuickCheck template-haskell ];
        description = "Write more understandable Haskell";
@@ -75592,19 +75682,6 @@ self: {
     ({ mkDerivation, base, basement, gauge, ghc-prim }:
      mkDerivation {
        pname = "foundation";
-       version = "0.0.20";
-       sha256 = "0bg4g0xf4pb2vmahnfp8c4f0a3v0av73lb5g8bwnp170khxfcsms";
-       libraryHaskellDepends = [ base basement ghc-prim ];
-       testHaskellDepends = [ base basement ];
-       benchmarkHaskellDepends = [ base basement gauge ];
-       description = "Alternative prelude with batteries and no dependencies";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "foundation_0_0_21" = callPackage
-    ({ mkDerivation, base, basement, gauge, ghc-prim }:
-     mkDerivation {
-       pname = "foundation";
        version = "0.0.21";
        sha256 = "1q43y8wfj0wf9gdq2kzphwjwq6m5pvryy1lqgk954aq5z3ks1lsf";
        libraryHaskellDepends = [ base basement ghc-prim ];
@@ -75612,7 +75689,6 @@ self: {
        benchmarkHaskellDepends = [ base basement gauge ];
        description = "Alternative prelude with batteries and no dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foundation-edge" = callPackage
@@ -75977,6 +76053,8 @@ self: {
        pname = "free-functors";
        version = "0.8.4";
        sha256 = "0qdllnqghnx6j51zyxqblnz809w7l86qp0d9dg8a4l4kllp1y703";
+       revision = "1";
+       editedCabalFile = "0yl71dl7rp8si7gshj1f713cjxmk5dzkb6m6d3vicc97b37s6r5j";
        libraryHaskellDepends = [
          algebraic-classes base bifunctors comonad constraints contravariant
          profunctors template-haskell transformers
@@ -77174,6 +77252,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "funcons-simple" = callPackage
+    ({ mkDerivation, base, funcons-tools, funcons-values }:
+     mkDerivation {
+       pname = "funcons-simple";
+       version = "0.1.0.3";
+       sha256 = "0ar5sxcalbfyhyvm6ijbyrrz2pzqyj5bihngnf187wrc5llq2ydr";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base funcons-tools funcons-values ];
+       description = "A modular interpreter for executing SIMPLE funcons";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "funcons-tools" = callPackage
     ({ mkDerivation, base, bv, containers, directory, funcons-values
      , gll, mtl, multiset, random-strings, regex-applicative, split
@@ -78035,6 +78126,7 @@ self: {
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib text ];
        libraryPkgconfigDepends = [ GConf ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GNOME configuration database system";
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs.gnome2) GConf;};
@@ -78894,6 +78986,7 @@ self: {
          base directory doctest filepath hspec interpolate markdown-unlit
          mockery QuickCheck shake silently
        ];
+       testToolDepends = [ markdown-unlit ];
        description = "A library for generic programming that aims to be easy to understand";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -79578,6 +79671,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "geodetic-types" = callPackage
+    ({ mkDerivation, base, dimensional, lens, semigroups }:
+     mkDerivation {
+       pname = "geodetic-types";
+       version = "0.0.1";
+       sha256 = "0sj82sz20zfys2h4g74wj9gwfyc2c4jkzazw882xrr18g8zx82p8";
+       libraryHaskellDepends = [ base dimensional lens semigroups ];
+       description = "Types for geodetic operations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "geodetics" = callPackage
     ({ mkDerivation, array, base, checkers, dimensional, HUnit
      , QuickCheck, test-framework, test-framework-hunit
@@ -80069,8 +80173,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-events";
-       version = "0.7.3";
-       sha256 = "13na5pkmid2jg9ivav62x5dzbcacwl4lcsqd7i7brg4h95iqnmpd";
+       version = "0.8.0";
+       sha256 = "1wdxap20wh8sdaqnpsk463mihg6v3va786zb1amgzrcjpsv49is5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -80152,6 +80256,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-exactprint_0_5_7_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, Diff, directory
+     , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
+     , silently, syb
+     }:
+     mkDerivation {
+       pname = "ghc-exactprint";
+       version = "0.5.7.0";
+       sha256 = "0r1cwjz96qrx0ww7snmwdh16xslzaqk6mlz3i9n4q779qf0y1n7m";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers directory filepath free ghc ghc-boot
+         ghc-paths mtl syb
+       ];
+       testHaskellDepends = [
+         base bytestring containers Diff directory filemanip filepath ghc
+         ghc-boot ghc-paths HUnit mtl silently syb
+       ];
+       description = "ExactPrint for GHC";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-gc-tune" = callPackage
     ({ mkDerivation, base, directory, filepath, process }:
      mkDerivation {
@@ -80227,6 +80355,7 @@ self: {
          monad-journal mtl optparse-applicative parsec process
          process-streaming safe syb transformers
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Find the Haddock documentation for a symbol";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80483,27 +80612,6 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-prof";
-       version = "1.4.1.2";
-       sha256 = "0rippzp76g2zn8vhxfkvpf9r2l62lid6525ym6zz1pyq4xzsbqrf";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base containers scientific text time
-       ];
-       testHaskellDepends = [
-         attoparsec base containers directory filepath process tasty
-         tasty-hunit temporary text
-       ];
-       description = "Library for parsing GHC time and allocation profiling reports";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-prof_1_4_1_3" = callPackage
-    ({ mkDerivation, attoparsec, base, containers, directory, filepath
-     , process, scientific, tasty, tasty-hunit, temporary, text, time
-     }:
-     mkDerivation {
-       pname = "ghc-prof";
        version = "1.4.1.3";
        sha256 = "16ckk4ldpkq7khka5mhkngrcazrnfxw394rm7mcshhlr7f41ydlr";
        isLibrary = true;
@@ -80517,7 +80625,6 @@ self: {
        ];
        description = "Library for parsing GHC time and allocation profiling reports";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-prof-aeson" = callPackage
@@ -80736,27 +80843,6 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-typelits-extra";
-       version = "0.2.5";
-       sha256 = "0waznf99wryc0sjyk9xb5c0vsalmmhx0v5vbqsyf5q7r6cjcig4s";
-       libraryHaskellDepends = [
-         base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat
-         ghc-typelits-natnormalise integer-gmp transformers
-       ];
-       testHaskellDepends = [
-         base ghc-typelits-knownnat ghc-typelits-natnormalise tasty
-         tasty-hunit template-haskell
-       ];
-       description = "Additional type-level operations on GHC.TypeLits.Nat";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-extra_0_2_6" = callPackage
-    ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra
-     , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp
-     , tasty, tasty-hunit, template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-extra";
        version = "0.2.6";
        sha256 = "0dx6rk6lpklqqklj74mg92vjn66kkjfxp87hwazzlx9wai23r3cm";
        libraryHaskellDepends = [
@@ -80769,7 +80855,6 @@ self: {
        ];
        description = "Additional type-level operations on GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-typelits-knownnat" = callPackage
@@ -80779,26 +80864,6 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-typelits-knownnat";
-       version = "0.5";
-       sha256 = "0mix7zgbnyc3216ykcrjl09rpidq5n2y886k03g8r5pziq1xki00";
-       libraryHaskellDepends = [
-         base ghc ghc-tcplugins-extra ghc-typelits-natnormalise
-         template-haskell transformers
-       ];
-       testHaskellDepends = [
-         base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck
-       ];
-       description = "Derive KnownNat constraints from other KnownNat constraints";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-knownnat_0_5_1" = callPackage
-    ({ mkDerivation, base, ghc, ghc-tcplugins-extra
-     , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-knownnat";
        version = "0.5.1";
        sha256 = "0yvdb3y82wrm41p9sbbsmfq91cp9kzx7mmqr20wgxrqamhnw952v";
        libraryHaskellDepends = [
@@ -80810,7 +80875,6 @@ self: {
        ];
        description = "Derive KnownNat constraints from other KnownNat constraints";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-typelits-natnormalise" = callPackage
@@ -80819,22 +80883,6 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-typelits-natnormalise";
-       version = "0.6.1";
-       sha256 = "0xzwlxcmd3vll86mdjk8pph6f0nw3vq0h3airzv7jagc4j3x9c7x";
-       libraryHaskellDepends = [
-         base ghc ghc-tcplugins-extra integer-gmp transformers
-       ];
-       testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
-       description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-natnormalise_0_6_2" = callPackage
-    ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
-     , tasty-hunit, template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-natnormalise";
        version = "0.6.2";
        sha256 = "04a338yfcl6jm1daax08zsy03myii4llzih4mlprkyid8i0yn740";
        libraryHaskellDepends = [
@@ -80843,7 +80891,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
        description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-typelits-presburger" = callPackage
@@ -82411,6 +82458,7 @@ self: {
          base megaparsec smallcheck smallcheck-series tasty tasty-discover
          tasty-hunit tasty-smallcheck tasty-travis text unordered-containers
        ];
+       testToolDepends = [ tasty-discover ];
        description = "A simple parser for Git configuration files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82850,8 +82898,8 @@ self: {
      }:
      mkDerivation {
        pname = "github-release";
-       version = "1.2.1";
-       sha256 = "1q01yk6nl60iylsqzz1gzg3q1gpjn6bi13p5lddx1z5hd6hri80h";
+       version = "1.2.2";
+       sha256 = "0mnkj8p90inaw6cic60hx05yq2lf2aahmv313qi59di5jqkyg106";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -83689,8 +83737,8 @@ self: {
        pname = "glirc";
        version = "2.26";
        sha256 = "1ax2ygzrsr1r21v9cx4ixnlgrax6nxr4rkh090n1wv6xn02kd3j0";
-       revision = "2";
-       editedCabalFile = "0fwyd1xvz11b1433lw0c9rb8md1f87mg9kinq3hrfq8jjmaws478";
+       revision = "4";
+       editedCabalFile = "1kky984mv59s94xj044wxj47ijy4a4fkrp93mkh47ww53azjw1lw";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -86624,6 +86672,7 @@ self: {
          MissingH mtl process QuickCheck regex-posix scientific servant
          servant-client text
        ];
+       testToolDepends = [ markdown-unlit ];
        description = "A Haskell client for Grakn";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87296,6 +87345,7 @@ self: {
          QuickCheck text
        ];
        testSystemDepends = [ graphviz ];
+       testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [ base criterion deepseq text ];
        description = "Bindings to Graphviz for graph visualisation";
        license = stdenv.lib.licenses.bsd3;
@@ -87313,6 +87363,7 @@ self: {
          aeson base containers process regex-posix scientific text
        ];
        testHaskellDepends = [ base hspec markdown-unlit text ];
+       testToolDepends = [ markdown-unlit ];
        description = "Execute Graql queries on a Grakn graph";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88215,6 +88266,7 @@ self: {
          array base bytestring directory glib mtl
        ];
        libraryPkgconfigDepends = [ gst-plugins-base gstreamer ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GStreamer open source multimedia framework";
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;};
@@ -88368,8 +88420,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk-sni-tray";
-       version = "0.1.4.0";
-       sha256 = "1cxs2rgyjkjwz7y2n205pwqnji4c27k6ilx6prv9a5nsd0msr1h2";
+       version = "0.1.5.0";
+       sha256 = "0vfxskzhcm1a3i7kvqxfvmqdvx7xk6hnbpsnqymrzjaj11w9r9x0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -88633,6 +88685,7 @@ self: {
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib gtk pango ];
        libraryPkgconfigDepends = [ gtkglext ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GTK+ OpenGL Extension";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88690,6 +88743,7 @@ self: {
          array base containers glib gtk mtl text
        ];
        libraryPkgconfigDepends = [ gtksourceview ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs.gnome2) gtksourceview;};
@@ -88708,6 +88762,7 @@ self: {
          array base containers glib gtk3 mtl text
        ];
        libraryPkgconfigDepends = [ gtksourceview3 ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
      }) {gtksourceview3 = pkgs.gnome3.gtksourceview;};
@@ -89129,8 +89184,8 @@ self: {
      }:
      mkDerivation {
        pname = "hOpenPGP";
-       version = "2.7";
-       sha256 = "0s4afs5s6sz2j9vkgz6xhx426dva72i6gk8804avjphjrfvvgdzg";
+       version = "2.7.1";
+       sha256 = "02nws5px5zb9rvsl3hpqr15iw56n0d2pwgdrk3d047l4hx9cbm95";
        libraryHaskellDepends = [
          aeson asn1-encoding attoparsec base base16-bytestring
          base64-bytestring bifunctors binary binary-conduit bytestring bzlib
@@ -89165,19 +89220,19 @@ self: {
      }) {};
 
   "hPDB" = callPackage
-    ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq
-     , directory, ghc-prim, iterable, mmap, mtl, Octree, parallel
+    ({ mkDerivation, base, bytestring, containers, deepseq, directory
+     , ghc-prim, iterable, linear, mmap, mtl, Octree, parallel
      , QuickCheck, tagged, template-haskell, text, unordered-containers
      , vector, zlib
      }:
      mkDerivation {
        pname = "hPDB";
-       version = "1.2.0.10";
-       sha256 = "10a5995872n6y849nhs9yl7zwp7ywfma3mabgywq7acmpppl5ka0";
+       version = "1.5.0.0";
+       sha256 = "07pc4g0gj56q0nrry6462a8h2v0psp23nbn9sd7fybgz248c39lw";
        libraryHaskellDepends = [
-         AC-Vector base bytestring containers deepseq directory ghc-prim
-         iterable mmap mtl Octree parallel QuickCheck tagged
-         template-haskell text unordered-containers vector zlib
+         base bytestring containers deepseq directory ghc-prim iterable
+         linear mmap mtl Octree parallel QuickCheck tagged template-haskell
+         text unordered-containers vector zlib
        ];
        description = "Protein Databank file format library";
        license = stdenv.lib.licenses.bsd3;
@@ -89185,25 +89240,26 @@ self: {
      }) {};
 
   "hPDB-examples" = callPackage
-    ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq
-     , directory, ghc-prim, GLUT, hPDB, IfElse, iterable, mtl, Octree
-     , OpenGL, process, QuickCheck, template-haskell, text, text-format
-     , time, vector
+    ({ mkDerivation, base, bytestring, containers, deepseq, directory
+     , ghc-prim, GLUT, hPDB, IfElse, iterable, linear, mtl, Octree
+     , OpenGL, process, QuickCheck, template-haskell, text, time, vector
      }:
      mkDerivation {
        pname = "hPDB-examples";
-       version = "1.2.0.8";
-       sha256 = "0zyfh2693cirr69qcmiwsmk4p8w8v6yacidcs22jcisay95v4qf6";
+       version = "1.5.0.0";
+       sha256 = "0hhi6x8m7pngcjmxv5mncw66r5bn67i07g347d85lc6yszhrykdp";
+       revision = "1";
+       editedCabalFile = "1bk3fmdgqyj0p72049w79y0b9hdzb5knzkxzl9z02qsbdj5f5if0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         AC-Vector base bytestring containers deepseq directory ghc-prim
-         GLUT hPDB iterable mtl Octree OpenGL QuickCheck template-haskell
-         text text-format vector
+         base bytestring containers deepseq directory ghc-prim GLUT hPDB
+         iterable linear mtl Octree OpenGL QuickCheck template-haskell text
+         vector
        ];
        testHaskellDepends = [
-         AC-Vector base bytestring containers deepseq directory ghc-prim
-         hPDB IfElse iterable mtl process template-haskell text time vector
+         base bytestring containers deepseq directory ghc-prim hPDB IfElse
+         iterable linear mtl process template-haskell text time vector
        ];
        description = "Examples for hPDB library";
        license = stdenv.lib.licenses.bsd3;
@@ -90101,8 +90157,8 @@ self: {
      }:
      mkDerivation {
        pname = "hackage-whatsnew";
-       version = "0.1.0.2";
-       sha256 = "0z57nnp0sn15399b11h7kb5dxqmg1gd3l8qv7vw8knxv65yfgra3";
+       version = "0.1.1";
+       sha256 = "140qsl0aqw2zg246inijifvcddmirba613as0hrg11hkd52f6fhr";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -90584,8 +90640,8 @@ self: {
      }:
      mkDerivation {
        pname = "hadolint";
-       version = "1.10.2";
-       sha256 = "0x9szi43a4l7ii8qbhpgakln2ddaix5p42n39i08w8h54qbx6c08";
+       version = "1.10.3";
+       sha256 = "00khz032sy78z5rr36d20zj4grbbqkf1rk1x8m0nf05ca6gfwjbj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -91965,8 +92021,8 @@ self: {
      }:
      mkDerivation {
        pname = "hapistrano";
-       version = "0.3.5.7";
-       sha256 = "0fis5g2fg0x5pw7r0p7qy090v90gzqza5qjnpzinnq1yipmr872p";
+       version = "0.3.5.8";
+       sha256 = "0yg1wgg4mkfjf49xfcnijrwmj747yzbybsvkaq515i618nz5x57z";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -93237,6 +93293,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hash-store" = callPackage
+    ({ mkDerivation, base, base16-bytestring, blake2, bytestring
+     , directory, filepath
+     }:
+     mkDerivation {
+       pname = "hash-store";
+       version = "0.1.0";
+       sha256 = "1lbnywgd3kr7nryw0s6pgpznsx526xvagapsl5sdwwss8ginjh78";
+       libraryHaskellDepends = [
+         base base16-bytestring blake2 bytestring directory filepath
+       ];
+       description = "Hash as cache";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "hash-tree" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, containers
      , cryptonite, hspec, memory, QuickCheck
@@ -93709,8 +93780,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskdogs";
-       version = "0.5.1";
-       sha256 = "1iilnxw9xq3i5y1fvvjs557xbblfgq992576fpvr405wj6nlhmk3";
+       version = "0.5.3";
+       sha256 = "1n3vwrm99h4kzcimav18dkbvkpkhspwdf5gz8da1sr4g0m4kg96n";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -95091,8 +95162,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-ast";
-       version = "1.1.0.1";
-       sha256 = "1g450ikg2wi7whw46ibm9pc7jdnk5lng8l7lqryi0nigmrmgz355";
+       version = "1.1.0.2";
+       sha256 = "0j81dmg2mgxlc4wy054a13bvx549xs19fr729rirdj2illdgbw1c";
        libraryHaskellDepends = [
          base classyplate ghc mtl pretty references template-haskell
          uniplate
@@ -95159,8 +95230,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-backend-ghc";
-       version = "1.1.0.1";
-       sha256 = "030ylilmgn4drp00d3683kwfyq9rky5i8ihpvmqjkphyq7bbwva4";
+       version = "1.1.0.2";
+       sha256 = "0c054gvnn38r5vlpka5jsvq3n8lcn3j77jg45g1zl1az0099mzhl";
        libraryHaskellDepends = [
          base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl
          references safe split template-haskell transformers uniplate
@@ -95180,8 +95251,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-builtin-refactorings";
-       version = "1.1.0.1";
-       sha256 = "0xlcwyydspn73nv7yi1djncqhswszqn9skrm6hm96scfyqvvxbwa";
+       version = "1.1.0.2";
+       sha256 = "1wm7c63cw4izg6vlrm2xdyrfvf4cwcqs2n144y8k0zf442xaq5l9";
        libraryHaskellDepends = [
          aeson base Cabal classyplate containers deepseq directory filepath
          ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc
@@ -95210,8 +95281,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-cli";
-       version = "1.1.0.1";
-       sha256 = "1gc20ajz1xzp3343j013w0knqdvhwa5hxwvxr6ydpxgrigjxk18p";
+       version = "1.1.0.2";
+       sha256 = "0222qiyjncfyvcizsjx8qv4j8pjfrqb1mi18566fg689bhwl8x7z";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95247,8 +95318,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-daemon";
-       version = "1.1.0.1";
-       sha256 = "0vq8d7n8k978d2jv4f3sbvccjj9vqydci33xl1axamslani0k8x2";
+       version = "1.1.0.2";
+       sha256 = "048k4pa26z3b3m83km8wbhr7nx2z3zmg4gyp1ga15idv73fis3kl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95280,8 +95351,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-debug";
-       version = "1.1.0.1";
-       sha256 = "1l84y0pqwcq1y6509gg68flfa1ai5zl2psn57lp1nm17i7cddsjw";
+       version = "1.1.0.2";
+       sha256 = "1lnv9j4h45g0z1s9pf86py39p2bs8dbz3xybg0bwz89yix8h7nhl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95306,8 +95377,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-demo";
-       version = "1.1.0.1";
-       sha256 = "1rzpwy7fvc51vs9sqpxvja84bqjgrpj6943cc2p06d1ynl7vzmk5";
+       version = "1.1.0.2";
+       sha256 = "0c2m6xqcl22x9ay3n9j64lphmsvxsgcwymvbxscwpki9mv7wbvkx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95337,8 +95408,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-experimental-refactorings";
-       version = "1.1.0.1";
-       sha256 = "16qdvs68zlzjx5gj8034w5qwc79i640kfdnwc81wi84hch7xwy4p";
+       version = "1.1.0.2";
+       sha256 = "1kqiblwc0dp3p7yx10jqxflsgybc0vvgrvi0ylxhgkmn6cpmnkqv";
        libraryHaskellDepends = [
          base Cabal containers directory filepath ghc ghc-paths
          haskell-tools-ast haskell-tools-backend-ghc
@@ -95364,8 +95435,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-prettyprint";
-       version = "1.1.0.1";
-       sha256 = "1x8zz8i66cfnvif991bj9nkidp2bwlhs9zfkxwlyhvhrlda45q8f";
+       version = "1.1.0.2";
+       sha256 = "01j212inqx7hq24kcw7n0619bgz7bj576xrh06h10n0wqhd6qfbq";
        libraryHaskellDepends = [
          base containers ghc haskell-tools-ast mtl references split text
          uniplate
@@ -95384,8 +95455,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-refactor";
-       version = "1.1.0.1";
-       sha256 = "0kfw41f4js9s6mf533q7vm7ym63hb289j77r2ypm08490bqjhi9g";
+       version = "1.1.0.2";
+       sha256 = "12gkmji62kvnqjih9845hmsdj2f52hvmqgrz7s5wclpn3b5fhczq";
        libraryHaskellDepends = [
          aeson base Cabal containers directory filepath ghc ghc-paths
          haskell-tools-ast haskell-tools-backend-ghc
@@ -95411,8 +95482,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-rewrite";
-       version = "1.1.0.1";
-       sha256 = "0j1925x0qkkm8n0klqbawgd419ra9jrfl4y4hn75j3w4zxzh3v5j";
+       version = "1.1.0.2";
+       sha256 = "1az7924bsiapn7g8gj75vdi47alrlly0wnwhcd7p8a24kh1hj055";
        libraryHaskellDepends = [
          base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl
          references
@@ -97786,6 +97857,7 @@ self: {
          smallcheck tasty tasty-discover tasty-hedgehog tasty-hunit
          tasty-smallcheck temporary text transformers vector
        ];
+       testToolDepends = [ tasty-discover ];
        benchmarkHaskellDepends = [
          base binary bytestring criterion deepseq filepath
          optparse-applicative parsec primitive text transformers vector
@@ -99610,8 +99682,8 @@ self: {
      }:
      mkDerivation {
        pname = "herms";
-       version = "1.9.0.2";
-       sha256 = "0gl2zwmqcvmkk63xip7zqn37qwpii5b8qbf7h289iyrc46a3z29z";
+       version = "1.9.0.3";
+       sha256 = "0pb0pzaa5b9hmrscdggvafm6ygr843i02brhs604mkhggyqivf74";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -103859,7 +103931,7 @@ self: {
        libraryHaskellDepends = [ base cgen ];
        librarySystemDepends = [ OgreMain ];
        libraryPkgconfigDepends = [ OGRE ];
-       libraryToolDepends = [ cgen-hs grgen ];
+       libraryToolDepends = [ cgen cgen-hs grgen ];
        doHaddock = false;
        description = "Haskell binding to a subset of OGRE";
        license = stdenv.lib.licenses.mit;
@@ -105177,6 +105249,44 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hpack_0_29_5" = callPackage
+    ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
+     , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
+     , http-client, http-client-tls, http-types, HUnit, infer-license
+     , interpolate, mockery, pretty, QuickCheck, scientific
+     , template-haskell, temporary, text, transformers
+     , unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "hpack";
+       version = "0.29.5";
+       sha256 = "1jm70x2d1d5la780aksq3088k5vj8s6j2srslij9slsfkw6mmv56";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bifunctors bytestring Cabal containers cryptonite
+         deepseq directory filepath Glob http-client http-client-tls
+         http-types infer-license pretty scientific text transformers
+         unordered-containers vector yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bifunctors bytestring Cabal containers cryptonite
+         deepseq directory filepath Glob http-client http-client-tls
+         http-types infer-license pretty scientific text transformers
+         unordered-containers vector yaml
+       ];
+       testHaskellDepends = [
+         aeson base bifunctors bytestring Cabal containers cryptonite
+         deepseq directory filepath Glob hspec http-client http-client-tls
+         http-types HUnit infer-license interpolate mockery pretty
+         QuickCheck scientific template-haskell temporary text transformers
+         unordered-containers vector yaml
+       ];
+       description = "An alternative format for Haskell packages";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hpack-convert" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
      , Cabal, containers, deepseq, directory, filepath, Glob, hspec
@@ -105215,8 +105325,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack-dhall";
-       version = "0.2.0";
-       sha256 = "0avkxcrpa1qgyw56wqna773404gcglvqxr81jmzr0hij406x4c8m";
+       version = "0.3.0";
+       sha256 = "0dplb37npz47cxya1c3dnj6bjcnprjph83yifb08a5qf6vnhcjyh";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -105624,6 +105734,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) postgresql;};
 
+  "hpqtypes_1_6_0_0" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, Cabal, containers
+     , data-default-class, directory, exceptions, filepath, HUnit
+     , lifted-base, monad-control, mtl, postgresql, QuickCheck, random
+     , resource-pool, scientific, semigroups, test-framework
+     , test-framework-hunit, text, text-show, time, transformers
+     , transformers-base, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hpqtypes";
+       version = "1.6.0.0";
+       sha256 = "1aydpbkp5if7416dvswiygn7vfhgg7nza9p011gld18pr9mpsf5i";
+       setupHaskellDepends = [ base Cabal directory filepath ];
+       libraryHaskellDepends = [
+         aeson async base bytestring containers data-default-class
+         exceptions lifted-base monad-control mtl resource-pool semigroups
+         text text-show time transformers transformers-base vector
+       ];
+       librarySystemDepends = [ postgresql ];
+       testHaskellDepends = [
+         aeson base bytestring exceptions HUnit lifted-base monad-control
+         mtl QuickCheck random scientific test-framework
+         test-framework-hunit text text-show time transformers-base
+         unordered-containers vector
+       ];
+       description = "Haskell bindings to libpqtypes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) postgresql;};
+
   "hpqtypes-extras" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, containers
      , cryptohash, data-default, exceptions, fields-json, hpqtypes
@@ -105632,8 +105772,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpqtypes-extras";
-       version = "1.6.1.0";
-       sha256 = "1k23dk3f1d3d3a1qdkvwjk91nw7iz4906clnwhd9k2s70zgsw111";
+       version = "1.6.2.0";
+       sha256 = "095kxfk12bzl7gl44fa7xmwfnx63707s1jz861hqjmi9dv3mm8kp";
        libraryHaskellDepends = [
          base base16-bytestring bytestring containers cryptohash
          data-default exceptions fields-json hpqtypes lifted-base log-base
@@ -106815,6 +106955,7 @@ self: {
          base bytestring data-default-class hspec hspec-discover temporary
          text
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Integrating Sass into Haskell applications";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -108485,6 +108626,7 @@ self: {
          hspec-expectations hspec-meta HUnit QuickCheck stringbuilder
          transformers
        ];
+       testToolDepends = [ hspec-discover ];
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108508,10 +108650,35 @@ self: {
          hspec-expectations hspec-meta HUnit QuickCheck stringbuilder
          transformers
        ];
+       testToolDepends = [ hspec-discover ];
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec_2_5_5" = callPackage
+    ({ mkDerivation, base, call-stack, directory, hspec-core
+     , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
+     , stringbuilder, transformers
+     }:
+     mkDerivation {
+       pname = "hspec";
+       version = "2.5.5";
+       sha256 = "1yv4k5b5kkig2q3waj28587sq28wms7wfav5a3lq4dra6jybimfm";
+       libraryHaskellDepends = [
+         base call-stack hspec-core hspec-discover hspec-expectations HUnit
+         QuickCheck transformers
+       ];
+       testHaskellDepends = [
+         base call-stack directory hspec-core hspec-discover
+         hspec-expectations hspec-meta HUnit QuickCheck stringbuilder
+         transformers
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hspec
      , hspec-expectations, text
@@ -108607,6 +108774,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-core_2_5_5" = callPackage
+    ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
+     , deepseq, directory, filepath, hspec-expectations, hspec-meta
+     , HUnit, process, QuickCheck, quickcheck-io, random, setenv
+     , silently, stm, temporary, tf-random, transformers
+     }:
+     mkDerivation {
+       pname = "hspec-core";
+       version = "2.5.5";
+       sha256 = "1vfrqlpn32s9wiykmkxbnrnd5p56yznw20pf8fwzw78ar4wpz55x";
+       libraryHaskellDepends = [
+         ansi-terminal array base call-stack clock deepseq directory
+         filepath hspec-expectations HUnit QuickCheck quickcheck-io random
+         setenv stm tf-random transformers
+       ];
+       testHaskellDepends = [
+         ansi-terminal array base call-stack clock deepseq directory
+         filepath hspec-expectations hspec-meta HUnit process QuickCheck
+         quickcheck-io random setenv silently stm temporary tf-random
+         transformers
+       ];
+       testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-dirstream" = callPackage
     ({ mkDerivation, base, dirstream, filepath, hspec, hspec-core
      , pipes, pipes-safe, system-filepath, text
@@ -108662,6 +108856,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-discover_2_5_5" = callPackage
+    ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
+     }:
+     mkDerivation {
+       pname = "hspec-discover";
+       version = "2.5.5";
+       sha256 = "04aidzi91ccr9bygmfkjzshz34z9vh8wvqj4zinx2clxq6r7gqfz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
+         base directory filepath hspec-meta QuickCheck
+       ];
+       description = "Automatically discover and run Hspec tests";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-expectations" = callPackage
     ({ mkDerivation, base, call-stack, HUnit, nanospec }:
      mkDerivation {
@@ -108833,6 +109046,7 @@ self: {
        sha256 = "15mcspn20znjxjsjqivrfvpndjd2i3kic5nyij13lfwyd3p2al0j";
        libraryHaskellDepends = [ base hspec QuickCheck ];
        testHaskellDepends = [ base hspec markdown-unlit QuickCheck ];
+       testToolDepends = [ markdown-unlit ];
        description = "Document and test laws for standard type classes";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -110326,6 +110540,7 @@ self: {
          base containers hspec hspec-discover QuickCheck
          quickcheck-instances string-conversions text
        ];
+       testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [
          attoparsec base criterion deepseq tagsoup text
        ];
@@ -110738,23 +110953,6 @@ self: {
      }:
      mkDerivation {
        pname = "http-client-openssl";
-       version = "0.2.1.1";
-       sha256 = "173s2m73xcf6ramy680ky4zhxhmrymh98g2hv5xa2pnj489j7vi4";
-       libraryHaskellDepends = [ base HsOpenSSL http-client network ];
-       testHaskellDepends = [
-         base HsOpenSSL hspec http-client http-types
-       ];
-       doCheck = false;
-       description = "http-client backend using the OpenSSL library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "http-client-openssl_0_2_2_0" = callPackage
-    ({ mkDerivation, base, HsOpenSSL, hspec, http-client, http-types
-     , network
-     }:
-     mkDerivation {
-       pname = "http-client-openssl";
        version = "0.2.2.0";
        sha256 = "1ahh2b34cwkmspwg8zilf2llmayf03p33z2gsw455wkhgfbhshcn";
        libraryHaskellDepends = [ base HsOpenSSL http-client network ];
@@ -110764,7 +110962,6 @@ self: {
        doCheck = false;
        description = "http-client backend using the OpenSSL library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-client-request-modifiers" = callPackage
@@ -112397,14 +112594,14 @@ self: {
 
   "hw-excess" = callPackage
     ({ mkDerivation, base, hspec, hw-bits, hw-prim, hw-rankselect-base
-     , QuickCheck, safe, storable-record, vector
+     , QuickCheck, safe, vector
      }:
      mkDerivation {
        pname = "hw-excess";
-       version = "0.2.0.0";
-       sha256 = "1ab1nl03pzqsxkp6xcxwfrjp7h7jrfxjaw6p01yk7c7mk1h4nypi";
+       version = "0.2.0.2";
+       sha256 = "1xm1nwab2zhlyd0n536pd5sny4miqr8p41pasl9mqvg89v6x0db7";
        libraryHaskellDepends = [
-         base hw-bits hw-prim hw-rankselect-base safe storable-record vector
+         base hw-bits hw-prim hw-rankselect-base safe vector
        ];
        testHaskellDepends = [
          base hspec hw-bits hw-prim QuickCheck vector
@@ -112543,34 +112740,53 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-json-lens" = callPackage
+  "hw-json_0_8_1_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base
-     , bytestring, conduit, containers, criterion, dlist, hspec
-     , hw-balancedparens, hw-bits, hw-conduit, hw-diagnostics, hw-json
-     , hw-parser, hw-prim, hw-rankselect, lens, mmap, mono-traversable
-     , parsec, QuickCheck, resourcet, scientific, text, transformers
-     , unordered-containers, vector, word8
+     , bytestring, containers, criterion, directory, dlist, hspec
+     , hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim
+     , hw-rankselect, hw-rankselect-base, mmap, text, vector, word8
      }:
      mkDerivation {
-       pname = "hw-json-lens";
-       version = "0.0.0.1";
-       sha256 = "1r0g22271avmvqfl4sph4c6rnqwchbah5ixccksp7p2xa9g5j52z";
+       pname = "hw-json";
+       version = "0.8.1.0";
+       sha256 = "1dllysbajkjsyb0rr9rhp2pmyrl99l7n086w8ifkm3491vgph179";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint array attoparsec base bytestring conduit containers
-         dlist hw-balancedparens hw-bits hw-conduit hw-diagnostics hw-json
-         hw-parser hw-prim hw-rankselect lens mmap mono-traversable
-         resourcet scientific text unordered-containers vector word8
+         ansi-wl-pprint array attoparsec base bytestring containers dlist
+         hw-balancedparens hw-bits hw-mquery hw-parser hw-prim hw-rankselect
+         hw-rankselect-base mmap text vector word8
+       ];
+       executableHaskellDepends = [
+         base bytestring criterion dlist hw-balancedparens hw-bits hw-mquery
+         hw-prim hw-rankselect hw-rankselect-base mmap vector
        ];
        testHaskellDepends = [
-         attoparsec base bytestring conduit containers hspec
-         hw-balancedparens hw-bits hw-conduit hw-json hw-prim hw-rankselect
-         lens mmap parsec QuickCheck resourcet scientific transformers
-         unordered-containers vector
+         attoparsec base bytestring containers hspec hw-balancedparens
+         hw-bits hw-prim hw-rankselect hw-rankselect-base mmap vector
        ];
        benchmarkHaskellDepends = [
-         base bytestring conduit criterion hw-bits hw-conduit hw-prim
-         hw-rankselect lens mmap resourcet scientific unordered-containers
-         vector
+         base bytestring criterion directory hw-balancedparens hw-bits
+         hw-prim hw-rankselect hw-rankselect-base mmap vector
+       ];
+       description = "Memory efficient JSON parser";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hw-json-lens" = callPackage
+    ({ mkDerivation, base, bytestring, containers, criterion, hw-json
+     , lens, scientific, word8
+     }:
+     mkDerivation {
+       pname = "hw-json-lens";
+       version = "0.1.0.0";
+       sha256 = "1dbgxdbm8xp83hmdygi0y4h5lysacvdhms5g6i7p5i2w6prwqvid";
+       libraryHaskellDepends = [
+         base bytestring containers hw-json lens scientific word8
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion hw-json lens
        ];
        description = "Lens for hw-json";
        license = stdenv.lib.licenses.mit;
@@ -112695,6 +112911,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-parser_0_1_0_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, hw-prim, text }:
+     mkDerivation {
+       pname = "hw-parser";
+       version = "0.1.0.0";
+       sha256 = "14ck19m0fizv7zpqxnpgv7fah9x3fp0p5ax5a5zxr5s52b52mq2x";
+       libraryHaskellDepends = [
+         attoparsec base bytestring hw-prim text
+       ];
+       description = "Simple parser support";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-prim" = callPackage
     ({ mkDerivation, base, bytestring, criterion, directory, exceptions
      , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, vector
@@ -112828,6 +113058,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-simd" = callPackage
+    ({ mkDerivation, base, bits-extra, bytestring, c2hs, cassava
+     , containers, criterion, deepseq, directory, hedgehog, hspec
+     , hw-bits, hw-hspec-hedgehog, hw-prim, hw-rankselect
+     , hw-rankselect-base, mmap, text, vector
+     }:
+     mkDerivation {
+       pname = "hw-simd";
+       version = "0.0.0.3";
+       sha256 = "1kkaigvkh932gcdvn7ll93qkz332bp6ylg5wsf8saxnir1n1362k";
+       libraryHaskellDepends = [
+         base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect
+         hw-rankselect-base vector
+       ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [
+         base bits-extra bytestring deepseq directory hedgehog hspec hw-bits
+         hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base text
+         vector
+       ];
+       benchmarkHaskellDepends = [
+         base bits-extra bytestring cassava containers criterion deepseq
+         directory hw-bits hw-prim hw-rankselect hw-rankselect-base mmap
+         vector
+       ];
+       description = "SIMD library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hw-string-parse" = callPackage
     ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }:
      mkDerivation {
@@ -116042,6 +116301,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "indexation" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus
+     , foldl, hashable, list-t, potoki, potoki-cereal, profunctors
+     , stm-containers, text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "indexation";
+       version = "0.2.0.2";
+       sha256 = "10wm6k8rjdk4pq9pypnbh9pbqzr0vxbfgmj66d18grpr9g2mk5j1";
+       libraryHaskellDepends = [
+         base bytestring cereal deferred-folds focus foldl hashable list-t
+         potoki potoki-cereal profunctors stm-containers text transformers
+         unordered-containers vector
+       ];
+       description = "Tools for entity indexation";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "indexed" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -116181,6 +116458,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "infer-license" = callPackage
+    ({ mkDerivation, base, directory, filepath, hspec, text
+     , text-metrics
+     }:
+     mkDerivation {
+       pname = "infer-license";
+       version = "0.2.0";
+       sha256 = "0wlfm6bf55kfvm74xar9lmjg5v1103rs9m3grw1rq5bmcmhzxrhj";
+       libraryHaskellDepends = [
+         base directory filepath text text-metrics
+       ];
+       testHaskellDepends = [
+         base directory filepath hspec text text-metrics
+       ];
+       description = "Infer software license from a given license file";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "infer-upstream" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, github, optparse-applicative
      , parsec, process, text
@@ -116409,8 +116704,8 @@ self: {
     ({ mkDerivation, base, inj }:
      mkDerivation {
        pname = "inj-base";
-       version = "0.1.0.0";
-       sha256 = "1mxpx2lw7vxjr3mynxx90a49qavsmkf71afqshd2h4xz1kxnjnjh";
+       version = "0.2.0.0";
+       sha256 = "1cvhk4ww55nd85rwhaagaz2fihcakrqxy9r37jdp3jghaybk9p9d";
        libraryHaskellDepends = [ base inj ];
        description = "'Inj' instances for 'base'";
        license = stdenv.lib.licenses.bsd3;
@@ -116550,8 +116845,8 @@ self: {
      }:
      mkDerivation {
        pname = "inline-java";
-       version = "0.8.3";
-       sha256 = "01xg2ml1khdns5w30n83ibl3k0lc2ym7n0dgvkxgy17b5m8r6kbb";
+       version = "0.8.4";
+       sha256 = "1ddgwhk40g23lc71f8wbbfck9pqymil0syi14wsawc25sx6zb52v";
        libraryHaskellDepends = [
          base bytestring Cabal directory filepath ghc jni jvm language-java
          mtl process template-haskell temporary text
@@ -117380,8 +117675,8 @@ self: {
      }:
      mkDerivation {
        pname = "intrinsic-superclasses";
-       version = "0.3.0.0";
-       sha256 = "18xvpdip1zdgylqcngvk8hz6dsnl3bp681pc31nb562vg2crqzz6";
+       version = "0.4.0.0";
+       sha256 = "1lnb1sp77fdszz3d4qxgyynla037vn2a4c9wkv2fjjaghbsb1csi";
        libraryHaskellDepends = [
          base containers haskell-src-meta mtl template-haskell
        ];
@@ -117482,17 +117777,15 @@ self: {
 
   "invariant" = callPackage
     ({ mkDerivation, array, base, bifunctors, comonad, containers
-     , contravariant, ghc-prim, hspec, profunctors, QuickCheck
-     , semigroups, StateVar, stm, tagged, template-haskell
+     , contravariant, ghc-prim, hspec, hspec-discover, profunctors
+     , QuickCheck, semigroups, StateVar, stm, tagged, template-haskell
      , th-abstraction, transformers, transformers-compat
      , unordered-containers
      }:
      mkDerivation {
        pname = "invariant";
-       version = "0.5";
-       sha256 = "1zz9a5irmpma5qchvvp7qin1s7cfnhvpg3b452xxysgbxvmcmfw0";
-       revision = "2";
-       editedCabalFile = "01n0v2qmbyd44z3wvha6vmbf1nr3bar205nk1r8hsq9jsmrfzaj1";
+       version = "0.5.1";
+       sha256 = "0aqj7z55632qdg45074kgn9qfdxzb0a2f8lgjzr0l0i4mm2rr37b";
        libraryHaskellDepends = [
          array base bifunctors comonad containers contravariant ghc-prim
          profunctors semigroups StateVar stm tagged template-haskell
@@ -117500,6 +117793,7 @@ self: {
          unordered-containers
        ];
        testHaskellDepends = [ base hspec QuickCheck template-haskell ];
+       testToolDepends = [ hspec-discover ];
        description = "Haskell98 invariant functors";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -118922,8 +119216,8 @@ self: {
      }:
      mkDerivation {
        pname = "ivory";
-       version = "0.1.0.7";
-       sha256 = "1qf0kp863ivb57mrc27kh1vm5a7ikfiz1hk32pm3jq8h7i2znh1s";
+       version = "0.1.0.8";
+       sha256 = "0nwn5h1fnnh9a6fkznscix50yvzqpw50hai7rslfzgizpbnzckrk";
        libraryHaskellDepends = [
          array base base-compat containers dlist filepath monadLib pretty
          template-haskell text th-abstraction th-lift
@@ -118957,8 +119251,8 @@ self: {
      }:
      mkDerivation {
        pname = "ivory-backend-c";
-       version = "0.1.0.7";
-       sha256 = "1xj492gzlypwd66w71mz4ndvl27vx2c712nz61myp3i4lx4rnpay";
+       version = "0.1.0.8";
+       sha256 = "1zp5kddiczkb85ac7y6wn145bzx3hpvzzhincgq8f1ykcr23miz9";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-compat bytestring containers directory filepath ivory
@@ -119035,8 +119329,8 @@ self: {
     ({ mkDerivation, base, filepath, ivory, ivory-artifact }:
      mkDerivation {
        pname = "ivory-hw";
-       version = "0.1.0.5";
-       sha256 = "0h21r9ij3n49b0m3dcjx22vyxc68v4jifl6yv1wpyn1hgrzxlyck";
+       version = "0.1.0.6";
+       sha256 = "0az65nj7pl32gyffv2z2vmcgm36cm740y765n4r7389drls5lj5d";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        description = "Ivory hardware model (STM32F4)";
@@ -119923,8 +120217,8 @@ self: {
      }:
      mkDerivation {
        pname = "jni";
-       version = "0.6.0";
-       sha256 = "04phf6sqfp8g9rqfj2lxg2j43350wlini1dnsjwyr6yvy888z9ba";
+       version = "0.6.1";
+       sha256 = "1z71vp8qskymgd4bjv8wxxjn34n49m28vnph0p0wbxgpz2wpn4hz";
        libraryHaskellDepends = [
          base bytestring choice constraints containers deepseq inline-c
          singletons
@@ -120017,6 +120311,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "jord" = callPackage
+    ({ mkDerivation, base, haskeline, hspec, HUnit }:
+     mkDerivation {
+       pname = "jord";
+       version = "0.2.0.0";
+       sha256 = "0akf6jjijwgn4jsvlzvj7mh9fx9wx0p05gf7bara6hiqj58y6k65";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base haskeline ];
+       testHaskellDepends = [ base hspec HUnit ];
+       description = "Geographical Position Calculations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "jort" = callPackage
     ({ mkDerivation, array, base, gtk }:
      mkDerivation {
@@ -120578,8 +120887,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-feed";
-       version = "1.0.2";
-       sha256 = "1485c4rljprf09nn8hd5fdpipjzpcylgmzz3ckw4nna5fhyx2n40";
+       version = "1.0.3";
+       sha256 = "08y6w4sad6f0f5gs3znw9yfp51cskw9q81xq5q70g6glq14lph50";
        libraryHaskellDepends = [
          aeson base bytestring mime-types network-uri tagsoup text time
        ];
@@ -120959,6 +121268,7 @@ self: {
          aeson aeson-pretty base bytestring containers hspec hspec-core
          hspec-discover hspec-expectations microlens mtl time
        ];
+       testToolDepends = [ hspec-discover ];
        description = "A polymorphic, type-safe, json-structured tracing library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121467,6 +121777,7 @@ self: {
          hspec-expectations-pretty-diff mtl QuickCheck tasty tasty-discover
          tasty-hspec tasty-quickcheck template-haskell text vector
        ];
+       testToolDepends = [ tasty-discover ];
        benchmarkHaskellDepends = [
          attoparsec base binary bytestring containers criterion
          data-binary-ieee754 deepseq deriving-compat mtl template-haskell
@@ -121609,6 +121920,7 @@ self: {
        testHaskellDepends = [
          base bytestring cereal hspec hspec-discover QuickCheck time
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Low-level Haskell client library for Apache Kafka 0.7.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -122343,18 +122655,26 @@ self: {
      }) {};
 
   "keccak" = callPackage
-    ({ mkDerivation, base, base16-bytestring, bytestring, HUnit
-     , QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
+    ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite
+     , gauge, HUnit, memory, parsec, QuickCheck, quickcheck-instances
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text
      }:
      mkDerivation {
        pname = "keccak";
-       version = "0.1.0";
-       sha256 = "1z3daxxpqj0pwv6ln7kils7aqqmcp8m438x9z3xay5szr8l1i8sz";
+       version = "0.1.2";
+       sha256 = "0jrnx5w2nxxc47lmw71c57cqja3mynx8j3fr89rjwby6mym5yw4g";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
+       executableHaskellDepends = [ base base16-bytestring bytestring ];
        testHaskellDepends = [
-         base base16-bytestring bytestring HUnit QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2
+         base base16-bytestring bytestring cryptonite HUnit memory parsec
+         QuickCheck quickcheck-instances test-framework test-framework-hunit
+         test-framework-quickcheck2 text
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring cryptonite gauge memory
        ];
        description = "haskell keccak functions";
        license = stdenv.lib.licenses.mit;
@@ -123634,8 +123954,8 @@ self: {
     ({ mkDerivation, base, hspec, servant, servant-foreign, text }:
      mkDerivation {
        pname = "lackey";
-       version = "1.0.4";
-       sha256 = "1x0jrsk9jp7k0l6xz7nxrcdkglld1ab21kh6w1a253zklpwd3vz1";
+       version = "1.0.5";
+       sha256 = "0ixiqppj7sdkbhp2i6nr4xch82j4r6gxwwn0rvbb0x6wzikkdrf3";
        libraryHaskellDepends = [ base servant servant-foreign text ];
        testHaskellDepends = [ base hspec servant servant-foreign text ];
        description = "Generate Ruby clients from Servant APIs";
@@ -124470,17 +124790,17 @@ self: {
   "language-ats" = callPackage
     ({ mkDerivation, alex, ansi-wl-pprint, array, base
      , composition-prelude, containers, cpphs, criterion, deepseq, happy
-     , hspec, hspec-dirstream, micro-recursion-schemes, microlens
-     , microlens-th, system-filepath, transformers
+     , hspec, hspec-dirstream, microlens, recursion-schemes
+     , system-filepath, transformers
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.2.0.11";
-       sha256 = "1kz30k8fdmnrx5zcyy3kpvr81p50m7bwsxgp5qqjrhk2i1a1igfp";
+       version = "1.2.0.14";
+       sha256 = "13nafbk4h8z3vx12i6zs250795c3ipsgxq83bhgha2w0wjr49d18";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
-         micro-recursion-schemes microlens microlens-th transformers
+         microlens recursion-schemes transformers
        ];
        libraryToolDepends = [ alex cpphs happy ];
        testHaskellDepends = [
@@ -124674,8 +124994,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-docker";
-       version = "6.0.3";
-       sha256 = "0rp94hgbh2knz8xn146shgaw0qp6lnp0skxzknsi0l6d3xzzr7qr";
+       version = "6.0.4";
+       sha256 = "1brlqlxa1h7iv2p17h4nb6ly7nr4dr9j815z3yiz0gbj91bgj4c1";
        libraryHaskellDepends = [
          base bytestring containers free megaparsec mtl prettyprinter split
          template-haskell text th-lift time
@@ -125247,51 +125567,6 @@ self: {
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.3.19";
-       sha256 = "1g6b6dmjx1nk29r55qccvk6csbjig2yc493bmq0dlnqgbn0aiimp";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
-         case-insensitive containers cryptonite directory exceptions
-         filecache filepath formatting hashable hruby hslogger hspec
-         http-api-data http-client lens lens-aeson megaparsec memory mtl
-         operational parsec pcre-utils process protolude random
-         regex-pcre-builtin scientific servant servant-client split stm
-         strict-base-types text time transformers unix unordered-containers
-         vector yaml
-       ];
-       executableHaskellDepends = [
-         aeson ansi-wl-pprint base bytestring containers Glob hslogger
-         http-client lens megaparsec mtl optparse-applicative parallel-io
-         regex-pcre-builtin strict-base-types text transformers
-         unordered-containers vector yaml
-       ];
-       testHaskellDepends = [
-         base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl
-         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;
-       hydraPlatforms = [ "x86_64-linux" ];
-     }) {};
-
-  "language-puppet_1_3_19_1" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
-     , base16-bytestring, bytestring, case-insensitive, containers
-     , cryptonite, directory, exceptions, filecache, filepath
-     , formatting, Glob, hashable, hruby, hslogger, hspec
-     , hspec-megaparsec, http-api-data, http-client, lens, lens-aeson
-     , megaparsec, memory, mtl, operational, optparse-applicative
-     , parallel-io, parsec, pcre-utils, process, protolude, random
-     , regex-pcre-builtin, scientific, servant, servant-client, split
-     , stm, strict-base-types, temporary, text, time, transformers, unix
-     , unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "language-puppet";
        version = "1.3.19.1";
        sha256 = "0f1g9sq3ysyjyps8p68wxh1rmjb3v7iw9gmj8zd7wb5kyjlc4xph";
        isLibrary = true;
@@ -125320,7 +125595,7 @@ self: {
        ];
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
   "language-python" = callPackage
@@ -125517,6 +125792,7 @@ self: {
          ansi-wl-pprint base containers hspec hspec-discover megaparsec
          QuickCheck scientific semigroups text transformers
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Parser and pretty printer for the Thrift IDL format";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125811,6 +126087,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "latex-live-snippets" = callPackage
+    ({ mkDerivation, base, directory, filepath, lens, MissingH }:
+     mkDerivation {
+       pname = "latex-live-snippets";
+       version = "0.1.0.0";
+       sha256 = "0nvw0lf2fdr437ddfdlgba1dh6l50pksgl81zkhg65j0zp9fjp6s";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base directory filepath lens MissingH
+       ];
+       description = "Automatically inline Haskell snippets into LaTeX documents";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lattices" = callPackage
     ({ mkDerivation, base, base-compat, containers, deepseq, hashable
      , QuickCheck, quickcheck-instances, semigroupoids, tagged, tasty
@@ -127034,8 +127325,8 @@ self: {
     ({ mkDerivation, base, mtl, template-haskell }:
      mkDerivation {
        pname = "lenses";
-       version = "0.1.7";
-       sha256 = "09p1ph5ih2dzrbn7h9wjnf4xch04g0amf8cc3q64g5a2clg3vjx4";
+       version = "0.1.8";
+       sha256 = "1wwl0f1f1scflnbjgqcinkpvpvhn21942bfbg8vlimdap6i5d49h";
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Simple Functional Lenses";
        license = stdenv.lib.licenses.bsd3;
@@ -127730,8 +128021,8 @@ self: {
     ({ mkDerivation, base, bytestring, glib, gtk, libnotify }:
      mkDerivation {
        pname = "libnotify";
-       version = "0.2";
-       sha256 = "0nazjlilbz3l32fn11shwxjlabvd2kfpxa7vnirpfp1y6k406mk6";
+       version = "0.2.1";
+       sha256 = "0a55lmalnn840zbryva19k3z4y79fq2q2qjl88wii3im53x0mzmy";
        libraryHaskellDepends = [ base bytestring glib gtk ];
        librarySystemDepends = [ libnotify ];
        description = "Bindings to libnotify library";
@@ -130812,6 +131103,7 @@ self: {
          base markdown-unlit microlens monad-control mtl o-clock text
          universum yaml
        ];
+       executableToolDepends = [ markdown-unlit ];
        testHaskellDepends = [
          async base data-default directory filepath hspec HUnit
          microlens-mtl QuickCheck universum unordered-containers
@@ -133652,8 +133944,8 @@ self: {
      }:
      mkDerivation {
        pname = "mandrill";
-       version = "0.5.3.3";
-       sha256 = "0hhyif8lqq16i25bvpz7z54n2rmnq9q198pjdm4vssh02597lnn8";
+       version = "0.5.3.4";
+       sha256 = "0gaz5drb8wvlr12ynwag4rcgmsyzd713j0qgpv9ydy3jlk65nrf7";
        libraryHaskellDepends = [
          aeson base base64-bytestring blaze-html bytestring containers
          email-validate http-client http-client-tls http-types lens mtl
@@ -134414,6 +134706,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "math-functions_0_3_0_1" = callPackage
+    ({ mkDerivation, base, data-default-class, deepseq, erf, HUnit
+     , primitive, QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, vector, vector-th-unbox
+     }:
+     mkDerivation {
+       pname = "math-functions";
+       version = "0.3.0.1";
+       sha256 = "1nrslskbgsy9yx0kzc5a0jdahch218qd16343j001pdxkygq21b2";
+       libraryHaskellDepends = [
+         base data-default-class deepseq primitive vector vector-th-unbox
+       ];
+       testHaskellDepends = [
+         base data-default-class deepseq erf HUnit primitive QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2
+         vector vector-th-unbox
+       ];
+       description = "Collection of tools for numeric computations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mathblog" = callPackage
     ({ mkDerivation, base, bytestring, ConfigFile, containers
      , data-default, deepseq, directory, either, filepath, fsnotify
@@ -135489,25 +135803,6 @@ self: {
      }:
      mkDerivation {
        pname = "mega-sdist";
-       version = "0.3.3";
-       sha256 = "0vwk3fq34f8nnviw7fxpyqx365v4khvjr45pzgxsgc7rfx7hcw9c";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base bytestring conduit conduit-extra http-conduit optparse-simple
-         rio rio-orphans tar-conduit yaml
-       ];
-       description = "Handles uploading to Hackage from mega repos";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mega-sdist_0_3_3_1" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, conduit-extra
-     , http-conduit, optparse-simple, rio, rio-orphans, tar-conduit
-     , yaml
-     }:
-     mkDerivation {
-       pname = "mega-sdist";
        version = "0.3.3.1";
        sha256 = "0p4n5m91i80cns1g5n18bczpyxm8jcc205syr3k8xd7x9gwg69ww";
        isLibrary = false;
@@ -135518,7 +135813,6 @@ self: {
        ];
        description = "Handles uploading to Hackage from mega repos";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "megaparsec" = callPackage
@@ -135940,8 +136234,8 @@ self: {
        pname = "menoh";
        version = "0.1.1";
        sha256 = "0cbkhafibm65yn4222kfy8j6zkw6q6k3962hwjhbvp2n57avh789";
-       revision = "1";
-       editedCabalFile = "1mbn1aq24dvaa1amwypik69dmg1x8mm1dz1h4kadzvljc4ld870i";
+       revision = "2";
+       editedCabalFile = "1hfgg9n86cp3qa9ziycx2134zsvsn76ilkmwrqnc7yb50279dw1b";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -136444,43 +136738,6 @@ self: {
      }:
      mkDerivation {
        pname = "microformats2-parser";
-       version = "1.0.1.8";
-       sha256 = "0hb5i60w369lngfw5a3bai5zvlgchcf1vvxshp9md77lyl7h49ar";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-qq attoparsec base base-compat blaze-markup bytestring
-         containers data-default either errors html-conduit lens-aeson
-         network-uri pcre-heavy safe tagsoup text time transformers
-         unordered-containers vector xml-lens xss-sanitize
-       ];
-       executableHaskellDepends = [
-         aeson aeson-pretty base base-compat blaze-html blaze-markup
-         data-default network network-uri options scotty text wai-cli
-         wai-extra
-       ];
-       testHaskellDepends = [
-         aeson-qq base base-compat bytestring data-default hspec
-         hspec-expectations-pretty-diff html-conduit mtl network-uri
-         raw-strings-qq template-haskell text time xml-lens
-       ];
-       description = "A Microformats 2 parser";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "microformats2-parser_1_0_1_9" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base
-     , base-compat, blaze-html, blaze-markup, bytestring, containers
-     , data-default, either, errors, hspec
-     , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl
-     , network, network-uri, options, pcre-heavy, raw-strings-qq, safe
-     , scotty, tagsoup, template-haskell, text, time, transformers
-     , unordered-containers, vector, wai-cli, wai-extra, xml-lens
-     , xss-sanitize
-     }:
-     mkDerivation {
-       pname = "microformats2-parser";
        version = "1.0.1.9";
        sha256 = "1lxbw825yg16nmflf93l1sy6mxa3dnd7a5mdalc034brsnf1vish";
        isLibrary = true;
@@ -137768,8 +138025,8 @@ self: {
        pname = "mmark";
        version = "0.0.5.6";
        sha256 = "0d0jxxj0b1jy9mym6389dmm6biiw8kzdh06zj2j0gsjczn2n60zw";
-       revision = "4";
-       editedCabalFile = "0jc342mpqp1s6s9al7dyky54wpvbx6a1jl8yljmwgmhafrbg1kdk";
+       revision = "5";
+       editedCabalFile = "1m4l42g519hnzjaafsnbjcfr0nrf28x1lmc1kjh5swrg6qd3kf29";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base case-insensitive containers data-default-class deepseq
@@ -139860,6 +140117,8 @@ self: {
        pname = "monoid-extras";
        version = "0.5";
        sha256 = "172d1mfns7agd619rlbb1i9kw2y26kjvivkva06k1r14bar1lmy6";
+       revision = "1";
+       editedCabalFile = "12dq0flvkw8lqbga3wsygcmkzwc9f16kmq31wh79alybzynz36qw";
        libraryHaskellDepends = [ base groups semigroupoids semigroups ];
        benchmarkHaskellDepends = [ base criterion semigroups ];
        description = "Various extra monoid-related definitions and utilities";
@@ -140307,6 +140566,7 @@ self: {
        testHaskellDepends = [
          base hspec hspec-discover motor motor-reflection text
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Generate state diagrams from Motor FSM typeclasses";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140324,6 +140584,7 @@ self: {
        testHaskellDepends = [
          base hspec hspec-discover indexed motor row-types
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Reflect on Motor FSM typeclasses to obtain runtime representations";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142236,6 +142497,8 @@ self: {
        pname = "mwc-probability";
        version = "2.0.4";
        sha256 = "0msi72qp5aps3n4ji565r4rzyjg7svwilsh8lch59y2b4q7fvscz";
+       revision = "1";
+       editedCabalFile = "1b4wbxkxx0szjgzgn5jc1qap80zx6ispxrd51yxs4z7llv15w5k6";
        libraryHaskellDepends = [ base mwc-random primitive transformers ];
        description = "Sampling function-based probability distributions";
        license = stdenv.lib.licenses.mit;
@@ -142274,6 +142537,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mwc-random_0_14_0_0" = callPackage
+    ({ mkDerivation, base, math-functions, primitive, time, vector }:
+     mkDerivation {
+       pname = "mwc-random";
+       version = "0.14.0.0";
+       sha256 = "18pg24sw3b79b32cwx8q01q4k0lm34mwr3l6cdkchl8alvd0wdq0";
+       libraryHaskellDepends = [
+         base math-functions primitive time vector
+       ];
+       doCheck = false;
+       description = "Fast, high quality pseudo random number generation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mwc-random-accelerate" = callPackage
     ({ mkDerivation, accelerate, base, mwc-random }:
      mkDerivation {
@@ -142926,6 +143204,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "named_0_2_0_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "named";
+       version = "0.2.0.0";
+       sha256 = "17ldvxypf099wj5phzh2aymzfwmyiyzhz24h1aj2s21nrys5n6n0";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       description = "Named parameters (keyword arguments) for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "named-formlet" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers, mtl
      , text, transformers
@@ -144755,6 +145046,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-messagepack-rpc" = callPackage
+    ({ mkDerivation, base, bytestring, data-msgpack, safe-exceptions
+     , text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "network-messagepack-rpc";
+       version = "0.1.0.0";
+       sha256 = "0yqisywmhl0y6f88ifpkv8dlldg5s2c2h8z8cv6mhhqj4qdzp1h3";
+       libraryHaskellDepends = [
+         base bytestring data-msgpack safe-exceptions text
+         unordered-containers
+       ];
+       description = "MessagePack RPC";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "network-messagepack-rpc-websocket" = callPackage
+    ({ mkDerivation, async, base, bytestring, data-msgpack, envy, hspec
+     , network-messagepack-rpc, QuickCheck, skews, text, websockets
+     , wss-client
+     }:
+     mkDerivation {
+       pname = "network-messagepack-rpc-websocket";
+       version = "0.1.0.0";
+       sha256 = "1q7ckch5z08wxrdsv62z07ivdihqvmcwfg2pgcbf66dhgc9bq4f6";
+       libraryHaskellDepends = [
+         base network-messagepack-rpc text websockets wss-client
+       ];
+       testHaskellDepends = [
+         async base bytestring data-msgpack envy hspec
+         network-messagepack-rpc QuickCheck skews text wss-client
+       ];
+       description = "WebSocket backend for MessagePack RPC";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "network-metrics" = callPackage
     ({ mkDerivation, base, binary, bytestring, data-default, network
      , random, time
@@ -147393,6 +147720,7 @@ self: {
          template-haskell text time time-locale-compat transformers
          transformers-base unliftio unliftio-core utf8-string
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -147415,6 +147743,7 @@ self: {
        testHaskellDepends = [
          base hspec hspec-discover nvim-hs QuickCheck
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -147521,6 +147850,7 @@ self: {
          base doctest Glob hedgehog markdown-unlit tasty tasty-hedgehog
          tasty-hspec type-spec
        ];
+       testToolDepends = [ doctest markdown-unlit ];
        benchmarkHaskellDepends = [ base deepseq gauge tiempo time-units ];
        description = "Type-safe time library";
        license = stdenv.lib.licenses.mit;
@@ -148379,6 +148709,8 @@ self: {
        pname = "one-liner";
        version = "1.0";
        sha256 = "1diigbl8l0m8q1sl0kxjjqbhl3vkpf0rrzxlbqaamp3ahpmgpx67";
+       revision = "1";
+       editedCabalFile = "1ijc5mj93zyfj7hh12aw3xh30kc1xsp7wf6rbbfal36yllnl2xhs";
        libraryHaskellDepends = [
          base bifunctors contravariant ghc-prim profunctors tagged
          transformers
@@ -148531,6 +148863,7 @@ self: {
          multiset postgresql-simple product-profunctors profunctors
          QuickCheck semigroups text time transformers
        ];
+       testToolDepends = [ hspec-discover ];
        description = "An SQL-generating DSL targeting PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150871,6 +151204,55 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "pandoc_2_2_2" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
+     , binary, blaze-html, blaze-markup, bytestring, Cabal
+     , case-insensitive, cmark-gfm, containers, criterion, data-default
+     , deepseq, Diff, directory, doctemplates, exceptions
+     , executable-path, filepath, Glob, haddock-library, hslua
+     , hslua-module-text, HsYAML, HTTP, http-client, http-client-tls
+     , http-types, JuicyPixels, mtl, network, network-uri, pandoc-types
+     , parsec, process, QuickCheck, random, safe, SHA, skylighting
+     , split, syb, tagsoup, tasty, tasty-golden, tasty-hunit
+     , tasty-quickcheck, temporary, texmath, text, time, unix
+     , unordered-containers, vector, weigh, xml, zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "pandoc";
+       version = "2.2.2";
+       sha256 = "0rbr6mjm7kfzxrjbglqj6bgz1l1zlbiiff3pi59nhqava3nindqc";
+       configureFlags = [ "-fhttps" "-f-trypandoc" ];
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         aeson aeson-pretty base base64-bytestring binary blaze-html
+         blaze-markup bytestring case-insensitive cmark-gfm containers
+         data-default deepseq directory doctemplates exceptions filepath
+         Glob haddock-library hslua hslua-module-text HsYAML HTTP
+         http-client http-client-tls http-types JuicyPixels mtl network
+         network-uri pandoc-types parsec process random safe SHA skylighting
+         split syb tagsoup temporary texmath text time unix
+         unordered-containers vector xml zip-archive zlib
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base base64-bytestring bytestring containers Diff directory
+         executable-path filepath Glob hslua pandoc-types process QuickCheck
+         tasty tasty-golden tasty-hunit tasty-quickcheck temporary text time
+         xml zip-archive
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion mtl text time weigh
+       ];
+       doCheck = false;
+       description = "Conversion between markup formats";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "pandoc-citeproc" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , Cabal, containers, data-default, directory, filepath, hs-bibutils
@@ -150994,6 +151376,7 @@ self: {
          base pandoc-types tasty tasty-discover tasty-hspec tasty-hunit
          unordered-containers
        ];
+       testToolDepends = [ tasty-discover ];
        description = "A Pandoc filter for emphasizing code in fenced blocks";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -151129,6 +151512,7 @@ self: {
        testHaskellDepends = [
          base hspec hspec-discover mtl pandoc-types SHA utf8-string
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Render and insert PlantUML diagrams with Pandoc";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -151828,14 +152212,12 @@ self: {
      }) {};
 
   "parallel" = callPackage
-    ({ mkDerivation, array, base, containers, deepseq }:
+    ({ mkDerivation, array, base, containers, deepseq, ghc-prim }:
      mkDerivation {
        pname = "parallel";
-       version = "3.2.1.1";
-       sha256 = "05rw8zhpqhx31zi6vg7zpyciaarh24j7g2p613xrpyrnksybjfrj";
-       revision = "1";
-       editedCabalFile = "12sgigg7r4nmyhbfn1p09ajf4s576yca31b7daj5zpp1mxgb5x7i";
-       libraryHaskellDepends = [ array base containers deepseq ];
+       version = "3.2.2.0";
+       sha256 = "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p";
+       libraryHaskellDepends = [ array base containers deepseq ghc-prim ];
        description = "Parallel programming library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -152715,6 +153097,8 @@ self: {
        pname = "passman-core";
        version = "0.2.0.0";
        sha256 = "03l43n8r0jdxbc07qjdazkanzd7lj1kp814ylhvn0ri9zzyfcgm7";
+       revision = "1";
+       editedCabalFile = "1840hm9wiym9jlgij1b2d8fa90pdscg2rqhzhvrl7qawd3jjxq5x";
        libraryHaskellDepends = [
          aeson base bcrypt bytestring conduit conduit-extra containers
          cryptohash-md5 csv-conduit data-ordlist directory filepath int-cast
@@ -155131,6 +155515,7 @@ self: {
          base bytestring exceptions hspec hspec-discover postgresql-simple
          tmp-postgres
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Another postgresql-simple transaction monad";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155869,6 +156254,7 @@ self: {
          base bytestring containers hspec hspec-discover QuickCheck
          semigroups text unordered-containers vector
        ];
+       testToolDepends = [ hspec-discover ];
        description = "An alternative implementation of Thrift for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -156806,8 +157192,8 @@ self: {
        pname = "pipes-random";
        version = "1.0.0.4";
        sha256 = "17k510v2f5ziysqh7sknyw3rgxf8iblw800z3hh8gymaszkhfajl";
-       revision = "1";
-       editedCabalFile = "0m32wz3rwxx9gdcl1chk64yspyd1ls13z03zcgjcn865mpbhz97h";
+       revision = "2";
+       editedCabalFile = "0czw2qfi05d5kbnwzhzr75j1ag6hfbn9nvbjyifdjradfzjxl2s9";
        libraryHaskellDepends = [ base mwc-random pipes vector ];
        description = "Producers for handling randomness";
        license = stdenv.lib.licenses.bsd3;
@@ -157922,6 +158308,7 @@ self: {
          AC-Vector base hspec markdown-unlit QuickCheck random
          random-shuffle
        ];
+       testToolDepends = [ markdown-unlit ];
        description = "Point octree, with bounding boxes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -157999,22 +158386,16 @@ self: {
      }:
      mkDerivation {
        pname = "pointfree-fancy";
-       version = "1.1.1.7";
-       sha256 = "1xw2p96ghclfxmc12kwxyh25r5k9k6h3zriaf38wz5d3j36npa7w";
-       revision = "1";
-       editedCabalFile = "0mdanymbifnxc85z3aixmn5v08kxa1fjazadrhc0jjf5y110sxc2";
+       version = "1.1.1.8";
+       sha256 = "16n1yzjnfhwkdps8lcjhpnrmbbrvw2n6qsi90vzjxswkwsvp4hi3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          array base containers haskell-src-exts transformers
        ];
-       executableHaskellDepends = [
-         array base containers haskell-src-exts transformers
-       ];
-       testHaskellDepends = [
-         array base containers haskell-src-exts HUnit QuickCheck
-         transformers
-       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base HUnit QuickCheck ];
+       doHaddock = false;
        description = "Tool for refactoring expressions into pointfree form";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -158436,8 +158817,8 @@ self: {
        pname = "polyvariadic";
        version = "0.3.0.3";
        sha256 = "0zf7znslayjmcnajmsymc79f0lyyk7ph9zfczq78inirg0hv7hq1";
-       revision = "1";
-       editedCabalFile = "11jrr3xbkc828564sg3cc6ca1qaibbp43lbyrgi32kjy5l97w7y0";
+       revision = "2";
+       editedCabalFile = "0bcckgz6v7707rdgipaahqws6gkcmmrq5wyl407awb3fssnqxfkn";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base ];
        description = "Creation and application of polyvariadic functions";
@@ -158718,6 +159099,7 @@ self: {
          array base bytestring cairo containers glib gtk mtl
        ];
        libraryPkgconfigDepends = [ gdk_pixbuf gtk2 pango poppler ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the Poppler";
        license = stdenv.lib.licenses.gpl2;
      }) {inherit (pkgs) gdk_pixbuf; gtk2 = pkgs.gnome2.gtk; 
@@ -159459,6 +159841,7 @@ self: {
          pg-transact postgresql-simple random split stm text time
          transformers
        ];
+       testToolDepends = [ hspec-discover ];
        description = "A PostgreSQL backed queue";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159754,8 +160137,8 @@ self: {
     ({ mkDerivation, potoki-core }:
      mkDerivation {
        pname = "potoki";
-       version = "2.0.1.1";
-       sha256 = "1mn3wqk0n4ny8b0m891ndqswxr9zafl4hvb20i12q1d6mxirczlf";
+       version = "2.0.2";
+       sha256 = "00z7al5kk3ry3npghc71vlwba5wmxrlps3lmwllpw8sgf8x288r5";
        libraryHaskellDepends = [ potoki-core ];
        description = "Simple streaming in IO";
        license = stdenv.lib.licenses.mit;
@@ -159768,8 +160151,8 @@ self: {
      }:
      mkDerivation {
        pname = "potoki-cereal";
-       version = "0.2.1.1";
-       sha256 = "19rd5ykifa7bv32cyxp8hi942sl7xwav0cqhygp6kngw3vsrsnv8";
+       version = "0.3";
+       sha256 = "0m7g9dkvzb94iwywf3bil8h57xbs2d3zvgn4d8la54qz5izimszp";
        libraryHaskellDepends = [
          acquire attoparsec base base-prelude bytestring cereal potoki-core
          text
@@ -159788,8 +160171,8 @@ self: {
      }:
      mkDerivation {
        pname = "potoki-core";
-       version = "2.2.1.1";
-       sha256 = "18szi60ngxj69y5xpiwfhvp51ggb81kv6kphd3ghjjai7as42nmk";
+       version = "2.2.2.1";
+       sha256 = "0bnmqw0jk8p7bfhy165w5ha3pl0966z5bxzfacbyiqvhmj68xx6j";
        libraryHaskellDepends = [
          acquire attoparsec base bytestring directory foldl hashable
          profunctors ptr stm text transformers unagi-chan
@@ -159992,6 +160375,7 @@ self: {
          base boxes containers HUnit markdown-unlit QuickCheck tasty
          tasty-hunit tasty-quickcheck vector
        ];
+       testToolDepends = [ markdown-unlit ];
        description = "Pretty Print containers in a tabular format";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -160712,25 +161096,6 @@ self: {
      }:
      mkDerivation {
        pname = "pretty-simple";
-       version = "2.1.0.0";
-       sha256 = "1jiq9l2zlgk3yzy6mif84fdzvwx3vzzbsh9zvwdph12zxa2y4b68";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal base containers mtl parsec text transformers
-       ];
-       testHaskellDepends = [ base doctest Glob ];
-       benchmarkHaskellDepends = [ base criterion ];
-       description = "pretty printer for data types with a 'Show' instance";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pretty-simple_2_1_0_1" = callPackage
-    ({ mkDerivation, ansi-terminal, base, containers, criterion
-     , doctest, Glob, mtl, parsec, text, transformers
-     }:
-     mkDerivation {
-       pname = "pretty-simple";
        version = "2.1.0.1";
        sha256 = "1lfkbjpcgyiv915xvhpirhx8x7ng1jgrlxd6zlilcvnpkkm2xacs";
        isLibrary = true;
@@ -160742,7 +161107,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "pretty printer for data types with a 'Show' instance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pretty-sop" = callPackage
@@ -161107,6 +161471,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "primitive-extras" = callPackage
+    ({ mkDerivation, base, cereal, deferred-folds, foldl, primitive
+     , profunctors, vector
+     }:
+     mkDerivation {
+       pname = "primitive-extras";
+       version = "0.3";
+       sha256 = "1az9933jkf3891l6svzvg1fhprmcnjj1bklr0rglrljlj8m01laz";
+       libraryHaskellDepends = [
+         base cereal deferred-folds foldl primitive profunctors vector
+       ];
+       description = "Extras for the \"primitive\" library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "primitive-indexed" = callPackage
     ({ mkDerivation, base, doctest, primitive, QuickCheck }:
      mkDerivation {
@@ -161457,14 +161836,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "process_1_6_3_0" = callPackage
+  "process_1_6_4_0" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, directory, filepath
      , unix
      }:
      mkDerivation {
        pname = "process";
-       version = "1.6.3.0";
-       sha256 = "0lxkl0gmyy2sn3r9c7dyz8vz1cm6nvygmgrizilliir5bp42m8cc";
+       version = "1.6.4.0";
+       sha256 = "1w12ssmwpz5glmm964rxdc3fgi2w5sq9lac17rxs8p626r5p6rkn";
        libraryHaskellDepends = [ base deepseq directory filepath unix ];
        testHaskellDepends = [ base bytestring directory ];
        description = "Process libraries";
@@ -162973,8 +163352,8 @@ self: {
        pname = "pseudo-boolean";
        version = "0.1.6.0";
        sha256 = "1v28vbhcrx0mvciazlanwyaxwav0gfjc7sxz7adgims7mj64g1ra";
-       revision = "1";
-       editedCabalFile = "11n7wcfpahbyg8lmq90vvq11fm2ls4761qf9q7pkbvd7vkm6by2n";
+       revision = "2";
+       editedCabalFile = "1wnp16zs9nx3b250cmh6j84scv821arc0grb8k08h0a3kphavqx1";
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder containers deepseq
          dlist hashable megaparsec parsec void
@@ -163082,6 +163461,7 @@ self: {
        sha256 = "12130fpdskml0mdgbr38zki48n5ffid0diiixyn89kzcq948vvmn";
        libraryHaskellDepends = [ base generic-deriving ];
        testHaskellDepends = [ base hspec hspec-discover ];
+       testToolDepends = [ hspec-discover ];
        description = "Bindings for the pthread library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163611,6 +163991,7 @@ self: {
          tasty tasty-hspec text time transformers transformers-base
          transformers-compat unordered-containers utf8-string vector
        ];
+       testToolDepends = [ hspec-discover ];
        doCheck = false;
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.bsd3;
@@ -165680,6 +166061,7 @@ self: {
          base bytestring hspec hspec-discover HUnit QuickCheck transformers
          vector
        ];
+       testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [
          base blaze-builder bytestring criterion pretty
        ];
@@ -165976,16 +166358,15 @@ self: {
      }:
      mkDerivation {
        pname = "raketka";
-       version = "1.1.1";
-       sha256 = "0whm7jzmcq30zg7rb29m50dyx6ikjk1xjxi74w8qsmjy2hyj3ph0";
-       revision = "1";
-       editedCabalFile = "1adyzp0wc4lajgbs4h6rgliw0qqs13bnq1rhzmqacwji39rx0qsz";
+       version = "1.1.2";
+       sha256 = "1zyqgldryci4cbwqcbjlkm4k1dfps36x4rk03pi9gf901zw0k38p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson async base binary conf-json containers distributed-process
-         distributed-process-simplelocalnet network network-transport
-         network-transport-tcp random stm tagged template-haskell
+         aeson async base binary bytestring conf-json containers
+         distributed-process distributed-process-simplelocalnet network
+         network-transport network-transport-tcp random stm tagged
+         template-haskell
        ];
        executableHaskellDepends = [
          aeson async base binary bytestring conf-json containers
@@ -166880,8 +167261,8 @@ self: {
      }:
      mkDerivation {
        pname = "ratel";
-       version = "1.0.4";
-       sha256 = "14ivx9hb7hjy0i7ybz92mcr800zzfspfldzw9jr6qpmrnv43nqdd";
+       version = "1.0.5";
+       sha256 = "0an55fbl8q7d0h4zlpx8vg4kijwmw99f2fvf50nq06c6snlfjg4r";
        libraryHaskellDepends = [
          aeson base bytestring case-insensitive containers http-client
          http-client-tls http-types text uuid
@@ -166900,8 +167281,8 @@ self: {
      }:
      mkDerivation {
        pname = "ratel-wai";
-       version = "1.0.2";
-       sha256 = "07hpsmv3c75r8lc9fpa2mn5xsz5xml5nadzlzq8dihbgv6ma4mss";
+       version = "1.0.3";
+       sha256 = "0bkk41qk0040a6sbsc5ky968gw1y5501ji7l2040hwz8j4z8wm84";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers http-client ratel wai
        ];
@@ -166938,8 +167319,8 @@ self: {
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "4.1.1";
-       sha256 = "1wwglqr84ijzrbsrid5cfhm96ljnfdj59z766wjbr8fx5gmrcdfw";
+       version = "4.1.2";
+       sha256 = "0zmacxdf1k5mnvmrrkkvgjghzr4h948z5g73lavhmfg56i6vpkb2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -169937,6 +170318,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-query_0_12_1_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.12.1.0";
+       sha256 = "1mdd3lh4kpqaa7l0aqnsnwgi95hbwh9p8dx61js8011wl50j9l9k";
+       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
@@ -169946,8 +170350,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query-HDBC";
-       version = "0.7.0.0";
-       sha256 = "1kzryjkfkg4f616ijyx28p72v9a45gpvjs7jpksb1by24ll9ly46";
+       version = "0.7.0.1";
+       sha256 = "0dlg4ykjh0yjr2c2vrxhss1z33myc0z86im6am8b7g64rjaxhpm0";
        libraryHaskellDepends = [
          base containers convertible dlist HDBC HDBC-session names-th
          persistable-record product-isomorphic relational-query
@@ -169961,7 +170365,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "relational-query-HDBC_0_7_0_1" = callPackage
+  "relational-query-HDBC_0_7_1_1" = callPackage
     ({ mkDerivation, base, containers, convertible, dlist, HDBC
      , HDBC-session, names-th, persistable-record, product-isomorphic
      , QuickCheck, quickcheck-simple, relational-query
@@ -169970,8 +170374,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query-HDBC";
-       version = "0.7.0.1";
-       sha256 = "0dlg4ykjh0yjr2c2vrxhss1z33myc0z86im6am8b7g64rjaxhpm0";
+       version = "0.7.1.1";
+       sha256 = "0lgzkqx4nhvwrrgdrr423d4yyadf6x8l664030l2xi4zrxjws2mk";
        libraryHaskellDepends = [
          base containers convertible dlist HDBC HDBC-session names-th
          persistable-record product-isomorphic relational-query
@@ -170744,6 +171148,7 @@ self: {
          hspec-discover ixset lens mtl old-locale parsec QuickCheck stm text
          time transformers transformers-base transformers-compat
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Blogging module using blaze html for markup";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172112,13 +172517,13 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "rhine_0_4_0_2" = callPackage
+  "rhine_0_4_0_3" = callPackage
     ({ mkDerivation, base, containers, dunai, free, time, transformers
      }:
      mkDerivation {
        pname = "rhine";
-       version = "0.4.0.2";
-       sha256 = "1lsa9sgfrxdwz1jgjd314n7g4a8q97gq990nqdsxrrq2bmvdhpv1";
+       version = "0.4.0.3";
+       sha256 = "1s88dga75c835ixw1j59chswiv512sdwwg09p0r5jgsl8lqjp6h7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -174669,8 +175074,8 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "salve";
-       version = "1.0.3";
-       sha256 = "1688sd4zrw8swb61svnjawaq7w85hgvh4ww7zz3yppl40sl82irj";
+       version = "1.0.4";
+       sha256 = "0q9z7smss3lf33lq982ghrq8dhv71cppc73zi61b22f0b076njvd";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "Semantic version numbers and constraints";
@@ -174826,6 +175231,8 @@ self: {
        pname = "sampling";
        version = "0.3.3";
        sha256 = "038fl0mdim3r25jsj8bgvnmkd7iy00hpwbc0yqwijsqyss9xrgn8";
+       revision = "1";
+       editedCabalFile = "168k8ykppa8pikfxy1gmby63kfzr833vswh8wcchz8li9vkd4w2h";
        libraryHaskellDepends = [
          base containers foldl mwc-random primitive vector
        ];
@@ -175669,6 +176076,7 @@ self: {
          regex-tdfa-text singletons smallcheck tagged text
          unordered-containers validationt vinyl
        ];
+       testToolDepends = [ hspec-discover ];
        description = "JSON-biased spec and validation tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176021,7 +176429,7 @@ self: {
          async base bytestring data-default-class directory hpc-coveralls
          hspec hspec-wai http-types lifted-base network text wai
        ];
-       testToolDepends = [ hspec-discover ];
+       testToolDepends = [ hpc-coveralls hspec-discover ];
        description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177179,16 +177587,16 @@ self: {
 
   "self-extract" = callPackage
     ({ mkDerivation, base, binary, bytestring, Cabal, extra, file-embed
-     , path, path-io, process, unix-compat, ztar
+     , path, path-io, unix-compat, ztar
      }:
      mkDerivation {
        pname = "self-extract";
-       version = "0.3.1";
-       sha256 = "01kzvjzb6rh86jzvh4n4802bvzgjz34rwmcrpm4aqzxpca9ax556";
+       version = "0.3.2";
+       sha256 = "0w4pqh9bcdnkyjmy24am2b894627x9is33vbyw03r0br9pd7q82q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base binary bytestring Cabal extra file-embed path path-io process
+         base binary bytestring Cabal extra file-embed path path-io
          unix-compat ztar
        ];
        executableHaskellDepends = [ base ];
@@ -178322,7 +178730,7 @@ self: {
          jose lens lens-aeson markdown-unlit mtl QuickCheck servant-auth
          servant-server time transformers wai warp wreq
        ];
-       testToolDepends = [ hspec-discover ];
+       testToolDepends = [ hspec-discover markdown-unlit ];
        description = "servant-server/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -178582,7 +178990,7 @@ self: {
          servant servant-client-core servant-server text transformers
          transformers-compat wai warp
        ];
-       testToolDepends = [ hspec-discover ];
+       testToolDepends = [ hspec-discover markdown-unlit ];
        description = "automatical derivation of querying functions for servant webservices";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -179890,8 +180298,8 @@ self: {
        pname = "servant-yaml";
        version = "0.1.0.0";
        sha256 = "011jxvr2i65bf0kmdn0sxkqgfz628a0sfhzphr1rqsmh8sqdj5y9";
-       revision = "20";
-       editedCabalFile = "0g13cchj5wnjpypsj9fgwk4ypy8xzzwrpry2f9zlsyp0lvkqjqrw";
+       revision = "21";
+       editedCabalFile = "1xrlhbgh54ny4xiqcdbka7i86wkyyqndwwv3r3k47xdr5683iyc1";
        libraryHaskellDepends = [
          base bytestring http-media servant yaml
        ];
@@ -180009,8 +180417,8 @@ self: {
      }:
      mkDerivation {
        pname = "serverless-haskell";
-       version = "0.6.1";
-       sha256 = "1amv4plafwjnw2nd4hc429zpybvd70c4c76hvnmkwc4d13z3rh3b";
+       version = "0.6.2";
+       sha256 = "1nlby06n8wkildflwlszcy9iljji19mdfkaw0fnnll0l7gir14v5";
        libraryHaskellDepends = [
          aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
          amazonka-s3 base bytestring case-insensitive http-types iproute
@@ -180022,6 +180430,34 @@ self: {
          http-types iproute lens raw-strings-qq text time unix
          unordered-containers
        ];
+       testToolDepends = [ hspec-discover ];
+       description = "Deploying Haskell code onto AWS Lambda using Serverless";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "serverless-haskell_0_7_0" = callPackage
+    ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core
+     , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive
+     , hspec, hspec-discover, http-types, iproute, lens, raw-strings-qq
+     , text, time, unix, unordered-containers
+     }:
+     mkDerivation {
+       pname = "serverless-haskell";
+       version = "0.7.0";
+       sha256 = "04z67q8g8qkksivvqw8dk8m883f3kicc98m16v17hpdv5kni8qcj";
+       libraryHaskellDepends = [
+         aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
+         amazonka-s3 base bytestring case-insensitive http-types iproute
+         lens text time unix unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
+         amazonka-s3 base bytestring case-insensitive hspec hspec-discover
+         http-types iproute lens raw-strings-qq text time unix
+         unordered-containers
+       ];
+       testToolDepends = [ hspec-discover ];
        description = "Deploying Haskell code onto AWS Lambda using Serverless";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -180205,24 +180641,6 @@ self: {
 
   "servius" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-html, bytestring
-     , http-types, markdown, shakespeare, text, wai, wai-app-static
-     }:
-     mkDerivation {
-       pname = "servius";
-       version = "1.2.0.3";
-       sha256 = "1w330lvkikbsv92g398kmnlw71wym6l080d8xsdfdx2wwl0iyqj7";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base blaze-builder blaze-html bytestring http-types markdown
-         shakespeare text wai wai-app-static
-       ];
-       description = "Warp web server with template rendering";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "servius_1_2_1_0" = callPackage
-    ({ mkDerivation, base, blaze-builder, blaze-html, bytestring
      , cmark-gfm, http-types, shakespeare, text, wai, wai-app-static
      }:
      mkDerivation {
@@ -180237,7 +180655,6 @@ self: {
        ];
        description = "Warp web server with template rendering";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ses-html" = callPackage
@@ -180464,6 +180881,7 @@ self: {
          base containers mtl smallcheck tasty tasty-discover tasty-hunit
          tasty-quickcheck tasty-smallcheck
        ];
+       testToolDepends = [ tasty-discover ];
        description = "A Haskell implementation of setoid";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182222,8 +182640,8 @@ self: {
        pname = "sign";
        version = "0.4.3";
        sha256 = "0i3m3zylss4nxmf290wmc8ldck0pnx0m5z4y8nhxnz51adlmp1bp";
-       revision = "1";
-       editedCabalFile = "112xj46k2fzhxiqsnh2fs7fmfrhs6k4q65jxw8mkn58mwl9sr86f";
+       revision = "2";
+       editedCabalFile = "1j4kxvxd3cl9k2nhlgnx8zrh1ygd0m75q0m2wrqcqv0pf1z39lya";
        libraryHaskellDepends = [
          base containers deepseq hashable lattices universe-base
        ];
@@ -183372,8 +183790,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "singleton-typelits";
-       version = "0.0.0.0";
-       sha256 = "00f2nvs4avl3kxijcl7wb17ip1mcnb4fzqq5ckcz0a247qvv4yig";
+       version = "0.1.0.0";
+       sha256 = "08xn7qv9kwhj9i69bpzigd76581rpq2jz410gmvr29g5ag1d0k08";
        libraryHaskellDepends = [ base ];
        description = "Singletons and induction over GHC TypeLits";
        license = stdenv.lib.licenses.bsd3;
@@ -183627,6 +184045,7 @@ self: {
          generics-sop hedgehog HUnit lens markdown-unlit tasty
          tasty-hedgehog tasty-hunit vector-space
        ];
+       testToolDepends = [ markdown-unlit ];
        description = "Multidimensional grids with sized specified at compile time";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183741,6 +184160,7 @@ self: {
          base containers mtl smallcheck tasty tasty-discover tasty-hunit
          tasty-quickcheck tasty-smallcheck
        ];
+       testToolDepends = [ tasty-discover ];
        description = "Skeletal set - a set with equivalence relation different from equality";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183919,6 +184339,8 @@ self: {
        pname = "skylighting-core";
        version = "0.7.2";
        sha256 = "066fwmwsd7xcvwlinfk2izlzq0xp8697i6lnbgsbl71jdybyackq";
+       revision = "1";
+       editedCabalFile = "0qjmk3i9kjnd3195fhphjgqvsgbw6blfjl40mdyiblw1piyvc6yw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -184140,6 +184562,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "slick" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, containers, lens
+     , lens-aeson, mustache, pandoc, shake, text, time
+     }:
+     mkDerivation {
+       pname = "slick";
+       version = "0.1.0.0";
+       sha256 = "0irp1d9z5l8jr33qgbnkq05lpkpll6dw84qyl0cd2xnqs1iklyds";
+       libraryHaskellDepends = [
+         aeson base binary bytestring containers lens lens-aeson mustache
+         pandoc shake text time
+       ];
+       testHaskellDepends = [
+         aeson base binary bytestring containers lens lens-aeson mustache
+         pandoc shake text time
+       ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "slidemews" = callPackage
     ({ mkDerivation, aeson, base, bytestring, MonadCatchIO-transformers
      , mtl, pandoc, snap-core, snap-server, utf8-string
@@ -186669,6 +187110,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "solve" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "solve";
+       version = "1.0";
+       sha256 = "06sk2imqgzk9zjr10ignigs04avnjjxfsi2qkk7vqfslhcfzgqnq";
+       libraryHaskellDepends = [ base containers ];
+       description = "Solving simple games";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "sonic-visualiser" = callPackage
     ({ mkDerivation, array, base, bytestring, bzlib, containers, mtl
      , pretty, utf8-string, xml
@@ -186721,14 +187173,18 @@ self: {
      }) {};
 
   "sort-by-pinyin" = callPackage
-    ({ mkDerivation, air, base, bytestring, containers, text }:
+    ({ mkDerivation, air, base, bytestring, containers, here
+     , template-haskell, text
+     }:
      mkDerivation {
        pname = "sort-by-pinyin";
-       version = "2017.10.18";
-       sha256 = "0gxz5kmkcmq8330v1iclhxqzfb6p9qk4prnskm16qmv2i4dp1p34";
+       version = "2018.4.9";
+       sha256 = "0r7fnsb4wcmhabybggzfbi1v2qcl7jzsmvwc43v7pwg5fl217nm8";
        enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ air base bytestring containers text ];
-       description = "Sort Simplified Chinese by PinYin";
+       libraryHaskellDepends = [
+         air base bytestring containers here template-haskell text
+       ];
+       description = "sort by pinyin";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -187459,18 +187915,19 @@ self: {
     ({ mkDerivation, aeson, base, bytestring, heavy-logger, HsOpenSSL
      , hspec, http-client, http-client-openssl, http-types
      , json-autotype, lens, mime-types, monad-control, mtl
-     , neat-interpolation, options, SHA, text, text-format-heavy, wreq
+     , neat-interpolation, options, SHA, split, text, text-format-heavy
+     , wreq
      }:
      mkDerivation {
        pname = "speechmatics";
-       version = "0.7.1.0";
-       sha256 = "1sx4q4l1rx6xss6xp1qqdb1nscclaszpkn78cs47rxpa19lcnsd2";
+       version = "0.7.2.0";
+       sha256 = "0i8xmlk0czqkshkdmnskqp7xpy45ads1x7yzdjn9p5mn0z46h7vb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring heavy-logger HsOpenSSL http-client
          http-client-openssl http-types json-autotype lens mime-types
-         monad-control mtl text text-format-heavy wreq
+         monad-control mtl split text text-format-heavy wreq
        ];
        executableHaskellDepends = [
          aeson base bytestring heavy-logger mime-types mtl options SHA text
@@ -188787,8 +189244,8 @@ self: {
        pname = "stache";
        version = "1.2.1";
        sha256 = "0fqipjyin2hpklm0gaab4qhcfj9gzkpb2g948sqzf1n6alkxvyvb";
-       revision = "6";
-       editedCabalFile = "1h4llrsmd270vnw7fxzvw1a22bdkm3srdf5f3v19pbcgm2ahadsj";
+       revision = "7";
+       editedCabalFile = "08i636hsi0znrm3ma7z2wknma06aa4xzfqwy0z4x9d7vn7fscm48";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory filepath
@@ -188828,8 +189285,8 @@ self: {
        pname = "stack";
        version = "1.7.1";
        sha256 = "17rjc9fz1hn56jz4bnhhm50h5x71r69jizlw6dx7kfvm57hg5i0r";
-       revision = "5";
-       editedCabalFile = "1pfvn5xc3yq2i2qxml4ww3mm2lidkz1v4f76j0x08g37p37d2lbz";
+       revision = "8";
+       editedCabalFile = "0l6fnradzx4wf5q5zm1yv3zj8mragvzjk472pz3jsvk6iam6ss2c";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -189903,8 +190360,8 @@ self: {
        pname = "statistics";
        version = "0.14.0.2";
        sha256 = "0y27gafkib0x0fn39qfn2rkgsfrm09ng35sbb5dwr7rclhnxz59l";
-       revision = "1";
-       editedCabalFile = "0gg7hq8qvbnhp7lnrykh401ggr51izffylgdmy6nip2a81q9dxi0";
+       revision = "2";
+       editedCabalFile = "1bx70yqkn62ii17fjv3pig4hklrzkqd09zj67zzjiyjzmn04fir3";
        libraryHaskellDepends = [
          aeson base base-orphans binary deepseq erf math-functions monad-par
          mwc-random primitive vector vector-algorithms
@@ -190974,8 +191431,8 @@ self: {
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.24.1";
-       sha256 = "1kgky2713bik420i93k982zwlnp4ldr6lik2brg4nqwplwzf091i";
+       version = "0.24.3";
+       sha256 = "1dvac89fzciklhkkagmhq93sk7mscnp3k4nw9izbfr5gyfdmvvdz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -190986,6 +191443,7 @@ self: {
          aeson aeson-pretty base bytestring containers hashable hspec
          hspec-discover lens template-haskell text unordered-containers
        ];
+       testToolDepends = [ hspec-discover ];
        description = "EDSL for AWS CloudFormation";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -191229,24 +191687,25 @@ self: {
      }) {};
 
   "streaming-benchmarks" = callPackage
-    ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, conduit
-     , csv, deepseq, directory, gauge, list-t, list-transformer, logict
-     , machines, mtl, pipes, random, split, streaming, streamly, text
-     , transformers, typed-process, vector
+    ({ mkDerivation, base, bench-graph, bytestring, Chart
+     , Chart-diagrams, conduit, csv, deepseq, directory, drinkery, gauge
+     , getopt-generics, machines, mtl, pipes, random, split, streaming
+     , streamly, template-haskell, text, transformers, typed-process
+     , vector
      }:
      mkDerivation {
        pname = "streaming-benchmarks";
-       version = "0.1.0";
-       sha256 = "0nyv4z828fj8jhan7q0bx2s351xmbxz9z81g2x3nyk4ad1rqjpyq";
+       version = "0.2.0";
+       sha256 = "1vpflmvz2vrll9bangl61rdjnngdxbrmpzg3xha8h85ij3458c0x";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base bytestring Chart Chart-diagrams csv directory split text
-         typed-process
+         base bench-graph bytestring Chart Chart-diagrams csv directory
+         getopt-generics split text transformers typed-process
        ];
        benchmarkHaskellDepends = [
-         base conduit deepseq gauge list-t list-transformer logict machines
-         mtl pipes random streaming streamly transformers vector
+         base conduit deepseq drinkery gauge machines mtl pipes random
+         streaming streamly template-haskell transformers vector
        ];
        description = "Benchmarks to compare streaming packages";
        license = stdenv.lib.licenses.mit;
@@ -191623,6 +192082,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "streamly_0_4_1" = callPackage
+    ({ mkDerivation, atomic-primops, base, containers, deepseq
+     , exceptions, gauge, ghc-prim, heaps, hspec, lockfree-queue
+     , monad-control, mtl, QuickCheck, random, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "streamly";
+       version = "0.4.1";
+       sha256 = "0xxkb8vdnbyq5l590wh3ig68xw4ny44aymx4k816cbif2da5w7zy";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         atomic-primops base containers exceptions ghc-prim heaps
+         lockfree-queue monad-control mtl transformers transformers-base
+       ];
+       testHaskellDepends = [
+         base containers exceptions hspec mtl QuickCheck random transformers
+       ];
+       benchmarkHaskellDepends = [
+         atomic-primops base containers deepseq exceptions gauge ghc-prim
+         heaps lockfree-queue monad-control mtl random transformers
+         transformers-base
+       ];
+       description = "Beautiful Streaming, Concurrent and Reactive Composition";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "streamproc" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -192292,8 +192780,8 @@ self: {
      }:
      mkDerivation {
        pname = "strive";
-       version = "5.0.5";
-       sha256 = "1kzkhq791ycx5q20vg6pfl1y1mirlk9h00s4ii1pf5l56lw6kgq1";
+       version = "5.0.6";
+       sha256 = "0dpf986nbsz5j47dl26073qyz290nznghi85mzj2gw0rlj9dp937";
        libraryHaskellDepends = [
          aeson base bytestring data-default gpolyline http-client
          http-client-tls http-types template-haskell text time transformers
@@ -192303,6 +192791,7 @@ self: {
          http-client-tls http-types markdown-unlit template-haskell text
          time transformers
        ];
+       testToolDepends = [ markdown-unlit ];
        description = "A client for the Strava V3 API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -192380,8 +192869,8 @@ self: {
      }:
      mkDerivation {
        pname = "structured-cli";
-       version = "0.9.3.0";
-       sha256 = "107kyi11634r7iqx0n6ry60byjab3xigl0xf3waq0lrv7jgrmhbz";
+       version = "0.9.4.0";
+       sha256 = "1mwrr0brmjb15ncjqapqaslrz3akzn3bs3ajnwsa1d0ji25l2igd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -192956,6 +193445,33 @@ self: {
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
+  "summoner_1_0_5" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, directory
+     , filepath, generic-deriving, hedgehog, neat-interpolation
+     , optparse-applicative, process, tasty, tasty-discover
+     , tasty-hedgehog, text, time, tomland, universum
+     }:
+     mkDerivation {
+       pname = "summoner";
+       version = "1.0.5";
+       sha256 = "0sxgg1g2d6pwvmp0rbyny3cizbajd0iq2wdyxspfw3rapkjap5j2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base bytestring directory filepath
+         generic-deriving neat-interpolation optparse-applicative process
+         text time tomland universum
+       ];
+       executableHaskellDepends = [ base universum ];
+       testHaskellDepends = [
+         base hedgehog tasty tasty-hedgehog universum
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Tool for creating completely configured production Haskell projects";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sump" = callPackage
     ({ mkDerivation, base, bytestring, data-default, lens, serialport
      , transformers, vector
@@ -193273,8 +193789,8 @@ self: {
      }:
      mkDerivation {
        pname = "superrecord";
-       version = "0.5.0.0";
-       sha256 = "1bg2kjkwl78lhf34j1xb20lpypp26bavd0h6cnhj4m6d4sq3z86a";
+       version = "0.5.0.1";
+       sha256 = "0l1zimami83701djj47nk3izb10m6jxszq52zwmb8411dbn9pclb";
        libraryHaskellDepends = [
          aeson base bytestring constraints deepseq ghc-prim mtl text
        ];
@@ -193467,6 +193983,7 @@ self: {
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base cairo glib mtl text ];
        libraryPkgconfigDepends = [ librsvg ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the libsvg-cairo library";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs.gnome3) librsvg;};
@@ -195051,8 +195568,8 @@ self: {
      }:
      mkDerivation {
        pname = "table-layout";
-       version = "0.8.0.1";
-       sha256 = "12glh66b7ih6zxhry1s1a9pbc2arpz0m4z1hvx3r3ji8s87i18kh";
+       version = "0.8.0.2";
+       sha256 = "0dxdk1yjbk0f648q59dfkgx9asc24f733ww3cs98p799n7jnfl1v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -197887,6 +198404,7 @@ self: {
        testHaskellDepends = [
          base hspec hspec-discover mtl template-haskell transformers
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Test monadic side-effects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198249,6 +198767,7 @@ self: {
        sha256 = "0wagfhljym2mnwpxld8dcf4qcdbp3d9liyf9mcigd4kiy5sdhfx4";
        libraryHaskellDepends = [ base HUnit ];
        testHaskellDepends = [ base hspec hspec-discover silently ];
+       testToolDepends = [ hspec-discover ];
        description = "Catchy combinators for HUnit";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198493,16 +199012,16 @@ self: {
 
   "texrunner" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, directory, filepath
-     , HUnit, io-streams, lens, mtl, process, temporary, test-framework
-     , test-framework-hunit
+     , HUnit, io-streams, lens, mtl, process, semigroups, temporary
+     , test-framework, test-framework-hunit
      }:
      mkDerivation {
        pname = "texrunner";
-       version = "0.0.1.1";
-       sha256 = "0qsx47jml91ndnlln7nmw4p0rh3vf07br29fqsxg831f7xd190v2";
+       version = "0.0.1.2";
+       sha256 = "1fxyxwgvn0rxhkl1fs2msr88jqwx5wwfnjsjlcankrwcn7gyk7jy";
        libraryHaskellDepends = [
          attoparsec base bytestring directory filepath io-streams mtl
-         process temporary
+         process semigroups temporary
        ];
        testHaskellDepends = [
          base bytestring HUnit lens test-framework test-framework-hunit
@@ -198634,6 +199153,7 @@ self: {
          base base16-bytestring base64-bytestring bytestring errors text
        ];
        testHaskellDepends = [ base bytestring hspec hspec-discover text ];
+       testToolDepends = [ hspec-discover ];
        description = "Safe conversions between textual types";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -199813,6 +200333,7 @@ self: {
        sha256 = "1r9qwj3aw5adxzgxb1kgr9s1scrqclf4jfmlhv8nz1dhbqwg84h1";
        libraryHaskellDepends = [ base template-haskell time ];
        testHaskellDepends = [ base markdown-unlit ];
+       testToolDepends = [ markdown-unlit ];
        description = "Template Haskell splice that expands to current time";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -200359,8 +200880,8 @@ self: {
      }:
      mkDerivation {
        pname = "threadscope";
-       version = "0.2.11";
-       sha256 = "07v9szpjx4hd01rk1wq5a3bcpkxnm317f6xj3mi2klxrdwrhdyav";
+       version = "0.2.11.1";
+       sha256 = "18s1k3c3013zsvw3midzpwlh7mn2lmz6ryyrh98rhjccz5nl0qvh";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -200564,6 +201085,7 @@ self: {
          base doctest either safe-exceptions silently tasty tasty-discover
          tasty-hunit text
        ];
+       testToolDepends = [ tasty-discover ];
        description = "throwable-exceptions gives the easy way to throw exceptions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -201748,9 +202270,11 @@ self: {
          base clay containers data-has directory frontmatter inliterate
          lucid process require temporary text universum yaml
        ];
+       libraryToolDepends = [ require ];
        executableHaskellDepends = [
          base optparse-generic require universum
        ];
+       executableToolDepends = [ require ];
        testHaskellDepends = [ base require ];
        description = "A softer alternative to Haddock";
        license = stdenv.lib.licenses.asl20;
@@ -202154,6 +202678,7 @@ self: {
          base bytestring directory hspec hspec-discover postgresql-simple
          process temporary
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Start and stop a temporary postgres for testing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -202875,8 +203400,8 @@ self: {
      }:
      mkDerivation {
        pname = "tpdb";
-       version = "2.1.0";
-       sha256 = "155vpz1l2qdxnyp87qmkyphdrab7jryqjdlvddb55ii7cdjdm6d7";
+       version = "2.1.1";
+       sha256 = "0hk592dki8hp15a84pnqnjdwql2zczfask71gxf833i0vrph38yb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -206313,6 +206838,7 @@ self: {
          base ghc-typelits-knownnat hedgehog tasty tasty-discover
          tasty-hedgehog tasty-hspec
        ];
+       testToolDepends = [ tasty-discover ];
        benchmarkHaskellDepends = [
          base criterion deepseq dependent-map dependent-sum
          ghc-typelits-knownnat
@@ -206354,8 +206880,8 @@ self: {
      }:
      mkDerivation {
        pname = "typesafe-precure";
-       version = "0.6.2.1";
-       sha256 = "0qa9vp1fg495b2ddzbdpivlzp0maap7jxqn2xd4z2rrxbrjdlhl2";
+       version = "0.6.3.1";
+       sha256 = "16jysdh7v8336xkhl6vzni5zj301jsgawwxy8fcrd74p87am2k05";
        libraryHaskellDepends = [
          aeson aeson-pretty autoexporter base bytestring dlist
          monad-skeleton template-haskell text th-data-compat
@@ -207098,6 +207624,8 @@ self: {
        pname = "unfoldable";
        version = "0.9.6";
        sha256 = "18gaay37mjgyd5rfpfs84p4q7vqdnv4lcjabaprgm315pblym46d";
+       revision = "1";
+       editedCabalFile = "1lgyfmv339zfkrf6s4bw1ksk0757vcc1vx07yc4l33idmpsgz77c";
        libraryHaskellDepends = [
          base containers ghc-prim one-liner QuickCheck random transformers
        ];
@@ -208500,6 +209028,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "unwrapped-functors" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "unwrapped-functors";
+       version = "0.1.0.0";
+       sha256 = "08q1zvc61gh2l8212xb2p4nvjx7p0qaw1q69085xzgg3hn5rwig2";
+       libraryHaskellDepends = [ base ];
+       description = "Unwrapping sums/products lifted to functors";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "uom-plugin" = callPackage
     ({ mkDerivation, base, containers, deepseq, ghc
      , ghc-tcplugins-extra, hlint, tasty, tasty-hunit, template-haskell
@@ -210586,8 +211125,8 @@ self: {
        pname = "vector";
        version = "0.12.0.1";
        sha256 = "0yrx2ypiaxahvaz84af5bi855hd3107kxkbqc8km29nsp5wyw05i";
-       revision = "2";
-       editedCabalFile = "0vzr8kra73anchp86knkmkq2afkd1hw6hirldn9vn69frynb1n6y";
+       revision = "3";
+       editedCabalFile = "0y5rh8k710i2a3p1h2rghvr5cfg78p5h0kbfi7ifxqqf6pzlyr1x";
        libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
        testHaskellDepends = [
          base HUnit QuickCheck random template-haskell test-framework
@@ -210874,8 +211413,8 @@ self: {
      }:
      mkDerivation {
        pname = "vector-sized";
-       version = "1.0.3.0";
-       sha256 = "1mjg8hncv7xd3w7fsdalvhwiwnsr83nxv21njc01bgj891as44bx";
+       version = "1.0.4.0";
+       sha256 = "1rdryc5ykqvdpjgx3a895cx2i14ixg0ryhppn89fjzhann79mgk4";
        libraryHaskellDepends = [
          adjunctions base deepseq distributive finite-typelits
          indexed-list-literals primitive vector
@@ -210884,23 +211423,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "vector-sized_1_0_3_1" = callPackage
-    ({ mkDerivation, adjunctions, base, deepseq, distributive
-     , finite-typelits, indexed-list-literals, primitive, vector
-     }:
-     mkDerivation {
-       pname = "vector-sized";
-       version = "1.0.3.1";
-       sha256 = "0dzf3cg7zfg4k5jiq7h6dw2ihczs42as9cxn8dkswx5v6nahnnxx";
-       libraryHaskellDepends = [
-         adjunctions base deepseq distributive finite-typelits
-         indexed-list-literals primitive vector
-       ];
-       description = "Size tagged vectors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "vector-space" = callPackage
     ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }:
      mkDerivation {
@@ -211307,8 +211829,8 @@ self: {
      }:
      mkDerivation {
        pname = "viewprof";
-       version = "0.0.0.18";
-       sha256 = "1cf37vhj21yd6d1bia7jlwwc0bw6d2lwj7wkl936argn3zzxrqf6";
+       version = "0.0.0.19";
+       sha256 = "1v8lnc3naklznwrla34zgx4hf5vzb2762f9p1cxkb5fdnwslbmlc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -211908,6 +212430,7 @@ self: {
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib gtk pango ];
        libraryPkgconfigDepends = [ vte ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -211925,6 +212448,7 @@ self: {
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib gtk3 pango ];
        libraryPkgconfigDepends = [ vte ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -211964,6 +212488,41 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vty_5_22" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
+     , deepseq, directory, filepath, hashable, HUnit, microlens
+     , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
+     , quickcheck-assertions, random, smallcheck, stm, string-qq
+     , terminfo, test-framework, test-framework-hunit
+     , test-framework-smallcheck, text, transformers, unix, utf8-string
+     , vector
+     }:
+     mkDerivation {
+       pname = "vty";
+       version = "5.22";
+       sha256 = "0x9kz6pvky1cmbhcf3bs5m3hnhrqj8cm510m4d4a2hf9ish55wvz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers deepseq directory filepath
+         hashable microlens microlens-mtl microlens-th mtl parallel parsec
+         stm terminfo text transformers unix utf8-string vector
+       ];
+       executableHaskellDepends = [
+         base containers microlens microlens-mtl mtl
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring Cabal containers deepseq HUnit
+         microlens microlens-mtl mtl QuickCheck quickcheck-assertions random
+         smallcheck stm string-qq terminfo test-framework
+         test-framework-hunit test-framework-smallcheck text unix
+         utf8-string vector
+       ];
+       description = "A simple terminal UI library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vty-examples" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck
@@ -212360,8 +212919,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-extra";
-       version = "3.0.22.1";
-       sha256 = "0bvj0nc3m314hh6n4rpz6dzb4bqg24b1sz4x0w7bj5ah8msr0z3y";
+       version = "3.0.23.0";
+       sha256 = "10chij5jy057q1c4zybmb6jq5kff9i9iqijz31q51s6l0fh1zkw8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -213835,8 +214394,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.2.22";
-       sha256 = "03jrby2q3xb16xgbmlk3yl36g1mnwq56lj62whks438568626nv4";
+       version = "3.2.23";
+       sha256 = "12v9qhi4hyp0sb90yddsax16jj7x47nmqwn53sv7b5nszcxgzam0";
        libraryHaskellDepends = [
          array async auto-update base bsb-http-chunked bytestring
          case-insensitive containers ghc-prim hashable http-date http-types
@@ -214522,6 +215081,7 @@ self: {
          hspec-discover hspec-expectations memory split stm tagged text time
          transformers
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Ethereum API for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -214914,6 +215474,7 @@ self: {
          base bytestring cairo glib gtk mtl pango text transformers
        ];
        libraryPkgconfigDepends = [ webkit ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -214961,6 +215522,7 @@ self: {
          base bytestring cairo glib gtk3 mtl pango text transformers
        ];
        libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -217142,8 +217704,8 @@ self: {
      }:
      mkDerivation {
        pname = "wuss";
-       version = "1.1.9";
-       sha256 = "1la0zvdsb1w0k2sj8f9wrnsirljjnbx0a1kalzwalh6d82h2jd9z";
+       version = "1.1.10";
+       sha256 = "0l4mlmr3b8ndx4nmb3rf0n0bpjxhzxmqv1mslxl432kf02312z09";
        libraryHaskellDepends = [
          base bytestring connection network websockets
        ];
@@ -218871,14 +219433,14 @@ self: {
     ({ mkDerivation, alsa-core, alsa-mixer, base, bytestring
      , containers, dbus, directory, filepath, hinotify, hspec, HTTP
      , http-conduit, http-types, iwlib, libmpd, libXpm, libXrandr
-     , libXrender, mtl, old-locale, parsec, process, regex-compat, stm
-     , time, timezone-olson, timezone-series, transformers, unix
-     , utf8-string, wirelesstools, X11, X11-xft
+     , libXrender, mtl, old-locale, parsec, parsec-numbers, process
+     , regex-compat, stm, time, timezone-olson, timezone-series
+     , transformers, unix, utf8-string, wirelesstools, X11, X11-xft
      }:
      mkDerivation {
        pname = "xmobar";
-       version = "0.26";
-       sha256 = "19g40vqj3cs94i27f66194k7d5cazrv1lx54bz9kc0qy2npxjzgz";
+       version = "0.27";
+       sha256 = "0agx490q6sbmv3vfq33ys8dsrgwizj3bmha4i1pkxz5wp5q8cx3l";
        configureFlags = [
          "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus"
          "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris"
@@ -218890,15 +219452,17 @@ self: {
        executableHaskellDepends = [
          alsa-core alsa-mixer base bytestring containers dbus directory
          filepath hinotify HTTP http-conduit http-types iwlib libmpd mtl
-         old-locale parsec process regex-compat stm time timezone-olson
-         timezone-series transformers unix utf8-string X11 X11-xft
+         old-locale parsec parsec-numbers process regex-compat stm time
+         timezone-olson timezone-series transformers unix utf8-string X11
+         X11-xft
        ];
        executableSystemDepends = [
          libXpm libXrandr libXrender wirelesstools
        ];
        testHaskellDepends = [
          base bytestring containers directory filepath hspec mtl old-locale
-         parsec process regex-compat stm time transformers unix X11
+         parsec parsec-numbers process regex-compat stm time transformers
+         unix X11
        ];
        description = "A Minimalistic Text Based Status Bar";
        license = stdenv.lib.licenses.bsd3;
@@ -219776,14 +220340,14 @@ self: {
 
   "yaml" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
-     , conduit, containers, directory, filepath, hspec, HUnit, libyaml
-     , mockery, resourcet, scientific, semigroups, template-haskell
-     , temporary, text, transformers, unordered-containers, vector
+     , conduit, containers, directory, filepath, hspec, HUnit, mockery
+     , resourcet, scientific, semigroups, template-haskell, temporary
+     , text, transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "yaml";
-       version = "0.8.31.1";
-       sha256 = "0lwbdlz2r54nvdr5snmjp5lnkv6wwk118bhy13v1vjz62wclb88v";
+       version = "0.8.32";
+       sha256 = "0cbsyh4ilvjzq1q7pxls43k6pdqxg1l85xzibcwpbvmlvrizh86w";
        configureFlags = [ "-fsystem-libyaml" ];
        isLibrary = true;
        isExecutable = true;
@@ -219792,15 +220356,15 @@ self: {
          filepath resourcet scientific semigroups template-haskell text
          transformers unordered-containers vector
        ];
-       libraryPkgconfigDepends = [ libyaml ];
        testHaskellDepends = [
-         aeson base base-compat bytestring conduit directory hspec HUnit
-         mockery resourcet temporary text transformers unordered-containers
-         vector
+         aeson attoparsec base base-compat bytestring conduit containers
+         directory filepath hspec HUnit mockery resourcet scientific
+         semigroups template-haskell temporary text transformers
+         unordered-containers vector
        ];
        description = "Support for parsing and rendering YAML documents";
        license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) libyaml;};
+     }) {};
 
   "yaml_0_9_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
@@ -220375,6 +220939,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yeshql_4_1_0_1" = callPackage
+    ({ mkDerivation, base, yeshql-core, yeshql-hdbc }:
+     mkDerivation {
+       pname = "yeshql";
+       version = "4.1.0.1";
+       sha256 = "1dlxq8vp18fagfymlzqa4j0ns174s31d7p1vi54wz0b55ml91if4";
+       libraryHaskellDepends = [ base yeshql-core yeshql-hdbc ];
+       description = "YesQL-style SQL database abstraction (legacy compatibility wrapper)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yeshql-core" = callPackage
     ({ mkDerivation, base, containers, convertible, filepath, parsec
      , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell
@@ -220394,6 +220970,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yeshql-core_4_1_0_1" = callPackage
+    ({ mkDerivation, base, containers, convertible, filepath, parsec
+     , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "yeshql-core";
+       version = "4.1.0.1";
+       sha256 = "1v15n7h69j6v3zgvdbvy08l8in9z3yl9cbbfny4998i4p7fl2nzn";
+       libraryHaskellDepends = [
+         base containers convertible filepath parsec template-haskell
+       ];
+       testHaskellDepends = [
+         base containers stm tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "YesQL-style SQL database abstraction (core)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yeshql-hdbc" = callPackage
     ({ mkDerivation, base, containers, convertible, filepath, HDBC
      , parsec, stm, tasty, tasty-hunit, tasty-quickcheck
@@ -220415,6 +221010,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yeshql-hdbc_4_1_0_1" = callPackage
+    ({ mkDerivation, base, containers, convertible, filepath, HDBC
+     , parsec, stm, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, yeshql-core
+     }:
+     mkDerivation {
+       pname = "yeshql-hdbc";
+       version = "4.1.0.1";
+       sha256 = "0a5wkjkq1lfqk5cv7wmxbx28j6r3xqj8bbkafxfjvs2s02x4qvvc";
+       libraryHaskellDepends = [
+         base containers convertible filepath HDBC parsec template-haskell
+         yeshql-core
+       ];
+       testHaskellDepends = [
+         base containers HDBC stm tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "YesQL-style SQL database abstraction (HDBC backend)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yeshql-postgresql-simple" = callPackage
     ({ mkDerivation, base, bytestring, containers, convertible
      , filepath, parsec, postgresql-simple, stm, tasty, tasty-hunit
@@ -220422,8 +221038,8 @@ self: {
      }:
      mkDerivation {
        pname = "yeshql-postgresql-simple";
-       version = "4.1.0.0";
-       sha256 = "1dnwlrgnxg3gvfg6xmfrxqvqbi73402g9m82phqb6s624ifjir0c";
+       version = "4.1.0.1";
+       sha256 = "09sypmx1w5shn8sazhll02a4yjdhrrxr3cic74vr7ch08pjpkkyq";
        libraryHaskellDepends = [
          base containers convertible filepath parsec postgresql-simple
          template-haskell yeshql-core
@@ -220562,35 +221178,6 @@ self: {
   "yesod-auth" = callPackage
     ({ mkDerivation, aeson, authenticate, base, base16-bytestring
      , base64-bytestring, binary, blaze-builder, blaze-html
-     , blaze-markup, byteable, bytestring, conduit, conduit-extra
-     , containers, cryptonite, data-default, email-validate, file-embed
-     , http-client, http-client-tls, http-conduit, http-types, memory
-     , mime-mail, network-uri, nonce, persistent, persistent-template
-     , random, resourcet, safe, shakespeare, template-haskell, text
-     , time, transformers, unliftio, unliftio-core, unordered-containers
-     , wai, yesod-core, yesod-form, yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod-auth";
-       version = "1.6.3";
-       sha256 = "1f4qhsfgar7c2yq7rsm7g3wndg6hhwbmcmjz8dbljdwmzmxl5px0";
-       libraryHaskellDepends = [
-         aeson authenticate base base16-bytestring base64-bytestring binary
-         blaze-builder blaze-html blaze-markup byteable bytestring conduit
-         conduit-extra containers cryptonite data-default email-validate
-         file-embed http-client http-client-tls http-conduit http-types
-         memory mime-mail network-uri nonce persistent persistent-template
-         random resourcet safe shakespeare template-haskell text time
-         transformers unliftio unliftio-core unordered-containers wai
-         yesod-core yesod-form yesod-persistent
-       ];
-       description = "Authentication for Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-auth_1_6_4_1" = callPackage
-    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
-     , base64-bytestring, binary, blaze-builder, blaze-html
      , blaze-markup, bytestring, conduit, conduit-extra, containers
      , cryptonite, data-default, email-validate, file-embed, http-client
      , http-client-tls, http-conduit, http-types, memory, network-uri
@@ -220614,7 +221201,6 @@ self: {
        ];
        description = "Authentication for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-account" = callPackage
@@ -221150,45 +221736,6 @@ self: {
     ({ mkDerivation, aeson, async, auto-update, base, blaze-html
      , blaze-markup, byteable, bytestring, case-insensitive, cereal
      , clientsession, conduit, conduit-extra, containers, cookie
-     , deepseq, deepseq-generics, directory, fast-logger, gauge, hspec
-     , hspec-expectations, http-types, HUnit, monad-logger, mtl, network
-     , old-locale, parsec, path-pieces, primitive, QuickCheck, random
-     , resourcet, safe, semigroups, shakespeare, streaming-commons
-     , template-haskell, text, time, transformers, unix-compat, unliftio
-     , unordered-containers, vector, wai, wai-extra, wai-logger, warp
-     , word8
-     }:
-     mkDerivation {
-       pname = "yesod-core";
-       version = "1.6.5";
-       sha256 = "0yj06bfw7cln4waf76nfj1dm1f5fd13i896f5iy33035xc0bwiml";
-       libraryHaskellDepends = [
-         aeson auto-update base blaze-html blaze-markup byteable bytestring
-         case-insensitive cereal clientsession conduit conduit-extra
-         containers cookie deepseq deepseq-generics directory fast-logger
-         http-types monad-logger mtl old-locale parsec path-pieces primitive
-         random resourcet safe semigroups shakespeare template-haskell text
-         time transformers unix-compat unliftio unordered-containers vector
-         wai wai-extra wai-logger warp word8
-       ];
-       testHaskellDepends = [
-         async base bytestring clientsession conduit conduit-extra
-         containers cookie hspec hspec-expectations http-types HUnit network
-         path-pieces QuickCheck random resourcet shakespeare
-         streaming-commons template-haskell text transformers unliftio wai
-         wai-extra
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-html bytestring gauge shakespeare text transformers
-       ];
-       description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-core_1_6_6" = callPackage
-    ({ mkDerivation, aeson, async, auto-update, base, blaze-html
-     , blaze-markup, byteable, bytestring, case-insensitive, cereal
-     , clientsession, conduit, conduit-extra, containers, cookie
      , deepseq, fast-logger, gauge, hspec, hspec-expectations
      , http-types, HUnit, monad-logger, mtl, network, parsec
      , path-pieces, random, resourcet, rio, shakespeare
@@ -221219,7 +221766,6 @@ self: {
        ];
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-crud" = callPackage
@@ -221484,29 +222030,6 @@ self: {
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, containers, data-default
      , email-validate, hspec, network-uri, persistent, resourcet
-     , semigroups, shakespeare, template-haskell, text, time
-     , transformers, wai, xss-sanitize, yesod-core, yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod-form";
-       version = "1.6.1";
-       sha256 = "05pnsgnhcsq74w91r74p8psh567yxbmyhddj04mnrfzlzzm19zxq";
-       libraryHaskellDepends = [
-         aeson attoparsec base blaze-builder blaze-html blaze-markup
-         byteable bytestring containers data-default email-validate
-         network-uri persistent resourcet semigroups shakespeare
-         template-haskell text time transformers wai xss-sanitize yesod-core
-         yesod-persistent
-       ];
-       testHaskellDepends = [ base hspec text time ];
-       description = "Form handling support for Yesod Web Framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-form_1_6_2" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, byteable, bytestring, containers, data-default
-     , email-validate, hspec, network-uri, persistent, resourcet
      , semigroups, shakespeare, text, time, transformers, wai
      , xss-sanitize, yesod-core, yesod-persistent
      }:
@@ -221523,23 +222046,9 @@ self: {
        testHaskellDepends = [ base hspec text time ];
        description = "Form handling support for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-form-bootstrap4" = callPackage
-    ({ mkDerivation, base, shakespeare, text, yesod-core, yesod-form }:
-     mkDerivation {
-       pname = "yesod-form-bootstrap4";
-       version = "1.0.0";
-       sha256 = "0z19w6d612qxl0w6nmq2vc467s9s9q6ncbjjc2l620px2i7iqrfq";
-       libraryHaskellDepends = [
-         base shakespeare text yesod-core yesod-form
-       ];
-       description = "renderBootstrap4";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-form-bootstrap4_1_0_2" = callPackage
     ({ mkDerivation, base, text, yesod-core, yesod-form }:
      mkDerivation {
        pname = "yesod-form-bootstrap4";
@@ -221548,7 +222057,6 @@ self: {
        libraryHaskellDepends = [ base text yesod-core yesod-form ];
        description = "renderBootstrap4";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-form-bulma" = callPackage
@@ -222448,32 +222956,6 @@ self: {
 
   "yesod-test" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, bytestring, case-insensitive, conduit, containers
-     , cookie, hspec, hspec-core, html-conduit, http-types, HUnit
-     , network, persistent, pretty-show, semigroups, text, time
-     , transformers, unliftio, wai, wai-extra, xml-conduit, xml-types
-     , yesod-core, yesod-form
-     }:
-     mkDerivation {
-       pname = "yesod-test";
-       version = "1.6.4";
-       sha256 = "0nxrscg4rxdwvivpxfsc735zr8w72w5vrlgaw1mq6ikn4cwidyng";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder blaze-html blaze-markup bytestring
-         case-insensitive conduit containers cookie hspec-core html-conduit
-         http-types HUnit network persistent pretty-show semigroups text
-         time transformers wai wai-extra xml-conduit xml-types yesod-core
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec html-conduit http-types HUnit text
-         unliftio wai wai-extra xml-conduit yesod-core yesod-form
-       ];
-       description = "integration testing for WAI/Yesod Applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-test_1_6_5" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , bytestring, case-insensitive, conduit, containers, cookie, hspec
      , hspec-core, html-conduit, http-types, HUnit, network, pretty-show
      , semigroups, text, time, transformers, unliftio, wai, wai-extra
@@ -222495,7 +222977,6 @@ self: {
        ];
        description = "integration testing for WAI/Yesod Applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-test-json" = callPackage
@@ -224380,8 +224861,8 @@ self: {
     ({ mkDerivation, base, binary, bytestring, containers }:
      mkDerivation {
        pname = "zmidi-core";
-       version = "0.8.2";
-       sha256 = "02895shbxbswnczgljafr9k7vfrxg7w2sqhnlx8azixkw84lk5mh";
+       version = "0.9.0";
+       sha256 = "127c36pdp7rq03amz6r3pji1crw0f7q5xp0baf782yq71fjgy4c5";
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Read and write MIDI files";
        license = stdenv.lib.licenses.bsd3;
@@ -224633,18 +225114,21 @@ self: {
      }) {};
 
   "ztar" = callPackage
-    ({ mkDerivation, base, bytestring, directory, extra, filepath, path
-     , path-io, QuickCheck, tar, tasty, tasty-quickcheck, zip, zlib
+    ({ mkDerivation, base, bytestring, bytestring-arbitrary, deepseq
+     , directory, extra, filepath, path, path-io, process, QuickCheck
+     , tasty, tasty-quickcheck, text, unix-compat, zip, zlib
      }:
      mkDerivation {
        pname = "ztar";
-       version = "0.1.0";
-       sha256 = "12jndqj9ls67wdx840c25zrvms2s3prbb59scc9dgi93zb6s0k9d";
+       version = "0.1.3";
+       sha256 = "12pzskr90a724x3wh1dsbpbszh6a58lbp4sxl7sd7s1bk3m2kgq1";
        libraryHaskellDepends = [
-         base bytestring directory filepath path tar zip zlib
+         base bytestring deepseq directory filepath path process text
+         unix-compat zip zlib
        ];
        testHaskellDepends = [
-         base extra path path-io QuickCheck tasty tasty-quickcheck
+         base bytestring bytestring-arbitrary extra path path-io QuickCheck
+         tasty tasty-quickcheck
        ];
        description = "Creating and extracting arbitrary archives";
        license = stdenv.lib.licenses.bsd3;
@@ -224684,6 +225168,7 @@ self: {
          tasty-discover tasty-hunit template-haskell text text-show
          throwable-exceptions transformers
        ];
+       testToolDepends = [ tasty-discover ];
        description = "A lisp processor, An inline-lisp, in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 87ac65307aab..95dac230cc55 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -128,7 +128,7 @@ let
       preferLocalBuild = true;
       phases = ["installPhase"];
       LANG = "en_US.UTF-8";
-      LOCALE_ARCHIVE = pkgs.lib.optionalString buildPlatform.isLinux "${buildPackages.glibcLocales}/lib/locale/locale-archive";
+      LOCALE_ARCHIVE = pkgs.lib.optionalString (buildPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive";
       installPhase = ''
         export HOME="$TMP"
         mkdir -p "$out"