From 57ec1813fff2e48e011dc95b02e986c0573c3cda Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Wed, 9 Jun 2021 15:09:00 +0200
Subject: [PATCH 01/30] haskell-generic-builder: allow passing flags to the
 test suite(s)

Every flag the generic builder receives via `testFlags` is passed via
`--test-option` [1] to `Setup.hs` which in turn passes them to the
underlying test suite binary. These wrapped options are added to
`checkFlagsArray` in `checkPhase`. This needs to be done in bash since
without structuredAttrs in nixpkgs so far, Nix arrays aren't properly
translated into bash arrays, so we'd have all sorts of quoting issues
when spaces are involved.

Re-using `checkFlags` and `checkFlagsArray` from standard stdenv
setup.sh also results in an additional feature: Using `overrideAttrs`
`checkFlags` and `checkFlagsArray` can additionally be overridden,
which allows passing extra flags to `Setup.hs` whithout being wrapped
with `--test-option`.

[1]: See also https://cabal.readthedocs.io/en/3.4/setup-commands.html?highlight=test-option#cmdoption-runhaskell-Setup.hs-test-test-option
     According to the cabal-install man page this also allows passing
     special variables which are substituted for other values
     depending on context.
---
 pkgs/development/haskell-modules/configuration-common.nix | 7 ++-----
 pkgs/development/haskell-modules/generic-builder.nix      | 8 ++++++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3a3282d2ab73..468961fc26d4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1928,9 +1928,7 @@ EOT
   # Disable flaky tests
   # https://github.com/DavidEichmann/alpaca-netcode/issues/2
   alpaca-netcode = overrideCabal super.alpaca-netcode {
-    # use testTarget to also pass some flags to the test suite.
-    # TODO: We should add proper support for this to the builder.
-    testTarget = "test --test-options='-p \"!/[NOCI]/\"'";
+    testFlags = [ "--pattern" "!/[NOCI]/" ];
   };
 
   # Tests require to run a binary which isn't built
@@ -1941,8 +1939,7 @@ EOT
   # this, run tests with only a single job.
   # https://github.com/vmchale/libarchive/issues/20
   libarchive = overrideCabal super.libarchive {
-    # TODO: We should add proper support for this to the builder.
-    testTarget = "libarchive-test --test-options='-j1'";
+    testFlags = [ "-j1" ];
   };
 
   # unrestrict bounds for hashable and semigroups
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index b91da1669527..2b2f23e20eaf 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -58,7 +58,7 @@ in
 , pkg-configDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? []
 , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [], testFrameworkDepends ? []
 , benchmarkDepends ? [], benchmarkHaskellDepends ? [], benchmarkSystemDepends ? [], benchmarkFrameworkDepends ? []
-, testTarget ? ""
+, testTarget ? "", testFlags ? []
 , broken ? false
 , preCompileBuildDriver ? null, postCompileBuildDriver ? null
 , preUnpack ? null, postUnpack ? null
