August 2022 - openSUSE Commits - openSUSE Mailing Lists

commit ghc-bifunctors for openSUSE:Factory
by Source-Sync 01 Aug '22

01 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-bifunctors for openSUSE:Factory checked in at 2022-08-01 21:29:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-bifunctors (Old) and /work/SRC/openSUSE:Factory/.ghc-bifunctors.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-bifunctors" Mon Aug 1 21:29:33 2022 rev:27 rq:987020 version:5.5.12 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-bifunctors/ghc-bifunctors.changes 2021-08-25 20:57:25.473222921 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-bifunctors.new.1533/ghc-bifunctors.changes 2022-08-01 21:29:39.721529613 +0200 @@ -1,0 +2,12 @@ +Sun May 8 00:00:30 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update bifunctors to version 5.5.12. + 5.5.12 [2022.05.07] + ------------------- + * Backport an upstream GHC change which removes the default implementation of + `bitraverse`. Per the discussion in + https://github.com/haskell/core-libraries-committee/issues/47, this default + implementation was completely broken, as attempting to use it would always + result in an infinite loop. + +------------------------------------------------------------------- Old: ---- bifunctors-5.5.11.tar.gz bifunctors.cabal New: ---- bifunctors-5.5.12.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-bifunctors.spec ++++++ --- /var/tmp/diff_new_pack.lePB5W/_old 2022-08-01 21:29:40.281531220 +0200 +++ /var/tmp/diff_new_pack.lePB5W/_new 2022-08-01 21:29:40.289531243 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-bifunctors # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,12 @@ %global pkg_name bifunctors %bcond_with tests Name: ghc-%{pkg_name} -Version: 5.5.11 +Version: 5.5.12 Release: 0 Summary: Collection Haskell 98 bifunctors, bifoldables and bitraversables License: BSD-2-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-base-orphans-devel BuildRequires: ghc-comonad-devel @@ -57,7 +56,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ bifunctors-5.5.11.tar.gz -> bifunctors-5.5.12.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bifunctors-5.5.11/CHANGELOG.markdown new/bifunctors-5.5.12/CHANGELOG.markdown --- old/bifunctors-5.5.11/CHANGELOG.markdown 2001-09-09 03:46:40.000000000 +0200 +++ new/bifunctors-5.5.12/CHANGELOG.markdown 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,11 @@ +5.5.12 [2022.05.07] +------------------- +* Backport an upstream GHC change which removes the default implementation of + `bitraverse`. Per the discussion in + https://github.com/haskell/core-libraries-committee/issues/47, this default + implementation was completely broken, as attempting to use it would always + result in an infinite loop. + 5.5.11 [2021.04.30] ------------------- * Allow building with `template-haskell-2.18` (GHC 9.2). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bifunctors-5.5.11/bifunctors.cabal new/bifunctors-5.5.12/bifunctors.cabal --- old/bifunctors-5.5.11/bifunctors.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/bifunctors-5.5.12/bifunctors.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,6 +1,6 @@ name: bifunctors category: Data, Functors -version: 5.5.11 +version: 5.5.12 license: BSD3 cabal-version: >= 1.10 license-file: LICENSE @@ -24,8 +24,9 @@ , GHC == 8.4.4 , GHC == 8.6.5 , GHC == 8.8.4 - , GHC == 8.10.4 - , GHC == 9.0.1 + , GHC == 8.10.7 + , GHC == 9.0.2 + , GHC == 9.2.2 extra-source-files: CHANGELOG.markdown README.markdown @@ -62,10 +63,10 @@ containers >= 0.2 && < 0.7, template-haskell >= 2.4 && < 2.19, th-abstraction >= 0.4.2.0 && < 0.5, - transformers >= 0.3 && < 0.6 + transformers >= 0.3 && < 0.7 if !impl(ghc > 8.2) - build-depends: transformers-compat >= 0.5 && < 0.7 + build-depends: transformers-compat >= 0.5 && < 0.8 if !impl(ghc >= 8.0) build-depends: fail == 4.9.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bifunctors-5.5.11/old-src/ghc801/Data/Bitraversable.hs new/bifunctors-5.5.12/old-src/ghc801/Data/Bitraversable.hs --- old/bifunctors-5.5.11/old-src/ghc801/Data/Bitraversable.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/bifunctors-5.5.12/old-src/ghc801/Data/Bitraversable.hs 2001-09-09 03:46:40.000000000 +0200 @@ -141,8 +141,6 @@ -- -- For a version that ignores the results, see 'bitraverse_'. bitraverse :: Applicative f => (a -> f c) -> (b -> f d) -> t a b -> f (t c d) - bitraverse f g = bisequenceA . bimap f g - {-# INLINE bitraverse #-} -- | Sequences all the actions in a structure, building a new structure with the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bifunctors-5.5.11/tests/BifunctorSpec.hs new/bifunctors-5.5.12/tests/BifunctorSpec.hs --- old/bifunctors-5.5.11/tests/BifunctorSpec.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/bifunctors-5.5.12/tests/BifunctorSpec.hs 2001-09-09 03:46:40.000000000 +0200 @@ -8,6 +8,7 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} #if __GLASGOW_HASKELL__ >= 708 {-# LANGUAGE EmptyCase #-}

1 0

commit ghc-base64-bytestring-type for openSUSE:Factory
by Source-Sync 01 Aug '22

01 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-base64-bytestring-type for openSUSE:Factory checked in at 2022-08-01 21:29:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-base64-bytestring-type (Old) and /work/SRC/openSUSE:Factory/.ghc-base64-bytestring-type.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-base64-bytestring-type" Mon Aug 1 21:29:33 2022 rev:7 rq:987019 version:1.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-base64-bytestring-type/ghc-base64-bytestring-type.changes 2021-12-19 17:34:59.708288548 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-base64-bytestring-type.new.1533/ghc-base64-bytestring-type.changes 2022-08-01 21:29:38.701526687 +0200 @@ -1,0 +2,12 @@ +Wed Jun 15 16:45:59 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update base64-bytestring-type to version 1.0.1 revision 14. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- +Tue Apr 12 16:04:54 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update base64-bytestring-type to version 1.0.1 revision 12. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-base64-bytestring-type.spec ++++++ --- /var/tmp/diff_new_pack.mDHhSU/_old 2022-08-01 21:29:39.149527972 +0200 +++ /var/tmp/diff_new_pack.mDHhSU/_new 2022-08-01 21:29:39.153527984 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-base64-bytestring-type # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/11.caba… +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/14.caba… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-aeson-devel ++++++ base64-bytestring-type.cabal ++++++ --- /var/tmp/diff_new_pack.mDHhSU/_old 2022-08-01 21:29:39.205528133 +0200 +++ /var/tmp/diff_new_pack.mDHhSU/_new 2022-08-01 21:29:39.205528133 +0200 @@ -1,7 +1,7 @@ cabal-version: 1.12 name: base64-bytestring-type version: 1.0.1 -x-revision: 11 +x-revision: 14 synopsis: A newtype around ByteString, for base64 encoding description: A newtype around ByteString, for base64 encoding. @@ -24,8 +24,8 @@ || ==8.6.5 || ==8.8.4 || ==8.10.7 - || ==9.0.1 - || ==9.2.1 + || ==9.0.2 + || ==9.2.2 extra-source-files: README.md @@ -63,11 +63,11 @@ , binary >=0.7.1.0 && <0.10 , bytestring >=0.10.4.0 && <0.12 , deepseq >=1.3.0.2 && <1.5 - , text >=1.2.3.0 && <1.3 + , text >=1.2.3.0 && <1.3 || >=2.0 && <2.1 -- other dependencies: build-depends: - aeson >=1.2.3.0 && <1.6 || >=2.0 && <2.1 + aeson >=1.2.3.0 && <1.6 || >=2.0 && <2.2 , base-compat >=0.9.3 && <0.13 , base64-bytestring >=1.0.0.1 && <1.3 , hashable >=1.2.6.1 && <1.5 @@ -83,7 +83,7 @@ build-depends: serialise >=0.2.1.0 && <0.3 if flag(http-api-data) - build-depends: http-api-data ==0.4.* + build-depends: http-api-data >=0.4 && <0.6 exposed-modules: Data.ByteString.Base64.Lazy.Type

1 0

commit ghc-attoparsec-iso8601 for openSUSE:Factory
by Source-Sync 01 Aug '22

