commit ghc-shakespeare for openSUSE:Factory

Hello community, here is the log from the commit of package ghc-shakespeare for openSUSE:Factory checked in at 2016-11-02 12:45:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-shakespeare (Old) and /work/SRC/openSUSE:Factory/.ghc-shakespeare.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-shakespeare" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-shakespeare/ghc-shakespeare.changes 2016-09-05 21:20:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-shakespeare.new/ghc-shakespeare.changes 2016-11-02 12:45:20.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Sep 15 06:46:12 UTC 2016 - psimons@suse.com + +- Update to version 2.0.11.1 revision 0 with cabal2obs. + +------------------------------------------------------------------- Old: ---- shakespeare-2.0.11.tar.gz New: ---- shakespeare-2.0.11.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-shakespeare.spec ++++++ --- /var/tmp/diff_new_pack.e7f8Jr/_old 2016-11-02 12:45:21.000000000 +0100 +++ /var/tmp/diff_new_pack.e7f8Jr/_new 2016-11-02 12:45:21.000000000 +0100 @@ -19,7 +19,7 @@ %global pkg_name shakespeare %bcond_with tests Name: ghc-%{pkg_name} -Version: 2.0.11 +Version: 2.0.11.1 Release: 0 Summary: A toolkit for making compile-time interpolated templates License: MIT ++++++ shakespeare-2.0.11.tar.gz -> shakespeare-2.0.11.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shakespeare-2.0.11/ChangeLog.md new/shakespeare-2.0.11.1/ChangeLog.md --- old/shakespeare-2.0.11/ChangeLog.md 2016-08-02 11:54:03.000000000 +0200 +++ new/shakespeare-2.0.11.1/ChangeLog.md 2016-09-02 08:01:55.000000000 +0200 @@ -1,3 +1,7 @@ +### 2.0.11.1 + +* Handle parsing of trailing semicolon after mixins [#194](https://github.com/yesodweb/shakespeare/issues/194) + ### 2.0.11 * Export hamletFromString [#191](https://github.com/yesodweb/shakespeare/pull/191) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shakespeare-2.0.11/Text/Lucius.hs new/shakespeare-2.0.11.1/Text/Lucius.hs --- old/shakespeare-2.0.11/Text/Lucius.hs 2016-08-02 11:54:03.000000000 +0200 +++ new/shakespeare-2.0.11.1/Text/Lucius.hs 2016-09-02 08:01:55.000000000 +0200 @@ -158,6 +158,8 @@ whiteSpace Right x <- parseCaret whiteSpace + (char ';' >> return ()) <|> return () + whiteSpace return $ PBMixin x checkIfBlock = do skipMany $ noneOf "#@{};" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shakespeare-2.0.11/shakespeare.cabal new/shakespeare-2.0.11.1/shakespeare.cabal --- old/shakespeare-2.0.11/shakespeare.cabal 2016-08-02 11:54:03.000000000 +0200 +++ new/shakespeare-2.0.11.1/shakespeare.cabal 2016-09-02 08:01:55.000000000 +0200 @@ -1,5 +1,5 @@ name: shakespeare -version: 2.0.11 +version: 2.0.11.1 license: MIT license-file: LICENSE author: Michael Snoyman diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shakespeare-2.0.11/test/Text/CssSpec.hs new/shakespeare-2.0.11.1/test/Text/CssSpec.hs --- old/shakespeare-2.0.11/test/Text/CssSpec.hs 2016-08-02 11:54:03.000000000 +0200 +++ new/shakespeare-2.0.11.1/test/Text/CssSpec.hs 2016-09-02 08:01:55.000000000 +0200 @@ -496,6 +496,21 @@ src: url(sansation_light.woff) |] + describe "trailing semicolon in mixin" $ do + let someMixin = [luciusMixin|foo:bar|] + it "direct in lucius" $ + celper "baz{foo:bar}" [lucius| + baz { + ^{someMixin}; + } + |] + + it "implicit in cassius #194" $ + celper "baz{foo:bar}" [cassius| + baz + ^{someMixin} + |] + data Url = Home | Sub SubUrl data SubUrl = SubUrl render :: Url -> [(Text, Text)] -> Text