diff options
author | Malte Brandy <malte.brandy@maralorn.de> | 2021-05-07 20:09:32 +0200 |
---|---|---|
committer | Malte Brandy <malte.brandy@maralorn.de> | 2021-05-07 21:19:00 +0200 |
commit | 9fd589504eb629d84e5852e76fbc2708944c7877 (patch) | |
tree | 814b3c077217b2678693ee20ad8d2de06fc6883d | |
parent | b858ba8a7c9f6188f15a2cedee1b7e7a5fe8bbb7 (diff) |
haskellPackages.haskell-gi: Bump versions manually to still build with used C libs
4 files changed, 151 insertions, 304 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a341e6a657eeb..e1b40d87759bb 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1291,16 +1291,32 @@ self: super: { # https://github.com/kowainik/policeman/issues/57 policeman = doJailbreak super.policeman; - haskell-gi-base = addBuildDepends super.haskell-gi-base [ pkgs.gobject-introspection ]; - - # 2020-08-14: Needs some manual patching to be compatible with haskell-gi-base 0.24 + # nixpkgs has bumped gdkpixbuf C lib, so we need gi-gdkpixbuf_2_0_26 to link against that. + # This leads to all this bumps which can be removed once stackage has haskell-gi 0.25. + haskell-gi = self.haskell-gi_0_25_0; + haskell-gi-base = addBuildDepends super.haskell-gi-base_0_25_0 [ pkgs.gobject-introspection ]; + gi-glib = self.gi-glib_2_0_25; + gi-cairo = self.gi-cairo_1_0_25; + gi-gobject = self.gi-gobject_2_0_26; + gi-atk = self.gi-atk_2_0_23; + gi-gio = self.gi-gio_2_0_28; + gi-harfbuzz = self.gi-harfbuzz_0_0_4; + gi-javascriptcore = self.gi-javascriptcore_4_0_23; + gi-pango = self.gi-pango_1_0_24; + gi-soup = self.gi-soup_2_4_24; + gi-gdkpixbuf = self.gi-gdkpixbuf_2_0_26; + gi-gdk = self.gi-gdk_3_0_24; + gi-gtk = self.gi-gtk_3_0_37; + gi-webkit2 = self.gi-webkit2_4_0_27; + gi-cairo-render = doJailbreak super.gi-cairo-render; + gi-cairo-connector = doJailbreak super.gi-cairo-connector; + 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 - jsaddle-webkit2gtk = appendPatch super.jsaddle-webkit2gtk (pkgs.fetchpatch { - url = "https://github.com/ghcjs/jsaddle/compare/9727365...f842748.patch"; - sha256 = "07l4l999lmlx7sqxf7v4f70rmxhx9r0cjblkgc4n0y6jin4iv1cb"; - stripLen = 2; - extraPrefix = ""; - }); + jsaddle-webkit2gtk = appendPatch super.jsaddle-webkit2gtk ./patches/jsaddle-webkit2gtk.patch; # Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released) # https://github.com/lehins/massiv/pull/104 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index dccd1f75a93b7..46470d75db839 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -88,18 +88,18 @@ default-package-overrides: # so we need to restrict these to compatible versions # Remove these as soon as haskell-gi{,-base} are 0.25.* # in Stackage Nightly! - - gi-ggit < 1.0.10 - - gi-girepository < 1.0.24 - - gi-gst < 1.0.24 - - gi-gstbase < 1.0.24 - - gi-gstvideo < 1.0.24 - - gi-gtksource < 3.0.24 - - gi-ibus < 1.5.3 - - gi-notify < 0.7.23 - - gi-ostree < 1.0.14 - - gi-pangocairo < 1.0.25 - - gi-secret < 0.0.13 - - gi-vte < 2.91.28 + #- gi-ggit < 1.0.10 + #- gi-girepository < 1.0.24 + #- gi-gst < 1.0.24 + #- gi-gstbase < 1.0.24 + #- gi-gstvideo < 1.0.24 + #- gi-gtksource < 3.0.24 + #- gi-ibus < 1.5.3 + #- gi-notify < 0.7.23 + #- gi-ostree < 1.0.14 + #- gi-pangocairo < 1.0.25 + #- gi-secret < 0.0.13 + #- gi-vte < 2.91.28 # Stackage Nightly 2021-05-03 - abstract-deque ==0.3 @@ -2819,6 +2819,8 @@ extra-packages: - refinery == 0.3.* # required by hls-tactics-plugin-1.0.0.0 - resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x - 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: @@ -5777,7 +5779,6 @@ broken-packages: - ghcup - ght - gi-cairo-again - - gi-gmodule - gi-graphene - gi-gsk - gi-gstaudio diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 22a5534c8176a..16b9400d01a9a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -103670,6 +103670,31 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; + "gi-gdk_3_0_24" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo + , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gdk"; + version = "3.0.24"; + sha256 = "17slysv7zj3nbzh302w8jkvcfkvwfk5s80n99lqhggd6lnhf5fjx"; + setupHaskellDepends = [ + base Cabal gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango + haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib + gi-gobject gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtk3 ]; + description = "Gdk bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) gtk3;}; + "gi-gdk_4_0_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk4 @@ -103790,30 +103815,6 @@ self: { }: mkDerivation { pname = "gi-ggit"; - version = "1.0.9"; - sha256 = "0qvmppdby40ncd9alnnk8ang90qcaj00c0g0nrq0s0m1ynar8ccd"; - setupHaskellDepends = [ - base Cabal gi-gio gi-glib gi-gobject haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ libgit2-glib ]; - description = "libgit2-glib bindings"; - license = lib.licenses.lgpl21Only; - platforms = [ - "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" - ]; - }) {inherit (pkgs) libgit2-glib;}; - - "gi-ggit_1_0_10" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, libgit2-glib, text, transformers - }: - mkDerivation { - pname = "gi-ggit"; version = "1.0.10"; sha256 = "1rfmvml0wfw522c9gzzpjsg5ajbsbnzylc5rf2x3qqhb1x9y3bd2"; setupHaskellDepends = [ @@ -103829,7 +103830,6 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) libgit2-glib;}; "gi-gio" = callPackage @@ -103878,25 +103878,6 @@ self: { }: mkDerivation { pname = "gi-girepository"; - version = "1.0.23"; - sha256 = "0a8sis3zayiywi7mgs1g4p7nr9szv392j7bimq5nvva04lj6sdzc"; - setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ gobject-introspection ]; - description = "GIRepository (gobject-introspection) bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) gobject-introspection;}; - - "gi-girepository_1_0_24" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gobject-introspection, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-girepository"; version = "1.0.24"; sha256 = "1sj68k3wih2345gkmv0jb1smka73pxnjy8jwmk2ifgl407f3hhfw"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; @@ -103907,7 +103888,6 @@ self: { libraryPkgconfigDepends = [ gobject-introspection ]; description = "GIRepository (gobject-introspection) bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gobject-introspection;}; "gi-glib" = callPackage @@ -103966,8 +103946,6 @@ self: { libraryPkgconfigDepends = [ gmodule ]; description = "GModule bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {gmodule = null;}; "gi-gobject" = callPackage @@ -104084,25 +104062,6 @@ self: { }: mkDerivation { pname = "gi-gst"; - version = "1.0.23"; - sha256 = "0w4xscgd49d6d00gvsqc210r63c0wj748dqa5ypppr4mzllsm0qv"; - setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ gstreamer ]; - description = "GStreamer bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs.gst_all_1) gstreamer;}; - - "gi-gst_1_0_24" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gstreamer, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-gst"; version = "1.0.24"; sha256 = "01xbjxwipg1s93fkswag8gp8s696z1l1gaazl2w4wnpyykx4hh8s"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; @@ -104113,7 +104072,6 @@ self: { libraryPkgconfigDepends = [ gstreamer ]; description = "GStreamer bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs.gst_all_1) gstreamer;}; "gi-gstaudio" = callPackage @@ -104146,27 +104104,6 @@ self: { }: mkDerivation { pname = "gi-gstbase"; - version = "1.0.23"; - sha256 = "0im25z9pf9j0cxj0b6lbbr3lis9kbvzzvzns65cmargbh1018959"; - setupHaskellDepends = [ - base Cabal gi-glib gi-gobject gi-gst haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject gi-gst haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ gst-plugins-base ]; - description = "GStreamerBase bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; - - "gi-gstbase_1_0_24" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gst-plugins-base, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-gstbase"; version = "1.0.24"; sha256 = "0b8k2xk3ha6b79kkw72kgdmj8vjyh40r26saavin54gznlgd5xh8"; setupHaskellDepends = [ @@ -104179,7 +104116,6 @@ self: { libraryPkgconfigDepends = [ gst-plugins-base ]; description = "GStreamerBase bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gstpbutils" = callPackage @@ -104238,8 +104174,8 @@ self: { }: mkDerivation { pname = "gi-gstvideo"; - version = "1.0.23"; - sha256 = "1kb09kal08x7nznc0g8c2n9jfijapdndbnsfs5cvz0p9smvd092i"; + version = "1.0.24"; + sha256 = "0qjfjk5jnpy1f4grn8i68kwdd1yvnq1yc55rk6yxhlj7wks1d35h"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -104252,29 +104188,31 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; - "gi-gstvideo_1_0_24" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi - , haskell-gi-base, haskell-gi-overloading, text, transformers + "gi-gtk" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject + , gi-pango, gtk3, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers }: mkDerivation { - pname = "gi-gstvideo"; - version = "1.0.24"; - sha256 = "0qjfjk5jnpy1f4grn8i68kwdd1yvnq1yc55rk6yxhlj7wks1d35h"; + pname = "gi-gtk"; + version = "3.0.36"; + sha256 = "0bzb3xrax5k5r5fd6vv4by6hprmk77qrqr9mqn3dxqm6an8jwjn9"; setupHaskellDepends = [ - base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi + base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib + gi-gobject gi-pango haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase - haskell-gi haskell-gi-base haskell-gi-overloading text transformers + base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf + gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ gst-plugins-base ]; - description = "GStreamerVideo bindings"; + libraryPkgconfigDepends = [ gtk3 ]; + description = "Gtk bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; + }) {inherit (pkgs) gtk3;}; - "gi-gtk" = callPackage + "gi-gtk_3_0_37" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-pango, gtk3, haskell-gi, haskell-gi-base @@ -104282,8 +104220,8 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "3.0.36"; - sha256 = "0bzb3xrax5k5r5fd6vv4by6hprmk77qrqr9mqn3dxqm6an8jwjn9"; + version = "3.0.37"; + sha256 = "1psg789lrpcnrwh1y80y7s09hcxl3hihi0gwsmd7j3v731dp7a0k"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango haskell-gi @@ -104296,6 +104234,7 @@ self: { libraryPkgconfigDepends = [ gtk3 ]; description = "Gtk bindings"; license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gtk3;}; "gi-gtk_4_0_4" = callPackage @@ -104460,30 +104399,6 @@ self: { }: mkDerivation { pname = "gi-gtksource"; - version = "3.0.23"; - sha256 = "13rsxjbl62q8zhwqr8jm2fh5njzfa86izqwag4d6aw8xi71wqfrn"; - setupHaskellDepends = [ - base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib - gi-gobject gi-gtk gi-pango haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf - gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ gtksourceview3 ]; - description = "GtkSource bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) gtksourceview3;}; - - "gi-gtksource_3_0_24" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk - , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject - , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-gtksource"; version = "3.0.24"; sha256 = "0bnwqcn7y5a3z3lkl9l886m9albvc602nb7qsh2jkiilf0ng64dp"; setupHaskellDepends = [ @@ -104498,7 +104413,6 @@ self: { libraryPkgconfigDepends = [ gtksourceview3 ]; description = "GtkSource bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gtksourceview3;}; "gi-handy" = callPackage @@ -104573,30 +104487,6 @@ self: { }: mkDerivation { pname = "gi-ibus"; - version = "1.5.2"; - sha256 = "14chw0qhzdxixsqsn2ra31z561kn2zclk15b7hfpfzayqr6dqci1"; - setupHaskellDepends = [ - base Cabal gi-gio gi-glib gi-gobject haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ ibus ]; - description = "IBus bindings"; - license = lib.licenses.lgpl21Only; - platforms = [ - "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" - ]; - }) {inherit (pkgs) ibus;}; - - "gi-ibus_1_5_3" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, ibus, text, transformers - }: - mkDerivation { - pname = "gi-ibus"; version = "1.5.3"; sha256 = "1gbpbxcdl9f5di2vpnkx3zsy54dkfhz81h3yxss91r65lp9fwrm8"; setupHaskellDepends = [ @@ -104612,7 +104502,6 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) ibus;}; "gi-javascriptcore" = callPackage @@ -104662,27 +104551,6 @@ self: { }: mkDerivation { pname = "gi-notify"; - version = "0.7.22"; - sha256 = "0j5cxx9dsxh2wafw4xa7yasr6n98h2qwpm1y08nm7m6i0kwrksap"; - setupHaskellDepends = [ - base Cabal gi-gdkpixbuf gi-glib gi-gobject haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-gdkpixbuf gi-glib gi-gobject - haskell-gi haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ libnotify ]; - description = "Libnotify bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) libnotify;}; - - "gi-notify_0_7_23" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, libnotify, text, transformers - }: - mkDerivation { - pname = "gi-notify"; version = "0.7.23"; sha256 = "00p10lw9v9q8mh6630ijpz8smnpz5hiiw8kxk1fv8497akssxjsh"; setupHaskellDepends = [ @@ -104695,7 +104563,6 @@ self: { libraryPkgconfigDepends = [ libnotify ]; description = "Libnotify bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) libnotify;}; "gi-ostree" = callPackage @@ -104705,30 +104572,6 @@ self: { }: mkDerivation { pname = "gi-ostree"; - version = "1.0.13"; - sha256 = "07k02mffidw18f104crmhayr5nf3v5xcldc8fbmxdinp7wik5c7f"; - setupHaskellDepends = [ - base Cabal gi-gio gi-glib gi-gobject haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ ostree ]; - description = "OSTree bindings"; - license = lib.licenses.lgpl21Only; - platforms = [ - "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" - ]; - }) {inherit (pkgs) ostree;}; - - "gi-ostree_1_0_14" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, ostree, text, transformers - }: - mkDerivation { - pname = "gi-ostree"; version = "1.0.14"; sha256 = "08jglqkq0h497iv83rc0br83qrf000gm202hp0j1pnhwvdgp7d0f"; setupHaskellDepends = [ @@ -104744,7 +104587,6 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) ostree;}; "gi-pango" = callPackage @@ -104806,32 +104648,6 @@ self: { }: mkDerivation { pname = "gi-pangocairo"; - version = "1.0.24"; - sha256 = "1yya5gsqrkagmm33rsasshlj691nmax47fqdn1p2rnf4aqx1jcqr"; - setupHaskellDepends = [ - base Cabal gi-cairo gi-glib gi-gobject gi-pango haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-cairo gi-glib gi-gobject gi-pango - haskell-gi haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ cairo pango ]; - preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" - setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" - ''; - description = "PangoCairo bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; - - "gi-pangocairo_1_0_25" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cairo, containers - , gi-cairo, gi-glib, gi-gobject, gi-pango, haskell-gi - , haskell-gi-base, haskell-gi-overloading, pango, text - , transformers - }: - mkDerivation { - pname = "gi-pangocairo"; version = "1.0.25"; sha256 = "1w7sdwxfsymysazv9b045li97mjj2xspgrfyhm74x7sd7b4jl4aa"; setupHaskellDepends = [ @@ -104848,7 +104664,6 @@ self: { ''; description = "PangoCairo bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; "gi-poppler" = callPackage @@ -104881,27 +104696,6 @@ self: { }: mkDerivation { pname = "gi-secret"; - version = "0.0.12"; - sha256 = "19mr7mvay2slm5k6afqj0hhy4ddh0advrb5dyzqi75xysx7xagm8"; - setupHaskellDepends = [ - base Cabal gi-gio gi-glib gi-gobject haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ libsecret ]; - description = "Libsecret bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) libsecret;}; - - "gi-secret_0_0_13" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, libsecret, text, transformers - }: - mkDerivation { - pname = "gi-secret"; version = "0.0.13"; sha256 = "0n37sdm4q6q807j4wgwwsl28knc71d8jiyx4prxbl2d69gg6i2ka"; setupHaskellDepends = [ @@ -104914,7 +104708,6 @@ self: { libraryPkgconfigDepends = [ libsecret ]; description = "Libsecret bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) libsecret;}; "gi-soup" = callPackage @@ -104989,33 +104782,6 @@ self: { }: mkDerivation { pname = "gi-vte"; - version = "2.91.27"; - sha256 = "0a4n8yah3nirwciw0y1i8vpcjqbbk3pw15nd8av109cyxgl8nzx8"; - setupHaskellDepends = [ - base Cabal gi-atk gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-pango - haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject - gi-gtk gi-pango haskell-gi haskell-gi-base haskell-gi-overloading - text transformers - ]; - libraryPkgconfigDepends = [ vte_291 ]; - description = "Vte bindings"; - license = lib.licenses.lgpl21Only; - platforms = [ - "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" - ]; - }) {vte_291 = pkgs.vte;}; - - "gi-vte_2_91_28" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk - , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi - , haskell-gi-base, haskell-gi-overloading, text, transformers - , vte_291 - }: - mkDerivation { - pname = "gi-vte"; version = "2.91.28"; sha256 = "06bgl5r1r4ri22c43an4h538p0b3icrb8nq1w7fw8cmxqj7y5m33"; setupHaskellDepends = [ @@ -105033,7 +104799,6 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - hydraPlatforms = lib.platforms.none; }) {vte_291 = pkgs.vte;}; "gi-webkit" = callPackage diff --git a/pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch b/pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch new file mode 100644 index 0000000000000..33c276926f4bd --- /dev/null +++ b/pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch @@ -0,0 +1,65 @@ +From 09f44aa3271390c14f92a3f196ab2ba475b4907f Mon Sep 17 00:00:00 2001 +From: Malte Brandy <malte.brandy@maralorn.de> +Date: Fri, 14 Aug 2020 17:52:28 +0200 +Subject: [PATCH 1/2] jsaddle-webkit2gtk: Bump haskell-gi-base upper bound + +--- + jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal b/jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal +index 93d0b77..60c2312 100644 +--- a/jsaddle-webkit2gtk.cabal ++++ b/jsaddle-webkit2gtk.cabal +@@ -35,7 +35,7 @@ library + gi-gtk >=3.0.17 && <3.1, + gi-webkit2 >=4.0.14 && <4.1, + gi-javascriptcore >=4.0.14 && <4.1, +- haskell-gi-base >=0.20 && <0.24, ++ haskell-gi-base >=0.20 && <0.26, + haskell-gi-overloading >=0.0 && < 2.0, + jsaddle >=0.9.4.0 && <0.10, + text >=1.2.1.3 && <1.3, + +From f8427480ca827b2bee1d9b33dfa6118e14fe2924 Mon Sep 17 00:00:00 2001 +From: Malte Brandy <malte.brandy@maralorn.de> +Date: Fri, 14 Aug 2020 18:10:26 +0200 +Subject: [PATCH 2/2] Locally define noAdjustment and noCancellable + +Those two convenience definitions disappeared from gi-gio and gi-gtk in +newer versions. +--- + .../src/Language/Javascript/JSaddle/WebKitGTK.hs | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs b/jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs +index 898dac2..5249477 100644 +--- a/src/Language/Javascript/JSaddle/WebKitGTK.hs ++++ b/src/Language/Javascript/JSaddle/WebKitGTK.hs +@@ -55,11 +55,11 @@ import GI.GLib (timeoutAdd, idleAdd, pattern PRIORITY_HIGH, pattern PRIORITY_DEF + import qualified GI.Gtk as Gtk (main, init) + import GI.Gtk + (windowSetPosition, windowSetDefaultSize, windowNew, +- scrolledWindowNew, noAdjustment, containerAdd, ++ scrolledWindowNew, Adjustment, containerAdd, + WindowType(..), WindowPosition(..), widgetDestroy, + widgetGetToplevel, widgetShowAll, onWidgetDestroy, + mainQuit) +-import GI.Gio (noCancellable) ++import GI.Gio (Cancellable) + import GI.JavaScriptCore (valueToString) + import GI.WebKit2 + (scriptDialogPromptSetText, scriptDialogPromptGetDefaultText, +@@ -82,6 +82,12 @@ import Language.Javascript.JSaddle (JSM, Results, Batch) + import Language.Javascript.JSaddle.Run (runJavaScript) + import Language.Javascript.JSaddle.Run.Files (initState, runBatch, ghcjsHelpers) + ++noAdjustment :: Maybe Adjustment ++noAdjustment = Nothing ++ ++noCancellable :: Maybe Cancellable ++noCancellable = Nothing ++ + quitWebView :: WebView -> IO () + quitWebView wv = postGUIAsync $ do w <- widgetGetToplevel wv --TODO: Shouldn't this be postGUISync? + widgetDestroy w |