Merge branch 'wip/romes/migration-v2' into 'master'

Use cabal-version 3.14

See merge request !25

ci/config.cabal.project

@@ -3,9 +3,10 @@
 -- ghc/ghc#23048.
 
 index-state:
-    hackage.haskell.org 2023-10-16T12:18:14Z,
+    hackage.haskell.org 2024-05-03T00:18:14Z,
     head.hackage HEAD
 
+constraints: cabal-doctest >= 1.0.9
 constraints: th-abstraction >= 0.4
 
 -- aeson is now quite old, don't attempt to use it

ci/default.nix

@@ -45,7 +45,7 @@ let
 
   buildDeps = import ./build-deps.nix { pkgs = nixpkgs; };
 
-  cabalDependencies = [ "Cabal-tests" "Cabal" "cabal-install-solver" "Cabal-syntax" "Cabal-described" "Cabal-QuickCheck" "Cabal-tree-diff" "cabal-install" ];
+  cabalDependencies = [ "Cabal-tests" "Cabal" "cabal-install-solver" "Cabal-syntax" "Cabal-hooks" "Cabal-described" "Cabal-QuickCheck" "Cabal-tree-diff" "cabal-install" ];
 
   cabalDependenciesOverrides = self:
     builtins.listToAttrs (builtins.map (pn: { name = "${pn}"; value = self.callCabal2nixWithOptions pn "${cabalSrc}/${pn}" "--no-check" {};} ) cabalDependencies);
@@ -142,6 +142,6 @@ let
 in
   mkShell {
     name = "head-hackage-build-env";
-    buildInputs = [ build-repo ];
+    buildInputs = [ build-repo haskellPackagesWithCabal.cabal-install haskellPackages.ghc ];
     cabalDepsSrc = buildDepsFragment;
   }

patches/Agda-2.6.3.patch

 diff --git a/Agda.cabal b/Agda.cabal
-index 306f81f..0082221 100644
+index 306f81f..89bb9ac 100644
 --- a/Agda.cabal
 +++ b/Agda.cabal
 @@ -1,8 +1,8 @@
-+cabal-version:   3.12
++cabal-version:   3.14
  name:            Agda
  version:         2.6.3
 -cabal-version:   1.24
@@ -14,17 +14,18 @@ index 306f81f..0082221 100644
  license-file:    LICENSE
  copyright:       (c) 2005-2023 The Agda Team.
  author:          Ulf Norell and The Agda Team, see https://agda.readthedocs.io/en/latest/team.html
-@@ -172,7 +172,8 @@ flag optimise-heavily
+@@ -172,7 +172,9 @@ flag optimise-heavily
  
  custom-setup
    setup-depends:  base >= 4.9.0.0 && < 4.18
 -                , Cabal >= 1.24.0.0 && < 3.9
-+                , Cabal >= 1.24.0.0 && < 3.12
++                , Cabal >= 1.24.0.0 && < 3.14
 +                , Cabal-hooks
++                , hashable == 1.4.4.0
                  , directory >= 1.2.6.2 && < 1.4
                  , filepath >= 1.4.1.0 && < 1.5
                  , process >= 1.4.2.0 && < 1.7
-@@ -184,7 +185,7 @@ library
+@@ -184,7 +186,7 @@ library
      -- We don't write an upper bound for cpphs because the
      -- `build-tools` field can not be modified in Hackage.
  
@@ -33,7 +34,16 @@ index 306f81f..0082221 100644
      ghc-options: -pgmP cpphs -optP --cpp
  
    if flag(debug)
-@@ -280,8 +281,9 @@ library
+@@ -231,7 +233,7 @@ library
+                 -- hashable 1.2.0.10 makes library-test 10x
+                 -- slower. The issue was fixed in hashable 1.2.1.0.
+                 -- https://github.com/tibbe/hashable/issues/57.
+-                , hashable >= 1.2.1.0 && < 1.5
++                , hashable == 1.4.4.0
+                 , haskeline >= 0.7.2.3 && < 0.9
+                 -- monad-control-1.0.1.0 is the first to contain liftThrough
+                 , monad-control >= 1.0.1.0 && < 1.1
+@@ -280,8 +282,9 @@ library
    -- We don't write upper bounds for Alex nor Happy because the
    -- `build-tools` field can not be modified in Hackage. Agda doesn't
    -- build with Alex 3.2.0 and segfaults with 3.2.2.

