From 8d1ec1d03da6b62d67ea1d3bb884275b5958a843 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sun, 12 Oct 2025 22:38:38 +0800 Subject: [PATCH] haskellPackages.gi-gtk-hs: use gi-gtk3 and gi-gdk3 to fix build Upstream change that makes this change hasn't been released yet. Co-authored-by: sternenseemann --- .../haskell-modules/configuration-common.nix | 19 +++++++++++++++++++ .../configuration-hackage2nix/broken.yaml | 1 - .../transitive-broken.yaml | 1 - .../haskell-modules/hackage-packages.nix | 2 -- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9ac0952076b6..cfa210d9b218 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3363,6 +3363,25 @@ with haskellLib; stripe-signature = doJailbreak super.stripe-signature; stripe-wreq = doJailbreak super.stripe-wreq; + # 2025-10-12: gi-gtk was renamed to gi-gtk3 + # https://github.com/haskell-gi/haskell-gi/issues/478 + gi-gtk-hs = + appendPatches + [ + (pkgs.fetchpatch { + name = "gi-gtk-hs-use-gtk3.patch"; + url = "https://github.com/haskell-gi/haskell-gi/commit/e2ed85835499f70e119f050a2f37f22481f93886.patch"; + sha256 = "sha256-MzxXtBNBbJJaNwTOrq/CYqK4yGfS4Yk5fQ38ihFcclA="; + relative = "gi-gtk-hs"; + }) + ] + ( + super.gi-gtk-hs.override { + gi-gdk = self.gi-gdk3; + gi-gtk = self.gi-gtk3; + } + ); + # 2025-08-04: Disable failing testcases. It would feel bad to disable all the # checks in a cryptography related package. botan-low = overrideCabal (drv: { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 1012f06cdb83..496b82342f40 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -2169,7 +2169,6 @@ broken-packages: - gi-gstapp # failure in job https://hydra.nixos.org/build/253686159 at 2024-03-31 - gi-gsttag # failure in job https://hydra.nixos.org/build/233197576 at 2023-09-02 - gi-gtk-declarative # failure in job https://hydra.nixos.org/build/307610571 at 2025-09-19 - - gi-gtk-hs # failure in job https://hydra.nixos.org/build/307610574 at 2025-09-19 - gi-gtk4-layer-shell # failure in job https://hydra.nixos.org/build/302803068 at 2025-07-27 - gi-gtksheet # failure in job https://hydra.nixos.org/build/233211386 at 2023-09-02 - gi-ibus # failure in job https://hydra.nixos.org/build/233220272 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 4f70b7e6cdef..04eaedcec9e0 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -679,7 +679,6 @@ dont-distribute-packages: - datadog-tracing - datafix - dataflow - - dataframe_0_3_0_4 - datasets - date-conversions - dbjava diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index cd719b95d2f8..e179bb5a7c60 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -264668,8 +264668,6 @@ self: { ]; description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { };