From 6c0b0306ced92c1ce4c557c03cefe9f736fe99a5 Mon Sep 17 00:00:00 2001
From: Alejandro Serrano <trupill@gmail.com>
Date: Sun, 28 Feb 2021 13:54:31 +0100
Subject: [PATCH] Support for GHC 8.10

---
 .../IHaskell/Display/Widgets/Singletons.hs    |  4 ++
 stack-8.8.yaml                                | 55 +++++++++++++++++++
 stack.yaml                                    | 14 ++++-
 3 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 stack-8.8.yaml

diff --git a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Singletons.hs b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Singletons.hs
index caed3990..5910dccc 100644
--- a/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Singletons.hs
+++ b/ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Singletons.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE PolyKinds #-}
@@ -11,6 +12,9 @@
 {-# LANGUAGE EmptyCase #-}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE TypeApplications #-}
+#if __GLASGOW_HASKELL__ >= 810
+{-# LANGUAGE StandaloneKindSignatures #-}
+#endif
 
 module IHaskell.Display.Widgets.Singletons where
 
diff --git a/stack-8.8.yaml b/stack-8.8.yaml
new file mode 100644
index 00000000..95ef79c0
--- /dev/null
+++ b/stack-8.8.yaml
@@ -0,0 +1,55 @@
+resolver: lts-16.23
+
+flags: {}
+packages:
+    - .
+    - ./ipython-kernel
+    - ./ghc-parser
+    - ./ihaskell-display/ihaskell-aeson
+    - ./ihaskell-display/ihaskell-blaze
+    - ./ihaskell-display/ihaskell-charts
+    - ./ihaskell-display/ihaskell-diagrams
+    - ./ihaskell-display/ihaskell-gnuplot
+    - ./ihaskell-display/ihaskell-hatex
+    - ./ihaskell-display/ihaskell-juicypixels
+    - ./ihaskell-display/ihaskell-magic
+    - ./ihaskell-display/ihaskell-plot
+    # - ./ihaskell-display/ihaskell-static-canvas
+    - ./ihaskell-display/ihaskell-widgets
+
+extra-deps:
+- Chart-cairo-1.9.3
+- diagrams-cairo-1.4.1.1
+- cairo-0.13.8.1
+- pango-0.13.8.1
+- glib-0.13.8.1
+- gtk2hs-buildtools-0.13.8.0
+- magic-1.1
+- plot-0.2.3.11
+# - static-canvas-0.2.0.3
+- vinyl-0.13.0
+
+ghc-options:
+  # Eventually we want "$locals": -Wall -Wpartial-fields -Werror
+  # ghc-parser: -Wall -Wpartial-fields -Werror
+  # ihaskell: -Wall -Wpartial-fields -Werror
+  # ihaskell-widgets: -Wall -Wpartial-fields -Werror
+
+docker:
+    repo: "ihaskell-dev:latest"
+    enable: false
+
+nix:
+  enable: false
+  packages:
+    - blas
+    - cairo
+    - file
+    - gcc
+    - gfortran.cc.lib
+    - liblapack
+    - ncurses
+    - pango
+    - pkgconfig
+    - zeromq
+    - zlib
\ No newline at end of file
diff --git a/stack.yaml b/stack.yaml
index 17285cb6..5a5f6fcb 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,4 +1,5 @@
-resolver: lts-16.23
+resolver: lts-17.4
+allow-newer: true
 
 flags: {}
 packages:
@@ -18,8 +19,14 @@ packages:
     - ./ihaskell-display/ihaskell-widgets
 
 extra-deps:
+- active-0.2.0.14
 - Chart-cairo-1.9.3
+- diagrams-1.4
 - diagrams-cairo-1.4.1.1
+- diagrams-contrib-1.4.4
+- diagrams-core-1.4.2
+- diagrams-lib-1.4.3
+- diagrams-svg-1.4.3
 - cairo-0.13.8.1
 - pango-0.13.8.1
 - glib-0.13.8.1
@@ -27,7 +34,12 @@ extra-deps:
 - magic-1.1
 - plot-0.2.3.11
 # - static-canvas-0.2.0.3
+- statestack-0.3
 - vinyl-0.13.0
+- dual-tree-0.2.2.1
+- monoid-extras-0.5.1
+- svg-builder-0.1.1
+- force-layout-0.4.0.6
 
 ghc-options:
   # Eventually we want "$locals": -Wall -Wpartial-fields -Werror