GHC 9.12 support

.github/workflows/ci.yml

@@ -33,14 +33,10 @@ jobs:
         os: [ubuntu-latest]
         cabal: ["latest"]
         ghc:
-          - "8.6.5"
-          - "8.10.7"
-          - "9.0.2"
-          - "9.2.8"
-          - "9.4.8"
-          - "9.6.4"
-          - "9.8.2"
-          - "9.10.1"
+          - "9.6.7"
+          - "9.8.4"
+          - "9.10.3"
+          - "9.12.4"
 
     steps:
     - uses: actions/checkout@v3

circuit-notation.cabal

@@ -1,25 +1,25 @@
--- cabal-version: 2.2
+cabal-version:       2.4
 name:                circuit-notation
 version:             0.1.0.0
 synopsis:            A source plugin for manipulating circuits in clash with a arrow notation
 -- description:
-license:             BSD3
+license:             BSD-3-Clause
 license-file:        LICENSE
 author:              Christopher Chalmers
 maintainer:          c.chalmers@me.com
 copyright:           2024 Christopher Chalmers
 category:            Hardware
 build-type:          Simple
-cabal-version:       >=1.10
+tested-with:
+    GHC ==9.6.7
+  , GHC ==9.8.4
+  , GHC ==9.10.3
+  , GHC ==9.12.4
 
 library
   exposed-modules:     CircuitNotation Circuit
 
-  if impl(ghc < 9.2)
-    other-modules:
-      GHC.Types.Unique.Map
-
-  if impl(ghc < 9.10)
+  if impl(ghc < 9.8)
     other-modules:
       GHC.Types.Unique.Map.Extra
 
@@ -29,7 +29,7 @@ library
     , clash-prelude >= 1.0
     , containers
     , data-default
-    , ghc (>=8.6 && <8.8) || (>=8.10 && < 9.12)
+    , ghc >= 9.6 && < 9.13
     , lens
     , mtl
     , parsec

example/Example.hs

@@ -11,17 +11,12 @@ This file contains examples of using the Circuit Notation.
 -}
 
 {-# LANGUAGE BlockArguments      #-}
-{-# LANGUAGE CPP                 #-}
 {-# LANGUAGE DataKinds           #-}
 {-# LANGUAGE DeriveFunctor       #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeFamilies        #-}
 {-# LANGUAGE TypeOperators       #-}
 
-#if __GLASGOW_HASKELL__ < 810
-{-# LANGUAGE Arrows              #-}
-#endif
-
 {-# OPTIONS -fplugin=CircuitNotation #-}
 {-# OPTIONS -fplugin-opt=CircuitNotation:debug #-}
 {-# OPTIONS -Wall #-}
@@ -42,11 +37,6 @@ import           Clash.Prelude
 idCircuit :: Circuit a a
 idCircuit = idC
 
-#if __GLASGOW_HASKELL__ < 810
-swapC0 :: Circuit (a,b) (b,a)
-swapC0 = id $ circuit $ \ ~(a,b) -> ~(b,a)
-#endif
-
 swapC1 :: Circuit (a,b) (b,a)
 swapC1 = id $ circuit $ \ ~(a,b) -> (b,a)
 

example/Testing.hs

@@ -10,10 +10,6 @@
 For testing the circuit notation.
 -}
 
-{-# LANGUAGE CPP #-}
-#if __GLASGOW_HASKELL__ < 810
-{-# LANGUAGE Arrows #-}
-#endif
 {-# LANGUAGE BlockArguments #-}
 {-# LANGUAGE DataKinds#-}
 {-# LANGUAGE GADTs #-}

src/Circuit.hs

@@ -10,7 +10,6 @@
 This file contains the 'Circuit' type, that the notation describes.
 -}
 
-{-# LANGUAGE CPP                    #-}
 {-# LANGUAGE DataKinds              #-}
 {-# LANGUAGE DeriveFunctor          #-}
 {-# LANGUAGE GADTs                  #-}
@@ -28,15 +27,13 @@ module Circuit where
 
 import           Clash.Prelude
 
-#if __GLASGOW_HASKELL__ > 900
 -- | Unsafe version of ':>'. Will fail if applied to empty vectors. This is used to
 -- workaround spurious incomplete pattern match warnings generated in newer GHC
 -- versions.
 pattern (:>!) :: a -> Vec n a -> Vec (n + 1) a
 pattern (:>!) x xs <- (\ys -> (head ys, tail ys) -> (x,xs))
 {-# COMPLETE (:>!) #-}
 infixr 5 :>!
-#endif
 
 type family Fwd a
 type family Bwd a