commit ghc-gogol-core for openSUSE:Factory

31 Aug 2017

Hello community,

here is the log from the commit of package ghc-gogol-core for openSUSE:Factory checked in at 2017-08-31 20:47:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-gogol-core (Old)
 and      /work/SRC/openSUSE:Factory/.ghc-gogol-core.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ghc-gogol-core"

Thu Aug 31 20:47:20 2017 rev:2 rq:513292 version:0.3.0

Changes:
--------

--- /work/SRC/openSUSE:Factory/ghc-gogol-core/ghc-gogol-core.changes	2017-05-10 20:39:47.821608489 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-gogol-core.new/ghc-gogol-core.changes	2017-08-31 20:47:20.928213529 +0200
@@ -1,0 +2,5 @@
+Thu Jul 27 14:07:38 UTC 2017 - psimons@suse.com
+
+- Update to version 0.3.0.
+
+-------------------------------------------------------------------

Old:
----
  gogol-core-0.1.1.tar.gz
  gogol-core.cabal

New:
----
  gogol-core-0.3.0.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ghc-gogol-core.spec ++++++
--- /var/tmp/diff_new_pack.Y2kiWb/_old	2017-08-31 20:47:21.784093394 +0200
+++ /var/tmp/diff_new_pack.Y2kiWb/_new	2017-08-31 20:47:21.788092832 +0200
@@ -19,14 +19,13 @@
 %global pkg_name gogol-core
 %bcond_with tests
 Name:           ghc-%{pkg_name}
-Version:        0.1.1
+Version:        0.3.0
 Release:        0
 Summary:        Core data types and functionality for Gogol libraries
 License:        MPL-2.0
 Group:          Development/Languages/Other
 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-aeson-devel
 BuildRequires:  ghc-attoparsec-devel
@@ -42,7 +41,6 @@
 BuildRequires:  ghc-http-media-devel
 BuildRequires:  ghc-http-types-devel
 BuildRequires:  ghc-lens-devel
-BuildRequires:  ghc-memory-devel
 BuildRequires:  ghc-resourcet-devel
 BuildRequires:  ghc-rpm-macros
 BuildRequires:  ghc-scientific-devel
@@ -76,7 +74,6 @@
 
 %prep
 %setup -q -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
 
 %build
 %ghc_lib_build

++++++ gogol-core-0.1.1.tar.gz -> gogol-core-0.3.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gogol-core-0.1.1/gogol-core.cabal new/gogol-core-0.3.0/gogol-core.cabal
--- old/gogol-core-0.1.1/gogol-core.cabal	2016-11-03 14:21:01.000000000 +0100
+++ new/gogol-core-0.3.0/gogol-core.cabal	2017-07-12 16:45:05.000000000 +0200
@@ -1,5 +1,5 @@
 name:                  gogol-core
-version:               0.1.1
+version:               0.3.0
 synopsis:              Core data types and functionality for Gogol libraries.
 homepage:              https://github.com/brendanhay/gogol
 bug-reports:           https://github.com/brendanhay/gogol/issues
@@ -36,7 +36,7 @@
     ghc-options:       -Wall
 
     exposed-modules:
-          Network.Google.Data.Base64
+          Network.Google.Data.Bytes
         , Network.Google.Data.JSON
         , Network.Google.Data.Numeric
         , Network.Google.Data.Time
@@ -59,7 +59,6 @@
         , http-media           >= 0.6
         , http-types           >= 0.8.6
         , lens                 >= 4.4
-        , memory               >= 0.8
         , resourcet            >= 1.1
         , scientific           >= 0.3
         , servant              >= 0.4.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gogol-core-0.1.1/src/Network/Google/Data/Base64.hs new/gogol-core-0.3.0/src/Network/Google/Data/Base64.hs
