Move to GHC 8.10

Author: martijnbastiaan

.gitlab-ci.yml

@@ -20,13 +20,6 @@
   after_script:
     - tar -cf - $(ls -d /root/.cabal /root/.stack /nix || true) | zstd -T0 -3 > cache.tar.zstd
 
-.common-806:
-  extends: .common
-  image: docker.pkg.github.com/clash-lang/clash-protocols/protocols-focal-ghc-cabal-stack-8.6.5:2020-12-07
-  variables:
-    GHC_VERSION: "8.6.5"
-    CABAL_VERSION: "3.2.0.0"
-
 .common-810:
   extends: .common
   image: docker.pkg.github.com/clash-lang/clash-protocols/protocols-focal-ghc-cabal-stack-8.10.2:2020-12-07
@@ -44,14 +37,12 @@ haddock:
   script:
     - .ci/build_docs.sh
 
-# Circuit-notation is broken on 810.
-# https://github.com/cchalmers/circuit-notation/pull/8#issuecomment-739844352
-cabal-8.6.5:
-  extends: .common-806
+cabal-8.10.2:
+  extends: .common-810
   script:
     - .ci/test_cabal.sh
 
 stack:
-  extends: .common-806
+  extends: .common-810
   script:
     - .ci/test_stack.sh

.gitmodules

@@ -1,6 +1,5 @@
 packages:
   clash-protocols.cabal
-  deps/circuit-notation/circuit-notation.cabal
 
 package clash-prelude
   -- 'large-tuples' generates tuple instances for various classes up to the
@@ -9,6 +8,11 @@ package clash-prelude
   -- it by default. This will be the default for Clash >=1.4.
   flags: -large-tuples
 
+source-repository-package
+    type: git
+    location: https://github.com/cchalmers/circuit-notation.git
+    tag: 0fe897cb95bd1be87abed044f4072f104dec2f7d
+
 source-repository-package
     type: git
     location: https://github.com/martijnbastiaan/haskell-hedgehog.git

cabal.project

@@ -83,8 +83,8 @@ common common-options
 
   default-language: Haskell2010
   build-depends:
-    -- GHC >= 8.6
-    base >= 4.12.0.0,
+    -- GHC >= 8.10
+    base >= 4.14.0.0,
     Cabal,
 
     -- clash-prelude will set suitable version bounds for the plugins

clash-protocols.cabal

@@ -1,18 +1,15 @@
-resolver: lts-14.27
+resolver: nightly-2020-12-14
 
 packages:
   - .
-  - deps/circuit-notation
 
 extra-deps:
-- ghc-typelits-extra-0.4@sha256:e1ba4ebf14cb7025dd940380dfb15db444f7e8bced7e30bdad6e1707f0af7622,4813
-- ghc-typelits-knownnat-0.7.2@sha256:63054c8108f21a4bc5ace477227476b72a4e3792f35f37f2d406eef262ae4346,4711
-- ghc-typelits-natnormalise-0.7.2@sha256:0fc48a3744aa25e5e53a054a8bb1fe6410752e497f446d75db9bd67bb258d05e,3495
-- clash-prelude-1.2.5@sha256:2ea4d0506adfccd0e817a67e47de132290a856535dd69bcc71e7fbce24ece3f2,15307
 - git: https://github.com/martijnbastiaan/haskell-hedgehog.git
   commit: 41e87d110d3b2b7b522d29d7c0500672f2640dcc
   subdirs:
     - hedgehog
+- git: https://github.com/cchalmers/circuit-notation.git
+  commit: 0fe897cb95bd1be87abed044f4072f104dec2f7d
 
 flags:
   clash-prelude: