Skip to content
  • mergify[bot]'s avatar
    0f2350c1
    Bump base in cabal-dev-scripts.cabal (backport #9303) (#9311) · 0f2350c1
    mergify[bot] authored
    
    
    * Bump base in cabal-dev-scripts.cabal
    
    Bump base in cabal-dev-scripts.cabal. We are now using GHC 9.4.7 in CI, which ships with base 4.17.2.0. I am bumping all the way to <4.19 after testing everything compiles with GHC 9.6.3 (base-4.18.1.0).
    
    (cherry picked from commit 033e8e04)
    
    * Avoid OverloadedStrings when it causes troubles
    
    (cherry picked from commit dc08acb9)
    
    # Conflicts:
    #	Cabal-syntax/src/Distribution/Fields/Parser.hs
    
    * doctest: provide a separate project file without -Werror (fix #9307)
    
    This became necessary after an upgrade to GHC 9.4, which, apparently,
    has a subtle change in how -W/-w-related things get interpreted.
    
    (cherry picked from commit ccce7c3b)
    
    * fixup! resolve a conflict
    
    ---------
    
    Co-authored-by: default avatarAndrea Bedini <andrea.bedini@tweag.io>
    Co-authored-by: default avatarArtem Pelenitsyn <a.pelenitsyn@gmail.com>
    0f2350c1
    Bump base in cabal-dev-scripts.cabal (backport #9303) (#9311)
    mergify[bot] authored
    
    
    * Bump base in cabal-dev-scripts.cabal
    
    Bump base in cabal-dev-scripts.cabal. We are now using GHC 9.4.7 in CI, which ships with base 4.17.2.0. I am bumping all the way to <4.19 after testing everything compiles with GHC 9.6.3 (base-4.18.1.0).
    
    (cherry picked from commit 033e8e04)
    
    * Avoid OverloadedStrings when it causes troubles
    
    (cherry picked from commit dc08acb9)
    
    # Conflicts:
    #	Cabal-syntax/src/Distribution/Fields/Parser.hs
    
    * doctest: provide a separate project file without -Werror (fix #9307)
    
    This became necessary after an upgrade to GHC 9.4, which, apparently,
    has a subtle change in how -W/-w-related things get interpreted.
    
    (cherry picked from commit ccce7c3b)
    
    * fixup! resolve a conflict
    
    ---------
    
    Co-authored-by: default avatarAndrea Bedini <andrea.bedini@tweag.io>
    Co-authored-by: default avatarArtem Pelenitsyn <a.pelenitsyn@gmail.com>
Loading