Hello community, here is the log from the commit of package ghc-tabular for openSUSE:Factory checked in at 2020-09-07 21:32:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-tabular (Old) and /work/SRC/openSUSE:Factory/.ghc-tabular.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-tabular" Mon Sep 7 21:32:31 2020 rev:3 rq:832323 version:0.2.2.8 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-tabular/ghc-tabular.changes 2020-08-28 21:38:48.440821280 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-tabular.new.3399/ghc-tabular.changes 2020-09-07 21:32:37.373305250 +0200 @@ -1,0 +2,6 @@ +Tue Sep 1 14:36:11 UTC 2020 - [email protected] + +- Update tabular to version 0.2.2.8. + Upstream does not provide a change log file. + +------------------------------------------------------------------- Old: ---- tabular-0.2.2.7.tar.gz New: ---- tabular-0.2.2.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-tabular.spec ++++++ --- /var/tmp/diff_new_pack.0UgTT2/_old 2020-09-07 21:32:39.197306087 +0200 +++ /var/tmp/diff_new_pack.0UgTT2/_new 2020-09-07 21:32:39.201306089 +0200 @@ -18,7 +18,7 @@ %global pkg_name tabular Name: ghc-%{pkg_name} -Version: 0.2.2.7 +Version: 0.2.2.8 Release: 0 Summary: Two-dimensional data tables with rendering functions License: BSD-3-Clause ++++++ tabular-0.2.2.7.tar.gz -> tabular-0.2.2.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tabular-0.2.2.7/Setup.hs new/tabular-0.2.2.8/Setup.hs --- old/tabular-0.2.2.7/Setup.hs 1970-01-01 01:00:00.000000000 +0100 +++ new/tabular-0.2.2.8/Setup.hs 2001-09-09 03:46:40.000000000 +0200 @@ -0,0 +1,3 @@ +#!/usr/bin/env runhaskell +import Distribution.Simple +main = defaultMain diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tabular-0.2.2.7/Setup.lhs new/tabular-0.2.2.8/Setup.lhs --- old/tabular-0.2.2.7/Setup.lhs 2015-02-26 10:28:06.000000000 +0100 +++ new/tabular-0.2.2.8/Setup.lhs 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -#!/usr/bin/env runhaskell -> import Distribution.Simple -> main = defaultMain diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tabular-0.2.2.7/Text/Tabular.hs new/tabular-0.2.2.8/Text/Tabular.hs --- old/tabular-0.2.2.7/Text/Tabular.hs 2015-02-26 10:28:06.000000000 +0100 +++ new/tabular-0.2.2.8/Text/Tabular.hs 2001-09-09 03:46:40.000000000 +0200 @@ -9,7 +9,9 @@ import Control.Monad.State (evalState, State, get, put) data Properties = NoLine | SingleLine | DoubleLine + deriving (Show) data Header h = Header h | Group Properties [Header h] + deriving (Show) -- | -- > example = Table @@ -39,28 +41,7 @@ -- > -- B 2 || better | no chance || crawling | amazing -- > -- B 3 || meh | well... || worst ever | ok data Table rh ch a = Table (Header rh) (Header ch) [[a]] - --- ---------------------------------------------------------------------- --- --- ---------------------------------------------------------------------- - -{- --- | A 'Table' of "FancyCell" -type FancyTable d a = Table (FancyCell d a) - --- | 'FancyCell' @decorations a@ is a table cell that is associated with --- decorations of your choosing (for example, a cell colour) as well as --- instructions to merge that cell with its neighbours down or to the --- right. We include special versions of the rendering functions that --- recognise the merge instructions, but you will have to supply the --- code that deals with the decorations. -type FancyCell decorations a = (a, Maybe decorations, Maybe MergeInfo) - - -data MergeInfo = MergeInfo { mergeDown :: Int - , mergeRight :: Int - } --} + deriving (Show) -- ---------------------------------------------------------------------- -- * Helper functions for rendering @@ -147,6 +128,7 @@ -- > +.+ row "B 2" ["better", "no chance", "crawling", "amazing"] -- > +.+ row "B 3" ["meh", "well...", "worst ever", "ok"] data SemiTable h a = SemiTable (Header h) [a] + deriving (Show) empty :: Table rh ch a empty = Table (Group NoLine []) (Group NoLine []) [] @@ -168,7 +150,7 @@ beside prop (Table rows cols1 data1) (SemiTable cols2 data2) = Table rows (Group prop [cols1, cols2]) - (zipWith (++) data1 [data2]) + (zipWith (\xs x -> xs ++ [x]) data1 data2) below :: Properties -> Table rh ch a -> SemiTable rh a -> Table rh ch a below prop (Table rows1 cols data1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tabular-0.2.2.7/tabular.cabal new/tabular-0.2.2.8/tabular.cabal --- old/tabular-0.2.2.7/tabular.cabal 2015-02-26 10:28:06.000000000 +0100 +++ new/tabular-0.2.2.8/tabular.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,5 @@ name: tabular -version: 0.2.2.7 +version: 0.2.2.8 synopsis: Two-dimensional data tables with rendering functions description: Tabular provides a Haskell representation of two-dimensional data tables, the kind that you might find in a spreadsheet or @@ -24,19 +24,30 @@ license: BSD3 license-file: LICENSE author: Eric Kow -maintainer: Eric Kow <[email protected]> -homepage: http://hub.darcs.net/kowey/tabular -cabal-version: >= 1.8 +maintainer: Ben Gamari <[email protected]> +homepage: https://github.com/bgamari/tabular +cabal-version: 1.18 build-type: Simple -extra-doc-files: example/sample1.hs, - example/sample1.tex +extra-doc-files: example/sample1.hs, + example/sample1.tex +tested-with: GHC==8.10.2, + GHC==8.8.4, + GHC==8.6.5, + GHC==8.4.4, + GHC==8.2.2, + GHC==8.0.2, + GHC==7.10.3, + GHC==7.8.4, + GHC==7.6.3 + source-repository head - type: darcs - location: http://hub.darcs.net/kowey/tabular + type: git + location: https://github.com/bgamari/tabular library - build-Depends: base >= 2.1 && < 5, mtl >= 1 && < 2.3, + build-Depends: base >= 2.1 && < 5, + mtl >= 1 && < 2.3, csv >= 0.1 && < 0.2, html >= 1.0 && < 2.0 exposed-modules: Text.Tabular, @@ -45,3 +56,4 @@ Text.Tabular.Csv, Text.Tabular.Html, Text.Tabular.Latex + default-language: Haskell2010
