From 9db64cab54642d2e42222b523df9141c9cff0e24 Mon Sep 17 00:00:00 2001 From: christiaanb Date: Tue, 1 Jun 2010 16:19:04 +0200 Subject: [PATCH 1/1] Update package dependencies --- "c\316\273ash/CLasH/Normalize.hs" | 3 +-- "c\316\273ash/CLasH/Normalize/NormalizeTools.hs" | 3 +-- "c\316\273ash/clash.cabal" | 12 +++++++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git "a/c\316\273ash/CLasH/Normalize.hs" "b/c\316\273ash/CLasH/Normalize.hs" index 1dc20f5..c27e93e 100644 --- "a/c\316\273ash/CLasH/Normalize.hs" +++ "b/c\316\273ash/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\316\273ash/CLasH/Normalize/NormalizeTools.hs" "b/c\316\273ash/CLasH/Normalize/NormalizeTools.hs" index f6c254e..cdb7ee0 100644 --- "a/c\316\273ash/CLasH/Normalize/NormalizeTools.hs" +++ "b/c\316\273ash/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\316\273ash/clash.cabal" "b/c\316\273ash/clash.cabal" index d722191..a5ab102 100644 --- "a/c\316\273ash/clash.cabal" +++ "b/c\316\273ash/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 + -- 2.30.2