[Git][ghc/ghc][master] haddock: Update bounds in cabal files and remove allow-newer stanza in cabal.project

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
cd512234 by Hécate Kleidukos at 2024-06-20T07:24:02-04:00
haddock: Update bounds in cabal files and remove allow-newer stanza in cabal.project

- - - - -


4 changed files:

- utils/haddock/cabal.project
- utils/haddock/haddock-library/haddock-library.cabal
- utils/haddock/haddock-test/haddock-test.cabal
- utils/haddock/haddock.cabal


Changes:

=====================================
utils/haddock/cabal.project
=====================================
@@ -5,12 +5,6 @@ packages: ./
 
 test-show-details: direct
 
-allow-newer:
-  ghc-paths:Cabal,
-  *:base,
-  *:ghc-prim,
-  tree-diff:time
-
 package haddock-library
   tests: False
 
@@ -18,4 +12,4 @@ package haddock-api
   tests: False
 
 -- Pinning the index-state helps to make reasonably CI deterministic
-index-state: 2023-05-22T15:14:29Z
+index-state: 2024-06-18T11:54:44Z


=====================================
utils/haddock/haddock-library/haddock-library.cabal
=====================================
@@ -33,7 +33,7 @@ common lib-defaults
   default-language: Haskell2010
 
   build-depends:
-    , base         >= 4.10     && < 4.20
+    , base         >= 4.10     && < 4.21
     , containers   ^>= 0.4.2.1 || ^>= 0.5.0.0 || ^>= 0.6.0.1 || ^>= 0.7
     , text         ^>= 1.2.3.0 || ^>= 2.0 || ^>= 2.1
     , parsec       ^>= 3.1.13.0
@@ -79,9 +79,9 @@ test-suite spec
     Documentation.Haddock.Parser.Identifier
 
   build-depends:
-    , base-compat  ^>= 0.12.0 || ^>= 0.13.0
-    , QuickCheck   ^>= 2.11  || ^>= 2.13.2 || ^>= 2.14
-    , deepseq      ^>= 1.3.0.0 || ^>= 1.4.0.0 || ^>=1.5.0.0
+    , base-compat  >= 0.12.0 && <0.15.0
+    , QuickCheck   >= 2.11 && <2.16
+    , deepseq      >= 1.3.0.0 && <1.6.0.0
 
   -- NB: build-depends & build-tool-depends have independent
   --     install-plans, so it's best to limit to a single major
@@ -106,8 +106,8 @@ test-suite fixtures
     , base
 
       -- extra dependencies
-    , base-compat           ^>= 0.12.0 || ^>=0.13.0
+    , base-compat
     , directory             ^>= 1.3.0.2
-    , filepath              ^>= 1.4.1.2
+    , filepath              >= 1.4 && <1.6
     , optparse-applicative  >= 0.15 && < 0.19
     , tree-diff             ^>= 0.2 || ^>= 0.3


=====================================
utils/haddock/haddock-test/haddock-test.cabal
=====================================
@@ -16,7 +16,7 @@ library
   default-language: Haskell2010
   ghc-options: -Wall
   hs-source-dirs:   src
-  build-depends:    base >= 4.3 && < 4.20, bytestring, directory, process, filepath, Cabal
+  build-depends:    base >= 4.3 && < 4.21, bytestring, directory, process, filepath, Cabal
 
   exposed-modules:
     Test.Haddock


=====================================
utils/haddock/haddock.cabal
=====================================
@@ -79,7 +79,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 || ^>= 4.19.0.0 || ^>= 4.20.0.0
+    base >= 4.13.0.0 && <4.21
 
   if flag(in-ghc-tree)
     hs-source-dirs: haddock-api/src,  haddock-library/src



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/cd51223492e567edb39aa65fff5a37ffac2db327

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/cd51223492e567edb39aa65fff5a37ffac2db327
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20240620/081f5c7c/attachment-0001.html>