patches/configuration-tools-0.7.0.patch

@@ -220,12 +220,12 @@ index 2088620..19796da 100644
  -- -------------------------------------------------------------------------- --
  -- Generate PkgInfo Module
 diff --git a/configuration-tools.cabal b/configuration-tools.cabal
-index 78c7e02..d5180f0 100644
+index 78c7e02..739a406 100644
 --- a/configuration-tools.cabal
 +++ b/configuration-tools.cabal
 @@ -1,4 +1,4 @@
 -cabal-version: 3.0
-+cabal-version: 3.12
++cabal-version: 3.14
  
  name: configuration-tools
  version: 0.7.0
@@ -255,7 +255,7 @@ index 78c7e02..d5180f0 100644
        , prettyprinter >= 1.7
        , attoparsec >= 0.11.3.4
 diff --git a/src/Configuration/Utils/Setup.hs b/src/Configuration/Utils/Setup.hs
-index 30e887f..4935665 100644
+index 30e887f..7775c82 100644
 --- a/src/Configuration/Utils/Setup.hs
 +++ b/src/Configuration/Utils/Setup.hs
 @@ -7,47 +7,50 @@
@@ -395,7 +395,7 @@ index 30e887f..4935665 100644
 +  noSetupHooks
 +    { buildHooks =
 +        noBuildHooks
-+          { preBuildComponentRules = Just $ rules (static mkPkgInfoModules)
++          { preBuildComponentRules = Just $ rules (static ()) mkPkgInfoModules
 +          }
      }
  

patches/darcs-2.16.5.patch

@@ -171,12 +171,12 @@ index 79a7500..4255a31 100644
      else return Nothing
 +
 diff --git a/darcs.cabal b/darcs.cabal
-index 72ea398..57862d8 100644
+index 72ea398..afe755d 100644
 --- a/darcs.cabal
 +++ b/darcs.cabal
 @@ -1,4 +1,4 @@
 -Cabal-Version:  2.4
-+Cabal-Version: 3.12
++Cabal-Version: 3.14
  Name:           darcs
  version:        2.16.5
  License:        GPL-2.0-or-later
@@ -268,3 +268,67 @@ index 72ea398..57862d8 100644
                        http-types        >= 0.12.1 && < 0.12.4
  
      if flag(warn-as-error)
+diff --git a/src/Darcs/Patch/Annotate.hs b/src/Darcs/Patch/Annotate.hs
+index ede4b1d..0dc9e5e 100644
+--- a/src/Darcs/Patch/Annotate.hs
++++ b/src/Darcs/Patch/Annotate.hs
+@@ -43,7 +43,8 @@ module Darcs.Patch.Annotate
+ 
+ import Darcs.Prelude
+ 
+-import Control.Monad.State ( modify, modify', when, gets, State, execState )
++import Control.Monad.State ( modify, modify', gets, State, execState )
++import Control.Monad
+ 
+ import qualified Data.ByteString as B
+ import qualified Data.ByteString.Char8 as BC
+diff --git a/src/Darcs/Patch/Index/Monad.hs b/src/Darcs/Patch/Index/Monad.hs
+index 385045a..630a224 100644
+--- a/src/Darcs/Patch/Index/Monad.hs
++++ b/src/Darcs/Patch/Index/Monad.hs
+@@ -30,6 +30,7 @@ import Darcs.Patch.Index.Types ( PatchMod(..), PatchId(..) )
+ import Darcs.Patch.Info ( makePatchname, PatchInfo )
+ import Darcs.Patch.Apply ( Apply(..) )
+ import Darcs.Patch.ApplyMonad ( ApplyMonad(..), ApplyMonadTree(..) )
++import Control.Monad
+ import Control.Monad.State
+ import Control.Arrow
+ import Darcs.Util.Path ( AnchoredPath, anchorPath, movedirfilename, isPrefix )
+diff --git a/src/Darcs/UI/Commands/Log.hs b/src/Darcs/UI/Commands/Log.hs
+index d93f649..758ebef 100644
+--- a/src/Darcs/UI/Commands/Log.hs
++++ b/src/Darcs/UI/Commands/Log.hs
+@@ -23,6 +23,7 @@ module Darcs.UI.Commands.Log
+     , simpleLogInfo -- for darcsden
+     ) where
+ 
++import Control.Monad
+ import Darcs.Prelude
+ 
+ import Data.List ( intersect, find )
+diff --git a/src/Darcs/Util/Tree/Hashed.hs b/src/Darcs/Util/Tree/Hashed.hs
+index 669a443..076cbe9 100644
+--- a/src/Darcs/Util/Tree/Hashed.hs
++++ b/src/Darcs/Util/Tree/Hashed.hs
+@@ -40,7 +40,8 @@ import qualified Data.ByteString as B
+ 
+ import Data.List( sortBy )
+ import Data.Maybe( fromJust, isJust )
+-import Control.Monad.State.Strict (liftIO,when,unless)
++import Control.Monad
++import Control.Monad.State.Strict (liftIO)
+ 
+ import Darcs.Prelude
+ 
+diff --git a/src/Darcs/Util/Tree/Monad.hs b/src/Darcs/Util/Tree/Monad.hs
+index f639766..8947aea 100644
+--- a/src/Darcs/Util/Tree/Monad.hs
++++ b/src/Darcs/Util/Tree/Monad.hs
+@@ -35,6 +35,7 @@ module Darcs.Util.Tree.Monad
+ 
+ import Darcs.Prelude hiding ( readFile, writeFile )
+ 
++import Control.Monad
+ import Control.Exception ( throw )
+ 
+ import Darcs.Util.Path

patches/entropy-0.4.1.10.patch

@@ -180,11 +180,11 @@ index 4ddeeae..fd8b1a5 100644
 -      | otherwise = return ()
 -#endif
 diff --git a/entropy.cabal b/entropy.cabal
-index cddaece..9c1f2ee 100644
+index cddaece..7127c63 100644
 --- a/entropy.cabal
 +++ b/entropy.cabal
 @@ -1,3 +1,4 @@
-+cabal-version:  3.12
++cabal-version:  3.14
  name:           entropy
  
  version:        0.4.1.10

patches/executable-hash-0.2.0.4.patch

@@ -68,11 +68,11 @@ index 0000000..e0e53a8
 +        }
 +    }
 diff --git a/executable-hash.cabal b/executable-hash.cabal
