diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown --- a/CHANGELOG.markdown +++ b/CHANGELOG.markdown @@ -1,3 +1,9 @@ +5.3.6 [2026.01.10] +------------------ +* Allow building with `template-haskell-2.24.*` (GHC 9.14). +* Add `_SpecialiseEP` to `Language.Haskell.TH.Lens` (when building with + `template-haskell-2.24.*`/GHC 9.14 or later). + 5.3.5 [2025.06.17] ------------------ * Replace `test-framework` with `tasty` in the test suite. diff --git a/examples/lens-examples.cabal b/examples/lens-examples.cabal --- a/examples/lens-examples.cabal +++ b/examples/lens-examples.cabal @@ -25,10 +25,11 @@ , GHC == 9.0.2 , GHC == 9.2.8 , GHC == 9.4.8 - , GHC == 9.6.6 + , GHC == 9.6.7 , GHC == 9.8.4 - , GHC == 9.10.1 - , GHC == 9.12.1 + , GHC == 9.10.3 + , GHC == 9.12.2 + , GHC == 9.14.1 source-repository head type: git @@ -44,10 +45,9 @@ Turtle build-depends: aeson, - base >= 4.5 && < 5, + base >= 4.9 && < 5, bytestring >= 0.9.1.10 && < 0.13, data-default-class, - ghc-prim, lens default-language: Haskell2010 ghc-options: -Wall @@ -57,7 +57,7 @@ buildable: False build-depends: - base >= 4.5 && < 5, + base >= 4.9 && < 5, containers >= 0.4 && < 0.9, gloss >= 1.12 && < 1.14, lens, diff --git a/lens-properties/lens-properties.cabal b/lens-properties/lens-properties.cabal --- a/lens-properties/lens-properties.cabal +++ b/lens-properties/lens-properties.cabal @@ -22,10 +22,11 @@ , GHC == 9.0.2 , GHC == 9.2.8 , GHC == 9.4.8 - , GHC == 9.6.6 + , GHC == 9.6.7 , GHC == 9.8.4 - , GHC == 9.10.1 - , GHC == 9.12.1 + , GHC == 9.10.3 + , GHC == 9.12.2 + , GHC == 9.14.1 extra-source-files: .hlint.yaml @@ -39,7 +40,7 @@ build-depends: base >= 4.9 && < 5, lens >= 4 && < 6, - QuickCheck >= 2.4 && < 2.17, + QuickCheck >= 2.4 && < 2.18, transformers >= 0.2 && < 0.7 exposed-modules: diff --git a/lens.cabal b/lens.cabal --- a/lens.cabal +++ b/lens.cabal @@ -1,6 +1,6 @@ name: lens category: Data, Lenses, Generics -version: 5.3.5 +version: 5.3.6 license: BSD2 cabal-version: 1.18 license-file: LICENSE @@ -21,10 +21,11 @@ , GHC == 9.0.2 , GHC == 9.2.8 , GHC == 9.4.8 - , GHC == 9.6.6 + , GHC == 9.6.7 , GHC == 9.8.4 - , GHC == 9.10.1 - , GHC == 9.12.1 + , GHC == 9.10.3 + , GHC == 9.12.2 + , GHC == 9.14.1 synopsis: Lenses, Folds and Traversals description: This package comes \"Batteries Included\" with many useful lenses for the types @@ -53,9 +54,7 @@ With some signatures simplified, the core of the hierarchy of lens-like constructions looks like: . . - <> - . - + <> . You can compose any two elements of the hierarchy above using @(.)@ from the @Prelude@, and you can use any element of the hierarchy as any type it linked to above it. @@ -189,24 +188,22 @@ exceptions >= 0.8.2.1 && < 1, filepath >= 1.2.0.0 && < 1.6, free >= 5.1.5 && < 6, - ghc-prim, hashable >= 1.2.7.0 && < 1.6, indexed-traversable >= 0.1 && < 0.2, indexed-traversable-instances >= 0.1 && < 0.2, kan-extensions >= 5 && < 6, mtl >= 2.2.1 && < 2.4, - parallel >= 3.2.1.0 && < 3.3, + parallel >= 3.2.1.0 && < 3.4, profunctors >= 5.5.2 && < 6, reflection >= 2.1 && < 3, semigroupoids >= 5.0.1 && < 7, strict >= 0.4 && < 0.6, tagged >= 0.8.6 && < 1, - template-haskell >= 2.11.1.0 && < 2.24, + template-haskell >= 2.11.1.0 && < 2.25, text >= 1.2.3.0 && < 2.2, th-abstraction >= 0.4.1 && < 0.8, these >= 1.1.1.1 && < 1.3, transformers >= 0.5.0.0 && < 0.7, - transformers-compat >= 0.5.0.4 && < 1, unordered-containers >= 0.2.10 && < 0.3, vector >= 0.12.1.2 && < 0.14 diff --git a/src/Control/Lens/Traversal.hs b/src/Control/Lens/Traversal.hs --- a/src/Control/Lens/Traversal.hs +++ b/src/Control/Lens/Traversal.hs @@ -162,7 +162,7 @@ import Data.Semigroup.Traversable import Data.Semigroup.Bitraversable import Data.Tuple (swap) -import GHC.Magic (inline) +import GHC.Exts (inline) -- $setup -- >>> :set -XNoOverloadedStrings -XFlexibleContexts diff --git a/src/Data/Data/Lens.hs b/src/Data/Data/Lens.hs --- a/src/Data/Data/Lens.hs +++ b/src/Data/Data/Lens.hs @@ -12,12 +12,6 @@ {-# LANGUAGE Trustworthy #-} #endif {-# OPTIONS_GHC -fno-full-laziness #-} -#if __GLASGOW_HASKELL__ >= 810 --- Use -fbyte-code explicitly to ensure that -fobject-code isn't automatically --- implied on GHCi 8.10+ by the use of UnboxedTuples, as this breaks the --- doctests. See #874 for more details. -{-# OPTIONS_GHC -fbyte-code #-} -#endif ----------------------------------------------------------------------------- -- | -- Module : Data.Data.Lens diff --git a/src/Language/Haskell/TH/Lens.hs b/src/Language/Haskell/TH/Lens.hs --- a/src/Language/Haskell/TH/Lens.hs +++ b/src/Language/Haskell/TH/Lens.hs @@ -200,6 +200,9 @@ #if MIN_VERSION_template_haskell(2,22,0) , _SCCP #endif +#if MIN_VERSION_template_haskell(2,24,0) + , _SpecialiseEP +#endif -- ** Inline Prisms , _NoInline , _Inline @@ -1617,6 +1620,16 @@ reviewer (x, y) = SCCP x y remitter (SCCP x y) = Just (x, y) remitter _ = Nothing +#endif + +#if MIN_VERSION_template_haskell(2,24,0) +_SpecialiseEP :: Prism' Pragma (Maybe [TyVarBndr ()], [RuleBndr], Exp, Maybe Inline, Phases) +_SpecialiseEP + = prism' reviewer remitter + where + reviewer (x, y, z, w, u) = SpecialiseEP x y z w u + remitter (SpecialiseEP x y z w u) = Just (x, y, z, w, u) + remitter _ = Nothing #endif _NoInline :: Prism' Inline ()