Merge pull request #166460 from NixOS/haskell-updates

haskellPackages: update stackage and hackage
2022-04-03 14:15:45 +02:00 · 2022-04-03 14:15:45 +02:00 · 34e9589d5a
parent 5be97bb4aa d720420f37
commit 34e9589d5a
8 changed files with 1090 additions and 2479 deletions
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@ -1,6 +1,6 @@
 {
-  "commit": "f504760b580057f368d85ed6f6c4e78a38968ff4",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f504760b580057f368d85ed6f6c4e78a38968ff4.tar.gz",
-  "sha256": "0m3w7bawx0qxj2qn3yx1d4j90dq89k5c4604f6z38cxxx0rszmzj",
-  "msg": "Update from Hackage at 2022-03-26T03:24:04Z"
+  "commit": "a02557e981025a281de13f66204c2cd2e788732f",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a02557e981025a281de13f66204c2cd2e788732f.tar.gz",
+  "sha256": "0c6jg9s4p65ynkkk0z6p9q4whz5hs1vmbq8zsn7pavxkzwa8ych1",
+  "msg": "Update from Hackage at 2022-03-30T19:23:57Z"
 }
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -23,6 +23,12 @@ self: super: {
  # There are numerical tests on random data, that may fail occasionally
  lapack = dontCheck super.lapack;

+  # fix tests failure for base≥4.15 (https://github.com/kim/leveldb-haskell/pull/41)
+  leveldb-haskell = appendPatch (fetchpatch {
+    url = "https://github.com/kim/leveldb-haskell/commit/f5249081f589233890ddb1945ec548ca9fb717cf.patch";
+    sha256 = "14gllipl28lqry73c5dnclsskzk1bsrrgazibl4lkl8z98j2csjb";
+  }) super.leveldb-haskell;
+
  # Arion's test suite needs a Nixpkgs, which is cumbersome to do from Nixpkgs
  # itself. For instance, pkgs.path has dirty sources and puts a huge .git in the
  # store. Testing is done upstream.
@ -1821,19 +1827,6 @@ self: super: {
  vivid-osc = dontCheck super.vivid-osc;
  vivid-supercollider = dontCheck super.vivid-supercollider;

-  yarn2nix = assert super.yarn2nix.version == "0.8.0";
-    lib.pipe (super.yarn2nix.override {
-      regex-tdfa-text = null; # dependency dropped in 0.10.1
-    }) [
-      (overrideCabal {
-        version = "0.10.1";
-        sha256 = "17f96563v9hp56ycd276fxri7z6nljd7yaiyzpgaa3px6rf48a0m";
-        editedCabalFile = null;
-        revision = null;
-      })
-      (addBuildDepends [ self.aeson-better-errors ]) # 0.8.0 didn't depend on this
-    ];
-
  # cabal-install switched to build type simple in 3.2.0.0
  # as a result, the cabal(1) man page is no longer installed
  # automatically. Instead we need to use the `cabal man`
@ -2241,7 +2234,7 @@ self: super: {
  # but with too strict lower bounds for our lts-18.
  # Disable aeson for now, future release should support it
  graphql =
-    assert super.graphql.version == "1.0.2.0";
+    assert super.graphql.version == "1.0.3.0";
    appendConfigureFlags [
      "-f-json"
    ] (lib.warnIf (lib.versionAtLeast self.hspec.version "2.9.0") "@NixOS/haskell: Remove jailbreak for graphql" doJailbreak super.graphql);
@ -2584,9 +2577,6 @@ self: super: {
      })
     ] super.elm2nix;

-  # Fixes test suite with modern-uri 0.3.4.3, waiting for Stackage LTS to follow suit
-  mmark = doDistribute self.mmark_0_0_7_5;
-
  # https://github.com/Synthetica9/nix-linter/issues/65
  nix-linter = super.nix-linter.overrideScope (self: super: {
    aeson = self.aeson_1_5_6_0;
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@ -268,6 +268,7 @@ broken-packages:
  - avatar-generator
  - aviation-units
  - avl-static
+  - avro-piper
  - avr-shake
  - avwx
  - awesome-prelude
@ -452,7 +453,6 @@ broken-packages:
  - botpp
  - bottom
  - boundingboxes
-  - bower-json
  - bowntz
  - bpath
  - braid
@ -1445,6 +1445,7 @@ broken-packages:
  - fingertree-tf
  - finitary
  - finite
+  - FiniteCategories
  - finite-fields
  - firefly-example
  - first-and-last
@ -1786,6 +1787,7 @@ broken-packages:
  - graphmod-plugin
  - graphql-api
  - graphql-parser
+  - graphql-spice
  - graphql-w-persistent
  - graph-rewriting
  - graph-serialize
@ -2539,7 +2541,6 @@ broken-packages:
  - hylolib
  - hyperdrive
  - hyperfunctions
-  - hyper-haskell-server
  - hyperion
  - hyperloglogplus
  - hyperscript
@ -2917,7 +2918,6 @@ broken-packages:
  - lens-xml
  - less-arbitrary
  - Level0
-  - leveldb-haskell
  - level-monad
  - levenshtein
  - levmar
@ -4162,6 +4162,8 @@ broken-packages:
  - react-haskell
  - reaction-logic
  - reactive-bacon
+  - reactive-banana-automation
+  - reactive-banana-bunch
  - reactive-banana-gi-gtk
  - reactive-banana-sdl2
  - reactive-banana-threepenny
@ -4815,6 +4817,7 @@ broken-packages:
  - stm-stats
  - stochastic
  - Stomp
+  - stooq-api
  - storable
  - storable-static-array
  - stp
@ -5012,6 +5015,7 @@ broken-packages:
  - tensorflow
  - tensorflow-opgen
  - tensor-safe
+  - termbox-banana
  - termbox-bindings
  - termination-combinators
  - termplot
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@ -319,6 +319,7 @@ package-maintainers:
    - shakespeare
  roberth:
    - arion-compose
+    - cabal-pkg-config-version-hook
    - hercules-ci-agent
    - hercules-ci-api
    - hercules-ci-api-agent
@ -403,6 +404,7 @@ unsupported-platforms:
  dx9d3d:                                       [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
  dx9d3dx:                                      [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
  Euterpea:                                     [ x86_64-darwin, aarch64-darwin ]
+  essence-of-live-coding-PortMidi:              [ x86_64-darwin, aarch64-darwin ]
  follow-file:                                  [ x86_64-darwin, aarch64-darwin ]
  freenect:                                     [ x86_64-darwin, aarch64-darwin ]
  FTGL:                                         [ x86_64-darwin, aarch64-darwin ]
@ -421,6 +423,7 @@ unsupported-platforms:
  gi-webkit2:                                   [ x86_64-darwin, aarch64-darwin ] # webkitgtk marked broken on darwin
  gi-wnck:                                      [ x86_64-darwin, aarch64-darwin ]
  gnome-keyring:                                [ x86_64-darwin, aarch64-darwin ]
+  grid-proto:                                   [ x86_64-darwin, aarch64-darwin ]
  gtk3-mac-integration:                         [ x86_64-linux, aarch64-linux ]
  gtk-mac-integration:                          [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ]
  gtk-sni-tray:                                 [ x86_64-darwin, aarch64-darwin ]
@ -428,6 +431,7 @@ unsupported-platforms:
  hbro-contrib:                                 [ x86_64-darwin, aarch64-darwin ] # webkitgtk marked broken on darwin
  hbro:                                         [ x86_64-darwin, aarch64-darwin ] # webkitgtk marked broken on darwin
  hcwiid:                                       [ x86_64-darwin, aarch64-darwin ]
+  HDRUtils:                                     [ x86_64-darwin, aarch64-darwin ]
  HFuse:                                        [ x86_64-darwin, aarch64-darwin ]
  hidapi:                                       [ x86_64-darwin, aarch64-darwin ]
  hinotify-bytestring:                          [ x86_64-darwin, aarch64-darwin ]
@ -461,6 +465,7 @@ unsupported-platforms:
  lio-fs:                                       [ x86_64-darwin, aarch64-darwin ]
  logging-facade-journald:                      [ x86_64-darwin, aarch64-darwin ]
  longshot:                                     [ aarch64-linux ]
+  lxc:                                          [ x86_64-darwin, aarch64-darwin ]
  midi-alsa:                                    [ x86_64-darwin, aarch64-darwin ]
  mpi-hs:                                       [ aarch64-linux, x86_64-darwin, aarch64-darwin ]
  mpi-hs-binary:                                [ aarch64-linux, x86_64-darwin, aarch64-darwin ]
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
@ -1,4 +1,4 @@
-# Stackage LTS 19.0
+# Stackage LTS 19.1
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@ -36,7 +36,7 @@ default-package-overrides:
  - Agda ==2.6.2.1
  - agda2lagda ==0.2021.6.1
  - al ==0.1.4.2
-  - alarmclock ==0.7.0.5
+  - alarmclock ==0.7.0.6
  - alerts ==0.1.2.0
  - alex ==3.2.7.1
  - alex-meta ==0.3.0.13
@ -77,15 +77,16 @@ default-package-overrides:
  - array-memoize ==0.6.0
  - arrow-extras ==0.1.0.1
  - arrows ==0.4.4.2
-  - ascii ==1.1.1.2
+  - ascii ==1.1.2.0
  - ascii-case ==1.0.0.10
  - ascii-char ==1.0.0.14
  - asciidiagram ==1.3.3.3
-  - ascii-group ==1.0.0.10
-  - ascii-predicates ==1.0.0.8
+  - ascii-group ==1.0.0.12
+  - ascii-numbers ==1.0.0.0
+  - ascii-predicates ==1.0.0.10
  - ascii-progress ==0.3.3.0
-  - ascii-superset ==1.0.1.10
-  - ascii-th ==1.0.0.8
+  - ascii-superset ==1.0.1.12
+  - ascii-th ==1.0.0.10
  - asn1-encoding ==0.9.6
  - asn1-parse ==0.9.5
  - asn1-types ==0.3.4
@ -117,7 +118,7 @@ default-package-overrides:
  - auto-update ==0.1.6
  - aws-cloudfront-signed-cookies ==0.2.0.10
  - backtracking ==0.1.0
-  - bank-holidays-england ==0.2.0.6
+  - bank-holidays-england ==0.2.0.7
  - barbies ==2.0.3.1
  - barrier ==0.1.1
  - base16 ==0.3.1.0
@ -137,7 +138,7 @@ default-package-overrides:
  - base-compat-batteries ==0.11.2
  - basement ==0.0.14
  - base-orphans ==0.8.6
-  - base-prelude ==1.6
+  - base-prelude ==1.6.1
  - base-unicode-symbols ==0.2.4.2
  - basic-prelude ==0.7.0
  - battleship-combinatorics ==0.0.1
@ -151,7 +152,7 @@ default-package-overrides:
  - bech32 ==1.1.2
  - bech32-th ==1.1.1
  - bench ==1.0.12
-  - benchpress ==0.2.2.18
+  - benchpress ==0.2.2.19
  - bencode ==0.6.1.1
  - bencoding ==0.4.5.4
  - between ==0.11.0.0
@ -161,7 +162,7 @@ default-package-overrides:
  - bimaps ==0.1.0.2
  - bimap-server ==0.1.0.1
  - bin ==0.1.2
-  - binance-exports ==0.1.0.0
+  - binance-exports ==0.1.1.0
  - binary-conduit ==1.3.1
  - binaryen ==0.0.6.0
  - binary-generic-combinators ==0.4.4.0
@ -186,7 +187,7 @@ default-package-overrides:
  - bitarray ==0.0.1.1
  - bits ==0.6
  - bitset-word8 ==0.1.1.2
-  - bits-extra ==0.0.2.0
+  - bits-extra ==0.0.2.3
  - bitvec ==1.1.2.0
  - bitwise-enum ==1.0.1.0
  - blake2 ==0.3.0
@ -214,7 +215,7 @@ default-package-overrides:
  - Boolean ==0.2.4
  - boolean-like ==0.1.1.0
  - boolsimplifier ==0.1.8
-  - boomerang ==1.4.7
+  - boomerang ==1.4.8
  - boots ==0.2.0.1
  - bordacount ==0.1.0.0
  - boring ==0.2
@ -256,10 +257,10 @@ default-package-overrides:
  - bz2 ==1.0.1.0
  - bzlib ==0.5.1.0
  - bzlib-conduit ==0.3.0.2
-  - c14n ==0.1.0.1
+  - c14n ==0.1.0.2
  - c2hs ==0.28.8
  - cabal2spec ==2.6.2
-  - cabal-appimage ==0.3.0.3
+  - cabal-appimage ==0.3.0.4
  - cabal-clean ==0.1.20210924
  - cabal-doctest ==1.0.9
  - cabal-file ==0.1.1
@ -275,7 +276,7 @@ default-package-overrides:
  - call-alloy ==0.3
  - call-stack ==0.4.0
  - can-i-haz ==0.3.1.0
-  - capability ==0.5.0.0
+  - capability ==0.5.0.1
  - capataz ==0.2.1.0
  - ca-province-codes ==1.0.0.0
  - cardano-coin-selection ==1.0.1
@ -364,7 +365,7 @@ default-package-overrides:
  - comfort-array ==0.5.1
  - comfort-array-shape ==0.0
  - comfort-fftw ==0.0
-  - comfort-graph ==0.0.3.1
+  - comfort-graph ==0.0.3.2
  - commonmark ==0.2.1.1
  - commonmark-extensions ==0.2.3
  - commonmark-pandoc ==0.2.1.2
@ -410,7 +411,7 @@ default-package-overrides:
  - constraints ==0.13.3
  - constraints-extras ==0.3.2.1
  - constraint-tuples ==0.1.2
-  - construct ==0.3.0.2
+  - construct ==0.3.1
  - containers-unicode-symbols ==0.3.1.3
  - contravariant ==1.5.5
  - contravariant-extras ==0.3.5.3
@ -482,7 +483,7 @@ default-package-overrides:
  - cutter ==0.0
  - cyclotomic ==1.1.1
  - czipwith ==1.0.1.4
-  - d10 ==1.0.0.2
+  - d10 ==1.0.1.0
  - data-accessor ==0.2.3
  - data-accessor-mtl ==0.2.0.4
  - data-accessor-transformers ==0.2.1.7
@ -605,11 +606,11 @@ default-package-overrides:
  - doldol ==0.4.1.2
  - do-list ==1.0.1
  - domain ==0.1.1.3
-  - domain-core ==0.1.0.1
-  - domain-optics ==0.1.0.2
+  - domain-core ==0.1.0.2
+  - domain-optics ==0.1.0.3
  - do-notation ==0.1.0.2
  - dot ==0.3
-  - dotenv ==0.9.0.0
+  - dotenv ==0.9.0.2
  - dotgen ==0.4.3
  - dotnet-timespan ==0.0.1.0
  - double-conversion ==2.0.4.1
@ -654,7 +655,7 @@ default-package-overrides:
  - elynx-seq ==0.6.1.1
  - elynx-tools ==0.6.1.1
  - elynx-tree ==0.6.1.1
-  - email-validate ==2.3.2.15
+  - email-validate ==2.3.2.16
  - emd ==0.2.0.0
  - emojis ==0.1.2
  - enclosed-exceptions ==1.0.3
@ -730,7 +731,7 @@ default-package-overrides:
  - feature-flags ==0.1.0.1
  - fedora-dists ==2.0.0
  - fedora-haskell-tools ==1.0
-  - feed ==1.3.2.0
+  - feed ==1.3.2.1
  - FenwickTree ==0.1.2.1
  - fft ==0.1.8.7
  - fftw-ffi ==0.1
@ -854,7 +855,7 @@ default-package-overrides:
  - genvalidity-persistent ==1.0.0.0
  - genvalidity-property ==1.0.0.0
  - genvalidity-scientific ==1.0.0.0
-  - genvalidity-text ==1.0.0.0
+  - genvalidity-text ==1.0.0.1
  - genvalidity-time ==1.0.0.0
  - genvalidity-unordered-containers ==1.0.0.0
  - genvalidity-uuid ==1.0.0.0
@ -925,7 +926,7 @@ default-package-overrides:
  - Glob ==0.10.2
  - glob-posix ==0.2.0.1
  - gloss ==1.13.2.1
-  - gloss-algorithms ==1.13.0.2
+  - gloss-algorithms ==1.13.0.3
  - gloss-raster ==1.13.1.2
  - gloss-rendering ==1.13.1.1
  - GLURaw ==2.0.0.5
@ -955,7 +956,7 @@ default-package-overrides:
  - group-by-date ==0.1.0.4
  - grouped-list ==0.2.3.0
  - groups ==0.5.3
-  - gtk2hs-buildtools ==0.13.8.2
+  - gtk2hs-buildtools ==0.13.8.3
  - gtk-sni-tray ==0.1.8.0
  - gtk-strut ==0.1.3.0
  - guarded-allocation ==0.0.1
@ -965,7 +966,7 @@ default-package-overrides:
  - hadoop-streaming ==0.2.0.3
  - hakyll ==4.15.1.1
  - hakyll-convert ==0.3.0.4
-  - hal ==0.4.9
+  - hal ==0.4.10
  - half ==0.3.1
  - hall-symbols ==0.1.0.6
  - hamilton ==0.1.0.3
@ -977,7 +978,7 @@ default-package-overrides:
  - happy ==1.20.0
  - happy-meta ==0.2.0.11
  - HasBigDecimal ==0.1.1
-  - hasbolt ==0.1.6.1
+  - hasbolt ==0.1.6.2
  - hashable ==1.3.5.0
  - hashable-time ==0.3
  - hashids ==1.0.2.7
@ -1192,36 +1193,36 @@ default-package-overrides:
  - hunit-dejafu ==2.0.0.5
  - hvect ==0.4.0.1
  - hvega ==0.12.0.2
-  - hw-balancedparens ==0.4.1.1
-  - hw-bits ==0.7.2.1
-  - hw-conduit ==0.2.1.0
+  - hw-balancedparens ==0.4.1.2
+  - hw-bits ==0.7.2.2
+  - hw-conduit ==0.2.1.1
  - hw-conduit-merges ==0.2.1.0
  - hw-diagnostics ==0.0.1.0
-  - hw-dsv ==0.4.1.0
+  - hw-dsv ==0.4.1.1
  - hweblib ==0.6.3
-  - hw-eliasfano ==0.1.2.0
+  - hw-eliasfano ==0.1.2.1
  - hw-excess ==0.2.3.0
-  - hw-fingertree ==0.1.2.0
-  - hw-fingertree-strict ==0.1.2.0
-  - hw-hedgehog ==0.1.1.0
+  - hw-fingertree ==0.1.2.1
+  - hw-fingertree-strict ==0.1.2.1
+  - hw-hedgehog ==0.1.1.1
  - hw-int ==0.0.2.0
-  - hw-ip ==2.4.2.0
-  - hw-json-simd ==0.1.1.0
-  - hw-json-simple-cursor ==0.1.1.0
-  - hw-json-standard-cursor ==0.2.3.1
+  - hw-ip ==2.4.2.1
+  - hw-json-simd ==0.1.1.1
+  - hw-json-simple-cursor ==0.1.1.1
+  - hw-json-standard-cursor ==0.2.3.2
  - hw-kafka-client ==4.0.3
-  - hw-mquery ==0.2.1.0
+  - hw-mquery ==0.2.1.1
  - hworker ==0.1.0.1
-  - hw-packed-vector ==0.2.1.0
+  - hw-packed-vector ==0.2.1.1
  - hw-parser ==0.1.1.0
-  - hw-prim ==0.6.3.0
-  - hw-rankselect ==0.13.4.0
+  - hw-prim ==0.6.3.1
+  - hw-rankselect ==0.13.4.1
  - hw-rankselect-base ==0.3.4.1
-  - hw-simd ==0.1.2.0
+  - hw-simd ==0.1.2.1
  - hw-streams ==0.0.1.0
-  - hw-string-parse ==0.0.0.4
+  - hw-string-parse ==0.0.0.5
  - hw-succinct ==0.1.0.1
-  - hw-xml ==0.5.1.0
+  - hw-xml ==0.5.1.1
  - hxt ==9.3.1.22
  - hxt-charproperties ==9.5.0.0
  - hxt-css ==0.1.0.3
@ -1266,7 +1267,7 @@ default-package-overrides:
  - inline-c ==0.9.1.5
  - inline-c-cpp ==0.5.0.0
  - inliterate ==0.1.0
-  - input-parsers ==0.2.3.1
+  - input-parsers ==0.2.3.2
  - insert-ordered-containers ==0.2.5.1
  - inspection-testing ==0.4.6.0
  - instance-control ==0.1.2.0
@ -1283,6 +1284,7 @@ default-package-overrides:
  - intro ==0.9.0.0
  - intset-imperative ==0.1.0.0
  - invariant ==0.5.5
+  - invert ==1.0.0.2
  - invertible ==0.2.0.7
  - invertible-grammar ==0.1.3.2
  - io-machine ==0.2.0.0
@ -1318,8 +1320,8 @@ default-package-overrides:
  - js-flot ==0.8.3
  - js-jquery ==3.3.1
  - json ==0.10
-  - json-feed ==2.0.0.0
-  - jsonifier ==0.2
+  - json-feed ==2.0.0.1
+  - jsonifier ==0.2.0.1
  - jsonpath ==0.2.1.0
  - json-stream ==0.4.3.0
  - JuicyPixels ==3.3.7
@ -1341,20 +1343,20 @@ default-package-overrides:
  - ki ==0.2.0.1
  - kind-apply ==0.3.2.1
  - kind-generics ==0.4.1.4
-  - kind-generics-th ==0.2.2.2
+  - kind-generics-th ==0.2.2.3
  - kleene ==0.1
  - kmeans ==0.1.3
  - koji ==0.0.2
  - krank ==0.2.3
  - l10n ==0.1.0.1
  - labels ==0.3.3
-  - lackey ==2.0.0.0
+  - lackey ==2.0.0.1
  - LambdaHack ==0.11.0.0
  - lame ==0.2.0
  - language-bash ==0.9.2
  - language-c ==0.9.0.2
  - language-c-quote ==0.13
-  - language-docker ==10.4.2
+  - language-docker ==10.4.3
  - language-dot ==0.1.1
  - language-glsl ==0.3.0
  - language-java ==0.2.9
@ -1392,7 +1394,7 @@ default-package-overrides:
  - lens-properties ==4.11.1
  - lens-regex ==0.1.3
  - lens-regex-pcre ==1.1.0.0
-  - lentil ==1.5.3.2
+  - lentil ==1.5.4.0
  - LetsBeRational ==1.0.0.0
  - leveldb-haskell ==0.6.5
  - lexer-applicative ==2.1.0.2
@ -1489,7 +1491,7 @@ default-package-overrides:
  - mbox ==0.3.4
  - mbox-utility ==0.0.3.1
  - mbtiles ==0.6.0.0
-  - mcmc ==0.6.2.0
+  - mcmc ==0.6.2.2
  - mcmc-types ==1.0.3
  - median-stream ==0.7.0.0
  - med-module ==0.1.2.2
@ -1502,7 +1504,7 @@ default-package-overrides:
  - mergeless ==0.3.0.0
  - mersenne-random ==1.0.0.1
  - mersenne-random-pure64 ==0.2.2.0
-  - messagepack ==0.5.4
+  - messagepack ==0.5.5
  - metrics ==0.4.1.1
  - mfsolve ==0.3.2.1
  - microlens ==0.4.12.0
@ -1531,7 +1533,7 @@ default-package-overrides:
  - MissingH ==1.5.0.1
  - mixed-types-num ==0.5.9.1
  - mmap ==0.5.9
-  - mmark ==0.0.7.4
+  - mmark ==0.0.7.5
  - mmark-cli ==0.0.5.1
  - mmark-ext ==0.2.1.4
  - mmorph ==1.1.5
@ -1546,7 +1548,7 @@ default-package-overrides:
  - monad-chronicle ==1.0.0.1
  - monad-control ==1.0.3.1
  - monad-control-aligned ==0.0.1.1
-  - monad-coroutine ==0.9.1.3
+  - monad-coroutine ==0.9.2
  - monad-extras ==0.6.0
  - monadic-arrays ==0.2.2
  - monad-journal ==0.8.1
@ -1604,7 +1606,7 @@ default-package-overrides:
  - mwc-random-monad ==0.7.3.1
  - mx-state-codes ==1.0.0.0
  - mysql ==0.2.1
-  - mysql-simple ==0.4.7.1
+  - mysql-simple ==0.4.7.2
  - n2o ==0.11.1
  - n2o-nitro ==0.11.2
  - nagios-check ==0.3.2
@ -1688,7 +1690,7 @@ default-package-overrides:
  - ochintin-daicho ==0.3.4.2
  - o-clock ==1.2.1.1
  - oeis ==0.3.10
-  - oeis2 ==1.0.6
+  - oeis2 ==1.0.7
  - ofx ==0.4.4.0
  - old-locale ==1.0.0.7
  - old-time ==1.1.0.3
@ -1715,10 +1717,10 @@ default-package-overrides:
  - operational ==0.2.4.1
  - operational-class ==0.3.0.0
  - opml-conduit ==0.9.0.0
-  - optics ==0.4
-  - optics-core ==0.4
-  - optics-extra ==0.4
-  - optics-th ==0.4
+  - optics ==0.4.1
+  - optics-core ==0.4.1
+  - optics-extra ==0.4.1
+  - optics-th ==0.4.1
  - optics-vl ==0.2.1
  - optima ==0.4.0.3
  - optional-args ==1.0.2
@ -1791,7 +1793,7 @@ default-package-overrides:
  - peano ==0.1.0.1
  - pem ==0.2.4
  - percent-format ==0.0.2
-  - peregrin ==0.3.1
+  - peregrin ==0.3.2
  - perf ==0.9.0
  - perfect-hash-generator ==0.2.0.6
  - persist ==0.1.1.5
@ -1800,7 +1802,7 @@ default-package-overrides:
  - persistent-documentation ==0.1.0.4
  - persistent-mongoDB ==2.13.0.1
  - persistent-mtl ==0.4.0.0
-  - persistent-mysql ==2.13.1.2
+  - persistent-mysql ==2.13.1.3
  - persistent-pagination ==0.1.1.2
  - persistent-postgresql ==2.13.5.0
  - persistent-qq ==2.12.0.2
@ -1874,8 +1876,8 @@ default-package-overrides:
  - postgresql-schema ==0.1.14
  - postgresql-simple ==0.6.4
  - postgresql-simple-url ==0.2.1.0
-  - postgresql-syntax ==0.4
-  - postgresql-typed ==0.6.2.0
+  - postgresql-syntax ==0.4.0.2
+  - postgresql-typed ==0.6.2.1
  - post-mess-age ==0.2.1.0
  - pptable ==0.3.0.0
  - pqueue ==1.4.1.4
@ -1996,7 +1998,7 @@ default-package-overrides:
  - rattle ==0.2
  - rattletrap ==11.2.4
  - Rattus ==0.5.0.1
-  - rawfilepath ==1.0.0
+  - rawfilepath ==1.0.1
  - rawstring-qm ==0.2.3.0
  - raw-strings-qq ==1.1
  - rcu ==0.2.5
@ -2046,7 +2048,7 @@ default-package-overrides:
  - renderable ==0.2.0.1
  - reorder-expression ==0.1.0.0
  - repa ==3.4.1.5
-  - repa-io ==3.4.1.1
+  - repa-io ==3.4.1.2
  - replace-attoparsec ==1.4.5.0
  - replace-megaparsec ==1.4.4.0
  - repline ==0.4.0.0
@ -2100,7 +2102,7 @@ default-package-overrides:
  - safe-exceptions-checked ==0.1.0
  - safe-foldable ==0.1.0.0
  - safeio ==0.0.5.0
-  - safe-json ==1.1.3.0
+  - safe-json ==1.1.3.1
  - safe-money ==0.9.1
  - SafeSemaphore ==0.10.1
  - salak ==0.3.6
@ -2179,10 +2181,10 @@ default-package-overrides:
  - servant-pipes ==0.15.3
  - servant-rawm ==1.0.0.0
  - servant-ruby ==0.9.0.0
-  - servant-server ==0.19
+  - servant-server ==0.19.1
  - servant-static-th ==1.0.0.0
  - servant-subscriber ==0.7.0.0
-  - servant-swagger ==1.1.10
+  - servant-swagger ==1.1.11
  - servant-swagger-ui ==0.3.5.4.5.0
  - servant-swagger-ui-core ==0.3.5
  - servant-swagger-ui-redoc ==0.3.4.1.22.3
@ -2220,7 +2222,7 @@ default-package-overrides:
  - silently ==1.2.5.2
  - simple-affine-space ==0.1.1
  - simple-cabal ==0.1.3
-  - simple-cmd ==0.2.3
+  - simple-cmd ==0.2.4
  - simple-cmd-args ==0.1.7
  - simple-log ==0.9.12
  - simple-media-timestamp ==0.2.0.0
@ -2292,13 +2294,13 @@ default-package-overrides:
  - sqlite-simple ==0.4.18.0
  - sql-words ==0.1.6.4
  - squeather ==0.8.0.0
-  - srcloc ==0.6
+  - srcloc ==0.6.0.1
  - srt ==0.1.1.0
  - srt-attoparsec ==0.1.0.0
  - srt-dhall ==0.1.0.0
  - srt-formatting ==0.1.0.0
  - stache ==2.3.1
-  - stack-all ==0.4
+  - stack-all ==0.4.0.1
  - stack-clean-old ==0.4.6
  - stackcollapse-ghc ==0.0.1.4
  - stack-templatizer ==0.1.0.2
@ -2307,7 +2309,7 @@ default-package-overrides:
  - StateVar ==1.2.2
  - stateWriter ==0.3.0
  - static-text ==0.2.0.7
-  - statistics ==0.16.0.1
+  - statistics ==0.16.0.2
  - status-notifier-item ==0.3.1.0
  - stb-image-redux ==0.2.1.2
  - step-function ==0.2
@ -2361,8 +2363,8 @@ default-package-overrides:
  - stripe-scotty ==1.1.0.2
  - stripe-signature ==1.0.0.14
  - stripe-wreq ==1.0.1.14
-  - strive ==6.0.0.1
-  - strong-path ==1.1.3.0
+  - strive ==6.0.0.2
+  - strong-path ==1.1.4.0
  - structs ==0.1.6
  - structured ==0.1.1
  - structured-cli ==2.7.0.1
@ -2437,7 +2439,7 @@ default-package-overrides:
  - tcp-streams ==1.0.1.1
  - tdigest ==0.2.1.1
  - teardown ==0.5.0.1
-  - telegram-bot-simple ==0.4.3
+  - telegram-bot-simple ==0.4.4
  - template-haskell-compat-v0208 ==0.1.7
  - temporary ==1.3
  - temporary-rc ==1.2.0.3
@ -2446,7 +2448,7 @@ default-package-overrides:
  - tensors ==0.1.5
  - termbox ==0.3.0
  - terminal-progress-bar ==0.4.1
-  - terminal-size ==0.3.2.1
+  - terminal-size ==0.3.3
  - termonad ==4.2.0.1
  - test-framework ==0.8.2.0
  - test-framework-hunit ==0.3.0.2
@ -2465,7 +2467,7 @@ default-package-overrides:
  - text-latin1 ==0.3.1
  - text-ldap ==0.1.1.14
  - textlocal ==0.1.0.5
-  - text-manipulate ==0.3.0.0
+  - text-manipulate ==0.3.1.0
  - text-metrics ==0.3.2
  - text-postgresql ==0.0.3.1
  - text-printer ==0.5.0.2
@ -2489,7 +2491,7 @@ default-package-overrides:
  - these-skinny ==0.7.5
  - th-expand-syns ==0.4.9.0
  - th-extras ==0.0.0.6
-  - th-lego ==0.3
+  - th-lego ==0.3.0.1
  - th-lift ==0.8.2
  - th-lift-instances ==0.1.19
  - th-nowq ==0.1.0.5
@ -2539,7 +2541,7 @@ default-package-overrides:
  - torsor ==0.1
  - tostring ==0.2.1.1
  - tracing ==0.0.7.2
-  - tracing-control ==0.0.7.2
+  - tracing-control ==0.0.7.3
  - transaction ==0.1.1.3
  - transformers-base ==0.4.6
  - transformers-bifunctors ==0.1
@ -2590,7 +2592,7 @@ default-package-overrides:
  - typography-geometry ==1.0.1.0
  - tz ==0.1.3.6
  - tzdata ==0.2.20220315.0
-  - ua-parser ==0.7.6.0
+  - ua-parser ==0.7.7.0
  - uglymemo ==0.1.0.1
  - unagi-chan ==0.4.1.4
  - unbounded-delays ==0.1.1.1
@ -2604,8 +2606,8 @@ default-package-overrides:
  - unicode ==0.0.1.1
  - unicode-collation ==0.1.3.1
  - unicode-data ==0.3.0
-  - unicode-show ==0.1.1.0
-  - unicode-transforms ==0.4.0
+  - unicode-show ==0.1.1.1
+  - unicode-transforms ==0.4.0.1
  - unidecode ==0.1.0.4
  - unification-fd ==0.11.1
  - union ==0.1.2
@ -2702,7 +2704,7 @@ default-package-overrides:
  - void ==0.7.3
  - vty ==5.33
  - wai ==3.2.3
-  - wai-app-static ==3.1.7.3
+  - wai-app-static ==3.1.7.4
  - wai-cli ==0.2.3
  - wai-conduit ==3.0.0.4
  - wai-cors ==0.2.7
@ -2720,11 +2722,11 @@ default-package-overrides:
  - wai-middleware-prometheus ==1.0.0.1
  - wai-middleware-static ==0.9.2
  - wai-rate-limit ==0.2.0.0
-  - wai-rate-limit-redis ==0.2.0.0
-  - wai-saml2 ==0.2.1.2
+  - wai-rate-limit-redis ==0.2.0.1
+  - wai-saml2 ==0.2.1.3
  - wai-session ==0.3.3
  - wai-session-postgresql ==0.2.1.3
-  - wai-session-redis ==0.1.0.4
+  - wai-session-redis ==0.1.0.5
  - wai-slack-middleware ==0.2.0
  - wai-transformers ==0.1.0
  - wai-websockets ==3.0.1.2
@ -2740,7 +2742,7 @@ default-package-overrides:
  - webgear-openapi ==1.0.1
  - webgear-server ==1.0.1
  - webpage ==0.0.5.1
-  - web-plugins ==0.4.0
+  - web-plugins ==0.4.1
  - web-routes ==0.27.14.3
  - web-routes-boomerang ==0.28.4.2
  - web-routes-happstack ==0.23.12.1
@ -2758,7 +2760,7 @@ default-package-overrides:
  - Win32-notify ==0.3.0.3
  - windns ==0.1.0.1
  - wire-streams ==0.1.1.0
-  - witch ==1.0.0.1
+  - witch ==1.0.0.2
  - withdependencies ==0.3.0
  - witherable ==0.4.2
  - within ==0.2.0.1
@ -2821,7 +2823,7 @@ default-package-overrides:
  - xxhash-ffi ==0.2.0.0
  - yaml ==0.11.8.0
  - yamlparse-applicative ==0.2.0.1
-  - yaml-unscrambler ==0.1.0.8
+  - yaml-unscrambler ==0.1.0.9
  - yarn-lock ==0.6.5
  - yeshql-core ==4.2.0.0
  - yesod ==1.6.2
@ -2830,8 +2832,8 @@ default-package-overrides:
  - yesod-auth-basic ==0.1.0.3
  - yesod-auth-hashdb ==1.7.1.7
  - yesod-auth-oauth2 ==0.7.0.1
-  - yesod-bin ==1.6.2
-  - yesod-core ==1.6.21.0
+  - yesod-bin ==1.6.2.1
+  - yesod-core ==1.6.22.0
  - yesod-eventsource ==1.6.0.1
  - yesod-form ==1.7.0
  - yesod-form-bootstrap4 ==3.0.1
@ -2871,4 +2873,4 @@ default-package-overrides:
  - zlib-lens ==0.1.2.1
  - zot ==0.0.3
  - zstd ==0.1.3.0
-  - ztail ==1.2.0.2
+  - ztail ==1.2.0.3
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@ -660,9 +660,9 @@ dont-distribute-packages:
 - arithmetic-circuits
 - array-forth
 - arraylist
+ - ascii
 - ascii-cows
 - ascii-table
- - ascii_1_1_2_0
 - asic
 - asif
 - assert4hs-hspec
@ -795,7 +795,6 @@ dont-distribute-packages:
 - bip32
 - birch-beer
 - bird
- - bisc
 - biscuit-servant
 - bit-array
 - bitcoin-address
@ -1849,7 +1848,6 @@ dont-distribute-packages:
 - graphql-utils
 - graphtype
 - greencard-lib
- - grid-proto
 - gridbounds
 - gridland
 - groot
@ -2110,7 +2108,6 @@ dont-distribute-packages:
 - hie-core
 - hierarchical-env
 - hierarchical-spectral-clustering
- - higher-leveldb
 - highjson-swagger
 - highjson-th
 - himpy
@ -3129,7 +3126,6 @@ dont-distribute-packages:
 - potoki-conduit
 - potoki-hasql
 - potoki-zlib
- - powerqueue-levelmem
 - powerqueue-sqs
 - pqueue-mtl
 - practice-room
@ -3272,10 +3268,13 @@ dont-distribute-packages:
 - rdioh
 - react-flux-servant
 - reactive
+ - reactive-balsa
 - reactive-banana-sdl
 - reactive-banana-wx
 - reactive-fieldtrip
 - reactive-glut
+ - reactive-jack
+ - reactive-midyim
 - reactor
 - readline-in-other-words
 - readpyc
@ -3317,6 +3316,7 @@ dont-distribute-packages:
 - regions-monadstf
 - regions-mtl
 - registry-hedgehog
+ - registry-hedgehog-aeson
 - regular-extras
 - regular-web
 - regular-xmlpickler
@ -3638,7 +3638,6 @@ dont-distribute-packages:
 - sock2stream
 - socket-io
 - sockets
- - socketson
 - solga
 - solga-swagger
 - solr
@ -3647,7 +3646,6 @@ dont-distribute-packages:
 - soundgen
 - source-code-server
 - spade
- - spago
 - sparkle
 - sparrow
 - sparsebit
@ -3903,7 +3901,6 @@ dont-distribute-packages:
 - triangulation
 - tries
 - trimpolya
- - tripLL
 - tropical-geometry
 - truelevel
 - trurl
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@ -181,7 +181,8 @@ let
  ] ++ optionals (!isHaLVM) [
    "--hsc2hs-option=--cross-compile"
    (optionalString enableHsc2hsViaAsm "--hsc2hs-option=--via-asm")
-  ];
+  ] ++ optional (allPkgconfigDepends != [])
+    "--with-pkg-config=${pkg-config.targetPrefix}pkg-config";

  parallelBuildingFlags = "-j$NIX_BUILD_CORES" + optionalString stdenv.isLinux " +RTS -A64M -RTS";

--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix