haskellPackages.gi-*: Fix some builds

Changed files
+26
pkgs
+2
pkgs/development/haskell-modules/configuration-common.nix
···
gi-gtk-hs = self.gi-gtk-hs_0_3_10;
gi-dbusmenu = self.gi-dbusmenu_0_4_9;
gi-xlib = self.gi-xlib_2_0_10;
# 2021-05-17: Needs some manual patching to be compatible with haskell-gi-base 0.25
# Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119
···
gi-gtk-hs = self.gi-gtk-hs_0_3_10;
gi-dbusmenu = self.gi-dbusmenu_0_4_9;
gi-xlib = self.gi-xlib_2_0_10;
+
gi-gdkx11 = self.gi-gdkx11_3_0_11;
+
gi-dbusmenugtk3 = self.gi-dbusmenugtk3_0_4_10;
# 2021-05-17: Needs some manual patching to be compatible with haskell-gi-base 0.25
# Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119
+1
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
···
- sbv == 7.13 # required for pkgs.petrinizer
- gi-gdk == 3.0.24 # 2021-05-07: For haskell-gi 0.25 without gtk4
- gi-gtk < 4.0 # 2021-05-07: For haskell-gi 0.25 without gtk4
package-maintainers:
peti:
···
- sbv == 7.13 # required for pkgs.petrinizer
- gi-gdk == 3.0.24 # 2021-05-07: For haskell-gi 0.25 without gtk4
- gi-gtk < 4.0 # 2021-05-07: For haskell-gi 0.25 without gtk4
+
- gi-gdkx11 == 3.0.11 # 2021-05-07: For haskell-gi 0.25 without gtk4
package-maintainers:
peti:
+23
pkgs/development/haskell-modules/hackage-packages.nix
···
license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) gtk3;};
"gi-gdkx11_4_0_3" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
, gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk4-x11, haskell-gi
···
license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) gtk3;};
+
"gi-gdkx11_3_0_11" = callPackage
+
({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
+
, gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi
+
, haskell-gi-base, haskell-gi-overloading, text, transformers
+
}:
+
mkDerivation {
+
pname = "gi-gdkx11";
+
version = "3.0.11";
+
sha256 = "07r47fpx6rvsahgnv8g741fl6h1s6y1xrlyacbpc3d8cv7x4aax2";
+
setupHaskellDepends = [
+
base Cabal gi-cairo gi-gdk gi-gio gi-gobject gi-xlib haskell-gi
+
];
+
libraryHaskellDepends = [
+
base bytestring containers gi-cairo gi-gdk gi-gio gi-gobject
+
gi-xlib haskell-gi haskell-gi-base haskell-gi-overloading text
+
transformers
+
];
+
libraryPkgconfigDepends = [ gtk3 ];
+
description = "GdkX11 bindings";
+
license = lib.licenses.lgpl21Only;
+
hydraPlatforms = lib.platforms.none;
+
}) {inherit (pkgs) gtk3;};
+
"gi-gdkx11_4_0_3" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
, gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk4-x11, haskell-gi