01 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-attoparsec-iso8601 for openSUSE:Factory checked in at 2022-08-01 21:29:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-attoparsec-iso8601 (Old) and /work/SRC/openSUSE:Factory/.ghc-attoparsec-iso8601.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-attoparsec-iso8601" Mon Aug 1 21:29:32 2022 rev:16 rq:987018 version:1.1.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-attoparsec-iso8601/ghc-attoparsec-iso8601.changes 2022-02-11 23:09:33.234971030 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-attoparsec-iso8601.new.1533/ghc-attoparsec-iso8601.changes 2022-08-01 21:29:37.517523290 +0200 @@ -1,0 +2,8 @@ +Wed Jun 15 14:53:41 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update attoparsec-iso8601 to version 1.1.0.0. + 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: ---- attoparsec-iso8601-1.0.2.1.tar.gz New: ---- attoparsec-iso8601-1.1.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-attoparsec-iso8601.spec ++++++ --- /var/tmp/diff_new_pack.JzO5Kt/_old 2022-08-01 21:29:38.077524896 +0200 +++ /var/tmp/diff_new_pack.JzO5Kt/_new 2022-08-01 21:29:38.081524908 +0200 @@ -18,7 +18,7 @@ %global pkg_name attoparsec-iso8601 Name: ghc-%{pkg_name} -Version: 1.0.2.1 +Version: 1.1.0.0 Release: 0 Summary: Parsing of ISO 8601 dates, originally from aeson License: BSD-3-Clause @@ -66,6 +66,6 @@ %license LICENSE %files devel -f %{name}-devel.files -%doc README.md +%doc README.md changelog.md %changelog ++++++ attoparsec-iso8601-1.0.2.1.tar.gz -> attoparsec-iso8601-1.1.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attoparsec-iso8601-1.0.2.1/attoparsec-iso8601.cabal new/attoparsec-iso8601-1.1.0.0/attoparsec-iso8601.cabal --- old/attoparsec-iso8601-1.0.2.1/attoparsec-iso8601.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/attoparsec-iso8601-1.1.0.0/attoparsec-iso8601.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,5 @@ name: attoparsec-iso8601 -version: 1.0.2.1 +version: 1.1.0.0 synopsis: Parsing of ISO 8601 dates, originally from aeson description: Parsing of ISO 8601 dates, originally from aeson. license: BSD3 @@ -14,19 +14,10 @@ homepage: https://github.com/haskell/aeson bug-reports: https://github.com/haskell/aeson/issues build-type: Simple -tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.4, GHC == 9.0.1 +tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.2, GHC ==9.2.3, GHC==9.4.1 extra-source-files: README.md - -flag developer - description: operate in developer mode - default: False - manual: True - -flag fast - description: compile without optimizations - default: False - manual: True + changelog.md library hs-source-dirs: src @@ -43,15 +34,6 @@ text >= 1.2.3.0 && < 1.3.0.0 || >= 2.0 && <2.1, time >= 1.6.0.1 && < 1.13 - if flag(fast) - ghc-options: -O0 - else - ghc-options: -O2 - - if flag(developer) - ghc-options: -Werror - ghc-prof-options: -auto-all - source-repository head type: git location: git://github.com/haskell/aeson.git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attoparsec-iso8601-1.0.2.1/changelog.md new/attoparsec-iso8601-1.1.0.0/changelog.md --- old/attoparsec-iso8601-1.0.2.1/changelog.md 1970-01-01 01:00:00.000000000 +0100 +++ new/attoparsec-iso8601-1.1.0.0/changelog.md 2001-09-09 03:46:40.000000000 +0200 @@ -0,0 +1,19 @@ +For the latest version of this document, please see [https://github.com/bos/aeson/blob/master/attoparsec-iso8601/changelog.md](h…. + +### 1.1.0.0 + +- Change parsers of types with year (`Day`, `UTCTime`) to require years with at least 4 digits. +- Remove `fast` and `developer` package flags + +### 1.0.2.1 + +* Code (re)organization. +* Avoid wildcard imports + +### 1.0.2.0 + +* Add `month :: Parser Month` and `quarter :: Parser Quarter` + +### 1.0.1.0 + +* Fixes handling of `UTCTime` wrt. leap seconds , thanks to Adam Sch��nemann diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attoparsec-iso8601-1.0.2.1/src/Data/Attoparsec/Time.hs new/attoparsec-iso8601-1.1.0.0/src/Data/Attoparsec/Time.hs --- old/attoparsec-iso8601-1.0.2.1/src/Data/Attoparsec/Time.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/attoparsec-iso8601-1.1.0.0/src/Data/Attoparsec/Time.hs 2001-09-09 03:46:40.000000000 +0200 @@ -19,6 +19,7 @@ , timeZone , utcTime , zonedTime + , year , month , quarter ) where @@ -27,7 +28,7 @@ import Control.Applicative ((<|>)) import Control.Monad (void, when) -import Data.Attoparsec.Text (Parser, char, decimal, digit, option, anyChar, peekChar, peekChar', takeWhile1, satisfy) +import Data.Attoparsec.Text (Parser, char, digit, option, anyChar, peekChar, peekChar', takeWhile1, satisfy) import Data.Attoparsec.Time.Internal (toPico) import Data.Bits ((.&.)) import Data.Char (isDigit, ord) @@ -35,6 +36,7 @@ import Data.Int (Int64) import Data.Maybe (fromMaybe) import Data.Time.Calendar (Day, fromGregorianValid) +import Data.Time.Calendar.Compat (Year) import Data.Time.Calendar.Quarter.Compat (Quarter, QuarterOfYear (..), fromYearQuarter) import Data.Time.Calendar.Month.Compat (Month, fromYearMonthValid) import Data.Time.Clock (UTCTime(..)) @@ -42,27 +44,37 @@ import qualified Data.Time.LocalTime as Local -- | Parse a date of the form @[+,-]YYYY-MM-DD@. +-- +-- The year must contain at least 4 digits, to avoid the Y2K problem: +-- a two-digit year @YY@ may mean @YY@, @19YY@, or @20YY@, and we make it +-- an error to prevent the ambiguity. +-- Years from @0000@ to @0999@ must thus be zero-padded. +-- The year may have more than 4 digits. day :: Parser Day day = do absOrNeg <- negate <$ char '-' <|> id <$ char '+' <|> pure id - y <- (decimal <* char '-') <|> fail "date must be of form [+,-]YYYY-MM-DD" + y <- (year <* char '-') <|> fail "date must be of form [+,-]YYYY-MM-DD" m <- (twoDigits <* char '-') <|> fail "date must be of form [+,-]YYYY-MM-DD" d <- twoDigits <|> fail "date must be of form [+,-]YYYY-MM-DD" maybe (fail "invalid date") return (fromGregorianValid (absOrNeg y) m d) -- | Parse a month of the form @[+,-]YYYY-MM@. +-- +-- See also 'day' for details about the year format. month :: Parser Month month = do absOrNeg <- negate <$ char '-' <|> id <$ char '+' <|> pure id - y <- (decimal <* char '-') <|> fail "month must be of form [+,-]YYYY-MM" + y <- (year <* char '-') <|> fail "month must be of form [+,-]YYYY-MM" m <- twoDigits <|> fail "month must be of form [+,-]YYYY-MM" maybe (fail "invalid month") return (fromYearMonthValid (absOrNeg y) m) -- | Parse a quarter of the form @[+,-]YYYY-QN@. +-- +-- See also 'day' for details about the year format. quarter :: Parser Quarter quarter = do absOrNeg <- negate <$ char '-' <|> id <$ char '+' <|> pure id - y <- (decimal <* char '-') <|> fail "month must be of form [+,-]YYYY-MM" + y <- (year <* char '-') <|> fail "month must be of form [+,-]YYYY-MM" _ <- char 'q' <|> char 'Q' q <- parseQ return $! fromYearQuarter (absOrNeg y) q @@ -72,6 +84,19 @@ <|> Q3 <$ char '3' <|> Q4 <$ char '4' +-- | Parse a year @YYYY@, with at least 4 digits. Does not include any sign. +-- +-- Note: 'Year' is a type synonym for 'Integer'. +-- +-- @since 1.1.0.0 +year :: Parser Year +year = do + ds <- takeWhile1 isDigit + if T.length ds < 4 then + fail "expected year with at least 4 digits" + else + pure (txtToInteger ds) + -- | Parse a two-digit integer (e.g. day of month, hour). twoDigits :: Parser Int twoDigits = do @@ -172,3 +197,53 @@ utc :: Local.TimeZone utc = Local.TimeZone 0 False "" + +------------------ Copy-pasted and adapted from base ------------------------ + +txtToInteger :: T.Text -> Integer +txtToInteger bs + | l > 40 = valInteger 10 l [ fromIntegral (ord w - 48) | w <- T.unpack bs ] + | otherwise = txtToIntegerSimple bs + where + l = T.length bs + +txtToIntegerSimple :: T.Text -> Integer +txtToIntegerSimple = T.foldl' step 0 where + step a b = a * 10 + fromIntegral (ord b - 48) -- 48 = '0' + +-- A sub-quadratic algorithm for Integer. Pairs of adjacent radix b +-- digits are combined into a single radix b^2 digit. This process is +-- repeated until we are left with a single digit. This algorithm +-- performs well only on large inputs, so we use the simple algorithm +-- for smaller inputs. +valInteger :: Integer -> Int -> [Integer] -> Integer +valInteger = go + where + go :: Integer -> Int -> [Integer] -> Integer + go _ _ [] = 0 + go _ _ [d] = d + go b l ds + | l > 40 = b' `seq` go b' l' (combine b ds') + | otherwise = valSimple b ds + where + -- ensure that we have an even number of digits + -- before we call combine: + ds' = if even l then ds else 0 : ds + b' = b * b + l' = (l + 1) `quot` 2 + + combine b (d1 : d2 : ds) = d `seq` (d : combine b ds) + where + d = d1 * b + d2 + combine _ [] = [] + combine _ [_] = errorWithoutStackTrace "this should not happen" + +-- The following algorithm is only linear for types whose Num operations +-- are in constant time. +valSimple :: Integer -> [Integer] -> Integer +valSimple base = go 0 + where + go r [] = r + go r (d : ds) = r' `seq` go r' ds + where + r' = r * base + fromIntegral d

1 0

commit ghc-ansi-terminal for openSUSE:Factory
by Source-Sync 01 Aug '22

01 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-ansi-terminal for openSUSE:Factory checked in at 2022-08-01 21:29:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-ansi-terminal (Old) and /work/SRC/openSUSE:Factory/.ghc-ansi-terminal.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-ansi-terminal" Mon Aug 1 21:29:31 2022 rev:21 rq:987017 version:0.11.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-ansi-terminal/ghc-ansi-terminal.changes 2022-02-11 23:10:29.095132593 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-ansi-terminal.new.1533/ghc-ansi-terminal.changes 2022-08-01 21:29:34.529514717 +0200 @@ -1,0 +2,9 @@ +Thu Apr 28 23:10:27 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update ansi-terminal to version 0.11.3. + Upstream has edited the change log file since the last release in + a non-trivial way, i.e. they did more than just add a new entry + at the top. You can review the file at: + http://hackage.haskell.org/package/ansi-terminal-0.11.3/src/CHANGELOG.md + +------------------------------------------------------------------- Old: ---- ansi-terminal-0.11.1.tar.gz New: ---- ansi-terminal-0.11.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-ansi-terminal.spec ++++++ --- /var/tmp/diff_new_pack.HlIdvB/_old 2022-08-01 21:29:35.017516117 +0200 +++ /var/tmp/diff_new_pack.HlIdvB/_new 2022-08-01 21:29:35.021516129 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-ansi-terminal # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %global pkg_name ansi-terminal Name: ghc-%{pkg_name} -Version: 0.11.1 +Version: 0.11.3 Release: 0 Summary: Simple ANSI terminal support, with Windows compatibility License: BSD-3-Clause ++++++ ansi-terminal-0.11.1.tar.gz -> ansi-terminal-0.11.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansi-terminal-0.11.1/CHANGELOG.md new/ansi-terminal-0.11.3/CHANGELOG.md --- old/ansi-terminal-0.11.1/CHANGELOG.md 2021-11-23 22:07:49.000000000 +0100 +++ new/ansi-terminal-0.11.3/CHANGELOG.md 2022-04-29 01:06:08.000000000 +0200 @@ -1,6 +1,19 @@ Changes ======= +Version 0.11.3 +-------------- + +* Add `hyperlink`, `hyperlinkWithId` and `hyperlinkWithParams`, and support for + clicable hyperlinks. + +Version 0.11.2 +-------------- + +* On Windows, fix compatability with the Windows I/O Manager (WinIO) when + GHC >= 9.0.1 but `Win32` < 2.9.0.0. +* Improvements to Haddock documentation. + Version 0.11.1 -------------- @@ -78,9 +91,9 @@ Version 0.8.1 ------------- -* Add `hSupportsANSIWithoutEmulation`. On Windows 10, if the handle is identifed - as connected to a native terminal ('Command Prompt' or 'PowerShell'), the - processing of 'ANSI' control characters will be enabled. +* Add `hSupportsANSIWithoutEmulation`. On Windows 10, if the handle is + identified as connected to a native terminal ('Command Prompt' or + 'PowerShell'), the processing of 'ANSI' control characters will be enabled. Version 0.8.0.4 --------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansi-terminal-0.11.1/README.md new/ansi-terminal-0.11.3/README.md --- old/ansi-terminal-0.11.1/README.md 2021-11-23 21:48:27.000000000 +0100 +++ new/ansi-terminal-0.11.3/README.md 2022-04-29 01:00:01.000000000 +0200 @@ -16,6 +16,7 @@ - Moving the cursor around - Reporting the position of the cursor - Scrolling the screen up or down +- Clickable hyperlinks to URIs - Changing the title of the terminal By using emulation, it is compatible with versions of 'Command Prompt' and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansi-terminal-0.11.1/ansi-terminal.cabal new/ansi-terminal-0.11.3/ansi-terminal.cabal --- old/ansi-terminal-0.11.1/ansi-terminal.cabal 2021-11-23 22:07:49.000000000 +0100 +++ new/ansi-terminal-0.11.3/ansi-terminal.cabal 2022-04-29 01:04:07.000000000 +0200 @@ -1,5 +1,5 @@ Name: ansi-terminal -Version: 0.11.1 +Version: 0.11.3 Cabal-Version: >= 1.10 Category: User Interfaces Synopsis: Simple ANSI terminal support, with Windows compatibility diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansi-terminal-0.11.1/app/Example.hs new/ansi-terminal-0.11.3/app/Example.hs --- old/ansi-terminal-0.11.1/app/Example.hs 2021-11-23 21:48:27.000000000 +0100 +++ new/ansi-terminal-0.11.3/app/Example.hs 2022-04-29 01:00:01.000000000 +0200 @@ -22,13 +22,14 @@ , sgrColorExample , sgrOtherExample , cursorVisibilityExample + , hyperlinkExample , titleExample , getCursorPositionExample , getTerminalSizeExample ] main :: IO () -main = mapM_ (\example -> resetScreen >> example) examples +main = mapM_ (resetScreen >>) examples -- Annex D to Standard ECMA-48 (5th Ed, 1991) identifies that the representation -- of an erased state is implementation-dependent. There may or may not be a @@ -229,7 +230,7 @@ forM_ colors $ \color -> do setSGR [Reset] setSGR [SetColor layer intensity color] - putStrLn (show color) + print color pause -- The ANSI eight standard colors, 4 times in sequence (two layers and two -- intensities) @@ -365,6 +366,22 @@ pause -- Cursor Demo| +hyperlinkExample :: IO () +hyperlinkExample = do + putStr "Hyperlink demo: " + hyperlink "https://example.com" "Example hyperlink\n" + putStrLn "" + putStrLn "Linked hyperlinks demo:" + hyperlinkWithId "ref" "https://example.com" "Example linked hyperlink one\n" + hyperlinkWithId "ref" "https://example.com" "Example linked hyperlink two\n" + + replicateM_ 5 pause + -- Hyperlink demo: Example hyperlink + -- + -- Linked hyperlinks demo: + -- Example linked hyperlink one + -- Example linked hyperlink two + titleExample :: IO () titleExample = do putStr "Title Demo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansi-terminal-0.11.1/src/System/Console/ANSI/Codes.hs new/ansi-terminal-0.11.3/src/System/Console/ANSI/Codes.hs --- old/ansi-terminal-0.11.1/src/System/Console/ANSI/Codes.hs 2021-11-23 21:48:27.000000000 +0100 +++ new/ansi-terminal-0.11.3/src/System/Console/ANSI/Codes.hs 2022-04-29 01:00:01.000000000 +0200 @@ -47,20 +47,19 @@ -- * Cursor visibilty changes , hideCursorCode, showCursorCode + -- * Hyperlinks + -- | Some, but not all, terminals support hyperlinks - that is, clickable + -- text that points to a URI. + , hyperlinkCode, hyperlinkWithIdCode, hyperlinkWithParamsCode + -- * Changing the title - -- | Thanks to Brandon S. Allbery and Curt Sampson for pointing me in the - -- right direction on xterm title setting on haskell-cafe. The "0" - -- signifies that both the title and "icon" text should be set: i.e. the - -- text for the window in the Start bar (or similar) as well as that in - -- the actual window title. This is chosen for consistent behaviour - -- between Unixes and Windows. , setTitleCode -- * Utilities , colorToCode, csi, sgrToCode ) where -import Data.List (intersperse) +import Data.List (intercalate) import Data.Colour.SRGB (toSRGB24, RGB (..)) @@ -74,7 +73,7 @@ csi :: [Int] -- ^ List of parameters for the control sequence -> String -- ^ Character(s) that identify the control function -> String -csi args code = "\ESC[" ++ concat (intersperse ";" (map show args)) ++ code +csi args code = "\ESC[" ++ intercalate ";" (map show args) ++ code -- | 'colorToCode' @color@ returns the 0-based index of the color (one of the -- eight colors in the ANSI standard). @@ -206,8 +205,57 @@ hideCursorCode = csi [] "?25l" showCursorCode = csi [] "?25h" +-- | Code to introduce a hyperlink with (key, value) parameters. Some terminals +-- support an @id@ parameter key, so that hyperlinks with the same @id@ value +-- are treated as connected. +-- +-- @since 0.11.3 +hyperlinkWithParamsCode + :: [(String, String)] + -- ^ Parameters + -> String + -- ^ URI + -> String + -- ^ Link text + -> String +hyperlinkWithParamsCode ps uri link = + "\ESC]8;" ++ ps' ++ ";" ++ uri ++ "\ESC\\" ++ link ++ "\ESC]8;;\ESC\\" + where + ps' = intercalate ":" $ map (\(k, v) -> k ++ "=" ++ v) ps + +-- | Code to introduce a hyperlink. +-- +-- @since 0.11.3 +hyperlinkCode + :: String + -- ^ URI + -> String + -- ^ Link text + -> String +hyperlinkCode = hyperlinkWithParamsCode [] + +-- | Code to introduce a hyperlink with an identifier for the link. Some +-- terminals support an identifier, so that hyperlinks with the same identifier +-- are treated as connected. +-- +-- @since 0.11.3 +hyperlinkWithIdCode + :: String + -- ^ Identifier for the link + -> String + -- ^ URI + -> String + -- ^ Link text + -> String +hyperlinkWithIdCode linkId = hyperlinkWithParamsCode [("id", linkId)] + +-- | Code to set the terminal window title and the icon name (that is, the text +-- for the window in the Start bar, or similar). --- | XTerm control sequence to set the Icon Name and Window Title. -setTitleCode :: String -- ^ New Icon Name and Window Title +-- Thanks to Brandon S. Allbery and Curt Sampson for pointing me in the right +-- direction on xterm title setting on haskell-cafe. The "0" signifies that both +-- the title and "icon" text should be set. This is chosen for consistent +-- behaviour between Unixes and Windows. +setTitleCode :: String -- ^ New window title and icon name -> String setTitleCode title = "\ESC]0;" ++ filter (/= '\007') title ++ "\007" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansi-terminal-0.11.1/src/System/Console/ANSI/Unix.hs new/ansi-terminal-0.11.3/src/System/Console/ANSI/Unix.hs --- old/ansi-terminal-0.11.1/src/System/Console/ANSI/Unix.hs 2021-11-23 21:48:27.000000000 +0100 +++ new/ansi-terminal-0.11.3/src/System/Console/ANSI/Unix.hs 2022-04-29 01:00:01.000000000 +0200 @@ -24,7 +24,7 @@ -- This file contains code that is common to modules System.Console.ANSI.Unix, -- System.Console.ANSI.Windows and System.Console.ANSI.Windows.Emulator, such as -- type signatures and the definition of functions specific to stdout in terms --- of the corresponding more general functions, inclduding the related Haddock +-- of the corresponding more general functions, including the related Haddock -- documentation. #include "Common-Include.hs" -- This file contains code that is common save that different code is required @@ -64,6 +64,9 @@ hHideCursor h = hPutStr h hideCursorCode hShowCursor h = hPutStr h showCursorCode +hHyperlinkWithParams h params uri link = + hPutStr h $ hyperlinkWithParamsCode params uri link + hSetTitle h title = hPutStr h $ setTitleCode title -- hSupportsANSI :: Handle -> IO Bool diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansi-terminal-0.11.1/src/System/Console/ANSI/Windows/Emulator/Codes.hs new/ansi-terminal-0.11.3/src/System/Console/ANSI/Windows/Emulator/Codes.hs --- old/ansi-terminal-0.11.1/src/System/Console/ANSI/Windows/Emulator/Codes.hs 2021-11-23 21:48:27.000000000 +0100 +++ new/ansi-terminal-0.11.3/src/System/Console/ANSI/Windows/Emulator/Codes.hs 2022-04-29 01:00:01.000000000 +0200 @@ -29,6 +29,9 @@ -- * Cursor visibilty changes , hideCursorCode, showCursorCode + -- * Hyperlinks + , hyperlinkCode, hyperlinkWithIdCode, hyperlinkWithParamsCode + -- * Changing the title , setTitleCode ) where @@ -90,6 +93,26 @@ hideCursorCode = "" showCursorCode = "" +hyperlinkWithParamsCode + :: ([(String, String)]) + -> String + -> String + -> String +hyperlinkWithParamsCode _ _ _ = "" + +hyperlinkCode + :: String + -> String + -> String +hyperlinkCode _ _ = "" + +hyperlinkWithIdCode + :: String + -> String + -> String + -> String +hyperlinkWithIdCode _ _ _ = "" + setTitleCode :: String -- ^ New title -> String setTitleCode _ = "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansi-terminal-0.11.1/src/System/Console/ANSI/Windows/Emulator.hs new/ansi-terminal-0.11.3/src/System/Console/ANSI/Windows/Emulator.hs --- old/ansi-terminal-0.11.1/src/System/Console/ANSI/Windows/Emulator.hs 2021-11-23 21:48:27.000000000 +0100 +++ new/ansi-terminal-0.11.3/src/System/Console/ANSI/Windows/Emulator.hs 2022-04-29 01:00:01.000000000 +0200 @@ -14,7 +14,7 @@ import Data.List (foldl', minimumBy) import Data.Maybe (mapMaybe) import qualified Data.Map.Strict as Map (Map, empty, insert, lookup) -import System.IO (Handle, hIsTerminalDevice, stdin) +import System.IO (Handle, hIsTerminalDevice, hPutStr, stdin) import System.IO.Unsafe (unsafePerformIO) import Text.ParserCombinators.ReadP (readP_to_S) @@ -33,7 +33,7 @@ -- This file contains code that is common to modules System.Console.ANSI.Unix, -- System.Console.ANSI.Windows and System.Console.ANSI.Windows.Emulator, such as -- type signatures and the definition of functions specific to stdout in terms --- of the corresponding more general functions, inclduding the related Haddock +-- of the corresponding more general functions, including the related Haddock -- documentation. #include "Common-Include.hs" -- This file contains code that is required in the case of the module @@ -349,6 +349,8 @@ = emulatorFallback (Unix.hShowCursor h) $ withHandle h $ \handle -> hChangeCursorVisibility handle True +hHyperlinkWithParams h _ _ = hPutStr h + -- Windows only supports setting the terminal title on a process-wide basis, so -- for now we will assume that that is what the user intended. This will fail if -- they are sending the command over e.g. a network link... but that's not @@ -474,14 +476,17 @@ return $ stringFromInputEvents es stringFromInputEvents = cWcharsToChars . wCharsFromInputEvents wCharsFromInputEvents = mapMaybe wCharFromInputEvent - wCharFromInputEvent e = if isKeyDownEvent + wCharFromInputEvent e = if isKeyEvent && isKeyDown then Just (unicodeAsciiChar $ keyEventChar keyEventRecord) else Nothing where eventType = inputEventType e - InputKeyEvent keyEventRecord = inputEvent e + eventRecord = inputEvent e + isKeyEvent = eventType == 1 + keyEventRecord = case eventRecord of + InputKeyEvent keyEventRecord' -> keyEventRecord' + _ -> error "Unexpected input event, given input event type." isKeyDown = keyEventKeyDown keyEventRecord - isKeyDownEvent = eventType == 1 && isKeyDown -- hGetCursorPosition :: Handle -> IO (Maybe (Int, Int)) -- (See Common-Include.hs for Haddock documentation) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansi-terminal-0.11.1/src/System/Console/ANSI/Windows.hs new/ansi-terminal-0.11.3/src/System/Console/ANSI/Windows.hs --- old/ansi-terminal-0.11.1/src/System/Console/ANSI/Windows.hs 2021-11-23 21:48:27.000000000 +0100 +++ new/ansi-terminal-0.11.3/src/System/Console/ANSI/Windows.hs 2022-04-29 01:00:01.000000000 +0200 @@ -20,7 +20,7 @@ -- This file contains code that is common to modules System.Console.ANSI.Unix, -- System.Console.ANSI.Windows and System.Console.ANSI.Windows.Emulator, such as -- type signatures and the definition of functions specific to stdout in terms --- of the corresponding more general functions, inclduding the related Haddock +-- of the corresponding more general functions, including the related Haddock -- documentation. #include "Common-Include.hs" -- This file contains code that is common save that different code is required @@ -173,6 +173,32 @@ showCursorCode :: String showCursorCode = nativeOrEmulated U.showCursorCode E.showCursorCode +-- * Hyperlinks +hHyperlinkWithParams = + nativeOrEmulated U.hHyperlinkWithParams E.hHyperlinkWithParams + +hyperlinkWithParamsCode + :: [(String, String)] + -> String + -> String + -> String +hyperlinkWithParamsCode = + nativeOrEmulated U.hyperlinkWithParamsCode E.hyperlinkWithParamsCode + +hyperlinkCode + :: String + -> String + -> String +hyperlinkCode = nativeOrEmulated U.hyperlinkCode E.hyperlinkCode + +hyperlinkWithIdCode + :: String + -> String + -> String + -> String +hyperlinkWithIdCode = + nativeOrEmulated U.hyperlinkWithIdCode E.hyperlinkWithIdCode + -- * Changing the title hSetTitle = nativeOrEmulated U.hSetTitle E.hSetTitle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansi-terminal-0.11.1/src/System/Console/ANSI.hs new/ansi-terminal-0.11.3/src/System/Console/ANSI.hs --- old/ansi-terminal-0.11.1/src/System/Console/ANSI.hs 2021-11-23 21:48:27.000000000 +0100 +++ new/ansi-terminal-0.11.3/src/System/Console/ANSI.hs 2022-04-29 01:00:01.000000000 +0200 @@ -21,6 +21,8 @@ * Scrolling the screen up or down + * Clickable hyperlinks to URIs + * Changing the title of the terminal A terminal that supports control character sequences acts on them when they diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansi-terminal-0.11.1/src/System/Win32/Compat.hs new/ansi-terminal-0.11.3/src/System/Win32/Compat.hs --- old/ansi-terminal-0.11.1/src/System/Win32/Compat.hs 2021-11-23 21:48:27.000000000 +0100 +++ new/ansi-terminal-0.11.3/src/System/Win32/Compat.hs 2022-04-29 01:00:01.000000000 +0200 @@ -40,8 +40,14 @@ TCHAR, UINT, WORD, failIfFalse_, getLastError, iNVALID_HANDLE_VALUE, nullHANDLE, withTString) +-- Circumstancees in which the patching of Win32 package for the Windows I/O +-- Manager is required +#if defined(__IO_MANAGER_WINIO__)&&MIN_VERSION_Win32(2,9,0)&&!MIN_VERSION_Win32(2,13,2) +#define PATCHING_WIN32_PACKAGE_FOR_WINIO +#endif + -- Circumstances in which the patching of Win32 package is required -#if !MIN_VERSION_Win32(2,5,1)||(defined(__IO_MANAGER_WINIO__)&&!MIN_VERSION_Win32(2,13,2)) +#if !MIN_VERSION_Win32(2,5,1)||defined(PATCHING_WIN32_PACKAGE_FOR_WINIO) #define PATCHING_WIN32_PACKAGE #endif @@ -57,7 +63,7 @@ import Foreign.StablePtr (StablePtr, freeStablePtr, newStablePtr) import GHC.IO.Handle.Types (Handle (..), Handle__ (..)) -#if defined(__IO_MANAGER_WINIO__)&&!MIN_VERSION_Win32(2,13,2) +#if defined(PATCHING_WIN32_PACKAGE_FOR_WINIO) import GHC.IO.Exception (IOErrorType (InappropriateType), IOException (IOError), ioException) import GHC.IO.SubSystem ((<!>)) @@ -87,7 +93,7 @@ withStablePtr :: a -> (StablePtr a -> IO b) -> IO b withStablePtr value = bracket (newStablePtr value) freeStablePtr -#if defined(__IO_MANAGER_WINIO__)&&!MIN_VERSION_Win32(2,13,2) +#if defined(PATCHING_WIN32_PACKAGE_FOR_WINIO) withHandleToHANDLE :: Handle -> (HANDLE -> IO a) -> IO a withHandleToHANDLE = withHandleToHANDLEPosix <!> withHandleToHANDLENative @@ -162,7 +168,7 @@ foreign import WINDOWS_CCONV unsafe "_get_osfhandle" cget_osfhandle :: CInt -> IO HANDLE --- defined(__IO_MANAGER_WINIO__)&&!MIN_VERSION_Win32(2,13,2) +-- defined(PATCHING_WIN32_PACKAGE_FOR_WINIO) #endif -- defined(PATCHING_WIN32_PACKAGE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansi-terminal-0.11.1/src/includes/Common-Include.hs new/ansi-terminal-0.11.3/src/includes/Common-Include.hs --- old/ansi-terminal-0.11.1/src/includes/Common-Include.hs 2021-11-23 21:48:28.000000000 +0100 +++ new/ansi-terminal-0.11.3/src/includes/Common-Include.hs 2022-04-29 01:00:01.000000000 +0200 @@ -1,7 +1,7 @@ -- This file contains code that is common to modules System.Console.ANSI.Unix, -- System.Console.ANSI.Windows and System.Console.ANSI.Windows.Emulator, such as -- type signatures and the definition of functions specific to stdout in terms --- of the corresponding more general functions, inclduding the related Haddock +-- of the corresponding more general functions, including the related Haddock -- documentation. #if !MIN_VERSION_base(4,8,0) @@ -103,12 +103,82 @@ hideCursor = hHideCursor stdout showCursor = hShowCursor stdout --- | Set the terminal window title +-- | Introduce a hyperlink with (key, value) parameters. Some terminals support +-- an @id@ parameter key, so that hyperlinks with the same @id@ value are +-- treated as connected. +-- +-- @since 0.11.3 +hHyperlinkWithParams + :: Handle + -> [(String, String)] -- ^ Parameters + -> String -- ^ URI + -> String -- ^ Link text + -> IO () + +-- | Introduce a hyperlink with (key, value) parameters. Some terminals support +-- an @id@ parameter key, so that hyperlinks with the same @id@ value are +-- treated as connected. +-- +-- @since 0.11.3 +hyperlinkWithParams + :: [(String, String)] -- ^ Parameters + -> String -- ^ URI + -> String -- ^ Link text + -> IO () +hyperlinkWithParams = hHyperlinkWithParams stdout + +-- | Introduce a hyperlink. +-- +-- @since 0.11.3 +hHyperlink + :: Handle + -> String -- ^ URI + -> String -- ^ Link text + -> IO () +hHyperlink h = hHyperlinkWithParams h [] + +-- | Introduce a hyperlink. +-- +-- @since 0.11.3 +hyperlink + :: String -- ^ URI + -> String -- ^ Link text + -> IO () +hyperlink = hHyperlink stdout + +-- | Introduce a hyperlink with an identifier for the link. Some terminals +-- support an identifier, so that hyperlinks with the same identifier are +-- treated as connected. +-- +-- @since 0.11.3 +hHyperlinkWithId + :: Handle + -> String -- ^ Identifier for the link + -> String -- ^ URI + -> String -- ^ Link text + -> IO () +hHyperlinkWithId h linkId = hHyperlinkWithParams h [("id", linkId)] + +-- | Introduce a hyperlink with an identifier for the link. Some terminals +-- support an identifier, so that hyperlinks with the same identifier are +-- treated as connected. +-- +-- @since 0.11.3 +hyperlinkWithId + :: String -- ^ Identifier for the link + -> String -- ^ URI + -> String -- ^ Link text + -> IO () +hyperlinkWithId = hHyperlinkWithId stdout + +-- | Set the terminal window title and icon name (that is, the text for the +-- window in the Start bar, or similar). hSetTitle :: Handle - -> String -- ^ New title + -> String -- ^ New window title and icon name -> IO () --- | Set the terminal window title -setTitle :: String -- ^ New title +-- | Set the terminal window title and icon name (that is, the text for the +-- window in the Start bar, or similar). +setTitle :: String -- ^ New window title and icon name -> IO () setTitle = hSetTitle stdout @@ -161,7 +231,7 @@ -- On Windows, what is returned will depend on what the handle is connected to -- and the version of the operating system. If the handle is identified as -- connected to a \'mintty\' terminal, @return (Just True)@ is --- returned. If it is identifed as connected to a native terminal, then, on +-- returned. If it is identified as connected to a native terminal, then, on -- Windows 10, the processing of \'ANSI\' control characters will be enabled and -- @return (Just True)@ returned; and, on versions of Windows before Windows 10, -- @return (Just False)@ is returned. Otherwise, if a @TERM@ environment diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansi-terminal-0.11.1/src/includes/Exports-Include.hs new/ansi-terminal-0.11.3/src/includes/Exports-Include.hs --- old/ansi-terminal-0.11.1/src/includes/Exports-Include.hs 2021-11-23 21:48:28.000000000 +0100 +++ new/ansi-terminal-0.11.3/src/includes/Exports-Include.hs 2022-04-29 01:00:01.000000000 +0200 @@ -100,6 +100,20 @@ , hideCursorCode , showCursorCode + -- * Hyperlinks + -- | Some, but not all, terminals support hyperlinks - that is, clickable + -- text that points to a URI. On Windows, if emulation is required, + -- hyperlinks are not emulated. + , hyperlink + , hHyperlink + , hyperlinkCode + , hyperlinkWithId + , hHyperlinkWithId + , hyperlinkWithIdCode + , hyperlinkWithParams + , hHyperlinkWithParams + , hyperlinkWithParamsCode + -- * Changing the title , setTitle , hSetTitle

