Skip to content

Commit

Permalink
Bump versions for ghc-9.6 release
Browse files Browse the repository at this point in the history
  • Loading branch information
bgamari committed Mar 10, 2023
1 parent 37e3c36 commit 9696d0d
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 14 deletions.
4 changes: 1 addition & 3 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
with-compiler: ghc-9.4
with-compiler: ghc-9.6

packages: ./
./haddock-api
./haddock-library
./haddock-test

with-compiler: ghc-9.4

allow-newer:
ghc-paths:Cabal,
*:base,
Expand Down
8 changes: 4 additions & 4 deletions haddock-api/haddock-api.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: haddock-api
version: 2.27.0
version: 2.28.0
synopsis: A documentation-generation tool for Haskell libraries
description: Haddock is a documentation-generation tool for Haskell
libraries
Expand All @@ -13,7 +13,7 @@ bug-reports: https://github.com/haskell/haddock/issues
copyright: (c) Simon Marlow, David Waern
category: Documentation
build-type: Simple
tested-with: GHC==9.4.*
tested-with: GHC==9.6.*

extra-source-files:
CHANGES.md
Expand Down Expand Up @@ -44,7 +44,7 @@ library

-- this package typically supports only single major versions
build-depends: base ^>= 4.16.0
, ghc ^>= 9.4
, ghc ^>= 9.6
, ghc-paths ^>= 0.1.0.9
, haddock-library ^>= 1.11
, xhtml ^>= 3000.2.2
Expand Down Expand Up @@ -180,7 +180,7 @@ test-suite spec
Haddock.Backends.Hyperlinker.Parser
Haddock.Backends.Hyperlinker.Types

build-depends: ghc ^>= 9.4
build-depends: ghc ^>= 9.6
, ghc-paths ^>= 0.1.0.12
, haddock-library ^>= 1.11
, xhtml ^>= 3000.2.2
Expand Down
2 changes: 1 addition & 1 deletion haddock-library/haddock-library.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ common lib-defaults
default-language: Haskell2010

build-depends:
, base >= 4.5 && < 4.17
, base >= 4.5 && < 4.19
, containers ^>= 0.4.2.1 || ^>= 0.5.0.0 || ^>= 0.6.0.1
, text ^>= 1.2.3.0 || ^>= 2.0
, parsec ^>= 3.1.13.0
Expand Down
4 changes: 2 additions & 2 deletions haddock-test/haddock-test.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ bug-reports: https://github.com/haskell/haddock/issues
copyright: (c) Simon Marlow, David Waern
category: Documentation
build-type: Simple
tested-with: GHC==9.4.*
tested-with: GHC==9.6.*
stability: experimental

library
default-language: Haskell2010
ghc-options: -Wall
hs-source-dirs: src
build-depends: base >= 4.3 && < 4.17, bytestring, directory, process, filepath, Cabal
build-depends: base >= 4.3 && < 4.19, bytestring, directory, process, filepath, Cabal

exposed-modules:
Test.Haddock
Expand Down
8 changes: 4 additions & 4 deletions haddock.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: haddock
version: 2.27.0
version: 2.28.0
synopsis: A documentation-generation tool for Haskell libraries
description:
This is Haddock, a tool for automatically generating documentation
Expand Down Expand Up @@ -35,7 +35,7 @@ bug-reports: https://github.com/haskell/haddock/issues
copyright: (c) Simon Marlow, David Waern
category: Documentation
build-type: Simple
tested-with: GHC==9.4.*
tested-with: GHC==9.6.*

extra-source-files:
CHANGES.md
Expand Down Expand Up @@ -68,7 +68,7 @@ executable haddock

-- haddock typically only supports a single GHC major version
build-depends:
base ^>= 4.13.0.0 || ^>= 4.14.0.0 || ^>= 4.15.0.0 || ^>= 4.16.0.0 || ^>= 4.17.0.0 || ^>= 4.18.0.0
base ^>= 4.13.0.0 || ^>= 4.14.0.0 || ^>= 4.15.0.0 || ^>= 4.16.0.0 || ^>= 4.17.0.0 || ^>= 4.18.0.0 || ^>= 4.19.0.0

if flag(in-ghc-tree)
hs-source-dirs: haddock-api/src, haddock-library/src
Expand Down Expand Up @@ -150,7 +150,7 @@ executable haddock
else
-- in order for haddock's advertised version number to have proper meaning,
-- we pin down to a single haddock-api version.
build-depends: haddock-api == 2.27.0
build-depends: haddock-api == 2.28.0

test-suite html-test
type: exitcode-stdio-1.0
Expand Down

0 comments on commit 9696d0d

Please sign in to comment.