haskellPackages: Stackage 23.19 -> 23.21

maintainers/scripts/haskell/mark-broken.sh

@@ -35,19 +35,19 @@ trap "rm ${tmpfile}" 0
 
 echo "Remember that you need to manually run 'maintainers/scripts/haskell/hydra-report.hs get-report' sometime before running this script."
 echo "Generating a list of broken builds and displaying for manual confirmation ..."
-maintainers/scripts/haskell/hydra-report.hs mark-broken-list $mark_broken_list_flags | sort -i > "$tmpfile"
+maintainers/scripts/haskell/hydra-report.hs mark-broken-list $mark_broken_list_flags | LC_ALL=C.UTF-8 sort --ignore-case > "$tmpfile"
 
 $EDITOR "$tmpfile"
 
 tail -n +3 "$broken_config" >> "$tmpfile"
 
 cat > "$broken_config" << EOF
+# These packages don't compile.
 broken-packages:
-  # These packages don't compile.
 EOF
 
 # clear environment here to avoid things like allowing broken builds in
-sort -iu "$tmpfile" >> "$broken_config"
+LC_ALL=C.UTF-8 sort --ignore-case --unique "$tmpfile" >> "$broken_config"
 clear="env -u HOME -u NIXPKGS_CONFIG"
 $clear maintainers/scripts/haskell/regenerate-hackage-packages.sh
 evalline=$(maintainers/scripts/haskell/hydra-report.hs eval-info)

maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh

@@ -20,6 +20,6 @@ cat > $tmpfile << EOF
 dont-distribute-packages:
 EOF
 
-nix-instantiate --eval --option restrict-eval true -I . --strict --json maintainers/scripts/haskell/transitive-broken-packages.nix | jq -r . | LC_ALL=C.UTF-8 sort -i >> $tmpfile
+nix-instantiate --eval --option restrict-eval true -I . --strict --json maintainers/scripts/haskell/transitive-broken-packages.nix | jq -r . | LC_ALL=C.UTF-8 sort --ignore-case >> $tmpfile
 
 mv $tmpfile $config_file

maintainers/scripts/haskell/update-stackage.sh

@@ -46,7 +46,7 @@ sed -r \
     -e '/^with-compiler:/d' \
     -e '/installed$/d' \
     -e '/^$/d' \
-    < "${tmpfile}" | sort --ignore-case >"${tmpfile_new}"
+    < "${tmpfile}" | LC_ALL=C.UTF-8 sort --ignore-case >"${tmpfile_new}"
 
 cat > $stackage_config << EOF
 # Stackage $version

pkgs/data/misc/hackage/pin.json

@@ -1,6 +1,6 @@
 {
-  "commit": "611ebba3fc94becabf6cc6fbe713e4bfad592924",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/611ebba3fc94becabf6cc6fbe713e4bfad592924.tar.gz",
-  "sha256": "1gn3asjrzr6v7lcdg1vyrpv7xv74ldwbz517cvfhh2mxzrawrkmc",
-  "msg": "Update from Hackage at 2025-04-21T04:38:52Z"
+  "commit": "0541f1fcdc25b23b03d1296ea03886da83d12375",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0541f1fcdc25b23b03d1296ea03886da83d12375.tar.gz",
+  "sha256": "04ndjav4zirp0qzf8v3149m92ji092asiiyyrhkc8k4ca8hs8v8q",
+  "msg": "Update from Hackage at 2025-05-05T12:06:43Z"
 }

pkgs/development/compilers/ghc/head.nix

@@ -1,5 +1,5 @@
 import ./common-hadrian.nix {
-  version = "9.13.20250205";
-  rev = "5622a14a7a036ab36e28963a4fba826a5ac798a7";
-  sha256 = "1djhs67gz136xvky7wsv44ic60j7xk4fzabr5why2jh312r4vlr4";
+  version = "9.13.20250428";
+  rev = "22d11fa818fae2c95c494fc0fac1f8cb4c6e7cb6";
+  sha256 = "0f3xc4k662yrlx8abqqrbgvwzr0ffnpiw8z4a47nnai4xk5k0wjl";
 }

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

@@ -18,6 +18,7 @@ in
 
 with haskellLib;
 