1 0

commit ghc-aeson-pretty for openSUSE:Factory
by Source-Sync 01 Aug '22

01 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-aeson-pretty for openSUSE:Factory checked in at 2022-08-01 21:29:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-aeson-pretty (Old) and /work/SRC/openSUSE:Factory/.ghc-aeson-pretty.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-aeson-pretty" Mon Aug 1 21:29:31 2022 rev:18 rq:987016 version:0.8.9 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-aeson-pretty/ghc-aeson-pretty.changes 2021-12-19 17:34:27.296265718 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-aeson-pretty.new.1533/ghc-aeson-pretty.changes 2022-08-01 21:29:33.465511665 +0200 @@ -1,0 +2,6 @@ +Fri Jun 17 19:09:13 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update aeson-pretty to version 0.8.9 revision 2. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-aeson-pretty.spec ++++++ --- /var/tmp/diff_new_pack.q4Htsy/_old 2022-08-01 21:29:33.973513122 +0200 +++ /var/tmp/diff_new_pack.q4Htsy/_new 2022-08-01 21:29:33.977513134 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-aeson-pretty # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/2.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-aeson-devel BuildRequires: ghc-base-compat-devel ++++++ aeson-pretty.cabal ++++++ --- /var/tmp/diff_new_pack.q4Htsy/_old 2022-08-01 21:29:34.025513272 +0200 +++ /var/tmp/diff_new_pack.q4Htsy/_new 2022-08-01 21:29:34.029513283 +0200 @@ -1,7 +1,7 @@ cabal-version: 2.0 name: aeson-pretty version: 0.8.9 -x-revision: 1 +x-revision: 2 license: BSD3 license-file: LICENSE category: Text, Web, JSON, Pretty Printer @@ -42,7 +42,7 @@ Data.Aeson.Encode.Pretty build-depends: - aeson ^>= 1.0 || ^>=1.1 || ^>=1.2 || ^>=1.3 || ^>=1.4 || ^>=1.5 || ^>=2.0, + aeson ^>= 1.0 || ^>=1.1 || ^>=1.2 || ^>=1.3 || ^>=1.4 || ^>=1.5 || ^>=2.0 || ^>=2.1, base >= 4.5, base-compat >= 0.9, bytestring >= 0.9,

1 0

commit ghc-adjunctions for openSUSE:Factory
by Source-Sync 01 Aug '22

