haskellPackages: clean up overrides (part 1)

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

@@ -87,7 +87,7 @@ self: super: {
 
   # Extensions wants the latest version of Cabal for its list of Haskell
   # language extensions.
-  # 2024-01-15: jailbreak to allow hspec-hedgehog 0.1.1.0 https://github.com/kowainik/extensions/pull/92
+  # 2025-02-10: jailbreak to allow hspec-hedgehog 0.3.0.0 and hedgehog 1.5
   extensions = doJailbreak (super.extensions.override {
     Cabal =
       if versionOlder self.ghc.version "9.6"
@@ -146,8 +146,6 @@ self: super: {
   }) (doJailbreak super.language-haskell-extract);
 
   vector = overrideCabal (old: {
-    # Too strict bounds on doctest which isn't used, but is part of the configuration
-    jailbreak = true;
     # vector-doctest seems to be broken when executed via ./Setup test
     testTarget = lib.concatStringsSep " " [
       "vector-tests-O0"
@@ -187,14 +185,11 @@ self: super: {
   # 2023-06-28: Test error: https://hydra.nixos.org/build/225565149
   orbits = dontCheck super.orbits;
 
-  # Too strict bounds on hspec < 2.11
-  http-api-data = doJailbreak super.http-api-data;
+  # 2025-02-10: Too strict bounds on tasty-quickcheck < 0.11
   tasty-discover = doJailbreak super.tasty-discover;
 
-  # Too strict lower bound on lens, drop with LTS 23
-  provide = doJailbreak super.provide;
-  # Too strict bounds on quickcheck-instances/tasty-qickcheck, drop with LTS 23
-  lawful-conversions = doJailbreak super.lawful-conversions;
+  # 2025-02-10: Too strict bounds on tasty < 1.5
+  tasty-hunit-compat = doJailbreak super.tasty-hunit-compat;
 
   # Out of date test data: https://github.com/ocharles/weeder/issues/176
   weeder = appendPatch (pkgs.fetchpatch {
@@ -222,18 +217,6 @@ self: super: {
   # https://github.com/yesodweb/shakespeare/issues/280
   shakespeare = doDistribute self.shakespeare_2_1_0_1;
 
-  # 2023-08-09: Jailbreak because of vector < 0.13
-  # 2023-11-09: don't check because of https://github.com/tweag/monad-bayes/pull/326
-  monad-bayes = dontCheck (doJailbreak super.monad-bayes);
-
-  # Disable tests failing on odd floating point numbers generated by QuickCheck 2.14.3
-  # https://github.com/haskell/statistics/issues/205
-  statistics = overrideCabal (drv: {
-    testFlags = [
-      "-p" "! (/Pearson correlation/ || /t_qr/ || /Tests for: FDistribution.1-CDF is correct/)"
-    ];
-  }) super.statistics;
-
   # Work around -Werror failures until a more permanent solution is released
   # https://github.com/haskell-cryptography/HsOpenSSL/issues/88
   # https://github.com/haskell-cryptography/HsOpenSSL/issues/93
@@ -314,10 +297,6 @@ self: super: {
   # successfully with recent versions of the compiler).
   bin-package-db = null;
 
-  # Unnecessarily requires alex >= 3.3
-  # https://github.com/glguy/config-value/commit/c5558c8258598fab686c259bff510cc1b19a0c50#commitcomment-119514821
-  config-value = doJailbreak super.config-value;
-
   # path-io bound is adjusted in 0.6.1 release
   # https://github.com/tek/hix/commit/019426f6a3db256e4c96558ffe6fa2114e2f19a0
   hix = doJailbreak super.hix;
@@ -328,11 +307,8 @@ self: super: {
     sha256 = "1c7knpvxr7p8c159jkyk6w29653z5yzgjjqj11130bbb8mk9qhq7";
   }) super.c2hsc;
 
-  ghc-debug-client = doJailbreak super.ghc-debug-client;
-
-  # Test failure.  Tests also disabled in Stackage:
-  # https://github.com/jtdaugherty/brick/issues/499
-  brick = dontCheck super.brick;
+  # 2025-02-10: Too strict bounds on bytestring < 0.12
+  ghc-debug-common = doJailbreak super.ghc-debug-common;
 
   # Needs older QuickCheck version
   attoparsec-varword = dontCheck super.attoparsec-varword;
@@ -405,6 +381,7 @@ self: super: {
   ] super.gitit;
 
   # 2024-03-10: Maintainance stalled, fixes unmerged: https://github.com/haskell/ThreadScope/pull/130
+  # TODO: Confirm whether this can be removed once gtk is fixed on staging.
   threadscope = overrideCabal (drv: {
     prePatch = drv.prePatch or "" + ''
       ${pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal
@@ -500,10 +477,6 @@ self: super: {
   # Pending a hackage revision: https://github.com/berberman/arch-web/commit/5d08afee5b25e644f9e2e2b95380a5d4f4aa81ea#commitcomment-89230555
   arch-web = doJailbreak super.arch-web;
 
-  # Too strict upper bound on hedgehog
-  # https://github.com/circuithub/rel8/issues/248
-  rel8 = doJailbreak super.rel8;
-
   # Fix test trying to access /home directory
   shell-conduit = overrideCabal (drv: {
     postPatch = "sed -i s/home/tmp/ test/Spec.hs";
@@ -934,13 +907,11 @@ self: super: {
   #    else dontCheck super.doctest-discover);
   doctest-discover = dontCheck super.doctest-discover;
 
-  # Too strict lower bound on tasty-hedgehog
-  # https://github.com/qfpl/tasty-hedgehog/issues/70
-  tasty-sugar = doJailbreak super.tasty-sugar;
+  # 2025-02-10: Too strict bounds on doctest < 0.22
+  tasty-checklist = doJailbreak super.tasty-checklist;
 
-  # Too strict lower bound on aeson
-  # https://github.com/input-output-hk/hedgehog-extras/issues/39
-  hedgehog-extras = doJailbreak super.hedgehog-extras;
+  # 2025-02-10: Too strict bounds on hedgehog < 1.5
+  tasty-sugar = doJailbreak super.tasty-sugar;
 
   # Allow bytestring-0.12.1.0, https://github.com/lpeterse/haskell-socket/issues/71
   socket = doJailbreak super.socket;
@@ -1096,8 +1067,6 @@ self: super: {
     };
   } super.djinn;
 
-  mueval = doJailbreak super.mueval;
-
   # We cannot build this package w/o the C library from <http://www.phash.org/>.
   phash = markBroken super.phash;
 
@@ -1143,19 +1112,9 @@ self: super: {
     (self.generateOptparseApplicativeCompletions [ "idris" ])
   ];
 
-  # Too strict bound on hspec
-  # https://github.com/lspitzner/multistate/issues/9#issuecomment-1367853016
-  multistate = doJailbreak super.multistate;
-
-  # https://github.com/pontarius/pontarius-xmpp/issues/105
-  pontarius-xmpp = dontCheck super.pontarius-xmpp;
-
   # fails with sandbox
   yi-keymap-vim = dontCheck super.yi-keymap-vim;
 
-  # https://github.com/bmillwood/applicative-quoters/issues/6
-  applicative-quoters = doJailbreak super.applicative-quoters;
-
   # https://hydra.nixos.org/build/42769611/nixlog/1/raw
   # note: the library is unmaintained, no upstream issue
   dataenc = doJailbreak super.dataenc;
@@ -1198,7 +1157,7 @@ self: super: {
   # Has a dependency on outdated versions of directory.
   cautious-file = doJailbreak (dontCheck super.cautious-file);
 
-  # missing dependencies: blaze-html >=0.5 && <0.9, blaze-markup >=0.5 && <0.8
+  # 2025-02-10: Too strict bounds on text < 2.1
   digestive-functors-blaze = doJailbreak super.digestive-functors-blaze;
   digestive-functors = doJailbreak super.digestive-functors;
 
@@ -1235,19 +1194,14 @@ self: super: {
   # test suite requires git and does a bunch of git operations
   restless-git = dontCheck super.restless-git;
 
-  # patch out a flaky test that depends on output from hspec >= v2.11.7.
-  # https://github.com/hspec/sensei/issues/125
-  sensei = appendPatch (fetchpatch {
-    url = "https://github.com/hspec/sensei/commit/5c11026fa48e13ea1c351ab882765eb0966f2e97.patch";
-    hash = "sha256-eUCDvypj2bxTRnHLzrcembLMKHg5c3W3quNfclBDsso=";
-  }) (overrideCabal (drv: {
+  sensei = overrideCabal (drv: {
     # sensei passes `-package hspec-meta` to GHC in the tests, but doesn't
     # depend on it itself.
     testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta ];
     # requires git at test-time *and* runtime, but we'll just rely on users to
     # bring their own git at runtime.
     testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ];
-  }) super.sensei);
+  }) super.sensei;
 
   # Depends on broken fluid.
   fluid-idl-http-client = markBroken super.fluid-idl-http-client;
@@ -1270,10 +1224,6 @@ self: super: {
 
   # Needs QuickCheck <2.10, which we don't have.
   edit-distance = doJailbreak super.edit-distance;
-  int-cast = doJailbreak super.int-cast;
-
-  # Needs QuickCheck <2.10, HUnit <1.6 and base <4.10
-  pointfree = doJailbreak super.pointfree;
 
   # Needs tasty-quickcheck ==0.8.*, which we don't have.
   gitHUD = dontCheck super.gitHUD;
@@ -1292,9 +1242,6 @@ self: super: {
   # https://github.com/alphaHeavy/protobuf/issues/34
   protobuf = dontCheck super.protobuf;
 
-  # jailbreak tasty < 1.2 until servant-docs > 0.11.3 is on hackage.
-  snap-templates = doJailbreak super.snap-templates; # https://github.com/snapframework/snap-templates/issues/22
-
   # The test suite does not know how to find the 'alex' binary.
   alex = overrideCabal (drv: {
     testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which];
@@ -2783,7 +2730,7 @@ self: super: {
       # Matching dependencies for hasql < 1.6.x
       hasql-dynamic-statements = dontCheck super.hasql-dynamic-statements_0_3_1_5;
       hasql-implicits = dontCheck super.hasql-implicits_0_1_1_3;
-      hasql-notifications = dontCheck super.hasql-notifications_0_2_2_0;
+      hasql-notifications = 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;
     })) [

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

@@ -2503,7 +2503,6 @@ broken-packages:
   - heckle # failure in job https://hydra.nixos.org/build/233228954 at 2023-09-02
   - heddit # failure in job https://hydra.nixos.org/build/233229058 at 2023-09-02
   - hedgehog-checkers # failure in job https://hydra.nixos.org/build/233229405 at 2023-09-02
-  - hedgehog-extras # failure in job https://hydra.nixos.org/build/269679462 at 2024-08-19
   - hedgehog-fakedata # failure in job https://hydra.nixos.org/build/252721345 at 2024-03-16
   - hedgehog-generic # failure in job https://hydra.nixos.org/build/233204695 at 2023-09-02
   - hedgehog-gen # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237243271 at 2023-10-21
@@ -3879,7 +3878,6 @@ broken-packages:
   - monadacme # failure in job https://hydra.nixos.org/build/233218330 at 2023-09-02
   - monad-atom # failure in job https://hydra.nixos.org/build/233243367 at 2023-09-02
   - monad-atom-simple # failure in job https://hydra.nixos.org/build/233259038 at 2023-09-02
-  - monad-bayes # failure in job https://hydra.nixos.org/build/252725686 at 2024-03-16
   - monad-branch # failure in job https://hydra.nixos.org/build/233251253 at 2023-09-02
   - MonadCatchIO-mtl # failure in job https://hydra.nixos.org/build/233228214 at 2023-09-02
   - MonadCatchIO-transformers # failure in job https://hydra.nixos.org/build/252729237 at 2024-03-16
@@ -5320,7 +5318,6 @@ broken-packages:
   - semilattices # failure in job https://hydra.nixos.org/build/233223765 at 2023-09-02
   - sendgrid-haskell # failure in job https://hydra.nixos.org/build/233228693 at 2023-09-02
   - sendgrid-v3 # failure in job https://hydra.nixos.org/build/233224134 at 2023-09-02
-  - sensei # failure in job https://hydra.nixos.org/build/241518007 at 2023-12-03
   - sensu-run # failure in job https://hydra.nixos.org/build/233251719 at 2023-09-02
   - sentry # failure in job https://hydra.nixos.org/build/233246813 at 2023-09-02
   - seonbi # failure in job https://hydra.nixos.org/build/233196115 at 2023-09-02
@@ -5948,7 +5945,6 @@ broken-packages:
   - taskell # depends on old version of brick
   - TaskMonad # failure in job https://hydra.nixos.org/build/233219257 at 2023-09-02
   - tasty-auto # failure in job https://hydra.nixos.org/build/233220008 at 2023-09-02
-  - tasty-checklist # failure in job https://hydra.nixos.org/build/252710481 at 2024-03-16
   - tasty-fail-fast # failure in job https://hydra.nixos.org/build/233200040 at 2023-09-02
   - tasty-flaky # failure in job https://hydra.nixos.org/build/275140265 at 2024-10-21
   - tasty-golden-extra # failure in job https://hydra.nixos.org/build/283204600 at 2024-12-31