WIP: Cabal 3.9 and GHC 9.6

Author: andreasabel

hackage-server.cabal

@@ -91,8 +91,14 @@ flag test-create-user
 
 flag cabal-parsers
   description: Enable experimental @cabal-parsers@ checks
-  manual: True
   default: False
+  manual: True
+
+-- Automatic flag to turn off the DocTests suite if its dependencies are not available.
+flag doctests
+  description: Build DocTests test-suite
+  -- default: True
+  -- manual:  False
 
 ----------------------------------------------------------------------------
 
@@ -105,7 +111,7 @@ common defaults
   -- see `cabal.project.local-ghc-${VERSION}` files
   build-depends:
     , array                  >= 0.5   && < 0.6
-    , base                   >= 4.13  && < 4.18
+    , base                   >= 4.13  && < 4.19
     , binary                 >= 0.8   && < 0.9
     , bytestring             >= 0.10  && < 0.12
     , containers            ^>= 0.6.0
@@ -119,13 +125,13 @@ common defaults
     , text                  ^>= 1.2.5.0 || ^>= 2.0
     , time                   >= 1.9   && < 1.13
     , transformers           >= 0.5   && < 0.7
-    , unix                   >= 2.7   && < 2.8
+    , unix                   >= 2.7   && < 2.9
     , scientific
   -- other dependencies shared by most components
   build-depends:
     , aeson                 ^>= 2.0.3.0 || ^>= 2.1.0.0
-    , Cabal                 ^>= 3.8.1.0
-    , Cabal-syntax          ^>= 3.8.1.0
+    , Cabal                 ^>= 3.8.1.0 || ^>= 3.9.0.0
+    , Cabal-syntax          ^>= 3.8.1.0 || ^>= 3.9.0.0
         -- Cabal-syntax needs to be bound to constrain hackage-security
         -- see https://github.com/haskell/hackage-server/issues/1130
     , fail                  ^>= 4.9.0
@@ -650,3 +656,6 @@ test-suite DocTests
     , lib-server
     , doctest-parallel ^>= 0.3.0
         -- doctest-parallel-0.2.2 is the first to filter out autogen-modules
+
+  if !flag(doctests)
+    buildable: False

src/Distribution/Server/Framework/BlobStorage.hs

@@ -1,6 +1,10 @@
-{-# LANGUAGE DeriveDataTypeable, GeneralizedNewtypeDeriving,
-             ScopedTypeVariables, TypeFamilies, CPP,
-             RecordWildCards #-}
+{-# LANGUAGE CPP #-}
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeFamilies #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Distribution.Server.BlobStorage
@@ -199,7 +203,11 @@ withIncoming' store file blobId action = do
         if commit
             then do
 #ifndef mingw32_HOST_OS
+#if !MIN_VERSION_unix(2,8,0)
               fd <- openFd (directory store blobId) ReadOnly Nothing defaultFileFlags
+#else
+              fd <- openFd (directory store blobId) ReadOnly defaultFileFlags
+#endif
 #endif
               -- TODO: if the target already exists then there is no need to overwrite
               -- it since it will have the same content. Checking and then renaming

src/Distribution/Server/Packages/Unpack.hs

@@ -1,8 +1,11 @@
--- Unpack a tarball containing a Cabal package
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+
+-- | Unpack a tarball containing a Cabal package
+
 module Distribution.Server.Packages.Unpack (
     CombinedTarErrs(..),
     checkEntries,
@@ -32,7 +35,11 @@ import Distribution.PackageDescription.Configuration
          ( flattenPackageDescription )
 import Distribution.PackageDescription.Check
          ( PackageCheck(..), checkPackage, CheckPackageContentOps(..)
-         , checkPackageContent )
+         , checkPackageContent
+#if MIN_VERSION_Cabal(3,9,0)
+         , ppPackageCheck
+#endif
+         )
 import Distribution.Parsec
          ( showPError, showPWarning )
 import Distribution.Text
@@ -293,8 +300,11 @@ extraChecks genPkgDesc pkgId tarIndex = do
       isDistError (PackageDistSuspiciousWarn {}) = False -- just a warning
       isDistError _                              = True
       (errors, warnings) = partition isDistError checks
-  mapM_ (throwError . explanation) errors
-  mapM_ (warn . explanation) warnings
+#if !MIN_VERSION_Cabal(3,9,0)
+      ppPackageCheck = explanation
+#endif
+  mapM_ (throwError . ppPackageCheck) errors
+  mapM_ (warn . ppPackageCheck) warnings
 
   -- Proprietary License check (only active in central-server branch)
   unless (allowAllRightsReserved || isAcceptableLicense pkgDesc) $

src/Distribution/Server/Util/CabalRevisions.hs

@@ -176,12 +176,16 @@ checkCabalFileRevision checkXRevision old new = do
         newwarns -> fail $ "New parse warning: "
                         ++ unlines (map (showPWarning filename) newwarns)
 
+    checkPackageChecks :: Check GenericPackageDescription
     checkPackageChecks pkg pkg' =
       let checks  = checkPackage pkg  Nothing
           checks' = checkPackage pkg' Nothing
        in case checks' \\ checks of
             []        -> return ()
-            newchecks -> fail $ unlines (map explanation newchecks)
+            newchecks -> fail $ unlines (map ppPackageCheck newchecks)
+#if !MIN_VERSION_Cabal(3,9,0)
+      where ppPackageCheck = explanation
+#endif
 
 checkGenericPackageDescription :: Bool -> Check GenericPackageDescription
 checkGenericPackageDescription checkXRevision