From 2736b8776ee12640ebdd08b677b393afcafc313d Mon Sep 17 00:00:00 2001
From: Bodigrim <andrew.lelechenko@gmail.com>
Date: Sun, 21 Jun 2026 19:44:02 +0100
Subject: [PATCH 1/7] Monad of no Return

---
 Cabal-syntax/src/Distribution/Fields/LexerMonad.hs             | 1 -
 Cabal-syntax/src/Distribution/Fields/ParseResult.hs            | 1 -
 Cabal-syntax/src/Distribution/Parsec.hs                        | 2 --
 Cabal-syntax/src/Distribution/Types/Condition.hs               | 2 --
 Cabal/src/Distribution/Backpack/ReadyComponent.hs              | 1 -
 Cabal/src/Distribution/Backpack/UnifyM.hs                      | 1 -
 Cabal/src/Distribution/Simple/BuildTarget.hs                   | 2 --
 Cabal/src/Distribution/Utils/LogProgress.hs                    | 1 -
 Cabal/src/Distribution/Utils/Progress.hs                       | 1 -
 Cabal/src/Distribution/ZinzaPrelude.hs                         | 1 -
 cabal-install-solver/src/Distribution/Solver/Types/Progress.hs | 1 -
 cabal-install/src/Distribution/Client/Init/Types.hs            | 1 -
 cabal-install/src/Distribution/Client/TargetSelector.hs        | 1 -
 cabal-install/src/Distribution/Deprecated/ParseUtils.hs        | 1 -
 cabal-install/src/Distribution/Deprecated/ProjectParseUtils.hs | 1 -
 15 files changed, 18 deletions(-)

diff --git a/Cabal-syntax/src/Distribution/Fields/LexerMonad.hs b/Cabal-syntax/src/Distribution/Fields/LexerMonad.hs
index 4a9c5641db2..f239d39475a 100644
--- a/Cabal-syntax/src/Distribution/Fields/LexerMonad.hs
+++ b/Cabal-syntax/src/Distribution/Fields/LexerMonad.hs
@@ -55,7 +55,6 @@ instance Applicative Lex where
   (<*>) = ap
 
 instance Monad Lex where
