haskellPackages.haskell-gi: Bump versions manually to still build with used C libs

1 files changed, 65 insertions, 0 deletions

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