haskellPackages.haskell-gi: Bump versions manually to still build with used C libs
This commit is contained in:
Malte Brandy
parent
b858ba8a7c
commit
9fd589504e
@ -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 ];
|
||||
# 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;
|
||||
|
||||
# 2020-08-14: Needs some manual patching to be compatible with haskell-gi-base 0.24
|
||||
# 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
|
||||
|
||||
@ -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
|
||||
|
||||
335
pkgs/development/haskell-modules/hackage-packages.nix
generated
335
pkgs/development/haskell-modules/hackage-packages.nix
generated
@ -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
|
||||
@ -103784,30 +103809,6 @@ self: {
|
||||
}) {gtk4-x11 = null;};
|
||||
|
||||
"gi-ggit" = 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.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
|
||||
@ -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
|
||||
@ -103872,25 +103872,6 @@ self: {
|
||||
}) {inherit (pkgs) glib;};
|
||||
|
||||
"gi-girepository" = 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.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
|
||||
@ -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
|
||||
@ -104078,25 +104056,6 @@ self: {
|
||||
}) {inherit (pkgs) gtk4;};
|
||||
|
||||
"gi-gst" = 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.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
|
||||
@ -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
|
||||
@ -104140,27 +104098,6 @@ self: {
|
||||
}) {inherit (pkgs.gst_all_1) gst-plugins-base;};
|
||||
|
||||
"gi-gstbase" = 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.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
|
||||
@ -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
|
||||
@ -104232,27 +104168,6 @@ self: {
|
||||
}) {gstreamer-tag = null;};
|
||||
|
||||
"gi-gstvideo" = 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
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "gi-gstvideo";
|
||||
version = "1.0.23";
|
||||
sha256 = "1kb09kal08x7nznc0g8c2n9jfijapdndbnsfs5cvz0p9smvd092i";
|
||||
setupHaskellDepends = [
|
||||
base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi
|
||||
];
|
||||
libraryHaskellDepends = [
|
||||
base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
|
||||
haskell-gi haskell-gi-base haskell-gi-overloading text transformers
|
||||
];
|
||||
libraryPkgconfigDepends = [ gst-plugins-base ];
|
||||
description = "GStreamerVideo bindings";
|
||||
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
|
||||
@ -104271,7 +104186,6 @@ self: {
|
||||
libraryPkgconfigDepends = [ gst-plugins-base ];
|
||||
description = "GStreamerVideo bindings";
|
||||
license = lib.licenses.lgpl21Only;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {inherit (pkgs.gst_all_1) gst-plugins-base;};
|
||||
|
||||
"gi-gtk" = callPackage
|
||||
@ -104298,6 +104212,31 @@ self: {
|
||||
license = lib.licenses.lgpl21Only;
|
||||
}) {inherit (pkgs) gtk3;};
|
||||
|
||||
"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
|
||||
, haskell-gi-overloading, text, transformers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "gi-gtk";
|
||||
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
|
||||
];
|
||||
libraryHaskellDepends = [
|
||||
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 = [ gtk3 ];
|
||||
description = "Gtk bindings";
|
||||
license = lib.licenses.lgpl21Only;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {inherit (pkgs) gtk3;};
|
||||
|
||||
"gi-gtk_4_0_4" = callPackage
|
||||
({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
|
||||
, gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
|
||||
@ -104453,30 +104392,6 @@ self: {
|
||||
}) {gtksheet = null;};
|
||||
|
||||
"gi-gtksource" = 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.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
|
||||
@ -104498,7 +104413,6 @@ self: {
|
||||
libraryPkgconfigDepends = [ gtksourceview3 ];
|
||||
description = "GtkSource bindings";
|
||||
license = lib.licenses.lgpl21Only;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {inherit (pkgs) gtksourceview3;};
|
||||
|
||||
"gi-handy" = callPackage
|
||||
@ -104567,30 +104481,6 @@ self: {
|
||||
}) {inherit (pkgs) harfbuzz; harfbuzz-gobject = null;};
|
||||
|
||||
"gi-ibus" = 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.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
|
||||
@ -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
|
||||
@ -104656,27 +104545,6 @@ self: {
|
||||
}) {inherit (pkgs) webkitgtk;};
|
||||
|
||||
"gi-notify" = 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.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
|
||||
@ -104695,34 +104563,9 @@ self: {
|
||||
libraryPkgconfigDepends = [ libnotify ];
|
||||
description = "Libnotify bindings";
|
||||
license = lib.licenses.lgpl21Only;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {inherit (pkgs) libnotify;};
|
||||
|
||||
"gi-ostree" = 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.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
|
||||
@ -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
|
||||
@ -104799,32 +104641,6 @@ self: {
|
||||
}) {inherit (pkgs) cairo; inherit (pkgs) pango;};
|
||||
|
||||
"gi-pangocairo" = 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.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
|
||||
@ -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
|
||||
@ -104875,27 +104690,6 @@ self: {
|
||||
}) {inherit (pkgs) poppler_gi;};
|
||||
|
||||
"gi-secret" = 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.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
|
||||
@ -104914,7 +104708,6 @@ self: {
|
||||
libraryPkgconfigDepends = [ libsecret ];
|
||||
description = "Libsecret bindings";
|
||||
license = lib.licenses.lgpl21Only;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {inherit (pkgs) libsecret;};
|
||||
|
||||
"gi-soup" = callPackage
|
||||
@ -104982,33 +104775,6 @@ self: {
|
||||
}) {inherit (pkgs) vips;};
|
||||
|
||||
"gi-vte" = 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.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
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
Loading…
x
Reference in New Issue
Block a user