-  return = pure
   (>>=) = thenLex
 
 data LexResult a = LexResult {-# UNPACK #-} !LexState a
diff --git a/Cabal-syntax/src/Distribution/Fields/ParseResult.hs b/Cabal-syntax/src/Distribution/Fields/ParseResult.hs
index b20d140c132..2842a89c90e 100644
--- a/Cabal-syntax/src/Distribution/Fields/ParseResult.hs
+++ b/Cabal-syntax/src/Distribution/Fields/ParseResult.hs
@@ -128,7 +128,6 @@ instance Applicative (ParseResult src) where
   {-# INLINE (<*) #-}
 
 instance Monad (ParseResult src) where
-  return = pure
   (>>) = (*>)
 
   m >>= k = PR $ \ !s fp failure success ->
diff --git a/Cabal-syntax/src/Distribution/Parsec.hs b/Cabal-syntax/src/Distribution/Parsec.hs
index 017e5e3573a..4420b3954f3 100644
--- a/Cabal-syntax/src/Distribution/Parsec.hs
+++ b/Cabal-syntax/src/Distribution/Parsec.hs
@@ -145,8 +145,6 @@ instance Alternative ParsecParser where
   {-# INLINE some #-}
 
 instance Monad ParsecParser where
-  return = pure
-
   m >>= k = PP $ \v -> unPP m v >>= \x -> unPP (k x) v
   {-# INLINE (>>=) #-}
   (>>) = (*>)
diff --git a/Cabal-syntax/src/Distribution/Types/Condition.hs b/Cabal-syntax/src/Distribution/Types/Condition.hs
index 0590cecf57e..6c764f1d9fe 100644
--- a/Cabal-syntax/src/Distribution/Types/Condition.hs
+++ b/Cabal-syntax/src/Distribution/Types/Condition.hs
@@ -73,8 +73,6 @@ instance Applicative Condition where
   (<*>) = ap
 
 instance Monad Condition where
-  return = pure
-
   -- Terminating cases
   (>>=) (Lit x) _ = Lit x
   (>>=) (Var x) f = f x
diff --git a/Cabal/src/Distribution/Backpack/ReadyComponent.hs b/Cabal/src/Distribution/Backpack/ReadyComponent.hs
index 08b4995db07..98c4d7a1d59 100644
--- a/Cabal/src/Distribution/Backpack/ReadyComponent.hs
+++ b/Cabal/src/Distribution/Backpack/ReadyComponent.hs
@@ -218,7 +218,6 @@ instance Applicative InstM where
      in (f' x', s'')
 
 instance Monad InstM where
-  return = pure
   InstM m >>= f = InstM $ \s ->
     let (x, s') = m s
      in runInstM (f x) s'
diff --git a/Cabal/src/Distribution/Backpack/UnifyM.hs b/Cabal/src/Distribution/Backpack/UnifyM.hs
index d4e1e1a0b0a..a6969986f6a 100644
--- a/Cabal/src/Distribution/Backpack/UnifyM.hs
+++ b/Cabal/src/Distribution/Backpack/UnifyM.hs
@@ -152,7 +152,6 @@ instance Applicative (UnifyM s) where
           Just x'' -> return (Just (f'' x''))
 
 instance Monad (UnifyM s) where
-  return = pure
   UnifyM m >>= f = UnifyM $ \r -> do
     x <- m r
     case x of
diff --git a/Cabal/src/Distribution/Simple/BuildTarget.hs b/Cabal/src/Distribution/Simple/BuildTarget.hs
index 1a1c9aaaeff..9c046100fee 100644
--- a/Cabal/src/Distribution/Simple/BuildTarget.hs
+++ b/Cabal/src/Distribution/Simple/BuildTarget.hs
@@ -908,8 +908,6 @@ instance Applicative Match where
   (<*>) = ap
 
 instance Monad Match where
-  return = pure
-
   NoMatch d ms >>= _ = NoMatch d ms
   ExactMatch d xs >>= f =
     addDepth d $
diff --git a/Cabal/src/Distribution/Utils/LogProgress.hs b/Cabal/src/Distribution/Utils/LogProgress.hs
index dce540df985..3fc34604e2a 100644
--- a/Cabal/src/Distribution/Utils/LogProgress.hs
+++ b/Cabal/src/Distribution/Utils/LogProgress.hs
@@ -41,7 +41,6 @@ instance Applicative LogProgress where
   LogProgress f <*> LogProgress x = LogProgress $ \r -> f r `ap` x r
 
 instance Monad LogProgress where
-  return = pure
   LogProgress m >>= f = LogProgress $ \r -> m r >>= \x -> unLogProgress (f x) r
 
 -- | Run 'LogProgress', outputting traces according to 'Verbosity',
diff --git a/Cabal/src/Distribution/Utils/Progress.hs b/Cabal/src/Distribution/Utils/Progress.hs
index c6edf87d558..903007f38d9 100644
--- a/Cabal/src/Distribution/Utils/Progress.hs
+++ b/Cabal/src/Distribution/Utils/Progress.hs
@@ -57,7 +57,6 @@ foldProgress step err done = fold
     fold (Done r) = done r
 
 instance Monad (Progress step fail) where
-  return = pure
   p >>= f = foldProgress Step Fail f p
 
 instance Applicative (Progress step fail) where
diff --git a/Cabal/src/Distribution/ZinzaPrelude.hs b/Cabal/src/Distribution/ZinzaPrelude.hs
index 81ef5170c1a..5fe1d49e641 100644
--- a/Cabal/src/Distribution/ZinzaPrelude.hs
+++ b/Cabal/src/Distribution/ZinzaPrelude.hs
@@ -33,7 +33,6 @@ instance Applicative Writer where
   (<*>) = ap
 
 instance Monad Writer where
-  return = pure
   m >>= k = W $ \s1 ->
     let (s2, x) = unW m s1
      in unW (k x) s2
diff --git a/cabal-install-solver/src/Distribution/Solver/Types/Progress.hs b/cabal-install-solver/src/Distribution/Solver/Types/Progress.hs
index b70e12a26e3..aac29a4a23f 100644
--- a/cabal-install-solver/src/Distribution/Solver/Types/Progress.hs
+++ b/cabal-install-solver/src/Distribution/Solver/Types/Progress.hs
@@ -36,7 +36,6 @@ foldProgress step' fail' done' = fold
         fold (Done r)   = done' r
 
 instance Monad (Progress step fail) where
-  return   = pure
   p >>= f  = foldProgress Step Fail f p
 
 instance MonadFail (Progress step String) where
diff --git a/cabal-install/src/Distribution/Client/Init/Types.hs b/cabal-install/src/Distribution/Client/Init/Types.hs
index 893323535d9..eb0951c0f2b 100644
--- a/cabal-install/src/Distribution/Client/Init/Types.hs
+++ b/cabal-install/src/Distribution/Client/Init/Types.hs
@@ -330,7 +330,6 @@ instance Applicative PurePrompt where
       Right (a, s'') -> Right (f a, s'')
 
 instance Monad PurePrompt where
-  return = pure
   PurePrompt a >>= k = PurePrompt $ \s -> case a s of
     Left e -> Left e
     Right (a', s') -> runPromptState (k a') s'
diff --git a/cabal-install/src/Distribution/Client/TargetSelector.hs b/cabal-install/src/Distribution/Client/TargetSelector.hs
index 306cb629302..efba01d1b05 100644
--- a/cabal-install/src/Distribution/Client/TargetSelector.hs
+++ b/cabal-install/src/Distribution/Client/TargetSelector.hs
@@ -2365,7 +2365,6 @@ instance Alternative Match where
   (<|>) = matchPlus
 
 instance Monad Match where
-  return = pure
   NoMatch d ms >>= _ = NoMatch d ms
   Match m d xs >>= f =
     -- To understand this, it needs to be read in context with the
diff --git a/cabal-install/src/Distribution/Deprecated/ParseUtils.hs b/cabal-install/src/Distribution/Deprecated/ParseUtils.hs
index 54d19932ea7..cdbf548d21d 100644
--- a/cabal-install/src/Distribution/Deprecated/ParseUtils.hs
+++ b/cabal-install/src/Distribution/Deprecated/ParseUtils.hs
@@ -124,7 +124,6 @@ instance Applicative ParseResult where
   (<*>) = ap
 
 instance Monad ParseResult where
-  return = pure
   ParseFailed err >>= _ = ParseFailed err
   ParseOk ws x >>= f = case f x of
     ParseFailed err -> ParseFailed err
diff --git a/cabal-install/src/Distribution/Deprecated/ProjectParseUtils.hs b/cabal-install/src/Distribution/Deprecated/ProjectParseUtils.hs
index 790b7b6b352..f7d6bc1f981 100644
--- a/cabal-install/src/Distribution/Deprecated/ProjectParseUtils.hs
+++ b/cabal-install/src/Distribution/Deprecated/ProjectParseUtils.hs
@@ -41,7 +41,6 @@ instance Applicative ProjectParseResult where
   (<*>) = ap
 
 instance Monad ProjectParseResult where
-  return = pure
   ProjectParseFailed err >>= _ = ProjectParseFailed err
   ProjectParseOk ws x >>= f = case f x of
     ProjectParseFailed err -> ProjectParseFailed err

From 556c6b3e507a383aac53bff825b850794ec3e3a4 Mon Sep 17 00:00:00 2001
From: Artem Pelenitsyn <a.pelenitsyn@gmail.com>
Date: Tue, 23 Jun 2026 20:26:14 -0400
Subject: [PATCH 2/7] chore(cabal-install): Bump open-browser dependency to
 allow 0.5

---
 cabal-install/cabal-install.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
index e7172fa6b00..af1e2620d7d 100644
--- a/cabal-install/cabal-install.cabal
+++ b/cabal-install/cabal-install.cabal
@@ -264,7 +264,7 @@ library
       , hackage-security >= 0.6.2.0 && < 0.7
       , text       >= 1.2.3    && < 1.3 || >= 2.0 && < 2.2
       , parsec     >= 3.1.13.0 && < 3.2
-      , open-browser >= 0.2.1.0 && < 0.5
+      , open-browser >= 0.2.1.0 && < 0.6
       , regex-base  >= 0.94.0.0 && <0.95
       , regex-posix >= 0.96.0.0 && <0.97
       , safe-exceptions >= 0.1.7.0 && < 0.2

From 690abe9baf8feb52cb5fe4ceb3db1396b6ab5716 Mon Sep 17 00:00:00 2001
From: Mikolaj Konarski <mikolaj.konarski@gmail.com>
Date: Wed, 24 Jun 2026 11:26:04 +0200
Subject: [PATCH 3/7] Bump copyright years

---
 Cabal-hooks/Cabal-hooks.cabal                 | 136 +++++++++---------
 Cabal-hooks/LICENSE                           |  68 ++++-----
 Cabal-syntax/Cabal-syntax.cabal               |   2 +-
 Cabal-syntax/LICENSE                          |   2 +-
 Cabal-tests/Cabal-tests.cabal                 |   2 +-
 Cabal-tests/LICENSE                           |   2 +-
 Cabal/Cabal.cabal                             |   2 +-
 Cabal/LICENSE                                 |   2 +-
 cabal-benchmarks/LICENSE                      |   2 +-
 cabal-benchmarks/cabal-benchmarks.cabal       |   2 +-
 cabal-dev-scripts/LICENSE                     |   2 +-
 cabal-install-solver/LICENSE                  |   2 +-
 .../cabal-install-solver.cabal                |   2 +-
 cabal-install/LICENSE                         |   2 +-
 cabal-install/cabal-install.cabal             |   2 +-
 cabal-testsuite/LICENSE                       |   2 +-
 cabal-testsuite/cabal-testsuite.cabal         |   2 +-
 cabal-validate/cabal-validate.cabal           |   2 +-
 solver-benchmarks/LICENSE                     |   2 +-
 solver-benchmarks/solver-benchmarks.cabal     |   2 +-
 20 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/Cabal-hooks/Cabal-hooks.cabal b/Cabal-hooks/Cabal-hooks.cabal
index e9d68f6b6ca..f121c3c6abf 100644
--- a/Cabal-hooks/Cabal-hooks.cabal
+++ b/Cabal-hooks/Cabal-hooks.cabal
@@ -1,68 +1,68 @@
-cabal-version: 3.6
-name:          Cabal-hooks
-version:       3.17
-copyright:     2025, Cabal Development Team
-license:       BSD-3-Clause
-license-file:  LICENSE
-author:        Cabal Development Team <cabal-devel@haskell.org>
-maintainer:    cabal-devel@haskell.org
-homepage:      http://www.haskell.org/cabal/
-bug-reports:   https://github.com/haskell/cabal/issues
-synopsis:      API for the Hooks build-type
-description:
-  User-facing API for the Hooks build-type.
-category:       Distribution
-build-type:     Simple
-
-extra-doc-files:
-  README.md CHANGELOG.md
-
-source-repository head
-  type:     git
-  location: https://github.com/haskell/cabal/
-  subdir:   Cabal-hooks
-
-library
-  default-language: Haskell2010
-  hs-source-dirs: src
-
-  build-depends:
-    , Cabal-syntax    >= 3.17      && < 3.18
-    , Cabal           >= 3.17      && < 3.18
-    , base            >= 4.17      && < 5
-    , containers      >= 0.5.0.0   && < 0.9
-    , transformers    >= 0.5.6.0   && < 0.7
-
-  ghc-options: -Wall -fno-ignore-asserts -Wtabs -Wincomplete-uni-patterns -Wincomplete-record-updates
-
-  exposed-modules:
-    Distribution.Simple.SetupHooks
-
-  other-extensions:
-    BangPatterns
-    CPP
-    DefaultSignatures
-    DeriveDataTypeable
-    DeriveFoldable
-    DeriveFunctor
-    DeriveGeneric
-    DeriveTraversable
-    ExistentialQuantification
-    FlexibleContexts
-    FlexibleInstances
-    GeneralizedNewtypeDeriving
-    ImplicitParams
-    KindSignatures
-    LambdaCase
-    NondecreasingIndentation
-    OverloadedStrings
-    PatternSynonyms
-    RankNTypes
-    RecordWildCards
-    ScopedTypeVariables
-    StandaloneDeriving
-    Trustworthy
-    TypeFamilies
-    TypeOperators
-    TypeSynonymInstances
-    UndecidableInstances
+cabal-version: 3.6
+name:          Cabal-hooks
+version:       3.17
+copyright:     2003-2026, Cabal Development Team
+license:       BSD-3-Clause
+license-file:  LICENSE
+author:        Cabal Development Team <cabal-devel@haskell.org>
+maintainer:    cabal-devel@haskell.org
+homepage:      http://www.haskell.org/cabal/
+bug-reports:   https://github.com/haskell/cabal/issues
+synopsis:      API for the Hooks build-type
+description:
+  User-facing API for the Hooks build-type.
+category:       Distribution
+build-type:     Simple
+
+extra-doc-files:
+  README.md CHANGELOG.md
+
+source-repository head
+  type:     git
+  location: https://github.com/haskell/cabal/
+  subdir:   Cabal-hooks
+
+library
+  default-language: Haskell2010
+  hs-source-dirs: src
+
+  build-depends:
+    , Cabal-syntax    >= 3.17      && < 3.18
+    , Cabal           >= 3.17      && < 3.18
+    , base            >= 4.17      && < 5
+    , containers      >= 0.5.0.0   && < 0.9
+    , transformers    >= 0.5.6.0   && < 0.7
+
+  ghc-options: -Wall -fno-ignore-asserts -Wtabs -Wincomplete-uni-patterns -Wincomplete-record-updates
+
+  exposed-modules:
+    Distribution.Simple.SetupHooks
+
+  other-extensions:
+    BangPatterns
+    CPP
+    DefaultSignatures
+    DeriveDataTypeable
+    DeriveFoldable
+    DeriveFunctor
+    DeriveGeneric
+    DeriveTraversable
+    ExistentialQuantification
+    FlexibleContexts
+    FlexibleInstances
+    GeneralizedNewtypeDeriving
+    ImplicitParams
+    KindSignatures
+    LambdaCase
+    NondecreasingIndentation
+    OverloadedStrings
+    PatternSynonyms
+    RankNTypes
+    RecordWildCards
+    ScopedTypeVariables
+    StandaloneDeriving
+    Trustworthy
+    TypeFamilies
+    TypeOperators
+    TypeSynonymInstances
+    UndecidableInstances
diff --git a/Cabal-hooks/LICENSE b/Cabal-hooks/LICENSE
index d66d30010de..3fb6214dad1 100644
--- a/Cabal-hooks/LICENSE
+++ b/Cabal-hooks/LICENSE
@@ -1,34 +1,34 @@
-Copyright (c) 2003-2025, Cabal Development Team.
-See the AUTHORS file for the full list of copyright holders.
-
-See */LICENSE for the copyright holders of the subcomponents.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * Neither the name of Isaac Jones nor the names of other
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Copyright (c) 2003-2026, Cabal Development Team.
+See the AUTHORS file for the full list of copyright holders.
+
+See */LICENSE for the copyright holders of the subcomponents.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Isaac Jones nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Cabal-syntax/Cabal-syntax.cabal b/Cabal-syntax/Cabal-syntax.cabal
index 6475d50df4a..e9bc241735a 100644
--- a/Cabal-syntax/Cabal-syntax.cabal
+++ b/Cabal-syntax/Cabal-syntax.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.6
 name:          Cabal-syntax
 version:       3.17.0.0
-copyright:     2003-2025, Cabal Development Team (see AUTHORS file)
+copyright:     2003-2026, Cabal Development Team (see AUTHORS file)
 license:       BSD-3-Clause
 license-file:  LICENSE
 author:        Cabal Development Team <cabal-devel@haskell.org>
diff --git a/Cabal-syntax/LICENSE b/Cabal-syntax/LICENSE
index 9e72b1f595f..3fb6214dad1 100644
--- a/Cabal-syntax/LICENSE
+++ b/Cabal-syntax/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2025, Cabal Development Team.
+Copyright (c) 2003-2026, Cabal Development Team.
 See the AUTHORS file for the full list of copyright holders.
 
 See */LICENSE for the copyright holders of the subcomponents.
diff --git a/Cabal-tests/Cabal-tests.cabal b/Cabal-tests/Cabal-tests.cabal
index e928a5c3429..446530fa6e0 100644
--- a/Cabal-tests/Cabal-tests.cabal
+++ b/Cabal-tests/Cabal-tests.cabal
@@ -1,7 +1,7 @@
 cabal-version: 2.2
 name:          Cabal-tests
 version:       3
-copyright:     2003-2025, Cabal Development Team (see AUTHORS file)
+copyright:     2003-2026, Cabal Development Team (see AUTHORS file)
 license:       BSD-3-Clause
 license-file:  LICENSE
 author:        Cabal Development Team <cabal-devel@haskell.org>
diff --git a/Cabal-tests/LICENSE b/Cabal-tests/LICENSE
index 9e72b1f595f..3fb6214dad1 100644
--- a/Cabal-tests/LICENSE
+++ b/Cabal-tests/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2025, Cabal Development Team.
+Copyright (c) 2003-2026, Cabal Development Team.
 See the AUTHORS file for the full list of copyright holders.
 
 See */LICENSE for the copyright holders of the subcomponents.
diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
index ffb1b56c69c..9178c76fd4f 100644
--- a/Cabal/Cabal.cabal
+++ b/Cabal/Cabal.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.8
 name:          Cabal
 version:       3.17.0.0
-copyright:     2003-2025, Cabal Development Team (see AUTHORS file)
+copyright:     2003-2026, Cabal Development Team (see AUTHORS file)
 license:       BSD-3-Clause
 license-file:  LICENSE
 author:        Cabal Development Team <cabal-devel@haskell.org>
diff --git a/Cabal/LICENSE b/Cabal/LICENSE
index 9e72b1f595f..3fb6214dad1 100644
--- a/Cabal/LICENSE
+++ b/Cabal/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2025, Cabal Development Team.
+Copyright (c) 2003-2026, Cabal Development Team.
 See the AUTHORS file for the full list of copyright holders.
 
 See */LICENSE for the copyright holders of the subcomponents.
diff --git a/cabal-benchmarks/LICENSE b/cabal-benchmarks/LICENSE
index 9e72b1f595f..3fb6214dad1 100644
--- a/cabal-benchmarks/LICENSE
+++ b/cabal-benchmarks/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2025, Cabal Development Team.
+Copyright (c) 2003-2026, Cabal Development Team.
 See the AUTHORS file for the full list of copyright holders.
 
 See */LICENSE for the copyright holders of the subcomponents.
diff --git a/cabal-benchmarks/cabal-benchmarks.cabal b/cabal-benchmarks/cabal-benchmarks.cabal
index a48e9298677..ae6cffd2c73 100644
--- a/cabal-benchmarks/cabal-benchmarks.cabal
+++ b/cabal-benchmarks/cabal-benchmarks.cabal
@@ -1,7 +1,7 @@
 cabal-version:      2.2
 name:               cabal-benchmarks
 version:            3
-copyright:          2003-2025, Cabal Development Team (see AUTHORS file)
+copyright:          2003-2026, Cabal Development Team (see AUTHORS file)
 license:            BSD-3-Clause
 license-file:       LICENSE
 author:             Cabal Development Team <cabal-devel@haskell.org>
diff --git a/cabal-dev-scripts/LICENSE b/cabal-dev-scripts/LICENSE
index 9e72b1f595f..3fb6214dad1 100644
--- a/cabal-dev-scripts/LICENSE
+++ b/cabal-dev-scripts/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2025, Cabal Development Team.
+Copyright (c) 2003-2026, Cabal Development Team.
 See the AUTHORS file for the full list of copyright holders.
 
 See */LICENSE for the copyright holders of the subcomponents.
diff --git a/cabal-install-solver/LICENSE b/cabal-install-solver/LICENSE
index 9e72b1f595f..3fb6214dad1 100644
--- a/cabal-install-solver/LICENSE
+++ b/cabal-install-solver/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2025, Cabal Development Team.
+Copyright (c) 2003-2026, Cabal Development Team.
 See the AUTHORS file for the full list of copyright holders.
 
 See */LICENSE for the copyright holders of the subcomponents.
diff --git a/cabal-install-solver/cabal-install-solver.cabal b/cabal-install-solver/cabal-install-solver.cabal
index 3ea8788836e..6e171127320 100644
--- a/cabal-install-solver/cabal-install-solver.cabal
+++ b/cabal-install-solver/cabal-install-solver.cabal
@@ -11,7 +11,7 @@ license:       BSD-3-Clause
 license-file:  LICENSE
 author:        Cabal Development Team (see AUTHORS file)
 maintainer:    Cabal Development Team <cabal-devel@haskell.org>
-copyright:     2003-2025, Cabal Development Team
+copyright:     2003-2026, Cabal Development Team
 category:      Distribution
 build-type:    Simple
 extra-doc-files:
diff --git a/cabal-install/LICENSE b/cabal-install/LICENSE
index 9e72b1f595f..3fb6214dad1 100644
--- a/cabal-install/LICENSE
+++ b/cabal-install/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2025, Cabal Development Team.
+Copyright (c) 2003-2026, Cabal Development Team.
 See the AUTHORS file for the full list of copyright holders.
 
 See */LICENSE for the copyright holders of the subcomponents.
diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
index e7172fa6b00..233ce1bc1bf 100644
--- a/cabal-install/cabal-install.cabal
+++ b/cabal-install/cabal-install.cabal
@@ -13,7 +13,7 @@ License:            BSD-3-Clause
 License-File:       LICENSE
 Author:             Cabal Development Team (see AUTHORS file)
 Maintainer:         Cabal Development Team <cabal-devel@haskell.org>
-Copyright:          2003-2025, Cabal Development Team
+Copyright:          2003-2026, Cabal Development Team
 Category:           Distribution
 Build-type:         Simple
 Extra-Source-Files:
diff --git a/cabal-testsuite/LICENSE b/cabal-testsuite/LICENSE
index 9e72b1f595f..3fb6214dad1 100644
--- a/cabal-testsuite/LICENSE
+++ b/cabal-testsuite/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2025, Cabal Development Team.
+Copyright (c) 2003-2026, Cabal Development Team.
 See the AUTHORS file for the full list of copyright holders.
 
 See */LICENSE for the copyright holders of the subcomponents.
diff --git a/cabal-testsuite/cabal-testsuite.cabal b/cabal-testsuite/cabal-testsuite.cabal
index 31871e2dc82..58c397ef676 100644
--- a/cabal-testsuite/cabal-testsuite.cabal
+++ b/cabal-testsuite/cabal-testsuite.cabal
@@ -1,7 +1,7 @@
 cabal-version: 2.2
 name:          cabal-testsuite
 version:       3
-copyright:     2003-2025, Cabal Development Team (see AUTHORS file)
+copyright:     2003-2026, Cabal Development Team (see AUTHORS file)
 license:       BSD-3-Clause
 license-file:  LICENSE
 author:        Cabal Development Team <cabal-devel@haskell.org>
diff --git a/cabal-validate/cabal-validate.cabal b/cabal-validate/cabal-validate.cabal
index 1c01299c685..b423aa873b4 100644
--- a/cabal-validate/cabal-validate.cabal
+++ b/cabal-validate/cabal-validate.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 name:          cabal-validate
 version:       1.0.0
-copyright:     2024-2025, Cabal Development Team (see AUTHORS file)
+copyright:     2024-2026, Cabal Development Team (see AUTHORS file)
 license:       BSD-3-Clause
 author:        Cabal Development Team <cabal-devel@haskell.org>
 synopsis:      An internal tool for building and testing the Cabal package manager
diff --git a/solver-benchmarks/LICENSE b/solver-benchmarks/LICENSE
index 9e72b1f595f..3fb6214dad1 100644
--- a/solver-benchmarks/LICENSE
+++ b/solver-benchmarks/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2025, Cabal Development Team.
+Copyright (c) 2003-2026, Cabal Development Team.
 See the AUTHORS file for the full list of copyright holders.
 
 See */LICENSE for the copyright holders of the subcomponents.
diff --git a/solver-benchmarks/solver-benchmarks.cabal b/solver-benchmarks/solver-benchmarks.cabal
index 1090491187c..bff0b5bfb8e 100644
--- a/solver-benchmarks/solver-benchmarks.cabal
+++ b/solver-benchmarks/solver-benchmarks.cabal
@@ -1,7 +1,7 @@
 cabal-version:  2.2
 name:          solver-benchmarks
 version:       3
-copyright:     2003-2025, Cabal Development Team (see AUTHORS file)
+copyright:     2003-2026, Cabal Development Team (see AUTHORS file)
 license:       BSD-3-Clause
 license-file:  LICENSE
 author:        Cabal Development Team <cabal-devel@haskell.org>

From c5d2730c5fca919895e7337642427926efe174db Mon Sep 17 00:00:00 2001
From: Mikolaj Konarski <mikolaj.konarski@gmail.com>
Date: Tue, 23 Jun 2026 18:15:04 +0200
Subject: [PATCH 4/7] Bump index state to get new hackage-security

---
 cabal.bootstrap.project | 2 +-
 cabal.release.project   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cabal.bootstrap.project b/cabal.bootstrap.project
index a6f80f9cd8c..e417972a8ed 100644
--- a/cabal.bootstrap.project
+++ b/cabal.bootstrap.project
@@ -12,4 +12,4 @@ packages:
 tests: False
 benchmarks: False
 
-index-state: hackage.haskell.org 2026-05-25T10:36:08Z
+index-state: hackage.haskell.org 2026-06-20T05:46:05Z
diff --git a/cabal.release.project b/cabal.release.project
index 3cfd0ae6c09..ff380a27e84 100644
--- a/cabal.release.project
+++ b/cabal.release.project
@@ -3,7 +3,7 @@ import: project-cabal/pkgs/cabal.config
 import: project-cabal/pkgs/install.config
 import: project-cabal/pkgs/tests.config
 
-index-state: hackage.haskell.org 2026-05-25T10:36:08Z
+index-state: hackage.haskell.org 2026-06-20T05:46:05Z
 
 -- never include this or its TH dependency in a release!
 package cabal-install

From a74cb2311e588a3717fed89458be8a42ddecd80a Mon Sep 17 00:00:00 2001
From: Mikolaj Konarski <mikolaj.konarski@gmail.com>
Date: Wed, 24 Jun 2026 17:25:30 +0200
Subject: [PATCH 5/7] Disable queue_controls_comment to avoid bypassing our
 merge rules

---
 .github/mergify.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 2dd788482e8..32e5f09c68c 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -197,6 +197,7 @@ pull_request_rules:
 
 merge_queue:
   max_parallel_checks: 2
+  queue_controls_comment: false
 
 queue_rules:
   # Mergify now requires different queues for different strategies

From 19727561041b65d9a23bdac028827928b9e9f7a8 Mon Sep 17 00:00:00 2001
From: Mikolaj Konarski <mikolaj.konarski@gmail.com>
Date: Wed, 24 Jun 2026 18:28:47 +0200
Subject: [PATCH 6/7] Bump GHC_FOR_RELEASE to work around a segfault on macos

---
 .github/workflows/validate.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 6b06b0a32b2..4ce2b5f902d 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -32,7 +32,7 @@ on:
 env:
   # We choose a stable ghc version across all os's
   # which will be used to do the next release
-  GHC_FOR_RELEASE: "9.10.3"
+  GHC_FOR_RELEASE: "9.12.4"
   # Ideally we should use the version about to be released for hackage tests and benchmarks
   GHC_FOR_SOLVER_BENCHMARKS: "9.10.3"
   GHC_FOR_COMPLETE_HACKAGE_TESTS: "9.10.3"

From 26730b5befed58fdde82bc15f1d7e424c91eb7dc Mon Sep 17 00:00:00 2001
From: Mikolaj Konarski <mikolaj.konarski@gmail.com>
Date: Wed, 24 Jun 2026 20:34:31 +0200
Subject: [PATCH 7/7] Revert "Bump GHC_FOR_RELEASE to work around a segfault on
 macos"

This reverts commit 19727561041b65d9a23bdac028827928b9e9f7a8.
---
 .github/workflows/validate.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 4ce2b5f902d..6b06b0a32b2 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -32,7 +32,7 @@ on:
 env:
   # We choose a stable ghc version across all os's
   # which will be used to do the next release
-  GHC_FOR_RELEASE: "9.12.4"
+  GHC_FOR_RELEASE: "9.10.3"
   # Ideally we should use the version about to be released for hackage tests and benchmarks
   GHC_FOR_SOLVER_BENCHMARKS: "9.10.3"
   GHC_FOR_COMPLETE_HACKAGE_TESTS: "9.10.3"