fix for ghc 8.6, add travis tests

mstksg · Nov 14, 2018 · 54f7882 · 54f7882
1 parent 23cc1e6
commit 54f7882
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -33,9 +33,13 @@ matrix:
     compiler: ": #GHC 8.2.2"
     addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2,happy-1.19.5,alex-3.1.7,libblas-dev,liblapack-dev], sources: [hvr-ghc]}}
 
-  - env: BUILD=cabal GHCVER=8.4.3 CABALVER=2.2 HAPPYVER=1.19.5 ALEXVER=3.1.7
-    compiler: ": #GHC 8.4.3"
-    addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.3,happy-1.19.5,alex-3.1.7,libblas-dev,liblapack-dev], sources: [hvr-ghc]}}
+  - env: BUILD=cabal GHCVER=8.4.4 CABALVER=2.2 HAPPYVER=1.19.5 ALEXVER=3.1.7
+    compiler: ": #GHC 8.4.4"
+    addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4,happy-1.19.5,alex-3.1.7,libblas-dev,liblapack-dev], sources: [hvr-ghc]}}
+
+  - env: BUILD=cabal GHCVER=8.6.2 CABALVER=2.4 HAPPYVER=1.19.5 ALEXVER=3.1.7
+    compiler: ": #GHC 8.6.2"
+    addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.2,happy-1.19.5,alex-3.1.7,libblas-dev,liblapack-dev], sources: [hvr-ghc]}}
 
   # Build with the newest GHC and cabal-install. This is an accepted failure,
   # see below.
@@ -65,6 +69,10 @@ matrix:
     compiler: ": #stack 8.2.2"
     addons: {apt: {packages: [ghc-8.2.2,libblas-dev,liblapack-dev], sources: [hvr-ghc]}}
 
+  - env: BUILD=stack ARGS="--resolver lts-12"
+    compiler: ": #stack 8.4.4"
+    addons: {apt: {packages: [ghc-8.4.4,libblas-dev,liblapack-dev], sources: [hvr-ghc]}}
+
   # Nightly builds are allowed to fail
   - env: BUILD=stack ARGS="--resolver nightly"
     compiler: ": #stack nightly"
@@ -91,6 +99,10 @@ matrix:
     compiler: ": #stack 8.2.2 osx"
     os: osx
 
+  - env: BUILD=stack ARGS="--resolver lts-12"
+    compiler: ": #stack 8.4.4 osx"
+    os: osx
+
   - env: BUILD=stack ARGS="--resolver nightly"
     compiler: ": #stack nightly osx"
     os: osx

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,15 @@
 Changelog
 =========
 
+Version 0.1.2.5
+---------------
+
+*November 14, 2018*
+
+<https://github.com/mstksg/hmatrix-backprop/releases/tag/v0.1.2.5>
+
+*   Fix compatibility with GHC 8.6
+
 Version 0.1.2.4
 ---------------
 

diff --git a/package.yaml b/package.yaml
@@ -1,5 +1,5 @@
 name:                hmatrix-backprop
-version:             0.1.2.4
+version:             0.1.2.5
 github:              "mstksg/hmatrix-backprop"
 license:             BSD3
 author:              "Justin Le"

diff --git a/src/Numeric/LinearAlgebra/Static/Backprop.hs b/src/Numeric/LinearAlgebra/Static/Backprop.hs
@@ -12,6 +12,11 @@
 {-# OPTIONS_GHC -fplugin GHC.TypeLits.KnownNat.Solver #-}
 {-# OPTIONS_GHC -fplugin GHC.TypeLits.Normalise       #-}
 
+#if MIN_VERSION_base(4,12,0)
+{-# LANGUAGE NoStarIsType #-}
+#endif
+
+
 -- |
 -- Module      : Numeric.LinearAlgebra.Static.Backprop
 -- Copyright   : (c) Justin Le 2018

diff --git a/stack.yaml b/stack.yaml
@@ -16,7 +16,7 @@
 #  name: custom-snapshot
 #  location: "./custom-snapshot.yaml"
 # resolver: nightly-2018-03-25
-resolver: nightly-2018-08-06
+resolver: nightly-2018-11-13
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.
@@ -43,13 +43,13 @@ packages:
 # (e.g., acme-missiles-0.3)
 extra-deps:
 - backprop-0.2.6.1
-- distributive-0.6
+# - distributive-0.6
 - finite-typelits-0.1.4.2
-- hedgehog-0.6
-- hmatrix-vector-sized-0.1.1.0
-- indexed-list-literals-0.2.1.1
-- vector-sized-1.0.4.0
-- vinyl-0.9.1
+# - hedgehog-0.6
+- hmatrix-vector-sized-0.1.1.2
+- indexed-list-literals-0.2.1.2
+- vector-sized-1.1.1.0
+- vinyl-0.10.0
 
 # Override default flag values for local packages and extra-deps
 # flags: {}