From 9a0fdb1eb7fd16a02e6ca1025f344bdc147fb10e Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Thu, 15 Aug 2024 22:46:57 +0100 Subject: [PATCH 01/12] haskellPackages.stan: remove override --- pkgs/development/haskell-modules/configuration-common.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2b46e9ae0d48a..cdb2a0c5fbf50 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1894,11 +1894,6 @@ self: super: { # 2024-03-02: vty <5.39 - https://github.com/reflex-frp/reflex-ghci/pull/33 reflex-ghci = assert super.reflex-ghci.version == "0.2.0.1"; doJailbreak super.reflex-ghci; - # 2020-11-19: jailbreaking because of pretty-simple bound out of date - # https://github.com/kowainik/stan/issues/408 - # Tests disabled because of: https://github.com/kowainik/stan/issues/409 - stan = doJailbreak (dontCheck super.stan); - # Due to tests restricting base in 0.8.0.0 release http-media = doJailbreak super.http-media; From a3671063679af637ca0ad34848128e42e3bf145f Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Thu, 15 Aug 2024 23:05:29 +0100 Subject: [PATCH 02/12] haskellPackages.hakyll-filestore: remove override --- 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 cdb2a0c5fbf50..6b5043c610b5e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1516,8 +1516,6 @@ self: super: { # https://bitbucket.org/rvlm/hakyll-contrib-hyphenation/src/master/ # Therefore we jailbreak it. hakyll-contrib-hyphenation = doJailbreak super.hakyll-contrib-hyphenation; - # 2021-10-04: too strict upper bound on Hakyll - hakyll-filestore = doJailbreak super.hakyll-filestore; # The test suite depends on an impure cabal-install installation in # $HOME, which we don't have in our build sandbox. From f7de034e531b5d9d3c913b77002bc808036874b1 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Thu, 15 Aug 2024 23:05:58 +0100 Subject: [PATCH 03/12] haskellPackages.streamly-bytestring: remove override --- 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 6b5043c610b5e..9e5e60bbd64e3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -578,9 +578,6 @@ self: super: { HerbiePlugin = dontCheck super.HerbiePlugin; wai-cors = dontCheck super.wai-cors; - # 2022-02-14: Strict upper bound: https://github.com/psibi/streamly-bytestring/issues/30 - streamly-bytestring = doJailbreak super.streamly-bytestring; - # 2024-05-18: Upstream tests against a different pandoc version pandoc-crossref = dontCheck super.pandoc-crossref; From 9649c7eba2df426e35358b167d49101ea34d44ca Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Thu, 15 Aug 2024 23:06:10 +0100 Subject: [PATCH 04/12] haskellPackages.blucontrol: remove override --- 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 9e5e60bbd64e3..4ac979f70c23c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2374,10 +2374,6 @@ self: super: { # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too. streamly-posix = doJailbreak super.streamly-posix; - # 2022-08-30 Too strict bounds on finite-typelits - # https://github.com/jumper149/blucontrol/issues/1 - blucontrol = doJailbreak super.blucontrol; - # Fix from https://github.com/brendanhay/gogol/pull/144 which has seen no release # Can't use fetchpatch as it required tweaking the line endings as the .cabal # file revision on hackage was gifted CRLF line endings From cfc804712446a00edfef48fc798edc7508a39166 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Thu, 15 Aug 2024 23:19:49 +0100 Subject: [PATCH 05/12] haskellPackages.bench: remove override --- 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 4ac979f70c23c..f0f3a5bb79447 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -782,10 +782,6 @@ self: super: { xsd = dontCheck super.xsd; zip-archive = dontCheck super.zip-archive; # https://github.com/jgm/zip-archive/issues/57 - # 2023-01-11: Too strict bounds on optparse-applicative - # https://github.com/Gabriella439/bench/issues/49 - bench = doJailbreak super.bench; - # 2023-06-26: Test failure: https://hydra.nixos.org/build/224869905 comfort-blas = dontCheck super.comfort-blas; From 473989a5652a7cbe7c1e20057063cb053f39b590 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Thu, 15 Aug 2024 23:20:12 +0100 Subject: [PATCH 06/12] haskellPackages.comfort-blas: remove override --- 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 f0f3a5bb79447..5effcc0d696b8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -782,9 +782,6 @@ self: super: { xsd = dontCheck super.xsd; zip-archive = dontCheck super.zip-archive; # https://github.com/jgm/zip-archive/issues/57 - # 2023-06-26: Test failure: https://hydra.nixos.org/build/224869905 - comfort-blas = dontCheck super.comfort-blas; - # These test suites run for ages, even on a fast machine. This is nuts. Random123 = dontCheck super.Random123; systemd = dontCheck super.systemd; From d1c7660c96caa8f6b10d34ffab03f9e562fac1fb Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Thu, 15 Aug 2024 23:20:20 +0100 Subject: [PATCH 07/12] haskellPackages.storablevector: remove override --- 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 5effcc0d696b8..68a865a36dd75 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -587,9 +587,6 @@ self: super: { # 2022-01-29: Tests require package to be in ghc-db. aeson-schemas = dontCheck super.aeson-schemas; - # 2023-04-20: Restrictive bytestring bound in tests. - storablevector = doJailbreak super.storablevector; - matterhorn = doJailbreak super.matterhorn; # Too strict bounds on transformers and resourcet From c11def254ea225b51feea2e94b306c6ed1673b48 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Thu, 15 Aug 2024 23:21:47 +0100 Subject: [PATCH 08/12] haskellPackages.shh-extras: remove override --- 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 68a865a36dd75..3ac572768a267 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1243,7 +1243,6 @@ self: super: { # 2023-07-14: Restrictive upper bounds: https://github.com/luke-clifton/shh/issues/76 shh = doJailbreak super.shh; - shh-extras = doJailbreak super.shh-extras; # This package refers to the wrong library (itself in fact!) vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; }; From 8b9a958cda4c553e952a63f99cd7155d8a549c4c Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Thu, 15 Aug 2024 23:28:00 +0100 Subject: [PATCH 09/12] haskellPackages.diagrams-gtk: remove override --- 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 3ac572768a267..62c94d381225b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2888,9 +2888,6 @@ self: super: { # https://github.com/kseo/sfnt2woff/issues/1 sfnt2woff = doJailbreak super.sfnt2woff; - # 2023-03-05: restrictive bounds on base https://github.com/diagrams/diagrams-gtk/issues/11 - diagrams-gtk = doJailbreak super.diagrams-gtk; - # libfuse3 fails to mount fuse file systems within the build environment libfuse3 = dontCheck super.libfuse3; From 468486a64bae109fc7961bb96a7396cdaffe074f Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Thu, 15 Aug 2024 23:26:01 +0100 Subject: [PATCH 10/12] haskellPackages.haskell-ci: remove jailbreak --- pkgs/development/haskell-modules/configuration-common.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 62c94d381225b..16e17a4d7de34 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2265,12 +2265,11 @@ self: super: { }; # 2023-04-09: haskell-ci needs Cabal-syntax 3.10 - # 2023-07-03: allow lattices-2.2, waiting on https://github.com/haskell-CI/haskell-ci/pull/664 # 2024-03-21: pins specific version of ShellCheck - haskell-ci = doJailbreak (super.haskell-ci.overrideScope (self: super: { + haskell-ci = super.haskell-ci.overrideScope (self: super: { Cabal-syntax = self.Cabal-syntax_3_10_3_0; ShellCheck = self.ShellCheck_0_9_0; - })); + }); # ShellCheck < 0.10.0 needs to be adjusted for changes in fgl >= 5.8 # https://github.com/koalaman/shellcheck/issues/2677 From 352af3c131ab6c020efb11293af28fffb0c649bd Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Sat, 20 Jul 2024 18:44:55 +0100 Subject: [PATCH 11/12] haskellPackages.math-functions: remove override --- pkgs/development/haskell-modules/configuration-common.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 16e17a4d7de34..4fdf42bee6b10 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -148,12 +148,6 @@ self: super: { ]; }) super.vector; - # Almost guaranteed failure due to floating point imprecision with QuickCheck-2.14.3 - # https://github.com/haskell/math-functions/issues/73 - math-functions = overrideCabal (drv: { - testFlags = drv.testFlags or [] ++ [ "-p" "! /Kahan.t_sum_shifted/" ]; - }) super.math-functions; - # Too strict bounds on base # https://github.com/lspitzner/butcher/issues/7#issuecomment-1681394943 butcher = doJailbreak super.butcher; From 74311469928d06072d116330401572bd4ad073c7 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Sat, 20 Jul 2024 18:46:28 +0100 Subject: [PATCH 12/12] haskellPackages.vector-hashtables: remove override --- 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 4fdf42bee6b10..ed1b6d88008f3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2614,10 +2614,6 @@ self: super: { # has been resolved. lucid-htmx = doJailbreak super.lucid-htmx; - # Too strict bounds on hspec - # https://github.com/klapaucius/vector-hashtables/issues/11 - vector-hashtables = doJailbreak super.vector-hashtables; - # doctest-parallel is broken with v1-style cabal-install / Setup.hs # https://github.com/martijnbastiaan/doctest-parallel/issues/22 doctest-parallel = dontCheck super.doctest-parallel;