use Cabal 3.6

Author: AliasQli

hackage-server.cabal

@@ -117,7 +117,8 @@ common defaults
   -- other dependencies shared by most components
   build-depends:
     , aeson                 ^>= 2.0.3.0
-    , Cabal                 ^>= 3.8
+    , Cabal                 ^>= 3.6.3.0
+    , Cabal-syntax          ^>= 3.6
     , fail                  ^>= 4.9.0
       -- we use Control.Monad.Except, introduced in mtl-2.2.1
     , network               >=  3 && < 3.2
@@ -392,7 +393,7 @@ library lib-server
     , ed25519               ^>= 0.0.5
     , hackage-security      ^>= 0.6
     , hackage-security-HTTP ^>= 0.1.1
-    , haddock-library       >= 1.11 && < 2
+    , haddock-library       > 1.7 && < 2
     , happstack-server      ^>= 7.7.1
     , hashable              ^>= 1.3 || ^>= 1.4
     , hslogger              ^>= 1.3.1

src/Distribution/Server/Features/BuildReports/BuildReport.hs

@@ -71,7 +71,7 @@ import Distribution.FieldGrammar
 import Distribution.Fields.Parser
          ( readFields )
 import Distribution.Fields.Pretty
-         ( showFields, CommentPosition (..) )
+         ( showFields )
 import Distribution.Fields.ParseResult
          (ParseResult, parseFatalFailure, runParseResult )
 import Distribution.Server.Framework.Instances ()
@@ -311,7 +311,7 @@ intPair = do
 -- Pretty-printing
 
 show :: BuildReport -> String
-show = showFields (const NoComment) . prettyFieldGrammar CabalSpecV2_4 fieldDescrs
+show = showFields (const []) . prettyFieldGrammar CabalSpecV2_4 fieldDescrs
 
 -- -----------------------------------------------------------------------------
 -- Description of the fields, for parsing/printing

src/Distribution/Server/Framework/Instances.hs

@@ -136,7 +136,6 @@ instance SafeCopy OS where
     putCopy Ghcjs       = contain $ putWord8 14
     putCopy Hurd        = contain $ putWord8 15
     putCopy Android     = contain $ putWord8 16
-    putCopy Wasi        = contain $ putWord8 17
 
     getCopy = contain $ do
       tag <- getWord8
@@ -158,7 +157,6 @@ instance SafeCopy OS where
         14 -> return Ghcjs
         15 -> return Hurd
         16 -> return Android
-        17 -> return Wasi
         _  -> fail "SafeCopy OS getCopy: unexpected tag"
 
 instance SafeCopy  Arch where
@@ -182,8 +180,6 @@ instance SafeCopy  Arch where
     putCopy Vax           = contain $ putWord8 15
     putCopy JavaScript    = contain $ putWord8 16
     putCopy AArch64       = contain $ putWord8 17
-    putCopy S390X         = contain $ putWord8 18
-    putCopy Wasm32        = contain $ putWord8 19
 
     getCopy = contain $ do
       tag <- getWord8
@@ -206,8 +202,6 @@ instance SafeCopy  Arch where
         15 -> return Vax
         16 -> return JavaScript
         17 -> return AArch64
-        18 -> return S390X
-        19 -> return Wasm32
         _  -> fail "SafeCopy Arch getCopy: unexpected tag"
 
 instance SafeCopy CompilerFlavor where

src/Distribution/Server/Util/CabalRevisions.hs

@@ -38,7 +38,7 @@ import Distribution.Pretty (Pretty (..), prettyShow)
 import Distribution.Version
 import Distribution.Compiler (CompilerFlavor)
 import Distribution.FieldGrammar (prettyFieldGrammar)
-import Distribution.Fields.Pretty (PrettyField (..), showFields, CommentPosition (..))
+import Distribution.Fields.Pretty (PrettyField (..), showFields)
 import Distribution.PackageDescription
 import Distribution.PackageDescription.Parsec (parseGenericPackageDescription, runParseResult)
 import Distribution.PackageDescription.FieldGrammar (sourceRepoFieldGrammar)
@@ -340,7 +340,7 @@ checkPackageDescriptions checkXRevision
   checkSame "The package-url field is unused, don't bother changing it."
             pkgUrlA pkgUrlB
   changesOk "bug-reports" fromShortText bugReportsA bugReportsB
-  changesOkList changesOk "source-repository" (showFields (const NoComment) . (:[]) . ppSourceRepo)
+  changesOkList changesOk "source-repository" (showFields (const []) . (:[]) . ppSourceRepo)
             sourceReposA sourceReposB
   changesOk "synopsis"    fromShortText synopsisA synopsisB
   changesOk "description" fromShortText descriptionA descriptionB
@@ -625,8 +625,8 @@ checkExecutable componentName
 
 checkTestSuite :: ComponentName -> Check TestSuite
 checkTestSuite componentName
-               (TestSuite _nameA interfaceA buildInfoA _codeGenA)
-               (TestSuite _nameB interfaceB buildInfoB _codeGenB) = do
+               (TestSuite _nameA interfaceA buildInfoA)
+               (TestSuite _nameB interfaceB buildInfoB) = do
   checkSame "Cannot change test-suite type" interfaceA interfaceB
   checkBuildInfo componentName buildInfoA buildInfoB