commit ghc-uuid-orphans for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-uuid-orphans for openSUSE:Factory checked in at 2017-04-11 09:34:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-uuid-orphans (Old) and /work/SRC/openSUSE:Factory/.ghc-uuid-orphans.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-uuid-orphans" Tue Apr 11 09:34:08 2017 rev:2 rq:483135 version:1.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-uuid-orphans/ghc-uuid-orphans.changes 2017-03-28 15:19:14.386910249 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-uuid-orphans.new/ghc-uuid-orphans.changes 2017-04-11 09:34:11.330097245 +0200 @@ -1,0 +2,5 @@ +Thu Sep 15 07:13:23 UTC 2016 - psimons@suse.com + +- Update to version 1.4.1 revision 0 with cabal2obs. + +------------------------------------------------------------------- Old: ---- uuid-orphans-1.3.11.1.tar.gz New: ---- uuid-orphans-1.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-uuid-orphans.spec ++++++ --- /var/tmp/diff_new_pack.7ezEUH/_old 2017-04-11 09:34:12.337954873 +0200 +++ /var/tmp/diff_new_pack.7ezEUH/_new 2017-04-11 09:34:12.341954308 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-uuid-orphans # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,22 +18,21 @@ %global pkg_name uuid-orphans Name: ghc-%{pkg_name} -Version: 1.3.11.1 +Version: 1.4.1 Release: 0 Summary: Orphan instances for the UUID datatype License: BSD-3-Clause -Group: System/Libraries +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 BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros -# Begin cabal-rpm deps: BuildRequires: ghc-safecopy-devel BuildRequires: ghc-text-devel +BuildRequires: ghc-th-lift-devel BuildRequires: ghc-uuid-types-devel BuildRequires: ghc-web-routes-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -# End cabal-rpm deps %description Orphan instances for the UUID datatype. Currently , instances for SafeCopy and @@ -54,15 +53,12 @@ %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install - %post devel %ghc_pkg_recache ++++++ uuid-orphans-1.3.11.1.tar.gz -> uuid-orphans-1.4.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/uuid-orphans-1.3.11.1/Data/UUID/Orphans.hs new/uuid-orphans-1.4.1/Data/UUID/Orphans.hs --- old/uuid-orphans-1.3.11.1/Data/UUID/Orphans.hs 2015-09-22 20:01:54.000000000 +0200 +++ new/uuid-orphans-1.4.1/Data/UUID/Orphans.hs 2016-07-10 02:50:33.000000000 +0200 @@ -1,9 +1,10 @@ -{-# LANGUAGE TemplateHaskell #-} -module Data.UUID.Orphans () where +{-# LANGUAGE CPP, TemplateHaskell #-} +module Data.UUID.Orphans (showUUID) where import Data.SafeCopy (base, deriveSafeCopy) import Data.Text as T (pack, unpack) import Data.UUID.Types (UUID, toString, fromString) +import Language.Haskell.TH.Lift (deriveLiftMany) import Web.Routes.PathInfo $(deriveSafeCopy 0 'base ''UUID) @@ -12,3 +13,14 @@ toPathSegments = (:[]) . T.pack . toString fromPathSegments = pToken (const ("UUID" :: String)) checkUUID where checkUUID txt = fromString (T.unpack txt) + +#if !__GHCJS__ +$(deriveLiftMany [ + ''UUID + ]) +#endif + +-- | The Show instance for UUID does not return a string containing a +-- haskell expression, so if that is required use this function instead. +showUUID :: UUID -> String +showUUID uuid = "(read " ++ show (show uuid) ++ " :: UUID)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/uuid-orphans-1.3.11.1/uuid-orphans.cabal new/uuid-orphans-1.4.1/uuid-orphans.cabal --- old/uuid-orphans-1.3.11.1/uuid-orphans.cabal 2015-09-22 20:01:54.000000000 +0200 +++ new/uuid-orphans-1.4.1/uuid-orphans.cabal 2016-07-10 02:50:33.000000000 +0200 @@ -1,5 +1,5 @@ name: uuid-orphans -version: 1.3.11.1 +version: 1.4.1 cabal-version: >= 1.10 build-type: Simple license: BSD3 @@ -8,7 +8,7 @@ author: David Fox copyright: (c) David Fox maintainer: David Fox <dsf@seereason.com> -bug-reports: https://github.com/seereason/uuid +bug-reports: https://github.com/seereason/uuid-orphans stability: experimental tested-with: GHC == 7.10.2 synopsis: Orphan instances for the UUID datatype @@ -22,6 +22,7 @@ uuid-types >= 1.0.2, safecopy, text, + th-lift, web-routes ghc-options: -Wall exposed-modules: Data.UUID.Orphans @@ -29,4 +30,4 @@ source-repository head type: git - location: git://github.com/seereason/uuid.git + location: git://github.com/ddssff/uuid-orphans.git
participants (1)
-
root@hilbert.suse.de