+# To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead.
 self: super:
 {
   # Hackage's accelerate is from 2020 and incomptible with our GHC.
@@ -88,12 +89,10 @@ self: super:
     (
       let
         # !!! Use cself/csuper inside for the actual overrides
-        cabalInstallOverlay =
-          cself: csuper:
-          lib.optionalAttrs (lib.versionOlder self.ghc.version "9.12") {
-            Cabal = cself.Cabal_3_14_2_0;
-            Cabal-syntax = cself.Cabal-syntax_3_14_2_0;
-          };
+        cabalInstallOverlay = cself: csuper: {
+          Cabal = cself.Cabal_3_14_2_0;
+          Cabal-syntax = cself.Cabal-syntax_3_14_2_0;
+        };
       in
       {
         cabal-install =
@@ -204,6 +203,27 @@ self: super:
     disableCabalFlag "auto" super.ghc-lib-parser-ex
   );
 
+  ghcide = appendPatches [
+    # Support ghc == 9.10.2
+    (pkgs.fetchpatch2 {
+      name = "ghcide-ghc-9.10.2.patch";
+      url = "https://github.com/haskell/haskell-language-server/commit/fb17921128bd56ba74872cae9539767e63b9fd79.patch";
+      sha256 = "161kcpfnv3q0n1fgsc0rx2v1rqf16g3pnjqabayym47yg2kp1qiv";
+      stripLen = 1;
+    })
+    # Support hie-bios >= 0.15 (unreleased to hackage)
+    (pkgs.fetchpatch2 {
+      name = "ghcide-hie-bios-0.15.patch";
+      url = "https://github.com/haskell/haskell-language-server/commit/eb06c6f6ad7d7fcc29ff4b62f679f428897147f8.patch";
+      sha256 = "0im3mf71chsgk787lz942c8zlmq00gfsd5rclprlsncg0zli1whq";
+      includes = [
+        "ghcide.cabal"
+        "**/Diagnostics.hs"
+      ];
+      stripLen = 1;
+    })
+  ] super.ghcide;
+
   ###########################################
   ### END HASKELL-LANGUAGE-SERVER SECTION ###
   ###########################################
@@ -411,9 +431,6 @@ self: super:
   # As well as deepseq < 1.5 (so it forbids GHC 9.8)
   hw-fingertree = doJailbreak super.hw-fingertree;
 
-  # hedgehog < 1.5
-  hw-prim = doJailbreak super.hw-prim;
-
   # Test suite is slow and sometimes comes up with counter examples.
   # Upstream is aware (https://github.com/isovector/nspace/issues/1),
   # if it's a bug, at least doesn't seem to be nixpkgs-specific.
@@ -895,6 +912,14 @@ self: super:
   # https://github.com/joeyadams/haskell-stm-delay/issues/3
   stm-delay = dontCheck super.stm-delay;
 
+  # Skip test that checks a race condition between stm and stm-queue
+  stm-queue = overrideCabal (drv: {
+    testFlags = drv.testFlags or [ ] ++ [
+      "--skip"
+      "/Data.Queue/behaves faster than TQueue in its worst case/"
+    ];
+  }) super.stm-queue;
+
   # https://github.com/pixbi/duplo/issues/25
   duplo = doJailbreak super.duplo;
 
@@ -909,10 +934,6 @@ self: super:
   # "base" dependency.
   haddock-cheatsheet = doJailbreak super.haddock-cheatsheet;
 
-  # Too strict bounds on bytestring < 0.12
-  # https://github.com/Gabriella439/Haskell-Pipes-HTTP-Library/issues/18
-  pipes-http = doJailbreak super.pipes-http;
-
   # no haddock since this is an umbrella package.
   cloud-haskell = dontHaddock super.cloud-haskell;
 
@@ -1045,7 +1066,20 @@ self: super:
               }
               + "/${name}";
             # 2025-04-09: jailbreak to allow bytestring >= 0.12, text >= 2.1
-            jailbreak = true;
+            # Note: jailbreak ignores constraints under an if(flag)
+            postPatch = ''
+              check_sed() {
+                if ! test -s "$1"; then
+                  echo "sed: pattern '$2' doesn't match anything" >&2
+                  exit 1
+                fi
+              }
+              sed -i ${name}.cabal \
+                -e 's/\(bytestring\) .*/\1/w c1' \
+                -e 's/\(text\) .*/\1/w c2'
+              check_sed c1 'bytestring .*'
+              check_sed c2 'text .*'
+            '';
           }) super.${name};
       in
       lib.genAttrs [ "selda" "selda-sqlite" "selda-json" ] mkSeldaPackage
