haskellPackages.duckdb-simple: jailbreak (#528095)

too strict bounds on QuickCheck <2.16

maintainers/scripts/haskell/eval-pkg-sets.sh

@@ -0,0 +1,39 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash
+#!nix-shell -p jq git
+# shellcheck shell=bash
+#
+# Usage: eval-pkg-sets.sh [extra flags for nix-* commands ...]
+#
+# Must be executed in a git checkout of Nixpkgs.
+
+set -euo pipefail
+
+NIXPKGS="$(git rev-parse --show-toplevel)"
+PKGSETS="$(nix-env --readonly-mode --json --drv-path -f "$NIXPKGS" -qaP -A haskell.compiler "$@" \
+  | jq -r 'to_entries | unique_by(.value.drvPath) .[] .key | sub("^haskell.compiler";"haskell.packages")')"
+
+trap 'exit 1' SIGINT SIGTERM
+
+set +e
+
+badsets=""
+for set in $PKGSETS; do
+  # Confirm an equivalent package set to haskell.compiler.$entry exists and is usable
+  if ! nix-instantiate --readonly-mode -A "$set.ghc" "$@" > /dev/null 2>&1; then
+    echo "Skipping $set... ($set.ghc does not evaluate)"
+  else
+    echo "Evaluating $set..."
+
+    if ! nix-env --readonly-mode -f "$NIXPKGS" -qaP --drv-path -A "$set" "$@" > /dev/null; then
+      badsets+="$set "
+    fi
+  fi
+done
+
+if [ -n "$badsets" ]; then
+  echo "Found potential eval issues in the following sets:" >&2
+  # shellcheck disable=SC2086
+  printf '%s\n' $badsets
+  exit 1
+fi

maintainers/scripts/haskell/update-stackage.sh

@@ -33,7 +33,7 @@ fi
 
 # Stackage solver to use, LTS or Nightly
 # (should be capitalized like the display name)
-SOLVER=LTS
+SOLVER=Nightly
 # Stackage solver verson, if any. Use latest if empty
 VERSION=
 TMP_TEMPLATE=update-stackage.XXXXXXX
@@ -105,6 +105,7 @@ sed -r \
     -e '/ hledger-ui /d' \
     -e '/ hledger-web /d' \
     -e '/ spacecookie /d' \
+    -e '/ hnix-store-core /d' \
     < "${tmpfile_new}" >> $stackage_config
 # Explanations:
 # cabal2nix, distribution-nixpkgs, jailbreak-cabal, language-nix: These are our packages and we know what we are doing.

pkgs/by-name/mk/mkjson/generated.nix

@@ -1,7 +1,7 @@
 {
   mkDerivation,
   lib,
-  fetchFromGitHub,
+  fetchFromCodeberg,
   aeson,
   base,
   bytestring,
@@ -26,7 +26,7 @@
 mkDerivation rec {
   pname = "mkjson";
   version = "0.4.0";
-  src = fetchFromGitHub {
+  src = fetchFromCodeberg {
     owner = "mfussenegger";
     repo = "mkjson";
     rev = "${version}";

pkgs/by-name/mk/mkjson/package.nix

@@ -1,2 +1,19 @@
-{ haskell, haskellPackages }:
-haskell.lib.justStaticExecutables (haskellPackages.callPackage ./generated.nix { })
+{
+  haskell,
+  haskellPackages,
+  lib,
+}:
+let
+  inherit (haskell.lib.compose) justStaticExecutables overrideCabal;
+
+  # The mkjson-doctest suite depends on specific RNG results not provided by the
+  # GHC in Nixpkgs as of this writing.
+  overrides = {
+    testTargets = [ "mkjson-test" ];
+  };
+  raw-pkg = haskellPackages.callPackage ./generated.nix { };
+in
+lib.pipe raw-pkg [
+  (overrideCabal overrides)
+  justStaticExecutables
+]

pkgs/data/misc/hackage/pin.json

@@ -1,6 +1,6 @@
 {
-  "commit": "3a3b69bdd8114e4503dc8cb9909a3b0ea32e6be6",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3a3b69bdd8114e4503dc8cb9909a3b0ea32e6be6.tar.gz",
-  "sha256": "1qjd5gp9d4r4y6qjf52m7w9dzy9nq622aqv72ma8d4xlrxrrachp",
-  "msg": "Update from Hackage at 2026-04-24T19:35:23Z"
+  "commit": "41e49d63ab2d2faba2408df6de30fc5aee663d79",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/41e49d63ab2d2faba2408df6de30fc5aee663d79.tar.gz",
+  "sha256": "1iyd3ldbv8474vcpps9nzfkj98ksvql5xrsxkdfrl0fisg2ah9pf",
+  "msg": "Update from Hackage at 2026-05-28T09:17:22Z"
 }

pkgs/development/compilers/ghc/common-hadrian.nix

@@ -855,16 +855,6 @@ stdenv.mkDerivation (
     preInstall = ''
       pushd _build/bindist/*
 
-    ''
-    # the bindist configure script uses different env variables than the GHC configure script
-    # see https://github.com/NixOS/nixpkgs/issues/267250 krank:ignore-line
-    # https://gitlab.haskell.org/ghc/ghc/-/issues/24211  krank:ignore-line
-    + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
-      export InstallNameToolCmd=$INSTALL_NAME_TOOL
-      export OtoolCmd=$OTOOL
-    ''
-    # Replicate configurePhase
-    + ''
       $configureScript "''${configureFlags[@]}"
     '';
 

pkgs/development/compilers/ghc/head.nix

@@ -1,5 +1,5 @@
 import ./common-hadrian.nix {
-  version = "9.15.20260322";
-  rev = "44f118f09dcde49f64d03e427312df4732f2d4a4";
-  sha256 = "sha256-xby7HKyK5P1Y5DjKbVe62piDCY4Ujb4pbv8AJ7sQ0HI=";
+  version = "10.1.20260513";
+  rev = "38b76b2f1d918f10d2f9d3e57bd0459dfe671d4f";
+  sha256 = "sha256-b0AZsWVmGi6EaWEtPWPOQAxvTlxG2aBwegw5l5HBPDo=";
 }

pkgs/development/haskell-modules/configuration-common.nix

@@ -287,6 +287,9 @@ with haskellLib;
   }) (doJailbreak super.language-haskell-extract);
 
   vector = overrideCabal (old: {
+    # 2026-05-16: allow QuickCheck 2.16
+    # https://github.com/haskell/vector/issues/562
+    jailbreak = true;
     # vector-doctest seems to be broken when executed via ./Setup test
     testTargets = [
       "vector-tests-O0"
@@ -345,15 +348,6 @@ with haskellLib;
     '';
   }) super.streamly-core;
 
-  # Work around tasty >= 1.5.4 parallelism breaking the test suite
-  criterion = appendPatches [
-    (pkgs.fetchpatch {
-      name = "criterion-tasty-1.5.4.patch";
-      url = "https://github.com/haskell/criterion/commit/d555422d1779434432489efbc19d75011226c3e6.patch";
-      hash = "sha256-VRSfdzT/mzdRSMQmmIeycuChvRN/VDhYsHJQb0bRMaA=";
-    })
-  ] super.criterion;
-
   # Avoid rebinding to the same port with tasty >= 1.5.4 parallelism
   # https://github.com/lpeterse/haskell-socket/pull/73
   socket = appendPatches [
@@ -405,14 +399,6 @@ with haskellLib;
   # There are numerical tests on random data, that may fail occasionally
   lapack = dontCheck super.lapack;
 
-  # fpr-calc test suite depends on random >= 1.3
-  # see https://github.com/IntersectMBO/lsm-tree/issues/797
-  bloomfilter-blocked =
-    lib.warnIf (lib.versionAtLeast self.random.version "1.3")
-      "haskellPackages.bloomfilter-blocked: dontCheck can potentially be removed"
-      dontCheck
-      super.bloomfilter-blocked;
-
   # Missing files necessary for test suite compilation
   # https://github.com/brandonchinn178/kdl-hs/issues/33
   kdl-hs = dontCheck super.kdl-hs;
@@ -459,13 +445,9 @@ with haskellLib;
   # https://github.com/sol/ghc-bench/issues/81
   ghc-bench = dontCheck super.ghc-bench;
 
-  # Needs QuickCheck >= 2.16
-  # https://github.com/input-output-hk/io-sim/issues/248
-  io-sim = dontCheck super.io-sim;
-
-  # Test suites broken by hakyll 4.16, but lib is still okay
-  # https://github.com/LaurentRDC/hakyll-images/issues/14
-  hakyll-images = dontCheck super.hakyll-images;
+  # Too strict upper bound on hakyll (<4.17)
+  # https://gitlab.com/lysxia/hakyll-alectryon/-/work_items/2
+  hakyll-alectryon = doJailbreak super.hakyll-alectryon;
 
   # 2024-06-23: Hourglass is archived and had its last commit 6 years ago.
   # Patch is needed to add support for time 1.10, which is only used in the tests
@@ -516,9 +498,12 @@ with haskellLib;
   # 2025-02-14: Too strict bounds on attoparsec < 0.14
   attoparsec-varword = doJailbreak (dontCheck super.attoparsec-varword);
 
-  # Fix t_iter test which fails randomly, but frequently. No upstream feedback so far.
-  # https://github.com/haskell/attoparsec/issues/232
   attoparsec = overrideCabal (drv: {
+    # 2025-05-17: allow QuickCheck 2.16
+    # https://github.com/haskell/attoparsec/issues/236
+    jailbreak = true;
+    # Fix t_iter test which fails randomly, but frequently. No upstream feedback so far.
+    # https://github.com/haskell/attoparsec/issues/232
     testFlags = drv.testFlags or [ ] ++ [
       "-p"
       "$0!=\"tests.buf.t_iter\""
@@ -704,13 +689,6 @@ with haskellLib;
           --replace-fail 'InstallDesktopFile $(PREFIX)/bin/git-annex' \
                          'InstallDesktopFile git-annex'
       '';
-
-      # Work around race condition in test suite exposed by tasty-1.5.4
-      # TODO(@sternenseemann): make testFlags arg usable with git-annex
-      preCheck = ''
-        ${drv.preCheck or ""}
-        appendToVar checkFlags -j1
-      '';
     }))
   ];
 
@@ -776,13 +754,6 @@ with haskellLib;
     })
   ] super.turtle;
 
-  # Allow inspection-testing >= 0.6 in test suite
-  algebraic-graphs = appendPatch (pkgs.fetchpatch2 {
-    name = "algebraic-graphs-0.7-allow-inspection-testing-0.6.patch";
-    url = "https://github.com/snowleopard/alga/commit/d4e43fb42db05413459fb2df493361d5a666588a.patch";
-    hash = "sha256-feGEuALVJ0Zl8zJPIfgEFry9eH/MxA0Aw7zlDq0PC/s=";
-  }) super.algebraic-graphs;
-
   inspection-testing = overrideCabal (drv: {
     broken =
       with pkgs.stdenv.hostPlatform;
@@ -868,12 +839,6 @@ with haskellLib;
   xmlgen = dontCheck super.xmlgen;
   wai-cors = dontCheck super.wai-cors;
 
-  # Needs QuickCheck >= 2.16, but Stackage is currently on 2.15
-  integer-logarithms =
-    lib.warnIf (lib.versionAtLeast super.QuickCheck.version "2.16")
-      "override for haskellPackages.integer-logarithms may no longer be needed"
-      (dontCheck super.integer-logarithms);
-
   # Apply patch fixing an incorrect QuickCheck property which occasionally causes false negatives
   # https://github.com/Philonous/xml-picklers/issues/5
   xml-picklers = appendPatch (pkgs.fetchpatch {
@@ -885,36 +850,10 @@ with haskellLib;
   pandoc-crossref = lib.pipe super.pandoc-crossref [
     # https://github.com/lierdakil/pandoc-crossref/issues/492
     doJailbreak
-    # We are still using pandoc == 3.7.*
-    (appendPatch (
-      lib.warnIf (lib.versionAtLeast self.pandoc.version "3.8")
-        "haskellPackages.pandoc-crossref: remove revert of pandoc-3.8 patch"
-        pkgs.fetchpatch
-        {
-          name = "pandoc-crossref-revert-pandoc-3.8-highlight.patch";
-          url = "https://github.com/lierdakil/pandoc-crossref/commit/b0c35a59d5a802f6525407bfeb31699ffd0b4671.patch";
-          hash = "sha256-MIITL9Qr3+1fKf1sTwHzXPcYTt3YC+vr9CpMgqsBXlc=";
-          revert = true;
-        }
-    ))
   ];
 
   pandoc = overrideCabal (drv: {
     patches = drv.patches or [ ] ++ [
-      # Adjust test fixtures for djot >= 0.1.2.3, patch extracted from unrelated change.
-      (pkgs.fetchpatch {
-        name = "pandoc-djot-0.1.2.3.patch";
-        url = "https://github.com/jgm/pandoc/commit/643712ca70b924c0edcc059699aa1ee42234be34.patch";
-        hash = "sha256-khDkb1PzC0fTaWTq3T04UvgoI+XefOJMaTV1d3Du8BU=";
-        includes = [ "test/djot-reader.native" ];
-      })
-      # Adjust tests for skylighting-format-blaze-html >= 0.1.2
-      (pkgs.fetchpatch {
-        name = "pandoc-skylighting-format-blaze-html-0.1.2.patch";
-        url = "https://github.com/jgm/pandoc/commit/cab682ba58f2eb7e940d1af508e196ff6b1c1112.patch";
-        hash = "sha256-lpddKGa8xs+Lhi62HhBgV04fUq2kkippA1xX2/b2ukM=";
-        includes = [ "test/Tests/Writers/HTML.hs" ];
-      })
       # Resolve test suite race condition(s) due to tasty >= 1.5.4 and
       # inDirectory, https://github.com/jgm/pandoc/issues/11566 krank:ignore-line
       (pkgs.fetchpatch {
@@ -1101,9 +1040,6 @@ with haskellLib;
   # This packages compiles 4+ hours on a fast machine. That's just unreasonable.
   CHXHtml = dontDistribute super.CHXHtml;
 
-  # Avoid "QuickCheck >=2.3 && <2.10" dependency we cannot fulfill in lts-11.x.
-  test-framework = dontCheck super.test-framework;
-
   # Test suite won't compile against tasty-hunit 0.10.x.
   binary-parsers = dontCheck super.binary-parsers;
 
@@ -1220,9 +1156,6 @@ with haskellLib;
   # 2025-02-10: Too strict bounds on text < 2.1
   digestive-functors-blaze = doJailbreak super.digestive-functors-blaze;
 
-  # Too strict bound on QuickCheck <2.15
-  hgmp = doJailbreak super.hgmp;
-
   # Z3 removed aliases for boolean types in 4.12
   inherit
     (
@@ -1292,12 +1225,6 @@ with haskellLib;
   # The test suite runs for 20+ minutes on a very fast machine, which feels kinda disproportionate.
   prettyprinter = dontCheck super.prettyprinter;
 
-  hpc-codecov = overrideCabal (drv: {
-    # Work around test suite race condition due to tasty >= 1.5.4
-    # https://github.com/8c6794b6/hpc-codecov/issues/52
-    testFlags = drv.testFlags or [ ] ++ [ "-j1" ];
-  }) super.hpc-codecov;
-
   # sexpr is old, broken and has no issue-tracker. Let's fix it the best we can.
   sexpr = appendPatch ./patches/sexpr-0.2.1.patch (
     overrideCabal (drv: {
@@ -1393,8 +1320,8 @@ with haskellLib;
     '';
   }) (addExtraLibrary self.QuickCheck super.Chart-tests);
 
-  # 2026-01-17: too strict bounds on QuickCheck < 2.15
-  # https://github.com/hasufell/lzma-static/pull/15
+  # 2026-05-18: too strict bounds on QuickCheck < 2.16
+  # https://github.com/hasufell/lzma-static/issues/16
   xz = doJailbreak super.xz;
 
   ghcup =
@@ -1408,10 +1335,6 @@ with haskellLib;
   # Therefore we jailbreak it.
   hakyll-contrib-hyphenation = doJailbreak super.hakyll-contrib-hyphenation;
 
-  # The test suite depends on an impure cabal-install installation in
-  # $HOME, which we don't have in our build sandbox.
-  cabal-install-parsers = dontCheck super.cabal-install-parsers;
-
   # Test suite requires database
   persistent-mysql = dontCheck super.persistent-mysql;
 
@@ -1579,23 +1502,56 @@ with haskellLib;
   # Break infinite recursion via optparse-applicative (alternatively, dontCheck syb)
   prettyprinter-ansi-terminal = dontCheck super.prettyprinter-ansi-terminal;
 
-  # Released version prohibits QuickCheck >= 2.15 at the moment
-  optparse-applicative = appendPatches [
-    (pkgs.fetchpatch2 {
-      name = "optparse-applicative-0.18.1-allow-QuickCheck-2.15.patch";
-      url = "https://github.com/pcapriotti/optparse-applicative/commit/2c2a39ed53e6339d8dc717efeb7d44f4c2b69cab.patch";
-      hash = "sha256-198TfBUR3ygPpvKPvtH69UmbMmoRagmzr9UURPr6Kj4=";
-    })
-  ] super.optparse-applicative;
+  # 2026-05-18: allow QuickCheck 2.16
+  # Already updated upstream, but not released on hackage, yet.
+  finite-typelits = warnAfterVersion "0.2.1.0" (doJailbreak super.finite-typelits);
+
+  # 2026-05-16: allow QuickCheck 2.16
+  # https://github.com/pcapriotti/optparse-applicative/issues/516
+  optparse-applicative = doJailbreak super.optparse-applicative;
+
+  # 2026-05-17: allow QuickCheck 2.16
+  # https://github.com/jaspervdj/psqueues/issues/67
+  psqueues = doJailbreak super.psqueues;
+
+  # 2026-05-17: allow QuickCheck 2.16
+  # https://github.com/fizruk/http-api-data/issues/157
+  http-api-data = doJailbreak super.http-api-data;
+
+  # 2026-05-17: allow QuickCheck 2.16
+  # https://github.com/Gabriella439/Haskell-Nix-Derivation-Library/issues/30
+  nix-derivation = doJailbreak super.nix-derivation;
+
+  # 2026-05-17: allow QuickCheck 2.16
+  # https://github.com/haskell-hvr/uuid/issues/101
+  uuid = doJailbreak super.uuid;
+
+  # 2026-05-17: allow QuickCheck 2.16
+  # https://github.com/haskell/fgl/issues/119
+  fgl = doJailbreak super.fgl;
+
+  # 2026-05-17: allow QuickCheck 2.16
+  # Sent Claude an email on 2026-05-18.
+  bitwise = doJailbreak super.bitwise;
+
+  # 2026-05-17: allow QuickCheck 2.16
+  # https://github.com/haskell-hvr/lzma/issues/45
+  lzma = doJailbreak super.lzma;
+
+  # 2026-05-17: allow QuickCheck 2.16
+  # https://github.com/snowleopard/alga/issues/324
+  algebraic-graphs = doJailbreak super.algebraic-graphs;
+
+  # 2026-05-18: allow QuickCheck 2.16
+  # https://github.com/haskellari/binary-instances/pull/34/changes#r3257818178
+  binary-instances = doJailbreak super.binary-instances;
 
   # chell-quickcheck doesn't work with QuickCheck >= 2.15 with no known fix yet
   # https://github.com/typeclasses/chell/issues/5
   system-filepath = dontCheck super.system-filepath;
   gnuidn = dontCheck super.gnuidn;
 
-  # Tests rely on `Int` being 64-bit: https://github.com/hspec/hspec/issues/431.
-  # Also, we need QuickCheck-2.14.x to build the test suite, which isn't easy in LTS-16.x.
-  # So let's not go there and just disable the tests altogether.
+  # Avoids infinite recursion
   hspec-core = dontCheck super.hspec-core;
 
   update-nix-fetchgit =
@@ -1661,6 +1617,11 @@ with haskellLib;
   # https://github.com/biocad/servant-openapi3/issues/30
   servant-openapi3 = dontCheck super.servant-openapi3;
 
+  # 2026-06-04: strict upper bound on random
+  # https://github.com/haskell-servant/servant-multipart/issues/76
+  # https://github.com/haskell-servant/servant-multipart/pull/77
+  servant-multipart-client = doJailbreak super.servant-multipart-client;
+
   # Disable test cases that were broken by insignificant changes in icu 76
   # https://github.com/haskell/text-icu/issues/108
   text-icu = overrideCabal (drv: {
@@ -1760,6 +1721,11 @@ with haskellLib;
     ];
   }) super.duckdb-ffi;
 
+  # 2026-06-04: too strict bounds on QuickCheck <2.16
+  # https://github.com/Tritlo/duckdb-haskell/pull/13
+  # TODO: remove after PR is merged
+  duckdb-simple = doJailbreak super.duckdb-simple;
+
   spacecookie = overrideCabal (old: {
     buildTools = (old.buildTools or [ ]) ++ [ pkgs.buildPackages.installShellFiles ];
     # let testsuite discover the resulting binary
@@ -1817,9 +1783,10 @@ with haskellLib;
   # https://github.com/obsidiansystems/database-id/issues/1
   database-id-class = doJailbreak super.database-id-class;
 
-  # Allow granite >= 0.4
-  dataframe = lib.pipe super.dataframe [
-    (warnAfterVersion "0.5.0.1")
+  # Too strict version bounds (<0.4) on network-run
+  # https://github.com/abhinav/pinch/pull/72
+  pinch = lib.pipe super.pinch [
+    (warnAfterVersion "0.5.2.0")
     doJailbreak
   ];
 
@@ -1885,29 +1852,47 @@ with haskellLib;
   # https://github.com/minimapletinytools/linear-tests/issues/1
   linear-tests = dontCheck super.linear-tests;
 
-  # 2023-04-09: haskell-ci needs Cabal-syntax 3.10
-  # 2024-03-21: pins specific version of ShellCheck
   # 2025-03-10: jailbreak, https://github.com/haskell-CI/haskell-ci/issues/771
-  haskell-ci = doJailbreak (
-    super.haskell-ci.overrideScope (
-      self: super: {
-        Cabal-syntax = self.Cabal-syntax_3_10_3_0;
-        ShellCheck = self.ShellCheck_0_9_0;
+  haskell-ci = lib.pipe super.haskell-ci [
+    (warnAfterVersion "0.18.1")
+    (overrideSrc {
+      # ATTN: also update cabal-install-parsers version below
+      version = "0.19.20260331-unstable-2026-04-15";
+      src = pkgs.fetchFromGitHub {
+        owner = "haskell-CI";
+        repo = "haskell-ci";
+        rev = "30692865b767dcab15086e63f2f4fd3d3d1fe8a5";
+        hash = "sha256-t1urzATbWwdRWkpCygg2kLZ3i8/0qG9ZOjDsNpnUBt0=";
+      };
+    })
+    (addBuildDepends [ self.tasty-hunit ])
+    # https://github.com/haskell-CI/haskell-ci/issues/819
+    doJailbreak
+    (
+      haskell-ci:
+      haskell-ci.override {
+        ShellCheck = self.ShellCheck_0_10_0;
+        cabal-install-parsers = lib.pipe self.cabal-install-parsers [
+          (warnAfterVersion "0.6.3")
+          (overrideSrc {
+            version = "0.6.4-unstable-2026-04-15";
+            inherit (self.haskell-ci) src;
+          })
+          (overrideCabal {
+            # Too strict bounds on tree-diff, tar
+            # https://github.com/haskell-CI/haskell-ci/issues/807
+            jailbreak = true;
+            postUnpack = ''
+              sourceRoot+="/cabal-install-parsers"
+            '';
+          })
+        ];
       }
     )
-  );
+  ];
 
-  # ShellCheck < 0.10.0 needs to be adjusted for changes in fgl >= 5.8
-  # https://github.com/koalaman/shellcheck/issues/2677
-  ShellCheck_0_9_0 = doJailbreak (
-    appendPatches [
-      (fetchpatch {
-        name = "shellcheck-fgl-5.8.1.1.patch";
-        url = "https://github.com/koalaman/shellcheck/commit/c05380d518056189412e12128a8906b8ca6f6717.patch";
-        sha256 = "0gbx46x1a2sh5mvgpqxlx9xkqcw4wblpbgqdkqccxdzf7vy50xhm";
-      })
-    ] super.ShellCheck_0_9_0
-  );
+  # Allow QuickCheck >= 2.16
+  ShellCheck_0_10_0 = doDistribute (doJailbreak super.ShellCheck_0_10_0);
 
   # Too strict bound on hspec (<2.11)
   utf8-light = doJailbreak super.utf8-light;
@@ -1953,8 +1938,7 @@ with haskellLib;
   hadolint = doJailbreak super.hadolint;
 
   # Too strict bounds on
-  # QuickCheck (<2.15): https://github.com/kapralVV/Unique/issues/12
-  # hashable (<1.5): https://github.com/kapralVV/Unique/issues/11#issuecomment-3088832168
+  # extra <= 1.8
   Unique = doJailbreak super.Unique;
 
   # Too strict bound on tasty-quickcheck (<0.11)
@@ -2149,7 +2133,7 @@ with haskellLib;
   # https://github.com/haskell-works/hw-string-parse/issues/43
   hw-string-parse = doJailbreak super.hw-string-parse;
 
-  # 2025-09-03: allow QuickCheck 2.15
+  # 2026-05-18: allow QuickCheck 2.16
   # https://github.com/haskell-works/hw-prim/issues/150
   hw-prim = lib.pipe super.hw-prim [
     (warnAfterVersion "0.6.3.2")
@@ -2311,17 +2295,6 @@ with haskellLib;
   # https://github.com/phadej/crypt-sha512/issues/13
   crypt-sha512 = dontCheck (doJailbreak super.crypt-sha512);
 
-  # Latest release depends on crypton-connection ==0.3.2 https://github.com/ndmitchell/hoogle/issues/435
-  hoogle = overrideSrc {
-    version = "unstable-2024-07-29";
-    src = pkgs.fetchFromGitHub {
-      owner = "ndmitchell";
-      repo = "hoogle";
-      rev = "8149c93c40a542bf8f098047e1acbc347fc9f4e6";
-      hash = "sha256-k3UdmTq8c+iNF8inKM+oWf/NgJqRgUSFS3YwRKVg8Mw=";
-    };
-  } super.hoogle;
-
   inherit
     (
       let
@@ -2464,22 +2437,6 @@ with haskellLib;
     })
   ] super.heist;
 
-  # 2025-09-03: Disable tests until this is solved:
-  # https://github.com/clash-lang/ghc-typelits-extra/issues/60
-  ghc-typelits-extra = lib.pipe super.ghc-typelits-extra [
-    (warnAfterVersion "0.4.8")
-    dontCheck
-  ];
-
-  # 2025-09-16: 0.5 adds support for GHC 9.12 and doesn't actually seem to contain a
-  # breaking change, so we can upgrade beyond Stackage.
-  # https://github.com/clash-lang/ghc-tcplugins-extra/pull/29#issuecomment-3299008674
-  # https://github.com/clash-lang/ghc-tcplugins-extra/compare/702dda2095c66c4f5148a749c8b7dbcc8a09f5c...v0.5.0
-  ghc-tcplugins-extra = doDistribute self.ghc-tcplugins-extra_0_5;
-  # 2025-09-11: Tests have been fixed in 0.7.12, but it requests ghc-tcplugins-extra >= 0.5
-  # which Stackage LTS won't update to, but we can.
-  ghc-typelits-natnormalise = doDistribute self.ghc-typelits-natnormalise_0_7_12;
-
   # calls ghc in tests
   # https://github.com/brandonchinn178/tasty-autocollect/issues/54
   tasty-autocollect = dontCheck super.tasty-autocollect;
@@ -2498,6 +2455,9 @@ with haskellLib;
           hasql-notifications = unmarkBroken (dontCheck super.hasql-notifications_0_2_2_2);
           hasql-pool = dontCheck super.hasql-pool_1_0_1;
           hasql-transaction = dontCheck super.hasql-transaction_1_1_0_1;
+          insert-ordered-containers = super.insert-ordered-containers_0_2_7;
+          lawful-conversions = super.lawful-conversions_0_1_7;
+          swagger2 = doJailbreak super.swagger2_2_8_10; # jailbreak for QuickCheck 2.16
           text-builder = super.text-builder_0_6_10;
           text-builder-dev = super.text-builder-dev_0_3_10;
         }
@@ -2634,22 +2594,43 @@ with haskellLib;
   # https://github.com/phadej/zinza/pull/28
   zinza = dontCheck super.zinza;
 
-  pdftotext = overrideCabal (drv: {
-    jailbreak = true;
-    postPatch = ''
+  pdftotext =
+    let
+      decodeSourceHutMboxPatch = lib.escapeShellArgs [
+        "${pkgs.perl}/bin/perl"
+        "-MMIME::QuotedPrint=decode_qp"
+        "-0777"
+        "-ne"
+        "print decode_qp($_)"
+      ];
+    in
+    appendPatches [
       # Fixes https://todo.sr.ht/~geyaeb/haskell-pdftotext/6
-      substituteInPlace pdftotext.cabal --replace-quiet c-sources cxx-sources
-
       # Fix cabal ignoring cxx because the cabal format version is too old
-      substituteInPlace pdftotext.cabal --replace-quiet ">=1.10" 2.2
-
       # Fix wrong license name that breaks recent cabal version
-      substituteInPlace pdftotext.cabal --replace-quiet BSD3 BSD-3-Clause
-    ''
-    + (drv.postPatch or "");
-  }) super.pdftotext;
+      (fetchpatch {
+        name = "pdftotext-use-cxx-sources-for-cxx-sources.patch";
+        url = "https://lists.sr.ht/~geyaeb/haskell-pdftotext/patches/69754/mbox";
+        decode = decodeSourceHutMboxPatch;
+        hash = "sha256-5DvNBFlbP0o5Hso+mzKweQAINUUTequPMoOJZfgeIzU=";
+      })
+      # Adapt the executable to range 1.0's Ranges API.
+      (fetchpatch {
+        name = "pdftotext-support-range-1.0-in-the-cli.patch";
+        url = "https://lists.sr.ht/~geyaeb/haskell-pdftotext/patches/69755/mbox";
+        decode = decodeSourceHutMboxPatch;
+        hash = "sha256-hZFMSI8Yyh5QIXMRs9VkBKPPP2IM+cbU2ILcqYc9oIw=";
+      })
+      # Relax stale dependency bounds, replacing jailbreak.
+      (fetchpatch {
+        name = "pdftotext-relax-dependency-bounds.patch";
+        url = "https://lists.sr.ht/~geyaeb/haskell-pdftotext/patches/69756/mbox";
+        decode = decodeSourceHutMboxPatch;
+        hash = "sha256-wYM0SsOk9eZXR+/g+VOkj7okhmy1sEONCLHcrHlV2EI=";
+      })
+    ] super.pdftotext;
 
-  # QuickCheck <2.15
+  # Allow QuickCheck 2.16
   # https://github.com/google/proto-lens/issues/403
   proto-lens-arbitrary = doJailbreak super.proto-lens-arbitrary;
 
@@ -2746,6 +2727,10 @@ with haskellLib;
   # 2025-04-09: jailbreak to allow hedgehog >= 1.5
   hw-int = warnAfterVersion "0.0.2.0" (doJailbreak super.hw-int);
 
+  # 2026-05-17: allow hedgehog 1.6
+  # https://github.com/hedgehogqa/haskell-hedgehog-classes/pull/65
+  hedgehog-classes = doJailbreak super.hedgehog-classes;
+
   # 2025-04-09: jailbreak to allow tasty-quickcheck >= 0.11
   bzlib = warnAfterVersion "0.5.2.0" (doJailbreak super.bzlib);
 
@@ -2777,7 +2762,6 @@ with haskellLib;
       ]
     ) super)
     what4
-    what4_1_7_3
     ;
 
   copilot-theorem = lib.pipe super.copilot-theorem [
@@ -2845,15 +2829,7 @@ with haskellLib;
       (doJailbreak super.monad-bayes);
 
   # 2025-04-13: jailbreak to allow th-abstraction >= 0.7
-  crucible = doJailbreak (
-    super.crucible.override {
-      what4 = self.what4_1_7_3;
-    }
-  );
-
-  crucible-llvm = super.crucible-llvm.override {
-    what4 = self.what4_1_7_3;
-  };
+  crucible = doJailbreak super.crucible;
 
   # Test suite invokes cabal-install in a way incompatible with our generic builder
   # (i.e. tries to re-use the ghc package db / environment from dist-newstyle).
@@ -3002,13 +2978,13 @@ with haskellLib;
     amazonkaSrc = pkgs.fetchFromGitHub {
       owner = "brendanhay";
       repo = "amazonka";
-      rev = "7645bd335f008912b9e5257486f622b674de7afa";
-      sha256 = "sha256-ObamDnJdcLA2BlX9iGIxkaknUeL3Po3madKO4JA/em0=";
+      rev = "c87e5cbb67d8116c8829c9f84db4f8da92734830";
+      sha256 = "sha256-mO9kbooiReW1cdnrG9t4yjAsm/qVQKhEN8CmCiEfJgY=";
     };
     setAmazonkaSourceRoot =
       dir: drv:
       (overrideSrc {
-        version = "2.0-unstable-2025-04-16";
+        version = "2.0-unstable-2026-05-20";
         src = amazonkaSrc + "/${dir}";
       })
         drv;
@@ -3379,9 +3355,14 @@ with haskellLib;
         self.microlens-pro
       ])
     ];
-    amazonka = warnAfterVersion "2.0" (
-      setAmazonkaSourceRoot "lib/amazonka" (doJailbreak super.amazonka)
-    );
+    amazonka = lib.pipe super.amazonka [
+      (setAmazonkaSourceRoot "lib/amazonka")
+      (addBuildDepends [
+        self.tasty
+        self.tasty-hunit
+      ])
+      (warnAfterVersion "2.0")
+    ];
     amazonka-test = warnAfterVersion "2.0" (
       setAmazonkaSourceRoot "lib/amazonka-test" (doJailbreak super.amazonka-test)
     );
@@ -3422,42 +3403,3 @@ with haskellLib;
     ];
   }
 )
-
-# 2026-04-01: IHP packages need hasql >= 1.10 (via hasql-mapping).
-# The scope renames hasql-stack attrs to the 1.10 line and unmarks
-# hasql-mapping, which only builds against hasql >= 1.10 and so stays
-# broken at the top level. dontCheck for tests that need a live
-# PostgreSQL lives in configuration-nix.nix on the versioned attrs.
-// (
-  let
-    ihpHasqlScope = self: super: {
-      hasql = doDistribute super.hasql_1_10_3;
-      hasql-dynamic-statements = doDistribute super.hasql-dynamic-statements_0_5_1;
-      hasql-notifications = doDistribute super.hasql-notifications_0_2_5_0;
-      hasql-pool = doDistribute super.hasql-pool_1_4_2;
-      hasql-transaction = doDistribute super.hasql-transaction_1_2_2;
-      postgresql-binary = doDistribute super.postgresql-binary_0_15_0_1;
-      text-builder = doDistribute super.text-builder_1_0_0_5;
-      hasql-mapping = doDistribute (unmarkBroken super.hasql-mapping);
-      postgresql-simple-postgresql-types = doDistribute (
-        unmarkBroken super.postgresql-simple-postgresql-types
-      );
-    };
-
-    ihpPackages = [
-      "ihp"
-      "ihp-datasync"
-      "ihp-graphql"
-      "ihp-hspec"
-      "ihp-ide"
-      "ihp-job-dashboard"
-      "ihp-migrate"
-      "ihp-pglistener"
-      "ihp-ssc"
-      "ihp-typed-sql"
-    ];
-  in
-  lib.genAttrs ihpPackages (
-    name: haskellLib.doDistribute (haskellLib.unmarkBroken (super.${name}.overrideScope ihpHasqlScope))
-  )
-)

pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix

@@ -37,4 +37,21 @@ self: super: {
   unix = null;
   xhtml = null;
   Win32 = null;
+
+  # core pkgs on later GHCs that we can reasonably provide a stub
+  # or Hackage released version for (though they may not build).
+  Cabal-syntax = self.Cabal-syntax_3_6_0_0;
+  semaphore-compat = self.semaphore-compat_1_0_0;
+  os-string = self.os-string_2_0_10;
+  file-io = self.file-io_0_2_0;
+  # Would need 2.25.*, but let's not bother
+  haddock-api = self.haddock-api_2_29_1;
+  haddock-library = self.haddock-library_1_11_0;
+
+  # core pkgs on later GHCs we can't provide at all
+  system-cxx-std-lib = null;
+  ghc-experimental = null;
+  ghc-internal = null;
+  ghc-platform = null;
+  ghc-toolchain = null;
 }

pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix

@@ -65,6 +65,13 @@ in
   xhtml = null;
   Win32 = null;
 
+  # Become core packages in GHC >= 9.12
+  file-io = doDistribute self.file-io_0_2_0;
+  haddock-api = markBroken self.haddock-api_2_29_1; # no compatible release available
+  haddock-library = doJailbreak (doDistribute self.haddock-library_1_11_0);
+
+  ghc-exactprint = doDistribute self.ghc-exactprint_1_10_0_0;
+
   # “Unfortunately we are unable to support GHC 9.10.”
   apply-refact = dontDistribute (markBroken super.apply-refact);
 
@@ -104,7 +111,7 @@ in
               ];
           in
           {
-            pantry = upgradeCabal ssuper.pantry_0_11_2;
+            pantry = upgradeCabal ssuper.pantry;
             rio-prettyprint = upgradeCabal ssuper.rio-prettyprint;
             hackage-security = upgradeCabal ssuper.hackage-security;
             hpack = upgradeCabal sself.hpack_0_39_1;
@@ -124,10 +131,6 @@ in
   # Jailbreaks
   #
   floskell = doJailbreak super.floskell; # base <4.20
-  # 2025-04-09: filepath <1.5
-  haddock-library =
-    assert super.haddock-library.version == "1.11.0";
-    doJailbreak super.haddock-library;
   tree-sitter = doJailbreak super.tree-sitter; # containers <0.7, filepath <1.5
 
   #

pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix

@@ -73,7 +73,6 @@ with haskellLib;
   #
 
   extensions = doDistribute self.extensions_0_1_1_0;
-  ghc-exactprint = doDistribute self.ghc-exactprint_1_12_0_0;
 
   #
   # Jailbreaks
@@ -87,15 +86,6 @@ with haskellLib;
     '';
   }) super.cpphs;
   cabal-install-parsers = doJailbreak super.cabal-install-parsers; # base, Cabal-syntax, etc.
-  ghc-exactprint_1_12_0_0 = addBuildDepends [
-    # cabal2nix drops conditional block: impl (ghc >= 9.12)
-    self.Diff
-    self.extra
-    self.ghc-paths
-    self.silently
-    self.syb
-    self.HUnit
-  ] super.ghc-exactprint_1_12_0_0;
   timezone-series = doJailbreak super.timezone-series; # time <1.14
   timezone-olson = doJailbreak super.timezone-olson; # time <1.14
   cabal-plan = doJailbreak super.cabal-plan; # base <4.21

pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix

@@ -81,13 +81,7 @@ with haskellLib;
   #
 
   ghc-exactprint = doDistribute self.ghc-exactprint_1_14_0_0;
-  hedgehog = doDistribute self.hedgehog_1_7;
   hie-bios = doDistribute (dontCheck self.hie-bios_0_19_0); # Tests access homeless-shelter.
-  lifted-async = doDistribute self.lifted-async_0_11_0;
-  parallel = doDistribute self.parallel_3_3_0_0;
-  tagged = doDistribute self.tagged_0_8_10;
-  unordered-containers = doDistribute self.unordered-containers_0_2_21;
-  HTTP = doDistribute self.HTTP_4000_5_0;
 
   #
   # Jailbreaks
@@ -147,7 +141,6 @@ with haskellLib;
     self.extra
     self.ghc-paths
     self.silently
-    self.syb
     self.HUnit
   ] super.ghc-exactprint_1_14_0_0;
 

pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix

@@ -58,6 +58,13 @@ self: super: {
   # Becomes a core package in GHC >= 9.10
   os-string = doDistribute self.os-string_2_0_10;
 
+  # Become core packages in GHC >= 9.12
+  haddock-library = doDistribute (doJailbreak self.haddock-library_1_11_0);
+  haddock-api = doDistribute (doJailbreak self.haddock-api_2_27_0);
+
+  # Becomes a core package in GHC >= 9.12, but needs unix >= 2.8
+  file-io = null;
+
   # Become core packages in GHC >= 9.10, no release compatible with GHC < 9.10 is available
   ghc-experimental = null;
   ghc-internal = null;
@@ -138,7 +145,6 @@ self: super: {
   # https://github.com/kowainik/relude/issues/436
   relude = dontCheck super.relude;
 
-  haddock-library = doJailbreak super.haddock-library;
   path = self.path_0_9_5;
 
   haskell-language-server =

pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix

@@ -76,6 +76,11 @@ in
   ghc-toolchain = null;
   ghc-platform = null;
 
+  # Become core packages in GHC >= 9.12
+  file-io = doDistribute self.file-io_0_2_0;
+  haddock-api = doDistribute (doJailbreak self.haddock-api_2_29_1);
+  haddock-library = doJailbreak (doDistribute self.haddock-library_1_11_0);
+
   # Needs base-orphans for GHC < 9.8 / base < 4.19
   some = addBuildDepend self.base-orphans super.some;
 
@@ -208,7 +213,6 @@ in
   ghc-lib = doDistribute self.ghc-lib_9_8_5_20250214;
   ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_5_20250214;
   ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2;
-  haddock-library = doJailbreak super.haddock-library;
   inherit
     (
       let

pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix

@@ -73,6 +73,11 @@ in
   ghc-toolchain = null;
   ghc-platform = null;
 
+  # Become core packages in GHC >= 9.12
+  file-io = doDistribute self.file-io_0_2_0;
+  haddock-api = markBroken self.haddock-api_2_29_1; # no compatible release available
+  haddock-library = doJailbreak (doDistribute self.haddock-library_1_11_0);
+
   #
   # Version upgrades
   #
@@ -106,7 +111,6 @@ in
   # A given major version of ghc-exactprint only supports one version of GHC.
   ghc-exactprint = doDistribute super.ghc-exactprint_1_8_0_0;
 
-  haddock-library = doJailbreak super.haddock-library;
   ghc-lib = doDistribute self.ghc-lib_9_8_5_20250214;
   ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_5_20250214;
   ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2;

pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml

@@ -2408,7 +2408,6 @@ broken-packages:
   - HackMail # failure in job https://hydra.nixos.org/build/233215224 at 2023-09-02
   - hactor # failure in job https://hydra.nixos.org/build/233254977 at 2023-09-02
   - hactors # failure in job https://hydra.nixos.org/build/233218599 at 2023-09-02
-  - haddock-api # failure in job https://hydra.nixos.org/build/233216515 at 2023-09-02
   - haddock-leksah # failure in job https://hydra.nixos.org/build/233206878 at 2023-09-02
   - haddock-test # failure in job https://hydra.nixos.org/build/233246641 at 2023-09-02
   - hadoop-formats # failure in job https://hydra.nixos.org/build/233224647 at 2023-09-02
@@ -2627,7 +2626,6 @@ broken-packages:
   - hasql-explain-tests # failure in job https://hydra.nixos.org/build/233247034 at 2023-09-02
   - hasql-generate # failure in job https://hydra.nixos.org/build/324107360 at 2026-03-15
   - hasql-generic # failure in job https://hydra.nixos.org/build/233204654 at 2023-09-02
-  - hasql-mapping # failure in job https://hydra.nixos.org/build/324107379 at 2026-03-15
   - hasql-migration # failure in job https://hydra.nixos.org/build/295094132 at 2025-04-22
   - hasql-mover # failure in job https://hydra.nixos.org/build/295094128 at 2025-04-22
   - hasql-pipes # failure in job https://hydra.nixos.org/build/295094119 at 2025-04-22
@@ -2772,7 +2770,6 @@ broken-packages:
   - hGelf # failure in job https://hydra.nixos.org/build/233203909 at 2023-09-02
   - hgeometric # failure in job https://hydra.nixos.org/build/233197856 at 2023-09-02
   - hgis # failure in job https://hydra.nixos.org/build/233200418 at 2023-09-02
-  - hgmp # failure in job https://hydra.nixos.org/build/307519217 at 2025-09-19
   - hgom # failure in job https://hydra.nixos.org/build/233255569 at 2023-09-02
   - hgopher # failure in job https://hydra.nixos.org/build/233222066 at 2023-09-02
   - HGraphStorage # failure in job https://hydra.nixos.org/build/233217988 at 2023-09-02
@@ -3295,7 +3292,6 @@ broken-packages:
   - ihaskell-parsec # failure in job https://hydra.nixos.org/build/233244271 at 2023-09-02
   - ihaskell-plot # failure in job https://hydra.nixos.org/build/233255936 at 2023-09-02
   - ihaskell-widgets # failure in job https://hydra.nixos.org/build/265955663 at 2024-07-14
-  - ihp-pglistener # failure in job https://hydra.nixos.org/build/325267877 at 2026-04-12
   - illuminate # failure in job https://hydra.nixos.org/build/233219478 at 2023-09-02
   - image-type # failure in job https://hydra.nixos.org/build/233251466 at 2023-09-02
   - imagemagick # failure in job https://hydra.nixos.org/build/233598237 at 2023-09-02
@@ -4978,7 +4974,6 @@ broken-packages:
   - postgresql-simple-interval # failure in job https://hydra.nixos.org/build/307611243 at 2025-09-19
   - postgresql-simple-named # failure in job https://hydra.nixos.org/build/233202481 at 2023-09-02
   - postgresql-simple-opts # failure in job https://hydra.nixos.org/build/252718901 at 2024-03-16
-  - postgresql-simple-postgresql-types # failure in job https://hydra.nixos.org/build/327522032 at 2026-04-30
   - postgresql-simple-sop # failure in job https://hydra.nixos.org/build/233249757 at 2023-09-02
   - postgresql-simple-url # failure in job https://hydra.nixos.org/build/295096191 at 2025-04-22
   - postgresql-tx # failure in job https://hydra.nixos.org/build/252717914 at 2024-03-16

pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml

@@ -27,9 +27,6 @@
 default-package-overrides:
   - chs-cabal == 0.1.1.2 # matches Cabal 3.12 (GHC 9.10)
   - clash-lib-hedgehog < 1.9 # needs to match clash-lib from Stackage
-  # 2026-01-23: dataframe >= 0.3.3.7 uses random-1.3, which breaks dependency coherence on 25.11, whose default version is random-1.2
-  # TODO: when (likely in 25.x) Stackage bumps random to 1.3, review
-  - dataframe == 0.3.3.6
   # 2025-12-26: Needs to match egison-pattern-src from Stackage LTS
   - egison-pattern-src-th-mode < 0.2.2
   - extensions == 0.1.0.2 # matches Cabal 3.12 (GHC 9.10)
@@ -40,6 +37,7 @@ default-package-overrides:
   - hiedb < 0.8.0
   # 2025-09-13: hnix 0.17.0 doesn't support hnix-store-core >= 0.8
   # https://github.com/haskell-nix/hnix/pull/1112
+  # Note: When removing this, also remove hnix-store-core from maintainers/scripts/haskell/update-stackage.sh
   - hnix-store-core < 0.7
   - hnix-store-remote < 0.7
   # 2025-08-03: need to match stackage version of hosc
@@ -77,6 +75,7 @@ extra-packages:
   - Cabal == 3.14.*
   - Cabal == 3.16.*                     # version required for cabal-install and other packages
   - cabal-add == 0.1                    # 2025-09-09: Only needed for hls 2.11 can be removed once we are past it.
+  - Cabal-syntax == 3.6.*               # required for the GHC 9.0.2 package set
   - Cabal-syntax == 3.10.*
   - Cabal-syntax == 3.12.*
   - Cabal-syntax == 3.14.*
@@ -89,7 +88,7 @@ extra-packages:
   - ghc-exactprint == 1.6.*             # 2023-03-30: needed for GHC == 9.4
   - ghc-exactprint == 1.7.*             # 2025-03-09: needed for GHC == 9.6
   - ghc-exactprint == 1.8.*             # 2024-05-20: needed for GHC == 9.8
-  - ghc-exactprint == 1.9.*             # 2024-08-27: needed for GHC == 9.10
+  - ghc-exactprint == 1.10.*            # 2024-08-27: needed for GHC == 9.10
   - ghc-exactprint == 1.12.*            # 2025-10-15: needed for GHC == 9.12
   - ghc-lib == 9.6.*                    # 2022-02-17: preserve for GHC 9.4
   - ghc-lib == 9.8.*                    # 2025-12-11: preserve for GHC 9.6, 9.8
@@ -100,7 +99,7 @@ extra-packages:
   - ghc-lib-parser-ex == 9.8.*         # 2024-12-26: preserve for GHC 9.6, 9.8
   - ghc-tags == 1.7.*                   # 2023-02-18: preserve for ghc-lib == 9.6.*
   - ghc-tags == 1.8.*                   # 2023-02-18: preserve for ghc-lib == 9.8.*
-  - ghc-typelits-natnormalise < 0.8     # 2025-09-15: Stackage is stuck at 0.7.10
+  - haddock-api == 2.27.*               # 2026-05-22: latest version compatible with GHC 9.4
   - happy == 1.20.*                     # for ghc-lib-parser == 9.6.*
   - hashable < 1.5                      # 2025-07-30: hashable >= 1.5 requires GHC >= 9.6
   - hasql < 1.7                         # 2025-01-19: Needed for building postgrest
@@ -112,18 +111,22 @@ extra-packages:
   - hlint == 3.6.*                      # 2025-04-14: needed for hls with ghc-lib-parser 9.6
   - hlint == 3.8.*                      # 2025-09-21: needed for hls with ghc-lib-parser 9.8
   - hpack == 0.39.1                     # 2026-03-15: to match upstream stack-3.9.3
+  - insert-ordered-containers < 0.3     # 2026-05-25: Needed for building postgrest
   - language-javascript == 0.7.0.0      # required by purescript
+  - lawful-conversions < 0.2            # 2026-05-25: Needed for building postgrest
   - network-run == 0.4.0                # 2024-10-20: for GHC 9.10/network == 3.1.*
   - ormolu == 0.7.2.0                   # 2023-11-13: for ghc-lib-parser 9.6 compat
   - ormolu == 0.7.4.0                   # 2023-09-21: for ghc-lib-parser 9.8 compat
   - path == 0.9.5                       # 2025-09-21: Pin for hls on ghc 9.4
   - postgresql-binary < 0.14            # 2025-01-19: Needed for building postgrest
+  - semaphore-compat == 1.0.*           # 2026-05-27: Match GHC 9.2 / Stackage Nightly
   - shake-cabal < 0.2.2.3               # 2023-07-01: last version to support Cabal 3.6.*
-  - ShellCheck == 0.9.0                 # 2024-03-21: pinned by haskell-ci
+  - ShellCheck == 0.10.0                # 2026-05-30: pinned by haskell-ci
   - simple-get-opt < 0.5                # 2025-05-01: for crux-0.7.2
   - stylish-haskell == 0.14.5.0         # 2025-04-14: needed for hls with ghc-lib 9.6
   - stylish-haskell == 0.14.6.0         # 2025-09-21: needed for hls with ghc-lib 9.8
   - stylish-haskell == 0.15.0.1         # 2025-04-14: needed for hls with ghc-lib 9.10
+  - swagger2 < 2.9                      # 2026-05-25: Needed for building postgrest
   - tar == 0.6.3.0                      # 2025-08-17: last version to not require file-io and directory-ospath-streaming (for GHC < 9.6)
   - text-builder < 1                    # 2025-08-27: Needed for building postgrest
   - text-builder-dev < 0.4              # 2025-08-27: Needed for building postgrest

pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml

@@ -213,6 +213,7 @@ dont-distribute-packages:
  - battleships
  - bayes-stack
  - bbi
+ - bcp47-orphans
  - bdcs
  - bdcs-api
  - beam-th
@@ -280,7 +281,6 @@ dont-distribute-packages:
  - Bitly
  - bitly-cli
  - bitmaps
- - bits-extra
  - bittorrent
  - bla
  - blakesum-demo
@@ -449,6 +449,9 @@ dont-distribute-packages:
  - claferIG
  - claferwiki
  - clash
+ - clash-protocols
+ - clash-protocols-base
+ - clash-vexriscv
  - classify-frog
  - classy-effects
  - classy-effects-th
@@ -593,6 +596,7 @@ dont-distribute-packages:
  - CPBrainfuck
  - cprng-aes
  - cprng-aes-effect
+ - cql
  - cql-io-tinylog
  - cqrs-example
  - cqrs-memory
@@ -650,7 +654,6 @@ dont-distribute-packages:
  - darcswatch
  - darkplaces-demo
  - darkplaces-rcon-util
- - dash-haskell
  - data-basic
  - data-cycle
  - data-default-extra
@@ -665,6 +668,11 @@ dont-distribute-packages:
  - datadog-tracing
  - datafix
  - dataflow
+ - dataframe
+ - dataframe-lazy
+ - dataframe-parquet
+ - dataframe-parquet-th
+ - dataframe-persistent
  - datasets
  - date-conversions
  - dbjava
@@ -690,6 +698,7 @@ dont-distribute-packages:
  - ddci-core
  - dde
  - debug
+ - decidable
  - decimal-arithmetic
  - dedukti
  - DeepArrow
@@ -821,10 +830,12 @@ dont-distribute-packages:
  - EditTimeReport
  - effect-monad
  - effective-aspects-mzv
+ - eigen-hhlo
  - ekg-carbon
  - elasticsearch-interchange
  - electrs-client
  - elerea-examples
+ - eliminators
  - elliptic-curve
  - elsa
  - ema-extra
@@ -853,6 +864,9 @@ dont-distribute-packages:
  - ersatz-viz
  - esotericbot
  - EsounD
+ - esqueleto
+ - esqueleto-compat
+ - esqueleto-postgis
  - esqueleto-streaming
  - estreps
  - Etage-Graph
@@ -892,6 +906,11 @@ dont-distribute-packages:
  - every-bit-counts
  - exact-kantorovich
  - exference
+ - exinst-aeson
+ - exinst-base
+ - exinst-bytes
+ - exinst-cereal
+ - exinst-serialise
  - exist-instances
  - existential
  - expand
@@ -1052,6 +1071,7 @@ dont-distribute-packages:
  - functor
  - functor-combo
  - functor-monad
+ - functor-products
  - funflow
  - funflow-nix
  - funion
@@ -1189,6 +1209,7 @@ dont-distribute-packages:
  - grapefruit-records
  - grapefruit-ui
  - grapefruit-ui-gtk
+ - grapesy-etcd
  - graph-rewriting-cl
  - graph-rewriting-gl
  - graph-rewriting-lambdascope
@@ -1262,7 +1283,6 @@ dont-distribute-packages:
  - hackage2twitter
  - hackmanager
  - haddock
- - haddocset
  - hadoop-tools
  - haggis
  - hails-bin
@@ -1276,6 +1296,7 @@ dont-distribute-packages:
  - halma-gui
  - halma-telegram-bot
  - hamusic
+ - hanalyze
  - hans-pcap
  - happlets-lib-gtk
  - HAppS-Data
@@ -1324,9 +1345,10 @@ dont-distribute-packages:
  - haskell-admin-health
  - haskell-admin-managed-functions
  - haskell-aliyun
+ - haskell-bee-redis
+ - haskell-bee-stm
  - haskell-bitmex-client
  - haskell-debugger
- - haskell-docs
  - haskell-eigen-util
  - haskell-ftp
  - haskell-lsp
@@ -1334,6 +1356,7 @@ dont-distribute-packages:
  - haskell-opentimestamps
  - haskell-opentimestamps-client
  - haskell-pdf-presenter
+ - haskell-pgmq
  - haskell-platform-test
  - haskell-reflect
  - haskell-src-exts-observe
@@ -1381,6 +1404,7 @@ dont-distribute-packages:
  - haskoin-crypto
  - haskoin-protocol
  - haskoin-script
+ - haskoin-wallet
  - haskoon
  - haskoon-httpspec
  - haskoon-salvia
@@ -1399,7 +1423,6 @@ dont-distribute-packages:
  - hasloGUI
  - hasql-postgres
  - hasql-postgres-options
- - hasql-postgresql-types
  - hasql-queue
  - hasql-streams-core
  - hasql-streams-example
@@ -1420,6 +1443,7 @@ dont-distribute-packages:
  - Hayoo
  - hback
  - hbayes
+ - hbayesian
  - hbb
  - hbf
  - hbro
@@ -1435,7 +1459,6 @@ dont-distribute-packages:
  - hdbi-tests
  - hdiff
  - hdirect
- - hdocs
  - hdph
  - heart-app
  - heatitup
@@ -1548,8 +1571,8 @@ dont-distribute-packages:
  - hmeap-utils
  - hmep
  - HMock
- - hMPC
  - hmt-diagrams
+ - hnix-store-db
  - HNM
  - hnormalise
  - hob
@@ -1654,6 +1677,7 @@ dont-distribute-packages:
  - hspec-pg-transact
  - hspec-setup
  - hspec-shouldbe
+ - hspec-webdriver
  - hspecVariant
  - hsprocess
  - hsql-mysql
@@ -1664,6 +1688,7 @@ dont-distribute-packages:
  - hsqml-demo-morris
  - hsqml-morris
  - hsreadability
+ - hsrs
  - hssourceinfo
  - hssqlppp-th
  - hstar
@@ -1708,11 +1733,8 @@ dont-distribute-packages:
  - huzzy
  - hw-all
  - hw-balancedparens
- - hw-bits
  - hw-eliasfano
  - hw-excess
- - hw-int
- - hw-ip
  - hw-json
  - hw-json-demo
  - hw-json-lens
@@ -1721,7 +1743,6 @@ dont-distribute-packages:
  - hw-kafka-avro
  - hw-rankselect
  - hw-simd
- - hw-streams
  - hw-succinct
  - hw-uri
  - hworker-ses
@@ -1760,23 +1781,10 @@ dont-distribute-packages:
  - iException
  - ige-mac-integration
  - igrf
+ - ihaskell-dataframe
  - ihaskell-inline-r
  - ihaskell-rlangqq
  - ihaskell-symtegration
- - ihp
- - ihp-datasync
- - ihp-datasync-typescript
- - ihp-graphql
- - ihp-hspec
- - ihp-ide
- - ihp-job-dashboard
- - ihp-mail
- - ihp-schema-compiler
- - ihp-sitemap
- - ihp-ssc
- - ihp-typed-sql
- - ihp-welcome
- - ihp-zip
  - ihttp
  - imap
  - imbib
@@ -1955,6 +1963,9 @@ dont-distribute-packages:
  - KiCS-debugger
  - KiCS-prophecy
  - kif-parser
+ - kind-integer
+ - kind-rational
+ - kiroku-otel
  - kit
  - kmeans-par
  - kmeans-vector
@@ -2076,6 +2087,7 @@ dont-distribute-packages:
  - list-t-attoparsec
  - list-t-html-parser
  - list-tuple
+ - list-witnesses
  - listenbrainz-client
  - liszt
  - lit
@@ -2274,6 +2286,12 @@ dont-distribute-packages:
  - mongrel2-handler
  - monky
  - Monocle
+ - monoidmap
+ - monoidmap-aeson
+ - monoidmap-examples
+ - monoidmap-hashable
+ - monoidmap-internal
+ - monoidmap-quickcheck
  - monomer
  - monomer-flatpak-example
  - monomer-hagrid
@@ -2362,6 +2380,7 @@ dont-distribute-packages:
  - mysql-simple-typed
  - myTestlll
  - mywatch
+ - n-tuple
  - n2o-web
  - NaCl
  - nakadi-client
@@ -2495,6 +2514,7 @@ dont-distribute-packages:
  - optimal-blocks
  - optimusprime
  - optparse-enum
+ - orbits
  - orchid
  - orchid-demo
  - order-maintenance
@@ -2573,7 +2593,11 @@ dont-distribute-packages:
  - persistent-hssqlppp
  - persistent-iproute
  - persistent-map
+ - persistent-pagination
+ - persistent-postgresql
  - persistent-protobuf
+ - persistent-sql-lifted
+ - persistent-typed-db
  - persona-idp
  - peyotls
  - peyotls-codec
@@ -2633,6 +2657,7 @@ dont-distribute-packages:
  - plugins-auto
  - pms-application-service
  - pms-domain-service
+ - pms-infra-agent-process
  - pms-infra-cmdrun
  - pms-infra-filesystem
  - pms-infra-procspawn
@@ -2684,6 +2709,7 @@ dont-distribute-packages:
  - poseidon
  - poseidon-postgis
  - postgresql-common-persistent
+ - postgresql-migration-persistent
  - postgresql-pure
  - postgresql-simple-ltree
  - postgresql-simple-queue
@@ -2790,7 +2816,10 @@ dont-distribute-packages:
  - queuelike
  - quic-simple
  - quick-process
+ - quickcheck-groups
+ - quickcheck-monoid-subclasses
  - quickcheck-poly
+ - quickcheck-quid
  - quickcheck-regex
  - quickcheck-relaxng
  - quicktest
@@ -2986,6 +3015,7 @@ dont-distribute-packages:
  - rv
  - s-expression
  - S3
+ - safe-coloured-text-layout-gen
  - safe-coupling
  - safe-failure-cme
  - safe-plugins
@@ -3180,6 +3210,9 @@ dont-distribute-packages:
  - SimpleLog
  - SimpleServer
  - simseq
+ - singleton-nats
+ - singletons-base
+ - singletons-default
  - singletons-presburger
  - siphon
  - siren-json
@@ -3552,6 +3585,7 @@ dont-distribute-packages:
  - type-sub-th
  - TypeClass
  - typed-encoding-encoding
+ - typed-fsm
  - typed-streams
  - typedflow
  - TypeIlluminator
@@ -3585,6 +3619,8 @@ dont-distribute-packages:
  - uniqueness-periods-vector-filters
  - uniqueness-periods-vector-general
  - uniqueness-periods-vector-properties
+ - units
+ - units-defs
  - unitym-servant
  - unitym-yesod
  - universal
@@ -3684,6 +3720,7 @@ dont-distribute-packages:
  - waldo
  - warp-grpc
  - warp-quic
+ - warp-s2n-tls
  - warped
  - warpZ-tls
  - WashNGo
@@ -3702,7 +3739,9 @@ dont-distribute-packages:
  - WebBits-multiplate
  - WebCont
  - webcrank-wai
+ - webdriver
  - webdriver-w3c
+ - webdriver-wrapper
  - webify
  - webserver
  - websnap

pkgs/development/haskell-modules/configuration-microhs.nix

@@ -38,6 +38,7 @@ self: super: {
   Cabal-syntax = doDistribute self.Cabal-syntax_3_16_1_0;
   containers = doDistribute self.containers_0_8;
   exceptions = doDistribute self.exceptions_0_10_12;
+  file-io = markBroken self.file-io_0_2_0;
   filepath = doDistribute self.filepath_1_5_5_0;
   ghc-bignum = null;
   ghc-boot = null;
@@ -49,6 +50,8 @@ self: super: {
   ghc-platform = null;
   ghc-prim = null;
   ghci = null;
+  haddock-api = markBroken self.haddock-api_2_29_1; # depends on ghc
+  haddock-library = markBroken self.haddock-library_1_11_0; # depends on ghc
   haskeline = doDistribute self.haskeline_0_8_4_1;
   hpc = markBroken self.hpc_0_7_0_2;
   integer-gmp = markBroken self.integer-gmp_1_1;
@@ -63,7 +66,7 @@ self: super: {
   system-cxx-std-lib = null;
   template-haskell = null;
   terminfo = doDistribute self.terminfo_0_4_1_7;
-  time = doDistribute self.time_1_15;
+  time = doDistribute self.time_1_16;
   transformers = doDistribute self.transformers_0_6_3_0;
   unix = markBroken self.unix_2_8_8_0;
   xhtml = markBroken self.xhtml_3000_4_0_0;

pkgs/development/haskell-modules/configuration-nix.nix

@@ -130,6 +130,10 @@ builtins.intersectAttrs super {
   # Tests access homeless-shelter.
   hie-bios = dontCheck super.hie-bios;
 
+  # The test suite depends on an impure cabal-install installation in
+  # $HOME, which we don't have in our build sandbox.
+  cabal-install-parsers = dontCheck super.cabal-install-parsers;
+
   ###########################################
   ### END HASKELL-LANGUAGE-SERVER SECTION ###
   ###########################################
@@ -1272,6 +1276,8 @@ builtins.intersectAttrs super {
           ln -sf git-annex git-remote-tor-annex
           PATH+=":$PWD"
 
+          checkFlagsArray+=("-J$NIX_BUILD_CORES")
+
           echo checkFlags: $checkFlags ''${checkFlagsArray:+"''${checkFlagsArray[@]}"}
 
           # Doesn't use Cabal's test mechanism
@@ -1661,6 +1667,15 @@ builtins.intersectAttrs super {
     (disableCabalFlag "icu")
   ];
 
+  # Tests spawn ghc with -fplugin and need this package's in-place package db.
+  # The trailing colon keeps GHC's default package db in the package path.
+  # https://hydra.nixos.org/build/329190094
+  ghc-typelits-natnormalise = overrideCabal (drv: {
+    preCheck = (drv.preCheck or "") + ''
+      export NIX_GHC_PACKAGE_PATH_FOR_TEST=$PWD/dist/package.conf.inplace/:$packageConfDir:
+    '';
+  }) super.ghc-typelits-natnormalise;
+
   # based on https://github.com/gibiansky/IHaskell/blob/aafeabef786154d81ab7d9d1882bbcd06fc8c6c4/release.nix
   ihaskell = overrideCabal (drv: {
     # ihaskell's cabal file forces building a shared executable, which we need

pkgs/top-level/all-packages.nix

@@ -3924,14 +3924,13 @@ with pkgs;
 
   haskellPackages = recurseIntoAttrs (
     # Prefer native-bignum to avoid linking issues with gmp;
-    # GHC 9.10 doesn't work too well with iserv-proxy.
     if stdenv.hostPlatform.isStatic then
       haskell.packages.native-bignum.ghc912
     # JS backend can't use gmp
     else if stdenv.hostPlatform.isGhcjs then
-      haskell.packages.native-bignum.ghc910
+      haskell.packages.native-bignum.ghc912
     else
-      haskell.packages.ghc910
+      haskell.packages.ghc912
   );
 
   # haskellPackages.ghc is build->host (it exposes the compiler used to build the
@@ -3945,14 +3944,13 @@ with pkgs;
   ghc =
     targetPackages.haskellPackages.ghc or (
       # Prefer native-bignum to avoid linking issues with gmp;
-      # GHC 9.10 doesn't work too well with iserv-proxy.
       if stdenv.hostPlatform.isStatic then
         haskell.compiler.native-bignum.ghc912
       # JS backend can't use GMP
       else if stdenv.targetPlatform.isGhcjs then
-        haskell.compiler.native-bignum.ghc910
+        haskell.compiler.native-bignum.ghc912
       else
-        haskell.compiler.ghc910
+        haskell.compiler.ghc912
     );
 
   # TODO(@NixOS/haskell): deprecate this alias?

pkgs/top-level/release-haskell.nix

@@ -537,6 +537,18 @@ let
       cabal2nix = released;
       cabal2nix-unstable = released;
       funcmp = released;
+      # haddock-{api,library} are core packages as of GHC >= 9.12
+      haddock-api = [
+        compilerNames.ghc94
+        compilerNames.ghc96
+        # No version compatible with 9.8 nor 9.10 released to Hackage
+      ];
+      haddock-library = [
+        compilerNames.ghc94
+        compilerNames.ghc96
+        compilerNames.ghc98
+        compilerNames.ghc910
+      ];
       haskell-debugger = [
         compilerNames.ghc9141
       ];