01 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-adjunctions for openSUSE:Factory checked in at 2022-08-01 21:29:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-adjunctions (Old) and /work/SRC/openSUSE:Factory/.ghc-adjunctions.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-adjunctions" Mon Aug 1 21:29:30 2022 rev:9 rq:987015 version:4.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-adjunctions/ghc-adjunctions.changes 2020-12-22 11:34:15.537185801 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-adjunctions.new.1533/ghc-adjunctions.changes 2022-08-01 21:29:32.597509175 +0200 @@ -1,0 +2,8 @@ +Sat May 7 23:22:16 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update adjunctions to version 4.4.1. + 4.4.1 [2022.05.07] + ------------------ + * Allow building with `transformers-0.6.*` and `mtl-2.3.*`. + +------------------------------------------------------------------- Old: ---- adjunctions-4.4.tar.gz adjunctions.cabal New: ---- adjunctions-4.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-adjunctions.spec ++++++ --- /var/tmp/diff_new_pack.PBudaX/_old 2022-08-01 21:29:33.181510850 +0200 +++ /var/tmp/diff_new_pack.PBudaX/_new 2022-08-01 21:29:33.185510862 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-adjunctions # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,12 @@ %global pkg_name adjunctions %bcond_with tests Name: ghc-%{pkg_name} -Version: 4.4 +Version: 4.4.1 Release: 0 Summary: Adjunctions and representable functors License: BSD-2-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/2.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-array-devel BuildRequires: ghc-comonad-devel @@ -63,7 +62,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ adjunctions-4.4.tar.gz -> adjunctions-4.4.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adjunctions-4.4/.travis.yml new/adjunctions-4.4.1/.travis.yml --- old/adjunctions-4.4/.travis.yml 2018-01-28 15:49:01.000000000 +0100 +++ new/adjunctions-4.4.1/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,146 +0,0 @@ -# This Travis job script has been generated by a script via -# -# runghc make_travis_yml_2.hs '-o' '.travis.yml' '--irc-channel=irc.freenode.org#haskell-lens' '--no-no-tests-no-bench' '--no-installed' 'cabal.project' -# -# For more information, see https://github.com/hvr/multi-ghc-travis -# -language: c -sudo: false - -git: - submodules: false # whether to recursively clone submodules - -notifications: - irc: - channels: - - "irc.freenode.org#haskell-lens" - skip_join: true - template: - - "\x0313adjunctions\x03/\x0306%{branch}\x03 \x0314%{commit}\x03 %{build_url} %{message}" - -cache: - directories: - - $HOME/.cabal/packages - - $HOME/.cabal/store - -before_cache: - - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log - # remove files that are regenerated by 'cabal update' - - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.* - - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json - - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache - - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar - - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx - - - rm -rfv $HOME/.cabal/packages/head.hackage - -addons: - apt: - packages: &apt_packages - - ghc-ppa-tools - - alex-3.1.7 - - happy-1.19.5 - -matrix: - include: - - compiler: "ghc-7.4.2" - # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [*apt_packages,cabal-install-2.0,ghc-7.4.2], sources: [hvr-ghc]}} - - compiler: "ghc-7.6.3" - # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [*apt_packages,cabal-install-2.0,ghc-7.6.3], sources: [hvr-ghc]}} - - compiler: "ghc-7.8.4" - # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [*apt_packages,cabal-install-2.0,ghc-7.8.4], sources: [hvr-ghc]}} - - compiler: "ghc-7.10.3" - # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [*apt_packages,cabal-install-2.0,ghc-7.10.3], sources: [hvr-ghc]}} - - compiler: "ghc-8.0.2" - # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [*apt_packages,cabal-install-2.0,ghc-8.0.2], sources: [hvr-ghc]}} - - compiler: "ghc-8.2.2" - # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [*apt_packages,cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}} - - compiler: "ghc-8.4.1" - env: GHCHEAD=true - addons: {apt: {packages: [*apt_packages,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}} - - compiler: "ghc-head" - env: GHCHEAD=true - addons: {apt: {packages: [*apt_packages,cabal-install-head,ghc-head], sources: [hvr-ghc]}} - - allow_failures: - - compiler: "ghc-8.4.1" - - compiler: "ghc-head" - -before_install: - - HC=${CC} - - HCPKG=${HC/ghc/ghc-pkg} - - unset CC - - ROOTDIR=$(pwd) - - mkdir -p $HOME/.local/bin - - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH" - - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') )) - - echo $HCNUMVER - -install: - - cabal --version - - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]" - - BENCH=${BENCH---enable-benchmarks} - - TEST=${TEST---enable-tests} - - HADDOCK=${HADDOCK-true} - - INSTALLED=${INSTALLED-true} - - GHCHEAD=${GHCHEAD-false} - - travis_retry cabal update -v - - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config" - - rm -fv cabal.project cabal.project.local - # Overlay Hackage Package Index for GHC HEAD: https://github.com/hvr/head.hackage - - | - if $GHCHEAD; then - sed -i.bak 's/-- allow-newer:.*/allow-newer: *:base, *:template-haskell, *:ghc, *:Cabal/' ${HOME}/.cabal/config - - echo 'repository head.hackage' >> ${HOME}/.cabal/config - echo ' url: http://head.hackage.haskell.org/' >> ${HOME}/.cabal/config - echo ' secure: True' >> ${HOME}/.cabal/config - echo ' root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740' >> ${HOME}/.cabal/config - echo ' 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb' >> ${HOME}/.cabal/config - echo ' 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e' >> ${HOME}/.cabal/config - echo ' key-threshold: 3' >> ${HOME}/.cabal.config - - cabal new-update head.hackage -v - fi - - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$' - - "printf 'packages: \".\"\\n' > cabal.project" - - cat cabal.project - - if [ -f "./configure.ac" ]; then - (cd "." && autoreconf -i); - fi - - rm -f cabal.project.freeze - - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all - - rm -rf "."/.ghc.environment.* "."/dist - - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX) - -# Here starts the actual work to be performed for the package under test; -# any command which exits with a non-zero exit code causes the build to fail. -script: - # test that source-distributions can be generated - - (cd "." && cabal sdist) - - mv "."/dist/adjunctions-*.tar.gz ${DISTDIR}/ - - cd ${DISTDIR} || false - - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \; - - "printf 'packages: adjunctions-*/*.cabal\\n' > cabal.project" - - cat cabal.project - - - # build & run tests, build benchmarks - - cabal new-build -w ${HC} ${TEST} ${BENCH} all - - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} ${BENCH} all; fi - - # cabal check - - (cd adjunctions-* && cabal check) - - # haddock - - rm -rf ./dist-newstyle - - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi - -# REGENDATA ["-o",".travis.yml","--irc-channel=irc.freenode.org#haskell-lens","--no-no-tests-no-bench","--no-installed","cabal.project"] -# EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adjunctions-4.4/CHANGELOG.markdown new/adjunctions-4.4.1/CHANGELOG.markdown --- old/adjunctions-4.4/CHANGELOG.markdown 2018-01-28 15:49:01.000000000 +0100 +++ new/adjunctions-4.4.1/CHANGELOG.markdown 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,7 @@ +4.4.1 [2022.05.07] +------------------ +* Allow building with `transformers-0.6.*` and `mtl-2.3.*`. + 4.4 [2018.01.28] ---------------- * Added `imapRep`, `ifoldMapRep`, `itraverseRep` to make it easier to define representable `FunctorWithIndex`, `FoldableWithIndex`, `TraversableWithIndex` instances from the `lens` package. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adjunctions-4.4/README.markdown new/adjunctions-4.4.1/README.markdown --- old/adjunctions-4.4/README.markdown 2018-01-28 15:49:01.000000000 +0100 +++ new/adjunctions-4.4.1/README.markdown 2001-09-09 03:46:40.000000000 +0200 @@ -1,7 +1,7 @@ adjunctions ========== -[![Hackage](https://img.shields.io/hackage/v/adjunctions.svg)](https://hackage.haskell.org/package/adjunctions) [![Build Status](https://secure.travis-ci.org/ekmett/adjunctions.png?branch=master)]… +[![Hackage](https://img.shields.io/hackage/v/adjunctions.svg)](https://hackage.haskell.org/package/adjunctions) [![Build Status](https://github.com/ekmett/adjunctions/workflows/Haskell-CI/badge.sv… This package provides adjunctions for Haskell. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adjunctions-4.4/adjunctions.cabal new/adjunctions-4.4.1/adjunctions.cabal --- old/adjunctions-4.4/adjunctions.cabal 2018-01-28 15:49:01.000000000 +0100 +++ new/adjunctions-4.4.1/adjunctions.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,8 +1,8 @@ name: adjunctions category: Data Structures, Adjunctions -version: 4.4 +version: 4.4.1 license: BSD3 -cabal-version: >= 1.8 +cabal-version: >= 1.10 license-file: LICENSE author: Edward A. Kmett maintainer: Edward A. Kmett <ekmett(a)gmail.com> @@ -15,10 +15,7 @@ build-type: Simple extra-source-files: .gitignore - .travis.yml .vim.custom - travis/cabal-apt-install - travis/config HLint.hs CHANGELOG.markdown README.markdown @@ -28,7 +25,12 @@ , GHC == 7.10.3 , GHC == 8.0.2 , GHC == 8.2.2 - , GHC == 8.4.1 + , GHC == 8.4.4 + , GHC == 8.6.5 + , GHC == 8.8.4 + , GHC == 8.10.7 + , GHC == 9.0.2 + , GHC == 9.2.2 source-repository head type: git @@ -49,16 +51,16 @@ array >= 0.3.0.2 && < 0.7, base >= 4 && < 5, comonad >= 4 && < 6, - containers >= 0.3 && < 0.6, + containers >= 0.3 && < 0.7, contravariant >= 1 && < 2, distributive >= 0.5.1 && < 1, free >= 4 && < 6, - mtl >= 2.0.1 && < 2.3, + mtl >= 2.0.1 && < 2.4, profunctors >= 4 && < 6, tagged >= 0.7 && < 1, semigroupoids >= 4 && < 6, semigroups >= 0.11 && < 1, - transformers >= 0.2 && < 0.6, + transformers >= 0.2 && < 0.7, transformers-compat >= 0.3 && < 1, void >= 0.5.5.1 && < 1 @@ -80,9 +82,18 @@ ghc-options: -Wall - -- See https://ghc.haskell.org/trac/ghc/wiki/Migration/8.0#base-4.9.0.0 + default-language: Haskell2010 + if impl(ghc >= 8.0) - ghc-options: -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances + -- See https://ghc.haskell.org/trac/ghc/wiki/Migration/8.0#base-4.9.0.0 + ghc-options: -Wcompat -Wnoncanonical-monad-instances + ghc-options: -Wno-trustworthy-safe -Wno-inline-rule-shadowing + + if !impl(ghc >= 8.8) + ghc-options: -Wnoncanonical-monadfail-instances + + if impl(ghc >= 8.6) + ghc-options: -Wno-star-is-type test-suite spec type: exitcode-stdio-1.0 @@ -100,3 +111,4 @@ other-modules: GenericsSpec ghc-options: -Wall -threaded -rtsopts + default-language: Haskell2010 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adjunctions-4.4/src/Control/Comonad/Representable/Store.hs new/adjunctions-4.4.1/src/Control/Comonad/Representable/Store.hs --- old/adjunctions-4.4/src/Control/Comonad/Representable/Store.hs 2018-01-28 15:49:01.000000000 +0100 +++ new/adjunctions-4.4.1/src/Control/Comonad/Representable/Store.hs 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,6 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE TypeOperators #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE MultiParamTypeClasses #-} @@ -43,7 +44,9 @@ import Data.Functor.Apply import Data.Functor.Extend import Data.Functor.Rep +#if !(MIN_VERSION_base(4,11,0)) import Data.Semigroup +#endif -- | A memoized store comonad parameterized by a representable functor @g@, where -- the representatation of @g@, @Rep g@ is the index of the store. @@ -58,8 +61,8 @@ -> Store g a store = storeT . Identity --- | Unwrap a state monad computation as a function. --- (The inverse of 'state'.) +-- | Unwrap a store comonad computation as a function and a current index. +-- (The inverse of 'store'.) runStore :: Representable g => Store g a -- ^ a store to access -> (Rep g -> a, Rep g) -- ^ initial state diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adjunctions-4.4/src/Control/Monad/Representable/State.hs new/adjunctions-4.4.1/src/Control/Monad/Representable/State.hs --- old/adjunctions-4.4/src/Control/Monad/Representable/State.hs 2018-01-28 15:49:01.000000000 +0100 +++ new/adjunctions-4.4.1/src/Control/Monad/Representable/State.hs 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,6 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE TypeOperators #-} {-# LANGUAGE TypeSynonymInstances #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adjunctions-4.4/src/Data/Functor/Adjunction.hs new/adjunctions-4.4.1/src/Data/Functor/Adjunction.hs --- old/adjunctions-4.4/src/Data/Functor/Adjunction.hs 2018-01-28 15:49:01.000000000 +0100 +++ new/adjunctions-4.4.1/src/Data/Functor/Adjunction.hs 2001-09-09 03:46:40.000000000 +0200 @@ -181,7 +181,7 @@ instance Adjunction m w => Adjunction (WriterT s m) (TracedT s w) where unit = TracedT . leftAdjunct (\ma s -> WriterT (fmap (\a -> (a, s)) ma)) - counit = rightAdjunct (\(t, s) -> ($s) <$> runTracedT t) . runWriterT + counit = rightAdjunct (\(t, s) -> ($ s) <$> runTracedT t) . runWriterT instance (Adjunction f g, Adjunction f' g') => Adjunction (Compose f' f) (Compose g g') where diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adjunctions-4.4/src/Data/Functor/Contravariant/Rep.hs new/adjunctions-4.4.1/src/Data/Functor/Contravariant/Rep.hs --- old/adjunctions-4.4/src/Data/Functor/Contravariant/Rep.hs 2018-01-28 15:49:01.000000000 +0100 +++ new/adjunctions-4.4.1/src/Data/Functor/Contravariant/Rep.hs 2001-09-09 03:46:40.000000000 +0200 @@ -24,7 +24,6 @@ , contramapRep ) where -import Control.Monad.Reader import Data.Functor.Contravariant import Data.Functor.Product import Data.Profunctor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adjunctions-4.4/src/Data/Functor/Rep.hs new/adjunctions-4.4.1/src/Data/Functor/Rep.hs --- old/adjunctions-4.4/src/Data/Functor/Rep.hs 2018-01-28 15:49:01.000000000 +0100 +++ new/adjunctions-4.4.1/src/Data/Functor/Rep.hs 2001-09-09 03:46:40.000000000 +0200 @@ -86,13 +86,15 @@ import Control.Comonad.Trans.Class import Control.Comonad.Trans.Traced import Control.Comonad.Cofree +import Control.Monad.Fix (MonadFix(..)) import Control.Monad.Trans.Identity -import Control.Monad.Reader +import Control.Monad.Reader (MonadReader(..), ReaderT(..)) #if MIN_VERSION_base(4,4,0) import Data.Complex #endif import Data.Distributive import Data.Foldable (Foldable(fold)) +import Data.Function import Data.Functor.Bind import Data.Functor.Identity import Data.Functor.Compose @@ -106,7 +108,9 @@ import qualified Data.Sequence as Seq import Data.Semigroup hiding (Product) import Data.Tagged +#if !(MIN_VERSION_base(4,8,0)) import Data.Traversable (Traversable(sequenceA)) +#endif import Data.Void import GHC.Generics hiding (Rep) import Prelude hiding (lookup) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adjunctions-4.4/travis/cabal-apt-install new/adjunctions-4.4.1/travis/cabal-apt-install --- old/adjunctions-4.4/travis/cabal-apt-install 2018-01-28 15:49:01.000000000 +0100 +++ new/adjunctions-4.4.1/travis/cabal-apt-install 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -#! /bin/bash -set -eu - -APT="sudo apt-get -q -y" -CABAL_INSTALL_DEPS="cabal install --only-dependencies --force-reinstall" - -$APT update -$APT install dctrl-tools - -# Find potential system packages to satisfy cabal dependencies -deps() -{ - local M='^$[^ ]\+$-[0-9.]\+ (.*$' - local G=' -o ( -FPackage -X libghc-\L\1\E-dev )' - local E="$($CABAL_INSTALL_DEPS "$@" --dry-run -v 2> /dev/null \ - | sed -ne "s/$M/$G/p" | sort -u)" - grep-aptavail -n -sPackage $ -FNone -X None $ $E | sort -u -} - -$APT install $(deps "$@") libghc-quickcheck2-dev # QuickCheck is special -$CABAL_INSTALL_DEPS "$@" # Install the rest via Hackage - -if ! $APT install hlint ; then - $APT install $(deps hlint) - cabal install hlint -fi - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adjunctions-4.4/travis/config new/adjunctions-4.4.1/travis/config --- old/adjunctions-4.4/travis/config 2018-01-28 15:49:01.000000000 +0100 +++ new/adjunctions-4.4.1/travis/config 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ --- This provides a custom ~/.cabal/config file for use when hackage is down that should work on unix --- --- This is particularly useful for travis-ci to get it to stop complaining --- about a broken build when everything is still correct on our end. --- --- This uses Luite Stegeman's mirror of hackage provided by his 'hdiff' site instead --- --- To enable this, uncomment the before_script in .travis.yml - -remote-repo: hdiff.luite.com:http://hdiff.luite.com/packages/archive -remote-repo-cache: ~/.cabal/packages -world-file: ~/.cabal/world -build-summary: ~/.cabal/logs/build.log -remote-build-reporting: anonymous -install-dirs user -install-dirs global

1 0

commit ghc-ListLike for openSUSE:Factory
by Source-Sync 01 Aug '22

