Update package dependencies

diff --git a/cλash/CLasH/Normalize.hs b/cλash/CLasH/Normalize.hs
index 1dc20f57051381b0a513448870dc3bed2b2a55d6..c27e93eb7803c0c4604492308cbccd9fadbc2864 100644 (file)
--- a/cλash/CLasH/Normalize.hs
+++ b/cλash/CLasH/Normalize.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE PackageImports #-}
 --
 -- Functions to bring a Core expression in normal form. This module provides a
 -- top level function "normalize", and defines the actual transformation passes that
@@ -10,7 +9,7 @@ module CLasH.Normalize (getNormalized, normalizeExpr, splitNormalized) where
 import Debug.Trace
 import qualified Maybe
 import qualified List
-import qualified "transformers" Control.Monad.Trans as Trans
+import qualified Control.Monad.Trans.Class as Trans
 import qualified Control.Monad as Monad
 import qualified Control.Monad.Trans.Writer as Writer
 import qualified Data.Accessor.Monad.Trans.State as MonadState

diff --git a/cλash/CLasH/Normalize/NormalizeTools.hs b/cλash/CLasH/Normalize/NormalizeTools.hs
index f6c254e431381376700ed528a88cdcd9de9c118a..cdb7ee01352a85fca6cf080de9019259c359d632 100644 (file)
--- a/cλash/CLasH/Normalize/NormalizeTools.hs
+++ b/cλash/CLasH/Normalize/NormalizeTools.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE PackageImports #-}
 -- 
 -- This module provides functions for program transformations.
 --
@@ -9,7 +8,7 @@ import qualified Data.Monoid as Monoid
 import qualified Data.Either as Either
 import qualified Control.Monad as Monad
 import qualified Control.Monad.Trans.Writer as Writer
-import qualified "transformers" Control.Monad.Trans as Trans
+import qualified Control.Monad.Trans.Class as Trans
 import qualified Data.Accessor.Monad.Trans.State as MonadState
 
 -- GHC API

diff --git a/cλash/clash.cabal b/cλash/clash.cabal
index d7221917fcee8704244d272d915b9b30b054ee3d..a5ab10291fdb5ec065a88904d3d7866c50322921 100644 (file)
--- a/cλash/clash.cabal
+++ b/cλash/clash.cabal
@@ -17,18 +17,23 @@ maintainer:         christiaan.baaij@gmail.com & matthijs@stdin.nl
 Cabal-Version:      >= 1.2
 
 Library
-  build-depends:    ghc >= 6.11, pretty, vhdl > 0.1, haskell98, syb,
+  build-depends:    ghc >= 6.12, pretty, vhdl > 0.1, haskell98, syb,
                     data-accessor, containers, base >= 4, transformers,
                     filepath, template-haskell, data-accessor-template,
                     data-accessor-transformers, prettyclass, directory, 
-                    th-lift-ng, tfp, tfvec, time
+                    tfp, th-lift, time
                     
   exposed-modules:  CLasH.HardwareTypes
                     CLasH.Translator
                     CLasH.Translator.Annotations
                     CLasH.Utils
                     
-  other-modules:    CLasH.Translator.TranslatorTypes
+  other-modules:    Data.Param.Integer
+                    Data.Param.Signed
+                    Data.Param.Unsigned
+                    Data.Param.Index
+                    Data.Param.Vector
+                    CLasH.Translator.TranslatorTypes
                     CLasH.Normalize
                     CLasH.Normalize.NormalizeTypes
                     CLasH.Normalize.NormalizeTools
@@ -44,4 +49,5 @@ Library
                     CLasH.Utils.Core.BinderTools
                     CLasH.Utils.Core.CoreShow
                     CLasH.Utils.Core.CoreTools
+