From 89a53c5e8f398bbc4e170e82a64166801a7ce289 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 19 Apr 2026 21:30:36 +0200 Subject: [PATCH] haskellPackages.dom-parser: prevent revision from breaking the build Hackage revisions have introduced an upper bound on text <2.1.2 which we have a patch for. --- .../haskell-modules/configuration-common.nix | 22 +++++++++++++------ .../configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a3f71864447d..35a11a3ed120 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1722,13 +1722,21 @@ with haskellLib; ]; # Unreleased patch fixing compilation with text >= 2.1.2 - dom-parser = appendPatches [ - (pkgs.fetchpatch { - name = "dom-parser-text-2.1.2.patch"; - url = "https://github.com/typeable/dom-parser/commit/b8d9af75595072026a1706e94750dba55e65326b.patch"; - hash = "sha256-c7ea0YCtXhv4u+pTuxcWoISa+yV2oEtxS/RmC6Bbx1M="; - }) - ] super.dom-parser; + dom-parser = + appendPatches + [ + (pkgs.fetchpatch { + name = "dom-parser-text-2.1.2.patch"; + url = "https://github.com/typeable/dom-parser/commit/b8d9af75595072026a1706e94750dba55e65326b.patch"; + hash = "sha256-c7ea0YCtXhv4u+pTuxcWoISa+yV2oEtxS/RmC6Bbx1M="; + }) + ] + ( + overrideCabal { + revision = null; + editedCabalFile = null; + } super.dom-parser + ); # Requires jsaddle-webkit2gtk to build outside of pkgsCross.ghcjs # which requires a version of libsoup that's marked as insecure diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index d3a55ec09527..b3a363ca4759 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1467,7 +1467,6 @@ broken-packages: - DOH # failure in job https://hydra.nixos.org/build/233231913 at 2023-09-02 - doi # failure in job https://hydra.nixos.org/build/295092999 at 2025-04-22 - dom-events # failure in job https://hydra.nixos.org/build/233231199 at 2023-09-02 - - dom-parser # failure in job https://hydra.nixos.org/build/315095926 at 2025-11-29 - dom-selector # failure in job https://hydra.nixos.org/build/233212663 at 2023-09-02 - domaindriven-core # failure in job https://hydra.nixos.org/build/233234739 at 2023-09-02 - dominion # failure in job https://hydra.nixos.org/build/252714022 at 2024-03-16 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 57b4a1fa6e87..1f75199d32c1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -205981,8 +205981,6 @@ self: { ]; description = "Simple monadic DOM parser"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { };