Skip to content

Commit ee84fe2

Browse files
committed
Add conditional dep on nats to restore compat with GHC < 7.10
Also tweak changelog for consistency
1 parent 9423130 commit ee84fe2

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

changelog.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@
44

55
* Removed `alwaysSucceeds` and `always`, GHC's invariant checking primitives. (GHC #14324)
66

7-
* Add `lengthTBQueue` to `Control.Concurrent.STM.TBQueue`.
7+
* Add `lengthTBQueue` to `Control.Concurrent.STM.TBQueue`
88

9-
* Switched `newTBQueue` and `newTBQueueIO` to accept `Natural` as
10-
size. [#17](https://github.com/haskell/stm/pull/17)
11-
12-
* Dropped support for `base < 4.8`, due to above change.
9+
* Switched `newTBQueue` and `newTBQueueIO` to accept `Natural` as size (gh-17)
1310

1411
----
1512

stm.cabal

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
cabal-version: >=1.10
12
name: stm
23
version: 2.5.0.0
34
-- don't forget to update changelog.md file!
5+
46
license: BSD3
57
license-file: LICENSE
68
maintainer: libraries@haskell.org
@@ -9,7 +11,6 @@ bug-reports: https://github.com/haskell/stm/issues
911
synopsis: Software Transactional Memory
1012
category: Concurrency
1113
build-type: Simple
12-
cabal-version: >=1.10
1314
tested-with: GHC==8.6.*, GHC==8.4.*, GHC==8.2.*, GHC==8.0.*, GHC==7.10.*, GHC==7.8.*, GHC==7.6.*, GHC==7.4.*, GHC==7.2.*, GHC==7.0.*
1415
description:
1516
Software Transactional Memory, or STM, is an abstraction for
@@ -42,6 +43,9 @@ library
4243
if impl(ghc >= 7.9)
4344
other-extensions: Safe
4445

46+
if !impl(ghc >= 7.10)
47+
build-depends: nats (>= 0.1.3 && < 0.3) || (>= 1 && < 1.2)
48+
4549
build-depends:
4650
base >= 4.3 && < 4.13,
4751
array >= 0.3 && < 0.6

0 commit comments

Comments
 (0)