Merge pull request #262645 from NixOS/haskell-updates

haskellPackages: update stackage and hackage
2023-11-10 20:38:08 +09:00 · 2023-11-10 20:38:08 +09:00 · b756c485aa
commit b756c485aa
parent 292b9620ab 1713e1d023
42 changed files with 3026 additions and 1682 deletions
--- a/maintainers/scripts/haskell/hydra-report.hs
+++ b/maintainers/scripts/haskell/hydra-report.hs
@ -187,7 +187,7 @@ getBuildReports opt = runReq defaultHttpConfig do

 getEvalBuilds :: HydraSlownessWorkaroundFlag -> Int -> Req (Seq Build)
 getEvalBuilds NoHydraSlownessWorkaround id =
-  hydraJSONQuery (responseTimeout 900000000) ["eval", showT id, "builds"]
+  hydraJSONQuery mempty ["eval", showT id, "builds"]
 getEvalBuilds HydraSlownessWorkaround id = do
  Eval{builds} <- hydraJSONQuery mempty [ "eval", showT id ]
  forM builds $ \buildId -> do
@ -195,14 +195,15 @@ getEvalBuilds HydraSlownessWorkaround id = do
    hydraJSONQuery mempty [ "build", showT buildId ]

 hydraQuery :: HttpResponse a => Proxy a -> Option 'Https -> [Text] -> Req (HttpResponseBody a)
-hydraQuery responseType option query =
-   responseBody
-      <$> req
-         GET
-         (foldl' (/:) (https "hydra.nixos.org") query)
-         NoReqBody
-         responseType
-         (header "User-Agent" "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell) pls fix https://github.com/NixOS/nixos-org-configurations/issues/270" <> option)
+hydraQuery responseType option query = do
+  let customHeaderOpt =
+        header
+          "User-Agent"
+          "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell) pls fix https://github.com/NixOS/nixos-org-configurations/issues/270"
+      customTimeoutOpt = responseTimeout 900_000_000 -- 15 minutes
+      opts = customHeaderOpt <> customTimeoutOpt <> option
+      url = foldl' (/:) (https "hydra.nixos.org") query
+  responseBody <$> req GET url NoReqBody responseType opts

 hydraJSONQuery :: FromJSON a => Option 'Https -> [Text] -> Req a
 hydraJSONQuery = hydraQuery jsonResponse
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@ -47,6 +47,7 @@ let
    "lagda.org"
    "lagda.rst"
    "lagda.tex"
+    "lagda.typ"
  ];

  defaults =
--- a/pkgs/build-support/agda/lib.nix
+++ b/pkgs/build-support/agda/lib.nix
@ -6,7 +6,7 @@
  * interfaceFile "Everything.agda" == "Everything.agdai"
  * interfaceFile "src/Everything.lagda.tex" == "src/Everything.agdai"
  */
-  interfaceFile = agdaFile: lib.head (builtins.match ''(.*\.)l?agda(\.(md|org|rst|tex))?'' agdaFile) + "agdai";
+  interfaceFile = agdaFile: lib.head (builtins.match ''(.*\.)l?agda(\.(md|org|rst|tex|typ))?'' agdaFile) + "agdai";

  /* Takes an arbitrary derivation and says whether it is an agda library package
  *  that is not marked as broken.
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@ -1,6 +1,6 @@
 {
-  "commit": "d37311b9195c41b254b2d71c74c93e51f6ccebab",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d37311b9195c41b254b2d71c74c93e51f6ccebab.tar.gz",
-  "sha256": "1m2xcnyz6y03m5l5qdxc0avi4gi53g82hq4ab9qcjbxi82g3qn4v",
-  "msg": "Update from Hackage at 2023-10-04T18:27:12Z"
+  "commit": "49d09494dd24eae895fe1260e2c26157f740e451",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/49d09494dd24eae895fe1260e2c26157f740e451.tar.gz",
+  "sha256": "1f0m4wni61v6679ya0mb9mw3vxhak9yvjxjm6wfs7wryayb4i5ba",
+  "msg": "Update from Hackage at 2023-10-21T19:49:07Z"
 }
--- a/pkgs/development/compilers/ghc/8.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix
@ -212,6 +212,7 @@ stdenv.mkDerivation rec {
      (let buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"''; in
        lib.concatStringsSep "\n" [
          (''
+            shopt -u nullglob
            echo "Checking that ghc binary exists in bindist at ${buildExeGlob}"
            if ! test -e ${buildExeGlob}; then
              echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;
--- a/pkgs/development/compilers/ghc/8.10.7-binary.nix
+++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix
@ -210,6 +210,7 @@ stdenv.mkDerivation rec {
      (let buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"''; in
        lib.concatStringsSep "\n" [
          (''
+            shopt -u nullglob
            echo "Checking that ghc binary exists in bindist at ${buildExeGlob}"
            if ! test -e ${buildExeGlob}; then
              echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;
--- a/pkgs/development/compilers/ghc/9.2.4-binary.nix
+++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix
@ -196,6 +196,7 @@ stdenv.mkDerivation rec {
      (let buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"''; in
        lib.concatStringsSep "\n" [
          (''
+            shopt -u nullglob
            echo "Checking that ghc binary exists in bindist at ${buildExeGlob}"
            if ! test -e ${buildExeGlob}; then
              echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;
@ -368,7 +369,9 @@ stdenv.mkDerivation rec {
  # Recache package db which needs to happen for Hadrian bindists
  # where we modify the package db before installing
  + ''
-    "$out/bin/ghc-pkg" --package-db="$out/lib/"ghc-*/package.conf.d recache
+    shopt -s nullglob
+    package_db=("$out"/lib/ghc-*/lib/package.conf.d "$out"/lib/ghc-*/package.conf.d)
+    "$out/bin/ghc-pkg" --package-db="$package_db" recache
  '';

  # In nixpkgs, musl based builds currently enable `pie` hardening by default
--- a/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/pkgs/development/compilers/ghc/common-hadrian.nix
@ -150,7 +150,7 @@

  # GHC's build system hadrian built from the GHC-to-build's source tree
  # using our bootstrap GHC.