@@ -1232,17 +1266,6 @@ self: super:
   # test suite requires git and does a bunch of git operations
   restless-git = dontCheck super.restless-git;
 
-  # Missing test files
-  # https://github.com/pbrisbin/jsonpatch/issues/10
-  jsonpatch = overrideCabal (drv: {
-    testTargets =
-      lib.warnIf (lib.versionAtLeast drv.version "0.3.0.2")
-        "haskellPackages.jsonpatch: override can be dropped"
-        [
-          "readme" # disabled: "spec"
-        ];
-  }) super.jsonpatch;
-
   # Work around https://github.com/haskell/c2hs/issues/192.
   c2hs = dontCheck super.c2hs;
 
@@ -1294,8 +1317,8 @@ self: super:
   dhall-yaml = self.generateOptparseApplicativeCompletions [ "dhall-to-yaml-ng" "yaml-to-dhall" ] (
     doJailbreak super.dhall-yaml
   ); # bytestring <0.12, text<2.1
+  # 2025-02-14: see also https://github.com/dhall-lang/dhall-haskell/issues/2638
   dhall-bash = doJailbreak super.dhall-bash; # bytestring <0.12, text <2.1
-  # see also https://github.com/dhall-lang/dhall-haskell/issues/2638
 
   # musl fixes
   # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test
@@ -1470,6 +1493,16 @@ self: super:
   # https://github.com/haskell-servant/servant-ekg/issues/15
   servant-ekg = doJailbreak super.servant-ekg;
 
