starlitcanopy/simple-sql-parser
1
Fork 0
Code Activity

update to work with latest ghc, cabal packages

Browse source
This commit is contained in:
Jake Wheat 2024-01-08 12:26:44 +00:00
parent a937424514
commit 6957a39911
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -75,8 +75,6 @@ build-haddock :
# todo: handle the deps properly # todo: handle the deps properly
rm -Rf build/haddock rm -Rf build/haddock
mkdir build/haddock/ mkdir build/haddock/
#GHC_VER="$(shell ghc --numeric-version)"
# wtf
$(eval GHC_VER="$(shell ghc --numeric-version)") $(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/

6
simple-sql-parser.cabal
View file

@ -40,7 +40,7 @@ common shared-properties
default-language: Haskell2010 default-language: Haskell2010
build-depends: base >=4 && <5, build-depends: base >=4 && <5,
parsec >=3.1 && <3.2, parsec >=3.1 && <3.2,
mtl >=2.1 && <2.3, mtl >=2.1 && <2.4,
pretty >= 1.1 && < 1.2 pretty >= 1.1 && < 1.2
ghc-options: -Wall ghc-options: -Wall
@ -62,7 +62,7 @@ Test-Suite Tests
main-is: RunTests.lhs main-is: RunTests.lhs
hs-source-dirs: tools hs-source-dirs: tools
Build-Depends: simple-sql-parser, Build-Depends: simple-sql-parser,
tasty >= 1.1 && < 1.5, tasty >= 1.1 && < 1.6,
tasty-hunit >= 0.9 && < 0.11 tasty-hunit >= 0.9 && < 0.11
Other-Modules: Language.SQL.SimpleSQL.ErrorMessages, Other-Modules: Language.SQL.SimpleSQL.ErrorMessages,
@ -108,7 +108,7 @@ executable Fixity
hs-source-dirs: tools hs-source-dirs: tools
Build-Depends: simple-sql-parser, Build-Depends: simple-sql-parser,
pretty-show >= 1.6 && < 1.10, pretty-show >= 1.6 && < 1.10,
tasty >= 1.1 && < 1.5, tasty >= 1.1 && < 1.6,
tasty-hunit >= 0.9 && < 0.11 tasty-hunit >= 0.9 && < 0.11
if flag(fixitytest) if flag(fixitytest)
buildable: True buildable: True

1
website/RenderTestCases.lhs
View file

@ -7,6 +7,7 @@ Converts the test data to asciidoc
> import Language.SQL.SimpleSQL.Parse > import Language.SQL.SimpleSQL.Parse
> import Language.SQL.SimpleSQL.Lex > import Language.SQL.SimpleSQL.Lex
> import Data.List > import Data.List
> import Control.Monad (when, unless)
> data TableItem = Heading Int String > data TableItem = Heading Int String
> | Row String String > | Row String String