-, hadrian ? bootPkgs.callPackage ../../tools/haskell/hadrian {
+, hadrian ? import ../../tools/haskell/hadrian/make-hadrian.nix { inherit bootPkgs lib; } {
    ghcSrc = ghcSrc;
    ghcVersion = version;
    userSettings = hadrianUserSettings;
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@ -1,5 +1,5 @@
 import ./common-hadrian.nix {
-  version = "9.7.20230527";
-  rev = "69fdbece5f6ca0a718bb9f1fef7b0ab57cf6b664";
-  sha256 = "13rf1d27wdich0kmbds55by9vj3wz0v9clba9p8qpwz7x7wpcjz2";
+  version = "9.9.20231014";
+  rev = "13d3c613c3c1e4942c698449bdf58a6a13b76695";
+  sha256 = "13xp4ijnym2qbw2qbxkvfb79l7034vrcm9j2j9kirbhjxzdshvx9";
 }
--- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix
@ -8,10 +8,10 @@
 }:
 mkDerivation {
  pname = "cabal2nix";
-  version = "unstable-2023-08-15";
+  version = "unstable-2023-11-02";
  src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/0365d9b77086d26ca5197fb48019cedbb0dce5d2.tar.gz";
-    sha256 = "15aia2v05cmblabhb287cf1yqy4dlzw0g905h79fcvkgygnn2ib8";
+    url = "https://github.com/NixOS/cabal2nix/archive/2099a1f4594f621bb1a2879b793b860aefe4c027.tar.gz";
+    sha256 = "11j1lzjanhmdkqwnb7hni3wxiixl7fzxk6d633cn7ybr7b8wra9s";
  };
  postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
  isLibrary = true;
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -20,8 +20,8 @@ with haskellLib;

 self: super: {
  # Make sure that Cabal 3.10.* can be built as-is
-  Cabal_3_10_1_0 = doDistribute (super.Cabal_3_10_1_0.override ({
-    Cabal-syntax = self.Cabal-syntax_3_10_1_0;
+  Cabal_3_10_2_0 = doDistribute (super.Cabal_3_10_2_0.override ({
+    Cabal-syntax = self.Cabal-syntax_3_10_2_0;
  } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") {
    # Use process core package when possible
    process = self.process_1_6_18_0;
@ -39,8 +39,8 @@ self: super: {
          # Needs to be downgraded compared to Stackage LTS 21
          resolv = cself.resolv_0_1_2_0;
        } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.6") {
-          Cabal = cself.Cabal_3_10_1_0;
-          Cabal-syntax = cself.Cabal-syntax_3_10_1_0;
+          Cabal = cself.Cabal_3_10_2_0;
+          Cabal-syntax = cself.Cabal-syntax_3_10_2_0;
        } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.4") {
          # We need at least directory >= 1.3.7.0. Using the latest version
          # 1.3.8.* is not an option since it causes very annoying dependencies
@ -57,15 +57,15 @@ self: super: {
          # not solvable short of recompiling GHC. Instead of adding
          # allowInconsistentDependencies for all reverse dependencies of hspec-core,
          # just upgrade to an hspec version without the offending dependency.
-          hspec-core = cself.hspec-core_2_11_5;
-          hspec-discover = cself.hspec-discover_2_11_5;
-          hspec = cself.hspec_2_11_5;
+          hspec-core = cself.hspec-core_2_11_6;
+          hspec-discover = cself.hspec-discover_2_11_6;
+          hspec = cself.hspec_2_11_6;

          # hspec-discover and hspec-core depend on hspec-meta for testing which
          # we need to avoid since it depends on ghc as well. Since hspec*_2_11*
          # are overridden to take the versioned attributes as inputs, we need
          # to make sure to override the versioned attribute with this fix.
-          hspec-discover_2_11_5 = dontCheck csuper.hspec-discover_2_11_5;
+          hspec-discover_2_11_6 = dontCheck csuper.hspec-discover_2_11_6;

          # Prevent dependency on doctest which causes an inconsistent dependency
          # due to depending on ghc which depends on directory etc.
@ -154,16 +154,6 @@ self: super: {
      "vector-tests-O0"
      "vector-tests-O2"
    ];
-    patches = [
-      # Workaround almost guaranteed floating point errors in test suite with quickcheck 2.14.3
-      # https://github.com/haskell/vector/issues/460
-      (pkgs.fetchpatch {
-        name = "vector-quickcheck-2.14.3-float-workaround.patch";
-        url = "https://github.com/haskell/vector/commit/df8dd8e8e84005aa6b187b03cd502f3c6e18cf3c.patch";
-        sha256 = "040wg8mqlkdnrl5axy9wk0mlpn8rpc4vc4afpxignj9i7yc4pfjj";
-        stripLen = 1;
-     })
-   ];
  }) super.vector;

  # Almost guaranteed failure due to floating point imprecision with QuickCheck-2.14.3
@ -194,11 +184,6 @@ self: super: {
    })
  ] super.aeson);

-  # aeson 2.2.0.0 requires th-abstraction >= 0.5 & < 0.6
-  aeson_2_2_0_0 = super.aeson_2_2_0_0.overrideScope (hfinal: hprev: {
-    th-abstraction = hfinal.th-abstraction_0_5_0_0;
-  });
-
  # 2023-06-28: Test error: https://hydra.nixos.org/build/225565149
  orbits = dontCheck super.orbits;

@ -207,9 +192,10 @@ self: super: {
  aeson-better-errors = doJailbreak super.aeson-better-errors;

  # 2023-08-09: Jailbreak because of vector < 0.13
-  monad-bayes = doJailbreak (super.monad-bayes.override {
-    hspec = self.hspec_2_11_5;
-  });
+  # 2023-11-09: don't check because of https://github.com/tweag/monad-bayes/pull/326
+  monad-bayes = dontCheck (doJailbreak (super.monad-bayes.override {
+    hspec = self.hspec_2_11_6;
+  }));

  # Disable tests failing on odd floating point numbers generated by QuickCheck 2.14.3
  # https://github.com/haskell/statistics/issues/205
@ -652,7 +638,6 @@ self: super: {
  saltine = dontCheck super.saltine; # https://github.com/tel/saltine/pull/56
  scp-streams = dontCheck super.scp-streams;
  sdl2 = dontCheck super.sdl2; # the test suite needs an x server
-  sdl2-ttf = dontCheck super.sdl2-ttf; # as of version 0.2.1, the test suite requires user intervention
  separated = dontCheck super.separated;
  shadowsocks = dontCheck super.shadowsocks;
  shake-language-c = dontCheck super.shake-language-c;
@ -1393,7 +1378,7 @@ self: super: {
  # 2022-08-31: Jailbreak is done to allow aeson 2.0.*:
  # https://github.com/haskell-CI/haskell-ci/commit/6ad0d5d701cbe101013335d597acaf5feadd3ab9#r82681900
  cabal-install-parsers = doJailbreak (dontCheck (super.cabal-install-parsers.override {
-    Cabal-syntax = self.Cabal-syntax_3_10_1_0;
+    Cabal-syntax = self.Cabal-syntax_3_10_2_0;
  }));

  # Test suite requires database
@ -1438,13 +1423,20 @@ self: super: {
  # upstream: https://github.com/obsidiansystems/which/pull/6
  which = doJailbreak super.which;

-  # 2022-09-20: We have overridden lsp to not be the stackage version.
-  # dhall-lsp-server needs the older 1.4.0.0 lsp
-  dhall-lsp-server = super.dhall-lsp-server.override {
-    lsp = dontCheck (super.lsp_1_4_0_0.override {
-      lsp-types = super.lsp-types_1_4_0_1;
-    });
-  };
+  dhall-lsp-server =
+    # 2022-09-20: We have overridden lsp to not be the stackage version.
+    # dhall-lsp-server needs the older 1.4.0.0 lsp
+    let overridden-dhall-lsp-server = super.dhall-lsp-server.override {
+          lsp = dontCheck (super.lsp_1_4_0_0.override {
+            lsp-types = super.lsp-types_1_4_0_1;
+          });
+        };
+    in appendPatch (fetchpatch {
+      # This patch can be removed once the change question is in a tracked release.
+      url = "https://github.com/dhall-lang/dhall-haskell/pull/2539/commits/5dd0f0ba2d836fea3ef499c7aed04e83269c203f.patch";
+      sha256 = "sha256-xjVuLDBptDGfTf7MVmPb0WuuFWRLpgDYX2ybbgjAjzs=";
+      relative = "dhall-lsp-server";
+    }) overridden-dhall-lsp-server;

  # 2022-03-16: lens bound can be loosened https://github.com/ghcjs/jsaddle-dom/issues/19
  jsaddle-dom = overrideCabal (old: {
@ -1612,7 +1604,7 @@ self: super: {
  hspec-contrib = dontCheck super.hspec-contrib;

  # github.com/ucsd-progsys/liquidhaskell/issues/1729
-  liquidhaskell = super.liquidhaskell.override { Diff = self.Diff_0_3_4; };
+  liquidhaskell-boot = super.liquidhaskell-boot.override { Diff = self.Diff_0_3_4; };
  Diff_0_3_4 = dontCheck super.Diff_0_3_4;

  # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox.
@ -1679,19 +1671,19 @@ self: super: {
  servant-openapi3 = dontCheck super.servant-openapi3;

  # Give latest hspec correct dependency versions without overrideScope
-  hspec_2_11_5 = doDistribute (super.hspec_2_11_5.override {
-    hspec-discover = self.hspec-discover_2_11_5;
-    hspec-core = self.hspec-core_2_11_5;
+  hspec_2_11_6 = doDistribute (super.hspec_2_11_6.override {
+    hspec-discover = self.hspec-discover_2_11_6;
+    hspec-core = self.hspec-core_2_11_6;
  });
-  hspec-meta_2_11_5 = doDistribute (super.hspec-meta_2_11_5.override {
+  hspec-meta_2_11_6 = doDistribute (super.hspec-meta_2_11_6.override {
    hspec-expectations = self.hspec-expectations_0_8_4;
  });
-  hspec-discover_2_11_5 = doDistribute (super.hspec-discover_2_11_5.override {
-    hspec-meta = self.hspec-meta_2_11_5;
+  hspec-discover_2_11_6 = doDistribute (super.hspec-discover_2_11_6.override {
+    hspec-meta = self.hspec-meta_2_11_6;
  });
-  # Need to disable tests to prevent an infinite recursion if hspec-core_2_11_5
+  # Need to disable tests to prevent an infinite recursion if hspec-core_2_11_6
  # is overlayed to hspec-core.
-  hspec-core_2_11_5 = doDistribute (dontCheck (super.hspec-core_2_11_5.override {
+  hspec-core_2_11_6 = doDistribute (dontCheck (super.hspec-core_2_11_6.override {
    hspec-expectations = self.hspec-expectations_0_8_4;
  }));

@ -2123,7 +2115,7 @@ self: super: {
  # 2023-04-09: haskell-ci needs Cabal-syntax 3.10
  # 2023-07-03: allow lattices-2.2, waiting on https://github.com/haskell-CI/haskell-ci/pull/664
  haskell-ci = doJailbreak (super.haskell-ci.overrideScope (self: super: {
-    Cabal-syntax = self.Cabal-syntax_3_10_1_0;
+    Cabal-syntax = self.Cabal-syntax_3_10_2_0;
  }));

  large-hashable = lib.pipe (super.large-hashable.override {
@ -2370,7 +2362,7 @@ self: super: {

  cabal-fmt = doJailbreak (super.cabal-fmt.override {
    # Needs newer Cabal-syntax version.
-    Cabal-syntax = self.Cabal-syntax_3_10_1_0;
+    Cabal-syntax = self.Cabal-syntax_3_10_2_0;
  });

  # 2023-07-18: https://github.com/srid/ema/issues/156
@ -2684,4 +2676,13 @@ self: super: {

  # Too strict bounds on base
  kewar = doJailbreak super.kewar;
+
+  # Tests rely on (missing) submodule
+  unleash-client-haskell-core = dontCheck super.unleash-client-haskell-core;
+
+  # Workaround for Cabal failing to find nonexistent SDL2 library?!
+  # https://github.com/NixOS/nixpkgs/issues/260863
+  sdl2-gfx = overrideCabal { __propagatePkgConfigDepends = false; } super.sdl2-gfx;
+  sdl2-ttf = overrideCabal { __onlyPropagateKnownPkgConfigModules = true; } super.sdl2-ttf;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
--- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix
@ -0,0 +1,52 @@
+{ pkgs, haskellLib }:
+
+let
+  inherit (pkgs) lib;
+in
+
+self: super: {
+  llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
+
+  # Disable GHC core libraries
+  array = null;
+  base = null;
+  binary = null;
+  bytestring = null;
+  Cabal = null;
+  Cabal-syntax = null;
+  containers = null;
+  deepseq = null;
+  directory = null;
+  exceptions = null;
+  filepath = null;
+  ghc-bignum = null;
+  ghc-boot = null;
+  ghc-boot-th = null;
+  ghc-compact = null;
+  ghc-experimental = null;
+  ghc-heap = null;
+  ghc-internal = null;
+  ghc-platform = null;
+  ghc-prim = null;
+  ghc-toolchain = null;
+  ghci = null;
+  haskeline = null;
+  hpc = null;
+  integer-gmp = null;
+  mtl = null;
+  parsec = null;
+  pretty = null;
+  process = null;
+  rts = null;
+  semaphore-compat = null;
+  stm = null;
+  system-cxx-std-lib = null;
+  template-haskell = null;
+  # GHC only builds terminfo if it is a native compiler
+  terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6;
+  text = null;
+  time = null;
+  transformers = null;
+  unix = null;
+  xhtml = null;
+}
--- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
@ -115,9 +115,9 @@ in {
    (
      let
        hls_overlay = lself: lsuper: {
-          ghc-lib-parser = lself.ghc-lib-parser_9_6_2_20230523;
+          ghc-lib-parser = lself.ghc-lib-parser_9_6_3_20231014;
          ghc-lib-parser-ex = doDistribute lself.ghc-lib-parser-ex_9_6_0_2;
-          Cabal-syntax = lself.Cabal-syntax_3_10_1_0;
+          Cabal-syntax = lself.Cabal-syntax_3_10_2_0;
        };
      in
      lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) {
--- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
@ -65,21 +65,25 @@ self: super: {
  # Version deviations from Stackage LTS
  #

-  doctest = doDistribute super.doctest_0_22_1;
+  doctest = doDistribute super.doctest_0_22_2;
  http-api-data = doDistribute self.http-api-data_0_6; # allows base >= 4.18
  some = doDistribute self.some_1_0_5;
  th-abstraction = doDistribute self.th-abstraction_0_6_0_0;
  th-desugar = doDistribute self.th-desugar_1_15;
  semigroupoids = doDistribute self.semigroupoids_6_0_0_1;
  bifunctors = doDistribute self.bifunctors_5_6_1;
-  base-compat = doDistribute self.base-compat_0_13_0;
-  base-compat-batteries = doDistribute self.base-compat-batteries_0_13_0;
+  base-compat = doDistribute self.base-compat_0_13_1;
+  base-compat-batteries = doDistribute self.base-compat-batteries_0_13_1;
  fgl = doDistribute self.fgl_5_8_1_1;

  # Because we bumped the version of th-abstraction above.^
  aeson = doJailbreak super.aeson;
  free = doJailbreak super.free;

+  # Because we bumped the version of base-compat above.^
+  cabal-plan = unmarkBroken super.cabal-plan;
+  cabal-plan-bounds = unmarkBroken super.cabal-plan-bounds;
+
  # Requires filepath >= 1.4.100.0 <=> GHC >= 9.6
  file-io = unmarkBroken super.file-io;

@ -87,8 +91,8 @@ self: super: {
  # https://github.com/mokus0/th-extras/pull/21
  th-extras = doJailbreak super.th-extras;

-  ghc-lib = doDistribute self.ghc-lib_9_6_2_20230523;
-  ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_2_20230523;
+  ghc-lib = doDistribute self.ghc-lib_9_6_3_20231014;
+  ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_3_20231014;
  ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_6_0_2;

  # Tests fail due to the newly-build fourmolu not being in PATH
@ -196,8 +200,8 @@ self: super: {
  hw-prim = dontCheck (doJailbreak super.hw-prim);
  stm-containers = dontCheck super.stm-containers;
  regex-tdfa = dontCheck super.regex-tdfa;
-  rebase = doJailbreak super.rebase_1_20;
-  rerebase = doJailbreak super.rerebase_1_20;
+  rebase = doJailbreak super.rebase_1_20_1_1;
+  rerebase = doJailbreak super.rerebase_1_20_1_1;
  hiedb = dontCheck super.hiedb;
  retrie = dontCheck super.retrie;
  # https://github.com/kowainik/relude/issues/436
@ -268,7 +272,5 @@ self: super: {
  # the workaround on 9.6 is to revert to the LLVM backend (which is used
  # for these sorts of situations even on 9.2 and 9.4).
  # https://gitlab.haskell.org/ghc/ghc/-/issues/23746#note_525318
-  tls = appendConfigureFlags
-    (lib.optionals pkgs.stdenv.hostPlatform.isAarch64 [ "--ghc-option=-fllvm" ])
-    super.tls;
+  tls = if pkgs.stdenv.hostPlatform.isAarch64 then self.forceLlvmCodegenBackend super.tls else super.tls;
 }
--- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
@ -1,10 +1,3 @@
-##
-## Caveat: a copy of configuration-ghc-8.6.x.nix with minor changes:
-##
-##  1. "8.7" strings
-##  2. llvm 6
-##  3. disabled library update: parallel
-##
 { pkgs, haskellLib }:

 with haskellLib;
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@ -99,6 +99,8 @@ broken-packages:
  - affection # failure in job https://hydra.nixos.org/build/233213076 at 2023-09-02
  - affine-invariant-ensemble-mcmc # failure in job https://hydra.nixos.org/build/233237176 at 2023-09-02
  - Agata # failure in job https://hydra.nixos.org/build/233221026 at 2023-09-02
+  - agda2hs # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/239252884 at 2023-11-10
+  - agda2train # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/239247619 at 2023-11-10
  - Agda-executable # failure in job https://hydra.nixos.org/build/233332629 at 2023-09-02
  - agda-language-server # failure in job https://hydra.nixos.org/build/233332694 at 2023-09-02
  - agda-snippets # failure in job https://hydra.nixos.org/build/233332749 at 2023-09-02
@ -1183,7 +1185,6 @@ broken-packages:
  - dhall-check # failure in job https://hydra.nixos.org/build/233206425 at 2023-09-02
  - dhall-csv # failure in job https://hydra.nixos.org/build/233256049 at 2023-09-02
  - dhall-fly # failure in job https://hydra.nixos.org/build/233220306 at 2023-09-02
-  - dhall-lsp-server # failure in job https://hydra.nixos.org/build/233216852 at 2023-09-02
  - dhall-recursive-adt # failure in job https://hydra.nixos.org/build/233210665 at 2023-09-02
  - dhall-text # failure in job https://hydra.nixos.org/build/233253809 at 2023-09-02
  - dhall-to-cabal # failure in job https://hydra.nixos.org/build/233193270 at 2023-09-02
@ -1239,6 +1240,7 @@ broken-packages:
  - disjoint-set # failure in job https://hydra.nixos.org/build/233201934 at 2023-09-02
  - disjoint-set-stateful # failure in job https://hydra.nixos.org/build/233253300 at 2023-09-02
  - diskhash # failure in job https://hydra.nixos.org/build/233230362 at 2023-09-02
+  - disposable # timeout
  - distance # failure in job https://hydra.nixos.org/build/233255082 at 2023-09-02
  - Dist # failure in job https://hydra.nixos.org/build/233217811 at 2023-09-02
  - distributed-closure # failure in job https://hydra.nixos.org/build/233223516 at 2023-09-02
@ -1506,6 +1508,7 @@ broken-packages:
  - extensible-data # failure in job https://hydra.nixos.org/build/233198917 at 2023-09-02
  - extensible-effects-concurrent # failure in job https://hydra.nixos.org/build/233233685 at 2023-09-02
  - extensioneer # failure in job https://hydra.nixos.org/build/233663099 at 2023-09-02
+  - extensions # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/239249292 at 2023-11-10
  - external-sort # failure in job https://hydra.nixos.org/build/233244337 at 2023-09-02
  - extism # failure in job https://hydra.nixos.org/build/233242807 at 2023-09-02
  - extism-pdk # failure in job https://hydra.nixos.org/build/237239071 at 2023-10-21
@ -1624,6 +1627,7 @@ broken-packages:
  - flay # failure in job https://hydra.nixos.org/build/233235511 at 2023-09-02
  - flexible-time # failure in job https://hydra.nixos.org/build/233208099 at 2023-09-02
  - flickr # failure in job https://hydra.nixos.org/build/233212718 at 2023-09-02
+  - Flint2 # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/239246414 at 2023-11-10
  - float-binstring # failure in job https://hydra.nixos.org/build/233203257 at 2023-09-02
  - floating-bits # failure in job https://hydra.nixos.org/build/233223171 at 2023-09-02
  - flock # failure in job https://hydra.nixos.org/build/233245164 at 2023-09-02
@ -1733,7 +1737,6 @@ broken-packages:
  - fused-effects-resumable # failure in job https://hydra.nixos.org/build/233242479 at 2023-09-02
  - fused-effects-th # failure in job https://hydra.nixos.org/build/233192186 at 2023-09-02
  - fusion # failure in job https://hydra.nixos.org/build/233204359 at 2023-09-02
-  - futhark # failure in job https://hydra.nixos.org/build/236673091 at 2023-10-04
  - futhask # failure in job https://hydra.nixos.org/build/233229281 at 2023-09-02
  - futun # failure in job https://hydra.nixos.org/build/233245115 at 2023-09-02
  - future # failure in job https://hydra.nixos.org/build/233224844 at 2023-09-02
@ -1831,7 +1834,9 @@ broken-packages:
  - ghci-history-parser # failure in job https://hydra.nixos.org/build/233204448 at 2023-09-02
  - ghci-lib # failure in job https://hydra.nixos.org/build/233216644 at 2023-09-02
  - ghci-ng # failure in job https://hydra.nixos.org/build/233229533 at 2023-09-02
+  - ghcjs-base-stub # timeout
  - ghcjs-dom-jsffi # failure in job https://hydra.nixos.org/build/233215225 at 2023-09-02
+  - ghcjs-fetch # timeout
  - ghcjs-promise # failure in job https://hydra.nixos.org/build/233243985 at 2023-09-02
  - ghcjs-xhr # failure in job https://hydra.nixos.org/build/233235693 at 2023-09-02
  - ghc-justdoit # failure in job https://hydra.nixos.org/build/233221884 at 2023-09-02
@ -1852,12 +1857,13 @@ broken-packages:
  - ghc-time-alloc-prof # failure in job https://hydra.nixos.org/build/233242289 at 2023-09-02
  - ghc-usage # failure in job https://hydra.nixos.org/build/233199565 at 2023-09-02
  - gh-labeler # failure in job https://hydra.nixos.org/build/233233139 at 2023-09-02
+  - gi-adwaita # failure in compileBuildDriverPhase in job https://hydra.nixos.org/build/239685049 at 2023-11-10
  - giak # failure in job https://hydra.nixos.org/build/233242229 at 2023-09-02
  - gi-clutter # failure in job https://hydra.nixos.org/build/233252753 at 2023-09-02
  - gi-coglpango # failure in job https://hydra.nixos.org/build/233194401 at 2023-09-02
  - Gifcurry # failure in job https://hydra.nixos.org/build/233200204 at 2023-09-02
  - gi-gio-hs-list-model # failure in job https://hydra.nixos.org/build/233241640 at 2023-09-02
-  - gi-graphene # failure in job https://hydra.nixos.org/build/233205231 at 2023-09-02
+  - gi-gsk # failure in compileBuildDriverPhase in job https://hydra.nixos.org/build/239849990 at 2023-11-10
  - gi-gsttag # failure in job https://hydra.nixos.org/build/233197576 at 2023-09-02
  - gi-gtk-declarative # failure in job https://hydra.nixos.org/build/233217494 at 2023-09-02
  - gi-gtksheet # failure in job https://hydra.nixos.org/build/233211386 at 2023-09-02
@ -1870,7 +1876,6 @@ broken-packages:
  - GiST # failure in job https://hydra.nixos.org/build/233199759 at 2023-09-02
  - gist # failure in job https://hydra.nixos.org/build/233221381 at 2023-09-02
  - git-all # failure in job https://hydra.nixos.org/build/233252935 at 2023-09-02
-  - git-brunch # failure in job https://hydra.nixos.org/build/233250960 at 2023-09-02
  - git-checklist # failure in job https://hydra.nixos.org/build/233203228 at 2023-09-02
  - git-cuk # failure in job https://hydra.nixos.org/build/233211733 at 2023-09-02
  - git-date # failure in job https://hydra.nixos.org/build/233259193 at 2023-09-02
@ -2860,6 +2865,7 @@ broken-packages:
  - interruptible # failure in job https://hydra.nixos.org/build/233209873 at 2023-09-02
  - interval-algebra # failure in job https://hydra.nixos.org/build/233208487 at 2023-09-02
  - interval # failure in job https://hydra.nixos.org/build/233239434 at 2023-09-02
+  - interval-patterns # failure in job https://hydra.nixos.org/build/239259401 at 2023-11-10
  - interval-tree-clock # failure in job https://hydra.nixos.org/build/233234316 at 2023-09-02
  - IntFormats # failure in job https://hydra.nixos.org/build/233195190 at 2023-09-02
  - int-interval-map # failure in job https://hydra.nixos.org/build/233244556 at 2023-09-02
@ -2928,6 +2934,7 @@ broken-packages:
  - java-adt # failure in job https://hydra.nixos.org/build/233256402 at 2023-09-02
  - java-bridge # failure in job https://hydra.nixos.org/build/233219258 at 2023-09-02
  - javascript-bridge # failure in job https://hydra.nixos.org/build/233217052 at 2023-09-02
+  - javascript-extras # timeout
  - Javav # failure in job https://hydra.nixos.org/build/233243825 at 2023-09-02
  - javav # failure in job https://hydra.nixos.org/build/233246644 at 2023-09-02
  - jbi # failure in job https://hydra.nixos.org/build/233221466 at 2023-09-02
@ -3025,6 +3032,7 @@ broken-packages:
  - kawhi # failure in job https://hydra.nixos.org/build/233193086 at 2023-09-02
  - kdesrc-build-extra # failure in job https://hydra.nixos.org/build/233193718 at 2023-09-02
  - kd-tree # failure in job https://hydra.nixos.org/build/233207928 at 2023-09-02
+  - kdt # test failure in job https://hydra.nixos.org/build/239264029 at 2023-11-10
  - keccak # failure in job https://hydra.nixos.org/build/233200469 at 2023-09-02
  - keenser # failure in job https://hydra.nixos.org/build/233200021 at 2023-09-02
  - keera-hails-reactivevalues # failure in job https://hydra.nixos.org/build/233258391 at 2023-09-02
@ -3587,6 +3595,7 @@ broken-packages:
  - monoids # failure in job https://hydra.nixos.org/build/233231684 at 2023-09-02
  - monopati # failure in job https://hydra.nixos.org/build/233234119 at 2023-09-02
  - monus # failure in job https://hydra.nixos.org/build/233252424 at 2023-09-02
+  - monus-weighted-search # timeout
  - monzo # failure in job https://hydra.nixos.org/build/233254681 at 2023-09-02
  - morfette # failure in job https://hydra.nixos.org/build/233249575 at 2023-09-02
  - morfeusz # failure in job https://hydra.nixos.org/build/233232351 at 2023-09-02
@ -3729,6 +3738,7 @@ broken-packages:
  - networked-game # failure in job https://hydra.nixos.org/build/233239577 at 2023-09-02
  - network-house # failure in job https://hydra.nixos.org/build/233193957 at 2023-09-02
  - network-manager-tui # failure in job https://hydra.nixos.org/build/233247972 at 2023-09-02
+  - network-messagepack-rpc-websocket # timeout
  - network-metrics # failure in job https://hydra.nixos.org/build/233259963 at 2023-09-02
  - network-msg # failure in job https://hydra.nixos.org/build/233236413 at 2023-09-02
  - network-msgpack-rpc # failure in job https://hydra.nixos.org/build/233222467 at 2023-09-02
@ -4700,6 +4710,7 @@ broken-packages:
  - ron # failure in job https://hydra.nixos.org/build/233197052 at 2023-09-02
  - rope # failure in job https://hydra.nixos.org/build/233198109 at 2023-09-02
  - rosebud # failure in job https://hydra.nixos.org/build/233225772 at 2023-09-02
+  - rose-trees # timeout
  - rosmsg # failure in job https://hydra.nixos.org/build/233248569 at 2023-09-02
  - rospkg # failure in job https://hydra.nixos.org/build/233229989 at 2023-09-02
  - rosso # failure in job https://hydra.nixos.org/build/233230103 at 2023-09-02
@ -4804,10 +4815,8 @@ broken-packages:
  - sdl2-cairo-image # failure in job https://hydra.nixos.org/build/233210135 at 2023-09-02
  - sdl2-compositor # failure in job https://hydra.nixos.org/build/233198910 at 2023-09-02
  - sdl2-fps # failure in job https://hydra.nixos.org/build/233195346 at 2023-09-02
-  - sdl2-gfx # failure in job https://hydra.nixos.org/build/233236795 at 2023-09-02
  - sdl2-image # failure in job https://hydra.nixos.org/build/233216837 at 2023-09-02
  - sdl2-mixer # failure in job https://hydra.nixos.org/build/233228951 at 2023-09-02
-  - sdl2-ttf # failure in job https://hydra.nixos.org/build/233238600 at 2023-09-02
  - sdp # failure in job https://hydra.nixos.org/build/233246702 at 2023-09-02
  - seacat # failure in job https://hydra.nixos.org/build/233229959 at 2023-09-02
  - seakale # failure in job https://hydra.nixos.org/build/233236200 at 2023-09-02
@ -4872,7 +4881,6 @@ broken-packages:
  - servant-http-streams # failure in job https://hydra.nixos.org/build/233242852 at 2023-09-02
  - servant-iCalendar # failure in job https://hydra.nixos.org/build/233200493 at 2023-09-02
  - servant-jquery # failure in job https://hydra.nixos.org/build/233238796 at 2023-09-02
-  - servant-JuicyPixels # failure in job https://hydra.nixos.org/build/233222224 at 2023-09-02
  - servant-kotlin # failure in job https://hydra.nixos.org/build/233598190 at 2023-09-02
  - servant-namedargs # failure in job https://hydra.nixos.org/build/233258674 at 2023-09-02
  - servant-nix # failure in job https://hydra.nixos.org/build/233236159 at 2023-09-02
@ -5017,6 +5025,7 @@ broken-packages:
  - skeletal-set # failure in job https://hydra.nixos.org/build/233254711 at 2023-09-02
  - skell # failure in job https://hydra.nixos.org/build/233245484 at 2023-09-02
  - skemmtun # failure in job https://hydra.nixos.org/build/233223893 at 2023-09-02
+  - skews # timeout
  - skopedate # failure in job https://hydra.nixos.org/build/233220634 at 2023-09-02
  - skulk # failure in job https://hydra.nixos.org/build/233258672 at 2023-09-02
  - skylighting-extensions # failure in job https://hydra.nixos.org/build/233221387 at 2023-09-02
@ -5371,6 +5380,7 @@ broken-packages:
  - tamarin-prover-utils # failure in job https://hydra.nixos.org/build/233235417 at 2023-09-02
  - Tape # failure in job https://hydra.nixos.org/build/233191662 at 2023-09-02
  - tapioca # failure in job https://hydra.nixos.org/build/233207781 at 2023-09-02
+  - taskell # depends on old version of brick
  - TaskMonad # failure in job https://hydra.nixos.org/build/233219257 at 2023-09-02
  - tasty-autocollect # failure in job https://hydra.nixos.org/build/233256957 at 2023-09-02
  - tasty-auto # failure in job https://hydra.nixos.org/build/233220008 at 2023-09-02
@ -5476,6 +5486,7 @@ broken-packages:
  - thank-you-stars # failure in job https://hydra.nixos.org/build/233219923 at 2023-09-02
  - th-build # failure in job https://hydra.nixos.org/build/233224794 at 2023-09-02
  - th-dict-discovery # failure in job https://hydra.nixos.org/build/233204140 at 2023-09-02
+  - theatre-dev # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/239251083 at 2023-11-10
  - THEff # failure in job https://hydra.nixos.org/build/233221239 at 2023-09-02
  - themoviedb # failure in job https://hydra.nixos.org/build/233233008 at 2023-09-02
  - thentos-cookie-session # failure in job https://hydra.nixos.org/build/233234700 at 2023-09-02
@ -5620,6 +5631,7 @@ broken-packages:
  - tremulous-query # failure in job https://hydra.nixos.org/build/233200947 at 2023-09-02
  - TrendGraph # failure in job https://hydra.nixos.org/build/233258651 at 2023-09-02
  - trhsx # failure in job https://hydra.nixos.org/build/233231297 at 2023-09-02
+  - tries # timeout
  - trim # failure in job https://hydra.nixos.org/build/233195034 at 2023-09-02
  - tripLL # failure in job https://hydra.nixos.org/build/233217806 at 2023-09-02
  - trivia # failure in job https://hydra.nixos.org/build/233234176 at 2023-09-02
@ -5744,7 +5756,6 @@ broken-packages:
  - unix-handle # failure in job https://hydra.nixos.org/build/233233273 at 2023-09-02
  - unix-process-conduit # failure in job https://hydra.nixos.org/build/233191509 at 2023-09-02
  - unix-recursive # failure in job https://hydra.nixos.org/build/233194742 at 2023-09-02
-  - unleash-client-haskell-core # failure in job https://hydra.nixos.org/build/237229757 at 2023-10-21
  - unlifted-list # failure in job https://hydra.nixos.org/build/233205239 at 2023-09-02
  - unlift # failure in job https://hydra.nixos.org/build/233217875 at 2023-09-02
  - unliftio-messagebox # failure in job https://hydra.nixos.org/build/233200633 at 2023-09-02
@ -6023,6 +6034,7 @@ broken-packages:
  - wsdl # failure in job https://hydra.nixos.org/build/233208187 at 2023-09-02
  - wsedit # failure in job https://hydra.nixos.org/build/233232333 at 2023-09-02
  - ws # failure building executable 'ws' in job https://hydra.nixos.org/build/237237311 at 2023-10-21
+  - wss-client # timeout
  - wtk # failure in job https://hydra.nixos.org/build/233220668 at 2023-09-02
  - wumpus-core # failure in job https://hydra.nixos.org/build/233244405 at 2023-09-02
  - wxdirect # failure in job https://hydra.nixos.org/build/233255519 at 2023-09-02
@ -6196,7 +6208,9 @@ broken-packages:
  - zeolite-lang # failure in job https://hydra.nixos.org/build/233217146 at 2023-09-02
  - zero # failure in job https://hydra.nixos.org/build/233209286 at 2023-09-02
  - zeromq3-haskell # failure in job https://hydra.nixos.org/build/233215557 at 2023-09-02
+  - zeromq4-clone-pattern # timeout
  - zeromq4-conduit # failure in job https://hydra.nixos.org/build/233198244 at 2023-09-02
+  - zeromq4-patterns # timeout
  - zeromq-haskell # failure in job https://hydra.nixos.org/build/233196050 at 2023-09-02
  - zettelkast # failure in job https://hydra.nixos.org/build/233211485 at 2023-09-02
  - ZFS # failure in job https://hydra.nixos.org/build/233257824 at 2023-09-02
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@ -94,12 +94,15 @@ extra-packages:
  - ghc-lib == 8.10.7.*                 # 2022-02-17: preserve for GHC 8.10.7
  - ghc-lib == 9.2.*                    # 2022-02-17: preserve for GHC 9.2
  - ghc-lib == 9.4.*                    # 2023-03-17: preserve for GHC 9.4
+  - ghc-lib == 9.6.*                    # 2023-03-17: preserve for GHC 9.6
  - ghc-lib-parser == 8.10.7.*          # 2022-02-17: preserve for GHC 8.10.7
  - ghc-lib-parser == 9.2.*             # 2022-02-17: preserve for GHC 9.2
  - ghc-lib-parser == 9.4.*             # 2023-03-17: preserve for GHC 9.4
+  - ghc-lib-parser == 9.6.*             # 2023-10-24: preserve for GHC 9.6
  - ghc-lib-parser-ex == 8.10.*         # 2022-02-17: preserve for GHC 8.10.7
  - ghc-lib-parser-ex == 9.2.*          # 2022-07-13: preserve for GHC 9.2
  - ghc-lib-parser-ex == 9.4.*          # 2023-03-17: preserve for GHC 9.4
+  - ghc-lib-parser-ex == 9.6.*          # 2023-10-24: preserve for GHC 9.6
  - gi-soup == 2.4.28                   # 2023-04-05: the last version to support libsoup-2.4 (and thus be compatible with our other gi- packages)
  - haddock == 2.23.*                   # required on GHC < 8.10.x
  - haddock-api == 2.23.*               # required on GHC < 8.10.x
@ -154,6 +157,8 @@ package-maintainers:
    - hnix-store-remote
  arturcygan:
    - hevm
+  athas:
+    - futhark
  berberman:
    - nvfetcher
    - arch-web
@ -169,6 +174,7 @@ package-maintainers:
  centromere:
    - nfc
  dalpd:
+    - dhall-lsp-server
    - espial
    - ghc-vis
    - patat
@ -208,6 +214,9 @@ package-maintainers:
    - vulkan-utils
  erictapen:
    - hakyll
+  evenbrenden:
+    - unleash-client-haskell
+    - unleash-client-haskell-core
  Gabriella439:
    - annah
    - bench
@ -279,8 +288,6 @@ package-maintainers:
  maralorn:
    - cabal-fmt
    - clay
-    - ema
-    - emanote
    - eventlog2html
    - generic-optics
    - ghc-debug-brick
@ -323,11 +330,12 @@ package-maintainers:
  ncfavier:
    - lambdabot
  nomeata:
+    - cabal-plan-bounds
    - candid
    - leb128-cereal
-    - tasty-expected-failure
    - lhs2tex
    - rec-def
+    - tasty-expected-failure
  peti:
    - cabal2spec
    - funcmp
@ -378,6 +386,11 @@ package-maintainers:
    - taffybar
    - arbtt
    - lentil
+  sheepforce:
+    - mpi-hs
+    - mpi-hs-store
+    - mpi-hs-cereal
+    - mpi-hs-binary
  shlok:
    - streamly-archive
    - streamly-lmdb
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
@ -1,4 +1,4 @@
-# Stackage LTS 21.14
+# Stackage LTS 21.16
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@ -117,7 +117,7 @@ default-package-overrides:
  - audacity ==0.0.2.1
  - authenticate ==1.3.5.2
  - authenticate-oauth ==1.7
-  - autodocodec ==0.2.0.5
+  - autodocodec ==0.2.1.0
  - autodocodec-openapi3 ==0.2.1.1
  - autodocodec-schema ==0.1.0.3
  - autodocodec-yaml ==0.2.0.3
@ -148,8 +148,8 @@ default-package-overrides:
  - base-compat ==0.12.3
  - base-compat-batteries ==0.12.3
  - basement ==0.0.16
-  - base-orphans ==0.9.0
-  - base-prelude ==1.6.1
+  - base-orphans ==0.9.1
+  - base-prelude ==1.6.1.1
  - base-unicode-symbols ==0.2.4.2
  - basic-prelude ==0.7.0
  - battleship-combinatorics ==0.0.1
@ -182,7 +182,7 @@ default-package-overrides:
  - binary-instances ==1.0.4
  - binary-list ==1.1.1.2
  - binary-orphans ==1.0.4.1
-  - binary-parser ==0.5.7.3
+  - binary-parser ==0.5.7.4
  - binary-search ==2.0.0
  - binary-shared ==0.8.3
  - binary-tagged ==0.3.1
@ -199,7 +199,7 @@ default-package-overrides:
  - bitwise-enum ==1.0.1.2
  - blake2 ==0.3.0
  - Blammo ==1.1.2.1
-  - blank-canvas ==0.7.3
+  - blank-canvas ==0.7.4
  - blanks ==0.5.0
  - blas-carray ==0.1.0.2
  - blas-comfort-array ==0.0.0.3
@ -248,7 +248,7 @@ default-package-overrides:
  - bugsnag-hs ==0.2.0.12
  - bugsnag-wai ==1.0.0.1
  - bugsnag-yesod ==1.0.0.1
-  - bugzilla-redhat ==1.0.1
+  - bugzilla-redhat ==1.0.1.1
  - burrito ==2.0.1.6
  - bv ==0.5
  - byteable ==0.1.1
@ -265,7 +265,7 @@ default-package-overrides:
  - bytestring-builder ==0.10.8.2.0
  - bytestring-lexing ==0.5.0.10
  - bytestring-mmap ==0.2.2
-  - bytestring-strict-builder ==0.4.5.6
+  - bytestring-strict-builder ==0.4.5.7
  - bytestring-to-vector ==0.3.0.1
  - bytestring-tree-builder ==0.2.7.10
  - bytestring-trie ==0.2.7.2
@ -365,9 +365,9 @@ default-package-overrides:
  - colourista ==0.1.0.2
  - columnar ==1.0.0.0
  - combinatorial ==0.1.1
-  - comfort-array ==0.5.2.3
+  - comfort-array ==0.5.3
  - comfort-array-shape ==0.0
-  - comfort-blas ==0.0.0.1
+  - comfort-blas ==0.0.1
  - comfort-fftw ==0.0.0.1
  - comfort-glpk ==0.1
  - comfort-graph ==0.0.4
@ -391,7 +391,7 @@ default-package-overrides:
  - concise ==0.1.0.1
  - concurrency ==1.11.0.3
  - concurrent-extra ==0.7.0.12
-  - concurrent-output ==1.10.19
+  - concurrent-output ==1.10.20
  - concurrent-split ==0.0.1.1
  - cond ==0.4.1.1
  - conduino ==0.2.2.0
@ -546,7 +546,7 @@ default-package-overrides:
  - Decimal ==0.5.2
  - declarative ==0.5.4
  - deepseq-generics ==0.2.0.0
-  - deferred-folds ==0.9.18.3
+  - deferred-folds ==0.9.18.5
  - dejafu ==2.4.0.5
  - dense-linear-algebra ==0.1.0.0
  - dependent-map ==0.4.0.0
@ -702,7 +702,7 @@ default-package-overrides:
  - errors-ext ==0.4.2
  - ersatz ==0.4.13
  - esqueleto ==3.5.10.3
-  - event-list ==0.1.2
+  - event-list ==0.1.2.1
  - eventstore ==1.4.2
  - every ==0.0.1
  - evm-opcodes ==0.1.2
@ -742,6 +742,7 @@ default-package-overrides:
  - fast-logger ==3.2.2
  - fast-math ==1.0.2
  - fastmemo ==0.1.1
+  - fast-myers-diff ==0.0.0
  - fb ==2.1.1.1
  - fcf-family ==0.2.0.0
  - fdo-notify ==0.3.1
@ -860,27 +861,27 @@ default-package-overrides:
  - genvalidity-case-insensitive ==0.0.0.1
  - genvalidity-containers ==1.0.0.1
  - genvalidity-criterion ==1.1.0.0
-  - genvalidity-hspec ==1.0.0.2
+  - genvalidity-hspec ==1.0.0.3
  - genvalidity-hspec-aeson ==1.0.0.0
  - genvalidity-hspec-binary ==1.0.0.0
  - genvalidity-hspec-cereal ==1.0.0.0
-  - genvalidity-hspec-hashable ==1.0.0.0
+  - genvalidity-hspec-hashable ==1.0.0.1
  - genvalidity-hspec-optics ==1.0.0.0
  - genvalidity-hspec-persistent ==1.0.0.0
-  - genvalidity-mergeful ==0.3.0.0
+  - genvalidity-mergeful ==0.3.0.1
  - genvalidity-mergeless ==0.3.0.0
-  - genvalidity-persistent ==1.0.0.1
+  - genvalidity-persistent ==1.0.0.2
  - genvalidity-property ==1.0.0.0
  - genvalidity-scientific ==1.0.0.0
  - genvalidity-sydtest ==1.0.0.0
  - genvalidity-sydtest-aeson ==1.0.0.0
-  - genvalidity-sydtest-hashable ==1.0.0.0
+  - genvalidity-sydtest-hashable ==1.0.0.1
  - genvalidity-sydtest-lens ==1.0.0.0
  - genvalidity-sydtest-persistent ==1.0.0.0
  - genvalidity-text ==1.0.0.1
  - genvalidity-time ==1.0.0.1
  - genvalidity-typed-uuid ==0.1.0.1
-  - genvalidity-unordered-containers ==1.0.0.0
+  - genvalidity-unordered-containers ==1.0.0.1
  - genvalidity-uuid ==1.0.0.1
  - genvalidity-vector ==1.0.0.0
  - geodetics ==0.1.2
@ -900,11 +901,11 @@ default-package-overrides:
  - ghc-paths ==0.1.0.12
  - ghc-prof ==1.4.1.12
  - ghc-syntax-highlighter ==0.0.9.0
-  - ghc-tcplugins-extra ==0.4.4
+  - ghc-tcplugins-extra ==0.4.5
  - ghc-trace-events ==0.1.2.7
-  - ghc-typelits-extra ==0.4.5
-  - ghc-typelits-knownnat ==0.7.8
-  - ghc-typelits-natnormalise ==0.7.8
+  - ghc-typelits-extra ==0.4.6
+  - ghc-typelits-knownnat ==0.7.9
+  - ghc-typelits-natnormalise ==0.7.9
  - ghc-typelits-presburger ==0.7.2.0
  - ghost-buster ==0.1.1.0
  - gi-atk ==2.0.27
@ -1069,7 +1070,7 @@ default-package-overrides:
  - hfsevents ==0.1.6
  - hgal ==2.0.0.3
  - hidapi ==0.1.8
-  - hi-file-parser ==0.1.4.0
+  - hi-file-parser ==0.1.5.0
  - highlighting-kate ==0.6.4
  - hindent ==6.0.0
  - hinfo ==0.0.3.0
@ -1282,7 +1283,7 @@ default-package-overrides:
  - indexed-containers ==0.1.0.2
  - indexed-list-literals ==0.2.1.3
  - indexed-profunctors ==0.1.1.1
-  - indexed-traversable ==0.1.2.1
+  - indexed-traversable ==0.1.3
  - indexed-traversable-instances ==0.1.1.2
  - inf-backprop ==0.1.0.2
  - infer-license ==0.2.0
@ -1332,7 +1333,7 @@ default-package-overrides:
  - iso639 ==0.1.0.3
  - iso8601-time ==0.1.5
  - isocline ==1.0.9
-  - isomorphism-class ==0.1.0.9
+  - isomorphism-class ==0.1.0.10
  - iterable ==3.0
  - ix-shapable ==0.1.0
  - jack ==0.7.2.2
@ -1361,7 +1362,7 @@ default-package-overrides:
  - justified-containers ==0.3.0.0
  - jwt ==0.11.0
  - kan-extensions ==5.2.5
-  - kansas-comet ==0.4.1
+  - kansas-comet ==0.4.2
  - katip ==0.8.7.4
  - katip-logstash ==0.1.0.2
  - katip-wai ==0.1.2.2
@ -1375,11 +1376,11 @@ default-package-overrides:
  - keyed-vals-mem ==0.2.2.0
  - keyed-vals-redis ==0.2.2.0
  - keys ==3.12.3
-  - ki ==1.0.1.0
+  - ki ==1.0.1.1
  - kind-apply ==0.4.0.0
  - kind-generics ==0.5.0.0
  - kind-generics-th ==0.2.3.3
-  - ki-unlifted ==1.0.0.1
+  - ki-unlifted ==1.0.0.2
  - kleene ==0.1
  - kmeans ==0.1.3
  - knob ==0.2.2
@ -1454,10 +1455,10 @@ default-package-overrides:
  - linux-file-extents ==0.2.0.0
  - linux-namespaces ==0.1.3.0
  - List ==0.6.2
-  - ListLike ==4.7.8.1
+  - ListLike ==4.7.8.2
  - list-predicate ==0.1.0.1
  - listsafe ==0.1.0.1
-  - list-t ==1.0.5.6
+  - list-t ==1.0.5.7
  - list-transformer ==1.0.9
  - ListTree ==0.2.3
  - ListZipper ==1.2.0.2
@ -1548,9 +1549,9 @@ default-package-overrides:
  - microlens ==0.4.13.1
  - microlens-aeson ==2.5.1
  - microlens-contra ==0.1.0.3
-  - microlens-ghc ==0.4.14.1
+  - microlens-ghc ==0.4.14.2
  - microlens-mtl ==0.2.0.3
-  - microlens-platform ==0.4.3.3
+  - microlens-platform ==0.4.3.4
  - microlens-th ==0.4.3.14
  - microspec ==0.2.1.3
  - microstache ==1.0.2.3
@ -1672,7 +1673,7 @@ default-package-overrides:
  - natural-sort ==0.1.2
  - natural-transformation ==0.4
  - ndjson-conduit ==0.1.0.5
-  - neat-interpolation ==0.5.1.3
+  - neat-interpolation ==0.5.1.4
  - netcode-io ==0.0.3
  - netlib-carray ==0.1
  - netlib-comfort-array ==0.0.0.2
@ -1687,7 +1688,7 @@ default-package-overrides:
  - netwire-input-glfw ==0.0.11
  - network ==3.1.4.0
  - network-bsd ==2.8.1.0
-  - network-byte-order ==0.1.6
+  - network-byte-order ==0.1.7
  - network-conduit-tls ==1.3.2
  - network-info ==0.2.1
  - network-ip ==0.3.0.3
@ -1711,11 +1712,11 @@ default-package-overrides:
  - NoHoed ==0.1.1
  - nonce ==1.0.7
  - nondeterminism ==1.5
-  - non-empty ==0.3.4
+  - non-empty ==0.3.5
  - nonempty-containers ==0.3.4.4
  - nonemptymap ==0.0.6.0
  - non-empty-sequence ==0.2.0.4
-  - nonempty-vector ==0.2.2.0
+  - nonempty-vector ==0.2.3
  - nonempty-zipper ==1.0.0.4
  - non-negative ==0.1.2
  - normaldistribution ==1.1.0.3
@ -1852,8 +1853,8 @@ default-package-overrides:
  - pem ==0.2.4
  - percent-format ==0.0.4
  - perfect-hash-generator ==1.0.0
-  - persistent ==2.14.5.2
-  - persistent-discover ==0.1.0.6
+  - persistent ==2.14.6.0
+  - persistent-discover ==0.1.0.7
  - persistent-documentation ==0.1.0.4
  - persistent-iproute ==0.2.5
  - persistent-lens ==1.0.0
@ -1862,10 +1863,10 @@ default-package-overrides:
  - persistent-mysql ==2.13.1.4
  - persistent-pagination ==0.1.1.2
  - persistent-postgresql ==2.13.6.1
-  - persistent-qq ==2.12.0.5
+  - persistent-qq ==2.12.0.6
  - persistent-redis ==2.13.0.1
  - persistent-refs ==0.4
-  - persistent-sqlite ==2.13.1.1
+  - persistent-sqlite ==2.13.2.0
  - persistent-template ==2.12.0.0
  - persistent-test ==2.13.1.3
  - persistent-typed-db ==0.1.0.7
@ -1908,7 +1909,7 @@ default-package-overrides:
  - poly-arity ==0.1.0
  - polynomials-bernstein ==1.1.2
  - polyparse ==1.13
-  - polysemy ==1.9.1.2
+  - polysemy ==1.9.1.3
  - polysemy-fs ==0.1.0.0
  - polysemy-plugin ==0.4.5.1
  - polysemy-webserver ==0.2.1.2
@ -1955,7 +1956,7 @@ default-package-overrides:
  - primes ==0.2.1.0
  - primitive ==0.8.0.0
  - primitive-addr ==0.1.0.2
-  - primitive-extras ==0.10.1.7
+  - primitive-extras ==0.10.1.8
  - primitive-offset ==0.2.0.0
  - primitive-unaligned ==0.1.1.2
  - primitive-unlifted ==0.1.3.1
@ -1997,7 +1998,7 @@ default-package-overrides:
  - PyF ==0.11.1.1
  - qchas ==1.1.0.1
  - qm-interpolated-string ==0.3.1.0
-  - qrcode-core ==0.9.8
+  - qrcode-core ==0.9.9
  - qrcode-juicypixels ==0.8.5
  - quaalude ==0.0.0.1
  - quadratic-irrational ==0.1.1
@ -2009,7 +2010,7 @@ default-package-overrides:
  - quickcheck-classes-base ==0.6.2.0
  - quickcheck-groups ==0.0.0.0
  - quickcheck-higherorder ==0.1.0.1
-  - quickcheck-instances ==0.3.29.1
+  - quickcheck-instances ==0.3.30
  - quickcheck-io ==0.2.0
  - quickcheck-monoid-subclasses ==0.1.0.0
  - quickcheck-simple ==0.1.1.1
@ -2097,7 +2098,7 @@ default-package-overrides:
  - rel8 ==1.4.1.0
  - relapse ==1.0.0.1
  - reliable-io ==0.0.2
-  - relude ==1.2.0.0
+  - relude ==1.2.1.0
  - renderable ==0.2.0.1
  - replace-attoparsec ==1.5.0.0
  - replace-megaparsec ==1.5.0.1
@ -2136,7 +2137,7 @@ default-package-overrides:
  - rpmbuild-order ==0.4.10
  - rpm-nvr ==0.1.2
  - rp-tree ==0.7.1
-  - rrb-vector ==0.2.0.0
+  - rrb-vector ==0.2.0.1
  - RSA ==2.4.1
  - rss ==3000.2.0.7
  - rss-conduit ==0.6.0.1
@ -2291,7 +2292,7 @@ default-package-overrides:
  - simple-vec3 ==0.6.0.1
  - since ==0.0.0
  - singleton-bool ==0.1.6
-  - singleton-nats ==0.4.6
+  - singleton-nats ==0.4.7
  - singletons ==3.0.2
  - singletons-base ==3.1.1
  - singletons-presburger ==0.7.2.0
@ -2338,7 +2339,7 @@ default-package-overrides:
  - speedy-slice ==0.3.2
  - splice ==0.6.1.1
  - split ==0.2.3.5
-  - splitmix ==0.1.0.4
+  - splitmix ==0.1.0.5
  - splitmix-distributions ==1.0.0
  - split-record ==0.1.1.4
  - Spock ==0.14.0.0
@ -2378,7 +2379,7 @@ default-package-overrides:
  - stm-containers ==1.2.0.2
  - stm-delay ==0.1.1.1
  - stm-extras ==0.1.0.3
-  - stm-hamt ==1.2.0.11
+  - stm-hamt ==1.2.0.13
  - stm-lifted ==2.5.0.0
  - STMonadTrans ==0.4.7
  - stm-split ==0.0.2.1
@ -2387,10 +2388,10 @@ default-package-overrides:
  - storable-endian ==0.2.6.1
  - storable-record ==0.0.7
  - storable-tuple ==0.1
-  - storablevector ==0.2.13.1
-  - store ==0.7.16
-  - store-core ==0.4.4.4
-  - store-streaming ==0.2.0.3
+  - storablevector ==0.2.13.2
+  - store ==0.7.18
+  - store-core ==0.4.4.6
+  - store-streaming ==0.2.0.5
  - stratosphere ==0.60.0
  - Stream ==0.4.7.2
  - streaming ==0.2.4.0
@ -2438,28 +2439,28 @@ default-package-overrides:
  - SVGFonts ==1.8.0.1
  - svg-tree ==0.6.2.4
  - swagger2 ==2.8.7
-  - swish ==0.10.6.0
+  - swish ==0.10.7.0
  - syb ==0.7.2.4
-  - sydtest ==0.15.1.0
+  - sydtest ==0.15.1.1
  - sydtest-aeson ==0.1.0.0
  - sydtest-amqp ==0.1.0.0
  - sydtest-autodocodec ==0.0.0.0
-  - sydtest-discover ==0.0.0.3
+  - sydtest-discover ==0.0.0.4
  - sydtest-hedgehog ==0.4.0.0
  - sydtest-hedis ==0.0.0.0
  - sydtest-mongo ==0.0.0.0
-  - sydtest-persistent ==0.0.0.1
-  - sydtest-persistent-postgresql ==0.2.0.2
-  - sydtest-persistent-sqlite ==0.2.0.2
+  - sydtest-persistent ==0.0.0.2
+  - sydtest-persistent-postgresql ==0.2.0.3
+  - sydtest-persistent-sqlite ==0.2.0.3
  - sydtest-process ==0.0.0.0
  - sydtest-rabbitmq ==0.1.0.0
  - sydtest-servant ==0.2.0.2
  - sydtest-typed-process ==0.0.0.0
-  - sydtest-wai ==0.2.0.0
+  - sydtest-wai ==0.2.0.1
  - sydtest-webdriver ==0.0.0.1
-  - sydtest-webdriver-screenshot ==0.0.0.1
+  - sydtest-webdriver-screenshot ==0.0.0.2
  - sydtest-webdriver-yesod ==0.0.0.1
-  - sydtest-yesod ==0.3.0.1
+  - sydtest-yesod ==0.3.0.2
  - symbol ==0.2.4
  - symengine ==0.1.2.0
  - symmetry-operations-symbols ==0.0.2.1
@ -2552,7 +2553,7 @@ default-package-overrides:
  - text-builder-linear ==0.1.1.1
  - text-conversions ==0.3.1.1
  - text-format ==0.3.2.1
-  - text-icu ==0.8.0.3
+  - text-icu ==0.8.0.4
  - text-latin1 ==0.3.1
  - text-ldap ==0.1.1.14
  - textlocal ==0.1.0.5
@ -2564,7 +2565,7 @@ default-package-overrides:
  - text-rope ==0.2
  - text-short ==0.1.5
  - text-show ==3.10.4
-  - text-show-instances ==3.9.6
+  - text-show-instances ==3.9.7
  - text-zipper ==0.13
  - tfp ==1.0.2
  - tf-random ==0.5
@ -2667,7 +2668,7 @@ default-package-overrides:
  - twitter-types ==0.11.0
  - twitter-types-lens ==0.11.0
  - typecheck-plugin-nat-simple ==0.1.0.9
-  - typed-process ==0.2.11.0
+  - typed-process ==0.2.11.1
  - typed-uuid ==0.2.0.0
  - type-equality ==1
  - type-errors ==0.2.0.2
@ -2748,12 +2749,12 @@ default-package-overrides:
  - utf8-string ==1.0.2
  - utility-ht ==0.0.17
  - uuid ==1.3.15
-  - uuid-types ==1.0.5
+  - uuid-types ==1.0.5.1
  - valida ==1.1.0
  - valida-base ==0.2.0
  - validate-input ==0.5.0.0
  - validationt ==0.3.0
-  - validity ==0.12.0.1
+  - validity ==0.12.0.2
  - validity-aeson ==0.2.0.5
  - validity-bytestring ==0.4.1.1
  - validity-case-insensitive ==0.0.0.0
@ -2771,7 +2772,7 @@ default-package-overrides:
  - vault ==0.3.1.5
  - vcs-ignore ==0.0.2.0
  - vec ==0.5
-  - vector ==0.13.0.0
+  - vector ==0.13.1.0
  - vector-algorithms ==0.9.0.1
  - vector-binary-instances ==0.2.5.2
  - vector-buffer ==0.4.1
@ -2788,7 +2789,7 @@ default-package-overrides:
  - vector-stream ==0.1.0.0
  - vector-th-unbox ==0.2.2
  - verbosity ==0.4.0.0
-  - versions ==6.0.1
+  - versions ==6.0.2
  - vformat ==0.14.1.0
  - vformat-time ==0.1.0.0
  - ViennaRNAParser ==1.3.3
@ -2917,7 +2918,7 @@ default-package-overrides:
  - xxhash-ffi ==0.2.0.0
  - yaml ==0.11.11.2
  - yaml-unscrambler ==0.1.0.17
-  - Yampa ==0.14.4
+  - Yampa ==0.14.5
  - yarn-lock ==0.6.5
  - yeshql-core ==4.2.0.0
  - yesod ==1.6.2.1
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@ -22,7 +22,6 @@ dont-distribute-packages:
 - Advise-me
 - AlgoRhythm
 - AlignmentAlgorithms
- - Allure
 - AndroidViewHierarchyImporter
 - Annotations
 - ApplePush
@ -254,7 +253,6 @@ dont-distribute-packages:
 - LDAPv3
 - LPFP
 - LPPaver
- - LambdaHack
 - LambdaINet
 - LambdaPrettyQuote
 - LambdaShell
@ -1486,9 +1484,11 @@ dont-distribute-packages:
 - ghc-dump-util
 - ghc-imported-from
 - ghc-instances
+ - ghc-lib_9_8_1_20231009
 - ghc-mod
 - ghc-plugs-out
 - ghc-session
+ - ghc_9_8_1
 - ghci-pretty
 - ghcide-bench
 - ghcjs-dom-hello
@ -1498,7 +1498,6 @@ dont-distribute-packages:
 - ght
 - gi-cairo-again
 - gi-ges
- - gi-gsk
 - gi-gstpbutils
 - gi-gtk-declarative-app-simple
 - gi-gtk_4_0_8
@ -1727,8 +1726,6 @@ dont-distribute-packages:
 - gogol-youtube-reporting
 - google-drive
 - google-mail-filters
- - google-maps-geocoding
- - google-static-maps
 - googleplus
 - gore-and-ash-actor
 - gore-and-ash-async
@ -1894,7 +1891,6 @@ dont-distribute-packages:
 - haskell-pdf-presenter
 - haskell-platform-test
 - haskell-reflect
- - haskell-snake
 - haskell-src-exts-observe
 - haskell-token-utils
 - haskell-tools-ast
@ -2035,7 +2031,7 @@ dont-distribute-packages:
 - hesql
 - heterolist
 - hetzner
- - hetzner_0_4_0_1
+ - hetzner_0_5_0_0
 - hevolisa
 - hevolisa-dph
 - hexpat-conduit
@ -2547,6 +2543,7 @@ dont-distribute-packages:
 - liquid-prelude
 - liquid-vector
 - liquidhaskell
+ - liquidhaskell-boot
 - liquidhaskell-cabal-demo
 - list-t-attoparsec
 - list-t-html-parser
@ -3569,7 +3566,6 @@ dont-distribute-packages:
 - shady-gen
 - shady-graphics
 - shake-bindist
- - shake-futhark
 - shake-minify-css
 - shakebook
 - shaker
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@ -1342,4 +1342,24 @@ self: super: builtins.intersectAttrs super {
      gi-webkit2
      gi-webkit2webextension
      ;
+
+  # Makes the mpi-hs package respect the choice of mpi implementation in Nixpkgs.
+  # Also adds required test dependencies for checks to pass
+  mpi-hs =
+    let validMpi = [ "openmpi" "mpich" "mvapich" ];
+        mpiImpl = pkgs.mpi.pname;
+        disableUnused = with builtins; map disableCabalFlag (filter (n: n != mpiImpl) validMpi);
+     in lib.pipe
+          (super.mpi-hs_0_7_3_0.override { ompi = pkgs.mpi; })
+          ( [ (addTestToolDepends [ pkgs.openssh pkgs.mpiCheckPhaseHook ]) ]
+            ++ disableUnused
+            ++ lib.optional (builtins.elem mpiImpl validMpi) (enableCabalFlag mpiImpl)
+          );
+  inherit (lib.mapAttrs (_: addTestToolDepends
+    [ pkgs.openssh pkgs.mpiCheckPhaseHook ]
+    ) super)
+    mpi-hs-store
+    mpi-hs-cereal
+    mpi-hs-binary
+    ;
 }
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@ -625,4 +625,18 @@ in package-set { inherit pkgs lib callPackage; } self // {
        else pkg
      ) { };

+    /*
+      Modify given Haskell package to force GHC to employ the LLVM
+      codegen backend when compiling. Useful when working around bugs
+      in a native codegen backend GHC defaults to.
+
+      Example:
+        forceLlvmCodegenBackend tls
+
+      Type: drv -> drv
+    */
+    forceLlvmCodegenBackend = haskellLib.overrideCabal (drv: {
+      configureFlags = drv.configureFlags or [ ] ++ [ "--ghc-option=-fllvm" ];
+      buildTools = drv.buildTools or [ ] ++ [ self.llvmPackages.llvm ];
+    });
  }
--- a/pkgs/development/haskell-modules/non-hackage-packages.nix
+++ b/pkgs/development/haskell-modules/non-hackage-packages.nix
@ -7,6 +7,8 @@
 # files.
 self: super: {

+  changelog-d = self.callPackage ../misc/haskell/changelog-d {};
+
  dconf2nix = self.callPackage ../tools/haskell/dconf2nix/dconf2nix.nix { };

  # Used by maintainers/scripts/regenerate-hackage-packages.sh, and generated
@ -36,4 +38,5 @@ self: super: {
  # Unofficial fork until PRs are merged https://github.com/pcapriotti/optparse-applicative/pulls/roberth
  # cabal2nix --maintainer roberth https://github.com/hercules-ci/optparse-applicative.git > pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix
  hercules-ci-optparse-applicative = self.callPackage ../misc/haskell/hercules-ci-optparse-applicative.nix {};
+
 }
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@ -49,19 +49,21 @@
 , audiofile
 , libiconv
 , withStatic ? false
+# passthru.tests
+, testers
 }:

 # NOTE: When editing this expression see if the same change applies to
 # SDL expression too

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "SDL2";
  version = "2.28.3";

  src = fetchFromGitHub {
    owner = "libsdl-org";
    repo = "SDL";
-    rev = "release-${version}";
+    rev = "release-${finalAttrs.version}";
    hash = "sha256-/kQ2IyvAfmZ+zIUt1WuEIeX0nYPGXDlAQk2qDsQnFFs=";
  };
  dontDisableStatic = if withStatic then 1 else 0;
@ -96,7 +98,7 @@ stdenv.mkDerivation rec {
    ++ lib.optionals x11Support [ libX11 ];

  propagatedBuildInputs = lib.optionals x11Support [ xorgproto ]
-    ++ dlopenPropagatedBuildInputs;
+    ++ finalAttrs.dlopenPropagatedBuildInputs;

  dlopenBuildInputs = lib.optionals alsaSupport [ alsa-lib audiofile ]
    ++ lib.optional dbusSupport dbus
@ -109,7 +111,7 @@ stdenv.mkDerivation rec {
    ++ lib.optionals drmSupport [ libdrm mesa ];

  buildInputs = [ libiconv ]
-    ++ dlopenBuildInputs
+    ++ finalAttrs.dlopenBuildInputs
    ++ lib.optional ibusSupport ibus
    ++ lib.optionals waylandSupport [ wayland-protocols ]
    ++ lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ];
@ -156,7 +158,7 @@ stdenv.mkDerivation rec {
  # list the symbols used in this way.
  postFixup =
    let
-      rpath = lib.makeLibraryPath (dlopenPropagatedBuildInputs ++ dlopenBuildInputs);
+      rpath = lib.makeLibraryPath (finalAttrs.dlopenPropagatedBuildInputs ++ finalAttrs.dlopenBuildInputs);
    in
    lib.optionalString (stdenv.hostPlatform.extensions.sharedLibrary == ".so") ''
      for lib in $out/lib/*.so* ; do
@ -171,6 +173,9 @@ stdenv.mkDerivation rec {
  passthru = {
    inherit openglSupport;
    updateScript = nix-update-script { extraArgs = ["--version-regex" "release-(.*)"]; };
+    tests.pkg-config = testers.hasPkgConfigModules {
+      package = finalAttrs.finalPackage;
+    };
  };

  meta = with lib; {
@ -180,5 +185,6 @@ stdenv.mkDerivation rec {
    license = licenses.zlib;
    platforms = platforms.all;
    maintainers = with maintainers; [ cpages ];
+    pkgConfigModules = [ "sdl2" ];
  };
-}
+})
--- a/pkgs/development/libraries/SDL2_gfx/default.nix
+++ b/pkgs/development/libraries/SDL2_gfx/default.nix
@ -1,11 +1,11 @@
-{ lib, stdenv, darwin, fetchurl, pkg-config, SDL2 }:
+{ lib, stdenv, darwin, fetchurl, pkg-config, SDL2, testers }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "SDL2_gfx";
  version = "1.0.4";

  src = fetchurl {
-    url = "http://www.ferzkopp.net/Software/${pname}/${pname}-${version}.tar.gz";
+    url = "http://www.ferzkopp.net/Software/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
    sha256 = "0qk2ax7f7grlxb13ba0ll3zlm8780s7j8fmrhlpxzjgdvldf1q33";
  };

@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
  configureFlags = [(if stdenv.hostPlatform.isx86 then "--enable-mmx" else "--disable-mmx")]
     ++ lib.optional stdenv.isDarwin "--disable-sdltest";

+  passthru.tests.pkg-config = testers.hasPkgConfigModules {
+    package = finalAttrs.finalPackage;
+  };
+
  meta = with lib; {
    description = "SDL graphics drawing primitives and support functions";

@ -42,5 +46,6 @@ stdenv.mkDerivation rec {
    license = licenses.zlib;
    maintainers = with maintainers; [ cpages ];
    platforms = platforms.unix;
+    pkgConfigModules = [ "SDL2_gfx" ];
  };
-}
+})
--- a/pkgs/development/libraries/SDL2_ttf/default.nix
+++ b/pkgs/development/libraries/SDL2_ttf/default.nix
@ -1,11 +1,11 @@
-{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, harfbuzz, libGL }:
+{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, harfbuzz, libGL, testers }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "SDL2_ttf";
  version = "2.20.2";

  src = fetchurl {
-    url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz";
+    url = "https://www.libsdl.org/projects/SDL_ttf/release/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
    sha256 = "sha256-ncce2TSHUhsQeixKnKa/Q/ti9r3dXCawVea5FBiiIFM=";
  };

@ -18,10 +18,15 @@ stdenv.mkDerivation rec {
    ++ lib.optional (!stdenv.isDarwin) libGL
    ++ lib.optional stdenv.isDarwin darwin.libobjc;

+  passthru.tests.pkg-config = testers.hasPkgConfigModules {
+    package = finalAttrs.finalPackage;
+  };
+
  meta = with lib; {
    description = "Support for TrueType (.ttf) font files with Simple Directmedia Layer";
    platforms = platforms.unix;
    license = licenses.zlib;
    homepage = "https://github.com/libsdl-org/SDL_ttf";
+    pkgConfigModules = [ "SDL2_ttf" ];
  };
-}
+})
--- a/pkgs/development/libraries/agda/1lab/default.nix
+++ b/pkgs/development/libraries/agda/1lab/default.nix
@ -2,14 +2,13 @@

 mkDerivation rec {
  pname = "1lab";
-  version = "unstable-2023-03-07";
+  version = "unstable-2023-10-11";

  src = fetchFromGitHub {
    owner = "plt-amy";
    repo = pname;
-    # Last commit that compiles with Agda 2.6.3
-    rev = "c6ee57a2da327def241324b4775ec2c67cdab2af";
-    hash = "sha256-zDqFaDZxAdFxYM6l2zc7ZTi4XwMThw1AQwHfvhOxzdg=";
+    rev = "c6e0c3c714486fd6c89ace31443428ba48871685";
+    hash = "sha256-PC75NtT0e99HVyFedox+6xz/CY2zP2g4Vzqruj5Bjhc=";
  };

  # We don't need anything in support; avoid installing LICENSE.agda
--- a/pkgs/development/libraries/agda/agda-categories/default.nix
+++ b/pkgs/development/libraries/agda/agda-categories/default.nix
@ -1,14 +1,14 @@
 { lib, mkDerivation, fetchFromGitHub, standard-library }:

 mkDerivation rec {
-  version = "0.1.7.1a";
+  version = "0.1.7.2";
  pname = "agda-categories";

  src = fetchFromGitHub {
    owner = "agda";
    repo = "agda-categories";
    rev = "v${version}";
-    sha256 = "sha256-VlxRDxXg+unzYlACUU58JQUHXxtg0fI5dEQvlBRxJtU=";
+    sha256 = "sha256-lQzAfPqkdb0pG5seYVODPngSLrJxhbH1jf0K6qqoj3c=";
  };

  postPatch = ''
--- a/pkgs/development/libraries/agda/agda-prelude/default.nix
+++ b/pkgs/development/libraries/agda/agda-prelude/default.nix
@ -1,14 +1,14 @@
 { lib, mkDerivation, fetchFromGitHub }:

 mkDerivation rec {
-  version = "unstable-2022-01-14";
+  version = "unstable-2023-10-04";
  pname = "agda-prelude";

  src = fetchFromGitHub {
    owner = "UlfNorell";
    repo = "agda-prelude";
-    rev = "3d143d6d0a3f75966602480665623e87233ff93e";
-    hash = "sha256-ILhXDq788vrceMp5mCiQUMrJxeLPtS4yGtvMHMYxzg8=";
+    rev = "ff3b13253612caf0784a06e2d7d0f30be16c32e4";
+    hash = "sha256-A05uDv3fJqKncea9AL6eQa0XAskLZwAIUl1OAOVeP8I=";
  };

  preConfigure = ''
--- a/pkgs/development/libraries/agda/cubical/default.nix
+++ b/pkgs/development/libraries/agda/cubical/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "cubical";
-  version = "0.5";
+  version = "0.6";

  src = fetchFromGitHub {
    repo = pname;
    owner = "agda";
    rev = "v${version}";
-    hash = "sha256-47GOfZYwvE9TbGzdy/xSYZagTbjs/oeDpwjYUvI7z3k=";
+    hash = "sha256-2quAZ/j7kQaFkh9W5Bj1y7YQj9BT7FwHqVWyj8T4AH8=";
  };

  # The cubical library has several `Everything.agda` files, which are
--- a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
+++ b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
@ -26,5 +26,6 @@ mkDerivation rec {
    license = licenses.bsd3;
    platforms = platforms.unix;
    maintainers = with maintainers; [ ryanorendorff ];
+    broken = true;
  };
 }
--- a/pkgs/development/libraries/agda/standard-library/default.nix
+++ b/pkgs/development/libraries/agda/standard-library/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "standard-library";
-  version = "1.7.2";
+  version = "1.7.3";

  src = fetchFromGitHub {
    repo = "agda-stdlib";
    owner = "agda";
    rev = "v${version}";
-    hash = "sha256-vvbyfC5+Yyx18IDikSbAAcTHHtU6krlz45Fd2YlwsBg=";
+    hash = "sha256-vtL6VPvTXhl/mepulUm8SYyTjnGsqno4RHDmTIy22Xg=";
  };

  nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ];
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@ -30,14 +30,15 @@
 , gtk4
 , mapnik
 , qt5
+, testers
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "harfbuzz${lib.optionalString withIcu "-icu"}";
  version = "7.3.0";

  src = fetchurl {
-    url = "https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz";
+    url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz";
    hash = "sha256-IHcHiXSaybqEbfM5g9vaItuDbHDZ9dBQy5qlNHCUqPs=";
  };

@ -103,6 +104,9 @@ stdenv.mkDerivation rec {
  passthru.tests = {
    inherit gimp gtk3 gtk4 mapnik;
    inherit (qt5) qtbase;
+    pkg-config = testers.hasPkgConfigModules {
+      package = finalAttrs.finalPackage;
+    };
  };

  meta = with lib; {
@ -112,5 +116,10 @@ stdenv.mkDerivation rec {
    maintainers = [ maintainers.eelco ];
    license = licenses.mit;
    platforms = platforms.unix;
+    pkgConfigModules = [
+      "harfbuzz"
+      "harfbuzz-gobject"
+      "harfbuzz-subset"
+    ];
  };
-}
+})
--- a/pkgs/development/misc/haskell/changelog-d/changelog-d.nix
+++ b/pkgs/development/misc/haskell/changelog-d/changelog-d.nix
@ -0,0 +1,30 @@
+{ mkDerivation, base, bytestring, cabal-install-parsers
+, Cabal-syntax, containers, directory, fetchgit, filepath
+, generic-lens-lite, lib, mtl, optparse-applicative, parsec, pretty
+, regex-applicative
+}:
+mkDerivation {
+  pname = "changelog-d";
+  version = "0.1";
+  src = fetchgit {
+    url = "https://codeberg.org/fgaz/changelog-d";
+    sha256 = "0r0gr3bl88am9jivic3i8lfi9l5v1dj7xx4fvw6hhy3wdx7z50z7";
+    rev = "2816ddb78cec8b7fa4462c25028437ebfe3ad314";
+    fetchSubmodules = true;
+  };
+  isLibrary = false;
+  isExecutable = true;
+  libraryHaskellDepends = [
+    base bytestring cabal-install-parsers Cabal-syntax containers
+    directory filepath generic-lens-lite mtl parsec pretty
+    regex-applicative
+  ];
+  executableHaskellDepends = [
+    base bytestring Cabal-syntax directory filepath
+    optparse-applicative
+  ];
+  doHaddock = false;
+  description = "Concatenate changelog entries into a single one";
+  license = lib.licenses.gpl3Plus;
+  mainProgram = "changelog-d";
+}
--- a/pkgs/development/misc/haskell/changelog-d/default.nix
+++ b/pkgs/development/misc/haskell/changelog-d/default.nix
@ -0,0 +1,51 @@
+{ callPackage
+, lib
+, pkgs
+}:
+
+(callPackage ./changelog-d.nix { }).overrideAttrs (finalAttrs: oldAttrs: {
+
+  version = oldAttrs.version + "-git-${lib.strings.substring 0 7 oldAttrs.src.rev}";
+
+  passthru.updateScript = lib.getExe (pkgs.writeShellApplication {
+    name = "update-changelog-d";
+    runtimeInputs = [
+      pkgs.cabal2nix
+    ];
+    text = ''
+      cd pkgs/development/misc/haskell/changelog-d
+      cabal2nix https://codeberg.org/fgaz/changelog-d >changelog-d.nix
+    '';
+  });
+  passthru.tests = {
+    basic = pkgs.runCommand "changelog-d-basic-test" {
+        nativeBuildInputs = [ finalAttrs.finalPackage ];
+      } ''
+        mkdir changelogs
+        cat > changelogs/config <<EOF
+        organization: NixOS
+        repository: boondoggle
+        EOF
+        cat > changelogs/a <<EOF
+        synopsis: Support numbers with incrementing base-10 digits
+        issues: #1234
+        description: {
+        This didn't work before.
+        }
+        EOF
+        changelog-d changelogs >$out
+        cat -n $out
+        echo Checking the generated output
+        set -x
+        grep -F 'Support numbers with incrementing base-10 digits' $out >/dev/null
+        grep -F 'https://github.com/NixOS/boondoggle/issues/1234' $out >/dev/null
+        set +x
+      '';
+  };
+
+  meta = oldAttrs.meta // {
+    homepage = "https://codeberg.org/fgaz/changelog-d";
+    maintainers = [ lib.maintainers.roberth ];
+  };
+
+})
--- a/pkgs/development/tools/haskell/hadrian/ghc-platform.nix
+++ b/pkgs/development/tools/haskell/hadrian/ghc-platform.nix
@ -0,0 +1,16 @@
+{ mkDerivation, base, lib
+  # GHC source tree to build ghc-toolchain from
+, ghcSrc
+, ghcVersion
+}:
+mkDerivation {
+  pname = "ghc-platform";
+  version = ghcVersion;
+  src = ghcSrc;
+  postUnpack = ''
+    sourceRoot="$sourceRoot/libraries/ghc-platform"
+  '';
+  libraryHaskellDepends = [ base ];
+  description = "Platform information used by GHC and friends";
+  license = lib.licenses.bsd3;
+}
--- a/pkgs/development/tools/haskell/hadrian/ghc-toolchain.nix
+++ b/pkgs/development/tools/haskell/hadrian/ghc-toolchain.nix
@ -0,0 +1,19 @@
+{ mkDerivation, base, directory, filepath, ghc-platform, lib
+, process, text, transformers
+  # GHC source tree to build ghc-toolchain from
+, ghcVersion
+, ghcSrc
+}:
+mkDerivation {
+  pname = "ghc-toolchain";
+  version = ghcVersion;
+  src = ghcSrc;
+  postUnpack = ''
+    sourceRoot="$sourceRoot/utils/ghc-toolchain"
+  '';
+  libraryHaskellDepends = [
+    base directory filepath ghc-platform process text transformers
+  ];
+  description = "Utility for managing GHC target toolchains";
+  license = lib.licenses.bsd3;
+}
--- a/pkgs/development/tools/haskell/hadrian/hadrian.nix
+++ b/pkgs/development/tools/haskell/hadrian/hadrian.nix
@ -1,20 +1,19 @@
-{ # GHC source tree to build hadrian from
-  ghcSrc ? null, ghcVersion ? null
-, mkDerivation, base, bytestring, Cabal, containers, directory
+# See also ./make-hadria.nix
+{ mkDerivation, base, bytestring, Cabal, containers, directory
 , extra, filepath, lib, mtl, parsec, shake, text, transformers
 , unordered-containers, cryptohash-sha256, base16-bytestring
-, userSettings ? null
-# Whether to pass --hyperlinked-source to haddock or not. This is a custom
-# workaround as we wait for this to be configurable via userSettings or similar.
-# https://gitlab.haskell.org/ghc/ghc/-/issues/23625
-, enableHyperlinkedSource ? true
 , writeText
+  # Dependencies that are not on Hackage and only used in certain Hadrian versions
+, ghc-platform ? null
+, ghc-toolchain ? null
+  # GHC source tree to build hadrian from
+, ghcSrc
+, ghcVersion
+  # Customization
+, userSettings ? null
+, enableHyperlinkedSource
 }:

-if ghcSrc == null || ghcVersion == null
-then throw "hadrian: need to specify ghcSrc and ghcVersion arguments manually"
-else
-
 mkDerivation {
  pname = "hadrian";
  version = ghcVersion;
@ -44,7 +43,13 @@ mkDerivation {
    parsec shake text transformers unordered-containers
  ] ++ lib.optionals (lib.versionAtLeast ghcVersion "9.7") [
    cryptohash-sha256 base16-bytestring
+  ] ++ lib.optionals (lib.versionAtLeast ghcVersion "9.9") [
+    ghc-platform ghc-toolchain
  ];
+  passthru = {
+    # Expose »private« dependencies if any
+    inherit ghc-platform ghc-toolchain;
+  };
  description = "GHC build system";
  license = lib.licenses.bsd3;
 }
--- a/pkgs/development/tools/haskell/hadrian/make-hadrian.nix
+++ b/pkgs/development/tools/haskell/hadrian/make-hadrian.nix
@ -0,0 +1,59 @@
+# Hadrian is the build system used to (exclusively) build GHC. It can
+# (theoretically) be used starting with GHC 9.4 and is required since 9.6. It is
+# developed in the GHC source tree and specific to the GHC version it is released
+# with, i.e. Hadrian always needs to be built from the same GHC source tree as
+# the GHC we want to build.
+#
+# This fact makes it impossible to integrate Hadrian into our Haskell package
+# sets which are also used to bootstrap GHC, since a package set can bootstrap
+# multiple GHC versions (usually two major versions). A bootstrap set would need
+# knowledge of the GHC it would eventually bootstrap which would make the logic
+# unnecessarily complicated.
+#
+# Luckily Hadrian is, while annoying to bootstrap, relatively simple. Specifically
+# all it requires to build is (relative to the GHC we are trying to build) a
+# build->build GHC and build->build Haskell packages. We can get all of this
+# from bootPkgs which is already passed to the GHC expression.
+#
+# The solution is the following: The GHC expression passes its source tree and
+# version along with some parameters to this function (./make-hadrian.nix)
+# which acts as a common expression builder for all Hadrian version as well as
+# related packages that are managed in the GHC source tree. Its main job is to
+# expose all possible compile time customization in a common interface and
+# take care of all differences between Hadrian versions.
+{ bootPkgs
+, lib
+}:
+
+{ # GHC source tree and version to build hadrian & friends from.
+  # These are passed on to the actual package expressions.
+  ghcSrc
+, ghcVersion
+  # Contents of a non-default UserSettings.hs to use when building hadrian, if any.
+  # Should be a string or null.
+, userSettings ? null
+  # Whether to pass --hyperlinked-source to haddock or not. This is a custom
+  # workaround as we wait for this to be configurable via userSettings or similar.
+  # https://gitlab.haskell.org/ghc/ghc/-/issues/23625
+, enableHyperlinkedSource ? false
+}:
+
+let
+  callPackage' = f: args: bootPkgs.callPackage f ({
+    inherit ghcSrc ghcVersion;
+  } // args);
+
+  ghc-platform = callPackage' ./ghc-platform.nix { };
+  ghc-toolchain = callPackage' ./ghc-toolchain.nix {
+    inherit ghc-platform;
+  };
+in
+
+callPackage' ./hadrian.nix ({
+  inherit userSettings enableHyperlinkedSource;
+} // lib.optionalAttrs (lib.versionAtLeast ghcVersion "9.9") {
+  # Starting with GHC 9.9 development, additional in tree packages are required
+  # to build hadrian. (Hackage-released conditional dependencies are handled
+  # in ./hadrian.nix without requiring intervention here.)
+  inherit ghc-platform ghc-toolchain;
+})
--- a/pkgs/development/tools/pandoc/default.nix
+++ b/pkgs/development/tools/pandoc/default.nix
@ -33,6 +33,9 @@ in
      remove-references-to \
        -t ${haskellPackages.warp} \
        $out/bin/pandoc
+      remove-references-to \
+        -t ${haskellPackages.pandoc_3_1_8} \
+        $out/bin/pandoc
    '' + lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) ''
      mkdir -p $out/share/bash-completion/completions
      $out/bin/pandoc --bash-completion > $out/share/bash-completion/completions/pandoc
@ -45,5 +48,5 @@ in
    # lead to a transitive runtime dependency on the whole GHC distribution.
    # This should ideally be fixed in haskellPackages (or even Cabal),
    # but a minimal pandoc is important enough to patch it manually.
-    disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.warp ];
+    disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.warp haskellPackages.pandoc_3_1_8 ];
  })
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@ -415,22 +415,15 @@ in {
    };
    ghc98 = compiler.ghc981;
    ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
-      bootPkgs =
-        # For GHC 9.2 no armv7l bindists are available.
-        if stdenv.hostPlatform.isAarch32 then
-          packages.ghc924
-        else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
-          packages.ghc924
-        else
-          packages.ghc924Binary;
+      bootPkgs = packages.ghc963;
      inherit (buildPackages.python3Packages) sphinx;
      # Need to use apple's patched xattr until
      # https://github.com/xattr/xattr/issues/44 and
      # https://github.com/xattr/xattr/issues/55 are solved.
      inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
-      # 2023-01-15: Support range >= 10 && < 15
-      buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_14;
-      llvmPackages = pkgs.llvmPackages_14;
+      # 2023-01-15: Support range >= 11 && < 16
+      buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
+      llvmPackages = pkgs.llvmPackages_15;
    };

    ghcjs = compiler.ghcjs810;
@ -586,7 +579,7 @@ in {
    ghcHEAD = callPackage ../development/haskell-modules {
      buildHaskellPackages = bh.packages.ghcHEAD;
      ghc = bh.compiler.ghcHEAD;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { };
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.10.x.nix { };
    };

    ghcjs = packages.ghcjs810;
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@ -487,7 +487,7 @@ let
      cabal-install = lib.subtractLists [
        compilerNames.ghc981
      ] released;
-      Cabal_3_10_1_0 = lib.subtractLists [
+      Cabal_3_10_2_0 = lib.subtractLists [
        compilerNames.ghc981
      ] released;
      Cabal-syntax_3_10_1_0 = lib.subtractLists [