01 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-ListLike for openSUSE:Factory checked in at 2022-08-01 21:29:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-ListLike (Old) and /work/SRC/openSUSE:Factory/.ghc-ListLike.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-ListLike" Mon Aug 1 21:29:30 2022 rev:3 rq:987014 version:4.7.7 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-ListLike/ghc-ListLike.changes 2021-09-10 23:41:14.166554585 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-ListLike.new.1533/ghc-ListLike.changes 2022-08-01 21:29:31.497506019 +0200 @@ -1,0 +2,9 @@ +Mon Jun 20 16:44:10 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update ListLike to version 4.7.7 revision 1. + Upstream has edited the change log file since the last release in + a non-trivial way, i.e. they did more than just add a new entry + at the top. You can review the file at: + http://hackage.haskell.org/package/ListLike-4.7.7/src/CHANGELOG.md + +------------------------------------------------------------------- Old: ---- ListLike-4.7.6.tar.gz New: ---- ListLike-4.7.7.tar.gz ListLike.cabal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-ListLike.spec ++++++ --- /var/tmp/diff_new_pack.3JCY5Z/_old 2022-08-01 21:29:32.033507557 +0200 +++ /var/tmp/diff_new_pack.3JCY5Z/_new 2022-08-01 21:29:32.037507568 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-ListLike # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,12 +19,13 @@ %global pkg_name ListLike %bcond_with tests Name: ghc-%{pkg_name} -Version: 4.7.6 +Version: 4.7.7 Release: 0 Summary: Generalized support for list-like structures License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-array-devel BuildRequires: ghc-bytestring-devel @@ -67,6 +68,7 @@ %prep %autosetup -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ ListLike-4.7.6.tar.gz -> ListLike-4.7.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ListLike-4.7.6/CHANGELOG.md new/ListLike-4.7.7/CHANGELOG.md --- old/ListLike-4.7.6/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 +++ new/ListLike-4.7.7/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,8 +1,16 @@ CHANGES ======= -### 4.7.5 +### 4.7.7 (2022-05-26) + - methods `sequence` and `mapM`: relax `Monad` constraint to `Applicative` + - `LANGUAGE TypeOperators` to fix GHC 9.4 warning + - allow `text-2.0` + - tested with GHC 7.10 - 9.4 + +### 4.7.6 (2021-09-01) + + - new implementation of `tail` in `DList` instance - warning-free for `-Wall` and `-Wcompat` ### 4.7.4 (2021-01-07) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ListLike-4.7.6/ListLike.cabal new/ListLike-4.7.7/ListLike.cabal --- old/ListLike-4.7.6/ListLike.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/ListLike-4.7.7/ListLike.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,5 @@ Name: ListLike -Version: 4.7.6 +Version: 4.7.7 License: BSD3 Maintainer: David Fox <dsf(a)seereason.com>, Andreas Abel Author: John Goerzen @@ -23,8 +23,10 @@ Stability: Stable Tested-With: - GHC == 9.0.1 - GHC == 8.10.4 + GHC == 9.4.1 + GHC == 9.2.2 + GHC == 9.0.2 + GHC == 8.10.7 GHC == 8.8.4 GHC == 8.6.5 GHC == 8.4.4 @@ -66,7 +68,7 @@ ,containers >= 0.3 && < 0.7 ,bytestring >= 0.9.1 && < 0.12 ,array >= 0.3 && < 0.6 - ,text >= 0.11 && < 1.3 + ,text >= 0.11 && < 1.3 || == 2.0.* ,vector >= 0.5 && < 0.13 ,dlist >= 0.7 && < 1.1 ,fmlist >= 0.8 && < 0.10 @@ -84,7 +86,7 @@ -- Since ListLike defines orphan instances, we would need to include -- the minor version number in the upper bounds. -- (See issues #7 and #10.) - -- However, this could involve a maintenance to relax upper bounds. + -- However, this could involve a maintenance marathon to relax upper bounds. If !impl(ghc >= 8.4) Build-Depends: semigroups >= 0.16 && < 0.20 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ListLike-4.7.6/src/Data/ListLike/Base.hs new/ListLike-4.7.7/src/Data/ListLike/Base.hs --- old/ListLike-4.7.6/src/Data/ListLike/Base.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/ListLike-4.7.7/src/Data/ListLike/Base.hs 2001-09-09 03:46:40.000000000 +0200 @@ -7,6 +7,7 @@ ,FlexibleContexts ,ConstraintKinds ,CPP #-} +{-# LANGUAGE TypeOperators #-} -- for GHC >= 9.4 {- Copyright (C) 2007 John Goerzen <jgoerzen(a)complete.org> @@ -38,19 +39,24 @@ InfiniteListLike(..), zip, zipWith, sequence_ ) where -import Prelude hiding (length, {-uncons,-} head, last, null, tail, map, filter, concat, - any, lookup, init, all, foldl, foldr, foldl1, foldr1, - maximum, minimum, iterate, span, break, takeWhile, - dropWhile, {-dropWhileEnd,-} reverse, zip, zipWith, sequence, - sequence_, mapM, mapM_, concatMap, and, or, sum, - product, repeat, replicate, cycle, take, drop, - splitAt, elem, notElem, unzip, lines, words, - unlines, unwords, foldMap) + +import Prelude + ( Applicative(..), Bool(..), Eq(..), Int, Integer, Integral + , Maybe(..), Monad, Monoid(..), Num(..), Ord(..), Ordering(..) + , ($), (.), (&&), (||), (++), asTypeOf, error, flip, fst, snd + , id, maybe, max, min, not, otherwise + , sequenceA + ) +#if MIN_VERSION_base(4,17,0) +import Data.Type.Equality -- GHC 9.4: type equality ~ is just an operator now +#endif + import qualified Data.List as L import Data.ListLike.FoldableLL -import qualified Control.Monad as M -import Data.Monoid -import Data.Maybe + ( FoldableLL(foldr, foldr1, foldl), fold, foldMap, sequence_ ) +import qualified Control.Applicative as A +import Data.Monoid ( All(All, getAll), Any(Any, getAny) ) +import Data.Maybe ( listToMaybe ) import GHC.Exts (IsList(Item, fromList, {-fromListN,-} toList)) {- | The class implementing list-like functions. @@ -364,18 +370,14 @@ ------------------------------ Monadic operations {- | Evaluate each action in the sequence and collect the results -} - sequence :: (Monad m, ListLike fullinp (m item)) => + sequence :: (Applicative m, ListLike fullinp (m item)) => fullinp -> m full - sequence l = foldr func (return empty) l - where func litem results = - do x <- litem - xs <- results - return (cons x xs) + sequence = foldr (A.liftA2 cons) (pure empty) {- | A map in monad space. Same as @'sequence' . 'map'@ See also 'rigidMapM' -} - mapM :: (Monad m, ListLike full' item') => + mapM :: (Applicative m, ListLike full' item') => (item -> m item') -> full -> m full' mapM func l = sequence mapresult where mapresult = asTypeOf (map func l) [] @@ -550,12 +552,12 @@ | count <= 0 = empty | otherwise = map (\_ -> x) [1..count] -#if __GLASGOW_HASKELL__ >= 708 + {-# MINIMAL (singleton, uncons, null) | (singleton, uncons, genericLength) | (singleton, head, tail, null) | (singleton, head, tail, genericLength) #-} -#endif + -- | A version of 'ListLike' with a single type parameter, the item -- type is obtained using the 'Item' type function from 'IsList'. @@ -646,7 +648,7 @@ elemIndex = L.elemIndex elemIndices item = fromList . L.elemIndices item findIndex = L.findIndex - sequence = M.sequence . toList + sequence = sequenceA . toList -- mapM = M.mapM nub = L.nub delete = L.delete @@ -671,7 +673,7 @@ ListLike fullb itemb, ListLike result (item, itemb)) => full -> fullb -> result -zip = zipWith (\a b -> (a, b)) +zip = zipWith (,) {- | Takes two lists and combines them with a custom combining function -} zipWith :: (ListLike full item, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ListLike-4.7.6/src/Data/ListLike/Instances.hs new/ListLike-4.7.7/src/Data/ListLike/Instances.hs --- old/ListLike-4.7.6/src/Data/ListLike/Instances.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/ListLike-4.7.7/src/Data/ListLike/Instances.hs 2001-09-09 03:46:40.000000000 +0200 @@ -4,6 +4,9 @@ ,TypeFamilies ,TypeSynonymInstances #-} {-# OPTIONS -fno-warn-orphans #-} +#if __GLASGOW_HASKELL__ > 901 +{-# OPTIONS -fno-warn-incomplete-uni-patterns #-} +#endif {- Copyright (C) 2007 John Goerzen <jgoerzen(a)complete.org> @@ -39,7 +42,6 @@ splitAt, elem, notElem, unzip, lines, words, unlines, unwords) import qualified Prelude as P -import Control.Monad import qualified Data.List as L import qualified Data.Sequence as S import Data.Sequence ((><), (|>), (<|)) @@ -188,8 +190,8 @@ findIndices x = fromList . BS.findIndices x -- the default definitions don't work well for array-like things, so -- do monadic stuff via a list instead - sequence = liftM fromList . P.sequence . toList - mapM func = liftM fromList . P.mapM func . toList + sequence = fmap fromList . P.sequenceA . toList + mapM func = fmap fromList . P.traverse func . toList --nub = BS.nub --delete = BS.delete --deleteFirsts = BS.deleteFirsts @@ -311,8 +313,8 @@ --elemIndices x = fromList . L.map fromIntegral . BSL.elemIndices x findIndex f = mi64toi . BSL.findIndex f --findIndices x = fromList . L.map fromIntegral . BSL.findIndices x - sequence = liftM fromList . P.sequence . toList - mapM func = liftM fromList . P.mapM func . toList + sequence = fmap fromList . P.sequenceA . toList + mapM func = fmap fromList . P.traverse func . toList --sequence = BSL.sequence --mapM = BSL.mapM --mapM_ = BSL.mapM_ @@ -460,8 +462,8 @@ elemIndices i = fromList . L.elemIndices i . toList findIndex f = L.findIndex f . toList findIndices f = fromList . L.findIndices f . toList - sequence = liftM fromList . P.sequence . toList - mapM func = liftM fromList . P.mapM func . toList + sequence = fmap fromList . P.sequenceA . toList + mapM func = fmap fromList . P.traverse func . toList -- rigidMapM = mapM nub = fromList . L.nub . toList -- delete diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ListLike-4.7.6/src/Data/ListLike/Text/Text.hs new/ListLike-4.7.7/src/Data/ListLike/Text/Text.hs --- old/ListLike-4.7.6/src/Data/ListLike/Text/Text.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/ListLike-4.7.7/src/Data/ListLike/Text/Text.hs 2001-09-09 03:46:40.000000000 +0200 @@ -7,7 +7,6 @@ where import Prelude as P -import Control.Monad import qualified Data.Text as T import qualified Data.Text.IO as TI import qualified Data.Text.Lazy as Lazy (toStrict) @@ -78,8 +77,8 @@ genericSplitAt i = T.splitAt (fromIntegral i) genericReplicate i = LL.replicate (fromIntegral i) - sequence = liftM fromList . P.sequence . toList - mapM func = liftM fromList . P.mapM func . toList + sequence = fmap fromList . P.sequenceA . toList + mapM func = fmap fromList . P.traverse func . toList instance ListLikeIO T.Text Char where hGetLine = TI.hGetLine diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ListLike-4.7.6/src/Data/ListLike/Text/TextLazy.hs new/ListLike-4.7.7/src/Data/ListLike/Text/TextLazy.hs --- old/ListLike-4.7.6/src/Data/ListLike/Text/TextLazy.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/ListLike-4.7.7/src/Data/ListLike/Text/TextLazy.hs 2001-09-09 03:46:40.000000000 +0200 @@ -7,7 +7,6 @@ where import Prelude as P -import Control.Monad import qualified Data.Text.Lazy as T import qualified Data.Text.Lazy.IO as TI import Data.Text.Encoding (decodeUtf8) @@ -75,8 +74,8 @@ genericSplitAt i = T.splitAt (fromIntegral i) genericReplicate i = LL.replicate (fromIntegral i) - sequence = liftM fromList . P.sequence . toList - mapM func = liftM fromList . P.mapM func . toList + sequence = fmap fromList . P.sequenceA . toList + mapM func = fmap fromList . P.traverse func . toList instance ListLikeIO T.Text Char where hGetLine = TI.hGetLine diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ListLike-4.7.6/src/Data/ListLike/UTF8.hs new/ListLike-4.7.7/src/Data/ListLike/UTF8.hs --- old/ListLike-4.7.6/src/Data/ListLike/UTF8.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/ListLike-4.7.7/src/Data/ListLike/UTF8.hs 2001-09-09 03:46:40.000000000 +0200 @@ -108,8 +108,8 @@ -- findIndices x = fromList . UTF8.findIndices x -- -- the default definitions don't work well for array-like things, so -- -- do monadic stuff via a list instead - -- sequence = liftM fromList . P.sequence . toList - -- mapM func = liftM fromList . P.mapM func . toList + -- sequence = fmap fromList . P.sequenceA . toList + -- mapM func = fmap fromList . P.traverse func . toList -- --nub = UTF8.nub -- --delete = UTF8.delete -- --deleteFirsts = UTF8.deleteFirsts @@ -231,8 +231,8 @@ -- findIndices x = fromList . UTF8.findIndices x -- -- the default definitions don't work well for array-like things, so -- -- do monadic stuff via a list instead - -- sequence = liftM fromList . P.sequence . toList - -- mapM func = liftM fromList . P.mapM func . toList + -- sequence = fmap fromList . P.sequenceA . toList + -- mapM func = fmap fromList . P.traverse func . toList -- --nub = UTF8.nub -- --delete = UTF8.delete -- --deleteFirsts = UTF8.deleteFirsts diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ListLike-4.7.6/src/Data/ListLike/Vector/Generic.hs new/ListLike-4.7.7/src/Data/ListLike/Vector/Generic.hs --- old/ListLike-4.7.6/src/Data/ListLike/Vector/Generic.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/ListLike-4.7.7/src/Data/ListLike/Vector/Generic.hs 2001-09-09 03:46:40.000000000 +0200 @@ -4,6 +4,7 @@ ,FlexibleInstances ,TypeFamilies ,UndecidableInstances #-} +{-# LANGUAGE TypeOperators #-} -- for GHC >= 9.4 #if __GLASGOW_HASKELL__ < 710 {-# LANGUAGE OverlappingInstances #-} #endif @@ -17,7 +18,6 @@ where import Prelude as P -import Control.Monad import qualified Data.Vector.Generic as V import Data.Vector.Generic ((!)) import Data.ListLike.Base @@ -90,8 +90,8 @@ --genericSplitAt i = genericReplicate i = V.replicate (fromIntegral i) - sequence = liftM fromList . P.sequence . toList - mapM func = liftM fromList . P.mapM func . toList + sequence = fmap fromList . P.sequenceA . toList + mapM func = fmap fromList . P.traverse func . toList instance (Eq (v Char), V.Vector v Char) => IsString (v Char) where fromString = V.fromList diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ListLike-4.7.6/src/Data/ListLike/Vector/Storable.hs new/ListLike-4.7.7/src/Data/ListLike/Vector/Storable.hs --- old/ListLike-4.7.6/src/Data/ListLike/Vector/Storable.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/ListLike-4.7.7/src/Data/ListLike/Vector/Storable.hs 2001-09-09 03:46:40.000000000 +0200 @@ -8,7 +8,6 @@ where import Prelude as P -import Control.Monad import qualified Data.Vector.Storable as V import Data.Vector.Storable ((!)) import Data.ListLike.Base @@ -76,8 +75,8 @@ --genericSplitAt i = genericReplicate i = V.replicate (fromIntegral i) - sequence = liftM fromList . P.sequence . toList - mapM func = liftM fromList . P.mapM func . toList + sequence = fmap fromList . P.sequenceA . toList + mapM func = fmap fromList . P.traverse func . toList instance IsString (V.Vector Char) where fromString = fromList diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ListLike-4.7.6/src/Data/ListLike/Vector/Unboxed.hs new/ListLike-4.7.7/src/Data/ListLike/Vector/Unboxed.hs --- old/ListLike-4.7.6/src/Data/ListLike/Vector/Unboxed.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/ListLike-4.7.7/src/Data/ListLike/Vector/Unboxed.hs 2001-09-09 03:46:40.000000000 +0200 @@ -8,7 +8,6 @@ where import Prelude as P -import Control.Monad import qualified Data.Vector.Unboxed as V import Data.Vector.Unboxed (Unbox, (!)) import Data.ListLike.Base @@ -74,8 +73,8 @@ --genericSplitAt i = genericReplicate i = V.replicate (fromIntegral i) - sequence = liftM fromList . P.sequence . toList - mapM func = liftM fromList . P.mapM func . toList + sequence = fmap fromList . P.sequenceA . toList + mapM func = fmap fromList . P.traverse func . toList instance IsString (V.Vector Char) where fromString = fromList diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ListLike-4.7.6/src/Data/ListLike/Vector/Vector.hs new/ListLike-4.7.7/src/Data/ListLike/Vector/Vector.hs --- old/ListLike-4.7.6/src/Data/ListLike/Vector/Vector.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/ListLike-4.7.7/src/Data/ListLike/Vector/Vector.hs 2001-09-09 03:46:40.000000000 +0200 @@ -8,7 +8,6 @@ where import Prelude as P -import Control.Monad import qualified Data.Vector as V import Data.Vector ((!)) import Data.ListLike.Base @@ -73,8 +72,8 @@ --genericSplitAt i = genericReplicate i = V.replicate (fromIntegral i) - sequence = liftM fromList . P.sequence . toList - mapM func = liftM fromList . P.mapM func . toList + sequence = fmap fromList . P.sequenceA . toList + mapM func = fmap fromList . P.traverse func . toList instance IsString (V.Vector Char) where fromString = fromList ++++++ ListLike.cabal ++++++ Name: ListLike Version: 4.7.7 x-revision: 1 License: BSD3 Maintainer: David Fox <dsf(a)seereason.com>, Andreas Abel Author: John Goerzen Copyright: Copyright (c) 2007-2008 John Goerzen license-file: COPYRIGHT Category: list, string, text, bytestring, vector Cabal-Version: >= 1.10 Build-Type: Simple homepage: http://github.com/ddssff/listlike synopsis: Generalized support for list-like structures Description: Generalized support for list-like structures in Haskell. . The ListLike module provides a common interface to the various Haskell types that are list-like. Predefined interfaces include standard Haskell lists, Arrays, ByteStrings, and lazy ByteStrings. Custom types can easily be made ListLike instances as well. . ListLike also provides for String-like types, such as String and ByteString, for types that support input and output, and for types that can handle infinite lists. Stability: Stable Tested-With: GHC == 9.4.1 GHC == 9.2.2 GHC == 9.0.2 GHC == 8.10.7 GHC == 8.8.4 GHC == 8.6.5 GHC == 8.4.4 GHC == 8.2.2 GHC == 8.0.2 GHC == 7.10.3 extra-source-files: README.md CHANGELOG.md Library default-language: Haskell2010 GHC-Options: -Wall Hs-Source-Dirs: src Exposed-Modules: Data.ListLike Data.ListLike.Base Data.ListLike.Chars Data.ListLike.CharString Data.ListLike.FoldableLL Data.ListLike.IO Data.ListLike.Instances Data.ListLike.String Data.ListLike.Text Data.ListLike.Text.Builder Data.ListLike.Text.Text Data.ListLike.Text.TextLazy Data.ListLike.UTF8 Data.ListLike.Utils Data.ListLike.Vector Data.ListLike.Vector.Generic Data.ListLike.Vector.Storable Data.ListLike.Vector.Unboxed Data.ListLike.Vector.Vector Data.ListLike.DList Data.ListLike.FMList -- Other-Modules: Data.ConfigFile.Lexer Build-Depends: base >= 4.8 && < 5 ,containers >= 0.3 && < 0.7 ,bytestring >= 0.9.1 && < 0.12 ,array >= 0.3 && < 0.6 ,text >= 0.11 && < 1.3 || == 2.0.* ,vector >= 0.5 && < 0.14 ,dlist >= 0.7 && < 1.1 ,fmlist >= 0.8 && < 0.10 ,utf8-string >= 0.3.1 && < 1.1 ,deepseq -- Remark: Atm, we don't comply with the Haskell Package Versioning Policy -- https://pvp.haskell.org/ -- > ��6. Client defines orphan instance. -- > If a package defines an orphan instance, it MUST depend on the -- > minor version of the packages that define the data type and the -- > type class to be backwards compatible. For example, -- > build-depends: mypkg >= 2.1.1 && < 2.1.2. -- -- Since ListLike defines orphan instances, we would need to include -- the minor version number in the upper bounds. -- (See issues #7 and #10.) -- However, this could involve a maintenance marathon to relax upper bounds. If !impl(ghc >= 8.4) Build-Depends: semigroups >= 0.16 && < 0.20 if impl(ghc >= 8.0) ghc-options: -Wcompat Test-suite listlike-tests default-language: Haskell2010 Hs-source-dirs: testsrc Main-is: runtests.hs Type: exitcode-stdio-1.0 Other-modules: TestInfrastructure Build-depends: base ,ListLike ,HUnit >= 1.2 && < 2 ,QuickCheck >= 2.4 && < 3 ,random >= 1 && < 2 ,array ,bytestring ,containers ,dlist ,fmlist ,text ,vector ,utf8-string If !impl(ghc >= 8.4) Build-Depends: semigroups >= 0.16 && < 0.20 source-repository head type: git location: git://github.com/ddssff/listlike.git

