Commit 395205c0 authored by Alec Theriault's avatar Alec Theriault Committed by GitHub

Fix Travis CI, loosen .cabal bounds (#1089)

Tentatively for the 2.23 release:

  * updated Travis CI to work again
  * tweaked bounds in the `.cabal` files
  * adjusted `extra-source-files` to properly identify test files
parent 91c65619
This diff is collapsed.
......@@ -166,11 +166,11 @@ test-suite spec
Haddock.Backends.Hyperlinker.Types
build-depends: ghc ^>= 8.8
, ghc-paths ^>= 0.1.0.9
, ghc-paths ^>= 0.1.0.12
, haddock-library ^>= 1.8.0
, xhtml ^>= 3000.2.2
, hspec >= 2.4.4 && < 2.7
, QuickCheck >= 2.11 && < 2.13
, hspec >= 2.4.4 && < 2.8
, QuickCheck >= 2.11 && < 2.14
-- Versions for the dependencies below are transitively pinned by
-- the non-reinstallable `ghc` package and hence need no version
......@@ -186,7 +186,7 @@ test-suite spec
, transformers
build-tool-depends:
hspec-discover:hspec-discover >= 2.4.4 && < 2.7
hspec-discover:hspec-discover >= 2.4.4 && < 2.8
source-repository head
type: git
......
......@@ -19,6 +19,8 @@ bug-reports: https://github.com/haskell/haddock/issues
category: Documentation
extra-source-files:
CHANGES.md
fixtures/examples/*.input
fixtures/examples/*.parsed
common lib-defaults
default-language: Haskell2010
......@@ -74,8 +76,8 @@ test-suite spec
Documentation.Haddock.Parser.Identifier
build-depends:
, base-compat ^>= 0.9.3 || ^>= 0.10.0
, QuickCheck ^>= 2.11 || ^>= 2.12
, base-compat ^>= 0.9.3 || ^>= 0.11.0
, QuickCheck ^>= 2.11 || ^>= 2.13.2
, deepseq ^>= 1.3.0.0 || ^>= 1.4.0.0
-- NB: build-depends & build-tool-depends have independent
......@@ -83,10 +85,10 @@ test-suite spec
-- version of `hspec` & `hspec-discover` to ensure
-- intercompatibility
build-depends:
, hspec >= 2.4.4 && < 2.7
, hspec >= 2.4.4 && < 2.8
build-tool-depends:
, hspec-discover:hspec-discover >= 2.4.4 && < 2.7
, hspec-discover:hspec-discover >= 2.4.4 && < 2.8
test-suite fixtures
type: exitcode-stdio-1.0
......@@ -101,11 +103,11 @@ test-suite fixtures
, base
-- extra dependencies
, base-compat >= 0.9.3 && < 0.11
, base-compat ^>= 0.9.3 || ^>= 0.11.0
, directory ^>= 1.3.0.2
, filepath ^>= 1.4.1.2
, optparse-applicative ^>= 0.14.0.0
, tree-diff ^>= 0.0.0.1
, optparse-applicative ^>= 0.15
, tree-diff ^>= 0.1
source-repository head
type: git
......
cabal-version: 2.0
cabal-version: 2.4
name: haddock
version: 2.23.0
synopsis: A documentation-generation tool for Haskell libraries
......@@ -24,7 +24,7 @@ description:
from your source code.
.
<<https://cdn.rawgit.com/haskell/haddock/ghc-8.8/doc/cheatsheet/haddocks.svg>>
license: BSD3
license: BSD-3-Clause
license-file: LICENSE
author: Simon Marlow, David Waern
maintainer: Alec Theriault <alec.theriault@gmail.com>, Alex Biehl <alexbiehl@gmail.com>, Simon Hengel <sol@typeful.net>, Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
......@@ -47,9 +47,10 @@ extra-source-files:
html-test/ref/*.html
hypsrc-test/src/*.hs
hypsrc-test/ref/src/*.html
latex-test/src/Simple/*.hs
latex-test/ref/Simple/*.tex
latex-test/ref/Simple/*.sty
latex-test/src/**/*.hs
latex-test/ref/**/*.tex
hoogle-test/src/**/*.hs
hoogle-test/ref/**/*.txt
flag in-ghc-tree
description: Are we in a GHC tree?
......@@ -62,7 +63,7 @@ executable haddock
hs-source-dirs: driver
ghc-options: -funbox-strict-fields -Wall -fwarn-tabs -O2 -threaded
-- haddock typically only supports a single GHC major version
-- haddock typically only supports a single GHC major version
build-depends:
base ^>= 4.13.0.0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment