Add support for GHC 8.10

Author: christiaanb

.travis.yml

@@ -37,21 +37,44 @@ before_cache:
 matrix:
   include:
     - compiler: "ghc-8.0.2"
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}}
     - compiler: "ghc-8.2.2"
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
     - compiler: "ghc-8.4.4"
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.4], sources: [hvr-ghc]}}
-    - compiler: "ghc-8.6.4"
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.6.4], sources: [hvr-ghc]}}
-    - compiler: "ghc-head"
-      env: GHCHEAD=true
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-head], sources: [hvr-ghc]}}
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}
+    - compiler: "ghc-8.6.5"
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.5], sources: [hvr-ghc]}}
+    - compiler: "ghc-8.8.1"
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-3.0,ghc-8.8.1], sources: [hvr-ghc]}}
+    - compiler: "ghc-8.10.1"
+      env: HEADHACKAGE=true
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-3.0,ghc-8.10.1], sources: [hvr-ghc]}}
+    - env:
+        - GHCHEAD=true
+        - HEADHACKAGE=true
+        - GHC_ZIP='https://gitlab.haskell.org/ghc/ghc/-/jobs/artifacts/master/download?job=validate-x86_64-linux-deb9-hadrian'
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head], sources: [hvr-ghc]}}
 
   allow_failures:
-    - compiler: "ghc-head"
+    - env:
+        - GHCHEAD=true
+        - HEADHACKAGE=true
+        - GHC_ZIP='https://gitlab.haskell.org/ghc/ghc/-/jobs/artifacts/master/download?job=validate-x86_64-linux-deb9-hadrian'
 
 before_install:
+  - GHCHEAD=${GHCHEAD-false}
+  - |
+    if $GHCHEAD; then
+      travis_retry curl -L $GHC_ZIP --output artifact.zip
+      unzip artifact.zip
+      tar xpf ghc.tar.xz --strip-components 1
+      mkdir -p $HOME/ghc-head
+      sed -i -e 's/lld/gold/g' lib/settings
+      ./configure --prefix=$HOME/ghc-head
+      make V=1 install
+      PATH=$HOME/ghc-head/bin:$PATH
+      CC=ghc
+    fi
   - HC=${CC}
   - HCPKG=${HC/ghc/ghc-pkg}
   - unset CC
@@ -69,12 +92,13 @@ install:
   - HADDOCK=${HADDOCK-true}
   - INSTALLED=${INSTALLED-true}
   - GHCHEAD=${GHCHEAD-false}
+  - HEADHACKAGE=${HEADHACKAGE-false}
   - travis_retry cabal update -v
   - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
   - rm -fv cabal.project cabal.project.local
   # Overlay Hackage Package Index for GHC HEAD: https://github.com/hvr/head.hackage
   - |
-    if $GHCHEAD; then
+    if $HEADHACKAGE; then
       sed -i.bak 's/-- allow-newer:.*/allow-newer: *:base, *:template-haskell, *:ghc, *:Cabal/' ${HOME}/.cabal/config
 
       echo 'repository head.hackage'                                                        >> ${HOME}/.cabal/config
@@ -103,7 +127,7 @@ install:
 # any command which exits with a non-zero exit code causes the build to fail.
 script:
   # test that source-distributions can be generated
