update to work with latest ghc, cabal packages
This commit is contained in:
parent
a937424514
commit
6957a39911
6
Makefile
6
Makefile
|
@ -75,8 +75,6 @@ build-haddock :
|
|||
# todo: handle the deps properly
|
||||
rm -Rf build/haddock
|
||||
mkdir build/haddock/
|
||||
|
||||
#GHC_VER="$(shell ghc --numeric-version)"
|
||||
# wtf
|
||||
$(eval GHC_VER="$(shell ghc --numeric-version)")
|
||||
cp -R dist-newstyle/build/x86_64-linux/ghc-${GHC_VER}/simple-sql-parser-0.6.0/doc/html/simple-sql-parser/* build/haddock/
|
||||
$(eval SSP_VER="$(shell cat simple-sql-parser.cabal |grep -P '^version:' | awk '{print $$2}')")
|
||||
cp -R dist-newstyle/build/x86_64-linux/ghc-${GHC_VER}/simple-sql-parser-${SSP_VER}/doc/html/simple-sql-parser/* build/haddock/
|
||||
|
|
|
@ -40,7 +40,7 @@ common shared-properties
|
|||
default-language: Haskell2010
|
||||
build-depends: base >=4 && <5,
|
||||
parsec >=3.1 && <3.2,
|
||||
mtl >=2.1 && <2.3,
|
||||
mtl >=2.1 && <2.4,
|
||||
pretty >= 1.1 && < 1.2
|
||||
|
||||
ghc-options: -Wall
|
||||
|
@ -62,7 +62,7 @@ Test-Suite Tests
|
|||
main-is: RunTests.lhs
|
||||
hs-source-dirs: tools
|
||||
Build-Depends: simple-sql-parser,
|
||||
tasty >= 1.1 && < 1.5,
|
||||
tasty >= 1.1 && < 1.6,
|
||||
tasty-hunit >= 0.9 && < 0.11
|
||||
|
||||
Other-Modules: Language.SQL.SimpleSQL.ErrorMessages,
|
||||
|
@ -108,7 +108,7 @@ executable Fixity
|
|||
hs-source-dirs: tools
|
||||
Build-Depends: simple-sql-parser,
|
||||
pretty-show >= 1.6 && < 1.10,
|
||||
tasty >= 1.1 && < 1.5,
|
||||
tasty >= 1.1 && < 1.6,
|
||||
tasty-hunit >= 0.9 && < 0.11
|
||||
if flag(fixitytest)
|
||||
buildable: True
|
||||
|
|
|
@ -7,6 +7,7 @@ Converts the test data to asciidoc
|
|||
> import Language.SQL.SimpleSQL.Parse
|
||||
> import Language.SQL.SimpleSQL.Lex
|
||||
> import Data.List
|
||||
> import Control.Monad (when, unless)
|
||||
|
||||
> data TableItem = Heading Int String
|
||||
> | Row String String
|
||||
|
|
Loading…
Reference in a new issue