1 0

commit ghc-HsYAML-aeson for openSUSE:Factory
by Source-Sync 01 Aug '22

01 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-HsYAML-aeson for openSUSE:Factory checked in at 2022-08-01 21:29:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-HsYAML-aeson (Old) and /work/SRC/openSUSE:Factory/.ghc-HsYAML-aeson.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-HsYAML-aeson" Mon Aug 1 21:29:29 2022 rev:10 rq:987013 version:0.2.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-HsYAML-aeson/ghc-HsYAML-aeson.changes 2022-02-11 23:11:04.359234587 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-HsYAML-aeson.new.1533/ghc-HsYAML-aeson.changes 2022-08-01 21:29:30.601503448 +0200 @@ -1,0 +2,6 @@ +Mon Jun 20 11:03:24 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update HsYAML-aeson to version 0.2.0.1 revision 4. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-HsYAML-aeson.spec ++++++ --- /var/tmp/diff_new_pack.3rgUis/_old 2022-08-01 21:29:31.097504871 +0200 +++ /var/tmp/diff_new_pack.3rgUis/_new 2022-08-01 21:29:31.101504883 +0200 @@ -24,7 +24,7 @@ License: GPL-2.0-or-later URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/4.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-HsYAML-devel BuildRequires: ghc-aeson-devel ++++++ HsYAML-aeson.cabal ++++++ --- /var/tmp/diff_new_pack.3rgUis/_old 2022-08-01 21:29:31.141504998 +0200 +++ /var/tmp/diff_new_pack.3rgUis/_new 2022-08-01 21:29:31.141504998 +0200 @@ -1,7 +1,7 @@ cabal-version: 2.2 name: HsYAML-aeson version: 0.2.0.1 -x-revision: 1 +x-revision: 4 license: GPL-2.0-or-later license-file: LICENSE.GPLv2 author: Herbert Valerio Riedel @@ -50,15 +50,15 @@ exposed-modules: Data.YAML.Aeson build-depends: , HsYAML ^>= 0.2.0 - , aeson ^>= 1.4.0.0 || ^>= 1.5.0.0 || ^>= 2.0.0.0 + , aeson ^>= 1.4.0.0 || ^>= 1.5.0.0 || ^>= 2.0.0.0 || ^>= 2.1.0.0 , base >= 4.5 && < 4.17 , bytestring ^>= 0.9.2.1 || ^>= 0.10.0.2 || ^>= 0.11.0.0 , containers >=0.4.2 && <0.7 - , mtl ^>= 2.2.1 + , mtl ^>= 2.2.1 || ^>= 2.3 , scientific ^>= 0.3.6.2 , text ^>= 1.2.3 || ^>= 2.0 , unordered-containers ^>= 0.2 - , vector ^>= 0.12.0.2 + , vector ^>= 0.12.0.2 || ^>= 0.13.0.0 hs-source-dirs: src default-language: Haskell2010

1 0

commit ghc-HsYAML for openSUSE:Factory
by Source-Sync 01 Aug '22