-index 3c9fb9f..96b543d 100644
+index 3c9fb9f..a47b3e5 100644
 --- a/executable-hash.cabal
 +++ b/executable-hash.cabal
 @@ -1,3 +1,4 @@
-+cabal-version:       3.12
++cabal-version:       3.14
  name:                executable-hash
  version:             0.2.0.4
  synopsis:            Provides the SHA1 hash of the program executable

patches/ghc-paths-0.1.0.12.patch

@@ -232,11 +232,11 @@ index 0000000..f783b22
 +        , "docdir = " ++ show docdir
 +        ]
 diff --git a/ghc-paths.cabal b/ghc-paths.cabal
-index 6505ade..f69864b 100644
+index 6505ade..494043b 100644
 --- a/ghc-paths.cabal
 +++ b/ghc-paths.cabal
 @@ -1,6 +1,7 @@
-+cabal-version: 3.12
++cabal-version: 3.14
  name: ghc-paths
  version: 0.1.0.12
 -license: BSD3

patches/gi-glib-2.0.29.patch

@@ -44,18 +44,34 @@ index 0000000..060f161
 +        outputDir = Nothing
 +        inheritedOverrides = []
 diff --git a/gi-glib.cabal b/gi-glib.cabal
-index 4a13d6e..5eabfd0 100644
+index 4a13d6e..5d89745 100644
 --- a/gi-glib.cabal
 +++ b/gi-glib.cabal
-@@ -8,7 +8,7 @@ license-file:         LICENSE
+@@ -1,21 +1,21 @@
++cabal-version:        3.14
+ name:                 gi-glib
+ version:              2.0.29
+ synopsis:             GLib bindings
+ description:          Bindings for GLib, autogenerated by haskell-gi.
+ homepage:             https://github.com/haskell-gi/haskell-gi
+-license:              LGPL-2.1
+ license-file:         LICENSE
  author:               Iñaki García Etxebarria
  maintainer:           Iñaki García Etxebarria
  category:             Bindings
 -build-type:           Custom
+-cabal-version:        2.0
 +build-type:           Hooks
- cabal-version:        2.0
  
  extra-source-files: README.md ChangeLog.md stack.yaml GLib.overrides
+ 
+ custom-setup
+       setup-depends: base >= 4.11 && < 5,
+                      Cabal >= 1.24 && < 4,
++                     Cabal-hooks,
+                      haskell-gi >= 0.26 && < 0.27
+ 
+ library
 @@ -38,175 +38,3 @@ library
        -- see https://ghc.haskell.org/trac/ghc/ticket/14382
        if impl(ghc == 8.2.*)

