From fdff08e4bbe891de8f2d337152db40a2dc9bf3d2 Mon Sep 17 00:00:00 2001 From: Bodigrim Date: Mon, 30 Oct 2023 19:46:40 +0000 Subject: [PATCH] Depend on ghc-prim less --- Codec/Compression/Zlib/ByteStringCompat.hs | 3 +-- zlib.cabal | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Codec/Compression/Zlib/ByteStringCompat.hs b/Codec/Compression/Zlib/ByteStringCompat.hs index 5cfe8b8..6d882f8 100644 --- a/Codec/Compression/Zlib/ByteStringCompat.hs +++ b/Codec/Compression/Zlib/ByteStringCompat.hs @@ -14,8 +14,7 @@ import Foreign.ForeignPtr (ForeignPtr) import GHC.ForeignPtr (plusForeignPtr) #else import GHC.ForeignPtr (ForeignPtr(ForeignPtr)) -import GHC.Types (Int (..)) -import GHC.Prim (plusAddr#) +import GHC.Exts (Int (..), plusAddr#) #endif mkBS :: ForeignPtr Word8 -> Int -> Int -> ByteString diff --git a/zlib.cabal b/zlib.cabal index 1f30265..729e232 100644 --- a/zlib.cabal +++ b/zlib.cabal @@ -95,8 +95,8 @@ library build-depends: base >= 4.3 && < 4.20, bytestring >= 0.9 && < 0.13 - if impl(ghc < 8.0.3) - build-depends: ghc-prim + if impl(ghc < 7.6) + build-depends: ghc-prim < 0.3 build-tools: hsc2hs >= 0.67 && < 0.69 -- GHC 7 ships hsc2hs-0.67