From 5ae2fba1b126071801d17a5ae14e952b08832177 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Fri, 9 Feb 2024 14:10:03 +0800 Subject: haskellPackages.gi-gtk_4: Build fixes --- pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs/development/haskell-modules/configuration-hackage2nix') diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 5ab0290bbed6..2f31cd4af852 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1868,7 +1868,6 @@ broken-packages: - gi-coglpango # failure in job https://hydra.nixos.org/build/233194401 at 2023-09-02 - Gifcurry # failure in job https://hydra.nixos.org/build/233200204 at 2023-09-02 - gi-gio-hs-list-model # failure in job https://hydra.nixos.org/build/233241640 at 2023-09-02 - - gi-gsk # failure in compileBuildDriverPhase in job https://hydra.nixos.org/build/239849990 at 2023-11-10 - 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/233217494 at 2023-09-02 - gi-gtksheet # failure in job https://hydra.nixos.org/build/233211386 at 2023-09-02 -- cgit 1.4.1 From d06425d779cb4b23fc3b9d8e97a3dc5b27dea2d2 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sat, 10 Feb 2024 15:40:15 +0800 Subject: haskellPackages.gi-adwaita: Build fixes --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ .../development/haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) (limited to 'pkgs/development/haskell-modules/configuration-hackage2nix') diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b8f60c3b3cc8..d7e1dac7018d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2230,6 +2230,10 @@ self: super: { gi-gsk = super.gi-gsk.override { gi-gdk = self.gi-gdk_4; }; + gi-adwaita = super.gi-adwaita.override { + gi-gdk = self.gi-gdk_4; + gi-gtk = self.gi-gtk_4; + }; # Missing dependency on gi-cairo # https://github.com/haskell-gi/haskell-gi/pull/420 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 2f31cd4af852..f2fc1dbf4b3a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1862,7 +1862,6 @@ broken-packages: - ghc-time-alloc-prof # failure in job https://hydra.nixos.org/build/233242289 at 2023-09-02 - ghc-usage # failure in job https://hydra.nixos.org/build/233199565 at 2023-09-02 - gh-labeler # failure in job https://hydra.nixos.org/build/233233139 at 2023-09-02 - - gi-adwaita # failure in compileBuildDriverPhase in job https://hydra.nixos.org/build/239685049 at 2023-11-10 - giak # failure in job https://hydra.nixos.org/build/233242229 at 2023-09-02 - gi-clutter # failure in job https://hydra.nixos.org/build/233252753 at 2023-09-02 - gi-coglpango # failure in job https://hydra.nixos.org/build/233194401 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index bd91a4a83d8b..44780fe5e5db 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1361,6 +1361,7 @@ self: super: builtins.intersectAttrs super { gi-gtk_4_0_8 gi-gdk_4_0_7 gi-gsk + gi-adwaita ; # Makes the mpi-hs package respect the choice of mpi implementation in Nixpkgs. -- cgit 1.4.1 From 081f32d2ae355f7d946d81235954a03e02120ef9 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Fri, 9 Feb 2024 20:39:55 +0800 Subject: haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/configuration-hackage2nix/transitive-broken.yaml | 2 -- pkgs/development/haskell-modules/hackage-packages.nix | 4 ---- 2 files changed, 6 deletions(-) (limited to 'pkgs/development/haskell-modules/configuration-hackage2nix') diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index b238fa97e0b3..23cd5617eb94 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1479,7 +1479,6 @@ dont-distribute-packages: - gi-ges - gi-gstpbutils - gi-gtk-declarative-app-simple - - gi-gtk_4_0_8 - git-config - git-fmt - git-gpush @@ -4002,7 +4001,6 @@ dont-distribute-packages: - wahsp - wai-devel - wai-dispatch - - wai-handler-hal - wai-handler-snap - wai-hastache - wai-middleware-brotli diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3654fde0e7c4..034a3cd09fbe 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -118809,8 +118809,6 @@ self: { description = "Adwaita bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) libadwaita;}; "gi-atk" = callPackage @@ -119352,8 +119350,6 @@ self: { libraryPkgconfigDepends = [ gtk4 ]; description = "Gsk bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk4;}; "gi-gst" = callPackage -- cgit 1.4.1