patches/gi-gobject-2.0.30.patch

@@ -25,18 +25,34 @@ index 794d773..0052fab 100644
          version = "2.0"
          pkgName = "gi-gobject"
 diff --git a/gi-gobject.cabal b/gi-gobject.cabal
-index 18b52e3..3439a63 100644
+index 18b52e3..725a301 100644
 --- a/gi-gobject.cabal
 +++ b/gi-gobject.cabal
-@@ -8,7 +8,7 @@ license-file:         LICENSE
+@@ -1,21 +1,21 @@
++cabal-version:        3.14
+ name:                 gi-gobject
+ version:              2.0.30
+ synopsis:             GObject bindings
+ description:          Bindings for GObject, autogenerated by haskell-gi.
+ homepage:             https://github.com/haskell-gi/haskell-gi
+-license:              LGPL-2.1
+ license-file:         LICENSE
  author:               Iñaki García Etxebarria
  maintainer:           Iñaki García Etxebarria
  category:             Bindings
 -build-type:           Custom
+-cabal-version:        2.0
 +build-type:           Hooks
- cabal-version:        2.0
  
  extra-source-files: README.md ChangeLog.md stack.yaml GObject.overrides
+ 
+ custom-setup
+       setup-depends: base >= 4.11 && < 5,
+                      Cabal >= 1.24 && < 4,
++                     Cabal-hooks,
+                      haskell-gi >= 0.26 && < 0.27,
+                      gi-glib == 2.0.*
+ 
 @@ -40,145 +40,3 @@ library
        -- see https://ghc.haskell.org/trac/ghc/ticket/14382
        if impl(ghc == 8.2.*)

patches/haskell-gi-0.26.7.patch

@@ -11,7 +11,7 @@ index c0bc21b..0000000
 -main :: IO ()
 -main = defaultMainWithDoctests "doctests"
 diff --git a/haskell-gi.cabal b/haskell-gi.cabal
-index 7f863e8..6ac6561 100644
+index 7f863e8..8930a5a 100644
 --- a/haskell-gi.cabal
 +++ b/haskell-gi.cabal
 @@ -11,18 +11,12 @@ author:              Will Thompson and Iñaki García Etxebarria
@@ -34,14 +34,32 @@ index 7f863e8..6ac6561 100644
  source-repository head
    type: git
    location: git://github.com/haskell-gi/haskell-gi.git
+@@ -33,6 +27,7 @@ Library
+   build-depends:       base >= 4.11 && < 5,
+                        haskell-gi-base >= 0.26.4 && <0.27,
+                        Cabal >= 1.24,
++                       Cabal-hooks,
+                        attoparsec >= 0.13,
+                        containers,
+                        directory,
 diff --git a/lib/Data/GI/CodeGen/CabalHooks.hs b/lib/Data/GI/CodeGen/CabalHooks.hs
-index 23735c2..04a3975 100644
+index 23735c2..12bbb54 100644
 --- a/lib/Data/GI/CodeGen/CabalHooks.hs
 +++ b/lib/Data/GI/CodeGen/CabalHooks.hs
-@@ -1,17 +1,19 @@
+@@ -1,17 +1,31 @@
  -- | Convenience hooks for writing custom @Setup.hs@ files for
  -- bindings.
