From 11a35044f4e889c15ee1b1855bdfea69271d2b27 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 13 Feb 2025 21:32:32 +0100 Subject: [PATCH 1/7] haskellPackages.Chart-tests: fix build I had removed the jailbreak in 34fc7fce0d3e4f90f4bc3c622f8bbe761027098e, but couldn't test this because of a broken dependency. The original issue was resolved, but of course new bounds are now broken. --- 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 1258dcc7d9569..66f0c45af3b4b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1477,6 +1477,8 @@ self: super: { # Chart-tests needs and compiles some modules from Chart itself Chart-tests = overrideCabal (old: { + # 2025-02-13: Too strict bounds on lens < 5.3 and vector < 0.13 + jailbreak = true; preCheck = old.preCheck or "" + '' tar --one-top-level=../chart --strip-components=1 -xf ${self.Chart.src} ''; From 76940478ef55efb10e245e7c2b23430fcc0b9ab5 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 13 Feb 2025 21:31:01 +0100 Subject: [PATCH 2/7] haskellPackages.threadscope: remove some patches --- .../haskell-modules/configuration-common.nix | 30 ++----------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 66f0c45af3b4b..9309ecc9a53e4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -388,38 +388,14 @@ 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 - ''; - editedCabalFile = null; - revision = null; - }) - (appendPatches [ - (fetchpatch { - name = "loosen-bounds-1.patch"; - url = "https://github.com/haskell/ThreadScope/commit/8f9f21449adb3af07eed539dcaf267c9c9ee987b.patch"; - sha256 = "sha256-egKM060QplSmUeDptHXoSom1vf5KBrvNcjb2Vk59N7A="; - }) - (fetchpatch { - name = "loosen-bounds-2.patch"; - url = "https://github.com/haskell/ThreadScope/commit/f366a9ee455eda16cd6a4dc26f0275e2cf2b5798.patch"; - sha256 = "sha256-DaPTK5LRbZZS1KDIr5X/eXQasqtofrCteTbUQUZPu0Q="; - }) - (fetchpatch { - name = "loosen-bounds-3.patch"; - url = "https://github.com/haskell/ThreadScope/commit/12819abaa2322976004b7582e598db1cf952707a.patch"; - sha256 = "sha256-r7MVw8wwKU4R5VmcypBzhOBfTlRCISoRJtwie3+2Vb0="; - }) + # 2025-02-13: This part from https://github.com/haskell/ThreadScope/pull/130 seems to be unreleased: + threadscope = appendPatches [ (fetchpatch { name = "import-monad.patch"; url = "https://github.com/haskell/ThreadScope/commit/8846508e9769a8dfd82b3ff66259ba4d58255932.patch"; sha256 = "sha256-wBqDJWmqvmU1sFuw/ZlxHOb8xPhZO2RBuyYFP9bJCVI="; }) - ] - super.threadscope); + ] super.threadscope; # The latest release on hackage has an upper bound on containers which # breaks the build, though it works with the version of containers present From d25937cace0027e885efb7af927c77e30c140367 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 13 Feb 2025 22:28:23 +0100 Subject: [PATCH 3/7] haskellPackages.attoparsec-varword: fix build Builds fine. --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++-- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9309ecc9a53e4..c1a8ce26c4b5d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -318,8 +318,9 @@ self: super: { # Too strict bounds on bytestring < 0.12 superbuffer = doJailbreak super.superbuffer; - # Needs older QuickCheck version - attoparsec-varword = dontCheck super.attoparsec-varword; + # Infinite recursion with test enabled. + # 2025-02-14: Too strict bounds on attoparsec < 0.14 + attoparsec-varword = doJailbreak (dontCheck super.attoparsec-varword); # These packages (and their reverse deps) cannot be built with profiling enabled. ghc-heap-view = disableLibraryProfiling super.ghc-heap-view; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index e4ed937ca5102..3b17c229299ad 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -295,7 +295,6 @@ broken-packages: - attoparsec-csv # failure in job https://hydra.nixos.org/build/233245402 at 2023-09-02 - attoparsec-text # failure in job https://hydra.nixos.org/build/233227820 at 2023-09-02 - attoparsec-trans # failure in job https://hydra.nixos.org/build/233203168 at 2023-09-02 - - attoparsec-varword # failure in job https://hydra.nixos.org/build/233234240 at 2023-09-02 - attosplit # failure in job https://hydra.nixos.org/build/233203118 at 2023-09-02 - Attrac # failure in job https://hydra.nixos.org/build/234459267 at 2023-09-13 - augeas # failure in job https://hydra.nixos.org/build/233228677 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e4e17ff625bbb..dc3ecdc365562 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -42982,8 +42982,6 @@ self: { ]; description = "Variable-length integer decoding for Attoparsec"; license = lib.licenses.lgpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "attosplit" = callPackage From a1578f0005a1be98a04498c5ed279923f363f8ed Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 13 Feb 2025 22:28:35 +0100 Subject: [PATCH 4/7] haskellPackages.kewar: unbreak Builds fine. --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 2 files changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 3b17c229299ad..5d17a6ed4063e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3342,7 +3342,6 @@ broken-packages: - kempe # failure in job https://hydra.nixos.org/build/233221290 at 2023-09-02 - kesha # failure in job https://hydra.nixos.org/build/233215581 at 2023-09-02 - Ketchup # failure in job https://hydra.nixos.org/build/233211862 at 2023-09-02 - - kewar # failure in job https://hydra.nixos.org/build/233237574 at 2023-09-02 - keycloak-hs # failure in job https://hydra.nixos.org/build/233193019 at 2023-09-02 - keyed # failure in job https://hydra.nixos.org/build/233251186 at 2023-09-02 - key # failure in job https://hydra.nixos.org/build/252710595 at 2024-03-16 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index dc3ecdc365562..0ad5dc18d2219 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -184510,9 +184510,7 @@ self: { testHaskellDepends = [ array base containers HUnit split ]; description = "CLI and library to generate QR codes"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "kewar"; - broken = true; }) {}; "key" = callPackage From b3bdab23d92ab653be72fcf7ac499118938a3c7e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 13 Feb 2025 21:23:26 +0100 Subject: [PATCH 5/7] haskellPackages: move markBroken to broken.yaml --- .../haskell-modules/configuration-common.nix | 25 ----------------- .../configuration-hackage2nix/broken.yaml | 15 +++++++++- .../transitive-broken.yaml | 2 ++ .../haskell-modules/hackage-packages.nix | 28 +++++++++++++++++++ 4 files changed, 44 insertions(+), 26 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c1a8ce26c4b5d..c0bdcfed3dfa1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -951,18 +951,6 @@ self: super: { # vector dependency < 0.12 imagemagick = doJailbreak super.imagemagick; - # Elm is no longer actively maintained on Hackage: https://github.com/NixOS/nixpkgs/pull/9233. - Elm = markBroken super.Elm; - elm-build-lib = markBroken super.elm-build-lib; - elm-compiler = markBroken super.elm-compiler; - elm-get = markBroken super.elm-get; - elm-make = markBroken super.elm-make; - elm-package = markBroken super.elm-package; - elm-reactor = markBroken super.elm-reactor; - elm-repl = markBroken super.elm-repl; - elm-server = markBroken super.elm-server; - elm-yesod = markBroken super.elm-yesod; - # https://github.com/Euterpea/Euterpea2/issues/40 Euterpea = doJailbreak super.Euterpea; @@ -1057,9 +1045,6 @@ self: super: { }; } super.djinn; - # We cannot build this package w/o the C library from . - phash = markBroken super.phash; - # https://github.com/Philonous/hs-stun/pull/1 # Remove if a version > 0.1.0.1 ever gets released. stunclient = overrideCabal (drv: { @@ -1109,9 +1094,6 @@ self: super: { # note: the library is unmaintained, no upstream issue dataenc = doJailbreak super.dataenc; - # horribly outdated (X11 interface changed a lot) - sindre = markBroken super.sindre; - # Test suite occasionally runs for 1+ days on Hydra. distributed-process-tests = dontCheck super.distributed-process-tests; @@ -1193,10 +1175,6 @@ self: super: { testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ]; }) super.sensei; - # Depends on broken fluid. - fluid-idl-http-client = markBroken super.fluid-idl-http-client; - fluid-idl-scotty = markBroken super.fluid-idl-scotty; - # Work around https://github.com/haskell/c2hs/issues/192. c2hs = dontCheck super.c2hs; @@ -1411,9 +1389,6 @@ self: super: { # Test suite won't link for no apparent reason. constraints-deriving = dontCheck super.constraints-deriving; - # https://github.com/elliottt/hsopenid/issues/15 - openid = markBroken super.openid; - # https://github.com/erikd/hjsmin/issues/32 hjsmin = dontCheck super.hjsmin; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 5d17a6ed4063e..30c39e00b09a7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1517,9 +1517,19 @@ broken-packages: - ekg-statsd # failure in job https://hydra.nixos.org/build/233200955 at 2023-09-02 - elevator # failure in job https://hydra.nixos.org/build/233213794 at 2023-09-02 - elision # failure in job https://hydra.nixos.org/build/233218969 at 2023-09-02 + - Elm # Elm is no longer actively maintained on Hackage: https://github.com/NixOS/nixpkgs/pull/9233. + - elm-build-lib # Elm is no longer actively maintained on Hackage: https://github.com/NixOS/nixpkgs/pull/9233. + - elm-compiler # Elm is no longer actively maintained on Hackage: https://github.com/NixOS/nixpkgs/pull/9233. - elm-export-persistent # failure in job https://hydra.nixos.org/build/233248910 at 2023-09-02 - - elminator # failure in job https://hydra.nixos.org/build/252729949 at 2024-03-16 + - elm-get # Elm is no longer actively maintained on Hackage: https://github.com/NixOS/nixpkgs/pull/9233. + - elm-make # Elm is no longer actively maintained on Hackage: https://github.com/NixOS/nixpkgs/pull/9233. + - elm-package # Elm is no longer actively maintained on Hackage: https://github.com/NixOS/nixpkgs/pull/9233. + - elm-reactor # Elm is no longer actively maintained on Hackage: https://github.com/NixOS/nixpkgs/pull/9233. + - elm-repl # Elm is no longer actively maintained on Hackage: https://github.com/NixOS/nixpkgs/pull/9233. + - elm-server # Elm is no longer actively maintained on Hackage: https://github.com/NixOS/nixpkgs/pull/9233. - elm-websocket # failure in job https://hydra.nixos.org/build/233192201 at 2023-09-02 + - elm-yesod # Elm is no longer actively maintained on Hackage: https://github.com/NixOS/nixpkgs/pull/9233. + - elminator # failure in job https://hydra.nixos.org/build/252729949 at 2024-03-16 - elocrypt # failure in job https://hydra.nixos.org/build/233229627 at 2023-09-02 - ema-generics # failure in job https://hydra.nixos.org/build/233200038 at 2023-09-02 - emailaddress # failure in job https://hydra.nixos.org/build/233202700 at 2023-09-02 @@ -4275,6 +4285,7 @@ broken-packages: - opengles # failure in job https://hydra.nixos.org/build/233214966 at 2023-09-02 - OpenGLRaw21 # failure in job https://hydra.nixos.org/build/233229407 at 2023-09-02 - open-haddock # failure in job https://hydra.nixos.org/build/233205112 at 2023-09-02 + - openid # https://github.com/elliottt/hsopenid/issues/15 - openid-connect # failure in job https://hydra.nixos.org/build/233196765 at 2023-09-02 - open-pandoc # failure in job https://hydra.nixos.org/build/233247973 at 2023-09-02 - openpgp # failure in job https://hydra.nixos.org/build/233244438 at 2023-09-02 @@ -4526,6 +4537,7 @@ broken-packages: - pgvector # failure in job https://hydra.nixos.org/build/233202205 at 2023-09-02 - phasechange # failure in job https://hydra.nixos.org/build/233254293 at 2023-09-02 - phaser # failure in job https://hydra.nixos.org/build/233250604 at 2023-09-02 + - phash # We cannot build this package w/o the C library from . - phkdf # failure in job https://hydra.nixos.org/build/255669790 at 2024-04-16 - phladiprelio-general-datatype # failure in job https://hydra.nixos.org/build/275139962 at 2024-10-21 - phoityne # failure in job https://hydra.nixos.org/build/233195238 at 2023-09-02 @@ -5496,6 +5508,7 @@ broken-packages: - simplexmq # failure in job https://hydra.nixos.org/build/233223717 at 2023-09-02 - simple-zipper # failure in job https://hydra.nixos.org/build/233210316 at 2023-09-02 - simplistic-generics # failure in job https://hydra.nixos.org/build/233217412 at 2023-09-02 + - sindre # horribly outdated (X11 interface changed a lot) - singlethongs # failure in job https://hydra.nixos.org/build/233202756 at 2023-09-02 - singleton-dict # failure in job https://hydra.nixos.org/build/233245405 at 2023-09-02 - singleton-typelits # failure in job https://hydra.nixos.org/build/233250877 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 287a9b66cdd72..3ac0ab064ccb5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1374,6 +1374,8 @@ dont-distribute-packages: - fltkhs-themes - fluent-logger - fluent-logger-conduit + - fluid-idl-http-client + - fluid-idl-scotty - fmt-for-rio - foldable1 - foldl-transduce-attoparsec diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 0ad5dc18d2219..d04f75f1a6609 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5638,6 +5638,8 @@ self: { ]; description = "The Elm language module"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Emping" = callPackage @@ -98756,6 +98758,8 @@ self: { ]; description = "Compile Elm code to JS within Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "elm-compiler" = callPackage @@ -98794,6 +98798,8 @@ self: { ]; description = "Values to help with elm-package, elm-make, and elm-lang.org."; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "elm-core-sources" = callPackage @@ -98874,7 +98880,9 @@ self: { ]; description = "Tool for sharing and using Elm libraries"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "elm-get"; + broken = true; }) {}; "elm-hybrid" = callPackage @@ -98930,7 +98938,9 @@ self: { ]; description = "A build tool for Elm projects"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "elm-make"; + broken = true; }) {}; "elm-package" = callPackage @@ -98960,7 +98970,9 @@ self: { ]; description = "Package manager for Elm libraries"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "elm-package"; + broken = true; }) {}; "elm-reactor" = callPackage @@ -98985,7 +98997,9 @@ self: { ]; description = "Interactive development tool for Elm programs"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "elm-reactor"; + broken = true; }) {}; "elm-repl" = callPackage @@ -99011,7 +99025,9 @@ self: { ]; description = "a REPL for Elm"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "elm-repl"; + broken = true; }) {}; "elm-server" = callPackage @@ -99031,7 +99047,9 @@ self: { ]; description = "Server for developing Elm projects"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "elm-server"; + broken = true; }) {}; "elm-street" = callPackage @@ -99121,6 +99139,8 @@ self: { ]; description = "The Elm language Yesod compatibility module"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "elm2nix" = callPackage @@ -111045,6 +111065,7 @@ self: { ]; description = "Http Client addon for Fluid"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "fluid-idl-scotty" = callPackage @@ -111058,6 +111079,7 @@ self: { ]; description = "Scotty server add-on for Fluid"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "fluidsynth" = callPackage @@ -226542,6 +226564,8 @@ self: { ]; description = "An implementation of the OpenID-2.0 spec."; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "openid-connect" = callPackage @@ -237214,6 +237238,8 @@ self: { testSystemDepends = [ pHash ]; description = "Haskell bindings to pHash, the open source perceptual hash library"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {pHash = null;}; "phatsort" = callPackage @@ -282019,7 +282045,9 @@ self: { executablePkgconfigDepends = [ libXft xext ]; description = "A programming language for simple GUIs"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "sindre"; + broken = true; }) {inherit (pkgs.xorg) libXft; xext = null;}; "single-tuple" = callPackage From cf1abf5e0a13fdf8bfd47dfbc17f74ee5b34e80d Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 13 Feb 2025 22:17:05 +0100 Subject: [PATCH 6/7] haskellPackages: remove changelog-d This package is not defined in hackage-packages.nix. --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 30c39e00b09a7..87b7e29485f52 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -744,13 +744,6 @@ broken-packages: - chakra # failure in job https://hydra.nixos.org/build/282936173 at 2024-12-24 - chalkboard # failure in job https://hydra.nixos.org/build/234453414 at 2023-09-13 - chalmers-lava2000 # failure in job https://hydra.nixos.org/build/233239592 at 2023-09-02 - - changelog-d # failure in job https://hydra.nixos.org/build/252716175 at 2024-03-16 - - changelog-d # failure in job https://hydra.nixos.org/build/253689337 at 2024-03-31 - - changelog-d # failure in job https://hydra.nixos.org/build/255671571 at 2024-04-16 - - changelog-d # failure in job https://hydra.nixos.org/build/257082502 at 2024-04-27 - - changelog-d # failure in job https://hydra.nixos.org/build/259607598 at 2024-05-15 - - changelog-d # failure in job https://hydra.nixos.org/build/259957724 at 2024-05-19 - - changelog-d # failure in job https://hydra.nixos.org/build/260724402 at 2024-05-25 - changelogged # failure in job https://hydra.nixos.org/build/233211675 at 2023-09-02 - character-cases # failure in job https://hydra.nixos.org/build/233197636 at 2023-09-02 - charter # failure in job https://hydra.nixos.org/build/233237264 at 2023-09-02 From 9366c95768781f0aff2d7e3a53a55586e99baefd Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 13 Feb 2025 22:17:38 +0100 Subject: [PATCH 7/7] haskellPackages: remove config for bounds-related broken packages --- .../haskell-modules/configuration-common.nix | 82 ------------------- 1 file changed, 82 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c0bdcfed3dfa1..966fc241033c6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -301,10 +301,6 @@ self: super: { # successfully with recent versions of the compiler). bin-package-db = null; - # path-io bound is adjusted in 0.6.1 release - # https://github.com/tek/hix/commit/019426f6a3db256e4c96558ffe6fa2114e2f19a0 - hix = doJailbreak super.hix; - # waiting for release: https://github.com/jwiegley/c2hsc/issues/41 c2hsc = appendPatch (fetchpatch { url = "https://github.com/jwiegley/c2hsc/commit/490ecab202e0de7fc995eedf744ad3cb408b53cc.patch"; @@ -598,9 +594,6 @@ self: super: { # 2024-05-18: Upstream tests against a different pandoc version pandoc-crossref = dontCheck super.pandoc-crossref; - # base bound - digit = doJailbreak super.digit; - # 2022-01-29: Tests require package to be in ghc-db. aeson-schemas = dontCheck super.aeson-schemas; @@ -910,9 +903,6 @@ self: super: { # https://github.com/nomeata/tasty-expected-failure/issues/21 tasty-expected-failure = dontCheck super.tasty-expected-failure; - # Won't compile with recent versions of QuickCheck. - inilist = dontCheck super.inilist; - # https://github.com/yaccz/saturnin/issues/3 Saturnin = dontCheck super.Saturnin; @@ -948,9 +938,6 @@ self: super: { # https://github.com/kazu-yamamoto/logger/issues/42 logger = dontCheck super.logger; - # vector dependency < 0.12 - imagemagick = doJailbreak super.imagemagick; - # https://github.com/Euterpea/Euterpea2/issues/40 Euterpea = doJailbreak super.Euterpea; @@ -1126,9 +1113,6 @@ self: super: { postInstall = "rm $out/bin/mkReadme && rmdir $out/bin"; }) super.hastache; - # Has a dependency on outdated versions of directory. - cautious-file = doJailbreak (dontCheck super.cautious-file); - # 2025-02-10: Too strict bounds on text < 2.1 digestive-functors-blaze = doJailbreak super.digestive-functors-blaze; digestive-functors = doJailbreak super.digestive-functors; @@ -1160,9 +1144,6 @@ self: super: { } ) z3 hz3; - # Tests try to invoke external process and process == 1.4 - grakn = dontCheck (doJailbreak super.grakn); - # test suite requires git and does a bunch of git operations restless-git = dontCheck super.restless-git; @@ -1193,10 +1174,6 @@ self: super: { # Needs QuickCheck <2.10, which we don't have. edit-distance = doJailbreak super.edit-distance; - # Needs tasty-quickcheck ==0.8.*, which we don't have. - gitHUD = dontCheck super.gitHUD; - githud = dontCheck super.githud; - # Test suite fails due to trying to create directories path-io = dontCheck super.path-io; @@ -1220,9 +1197,6 @@ self: super: { VulkanMemoryAllocator = addExtraLibrary pkgs.vulkan-headers super.VulkanMemoryAllocator; vulkan-utils = addExtraLibrary pkgs.vulkan-headers super.vulkan-utils; - # Work around overspecified constraint on github ==0.18. - github-backup = doJailbreak super.github-backup; - # dontCheck: https://github.com/haskell-servant/servant-auth/issues/113 servant-auth-client = dontCheck super.servant-auth-client; @@ -1270,9 +1244,6 @@ self: super: { # https://github.com/haskell/hoopl/issues/50 hoopl = dontCheck super.hoopl; - # https://github.com/DanielG/cabal-helper/pull/123 - cabal-helper = doJailbreak super.cabal-helper; - # TODO(Profpatsch): factor out local nix store setup from # lib/tests/release.nix and use that for the tests of libnix # libnix = overrideCabal (old: { @@ -1416,10 +1387,6 @@ self: super: { # https://github.com/haskell-servant/servant-ekg/issues/15 servant-ekg = doJailbreak super.servant-ekg; - # the test suite has an overly tight restriction on doctest - # See https://github.com/ekmett/perhaps/pull/5 - perhaps = doJailbreak super.perhaps; - # it wants to build a statically linked binary by default hledger-flow = overrideCabal (drv: { postPatch = (drv.postPatch or "") + '' @@ -1825,13 +1792,6 @@ self: super: { # compatible with Cabal 3. No upstream repository found so far readline = appendPatch ./patches/readline-fix-for-cabal-3.patch super.readline; - # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27) - pandoc-include-code = doJailbreak super.pandoc-include-code; - - # 2023-07-08: Restrictive upper bounds on text: https://github.com/owickstrom/pandoc-emphasize-code/pull/14 - # 2023-07-08: Missing test dependency: https://github.com/owickstrom/pandoc-emphasize-code/pull/13 - pandoc-emphasize-code = dontCheck (doJailbreak super.pandoc-emphasize-code); - # DerivingVia is not allowed in safe Haskell # https://github.com/strake/util.hs/issues/1 util = appendConfigureFlags [ @@ -1892,19 +1852,10 @@ self: super: { # https://github.com/noinia/hgeometry/commit/a6abecb1ce4a7fd96b25cc1a5c65cd4257ecde7a#commitcomment-49282301 hgeometry-combinatorial = dontCheck (doJailbreak super.hgeometry-combinatorial); - # Test suite has a too strict bound on base - # https://github.com/jswebtools/language-ecmascript/pull/88 - # Test suite doesn't compile anymore - language-ecmascript = dontCheck (doJailbreak super.language-ecmascript); - # Too strict bounds on containers # https://github.com/jswebtools/language-ecmascript-analysis/issues/1 language-ecmascript-analysis = doJailbreak super.language-ecmascript-analysis; - # Too strict bounds on optparse-applicative - # https://github.com/faylang/fay/pull/474 - fay = doJailbreak super.fay; - cli-git = addBuildTool pkgs.git super.cli-git; cli-nix = addBuildTools [ @@ -2100,8 +2051,6 @@ self: super: { sha256 = "0l15ccfdys100jf50s9rr4p0d0ikn53bkh7a9qlk9i0y0z5jc6x1"; }) super.basic-cpuid; - # 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; # 2025-02-11: Too strict bounds on bytestring streamly-bytestring = doJailbreak super.streamly-bytestring; @@ -2226,10 +2175,6 @@ self: super: { # https://github.com/tree-sitter/haskell-tree-sitter/issues/298 tree-sitter = doJailbreak super.tree-sitter; - # 2022-08-07: Bounds are too restrictive: https://github.com/marcin-rzeznicki/libjwt-typed/issues/2 - # Also, the tests fail. - libjwt-typed = dontCheck (doJailbreak super.libjwt-typed); - # Test suite fails to compile # https://github.com/kuribas/mfsolve/issues/8 mfsolve = dontCheck super.mfsolve; @@ -2291,9 +2236,6 @@ self: super: { x509-validation = self.crypton-x509-validation; })); - # 2022-02-25: Unmaintained and to strict upper bounds - paths = doJailbreak super.paths; - # 2022-03-16: Upstream stopped updating bounds https://github.com/haskell-hvr/base-noprelude/pull/15 base-noprelude = doJailbreak super.base-noprelude; @@ -2303,9 +2245,6 @@ self: super: { # dontCheck: tests don't typecheck after ghc 8.4 (possibly introduced by api change of unix library) system-fileio = dontCheck super.system-fileio; - # Bounds too strict on base and ghc-prim: https://github.com/tibbe/ekg-core/pull/43 (merged); waiting on hackage release - hasura-ekg-core = doJailbreak super.hasura-ekg-core; - # Test suite doesn't support hspec 2.8 # https://github.com/zellige/hs-geojson/issues/29 geojson = dontCheck super.geojson; @@ -2470,21 +2409,9 @@ self: super: { purenix ; - # We provide newer dependencies than upstream expects. - swarm = doJailbreak super.swarm; - - # random <1.2 - unfoldable = doJailbreak super.unfoldable; - # containers <0.6, semigroupoids <5.3 data-lens = doJailbreak super.data-lens; - # transformers <0.3 - monads-fd = doJailbreak super.monads-fd; - - # exceptions <0.9 - eprocess = doJailbreak super.eprocess; - # hashable <1.4, mmorph <1.2 composite-aeson = doJailbreak super.composite-aeson; @@ -2541,9 +2468,6 @@ self: super: { # Tests open file "data/test_vectors_aserti3-2d_run01.txt" but it doesn't exist haskoin-core = dontCheck super.haskoin-core; - # base <4.9, transformers <0.5 - MonadCatchIO-transformers = doJailbreak super.MonadCatchIO-transformers; - # unix-compat <0.5 hxt-cache = doJailbreak super.hxt-cache; @@ -2556,9 +2480,6 @@ self: super: { # base <4.14 decimal-literals = doJailbreak super.decimal-literals; - # multiple bounds too strict - snaplet-sqlite-simple = doJailbreak super.snaplet-sqlite-simple; - # Test failure https://gitlab.com/lysxia/ap-normalize/-/issues/2 ap-normalize = dontCheck super.ap-normalize; @@ -2591,9 +2512,6 @@ self: super: { # https://github.com/tweag/webauthn/issues/166 webauthn = dontCheck super.webauthn; - # multiple bounds too strict - co-log-polysemy-formatting = doJailbreak super.co-log-polysemy-formatting; - # calls ghc in tests # https://github.com/brandonchinn178/tasty-autocollect/issues/54 tasty-autocollect = dontCheck super.tasty-autocollect;