Skip to content

Commit b306678

Browse files
committed
hackage-security: Drop flags base48, mtl21, old-directory
1 parent 24693ce commit b306678

File tree

2 files changed

+10
-40
lines changed

2 files changed

+10
-40
lines changed

hackage-security/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ See also http://pvp.haskell.org/faq
55

66
* Allow `tar-0.6`
77
* Drop support for GHC < 7.8 in favor of `PatternSynonyms`
8+
* Drop flags `base48`, `mtl21`, `old-directory` and support for GHC 7.8, `mtl < 2.2` and `directory < 1.2`
89
* Tested with GHC 7.10 - 9.8
910

1011
0.6.2.3

hackage-security/hackage-security.cabal

Lines changed: 9 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ source-repository head
5151
type: git
5252
location: https://github.com/haskell/hackage-security.git
5353

54-
flag base48
55-
description: Are we using @base@ 4.8 or later?
56-
manual: False
57-
5854
flag use-network-uri
5955
description: Are we using @network-uri@?
6056
manual: False
@@ -64,16 +60,6 @@ flag Cabal-syntax
6460
manual: False
6561
default: False
6662

67-
flag old-directory
68-
description: Use @directory@ < 1.2 and @old-time@
69-
manual: False
70-
default: False
71-
72-
flag mtl21
73-
description: Use @mtl@ < 2.2 and @mtl-compat@
74-
manual: False
75-
default: False
76-
7763
flag lukko
7864
description: Use @lukko@ for file-locking, otherwise use @GHC.IO.Handle.Lock@
7965
manual: True
@@ -126,17 +112,19 @@ library
126112
Hackage.Security.Util.TypedEmbedded
127113
MyPrelude
128114
-- We support ghc 7.4 (bundled with Cabal 1.14) and up
129-
build-depends: base >= 4.7 && < 4.20,
115+
build-depends: base >= 4.8 && < 4.20,
130116
-- PatternSynonyms are only available since GHC 7.8 (base 4.7)
131117
base16-bytestring >= 0.1.1 && < 1.1,
132118
base64-bytestring >= 1.0 && < 1.3,
133119
bytestring >= 0.9 && < 0.13,
134120
containers >= 0.4 && < 0.8,
121+
cryptohash-sha256 >= 0.11 && < 0.12,
122+
directory >= 1.2 && < 1.4,
135123
ed25519 >= 0.0 && < 0.1,
136124
filepath >= 1.2 && < 1.5,
125+
mtl >= 2.2 && < 2.4,
137126
parsec >= 3.1 && < 3.2,
138127
pretty >= 1.0 && < 1.2,
139-
cryptohash-sha256 >= 0.11 && < 0.12,
140128
-- 0.4.2 introduces TarIndex, 0.4.4 introduces more
141129
-- functionality, 0.5.0 changes type of serialise
142130
tar >= 0.5 && < 0.7,
@@ -146,17 +134,6 @@ library
146134
zlib >= 0.5 && < 0.7,
147135
-- whatever versions are bundled with ghc:
148136
ghc-prim
149-
if flag(old-directory)
150-
build-depends: directory >= 1.1.0.2 && < 1.2,
151-
old-time >= 1 && < 1.2
152-
else
153-
build-depends: directory >= 1.2 && < 1.4
154-
155-
if flag(mtl21)
156-
build-depends: mtl >= 2.1 && < 2.2,
157-
mtl-compat >= 0.2 && < 0.3
158-
else
159-
build-depends: mtl >= 2.2 && < 2.4
160137

161138
if flag(lukko)
162139
build-depends: lukko >= 0.1 && < 0.2
@@ -194,10 +171,14 @@ library
194171
TypeFamilies
195172
TypeOperators
196173
ViewPatterns
197-
other-extensions: BangPatterns
174+
other-extensions:
175+
AllowAmbiguousTypes
176+
BangPatterns
198177
CPP
199178
OverlappingInstances
200179
PackageImports
180+
RoleAnnotations
181+
StaticPointers
201182
UndecidableInstances
202183

203184
-- use the new stage1/cross-compile-friendly DeriveLift extension for GHC 8.0+
@@ -208,11 +189,6 @@ library
208189

209190
ghc-options: -Wall
210191

211-
if flag(base48)
212-
build-depends: base >= 4.8
213-
else
214-
build-depends: base < 4.8, old-locale == 1.0.*
215-
216192
-- The URI type got split out off the network package after version 2.5, and
217193
-- moved to a separate network-uri package. Since we don't need the rest of
218194
-- network here, it would suffice to rely only on network-uri:
@@ -252,13 +228,6 @@ library
252228
else
253229
build-depends: network >= 2.5 && < 2.6
254230

255-
if impl(ghc >= 7.8)
256-
other-extensions: RoleAnnotations
257-
258-
if impl(ghc >= 7.10)
259-
other-extensions: AllowAmbiguousTypes
260-
StaticPointers
261-
262231
test-suite TestSuite
263232
type: exitcode-stdio-1.0
264233
main-is: TestSuite.hs

0 commit comments

Comments
 (0)