01 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-HsYAML for openSUSE:Factory checked in at 2022-08-01 21:29:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-HsYAML (Old) and /work/SRC/openSUSE:Factory/.ghc-HsYAML.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-HsYAML" Mon Aug 1 21:29:28 2022 rev:15 rq:987012 version:0.2.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-HsYAML/ghc-HsYAML.changes 2022-02-11 23:11:03.719232736 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-HsYAML.new.1533/ghc-HsYAML.changes 2022-08-01 21:29:29.801501153 +0200 @@ -1,0 +2,11 @@ +Wed May 11 07:28:44 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update HsYAML to version 0.2.1.1. + ### 0.2.1.1 + + _2022-05-11_ + + * Compatibility with `mtl-2.3` + * Tested with GHC 7.4 - 9.2 + +------------------------------------------------------------------- Old: ---- HsYAML-0.2.1.0.tar.gz HsYAML.cabal New: ---- HsYAML-0.2.1.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-HsYAML.spec ++++++ --- /var/tmp/diff_new_pack.1YWmr6/_old 2022-08-01 21:29:30.361502760 +0200 +++ /var/tmp/diff_new_pack.1YWmr6/_new 2022-08-01 21:29:30.365502771 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-HsYAML # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,12 @@ %global pkg_name HsYAML %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.2.1.0 +Version: 0.2.1.1 Release: 0 Summary: Pure Haskell YAML 1.2 processor License: GPL-2.0-or-later URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/4.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel @@ -34,6 +33,7 @@ BuildRequires: ghc-parsec-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-devel +BuildRequires: ghc-transformers-devel ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-QuickCheck-devel @@ -79,7 +79,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ HsYAML-0.2.1.0.tar.gz -> HsYAML-0.2.1.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HsYAML-0.2.1.0/ChangeLog.md new/HsYAML-0.2.1.1/ChangeLog.md --- old/HsYAML-0.2.1.0/ChangeLog.md 2001-09-09 03:46:40.000000000 +0200 +++ new/HsYAML-0.2.1.1/ChangeLog.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,12 @@ See also http://pvp.haskell.org/faq +### 0.2.1.1 + +_2022-05-11_ + +* Compatibility with `mtl-2.3` +* Tested with GHC 7.4 - 9.2 + ### 0.2.1.0 * Define `Functor Doc` instance ([#33](https://github.com/haskell-hvr/HsYAML/issues/33)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HsYAML-0.2.1.0/HsYAML.cabal new/HsYAML-0.2.1.1/HsYAML.cabal --- old/HsYAML-0.2.1.0/HsYAML.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/HsYAML-0.2.1.1/HsYAML.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,20 +1,32 @@ cabal-version: 1.14 name: HsYAML -version: 0.2.1.0 +version: 0.2.1.1 synopsis: Pure Haskell YAML 1.2 processor -homepage: https://github.com/hvr/HsYAML -bug-reports: https://github.com/hvr/HsYAML/issues +homepage: https://github.com/haskell-hvr/HsYAML +bug-reports: https://github.com/haskell-hvr/HsYAML/issues license: GPL-2 X-SPDX-License-Identifier: GPL-2.0-or-later license-files: LICENSE.GPLv2 LICENSE.GPLv3 author: Herbert Valerio Riedel -maintainer: hvr(a)gnu.org +maintainer: https://github.com/haskell-hvr/HsYAML copyright: 2015-2018 Herbert Valerio Riedel , 2007-2008 Oren Ben-Kiki category: Text build-type: Simple -tested-with: GHC==8.6.1, GHC==8.4.3, GHC==8.4.1, GHC==8.2.2, GHC==8.0.2, GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2 +tested-with: + GHC == 9.2.2 + GHC == 9.0.2 + GHC == 8.10.7 + 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 + GHC == 7.4.2 description: @HsYAML@ is a [YAML 1.2](http://yaml.org/spec/1.2/spec.html) processor, i.e. a library for parsing and serializing YAML documents. @@ -38,7 +50,7 @@ source-repository head type: git - location: https://github.com/hvr/HsYAML.git + location: https://github.com/haskell-hvr/HsYAML.git flag exe description: Enable @exe:yaml-test@ component @@ -77,23 +89,24 @@ Trustworthy TypeSynonymInstances - build-depends: base >=4.5 && <4.14 - , bytestring >=0.9 && <0.11 - , containers >=0.4.2 && <0.7 - , deepseq >=1.3.0 && <1.5 - , text >=1.2.3 && <1.3 - , mtl >=2.2.1 && <2.3 - , parsec >=3.1.13.0 && < 3.2 + build-depends: base >= 4.5 && < 4.17 + , bytestring >= 0.9 && < 0.12 + , containers >= 0.4.2 && < 0.7 + , deepseq >= 1.3.0 && < 1.5 + , text >= 1.2.3 && < 2.1 + , mtl >= 2.2.1 && < 2.4 + , parsec >= 3.1.13.0 && < 3.2 + , transformers >= 0.4 && < 0.7 -- for GHC.Generics if impl(ghc < 7.6) build-depends: ghc-prim if !impl(ghc >= 8.0) - build-depends: fail >=4.9.0.0 && <4.10 + build-depends: fail >= 4.9.0.0 && < 4.10 if !impl(ghc >= 7.10) - build-depends: nats >=1.1.2 && <1.2 + build-depends: nats >= 1.1.2 && < 1.2 ghc-options: -Wall @@ -113,7 +126,7 @@ , containers , mtl -- non-inherited - , megaparsec >= 6.5.0 && < 6.6 + , megaparsec >= 7.0 && < 10 , microaeson == 0.1.* , filepath == 1.4.* , directory >= 1.2 && < 1.4 @@ -138,6 +151,6 @@ , containers , mtl -- non-inherited - , QuickCheck == 2.13.* - , tasty == 1.2.* + , QuickCheck == 2.14.* + , tasty == 1.4.* , tasty-quickcheck == 0.10.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HsYAML-0.2.1.0/LICENSE.GPLv2 new/HsYAML-0.2.1.1/LICENSE.GPLv2 --- old/HsYAML-0.2.1.0/LICENSE.GPLv2 2001-09-09 03:46:40.000000000 +0200 +++ new/HsYAML-0.2.1.1/LICENSE.GPLv2 2001-09-09 03:46:40.000000000 +0200 @@ -337,12 +337,3 @@ consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. - - - - - - - - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HsYAML-0.2.1.0/LICENSE.GPLv3 new/HsYAML-0.2.1.1/LICENSE.GPLv3 --- old/HsYAML-0.2.1.0/LICENSE.GPLv3 2001-09-09 03:46:40.000000000 +0200 +++ new/HsYAML-0.2.1.1/LICENSE.GPLv3 2001-09-09 03:46:40.000000000 +0200 @@ -672,7 +672,3 @@ the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <http://www.gnu.org/philosophy/why-not-lgpl.html>. - - - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HsYAML-0.2.1.0/src/Data/YAML/Event.hs new/HsYAML-0.2.1.1/src/Data/YAML/Event.hs --- old/HsYAML-0.2.1.0/src/Data/YAML/Event.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/HsYAML-0.2.1.1/src/Data/YAML/Event.hs 2001-09-09 03:46:40.000000000 +0200 @@ -409,7 +409,6 @@ | ii, hasLeadingSpace acc = [Left (tok2pos t, "leading empty lines contain more spaces than the first non-empty line in scalar: " ++ show acc)] | otherwise = Right (EvPos (Scalar manchor tag sty (T.pack acc)) pos0) : cont rest - go' _ _ _ xs | False = error (show xs) go' _ _ _ xs = err xs hasLeadingSpace (' ':_) = True @@ -669,7 +668,7 @@ -- -- Round-tripping at event-level will preserve all the comments and their relative position in the YAML-document but still, -- we lose some information like the exact indentation and the position at which the comments were present previously. --- This information sometimes can be quiet important for human-perception of comments. +-- This information sometimes can be quite important for human-perception of comments. -- Below are some guildlines, so that you can avoid ambiguities. -- -- 1) Always try to start your comment in a newline. This step will avoid most of the ambiguities. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HsYAML-0.2.1.0/src/Data/YAML/Loader.hs new/HsYAML-0.2.1.1/src/Data/YAML/Loader.hs --- old/HsYAML-0.2.1.0/src/Data/YAML/Loader.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/HsYAML-0.2.1.1/src/Data/YAML/Loader.hs 2001-09-09 03:46:40.000000000 +0200 @@ -16,7 +16,9 @@ , NodeId ) where -import Control.Monad.State +import Control.Monad.State (MonadState(..), gets, modify, + StateT, evalStateT, state) +import Control.Monad.Trans (MonadTrans(..)) import qualified Data.ByteString.Lazy as BS.L import qualified Data.Map as Map import qualified Data.Set as Set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HsYAML-0.2.1.0/src/Data/YAML/Token.hs new/HsYAML-0.2.1.1/src/Data/YAML/Token.hs --- old/HsYAML-0.2.1.0/src/Data/YAML/Token.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/HsYAML-0.2.1.1/src/Data/YAML/Token.hs 2001-09-09 03:46:40.000000000 +0200 @@ -542,17 +542,17 @@ -- | @lookbehind <?@ matches the current point without consuming any -- characters, if the previous character matches the lookbehind parser (single --- character positive lookbehind) +-- character positive lookbehind). (<?) :: (Match match result) => match -> Parser result (<?) lookbehind = prev lookbehind -- | @lookahead >?@ matches the current point without consuming any characters --- if it matches the lookahead parser (positive lookahead) +-- if it matches the lookahead parser (positive lookahead). (>?) :: (Match match result) => match -> Parser result (>?) lookahead = peek lookahead --- | @lookahead >?@ matches the current point without consuming any characters --- if it matches the lookahead parser (negative lookahead) +-- | @lookahead >!@ matches the current point without consuming any characters +-- if it matches the lookahead parser (negative lookahead). (>!) :: (Match match result) => match -> Pattern (>!) lookahead = reject lookahead Nothing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HsYAML-0.2.1.0/src/Util.hs new/HsYAML-0.2.1.1/src/Util.hs --- old/HsYAML-0.2.1.0/src/Util.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/HsYAML-0.2.1.1/src/Util.hs 2001-09-09 03:46:40.000000000 +0200 @@ -33,8 +33,10 @@ import GHC.Generics as X (Generic) import Numeric.Natural as X (Natural) -import Control.Monad.Except as X (ExceptT (..), MonadError (..), runExceptT) +import Control.Monad.Fix as X (MonadFix) +import Control.Monad.Except as X (MonadError (..)) import Control.Monad.Identity as X +import Control.Monad.Trans.Except as X (ExceptT (..), runExceptT) import Data.Char as X (chr, ord) import Data.Map as X (Map) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HsYAML-0.2.1.0/src-test/TML.hs new/HsYAML-0.2.1.1/src-test/TML.hs --- old/HsYAML-0.2.1.0/src-test/TML.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/HsYAML-0.2.1.1/src-test/TML.hs 2001-09-09 03:46:40.000000000 +0200 @@ -40,12 +40,11 @@ import Text.Megaparsec import Text.Megaparsec.Char import qualified Text.Megaparsec.Char.Lexer as L -import Text.Megaparsec.Expr type Parser = Parsec Void T.Text parse :: String -> T.Text -> Either T.Text Document -parse fn raw = either (Left . T.pack . parseErrorPretty' raw) +parse fn raw = either (Left . T.pack . errorBundlePretty) (Right .process_pseudo) (Text.Megaparsec.parse testml_document fn raw) @@ -318,7 +317,7 @@ block_definition = do -- block_heading string "===" *> ws - l <- T.pack <$> manyTill anyChar eol + l <- T.pack <$> manyTill anySingle eol -- TODO: user_defined ps <- many point_definition @@ -333,7 +332,7 @@ let single = do _ <- char ':' *> ws - x <- T.pack <$> manyTill anyChar eol + x <- T.pack <$> manyTill anySingle eol -- consume and ignore any point_lines _ <- point_lines pure $! case j of @@ -358,7 +357,7 @@ point_lines :: Parser T.Text point_lines = T.pack . unlines <$> go where - go = many (notFollowedBy point_boundary *> manyTill anyChar eol) + go = many (notFollowedBy point_boundary *> manyTill anySingle eol) point_boundary :: Parser () point_boundary = void (string "---") <|> void (string "===") <|> eof

1 0

commit dhall-yaml for openSUSE:Factory
by Source-Sync 01 Aug '22

01 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dhall-yaml for openSUSE:Factory checked in at 2022-08-01 21:29:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dhall-yaml (Old) and /work/SRC/openSUSE:Factory/.dhall-yaml.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dhall-yaml" Mon Aug 1 21:29:27 2022 rev:13 rq:987011 version:1.2.10 Changes: -------- --- /work/SRC/openSUSE:Factory/dhall-yaml/dhall-yaml.changes 2022-02-11 23:10:27.059126705 +0100 +++ /work/SRC/openSUSE:Factory/.dhall-yaml.new.1533/dhall-yaml.changes 2022-08-01 21:29:28.737498101 +0200 @@ -1,0 +2,16 @@ +Sat Jun 18 00:38:34 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update dhall-yaml to version 1.2.10 revision 1. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- +Tue Feb 22 02:18:28 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update dhall-yaml to version 1.2.10. + 1.2.10 + + * Build against `dhall-1.41` + * [Build against `optparse-applicative-0.17`](https://github.com/dhall-lang/dhall-haskell/pull/2376) + * [Build against `text-2.0`](https://github.com/dhall-lang/dhall-haskell/pull/2356) + +------------------------------------------------------------------- Old: ---- dhall-yaml-1.2.9.tar.gz New: ---- dhall-yaml-1.2.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhall-yaml.spec ++++++ --- /var/tmp/diff_new_pack.6ppCee/_old 2022-08-01 21:29:29.445500132 +0200 +++ /var/tmp/diff_new_pack.6ppCee/_new 2022-08-01 21:29:29.453500155 +0200 @@ -19,13 +19,13 @@ %global pkg_name dhall-yaml %bcond_with tests Name: %{pkg_name} -Version: 1.2.9 +Version: 1.2.10 Release: 0 Summary: Convert between Dhall and YAML License: GPL-3.0-or-later URL: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.t… -Source1: https://hackage.haskell.org/package/%{name}-%{version}/revision/2.cabal#/%{… +Source1: https://hackage.haskell.org/package/%{name}-%{version}/revision/1.cabal#/%{… BuildRequires: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-HsYAML-aeson-devel ++++++ dhall-yaml-1.2.9.tar.gz -> dhall-yaml-1.2.10.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dhall-yaml-1.2.9/CHANGELOG.md new/dhall-yaml-1.2.10/CHANGELOG.md --- old/dhall-yaml-1.2.9/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 +++ new/dhall-yaml-1.2.10/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,9 @@ +1.2.10 + +* Build against `dhall-1.41` +* [Build against `optparse-applicative-0.17`](https://github.com/dhall-lang/dhall-haskell/pull/2376) +* [Build against `text-2.0`](https://github.com/dhall-lang/dhall-haskell/pull/2356) + 1.2.9 * [Build against `aeson-2.0`](https://github.com/dhall-lang/dhall-haskell/pull/2315) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dhall-yaml-1.2.9/dhall-yaml.cabal new/dhall-yaml-1.2.10/dhall-yaml.cabal --- old/dhall-yaml-1.2.9/dhall-yaml.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/dhall-yaml-1.2.10/dhall-yaml.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,5 @@ Name: dhall-yaml -Version: 1.2.9 +Version: 1.2.10 Cabal-Version: >=1.10 Build-Type: Simple License: GPL-3 @@ -36,10 +36,10 @@ base >= 4.11.0.0 && < 5 , aeson >= 1.0.0.0 && < 2.1 , bytestring < 0.12, - dhall >= 1.31.0 && < 1.41, + dhall >= 1.31.0 && < 1.42, dhall-json >= 1.6.0 && < 1.8 , - optparse-applicative >= 0.14.0.0 && < 0.17, - text >= 0.11.1.0 && < 1.3 , + optparse-applicative >= 0.14.0.0 && < 0.18, + text >= 0.11.1.0 && < 2.1 , vector Exposed-Modules: Dhall.Yaml @@ -74,7 +74,7 @@ optparse-applicative , prettyprinter >= 1.7.0 , prettyprinter-ansi-terminal >= 1.1.1 && < 1.2 , - text < 1.3 + text Other-Modules: Paths_dhall_yaml GHC-Options: -Wall ++++++ dhall-yaml.cabal ++++++ --- /var/tmp/diff_new_pack.6ppCee/_old 2022-08-01 21:29:29.553500442 +0200 +++ /var/tmp/diff_new_pack.6ppCee/_new 2022-08-01 21:29:29.557500453 +0200 @@ -1,6 +1,6 @@ Name: dhall-yaml -Version: 1.2.9 -x-revision: 2 +Version: 1.2.10 +x-revision: 1 Cabal-Version: >=1.10 Build-Type: Simple License: GPL-3 @@ -35,9 +35,9 @@ HsYAML >= 0.2 && < 0.3 , HsYAML-aeson >= 0.2 && < 0.3 , base >= 4.11.0.0 && < 5 , - aeson >= 1.0.0.0 && < 2.1 , + aeson >= 1.0.0.0 && < 2.2 , bytestring < 0.12, - dhall >= 1.31.0 && < 1.41, + dhall >= 1.31.0 && < 1.42, dhall-json >= 1.6.0 && < 1.8 , optparse-applicative >= 0.14.0.0 && < 0.18, text >= 0.11.1.0 && < 2.1 ,

1 0