Rename integer-simple to integer-pure (gh-138)

haskell · Dec 22, 2015 · b806d94 · b806d94
1 parent b933ac2
commit b806d94
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/Data/Text/Lazy/Builder/Int.hs b/Data/Text/Lazy/Builder/Int.hs
@@ -36,14 +36,14 @@ import Control.Monad.ST
 #ifdef  __GLASGOW_HASKELL__
 # if defined(INTEGER_GMP)
 import GHC.Integer.GMP.Internals (Integer(S#))
-# elif defined(INTEGER_SIMPLE)
+# elif defined(INTEGER_PURE)
 import GHC.Integer
 # else
-# error "You need to use either GMP or integer-simple."
+# error "You need to use either GMP or integer-pure."
 # endif
 #endif
 
-#if defined(INTEGER_GMP) || defined(INTEGER_SIMPLE)
+#if defined(INTEGER_GMP) || defined(INTEGER_PURE)
 # define PAIR(a,b) (# a,b #)
 #else
 # define PAIR(a,b) (a,b)

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 1.2.2.0
 
+* The `integer-simple` package, upon which this package optionally
+  depended, has been replaced with `integer-pure`.  The build flag has
+  been renamed accordingly.
+
 * Bug fix: For the `Binary` instance, If UTF-8 decoding fails during a
   `get`, the error is propagated via `fail` instead of an uncatchable
   crash.

diff --git a/text.cabal b/text.cabal
@@ -69,8 +69,8 @@ flag developer
   default: False
   manual: True
 
-flag integer-simple
-  description: Use the simple integer library instead of GMP
+flag integer-pure
+  description: Use the pure-Haskell integer library instead of GMP
 
 library
   c-sources:    cbits/cbits.c
@@ -143,9 +143,9 @@ library
     ghc-options: -Werror
     cpp-options: -DASSERTS
 
-  if flag(integer-simple)
-    cpp-options: -DINTEGER_SIMPLE
-    build-depends: integer-simple >= 0.1 && < 0.5
+  if flag(integer-pure)
+    cpp-options: -DINTEGER_PURE
+    build-depends: integer-pure >= 1.0
   else
     cpp-options: -DINTEGER_GMP
     build-depends: integer-gmp >= 0.2
@@ -179,9 +179,9 @@ test-suite tests
     test-framework-hunit >= 0.2,
     test-framework-quickcheck2 >= 0.2
 
-  if flag(integer-simple)
-    cpp-options: -DINTEGER_SIMPLE
-    build-depends: integer-simple >= 0.1 && < 0.5
+  if flag(integer-pure)
+    cpp-options: -DINTEGER_PURE
+    build-depends: integer-pure >= 0.1 && < 0.5
   else
     cpp-options: -DINTEGER_GMP
     build-depends: integer-gmp >= 0.2