Merge pull request #171099 from NixOS/haskell-updates

haskellPackages: update stackage and hackage
2 years ago · a2fc0d6f23
parent d59dd43e49 37e3234f74
commit a2fc0d6f23
18 changed files with 1776 additions and 811 deletions
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@ -1,6 +1,6 @@
 {
-  "commit": "762464dcc5ce93f1c6a9a746feb6bd1bd0c47006",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/762464dcc5ce93f1c6a9a746feb6bd1bd0c47006.tar.gz",
-  "sha256": "0k1qp34lsc08a99p669v8n0fxs6mdzwc2bz87v0hdah4qagi4z4g",
-  "msg": "Update from Hackage at 2022-04-20T23:34:08Z"
+  "commit": "08ae12813ead00810e00ffe9dae284fcafe6a08a",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/08ae12813ead00810e00ffe9dae284fcafe6a08a.tar.gz",
+  "sha256": "00jc08pifnp791s1scscdhgwlf75v9682a7vjis1djnhj3y5s3ny",
+  "msg": "Update from Hackage at 2022-05-01T06:09:30Z"
 }
--- a/pkgs/development/haskell-modules/configuration-arm.nix
+++ b/pkgs/development/haskell-modules/configuration-arm.nix
@ -99,19 +99,22 @@ self: super: {
  hls-class-plugin = dontCheck super.hls-class-plugin;
  hls-selection-range-plugin = dontCheck super.hls-selection-range-plugin;

-  # Similar RTS issue in test suite:
-  # rts/linker/elf_reloc_aarch64.c:98: encodeAddendAarch64: Assertion `isInt64(21+12, addend)' failed.
-  hls-hlint-plugin = dontCheck super.hls-hlint-plugin;
-  hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin;
-  hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin;
-
-
  # https://github.com/ekmett/half/issues/35
  half = dontCheck super.half;

  # We disable profiling on aarch64, so tests naturally fail
  ghc-prof = dontCheck super.ghc-prof;

+} // lib.optionalAttrs (pkgs.stdenv.hostPlatform.isAarch64 && builtins.compareVersions super.ghc.version "9.2" < 0) {
+  # Some aarch64 issues have been fixed since 9.2
+
+  # Similar RTS issue in test suite:
+  # rts/linker/elf_reloc_aarch64.c:98: encodeAddendAarch64: Assertion `isInt64(21+12, addend)' failed.
+  # Fixed since 9.2
+  hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin;
+  hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin;
+  hls-rename-plugin = dontCheck super.hls-rename-plugin;
+  hls-fourmolu-plugin = dontCheck super.hls-fourmolu-plugin;
 } // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch32 {
  # AARCH32-SPECIFIC OVERRIDES

