Hello community,
here is the log from the commit of package ghc-attoparsec-iso8601 for
openSUSE:Factory checked in at 2018-10-25 08:14:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-attoparsec-iso8601 (Old)
and /work/SRC/openSUSE:Factory/.ghc-attoparsec-iso8601.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-attoparsec-iso8601"
Thu Oct 25 08:14:45 2018 rev:5 rq:642848 version:1.0.1.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/ghc-attoparsec-iso8601/ghc-attoparsec-iso8601.changes
2018-07-24 17:13:00.938575248 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-attoparsec-iso8601.new/ghc-attoparsec-iso8601.changes
2018-10-25 08:14:48.432110381 +0200
@@ -1,0 +2,6 @@
+Wed Oct 10 19:23:52 UTC 2018 - [email protected]
+
+- Update attoparsec-iso8601 to version 1.0.1.0.
+ Upstream does not provide a change log file.
+
+-------------------------------------------------------------------
Old:
----
attoparsec-iso8601-1.0.0.0.tar.gz
attoparsec-iso8601.cabal
New:
----
attoparsec-iso8601-1.0.1.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-attoparsec-iso8601.spec ++++++
--- /var/tmp/diff_new_pack.OXJB1z/_old 2018-10-25 08:14:49.080110102 +0200
+++ /var/tmp/diff_new_pack.OXJB1z/_new 2018-10-25 08:14:49.084110100 +0200
@@ -12,20 +12,19 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%global pkg_name attoparsec-iso8601
Name: ghc-%{pkg_name}
-Version: 1.0.0.0
+Version: 1.0.1.0
Release: 0
Summary: Parsing of ISO 8601 dates, originally from aeson
License: BSD-3-Clause
Group: Development/Libraries/Haskell
URL: https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
-Source1:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-attoparsec-devel
BuildRequires: ghc-base-compat-devel
@@ -50,7 +49,6 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
++++++ attoparsec-iso8601-1.0.0.0.tar.gz -> attoparsec-iso8601-1.0.1.0.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/attoparsec-iso8601-1.0.0.0/Data/Attoparsec/Time/Internal.hs
new/attoparsec-iso8601-1.0.1.0/Data/Attoparsec/Time/Internal.hs
--- old/attoparsec-iso8601-1.0.0.0/Data/Attoparsec/Time/Internal.hs
2017-04-20 10:05:15.000000000 +0200
+++ new/attoparsec-iso8601-1.0.1.0/Data/Attoparsec/Time/Internal.hs
2018-09-24 03:52:40.000000000 +0200
@@ -1,5 +1,5 @@
{-# LANGUAGE CPP #-}
-
+{-# LANGUAGE NoImplicitPrelude #-}
-- |
-- Module: Data.Aeson.Internal.Time
-- Copyright: (c) 2015-2016 Bryan O'Sullivan
@@ -17,17 +17,37 @@
, toTimeOfDay64
) where
-import Prelude ()
import Prelude.Compat
import Data.Int (Int64)
import Data.Time
import Unsafe.Coerce (unsafeCoerce)
+#if MIN_VERSION_time(1,6,0)
+
+import Data.Time.Clock (diffTimeToPicoseconds)
+
+#endif
+
#if MIN_VERSION_base(4,7,0)
import Data.Fixed (Pico, Fixed(MkFixed))
+#else
+
+import Data.Fixed (Pico)
+
+#endif
+
+#if !MIN_VERSION_time(1,6,0)
+
+diffTimeToPicoseconds :: DiffTime -> Integer
+diffTimeToPicoseconds = unsafeCoerce
+
+#endif
+
+#if MIN_VERSION_base(4,7,0)
+
toPico :: Integer -> Pico
toPico = MkFixed
@@ -36,8 +56,6 @@
#else
-import Data.Fixed (Pico)
-
toPico :: Integer -> Pico
toPico = unsafeCoerce
@@ -51,11 +69,16 @@
{-# UNPACK #-} !Int
{-# UNPACK #-} !Int64
+posixDayLength :: DiffTime
+posixDayLength = 86400
+
diffTimeOfDay64 :: DiffTime -> TimeOfDay64
-diffTimeOfDay64 t = TOD (fromIntegral h) (fromIntegral m) s
- where (h,mp) = fromIntegral pico `quotRem` 3600000000000000
- (m,s) = mp `quotRem` 60000000000000
- pico = unsafeCoerce t :: Integer
+diffTimeOfDay64 t
+ | t >= posixDayLength = TOD 23 59 (60000000000000 + pico (t -
posixDayLength))
+ | otherwise = TOD (fromIntegral h) (fromIntegral m) s
+ where (h,mp) = pico t `quotRem` 3600000000000000
+ (m,s) = mp `quotRem` 60000000000000
+ pico = fromIntegral . diffTimeToPicoseconds
toTimeOfDay64 :: TimeOfDay -> TimeOfDay64
toTimeOfDay64 (TimeOfDay h m s) = TOD h m (fromIntegral (fromPico s))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/attoparsec-iso8601-1.0.0.0/Data/Attoparsec/Time.hs
new/attoparsec-iso8601-1.0.1.0/Data/Attoparsec/Time.hs
--- old/attoparsec-iso8601-1.0.0.0/Data/Attoparsec/Time.hs 2017-04-20
10:05:15.000000000 +0200
+++ new/attoparsec-iso8601-1.0.1.0/Data/Attoparsec/Time.hs 2018-09-24
03:52:40.000000000 +0200
@@ -1,6 +1,6 @@
{-# LANGUAGE BangPatterns #-}
+{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE ScopedTypeVariables #-}
-
-- |
-- Module: Data.Aeson.Parser.Time
-- Copyright: (c) 2015-2016 Bryan O'Sullivan
@@ -21,7 +21,6 @@
, zonedTime
) where
-import Prelude ()
import Prelude.Compat
import Control.Applicative ((<|>))
@@ -42,9 +41,9 @@
day :: Parser Day
day = do
absOrNeg <- negate <$ char '-' <|> id <$ char '+' <|> pure id
- y <- decimal <* char '-'
- m <- twoDigits <* char '-'
- d <- twoDigits
+ y <- (decimal <* 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 two-digit integer (e.g. day of month, hour).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/attoparsec-iso8601-1.0.0.0/attoparsec-iso8601.cabal
new/attoparsec-iso8601-1.0.1.0/attoparsec-iso8601.cabal
--- old/attoparsec-iso8601-1.0.0.0/attoparsec-iso8601.cabal 2017-04-20
10:05:15.000000000 +0200
+++ new/attoparsec-iso8601-1.0.1.0/attoparsec-iso8601.cabal 2018-09-24
03:52:40.000000000 +0200
@@ -1,5 +1,5 @@
name: attoparsec-iso8601
-version: 1.0.0.0
+version: 1.0.1.0
synopsis: Parsing of ISO 8601 dates, originally from aeson.
description: Parsing of ISO 8601 dates, originally from aeson.
license: BSD3
@@ -37,7 +37,7 @@
build-depends:
attoparsec >= 0.13.0.1,
base >= 4.5 && < 5,
- base-compat >= 0.9.1 && < 0.10,
+ base-compat >= 0.9.1 && < 0.11,
text >= 1.1.1.0,
time >= 1.1.1.4