+  # Fixes bug in an Ord instance that was causing the test suite to fail
+  # https://github.com/fpringle/servant-routes/issues/33
+  servant-routes = appendPatches [
+    (pkgs.fetchpatch {
+      name = "servant-routes-fix-ord.patch";
+      url = "https://github.com/fpringle/servant-routes/commit/d1ef071f11c6a0810637beb8ea0b08f8e524b48a.patch";
+      sha256 = "1c2xpi7sz0621fj9r1010587d1l39j6mm8l4vqmz9pldccmcb0f2";
+    })
+  ] super.servant-routes;
+
   # it wants to build a statically linked binary by default
   hledger-flow = overrideCabal (drv: {
     postPatch =
@@ -1555,37 +1588,6 @@ self: super:
     lsp = self.lsp_2_1_0_0;
   };
 
-  ghcjs-dom-hello = appendPatches [
-    (fetchpatch {
-      url = "https://github.com/ghcjs/ghcjs-dom-hello/commit/53991df6a4eba9f1e9633eb22f6a0486a79491c3.patch";
-      sha256 = "sha256-HQeUgjvzYyY14+CDYiMahAMn7fBcy2d7p8/kqGq+rnI=";
-    })
-    (fetchpatch {
-      url = "https://github.com/ghcjs/ghcjs-dom-hello/commit/d766d937121f7ea5c4c154bd533a1eae47f531c9.patch";
-      sha256 = "sha256-QTkH+L+JMwGyuoqzHBnrokT7KzpHC4YiAWoeiaFBLUw=";
-    })
-    (fetchpatch {
-      url = "https://github.com/ghcjs/ghcjs-dom-hello/commit/831464d995f4033c9aa84f9ed9fb37a268f34d4e.patch";
-      sha256 = "sha256-hQMy+78geTuxd3kbdiyYqoAFrauu90HbpPi0EEKjMzM=";
-    })
-  ] super.ghcjs-dom-hello;
-
-  # Needs https://github.com/ghcjs/jsaddle-hello/pull/5 and hackage release
-  jsaddle-hello = appendPatches [
-    (fetchpatch {
-      url = "https://github.com/ghcjs/jsaddle-hello/commit/c4de837675117b821c50a5079d20d84ec16ff26a.patch";
-      sha256 = "sha256-NsM7QqNLt5V8i5bveYgMrawGnZVsIuAoJfBF75jBwV0=";
-    })
-    (fetchpatch {
-      url = "https://github.com/ghcjs/jsaddle-hello/commit/5c437363833684ea951ec74a0d0fdf5b6fbaca85.patch";
-      sha256 = "sha256-CUyZsts0FAQ3c8Z+zfvwbmlAJCMcidV80n8dA/SoRls=";
-    })
-    (fetchpatch {
-      url = "https://github.com/ghcjs/jsaddle-hello/commit/e2da9e266fbfa8f7fcf3009ab6cfbf825a8bcf7a.patch";
-      sha256 = "sha256-WL0CcnlMt6KI7MOZMg74fNN/I4gYSO3n+GiaXB2BOP0=";
-    })
-  ] super.jsaddle-hello;
-
   # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392
   reflex-dom-core = lib.pipe super.reflex-dom-core [
     doDistribute
@@ -1594,7 +1596,15 @@ self: super:
   ];
 
   # Tests disabled because they assume to run in the whole jsaddle repo and not the hackage tarball of jsaddle-warp.
-  jsaddle-warp = dontCheck super.jsaddle-warp;
+  jsaddle-warp =
+    appendPatch
+      # https://github.com/ghcjs/jsaddle/pull/158
+      (fetchpatch {
+        url = "https://github.com/ghcjs/jsaddle/commit/3a5648dd2e326c589170b58af711c72ab2a10a84.patch";
+        relative = "jsaddle-warp";
+        sha256 = "sha256-Eqm/oFRvQsAWtmd/Q1m25lOlcYB+j4bJ27t43CzZpHo=";
+      })
+      (dontCheck super.jsaddle-warp);
 
   # https://github.com/ghcjs/jsaddle/issues/151
   jsaddle-webkit2gtk =
@@ -1719,21 +1729,19 @@ self: super:
   # So let's not go there and just disable the tests altogether.
   hspec-core = dontCheck super.hspec-core;
 
-  # - Deps are required during the build for testing and also during execution,
-  #   so add them to build input and also wrap the resulting binary so they're in
-  #   PATH.
-  # - Patch can be removed on next package set bump (for v0.2.11)
-
-  # 2023-06-26: Test failure: https://hydra.nixos.org/build/225081865
   update-nix-fetchgit =
     let
+      # Deps are required during the build for testing and also during execution,
+      # so add them to build input and also wrap the resulting binary so they're in
+      # PATH.
       deps = [
         pkgs.git
         pkgs.nix
         pkgs.nix-prefetch-git
       ];
     in
     lib.pipe super.update-nix-fetchgit [
+      # 2023-06-26: Test failure: https://hydra.nixos.org/build/225081865
       dontCheck
       (self.generateOptparseApplicativeCompletions [ "update-nix-fetchgit" ])
       (overrideCabal (drv: {
@@ -1891,10 +1899,6 @@ self: super:
   feed = dontCheck super.feed;
 
   spacecookie = overrideCabal (old: {
-    # Security relevant patch update
-    version = "1.0.0.3";
-    sha256 = "1kzzbq22dk277jcx04w154y4vwa92zmnf40jcbgiihkz5rvisix0";
-
     buildTools = (old.buildTools or [ ]) ++ [ pkgs.buildPackages.installShellFiles ];
     # let testsuite discover the resulting binary
     preCheck =
@@ -2164,9 +2168,6 @@ self: super:
     sha256 = "0l15ccfdys100jf50s9rr4p0d0ikn53bkh7a9qlk9i0y0z5jc6x1";
   }) super.basic-cpuid;
 
-  # 2025-02-11: Too strict bounds on bytestring
-  streamly-bytestring = doJailbreak super.streamly-bytestring;
-
   # Allow building with language-docker >= 13 (!); waiting for 2.13 release.
   hadolint = doJailbreak (
     appendPatches [
@@ -2524,9 +2525,6 @@ self: super:
     };
   } super.hoogle;
 
-  # Too strict upper bound on HTTP
-  oeis = doJailbreak super.oeis;
-
   inherit
     (
       let
@@ -2592,9 +2590,7 @@ self: super:
 
   # Overly strict bounds on tasty-quickcheck (test suite) (< 0.11)
   hashable = doJailbreak super.hashable;
-  # https://github.com/well-typed/cborg/issues/340
   cborg = lib.pipe super.cborg [
-    doJailbreak
     # Fix build on 32-bit: https://github.com/well-typed/cborg/pull/322
     (appendPatches (
       lib.optionals pkgs.stdenv.hostPlatform.is32bit [
@@ -2712,6 +2708,20 @@ self: super:
   tasty-autocollect = dontCheck super.tasty-autocollect;
 
   postgres-websockets = lib.pipe super.postgres-websockets [
+    (appendPatches [
+      (pkgs.fetchpatch {
+        # Needed for the patch below to apply.
+        name = "remove-protolude.patch";
+        url = "https://github.com/diogob/postgres-websockets/commit/8027c0f6dc0c5fe6bab4e3e7730db8653b2c51cc.patch";
+        hash = "sha256-gefVUR+tJLrmpwnc1hf4GjLbGVe1GwNmLn5YU7qW/HY=";
+      })
+      (pkgs.fetchpatch {
+        # Can be removed with the next update.
+        name = "fix-connection-closing-when-no-write-mode-is-present.patch";
+        url = "https://github.com/diogob/postgres-websockets/commit/577a2f0bf4750c682c2c3c63e37d90e0ec6f95eb.patch";
+        hash = "sha256-7PCVbfNiJhWfmQrEjaVqbmCL5jffhofOto1RF2FVYJo=";
+      })
+    ])
     (addTestToolDepends [
       pkgs.postgresql
       pkgs.postgresqlTestHook

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

@@ -67,8 +67,9 @@ self: super: {
   # 2025-04-09: jailbreak to allow hedgehog >= 1.5, hspec-hedgehog >=0.2
   extensions = doJailbreak (doDistribute self.extensions_0_1_0_2);
   fourmolu = doDistribute self.fourmolu_0_16_0_0;
-  ghc-lib = doDistribute self.ghc-lib_9_10_1_20250103;
-  ghc-lib-parser = doDistribute self.ghc-lib-parser_9_10_1_20250103;
+  # https://github.com/digital-asset/ghc-lib/issues/600
+  ghc-lib = doDistribute (doJailbreak self.ghc-lib_9_10_2_20250503);
+  ghc-lib-parser = doDistribute (doJailbreak self.ghc-lib-parser_9_10_2_20250503);
   ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_10_0_0;
   htree = doDistribute self.htree_0_2_0_0;
   ormolu = doDistribute self.ormolu_0_7_7_0;

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

@@ -88,9 +88,9 @@ with haskellLib;
   extensions = doDistribute self.extensions_0_1_0_3;
   doctest = doDistribute self.doctest_0_24_0;
   ghc-syntax-highlighter = doDistribute self.ghc-syntax-highlighter_0_0_13_0;
-  ghc-lib = doDistribute self.ghc-lib_9_12_2_20250320;
+  ghc-lib = doDistribute self.ghc-lib_9_12_2_20250421;
   ghc-exactprint = doDistribute self.ghc-exactprint_1_12_0_0;
-  ghc-lib-parser = doDistribute self.ghc-lib-parser_9_12_2_20250320;
+  ghc-lib-parser = doDistribute self.ghc-lib-parser_9_12_2_20250421;
   ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_12_0_0;
   hlint = doDistribute self.hlint_3_10;
   fourmolu = doDistribute self.fourmolu_0_18_0_0;

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

@@ -71,7 +71,6 @@ self: super: {
     sha256 = "sha256-Mo65FfP1nh7QTY+oLia22hj4eV2v9hpXlYsrFKljA3E=";
   }) super.hevm;
   HaskellNet-SSL = doJailbreak super.HaskellNet-SSL; # bytestring >=0.9 && <0.12
-  saltine = doJailbreak super.saltine; # bytestring  && <0.12, deepseq <1.5, text > 1.2 && <1.3 || >=2.0 && <2.1
   inflections = doJailbreak super.inflections; # text >=0.2 && <2.1
 
   #