Support Cabal-3.14 (GHC 9.12)

Author: andreasabel

.github/workflows/haskell-ci.yml

@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.19.20241223
+# version: 0.19.20250506
 #
-# REGENDATA ("0.19.20241223",["github","hackage-cli.cabal"])
+# REGENDATA ("0.19.20250506",["github","hackage-cli.cabal"])
 #
 name: Haskell-CI
 on:
@@ -23,7 +23,7 @@ on:
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     timeout-minutes:
       60
     container:
@@ -32,19 +32,24 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.10.1
+          - compiler: ghc-9.12.2
             compilerKind: ghc
-            compilerVersion: 9.10.1
+            compilerVersion: 9.12.2
+            setup-method: ghcup
+            allow-failure: false
+          - compiler: ghc-9.10.2
+            compilerKind: ghc
+            compilerVersion: 9.10.2
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.8.4
             compilerKind: ghc
             compilerVersion: 9.8.4
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-9.6.6
+          - compiler: ghc-9.6.7
             compilerKind: ghc
-            compilerVersion: 9.6.6
+            compilerVersion: 9.6.7
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.4.8
@@ -97,12 +102,12 @@ jobs:
       - name: Install GHCup
         run: |
           mkdir -p "$HOME/.ghcup/bin"
-          curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
+          curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
           chmod a+x "$HOME/.ghcup/bin/ghcup"
       - name: Install cabal-install
         run: |
-          "$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
-          echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+          "$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
+          echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
       - name: Install GHC (GHCup)
         if: matrix.setup-method == 'ghcup'
         run: |

cabal.project

@@ -1,10 +1,3 @@
 packages: .
 
--- with-compiler: ghc-8.2.1
-
--- In order to build hackage-cli w/ an unreleased Cabal-2.x (NB: this builds fine w/ GHC 8.2.1 and its bundled Cabal-2.0):
---  1. `cabal get -s Cabal`
---  2. uncomment the 2 lines below (the constraints-line is a hack to avoid `setup`-components picking up the local Cabal package)
-
--- packages: Cabal/Cabal
--- constraints: setup.Cabal < 2
+constraints: HsOpenSSL +use-pkg-config

hackage-cli.cabal

@@ -18,9 +18,10 @@ build-type:          Simple
 -- Supported GHC versions when building with cabal:
 tested-with:
   -- Keep in descending order.
-  GHC == 9.10.1
+  GHC == 9.12.2
+  GHC == 9.10.2
   GHC == 9.8.4
-  GHC == 9.6.6
+  GHC == 9.6.7
   GHC == 9.4.8
   GHC == 9.2.8
   GHC == 9.0.2
@@ -55,7 +56,7 @@ library cabal-revisions
   build-depends:
     , base         >= 4.10.0.0 && < 5
     , bytestring   >= 0.10.4.0 && < 0.13
-    , Cabal        >= 3.4      && < 3.13
+    , Cabal        >= 3.4      && < 3.15
     , containers   >= 0.5.0.0  && < 0.8
     , mtl          >= 2.2.2    && < 2.3   || >= 2.3.1 && < 2.4
     , pretty      ^>= 1.1.2
@@ -125,7 +126,7 @@ executable hackage-cli
     , microlens-mtl          >= 0.1.11.1 && < 0.3
     , microlens-th           >= 0.4.1.3  && < 0.5
     , netrc                 ^>= 0.2.0.0
-    , optparse-applicative   >= 0.14     && < 0.19
+    , optparse-applicative   >= 0.14     && < 1
     , process-extras        ^>= 0.7.4
     , semigroups             >= 0.18.3   && < 0.21
     , stringsearch          ^>= 0.3.6

src/Main.hs

@@ -52,6 +52,9 @@ import qualified Distribution.Text                      as C
 #if MIN_VERSION_Cabal(3,7,0)
 import qualified Distribution.Simple.PackageDescription as C
 #endif
+#if MIN_VERSION_Cabal(3,14,0)
+import Distribution.Utils.Path (makeSymbolicPath)
+#endif
 
 import           Lens.Micro
 import           Lens.Micro.Mtl
@@ -652,8 +655,16 @@ mainWithOptions Options{ optHost, optCommand } = do
 
            return ()
 
-           (pkgn,pkgv,xrev) <- pkgDescToPkgIdXrev <$> C.readGenericPackageDescription C.deafening optSyCFile
        SyncCabal (SyncCOptions{ optSyCFile, optSyCIncrRev, optSyCForce }) -> do
+           (pkgn,pkgv,xrev) <- pkgDescToPkgIdXrev <$>
+             C.readGenericPackageDescription
+               C.deafening
+#if MIN_VERSION_Cabal(3,14,0)
+               Nothing
+               (makeSymbolicPath optSyCFile)
+#else
+               optSyCFile
+#endif
            cab0 <- BS.readFile optSyCFile
 
            BS8.putStrLn $ mconcat [ "local :  "
@@ -736,7 +747,15 @@ mainWithOptions Options{ optHost, optCommand } = do
            putStrLn $ "Using Hackage credentials for username " ++ show username
 
            forM_ optPsCFiles $ \fn -> do
-               (pkgn, pkgv, xrev0) <- pkgDescToPkgIdXrev <$> C.readGenericPackageDescription C.deafening fn
+               (pkgn, pkgv, xrev0) <- pkgDescToPkgIdXrev <$>
+                 C.readGenericPackageDescription
+                   C.deafening
+#if MIN_VERSION_Cabal(3,14,0)
+                   Nothing
+                   (makeSymbolicPath fn)
+#else
+                   fn
+#endif
                let xrev = applyWhen optPsCIncrRev (+1) xrev0
 
                putStrLn $ concat [ "Pushing ", show fn

stack-9.10.yaml

@@ -1,3 +1,7 @@
-resolver: nightly-2025-01-06
-compiler: ghc-9.10.1
+resolver: nightly-2025-05-28
+compiler: ghc-9.10.2
 compiler-check: match-exact
+
+flags:
+  HsOpenSSL:
+    use-pkg-config: true

stack-9.6.yaml

@@ -1 +1,5 @@
-resolver: lts-22.43
+resolver: lts-22.44
+
+flags:
+  HsOpenSSL:
+    use-pkg-config: true

stack-9.8.yaml

@@ -1 +1,5 @@
-resolver: lts-23.3
+resolver: lts-23.24
+
+flags:
+  HsOpenSSL:
+    use-pkg-config: true