Fixes for ghc 8.8.1

Author: hamishmack

.travis.yml

@@ -1,28 +1,30 @@
-sudo: required
-services:
- - docker
+language: nix
+nix: 2.2.2
 
-cache:
-  directories:
-    - .cabal
-    - .ghc
+jobs:
+  include:
+    - stage: Build
+      env: OS=linux GHCVER=ghc865
+    - stage: Build
+      env: OS=linux GHCVER=ghc881
+# TODO try to find how to get working webkitgtk with nix on macOS
+#    - env: OS=macos GHCVER=ghc865
+#      os: osx
+#      # Fix OSX, see https://travis-ci.community/t/cannot-use-nix-support-on-osx/2927
+#      language: generic
+#      before_install:
+#      - curl https://nixos.org/nix/install | sh
+#      - source /Users/travis/.nix-profile/etc/profile.d/nix.sh
 
-env:
- - CABALVER=1.24 GHCVER=7.10.3 OSVER=xenial
- - CABALVER=1.24 GHCVER=8.0.1 OSVER=xenial
-
-before_install:
- - docker build -t ltk -f travis/$OSVER.Dockerfile travis
+install:
+- sudo mkdir -p /etc/nix
+- echo "substituters = https://cache.nixos.org https://hydra.iohk.io" | sudo tee -a /etc/nix/nix.conf > /dev/null
+- echo "trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" | sudo tee -a /etc/nix/nix.conf > /dev/null
 
 script:
- - docker run -v `pwd`:/build ltk
-   bash -x -c "
-      apt-get install -y cabal-install-$CABALVER ghc-$GHCVER &&
-      export PATH=\$HOME/.cabal/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:/opt/alex/3.1.7/bin:/opt/happy/1.19.5/bin:\$PATH &&
-      ./travis/build.sh"
+- nix-build --argstr haskellCompiler $GHCVER -A hsPkgs.webkit2gtk3-javascriptcore.components.library
 
 notifications:
   irc:
     channels: "irc.freenode.net#gtk2hs"
-    skip_join: true
   email: true

cabal.project

@@ -1,37 +1,3 @@
-flags: -overloaded-methods -overloaded-signals -overloaded-properties
-
 packages: .
 
-package gi-atk
- flags: -overloaded-methods -overloaded-signals -overloaded-properties
-package gi-cairo
- flags: -overloaded-methods -overloaded-signals -overloaded-properties
-package gi-gdk
- flags: -overloaded-methods -overloaded-signals -overloaded-properties
-package gi-gdkpixbuf
- flags: -overloaded-methods -overloaded-signals -overloaded-properties
-package gi-gio
- flags: -overloaded-methods -overloaded-signals -overloaded-properties
-package gi-glib
- flags: -overloaded-methods -overloaded-signals -overloaded-properties
-package gi-gobject
- flags: -overloaded-methods -overloaded-signals -overloaded-properties
-package gi-gtk
- flags: -overloaded-methods -overloaded-signals -overloaded-properties
-package gi-gtk-hs
- flags: -overloaded-methods -overloaded-signals -overloaded-properties
-package gi-gtkosxapplication
- flags: -overloaded-methods -overloaded-signals -overloaded-properties
-package gi-gtksource
- flags: -overloaded-methods -overloaded-signals -overloaded-properties
-package gi-javascriptcore
- flags: -overloaded-methods -overloaded-signals -overloaded-properties
-package gi-pango
- flags: -overloaded-methods -overloaded-signals -overloaded-properties
-package gi-soup
- flags: -overloaded-methods -overloaded-signals -overloaded-properties
-package gi-webkit
- flags: -overloaded-methods -overloaded-signals -overloaded-properties
-package gi-webkit2
- flags: -overloaded-methods -overloaded-signals -overloaded-properties
-
+write-ghc-environment-files: never

default.nix

@@ -0,0 +1,16 @@
+{ pkgs ? import nixpkgs (haskellNixpkgsArgs // {
+    overlays = haskellNixpkgsArgs.overlays ++ [ (import ./nix/overlays/gtk-debug.nix) ];
+  } // (if system == null then {} else { inherit system; }))
+, nixpkgs ? haskellNixSrc + "/nixpkgs"
+, haskellNixpkgsArgs ? import haskellNixSrc
+, haskellNixSrc ? builtins.fetchTarball {
+    url = "https://github.com/input-output-hk/haskell.nix/archive/1dd6951d6a56115fd368c5b37b8dab47a90ec45c.tar.gz";
+    sha256 = "02nhjy90xwg9wrp81cnlczndxags966c71wlbz6n91423a13mc99";
+  }
+, haskellCompiler ? "ghc881"
+, system ? null
+}:
+  pkgs.haskell-nix.cabalProject' {
+    src = pkgs.haskell-nix.haskellLib.cleanGit { src = ./.; };
+    ghc = pkgs.haskell-nix.compiler.${haskellCompiler};
+  }

nix/overlays/gtk-debug.nix

@@ -0,0 +1,12 @@
+# Gtk actually has three states debug enabled, disabled and unspecified.
+# the unspecified option turns on some very useful debug features.
+self: super: {
+  gtk3 = super.gtk3.overrideAttrs (oldAttrs: {
+    configureFLags =
+      builtins.filter (x: !builtins.elem x [
+        "--disable-debug"
+        "--disable-dependency-tracking"
+        "--disable-glibtest"])
+      (super.pkgs.lib.lists.flatten (oldAttrs.configureFlags or []));
+  });
+}

shell.nix

@@ -0,0 +1,3 @@
+{ haskellCompiler ? "ghc881" }:
+(import ./. { inherit haskellCompiler; }).hsPkgs.shellFor {}
+    

webkit2gtk3-javascriptcore.cabal

@@ -1,5 +1,5 @@
 Name:           webkit2gtk3-javascriptcore
-Version:        0.14.3.0
+Version:        0.14.4.0
 Synopsis:       JavaScriptCore FFI from webkitgtk
 Description:    FFI for JavaScriptCore module from webkitgtk
 License:        BSD3
@@ -25,8 +25,8 @@ Source-Repository head
 
 custom-setup
   setup-depends: base >= 4.6,
-                 Cabal >= 1.24 && < 2.5,
-                 gtk2hs-buildtools >= 0.13.2.0 && < 0.14
+                 Cabal >= 1.24 && < 3.1,
+                 gtk2hs-buildtools >= 0.13.5.4 && < 0.14
 
 Library
         hs-source-dirs: src
@@ -50,6 +50,8 @@ Library
         x-Signals-Import: Graphics.UI.GtkInternals
 
         include-dirs: .
-        cpp-options: -DDISABLE_DEPRECATED -U__BLOCKS__ -D__attribute__(A)= -D_Nullable= -D_Nonnull=
+        cpp-options: -DDISABLE_DEPRECATED -U__BLOCKS__ -DGLIB_DISABLE_DEPRECATION_WARNINGS
+        if os(darwin) || os(freebsd)
+          cpp-options: -D_Nullable= -D_Nonnull= -D_Noreturn=
         x-c2hs-Header:  hsjscore.h
         pkgconfig-depends: webkit2gtk-4.0 >=1.1.15