Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-djot for openSUSE:Factory checked in at 2024-05-21 18:34:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-djot (Old) and /work/SRC/openSUSE:Factory/.ghc-djot.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-djot" Tue May 21 18:34:53 2024 rev:3 rq:1175067 version:0.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-djot/ghc-djot.changes 2024-03-27 20:43:44.931733420 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-djot.new.1880/ghc-djot.changes 2024-05-21 18:35:15.099776418 +0200 @@ -1,0 +2,10 @@ +Sat May 11 06:43:44 UTC 2024 - Peter Simons <[email protected]> + +- Update djot to version 0.1.2. + ## 0.1.2 -- 2024-05-10 + + * Allow `_` in symbols (see jgm/djot#296). + + * Add Lift derivations to AST datatypes (#5, Gideon Farrell) [API change]. + +------------------------------------------------------------------- Old: ---- djot-0.1.1.3.tar.gz New: ---- djot-0.1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-djot.spec ++++++ --- /var/tmp/diff_new_pack.UlQKsb/_old 2024-05-21 18:35:15.731799393 +0200 +++ /var/tmp/diff_new_pack.UlQKsb/_new 2024-05-21 18:35:15.731799393 +0200 @@ -20,7 +20,7 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.1.1.3 +Version: 0.1.2 Release: 0 Summary: Parser and renderer for djot light markup syntax License: MIT @@ -39,6 +39,8 @@ BuildRequires: ghc-mtl-devel BuildRequires: ghc-mtl-prof BuildRequires: ghc-rpm-macros +BuildRequires: ghc-template-haskell-devel +BuildRequires: ghc-template-haskell-prof BuildRequires: ghc-text-devel BuildRequires: ghc-text-prof ExcludeArch: %{ix86} ++++++ djot-0.1.1.3.tar.gz -> djot-0.1.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djot-0.1.1.3/CHANGELOG.md new/djot-0.1.2/CHANGELOG.md --- old/djot-0.1.1.3/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 +++ new/djot-0.1.2/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,11 @@ # Revision history for djot +## 0.1.2 -- 2024-05-10 + +* Allow `_` in symbols (see jgm/djot#296). + +* Add Lift derivations to AST datatypes (#5, Gideon Farrell) [API change]. + ## 0.1.1.3 -- 2024-03-17 * Ensure that tables end when we hit a blank line (#4). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djot-0.1.1.3/djot.cabal new/djot-0.1.2/djot.cabal --- old/djot-0.1.1.3/djot.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/djot-0.1.2/djot.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,6 +1,6 @@ cabal-version: 3.0 name: djot -version: 0.1.1.3 +version: 0.1.2 synopsis: Parser and renderer for djot light markup syntax. description: Djot (<https://djot.net>) is a light markup language. This package provides a data structure to represent @@ -17,13 +17,18 @@ extra-source-files: test/*.test benchmark/m.dj +common deps + build-depends: + base >= 4.12 && < 5, + bytestring >= 0.11.3, + doclayout + Library - build-depends: base >= 4.12 && < 5, - bytestring >= 0.11.3, - containers, - mtl, + import: deps + build-depends: mtl, + containers >= 0.6.6, text, - doclayout + template-haskell hs-source-dirs: src default-language: Haskell2010 exposed-modules: Djot @@ -38,49 +43,40 @@ ghc-options: -Wall -O2 executable djoths + import: deps main-is: Main.hs - build-depends: base >= 4.12 && < 5, - djot, - bytestring, - containers, - text, - doclayout + build-depends: djot, + text hs-source-dirs: app default-language: Haskell2010 ghc-options: -Wall -O2 -rtsopts -threaded test-suite test-djot + import: deps type: exitcode-stdio-1.0 main-is: Main.hs hs-source-dirs: test ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-K40K -with-rtsopts=-kc40K if impl(ghc >= 8.10) ghc-options: -Wunused-packages - build-depends: - base >= 4.12 && <5 - , djot - , text - , bytestring - , directory - , filepath - , doclayout - , tasty - , tasty-hunit - , tasty-quickcheck + build-depends: djot, + directory, + filepath, + tasty, + tasty-hunit, + tasty-quickcheck, + text default-language: Haskell2010 benchmark benchmark-djot + import: deps type: exitcode-stdio-1.0 main-is: Main.hs hs-source-dirs: benchmark - build-depends: - djot - , base >= 4.9 && < 5 - , bytestring - , directory - , filepath - , doclayout - , tasty-bench + build-depends: djot, + directory, + filepath, + tasty-bench ghc-options: -O2 -threaded -rtsopts -with-rtsopts=-K10K -with-rtsopts=-kc10K if impl(ghc >= 8.10) ghc-options: -Wunused-packages diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djot-0.1.1.3/src/Djot/AST.hs new/djot-0.1.2/src/Djot/AST.hs --- old/djot-0.1.1.3/src/Djot/AST.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/djot-0.1.2/src/Djot/AST.hs 2001-09-09 03:46:40.000000000 +0200 @@ -5,6 +5,7 @@ {-# LANGUAGE DeriveTraversable #-} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} +{-# LANGUAGE DeriveLift #-} module Djot.AST ( Inline(..), Many(..), @@ -87,11 +88,12 @@ import Data.Data (Data, Typeable) import qualified Data.ByteString.Char8 as B8 import GHC.Generics (Generic) +import Language.Haskell.TH.Syntax (Lift (..)) -- import Debug.Trace newtype Attr = Attr [(ByteString, ByteString)] - deriving (Show, Eq, Ord, Typeable, Data, Generic) + deriving (Show, Eq, Ord, Typeable, Data, Generic, Lift) instance Semigroup Attr where Attr as <> Attr bs = @@ -112,7 +114,7 @@ | otherwise -> kvs data Pos = NoPos | Pos Int Int Int Int -- start line, start col, end line, end col - deriving (Show, Eq, Ord, Typeable, Data, Generic) + deriving (Show, Eq, Ord, Typeable, Data, Generic, Lift) instance Semigroup Pos where Pos sl1 sc1 _ _ <> Pos _ _ el2 ec2 = @@ -125,7 +127,7 @@ mempty = NoPos data Node a = Node Pos Attr a - deriving (Show, Eq, Ord, Functor, Traversable, Foldable, Typeable, Data, Generic) + deriving (Show, Eq, Ord, Functor, Traversable, Foldable, Typeable, Data, Generic, Lift) {-# INLINE addAttr #-} addAttr :: Attr -> Node a -> Node a @@ -136,18 +138,18 @@ addPos pos (Node _ attr bs) = Node pos attr bs newtype Format = Format { unFormat :: ByteString } - deriving (Show, Eq, Ord, Typeable, Data, Generic) + deriving (Show, Eq, Ord, Typeable, Data, Generic, Lift) data MathStyle = DisplayMath | InlineMath - deriving (Show, Ord, Eq, Typeable, Data, Generic) + deriving (Show, Ord, Eq, Typeable, Data, Generic, Lift) data Target = Direct ByteString | Reference ByteString - deriving (Show, Ord, Eq, Typeable, Data, Generic) + deriving (Show, Ord, Eq, Typeable, Data, Generic, Lift) data QuoteType = SingleQuotes | DoubleQuotes - deriving (Show, Ord, Eq, Typeable, Data, Generic) + deriving (Show, Ord, Eq, Typeable, Data, Generic, Lift) data Inline = Str ByteString @@ -172,10 +174,10 @@ | Quoted QuoteType Inlines | SoftBreak | HardBreak - deriving (Show, Ord, Eq, Typeable, Data, Generic) + deriving (Show, Ord, Eq, Typeable, Data, Generic, Lift) newtype Many a = Many { unMany :: Seq a } - deriving (Show, Ord, Eq, Functor, Traversable, Foldable, Typeable, Data, Generic) + deriving (Show, Ord, Eq, Functor, Traversable, Foldable, Typeable, Data, Generic, Lift) type Inlines = Many (Node Inline) @@ -216,37 +218,37 @@ mempty = Many mempty data ListSpacing = Tight | Loose - deriving (Show, Ord, Eq, Typeable, Data, Generic) + deriving (Show, Ord, Eq, Typeable, Data, Generic, Lift) data OrderedListStyle = Decimal | LetterUpper | LetterLower | RomanUpper | RomanLower - deriving (Show, Ord, Eq, Typeable, Data, Generic) + deriving (Show, Ord, Eq, Typeable, Data, Generic, Lift) data OrderedListDelim = RightPeriod | RightParen | LeftRightParen - deriving (Show, Ord, Eq, Typeable, Data, Generic) + deriving (Show, Ord, Eq, Typeable, Data, Generic, Lift) data OrderedListAttributes = OrderedListAttributes { orderedListStyle :: OrderedListStyle , orderedListDelim :: OrderedListDelim , orderedListStart :: Int } - deriving (Show, Ord, Eq, Typeable, Data, Generic) + deriving (Show, Ord, Eq, Typeable, Data, Generic, Lift) data TaskStatus = Complete | Incomplete - deriving (Show, Ord, Eq, Typeable, Data, Generic) + deriving (Show, Ord, Eq, Typeable, Data, Generic, Lift) newtype Caption = Caption Blocks - deriving (Show, Ord, Eq, Typeable, Data, Generic) + deriving (Show, Ord, Eq, Typeable, Data, Generic, Lift) data Align = AlignLeft | AlignRight | AlignCenter | AlignDefault - deriving (Show, Ord, Eq, Typeable, Data, Generic) + deriving (Show, Ord, Eq, Typeable, Data, Generic, Lift) data CellType = HeadCell | BodyCell - deriving (Show, Ord, Eq, Typeable, Data, Generic) + deriving (Show, Ord, Eq, Typeable, Data, Generic, Lift) data Cell = Cell CellType Align Inlines - deriving (Show, Ord, Eq, Typeable, Data, Generic) + deriving (Show, Ord, Eq, Typeable, Data, Generic, Lift) data Block = Para Inlines @@ -262,7 +264,7 @@ | ThematicBreak | Table (Maybe Caption) [[Cell]] | RawBlock Format ByteString - deriving (Show, Ord, Eq, Typeable, Data, Generic) + deriving (Show, Ord, Eq, Typeable, Data, Generic, Lift) type Blocks = Many (Node Block) @@ -279,7 +281,7 @@ , docReferences :: ReferenceMap , docAutoReferences :: ReferenceMap , docAutoIdentifiers :: Set ByteString - } deriving (Show, Ord, Eq, Typeable, Data, Generic) + } deriving (Show, Ord, Eq, Typeable, Data, Generic, Lift) instance Semigroup Doc where Doc bs ns rs ar ai <> Doc bs' ns' rs' ar' ai' = @@ -291,7 +293,7 @@ -- | A map from labels to contents. newtype NoteMap = NoteMap { unNoteMap :: M.Map ByteString Blocks } - deriving (Show, Ord, Eq, Semigroup, Monoid, Typeable, Data, Generic) + deriving (Show, Ord, Eq, Semigroup, Monoid, Typeable, Data, Generic, Lift) insertNote :: ByteString -> Blocks -> NoteMap -> NoteMap insertNote label ref (NoteMap m) = @@ -303,7 +305,7 @@ newtype ReferenceMap = ReferenceMap { unReferenceMap :: M.Map ByteString (ByteString, Attr) } - deriving (Show, Ord, Eq, Semigroup, Monoid, Typeable, Data, Generic) + deriving (Show, Ord, Eq, Semigroup, Monoid, Typeable, Data, Generic, Lift) normalizeLabel :: ByteString -> ByteString normalizeLabel = B8.unwords . B8.splitWith isWs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djot-0.1.1.3/src/Djot/Inlines.hs new/djot-0.1.2/src/Djot/Inlines.hs --- old/djot-0.1.1.3/src/Djot/Inlines.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/djot-0.1.2/src/Djot/Inlines.hs 2001-09-09 03:46:40.000000000 +0200 @@ -215,6 +215,7 @@ asciiChar ':' bs <- byteStringOf $ skipSome (skipSatisfyByte (\c -> c == '+' || c == '-' || + c == '_' || (isAscii c && isAlphaNum c))) asciiChar ':' pure $ symbol bs
