Merge pull request #1350 from pe200012/master

update to lts-19

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Types.hs

@@ -501,7 +501,7 @@ instance HasKey f ~ 'False => ToPairs' 'False f where
   toPairs' _ = []
 
 instance (ToJSON (FieldType f), HasKey f ~ 'True) => ToPairs' 'True f where
-  toPairs' x = [ pack (toKey $ _field x) .= toJSON x ]
+  toPairs' x = [ fromString (toKey $ _field x) .= toJSON x ]
 
 newtype JSONByteString = JSONByteString ByteString
   deriving (Eq,Ord)
@@ -997,4 +997,4 @@ instance ToJSON OutputMsg where
   toJSON (OutputData d)     = object [ "output_type" .= str "display_data"
                                      , "data" .= toJSON d
                                      , "metadata" .= object []
-                                     ]
+                                     ]

stack-lts19.yaml

@@ -0,0 +1,57 @@
+# the GHC version of this resolver needs to match the GHC version in Dockerfile
+resolver: lts-19.3
+#allow-newer: true
+
+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-graphviz
+    - ./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@sha256:893d9da563b54350da20f258fe75e894f71ba5297dacc6b531407e0abc8988b4,924
+- diagrams-cairo-1.4.2@sha256:a9586a56c90fca258988ad0d1eec122ed62dadbfdd8a4ef022d02c1de0268cdd,3810
+- cairo-0.13.8.2
+- pango-0.13.8.2
+- glib-0.13.8.2
+- gtk2hs-buildtools-0.13.8.3
+- plot-0.2.3.11
+# - static-canvas-0.2.0.3
+- statestack-0.3
+- dual-tree-0.2.3.0
+- monoid-extras-0.6
+- svg-builder-0.1.1
+- force-layout-0.4.0.6
+
+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
+
+nix:
+  enable: false
+  packages:
+    - blas
+    - cairo
+    - file
+    - gcc
+    - gfortran.cc.lib
+    - liblapack
+    - ncurses
+    - pango
+    - pkgconfig
+    - zeromq
+    - zlib