Skip to content

Commit d5d835d

Browse files
Support newer containers and GHC
Closes: #54
1 parent 2580dcb commit d5d835d

3 files changed

Lines changed: 12 additions & 7 deletions

File tree

System/Console/Docopt/QQ/Instances.hs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# LANGUAGE CPP #-}
12
{-# LANGUAGE DeriveLift#-}
23
{-# LANGUAGE StandaloneDeriving #-}
34
{-# LANGUAGE FlexibleInstances #-}
@@ -9,7 +10,10 @@ module System.Console.Docopt.QQ.Instances where
910

1011
import System.Console.Docopt.Types
1112
import Language.Haskell.TH.Syntax (Lift)
12-
import Data.Map.Internal (Map(..))
1313

14+
#if !MIN_VERSION_containers(0,6,6)
15+
import Data.Map.Internal (Map(..))
1416
deriving instance Lift (Map Option OptionInfo)
17+
#endif
18+
1519
deriving instance Lift (Docopt)

docopt.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ library
4242

4343
build-depends: base >= 4.9 && < 5.0,
4444
parsec >= 3.1.14 && < 3.2,
45-
containers >= 0.6.2 && < 0.6.6,
46-
template-haskell >= 2.11.0 && < 2.18
45+
containers >= 0.6.2 && < 0.7,
46+
template-haskell >= 2.11.0 && < 2.22
4747

4848
ghc-options: -Wall
4949
-fno-warn-unused-binds

stack.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
# http://docs.haskellstack.org/en/stable/yaml_configuration/
33

44
# ghc 8.10.7
5-
resolver: lts-18.10
6-
# ghc 9.0.1
7-
# resolver: nightly-2021-07-16
8-
5+
# resolver: lts-18.10
6+
# ghc 9.6.1
7+
resolver: lts-22.11
8+
# ghc 9.8.1
9+
# resolver: nightly-2024-02-22
910
packages:
1011
- '.'
1112
- examples/

0 commit comments

Comments
 (0)