@@ -454,9 +454,13 @@ stdenv.mkDerivation ({
 
   inherit doCheck;
 
+  # Run test suite(s) and pass `checkFlags` as well as `checkFlagsArray`.
+  # `testFlags` are added to `checkFlagsArray` each prefixed with
+  # `--test-option`, so Cabal passes it to the underlying test suite binary.
   checkPhase = ''
     runHook preCheck
-    ${setupCommand} test ${testTarget}
+    checkFlagsArray+=(${lib.escapeShellArgs (builtins.map (opt: "--test-option=${opt}") testFlags)})
+    ${setupCommand} test ${testTarget} $checkFlags ''${checkFlagsArray:+"''${checkFlagsArray[@]}"}
     runHook postCheck
   '';
 

From f3ec332304bbce1c925068df918eccb03caaef74 Mon Sep 17 00:00:00 2001
From: maralorn <malte.brandy@maralorn.de>
Date: Sat, 12 Jun 2021 19:45:10 +0200
Subject: [PATCH 02/30] haskelPackages: HACKING.md, slight clarification

---
 pkgs/development/haskell-modules/HACKING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md
index 7c46e1560fd3..21b1f7091fef 100644
--- a/pkgs/development/haskell-modules/HACKING.md
+++ b/pkgs/development/haskell-modules/HACKING.md
@@ -44,7 +44,7 @@ In this section we create the PR for merging `haskell-updates` into `master`.
     $ ./maintainers/scripts/haskell/regenerate-hackage-packages.sh --do-commit
     ```
 
-1.  Push these commits to the Nixpkgs repository.
+1.  Push these commits to the `haskell-updates` branch of the NixOS/nixpkgs repository.
 
 1.  Open a PR on Nixpkgs merging `haskell-updates` into `master`.
 

From 7dd8733cfc930e4482c2f04e561368db2a475bef Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sat, 12 Jun 2021 19:42:09 +0200
Subject: [PATCH 03/30] haskellPackages: stackage-nightly 2021-06-01 ->
 2021-06-10

This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
---
 .../configuration-hackage2nix/stackage.yaml   | 156 ++++++++----------
 1 file changed, 72 insertions(+), 84 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
index bfe0b93b3e41..2ebd11bd006c 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
@@ -1,4 +1,4 @@
-# Stackage Nightly 2021-06-01
+# Stackage Nightly 2021-06-10
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@@ -11,8 +11,8 @@ default-package-overrides:
   - ad ==4.4.1
   - adjunctions ==4.4
   - adler32 ==0.1.2.0
-  - aern2-mp ==0.2.6.0
-  - aern2-real ==0.2.6.0
+  - aern2-mp ==0.2.7.0
+  - aern2-real ==0.2.7.0
   - aeson ==1.5.6.0
   - aeson-attoparsec ==0.0.0
   - aeson-better-errors ==0.9.1.0
@@ -34,7 +34,7 @@ default-package-overrides:
   - aeson-yak ==0.1.1.3
   - aeson-yaml ==1.1.0.0
   - Agda ==2.6.1.3
-  - agda2lagda ==0.2020.11.1
+  - agda2lagda ==0.2021.6.1
   - al ==0.1.4.2
   - alarmclock ==0.7.0.5
   - alerts ==0.1.2.0
@@ -159,7 +159,7 @@ default-package-overrides:
   - approximate-equality ==1.1.0.2
   - app-settings ==0.2.0.12
   - arbor-lru-cache ==0.1.1.1
-  - arithmoi ==0.11.0.1
+  - arithmoi ==0.12.0.0
   - array-memoize ==0.6.0
   - arrow-extras ==0.1.0.1
   - arrows ==0.4.4.2
@@ -202,7 +202,7 @@ default-package-overrides:
   - auto-update ==0.1.6
   - avers ==0.0.17.1
   - avro ==0.5.2.0
-  - aws-cloudfront-signed-cookies ==0.2.0.6
+  - aws-cloudfront-signed-cookies ==0.2.0.8
   - aws-xray-client ==0.1.0.0
   - aws-xray-client-wai ==0.1.0.0
   - backprop ==0.2.6.4
@@ -336,7 +336,7 @@ default-package-overrides:
   - cabal-file ==0.1.1
   - cabal-flatpak ==0.1.0.2
   - cabal-plan ==0.7.2.0
-  - cabal-rpm ==2.0.8
+  - cabal-rpm ==2.0.9
   - cache ==0.1.3.0
   - cacophony ==0.10.1
   - calendar-recycling ==0.0.0.1
@@ -360,7 +360,7 @@ default-package-overrides:
   - cayley-client ==0.4.15
   - cborg ==0.2.5.0
   - cborg-json ==0.2.2.0
-  - cdar-mBound ==0.1.0.2
+  - cdar-mBound ==0.1.0.4
   - c-enum ==0.1.0.1
   - cereal ==0.5.8.1
   - cereal-conduit ==0.8.0
@@ -418,7 +418,7 @@ default-package-overrides:
   - collect-errors ==0.1.5.0
   - co-log-concurrent ==0.5.0.0
   - co-log-core ==0.2.1.1
-  - Color ==0.3.1
+  - Color ==0.3.2
   - colorful-monoids ==0.2.1.3
   - colorize-haskell ==1.0.1
   - colour ==2.3.5
@@ -437,16 +437,6 @@ default-package-overrides:
   - compiler-warnings ==0.1.0
   - composable-associations ==0.1.0.0
   - composable-associations-aeson ==0.1.0.1
-  - composite-aeson ==0.7.5.0
-  - composite-aeson-path ==0.7.5.0
-  - composite-aeson-refined ==0.7.5.0
-  - composite-aeson-throw ==0.1.0.0
-  - composite-base ==0.7.5.0
-  - composite-binary ==0.7.5.0
-  - composite-ekg ==0.7.5.0
-  - composite-hashable ==0.7.5.0
-  - composite-tuple ==0.1.2.0
-  - composite-xstep ==0.1.0.0
   - composition ==1.0.2.2
   - composition-extra ==2.0.0
   - concise ==0.1.0.1
@@ -599,14 +589,14 @@ default-package-overrides:
   - deque ==0.4.3
   - deriveJsonNoPrefix ==0.1.0.1
   - derive-topdown ==0.0.2.2
-  - deriving-aeson ==0.2.6.1
+  - deriving-aeson ==0.2.7
   - deriving-compat ==0.5.10
   - derulo ==1.0.10
-  - dhall ==1.38.1
-  - dhall-bash ==1.0.36
-  - dhall-json ==1.7.6
-  - dhall-lsp-server ==1.0.14
-  - dhall-yaml ==1.2.6
+  - dhall ==1.39.0
+  - dhall-bash ==1.0.37
+  - dhall-json ==1.7.7
+  - dhall-lsp-server ==1.0.15
+  - dhall-yaml ==1.2.7
   - diagrams-solve ==0.1.3
   - dialogflow-fulfillment ==0.1.1.4
   - di-core ==1.0.4
@@ -625,7 +615,7 @@ default-package-overrides:
   - distribution-opensuse ==1.1.1
   - distributive ==0.6.2.1
   - dl-fedora ==0.9
-  - dlist ==0.8.0.8
+  - dlist ==1.0
   - dlist-instances ==0.1.1.1
   - dlist-nonempty ==0.1.1
   - dns ==4.0.1
@@ -740,7 +730,7 @@ default-package-overrides:
   - expiring-cache-map ==0.0.6.1
   - explicit-exception ==0.1.10
   - exp-pairs ==0.2.1.0
-  - express ==0.1.12
+  - express ==0.1.14
   - extended-reals ==0.2.4.0
   - extensible-effects ==5.0.0.1
   - extensible-exceptions ==0.1.1.4
@@ -781,7 +771,7 @@ default-package-overrides:
   - finite-typelits ==0.1.4.2
   - first-class-families ==0.8.0.1
   - first-class-patterns ==0.3.2.5
-  - fitspec ==0.4.8
+  - fitspec ==0.4.10
   - fixed ==0.3
   - fixed-length ==0.2.2.1
   - fixed-vector ==1.2.0.0
@@ -817,7 +807,7 @@ default-package-overrides:
   - formatting ==6.3.7
   - foundation ==0.0.26.1
   - fourmolu ==0.3.0.0
-  - free ==5.1.5
+  - free ==5.1.7
   - free-categories ==0.2.0.2
   - freenect ==1.2.1
   - freer-simple ==1.2.1.1
@@ -834,7 +824,7 @@ default-package-overrides:
   - function-builder ==0.3.0.1
   - functor-classes-compat ==1.0.1
   - functor-combinators ==0.3.6.0
-  - fusion-plugin ==0.2.2
+  - fusion-plugin ==0.2.3
   - fusion-plugin-types ==0.1.0
   - fuzzcheck ==0.1.1
   - fuzzy ==0.1.0.0
@@ -901,9 +891,9 @@ default-package-overrides:
   - ghcid ==0.8.7
   - ghci-hexcalc ==0.1.1.0
   - ghcjs-codemirror ==0.0.0.2
-  - ghc-lib ==8.10.4.20210206
-  - ghc-lib-parser ==8.10.4.20210206
-  - ghc-lib-parser-ex ==8.10.0.19
+  - ghc-lib ==8.10.5.20210606
+  - ghc-lib-parser ==8.10.5.20210606
+  - ghc-lib-parser-ex ==8.10.0.21
   - ghc-parser ==0.2.3.0
   - ghc-paths ==0.1.0.12
   - ghc-prof ==1.4.1.8
@@ -935,7 +925,7 @@ default-package-overrides:
   - ginger ==0.10.1.0
   - gingersnap ==0.3.1.0
   - gi-pango ==1.0.23
-  - githash ==0.1.5.0
+  - githash ==0.1.6.0
   - github-release ==1.3.7
   - github-rest ==1.0.3
   - github-types ==0.2.1
@@ -986,7 +976,7 @@ default-package-overrides:
   - hall-symbols ==0.1.0.6
   - hamtsolo ==1.0.3
   - HandsomeSoup ==0.4.2
-  - hapistrano ==0.4.1.3
+  - hapistrano ==0.4.1.4
   - happstack-server ==7.7.1
   - happy ==1.20.0
   - happy-meta ==0.2.0.11
@@ -1147,7 +1137,7 @@ default-package-overrides:
   - html-entities ==1.1.4.5
   - html-entity-map ==0.1.0.0
   - htoml ==1.0.0.3
-  - http2 ==3.0.1
+  - http2 ==3.0.2
   - HTTP ==4000.3.16
   - http-api-data ==0.4.2
   - http-client ==0.6.4.1
@@ -1187,12 +1177,10 @@ default-package-overrides:
   - hw-hspec-hedgehog ==0.1.1.0
   - hw-int ==0.0.2.0
   - hw-ip ==2.4.2.0
-  - hw-json ==1.3.2.2
   - hw-json-simd ==0.1.1.0
   - hw-json-simple-cursor ==0.1.1.0
   - hw-json-standard-cursor ==0.2.3.1
   - hw-kafka-client ==4.0.3
-  - hw-mquery ==0.2.1.0
   - hw-packed-vector ==0.2.1.0
   - hw-parser ==0.1.1.0
   - hw-prim ==0.6.3.0
@@ -1305,12 +1293,13 @@ default-package-overrides:
   - js-flot ==0.8.3
   - js-jquery ==3.3.1
   - json-feed ==1.0.13
+  - jsonifier ==0.1.1
   - jsonpath ==0.2.0.0
   - json-rpc ==1.0.3
   - json-rpc-generic ==0.2.1.5
   - JuicyPixels ==3.3.5
   - JuicyPixels-blurhash ==0.1.0.3
-  - JuicyPixels-extra ==0.5.0
+  - JuicyPixels-extra ==0.5.1
   - JuicyPixels-scale-dct ==0.1.2
   - junit-xml ==0.1.0.2
   - justified-containers ==0.3.0.0
@@ -1363,7 +1352,7 @@ default-package-overrides:
   - lazyio ==0.1.0.4
   - lazysmallcheck ==0.6
   - lca ==0.4
-  - leancheck ==0.9.6
+  - leancheck ==0.9.10
   - leancheck-instances ==0.0.4
   - leapseconds-announced ==2017.1.0.1
   - learn-physics ==0.6.5
@@ -1410,7 +1399,7 @@ default-package-overrides:
   - list-t ==1.0.4
   - list-transformer ==1.0.7
   - ListTree ==0.2.3
-  - literatex ==0.1.0.0
+  - literatex ==0.1.0.2
   - little-rio ==0.2.2
   - llvm-hs ==9.0.1
   - llvm-hs-pure ==9.0.0
@@ -1452,7 +1441,7 @@ default-package-overrides:
   - markdown ==0.1.17.4
   - markdown-unlit ==0.5.1
   - markov-chain ==0.0.3.4
-  - massiv ==0.6.0.0
+  - massiv ==0.6.1.0
   - massiv-io ==0.4.1.0
   - massiv-persist ==0.1.0.0
   - massiv-serialise ==0.1.0.0
@@ -1510,7 +1499,7 @@ default-package-overrides:
   - min-max-pqueue ==0.1.0.2
   - mintty ==0.1.2
   - missing-foreign ==0.1.1
-  - mixed-types-num ==0.5.7.0
+  - mixed-types-num ==0.5.8.0
   - mltool ==0.2.0.1
   - mmap ==0.5.9
   - mmark ==0.0.7.2
@@ -1648,14 +1637,15 @@ default-package-overrides:
   - nqe ==0.6.3
   - nri-env-parser ==0.1.0.7
   - nri-observability ==0.1.0.2
-  - nri-prelude ==0.6.0.0
+  - nri-prelude ==0.6.0.1
   - nsis ==0.3.3
   - numbers ==3000.2.0.2
   - numeric-extras ==0.1
+  - numeric-limits ==0.1.0.0
   - numeric-prelude ==0.4.3.3
   - numhask ==0.7.1.0
   - NumInstances ==1.4
-  - numtype-dk ==0.5.0.2
+  - numtype-dk ==0.5.0.3
   - nuxeo ==0.3.2
   - nvim-hs ==2.1.0.4
   - nvim-hs-contrib ==2.0.0.0
@@ -1683,10 +1673,10 @@ default-package-overrides:
   - openpgp-asciiarmor ==0.1.2
   - opensource ==0.1.1.0
   - openssl-streams ==1.2.3.0
-  - opentelemetry ==0.6.1
-  - opentelemetry-extra ==0.6.1
-  - opentelemetry-lightstep ==0.6.1
-  - opentelemetry-wai ==0.6.1
+  - opentelemetry ==0.7.0
+  - opentelemetry-extra ==0.7.0
+  - opentelemetry-lightstep ==0.7.0
+  - opentelemetry-wai ==0.7.0
   - operational ==0.2.3.5
   - operational-class ==0.3.0.0
   - optics ==0.3
@@ -1710,10 +1700,10 @@ default-package-overrides:
   - pagure-cli ==0.2
   - pandoc ==2.13
   - pandoc-dhall-decoder ==0.1.0.1
-  - pandoc-plot ==1.2.2
+  - pandoc-plot ==1.2.3
   - pandoc-throw ==0.1.0.0
   - pandoc-types ==1.22
-  - pantry ==0.5.2.1
+  - pantry ==0.5.2.2
   - parallel ==3.2.2.0
   - parameterized ==0.5.0.0
   - paripari ==0.7.0.0
@@ -1735,10 +1725,10 @@ default-package-overrides:
   - path-binary-instance ==0.1.0.1
   - path-extensions ==0.1.1.0
   - path-extra ==0.2.0
-  - path-io ==1.6.2
+  - path-io ==1.6.3
   - path-like ==0.2.0.2
   - path-pieces ==0.2.1
-  - path-text-utf8 ==0.0.1.6
+  - path-text-utf8 ==0.0.1.8
   - pathtype ==0.8.1.1
   - pathwalk ==0.3.1.2
   - pattern-arrows ==0.0.2
@@ -1759,10 +1749,10 @@ default-package-overrides:
   - persistable-record ==0.6.0.5
   - persistable-types-HDBC-pg ==0.0.3.5
   - persistent ==2.13.0.2
-  - persistent-mtl ==0.2.1.0
+  - persistent-mtl ==0.2.2.0
   - persistent-mysql ==2.13.0.1
   - persistent-pagination ==0.1.1.2
-  - persistent-postgresql ==2.13.0.1
+  - persistent-postgresql ==2.13.0.2
   - persistent-qq ==2.12.0.1
   - persistent-sqlite ==2.13.0.3
   - persistent-template ==2.12.0.0
@@ -1855,11 +1845,12 @@ default-package-overrides:
   - product-isomorphic ==0.0.3.3
   - product-profunctors ==0.11.0.2
   - profiterole ==0.1
-  - profunctors ==5.5.2
+  - profunctors ==5.6.2
   - projectroot ==0.2.0.1
   - project-template ==0.2.1.0
   - prometheus ==2.2.2
   - prometheus-client ==1.0.1
+  - prometheus-metrics-ghc ==1.0.1.1
   - prometheus-wai-middleware ==1.0.1.0
   - promises ==0.3
   - prompt ==0.1.1.2
@@ -1871,14 +1862,10 @@ default-package-overrides:
   - protocol-buffers-descriptor ==2.4.17
   - protocol-radius ==0.0.1.1
   - protocol-radius-test ==0.1.0.1
-  - proto-lens ==0.7.0.0
-  - proto-lens-protobuf-types ==0.7.0.0
-  - proto-lens-protoc ==0.7.0.0
-  - proto-lens-runtime ==0.7.0.0
-  - proto-lens-setup ==0.4.0.4
   - protolude ==0.3.0
   - proxied ==0.3.1
   - psqueues ==0.2.7.2
+  - ptr-poker ==0.1.1.4
   - publicsuffix ==0.20200526
   - pulse-simple ==0.1.14
   - pureMD5 ==2.1.3
@@ -1945,7 +1932,7 @@ default-package-overrides:
   - readable ==0.3.1
   - read-editor ==0.1.0.2
   - read-env-var ==1.0.0.0
-  - rebase ==1.6.1
+  - rebase ==1.13.0.1
   - record-dot-preprocessor ==0.2.11
   - record-hasfield ==1.0
   - records-sop ==0.1.1.0
@@ -1971,7 +1958,7 @@ default-package-overrides:
   - regex-pcre ==0.95.0.0
   - regex-pcre-builtin ==0.95.2.3.8.43
   - regex-posix ==0.96.0.0
-  - regex-tdfa ==1.3.1.0
+  - regex-tdfa ==1.3.1.1
   - regex-with-pcre ==1.1.0.0
   - registry ==0.2.0.3
   - reinterpret-cast ==0.1.0
@@ -1988,7 +1975,7 @@ default-package-overrides:
   - repline ==0.4.0.0
   - req ==3.9.0
   - req-conduit ==1.0.0
-  - rerebase ==1.6.1
+  - rerebase ==1.13.0.1
   - rescue ==0.4.2.1
   - resistor-cube ==0.0.1.2
   - resolv ==0.1.2.0
@@ -2016,14 +2003,15 @@ default-package-overrides:
   - rosezipper ==0.2
   - rot13 ==0.2.0.1
   - rpmbuild-order ==0.4.5
-  - rp-tree ==0.3.6
+  - rp-tree ==0.4
   - RSA ==2.4.1
   - runmemo ==1.0.0.1
   - rvar ==0.2.0.6
   - safe ==0.3.19
-  - safe-coloured-text ==0.0.0.0
+  - safe-coloured-text ==0.1.0.0
+  - safe-coloured-text-terminfo ==0.0.0.0
   - safecopy ==0.10.4.2
-  - safe-decimal ==0.2.0.0
+  - safe-decimal ==0.2.1.0
   - safe-exceptions ==0.1.7.1
   - safe-foldable ==0.1.0.0
   - safeio ==0.0.5.0
@@ -2031,17 +2019,15 @@ default-package-overrides:
   - safe-money ==0.9
   - SafeSemaphore ==0.10.1
   - safe-tensor ==0.2.1.1
-  - salak ==0.3.6
-  - salak-yaml ==0.3.5.3
   - saltine ==0.1.1.1
   - salve ==1.0.11
   - sample-frame ==0.0.3
   - sample-frame-np ==0.0.4.1
   - sampling ==0.3.5
-  - sandwich ==0.1.0.6
+  - sandwich ==0.1.0.7
   - sandwich-quickcheck ==0.1.0.5
   - sandwich-slack ==0.1.0.4
-  - sandwich-webdriver ==0.1.0.4
+  - sandwich-webdriver ==0.1.0.5
   - say ==0.1.0.1
   - sbp ==2.6.3
   - sbv ==8.15
@@ -2104,7 +2090,8 @@ default-package-overrides:
   - servant-foreign ==0.15.3
   - servant-http-streams ==0.18.2
   - servant-machines ==0.15.1
-  - servant-multipart ==0.12
+  - servant-multipart ==0.12.1
+  - servant-multipart-api ==0.12.1
   - servant-openapi3 ==2.0.1.2
   - servant-pipes ==0.15.2
   - servant-rawm ==1.0.0.0
@@ -2195,7 +2182,7 @@ default-package-overrides:
   - sparse-tensor ==0.2.1.5
   - spatial-math ==0.5.0.1
   - special-values ==0.1.0.0
-  - speculate ==0.4.6
+  - speculate ==0.4.8
   - speedy-slice ==0.3.2
   - Spintax ==0.3.6
   - splice ==0.6.1.1
@@ -2264,7 +2251,7 @@ default-package-overrides:
   - string-random ==0.1.4.1
   - stringsearch ==0.3.6.6
   - string-transform ==1.1.1
-  - stripe-concepts ==1.0.2.6
+  - stripe-concepts ==1.0.2.8
   - stripe-core ==2.6.2
   - stripe-haskell ==2.6.2
   - stripe-http-client ==2.6.2
@@ -2282,12 +2269,12 @@ default-package-overrides:
   - sweet-egison ==0.1.1.3
   - swish ==0.10.0.4
   - syb ==0.7.2.1
-  - sydtest ==0.1.0.0
+  - sydtest ==0.2.0.0
   - sydtest-discover ==0.0.0.0
-  - sydtest-persistent-sqlite ==0.0.0.0
-  - sydtest-servant ==0.0.0.0
-  - sydtest-wai ==0.0.0.0
-  - sydtest-yesod ==0.0.0.0
+  - sydtest-persistent-sqlite ==0.1.0.0
+  - sydtest-servant ==0.1.0.0
+  - sydtest-wai ==0.1.0.0
+  - sydtest-yesod ==0.1.0.0
   - symbol ==0.2.4
   - symengine ==0.1.2.0
   - symmetry-operations-symbols ==0.0.2.1
@@ -2451,7 +2438,7 @@ default-package-overrides:
   - triplesec ==0.2.2.1
   - trivial-constraint ==0.7.0.0
   - tsv2csv ==0.1.0.2
-  - ttc ==0.4.0.0
+  - ttc ==1.1.0.0
   - ttl-hashtables ==1.4.1.0
   - ttrie ==0.1.2.1
   - tuple ==0.3.0.2
@@ -2517,7 +2504,7 @@ default-package-overrides:
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.5.3
   - unix-time ==0.4.7
-  - unliftio ==0.2.17
+  - unliftio ==0.2.18
   - unliftio-core ==0.2.0.1
   - unliftio-pool ==0.2.1.1
   - unliftio-streams ==0.1.1.1
@@ -2592,6 +2579,7 @@ default-package-overrides:
   - wai-middleware-auth ==0.2.4.1
   - wai-middleware-caching ==0.1.0.2
   - wai-middleware-clacks ==0.1.0.1
+  - wai-middleware-prometheus ==1.0.0
   - wai-middleware-static ==0.9.0
   - wai-rate-limit ==0.1.0.0
   - wai-rate-limit-redis ==0.1.0.0
@@ -2619,7 +2607,7 @@ default-package-overrides:
   - wide-word ==0.1.1.2
   - wikicfp-scraper ==0.1.0.12
   - wild-bind ==0.1.2.7
-  - wild-bind-x11 ==0.2.0.12
+  - wild-bind-x11 ==0.2.0.13
   - Win32 ==2.6.1.0
   - Win32-notify ==0.3.0.3
   - windns ==0.1.0.1
@@ -2678,7 +2666,7 @@ default-package-overrides:
   - xss-sanitize ==0.3.6
   - xxhash-ffi ==0.2.0.0
   - yaml ==0.11.5.0
-  - yamlparse-applicative ==0.1.0.4
+  - yamlparse-applicative ==0.2.0.0
   - yesod ==1.6.1.1
   - yesod-auth ==1.6.10.3
   - yesod-auth-hashdb ==1.7.1.7
@@ -2710,7 +2698,7 @@ default-package-overrides:
   - zeromq4-patterns ==0.3.1.0
   - zim-parser ==0.2.1.0
   - zio ==0.1.0.2
-  - zip ==1.7.0
+  - zip ==1.7.1
   - zip-archive ==0.4.1
   - zipper-extra ==0.1.3.2
   - zippers ==0.3.1

From f60d1f542a0fd7291bd8fa127eca0d4e8b6fce6b Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sat, 12 Jun 2021 19:42:22 +0200
Subject: [PATCH 04/30] all-cabal-hashes: 2021-06-06T15:18:11Z ->
 2021-06-12T16:23:24Z

This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
---
 pkgs/data/misc/hackage/pin.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json
index 0ba838bda4ab..3fc3fc21e477 100644
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@@ -1,6 +1,6 @@
 {
-  "commit": "d1a32be92531e75b1acae3126313cdc013951965",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d1a32be92531e75b1acae3126313cdc013951965.tar.gz",
-  "sha256": "190m9drzg7rgkjpimlgvl8hsv2g1jg0m0fdgy8xkrh7xr1vjxxgz",
-  "msg": "Update from Hackage at 2021-06-06T15:18:11Z"
+  "commit": "7708395682f798fe3649bd05387ab571fcf8890c",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7708395682f798fe3649bd05387ab571fcf8890c.tar.gz",
+  "sha256": "0pfv9nmccp9q6p77lmyh8jqkvq1ad392zyy72g8y6kdsgy71nir5",
+  "msg": "Update from Hackage at 2021-06-12T16:23:24Z"
 }

From 9ea19887f6856bb01222395b66e8f4e257f8ff66 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sat, 12 Jun 2021 19:43:46 +0200
Subject: [PATCH 05/30] haskellPackages: regenerate package set based on
 current config

This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
---
 .../haskell-modules/hackage-packages.nix      | 2140 ++++++-----------
 1 file changed, 725 insertions(+), 1415 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ebfdbae6ba66..78753421dfcb 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3316,25 +3316,6 @@ self: {
      }) {inherit (pkgs) libdevil;};
 
   "Color" = callPackage
-    ({ mkDerivation, base, colour, criterion, data-default-class
-     , deepseq, doctest, hspec, HUnit, JuicyPixels, massiv, massiv-test
-     , QuickCheck, random, vector
-     }:
-     mkDerivation {
-       pname = "Color";
-       version = "0.3.1";
-       sha256 = "1gg15kb6za69w0b3x8pzrqbrh9b8g7g0zwj2a9ajf0wgp8kylp5b";
-       libraryHaskellDepends = [ base data-default-class deepseq vector ];
-       testHaskellDepends = [
-         base colour doctest hspec HUnit JuicyPixels massiv massiv-test
-         QuickCheck random vector
-       ];
-       benchmarkHaskellDepends = [ base colour criterion deepseq random ];
-       description = "Color spaces and conversions between them";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "Color_0_3_2" = callPackage
     ({ mkDerivation, base, colour, criterion, data-default-class
      , deepseq, doctest, hspec, HUnit, JuicyPixels, massiv, massiv-test
      , QuickCheck, random, vector
@@ -3351,7 +3332,6 @@ self: {
        benchmarkHaskellDepends = [ base colour criterion deepseq random ];
        description = "Color spaces and conversions between them";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Combinatorrent" = callPackage
@@ -11669,23 +11649,6 @@ self: {
      }) {};
 
   "JuicyPixels-extra" = callPackage
-    ({ mkDerivation, base, criterion, hspec, hspec-discover
-     , JuicyPixels
-     }:
-     mkDerivation {
-       pname = "JuicyPixels-extra";
-       version = "0.5.0";
-       sha256 = "1r6rpasakl4s7x53y6wz34rkg4xxjhh8zfm9aqdjnxc7b8ir0nbb";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base JuicyPixels ];
-       testHaskellDepends = [ base hspec JuicyPixels ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [ base criterion JuicyPixels ];
-       description = "Efficiently scale, crop, flip images with JuicyPixels";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "JuicyPixels-extra_0_5_1" = callPackage
     ({ mkDerivation, base, criterion, hspec, hspec-discover
      , JuicyPixels
      }:
@@ -11700,7 +11663,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion JuicyPixels ];
        description = "Efficiently scale, crop, flip images with JuicyPixels";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "JuicyPixels-repa" = callPackage
@@ -21911,17 +21873,18 @@ self: {
     ({ mkDerivation, base, bytestring, Cabal, case-insensitive
      , containers, deepseq, ghc-prim, hashable, hspec, hspec-discover
      , HUnit, integer-gmp, primitive, QuickCheck, quickcheck-instances
-     , scientific, tagged, template-haskell, time, unordered-containers
+     , scientific, tagged, template-haskell, time, unicode-collation
+     , unordered-containers
      }:
      mkDerivation {
        pname = "Z-Data";
-       version = "0.8.5.0";
-       sha256 = "1ib9lhhjymr4020yqrc318xqp7swr17iiczpb18d061ngcw8xi90";
+       version = "0.8.7.0";
+       sha256 = "0a68ymcgmack4z4zz9vb20g2jgs41ga00fc4612rq9qjywn26yxd";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          base bytestring case-insensitive containers deepseq ghc-prim
          hashable integer-gmp primitive QuickCheck scientific tagged
-         template-haskell time unordered-containers
+         template-haskell time unicode-collation unordered-containers
        ];
        testHaskellDepends = [
          base containers hashable hspec HUnit integer-gmp primitive
@@ -21943,8 +21906,8 @@ self: {
      }:
      mkDerivation {
        pname = "Z-IO";
-       version = "0.8.1.0";
-       sha256 = "08nw9jxg2n8yls5p1dhyy976qbcj5kwv468fq1dijn91f7ylhfix";
+       version = "0.8.1.1";
+       sha256 = "05d4dbvzdr2sall0sj9yh8hv09lh1af4bqfhnbss2jlj1jc1y1dr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -24258,29 +24221,6 @@ self: {
      }) {};
 
   "aern2-mp" = callPackage
-    ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec
-     , integer-logarithms, mixed-types-num, QuickCheck, reflection
-     , regex-tdfa, template-haskell
-     }:
-     mkDerivation {
-       pname = "aern2-mp";
-       version = "0.2.6.0";
-       sha256 = "0vfjgcf2pnspaixgxg8av7k0cqv5cqmy161zkgjr822n118an1ch";
-       libraryHaskellDepends = [
-         base cdar-mBound collect-errors deepseq hspec integer-logarithms
-         mixed-types-num QuickCheck reflection regex-tdfa template-haskell
-       ];
-       testHaskellDepends = [
-         base cdar-mBound collect-errors deepseq hspec integer-logarithms
-         mixed-types-num QuickCheck reflection regex-tdfa template-haskell
-       ];
-       description = "Multi-precision ball (interval) arithmetic";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "aern2-mp_0_2_7_0" = callPackage
     ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec
      , integer-logarithms, mixed-types-num, QuickCheck, reflection
      , regex-tdfa, template-haskell
@@ -24304,27 +24244,6 @@ self: {
      }) {};
 
   "aern2-real" = callPackage
-    ({ mkDerivation, aern2-mp, base, collect-errors, hspec
-     , integer-logarithms, mixed-types-num, QuickCheck
-     }:
-     mkDerivation {
-       pname = "aern2-real";
-       version = "0.2.6.0";
-       sha256 = "182vjrbdzjcpbbhmpsmv6i685jrnw94vda37646d1gph5v3hvfw6";
-       libraryHaskellDepends = [
-         aern2-mp base collect-errors hspec integer-logarithms
-         mixed-types-num QuickCheck
-       ];
-       testHaskellDepends = [
-         aern2-mp base collect-errors hspec integer-logarithms
-         mixed-types-num QuickCheck
-       ];
-       description = "Real numbers as sequences of MPBalls";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
-  "aern2-real_0_2_7_0" = callPackage
     ({ mkDerivation, aern2-mp, base, collect-errors, hspec
      , integer-logarithms, mixed-types-num, QuickCheck
      }:
@@ -25564,21 +25483,6 @@ self: {
      }) {};
 
   "agda2lagda" = callPackage
-    ({ mkDerivation, base, directory, filepath, optparse-applicative }:
-     mkDerivation {
-       pname = "agda2lagda";
-       version = "0.2020.11.1";
-       sha256 = "0yl44jdczy9306b5ifd8iwchr8izna8sd5v2h2qm9ns909wcs1l8";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base directory filepath optparse-applicative
-       ];
-       description = "Translate .agda files into .lagda.tex files.";
-       license = lib.licenses.publicDomain;
-     }) {};
-
-  "agda2lagda_0_2021_6_1" = callPackage
     ({ mkDerivation, base, directory, filepath, goldplate
      , optparse-applicative, process
      }:
@@ -25595,7 +25499,6 @@ self: {
        testToolDepends = [ goldplate ];
        description = "Translate .agda files into .lagda.tex files.";
        license = lib.licenses.publicDomain;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "agentx" = callPackage
@@ -32862,15 +32765,15 @@ self: {
 
   "arithmoi" = callPackage
     ({ mkDerivation, array, base, chimera, constraints, containers
-     , deepseq, exact-pi, gauge, integer-gmp, integer-logarithms
-     , integer-roots, mod, QuickCheck, quickcheck-classes, random
-     , semirings, smallcheck, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-rerun, tasty-smallcheck, transformers, vector
+     , deepseq, exact-pi, integer-gmp, integer-logarithms, integer-roots
+     , mod, QuickCheck, quickcheck-classes, random, semirings
+     , smallcheck, tasty, tasty-bench, tasty-hunit, tasty-quickcheck
+     , tasty-rerun, tasty-smallcheck, transformers, vector, vector-sized
      }:
      mkDerivation {
        pname = "arithmoi";
-       version = "0.11.0.1";
-       sha256 = "1dz6gpwnyw02lff8xh5vmf1vsknnvnd3vh3iix0r6f1hkf03xi8y";
+       version = "0.12.0.0";
+       sha256 = "1lghgr4z2vhafj8d8971pdghih6r5qq5xlc0b87jmazyhzz95w3f";
        configureFlags = [ "-f-llvm" ];
        libraryHaskellDepends = [
          array base chimera constraints containers deepseq exact-pi
@@ -32879,12 +32782,13 @@ self: {
        ];
        testHaskellDepends = [
          base containers exact-pi integer-gmp integer-roots mod QuickCheck
-         quickcheck-classes semirings smallcheck tasty tasty-hunit
+         quickcheck-classes random semirings smallcheck tasty tasty-hunit
          tasty-quickcheck tasty-rerun tasty-smallcheck transformers vector
+         vector-sized
        ];
        benchmarkHaskellDepends = [
-         array base constraints containers deepseq gauge integer-logarithms
-         mod random semirings vector
+         array base constraints containers deepseq integer-logarithms mod
+         random semirings tasty-bench vector
        ];
        description = "Efficient basic number-theoretic functions";
        license = lib.licenses.mit;
@@ -35530,6 +35434,41 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "aura_3_2_5" = callPackage
+    ({ mkDerivation, aeson, algebraic-graphs, aur, base, bytestring
+     , containers, filepath, hashable, http-client, http-client-tls
+     , http-types, language-bash, megaparsec, network-uri
+     , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
+     , rio, scheduler, stm, tasty, tasty-hunit, text, time, transformers
+     , typed-process, versions
+     }:
+     mkDerivation {
+       pname = "aura";
+       version = "3.2.5";
+       sha256 = "1zrsjcvmhh3y0pahnz2fr944j2xz8sv4dcd9xz08vci4x1lm87hr";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson algebraic-graphs aur base bytestring containers filepath
+         hashable http-client http-types language-bash megaparsec
+         network-uri prettyprinter prettyprinter-ansi-terminal rio scheduler
+         stm text time transformers typed-process versions
+       ];
+       executableHaskellDepends = [
+         aeson aur base bytestring containers http-client http-client-tls
+         megaparsec optparse-applicative prettyprinter
+         prettyprinter-ansi-terminal rio scheduler text transformers
+         typed-process versions
+       ];
+       testHaskellDepends = [
+         base bytestring containers megaparsec rio tasty tasty-hunit text
+         versions
+       ];
+       description = "A secure package manager for Arch Linux and the AUR";
+       license = lib.licenses.gpl3Only;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "authenticate" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
      , case-insensitive, conduit, containers, html-conduit, http-conduit
@@ -36277,8 +36216,8 @@ self: {
      }:
      mkDerivation {
        pname = "aws-cloudfront-signed-cookies";
-       version = "0.2.0.6";
-       sha256 = "19kzrmjw3vfv3v1s35fqdvixlxha43sdb29d60fwjkzvg7al9scv";
+       version = "0.2.0.8";
+       sha256 = "07640asv46gvqqzv8d050x19b2j6wjasm98gpy6047aqg1a6f3ac";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44218,8 +44157,8 @@ self: {
      }:
      mkDerivation {
        pname = "blucontrol";
-       version = "0.3.2.0";
-       sha256 = "1rg9gsrkwnpabrpgl0xh0z9wa1gkqi5vgxpfg7lfz6jcb72qsas6";
+       version = "0.5.0.0";
+       sha256 = "1xqwhzxgjn7fza46whp8rdpvsglly577hxjxlaqb67174rq29zgi";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -49136,8 +49075,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-rpm";
-       version = "2.0.8";
-       sha256 = "18ryg2qv1ppxkylgniw4iava9gh410pp6ibm1362ij52128z6rhz";
+       version = "2.0.9";
+       sha256 = "1r6a0dki4wsrmq5xfjb9bkj0dl7cnhwdf46427k71ay90hmc6ncq";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -52330,30 +52269,6 @@ self: {
      }) {dttools = null;};
 
   "cdar-mBound" = callPackage
-    ({ mkDerivation, base, containers, criterion, deepseq, integer-gmp
-     , parallel, QuickCheck, smallcheck, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck
-     }:
-     mkDerivation {
-       pname = "cdar-mBound";
-       version = "0.1.0.2";
-       sha256 = "1qzpb9kwswln7vbj0v0qm6fsi6v3v9xx701hyfg12y3f9hz096zf";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base containers deepseq integer-gmp ];
-       executableHaskellDepends = [ base containers deepseq integer-gmp ];
-       testHaskellDepends = [
-         base containers deepseq integer-gmp QuickCheck smallcheck tasty
-         tasty-hunit tasty-quickcheck tasty-smallcheck
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion deepseq integer-gmp parallel
-       ];
-       description = "Exact real arithmetic using Centred Dyadic Approximations";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "cdar-mBound_0_1_0_4" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, integer-gmp
      , smallcheck, tasty, tasty-hunit, tasty-quickcheck
      , tasty-smallcheck
@@ -52372,7 +52287,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Exact real arithmetic using Centred Dyadic Approximations";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "cdeps" = callPackage
@@ -54937,6 +54851,25 @@ self: {
        broken = true;
      }) {};
 
+  "circular_0_4_0_0" = callPackage
+    ({ mkDerivation, aeson, base, criterion, hspec, primitive
+     , QuickCheck, quickcheck-instances, vector
+     }:
+     mkDerivation {
+       pname = "circular";
+       version = "0.4.0.0";
+       sha256 = "1542z19mf0ck3x8n62slw88rbmqy8dgwjlsz145a0i8lb8f79kn1";
+       libraryHaskellDepends = [ aeson base primitive vector ];
+       testHaskellDepends = [
+         aeson base hspec primitive QuickCheck quickcheck-instances vector
+       ];
+       benchmarkHaskellDepends = [ base criterion vector ];
+       description = "Circular fixed-sized mutable vectors";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "cirru-parser" = callPackage
     ({ mkDerivation, aeson, base, text, vector }:
      mkDerivation {
@@ -57652,8 +57585,8 @@ self: {
      }:
      mkDerivation {
        pname = "cobot-io";
-       version = "0.1.3.19";
-       sha256 = "1gs4q04iyzzfwij58bbmhz2app3gf4xj0dnd4x4bhkgwj7gmvf4m";
+       version = "0.1.3.20";
+       sha256 = "075s6rhzyldm5c9g27ljwhs8xyxghk8cpm2742l3h69j9y7v3xnc";
        libraryHaskellDepends = [
          array attoparsec base binary bytestring containers data-msgpack
          deepseq http-conduit hyraxAbif lens linear mtl split text vector
@@ -62781,8 +62714,8 @@ self: {
      }:
      mkDerivation {
        pname = "consumers";
-       version = "2.2.0.3";
-       sha256 = "0jvh3mf7jmrv3zjplc5cjmpyj7h15573l6dlyzn3c2jhj61zjwkk";
+       version = "2.2.0.4";
+       sha256 = "0rssm2ygr395djjzkrzcq3vylc83k58flwcpqb4cb3w1id55ph5r";
        libraryHaskellDepends = [
          base containers exceptions extra hpqtypes lifted-base
          lifted-threads log-base monad-control monad-time mtl stm time
@@ -62911,8 +62844,8 @@ self: {
     ({ mkDerivation, base, base-unicode-symbols, containers }:
      mkDerivation {
        pname = "containers-unicode-symbols";
-       version = "0.3.1.2";
-       sha256 = "006znsrwz3sssvg53mail2xd98hq6y4l83140sd2fzyg4df25js7";
+       version = "0.3.1.3";
+       sha256 = "1qz404fjcc00c2zxphzrm1r8i9q3hd8h9lndhd9ddxy3cx3jw8r6";
        libraryHaskellDepends = [ base base-unicode-symbols containers ];
        description = "Unicode alternatives for common functions and operators";
        license = lib.licenses.bsd3;
@@ -64651,8 +64584,8 @@ self: {
     ({ mkDerivation, base, containers, directory, parallel }:
      mkDerivation {
        pname = "cpsa";
-       version = "3.6.6";
-       sha256 = "1mg85yjx4fjsnzfmbz0gh78agis44nqqmnc8rwdqkrp6vka1v9ks";
+       version = "3.6.7";
+       sha256 = "113w03i4a5xxxr9qc9zd2b00sp0m8lbf1mpgwf5zam3jjxzcq4x0";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -65932,8 +65865,8 @@ self: {
        pname = "crypto-enigma";
        version = "0.1.1.6";
        sha256 = "07qxrpwg9r2w2l0d2nrvn703vzsfhchznly93bnr2pfpbwj4iv2z";
-       revision = "4";
-       editedCabalFile = "0436kl0gsy0hj7dfrqmwz95q3k31af731q484yx2gj9zcma1h1vp";
+       revision = "6";
+       editedCabalFile = "1zp6mx1d0dbffc046770mzl1zmwvz4h54xznmmqzbijmnmsc0y3c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers split text ];
@@ -73132,8 +73065,8 @@ self: {
     ({ mkDerivation, aeson, base, bytestring }:
      mkDerivation {
        pname = "deriving-aeson";
-       version = "0.2.6.1";
-       sha256 = "014f3jsaiwqkz2l0jap8shwq3rdn1hq14ahmq0hm3l4c98vznjra";
+       version = "0.2.7";
+       sha256 = "02mx8z1cgqn9wgwcp94am2g655hhn7sn12sikmm8jhbldnyv3ziz";
        libraryHaskellDepends = [ aeson base ];
        testHaskellDepends = [ aeson base bytestring ];
        description = "Type driven generic aeson instance customisation";
@@ -73669,63 +73602,6 @@ self: {
      }) {};
 
   "dhall" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write
-     , base, bytestring, case-insensitive, cborg, cborg-json, containers
-     , contravariant, cryptonite, data-fix, deepseq, Diff, directory
-     , doctest, dotgen, either, exceptions, filepath, foldl, gauge
-     , generic-random, half, hashable, haskeline, http-client
-     , http-client-tls, http-types, lens-family-core, megaparsec, memory
-     , mmorph, mockery, mtl, network-uri, optparse-applicative
-     , parser-combinators, parsers, pretty-simple, prettyprinter
-     , prettyprinter-ansi-terminal, profunctors, QuickCheck
-     , quickcheck-instances, repline, scientific, serialise
-     , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit
-     , tasty-quickcheck, tasty-silver, template-haskell, text
-     , text-manipulate, th-lift-instances, transformers
-     , transformers-compat, turtle, unordered-containers, uri-encode
-     , vector
-     }:
-     mkDerivation {
-       pname = "dhall";
-       version = "1.38.1";
-       sha256 = "0g70x2crdrkwf41gvwr718am25dmbn9bg4cml9f9va7i1vx5rsgk";
-       revision = "2";
-       editedCabalFile = "02z0jmzzp20yj46iz6i384xwc6k2anxb33smvc4yhpmhqjs0aq8a";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty ansi-terminal atomic-write base bytestring
-         case-insensitive cborg cborg-json containers contravariant
-         cryptonite data-fix deepseq Diff directory dotgen either exceptions
-         filepath half hashable haskeline http-client http-client-tls
-         http-types lens-family-core megaparsec memory mmorph mtl
-         network-uri optparse-applicative parser-combinators parsers
-         pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors
-         repline scientific serialise template-haskell text text-manipulate
-         th-lift-instances transformers transformers-compat
-         unordered-containers uri-encode vector
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base bytestring cborg containers data-fix deepseq directory doctest
-         either filepath foldl generic-random http-client http-client-tls
-         lens-family-core megaparsec mockery prettyprinter QuickCheck
-         quickcheck-instances scientific serialise special-values spoon
-         tasty tasty-expected-failure tasty-hunit tasty-quickcheck
-         tasty-silver template-haskell text transformers turtle
-         unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring containers directory gauge text
-       ];
-       doCheck = false;
-       description = "A configuration language guaranteed to terminate";
-       license = lib.licenses.bsd3;
-       maintainers = with lib.maintainers; [ Gabriel439 ];
-     }) {};
-
-  "dhall_1_39_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write
      , base, bytestring, case-insensitive, cborg, cborg-json, containers
      , contravariant, cryptonite, data-fix, deepseq, Diff, directory
@@ -73777,35 +73653,10 @@ self: {
        doCheck = false;
        description = "A configuration language guaranteed to terminate";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
        maintainers = with lib.maintainers; [ Gabriel439 ];
      }) {};
 
   "dhall-bash" = callPackage
-    ({ mkDerivation, base, bytestring, containers, dhall
-     , neat-interpolation, optparse-generic, shell-escape, text
-     }:
-     mkDerivation {
-       pname = "dhall-bash";
-       version = "1.0.36";
-       sha256 = "0hg45xjl1pcla9xbds40qrxcx2h6b4ysw8kbx8hpnaqaazr2jrw0";
-       revision = "1";
-       editedCabalFile = "1jc74gydr3yx01xp1a69a3g9mbfqyzsmv1053xm51bcxxv6p6z9d";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers dhall neat-interpolation shell-escape
-         text
-       ];
-       executableHaskellDepends = [
-         base bytestring dhall optparse-generic text
-       ];
-       description = "Compile Dhall to Bash";
-       license = lib.licenses.bsd3;
-       maintainers = with lib.maintainers; [ Gabriel439 ];
-     }) {};
-
-  "dhall-bash_1_0_37" = callPackage
     ({ mkDerivation, base, bytestring, containers, dhall
      , neat-interpolation, optparse-generic, shell-escape, text
      }:
@@ -73824,7 +73675,6 @@ self: {
        ];
        description = "Compile Dhall to Bash";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
        maintainers = with lib.maintainers; [ Gabriel439 ];
      }) {};
 
@@ -73913,36 +73763,6 @@ self: {
      }) {};
 
   "dhall-json" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal
-     , base, bytestring, containers, dhall, exceptions, filepath
-     , lens-family-core, optparse-applicative, prettyprinter
-     , prettyprinter-ansi-terminal, scientific, tasty, tasty-hunit
-     , tasty-silver, text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "dhall-json";
-       version = "1.7.6";
-       sha256 = "1fl5ngp1qh77qr27ax5009siy20cas6fm55776zhs82zb96sli0n";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty aeson-yaml base bytestring containers dhall
-         exceptions filepath lens-family-core optparse-applicative
-         prettyprinter scientific text unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         aeson aeson-pretty ansi-terminal base bytestring dhall exceptions
-         optparse-applicative prettyprinter prettyprinter-ansi-terminal text
-       ];
-       testHaskellDepends = [
-         aeson base bytestring dhall tasty tasty-hunit tasty-silver text
-       ];
-       description = "Convert between Dhall and JSON or YAML";
-       license = lib.licenses.bsd3;
-       maintainers = with lib.maintainers; [ Gabriel439 ];
-     }) {};
-
-  "dhall-json_1_7_7" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal
      , base, bytestring, containers, dhall, exceptions, filepath
      , lens-family-core, optparse-applicative, prettyprinter
@@ -73969,7 +73789,6 @@ self: {
        ];
        description = "Convert between Dhall and JSON or YAML";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
        maintainers = with lib.maintainers; [ Gabriel439 ];
      }) {};
 
@@ -73993,38 +73812,6 @@ self: {
      }) {};
 
   "dhall-lsp-server" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
-     , data-default, dhall, dhall-json, directory, doctest, filepath
-     , haskell-lsp, haskell-lsp-types, hslogger, lens, lsp-test
-     , megaparsec, mtl, network-uri, optparse-applicative, prettyprinter
-     , QuickCheck, rope-utf16-splay, tasty, tasty-hspec, text
-     , transformers, unordered-containers, uri-encode
-     }:
-     mkDerivation {
-       pname = "dhall-lsp-server";
-       version = "1.0.14";
-       sha256 = "1jy80w3lr6c0hvn0525h5kn6fh9rj6ir942hdkilrzd9farg6qj9";
-       revision = "1";
-       editedCabalFile = "10947mmbwy5fg52s63cs7lqa6hydrg3w8ka7rfkpdiqn2q9f146r";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring containers data-default dhall
-         dhall-json directory filepath haskell-lsp hslogger lens megaparsec
-         mtl network-uri prettyprinter rope-utf16-splay text transformers
-         unordered-containers uri-encode
-       ];
-       executableHaskellDepends = [ base optparse-applicative ];
-       testHaskellDepends = [
-         base directory doctest filepath haskell-lsp-types lsp-test
-         QuickCheck tasty tasty-hspec text
-       ];
-       description = "Language Server Protocol (LSP) server for Dhall";
-       license = lib.licenses.mit;
-       maintainers = with lib.maintainers; [ Gabriel439 ];
-     }) {};
-
-  "dhall-lsp-server_1_0_15" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , data-default, dhall, dhall-json, directory, doctest, filepath
      , haskell-lsp, haskell-lsp-types, hslogger, hspec, lens, lsp-test
@@ -74051,7 +73838,6 @@ self: {
        ];
        description = "Language Server Protocol (LSP) server for Dhall";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
        maintainers = with lib.maintainers; [ Gabriel439 ];
      }) {};
 
@@ -74243,35 +74029,6 @@ self: {
      }) {};
 
   "dhall-yaml" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, dhall
-     , dhall-json, exceptions, HsYAML, HsYAML-aeson
-     , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
-     , tasty, tasty-expected-failure, tasty-hunit, text, vector
-     }:
-     mkDerivation {
-       pname = "dhall-yaml";
-       version = "1.2.6";
-       sha256 = "0v6f513hxn382h4l8hyj9gxara3xdfcrldzri0i3yjvir62bkicm";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring dhall dhall-json HsYAML HsYAML-aeson
-         optparse-applicative text vector
-       ];
-       executableHaskellDepends = [
-         aeson ansi-terminal base bytestring dhall dhall-json exceptions
-         optparse-applicative prettyprinter prettyprinter-ansi-terminal text
-       ];
-       testHaskellDepends = [
-         base bytestring dhall dhall-json tasty tasty-expected-failure
-         tasty-hunit text
-       ];
-       description = "Convert between Dhall and YAML";
-       license = lib.licenses.gpl3Only;
-       maintainers = with lib.maintainers; [ Gabriel439 ];
-     }) {};
-
-  "dhall-yaml_1_2_7" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, dhall
      , dhall-json, exceptions, HsYAML, HsYAML-aeson
      , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
@@ -74297,7 +74054,6 @@ self: {
        ];
        description = "Convert between Dhall and YAML";
        license = lib.licenses.gpl3Only;
-       hydraPlatforms = lib.platforms.none;
        maintainers = with lib.maintainers; [ Gabriel439 ];
      }) {};
 
@@ -74956,6 +74712,8 @@ self: {
        pname = "diagrams-rasterific";
        version = "1.4.2.1";
        sha256 = "09a1jnpc4kplg1yhv5kxhi0ph22m5xyr0vmnjv2c5wlz72c72z2z";
+       revision = "1";
+       editedCabalFile = "1nc12hm4qbj2lmbpk3a77cd46n5bcf20vwd075qj2vglbca2yl9b";
        libraryHaskellDepends = [
          base bytestring containers data-default-class diagrams-core
          diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels
@@ -75025,8 +74783,8 @@ self: {
        pname = "diagrams-svg";
        version = "1.4.3";
        sha256 = "1ysv6cz0fngrndl4wjmw4hrdj2rik5fxa1dkxzwnlgf1xwpvxgk8";
-       revision = "2";
-       editedCabalFile = "07149rnzc8787mwh0aac5hfg9f41dxgs5wc9yv60fmgk9h5qnw1n";
+       revision = "3";
+       editedCabalFile = "19n3g9wvp2fj4dlz3ssyjqx1b6ihskg5s595x9z2c99bpbzyykkv";
        libraryHaskellDepends = [
          base base64-bytestring bytestring colour containers diagrams-core
          diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl
@@ -77663,18 +77421,6 @@ self: {
      }) {};
 
   "dlist" = callPackage
-    ({ mkDerivation, base, Cabal, deepseq, QuickCheck }:
-     mkDerivation {
-       pname = "dlist";
-       version = "0.8.0.8";
-       sha256 = "0va9xk8g2iag24x042q3w6z77xdqd91112kh0piq8cwd0qccyabi";
-       libraryHaskellDepends = [ base deepseq ];
-       testHaskellDepends = [ base Cabal QuickCheck ];
-       description = "Difference lists";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "dlist_1_0" = callPackage
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
        pname = "dlist";
@@ -77684,7 +77430,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Difference lists";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "dlist-instances" = callPackage
@@ -78835,8 +78580,8 @@ self: {
      }:
      mkDerivation {
        pname = "domain";
-       version = "0.1.1";
-       sha256 = "0ykf1bxd0xmgdhkvd8rp14p4zccpwp5ywj2yiyh6mpp4sp03qwiw";
+       version = "0.1.1.1";
+       sha256 = "1vy789dv1lpha2bxvr0x1vk2vvgb9z43abkqi1rbj2vvirqsbr1n";
        libraryHaskellDepends = [
          attoparsec base bytestring domain-core foldl hashable
          parser-combinators template-haskell template-haskell-compat-v0208
@@ -78893,8 +78638,8 @@ self: {
      }:
      mkDerivation {
        pname = "domain-optics";
-       version = "0.1";
-       sha256 = "0nivzn3nw30n1wb0i2j9qzxfmqcyknc187z3rkfyz5a5y7iq7x4m";
+       version = "0.1.0.1";
+       sha256 = "1ypsnwy9rv9yldyc2v5w6q2az87dmj9dyalsmg7nnymaip4jm1dm";
        libraryHaskellDepends = [
          base domain-core optics-core template-haskell
          template-haskell-compat-v0208 text th-lego unordered-containers
@@ -82317,8 +82062,8 @@ self: {
     ({ mkDerivation, base, containers, doctest }:
      mkDerivation {
        pname = "either-list-functions";
-       version = "0.0.4.4";
-       sha256 = "1kh10iykk6gqzl78smrwv1zl8dcy0ns2raisx5qchcvrdgshzdiy";
+       version = "0.0.4.5";
+       sha256 = "1q77nq24sxig4xangcxzyg3dzm9yphj5w5l143q84am098hp0vkn";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base doctest ];
        description = "Functions involving lists of Either";
@@ -83353,6 +83098,24 @@ self: {
        license = lib.licenses.gpl3Plus;
      }) {};
 
+  "elynx_0_5_1_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, elynx-tools
+     , optparse-applicative, slynx, tlynx
+     }:
+     mkDerivation {
+       pname = "elynx";
+       version = "0.5.1.0";
+       sha256 = "05i3g1c7kdnji46y17215nv9vk21w3zi26z1ngqa8dnfswfx1d0i";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base bytestring elynx-tools optparse-applicative slynx tlynx
+       ];
+       description = "Validate and (optionally) redo ELynx analyses";
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "elynx-markov" = callPackage
     ({ mkDerivation, async, attoparsec, base, bytestring, containers
      , elynx-seq, elynx-tools, hmatrix, hspec, integration
@@ -83374,6 +83137,28 @@ self: {
        license = lib.licenses.gpl3Plus;
      }) {};
 
+  "elynx-markov_0_5_1_0" = callPackage
+    ({ mkDerivation, async, attoparsec, base, bytestring, containers
+     , elynx-seq, elynx-tools, hmatrix, hspec, integration
+     , math-functions, mwc-random, primitive, statistics, vector
+     }:
+     mkDerivation {
+       pname = "elynx-markov";
+       version = "0.5.1.0";
+       sha256 = "1wpq62in9zlap01an6swdf9n1x2pall1vfh4hw5r7zpn7vik1mfx";
+       libraryHaskellDepends = [
+         async attoparsec base bytestring containers elynx-seq hmatrix
+         integration math-functions mwc-random primitive statistics vector
+       ];
+       testHaskellDepends = [
+         base containers elynx-tools hmatrix hspec mwc-random vector
+       ];
+       benchmarkHaskellDepends = [ base ];
+       description = "Simulate molecular sequences along trees";
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "elynx-nexus" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hspec }:
      mkDerivation {
@@ -83386,6 +83171,19 @@ self: {
        license = lib.licenses.gpl3Plus;
      }) {};
 
+  "elynx-nexus_0_5_1_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, hspec }:
+     mkDerivation {
+       pname = "elynx-nexus";
+       version = "0.5.1.0";
+       sha256 = "0inl9bw7793zbji42gasj4vckigzmr1l4yqf66f9ss958pmgh5n9";
+       libraryHaskellDepends = [ attoparsec base bytestring ];
+       testHaskellDepends = [ base hspec ];
+       description = "Import and export Nexus files";
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "elynx-seq" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , elynx-tools, hspec, matrices, mwc-random, parallel, primitive
@@ -83406,6 +83204,27 @@ self: {
        license = lib.licenses.gpl3Plus;
      }) {};
 
+  "elynx-seq_0_5_1_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
+     , elynx-tools, hspec, matrices, mwc-random, parallel, primitive
+     , vector, vector-th-unbox, word8
+     }:
+     mkDerivation {
+       pname = "elynx-seq";
+       version = "0.5.1.0";
+       sha256 = "069fj6ap0yj5bn2r3d5bk85dy02r3fr8prd5hvky6l5gxvpvzcm0";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring containers matrices mwc-random
+         parallel primitive vector vector-th-unbox word8
+       ];
+       testHaskellDepends = [
+         base bytestring elynx-tools hspec matrices vector
+       ];
+       description = "Handle molecular sequences";
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "elynx-tools" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , bytestring, cryptohash-sha256, deepseq, directory, fast-logger
@@ -83428,6 +83247,29 @@ self: {
        license = lib.licenses.gpl3Plus;
      }) {};
 
+  "elynx-tools_0_5_1_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
+     , bytestring, cryptohash-sha256, deepseq, directory, hmatrix
+     , monad-control, monad-logger, mwc-random, optparse-applicative
+     , primitive, template-haskell, text, time, transformers
+     , transformers-base, vector, zlib
+     }:
+     mkDerivation {
+       pname = "elynx-tools";
+       version = "0.5.1.0";
+       sha256 = "0djfxqxc5aivvljzi7c8xabi7k23y7gnk5wqmdvw4riqpsc7by0y";
+       libraryHaskellDepends = [
+         aeson attoparsec base base16-bytestring bytestring
+         cryptohash-sha256 deepseq directory hmatrix monad-control
+         monad-logger mwc-random optparse-applicative primitive
+         template-haskell text time transformers transformers-base vector
+         zlib
+       ];
+       description = "Tools for ELynx";
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "elynx-tree" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad
      , containers, criterion, deepseq, double-conversion, elynx-nexus
@@ -83453,6 +83295,32 @@ self: {
        license = lib.licenses.gpl3Plus;
      }) {};
 
+  "elynx-tree_0_5_1_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad
+     , containers, criterion, deepseq, double-conversion, elynx-nexus
+     , elynx-tools, hspec, math-functions, microlens, mwc-random
+     , parallel, primitive, QuickCheck, statistics
+     }:
+     mkDerivation {
+       pname = "elynx-tree";
+       version = "0.5.1.0";
+       sha256 = "117my1fv16yw51qf0aa7mi6311d98jfmpvpsivwxyayhwi55g2q6";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring comonad containers deepseq
+         double-conversion elynx-nexus math-functions mwc-random parallel
+         primitive statistics
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring containers elynx-tools hspec QuickCheck
+       ];
+       benchmarkHaskellDepends = [
+         base criterion elynx-tools microlens mwc-random parallel
+       ];
+       description = "Handle phylogenetic trees";
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "ema" = callPackage
     ({ mkDerivation, aeson, async, base, blaze-html, blaze-markup
      , commonmark, commonmark-extensions, commonmark-pandoc, containers
@@ -84118,6 +83986,8 @@ self: {
        pname = "entropy";
        version = "0.4.1.6";
        sha256 = "0qmzz0zgad13zl0kjrxz6cxg8ckn2w8saas2a2j72vbafpzmkixd";
+       revision = "1";
+       editedCabalFile = "0jyyyn1cfi1cjisbgym90nw2vx2082ghvwg54ibnjzbii9aj7fj9";
        setupHaskellDepends = [ base Cabal directory filepath process ];
        libraryHaskellDepends = [ base bytestring unix ];
        description = "A platform independent entropy source";
@@ -87810,19 +87680,6 @@ self: {
      }) {};
 
   "express" = callPackage
-    ({ mkDerivation, base, leancheck, template-haskell }:
-     mkDerivation {
-       pname = "express";
-       version = "0.1.12";
-       sha256 = "1055qj5ymlzshva94i1gfr6sfmjgv1rhxpx5h76fdq5ia6hkd68z";
-       libraryHaskellDepends = [ base template-haskell ];
-       testHaskellDepends = [ base leancheck ];
-       benchmarkHaskellDepends = [ base leancheck ];
-       description = "Dynamically-typed expressions involving applications and variables";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "express_0_1_14" = callPackage
     ({ mkDerivation, base, leancheck, template-haskell }:
      mkDerivation {
        pname = "express";
@@ -87833,7 +87690,6 @@ self: {
        benchmarkHaskellDepends = [ base leancheck ];
        description = "Dynamically-typed expressions involving applications and variables";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "expression-parser" = callPackage
@@ -88791,6 +88647,34 @@ self: {
        broken = true;
      }) {};
 
+  "faktory_1_0_3_1" = callPackage
+    ({ mkDerivation, aeson, aeson-casing, async, base, bytestring
+     , connection, cryptonite, errors, hspec, markdown-unlit, megaparsec
+     , memory, mtl, network, random, safe-exceptions, scanner
+     , semigroups, text, time, unix, unordered-containers
+     }:
+     mkDerivation {
+       pname = "faktory";
+       version = "1.0.3.1";
+       sha256 = "0af9wsx3fl701an3bsp7daxa4hxv7pdj16y7cypj3cvdwav5wdsg";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-casing base bytestring connection cryptonite errors
+         megaparsec memory mtl network random safe-exceptions scanner
+         semigroups text time unix unordered-containers
+       ];
+       executableHaskellDepends = [ aeson base safe-exceptions ];
+       testHaskellDepends = [
+         aeson async base hspec markdown-unlit time
+       ];
+       testToolDepends = [ markdown-unlit ];
+       description = "Faktory Worker for Haskell";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "fallible" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -89920,6 +89804,8 @@ self: {
        pname = "feed";
        version = "1.3.2.0";
        sha256 = "0kv3vx3njqlhwvkmf12m1gmwl8jj97kfa60da2362vwdavhcf4dk";
+       revision = "1";
+       editedCabalFile = "0lg9yphl07hbknzx0nvdxvcw05bpxc5ac9sqb26lv4d9nkb72blg";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-compat bytestring old-locale old-time safe text time
@@ -91852,22 +91738,6 @@ self: {
      }) {inherit (pkgs) cfitsio;};
 
   "fitspec" = callPackage
-    ({ mkDerivation, base, cmdargs, leancheck, pretty, template-haskell
-     }:
-     mkDerivation {
-       pname = "fitspec";
-       version = "0.4.8";
-       sha256 = "01xfchs98xy5436kchzysnvwgm00s2srsn5xyxx3r04pzzb5cbd9";
-       libraryHaskellDepends = [
-         base cmdargs leancheck template-haskell
-       ];
-       testHaskellDepends = [ base leancheck ];
-       benchmarkHaskellDepends = [ base pretty ];
-       description = "refining property sets for testing Haskell programs";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "fitspec_0_4_10" = callPackage
     ({ mkDerivation, base, cmdargs, leancheck, pretty, template-haskell
      }:
      mkDerivation {
@@ -91881,7 +91751,6 @@ self: {
        benchmarkHaskellDepends = [ base pretty ];
        description = "refining property sets for testing Haskell programs";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "fix-imports" = callPackage
@@ -95152,26 +95021,6 @@ self: {
      }) {};
 
   "free" = callPackage
-    ({ mkDerivation, base, comonad, containers, distributive
-     , exceptions, indexed-traversable, mtl, profunctors, semigroupoids
-     , template-haskell, th-abstraction, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "free";
-       version = "5.1.5";
-       sha256 = "0rpnimi3iyr6n9q2ny365mp1l5rjjys15aggcikgnrfn0d656nw6";
-       revision = "1";
-       editedCabalFile = "1ac4f5n3spmxy9ajlikn9ffswg9l59s7kzwpgcpz8vkc2qf959g1";
-       libraryHaskellDepends = [
-         base comonad containers distributive exceptions indexed-traversable
-         mtl profunctors semigroupoids template-haskell th-abstraction
-         transformers transformers-base
-       ];
-       description = "Monads for free";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "free_5_1_7" = callPackage
     ({ mkDerivation, base, comonad, containers, distributive
      , exceptions, indexed-traversable, mtl, profunctors, semigroupoids
      , template-haskell, th-abstraction, transformers, transformers-base
@@ -95187,7 +95036,6 @@ self: {
        ];
        description = "Monads for free";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "free-algebras" = callPackage
@@ -97189,8 +97037,8 @@ self: {
      }:
      mkDerivation {
        pname = "fused-effects-exceptions";
-       version = "1.1.0.0";
-       sha256 = "0r5xfv5cknxz21viqcpa8xjd57sbadp2vf7nk7z9j1sd5faprmji";
+       version = "1.1.0.1";
+       sha256 = "1b1qflz64xgw1bd3z794vyvb9906g3x9v72w89z27142a6igy4hr";
        libraryHaskellDepends = [ base fused-effects transformers ];
        testHaskellDepends = [
          base fused-effects tasty tasty-hunit transformers
@@ -97338,22 +97186,6 @@ self: {
      }) {};
 
   "fusion-plugin" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath
-     , fusion-plugin-types, ghc, syb, time, transformers
-     }:
-     mkDerivation {
-       pname = "fusion-plugin";
-       version = "0.2.2";
-       sha256 = "1d7avmbrqgvp9c4jyrlw344hml29f3vy5m5fgyrsd1z3g4fymakb";
-       libraryHaskellDepends = [
-         base containers directory filepath fusion-plugin-types ghc syb time
-         transformers
-       ];
-       description = "GHC plugin to make stream fusion more predictable";
-       license = lib.licenses.asl20;
-     }) {};
-
-  "fusion-plugin_0_2_3" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , fusion-plugin-types, ghc, syb, time, transformers
      }:
@@ -97367,7 +97199,6 @@ self: {
        ];
        description = "GHC plugin to make stream fusion more predictable";
        license = lib.licenses.asl20;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "fusion-plugin-types" = callPackage
@@ -97462,6 +97293,27 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "futhark-data" = callPackage
+    ({ mkDerivation, base, binary, bytestring, bytestring-to-vector
+     , containers, megaparsec, mtl, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, text, vector, vector-binary-instances
+     }:
+     mkDerivation {
+       pname = "futhark-data";
+       version = "1.0.0.1";
+       sha256 = "126b7igrk0aldj4kjwkyvvsy3v64g9iv6w9ladbbfnd4qw7svswm";
+       libraryHaskellDepends = [
+         base binary bytestring bytestring-to-vector containers megaparsec
+         mtl text vector vector-binary-instances
+       ];
+       testHaskellDepends = [
+         base binary bytestring megaparsec QuickCheck tasty tasty-hunit
+         tasty-quickcheck text vector
+       ];
+       description = "An implementation of the Futhark data format";
+       license = lib.licenses.isc;
+     }) {};
+
   "futhask" = callPackage
     ({ mkDerivation, base, directory, raw-strings-qq, split }:
      mkDerivation {
@@ -101328,16 +101180,17 @@ self: {
   "ghc-lib" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
      , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy
-     , hpc, pretty, process, time, transformers, unix
+     , hpc, pretty, process, rts, time, transformers, unix
      }:
      mkDerivation {
        pname = "ghc-lib";
-       version = "8.10.4.20210206";
-       sha256 = "1zzglnpbnj9ijna6g3rmykqir3iqcg2afmjg9q0ng3imbv40slhs";
+       version = "8.10.5.20210606";
+       sha256 = "0bl2jp44s3pd1a1sg0kslkhi97f4z2423kdkizg65m6cvmk25ijs";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
-         ghc-lib-parser ghc-prim hpc pretty process time transformers unix
+         ghc-lib-parser ghc-prim hpc pretty process rts time transformers
+         unix
        ];
        libraryToolDepends = [ alex happy ];
        description = "The GHC API, decoupled from GHC versions";
@@ -101372,8 +101225,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-lib-parser";
-       version = "8.10.4.20210206";
-       sha256 = "07j3j67hxz43l1kkdfanghd935wiccvmw7sgk47fjymw6fdx92p2";
+       version = "8.10.5.20210606";
+       sha256 = "0pqsq49kvqwgbi6jw0dycbdzyldi0sannyqkfzavhqjf4mwjzn4a";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
@@ -101412,8 +101265,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-lib-parser-ex";
-       version = "8.10.0.19";
-       sha256 = "0qdkqv7ss9b2mnf39gpbq7i50ypccnl3wdmxiq148zrxbglzfqw9";
+       version = "8.10.0.21";
+       sha256 = "0ynrn7qdmim35fs9qdlbajqwyz559x1l9cqmjhb54vbrs2xnk6vp";
        libraryHaskellDepends = [
          base bytestring containers ghc ghc-boot ghc-boot-th uniplate
        ];
@@ -105224,8 +105077,8 @@ self: {
      }:
      mkDerivation {
        pname = "githash";
-       version = "0.1.5.0";
-       sha256 = "1m2dhmddn9k75j5wyjilbh40n7fkgi7cyic9l0k2s7g9z93yyvql";
+       version = "0.1.6.0";
+       sha256 = "1mcfzgvqiirlz8vc02wlvvfyf6742f3901ks8rphhabl4b4v1djl";
        libraryHaskellDepends = [
          base bytestring directory filepath process template-haskell
        ];
@@ -109747,8 +109600,8 @@ self: {
      }:
      mkDerivation {
        pname = "google-static-maps";
-       version = "0.6.0.1";
-       sha256 = "0hvkxdwfbn352q642v4n8wj4ikfp97sll87cwkgr3vb23qwmlbyy";
+       version = "0.7.0.0";
+       sha256 = "09ir6y13n3sk34g3nnbhv6rz6kibw1gph6fap8f9dlna1g1s1vrb";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytedump bytestring cryptonite
          double-conversion http-client JuicyPixels memory network-uri
@@ -116576,8 +116429,8 @@ self: {
      }:
      mkDerivation {
        pname = "hapistrano";
-       version = "0.4.1.3";
-       sha256 = "1sk5z0kf9ybhk17y36zf90ljn51j82pyf8rja0cv64ah9bg5zbgq";
+       version = "0.4.1.4";
+       sha256 = "1ci2q3vkjw51k5hbswmcajk7gl1zpmwx3npbkf3kng3j1kcv0bzw";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -116600,7 +116453,7 @@ self: {
        broken = true;
      }) {};
 
-  "hapistrano_0_4_1_4" = callPackage
+  "hapistrano_0_4_2_0" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, base, directory
      , filepath, formatting, gitrev, hspec, hspec-discover, mtl
      , optparse-applicative, path, path-io, process, QuickCheck
@@ -116608,8 +116461,8 @@ self: {
      }:
      mkDerivation {
        pname = "hapistrano";
-       version = "0.4.1.4";
-       sha256 = "1ci2q3vkjw51k5hbswmcajk7gl1zpmwx3npbkf3kng3j1kcv0bzw";
+       version = "0.4.2.0";
+       sha256 = "1f23a0n2pjhacqm275k8njkln3an2x0w48kjgxlrna39mf3fdkwh";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -121495,8 +121348,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-core";
-       version = "0.20.3";
-       sha256 = "0g5d6w6vwkbxf4iqx998q2c5cnhq1bav0ikksdbj98w8b7ga6v0z";
+       version = "0.20.4";
+       sha256 = "0mbq4ixnnjln0qjippmv57qz5p4qx3s0fyr2xj43q5gmis89m4cg";
        libraryHaskellDepends = [
          aeson array base base16 binary bytes bytestring cereal conduit
          containers cryptonite deepseq entropy hashable hspec memory mtl
@@ -121633,8 +121486,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-store";
-       version = "0.53.2";
-       sha256 = "04wm92b7687qivwjia69gahd9y2dasirmyxcbv8liqfp5xfmjbmz";
+       version = "0.53.4";
+       sha256 = "04q5a2hf198949z3dlswjq384ymlasq0my1a7n1v3kfr47hr1cjx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121679,8 +121532,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-store-data";
-       version = "0.53.2";
-       sha256 = "1i949izj89g797zp07qxjx16sd2591gsxbpq94v52vzgd6rl9h7n";
+       version = "0.53.4";
+       sha256 = "034yb730i2f2dklqk6fcygg7c1h1l0zpm0xh6zkp4a7wjb77f4jp";
        libraryHaskellDepends = [
          aeson base binary bytes bytestring cereal containers data-default
          deepseq hashable haskoin-core http-client http-types lens mtl
@@ -121827,6 +121680,8 @@ self: {
        pname = "haskore";
        version = "0.2.0.8";
        sha256 = "0aflqgvkabgscpkii7aiqfffb15nc90chp4q8xrl3bp8c3i4bb5l";
+       revision = "2";
+       editedCabalFile = "00rbyw9401m82innh9gjrdqvzn20vy564hicqnjprs1p1j8jn97g";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122928,8 +122783,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasqlator-mysql";
-       version = "0.0.3";
-       sha256 = "1b1nw3l96gvf2laxw7w72w8ya8aazdhv4w7c5ly47n09hx9q77zp";
+       version = "0.0.8";
+       sha256 = "1ns8ckpvib53s4gvdd3pa5c0ypqw2qw2fwvxakkkd1h66xx8as08";
        libraryHaskellDepends = [
          aeson base binary bytestring containers dlist io-streams megaparsec
          mtl mysql-haskell pretty-simple prettyprinter scientific
@@ -127461,19 +127316,20 @@ self: {
      , nonempty-vector, optparse-applicative, primitive, QuickCheck
      , quickcheck-instances, random, reflection, semigroupoids
      , semigroups, tasty-bench, template-haskell, text, vector
-     , vector-algorithms, vector-builder, vector-circular, vinyl, yaml
+     , vector-algorithms, vector-builder, vector-circular, vinyl
+     , witherable, yaml
      }:
      mkDerivation {
        pname = "hgeometry";
-       version = "0.12.0.2";
-       sha256 = "0l14qvsh1aas414zmwwliq7d7cbpjnrs33mfkfpna6svxw5d0phi";
+       version = "0.12.0.4";
+       sha256 = "1by6x3525hzfk2yr2rkwz4c0vq95x32f5c3bc0sr8kl6yrbabghw";
        libraryHaskellDepends = [
          aeson base bifunctors bytestring containers data-clist deepseq
          dlist fingertree fixed-vector hashable hgeometry-combinatorial
          hspec lens linear MonadRandom mtl nonempty-vector primitive
          QuickCheck quickcheck-instances random reflection semigroupoids
          semigroups template-haskell text vector vector-algorithms
-         vector-builder vector-circular vinyl yaml
+         vector-builder vector-circular vinyl witherable yaml
        ];
        testHaskellDepends = [
          base doctest doctest-discover QuickCheck quickcheck-instances
@@ -127496,12 +127352,12 @@ self: {
      , MonadRandom, mtl, nonempty-vector, primitive, QuickCheck
      , quickcheck-instances, random, reflection, semigroupoids
      , semigroups, template-haskell, text, unordered-containers, vector
-     , vector-builder, vector-circular, vinyl, yaml
+     , vector-builder, vector-circular, vinyl, witherable, yaml
      }:
      mkDerivation {
        pname = "hgeometry-combinatorial";
-       version = "0.12.0.2";
-       sha256 = "1ha9v1imwr7584mzxaba8mplsnb0d02j7bhs2knl03q72aaan4jq";
+       version = "0.12.0.3";
+       sha256 = "0sfng68pirghrnqflxnvysg8x3pnpbwrbc70xsj87gc257adfla9";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson array base bifunctors bytestring containers contravariant
@@ -127509,7 +127365,7 @@ self: {
          math-functions MonadRandom mtl nonempty-vector primitive QuickCheck
          quickcheck-instances random reflection semigroupoids semigroups
          template-haskell text unordered-containers vector vector-builder
-         vector-circular vinyl yaml
+         vector-circular vinyl witherable yaml
        ];
        testHaskellDepends = [
          approximate-equality base bytestring containers data-clist deepseq
@@ -127532,8 +127388,8 @@ self: {
      }:
      mkDerivation {
        pname = "hgeometry-ipe";
-       version = "0.11.0.0";
-       sha256 = "0h78rsxc281wxmg27zxzzak0k15mv61i146gzafihrdg9hpbw1lk";
+       version = "0.12.0.0";
+       sha256 = "0hljjl2812i9nicajc0xb53wfkq7q3hsicdqdj5z8kr8zrf09lbh";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bifunctors bytestring colour containers data-clist
@@ -128695,8 +128551,8 @@ self: {
      }:
      mkDerivation {
        pname = "hindley-milner-type-check";
-       version = "0.1.0.0";
-       sha256 = "0ym8jchjx6n9i6n76b852s511n0vafz8ixr22zx7lrzqi9ax4ayz";
+       version = "0.1.1.0";
+       sha256 = "1xikcxhv59skwx9gjki5zhbcqgjp0lhn2jmf99sls8fwcznbvqj9";
        libraryHaskellDepends = [
          base containers data-fix deepseq deriving-compat dlist mtl
          prettyprinter text
@@ -131717,29 +131573,29 @@ self: {
   "hnix-store-core" = callPackage
     ({ mkDerivation, algebraic-graphs, attoparsec, base
      , base16-bytestring, base64-bytestring, binary, bytestring, cereal
-     , containers, cryptohash-md5, cryptohash-sha1, cryptohash-sha256
-     , cryptohash-sha512, directory, filepath, hashable, hspec
-     , lifted-base, monad-control, mtl, nix-derivation, process, saltine
-     , tasty, tasty-discover, tasty-golden, tasty-hspec, tasty-hunit
-     , tasty-quickcheck, temporary, text, time, unix
+     , containers, cryptonite, directory, filepath, hashable, hspec
+     , lifted-base, memory, monad-control, mtl, nix-derivation, process
+     , saltine, tasty, tasty-discover, tasty-golden, tasty-hspec
+     , tasty-hunit, tasty-quickcheck, temporary, text, time, unix
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "hnix-store-core";
-       version = "0.4.3.0";
-       sha256 = "17l7198s3dzjx416nplinyghbqgignvpvxkww241gjv4p23izf77";
+       version = "0.5.0.0";
+       sha256 = "1w5qmk7qhasv2qydrhg3g5x9s2pjf5602w084lj1zbman44phzv5";
+       revision = "1";
+       editedCabalFile = "05jm5fv7fzp6gpjaw0f40fw58740k0g4cvfacq1bwcr39qnziavg";
        libraryHaskellDepends = [
          algebraic-graphs attoparsec base base16-bytestring
-         base64-bytestring bytestring cereal containers cryptohash-md5
-         cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 directory
-         filepath hashable lifted-base monad-control mtl nix-derivation
-         saltine text time unix unordered-containers vector
+         base64-bytestring bytestring cereal containers cryptonite directory
+         filepath hashable lifted-base memory monad-control mtl
+         nix-derivation saltine text time unix unordered-containers vector
        ];
        testHaskellDepends = [
          attoparsec base base16-bytestring base64-bytestring binary
-         bytestring containers directory filepath hspec process tasty
-         tasty-golden tasty-hspec tasty-hunit tasty-quickcheck temporary
-         text unix
+         bytestring containers cryptonite directory filepath hspec process
+         tasty tasty-golden tasty-hspec tasty-hunit tasty-quickcheck
+         temporary text unix
        ];
        testToolDepends = [ tasty-discover ];
        description = "Core effects for interacting with the Nix store";
@@ -131748,16 +131604,17 @@ self: {
 
   "hnix-store-remote" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring, containers
-     , hnix-store-core, mtl, network, nix-derivation, text, time
-     , unordered-containers
+     , cryptonite, hnix-store-core, mtl, network, nix-derivation, text
+     , time, unordered-containers
      }:
      mkDerivation {
        pname = "hnix-store-remote";
-       version = "0.4.3.1";
-       sha256 = "1wp6z5f13fkgh3mdzr1zcqdvsx1j90l5isf671gsg43brsv4c2vl";
+       version = "0.5.0.0";
+       sha256 = "0xvqi1l84ic249qf566vz3pxv75qwgc5d2cf3grh3rcxchp12kf9";
        libraryHaskellDepends = [
-         attoparsec base binary bytestring containers hnix-store-core mtl
-         network nix-derivation text time unordered-containers
+         attoparsec base binary bytestring containers cryptonite
+         hnix-store-core mtl network nix-derivation text time
+         unordered-containers
        ];
        description = "Remote hnix store";
        license = lib.licenses.asl20;
@@ -134708,8 +134565,8 @@ self: {
      }:
      mkDerivation {
        pname = "hs-aws-lambda";
-       version = "0.1.0.2";
-       sha256 = "078qkvxbjdsqgjmfq4fcpndb8c8cyz4g8s1q0ankpy359dvgxkv8";
+       version = "0.1.0.4";
+       sha256 = "1brykgglhslvgh3jrklr4m3mjcrzp0yq90xxyqh3h0prmswnx9y7";
        libraryHaskellDepends = [
          aeson base bytestring case-insensitive containers deepseq
          http-client http-types safe-exceptions text unliftio
@@ -141419,8 +141276,8 @@ self: {
      }:
      mkDerivation {
        pname = "http2";
-       version = "3.0.1";
-       sha256 = "1c1vhb2x23rlw7ciayz0rx6lpifjwrvpg88nspwa9w5nbjij2258";
+       version = "3.0.2";
+       sha256 = "13c2z35gdimncgpyg5dn5cpjvd83rbrigc8b40crg36678m0k0d1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -146956,6 +146813,20 @@ self: {
        broken = true;
      }) {};
 
+  "include-env" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "include-env";
+       version = "0.1.1.0";
+       sha256 = "0c65dn8r0rizmz71jv9vjf6l3cny31vi0d69jh9i72xwx14nlr77";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base template-haskell ];
+       executableHaskellDepends = [ base ];
+       description = "Include the value of an environment variable at compile time";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "include-file" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, criterion, random
      , template-haskell
@@ -160403,18 +160274,6 @@ self: {
      }) {};
 
   "leancheck" = callPackage
-    ({ mkDerivation, base, template-haskell }:
-     mkDerivation {
-       pname = "leancheck";
-       version = "0.9.6";
-       sha256 = "0nw7hm9aawv6xljii3cjy9qbdbb5p05k5rmc9qv4dkajjjyhyna9";
-       libraryHaskellDepends = [ base template-haskell ];
-       testHaskellDepends = [ base ];
-       description = "Enumerative property-based testing";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "leancheck_0_9_10" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "leancheck";
@@ -160424,7 +160283,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Enumerative property-based testing";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "leancheck-enum-instances" = callPackage
@@ -165212,8 +165070,8 @@ self: {
      }:
      mkDerivation {
        pname = "literatex";
-       version = "0.1.0.0";
-       sha256 = "0nfmvblm3a370a59hyd28wv8xnq1wlxcm5xz4n6b3n5cprj4h99z";
+       version = "0.1.0.2";
+       sha256 = "1axj5a10vj9fkpc89yzb8i7aq23bmygnf3mwvbp63vcvwmfyx49h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -165229,31 +165087,6 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "literatex_0_1_0_1" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, bytestring, conduit
-     , filepath, optparse-applicative, tasty, tasty-hunit, text, ttc
-     , unliftio
-     }:
-     mkDerivation {
-       pname = "literatex";
-       version = "0.1.0.1";
-       sha256 = "0nig3k78h86b80hsfqm04g9jc24lsicbw2pc3wnvxfs3nhkmhl0b";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring conduit text ttc unliftio
-       ];
-       executableHaskellDepends = [
-         ansi-wl-pprint base optparse-applicative ttc
-       ];
-       testHaskellDepends = [
-         base bytestring filepath tasty tasty-hunit text ttc unliftio
-       ];
-       description = "transform literate source code to Markdown";
-       license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
   "little-earley" = callPackage
     ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }:
      mkDerivation {
@@ -166299,18 +166132,17 @@ self: {
 
   "log-base" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq
-     , exceptions, mmorph, monad-control, monad-time, mtl, semigroups
-     , stm, text, time, transformers-base, unliftio-core
-     , unordered-containers
+     , exceptions, mmorph, monad-control, mtl, semigroups, stm, text
+     , time, transformers-base, unliftio-core, unordered-containers
      }:
      mkDerivation {
        pname = "log-base";
-       version = "0.9.1.1";
-       sha256 = "0b69q4vhayqg0n8kzqb4lma289av39zm5qbinnam4hh9inqhayfk";
+       version = "0.10.0.0";
+       sha256 = "1rbp34p7a89w960rpwmqwfqrj6nvqybbc5aqiji60zldxigvy3si";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring deepseq exceptions mmorph
-         monad-control monad-time mtl semigroups stm text time
-         transformers-base unliftio-core unordered-containers
+         monad-control mtl semigroups stm text time transformers-base
+         unliftio-core unordered-containers
        ];
        description = "Structured logging solution (base package)";
        license = lib.licenses.bsd3;
@@ -166378,8 +166210,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-elasticsearch";
-       version = "0.11.0.0";
-       sha256 = "1l64mxk3zmlfsqwlhsq62jp8rawj3jbw9izihg7555q51pbqlg5w";
+       version = "0.12.0.0";
+       sha256 = "05cvk93s61k42bmsmj4997hdij4xk74a6jrd1qvdbkq13w20260m";
        libraryHaskellDepends = [
          aeson aeson-pretty base base64-bytestring bytestring deepseq
          http-client http-client-tls http-types log-base network-uri
@@ -166398,8 +166230,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-postgres";
-       version = "0.7.1.5";
-       sha256 = "0g89403ijgp2xznd497xhvifh2jlgph4raz4l5fh5ajxvcf33hvn";
+       version = "0.8.0.0";
+       sha256 = "0vc3n53rpn3qwysp8y5i19ajaag386izsrf9h9k7c2g907k1skw6";
        libraryHaskellDepends = [
          aeson aeson-pretty base base64-bytestring bytestring deepseq
          hpqtypes http-client lifted-base log-base mtl semigroups split text
@@ -166549,6 +166381,21 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "logfmt" = callPackage
+    ({ mkDerivation, ansi-terminal, base, bytestring, fast-logger
+     , profunctors, time
+     }:
+     mkDerivation {
+       pname = "logfmt";
+       version = "0.0.1";
+       sha256 = "1phnyhh7pmv8mvh7lxbkswdr2j3vid8rb3n8iy34qn301bprnlb4";
+       libraryHaskellDepends = [
+         ansi-terminal base bytestring fast-logger profunctors time
+       ];
+       description = "Formatting";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "logger" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, containers, lens, mtl
      , template-haskell, time, time-locale-compat, transformers
@@ -168640,8 +168487,8 @@ self: {
      }:
      mkDerivation {
        pname = "lzma-static";
-       version = "5.2.5.2";
-       sha256 = "12na1ycwrd7p50g19kgnb6kdgswnkwgzynaf0lyrv30qicpd8a5z";
+       version = "5.2.5.4";
+       sha256 = "0ql96kb7hg50d1flk36999p5p05bqs7rp7a59ys4q02423mq1z7b";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -170850,27 +170697,6 @@ self: {
      }) {};
 
   "massiv" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, doctest, exceptions
-     , mersenne-random-pure64, primitive, QuickCheck, random, scheduler
-     , splitmix, template-haskell, unliftio-core, vector
-     }:
-     mkDerivation {
-       pname = "massiv";
-       version = "0.6.0.0";
-       sha256 = "12p3gcrz3nwry99xhxfrz51aiswm5ira2hyxl4q1g3jfi8vwgcd0";
-       libraryHaskellDepends = [
-         base bytestring deepseq exceptions primitive scheduler
-         unliftio-core vector
-       ];
-       testHaskellDepends = [
-         base doctest mersenne-random-pure64 QuickCheck random splitmix
-         template-haskell
-       ];
-       description = "Massiv (Массив) is an Array Library";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "massiv_0_6_1_0" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, doctest, exceptions
      , mersenne-random-pure64, primitive, QuickCheck, random, scheduler
      , splitmix, template-haskell, unliftio-core, vector
@@ -170889,7 +170715,6 @@ self: {
        ];
        description = "Massiv (Массив) is an Array Library";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "massiv-io" = callPackage
@@ -171605,8 +171430,8 @@ self: {
      }:
      mkDerivation {
        pname = "matterhorn";
-       version = "50200.12.0";
-       sha256 = "0rsxgc4igcjhddfil01la1sbnglvr08mf7gfi9fr6pf7sb9w6qbq";
+       version = "50200.13.0";
+       sha256 = "1wyhqj7jvk94px3npid3lncyccv2xsc3rmfcw616xrf4xsqwisx2";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -171641,8 +171466,8 @@ self: {
      }:
      mkDerivation {
        pname = "mattermost-api";
-       version = "50200.10.0";
-       sha256 = "0pbp4f0gwhap8d9chn6c2zf22ic3r32302zir4a5r6cmgg4vscgd";
+       version = "50200.11.0";
+       sha256 = "0knrc00377wx8j4ly8d2nxqswybp3782j7qig6mrzlww6nbd68j7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -171666,8 +171491,8 @@ self: {
      }:
      mkDerivation {
        pname = "mattermost-api-qc";
-       version = "50200.10.0";
-       sha256 = "0cv7l5g63ar7ii704j8q3y5hsvbmljm8cmgdw6p2shqigv8slzci";
+       version = "50200.11.0";
+       sha256 = "0crz0nc8qbsjyq3fllbj50d01axgwfas76bmr6xnz83sic2s1yw1";
        libraryHaskellDepends = [
          base containers mattermost-api QuickCheck text time
        ];
@@ -172029,6 +171854,34 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "mcmc_0_5_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, circular, containers
+     , criterion, data-default, deepseq, directory, dirichlet
+     , double-conversion, hspec, log-domain, microlens, monad-parallel
+     , mwc-random, pretty-show, primitive, statistics, time
+     , transformers, vector, zlib
+     }:
+     mkDerivation {
+       pname = "mcmc";
+       version = "0.5.0.0";
+       sha256 = "0vfbbzk7rwgan0lf1qxr03mbxlxgq1jccbsvffw4hy1k2s65wysi";
+       libraryHaskellDepends = [
+         aeson base bytestring circular containers data-default deepseq
+         directory dirichlet double-conversion log-domain microlens
+         monad-parallel mwc-random pretty-show primitive statistics time
+         transformers vector zlib
+       ];
+       testHaskellDepends = [
+         base hspec log-domain mwc-random statistics
+       ];
+       benchmarkHaskellDepends = [
+         base criterion log-domain microlens mwc-random
+       ];
+       description = "Sample from a posterior using Markov chain Monte Carlo";
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "mcmc-samplers" = callPackage
     ({ mkDerivation, base, containers, hakaru, hmatrix, mwc-random
      , primitive, statistics
@@ -175622,25 +175475,6 @@ self: {
      }) {};
 
   "mixed-types-num" = callPackage
-    ({ mkDerivation, base, collect-errors, hspec, hspec-smallcheck, mtl
-     , QuickCheck, smallcheck, template-haskell
-     }:
-     mkDerivation {
-       pname = "mixed-types-num";
-       version = "0.5.7.0";
-       sha256 = "0fnf165ff6c4vbc2hlfrydb7w8csk1hjxd86lvnh4y9w6sc9g6hp";
-       libraryHaskellDepends = [
-         base collect-errors hspec hspec-smallcheck mtl QuickCheck
-         smallcheck template-haskell
-       ];
-       testHaskellDepends = [
-         base collect-errors hspec hspec-smallcheck QuickCheck smallcheck
-       ];
-       description = "Alternative Prelude with numeric and logic expressions typed bottom-up";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "mixed-types-num_0_5_8_0" = callPackage
     ({ mkDerivation, base, collect-errors, hspec, hspec-smallcheck, mtl
      , QuickCheck, smallcheck, template-haskell
      }:
@@ -175657,7 +175491,6 @@ self: {
        ];
        description = "Alternative Prelude with numeric and logic expressions typed bottom-up";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "mixpanel-client" = callPackage
@@ -179598,8 +179431,8 @@ self: {
      }:
      mkDerivation {
        pname = "mp";
-       version = "1.2.0";
-       sha256 = "0jn987fg2kah3m39rdgnkmqy940ks2c8f2ld8lrj8k2zyjbgls5b";
+       version = "1.3.0";
+       sha256 = "1491q33yc7if2j9akwxidn1xn3c9idxnjhq3n5izbbijbdg5qnmd";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -181980,8 +181813,8 @@ self: {
      }:
      mkDerivation {
        pname = "musicScroll";
-       version = "0.3.2.1";
-       sha256 = "0q6hglv26qpy1prx4is0jbhgb9xsxkpxbknyah9mcfn7c52cx0c0";
+       version = "0.3.3";
+       sha256 = "07c9yxazl8frl06s7jslg28716xi97azyx7i9pc06zmnag9p2k2z";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -188471,32 +188304,6 @@ self: {
      }) {};
 
   "nri-prelude" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base
-     , bytestring, containers, directory, exceptions, filepath, ghc
-     , hedgehog, junit-xml, pretty-diff, pretty-show, safe-coloured-text
-     , safe-exceptions, terminal-size, text, time, vector
-     }:
-     mkDerivation {
-       pname = "nri-prelude";
-       version = "0.6.0.0";
-       sha256 = "02v83n08zxz8521skijgrn407a0mlkjc3fjn5q04gn932wf29g5s";
-       libraryHaskellDepends = [
-         aeson aeson-pretty async auto-update base bytestring containers
-         directory exceptions filepath ghc hedgehog junit-xml pretty-diff
-         pretty-show safe-coloured-text safe-exceptions terminal-size text
-         time vector
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty async auto-update base bytestring containers
-         directory exceptions filepath ghc hedgehog junit-xml pretty-diff
-         pretty-show safe-coloured-text safe-exceptions terminal-size text
-         time vector
-       ];
-       description = "A Prelude inspired by the Elm programming language";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "nri-prelude_0_6_0_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base
      , bytestring, containers, directory, exceptions, filepath, ghc
      , hedgehog, junit-xml, pretty-diff, pretty-show, safe-coloured-text
@@ -188521,7 +188328,6 @@ self: {
        ];
        description = "A Prelude inspired by the Elm programming language";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "nri-redis" = callPackage
@@ -189261,10 +189067,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "numtype-dk";
-       version = "0.5.0.2";
-       sha256 = "0avkdbhxijcja9i9g3cqh699mys8nhsxgrrpkknycmqpvp07sy4q";
-       revision = "1";
-       editedCabalFile = "0892xm8vyyvl1glg4vniz8r5ydg1nz3zmbpgk5mxdih6wi6nmpy4";
+       version = "0.5.0.3";
+       sha256 = "17mxqw82l3p0n18bjyyxbbnjvwqny4s3fkyj8vgj0ygw9ma534zl";
        libraryHaskellDepends = [ base ];
        description = "Type-level integers, using TypeNats, Data Kinds, and Closed Type Families";
        license = lib.licenses.bsd3;
@@ -189321,25 +189125,28 @@ self: {
      }) {};
 
   "nvfetcher" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, containers, extra
-     , free, microlens, microlens-th, neat-interpolation
-     , optparse-simple, shake, text, tomland, transformers
-     , validation-selective
+    ({ mkDerivation, aeson, base, binary, binary-instances, bytestring
+     , containers, data-default, extra, free, microlens, microlens-th
+     , neat-interpolation, optparse-simple, parsec, shake, text, tomland
+     , transformers, unordered-containers, validation-selective
      }:
      mkDerivation {
        pname = "nvfetcher";
-       version = "0.2.0.0";
-       sha256 = "04gslnmamy79i563ma7kj2b36mqr2c1wlcivqs70akr7s4my3g7z";
+       version = "0.3.0.0";
+       sha256 = "1b6kb7qlnrg74ymhj74ikqs80hmg013vv4rc7sdkb0pfs3l6f6mh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base binary bytestring containers extra free microlens
-         microlens-th neat-interpolation shake text transformers
+         aeson base binary binary-instances bytestring containers
+         data-default extra free microlens microlens-th neat-interpolation
+         optparse-simple parsec shake text tomland transformers
+         unordered-containers
        ];
        executableHaskellDepends = [
-         aeson base binary bytestring containers extra free microlens
-         microlens-th neat-interpolation optparse-simple shake text tomland
-         transformers validation-selective
+         aeson base binary binary-instances bytestring containers
+         data-default extra free microlens microlens-th neat-interpolation
+         optparse-simple parsec shake text tomland transformers
+         unordered-containers validation-selective
        ];
        description = "Generate nix sources expr for the latest version of packages";
        license = lib.licenses.mit;
@@ -191739,20 +191546,6 @@ self: {
      }) {};
 
   "opentelemetry" = callPackage
-    ({ mkDerivation, base, bytestring, exceptions, ghc-trace-events
-     , hashable
-     }:
-     mkDerivation {
-       pname = "opentelemetry";
-       version = "0.6.1";
-       sha256 = "0i88ciig40gil4gaj95qw28c2racdr2jb6rcpnsf60fzkqc8b3fk";
-       libraryHaskellDepends = [
-         base bytestring exceptions ghc-trace-events hashable
-       ];
-       license = lib.licenses.asl20;
-     }) {};
-
-  "opentelemetry_0_7_0" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, ghc-trace-events
      , hashable
      }:
@@ -191764,46 +191557,9 @@ self: {
          base bytestring exceptions ghc-trace-events hashable
        ];
        license = lib.licenses.asl20;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "opentelemetry-extra" = callPackage
-    ({ mkDerivation, aeson, async, base, binary, bytestring, clock
-     , containers, directory, exceptions, filepath, gauge
-     , generic-arbitrary, ghc-events, hashable, hashtables, http-client
-     , http-client-tls, http-types, hvega, opentelemetry, process
-     , QuickCheck, quickcheck-instances, random, scientific, splitmix
-     , stm, tasty, tasty-discover, tasty-hunit, tasty-quickcheck, text
-     , text-show, typed-process, unordered-containers
-     }:
-     mkDerivation {
-       pname = "opentelemetry-extra";
-       version = "0.6.1";
-       sha256 = "0ggxkhcrjj8sg6zf9jnp1j05wwlsay6k95c79j9j3dvw8qy2yjbx";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson async base binary bytestring clock containers directory
-         exceptions filepath ghc-events hashable http-client http-client-tls
-         http-types opentelemetry random scientific splitmix stm text
-         text-show unordered-containers
-       ];
-       executableHaskellDepends = [
-         async base bytestring clock containers directory exceptions
-         filepath hashtables http-client http-client-tls hvega opentelemetry
-         process text typed-process
-       ];
-       testHaskellDepends = [
-         base bytestring generic-arbitrary ghc-events hashable opentelemetry
-         QuickCheck quickcheck-instances splitmix tasty tasty-discover
-         tasty-hunit tasty-quickcheck text text-show unordered-containers
-       ];
-       testToolDepends = [ tasty-discover ];
-       benchmarkHaskellDepends = [ base gauge opentelemetry ];
-       license = lib.licenses.asl20;
-     }) {};
-
-  "opentelemetry-extra_0_7_0" = callPackage
     ({ mkDerivation, async, base, binary, bytestring, clock, containers
      , directory, exceptions, filepath, generic-arbitrary, ghc-events
      , hashable, hashtables, http-client, http-client-tls, http-types
@@ -191837,7 +191593,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        benchmarkHaskellDepends = [ base opentelemetry tasty-bench ];
        license = lib.licenses.asl20;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "opentelemetry-http-client" = callPackage
@@ -191856,32 +191611,6 @@ self: {
      }) {};
 
   "opentelemetry-lightstep" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, clock, containers
-     , exceptions, filepath, ghc-events, http-client, http-client-tls
-     , http-types, network, opentelemetry, opentelemetry-extra
-     , scientific, splitmix, stm, text, typed-process
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "opentelemetry-lightstep";
-       version = "0.6.1";
-       sha256 = "1a7rrm5aahqh63j0rr7nvd4y3q64m8qr7is0r0a17fwkkpppmyln";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson async base bytestring exceptions http-client http-client-tls
-         http-types network opentelemetry opentelemetry-extra scientific stm
-         text unordered-containers
-       ];
-       executableHaskellDepends = [
-         async base bytestring clock containers exceptions filepath
-         ghc-events http-client http-types opentelemetry opentelemetry-extra
-         splitmix text typed-process unordered-containers
-       ];
-       license = lib.licenses.asl20;
-     }) {};
-
-  "opentelemetry-lightstep_0_7_0" = callPackage
     ({ mkDerivation, async, base, bytestring, clock, containers
      , exceptions, filepath, ghc-events, http-client, http-client-tls
      , http-types, network, opentelemetry, opentelemetry-extra
@@ -191905,24 +191634,9 @@ self: {
          splitmix text typed-process unordered-containers
        ];
        license = lib.licenses.asl20;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "opentelemetry-wai" = callPackage
-    ({ mkDerivation, base, bytestring, http-types, opentelemetry, text
-     , wai
-     }:
-     mkDerivation {
-       pname = "opentelemetry-wai";
-       version = "0.6.1";
-       sha256 = "0g1a044sphd35z9crc8wbxsk4hfh1gpfi4g8rr1k4f842hznj7nf";
-       libraryHaskellDepends = [
-         base bytestring http-types opentelemetry text wai
-       ];
-       license = lib.licenses.asl20;
-     }) {};
-
-  "opentelemetry-wai_0_7_0" = callPackage
     ({ mkDerivation, base, bytestring, http-types, opentelemetry, text
      , wai
      }:
@@ -191934,7 +191648,6 @@ self: {
          base bytestring http-types opentelemetry text wai
        ];
        license = lib.licenses.asl20;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "opentheory" = callPackage
@@ -195070,8 +194783,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-plot";
-       version = "1.2.2";
-       sha256 = "0lj4a1nn78zsv7rms3irk0fy390k2yfd6ck687x9h1xqmsdhd3kd";
+       version = "1.2.3";
+       sha256 = "0r7xymgkk2c3fmdfk4vljdwbl2k3jrk40aa7f7y277fp5nxnqgp8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -195247,8 +194960,8 @@ self: {
     ({ mkDerivation }:
      mkDerivation {
        pname = "pandora";
-       version = "0.4.1";
-       sha256 = "0gn47zw0rzvdj1d1gwqy49di6f8lpvy53wfcs2g163nz9vil8xka";
+       version = "0.4.2";
+       sha256 = "1gn3bl9nls9rqn2mdxdiaik740l2g8ji7djn6626j4jnmvwkcwks";
        description = "A box of patterns and paradigms";
        license = lib.licenses.mit;
      }) {};
@@ -195400,47 +195113,6 @@ self: {
      }) {};
 
   "pantry" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal
-     , casa-client, casa-types, conduit, conduit-extra, containers
-     , cryptonite, cryptonite-conduit, digest, exceptions, filelock
-     , generic-deriving, hackage-security, hedgehog, hpack, hspec
-     , http-client, http-client-tls, http-conduit, http-download
-     , http-types, memory, mtl, network-uri, path, path-io, persistent
-     , persistent-sqlite, persistent-template, primitive, QuickCheck
-     , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint
-     , tar-conduit, text, text-metrics, time, transformers, unix-compat
-     , unliftio, unordered-containers, vector, yaml, zip-archive
-     }:
-     mkDerivation {
-       pname = "pantry";
-       version = "0.5.2.1";
-       sha256 = "0g1v78mgxa6mn0vm6yii3nzfdwpn4hgrlcld1h3mbwaxn6c8116k";
-       libraryHaskellDepends = [
-         aeson ansi-terminal base bytestring Cabal casa-client casa-types
-         conduit conduit-extra containers cryptonite cryptonite-conduit
-         digest filelock generic-deriving hackage-security hpack http-client
-         http-client-tls http-conduit http-download http-types memory mtl
-         network-uri path path-io persistent persistent-sqlite
-         persistent-template primitive resourcet rio rio-orphans
-         rio-prettyprint tar-conduit text text-metrics time transformers
-         unix-compat unliftio unordered-containers vector yaml zip-archive
-       ];
-       testHaskellDepends = [
-         aeson ansi-terminal base bytestring Cabal casa-client casa-types
-         conduit conduit-extra containers cryptonite cryptonite-conduit
-         digest exceptions filelock generic-deriving hackage-security
-         hedgehog hpack hspec http-client http-client-tls http-conduit
-         http-download http-types memory mtl network-uri path path-io
-         persistent persistent-sqlite persistent-template primitive
-         QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint
-         tar-conduit text text-metrics time transformers unix-compat
-         unliftio unordered-containers vector yaml zip-archive
-       ];
-       description = "Content addressable Haskell package management";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "pantry_0_5_2_2" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal
      , casa-client, casa-types, conduit, conduit-extra, containers
      , cryptonite, cryptonite-conduit, digest, exceptions, filelock
@@ -195479,7 +195151,6 @@ self: {
        ];
        description = "Content addressable Haskell package management";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "pantry-tmp" = callPackage
@@ -196094,6 +195765,8 @@ self: {
        pname = "parallel-tree-search";
        version = "0.4.2";
        sha256 = "08r8xl3x5zvsy3d3ss9m9l7kb0dyp7hjrwxlnz7g2jl7p5x8rjbd";
+       revision = "1";
+       editedCabalFile = "1d1wm16ydyyd1izm5mvrrxlqix8k98zvmfl418dsj446mfa2ih76";
        libraryHaskellDepends = [ base parallel tree-monad ];
        description = "Parallel Tree Search";
        license = lib.licenses.publicDomain;
@@ -196923,16 +196596,29 @@ self: {
      }) {};
 
   "parsley" = callPackage
+    ({ mkDerivation, base, parsley-core, template-haskell, text }:
+     mkDerivation {
+       pname = "parsley";
+       version = "1.0.0.0";
+       sha256 = "08g89wgynvr58xypcpvd552v7h16cb1rbfggiyr8dj49bmgm0hwx";
+       libraryHaskellDepends = [
+         base parsley-core template-haskell text
+       ];
+       description = "A fast parser combinator library backed by Typed Template Haskell";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "parsley-core" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, cpphs
      , dependent-map, dependent-sum, ghc-prim, hashable, mtl
      , pretty-terminal, template-haskell, text, unordered-containers
      }:
      mkDerivation {
-       pname = "parsley";
-       version = "0.1.0.1";
-       sha256 = "01rslkkisbrgdn2d8hzrag2z6hh9gjilp2bg0j87n8awzm1i2n19";
-       revision = "1";
-       editedCabalFile = "16rpf1l3ph3yil2jnyp9z0j46afb38bii52bwkl4blk2f781k97z";
+       pname = "parsley-core";
+       version = "1.0.0.0";
+       sha256 = "0vcvxnmnml5jsjicx6rhskkb30ggz95wjlfcj1fzxc9si9vlkh4j";
        libraryHaskellDepends = [
          array base bytestring containers dependent-map dependent-sum
          ghc-prim hashable mtl pretty-terminal template-haskell text
@@ -196941,8 +196627,21 @@ self: {
        libraryToolDepends = [ cpphs ];
        description = "A fast parser combinator library backed by Typed Template Haskell";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
+     }) {};
+
+  "parsley-garnish" = callPackage
+    ({ mkDerivation, base, ghc, ghc-tcplugins-extra, parsley-core, syb
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "parsley-garnish";
+       version = "1.0.0.0";
+       sha256 = "1vxl3ibxa923q4vxhvgxhf41p6c9ynmr18mmr7yrjrnc7arn615f";
+       libraryHaskellDepends = [
+         base ghc ghc-tcplugins-extra parsley-core syb template-haskell
+       ];
+       description = "A collection of GHC plugins to work with parsley";
+       license = lib.licenses.bsd3;
      }) {};
 
   "parsnip" = callPackage
@@ -197570,26 +197269,6 @@ self: {
      }) {};
 
   "path-io" = callPackage
-    ({ mkDerivation, base, containers, directory, dlist, exceptions
-     , filepath, hspec, path, temporary, time, transformers, unix-compat
-     }:
-     mkDerivation {
-       pname = "path-io";
-       version = "1.6.2";
-       sha256 = "11mrs0awd343far3rmcphdli65g737haxg7fwx3pl04fgdxfbpdq";
-       libraryHaskellDepends = [
-         base containers directory dlist exceptions filepath path temporary
-         time transformers unix-compat
-       ];
-       testHaskellDepends = [
-         base directory exceptions filepath hspec path transformers
-         unix-compat
-       ];
-       description = "Interface to ‘directory’ package for users of ‘path’";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "path-io_1_6_3" = callPackage
     ({ mkDerivation, base, containers, directory, dlist, exceptions
      , filepath, hspec, path, temporary, time, transformers, unix-compat
      }:
@@ -197607,7 +197286,6 @@ self: {
        ];
        description = "Interface to ‘directory’ package for users of ‘path’";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "path-like" = callPackage
@@ -197637,19 +197315,6 @@ self: {
      }) {};
 
   "path-text-utf8" = callPackage
-    ({ mkDerivation, base, bytestring, path, safe-exceptions, text }:
-     mkDerivation {
-       pname = "path-text-utf8";
-       version = "0.0.1.6";
-       sha256 = "0zlmmfjzjgnhscy8852gi67hq8xl9j05c53faf599cqa6c71ry11";
-       libraryHaskellDepends = [
-         base bytestring path safe-exceptions text
-       ];
-       description = "Read and write UTF-8 text files";
-       license = lib.licenses.asl20;
-     }) {};
-
-  "path-text-utf8_0_0_1_8" = callPackage
     ({ mkDerivation, base, bytestring, path, safe-exceptions, text }:
      mkDerivation {
        pname = "path-text-utf8";
@@ -197660,7 +197325,6 @@ self: {
        ];
        description = "Read and write UTF-8 text files";
        license = lib.licenses.asl20;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "path-utils" = callPackage
@@ -199805,31 +199469,6 @@ self: {
      }) {};
 
   "persistent-mtl" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, containers
-     , monad-logger, mtl, persistent, persistent-postgresql
-     , persistent-sqlite, persistent-template, resource-pool, resourcet
-     , tasty, tasty-golden, tasty-hunit, text, transformers, unliftio
-     , unliftio-core, unliftio-pool
-     }:
-     mkDerivation {
-       pname = "persistent-mtl";
-       version = "0.2.1.0";
-       sha256 = "1lwzkxb55bb4ldcwxkkfjfly39bnjjdg01yihl6znx8y3c461yrx";
-       libraryHaskellDepends = [
-         base conduit containers mtl persistent resource-pool resourcet text
-         transformers unliftio unliftio-core unliftio-pool
-       ];
-       testHaskellDepends = [
-         base bytestring conduit containers monad-logger persistent
-         persistent-postgresql persistent-sqlite persistent-template
-         resource-pool resourcet tasty tasty-golden tasty-hunit text
-         unliftio
-       ];
-       description = "Monad transformer for the persistent API";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "persistent-mtl_0_2_2_0" = callPackage
     ({ mkDerivation, base, bytestring, conduit, containers
      , monad-logger, mtl, persistent, persistent-postgresql
      , persistent-sqlite, persistent-template, resource-pool, resourcet
@@ -199852,7 +199491,6 @@ self: {
        ];
        description = "Monad transformer for the persistent API";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "persistent-mysql" = callPackage
@@ -199971,39 +199609,6 @@ self: {
      }) {};
 
   "persistent-postgresql" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
-     , conduit, containers, fast-logger, hspec, hspec-expectations
-     , hspec-expectations-lifted, http-api-data, HUnit, monad-logger
-     , mtl, path-pieces, persistent, persistent-qq, persistent-test
-     , postgresql-libpq, postgresql-simple, QuickCheck
-     , quickcheck-instances, resource-pool, resourcet
-     , string-conversions, text, time, transformers, unliftio
-     , unliftio-core, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "persistent-postgresql";
-       version = "2.13.0.1";
-       sha256 = "186anbb0sgml094pw1nb529pddi4q1af0mcv3xa8bshr1xywpnd8";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base blaze-builder bytestring conduit containers
-         monad-logger mtl persistent postgresql-libpq postgresql-simple
-         resource-pool resourcet string-conversions text time transformers
-         unliftio-core
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers fast-logger hspec
-         hspec-expectations hspec-expectations-lifted http-api-data HUnit
-         monad-logger path-pieces persistent persistent-qq persistent-test
-         QuickCheck quickcheck-instances resourcet text time transformers
-         unliftio unliftio-core unordered-containers vector
-       ];
-       description = "Backend for the persistent library using postgresql";
-       license = lib.licenses.mit;
-     }) {};
-
-  "persistent-postgresql_2_13_0_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
      , conduit, containers, fast-logger, hspec, hspec-expectations
      , hspec-expectations-lifted, http-api-data, HUnit, monad-logger
@@ -200034,7 +199639,6 @@ self: {
        ];
        description = "Backend for the persistent library using postgresql";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "persistent-protobuf" = callPackage
@@ -205090,8 +204694,8 @@ self: {
      }:
      mkDerivation {
        pname = "polysemy-RandomFu";
-       version = "0.4.2.0";
-       sha256 = "0rsmdp7p0asmaf13wf5ky0ngrmnqdfbi67y4a0vcwqvknqmlys2y";
+       version = "0.4.2.1";
+       sha256 = "16r167cx87y9l36psa3ffrcfjyhm4ngzbbsmm9c5dh3gvq53vw58";
        libraryHaskellDepends = [
          base polysemy polysemy-plugin polysemy-zoo random-fu random-source
        ];
@@ -210285,24 +209889,6 @@ self: {
      }) {coapplicative = null;};
 
   "profunctors" = callPackage
-    ({ mkDerivation, base, base-orphans, bifunctors, comonad
-     , contravariant, distributive, tagged, transformers
-     }:
-     mkDerivation {
-       pname = "profunctors";
-       version = "5.5.2";
-       sha256 = "0z5gk2ip4x2z0jad9lnsnq1q1i8bbgchw3bwgiy3gbmgp2m7j5az";
-       revision = "1";
-       editedCabalFile = "0b73nqyl3yc3q4r0asrciqx7q19y6ygfszb79kn37pndnzj4m0hd";
-       libraryHaskellDepends = [
-         base base-orphans bifunctors comonad contravariant distributive
-         tagged transformers
-       ];
-       description = "Profunctors";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "profunctors_5_6_2" = callPackage
     ({ mkDerivation, base, base-orphans, bifunctors, comonad
      , contravariant, distributive, tagged, transformers
      }:
@@ -210316,7 +209902,6 @@ self: {
        ];
        description = "Profunctors";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "progress" = callPackage
@@ -211343,6 +210928,8 @@ self: {
        pname = "proto3-suite";
        version = "0.4.2";
        sha256 = "015cg6brf6v0h2h2d36hqqr9i69vr30bhc35av55v0d65ya0sczz";
+       revision = "1";
+       editedCabalFile = "1s9mr6y31kbm0f316i7q0w4qgmi0mas23dhbam6i9pshfa0bav0x";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -212562,18 +212149,17 @@ self: {
      , http-types, HUnit, language-javascript, lifted-async, lifted-base
      , memory, microlens, microlens-platform, monad-control
      , monad-logger, mtl, network, optparse-applicative, parallel
-     , parsec, pattern-arrows, process, protolude, purescript-ast
-     , purescript-cst, regex-base, regex-tdfa, safe, scientific
-     , semialign, semigroups, serialise, sourcemap, split, stm
-     , stringsearch, syb, tasty, tasty-golden, tasty-hspec
-     , tasty-quickcheck, text, these, time, transformers
-     , transformers-base, transformers-compat, unordered-containers
-     , utf8-string, vector, wai, wai-websockets, warp, websockets
+     , parsec, pattern-arrows, process, protolude, purescript-cst
+     , QuickCheck, regex-base, regex-tdfa, safe, scientific, semialign
+     , semigroups, serialise, sourcemap, split, stm, stringsearch, syb
+     , text, these, time, transformers, transformers-base
+     , transformers-compat, unordered-containers, utf8-string, vector
+     , wai, wai-websockets, warp, websockets
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.14.1";
-       sha256 = "0cqrasq0my2nsslpvy1mfhc2nqj2bfcilv8acd600bn9f6qgn4yv";
+       version = "0.14.2";
+       sha256 = "12gk4c311v39gh0kp5s97gia2xrglzzkpnhisbpxc4h7nd9dqf5m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -212583,11 +212169,11 @@ self: {
          directory dlist edit-distance file-embed filepath fsnotify Glob
          haskeline language-javascript lifted-async lifted-base memory
          microlens microlens-platform monad-control monad-logger mtl
-         parallel parsec pattern-arrows process protolude purescript-ast
-         purescript-cst regex-tdfa safe scientific semialign semigroups
-         serialise sourcemap split stm stringsearch syb text these time
-         transformers transformers-base transformers-compat
-         unordered-containers utf8-string vector
+         parallel parsec pattern-arrows process protolude purescript-cst
+         regex-tdfa safe scientific semialign semigroups serialise sourcemap
+         split stm stringsearch syb text these time transformers
+         transformers-base transformers-compat unordered-containers
+         utf8-string vector
        ];
        libraryToolDepends = [ happy ];
        executableHaskellDepends = [
@@ -212598,12 +212184,11 @@ self: {
          fsnotify gitrev Glob haskeline http-types language-javascript
          lifted-async lifted-base memory microlens microlens-platform
          monad-control monad-logger mtl network optparse-applicative
-         parallel parsec pattern-arrows process protolude purescript-ast
-         purescript-cst regex-tdfa safe scientific semialign semigroups
-         serialise sourcemap split stm stringsearch syb text these time
-         transformers transformers-base transformers-compat
-         unordered-containers utf8-string vector wai wai-websockets warp
-         websockets
+         parallel parsec pattern-arrows process protolude purescript-cst
+         regex-tdfa safe scientific semialign semigroups serialise sourcemap
+         split stm stringsearch syb text these time transformers
+         transformers-base transformers-compat unordered-containers
+         utf8-string vector wai wai-websockets warp websockets
        ];
        executableToolDepends = [ happy ];
        testHaskellDepends = [
@@ -212613,11 +212198,10 @@ self: {
          directory dlist edit-distance file-embed filepath fsnotify Glob
          haskeline hspec HUnit language-javascript lifted-async lifted-base
          memory microlens microlens-platform monad-control monad-logger mtl
-         parallel parsec pattern-arrows process protolude purescript-ast
-         purescript-cst regex-base regex-tdfa safe scientific semialign
-         semigroups serialise sourcemap split stm stringsearch syb tasty
-         tasty-golden tasty-hspec tasty-quickcheck text these time
-         transformers transformers-base transformers-compat
+         parallel parsec pattern-arrows process protolude purescript-cst
+         QuickCheck regex-base regex-tdfa safe scientific semialign
+         semigroups serialise sourcemap split stm stringsearch syb text
+         these time transformers transformers-base transformers-compat
          unordered-containers utf8-string vector
        ];
        testToolDepends = [ happy hspec-discover ];
@@ -212682,25 +212266,20 @@ self: {
      }) {};
 
   "purescript-cst" = callPackage
-    ({ mkDerivation, array, base, base-compat, bytestring, containers
-     , dlist, filepath, happy, purescript-ast, scientific, semigroups
-     , tasty, tasty-golden, tasty-quickcheck, text
+    ({ mkDerivation, aeson, array, base, base-compat, bytestring
+     , containers, deepseq, dlist, filepath, happy, microlens, mtl
+     , protolude, scientific, semigroups, serialise, text, vector
      }:
      mkDerivation {
        pname = "purescript-cst";
-       version = "0.1.1.0";
-       sha256 = "05jqf9c0pakbjvr2zvybaxg9rfi87dadsx4srjlrw294r2sz969r";
+       version = "0.2.0.0";
+       sha256 = "0spsl9aq7hg2pkqawwjirgdr8ypzpb9amf2pznxmn6wm9ppaq73s";
        libraryHaskellDepends = [
-         array base containers dlist purescript-ast scientific semigroups
-         text
+         aeson array base base-compat bytestring containers deepseq dlist
+         filepath microlens mtl protolude scientific semigroups serialise
+         text vector
        ];
        libraryToolDepends = [ happy ];
-       testHaskellDepends = [
-         array base base-compat bytestring containers dlist filepath
-         purescript-ast scientific semigroups tasty tasty-golden
-         tasty-quickcheck text
-       ];
-       testToolDepends = [ happy ];
        description = "PureScript Programming Language Concrete Syntax Tree";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
@@ -218053,46 +217632,24 @@ self: {
      }) {};
 
   "rebase" = callPackage
-    ({ mkDerivation, base, bifunctors, bytestring, comonad, containers
-     , contravariant, contravariant-extras, deepseq, dlist, either
-     , hashable, mtl, profunctors, scientific, selective, semigroupoids
-     , semigroups, stm, text, time, transformers, unordered-containers
-     , uuid, vector, void
-     }:
-     mkDerivation {
-       pname = "rebase";
-       version = "1.6.1";
-       sha256 = "020aw7wlgx8nqbq6ara13szgxw2q0n0hx3vrsn2lfp53b2jdsvax";
-       libraryHaskellDepends = [
-         base bifunctors bytestring comonad containers contravariant
-         contravariant-extras deepseq dlist either hashable mtl profunctors
-         scientific selective semigroupoids semigroups stm text time
-         transformers unordered-containers uuid vector void
-       ];
-       description = "A more progressive alternative to the \"base\" package";
-       license = lib.licenses.mit;
-     }) {};
-
-  "rebase_1_13" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, comonad, containers
      , contravariant, deepseq, dlist, either, hashable, hashable-time
      , mtl, profunctors, scientific, selective, semigroupoids, stm, text
-     , time, transformers, unordered-containers, uuid, vector
+     , time, transformers, unordered-containers, uuid-types, vector
      , vector-instances, void
      }:
      mkDerivation {
        pname = "rebase";
-       version = "1.13";
-       sha256 = "0cqpp2cn3yi9d825qzavs52ky77b628fm8p7w51zy9qjx1p7650v";
+       version = "1.13.0.1";
+       sha256 = "0sh1vha10n28c4jb97p99xglghqph8ppydqzbnb2h25a34057927";
        libraryHaskellDepends = [
          base bifunctors bytestring comonad containers contravariant deepseq
          dlist either hashable hashable-time mtl profunctors scientific
          selective semigroupoids stm text time transformers
-         unordered-containers uuid vector vector-instances void
+         unordered-containers uuid-types vector vector-instances void
        ];
        description = "A more progressive alternative to the \"base\" package";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "rebindable" = callPackage
@@ -220348,27 +219905,6 @@ self: {
      }) {};
 
   "regex-tdfa" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, directory
-     , filepath, mtl, parsec, regex-base, text, utf8-string
-     }:
-     mkDerivation {
-       pname = "regex-tdfa";
-       version = "1.3.1.0";
-       sha256 = "1h1fliv2zjxwmddl9wnn7ckxxpgy1049hdfg6fcknyrr7mw7dhqm";
-       revision = "2";
-       editedCabalFile = "1hvcqdywwlcpia7qss7ikr9bq0lvkk8z0mjgaylaqpzlgh00z3gb";
-       libraryHaskellDepends = [
-         array base bytestring containers mtl parsec regex-base text
-       ];
-       testHaskellDepends = [
-         array base bytestring containers directory filepath mtl regex-base
-         text utf8-string
-       ];
-       description = "Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "regex-tdfa_1_3_1_1" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
      , filepath, mtl, parsec, regex-base, text, utf8-string
      }:
@@ -220385,7 +219921,6 @@ self: {
        ];
        description = "Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "regex-tdfa-pipes" = callPackage
@@ -222444,25 +221979,13 @@ self: {
     ({ mkDerivation, rebase }:
      mkDerivation {
        pname = "rerebase";
-       version = "1.6.1";
-       sha256 = "0lyi925jk6jbi3qc5xmv61ag07ff9d3xxmf9hfjlblqw2y9fsy93";
+       version = "1.13.0.1";
+       sha256 = "0j50l96whwi65ir35nfhn24h6103zy1ilfjsqiax63ajzw169fkv";
        libraryHaskellDepends = [ rebase ];
        description = "Reexports from \"base\" with a bunch of other standard libraries";
        license = lib.licenses.mit;
      }) {};
 
-  "rerebase_1_13" = callPackage
-    ({ mkDerivation, rebase }:
-     mkDerivation {
-       pname = "rerebase";
-       version = "1.13";
-       sha256 = "1ng16dnlrxcy76mpw21mwf2sk70q4i0kmqhxikjhc2h06zdpkqfr";
-       libraryHaskellDepends = [ rebase ];
-       description = "Reexports from \"base\" with a bunch of other standard libraries";
-       license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
   "reroute" = callPackage
     ({ mkDerivation, base, criterion, deepseq, graph-core, hashable
      , hspec, http-api-data, hvect, mtl, random, regex-compat, text
@@ -225774,18 +225297,20 @@ self: {
 
   "rp-tree" = callPackage
     ({ mkDerivation, base, benchpress, boxes, bytestring, conduit
-     , containers, deepseq, hspec, QuickCheck, serialise, splitmix
-     , splitmix-distributions, transformers, vector, vector-algorithms
+     , containers, deepseq, hspec, microlens, microlens-th, mtl
+     , psqueues, QuickCheck, serialise, splitmix, splitmix-distributions
+     , text, transformers, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "rp-tree";
-       version = "0.3.6";
-       sha256 = "0dz2xkgmk3lfr0pnc7xzfz756bzdkbmb2m96zdpw7vgyz59h9i64";
+       version = "0.4";
+       sha256 = "1pni4pmvk2cb3x98lma0isbn8vh651pyql0dmjmg4nvr8i471iqf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base boxes bytestring conduit containers deepseq serialise splitmix
-         splitmix-distributions transformers vector vector-algorithms
+         base boxes bytestring conduit containers deepseq microlens
+         microlens-th mtl psqueues serialise splitmix splitmix-distributions
+         text transformers vector vector-algorithms
        ];
        executableHaskellDepends = [
          base conduit containers splitmix splitmix-distributions
@@ -225802,6 +225327,39 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "rp-tree_0_6" = callPackage
+    ({ mkDerivation, base, benchpress, boxes, bytestring, conduit
+     , containers, deepseq, heaps, hspec, mtl, QuickCheck, serialise
+     , splitmix, splitmix-distributions, text, transformers, vector
+     , vector-algorithms
+     }:
+     mkDerivation {
+       pname = "rp-tree";
+       version = "0.6";
+       sha256 = "0ww3ckf1bq24p4d52mip6mxxk0z65p3pq7d4a1xy8yalsjhyyl0h";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base boxes bytestring conduit containers deepseq heaps mtl
+         serialise splitmix splitmix-distributions text transformers vector
+         vector-algorithms
+       ];
+       executableHaskellDepends = [
+         base conduit containers splitmix splitmix-distributions
+         transformers vector
+       ];
+       testHaskellDepends = [
+         base conduit hspec QuickCheck splitmix-distributions
+       ];
+       benchmarkHaskellDepends = [
+         base benchpress conduit deepseq splitmix splitmix-distributions
+         transformers vector
+       ];
+       description = "Random projection trees";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "rpc" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, derive
      , network-fancy, template-haskell, th-lift
@@ -225874,6 +225432,18 @@ self: {
        broken = true;
      }) {};
 
+  "rpm-nvr" = callPackage
+    ({ mkDerivation, base, extra, hspec }:
+     mkDerivation {
+       pname = "rpm-nvr";
+       version = "0.1.0";
+       sha256 = "11w40vw18wbxhd0lbjh75a1bc4sqwh9xqv2iaa6kd8cd6c7ij26x";
+       libraryHaskellDepends = [ base extra ];
+       testHaskellDepends = [ base hspec ];
+       description = "RPM package name-version-release datatypes";
+       license = lib.licenses.gpl2Only;
+     }) {};
+
   "rpmbuild-order" = callPackage
     ({ mkDerivation, base, case-insensitive, containers, directory
      , extra, fgl, filepath, graphviz, hspec, optparse-applicative
@@ -226667,17 +226237,6 @@ self: {
      }) {};
 
   "safe-coloured-text" = callPackage
-    ({ mkDerivation, base, bytestring, terminfo, text }:
-     mkDerivation {
-       pname = "safe-coloured-text";
-       version = "0.0.0.0";
-       sha256 = "0c07527g35gpxif8ia07x766pmzcf4m1cgjz9lkac973n12iwllx";
-       libraryHaskellDepends = [ base bytestring terminfo text ];
-       description = "Safely output coloured text";
-       license = lib.licenses.mit;
-     }) {};
-
-  "safe-coloured-text_0_1_0_0" = callPackage
     ({ mkDerivation, base, bytestring, text, validity
      , validity-bytestring, validity-text
      }:
@@ -226690,7 +226249,6 @@ self: {
        ];
        description = "Safely output coloured text";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "safe-coloured-text-gen" = callPackage
@@ -226769,18 +226327,16 @@ self: {
      }) {};
 
   "safe-decimal" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest
-     , exceptions, hspec, hspec-discover, QuickCheck, scientific
-     , template-haskell
+    ({ mkDerivation, base, deepseq, doctest, exceptions, hspec
+     , hspec-discover, QuickCheck, scientific
      }:
      mkDerivation {
        pname = "safe-decimal";
-       version = "0.2.0.0";
-       sha256 = "03id56ib8m7gja2g5a8d6b26cz3h3zf3f3gq2ss7paxvwvn6wfib";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       version = "0.2.1.0";
+       sha256 = "1q7l8rj5hhkxxhmmibcm0by7psvkw9lj82zd48slyfikmsdm9bdw";
        libraryHaskellDepends = [ base deepseq exceptions scientific ];
        testHaskellDepends = [
-         base deepseq doctest hspec QuickCheck scientific template-haskell
+         base deepseq doctest hspec QuickCheck scientific
        ];
        testToolDepends = [ hspec-discover ];
        description = "Safe and very efficient arithmetic operations on fixed decimal point numbers";
@@ -227399,8 +226955,8 @@ self: {
        pname = "salak";
        version = "0.3.6";
        sha256 = "00qyd09az0ldfidfgcki8z3r9gcpxmss3iyr99as5bky29rlz9n3";
-       revision = "4";
-       editedCabalFile = "07q9a24ry6h6r3m1av0dxz39dzmyjhlcrw1ww5jprqcf3xxjxhdz";
+       revision = "5";
+       editedCabalFile = "1dqanr95rrmjxfw882fa6as7n999883gfsy2765f3rprl7wlmigl";
        libraryHaskellDepends = [
          base bytestring containers data-default directory dlist exceptions
          filepath hashable heaps megaparsec mtl scientific text time
@@ -227822,49 +227378,6 @@ self: {
      }) {};
 
   "sandwich" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, async, base, brick
-     , bytestring, colour, containers, directory, exceptions, filepath
-     , free, haskell-src-exts, lens, lifted-async, microlens
-     , microlens-th, monad-control, monad-logger, mtl
-     , optparse-applicative, pretty-show, process, safe, safe-exceptions
-     , stm, string-interpolate, template-haskell, text, time
-     , transformers, transformers-base, unix, unliftio-core, vector, vty
-     }:
-     mkDerivation {
-       pname = "sandwich";
-       version = "0.1.0.6";
-       sha256 = "18fl6zdz7q5cm9ypnlgxyk5gh9r0yq481k04q0z740j2h1m5vgj8";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal async base brick bytestring colour containers
-         directory exceptions filepath free haskell-src-exts lens
-         lifted-async microlens microlens-th monad-control monad-logger mtl
-         optparse-applicative pretty-show process safe safe-exceptions stm
-         string-interpolate template-haskell text time transformers
-         transformers-base unix unliftio-core vector vty
-       ];
-       executableHaskellDepends = [
-         aeson ansi-terminal async base brick bytestring colour containers
-         directory exceptions filepath free haskell-src-exts lens
-         lifted-async microlens microlens-th monad-control monad-logger mtl
-         optparse-applicative pretty-show process safe safe-exceptions stm
-         string-interpolate template-haskell text time transformers
-         transformers-base unix unliftio-core vector vty
-       ];
-       testHaskellDepends = [
-         aeson ansi-terminal async base brick bytestring colour containers
-         directory exceptions filepath free haskell-src-exts lens
-         lifted-async microlens microlens-th monad-control monad-logger mtl
-         optparse-applicative pretty-show process safe safe-exceptions stm
-         string-interpolate template-haskell text time transformers
-         transformers-base unix unliftio-core vector vty
-       ];
-       description = "Yet another test framework for Haskell";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "sandwich_0_1_0_7" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, base, brick
      , bytestring, colour, containers, directory, exceptions, filepath
      , free, haskell-src-exts, lens, lifted-async, microlens
@@ -227905,7 +227418,6 @@ self: {
        ];
        description = "Yet another test framework for Haskell";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "sandwich-quickcheck" = callPackage
@@ -227959,49 +227471,6 @@ self: {
      }) {};
 
   "sandwich-webdriver" = callPackage
-    ({ mkDerivation, aeson, base, containers, convertible, data-default
-     , directory, exceptions, filepath, http-client, http-client-tls
-     , http-conduit, lifted-base, microlens, microlens-aeson
-     , monad-control, monad-logger, mtl, network, process, random, retry
-     , safe, safe-exceptions, sandwich, string-interpolate, temporary
-     , text, time, transformers, unix, unordered-containers, vector
-     , webdriver, X11
-     }:
-     mkDerivation {
-       pname = "sandwich-webdriver";
-       version = "0.1.0.4";
-       sha256 = "0vmqm2f78vd8kk0adg7ldd6rlb5rw5hks9q705gws9dj6s4nyz9r";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base containers convertible data-default directory exceptions
-         filepath http-client http-client-tls http-conduit lifted-base
-         microlens microlens-aeson monad-control monad-logger mtl network
-         process random retry safe safe-exceptions sandwich
-         string-interpolate temporary text time transformers unix
-         unordered-containers vector webdriver X11
-       ];
-       executableHaskellDepends = [
-         aeson base containers convertible data-default directory exceptions
-         filepath http-client http-client-tls http-conduit lifted-base
-         microlens microlens-aeson monad-control monad-logger mtl network
-         process random retry safe safe-exceptions sandwich
-         string-interpolate temporary text time transformers unix
-         unordered-containers vector webdriver X11
-       ];
-       testHaskellDepends = [
-         aeson base containers convertible data-default directory exceptions
-         filepath http-client http-client-tls http-conduit lifted-base
-         microlens microlens-aeson monad-control monad-logger mtl network
-         process random retry safe safe-exceptions sandwich
-         string-interpolate temporary text time transformers unix
-         unordered-containers vector webdriver X11
-       ];
-       description = "Sandwich integration with Selenium WebDriver";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "sandwich-webdriver_0_1_0_5" = callPackage
     ({ mkDerivation, aeson, base, containers, convertible, data-default
      , directory, exceptions, filepath, http-client, http-client-tls
      , http-conduit, lifted-base, microlens, microlens-aeson
@@ -228042,7 +227511,6 @@ self: {
        ];
        description = "Sandwich integration with Selenium WebDriver";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "sarasvati" = callPackage
@@ -232199,8 +231667,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-JuicyPixels";
-       version = "0.3.0.5";
-       sha256 = "1lhxb6z8xypx48k8hwzqpp92qww8wxbp3a1ggik4dfrcxkcklmlx";
+       version = "0.3.0.6";
+       sha256 = "16bdlgrz71h03lr2xcd2isclfzgr9h2xdl5lbnbs0v1czaxx7m6h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -233619,38 +233087,6 @@ self: {
      }) {};
 
   "servant-multipart" = callPackage
-    ({ mkDerivation, array, base, bytestring, directory, http-client
-     , http-media, http-types, lens, network, random, resourcet, servant
-     , servant-client, servant-client-core, servant-docs
-     , servant-foreign, servant-server, string-conversions, tasty
-     , tasty-wai, text, transformers, wai, wai-extra, warp
-     }:
-     mkDerivation {
-       pname = "servant-multipart";
-       version = "0.12";
-       sha256 = "1hs1h66zjhknfnz1bdi5c0d2sfb20fc7x9adbc87gq168k8riqvl";
-       revision = "2";
-       editedCabalFile = "019zk4vlm9gv8n85qv6819i6qn0ddiz56birlmabz2n95l715m7y";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base bytestring directory http-media lens random resourcet
-         servant servant-client-core servant-docs servant-foreign
-         servant-server string-conversions text transformers wai wai-extra
-       ];
-       executableHaskellDepends = [
-         base bytestring http-client network servant servant-client
-         servant-client-core servant-server text transformers wai warp
-       ];
-       testHaskellDepends = [
-         base bytestring http-types servant-server string-conversions tasty
-         tasty-wai text
-       ];
-       description = "multipart/form-data (e.g file upload) support for servant";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "servant-multipart_0_12_1" = callPackage
     ({ mkDerivation, base, bytestring, directory, http-types, lens
      , resourcet, servant, servant-docs, servant-foreign
      , servant-multipart-api, servant-server, string-conversions, tasty
@@ -233671,7 +233107,6 @@ self: {
        ];
        description = "multipart/form-data (e.g file upload) support for servant";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "servant-multipart-api" = callPackage
@@ -238369,8 +237804,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-parser";
-       version = "0.3.0";
-       sha256 = "05a4aakq93nqmm632mijd64vjq07dlpcb1m2a57z6k1mhqinwxc5";
+       version = "0.5.0";
+       sha256 = "0qkgk7gxk69ns4067viz59wbp5hz05j1d26hv0wmbkhixsxa56s3";
        libraryHaskellDepends = [
          base containers list-t mmorph mtl nonempty-containers scientific
          text text-builder
@@ -238656,8 +238091,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-ui";
-       version = "0.2.0";
-       sha256 = "0j0xq5s9l7dckbv0bakw96f3xnqsa2b7pqsji7s1y46k2fcr0r5s";
+       version = "0.3.0";
+       sha256 = "1dn9ma1kvn3gcgdcc09s38nlmcmcfifr7gcdn59ghp7pxxb8dxds";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base data-default-class exceptions lens mtl stm template-haskell
@@ -240433,6 +239868,29 @@ self: {
        license = lib.licenses.gpl3Plus;
      }) {};
 
+  "slynx_0_5_1_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , elynx-markov, elynx-seq, elynx-tools, elynx-tree, hmatrix
+     , monad-logger, mwc-random, optparse-applicative, statistics, text
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "slynx";
+       version = "0.5.1.0";
+       sha256 = "14wg6ws065wz0h8nid3w0bpspanyfarc2c3gs93225ismmbjk1ng";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers elynx-markov elynx-seq
+         elynx-tools elynx-tree hmatrix monad-logger mwc-random
+         optparse-applicative statistics text transformers vector
+       ];
+       executableHaskellDepends = [ base ];
+       description = "Handle molecular sequences";
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "small-bytearray-builder" = callPackage
     ({ mkDerivation, base, bytebuild, byteslice }:
      mkDerivation {
@@ -244344,23 +243802,6 @@ self: {
      }) {};
 
   "speculate" = callPackage
-    ({ mkDerivation, base, cmdargs, containers, express, leancheck }:
-     mkDerivation {
-       pname = "speculate";
-       version = "0.4.6";
-       sha256 = "0vpc2vxfpziyz0hzapni4j31g1i12m2gnsrq72zf42qbhjwif57g";
-       libraryHaskellDepends = [
-         base cmdargs containers express leancheck
-       ];
-       testHaskellDepends = [ base express leancheck ];
-       benchmarkHaskellDepends = [ base express leancheck ];
-       description = "discovery of properties about Haskell functions";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "speculate_0_4_8" = callPackage
     ({ mkDerivation, base, cmdargs, containers, express, leancheck }:
      mkDerivation {
        pname = "speculate";
@@ -246023,8 +245464,8 @@ self: {
      }:
      mkDerivation {
        pname = "stack-all";
-       version = "0.2.1";
-       sha256 = "07azc2phnljxwxskxlipmx52vjyavxn54q87k1bakapla469fdr4";
+       version = "0.2.2";
+       sha256 = "0bk22ryqvyc4r058yj3ngq33wv24m7r1alnbvg4c0h08fmwxi4m0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -250412,17 +249853,6 @@ self: {
      }) {};
 
   "stripe-concepts" = callPackage
-    ({ mkDerivation, base, bytestring, text }:
-     mkDerivation {
-       pname = "stripe-concepts";
-       version = "1.0.2.6";
-       sha256 = "0vz8kiwg9q27jhr6gfvhqy9gykrl3zgy3m2ldk1np4v7y4fg7906";
-       libraryHaskellDepends = [ base bytestring text ];
-       description = "Types for the Stripe API";
-       license = lib.licenses.mit;
-     }) {};
-
-  "stripe-concepts_1_0_2_8" = callPackage
     ({ mkDerivation, base, bytestring, text }:
      mkDerivation {
        pname = "stripe-concepts";
@@ -250431,7 +249861,6 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        description = "Types for the Stripe API";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "stripe-core" = callPackage
@@ -252500,6 +251929,32 @@ self: {
        license = lib.licenses.lgpl21Only;
      }) {};
 
+  "swish_0_10_0_5" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, hashable
+     , HUnit, intern, mtl, network-uri, old-locale, polyparse
+     , semigroups, test-framework, test-framework-hunit, text, time
+     }:
+     mkDerivation {
+       pname = "swish";
+       version = "0.10.0.5";
+       sha256 = "0cf3aba585hnlaamwfxy9mfp8mjanza0zgp27gi2y66f79hcpq2q";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base containers directory filepath hashable intern mtl network-uri
+         old-locale polyparse text time
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base containers hashable HUnit network-uri old-locale semigroups
+         test-framework test-framework-hunit text time
+       ];
+       description = "A semantic web toolkit";
+       license = lib.licenses.lgpl21Only;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "swiss-ephemeris" = callPackage
     ({ mkDerivation, base, directory, hspec, hspec-discover, QuickCheck
      }:
@@ -252651,32 +252106,6 @@ self: {
      }) {};
 
   "sydtest" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, Diff, dlist
-     , envparse, MonadRandom, mtl, optparse-applicative, path, path-io
-     , pretty-show, QuickCheck, quickcheck-io, random-shuffle, safe
-     , safe-coloured-text, split, stm, sydtest-discover, text, yaml
-     , yamlparse-applicative
-     }:
-     mkDerivation {
-       pname = "sydtest";
-       version = "0.1.0.0";
-       sha256 = "1r5p9vai0krzcnwxyicw9b00vzdqdm8zpj70y8snn4mdxxvhvyvq";
-       libraryHaskellDepends = [
-         async base bytestring containers Diff dlist envparse MonadRandom
-         mtl optparse-applicative path path-io pretty-show QuickCheck
-         quickcheck-io random-shuffle safe safe-coloured-text split text
-         yaml yamlparse-applicative
-       ];
-       testHaskellDepends = [
-         base bytestring path path-io QuickCheck safe-coloured-text stm text
-       ];
-       testToolDepends = [ sydtest-discover ];
-       description = "A modern testing framework for Haskell with good defaults and advanced testing features";
-       license = "unknown";
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
-  "sydtest_0_2_0_0" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, Diff, dlist
      , envparse, filepath, MonadRandom, mtl, optparse-applicative, path
      , path-io, pretty-show, QuickCheck, quickcheck-io, random-shuffle
@@ -252841,27 +252270,6 @@ self: {
      }) {};
 
   "sydtest-persistent-sqlite" = callPackage
-    ({ mkDerivation, base, monad-logger, mtl, persistent
-     , persistent-sqlite, persistent-template, sydtest, sydtest-discover
-     }:
-     mkDerivation {
-       pname = "sydtest-persistent-sqlite";
-       version = "0.0.0.0";
-       sha256 = "0p9xy2pdjnzd61dadvrzrnnxxz04xm0ypn2h1ssmrilfglic80iz";
-       libraryHaskellDepends = [
-         base monad-logger mtl persistent persistent-sqlite
-         persistent-template sydtest
-       ];
-       testHaskellDepends = [
-         base persistent persistent-sqlite persistent-template sydtest
-       ];
-       testToolDepends = [ sydtest-discover ];
-       description = "A persistent-sqlite companion library for sydtest";
-       license = "unknown";
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
-  "sydtest-persistent-sqlite_0_1_0_0" = callPackage
     ({ mkDerivation, base, monad-logger, mtl, persistent
      , persistent-sqlite, persistent-template, sydtest, sydtest-discover
      }:
@@ -252919,27 +252327,6 @@ self: {
      }) {};
 
   "sydtest-servant" = callPackage
-    ({ mkDerivation, base, http-client, servant, servant-client
-     , servant-server, stm, sydtest, sydtest-discover, sydtest-wai
-     }:
-     mkDerivation {
-       pname = "sydtest-servant";
-       version = "0.0.0.0";
-       sha256 = "147v5s10qvpp67aq7c240rsc4f356hvznc5gb538slh03d5vas4j";
-       libraryHaskellDepends = [
-         base http-client servant servant-client servant-server sydtest
-         sydtest-wai
-       ];
-       testHaskellDepends = [
-         base servant servant-client servant-server stm sydtest
-       ];
-       testToolDepends = [ sydtest-discover ];
-       description = "A servant companion library for sydtest";
-       license = "unknown";
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
-  "sydtest-servant_0_1_0_0" = callPackage
     ({ mkDerivation, base, http-client, servant, servant-client
      , servant-server, stm, sydtest, sydtest-discover, sydtest-wai
      }:
@@ -252977,24 +252364,6 @@ self: {
      }) {};
 
   "sydtest-wai" = callPackage
-    ({ mkDerivation, base, http-client, http-types, stm, sydtest
-     , sydtest-discover, wai, warp
-     }:
-     mkDerivation {
-       pname = "sydtest-wai";
-       version = "0.0.0.0";
-       sha256 = "01fqys32zj1rg9ciq04l7d4av3i1ynw3yinkgc84c3ia330i98ws";
-       libraryHaskellDepends = [ base http-client sydtest wai warp ];
-       testHaskellDepends = [
-         base http-client http-types stm sydtest wai
-       ];
-       testToolDepends = [ sydtest-discover ];
-       description = "A wai companion library for sydtest";
-       license = "unknown";
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
-  "sydtest-wai_0_1_0_0" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, http-client
      , http-types, mtl, network, pretty-show, stm, sydtest
      , sydtest-discover, text, time, wai, warp
@@ -253019,18 +252388,18 @@ self: {
   "sydtest-yesod" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
      , conduit, containers, cookie, exceptions, http-client, http-types
-     , monad-logger, mtl, persistent, persistent-sqlite
+     , monad-logger, mtl, network, persistent, persistent-sqlite
      , persistent-template, pretty-show, QuickCheck, resourcet, sydtest
      , sydtest-discover, sydtest-persistent-sqlite, sydtest-wai, text
      , time, wai, xml-conduit, yesod, yesod-core, yesod-form, yesod-test
      }:
      mkDerivation {
        pname = "sydtest-yesod";
-       version = "0.0.0.0";
-       sha256 = "0mknn114q495f1bh829fi6c9gag58048c0m06yw0bkl0ikz32k67";
+       version = "0.1.0.0";
+       sha256 = "0kdylnhfvg9x314bydic811i21r1r5zs9cm1zpw6d7frsl99g24k";
        libraryHaskellDepends = [
          base blaze-builder bytestring case-insensitive containers cookie
-         exceptions http-client http-types mtl pretty-show sydtest
+         exceptions http-client http-types mtl network pretty-show sydtest
          sydtest-wai text time wai xml-conduit yesod-core yesod-test
        ];
        testHaskellDepends = [
@@ -260926,8 +260295,8 @@ self: {
        pname = "th-test-utils";
        version = "1.1.0";
        sha256 = "12a8yp9wfl40afa3ps8jg3axcaah018pangjm0fzzga2awr1wzwk";
-       revision = "1";
-       editedCabalFile = "0q3x2gl9n22ww1wzlhgvgj8didnwjyk6frv92cs9i7zirrcfgvcw";
+       revision = "2";
+       editedCabalFile = "1jwx31jqglfcy6ylj4520kqfp918lnv6m13flx2qvhfwbd88xwcv";
        libraryHaskellDepends = [
          base template-haskell th-orphans transformers
        ];
@@ -261925,6 +261294,29 @@ self: {
        license = lib.licenses.gpl3Only;
      }) {};
 
+  "tidal_1_7_5" = callPackage
+    ({ mkDerivation, base, bifunctors, bytestring, clock, colour
+     , containers, criterion, deepseq, hosc, microspec, network, parsec
+     , primitive, random, text, transformers, weigh
+     }:
+     mkDerivation {
+       pname = "tidal";
+       version = "1.7.5";
+       sha256 = "0mcq1sll148qfwkyad6y9k64zrlbkflzba9wqcgqydgfm0jyr7z7";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bifunctors bytestring clock colour containers deepseq hosc
+         network parsec primitive random text transformers
+       ];
+       testHaskellDepends = [
+         base containers deepseq hosc microspec parsec
+       ];
+       benchmarkHaskellDepends = [ base criterion weigh ];
+       description = "Pattern language for improvised music";
+       license = lib.licenses.gpl3Only;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "tidal-midi" = callPackage
     ({ mkDerivation, base, containers, PortMidi, tidal, time
      , transformers
@@ -263613,6 +263005,29 @@ self: {
        license = lib.licenses.gpl3Plus;
      }) {};
 
+  "tlynx_0_5_1_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad
+     , containers, elynx-tools, elynx-tree, gnuplot, lifted-async
+     , monad-logger, mwc-random, optparse-applicative, parallel
+     , statistics, text, transformers, vector
+     }:
+     mkDerivation {
+       pname = "tlynx";
+       version = "0.5.1.0";
+       sha256 = "005382x1xsv6bsjfmjxirvcmh3nfyhigkkc08y2wz16b7dpwvk6k";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring comonad containers elynx-tools
+         elynx-tree gnuplot lifted-async monad-logger mwc-random
+         optparse-applicative parallel statistics text transformers vector
+       ];
+       executableHaskellDepends = [ base ];
+       description = "Handle phylogenetic trees";
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "tmapchan" = callPackage
     ({ mkDerivation, base, containers, hashable, stm
      , unordered-containers
@@ -265998,6 +265413,8 @@ self: {
        pname = "tree-monad";
        version = "0.3.1";
        sha256 = "0ny57rygkgwn8i733gz2zb12i5niq5q7lrqvzfwsnjd0b40yighf";
+       revision = "1";
+       editedCabalFile = "0pw6mzr6x3s5w01bv6b5pcrqkx2zbjf4bk4cgrzww9gs81p3v790";
        libraryHaskellDepends = [ base ];
        description = "Non-Determinism Monad for Tree Search";
        license = lib.licenses.bsd3;
@@ -267020,8 +266437,8 @@ self: {
      }:
      mkDerivation {
        pname = "ttc";
-       version = "0.4.0.0";
-       sha256 = "07b5vw7wxgxcsr04h4nx28bmv9a10hkdzhhssvka050hxhiyjmgv";
+       version = "1.1.0.0";
+       sha256 = "02b55f0dwgxvpr8x2727ryb6zhvz73l6l001szm4i821q0p4h00g";
        libraryHaskellDepends = [ base bytestring template-haskell text ];
        testHaskellDepends = [
          base bytestring tasty tasty-hunit template-haskell text
@@ -267030,23 +266447,6 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "ttc_1_0_0_0" = callPackage
-    ({ mkDerivation, base, bytestring, tasty, tasty-hunit
-     , template-haskell, text
-     }:
-     mkDerivation {
-       pname = "ttc";
-       version = "1.0.0.0";
-       sha256 = "1w9xzgks9vj89mzrnjpgrx1iv67xbp6rn8s1ffc0qam268y8dbzv";
-       libraryHaskellDepends = [ base bytestring template-haskell text ];
-       testHaskellDepends = [
-         base bytestring tasty tasty-hunit template-haskell text
-       ];
-       description = "Textual Type Classes";
-       license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
   "ttl-hashtables" = callPackage
     ({ mkDerivation, base, clock, containers, data-default, failable
      , hashable, hashtables, hspec, mtl, transformers
@@ -269433,17 +268833,18 @@ self: {
   "typesafe-precure" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, autoexporter, base
      , bytestring, dlist, hspec, monad-skeleton, template-haskell, text
-     , th-data-compat, th-strict-compat, th-utilities
+     , th-data-compat, th-strict-compat
      }:
      mkDerivation {
        pname = "typesafe-precure";
-       version = "0.7.11.1";
-       sha256 = "1kbxj35dr41rg1s38f9dv2bg2d0rrwj1g2154ggfpx6kwy758jg6";
+       version = "0.8.0.1";
+       sha256 = "05rsyiksmw3gilr944hr1q12alinsy842qwzvc444iwyvc4f0i17";
        libraryHaskellDepends = [
          aeson aeson-pretty autoexporter base bytestring dlist
          monad-skeleton template-haskell text th-data-compat
-         th-strict-compat th-utilities
+         th-strict-compat
        ];
+       libraryToolDepends = [ autoexporter ];
        testHaskellDepends = [ base hspec ];
        description = "Type-safe transformations and purifications of PreCures (Japanese Battle Heroine)";
        license = lib.licenses.bsd3;
@@ -271090,6 +270491,18 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "union-angle" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "union-angle";
+       version = "0.1.0.1";
+       sha256 = "0scvzln05l2y4pb96cy7908aw433v8ln4nc17fp5x2vlz579w9cl";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       description = "Union type that include radian angle and degree angle";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "union-find" = callPackage
     ({ mkDerivation, base, containers, transformers }:
      mkDerivation {
@@ -272013,31 +271426,6 @@ self: {
      }) {};
 
   "unliftio" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, deepseq
-     , directory, filepath, gauge, hspec, process, QuickCheck, stm, time
-     , transformers, unix, unliftio-core
-     }:
-     mkDerivation {
-       pname = "unliftio";
-       version = "0.2.17";
-       sha256 = "1z37bqnrzhqhg7dfmsqz31lq8ng3qnkknc9d4pxbjbbmf1g21hfv";
-       libraryHaskellDepends = [
-         async base bytestring deepseq directory filepath process stm time
-         transformers unix unliftio-core
-       ];
-       testHaskellDepends = [
-         async base bytestring containers deepseq directory filepath hspec
-         process QuickCheck stm time transformers unix unliftio-core
-       ];
-       benchmarkHaskellDepends = [
-         async base bytestring deepseq directory filepath gauge process stm
-         time transformers unix unliftio-core
-       ];
-       description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
-       license = lib.licenses.mit;
-     }) {};
-
-  "unliftio_0_2_18" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, deepseq
      , directory, filepath, gauge, hspec, process, QuickCheck, stm, time
      , transformers, unix, unliftio-core
@@ -272060,7 +271448,6 @@ self: {
        ];
        description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "unliftio-core" = callPackage
@@ -274066,22 +273453,16 @@ self: {
      }) {};
 
   "uusi" = callPackage
-    ({ mkDerivation, base, Cabal, directory, filepath, HUnit, microlens
-     , microlens-th, text
-     }:
+    ({ mkDerivation, base, Cabal, directory, filepath, HUnit, text }:
      mkDerivation {
        pname = "uusi";
-       version = "0.4.0.0";
-       sha256 = "03spazp0lpd2impvg9i6fdd32v3fzycgqr95ry2jwvaxijqhfic9";
+       version = "0.4.1.0";
+       sha256 = "14g56ygqx8n24hvbb9bzi7yy5wjfsvw3m89lad0xy8knf6gnh6y3";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base Cabal microlens microlens-th text ];
-       executableHaskellDepends = [
-         base Cabal directory filepath microlens microlens-th text
-       ];
-       testHaskellDepends = [
-         base Cabal HUnit microlens microlens-th text
-       ];
+       libraryHaskellDepends = [ base Cabal text ];
+       executableHaskellDepends = [ base Cabal directory filepath text ];
+       testHaskellDepends = [ base Cabal HUnit text ];
        description = "Tweak .cabal files";
        license = lib.licenses.mit;
        maintainers = with lib.maintainers; [ berberman ];
@@ -277175,8 +276556,8 @@ self: {
     ({ mkDerivation, base, bytestring, transformers, vector, vulkan }:
      mkDerivation {
        pname = "vulkan";
-       version = "3.10.2";
-       sha256 = "0l3afdavqn226vg96cq5di2ra7snl0ygmil5g8zcs46vkamgzcmy";
+       version = "3.10.3";
+       sha256 = "1ksx4klcj9g4s4mrxmcr47ydw3xzglb8vd0zmg7i5xa7hz0ksjw0";
        libraryHaskellDepends = [ base bytestring transformers vector ];
        libraryPkgconfigDepends = [ vulkan ];
        description = "Bindings to the Vulkan graphics API";
@@ -277204,8 +276585,8 @@ self: {
      }:
      mkDerivation {
        pname = "vulkan-utils";
-       version = "0.5.0";
-       sha256 = "11pcxa7pjhdrfcxl058dn909ar6sv9kn34g73w8jqa60d2savj6q";
+       version = "0.5.0.1";
+       sha256 = "0h904kz61ym7d0qaa59d52a4kw09iaz92q5qdlnmnyn2bdmqp3bl";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base bytestring containers dependent-map dependent-sum extra
@@ -281441,8 +280822,8 @@ self: {
        pname = "wide-word";
        version = "0.1.1.2";
        sha256 = "10sj7nca2sba74bkiicnp95xrfq2j1al93ggw3z24982nm9x3j8r";
-       revision = "1";
-       editedCabalFile = "1gqw8d8j3wml0431lq1ygl5a3n36ymp1i77m7qaw0mz3ss982gl2";
+       revision = "2";
+       editedCabalFile = "09nr9ni9vs38ldzrx3vmlm6dr2avmwx6p9wlaml0nhr6sh4lbjsr";
        libraryHaskellDepends = [ base deepseq primitive ];
        testHaskellDepends = [
          base bytestring ghc-prim hedgehog primitive QuickCheck
@@ -281584,27 +280965,6 @@ self: {
      }) {};
 
   "wild-bind-x11" = callPackage
-    ({ mkDerivation, async, base, containers, fold-debounce, hspec
-     , hspec-discover, mtl, semigroups, stm, text, time, transformers
-     , wild-bind, X11
-     }:
-     mkDerivation {
-       pname = "wild-bind-x11";
-       version = "0.2.0.12";
-       sha256 = "1zpb448pj586xvh0l9qp08hvbjw1lphxwzi4srnghmsbnfnkvhh6";
-       libraryHaskellDepends = [
-         base containers fold-debounce mtl semigroups stm text transformers
-         wild-bind X11
-       ];
-       testHaskellDepends = [
-         async base hspec text time transformers wild-bind X11
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "X11-specific implementation for WildBind";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "wild-bind-x11_0_2_0_13" = callPackage
     ({ mkDerivation, async, base, containers, fold-debounce, hspec
      , hspec-discover, mtl, semigroups, stm, text, time, transformers
      , wild-bind, X11
@@ -281623,7 +280983,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "X11-specific implementation for WildBind";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "willow" = callPackage
@@ -285017,12 +284376,12 @@ self: {
      }) {};
 
   "xml-query" = callPackage
-    ({ mkDerivation, base-prelude, free, text }:
+    ({ mkDerivation, base, free, text }:
      mkDerivation {
        pname = "xml-query";
-       version = "0.9.1";
-       sha256 = "16wszpvz8cp8nx18rmgyjy6mqk9awd3yf9w0is5rw77r73w88nwq";
-       libraryHaskellDepends = [ base-prelude free text ];
+       version = "0.9.1.1";
+       sha256 = "1rrzba94098rw7gmripz62awc5cscrx4lqavzd946h6vpy4ps4ba";
+       libraryHaskellDepends = [ base free text ];
        description = "A parser-agnostic declarative API for querying XML-documents";
        license = lib.licenses.mit;
        hydraPlatforms = lib.platforms.none;
@@ -286826,25 +286185,6 @@ self: {
      }) {};
 
   "yamlparse-applicative" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers
-     , optparse-applicative, path, path-io, prettyprinter
-     , safe-coloured-text, scientific, text, unordered-containers
-     , validity, validity-text, vector, yaml
-     }:
-     mkDerivation {
-       pname = "yamlparse-applicative";
-       version = "0.1.0.4";
-       sha256 = "19z6bg8pvhaccc4pc89a2hc1f1g9x66ma179gfx36pjgqdkp0fg1";
-       libraryHaskellDepends = [
-         aeson base bytestring containers optparse-applicative path path-io
-         prettyprinter safe-coloured-text scientific text
-         unordered-containers validity validity-text vector yaml
-       ];
-       description = "Declaritive configuration parsing with free docs";
-       license = lib.licenses.mit;
-     }) {};
-
-  "yamlparse-applicative_0_2_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
      , optparse-applicative, path, path-io, prettyprinter
      , safe-coloured-text, scientific, text, unordered-containers
@@ -286861,7 +286201,6 @@ self: {
        ];
        description = "Declaritive configuration parsing with free docs";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "yampa-canvas" = callPackage
@@ -291293,34 +290632,6 @@ self: {
      }) {};
 
   "zip" = callPackage
-    ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
-     , cereal, conduit, conduit-extra, conduit-zstd, containers, digest
-     , directory, dlist, exceptions, filepath, hspec, monad-control, mtl
-     , QuickCheck, resourcet, temporary, text, time, transformers
-     , transformers-base, unix
-     }:
-     mkDerivation {
-       pname = "zip";
-       version = "1.7.0";
-       sha256 = "11vdxpyxnh7hbsrpk8g90fd9abbk27dxi9g0mhxc1lxc6syjkzgl";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring bzlib-conduit case-insensitive cereal conduit
-         conduit-extra conduit-zstd containers digest directory dlist
-         exceptions filepath monad-control mtl resourcet text time
-         transformers transformers-base unix
-       ];
-       executableHaskellDepends = [ base filepath ];
-       testHaskellDepends = [
-         base bytestring conduit containers directory dlist exceptions
-         filepath hspec QuickCheck temporary text time transformers
-       ];
-       description = "Operations on zip archives";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "zip_1_7_1" = callPackage
     ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
      , cereal, conduit, conduit-extra, conduit-zstd, containers, digest
      , directory, dlist, exceptions, filepath, hspec, monad-control, mtl
@@ -291346,7 +290657,6 @@ self: {
        ];
        description = "Operations on zip archives";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "zip-archive" = callPackage

From 74d7230259e7f3334a91bec4f7c3eab7de7983ad Mon Sep 17 00:00:00 2001
From: maralorn <malte.brandy@maralorn.de>
Date: Sat, 12 Jun 2021 19:50:36 +0200
Subject: [PATCH 06/30] haskellPackages: HACKING.md, clarify PR title

---
 pkgs/development/haskell-modules/HACKING.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md
index 21b1f7091fef..c230d29840cc 100644
--- a/pkgs/development/haskell-modules/HACKING.md
+++ b/pkgs/development/haskell-modules/HACKING.md
@@ -48,7 +48,9 @@ In this section we create the PR for merging `haskell-updates` into `master`.
 
 1.  Open a PR on Nixpkgs merging `haskell-updates` into `master`.
 
-Use the following message body:
+
+
+Use the title `haskellPackages: update stackage and hackage` and the following message body:
 
 ```markdown
 ### This Merge

From 564bdae8e5278621486a2143bce8901c849383e5 Mon Sep 17 00:00:00 2001
From: maralorn <malte.brandy@maralorn.de>
Date: Sat, 12 Jun 2021 19:55:50 +0200
Subject: [PATCH 07/30] haskellPackages: HACKING.md: Insert links into template

---
 pkgs/development/haskell-modules/HACKING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md
index c230d29840cc..e5e16c59faf3 100644
--- a/pkgs/development/haskell-modules/HACKING.md
+++ b/pkgs/development/haskell-modules/HACKING.md
@@ -70,8 +70,8 @@ The short version is this:
 * We regularly update the Stackage and Hackage pins on `haskell-updates` (normally at the beginning of a merge window).
 * The community fixes builds of Haskell packages on that branch.
 * We aim at at least one merge of `haskell-updates` into `master` every two weeks.
-* We only do the merge if the `mergeable` job is succeeding on hydra.
-* If a maintained package is still broken at the time of merge, we will only merge if the maintainer has been pinged 7 days in advance. (If you care about a Haskell package, become a maintainer!)
+* We only do the merge if the [`mergeable`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/mergeable) job is succeeding on hydra.
+* If a [`maintained`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/maintained) package is still broken at the time of merge, we will only merge if the maintainer has been pinged 7 days in advance. (If you care about a Haskell package, become a maintainer!)
 
 ---
 

From cea929ddd01064a387bead6c9ebcfb8dfbe047c2 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sat, 12 Jun 2021 20:46:04 +0200
Subject: [PATCH 08/30] haskell.packages.ghc901.profunctors: fix eval error

Stackage has updated profunctors to 5.6.2, so the override is
unnecessary.
---
 pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
index 640cdec1cea3..cfef0f14ea81 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
@@ -95,9 +95,6 @@ self: super: {
   # The test suite seems pretty broken.
   base64-bytestring = dontCheck super.base64-bytestring;
 
-  # 5.6 introduced support for GHC 9.0.x, but hasn't landed in stackage yet
-  profunctors = super.profunctors_5_6_2;
-
   # 5 introduced support for GHC 9.0.x, but hasn't landed in stackage yet
   lens = super.lens_5_0_1;
 

From c9a1f7dc02089762b7fa6bb766cdfb69caaefe37 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sat, 12 Jun 2021 21:26:41 +0200
Subject: [PATCH 09/30] haskellPackages.ptr-poker: no longer mark as broken

---
 .../haskell-modules/configuration-hackage2nix/broken.yaml       | 1 -
 pkgs/development/haskell-modules/hackage-packages.nix           | 2 --
 2 files changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index b7561d38392a..133336f5e290 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -3731,7 +3731,6 @@ broken-packages:
   - proxy-mapping
   - pseudo-trie
   - PTQ
-  - ptr-poker
   - publicsuffixlistcreate
   - publish
   - pubnub
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 78753421dfcb..ba5c8dedc204 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -211571,8 +211571,6 @@ self: {
        benchmarkHaskellDepends = [ gauge rerebase ];
        description = "Pointer poking action construction and composition toolkit";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "ptrdiff" = callPackage

From d5f067260d90a73cb4e96d392c5337b6ba8e70b2 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sat, 12 Jun 2021 21:29:58 +0200
Subject: [PATCH 10/30] Revert "haskellPackages.gtk2hs-buildtools: attempt to
 fix build on aarch64"

This reverts commit 38c4256a9635d37ed297e43ade8e6f5ef42893d1.

The attempt failed, gtk2hs-buildtools still fails with the same linker error.
---
 pkgs/development/haskell-modules/configuration-arm.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix
index a8054c5861e0..b9f868b04ca5 100644
--- a/pkgs/development/haskell-modules/configuration-arm.nix
+++ b/pkgs/development/haskell-modules/configuration-arm.nix
@@ -37,10 +37,6 @@ self: super: {
   # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062
   happy = dontCheck super.happy;
 
-  # Disable GClosure based signals implementation on aarch64 as it causes linker issues
-  # https://github.com/gtk2hs/gtk2hs/issues/305
-  gtk2hs-buildtools = appendConfigureFlag super.gtk2hs-buildtools "-f-ClosureSignals";
-
 } // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch64 {
   # AARCH64-SPECIFIC OVERRIDES
 

From f38df6a4cde1a928fd26316b959b05e3736be7bd Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sat, 12 Jun 2021 21:34:45 +0200
Subject: [PATCH 11/30] haskellPackages.safe-coloured-text-*: mark as no longer
 broken

---
 .../haskell-modules/configuration-hackage2nix/broken.yaml   | 3 ---
 pkgs/development/haskell-modules/hackage-packages.nix       | 6 ------
 2 files changed, 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index 133336f5e290..373508cec588 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -4018,9 +4018,6 @@ broken-packages:
   - SableCC2Hs
   - safe-buffer-monad
   - safe-coerce
-  - safe-coloured-text-gen
-  - safe-coloured-text-layout
-  - safe-coloured-text-terminfo
   - safecopy-migrate
   - safecopy-store
   - safe-freeze
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ba5c8dedc204..c315d5fce464 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -226267,8 +226267,6 @@ self: {
        ];
        testToolDepends = [ sydtest-discover ];
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-coloured-text-layout" = callPackage
@@ -226286,8 +226284,6 @@ self: {
        testToolDepends = [ sydtest-discover ];
        description = "Safely layout output coloured text";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-coloured-text-layout-gen" = callPackage
@@ -226320,8 +226316,6 @@ self: {
        libraryHaskellDepends = [ base safe-coloured-text terminfo ];
        description = "Safely output coloured text";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-decimal" = callPackage

From ff9db852f0761e05093abf090d4ecb399fea4324 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Mon, 14 Jun 2021 10:48:56 +0900
Subject: [PATCH 12/30] spago: set earlier dhall dependency

---
 .../configuration-hackage2nix/main.yaml       |  1 +
 .../haskell-modules/configuration-nix.nix     |  7 ++-
 .../haskell-modules/hackage-packages.nix      | 58 +++++++++++++++++++
 3 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 6b07b67256bb..c07e2c61dc75 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -105,6 +105,7 @@ extra-packages:
   - dependent-map == 0.2.4.0            # required by Hasura 1.3.1, 2020-08-20
   - dependent-sum == 0.4                # required by Hasura 1.3.1, 2020-08-20
   - dhall == 1.29.0                     # required for ats-pkg
+  - dhall == 1.38.1                     # required for spago
   - Diff < 0.4                          # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729
   - ghc-tcplugins-extra ==0.3.2         # required for polysemy-plugin 0.2.5.0
   - haddock == 2.23.*                   # required on GHC < 8.10.x
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index b5868586f665..a9467dd0fc3f 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -577,7 +577,12 @@ self: super: builtins.intersectAttrs super {
         sha256 = "1hjdprm990vyxz86fgq14ajn0lkams7i00h8k2i2g1a0hjdwppq6";
       };
 
-      spagoDocs = overrideCabal super.spago (drv: {
+      spagoWithOverrides = super.spago.override {
+        # spago has not yet been updated for the latest dhall.
+        dhall = self.dhall_1_38_1;
+      };
+
+      spagoDocs = overrideCabal spagoWithOverrides (drv: {
         postUnpack = (drv.postUnpack or "") + ''
           # Spago includes the following two files directly into the binary
           # with Template Haskell.  They are fetched at build-time from the
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index c315d5fce464..9cd720d1139e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -73601,6 +73601,64 @@ self: {
        maintainers = with lib.maintainers; [ Gabriel439 ];
      }) {};
 
+  "dhall_1_38_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write
+     , base, bytestring, case-insensitive, cborg, cborg-json, containers
+     , contravariant, cryptonite, data-fix, deepseq, Diff, directory
+     , doctest, dotgen, either, exceptions, filepath, foldl, gauge
+     , generic-random, half, hashable, haskeline, http-client
+     , http-client-tls, http-types, lens-family-core, megaparsec, memory
+     , mmorph, mockery, mtl, network-uri, optparse-applicative
+     , parser-combinators, parsers, pretty-simple, prettyprinter
+     , prettyprinter-ansi-terminal, profunctors, QuickCheck
+     , quickcheck-instances, repline, scientific, serialise
+     , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit
+     , tasty-quickcheck, tasty-silver, template-haskell, text
+     , text-manipulate, th-lift-instances, transformers
+     , transformers-compat, turtle, unordered-containers, uri-encode
+     , vector
+     }:
+     mkDerivation {
+       pname = "dhall";
+       version = "1.38.1";
+       sha256 = "0g70x2crdrkwf41gvwr718am25dmbn9bg4cml9f9va7i1vx5rsgk";
+       revision = "2";
+       editedCabalFile = "02z0jmzzp20yj46iz6i384xwc6k2anxb33smvc4yhpmhqjs0aq8a";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty ansi-terminal atomic-write base bytestring
+         case-insensitive cborg cborg-json containers contravariant
+         cryptonite data-fix deepseq Diff directory dotgen either exceptions
+         filepath half hashable haskeline http-client http-client-tls
+         http-types lens-family-core megaparsec memory mmorph mtl
+         network-uri optparse-applicative parser-combinators parsers
+         pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors
+         repline scientific serialise template-haskell text text-manipulate
+         th-lift-instances transformers transformers-compat
+         unordered-containers uri-encode vector
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base bytestring cborg containers data-fix deepseq directory doctest
+         either filepath foldl generic-random http-client http-client-tls
+         lens-family-core megaparsec mockery prettyprinter QuickCheck
+         quickcheck-instances scientific serialise special-values spoon
+         tasty tasty-expected-failure tasty-hunit tasty-quickcheck
+         tasty-silver template-haskell text transformers turtle
+         unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers directory gauge text
+       ];
+       doCheck = false;
+       description = "A configuration language guaranteed to terminate";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       maintainers = with lib.maintainers; [ Gabriel439 ];
+     }) {};
+
   "dhall" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write
      , base, bytestring, case-insensitive, cborg, cborg-json, containers

From d49e15e746e87ccddedca0ca110f57f0c40420b6 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Mon, 14 Jun 2021 16:14:43 +0200
Subject: [PATCH 13/30] haskellPackages.hnix-store-{core,remote}: downgrade to
 < 0.5

hnix 0.13.* doesn't support hnix-store-* >= 0.5 yet, pending some
refactors to get GHC 9.0.x support working. Until that happens,
we downgrade hnix-store-* since nothing needs the new version yet.

https://github.com/haskell-nix/hnix/issues/952
---
 .../configuration-hackage2nix/main.yaml       |  3 ++
 .../haskell-modules/hackage-packages.nix      | 51 +++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index c07e2c61dc75..7c8ca8be75bf 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -96,6 +96,9 @@ default-package-overrides:
   # 2021-06-07: stackage still has dhall < 1.39
   - dhall-nix < 1.1.21
   - dhall-openapi < 1.0.1
+  # 2021-06-14: hnix still needs old versions https://github.com/haskell-nix/hnix/issues/952
+  - hnix-store-core < 0.5
+  - hnix-store-remote < 0.5
 
 extra-packages:
   - base16-bytestring < 1               # required for cabal-install etc.
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 9cd720d1139e..724077d620fe 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -131629,6 +131629,38 @@ self: {
      }) {};
 
   "hnix-store-core" = callPackage
+    ({ mkDerivation, algebraic-graphs, attoparsec, base
+     , base16-bytestring, base64-bytestring, binary, bytestring, cereal
+     , containers, cryptohash-md5, cryptohash-sha1, cryptohash-sha256
+     , cryptohash-sha512, directory, filepath, hashable, hspec
+     , lifted-base, monad-control, mtl, nix-derivation, process, saltine
+     , tasty, tasty-discover, tasty-golden, tasty-hspec, tasty-hunit
+     , tasty-quickcheck, temporary, text, time, unix
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hnix-store-core";
+       version = "0.4.3.0";
+       sha256 = "17l7198s3dzjx416nplinyghbqgignvpvxkww241gjv4p23izf77";
+       libraryHaskellDepends = [
+         algebraic-graphs attoparsec base base16-bytestring
+         base64-bytestring bytestring cereal containers cryptohash-md5
+         cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 directory
+         filepath hashable lifted-base monad-control mtl nix-derivation
+         saltine text time unix unordered-containers vector
+       ];
+       testHaskellDepends = [
+         attoparsec base base16-bytestring base64-bytestring binary
+         bytestring containers directory filepath hspec process tasty
+         tasty-golden tasty-hspec tasty-hunit tasty-quickcheck temporary
+         text unix
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Core effects for interacting with the Nix store";
+       license = lib.licenses.asl20;
+     }) {};
+
+  "hnix-store-core_0_5_0_0" = callPackage
     ({ mkDerivation, algebraic-graphs, attoparsec, base
      , base16-bytestring, base64-bytestring, binary, bytestring, cereal
      , containers, cryptonite, directory, filepath, hashable, hspec
@@ -131658,9 +131690,27 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Core effects for interacting with the Nix store";
        license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hnix-store-remote" = callPackage
+    ({ mkDerivation, attoparsec, base, binary, bytestring, containers
+     , hnix-store-core, mtl, network, nix-derivation, text, time
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "hnix-store-remote";
+       version = "0.4.3.1";
+       sha256 = "1wp6z5f13fkgh3mdzr1zcqdvsx1j90l5isf671gsg43brsv4c2vl";
+       libraryHaskellDepends = [
+         attoparsec base binary bytestring containers hnix-store-core mtl
+         network nix-derivation text time unordered-containers
+       ];
+       description = "Remote hnix store";
+       license = lib.licenses.asl20;
+     }) {};
+
+  "hnix-store-remote_0_5_0_0" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring, containers
      , cryptonite, hnix-store-core, mtl, network, nix-derivation, text
      , time, unordered-containers
@@ -131676,6 +131726,7 @@ self: {
        ];
        description = "Remote hnix store";
        license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hnn" = callPackage

From ee899c8c93bdac947037319ae11c7a9c184225f2 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Mon, 14 Jun 2021 23:01:54 +0200
Subject: [PATCH 14/30] haskellPackages.wide-word: remove now unnecessary
 override

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4e0b42d301a9..8b2ea63d5e61 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1946,10 +1946,6 @@ EOT
   # https://github.com/HeinrichApfelmus/reactive-banana/issues/215
   reactive-banana = doJailbreak super.reactive-banana;
 
-  # Too strict version bounds on QuickCheck and semirings
-  # https://github.com/erikd/wide-word/issues/57
-  wide-word = doJailbreak super.wide-word;
-
   hackage-db_2_1_0 = doDistribute super.hackage-db_2_1_0;
 
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From a5f7608182e6d63e2a97d54230e49784de3be075 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Mon, 14 Jun 2021 23:05:21 +0200
Subject: [PATCH 15/30] haskellPackages.dhall-{openapi,nix}: unrestrict

stackage has updated to dhall 1.39, so we can update these as well:

haskellPackages.dhall-openapi: 1.0.0 -> 1.0.1

haskellPackages.dhall-nix: 1.1.20 -> 1.1.21
---
 .../configuration-hackage2nix/main.yaml       |  3 --
 .../haskell-modules/hackage-packages.nix      | 51 -------------------
 2 files changed, 54 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 7c8ca8be75bf..56bd4ac4ab8e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -93,9 +93,6 @@ default-package-overrides:
   - futhark < 0.19.5
   # 2021-06-05: remove once pandoc 2.14 is in stackage
   - pandoc-crossref < 0.3.11.0
-  # 2021-06-07: stackage still has dhall < 1.39
-  - dhall-nix < 1.1.21
-  - dhall-openapi < 1.0.1
   # 2021-06-14: hnix still needs old versions https://github.com/haskell-nix/hnix/issues/952
   - hnix-store-core < 0.5
   - hnix-store-remote < 0.5
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 724077d620fe..7fa16fc96e4a 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -73900,30 +73900,6 @@ self: {
      }) {};
 
   "dhall-nix" = callPackage
-    ({ mkDerivation, base, containers, data-fix, dhall, hnix
-     , lens-family-core, neat-interpolation, optparse-generic, text
-     }:
-     mkDerivation {
-       pname = "dhall-nix";
-       version = "1.1.20";
-       sha256 = "14d9icvgmrphnbjjwlskh88p7vgphgb0xqd91p217bf2xhl9k2xd";
-       revision = "2";
-       editedCabalFile = "1w90jrkzmbv5nasafkkv0kyfmnqkngldx2lr891113h2mqbbr3wx";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers data-fix dhall hnix lens-family-core
-         neat-interpolation text
-       ];
-       executableHaskellDepends = [
-         base dhall hnix optparse-generic text
-       ];
-       description = "Dhall to Nix compiler";
-       license = lib.licenses.bsd3;
-       maintainers = with lib.maintainers; [ Gabriel439 ];
-     }) {};
-
-  "dhall-nix_1_1_21" = callPackage
     ({ mkDerivation, base, containers, data-fix, dhall, hnix
      , lens-family-core, neat-interpolation, optparse-generic, text
      }:
@@ -73942,7 +73918,6 @@ self: {
        ];
        description = "Dhall to Nix compiler";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
        maintainers = with lib.maintainers; [ Gabriel439 ];
      }) {};
 
@@ -73969,31 +73944,6 @@ self: {
      }) {};
 
   "dhall-openapi" = callPackage
-    ({ mkDerivation, aeson, base, containers, dhall, directory
-     , filepath, megaparsec, optparse-applicative, parser-combinators
-     , prettyprinter, scientific, sort, text, vector
-     }:
-     mkDerivation {
-       pname = "dhall-openapi";
-       version = "1.0.0";
-       sha256 = "1dg1hj8yfm08bzzirzg6cq26vkxv6i86rrf96a73pb1hpz3jjq7j";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base containers dhall prettyprinter scientific sort text
-         vector
-       ];
-       executableHaskellDepends = [
-         aeson base containers dhall directory filepath megaparsec
-         optparse-applicative parser-combinators prettyprinter sort text
-         vector
-       ];
-       description = "Convert an OpenAPI specification to a Dhall package";
-       license = lib.licenses.bsd3;
-       maintainers = with lib.maintainers; [ Gabriel439 ];
-     }) {};
-
-  "dhall-openapi_1_0_1" = callPackage
     ({ mkDerivation, aeson, base, containers, dhall, directory
      , filepath, megaparsec, optparse-applicative, parser-combinators
      , prettyprinter, scientific, sort, text, vector
@@ -74015,7 +73965,6 @@ self: {
        ];
        description = "Convert an OpenAPI specification to a Dhall package";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
        maintainers = with lib.maintainers; [ Gabriel439 ];
      }) {};
 

From d30eff5f90d9667c826d613fc6e0e1011476c82e Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Tue, 15 Jun 2021 10:46:31 +0900
Subject: [PATCH 16/30] haskellPackages: update documentation about Darwin
 builds

---
 pkgs/development/haskell-modules/HACKING.md | 49 ++++++++++++++-------
 1 file changed, 33 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md
index e5e16c59faf3..1161bd828f2a 100644
--- a/pkgs/development/haskell-modules/HACKING.md
+++ b/pkgs/development/haskell-modules/HACKING.md
@@ -1,5 +1,5 @@
 
-## Maintainer Workflow
+# Maintainer Workflow
 
 The goal of the [@NixOS/haskell](https://github.com/orgs/NixOS/teams/haskell)
 team is to keep the Haskell packages in Nixpkgs up-to-date, while making sure
@@ -20,7 +20,7 @@ The workflow generally proceeds in three main steps:
 
 Each of these steps is described in a separate section.
 
-### Initial `haskell-updates` PR
+## Initial `haskell-updates` PR
 
 In this section we create the PR for merging `haskell-updates` into `master`.
 
@@ -80,14 +80,14 @@ This is the follow-up to #TODO.
 
 Make sure to replace all TODO with the actual values.
 
-### Notify Maintainers and Fix Broken Packages
+## Notify Maintainers and Fix Broken Packages
 
 After you've done the previous steps, Hydra will start building the new and
 updated Haskell packages.  You can see the progress Hydra is making at
 https://hydra.nixos.org/jobset/nixpkgs/haskell-updates.  This Hydra jobset is
 defined in the file [release-haskell.nix](../../top-level/release-haskell.nix).
 
-#### Notify Maintainers
+### Notify Maintainers
 
 When Hydra finishes building all the updated packages for the `haskell-updates`
 jobset, you should generate a build report to notify maintainers of their
@@ -114,10 +114,12 @@ Maintainers should be given at least 7 days to fix up their packages when they
 break.  If maintainers don't fix up their packages with 7 days, then they
 may be marked broken before merging `haskell-updates` into `master`.
 
-#### Fix Broken Packages
+### Fix Broken Packages
 
 After getting the build report, you can see which packages and Hydra jobs are
-failing to build.  The most important jobs are the `maintained` and `mergeable`
+failing to build.  The most important jobs are the
+[`maintained`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/maintained) and
+[`mergeable`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/mergeable)
 jobs. These are both defined in
 [`release-haskell.nix`](../../top-level/release-haskell.nix).
 
@@ -133,7 +135,7 @@ Steps to fix Haskell packages that are failing to build is out of scope for
 this document, but it usually requires fixing up dependencies that are now
 out-of-bounds.
 
-#### Mark Broken Packages
+### Mark Broken Packages
 
 Packages that do not get fixed can be marked broken with the following
 commands.  First check which packages are broken:
@@ -178,7 +180,7 @@ following will happen:
 
 -   All updated files will be committed.
 
-#### Merge `master` into `haskell-updates`
+### Merge `master` into `haskell-updates`
 
 You should occasionally merge the `master` branch into the `haskell-updates`
 branch.
@@ -196,7 +198,7 @@ This is especially important after `staging-next` is merged into `master`,
 since there is a high chance that this will cause all the Haskell packages to
 rebuild.
 
-### Merge `haskell-updates` into `master`
+## Merge `haskell-updates` into `master`
 
 Now it is time to merge the `haskell-updates` PR you opened above.
 
@@ -215,15 +217,35 @@ Before doing this, make sure of the following:
     for Hydra to evaluate the new `haskell-updates` jobset.  Make sure you only
     merge `haskell-updates` into `master` when there are no evaluation errors.
 
+-   Due to Hydra having only a small number of Darwin build machines, the
+    `haskell-updates` jobset on Hydra often has many queued Darwin jobs.
+    In order to not have these queued Darwin jobs prevent the `haskell-updates`
+    branch from being merged to `master` in a timely manner, we have special
+    rules for Darwin jobs.
+
+    -   It is alright to merge the `haskell-updates` branch to `master` if
+        there are remaining queued Darwin jobs on Hydra.
+
+    -   We would like to keep GHC and the `mergeable` job building on Darwin.
+        Do not merge the `haskell-updates` branch to `master` if GHC is failing
+        to build, or the `mergeable` job has failing Darwin constituent jobs.
+
+        If GHC and the `mergeable` job are not failing, but merely queued,
+        it is alright to merge the `haskell-updates` branch to `master`.
+
+    -   We do not need to keep the `maintained` job building on Darwin.
+        If `maintained` packages are failing on Darwin, it is helpful to
+        mark them as broken on that platform.
+
 When you've double-checked these points, go ahead and merge the `haskell-updates` PR.
 After merging, **make sure not to delete the `haskell-updates` branch**, since it
 causes all currently open Haskell-related pull-requests to be automatically closed on GitHub.
 
-### Additional Info
+## Additional Info
 
 Here are some additional tips that didn't fit in above.
 
--   Hydra tries to evalute the `haskell-updates` branch (in the
+-   Hydra tries to evaluate the `haskell-updates` branch (in the
     [`nixpkgs:haskell-updates`](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates)
     jobset) every 4 hours.  It is possible to force a new Hydra evaluation without
     waiting 4 hours by the following steps:
@@ -265,8 +287,3 @@ Here are some additional tips that didn't fit in above.
 
 -   The Haskell team members generally hang out in the Matrix room
     [#haskell:nixos.org](https://matrix.to/#/#haskell:nixos.org).
-
-## Contributor Workflow
-
-(TODO: this section is to describe the type of workflow for non-committers to
-contribute to `haskell-updates`)

From d1c33896505bfabb2cd21fb6e8e73fee256a2bc4 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Tue, 15 Jun 2021 16:09:54 +0200
Subject: [PATCH 17/30] haskellPackages.hls-brittany-plugin: dontCheck on
 darwin

---
 pkgs/development/haskell-modules/configuration-darwin.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix
index 7e02a6653c77..4a62ab5867d1 100644
--- a/pkgs/development/haskell-modules/configuration-darwin.nix
+++ b/pkgs/development/haskell-modules/configuration-darwin.nix
@@ -170,5 +170,6 @@ self: super: {
 
   # 2021-05-25: Tests fail and I have no way to debug them.
   hls-class-plugin = dontCheck super.hls-class-plugin;
+  hls-brittany-plugin = dontCheck super.hls-brittany-plugin;
 
 }

From d8daa7af738311a68bacf5af1e4ff9e246a13e47 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Wed, 16 Jun 2021 10:32:20 +0800
Subject: [PATCH 18/30] haskellPackages.shellFor: Work around hoogle generation
 failure

Workaround for https://github.com/NixOS/nixpkgs/issues/82245

Although this doesn't tackle the root cause of a null package sneaking
in (via executableHaskellDepends), it does effectively treat the symptom
by just ignoring any null packages.

Seeing as that issue has been open for more than a year I think this
band-aid is necessary.
---
 pkgs/development/haskell-modules/hoogle.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index cfa06b045de2..d55f37f980d8 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -63,10 +63,13 @@ buildPackages.stdenv.mkDerivation {
   passAsFile = ["buildCommand"];
 
   buildCommand = ''
-    ${lib.optionalString (packages != [] -> docPackages == [])
+    ${let # Filter out nulls here to work around https://github.com/NixOS/nixpkgs/issues/82245
+          # If we don't then grabbing `p.name` here will fail.
+          packages' = lib.filter (p: p != null) packages;
+      in lib.optionalString (packages' != [] -> docPackages == [])
        ("echo WARNING: localHoogle package list empty, even though"
        + " the following were specified: "
-       + lib.concatMapStringsSep ", " (p: p.name) packages)}
+       + lib.concatMapStringsSep ", " (p: p.name) packages')}
     mkdir -p $out/share/doc/hoogle
 
     echo importing builtin packages

From 2d95c11e1c7c8876099779ecf4ce40fe5f564a7c Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Wed, 16 Jun 2021 13:16:23 +0800
Subject: [PATCH 19/30] nix-linter: 2020-09-25 -> 2021-06-16

Also add to haskellPackages
---
 .../haskell-modules/non-hackage-packages.nix      |  2 ++
 .../tools/analysis/nix-linter/default.nix         | 15 +++------------
 pkgs/top-level/all-packages.nix                   |  2 +-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix
index 1882d68f2343..6bbcabbf5a5e 100644
--- a/pkgs/development/haskell-modules/non-hackage-packages.nix
+++ b/pkgs/development/haskell-modules/non-hackage-packages.nix
@@ -22,6 +22,8 @@ self: super: {
   # https://github.com/spacchetti/spago/issues/512
   spago = self.callPackage ../tools/purescript/spago/spago.nix { };
 
+  nix-linter = self.callPackage ../../development/tools/analysis/nix-linter { };
+
   nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { };
 
   # cabal2nix --revision <rev> https://github.com/hasura/ci-info-hs.git
diff --git a/pkgs/development/tools/analysis/nix-linter/default.nix b/pkgs/development/tools/analysis/nix-linter/default.nix
index 279a69327fa6..f01886c883bc 100644
--- a/pkgs/development/tools/analysis/nix-linter/default.nix
+++ b/pkgs/development/tools/analysis/nix-linter/default.nix
@@ -17,18 +17,17 @@
 , containers
 , hnix
 , bytestring
-, fetchpatch
 }:
 
 mkDerivation rec {
   pname = "nix-linter-unstable";
-  version = "2020-09-25";
+  version = "2021-06-16";
 
   src = fetchFromGitHub {
     owner = "Synthetica9";
     repo = "nix-linter";
-    rev = "2516a8cda41f9bb553a1c3eca38e3dd94ebf53de";
-    sha256 = "07mn2c9v67wsm57jlxv9pqac9hahw4618vngmj2sfbgihx8997kb";
+    rev = "74707ed48dcc58dbfa27ae25ee0e044c072cc344";
+    sha256 = "17scghkinpx3pzlw3hw023ybnd8cy7bqfy8b48vwaq8a7bnm2rs3";
   };
 
   isLibrary = false;
@@ -37,14 +36,6 @@ mkDerivation rec {
   executableHaskellDepends = [ streamly mtl path pretty-terminal text base aeson cmdargs containers hnix bytestring path-io ];
   testHaskellDepends = [ tasty tasty-hunit tasty-th ];
 
-  patches = [
-    # Fix compatibility with hnix≥0.13.0 https://github.com/Synthetica9/nix-linter/pull/51
-    (fetchpatch {
-      url = "https://github.com/Synthetica9/nix-linter/commit/f73acacd8623dc25c9a35f8e04e4ff33cc596af8.patch";
-      sha256 = "139fm21hdg3vcw8hv35kxj4awd52bjqbb76mpzx191hzi9plj8qc";
-    })
-  ];
-
   description = "Linter for Nix(pkgs), based on hnix";
   homepage = "https://github.com/Synthetica9/nix-linter";
   license = lib.licenses.bsd3;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e1fc030ea07..774d62aeb4bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30873,7 +30873,7 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  nix-linter = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../development/tools/analysis/nix-linter { });
+  nix-linter = haskell.lib.justStaticExecutables (haskellPackages.nix-linter);
 
   nix-pin = callPackage ../tools/package-management/nix-pin { };
 

From 82ba3343c4e1833926e2a78e809dcb9ba5528c23 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Wed, 16 Jun 2021 11:50:07 +0200
Subject: [PATCH 20/30] haskellPackages.errata: no longer mark as broken

As pointed out here [1], errata has started working on its own again.

[1]: https://github.com/hyperrealgopher/burrow/pull/27#issue-670953936
---
 .../haskell-modules/configuration-hackage2nix/broken.yaml       | 1 -
 pkgs/development/haskell-modules/hackage-packages.nix           | 2 --
 2 files changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index 373508cec588..8cacd8a99a4d 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -1217,7 +1217,6 @@ broken-packages:
   - erlang
   - erlang-ffi
   - eros
-  - errata
   - error-context
   - error-continuations
   - error-list
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 7fa16fc96e4a..0ea3af07eaa0 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -84902,8 +84902,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Source code error pretty printing";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "errno" = callPackage

From faa7f48140fe47a287b04bad53f0a8ec4c58ac6f Mon Sep 17 00:00:00 2001
From: Tommy Bidne <tbidne@protonmail.com>
Date: Wed, 16 Jun 2021 11:26:31 +1200
Subject: [PATCH 21/30] haskellPackages.xmonad-wallpaper: jailbreak

Compiles with random 1.2.0, but bound is too strict at <1.2.

Co-authored-by: sterni <sternenseemann@systemli.org>
---
 pkgs/development/haskell-modules/configuration-common.nix     | 4 ++++
 .../haskell-modules/configuration-hackage2nix/broken.yaml     | 1 -
 pkgs/development/haskell-modules/hackage-packages.nix         | 2 --
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8b2ea63d5e61..cf4cbdeef13d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -698,6 +698,10 @@ self: super: {
   uuid-types = doJailbreak super.uuid-types;
   uuid = doJailbreak super.uuid;
 
+  # Bypass version check for random < 1.2 (1.2 works fine).
+  # https://github.com/yeyan/xmonad-wallpaper/issues/2
+  xmonad-wallpaper = doJailbreak super.xmonad-wallpaper;
+
   # The tests spuriously fail
   libmpd = dontCheck super.libmpd;
 
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index 8cacd8a99a4d..dd4b94d30914 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -5203,7 +5203,6 @@ broken-packages:
   - xmonad-dbus
   - xmonad-eval
   - xmonad-vanessa
-  - xmonad-wallpaper
   - xmonad-windownames
   - xor
   - Xorshift128Plus
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 0ea3af07eaa0..f1c9df6a41c6 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -285097,8 +285097,6 @@ self: {
        libraryHaskellDepends = [ base magic mtl random unix xmonad ];
        description = "xmonad wallpaper extension";
        license = lib.licenses.lgpl3Only;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "xmonad-windownames" = callPackage

From ca264edb1b50b725ce7375e8abca576a6dcde604 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Wed, 16 Jun 2021 23:07:32 +0200
Subject: [PATCH 22/30] haskellPackages.table-layout: unbreak

---
 pkgs/development/haskell-modules/configuration-common.nix     | 4 ++++
 .../haskell-modules/configuration-hackage2nix/broken.yaml     | 1 -
 pkgs/development/haskell-modules/hackage-packages.nix         | 2 --
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index cf4cbdeef13d..87f8265256bf 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1952,4 +1952,8 @@ EOT
 
   hackage-db_2_1_0 = doDistribute super.hackage-db_2_1_0;
 
+  # Too strict bounds on QuickCheck
+  # https://github.com/muesli4/table-layout/issues/16
+  table-layout = doJailbreak super.table-layout;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index dd4b94d30914..7e3509282574 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -4573,7 +4573,6 @@ broken-packages:
   - t3-server
   - table
   - tableaux
-  - table-layout
   - tables
   - Tables
   - tablestorage
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f1c9df6a41c6..55856c64070f 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -254038,8 +254038,6 @@ self: {
        ];
        description = "Format tabular data as grid or table";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "table-tennis" = callPackage

From 1be887ea3f071d44846f5252521d77f037f3e3d9 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Thu, 17 Jun 2021 09:52:14 +0200
Subject: [PATCH 23/30] haskellPackages.cabal2nix-unstable: wrap with runtime
 dependencies

---
 .../haskell-modules/configuration-nix.nix       | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index a9467dd0fc3f..161712d594b8 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -826,8 +826,21 @@ self: super: builtins.intersectAttrs super {
   random = dontCheck super.random;
 
   # Since this package is primarily used by nixpkgs maintainers and is probably
-  # not used to link against by anyone, we can make it’s closure smaller.
-  cabal2nix-unstable = justStaticExecutables super.cabal2nix-unstable;
+  # not used to link against by anyone, we can make it’s closure smaller and
+  # add its runtime dependencies in `haskellPackages` (as opposed to cabal2nix).
+  cabal2nix-unstable = overrideCabal
+    (justStaticExecutables super.cabal2nix-unstable)
+    (drv: {
+      buildTools = (drv.buildTools or []) ++ [
+        pkgs.makeWrapper
+      ];
+      postInstall = ''
+        wrapProgram $out/bin/cabal2nix \
+          --prefix PATH ":" "${
+            pkgs.lib.makeBinPath [ pkgs.nix pkgs.nix-prefetch-scripts ]
+          }"
+      '';
+    });
 
   # test suite needs local redis daemon
   nri-redis = dontCheck super.nri-redis;

From cacae0fc44aa79a178984740d951319e3730bf81 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Thu, 17 Jun 2021 10:58:06 +0200
Subject: [PATCH 24/30] haskellPackages.composite-{base,aeson}: unbreak

---
 pkgs/development/haskell-modules/configuration-common.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 87f8265256bf..e04da5d90b08 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1956,4 +1956,9 @@ EOT
   # https://github.com/muesli4/table-layout/issues/16
   table-layout = doJailbreak super.table-layout;
 
+  # Bounds on profunctors are too strict
+  # https://github.com/ConferOpenSource/composite/issues/50
+  composite-base = doJailbreak super.composite-base;
+  composite-aeson = doJailbreak super.composite-aeson;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 1c3b2aa37bc27929d3f1f0c0ab9a4f7c6eefce5d Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Thu, 17 Jun 2021 11:19:24 +0200
Subject: [PATCH 25/30] haskellPackages.proto-lens: unbreak

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e04da5d90b08..118c432ff58d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1961,4 +1961,8 @@ EOT
   composite-base = doJailbreak super.composite-base;
   composite-aeson = doJailbreak super.composite-aeson;
 
+  # Too strict bounds on profunctors
+  # https://github.com/google/proto-lens/issues/413
+  proto-lens = doJailbreak super.proto-lens;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From e8d2bf944dd5ace133f456a0a337eaa9d5afa9ee Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Thu, 17 Jun 2021 11:25:36 +0200
Subject: [PATCH 26/30] haskellPackages.tophat: unbreak

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 118c432ff58d..0d9d65af01c1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1965,4 +1965,8 @@ EOT
   # https://github.com/google/proto-lens/issues/413
   proto-lens = doJailbreak super.proto-lens;
 
+  # Too strict bounds on profunctors
+  # https://github.com/jcranch/tophat/issues/1
+  tophat = doJailbreak super.tophat;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From a37b662ba1ff8546d6e0c9b7b35947263f86ea95 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 18 Jun 2021 04:48:41 +0000
Subject: [PATCH 27/30] flow: 0.152.0 -> 0.153.0

---
 pkgs/development/tools/analysis/flow/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index ea1aee669c54..df571a1ce433 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flow";
-  version = "0.152.0";
+  version = "0.153.0";
 
   src = fetchFromGitHub {
     owner  = "facebook";
     repo   = "flow";
     rev    = "refs/tags/v${version}";
-    sha256 = "1af9z6xah3rk99pv984nikkpq8jzl5r0fccb1gdhmi7y5a6y6g1m";
+    sha256 = "sha256-KaDgrr1DY7DGxFvSOzbO04Y8Z3LkmvJcPwfFWa/UlMs=";
   };
 
   installPhase = ''

From 5420c28e6763ca915a0899ef6e2496a0dec0f918 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 18 Jun 2021 06:10:54 +0000
Subject: [PATCH 28/30] go-toml: 1.9.2 -> 1.9.3

---
 pkgs/development/tools/go-toml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/development/tools/go-toml/default.nix
index fee8d94f754b..8a41e0a4d133 100644
--- a/pkgs/development/tools/go-toml/default.nix
+++ b/pkgs/development/tools/go-toml/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "go-toml";
-  version = "1.9.2";
+  version = "1.9.3";
 
   src = fetchFromGitHub {
     owner = "pelletier";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-x740f6I+szhq4mEsed4bsXcC8PvzF6PKFJNJ9SKMGIE=";
+    sha256 = "sha256-Vu/PS01JeSeg1KHkpqL12rTjRJFoc9rla48H/ei2HDM=";
   };
 
   goPackagePath = "github.com/pelletier/go-toml";

From 40da6ce07462762c812e93da48e269e4e4e27847 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 18 Jun 2021 13:22:29 +0200
Subject: [PATCH 29/30] haskellPackages: mark builds failing on hydra as broken

This commit has been generated by maintainers/scripts/haskell/mark-broken.sh
---
 .../configuration-hackage2nix/broken.yaml     |  9 ++++++++
 .../transitive-broken.yaml                    | 11 ++++-----
 .../haskell-modules/hackage-packages.nix      | 23 ++++++++++++++++---
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index 7e3509282574..0f895e1f782e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -118,6 +118,7 @@ broken-packages:
   - alto
   - alure
   - amazon-emailer
+  - amazonka-s3-streaming
   - amazon-products
   - amby
   - AMI
@@ -834,6 +835,7 @@ broken-packages:
   - criu-rpc-types
   - crjdt-haskell
   - crocodile
+  - cronus
   - cruncher-types
   - crunghc
   - crypto-cipher-benchmarks
@@ -2364,6 +2366,7 @@ broken-packages:
   - hweblib
   - hwhile
   - hw-json-simd
+  - hw-mquery
   - hworker
   - hw-simd
   - hwsl2
@@ -2608,6 +2611,7 @@ broken-packages:
   - ktx
   - ktx-codec
   - kuifje
+  - kure
   - kure-your-boilerplate
   - KyotoCabinet
   - labeled-graph
@@ -2764,6 +2768,7 @@ broken-packages:
   - list-remote-forwards
   - ListT
   - list-t-http-client
+  - list-tries
   - list-t-text
   - list-zip-def
   - list-zipper
@@ -2986,6 +2991,7 @@ broken-packages:
   - mmtf
   - mmtl
   - Mobile-Legends-Hack-Cheats
+  - mock-time
   - modelicaparser
   - modular-prelude
   - module-management
@@ -3304,6 +3310,7 @@ broken-packages:
   - open-adt
   - OpenAFP
   - openai-hs
+  - openai-servant
   - openapi3-code-generator
   - openapi-petstore
   - openapi-typed
@@ -3434,6 +3441,7 @@ broken-packages:
   - parsers-megaparsec
   - parsimony
   - parsley
+  - parsley-core
   - parsnip
   - partage
   - partial-records
@@ -4615,6 +4623,7 @@ broken-packages:
   - teeth
   - telegram
   - telegram-api
+  - telegram-bot-simple
   - teleport
   - teleshell
   - tellbot
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
index 66ab6c5799cd..59c2630a962c 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@@ -28,7 +28,6 @@ dont-distribute-packages:
  - Advgame
  - Advise-me
  - aern2-real
- - aern2-real_0_2_7_0
  - AERN-Net
  - AERN-Real
  - AERN-Real-Double
@@ -121,6 +120,7 @@ dont-distribute-packages:
  - atuin
  - audiovisual
  - aura
+ - aura_3_2_5
  - authoring
  - AutoForms
  - autonix-deps-kf5
@@ -1105,6 +1105,7 @@ dont-distribute-packages:
  - happstack-jmacro
  - happstack-plugins
  - happstack-state
+ - happstack-static-routing
  - happstack-yui
  - happs-tutorial
  - happybara-webkit
@@ -1618,7 +1619,6 @@ dont-distribute-packages:
  - JSON-Combinator-Examples
  - json-enumerator
  - JsonGrammar
- - jsonifier
  - json-incremental-decoder
  - json-query
  - jsons-to-schema
@@ -1892,6 +1892,7 @@ dont-distribute-packages:
  - MaybeT-transformers
  - MC-Fold-DP
  - mcmc
+ - mcmc_0_5_0_0
  - mcmc-samplers
  - mDNSResponder-client
  - mealy
@@ -2080,7 +2081,6 @@ dont-distribute-packages:
  - NoSlow
  - notmuch-haskell
  - notmuch-web
- - nri-prelude_0_6_0_1
  - numerical
  - numeric-ode
  - numhask-hedgehog
@@ -2115,7 +2115,6 @@ dont-distribute-packages:
  - openpgp-crypto-api
  - OpenSCAD
  - openssh-github-keys
- - opentelemetry-extra_0_7_0
  - opentracing-jaeger
  - opentracing-zipkin-v1
  - open-union
@@ -2150,6 +2149,7 @@ dont-distribute-packages:
  - parquet-hs
  - parse-help
  - parsestar
+ - parsley-garnish
  - partial-lens
  - passman-cli
  - patch-image
@@ -2513,7 +2513,6 @@ dont-distribute-packages:
  - ruler-core
  - runtime-arbitrary
  - S3
- - safe-coloured-text-layout-gen
  - safer-file-handles
  - safer-file-handles-bytestring
  - safer-file-handles-text
@@ -2614,7 +2613,6 @@ dont-distribute-packages:
  - servant-zeppelin-swagger
  - serv-wai
  - sessiontypes-distributed
- - setdown
  - s-expression
  - SFML-control
  - SFont
@@ -2826,7 +2824,6 @@ dont-distribute-packages:
  - swearjure
  - sweet-egison
  - switch
- - sydtest_0_2_0_0
  - sydtest-persistent-postgresql
  - sylvia
  - symantic-atom
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 55856c64070f..e0d8cde491ce 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -29037,6 +29037,8 @@ self: {
        ];
        description = "Provides conduits to upload data to S3 using the Multipart API";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "amazonka-sagemaker" = callPackage
@@ -65671,6 +65673,8 @@ self: {
        ];
        description = "Another bloated standard library";
        license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "cruncher-types" = callPackage
@@ -117146,6 +117150,7 @@ self: {
        ];
        description = "Support for static URL routing with overlap detection for Happstack";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "happstack-util" = callPackage
@@ -143064,6 +143069,8 @@ self: {
        testToolDepends = [ doctest-discover hspec-discover ];
        description = "Monadic query DSL";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hw-packed-vector" = callPackage
@@ -153597,7 +153604,6 @@ self: {
        ];
        description = "Fast and simple JSON encoding toolkit";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "jsonnet" = callPackage
@@ -156795,6 +156801,8 @@ self: {
        libraryHaskellDepends = [ base dlist transformers ];
        description = "Combinators for Strategic Programming";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "kure-your-boilerplate" = callPackage
@@ -164907,6 +164915,8 @@ self: {
        ];
        description = "Tries and Patricia tries: finite sets and maps for list keys";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "list-tuple" = callPackage
@@ -176151,6 +176161,8 @@ self: {
        ];
        description = "Mock time in tests";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "mockazo" = callPackage
@@ -191000,6 +191012,8 @@ self: {
        ];
        description = "Unofficial OpenAI servant types";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "openapi-petstore" = callPackage
@@ -196683,6 +196697,8 @@ self: {
        libraryToolDepends = [ cpphs ];
        description = "A fast parser combinator library backed by Typed Template Haskell";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsley-garnish" = callPackage
@@ -196698,6 +196714,7 @@ self: {
        ];
        description = "A collection of GHC plugins to work with parsley";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "parsnip" = callPackage
@@ -226360,7 +226377,6 @@ self: {
        ];
        testToolDepends = [ sydtest-discover ];
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "safe-coloured-text-terminfo" = callPackage
@@ -234836,7 +234852,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Treating files as sets to perform rapid set manipulation";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "setenv" = callPackage
@@ -256713,6 +256728,8 @@ self: {
        ];
        description = "Easy to use library for building Telegram bots";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "telegram-raw-api" = callPackage

From 0e3229d628b3a1c56cc9279c39e6a40720794773 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 18 Jun 2021 17:03:40 +0000
Subject: [PATCH 30/30] erlangR22: 22.3.4.19 -> 22.3.4.20

---
 pkgs/development/interpreters/erlang/R22.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/R22.nix b/pkgs/development/interpreters/erlang/R22.nix
index c69c26d4cb01..9236ea428948 100644
--- a/pkgs/development/interpreters/erlang/R22.nix
+++ b/pkgs/development/interpreters/erlang/R22.nix
@@ -3,6 +3,6 @@
 # How to obtain `sha256`:
 # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
 mkDerivation {
-  version = "22.3.4.19";
-  sha256 = "sha256-U3ks7pDIqS8HVJ+yBobhEbKvnd9svEcQd9BsJQwajDs=";
+  version = "22.3.4.20";
+  sha256 = "sha256-EUErOCW16eUb/p5dLpFV7sQ3mXlCF/OgOvGAAyYEvLo=";
 }