From d00493bd14a01107c279f251f8fcc264bc6a31a5 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 21 Sep 2025 01:24:05 +0200 Subject: [PATCH 1/2] haskellPackages.{arbtt,binrep,cabal-cargs,dataframe,monad-bayes,patat,regression-simple}: jailbreak haskellPackages.cabal-cargs: drop override obsoleted by 1.7.0. --- .../haskell-modules/configuration-common.nix | 71 ++++++++++--------- .../configuration-hackage2nix/broken.yaml | 8 --- .../transitive-broken.yaml | 4 +- .../haskell-modules/hackage-packages.nix | 20 ------ 4 files changed, 39 insertions(+), 64 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6dce975173780..834c855d1beeb 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -208,28 +208,9 @@ with haskellLib; } ); - # Expected test output for these accidentally checks the absolute location of the source directory - # https://github.com/dan-t/cabal-cargs/issues/9 - cabal-cargs = overrideCabal (drv: { - testFlags = drv.testFlags or [ ] ++ [ - "-p" - "!/FindCabalFilePure withoutSandbox/" - "-p" - "!/FromCabalFilePure withoutSandbox/" - "-p" - "!/FromLibSrcPure withoutSandbox/" - "-p" - "!/FromExeSrcFilePure withoutSandbox/" - "-p" - "!/FindCabalFilePure withSandbox/" - "-p" - "!/FromCabalFilePure withSandbox/" - "-p" - "!/FromLibSrcPure withSandbox/" - "-p" - "!/FromExeSrcFilePure withSandbox/" - ]; - }) super.cabal-cargs; + # 2025-09-20: Too strict bound on filepath (<1.5) + # https://github.com/dan-t/cabal-cargs/issues/10 + cabal-cargs = doJailbreak super.cabal-cargs; # Extensions wants a specific version of Cabal for its list of Haskell # language extensions. @@ -439,6 +420,10 @@ with haskellLib; # https://github.com/sw17ch/data-clist/pull/28 data-clist = doJailbreak super.data-clist; + # 2025-09-20: Allow QuickCheck >= 2.15 + # https://github.com/raehik/binrep/issues/14 + binrep = warnAfterVersion "1.1.0" (doJailbreak super.binrep); + # 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 # https://github.com/vincenthz/hs-hourglass/pull/56 @@ -519,6 +504,10 @@ with haskellLib; ghc-datasize = disableLibraryProfiling super.ghc-datasize; ghc-vis = disableLibraryProfiling super.ghc-vis; + # 2025-09-20: Too strict upper bound on base (<4.20) + # https://github.com/phadej/regression-simple/issues/13 + regression-simple = doJailbreak super.regression-simple; + # Fix 32bit struct being used for 64bit syscall on 32bit platforms # https://github.com/haskellari/lukko/issues/15 lukko = appendPatches [ @@ -916,6 +905,10 @@ with haskellLib; )) ]; + # Too strict bounds on QuickCheck (<2.15), containers (<0.7), hashable (<1.5), pandoc (<3.7) + # https://github.com/jaspervdj/patat/issues/194 + patat = doJailbreak super.patat; + # Too strict upper bound on data-default-class (< 0.2) # https://github.com/stackbuilders/dotenv-hs/issues/203 dotenv = doJailbreak super.dotenv; @@ -2707,6 +2700,9 @@ with haskellLib; # 2025-08-06: Upper bounds on containers <0.7 and hedgehog < 1.5 too strict. hermes-json = doJailbreak super.hermes-json; + # Allow containers >= 0.7, https://github.com/nomeata/arbtt/issues/181 + arbtt = doJailbreak super.arbtt; + # hexstring is not compatible with newer versions of base16-bytestring # See https://github.com/solatis/haskell-hexstring/issues/3 hexstring = overrideCabal (old: { @@ -3322,17 +3318,22 @@ with haskellLib; brillo-juicy = warnAfterVersion "0.2.4" (doJailbreak super.brillo-juicy); brillo = warnAfterVersion "1.13.3" (doJailbreak super.brillo); - # Floating point precision issues. Test suite is only checked on x86_64. - # https://github.com/tweag/monad-bayes/issues/368 - monad-bayes = dontCheckIf ( - let - inherit (pkgs.stdenv) hostPlatform; - in - !hostPlatform.isx86_64 - # Presumably because we emulate x86_64-darwin via Rosetta, x86_64-darwin - # also fails on Hydra - || hostPlatform.isDarwin - ) super.monad-bayes; + monad-bayes = + # Floating point precision issues. Test suite is only checked on x86_64. + # https://github.com/tweag/monad-bayes/issues/368 + dontCheckIf + ( + let + inherit (pkgs.stdenv) hostPlatform; + in + !hostPlatform.isx86_64 + # Presumably because we emulate x86_64-darwin via Rosetta, x86_64-darwin + # also fails on Hydra + || hostPlatform.isDarwin + ) + # Too strict bounds on brick (<2.6), vty (<6.3) + # https://github.com/tweag/monad-bayes/issues/378 + (doJailbreak super.monad-bayes); crucible = lib.pipe @@ -3486,6 +3487,10 @@ with haskellLib; # including the current one in nixpkgs. liquid-fixpoint = dontCheck super.liquid-fixpoint; + # 2025-09-20: Too strict upper bound on text (<2.1.3) + # https://github.com/mchav/dataframe/issues/61 + dataframe = doJailbreak (warnAfterVersion "0.3.0.4" super.dataframe); + # 2025-8-26: Too strict bounds on containers and text, see: https://github.com/stackbuilders/inflections-hs/pull/83 inflections = doJailbreak super.inflections; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 338b2bf167798..e2c5b85c0483a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -231,7 +231,6 @@ broken-packages: - arbor-monad-logger # failure in job https://hydra.nixos.org/build/233228659 at 2023-09-02 - arbor-monad-metric # failure in job https://hydra.nixos.org/build/233236175 at 2023-09-02 - arbor-postgres # failure in job https://hydra.nixos.org/build/233232935 at 2023-09-02 - - arbtt # failure in job https://hydra.nixos.org/build/307516851 at 2025-09-19 - arch-hs # failure in job https://hydra.nixos.org/build/233225768 at 2023-09-02 - archiver # failure in job https://hydra.nixos.org/build/233245795 at 2023-09-02 - archlinux # failure in job https://hydra.nixos.org/build/233202430 at 2023-09-02 @@ -485,8 +484,6 @@ broken-packages: - bindings-wlc # failure in job https://hydra.nixos.org/build/233332720 at 2023-09-02 - bindynamic # failure in job https://hydra.nixos.org/build/295091957 at 2025-04-22 - binembed # failure in job https://hydra.nixos.org/build/233219100 at 2023-09-02 - - binrep # failure in job https://hydra.nixos.org/build/307517077 at 2025-09-19 - - binrep-instances # failure in job https://hydra.nixos.org/build/295092045 at 2025-04-22 - binsm # failure in job https://hydra.nixos.org/build/233232355 at 2023-09-02 - bio # failure in job https://hydra.nixos.org/build/233225273 at 2023-09-02 - bio-sequence # failure in job https://hydra.nixos.org/build/233236140 at 2023-09-02 @@ -654,7 +651,6 @@ broken-packages: - cabal-auto-expose # failure in job https://hydra.nixos.org/build/233195440 at 2023-09-02 - cabal-build-programs # failure in job https://hydra.nixos.org/build/257091363 at 2024-04-27 - cabal-bundle-clib # failure in job https://hydra.nixos.org/build/233199225 at 2023-09-02 - - cabal-cargs # failure in job https://hydra.nixos.org/build/307517214 at 2025-09-19 - cabal-constraints # failure in job https://hydra.nixos.org/build/233214316 at 2023-09-02 - cabal-db # failure in job https://hydra.nixos.org/build/233197235 at 2023-09-02 - cabal-debian # failure in job https://hydra.nixos.org/build/233255267 at 2023-09-02 @@ -1258,7 +1254,6 @@ broken-packages: - database-migrate # failure in job https://hydra.nixos.org/build/233201597 at 2023-09-02 - database-study # failure in job https://hydra.nixos.org/build/233222466 at 2023-09-02 - datadog # failure in job https://hydra.nixos.org/build/233191124 at 2023-09-02 - - dataframe # failure in job https://hydra.nixos.org/build/307517771 at 2025-09-19 - DataIndex # failure in job https://hydra.nixos.org/build/233254506 at 2023-09-02 - datalog # failure in job https://hydra.nixos.org/build/233242707 at 2023-09-02 - datapacker # failure in job https://hydra.nixos.org/build/233206524 at 2023-09-02 @@ -4072,7 +4067,6 @@ broken-packages: - mollie-api-haskell # failure in job https://hydra.nixos.org/build/233200867 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/307520391 at 2025-09-19 - monad-branch # failure in job https://hydra.nixos.org/build/233251253 at 2023-09-02 - monad-choice # failure in job https://hydra.nixos.org/build/233255987 at 2023-09-02 - monad-fork # failure in job https://hydra.nixos.org/build/233206855 at 2023-09-02 @@ -4653,7 +4647,6 @@ broken-packages: - pasta-curves # failure in job https://hydra.nixos.org/build/233196512 at 2023-09-02 - pastis # failure in job https://hydra.nixos.org/build/233218498 at 2023-09-02 - pasty # failure in job https://hydra.nixos.org/build/233251812 at 2023-09-02 - - patat # failure in job https://hydra.nixos.org/build/307611198 at 2025-09-19 - patches-vector # failure in job https://hydra.nixos.org/build/233244862 at 2023-09-02 - path-formatting # failure in job https://hydra.nixos.org/build/233199358 at 2023-09-02 - path-sing # failure in job https://hydra.nixos.org/build/237234354 at 2023-10-21 @@ -5309,7 +5302,6 @@ broken-packages: - registry-messagepack # failure in job https://hydra.nixos.org/build/303231364 at 2025-07-27 - registry-options # failure in job https://hydra.nixos.org/build/295096594 at 2025-04-22 - regress # failure in job https://hydra.nixos.org/build/233208901 at 2023-09-02 - - regression-simple # failure in job https://hydra.nixos.org/build/307521504 at 2025-09-19 - regular # failure in job https://hydra.nixos.org/build/233232656 at 2023-09-02 - rehoo # failure in job https://hydra.nixos.org/build/233246417 at 2023-09-02 - rei # failure in job https://hydra.nixos.org/build/233221328 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 78e83a5ddae66..c90f169b77bd6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -309,7 +309,6 @@ dont-distribute-packages: - blockio - blogination - BlogLiterately-diagrams - - bloomfilter-blocked - bloxorz - blubber - bluetile @@ -679,6 +678,7 @@ dont-distribute-packages: - datadog-tracing - datafix - dataflow + - dataframe_0_3_0_4 - datasets - date-conversions - dbjava @@ -2957,7 +2957,6 @@ dont-distribute-packages: - rfc-psql - rfc-redis - rfc-servant - - rhine-bayes - rhythm-game-tutorial - rib - ribosome @@ -3453,7 +3452,6 @@ dont-distribute-packages: - tasklite - tasklite-core - tasty-bdd - - tasty-bench-fit - tasty-groundhog-converters - tasty-integrate - tasty-jenkins-xml diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 85e8e5989e464..969b187887f8d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -81677,9 +81677,7 @@ self: { ]; description = "Automatic Rule-Based Time Tracker"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.rvl ]; - broken = true; } ) { }; @@ -105652,9 +105650,7 @@ self: { ]; description = "Encode precise binary representations directly in types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.raehik ]; - broken = true; } ) { }; @@ -105676,8 +105672,6 @@ self: { ]; description = "Orphan instances for binrep"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -111407,7 +111401,6 @@ self: { doHaddock = false; description = "Classic and block-style bloom filters"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -123104,9 +123097,7 @@ self: { ]; description = "A command line program for extracting compiler arguments from a cabal file"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "cabal-cargs"; - broken = true; } ) { }; @@ -180541,9 +180532,7 @@ self: { ]; description = "An intuitive, dynamically-typed DataFrame library"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; mainProgram = "dataframe"; - broken = true; } ) { }; @@ -180655,7 +180644,6 @@ self: { license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; mainProgram = "dataframe"; - broken = true; } ) { }; @@ -452610,10 +452598,8 @@ self: { ]; description = "A library for probabilistic programming"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "example"; maintainers = [ lib.maintainers.turion ]; - broken = true; } ) { }; @@ -506005,10 +505991,8 @@ self: { ]; description = "Terminal-based presentations using Pandoc"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; mainProgram = "patat"; maintainers = [ lib.maintainers.dalpd ]; - broken = true; } ) { }; @@ -566365,8 +566349,6 @@ self: { ]; description = "Simple linear and quadratic regression"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -573318,7 +573300,6 @@ self: { ]; description = "monad-bayes backend for Rhine"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "rhine-bayes-gloss"; } ) { }; @@ -657093,7 +657074,6 @@ self: { ]; description = "Determine time complexity of a given function"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; From d19e1790d64df689daa077539e08496faf0034c9 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Sep 2025 16:01:31 +0200 Subject: [PATCH 2/2] haskellPackages.bloomfilter-blocked: disable test suite we can't easily build --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 834c855d1beeb..e9f536b01089d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -390,6 +390,14 @@ 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; + # support for transformers >= 0.6 lifted-base = appendPatch (fetchpatch { url = "https://github.com/basvandijk/lifted-base/commit/6b61483ec7fd0d5d5d56ccb967860d42740781e8.patch";