From 84e7d5e0856d96bd607bf76653356954bd9df521 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 19:47:24 +0100 Subject: [PATCH 01/28] haskellPackages.extensions: update jailbreak comment --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 126d5fa57a5e3..2ac3ec9f3def5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/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" From 894eda34bb32bd8a5335f1079ac800a0465769b4 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 19:47:39 +0100 Subject: [PATCH 02/28] haskellPackages.vector: remove jailbreak Builds fine by now without. --- pkgs/development/haskell-modules/configuration-common.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2ac3ec9f3def5..e9a4398a81b2c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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" From 8b262612e9b38a5de911a94b272e11ca53ce71dc Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 20:15:06 +0100 Subject: [PATCH 03/28] haskellPackages.http-api-data: remove jailbreak Builds fine without it by now. --- pkgs/development/haskell-modules/configuration-common.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e9a4398a81b2c..dda49b228b4ec 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -186,7 +186,6 @@ self: super: { orbits = dontCheck super.orbits; # Too strict bounds on hspec < 2.11 - http-api-data = doJailbreak super.http-api-data; tasty-discover = doJailbreak super.tasty-discover; # Too strict lower bound on lens, drop with LTS 23 From 5f63d079a6631e4abf466ddaa5c6b73e60ecef63 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 20:15:51 +0100 Subject: [PATCH 04/28] haskellPackages.tasty-discover: update jailbreak comment --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index dda49b228b4ec..4e533863c3dee 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -185,7 +185,7 @@ self: super: { # 2023-06-28: Test error: https://hydra.nixos.org/build/225565149 orbits = dontCheck super.orbits; - # Too strict bounds on hspec < 2.11 + # 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 From 3e51d9f3648f45ae67e67b6c47b2d1de7df6a41b Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 20:17:54 +0100 Subject: [PATCH 05/28] haskellPackages.provide: remove jailbreak We have LTS 23 now. --- pkgs/development/haskell-modules/configuration-common.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4e533863c3dee..91bc0dd48f57f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -188,8 +188,6 @@ self: super: { # 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; From 6efea120f80f04c6cbb4f8e78acef77456337f11 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 20:18:09 +0100 Subject: [PATCH 06/28] haskellPackages.lawful-conversions: remove jailbreak We have LTS 23 now. --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 91bc0dd48f57f..4c49697fd512c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -188,9 +188,6 @@ self: super: { # 2025-02-10: Too strict bounds on tasty-quickcheck < 0.11 tasty-discover = doJailbreak super.tasty-discover; - # Too strict bounds on quickcheck-instances/tasty-qickcheck, drop with LTS 23 - lawful-conversions = doJailbreak super.lawful-conversions; - # Out of date test data: https://github.com/ocharles/weeder/issues/176 weeder = appendPatch (pkgs.fetchpatch { name = "weeder-2.9.0-test-fix-expected.patch"; From 63def5326c2e0372d1ff0c3a5ec5263b89cb5744 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 20:23:53 +0100 Subject: [PATCH 07/28] haskellPackages.tasty-hunit-compat: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4c49697fd512c..85b3e0629c5a5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -188,6 +188,9 @@ self: super: { # 2025-02-10: Too strict bounds on tasty-quickcheck < 0.11 tasty-discover = doJailbreak super.tasty-discover; + # 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 { name = "weeder-2.9.0-test-fix-expected.patch"; From 24c6c6dbcd9fd86a6ee915bd21b05ec2b1bcd301 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 20:35:46 +0100 Subject: [PATCH 08/28] haskellPackages: regenerate package set --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- pkgs/development/haskell-modules/hackage-packages.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 85b3e0629c5a5..494176d595d3e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2778,7 +2778,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; })) [ diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 22fd188e95c8c..f635588b9074e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -144767,14 +144767,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "hasql-notifications_0_2_2_0" = callPackage + "hasql-notifications_0_2_2_2" = callPackage ({ mkDerivation, base, bytestring, hasql, hasql-pool, hspec , postgresql-libpq, QuickCheck, text }: mkDerivation { pname = "hasql-notifications"; - version = "0.2.2.0"; - sha256 = "060fz6mwnb7q68v8aah455wmzfgk03a7bnr57zq5dm4wfm8cycaz"; + version = "0.2.2.2"; + sha256 = "1978z8wxx91dp36gqymr8ncl7yvnmy3l2fm1b2v46llhn339zrfv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ From cdf346c4434eff785c1dec41584397c995a51bfe Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 20:26:15 +0100 Subject: [PATCH 09/28] haskellPackages.monad-bayes: unbreak Seems to build fine. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 494176d595d3e..72b853524e551 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -217,10 +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: { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index f0084de1bf6f3..5f347058a4a92 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3879,7 +3879,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 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f635588b9074e..68747ba2afc71 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -209090,10 +209090,8 @@ self: { ]; description = "A library for probabilistic programming"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "example"; maintainers = [ lib.maintainers.turion ]; - broken = true; }) {}; "monad-bool" = callPackage From 386adb7ca4a90b73cc425165074470159d964566 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 20:29:49 +0100 Subject: [PATCH 10/28] haskellPackages.statistics: enable tests Upstream issue is resolved, builds fine. --- pkgs/development/haskell-modules/configuration-common.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 72b853524e551..1a848398262d2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -217,14 +217,6 @@ self: super: { # https://github.com/yesodweb/shakespeare/issues/280 shakespeare = doDistribute self.shakespeare_2_1_0_1; - # 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 From 62cedbc6fa6d34967d6d3c0b1d863909ef74930d Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 20:41:47 +0100 Subject: [PATCH 11/28] haskellPackages.config-value: remove jailbreak We have alex 3.5 by now. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1a848398262d2..7d69a325d1a58 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -297,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; From 8a335a8251566de0a1d60162d156f5e23011103a Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 20:47:31 +0100 Subject: [PATCH 12/28] haskellPackages.brick: enable test Upstream issue is resolved. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7d69a325d1a58..28f1d79936379 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -309,10 +309,6 @@ self: super: { 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; - # Needs older QuickCheck version attoparsec-varword = dontCheck super.attoparsec-varword; From 1d5bd7114de98f9381fab2bf539176a1879dbe43 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 20:48:16 +0100 Subject: [PATCH 13/28] haskellPackages.ghc-debug-common: jailbreak Too strict bounds on bytestring. --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 28f1d79936379..fca3247a972d4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -307,6 +307,8 @@ self: super: { sha256 = "1c7knpvxr7p8c159jkyk6w29653z5yzgjjqj11130bbb8mk9qhq7"; }) super.c2hsc; + # 2025-02-10: Too strict bounds on bytestring < 0.12 + ghc-debug-common = doJailbreak super.ghc-debug-common; ghc-debug-client = doJailbreak super.ghc-debug-client; # Needs older QuickCheck version From 72e497f92b3a9ada6ac53441027e32628f25b08a Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 20:48:39 +0100 Subject: [PATCH 14/28] haskellPackages.ghc-debug-client: remove jailbreak Passes without it. --- pkgs/development/haskell-modules/configuration-common.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fca3247a972d4..7bde1923511a2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -309,7 +309,6 @@ self: super: { # 2025-02-10: Too strict bounds on bytestring < 0.12 ghc-debug-common = doJailbreak super.ghc-debug-common; - ghc-debug-client = doJailbreak super.ghc-debug-client; # Needs older QuickCheck version attoparsec-varword = dontCheck super.attoparsec-varword; From 6eb4ef29eeb91bfc4703deee1a57e0d1dff641a1 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 20:59:30 +0100 Subject: [PATCH 15/28] haskellPackages.threadscope: add TODO This can probably be removed by now, but can't confirm due to failing build of gtk on staging. --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7bde1923511a2..02890040f61ee 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -381,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 From b3c36b3b8be3e0999fe49744c5214359b784a5f3 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 21:04:28 +0100 Subject: [PATCH 16/28] haskellPackages.rel8: remove jailbreak Works without. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 02890040f61ee..e5e942ce1db25 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -477,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"; From ccbe849519b1769650a4bba0fb90b22e1830aa3e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 21:26:16 +0100 Subject: [PATCH 17/28] haskellPackages.tasty-checklist: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e5e942ce1db25..24a9abdcc1a9c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -907,6 +907,9 @@ self: super: { # else dontCheck super.doctest-discover); doctest-discover = dontCheck super.doctest-discover; + # 2025-02-10: Too strict bounds on doctest < 0.22 + tasty-checklist = doJailbreak super.tasty-checklist; + # Too strict lower bound on tasty-hedgehog # https://github.com/qfpl/tasty-hedgehog/issues/70 tasty-sugar = doJailbreak super.tasty-sugar; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 5f347058a4a92..0955120680355 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5947,7 +5947,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 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 68747ba2afc71..d316a195cfd79 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -302144,8 +302144,6 @@ self: { ]; description = "Check multiple items during a tasty test"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tasty-coverage" = callPackage From d08ca320ac3b03e2c30aacc4ab294fd3549f1889 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 21:28:01 +0100 Subject: [PATCH 18/28] haskellPackages.tasty-sugar: update jailbreak comment --- pkgs/development/haskell-modules/configuration-common.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 24a9abdcc1a9c..b6aa4cc044518 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -910,8 +910,7 @@ self: super: { # 2025-02-10: Too strict bounds on doctest < 0.22 tasty-checklist = doJailbreak super.tasty-checklist; - # Too strict lower bound on tasty-hedgehog - # https://github.com/qfpl/tasty-hedgehog/issues/70 + # 2025-02-10: Too strict bounds on hedgehog < 1.5 tasty-sugar = doJailbreak super.tasty-sugar; # Too strict lower bound on aeson From 3e61daceffd6ac5c3b327f2e6174610e949ccf39 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 21:29:48 +0100 Subject: [PATCH 19/28] haskellPackages.hedgehog-extras: unbreak --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b6aa4cc044518..bd997f7e79ae5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -913,10 +913,6 @@ self: super: { # 2025-02-10: Too strict bounds on hedgehog < 1.5 tasty-sugar = doJailbreak super.tasty-sugar; - # Too strict lower bound on aeson - # https://github.com/input-output-hk/hedgehog-extras/issues/39 - hedgehog-extras = doJailbreak super.hedgehog-extras; - # Allow bytestring-0.12.1.0, https://github.com/lpeterse/haskell-socket/issues/71 socket = doJailbreak super.socket; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 0955120680355..145dfee71eb86 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/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 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d316a195cfd79..7aaecf20d2f27 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -147679,8 +147679,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Supplemental library for hedgehog"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hedgehog-fakedata" = callPackage From 84644bf9f083786933c12f166af31b9214958654 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 21:34:54 +0100 Subject: [PATCH 20/28] haskellPackages.mueval: remove jailbreak Not needed anymore. --- pkgs/development/haskell-modules/configuration-common.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bd997f7e79ae5..ed68677eef7aa 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1067,8 +1067,6 @@ self: super: { }; } super.djinn; - mueval = doJailbreak super.mueval; - # We cannot build this package w/o the C library from . phash = markBroken super.phash; From 2365796c3244dd84f297f539ca4a9c91d301a930 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 21:39:30 +0100 Subject: [PATCH 21/28] haskellPackages.multistate: remove jailbreak Works! --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ed68677eef7aa..f3f5c4720eb3c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1112,10 +1112,6 @@ 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; From 07dd75398bfb64f84541c9326b3c0ac3f26e66f7 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 22:46:43 +0100 Subject: [PATCH 22/28] haskellPackages.pontarius-xmpp: remove jailbreak Works! --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f3f5c4720eb3c..bdcca7e48bc6d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1112,9 +1112,6 @@ self: super: { (self.generateOptparseApplicativeCompletions [ "idris" ]) ]; - # 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; From b79a63e8d971c3cdb564497572a93eb984cda053 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 22:47:24 +0100 Subject: [PATCH 23/28] haskellPackages.applicative-quoters: remove jailbreak Pointless to keep it, since the github repo has been deleted, there is no maintainer and this has not been updated in more than 8 years - and of course it's broken anyway. --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bdcca7e48bc6d..08a8020e9a89b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1115,9 +1115,6 @@ self: super: { # 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; From dbc20255ef720f0b0e5f462d8a6c932dbe044871 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 22:57:34 +0100 Subject: [PATCH 24/28] haskellPackages.digestive-functors-blaze: update jailbreak comment --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 08a8020e9a89b..46c4c598921ae 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1157,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; From bcc8e2436cbf0587aee3f06179f61921cfb5e376 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 23:00:32 +0100 Subject: [PATCH 25/28] haskellPackages.sensei: enable test Our hspec is at 2.11.10 now and the upstream issue is closed. --- .../development/haskell-modules/configuration-common.nix | 9 ++------- .../configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 46c4c598921ae..86be56ce40ffa 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1194,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; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 145dfee71eb86..52ea0a62887e6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5318,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 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7aaecf20d2f27..bd0fb73542640 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -273145,9 +273145,7 @@ self: { description = "Automatically run Hspec tests on file modifications"; license = lib.licenses.mit; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.libjared ]; - broken = true; }) {}; "sensenet" = callPackage From 49f3da5de35df6b1b09d15178ffa1e10f98cca26 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 23:02:46 +0100 Subject: [PATCH 26/28] haskellPackages.int-cast: remove jailbreak Works! --- pkgs/development/haskell-modules/configuration-common.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 86be56ce40ffa..576a39fc7c944 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1224,7 +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; From 93cf2571d7b468a2ab54673a147f531e0fface37 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 23:03:17 +0100 Subject: [PATCH 27/28] haskellPackages.pointfree: remove jailbreak Works! --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 576a39fc7c944..2de78eac26390 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1225,9 +1225,6 @@ self: super: { # Needs QuickCheck <2.10, which we don't have. edit-distance = doJailbreak super.edit-distance; - # 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; githud = dontCheck super.githud; From 5244705e1978c8aea5ec56677dfdac60fdbdef82 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 10 Feb 2025 23:06:02 +0100 Subject: [PATCH 28/28] haskellPackages.snap-templates: remove jailbreak Works by now. --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2de78eac26390..d5098f090b2f7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1242,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];