++{-# OPTIONS_GHC -O0 #-}
++-- \^ Unfortunately, it seems there is a GHC bug related to static pointers
++-- triggered by this program, so we compile without optimisations to workaround it.
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE DeriveAnyClass #-}
++{-# LANGUAGE DeriveGeneric #-}
++{-# LANGUAGE BlockArguments #-}
++{-# LANGUAGE StaticPointers #-}
 +{-# LANGUAGE DisambiguateRecordFields #-}
++{-# LANGUAGE OverloadedRecordDot #-}
++{-# LANGUAGE OverloadedStrings #-}
 +{-# LANGUAGE TupleSections #-}
 +{-# LANGUAGE CPP #-}
  module Data.GI.CodeGen.CabalHooks
@@ -51,19 +69,21 @@ index 23735c2..04a3975 100644
      , TaggedOverride(..)
      ) where
  
++import GHC.Generics
  import qualified Distribution.ModuleName as MN
++import Distribution.Compat.Binary
 +import Distribution.Simple (OptimisationLevel(..))
  import Distribution.Simple.LocalBuildInfo
 -import Distribution.Simple.Setup
 -import Distribution.Simple (UserHooks(..), simpleUserHooks,
 -                            defaultMainWithHooks, OptimisationLevel(..))
 -import Distribution.PackageDescription
-+import Distribution.Simple.SetupHooks hiding (generateModules)
++import Distribution.Simple.SetupHooks
 +import qualified Distribution.Types.LocalBuildConfig as LBC
  
  import Data.GI.CodeGen.API (loadGIRInfo)
  import Data.GI.CodeGen.Code (genCode, writeModuleTree, listModuleTree,
-@@ -27,9 +29,10 @@ import Data.GI.CodeGen.Util (utf8ReadFile, utf8WriteFile, ucFirst)
+@@ -27,9 +41,10 @@ import Data.GI.CodeGen.Util (utf8ReadFile, utf8WriteFile, ucFirst)
  import System.Directory (createDirectoryIfMissing)
  import System.FilePath (joinPath, takeDirectory)
  
@@ -76,17 +96,28 @@ index 23735c2..04a3975 100644
  import qualified Data.Map as M
  #if !MIN_VERSION_base(4,11,0)
  import Data.Monoid ((<>))
-@@ -38,9 +41,6 @@ import qualified Data.Set as S
+@@ -37,9 +52,8 @@ import Data.Monoid ((<>))
+ import qualified Data.Set as S
  import Data.Text (Text)
  import qualified Data.Text as T
- 
+-
 -type ConfHook = (GenericPackageDescription, HookedBuildInfo) -> ConfigFlags
 -              -> IO LocalBuildInfo
--
++import Distribution.Utils.Path (getSymbolicPath)
++import qualified Data.List.NonEmpty as NE
+ 
  -- | Included overrides file.
  data TaggedOverride =
-   TaggedOverride { overrideTag   :: Text
-@@ -111,66 +111,117 @@ genConfigModule outputDir modName maybeGiven = do
+@@ -47,6 +61,8 @@ data TaggedOverride =
+                    -- ^ Tag for the override, for error reporting purposes.
+                  , overrideText  :: Text
+                  }
++                 deriving (Generic, Show)
++                 deriving anyclass Binary
+ 
+ -- | Generate the code for the given module.
+ genModuleCode :: Text -- ^ name
+@@ -111,66 +127,108 @@ genConfigModule outputDir modName maybeGiven = do
          quoteOverrides (Just (TaggedOverride _ ovText)) =
            map (T.pack . show) (T.lines ovText)
  
@@ -104,20 +135,17 @@ index 23735c2..04a3975 100644
 +                  -> SetupHooks
 +bindingSetupHooks name version pkgName pkgVersion verbosity
 +                  overridesFile inheritedOverrides outputDir =
-+  -- We use build and configure hooks explicitly instead of generateModules to
++  -- We use build and configure hooks explicitly to
 +  -- * Set the generated modules as exposed modules
 +  -- * Re-use the logic to write the module tree instead of returning a Map of contents.
 +  noSetupHooks
 +    { configureHooks =
 +      noConfigureHooks
 +        { preConfPackageHook =
-+            Just $ \PreConfPackageInputs{localBuildConfig=lbc} -> do
++            Just $ \pbci -> do
 +              -- Turn off optimisations.
-+              let lbc' =
-+                    lbc{ LBC.withBuildOptions =
-+                          (LBC.withBuildOptions lbc){LBC.withOptimization = NoOptimisation }
-+                       }
-+              return $ PreConfPackageOutputs{localBuildConfig=lbc'}
++              let outs = noPreConfPackageOutputs(pbci)
++              return outs{buildOptions=outs.buildOptions{LBC.withOptimization = NoOptimisation}}
 +        , preConfComponentHook = Just $ \PreConfComponentInputs{component=comp} ->
 +            case componentName comp of
 +              CLibName LMainLibName -> do
@@ -138,46 +166,40 @@ index 23735c2..04a3975 100644
 +        }
 +    , buildHooks =
 +        noBuildHooks
-+          { preBuildComponentRules = fromRulesM $ RulesM $ \PreBuildComponentInputs{} -> do
-+              actId <- registerAction $ Action $ \_ resolver -> do
-+                -- We need to call generateModule every time we want to
-+                -- regenerate the build tree, since we have just one rule for
-+                -- the whole build tree. It is probably possible to make it
-+                -- fine grained with the new design and the 'generateModules'
-+                -- convenience function from SetupHooks.
-+                givenOvs <- traverse (\fname -> TaggedOverride (T.pack fname) <$> utf8ReadFile fname) overridesFile
++          { preBuildComponentRules = Just $ rules (static ()) $ \pbci -> do
++              let
++                sourcesDir = getSymbolicPath $ autogenComponentModulesDir (pbci.localBuildInfo) (pbci.targetInfo.targetCLBI)
++                cmd = mkCommand (static Dict) (static \(sourcesDir,version,verbosity,pkgVersion,pkgName,overridesFile,outputDir,name,inheritedOverrides) -> do
++                  -- We need to call generateModule every time we want to
++                  -- regenerate the build tree, since we have just one rule for
++                  -- the whole build tree. It is probably possible to make it
++                  -- fine grained with the new design and the 'generateModules'
++                  -- convenience function from SetupHooks.
++                  givenOvs <- traverse (\fname -> TaggedOverride (T.pack fname) <$> utf8ReadFile fname) overridesFile
 +
-+                let ovs = maybe inheritedOverrides (:inheritedOverrides) givenOvs
-+                moduleInfo <- genModuleCode name version pkgName pkgVersion verbosity ovs
++                  let ovs = maybe inheritedOverrides (:inheritedOverrides) givenOvs
++                  moduleInfo <- genModuleCode name version pkgName pkgVersion verbosity ovs
 +
-+                -- We set the output dir to the resolved `SrcFile`, and ignore the
-+                -- `outputDir` argument. Ideally, we'd require `outputDir` to
-+                -- be a relative path, append it to the resolved SrcFile
-+                -- location, and to the module names of the declared `Results`.
-+                _ <- writeModuleTree verbosity (Just $ resolveLocation resolver SrcFile) moduleInfo
++                  -- We set the output dir to the resolved `SrcFile`, and ignore the
++                  -- `outputDir` argument. Ideally, we'd require `outputDir` to
++                  -- be a relative path, append it to the resolved SrcFile
++                  -- location, and to the module names of the declared `Results`.
++                  _ <- writeModuleTree verbosity (Just sourcesDir) moduleInfo
 +
-+                genConfigModule outputDir name givenOvs
++                  genConfigModule outputDir name givenOvs) (sourcesDir,version,verbosity,pkgVersion,pkgName,overridesFile,outputDir,name,inheritedOverrides)
 +
-+              return $ do
-+                -- We need to call generateModuleInfo a second time at build
-+                -- time, even if we've already computed this at configure for
-+                -- this component, since there's no easy way to share
-+                -- information between these two stages.
-+                moduleInfo <- liftIO $
-+                  generateModuleInfo
-+                    name version pkgName pkgVersion verbosity
-+                    overridesFile inheritedOverrides
-+                let em' = genModulesFromInfo name moduleInfo
++              -- We need to call generateModuleInfo a second time at build
++              -- time, even if we've already computed this at configure for
++              -- this component, since there's no easy way to share
++              -- information between these two stages.
++              moduleInfo <- liftIO $
++                generateModuleInfo
++                  name version pkgName pkgVersion verbosity
++                  overridesFile inheritedOverrides
++              let em' = genModulesFromInfo name moduleInfo
 +
-+                _ <- registerRule $
-+                  Rule
-+                    { unresolvedDependencies = []
-+                    , monitoredValue = Nothing
-+                    , monitoredDirs = []
-+                    , results = map (\mn -> (SrcFile, MN.toFilePath mn)) em'
-+                    , actionId = actId
-+                    }
-+                return ()
++              registerRule_ "rule1" $
++                staticRule cmd [] (NE.fromList $ map (\mn -> (sourcesDir, MN.toFilePath mn <> ".hs")) em')
 +          }
 +    }
 +

patches/hlibgit2-0.18.0.16.patch

@@ -41,11 +41,11 @@ index 0000000..42fea4a
 +    }
 +
 diff --git a/hlibgit2.cabal b/hlibgit2.cabal
-index 3116284..ac0b582 100644
+index 3116284..0657928 100644
 --- a/hlibgit2.cabal
 +++ b/hlibgit2.cabal
 @@ -1,3 +1,4 @@
-+Cabal-Version:       3.12
++Cabal-Version:       3.14
  Name:                hlibgit2
  Version:             0.18.0.16
  Synopsis:            Low-level bindings to libgit2

patches/mysql-0.2.1.patch

@@ -93,11 +93,11 @@ index 343aa6b..609d6fe 100644
    where
      -- Recover from an error by returning an empty list.
 diff --git a/mysql.cabal b/mysql.cabal
-index 3f13294..ea0e142 100644
+index 3f13294..237e29a 100644
 --- a/mysql.cabal
 +++ b/mysql.cabal
 @@ -1,3 +1,4 @@
-+cabal-version:  3.12
++cabal-version:  3.14
  name:           mysql
  version:        0.2.1
  homepage:       https://github.com/paul-rouse/mysql

patches/nix-paths-1.0.1.patch

@@ -108,11 +108,11 @@ index 0000000..adf47f3
 +    mangle '-' = '_'
 +    mangle c = toUpper c
 diff --git a/nix-paths.cabal b/nix-paths.cabal
-index 367821d..02c77c8 100644
+index 367821d..50f8a26 100644
 --- a/nix-paths.cabal
 +++ b/nix-paths.cabal
 @@ -1,3 +1,4 @@
-+cabal-version:          3.12
++cabal-version:          3.14
  name:                   nix-paths
  version:                1.0.1
  synopsis:               Knowledge of Nix's installation directories.

patches/postgresql-libpq-0.10.0.0.patch

@@ -133,12 +133,12 @@ index 0000000..e029f96
 +    verbosity = normal -- honestly, this is a hack
 +    strip x = dropWhile isSpace $ reverse $ dropWhile isSpace $ reverse x
 diff --git a/postgresql-libpq.cabal b/postgresql-libpq.cabal
-index 29544dd..2ce091a 100644
+index 29544dd..d4aee41 100644
 --- a/postgresql-libpq.cabal
 +++ b/postgresql-libpq.cabal
 @@ -1,4 +1,4 @@
 -cabal-version:      2.4
-+cabal-version:      3.12
++cabal-version:      3.14
  name:               postgresql-libpq
  version:            0.10.0.0
  synopsis:           low-level binding to libpq

patches/singletons-base-3.2.patch

@@ -257,11 +257,11 @@ index 0000000..fe3a84a
 +testSuiteName :: String
 +testSuiteName = "singletons-base-test-suite"
 diff --git a/singletons-base.cabal b/singletons-base.cabal
-index 18c562c..a88dca5 100644
+index 18c562c..5c904e6 100644
 --- a/singletons-base.cabal
 +++ b/singletons-base.cabal
 @@ -1,6 +1,6 @@
-+cabal-version:  3.12
++cabal-version:  3.14
  name:           singletons-base
  version:        3.2
 -cabal-version:  1.24
@@ -293,7 +293,7 @@ index 18c562c..a88dca5 100644
 -    base      >= 4.18 && < 4.19,
 -    Cabal     >= 3.0 && < 3.11,
 +    base      >= 4.18 && < 4.20,
-+    Cabal     >= 3.0 && < 3.12,
++    Cabal     >= 3.0 && < 3.15,
 +    Cabal-hooks,
      directory >= 1,
      filepath  >= 1.3

patches/stack-2.13.1.patch

@@ -369,12 +369,12 @@ index e4b8473..6f23a7d 100644
    fileChecks <-
      liftIO $ Check.checkPackageFiles minBound pkgDesc (toFilePath pkgDir)
 diff --git a/stack.cabal b/stack.cabal
-index fecb7c5..81858d1 100644
+index fecb7c5..9d464a6 100644
 --- a/stack.cabal
 +++ b/stack.cabal
 @@ -1,7 +1,7 @@
 -cabal-version:      2.0
-+cabal-version:      3.12
++cabal-version:      3.14
  name:               stack
  version:            2.13.1
 -license:            BSD3
@@ -391,10 +391,12 @@ index fecb7c5..81858d1 100644
  extra-source-files:
      CONTRIBUTING.md
      ChangeLog.md
-@@ -108,6 +108,7 @@ source-repository head
+@@ -107,7 +107,8 @@ source-repository head
+ 
  custom-setup
      setup-depends:
-         Cabal >=3.8.1.0 && <3.12,
+-        Cabal >=3.8.1.0 && <3.12,
++        Cabal >=3.8.1.0 && <3.15,
 +        Cabal-hooks,
          base >=4.14.3.0 && <5,
          filepath >=1.4.2.2