--- old/gogol-core-0.1.1/src/Network/Google/Data/Base64.hs	2016-11-03 14:21:01.000000000 +0100
+++ new/gogol-core-0.3.0/src/Network/Google/Data/Base64.hs	1970-01-01 01:00:00.000000000 +0100
@@ -1,53 +0,0 @@
-{-# LANGUAGE DeriveDataTypeable         #-}
-{-# LANGUAGE DeriveGeneric              #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-
--- |
--- Module      : Network.Google.Data.Base64
--- Copyright   : (c) 2013-2016 Brendan Hay
--- License     : Mozilla Public License, v. 2.0.
--- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
--- Stability   : provisional
--- Portability : non-portable (GHC extensions)
---
-module Network.Google.Data.Base64
-    ( Base64 (..)
-    , _Base64
-    ) where
-
-import           Control.Lens             (Iso', iso)
-import           Data.Aeson               (FromJSON (..), ToJSON (..))
-import qualified Data.ByteArray.Encoding  as BA
-import           Data.ByteString          (ByteString)
-import qualified Data.ByteString.Char8    as BS8
-import           Data.Data                (Data, Typeable)
-import           Data.Hashable
-import qualified Data.Text.Encoding       as Text
-import           GHC.Generics             (Generic)
-import           Network.Google.Data.JSON (parseJSONText, toJSONText)
-import           Web.HttpApiData          (FromHttpApiData (..),
-                                           ToHttpApiData (..))
-
--- | Base64 encoded binary data.
---
--- Encoding\/decoding is automatically deferred to serialisation and deserialisation
--- respectively.
-newtype Base64 = Base64 { unBase64 :: ByteString }
-    deriving (Eq, Read, Ord, Data, Typeable, Generic)
-
-instance Hashable Base64
-
-_Base64 :: Iso' Base64 ByteString
-_Base64 = iso unBase64 Base64
-
-instance ToHttpApiData Base64 where
-    toQueryParam = Text.decodeUtf8 . toHeader
-    toHeader     = BA.convertToBase BA.Base64 . unBase64
-
-instance FromHttpApiData Base64 where
-    parseQueryParam = parseHeader . Text.encodeUtf8
-    parseHeader     = either fail (pure . Base64) . BA.convertFromBase BA.Base64
-
-instance Show     Base64 where show      = show . BS8.unpack . unBase64
-instance FromJSON Base64 where parseJSON = parseJSONText "Base64"
-instance ToJSON   Base64 where toJSON    = toJSONText
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gogol-core-0.1.1/src/Network/Google/Data/Bytes.hs new/gogol-core-0.3.0/src/Network/Google/Data/Bytes.hs
--- old/gogol-core-0.1.1/src/Network/Google/Data/Bytes.hs	1970-01-01 01:00:00.000000000 +0100
+++ new/gogol-core-0.3.0/src/Network/Google/Data/Bytes.hs	2017-07-12 16:45:05.000000000 +0200
@@ -0,0 +1,49 @@
+{-# LANGUAGE DeriveDataTypeable         #-}
+{-# LANGUAGE DeriveGeneric              #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+
+-- |
+-- Module      : Network.Google.Data.Bytes
+-- Copyright   : (c) 2013-2016 Brendan Hay
+-- License     : Mozilla Public License, v. 2.0.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : provisional
+-- Portability : non-portable (GHC extensions)
+--
+module Network.Google.Data.Bytes
+    ( Bytes (..)
+    , _Bytes
+    ) where
+
+import           Control.Lens             (Iso', iso)
+import           Data.Aeson               (FromJSON (..), ToJSON (..))
+import           Data.ByteString          (ByteString)
+import           Data.Data                (Data, Typeable)
+import           Data.Hashable
+import qualified Data.Text.Encoding       as Text
+import           GHC.Generics             (Generic)
+import           Network.Google.Data.JSON (parseJSONText, toJSONText)
+import           Web.HttpApiData          (FromHttpApiData (..),
+                                           ToHttpApiData (..))
+-- | Binary data.
+--
+-- This data is passed to/from the serialisation routines as-is, and any
+-- particular encoding or decoding (say, base64) is left up to the caller.
+newtype Bytes = Bytes { unBytes :: ByteString }
+    deriving (Eq, Show, Read, Ord, Data, Typeable, Generic)
+
+instance Hashable Bytes
+
+_Bytes :: Iso' Bytes ByteString
+_Bytes = iso unBytes Bytes
+
+instance ToHttpApiData Bytes where
+    toQueryParam = Text.decodeUtf8 . unBytes
+    toHeader     = unBytes
+
+instance FromHttpApiData Bytes where
+    parseQueryParam = pure . Bytes . Text.encodeUtf8
+    parseHeader     = pure . Bytes
+
+instance FromJSON Bytes where parseJSON = parseJSONText "Bytes"
+instance ToJSON   Bytes where toJSON    = toJSONText
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gogol-core-0.1.1/src/Network/Google/Data/Time.hs new/gogol-core-0.3.0/src/Network/Google/Data/Time.hs
--- old/gogol-core-0.1.1/src/Network/Google/Data/Time.hs	2016-11-03 14:21:01.000000000 +0100
+++ new/gogol-core-0.3.0/src/Network/Google/Data/Time.hs	2017-07-12 16:45:05.000000000 +0200
@@ -1,3 +1,4 @@
+{-# LANGUAGE OverloadedStrings          #-}
 {-# LANGUAGE DeriveDataTypeable         #-}
 {-# LANGUAGE DeriveGeneric              #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
@@ -22,6 +23,7 @@
     , _Duration
     ) where
 
+import           Data.Monoid                      ((<>))
 import           Control.Lens
 import           Data.Aeson
 import qualified Data.Aeson.Types                  as Aeson
@@ -86,7 +88,7 @@
 instance ToHttpApiData Duration where
     toQueryParam =
           LText.toStrict
-        . Build.toLazyText
+        . (\seconds -> Build.toLazyText seconds <> "s")
         . Sci.formatScientificBuilder Sci.Fixed (Just 9)
         . unDuration
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gogol-core-0.1.1/src/Network/Google/Prelude.hs new/gogol-core-0.3.0/src/Network/Google/Prelude.hs
--- old/gogol-core-0.1.1/src/Network/Google/Prelude.hs	2016-11-03 14:21:01.000000000 +0100
+++ new/gogol-core-0.3.0/src/Network/Google/Prelude.hs	2017-07-12 16:45:05.000000000 +0200
@@ -27,11 +27,11 @@
 import Network.HTTP.Client as Export (RequestBody)
 import Numeric.Natural     as Export (Natural)
 import Prelude             as Export hiding (product)
-import Servant.API         as Export hiding (Headers, getResponse)
+import Servant.API         as Export hiding (Headers, Link, getResponse)
 import Servant.Utils.Links as Export hiding (Link)
 import Web.HttpApiData     as Export (FromHttpApiData (..), ToHttpApiData (..))
 
-import Network.Google.Data.Base64  as Export
+import Network.Google.Data.Bytes   as Export
 import Network.Google.Data.JSON    as Export
 import Network.Google.Data.Numeric as Export
 import Network.Google.Data.Time    as Export

    

root＠hilbert.suse.de

tags

participants (1)