diff options
| author | Ryan Scott <ryan.gl.scott@gmail.com> | 2019-04-09 08:52:21 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-04-09 23:23:50 -0400 |
| commit | be0dde8e3c27ca56477d1d1801bb77621f3618e1 (patch) | |
| tree | ddfb920958d6a5c5ee6d011c264d8306d86e3889 | |
| parent | fc3f421bd63cbf550cd0c8771aaf11e9c362f4d1 (diff) | |
| download | haskell-be0dde8e3c27ca56477d1d1801bb77621f3618e1.tar.gz | |
Use ghc-prim < 0.7, not <= 0.6.1, as upper version bounds
Using `ghc-prim <= 0.6.1` is somewhat dodgy from a PVP point of view,
as it makes it awkward to support new minor releases of `ghc-prim`.
Let's instead use `< 0.7`, which is the idiomatic way of expressing
PVP-compliant upper version bounds.
| -rw-r--r-- | ghc/ghc-bin.cabal.in | 2 | ||||
| -rw-r--r-- | libraries/base/base.cabal | 2 | ||||
| -rw-r--r-- | libraries/ghc-compact/ghc-compact.cabal | 2 | ||||
| -rw-r--r-- | libraries/ghc-heap/ghc-heap.cabal.in | 2 | ||||
| -rw-r--r-- | libraries/integer-gmp/integer-gmp.cabal | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in index 279e1274a9..0c2cb2db6d 100644 --- a/ghc/ghc-bin.cabal.in +++ b/ghc/ghc-bin.cabal.in @@ -58,7 +58,7 @@ Executable ghc Build-depends: containers >= 0.5 && < 0.7, deepseq == 1.4.*, - ghc-prim >= 0.5.0 && <= 0.6.1, + ghc-prim >= 0.5.0 && < 0.7, ghci == @ProjectVersionMunged@, haskeline == 0.7.*, time >= 1.8 && < 1.10, diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal index bac4897d7f..c4f9cfb941 100644 --- a/libraries/base/base.cabal +++ b/libraries/base/base.cabal @@ -95,7 +95,7 @@ Library UnliftedFFITypes Unsafe - build-depends: rts == 1.0, ghc-prim >= 0.5.1.0 && <= 0.6.1 + build-depends: rts == 1.0, ghc-prim >= 0.5.1.0 && < 0.7 -- sanity-check to ensure exactly one flag is set if !((flag(integer-gmp) && !flag(integer-simple)) || (!flag(integer-gmp) && flag(integer-simple))) diff --git a/libraries/ghc-compact/ghc-compact.cabal b/libraries/ghc-compact/ghc-compact.cabal index e36982f987..87c3b8dc6e 100644 --- a/libraries/ghc-compact/ghc-compact.cabal +++ b/libraries/ghc-compact/ghc-compact.cabal @@ -36,7 +36,7 @@ library UnboxedTuples CPP - build-depends: ghc-prim >= 0.5.3 && <= 0.6.1, + build-depends: ghc-prim >= 0.5.3 && < 0.7, base >= 4.9.0 && < 4.14, bytestring >= 0.10.6.0 ghc-options: -Wall diff --git a/libraries/ghc-heap/ghc-heap.cabal.in b/libraries/ghc-heap/ghc-heap.cabal.in index 7ab4f330d1..7beb7754b1 100644 --- a/libraries/ghc-heap/ghc-heap.cabal.in +++ b/libraries/ghc-heap/ghc-heap.cabal.in @@ -23,7 +23,7 @@ library default-language: Haskell2010 build-depends: base >= 4.9.0 && < 5.0 - , ghc-prim > 0.2 && <= 0.6.1 + , ghc-prim > 0.2 && < 0.7 , rts == 1.0.* ghc-options: -Wall diff --git a/libraries/integer-gmp/integer-gmp.cabal b/libraries/integer-gmp/integer-gmp.cabal index 008da1decb..648f500d03 100644 --- a/libraries/integer-gmp/integer-gmp.cabal +++ b/libraries/integer-gmp/integer-gmp.cabal @@ -58,7 +58,7 @@ library StandaloneDeriving UnboxedTuples UnliftedFFITypes - build-depends: ghc-prim >= 0.5.1.0 && <= 0.6.1 + build-depends: ghc-prim >= 0.5.1.0 && < 0.7 hs-source-dirs: src/ -- We need to set the unit ID to integer-wired-in -- (without a version number) as it's magic. |