Merge pull request #159 from dmcclean/maintenance-ghc8

Maintenance release for GHC 8
bjornbm · May 19, 2016 · adc3bfd · adc3bfd
2 parents 4dcd15d + 372e62e
commit adc3bfd
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 dist
 .cabal-sandbox/
+.stack-work/
 cabal.sandbox.config
 *.hi
 *.o

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+1.0.1.2 (2016-05)
+-----------------
+* Support for GHC 8.0.1-rc4, avoiding GHC Trac issue 12026.
+* Added support for stack.
+
 1.0.1.1 (2015-11)
 -----------------
 * Improved example in readme.

diff --git a/dimensional.cabal b/dimensional.cabal
@@ -1,5 +1,5 @@
 name:                dimensional
-version:             1.0.1.1
+version:             1.0.1.2
 license:             BSD3
 license-file:        LICENSE
 copyright:           Bjorn Buckwalter 2006-2015

diff --git a/src/Numeric/Units/Dimensional/Dimensions/TypeLevel.hs b/src/Numeric/Units/Dimensional/Dimensions/TypeLevel.hs
@@ -38,7 +38,7 @@ where
 
 import Data.Proxy
 import Numeric.NumType.DK.Integers
-  ( TypeInt (Zero, Pos1), (+)(), (-)()
+  ( TypeInt (Zero, Pos1), type (+), type (-)
   , KnownTypeInt, toNum
   )
 import qualified Numeric.NumType.DK.Integers as N

diff --git a/stack.yaml b/stack.yaml
@@ -0,0 +1,14 @@
+# For more information, see: https://github.com/commercialhaskell/stack/blob/release/doc/yaml_configuration.md
+
+# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
+resolver: lts-4.1
+
+# Local packages, usually specified by relative directory name
+packages:
+- '.'
+
+# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
+extra-deps: []
+
+# Override default flag values for local packages and extra-deps
+flags: {}