Commit 94327d07 authored by Clint Adams's avatar Clint Adams
Browse files

aeson-compat: future test re-enablement

parent e679a058

p/haskell-aeson/debian/control

+2 −3
Original line number Diff line number Diff line
@@ -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

+7 −2
Original line number Diff line number Diff line 
--- 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

+0 −2
Original line number Diff line number Diff line
@@ -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