[Git][haskell-team/DHG_packages][master] brick: enable testsuite

[Clint Adams (@clint)]

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


Commits:
f6e6865d by Clint Adams at 2024-10-19T12:06:14-04:00
brick: enable testsuite

- - - - -


6 changed files:

- p/haskell-brick/debian/changelog
- p/haskell-brick/debian/control
- + p/haskell-brick/debian/patches/31f94e1b76aaddf0cc5ff49be27ae6c3a82dc98b.diff
- p/haskell-brick/debian/patches/series
- − p/haskell-brick/debian/patches/temporarily-no-vty-crossplatform
- p/haskell-brick/debian/rules


Changes:

=====================================
p/haskell-brick/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+haskell-brick (2.1.1-2) unstable; urgency=medium
+
+  * Drop patch which removes dependency on vty-crossplatform.
+  * Enable testsuite.
+
+ -- Clint Adams <clint at debian.org>  Fri, 18 Oct 2024 21:46:25 -0400
+
 haskell-brick (2.1.1-1) unstable; urgency=medium
 
   [ Ilias Tsitsimpis ]


=====================================
p/haskell-brick/debian/control
=====================================
@@ -32,13 +32,14 @@ Build-Depends:
  libghc-vector-prof,
  libghc-vty-dev (>= 6.0),
  libghc-vty-prof,
- libghc-vty-unix-dev,
- libghc-vty-unix-prof,
+ libghc-vty-crossplatform-dev,
+ libghc-vty-crossplatform-prof,
  libghc-word-wrap-dev (>= 0.2),
  libghc-word-wrap-prof,
  libghc-text-zipper-dev,
  libghc-vty-dev,
  libghc-word-wrap-dev,
+ libghc-quickcheck2-dev <!nocheck>,
 Build-Depends-Indep: ghc-doc,
  libghc-bimap-doc,
  libghc-config-ini-doc,
@@ -50,7 +51,7 @@ Build-Depends-Indep: ghc-doc,
  libghc-unix-compat-doc,
  libghc-vector-doc,
  libghc-vty-doc,
- libghc-vty-unix-doc,
+ libghc-vty-crossplatform-doc,
  libghc-word-wrap-doc,
 Standards-Version: 4.7.0
 Homepage: https://github.com/jtdaugherty/brick/


=====================================
p/haskell-brick/debian/patches/31f94e1b76aaddf0cc5ff49be27ae6c3a82dc98b.diff
=====================================
@@ -0,0 +1,37 @@
+--- a/brick.cabal
++++ b/brick.cabal
+@@ -575,5 +575,5 @@ test-suite brick-tests
+                        microlens,
+                        vector,
+                        vty,
+-                       vty-unix,
++                       vty-crossplatform,
+                        QuickCheck
+--- a/tests/Main.hs
++++ b/tests/Main.hs
+@@ -1,3 +1,4 @@
++{-# LANGUAGE TypeOperators #-}
+ {-# LANGUAGE TemplateHaskell #-}
+ {-# LANGUAGE TypeFamilies #-}
+ 
+--- a/tests/Render.hs
++++ b/tests/Render.hs
+@@ -10,8 +10,7 @@ import Control.Monad (when)
+ import Data.Monoid
+ #endif
+ import qualified Graphics.Vty as V
+-import qualified Graphics.Vty.Platform.Unix.Output as VU
+-import qualified Graphics.Vty.Platform.Unix.Settings as VU
++import qualified Graphics.Vty.CrossPlatform.Testing as V
+ import Brick.Widgets.Border (hBorder)
+ import Control.Exception (SomeException, try)
+ 
+@@ -20,7 +19,7 @@ region = (30, 10)
+ 
+ renderDisplay :: Ord n => [Widget n] -> IO ()
+ renderDisplay ws = do
+-    outp <- VU.buildOutput =<< VU.defaultSettings
++    outp <- V.mkDefaultOutput
+     ctx <- V.displayContext outp region
+     V.outputPicture ctx (renderWidget Nothing ws region)
+     V.releaseDisplay outp


=====================================
p/haskell-brick/debian/patches/series
=====================================
@@ -1 +1 @@
-temporarily-no-vty-crossplatform
+31f94e1b76aaddf0cc5ff49be27ae6c3a82dc98b.diff


=====================================
p/haskell-brick/debian/patches/temporarily-no-vty-crossplatform deleted
=====================================
@@ -1,49 +0,0 @@
---- a/brick.cabal
-+++ b/brick.cabal
-@@ -96,7 +96,7 @@ library
- 
-   build-depends:       base >= 4.9.0.0 && < 4.21.0.0,
-                        vty >= 6.0,
--                       vty-crossplatform,
-+                       vty-unix,
-                        bimap >= 0.5 && < 0.6,
-                        data-clist >= 0.1,
-                        directory >= 1.2.5.0,
-@@ -160,7 +160,7 @@ executable brick-tail-demo
-                        brick,
-                        text,
-                        vty,
--                       vty-crossplatform,
-+                       vty-unix,
-                        random,
-                        microlens-th,
-                        microlens-mtl
-@@ -204,7 +204,7 @@ executable brick-form-demo
-                        text,
-                        microlens,
-                        microlens-th,
--                       vty-crossplatform,
-+                       vty-unix,
-                        vty
- 
- executable brick-text-wrap-demo
-@@ -262,7 +262,7 @@ executable brick-viewport-scrollbars-dem
-   build-depends:       base,
-                        brick,
-                        vty,
--                       vty-crossplatform,
-+                       vty-unix,
-                        text,
-                        microlens,
-                        microlens-mtl,
---- a/src/Brick/Main.hs
-+++ b/src/Brick/Main.hs
-@@ -77,7 +77,7 @@ import Graphics.Vty
-   , restoreInputState
-   , inputIface
-   )
--import Graphics.Vty.CrossPlatform (mkVty)
-+import Graphics.Vty.Platform.Unix (mkVty)
- import Graphics.Vty.Config (defaultConfig)
- import Graphics.Vty.Attributes (defAttr)
- 


=====================================
p/haskell-brick/debian/rules
=====================================
@@ -2,6 +2,7 @@
 
 DEB_CABAL_PACKAGE = brick
 DEB_DEFAULT_COMPILER = ghc
+DEB_ENABLE_TESTS = yes
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk



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

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/f6e6865db95b61ee2aac4677232945e38ba08ae2
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/20241019/a9e0be37/attachment-0001.htm>