Hello community,
here is the log from the commit of package ghc-network-uri for openSUSE:Factory
checked in at 2020-05-11 13:35:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-network-uri (Old)
and /work/SRC/openSUSE:Factory/.ghc-network-uri.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-network-uri"
Mon May 11 13:35:33 2020 rev:11 rq:801036 version:2.6.3.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-network-uri/ghc-network-uri.changes
2020-03-09 14:16:34.494632812 +0100
+++
/work/SRC/openSUSE:Factory/.ghc-network-uri.new.2738/ghc-network-uri.changes
2020-05-11 13:35:59.376442899 +0200
@@ -1,0 +2,5 @@
+Wed May 6 10:06:40 UTC 2020 - Peter Simons <[email protected]>
+
+- Downgrade to version 2.6.3.0. Upstream has retracted 2.7.0.0.
+
+-------------------------------------------------------------------
Old:
----
network-uri-2.7.0.0.tar.gz
network-uri.cabal
New:
----
network-uri-2.6.3.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-network-uri.spec ++++++
--- /var/tmp/diff_new_pack.ZgxG2H/_old 2020-05-11 13:36:00.312444861 +0200
+++ /var/tmp/diff_new_pack.ZgxG2H/_new 2020-05-11 13:36:00.316444870 +0200
@@ -19,13 +19,12 @@
%global pkg_name network-uri
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 2.7.0.0
+Version: 2.6.3.0
Release: 0
Summary: URI manipulation
License: BSD-3-Clause
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-deepseq-devel
BuildRequires: ghc-parsec-devel
@@ -78,7 +77,6 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
++++++ network-uri-2.7.0.0.tar.gz -> network-uri-2.6.3.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/network-uri-2.7.0.0/CHANGELOG.md
new/network-uri-2.6.3.0/CHANGELOG.md
--- old/network-uri-2.7.0.0/CHANGELOG.md 2001-09-09 03:46:40.000000000
+0200
+++ new/network-uri-2.6.3.0/CHANGELOG.md 2001-09-09 03:46:40.000000000
+0200
@@ -1,2 +1,33 @@
-# network-uri-2.6.2.0 (2019-??-??)
-* Added a `Generic` instance for `URIAuth`.
+# network-uri-2.6.3.0 (2020-02-18)
+* Add official support for SafeHaskell
+ NOTE: This is the first version whose SafeHaskell properties have become an
+ intentional part of the API contract; previous versions were merely
+ accidentally safe-inferred (or not depending on various factors; in other
+ words, this was a fragile property).
+* Derive `Lift` instances using `DeriveLift` extension, when available.
+
+# network-uri-2.6.2.0 (2020-01-30)
+* Mark the modules as Safe for SafeHaskell.
+
+# network-uri-2.6.2.0 (2020-01-30)
+* Merge network-uri-static (Network.URI.Static) into this
+ package, which offers a way to parse URI strings at compile time.
+* Add `Lens`es for the `URI` types
+* Add `Generic` instances for the `URI` type
+* Add `Lift` instances for the `URI` type
+* Optimize `isReserved` and related character-class functions.
+* Start to add some benchmarks for performance analysis
+* Fix a bug: Correctly parse IPv6 addresses in URIs.
+* Add `rectify` which normalizes a URI if it is missing certain
+ separator characters required by the module. Some users found adding
+ those characters inconvenient when building a URI from parts.
+* Add `nullURIAuth` and `uriAuthToString`, paralleling `nullURI` and
`uriToString`.
+
+# network-uri-2.6.0.3
+* Fix a bug with IPv4 address parsing.
+
+# network-uri-2.6.0.2
+* Implement Generic and NFData.
+
+# network-uri-2.6.0.0
+* Initial release: Module split off from `network`.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/network-uri-2.7.0.0/Network/URI/Lens.hs
new/network-uri-2.6.3.0/Network/URI/Lens.hs
--- old/network-uri-2.7.0.0/Network/URI/Lens.hs 2001-09-09 03:46:40.000000000
+0200
+++ new/network-uri-2.6.3.0/Network/URI/Lens.hs 2001-09-09 03:46:40.000000000
+0200
@@ -1,4 +1,10 @@
+{-# LANGUAGE CPP #-}
{-# LANGUAGE Rank2Types #-}
+#if __GLASGOW_HASKELL__ > 704
+{-# LANGUAGE Safe #-}
+#elif __GLASGOW_HASKELL__ > 702
+{-# LANGUAGE Trustworthy #-}
+#endif
-- | Network uri lenses
module Network.URI.Lens
( uriRegNameLens
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/network-uri-2.7.0.0/Network/URI/Static.hs
new/network-uri-2.6.3.0/Network/URI/Static.hs
--- old/network-uri-2.7.0.0/Network/URI/Static.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/network-uri-2.6.3.0/Network/URI/Static.hs 2001-09-09
03:46:40.000000000 +0200
@@ -1,24 +1,38 @@
#if __GLASGOW_HASKELL__ < 800
-module Network.URI.Static () where
+{-# LANGUAGE RecordWildCards, TemplateHaskell, ViewPatterns #-}
#else
-
{-# LANGUAGE RecordWildCards, TemplateHaskellQuotes, ViewPatterns #-}
-
+#endif
+#if MIN_VERSION_template_haskell(2,12,0)
+{-# LANGUAGE Safe #-}
+#elif __GLASGOW_HASKELL__ >= 702
+{-# LANGUAGE Trustworthy #-}
+#endif
module Network.URI.Static
(
-- * Absolute URIs
uri
+#if __GLASGOW_HASKELL__ >= 708
, staticURI
+#endif
+ , staticURI'
-- * Relative URIs
, relativeReference
+#if __GLASGOW_HASKELL__ >= 708
, staticRelativeReference
+#endif
+ , staticRelativeReference'
) where
-import Language.Haskell.TH (unType)
-import Language.Haskell.TH.Lib (TExpQ)
+import Language.Haskell.TH.Lib (ExpQ)
import Language.Haskell.TH.Quote (QuasiQuoter(..))
import Network.URI (URI(..), parseURI, parseRelativeReference)
+#if __GLASGOW_HASKELL__ >= 708
+import Language.Haskell.TH.Lib (TExpQ)
+import Language.Haskell.TH.Syntax (unTypeQ)
+#endif
+
-- $setup
-- >>> :set -XTemplateHaskell
-- >>> :set -XQuasiQuotes
@@ -27,6 +41,7 @@
-- Absolute URIs
----------------------------------------------------------------------------
+#if __GLASGOW_HASKELL__ >= 708
-- | 'staticURI' parses a specified string at compile time
-- and return an expression representing the URI when it's a valid URI.
-- Otherwise, it emits an error.
@@ -43,6 +58,19 @@
-> TExpQ URI -- ^ URI
staticURI (parseURI -> Just u) = [|| u ||]
staticURI s = fail $ "Invalid URI: " ++ s
+#endif
+
+-- | 'staticURI'' parses a specified string at compile time.
+--
+-- The typed template haskell 'staticURI' is available only with GHC-7.8+.
+staticURI' :: String -- ^ String representation of a URI
+ -> ExpQ -- ^ URI
+#if __GLASGOW_HASKELL__ >= 708
+staticURI' = unTypeQ . staticURI
+#else
+staticURI' (parseURI -> Just u) = [| u |]
+staticURI' s = fail $ "Invalid URI: " ++ s
+#endif
-- | 'uri' is a quasi quoter for 'staticURI'.
--
@@ -56,7 +84,7 @@
-- ...
uri :: QuasiQuoter
uri = QuasiQuoter {
- quoteExp = fmap unType . staticURI,
+ quoteExp = staticURI',
quotePat = undefined,
quoteType = undefined,
quoteDec = undefined
@@ -66,6 +94,7 @@
-- Relative URIs
----------------------------------------------------------------------------
+#if __GLASGOW_HASKELL__ >= 708
-- | 'staticRelativeReference' parses a specified string at compile time and
-- return an expression representing the URI when it's a valid relative
-- reference. Otherwise, it emits an error.
@@ -82,6 +111,21 @@
-> TExpQ URI -- ^ Refererence
staticRelativeReference (parseRelativeReference -> Just ref) = [|| ref ||]
staticRelativeReference ref = fail $ "Invalid relative reference: " ++ ref
+#endif
+
+-- | 'staticRelativeReference'' parses a specified string at compile time and
+-- return an expression representing the URI when it's a valid relative
+-- reference. Otherwise, it emits an error.
+--
+-- The typed template haskell 'staticRelativeReference' is available only with
GHC-7.8+.
+staticRelativeReference' :: String -- ^ String representation of a reference
+ -> ExpQ -- ^ Refererence
+#if __GLASGOW_HASKELL__ >= 708
+staticRelativeReference' = unTypeQ . staticRelativeReference
+#else
+staticRelativeReference' (parseRelativeReference -> Just ref) = [| ref |]
+staticRelativeReference' ref = fail $ "Invalid relative reference: " ++ ref
+#endif
-- | 'relativeReference' is a quasi quoter for 'staticRelativeReference'.
--
@@ -95,10 +139,8 @@
-- ...
relativeReference :: QuasiQuoter
relativeReference = QuasiQuoter {
- quoteExp = fmap unType . staticRelativeReference,
+ quoteExp = staticRelativeReference',
quotePat = undefined,
quoteType = undefined,
quoteDec = undefined
}
-
-#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/network-uri-2.7.0.0/Network/URI.hs
new/network-uri-2.6.3.0/Network/URI.hs
--- old/network-uri-2.7.0.0/Network/URI.hs 2001-09-09 03:46:40.000000000
+0200
+++ new/network-uri-2.6.3.0/Network/URI.hs 2001-09-09 03:46:40.000000000
+0200
@@ -1,7 +1,15 @@
{-# LANGUAGE RecordWildCards, CPP #-}
#if __GLASGOW_HASKELL__ >= 800
-{-# LANGUAGE TemplateHaskellQuotes #-}
+{-# LANGUAGE DeriveLift, StandaloneDeriving #-}
+#else
+{-# LANGUAGE TemplateHaskell #-}
+#endif
+#if MIN_VERSION_template_haskell(2,12,0) && MIN_VERSION_parsec(3,13,0)
+{-# LANGUAGE Safe #-}
+#elif __GLASGOW_HASKELL__ >= 702
+{-# LANGUAGE Trustworthy #-}
#endif
+
--------------------------------------------------------------------------------
-- |
-- Module : Network.URI
@@ -140,15 +148,7 @@
import Data.List (unfoldr, isPrefixOf, isSuffixOf)
import Numeric (showIntAtBase)
-#if __GLASGOW_HASKELL__ >= 800
-#ifndef MIN_VERSION_network_uri_static
import Language.Haskell.TH.Syntax (Lift(..))
-#else
-#if MIN_VERSION_network_uri_static(0,1,2)
-import Language.Haskell.TH.Syntax (Lift(..))
-#endif
-#endif
-#endif
#if !MIN_VERSION_base(4,8,0)
import Data.Traversable (sequenceA)
@@ -161,9 +161,8 @@
import Data.Generics (Data)
#endif
-#if MIN_VERSION_base(4,6,0)
+#if __GLASGOW_HASKELL__ >= 702
import GHC.Generics (Generic)
-#else
#endif
------------------------------------------------------------
@@ -185,7 +184,7 @@
, uriPath :: String -- ^ @\/ghc@
, uriQuery :: String -- ^ @?query@
, uriFragment :: String -- ^ @#frag@
-#if MIN_VERSION_base(4,6,0)
+#if __GLASGOW_HASKELL__ >= 702
} deriving (Eq, Ord, Typeable, Data, Generic)
#else
} deriving (Eq, Ord, Typeable, Data)
@@ -234,7 +233,7 @@
{ uriUserInfo :: String -- ^ @anonymous\@@
, uriRegName :: String -- ^ @www.haskell.org@
, uriPort :: String -- ^ @:42@
-#if MIN_VERSION_base(4,6,0)
+#if __GLASGOW_HASKELL__ >= 702
} deriving (Eq, Ord, Show, Typeable, Data, Generic)
#else
} deriving (Eq, Ord, Show, Typeable, Data)
@@ -1378,22 +1377,15 @@
------------------------------------------------------------
#if __GLASGOW_HASKELL__ >= 800
-#ifndef MIN_VERSION_network_uri_static
-instance Lift URI where
- lift (URI {..}) = [| URI {..} |]
-
-instance Lift URIAuth where
- lift (URIAuth {..}) = [| URIAuth {..} |]
+deriving instance Lift URI
+deriving instance Lift URIAuth
#else
-#if MIN_VERSION_network_uri_static(0,1,2)
instance Lift URI where
lift (URI {..}) = [| URI {..} |]
instance Lift URIAuth where
lift (URIAuth {..}) = [| URIAuth {..} |]
#endif
-#endif
-#endif
------------------------------------------------------------
-- Deprecated functions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/network-uri-2.7.0.0/network-uri.cabal
new/network-uri-2.6.3.0/network-uri.cabal
--- old/network-uri-2.7.0.0/network-uri.cabal 2001-09-09 03:46:40.000000000
+0200
+++ new/network-uri-2.6.3.0/network-uri.cabal 2001-09-09 03:46:40.000000000
+0200
@@ -1,5 +1,5 @@
name: network-uri
-version: 2.7.0.0
+version: 2.6.3.0
synopsis: URI manipulation
description:
This package provides facilities for parsing and unparsing URIs, and creating
@@ -45,7 +45,19 @@
category: Network
build-type: Simple
cabal-version: >=1.10
-tested-with: GHC==8.2.1, GHC==8.0.2, GHC==7.10.3, GHC==7.8.4,
GHC==7.6.3, GHC==7.4.2, GHC==7.2.2, GHC==7.0.4
+tested-with:
+ GHC ==8.10.1
+ || ==8.8.2
+ || ==8.6.5
+ || ==8.4.4
+ || ==8.2.2
+ || ==8.0.2
+ || ==7.10.3
+ || ==7.8.4
+ || ==7.6.3
+ || ==7.4.2
+ || ==7.2.2
+ || ==7.0.2
library
exposed-modules:
@@ -55,11 +67,12 @@
build-depends:
base >= 3 && < 5,
deepseq >= 1.1 && < 1.5,
- parsec >= 3.0 && < 3.2
- if impl(ghc >= 8.0)
- build-depends: template-haskell
+ parsec >= 3.1.12.0 && < 3.2
+ build-depends: template-haskell
default-extensions: CPP, DeriveDataTypeable
- if impl(ghc >= 7.6)
+ if impl(ghc < 7.6)
+ build-depends: ghc-prim
+ if impl(ghc >= 7.2)
default-extensions: DeriveGeneric
ghc-options: -Wall -fwarn-tabs
default-language: Haskell98
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/network-uri-2.7.0.0/tests/uri-bench.hs
new/network-uri-2.6.3.0/tests/uri-bench.hs
--- old/network-uri-2.7.0.0/tests/uri-bench.hs 2001-09-09 03:46:40.000000000
+0200
+++ new/network-uri-2.6.3.0/tests/uri-bench.hs 2001-09-09 03:46:40.000000000
+0200
@@ -53,4 +53,7 @@
bench "isReserved a" $ nf isReserved 'a'
, bench "isReserved :" $ nf isReserved ':'
]
+ ,
+ bench "parseURI" $
+ nf parseURI "http://[email protected]/flip/flop?a=b&c=d";
]