--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -1667,19 +1667,6 @@ self: super: {

  lsp = assert super.lsp.version == "1.4.0.0"; dontCheck super.lsp;

-  hls-test-utils = assert super.hls-test-utils.version == "1.2.0.0"; appendPatches [
-    (fetchpatch {
-      url = "https://github.com/haskell/haskell-language-server/commit/074593987e9086e308b89ecde336de2c64861dc0.patch";
-      sha256 = "sha256-uTlIbGQKulP3963UPL2V9cqMoIvPscK+s2W/HtBmMWc=";
-      relative = "hls-test-utils";
-    })
-    (fetchpatch {
-      url = "https://github.com/haskell/haskell-language-server/commit/78305f21783807b04baebca4860c255bfe84d4ab.patch";
-      sha256 = "sha256-oe8Q8kBJBkel+pR5imFj43NVpm4afcyLgAUCWhrIoPk=";
-      relative = "hls-test-utils";
-    })
-   ] super.hls-test-utils;
-
  # 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1809
  hls-eval-plugin = dontCheck super.hls-eval-plugin;

@ -2321,6 +2308,10 @@ self: super: {
  # 2021-09-18: https://github.com/haskell/haskell-language-server/issues/2205
  hls-stylish-haskell-plugin = doJailbreak super.hls-stylish-haskell-plugin;

+  # Necesssary .txt files are not included in sdist.
+  # https://github.com/haskell/haskell-language-server/pull/2887
+  hls-change-type-signature-plugin = dontCheck super.hls-change-type-signature-plugin;
+
  # Too strict bounds on hspec
  # https://github.com/haskell-works/hw-hspec-hedgehog/issues/62
  # https://github.com/haskell-works/hw-prim/issues/132
@ -2657,4 +2648,9 @@ self: super: {
    sha256 = "sha256-fW5bVbAGQxU/gd9zqgVNclwKraBtUjkKDek7L0c4+O0=";
  }) super.wstunnel;

+  # Adjustment of bounds on servant is unreleased
+  # https://github.com/haskell-servant/servant-cassava/commit/66617547851d38d48f5f1d1b786db1286bdafa9d
+  servant-cassava = assert super.servant-cassava.version == "0.10.1";
+    doJailbreak super.servant-cassava;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
--- a/pkgs/development/haskell-modules/configuration-darwin.nix
+++ b/pkgs/development/haskell-modules/configuration-darwin.nix
@ -200,6 +200,8 @@ self: super: ({
  hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin;
  hls-floskell-plugin = dontCheck super.hls-floskell-plugin;
  hls-call-hierarchy-plugin = dontCheck super.hls-call-hierarchy-plugin;
+  # 2022-05-05: Tests fail and I have no way to debug them.
+  hls-rename-plugin = dontCheck super.hls-rename-plugin;

  # We are lacking pure pgrep at the moment for tests to work
  tmp-postgres = dontCheck super.tmp-postgres;
@ -289,4 +291,7 @@ self: super: ({
  # tests appear to be failing to link or something:
  # https://hydra.nixos.org/build/174540882/nixlog/9
  regex-rure = dontCheck super.regex-rure;
+  # same
+  # https://hydra.nixos.org/build/174540882/nixlog/9
+  jacinda = dontCheck super.jacinda;
 })
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@ -43,7 +43,9 @@ self: super: {
  time = null;
  transformers = null;
  unix = null;
-  xhtml = null;
+  # GHC only bundles the xhtml library if haddock is enabled, check if this is
+  # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
+  xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1;

  # cabal-install needs more recent versions of Cabal and base16-bytestring.
  cabal-install = super.cabal-install.overrideScope (self: super: {
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@ -42,7 +42,9 @@ self: super: {
  time = null;
  transformers = null;
  unix = null;
-  xhtml = null;
+  # GHC only bundles the xhtml library if haddock is enabled, check if this is
+  # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
+  xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1;

  # Needs Cabal 3.0.x.
  cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; });
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@ -42,7 +42,9 @@ self: super: {
  time = null;
  transformers = null;
  unix = null;
-  xhtml = null;
+  # GHC only bundles the xhtml library if haddock is enabled, check if this is
+  # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
+  xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1;

  # GHC 8.8.x can build haddock version 2.23.*
  haddock = self.haddock_2_23_1;
--- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
@ -44,7 +44,9 @@ self: super: {
  time = null;
  transformers = null;
  unix = null;
-  xhtml = null;
+  # GHC only bundles the xhtml library if haddock is enabled, check if this is
+  # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
+  xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1;

  # cabal-install needs more recent versions of Cabal and base16-bytestring.
  cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: {
--- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
@ -44,7 +44,9 @@ self: super: {
  time = null;
  transformers = null;
  unix = null;
-  xhtml = null;
+  # GHC only bundles the xhtml library if haddock is enabled, check if this is
+  # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
+  xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1;

  # Tests fail because of typechecking changes
  conduit = dontCheck super.conduit;
@ -90,7 +92,7 @@ self: super: {
    # causing the build-depends to be skipped. Since the dependency
    # list hasn't changed much since 0.6.4, we can just reuse the
    # normal expression.
-    inherit (self.ghc-exactprint_1_4_1) src version;
+    inherit (self.ghc-exactprint_1_5_0) src version;
    revision = null; editedCabalFile = null;
    libraryHaskellDepends = [
      self.fail
@ -195,17 +197,7 @@ self: super: {
  } super.memory);

  # Use hlint from git for GHC 9.2.1 support
-  hlint = doDistribute (
-    overrideSrc {
-      version = "unstable-2021-12-12";
-      src = pkgs.fetchFromGitHub {
-        owner = "ndmitchell";
-        repo = "hlint";
-        rev = "77a9702e10b772a7695c08682cd4f450fd0e9e46";
-        sha256 = "0hpp3iw7m7w2abr8vb86gdz3x6c8lj119zxln933k90ia7bmk8jc";
-      };
-    } super.hlint
-  );
+  hlint = self.hlint_3_4;

  # https://github.com/sjakobi/bsb-http-chunked/issues/38
  bsb-http-chunked = dontCheck super.bsb-http-chunked;
@ -216,7 +208,7 @@ self: super: {
  some = doJailbreak super.some;
  fourmolu = super.fourmolu_0_6_0_0;
  # hls-fourmolu-plugin in this version has a to strict upper bound of fourmolu <= 0.5.0.0
-  hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.0.2.0"; doJailbreak super.hls-fourmolu-plugin;
+  hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.0.3.0"; doJailbreak super.hls-fourmolu-plugin;
  implicit-hie-cradle = doJailbreak super.implicit-hie-cradle;
  # 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed
  hashtables = assert super.hashtables.version == "1.2.4.2"; doJailbreak super.hashtables;
@ -226,18 +218,11 @@ self: super: {
  # Compare: https://haskell-language-server.readthedocs.io/en/latest/supported-versions.html
  haskell-language-server = overrideCabal (old: {libraryHaskellDepends = builtins.filter (x: x != super.hls-tactics-plugin) old.libraryHaskellDepends;})
    (appendConfigureFlags [
-    "-f-alternateNumberFormat"
-    "-f-class"
-    "-f-eval"
    "-f-haddockComments"
-    "-f-hlint"
    "-f-retrie"
    "-f-splice"
    "-f-tactics"
  ] (super.haskell-language-server.override {
-    hls-alternate-number-format-plugin = null;
-    hls-class-plugin = null;
-    hls-eval-plugin = null;
    hls-haddock-comments-plugin = null;
    hls-hlint-plugin = null;
    hls-retrie-plugin = null;
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@ -52,7 +52,9 @@ self: super: {
  time = null;
  transformers = null;
  unix = null;
-  xhtml = null;
+  # GHC only bundles the xhtml library if haddock is enabled, check if this is
+  # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
+  xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1;

  # https://github.com/tibbe/unordered-containers/issues/214
  unordered-containers = dontCheck super.unordered-containers;
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@ -455,6 +455,7 @@ broken-packages:
  - bower-json
  - bowntz
  - bpath
+  - BPS
  - braid
  - brain-bleep
  - Bravo
@ -511,6 +512,7 @@ broken-packages:
  - bytestring-substring
  - bytestring-time
  - bytestring-typenats
+  - bzlib-conduit-jappie
  - c10k
  - c2ats
  - cab
@ -523,6 +525,7 @@ broken-packages:
  - cabal-constraints
  - cabal-db
  - cabal-dependency-licenses
+  - cabal-detailed-quickcheck
  - cabal-dev
  - cabal-dir
  - cabal-edit
@ -854,6 +857,7 @@ broken-packages:
  - CoreDump
  - CoreErlang
  - core-haskell
+  - core-webserver-warp
  - Coroutine
  - coroutine-object
  - CouchDB
@ -1236,6 +1240,7 @@ broken-packages:
  - ede
  - edenmodules
  - edis
+  - EdisonAPI
  - EdisonCore
  - edit
  - edit-lenses
@ -2100,6 +2105,7 @@ broken-packages:
  - hdo
  - hdph-closure
  - hdr-histogram
+  - HDRUtils
  - headergen
  - heap-console
  - heapsort
@ -3932,6 +3938,7 @@ broken-packages:
  - polysemy-mocks
  - polysemy-readline
  - polysemy-req
+  - polysemy-scoped-fs
  - polysemy-zoo
  - polytypeable
  - polyvariadic
@ -4221,6 +4228,7 @@ broken-packages:
  - Referees
  - references
  - refined-http-api-data
+  - refined-with
  - reflection-extras
  - reflex-basic-host
  - reflex-dom-ace
@ -4486,7 +4494,6 @@ broken-packages:
  - servant-auth-hmac
  - servant-avro
  - servant-benchmark
-  - servant-cassava
  - servant-client-js
  - servant-db
  - servant-dhall
@ -5269,6 +5276,7 @@ broken-packages:
  - typalyze
  - typeable-mock
  - typeable-th
+  - typecheck-plugin-nat-simple
  - type-combinators
  - typed-digits
  - typed-encoding
@ -5388,6 +5396,7 @@ broken-packages:
  - utf8-prelude
  - utf8-validator
  - UTFTConverter
+  - util
  - util-logict
  - util-plus
  - util-primitive
@ -5804,3 +5813,4 @@ broken-packages:
  - Zwaluw
  - zxcvbn-hs
  - zydiskell
+  - zyre2
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@ -121,7 +121,6 @@ extra-packages:
  - brick == 0.64.*                     # 2021-12-03: matterhorn depends on brick < 0.65
  - path == 0.9.0                       # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2
  - ormolu == 0.2.*                     # 2022-02-21: For ghc 8.8 and 8.10
-  - ghc-exactprint == 1.4.*             # 2022-02-07: preserve for now, 1.5.0 has a breaking change without type changes
  - ShellCheck == 0.7.2                 # 2022-02-20: haskell-ci 0.14 needs this
  - weeder == 2.2.*                     # 2022-02-21: preserve for GHC 8.10.7
  - attoparsec == 0.13.*                # 2022-02-23: Needed to compile elm for now
--- 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.4
+# Stackage LTS 19.5
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@ -78,7 +78,7 @@ default-package-overrides:
  - array-memoize ==0.6.0
  - arrow-extras ==0.1.0.1
  - arrows ==0.4.4.2
-  - ascii ==1.1.2.0
+  - ascii ==1.1.3.0
  - ascii-case ==1.0.0.10
  - ascii-char ==1.0.0.14
  - asciidiagram ==1.3.3.3
@ -86,7 +86,7 @@ default-package-overrides:
  - ascii-numbers ==1.0.0.0
  - ascii-predicates ==1.0.0.10
  - ascii-progress ==0.3.3.0
-  - ascii-superset ==1.0.1.12
+  - ascii-superset ==1.0.1.13
  - ascii-th ==1.0.0.10
  - asn1-encoding ==0.9.6
  - asn1-parse ==0.9.5
@ -297,8 +297,8 @@ default-package-overrides:
  - cast ==0.1.0.2
  - caster ==0.0.3.0
  - cayley-client ==0.4.17
-  - cborg ==0.2.6.0
-  - cborg-json ==0.2.3.0
+  - cborg ==0.2.7.0
+  - cborg-json ==0.2.4.0
  - cdar-mBound ==0.1.0.4
  - c-enum ==0.1.1.3
  - cereal ==0.5.8.2
@ -630,7 +630,7 @@ default-package-overrides:
  - dual ==0.1.1.1
  - dual-tree ==0.2.3.0
  - dublincore-xml-conduit ==0.1.0.2
-  - dunai ==0.8.1
+  - dunai ==0.8.2
  - duration ==0.2.0.0
  - dvorak ==0.1.0.0
  - dynamic-state ==0.3.1
@ -874,7 +874,7 @@ default-package-overrides:
  - ghc-check ==0.5.0.6
  - ghc-compact ==0.1.0.0
  - ghc-core ==0.5.6
-  - ghc-events ==0.17.0.2
+  - ghc-events ==0.17.0.3
  - ghc-exactprint ==0.6.4
  - ghcid ==0.8.7
  - ghci-hexcalc ==0.1.1.0
@ -980,7 +980,7 @@ default-package-overrides:
  - HandsomeSoup ==0.4.2
  - handwriting ==0.1.0.3
  - happstack-server ==7.7.2
-  - happstack-server-tls ==7.2.1.1
+  - happstack-server-tls ==7.2.1.2
  - happy ==1.20.0
  - happy-meta ==0.2.0.11
  - HasBigDecimal ==0.1.1
@ -1012,7 +1012,7 @@ default-package-overrides:
  - hasql-optparse-applicative ==0.3.0.8
  - hasql-pool ==0.5.2.2
  - hasql-queue ==1.2.0.2
-  - hasql-th ==0.4.0.11
+  - hasql-th ==0.4.0.12
  - hasql-transaction ==1.0.1.1
  - has-transformers ==0.1.0.4
  - hasty-hamiltonian ==1.3.4
@ -1216,6 +1216,7 @@ default-package-overrides:
  - hw-json-simd ==0.1.1.1
  - hw-json-simple-cursor ==0.1.1.1
  - hw-json-standard-cursor ==0.2.3.2
+  - hwk ==0.6
  - hw-kafka-client ==4.0.3
  - hw-mquery ==0.2.1.1
  - hworker ==0.1.0.1
@ -1240,7 +1241,7 @@ default-package-overrides:
  - hxt-unicode ==9.0.2.4
  - hybrid-vectors ==0.2.2
  - hyper ==0.2.1.1
-  - hyperloglog ==0.4.5
+  - hyperloglog ==0.4.6
  - hyphenation ==0.8.2
  - iconv ==0.4.1.3
  - identicon ==0.2.2
@ -1787,7 +1788,7 @@ default-package-overrides:
  - pattern-arrows ==0.0.2
  - pava ==0.1.1.3
  - pcg-random ==0.1.3.7
-  - pcre2 ==2.1.0.1
+  - pcre2 ==2.1.1
  - pcre-heavy ==1.0.0.2
  - pcre-light ==0.4.1.0
  - pcre-utils ==0.1.8.2
@ -2030,10 +2031,10 @@ default-package-overrides:
  - ref-fd ==0.5
  - refined ==0.6.3
  - reflection ==2.1.6
-  - reform ==0.2.7.4
-  - reform-blaze ==0.2.4.3
+  - reform ==0.2.7.5
+  - reform-blaze ==0.2.4.4
  - reform-hamlet ==0.0.5.3
-  - reform-happstack ==0.2.5.4
+  - reform-happstack ==0.2.5.5
  - RefSerialize ==0.4.0
  - ref-tf ==0.5.0.1
  - regex ==1.1.0.1
@ -2136,7 +2137,7 @@ default-package-overrides:
  - sdl2 ==2.5.3.0
  - sdl2-ttf ==2.1.2
  - search-algorithms ==0.3.2
-  - secp256k1-haskell ==0.6.0
+  - secp256k1-haskell ==0.6.1
  - securemem ==0.1.10
  - selda ==0.5.1.0
  - selda-sqlite ==0.1.7.1
@ -2158,7 +2159,7 @@ default-package-overrides:
  - sequence-formats ==1.6.6.1
  - sequenceTools ==1.5.2
  - serf ==0.1.1.0
-  - serialise ==0.2.4.0
+  - serialise ==0.2.5.0
  - servant ==0.19
  - servant-auth ==0.4.1.0
  - servant-auth-client ==0.4.1.0
@ -2245,6 +2246,7 @@ default-package-overrides:
  - singletons-presburger ==0.6.1.0
  - singletons-th ==3.0
  - siphash ==1.0.3
+  - Sit ==0.2022.3.18
  - sitemap-gen ==0.1.0.0
  - sized ==1.0.0.0
  - skein ==1.0.9.4
@ -2382,7 +2384,7 @@ default-package-overrides:
  - SVGFonts ==1.8.0.1
  - svg-tree ==0.6.2.4
  - swagger2 ==2.8.2
-  - swish ==0.10.1.0
+  - swish ==0.10.2.0
  - syb ==0.7.2.1
  - sydtest-discover ==0.0.0.1
  - symbol ==0.2.4
@ -2716,7 +2718,7 @@ default-package-overrides:
  - wai-cors ==0.2.7
  - wai-enforce-https ==1.0.0.0
  - wai-eventsource ==3.0.0
-  - wai-extra ==3.1.8
+  - wai-extra ==3.1.10
  - wai-feature-flags ==0.1.0.3
  - wai-handler-launch ==3.0.3.1
  - wai-logger ==2.4.0
@ -2749,11 +2751,11 @@ default-package-overrides:
  - webgear-server ==1.0.1
  - webpage ==0.0.5.1
  - 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
-  - web-routes-hsp ==0.24.6.1
-  - web-routes-wai ==0.24.3.1
+  - web-routes ==0.27.14.4
+  - web-routes-boomerang ==0.28.4.3
+  - web-routes-happstack ==0.23.12.2
+  - web-routes-hsp ==0.24.6.2
+  - web-routes-wai ==0.24.3.2
  - webrtc-vad ==0.1.0.3
  - websockets ==0.12.7.3
  - websockets-simple ==0.2.0
@ -2839,7 +2841,7 @@ default-package-overrides:
  - yesod-auth-hashdb ==1.7.1.7
  - yesod-auth-oauth2 ==0.7.0.1
  - yesod-bin ==1.6.2.1
-  - yesod-core ==1.6.22.0
+  - yesod-core ==1.6.23
  - yesod-eventsource ==1.6.0.1
  - yesod-form ==1.7.0
  - yesod-form-bootstrap4 ==3.0.1
@ -2854,7 +2856,7 @@ default-package-overrides:
  - yesod-routes-flow ==3.0.0.2
  - yesod-sitemap ==1.6.0
  - yesod-static ==1.6.1.0
-  - yesod-test ==1.6.12
+  - yesod-test ==1.6.13
  - yesod-websockets ==0.3.0.3
  - yes-precure5-command ==5.5.3
  - yi-rope ==0.11
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@ -436,12 +436,14 @@ dont-distribute-packages:
 - adp-multi-monadiccp
 - aeson-native
 - aeson-result
+ - affine
 - afv
 - agda-server
 - agda-snippets-hakyll
 - agentx
 - aip
 - aivika-distributed
+ - alg
 - algebra-checkers
 - algebra-driven-design
 - algebra-sql
@ -647,6 +649,7 @@ dont-distribute-packages:
 - apiary-websockets
 - apis
 - apotiki
+ - appendful-persistent
 - approx-rand-test
 - arbor-monad-metric-datadog
 - archive-tar-bytestring
@ -663,7 +666,7 @@ dont-distribute-packages:
 - ascii
 - ascii-cows
 - ascii-table
- - ascii_1_2_0_0
+ - ascii_1_2_2_0
 - asic
 - asif
 - assert4hs-hspec
@ -770,6 +773,7 @@ dont-distribute-packages:
 - berp
 - bff
 - bglib
+ - bifunctor
 - billboard-parser
 - billeksah-forms
 - billeksah-main
@ -784,6 +788,7 @@ dont-distribute-packages:
 - bindings-ppdev
 - bindynamic
 - binembed-example
+ - binrep
 - bioace
 - bioalign
 - biofasta
@ -864,6 +869,7 @@ dont-distribute-packages:
 - bytelog
 - bytestring-builder-varword
 - bytestring-read
+ - ca
 - cabal-bounds
 - cabal-cache
 - cabal-cargs
@ -913,6 +919,7 @@ dont-distribute-packages:
 - cassy
 - casui
 - categorical-algebra
+ - category
 - category-extras
 - cautious-gen
 - cctools-workqueue
@ -1068,7 +1075,9 @@ dont-distribute-packages:
 - configifier
 - configurator-ng
 - conic-graphs
+ - constraint
 - constraint-manip
+ - constraint-reflection
 - constructible
 - consumers
 - container
@ -1095,6 +1104,7 @@ dont-distribute-packages:
 - copilot-libraries
 - copilot-sbv
 - copilot-theorem
+ - core-webserver-servant
 - coroutine-enumerator
 - coroutine-iteratee
 - couch-simple
@ -1389,6 +1399,8 @@ dont-distribute-packages:
 - exinst-deepseq
 - exinst-hashable
 - exinst-serialise
+ - exist
+ - exist-instances
 - expand
 - expat-enumerator
 - expiring-containers
@ -1404,6 +1416,7 @@ dont-distribute-packages:
 - extract-dependencies
 - factual-api
 - fadno
+ - fair
 - fallingblocks
 - family-tree
 - fast-arithmetic
@ -1484,6 +1497,7 @@ dont-distribute-packages:
 - fluent-logger
 - fluent-logger-conduit
 - fmt-for-rio
+ - foldable1
 - follower
 - foo
 - formal
@ -1565,6 +1579,7 @@ dont-distribute-packages:
 - geniconvert
 - geniserver
 - genvalidity-aeson
+ - genvalidity-appendful
 - genvalidity-hspec-aeson
 - genvalidity-mergeful
 - genvalidity-mergeless
@ -2379,6 +2394,7 @@ dont-distribute-packages:
 - iteratee-parsec
 - iteratee-stm
 - iterio-server
+ - ival
 - ivor
 - ivory-avr-atmega328p-registers
 - ivory-backend-c
@ -2391,6 +2407,7 @@ dont-distribute-packages:
 - ivory-serialize
 - ivory-stdlib
 - ivy-web
+ - ix
 - ixset
 - ixset-typed-binary-instance
 - ixset-typed-cassava
@ -2474,6 +2491,7 @@ dont-distribute-packages:
 - keid-sound-openal
 - keid-ui-dearimgui
 - kevin
+ - key-vault
 - keyring
 - keysafe
 - keystore
@ -3058,7 +3076,6 @@ dont-distribute-packages:
 - phonetic-languages-simplified-base
 - phonetic-languages-simplified-common
 - phonetic-languages-simplified-examples-array
- - phonetic-languages-simplified-examples-common
 - phonetic-languages-simplified-generalized-examples-array
 - phonetic-languages-simplified-generalized-examples-common
 - phonetic-languages-simplified-generalized-properties-array
@ -3154,6 +3171,7 @@ dont-distribute-packages:
 - process-streaming
 - procrastinating-structure
 - producer
+ - product
 - product-isomorphic
 - prof2dot
 - profiterole
@ -3249,9 +3267,11 @@ dont-distribute-packages:
 - raketka
 - rallod
 - random-access-file
+ - random-class
 - random-effin
 - random-hypergeometric
 - range-space
+ - ranged-list
 - rasa
 - rasa-example-config
 - rasa-ext-bufs
@ -3414,6 +3434,7 @@ dont-distribute-packages:
 - roundtrip-xml
 - route-generator
 - route-planning
+ - row
 - rpc
 - rpf
 - rsagl
@ -3602,6 +3623,7 @@ dont-distribute-packages:
 - smcdel
 - smith-cli
 - smith-client
+ - smt
 - smtlib2-debug
 - smtlib2-pipe
 - smtlib2-quickcheck
@ -3936,6 +3958,7 @@ dont-distribute-packages:
 - twitter-conduit
 - twitter-enumerator
 - twitter-types-lens
+ - txt
 - type-assertions
 - type-cache
 - type-cereal
@ -3981,6 +4004,7 @@ dont-distribute-packages:
 - uniqueness-periods-vector-filters
 - uniqueness-periods-vector-general
 - uniqueness-periods-vector-properties
+ - universal
 - universe
 - universe-dependent-sum
 - universe-th
@ -4021,6 +4045,7 @@ dont-distribute-packages:
 - vacuum-graphviz
 - vacuum-opengl
 - vacuum-ubigraph
+ - valid
 - variable-precision
 - vault-tool-server
 - vault-trans
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- a/pkgs/development/tools/purescript/spago/spago.nix
+++ b/pkgs/development/tools/purescript/spago/spago.nix
@ -14,11 +14,11 @@
 }:
 mkDerivation {
  pname = "spago";
-  version = "0.20.8";
+  version = "0.20.9";
  src = fetchgit {
    url = "https://github.com/purescript/spago.git";
-    sha256 = "0lakss2pg5kwbxqsmvzgkcc70l6j40cj9rarhkpcf0kxw98bb5x0";
-    rev = "744bdbbefc538750d4c36888ee53dc5d336314c4";
+    sha256 = "00vdqg7vaw3d9zwh47886lw9fhhlwjagzhaj3aqz4xm92pjavhih";
+    rev = "d16d4914200783fbd820ba89dbdf67270454faf5";
    fetchSubmodules = true;
  };
  isLibrary = true;
--- a/pkgs/development/tools/purescript/spago/update.sh
+++ b/pkgs/development/tools/purescript/spago/update.sh
@ -33,4 +33,7 @@ cabal2nix --revision "$new_version" "https://github.com/purescript/spago.git" >>
 # TODO: This should ideally also automatically update the docsSearchVersion
 # from pkgs/development/haskell/configuration-nix.nix.

-echo "Finished."
+echo
+echo "Finished.  Make sure you run the following commands to confirm Spago builds correctly:"
+echo ' - `nix build -L -f ./. spago`'
+echo ' - `sudo nix build -L -f ./. spago.passthru.tests --option sandbox relaxed`'
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@ -317,6 +317,7 @@ let
                random
                QuickCheck
                cabal2nix
+                xhtml # isn't bundled for cross
              ;
            };

@ -327,6 +328,7 @@ let
                random
                QuickCheck
                cabal2nix
+                xhtml # isn't bundled for cross
              ;
            };
          };