Upgrade to Cabal 3.16

app/Distribution/Aeson.hs

@@ -309,7 +309,7 @@ deriving via String instance ToJSON Token'
 
 deriving via String instance ToJSON FilePathNT
 
-deriving via String instance ToJSON CompatFilePath
+deriving via ViaUnpack CompatDataDir instance ToJSON CompatDataDir
 
 deriving via ViaUnpack CompatLicenseFile instance ToJSON CompatLicenseFile
 
@@ -325,7 +325,11 @@ deriving via (ViaPretty SpecLicense) instance ToJSON SpecLicense
 
 deriving via (ViaUnpack (List sep b a)) instance (ToJSON a) => ToJSON (List sep b a)
 
-deriving via (ViaPretty (SymbolicPath from to)) instance ToJSON (SymbolicPath from to)
+deriving via (ViaPretty (SymbolicPathX abs from to)) instance ToJSON (SymbolicPathX abs from to)
+
+deriving via (ViaPretty (SymbolicPathNT from to)) instance ToJSON (SymbolicPathNT from to)
+
+deriving via (ViaPretty (RelativePathNT from to)) instance ToJSON (RelativePathNT from to)
 
 deriving via (ViaPretty BuildType) instance ToJSON BuildType
 

app/Foliage/CmdBuild.hs

@@ -112,9 +112,9 @@ buildAction
             cf <- prepareIndexPkgCabal pkgId (fromMaybe currentTime pkgTimestamp) originalCabalFilePath
 
             -- all revised cabal files, with their timestamp
-            revcf <- for (zip [1 :: Int ..] cabalFileRevisions) $ \(revNum, (timestamp, path)) -> do
-              copyFileChanged path (outputDir </> "package" </> prettyShow pkgId </> "revision" </> show revNum <.> "cabal")
-              prepareIndexPkgCabal pkgId timestamp path
+            revcf <- for cabalFileRevisions $ \(RevisionSpec{revisionTimestamp, revisionNumber}, path) -> do
+              copyFileChanged path (outputDir </> "package" </> prettyShow pkgId </> "revision" </> show revisionNumber <.> "cabal")
+              prepareIndexPkgCabal pkgId revisionTimestamp path
 
             -- current version of the cabal file (after the revisions, if any)
             copyFileChanged cabalFilePath (outputDir </> "package" </> prettyShow pkgId </> prettyShow (pkgName pkgId) <.> "cabal")

app/Foliage/CmdImportIndex.hs

@@ -113,10 +113,10 @@ isCabalFile
     , Tar.entryContent = Tar.NormalFile contents _
     , Tar.entryTime = posixSecondsToUTCTime . fromIntegral -> time
     }
-    | ".cabal" `isSuffixOf` path =
-        let [pkgName, pkgVersion, _] = splitDirectories path
-            Just name = simpleParsec pkgName
-            Just version = simpleParsec pkgVersion
-            packageId = PackageIdentifier name version
-         in Just (packageId, contents, time)
+    | ".cabal" `isSuffixOf` path
+    , [pkgName, pkgVersion, _] <- splitDirectories path
+    , Just name <- simpleParsec pkgName
+    , Just version <- simpleParsec pkgVersion
+    , packageId <- PackageIdentifier name version =
+        Just (packageId, contents, time)
 isCabalFile _ = Nothing

app/Foliage/Meta.hs

@@ -176,9 +176,10 @@ revisionMetaCodec =
 data DeprecationSpec = DeprecationSpec
   { deprecationTimestamp :: UTCTime
   , deprecationIsDeprecated :: Bool
-  -- ^ 'True' means the package version has been deprecated
-  --   'False' means the package version has been undeprecated
-  --   FIXME: we should consider something better than 'Bool'
+  {- ^ 'True' means the package version has been deprecated
+  'False' means the package version has been undeprecated
+  FIXME: we should consider something better than 'Bool'
+  -}
   }
   deriving (Show, Eq, Generic, Ord)
   deriving anyclass (Binary, Hashable, NFData)

app/Foliage/Pages.hs

@@ -27,7 +27,7 @@ import Development.Shake (Action, traced)
 import Distribution.Aeson (jsonGenericPackageDescription)
 import Distribution.Package (PackageIdentifier (pkgName, pkgVersion))
 import Distribution.Pretty (prettyShow)
-import Foliage.Meta (PackageVersionSource)
+import Foliage.Meta (PackageVersionSource, RevisionSpec (..))
 import Foliage.Meta.Aeson ()
 import Foliage.PreparePackageVersion (PreparedPackageVersion (..))
 import Foliage.Utils.Aeson (MyAesonEncoding (..))
@@ -83,7 +83,7 @@ makeAllPackagesPage currentTime outputDir packageVersions =
                       , allPackagesPageEntryTimestamp = fromMaybe currentTime pkgTimestamp
                       , allPackagesPageEntryTimestampPosix = utcTimeToPOSIXSeconds (fromMaybe currentTime pkgTimestamp)
                       , allPackagesPageEntrySource = pkgVersionSource
-                      , allPackagesPageEntryLatestRevisionTimestamp = fst <$> listToMaybe cabalFileRevisions
+                      , allPackagesPageEntryLatestRevisionTimestamp = revisionTimestamp . fst <$> listToMaybe cabalFileRevisions
                       }
                 )
         )
