commit ghc-neat-interpolation for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-neat-interpolation for openSUSE:Factory checked in at 2020-09-15 16:21:27 Comparing /work/SRC/openSUSE:Factory/ghc-neat-interpolation (Old) and /work/SRC/openSUSE:Factory/.ghc-neat-interpolation.new.4249 (New) Package is "ghc-neat-interpolation" Tue Sep 15 16:21:27 2020 rev:9 rq:833310 version:0.5.1.2 Changes: --- /work/SRC/openSUSE:Factory/ghc-neat-interpolation/ghc-neat-interpolation.changes 2020-09-07 21:22:12.533018569 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-neat-interpolation.new.4249/ghc-neat-interpolation.changes 2020-09-15 16:21:31.322208002 +0200 @@ -1,0 +2,7 @@ +Fri Sep 4 17:21:39 UTC 2020 - psim...@suse.com + +- Update neat-interpolation to version 0.5.1.2. + Upstream has not updated the file "CHANGELOG.md" since the last + release. + +--- Old: neat-interpolation-0.5.1.1.tar.gz New: neat-interpolation-0.5.1.2.tar.gz Other differences: -- ++ ghc-neat-interpolation.spec ++ --- /var/tmp/diff_new_pack.NOWvIw/_old 2020-09-15 16:21:32.566209193 +0200 +++ /var/tmp/diff_new_pack.NOWvIw/_new 2020-09-15 16:21:32.570209197 +0200 @@ -19,7 +19,7 @@ %global pkg_name neat-interpolation %bcond_with tests Name: ghc-%{pkg_name} -Version:0.5.1.1 +Version:0.5.1.2 Release:0 Summary:A quasiquoter for neat and simple multiline text interpolation License:MIT ++ neat-interpolation-0.5.1.1.tar.gz -> neat-interpolation-0.5.1.2.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neat-interpolation-0.5.1.1/neat-interpolation.cabal new/neat-interpolation-0.5.1.2/neat-interpolation.cabal --- old/neat-interpolation-0.5.1.1/neat-interpolation.cabal 2020-07-13 13:33:37.0 +0200 +++ new/neat-interpolation-0.5.1.2/neat-interpolation.cabal 2020-09-04 16:26:00.0 +0200 @@ -1,5 +1,5 @@ name: neat-interpolation -version: 0.5.1.1 +version: 0.5.1.2 synopsis: A quasiquoter for neat and simple multiline text interpolation description: A quasiquoter for producing Text values with support for @@ -34,7 +34,7 @@ NeatInterpolation.String build-depends: base >=4.9 && <5, -megaparsec >=7 && <9, +megaparsec >=7 && <10, template-haskell >=2.8 && <3, text ==1.*
commit ghc-neat-interpolation for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-neat-interpolation for openSUSE:Factory checked in at 2020-09-07 21:22:03 Comparing /work/SRC/openSUSE:Factory/ghc-neat-interpolation (Old) and /work/SRC/openSUSE:Factory/.ghc-neat-interpolation.new.3399 (New) Package is "ghc-neat-interpolation" Mon Sep 7 21:22:03 2020 rev:8 rq:831219 version:0.5.1.1 Changes: --- /work/SRC/openSUSE:Factory/ghc-neat-interpolation/ghc-neat-interpolation.changes 2020-03-09 14:16:32.670631609 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-neat-interpolation.new.3399/ghc-neat-interpolation.changes 2020-09-07 21:22:12.533018569 +0200 @@ -1,0 +2,7 @@ +Tue Sep 1 14:41:20 UTC 2020 - psim...@suse.com + +- Update neat-interpolation to version 0.5.1.1. + Upstream has not updated the file "CHANGELOG.md" since the last + release. + +--- Old: neat-interpolation-0.5.1.tar.gz New: neat-interpolation-0.5.1.1.tar.gz Other differences: -- ++ ghc-neat-interpolation.spec ++ --- /var/tmp/diff_new_pack.KGzo1a/_old 2020-09-07 21:22:13.869019182 +0200 +++ /var/tmp/diff_new_pack.KGzo1a/_new 2020-09-07 21:22:13.873019185 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-neat-interpolation # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global pkg_name neat-interpolation %bcond_with tests Name: ghc-%{pkg_name} -Version:0.5.1 +Version:0.5.1.1 Release:0 Summary:A quasiquoter for neat and simple multiline text interpolation License:MIT @@ -56,7 +56,7 @@ files. %prep -%setup -q -n %{pkg_name}-%{version} +%autosetup -n %{pkg_name}-%{version} %build %ghc_lib_build ++ neat-interpolation-0.5.1.tar.gz -> neat-interpolation-0.5.1.1.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neat-interpolation-0.5.1/library/NeatInterpolation.hs new/neat-interpolation-0.5.1.1/library/NeatInterpolation.hs --- old/neat-interpolation-0.5.1/library/NeatInterpolation.hs 2020-02-04 09:06:36.0 +0100 +++ new/neat-interpolation-0.5.1.1/library/NeatInterpolation.hs 2020-07-13 13:33:37.0 +0200 @@ -123,7 +123,7 @@ quoteExp input = case Parsing.parseLines input of Left e -> fail $ show e -Right lines -> sigE (appE [|Text.intercalate "\n"|] $ listE $ map lineExp lines) +Right lines -> sigE (appE [|Text.intercalate (Text.singleton '\n')|] $ listE $ map lineExp lines) [t|Text|] lineExp :: Parsing.Line -> Q Exp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neat-interpolation-0.5.1/neat-interpolation.cabal new/neat-interpolation-0.5.1.1/neat-interpolation.cabal --- old/neat-interpolation-0.5.1/neat-interpolation.cabal 2020-02-04 09:06:36.0 +0100 +++ new/neat-interpolation-0.5.1.1/neat-interpolation.cabal 2020-07-13 13:33:37.0 +0200 @@ -1,5 +1,5 @@ name: neat-interpolation -version: 0.5.1 +version: 0.5.1.1 synopsis: A quasiquoter for neat and simple multiline text interpolation description: A quasiquoter for producing Text values with support for
commit ghc-neat-interpolation for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-neat-interpolation for openSUSE:Factory checked in at 2020-03-09 14:16:29 Comparing /work/SRC/openSUSE:Factory/ghc-neat-interpolation (Old) and /work/SRC/openSUSE:Factory/.ghc-neat-interpolation.new.26092 (New) Package is "ghc-neat-interpolation" Mon Mar 9 14:16:29 2020 rev:7 rq:780025 version:0.5.1 Changes: --- /work/SRC/openSUSE:Factory/ghc-neat-interpolation/ghc-neat-interpolation.changes 2019-12-27 13:55:41.100725464 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-neat-interpolation.new.26092/ghc-neat-interpolation.changes 2020-03-09 14:16:32.670631609 +0100 @@ -1,0 +2,8 @@ +Fri Feb 7 08:04:12 UTC 2020 - psim...@suse.com + +- Update neat-interpolation to version 0.5.1. + Upstream added a new change log file in this release. With no + previous version to compare against, the automatic updater cannot + reliable determine the relevante entries for this release. + +--- Old: neat-interpolation-0.3.2.5.tar.gz New: neat-interpolation-0.5.1.tar.gz Other differences: -- ++ ghc-neat-interpolation.spec ++ --- /var/tmp/diff_new_pack.E3hZYy/_old 2020-03-09 14:16:33.238631983 +0100 +++ /var/tmp/diff_new_pack.E3hZYy/_new 2020-03-09 14:16:33.238631983 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-neat-interpolation # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,20 +19,24 @@ %global pkg_name neat-interpolation %bcond_with tests Name: ghc-%{pkg_name} -Version:0.3.2.5 +Version:0.5.1 Release:0 Summary:A quasiquoter for neat and simple multiline text interpolation License:MIT URL:https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-base-prelude-devel BuildRequires: ghc-megaparsec-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-template-haskell-devel BuildRequires: ghc-text-devel %if %{with tests} -BuildRequires: ghc-HTF-devel +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-quickcheck-instances-devel +BuildRequires: ghc-rerebase-devel +BuildRequires: ghc-tasty-devel +BuildRequires: ghc-tasty-hunit-devel +BuildRequires: ghc-tasty-quickcheck-devel %endif %description @@ -73,5 +77,6 @@ %license LICENSE %files devel -f %{name}-devel.files +%doc CHANGELOG.md %changelog ++ neat-interpolation-0.3.2.5.tar.gz -> neat-interpolation-0.5.1.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neat-interpolation-0.3.2.5/CHANGELOG.md new/neat-interpolation-0.5.1/CHANGELOG.md --- old/neat-interpolation-0.3.2.5/CHANGELOG.md 1970-01-01 01:00:00.0 +0100 +++ new/neat-interpolation-0.5.1/CHANGELOG.md 2020-02-04 09:06:36.0 +0100 @@ -0,0 +1,7 @@ +## Version 0.5 + +- Isolated the `trimming` and `untrimming` variations of quasi-quoter. + +## Version 0.4 + +- Changed the behaviour of the quasi-quoter in regards to trailing whitespace. Before it was always adding newline in the end, now it always completely removes all the trailing whitespace. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neat-interpolation-0.3.2.5/executables/APITests.hs new/neat-interpolation-0.5.1/executables/APITests.hs --- old/neat-interpolation-0.3.2.5/executables/APITests.hs 2019-12-03 12:25:37.0 +0100 +++ new/neat-interpolation-0.5.1/executables/APITests.hs1970-01-01 01:00:00.0 +0100 @@ -1,49 +0,0 @@ -{-# OPTIONS_GHC -F -pgmF htfpp #-} - -import BasePrelude -import Test.Framework -import NeatInterpolation - - -main = htfMain $ htf_thisModulesTests - - -test_demo = do - assertEqual -"function(){\n function(){\n{\n indented line\n indented line\n}\n }\n return {\nindented line\nindented line\n }\n}\n" -(template a a) - assertEqual -"this_could_be_one_long_identifier\n" -(escaped "one") - where -template a b = - [text| -function(){ - function(){ -$a - } - return $b -} - |] -escaped name = [text|this_could_be_${name}_long_identifier|] -a = "{\n indented line\n indented line\n}" - -test_dollar = do - assertEqual -"function(){\n function(){\n{\n indented line\n
commit ghc-neat-interpolation for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-neat-interpolation for openSUSE:Factory checked in at 2019-12-27 13:55:31 Comparing /work/SRC/openSUSE:Factory/ghc-neat-interpolation (Old) and /work/SRC/openSUSE:Factory/.ghc-neat-interpolation.new.6675 (New) Package is "ghc-neat-interpolation" Fri Dec 27 13:55:31 2019 rev:6 rq:759456 version:0.3.2.5 Changes: --- /work/SRC/openSUSE:Factory/ghc-neat-interpolation/ghc-neat-interpolation.changes 2018-10-25 08:17:57.168028467 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-neat-interpolation.new.6675/ghc-neat-interpolation.changes 2019-12-27 13:55:41.100725464 +0100 @@ -1,0 +2,11 @@ +Wed Dec 4 03:03:16 UTC 2019 - psim...@suse.com + +- Update neat-interpolation to version 0.3.2.5. + Upstream does not provide a change log file. + +--- +Fri Nov 8 16:14:17 UTC 2019 - Peter Simons + +- Drop obsolete group attributes. + +--- Old: neat-interpolation-0.3.2.4.tar.gz New: neat-interpolation-0.3.2.5.tar.gz Other differences: -- ++ ghc-neat-interpolation.spec ++ --- /var/tmp/diff_new_pack.Ay37yU/_old 2019-12-27 13:55:41.688725748 +0100 +++ /var/tmp/diff_new_pack.Ay37yU/_new 2019-12-27 13:55:41.696725752 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-neat-interpolation # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,10 @@ %global pkg_name neat-interpolation %bcond_with tests Name: ghc-%{pkg_name} -Version:0.3.2.4 +Version:0.3.2.5 Release:0 Summary:A quasiquoter for neat and simple multiline text interpolation License:MIT -Group: Development/Libraries/Haskell URL:https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel @@ -43,7 +42,6 @@ %package devel Summary:Haskell %{pkg_name} library development files -Group: Development/Libraries/Haskell Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} ++ neat-interpolation-0.3.2.4.tar.gz -> neat-interpolation-0.3.2.5.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neat-interpolation-0.3.2.4/neat-interpolation.cabal new/neat-interpolation-0.3.2.5/neat-interpolation.cabal --- old/neat-interpolation-0.3.2.4/neat-interpolation.cabal 2018-09-14 03:47:54.0 +0200 +++ new/neat-interpolation-0.3.2.5/neat-interpolation.cabal 2019-12-03 12:25:37.0 +0100 @@ -1,7 +1,7 @@ name: neat-interpolation version: - 0.3.2.4 + 0.3.2.5 synopsis: A quasiquoter for neat and simple multiline text interpolation description: @@ -48,7 +48,7 @@ NeatInterpolation.String build-depends: text == 1.*, -megaparsec >= 7 && < 8, +megaparsec >= 7 && < 9, template-haskell >= 2.8 && < 3, base-prelude < 2, base >= 4.9 && < 5
commit ghc-neat-interpolation for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-neat-interpolation for openSUSE:Factory checked in at 2018-10-25 08:17:38 Comparing /work/SRC/openSUSE:Factory/ghc-neat-interpolation (Old) and /work/SRC/openSUSE:Factory/.ghc-neat-interpolation.new (New) Package is "ghc-neat-interpolation" Thu Oct 25 08:17:38 2018 rev:5 rq:642882 version:0.3.2.4 Changes: --- /work/SRC/openSUSE:Factory/ghc-neat-interpolation/ghc-neat-interpolation.changes 2018-07-24 17:20:19.223141204 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-neat-interpolation.new/ghc-neat-interpolation.changes 2018-10-25 08:17:57.168028467 +0200 @@ -1,0 +2,6 @@ +Wed Oct 10 19:24:17 UTC 2018 - psim...@suse.com + +- Update neat-interpolation to version 0.3.2.4. + Upstream does not provide a change log file. + +--- Old: neat-interpolation-0.3.2.2.tar.gz New: neat-interpolation-0.3.2.4.tar.gz Other differences: -- ++ ghc-neat-interpolation.spec ++ --- /var/tmp/diff_new_pack.3Pasic/_old 2018-10-25 08:17:58.828027739 +0200 +++ /var/tmp/diff_new_pack.3Pasic/_new 2018-10-25 08:17:58.832027737 +0200 @@ -12,14 +12,14 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %global pkg_name neat-interpolation %bcond_with tests Name: ghc-%{pkg_name} -Version:0.3.2.2 +Version:0.3.2.4 Release:0 Summary:A quasiquoter for neat and simple multiline text interpolation License:MIT ++ neat-interpolation-0.3.2.2.tar.gz -> neat-interpolation-0.3.2.4.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neat-interpolation-0.3.2.2/library/NeatInterpolation/Parsing.hs new/neat-interpolation-0.3.2.4/library/NeatInterpolation/Parsing.hs --- old/neat-interpolation-0.3.2.2/library/NeatInterpolation/Parsing.hs 2018-06-16 08:30:00.0 +0200 +++ new/neat-interpolation-0.3.2.4/library/NeatInterpolation/Parsing.hs 2018-09-14 03:47:54.0 +0200 @@ -1,6 +1,3 @@ -{-# LANGUAGE CPP #-} -{-# LANGUAGE EmptyCase #-} - module NeatInterpolation.Parsing where import BasePrelude hiding (many, some, try, (<|>)) @@ -17,22 +14,6 @@ LineContentIdentifier [Char] deriving (Show) -#if ( __GLASGOW_HASKELL__ < 710 ) -data Void - -instance Eq Void where -_ == _ = True - -instance Ord Void where -compare _ _ = EQ - -instance ShowErrorComponent Void where - showErrorComponent = absurd - -absurd :: Void -> a -absurd a = case a of {} -#endif - type Parser = Parsec Void String -- | Pretty parse exception for parsing lines. @@ -41,7 +22,7 @@ parseLines :: [Char] -> Either ParseException [Line] parseLines input = case parse lines "NeatInterpolation.Parsing.parseLines" input of -Left err -> Left $ ParseException $ pack $ parseErrorPretty' input err +Left err -> Left $ ParseException $ pack $ errorBundlePretty err Right output -> Right output where lines :: Parser [Line] @@ -54,7 +35,7 @@ escapedDollar = fmap LineContentText $ char '$' *> count 1 (char '$') identifier' = some (alphaNumChar <|> char '\'' <|> char '_') contentText = do - text <- manyTill anyChar end + text <- manyTill anySingle end if null text then fail "Empty text" else return $ LineContentText $ text diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neat-interpolation-0.3.2.2/neat-interpolation.cabal new/neat-interpolation-0.3.2.4/neat-interpolation.cabal --- old/neat-interpolation-0.3.2.2/neat-interpolation.cabal 2018-06-16 08:30:01.0 +0200 +++ new/neat-interpolation-0.3.2.4/neat-interpolation.cabal 2018-09-14 03:47:54.0 +0200 @@ -1,7 +1,7 @@ name: neat-interpolation version: - 0.3.2.2 + 0.3.2.4 synopsis: A quasiquoter for neat and simple multiline text interpolation description: @@ -48,10 +48,10 @@ NeatInterpolation.String build-depends: text == 1.*, -megaparsec >= 6.5 && < 7, +megaparsec >= 7 && < 8, template-haskell >= 2.8 && < 3, base-prelude < 2, -base >= 4.6 && < 5 +base >= 4.9 && < 5 ghc-options: -funbox-strict-fields default-extensions:
commit ghc-neat-interpolation for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-neat-interpolation for openSUSE:Factory checked in at 2018-07-24 17:20:18 Comparing /work/SRC/openSUSE:Factory/ghc-neat-interpolation (Old) and /work/SRC/openSUSE:Factory/.ghc-neat-interpolation.new (New) Package is "ghc-neat-interpolation" Tue Jul 24 17:20:18 2018 rev:4 rq:623816 version:0.3.2.2 Changes: --- /work/SRC/openSUSE:Factory/ghc-neat-interpolation/ghc-neat-interpolation.changes 2018-05-30 12:26:30.779913137 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-neat-interpolation.new/ghc-neat-interpolation.changes 2018-07-24 17:20:19.223141204 +0200 @@ -1,0 +2,12 @@ +Wed Jul 18 14:26:33 UTC 2018 - psim...@suse.com + +- Cosmetic: replace tabs with blanks, strip trailing white space, + and update copyright headers with spec-cleaner. + +--- +Fri Jul 13 14:31:41 UTC 2018 - psim...@suse.com + +- Update neat-interpolation to version 0.3.2.2. + Upstream does not provide a change log file. + +--- @@ -20 +31,0 @@ - Old: neat-interpolation-0.3.2.1.tar.gz New: neat-interpolation-0.3.2.2.tar.gz Other differences: -- ++ ghc-neat-interpolation.spec ++ --- /var/tmp/diff_new_pack.ORmUv3/_old 2018-07-24 17:20:21.351143935 +0200 +++ /var/tmp/diff_new_pack.ORmUv3/_new 2018-07-24 17:20:21.355143941 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-neat-interpolation # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global pkg_name neat-interpolation %bcond_with tests Name: ghc-%{pkg_name} -Version:0.3.2.1 +Version:0.3.2.2 Release:0 Summary:A quasiquoter for neat and simple multiline text interpolation License:MIT @@ -28,7 +28,7 @@ Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-base-prelude-devel -BuildRequires: ghc-parsec-devel +BuildRequires: ghc-megaparsec-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-template-haskell-devel BuildRequires: ghc-text-devel ++ neat-interpolation-0.3.2.1.tar.gz -> neat-interpolation-0.3.2.2.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neat-interpolation-0.3.2.1/library/NeatInterpolation/Parsing.hs new/neat-interpolation-0.3.2.2/library/NeatInterpolation/Parsing.hs --- old/neat-interpolation-0.3.2.1/library/NeatInterpolation/Parsing.hs 2016-07-16 10:12:15.0 +0200 +++ new/neat-interpolation-0.3.2.2/library/NeatInterpolation/Parsing.hs 2018-06-16 08:30:00.0 +0200 @@ -1,28 +1,58 @@ +{-# LANGUAGE CPP #-} +{-# LANGUAGE EmptyCase #-} + module NeatInterpolation.Parsing where -import BasePrelude hiding (try, (<|>), many) -import Text.Parsec hiding (Line) +import BasePrelude hiding (many, some, try, (<|>)) +import Data.Text (Text, pack) +import Text.Megaparsec hiding (Line) +import Text.Megaparsec.Char -data Line = +data Line = Line {lineIndent :: Int, lineContents :: [LineContent]} deriving (Show) -data LineContent = +data LineContent = LineContentText [Char] | LineContentIdentifier [Char] deriving (Show) -parseLines :: [Char] -> Either ParseError [Line] -parseLines = parse lines "NeatInterpolation.Parsing.parseLines" +#if ( __GLASGOW_HASKELL__ < 710 ) +data Void + +instance Eq Void where +_ == _ = True + +instance Ord Void where +compare _ _ = EQ + +instance ShowErrorComponent Void where + showErrorComponent = absurd + +absurd :: Void -> a +absurd a = case a of {} +#endif + +type Parser = Parsec Void String + +-- | Pretty parse exception for parsing lines. +newtype ParseException = ParseException Text +deriving (Show, Eq) + +parseLines :: [Char] -> Either ParseException [Line] +parseLines input = case parse lines "NeatInterpolation.Parsing.parseLines" input of +Left err -> Left $ ParseException $ pack $ parseErrorPretty' input err +Right output -> Right output where +lines :: Parser [Line] lines = sepBy line newline <* eof line = Line <$> countIndent <*> many content countIndent = fmap length $ try $ lookAhead $ many $ char ' ' content = try escapedDollar <|> try identifier <|> contentText -identifier = fmap LineContentIdentifier $ +identifier = fmap LineContentIdentifier $ char '$' *> (try identifier' <|>
commit ghc-neat-interpolation for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-neat-interpolation for openSUSE:Factory checked in at 2018-05-30 12:19:28 Comparing /work/SRC/openSUSE:Factory/ghc-neat-interpolation (Old) and /work/SRC/openSUSE:Factory/.ghc-neat-interpolation.new (New) Package is "ghc-neat-interpolation" Wed May 30 12:19:28 2018 rev:3 rq:609794 version:0.3.2.1 Changes: --- /work/SRC/openSUSE:Factory/ghc-neat-interpolation/ghc-neat-interpolation.changes 2017-09-15 22:00:19.301414912 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-neat-interpolation.new/ghc-neat-interpolation.changes 2018-05-30 12:26:30.779913137 +0200 @@ -1,0 +2,5 @@ +Wed May 16 13:06:57 UTC 2018 - psim...@suse.com + +- Prefer the new %license attribute over %doc. + +--- Other differences: -- ++ ghc-neat-interpolation.spec ++ --- /var/tmp/diff_new_pack.1kTRvR/_old 2018-05-30 12:26:31.863876310 +0200 +++ /var/tmp/diff_new_pack.1kTRvR/_new 2018-05-30 12:26:31.863876310 +0200 @@ -72,7 +72,7 @@ %ghc_pkg_recache %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files
commit ghc-neat-interpolation for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-neat-interpolation for openSUSE:Factory checked in at 2017-09-15 22:00:18 Comparing /work/SRC/openSUSE:Factory/ghc-neat-interpolation (Old) and /work/SRC/openSUSE:Factory/.ghc-neat-interpolation.new (New) Package is "ghc-neat-interpolation" Fri Sep 15 22:00:18 2017 rev:2 rq:525059 version:0.3.2.1 Changes: --- /work/SRC/openSUSE:Factory/ghc-neat-interpolation/ghc-neat-interpolation.changes 2016-10-22 13:14:06.0 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-neat-interpolation.new/ghc-neat-interpolation.changes 2017-09-15 22:00:19.301414912 +0200 @@ -1,0 +2,5 @@ +Thu Aug 3 15:38:38 UTC 2017 - psim...@suse.com + +- Updated with latest spec-cleaner version 0.9.8-8-geadfbbf. + +--- Other differences: -- ++ ghc-neat-interpolation.spec ++ --- /var/tmp/diff_new_pack.wMmwkV/_old 2017-09-15 22:00:20.097302760 +0200 +++ /var/tmp/diff_new_pack.wMmwkV/_new 2017-09-15 22:00:20.101302196 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-neat-interpolation # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,8 +23,8 @@ Release:0 Summary:A quasiquoter for neat and simple multiline text interpolation License:MIT -Group: System/Libraries -Url:https://hackage.haskell.org/package/%{pkg_name} +Group: Development/Libraries/Haskell +URL:https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-base-prelude-devel @@ -32,7 +32,6 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-template-haskell-devel BuildRequires: ghc-text-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with tests} BuildRequires: ghc-HTF-devel %endif @@ -44,7 +43,7 @@ %package devel Summary:Haskell %{pkg_name} library development files -Group: Development/Libraries/Other +Group: Development/Libraries/Haskell Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} @@ -57,19 +56,15 @@ %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install - %check %cabal_test - %post devel %ghc_pkg_recache @@ -77,10 +72,8 @@ %ghc_pkg_recache %files -f %{name}.files -%defattr(-,root,root,-) %doc LICENSE %files devel -f %{name}-devel.files -%defattr(-,root,root,-) %changelog
commit ghc-neat-interpolation for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-neat-interpolation for openSUSE:Factory checked in at 2016-10-22 13:14:06 Comparing /work/SRC/openSUSE:Factory/ghc-neat-interpolation (Old) and /work/SRC/openSUSE:Factory/.ghc-neat-interpolation.new (New) Package is "ghc-neat-interpolation" Changes: New Changes file: --- /dev/null 2016-09-15 12:42:18.240042505 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-neat-interpolation.new/ghc-neat-interpolation.changes 2016-10-22 13:14:06.0 +0200 @@ -0,0 +1,10 @@ +--- +Fri Jul 22 06:00:28 UTC 2016 - psim...@suse.com + +- Update to version 0.3.2.1 revision 0 with cabal2obs. + +--- +Sun Jul 10 17:19:09 UTC 2016 - psim...@suse.com + +- Update to version 0.3.2 revision 0 with cabal2obs. + New: ghc-neat-interpolation.changes ghc-neat-interpolation.spec neat-interpolation-0.3.2.1.tar.gz Other differences: -- ++ ghc-neat-interpolation.spec ++ # # spec file for package ghc-neat-interpolation # # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %global pkg_name neat-interpolation %bcond_with tests Name: ghc-%{pkg_name} Version:0.3.2.1 Release:0 Summary:A quasiquoter for neat and simple multiline text interpolation License:MIT Group: System/Libraries Url:https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-base-prelude-devel BuildRequires: ghc-parsec-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-template-haskell-devel BuildRequires: ghc-text-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with tests} BuildRequires: ghc-HTF-devel %endif %description A quasiquoter for producing Text values with support for a simple interpolation of input values. It removes the excessive indentation from the input and accurately manages the indentation of all lines of the interpolated variables. %package devel Summary:Haskell %{pkg_name} library development files Group: Development/Libraries/Other Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} %description devel This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} %build %ghc_lib_build %install %ghc_lib_install %check %cabal_test %post devel %ghc_pkg_recache %postun devel %ghc_pkg_recache %files -f %{name}.files %defattr(-,root,root,-) %doc LICENSE %files devel -f %{name}-devel.files %defattr(-,root,root,-) %changelog