Update to build with lts-14.2.

4 files changed, 21 insertions, 26 deletions

diff --git a/MeshSketch.hs b/MeshSketch.hs
index 837a43d..4a13010 100644
--- a/MeshSketch.hs
+++ b/MeshSketch.hs
@@ -34,6 +34,7 @@ import GI.GObject.Functions (signalHandlerDisconnect)
 import GI.Gdk.Objects
 import GI.GLib.Constants
 import GI.Gtk hiding (IsWindow,windowFullscreen,windowUnfullscreen)
+import Data.GI.Base.GType
 import qualified GI.Gtk.Objects as Gtk
 import LambdaCube.GL             as LC
 import LambdaCube.GL.Mesh        as LC
diff --git a/gix.hs b/gix.hs
index 349d6a9..54da628 100644
--- a/gix.hs
+++ b/gix.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE OverloadedLabels #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TypeApplications #-}
+{-# LANGUAGE CPP #-}
 module Main where
 
 import GI.Gtk as Gtk hiding (main)
@@ -25,7 +27,11 @@ main = do
             _ <- on gl #realize       $ R.realize   st gl
             _ <- on gl #unrealize     $ R.unrealize st gl
             _ <- on gl #render        $ R.render    st gl
+#if MIN_VERSION_haskell_gi_base(0,22,0)
+            typ <- gobjectType @GLArea
+#else
             typ <- gobjectType gl
+#endif
             ccSig <- signalLookup "create-context" typ
             ccid <- signalHandlerFind gl [SignalMatchTypeId] ccSig
                 0 -- detail
diff --git a/lambda-gtk.cabal b/lambda-gtk.cabal
index d262740..fa7d77d 100644
--- a/lambda-gtk.cabal
+++ b/lambda-gtk.cabal
@@ -18,7 +18,7 @@ executable lambda-gtk
   other-modules:       LambdaCube.Gtk LambdaHello
   extensions:          NondecreasingIndentation
   other-extensions:    OverloadedLabels, OverloadedLists, OverloadedStrings
-  build-depends:       base, containers >=0.5 && <0.6, bytestring >=0.10 && <0.11,
+  build-depends:       base, containers >=0.5 && <0.7, bytestring >=0.10 && <0.11,
                        vector, aeson, JuicyPixels,
                        -- rendering
                        lambdacube-ir, lambdacube-gl, OpenGL,
@@ -34,7 +34,7 @@ executable gldemo
   other-modules:       LambdaCubeWidget GLWidget LambdaCube.Gtk TimeKeeper
   extensions:          NondecreasingIndentation
   other-extensions:    OverloadedLabels, OverloadedLists, OverloadedStrings
-  build-depends:       base, containers >=0.5 && <0.6, bytestring >=0.10 && <0.11,
+  build-depends:       base, containers >=0.5 && <0.7, bytestring >=0.10 && <0.11,
                        vector, aeson, JuicyPixels, text, contravariant,
                        -- writer monad
                        mtl,
@@ -54,7 +54,7 @@ executable meshsketch
                        Data.List.Merge ByteStringUtil
   extensions:          NondecreasingIndentation
   other-extensions:    OverloadedLabels, OverloadedLists, OverloadedStrings
-  build-depends:       base, containers >=0.5 && <0.6, bytestring >=0.10 && <0.11,
+  build-depends:       base, containers >=0.5 && <0.7, bytestring >=0.10 && <0.11,
                        vector, aeson, JuicyPixels, text, contravariant, hmatrix,
                        zip-archive, filepath, directory, dependent-sum, pretty-show, deepseq,
                        -- todo: factor this next dependency into patch against lambdacube-gl
diff --git a/stack.yaml b/stack.yaml
index 818677a..4bffd02 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,28 +1,16 @@
-resolver: lts-12.26
+resolver: lts-14.2
 packages:
 - .
-
-# - lambdacube-compiler
-# - lambdacube-gl
-# - lambdacube-ir/ddl
-# - lambdacube-ir/lambdacube-ir.haskell
-
-- location:
-    git: d@emmy.childrenofmay.org:public_git/lambdacube-compiler
-    commit: fbb307078eb95cada21ba8dc2475c67220c4f636
-  extra-dep: true
-- location:
-    git: d@emmy.childrenofmay.org:public_git/lambdacube-gl
-    commit: b13702e457d79f79831f8e852edd89a6abf28d81
-  extra-dep: true
-- location:
-    git: d@emmy.childrenofmay.org:public_git/lambdacube-ir
-    commit: f6617496f582ad287bd8203d931a6ee037ed3a69
-    subdirs:
-    - lambdacube-ir.haskell
-    - ddl
-  extra-dep: true
 extra-deps:
 - ede-0.2.9
 - text-format-0.3.2
-- wavefront-0.7.1.3
+- git: d@cryptonomic.net:public_git/wavefront-obj.git
+  commit: 9713b39904c97340eb9a365811f81ed4f73c169e
+- git: d@cryptonomic.net:public_git/lambdacube-compiler.git
+  commit: fbb307078eb95cada21ba8dc2475c67220c4f636
+- git: d@cryptonomic.net:public_git/lambdacube-gl.git
+  commit: 249d4d8aa48855be5ceec9d3a5100e23851b9d95
+- git: d@cryptonomic.net:public_git/lambdacube-ir.git
+  commit: 1db488eecc8b91cf5c56c054b524d9c86de6970d
+  subdirs:
+  - lambdacube-ir.haskell