Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ jobs:
# IMPORTANT: If you remove a version from this list, then add it to the old-ghcs job below.
# Also a removed GHC from here means that we are actually dropping
# support, so the PR *must* have a changelog entry.
"9.14.0.20250819",
"9.12.2",
"9.10.2",
"9.8.4",
Expand Down Expand Up @@ -130,7 +131,7 @@ jobs:
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: 3.12.1.0 # see https://github.com/haskell/cabal/pull/10251
ghcup-release-channel: https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml
ghcup-release-channel: https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.9.yaml

# See the following link for a breakdown of the following step
# https://github.com/haskell/actions/issues/7#issuecomment-745697160
Expand Down
3 changes: 3 additions & 0 deletions Cabal/Cabal.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ library
if impl(ghc >= 8.0) && impl(ghc < 8.8)
ghc-options: -Wnoncanonical-monadfail-instances

if impl(ghc >= 9.14)
ghc-options: -Wno-pattern-namespace-specifier -Wno-incomplete-record-selectors

exposed-modules:
Distribution.Backpack.Configure
Distribution.Backpack.ComponentsGraph
Expand Down
3 changes: 3 additions & 0 deletions cabal-install/cabal-install.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ common warnings
if impl(ghc < 8.8)
ghc-options: -Wnoncanonical-monadfail-instances

if impl(ghc >= 9.14)
ghc-options: -Wno-pattern-namespace-specifier -Wno-incomplete-record-selectors

common base-dep
build-depends:
, base >=4.13 && <4.22
Expand Down
10 changes: 7 additions & 3 deletions cabal-install/tests/IntegrationTests2.hs
Original file line number Diff line number Diff line change
Expand Up @@ -2768,7 +2768,8 @@ testConfigOptionComments = do

testIgnoreProjectFlag :: Assertion
testIgnoreProjectFlag = do
-- Coverage flag should be false globally by default (~/.cabal folder)
-- Coverage flag should be false globally by default.
-- This should be covered by the vanilla config file created in `main`.
(_, _, prjConfigGlobal, _, _) <- configureProject testdir ignoreSetConfig
let globalCoverageFlag = packageConfigCoverage . projectConfigLocalPackages $ prjConfigGlobal
False @=? Flag.fromFlagOrDefault False globalCoverageFlag
Expand Down Expand Up @@ -2797,7 +2798,10 @@ testHaddockProjectDependencies config = do
(_, _, sharedConfig) <- planProject testdir config
-- `haddock-project` is only supported by `haddock-2.26.1` and above which is
-- shipped with `ghc-9.4`
when (compilerVersion (pkgConfigCompiler sharedConfig) > mkVersion [9, 4]) $ do
-- And doesn't work with older ghc on Windows for some reason (file in the
-- wrong place, perhaps?).
let safeMinor = if buildOS == Windows then 10 else 4
when (compilerVersion (pkgConfigCompiler sharedConfig) > mkVersion [9, safeMinor]) $ do
let dir = basedir </> testdir
cleanHaddockProject testdir
withCurrentDirectory dir $ do
Expand All @@ -2811,7 +2815,7 @@ testHaddockProjectDependencies config = do
["all"]
defaultGlobalFlags{globalStoreDir = Flag "store"}

let haddock = "haddocks" </> "async" </> "async.haddock"
let haddock = "haddocks" </> "time" </> "time.haddock"
hasHaddock <- doesFileExist haddock
unless hasHaddock $ assertFailure ("File `" ++ haddock ++ "` does not exist.")
cleanHaddockProject testdir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ cabal-version: >= 1.10

library
exposed-modules: MyLib
build-depends: base, async
build-depends: base, time
hs-source-dirs: src
default-language: Haskell2010
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ jobs: 1

documentation: True

package async
package time
documentation: True
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module MyLib (someFunc) where

import Control.Concurrent.Async
import Data.Time.Clock

someFunc :: IO (Async ())
someFunc = async (return ())
someFunc :: IO ()
someFunc = print =<< getCurrentTime
4 changes: 2 additions & 2 deletions project-cabal/ghc-latest.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

-- NOTE: don't forget to update the compiler version in the conditional
-- when upgrading to a newer GHC
if impl(ghc >= 9.12.0)
if impl(ghc >= 9.14.0)
allow-newer:
--windns:*, rere:*, tree-diff:*, uuid-types:*, these:*, assoc:*, semialign:*, indexed-traversable-instances:*, indexed-traversable:*, OneTuple:*, scientific:*, time-compat:*, text-short:*, integer-conversion:*, generically:*, data-fix:*, binary:*
-- Artem, 2024-04-21: I started and then gave up...
*:base, *:template-haskell, text-short, *:deepseq, *:bytestring, *:ghc-prim
*:base, *:template-haskell, text-short, *:deepseq, *:bytestring, *:ghc-prim, *:ghc-bignum, *:containers

-- repository head.hackage.ghc.haskell.org
-- url: https://ghc.gitlab.haskell.org/head.hackage/
Expand Down
1 change: 1 addition & 0 deletions project-cabal/ghc-options.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ if impl(ghc >= 9)
ghc-options: -Wunused-packages
package cabal-testsuite
ghc-options: -Wwarn=unused-packages

Loading