@@ -130,12 +130,12 @@ makeAllPackageVersionsPage currentTime outputDir packageVersions =
             }
             -- list of revisions
             : [ AllPackageVersionsPageEntryRevision
-                { allPackageVersionsPageEntryPkgId = pkgId
-                , allPackageVersionsPageEntryTimestamp = revisionTimestamp
-                , allPackageVersionsPageEntryTimestampPosix = utcTimeToPOSIXSeconds revisionTimestamp
-                , allPackageVersionsPageEntryDeprecated = pkgVersionIsDeprecated
-                }
-              | (revisionTimestamp, _) <- cabalFileRevisions
+                  { allPackageVersionsPageEntryPkgId = pkgId
+                  , allPackageVersionsPageEntryTimestamp = revisionTimestamp
+                  , allPackageVersionsPageEntryTimestampPosix = utcTimeToPOSIXSeconds revisionTimestamp
+                  , allPackageVersionsPageEntryDeprecated = pkgVersionIsDeprecated
+                  }
+              | (RevisionSpec{revisionTimestamp}, _) <- cabalFileRevisions
               ]
       )
       packageVersions

app/Foliage/PreparePackageVersion.hs

@@ -52,7 +52,7 @@ data PreparedPackageVersion = PreparedPackageVersion
   , sdistPath :: FilePath
   , cabalFilePath :: FilePath
   , originalCabalFilePath :: FilePath
-  , cabalFileRevisions :: [(UTCTime, FilePath)]
+  , cabalFileRevisions :: [(RevisionSpec, FilePath)]
   }
 
 -- @andreabedini comments:
@@ -190,8 +190,8 @@ preparePackageVersion inputDir metaFile = do
   let cabalFileRevisions =
         sortOn
           Down
-          [ (revisionTimestamp, cabalFileRevisionPath revisionNumber)
-          | RevisionSpec{revisionTimestamp, revisionNumber} <- packageVersionRevisions pkgSpec
+          [ (revision, cabalFileRevisionPath revisionNumber)
+          | revision@RevisionSpec{revisionNumber} <- packageVersionRevisions pkgSpec
           ]
 
   let pkgVersionDeprecationChanges =

app/Foliage/PrepareSdist.hs

@@ -23,6 +23,7 @@ import Development.Shake.Rule
 import Distribution.Client.SrcDist (packageDirToSdist)
 import Distribution.Package (packageId)
 import Distribution.Simple.PackageDescription (readGenericPackageDescription)
+import Distribution.Utils.Path (makeSymbolicPath)
 import Distribution.Verbosity qualified as Verbosity
 import Foliage.HackageSecurity
 import Foliage.Meta ()
@@ -92,7 +93,7 @@ addPrepareSdistRule outputDirRoot = addBuiltinRule noLint noIdentity run
                 ]
 
     traced "cabal sdist" $ do
-      gpd <- readGenericPackageDescription Verbosity.normal (srcDir </> cabalFile)
+      gpd <- readGenericPackageDescription Verbosity.normal Nothing (makeSymbolicPath $ srcDir </> cabalFile)
       let pkgId = packageId gpd
           packagePath = repoLayoutPkgTarGz hackageRepoLayout pkgId
           path = toFilePath $ anchorRepoPathLocally outputDirRoot packagePath

app/Foliage/Shake.hs

@@ -11,6 +11,7 @@ import Development.Shake
 import Development.Shake.FilePath
 import Distribution.Simple.PackageDescription
 import Distribution.Types.GenericPackageDescription
+import Distribution.Utils.Path (makeSymbolicPath)
 import Distribution.Verbosity qualified as Verbosity
 import Foliage.HackageSecurity
 import Foliage.Meta
@@ -36,4 +37,4 @@ readPackageVersionSpec' fp = do
 readGenericPackageDescription' :: FilePath -> Action GenericPackageDescription
 readGenericPackageDescription' fp = do
   need [fp]
-  liftIO $ readGenericPackageDescription Verbosity.silent fp
+  liftIO $ readGenericPackageDescription Verbosity.silent Nothing (makeSymbolicPath fp)

app/Foliage/UpdateCabalFile.hs

@@ -5,6 +5,7 @@ import Distribution.PackageDescription.PrettyPrint
 import Distribution.Simple.PackageDescription
 import Distribution.Types.Lens
 import Distribution.Types.Version
+import Distribution.Utils.Path
 import Distribution.Verbosity
 
 rewritePackageVersion
@@ -14,5 +15,5 @@ rewritePackageVersion
   -- ^ new version
   -> IO ()
 rewritePackageVersion cabalPath ver = do
-  gpd <- readGenericPackageDescription normal cabalPath
+  gpd <- readGenericPackageDescription normal Nothing (makeSymbolicPath cabalPath)
   writeGenericPackageDescription cabalPath (set (packageDescription . package . pkgVersion) ver gpd)

cabal.project

@@ -1,6 +1,6 @@
 packages: .
-index-state: 2023-09-10T21:31:08Z
-with-compiler: ghc-9.4.8
+index-state: 2025-12-23T23:59:20Z
+with-compiler: ghc-9.8.4
 
 tests: True
 test-show-details: direct