[Git][haskell-team/DHG_packages][master] aeson-compat: future test re-enablement

[Clint Adams]

Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
94327d07 by Clint Adams at 2018-04-16T11:06:43-04:00
aeson-compat: future test re-enablement

- - - - -


3 changed files:

- p/haskell-aeson/debian/control
- p/haskell-aeson/debian/patches/newer-deps
- p/haskell-aeson/debian/rules


Changes:

=====================================
p/haskell-aeson/debian/control
=====================================
--- a/p/haskell-aeson/debian/control
+++ b/p/haskell-aeson/debian/control
@@ -53,9 +53,8 @@ Build-Depends:
  libghc-uuid-types-prof,
  libghc-vector-dev (>= 0.8),
  libghc-vector-prof,
-# tests require base-orphans newer than current LTS
-# libghc-base-orphans-dev (>= 0.5.3) <!nocheck>,
-# libghc-base-orphans-dev (<< 0.6) <!nocheck>,
+ libghc-base-orphans-dev (>= 0.5.3) <!nocheck>,
+ libghc-base-orphans-dev (<< 0.8) <!nocheck>,
  libghc-base16-bytestring-dev <!nocheck>,
  libghc-generic-deriving-dev (>= 1.10) <!nocheck>,
  libghc-generic-deriving-dev (<< 1.13) <!nocheck>,


=====================================
p/haskell-aeson/debian/patches/newer-deps
=====================================
--- a/p/haskell-aeson/debian/patches/newer-deps
+++ b/p/haskell-aeson/debian/patches/newer-deps
@@ -1,6 +1,6 @@
 --- a/aeson.cabal
 +++ b/aeson.cabal
-@@ -200,7 +200,7 @@
+@@ -200,19 +200,19 @@
  
    build-depends:
      HUnit,
@@ -9,7 +9,12 @@
      aeson,
      integer-logarithms >= 1 && <1.1,
      attoparsec,
-@@ -212,7 +212,7 @@
+     base,
+     base-compat,
+-    base-orphans >= 0.5.3 && <0.7,
++    base-orphans >= 0.5.3 && <0.8,
+     base16-bytestring,
+     containers,
      directory,
      dlist,
      filepath,


=====================================
p/haskell-aeson/debian/rules
=====================================
--- a/p/haskell-aeson/debian/rules
+++ b/p/haskell-aeson/debian/rules
@@ -2,8 +2,6 @@
 
 DEB_SETUP_GHC_CONFIGURE_ARGS := $(shell test -e /usr/bin/ghci || echo --flags=-th)
 DEB_SETUP_GHC_CONFIGURE_ARGS += $(shell test -e /usr/lib/ghc/rts/libHSrts_thr.a || echo --flags=-threaded)
-# DEB_ENABLE_TESTS = $(shell test -e /usr/bin/ghci && echo yes)
-# requires base-orphans newer than current LTS Haskell
 DEB_ENABLE_TESTS = no
 
 include /usr/share/cdbs/1/rules/debhelper.mk



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

---
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/94327d071e12bd7700df50bf6a81318e706415ba
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/20180416/15db2651/attachment-0001.html>