[Git][haskell-team/DHG_packages][master] attoparsec: Fix FTBFS

[Ilias Tsitsimpis (@iliastsi)]

Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
3490aae5 by Ilias Tsitsimpis at 2022-07-22T09:22:12+03:00
attoparsec: Fix FTBFS

Remove internal library as our tooling cannot handle more than one
libraries per package.

- - - - -


5 changed files:

- p/haskell-attoparsec/debian/changelog
- p/haskell-attoparsec/debian/patches/no-threaded-testsuite
- + p/haskell-attoparsec/debian/patches/remove-internal-library
- p/haskell-attoparsec/debian/patches/series
- p/haskell-attoparsec/debian/rules


Changes:

=====================================
p/haskell-attoparsec/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-attoparsec (0.14.4-2) unstable; urgency=medium
+
+  * Remove internal library (Closes: #1013458)
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Thu, 21 Jul 2022 16:20:20 +0300
+
 haskell-attoparsec (0.14.4-1) unstable; urgency=medium
 
   * New upstream version.


=====================================
p/haskell-attoparsec/debian/patches/no-threaded-testsuite
=====================================
@@ -1,6 +1,8 @@
 Description:  Do not run test suite threaded, does not work on all arches.
 Author: Joachim Breitner <nomeata at debian.org>
 
+Index: b/attoparsec.cabal
+===================================================================
 --- a/attoparsec.cabal
 +++ b/attoparsec.cabal
 @@ -112,7 +112,7 @@ test-suite attoparsec-tests


=====================================
p/haskell-attoparsec/debian/patches/remove-internal-library
=====================================
@@ -0,0 +1,71 @@
+Index: b/attoparsec.cabal
+===================================================================
+--- a/attoparsec.cabal
++++ b/attoparsec.cabal
+@@ -32,26 +32,9 @@ Flag developer
+   Default: False
+   Manual: True
+ 
+--- We need to test and benchmark these modules,
+--- but do not want to expose them to end users
+-library attoparsec-internal
+-  hs-source-dirs: internal
+-  build-depends: array,
+-                 base >= 4.3 && < 5,
+-                 bytestring <0.12,
+-                 text >= 1.1.1.3
+-  if !impl(ghc >= 8.0)
+-    build-depends: semigroups >=0.16.1 && <0.21
+-  exposed-modules: Data.Attoparsec.ByteString.Buffer
+-                   Data.Attoparsec.ByteString.FastSet
+-                   Data.Attoparsec.Internal.Compat
+-                   Data.Attoparsec.Internal.Fhthagn
+-                   Data.Attoparsec.Text.Buffer
+-                   Data.Attoparsec.Text.FastSet
+-  ghc-options: -O2 -Wall
+-  default-language: Haskell2010
+ 
+ library
++  hs-source-dirs: . , internal
+   build-depends: array,
+                  base >= 4.3 && < 5,
+                  bytestring <0.12,
+@@ -60,8 +43,7 @@ library
+                  scientific >= 0.3.1 && < 0.4,
+                  transformers >= 0.2 && (< 0.4 || >= 0.4.1.0) && < 0.7,
+                  text >= 1.1.1.3,
+-                 ghc-prim <0.9,
+-                 attoparsec-internal
++                 ghc-prim <0.9
+   if impl(ghc < 7.4)
+     build-depends:
+       bytestring < 0.10.4.0
+@@ -85,6 +67,12 @@ library
+                    Data.Attoparsec.Text.Lazy
+                    Data.Attoparsec.Types
+                    Data.Attoparsec.Zepto
++                   Data.Attoparsec.ByteString.Buffer
++                   Data.Attoparsec.ByteString.FastSet
++                   Data.Attoparsec.Internal.Compat
++                   Data.Attoparsec.Internal.Fhthagn
++                   Data.Attoparsec.Text.Buffer
++                   Data.Attoparsec.Text.FastSet
+   other-modules:   Data.Attoparsec.ByteString.Internal
+                    Data.Attoparsec.Text.Internal
+   ghc-options: -O2 -Wall
+@@ -120,7 +108,6 @@ test-suite attoparsec-tests
+   build-depends:
+     array,
+     attoparsec,
+-    attoparsec-internal,
+     base,
+     bytestring,
+     deepseq >= 1.1,
+@@ -167,7 +154,6 @@ benchmark attoparsec-benchmarks
+   build-depends:
+     array,
+     attoparsec,
+-    attoparsec-internal,
+     base == 4.*,
+     bytestring >= 0.10.4.0,
+     case-insensitive,


=====================================
p/haskell-attoparsec/debian/patches/series
=====================================
@@ -1 +1,2 @@
 no-threaded-testsuite
+remove-internal-library


=====================================
p/haskell-attoparsec/debian/rules
=====================================
@@ -4,5 +4,3 @@ DEB_ENABLE_TESTS = yes
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
-
-check-ghc-stamp: export LC_ALL := C.UTF-8



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/3490aae5d1c062127b277ede97a39a4c4b4c4e38

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/3490aae5d1c062127b277ede97a39a4c4b4c4e38
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20220722/bd4eb9a8/attachment-0001.htm>