-  - (cd "." && cabal sdist)
+  - (cd "." && cabal new-sdist)
   - mv "."/dist-newstyle/sdist/ghc-typelits-extra-*.tar.gz ${DISTDIR}/
   - cd ${DISTDIR} || false
   - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog for the [`ghc-typelits-extra`](http://hackage.haskell.org/package/ghc-typelits-extra) package
 
+# 0.3.3 *February 6th 2020*
+* Add support for GHC 8.10.1-alpha2
+
 # 0.3.2 *January 18th 2020*
 * Fix https://github.com/clash-lang/clash-compiler/issues/1019
 

ghc-typelits-extra.cabal

@@ -1,5 +1,5 @@
 name:                ghc-typelits-extra
-version:             0.3.2
+version:             0.3.3
 synopsis:            Additional type-level operations on GHC.TypeLits.Nat
 description:
   Additional type-level operations on @GHC.TypeLits.Nat@:
@@ -47,7 +47,9 @@ build-type:          Simple
 extra-source-files:  README.md
                      CHANGELOG.md
 cabal-version:       >=1.10
-tested-with:         GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.4
+tested-with:         GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5,
+                     GHC == 8.8.1, GHC == 8.10.1
+
 
 source-repository head
   type: git
@@ -66,11 +68,11 @@ library
                        GHC.TypeLits.Extra.Solver.Operations
   build-depends:       base                      >= 4.8     && <5,
                        containers                >= 0.5.7.1 && <0.7,
-                       ghc                       >= 7.10    && <8.9,
+                       ghc                       >= 7.10    && <8.11,
                        ghc-prim                  >= 0.5     && <1.0,
-                       ghc-tcplugins-extra       >= 0.2,
-                       ghc-typelits-knownnat     >= 0.6     && <0.8,
-                       ghc-typelits-natnormalise >= 0.6     && <0.8,
+                       ghc-tcplugins-extra       >= 0.3.1,
+                       ghc-typelits-knownnat     >= 0.7.2   && <0.8,
+                       ghc-typelits-natnormalise >= 0.7.1   && <0.8,
                        integer-gmp               >= 1.0     && <1.1,
                        transformers              >= 0.4.2.0 && <0.6
   hs-source-dirs:      src
@@ -98,8 +100,8 @@ test-suite test-ghc-typelits-extra
   Other-Modules:       ErrorTests
   build-depends:       base                      >= 4.8 && <5,
                        ghc-typelits-extra,
-                       ghc-typelits-knownnat     >= 0.6,
-                       ghc-typelits-natnormalise >= 0.4.1,
+                       ghc-typelits-knownnat     >= 0.7.2,
+                       ghc-typelits-natnormalise >= 0.7.1,
                        tasty                     >= 0.10,
                        tasty-hunit               >= 0.9
   hs-source-dirs:      tests

src/GHC/TypeLits/Extra/Solver.hs

@@ -40,11 +40,8 @@ import Plugins    (purePlugin)
 #endif
 import TcEvidence (EvTerm)
 import TcPluginM  (TcPluginM, tcLookupTyCon, tcPluginTrace)
-import TcRnTypes  (Ct, TcPlugin(..), TcPluginResult (..), ctEvidence, ctEvPred,
-                   isWantedCt)
-import TcType      (typeKind)
-import Type       (EqRel (NomEq), Kind, PredTree (EqPred), classifyPredType,
-                   eqType)
+import TcRnTypes  (TcPlugin(..), TcPluginResult (..))
+import Type       (Kind, eqType)
 import TyCoRep    (Type (..))
 import TysWiredIn (typeNatKind, promotedTrueDataCon, promotedFalseDataCon)
 import TcTypeNats (typeNatLeqTyCon)
@@ -56,6 +53,16 @@ import TcPluginM  (zonkCt)
 import Control.Monad ((<=<))
 #endif
 
+#if MIN_VERSION_ghc(8,10,0)
+import Constraint (Ct, ctEvidence, ctEvPred, isWantedCt)
+import Predicate  (EqRel (NomEq), Pred (EqPred), classifyPredType)
+import Type       (typeKind)
+#else
+import TcRnTypes  (Ct, ctEvidence, ctEvPred, isWantedCt)
+import TcType     (typeKind)
+import Type       (EqRel (NomEq), PredTree (EqPred), classifyPredType)
+#endif
+
 -- internal
 import GHC.TypeLits.Extra.Solver.Operations
 import GHC.TypeLits.Extra.Solver.Unify

src/GHC/TypeLits/Extra/Solver/Unify.hs

@@ -26,12 +26,17 @@ import qualified GHC.TypeLits.Normalise.Unify as Normalise
 -- GHC API
 import Outputable (Outputable (..), ($$), text)
 import TcPluginM  (TcPluginM, matchFam, tcPluginTrace)
-import TcRnMonad  (Ct)
 import TcTypeNats (typeNatExpTyCon)
 import Type       (TyVar, coreView)
 import TyCoRep    (Type (..), TyLit (..))
 import UniqSet    (UniqSet, emptyUniqSet, unionUniqSets, unitUniqSet)
 
+#if MIN_VERSION_ghc(8,10,0)
+import Constraint (Ct)
+#else
+import TcRnMonad  (Ct)
+#endif
+
 -- internal
 import GHC.TypeLits.Extra.Solver.Operations