mirror of
https://github.com/IHaskell/IHaskell.git
synced 2025-04-17 20:06:07 +00:00
Clean out support for old ghcs from cabal files
This commit is contained in:
parent
18e108811f
commit
15d751447f
@ -16,37 +16,15 @@ build-type: Simple
|
||||
-- extra-source-files:
|
||||
cabal-version: >=1.16
|
||||
|
||||
-- hs-source-dirs doesn't work well, doesn't take union, so include all src dirs specifically
|
||||
extra-source-files:
|
||||
HaskellParser76.y.pp
|
||||
HaskellParser782.y.pp
|
||||
HaskellParser783.y.pp
|
||||
src-7.10/Language/Haskell/GHC/HappyParser.hs
|
||||
src-7.8.2/Language/Haskell/GHC/HappyParser.hs
|
||||
src-7.8.3/Language/Haskell/GHC/HappyParser.hs
|
||||
src-7.6/Language/Haskell/GHC/HappyParser.hs
|
||||
|
||||
library
|
||||
build-tools: happy, cpphs
|
||||
exposed-modules: Language.Haskell.GHC.Parser,
|
||||
Language.Haskell.GHC.HappyParser
|
||||
-- other-modules:
|
||||
-- other-extensions:
|
||||
build-depends: base >=4.6 && < 5,
|
||||
ghc >=7.6 && <8.7
|
||||
build-depends: base >=4.9 && < 5,
|
||||
ghc >=8.0 && <8.7
|
||||
|
||||
if impl(ghc >= 7.6) && impl(ghc < 7.8)
|
||||
hs-source-dirs: generic-src src-7.6
|
||||
else
|
||||
if impl(ghc >= 7.8) && impl(ghc < 7.8.3)
|
||||
hs-source-dirs: generic-src src-7.8.2
|
||||
else
|
||||
if impl(ghc < 7.10)
|
||||
hs-source-dirs: generic-src src-7.8.3
|
||||
else
|
||||
if impl(ghc < 8.0)
|
||||
hs-source-dirs: generic-src src-7.10
|
||||
else
|
||||
if impl(ghc >= 8.0) && impl(ghc < 8.4)
|
||||
hs-source-dirs: generic-src src-8.0
|
||||
else
|
||||
|
@ -1,42 +0,0 @@
|
||||
module Language.Haskell.GHC.HappyParser
|
||||
( fullStatement
|
||||
, fullImport
|
||||
, fullDeclaration
|
||||
, fullExpression
|
||||
, fullTypeSignature
|
||||
, fullModule
|
||||
) where
|
||||
|
||||
import Parser
|
||||
import SrcLoc
|
||||
|
||||
-- compiler/hsSyn
|
||||
import HsSyn
|
||||
|
||||
-- compiler/utils
|
||||
import OrdList
|
||||
|
||||
-- compiler/parser
|
||||
import RdrHsSyn
|
||||
import Lexer
|
||||
|
||||
-- compiler/basicTypes
|
||||
import RdrName
|
||||
|
||||
fullStatement :: P (Maybe (LStmt RdrName (LHsExpr RdrName)))
|
||||
fullStatement = parseStmt
|
||||
|
||||
fullImport :: P (LImportDecl RdrName)
|
||||
fullImport = parseImport
|
||||
|
||||
fullDeclaration :: P (OrdList (LHsDecl RdrName))
|
||||
fullDeclaration = parseDeclaration
|
||||
|
||||
fullExpression :: P (LHsExpr RdrName)
|
||||
fullExpression = parseExpression
|
||||
|
||||
fullTypeSignature :: P (Located (OrdList (LHsDecl RdrName)))
|
||||
fullTypeSignature = parseTypeSignature
|
||||
|
||||
fullModule :: P (Located (HsModule RdrName))
|
||||
fullModule = parseModule
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -53,7 +53,7 @@ library
|
||||
-- other-modules:
|
||||
|
||||
-- Other library packages from which modules are imported.
|
||||
build-depends: base >=4.6 && <5,
|
||||
build-depends: base >=4.9 && <5,
|
||||
here,
|
||||
text,
|
||||
bytestring,
|
||||
|
@ -57,7 +57,7 @@ library
|
||||
-- other-modules:
|
||||
|
||||
-- Other library packages from which modules are imported.
|
||||
build-depends: base >=4.6 && <5,
|
||||
build-depends: base >=4.9 && <5,
|
||||
blaze-html >= 0.6,
|
||||
blaze-markup >= 0.5,
|
||||
ihaskell >= 0.5
|
||||
|
@ -54,7 +54,7 @@ library
|
||||
-- other-modules:
|
||||
|
||||
-- Other library packages from which modules are imported.
|
||||
build-depends: base >=4.6 && <5,
|
||||
build-depends: base >=4.9 && <5,
|
||||
bytestring,
|
||||
data-default-class,
|
||||
directory,
|
||||
|
@ -55,7 +55,7 @@ library
|
||||
IHaskell.Display.Diagrams.ImgSize
|
||||
|
||||
-- Other library packages from which modules are imported.
|
||||
build-depends: base >=4.6 && <5,
|
||||
build-depends: base >=4.9 && <5,
|
||||
text,
|
||||
bytestring,
|
||||
directory,
|
||||
|
@ -54,7 +54,7 @@ library
|
||||
-- other-modules:
|
||||
|
||||
-- Other library packages from which modules are imported.
|
||||
build-depends: base >=4.6 && <5,
|
||||
build-depends: base >=4.9 && <5,
|
||||
bytestring,
|
||||
gnuplot >= 0.5.4,
|
||||
ihaskell >= 0.6.2
|
||||
|
@ -14,7 +14,7 @@ cabal-version: >=1.16
|
||||
|
||||
library
|
||||
exposed-modules: IHaskell.Display.Hatex
|
||||
build-depends: base >=4.6 && <5,
|
||||
build-depends: base >=4.9 && <5,
|
||||
text,
|
||||
HaTeX >= 3.9,
|
||||
ihaskell >= 0.5
|
||||
|
@ -60,7 +60,7 @@ library
|
||||
-- other-modules:
|
||||
|
||||
-- Other library packages from which modules are imported.
|
||||
build-depends: base >=4.6 && <5,
|
||||
build-depends: base >=4.9 && <5,
|
||||
bytestring,
|
||||
directory,
|
||||
JuicyPixels >= 3.1.3,
|
||||
|
@ -57,7 +57,7 @@ library
|
||||
-- other-modules:
|
||||
|
||||
-- Other library packages from which modules are imported.
|
||||
build-depends: base >=4.6 && <5,
|
||||
build-depends: base >=4.9 && <5,
|
||||
magic >= 1.0.8,
|
||||
text,
|
||||
bytestring,
|
||||
|
@ -54,7 +54,7 @@ library
|
||||
-- other-modules:
|
||||
|
||||
-- Other library packages from which modules are imported.
|
||||
build-depends: base >=4.6 && <5,
|
||||
build-depends: base >=4.9 && <5,
|
||||
plot,
|
||||
bytestring,
|
||||
hmatrix >= 0.10,
|
||||
|
@ -60,7 +60,7 @@ library
|
||||
-- other-extensions:
|
||||
|
||||
-- Other library packages from which modules are imported.
|
||||
build-depends: base >=4.7,
|
||||
build-depends: base >=4.9,
|
||||
ihaskell,
|
||||
static-canvas,
|
||||
text
|
||||
|
@ -91,10 +91,8 @@ library
|
||||
-- LANGUAGE extensions used by modules in this package.
|
||||
-- other-extensions:
|
||||
|
||||
-- Other library packages from which modules are imported.
|
||||
-- singletons 2.* require ghc 7.10.2
|
||||
build-depends: aeson >=0.7
|
||||
, base >=4.7 && <5
|
||||
, base >=4.9 && <5
|
||||
, containers >= 0.5
|
||||
, ipython-kernel >= 0.6.1.2
|
||||
, text >= 0.11
|
||||
@ -104,30 +102,13 @@ library
|
||||
, scientific -any
|
||||
, unix -any
|
||||
, ihaskell >= 0.6.4.1
|
||||
if impl(ghc >= 7.10.2)
|
||||
build-depends: singletons >= 0.9.0
|
||||
if impl(ghc == 7.10.1)
|
||||
build-depends: singletons >= 0.9.0 && <2.0
|
||||
, nats -any
|
||||
if impl(ghc < 7.10.1)
|
||||
build-depends: singletons >= 0.9.0 && <2.0
|
||||
, nats <1.1
|
||||
|
||||
-- The singletons package version is locked to the compiler
|
||||
-- so let cabal choose the right one.
|
||||
, singletons -any
|
||||
|
||||
-- Directories containing source files.
|
||||
hs-source-dirs: src
|
||||
|
||||
-- Base language which the package is written in.
|
||||
default-language: Haskell2010
|
||||
|
||||
-- Deal with small -fcontext-stack on ghc-7.8.
|
||||
-- Default values:
|
||||
-- ghc-7.6.* = 200
|
||||
-- ghc-7.8.* = 20 -- Too small for vinyl & singletons
|
||||
-- ghc-7.10.* = 100
|
||||
if impl(ghc == 7.8.*)
|
||||
ghc-options: -fcontext-stack=100
|
||||
|
||||
-- compile without optimizations not to run out of memory on travis
|
||||
if impl(ghc == 7.10.*)
|
||||
ghc-options: -O0
|
||||
|
||||
|
@ -134,10 +134,10 @@ executable ihaskell
|
||||
default-language: Haskell2010
|
||||
build-depends:
|
||||
ihaskell -any,
|
||||
base >=4.6 && < 4.13,
|
||||
base >=4.9 && < 4.13,
|
||||
text >=0.11,
|
||||
transformers -any,
|
||||
ghc >=7.6 || < 7.11,
|
||||
ghc >=8.0 && < 8.7,
|
||||
process >=1.1,
|
||||
aeson >=0.7,
|
||||
bytestring >=0.10,
|
||||
@ -147,9 +147,6 @@ executable ihaskell
|
||||
directory -any,
|
||||
ipython-kernel >=0.7
|
||||
|
||||
if flag(binPkgDb)
|
||||
build-depends: bin-package-db
|
||||
|
||||
Test-Suite hspec
|
||||
Type: exitcode-stdio-1.0
|
||||
Ghc-Options: -threaded
|
||||
|
@ -34,7 +34,7 @@ library
|
||||
other-extensions: OverloadedStrings
|
||||
hs-source-dirs: src
|
||||
default-language: Haskell2010
|
||||
build-depends: base >=4.6 && <5,
|
||||
build-depends: base >=4.9 && <5,
|
||||
aeson ,
|
||||
bytestring ,
|
||||
cereal ,
|
||||
|
Loading…
x
Reference in New Issue
Block a user