Hello community,
here is the log from the commit of package ghc-semigroupoids for openSUSE:Factory checked in at 2018-07-24 17:21:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-semigroupoids (Old)
and /work/SRC/openSUSE:Factory/.ghc-semigroupoids.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-semigroupoids"
Tue Jul 24 17:21:43 2018 rev:8 rq:623851 version:5.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-semigroupoids/ghc-semigroupoids.changes 2018-05-30 12:27:09.078600733 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-semigroupoids.new/ghc-semigroupoids.changes 2018-07-24 17:21:45.111251319 +0200
@@ -1,0 +2,18 @@
+Wed Jul 18 14:26:40 UTC 2018 - psimons@suse.com
+
+- Cosmetic: replace tabs with blanks, strip trailing white space,
+ and update copyright headers with spec-cleaner.
+
+-------------------------------------------------------------------
+Fri Jul 13 14:32:00 UTC 2018 - psimons@suse.com
+
+- Update semigroupoids to version 5.3.1.
+ * Fix a regression introduced in `semigroupoids-5.3` in which some modules
+ regressed from `Trustworthy` to `Unsafe`.
+ * Allow building with `containers-0.6`.
+ * Add `Alt` instances for `First` and `Last` from `Data.Semigroup`, and
+ `Alt` and `Plus` instances for `First` and `Last` from `Data.Monoid`.
+ * Add missing `Apply`, `Bind`, `Extend`, `Foldable1` and `Traversable1`
+ instances for `Data.Semigroups`, `Data.Monoid` and `GHC.Generics`.
+
+-------------------------------------------------------------------
@@ -79 +96,0 @@
-
Old:
----
semigroupoids-5.2.2.tar.gz
semigroupoids.cabal
New:
----
semigroupoids-5.3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-semigroupoids.spec ++++++
--- /var/tmp/diff_new_pack.beKCiL/_old 2018-07-24 17:21:45.955252399 +0200
+++ /var/tmp/diff_new_pack.beKCiL/_new 2018-07-24 17:21:45.955252399 +0200
@@ -19,14 +19,13 @@
%global pkg_name semigroupoids
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 5.2.2
+Version: 5.3.1
Release: 0
Summary: Semigroupoids: Category sans id
License: BSD-2-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/3.cabal#/%{pkg_name}.cabal
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-base-orphans-devel
BuildRequires: ghc-bifunctors-devel
@@ -97,7 +96,6 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
++++++ semigroupoids-5.2.2.tar.gz -> semigroupoids-5.3.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/semigroupoids-5.2.2/.gitignore new/semigroupoids-5.3.1/.gitignore
--- old/semigroupoids-5.2.2/.gitignore 2018-01-18 21:07:06.000000000 +0100
+++ new/semigroupoids-5.3.1/.gitignore 2018-07-02 20:08:27.000000000 +0200
@@ -1,3 +1,4 @@
+.ghc.environment.*
dist
docs
wiki
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/semigroupoids-5.2.2/.travis.yml new/semigroupoids-5.3.1/.travis.yml
--- old/semigroupoids-5.2.2/.travis.yml 2018-01-18 21:07:06.000000000 +0100
+++ new/semigroupoids-5.3.1/.travis.yml 2018-07-02 20:08:27.000000000 +0200
@@ -1,6 +1,6 @@
# 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'
+# runghc make_travis_yml_2.hs '-o' '.travis.yml' '--ghc-head' '--irc-channel=irc.freenode.org#haskell-lens' '--no-no-tests-no-bench' '--no-unconstrained' 'cabal.project'
#
# For more information, see https://github.com/hvr/multi-ghc-travis
#
@@ -36,42 +36,45 @@
matrix:
include:
- - compiler: "ghc-7.0.4"
+ - compiler: "ghc-8.6.1"
+ env: GHCHEAD=true
+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.6.1], sources: [hvr-ghc]}}
+ - compiler: "ghc-8.4.3"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
- addons: {apt: {packages: [*apt_packages,cabal-install-2.0,ghc-7.0.4], sources: [hvr-ghc]}}
- - compiler: "ghc-7.2.2"
+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], 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-7.2.2], sources: [hvr-ghc]}}
- - compiler: "ghc-7.4.2"
+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], 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-7.4.2], sources: [hvr-ghc]}}
- - compiler: "ghc-7.6.3"
+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], 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.6.3], sources: [hvr-ghc]}}
+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.10.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"
+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.8.4], 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.10.3], sources: [hvr-ghc]}}
- - compiler: "ghc-8.0.2"
+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.6.3], sources: [hvr-ghc]}}
+ - compiler: "ghc-7.4.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"
+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.4.2], sources: [hvr-ghc]}}
+ - compiler: "ghc-7.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]}}
+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.2.2], sources: [hvr-ghc]}}
+ - compiler: "ghc-7.0.4"
+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.0.4], sources: [hvr-ghc]}}
- compiler: "ghc-head"
env: GHCHEAD=true
- addons: {apt: {packages: [*apt_packages,cabal-install-head,ghc-head], sources: [hvr-ghc]}}
+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-head], sources: [hvr-ghc]}}
allow_failures:
+ - compiler: "ghc-head"
- compiler: "ghc-7.0.4"
- compiler: "ghc-7.2.2"
- - compiler: "ghc-8.4.1"
- - compiler: "ghc-head"
+ - compiler: "ghc-8.6.1"
before_install:
- HC=${CC}
@@ -89,7 +92,8 @@
- BENCH=${BENCH---enable-benchmarks}
- TEST=${TEST---enable-tests}
- HADDOCK=${HADDOCK-true}
- - INSTALLED=${INSTALLED-true}
+ - UNCONSTRAINED=${UNCONSTRAINED-true}
+ - NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}
- GHCHEAD=${GHCHEAD-false}
- travis_retry cabal update -v
- "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
@@ -97,7 +101,8 @@
# 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
+ sed -i 's/-- allow-newer: .*/allow-newer: *:base/' ${HOME}/.cabal/config
+ for pkg in $($HCPKG list --simple-output); do pkg=$(echo $pkg | sed 's/-[^-]*$//'); sed -i "s/allow-newer: /allow-newer: *:$pkg, /" ${HOME}/.cabal/config; done
echo 'repository head.hackage' >> ${HOME}/.cabal/config
echo ' url: http://head.hackage.haskell.org/' >> ${HOME}/.cabal/config
@@ -107,17 +112,22 @@
echo ' 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e' >> ${HOME}/.cabal/config
echo ' key-threshold: 3' >> ${HOME}/.cabal.config
+ grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
+
cabal new-update head.hackage -v
fi
- grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
- "printf 'packages: \".\"\\n' > cabal.project"
- - cat cabal.project
+ - touch cabal.project.local
+ - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
+ - cat cabal.project || true
+ - cat cabal.project.local || true
- 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
+ - 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;
@@ -129,8 +139,10 @@
- cd ${DISTDIR} || false
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
- "printf 'packages: semigroupoids-*/*.cabal\\n' > cabal.project"
- - cat cabal.project
-
+ - touch cabal.project.local
+ - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
+ - cat cabal.project || true
+ - cat cabal.project.local || true
# build & run tests, build benchmarks
- cabal new-build -w ${HC} ${TEST} ${BENCH} all
@@ -143,5 +155,5 @@
- 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"]
+# REGENDATA ["-o",".travis.yml","--ghc-head","--irc-channel=irc.freenode.org#haskell-lens","--no-no-tests-no-bench","--no-unconstrained","cabal.project"]
# EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/semigroupoids-5.2.2/CHANGELOG.markdown new/semigroupoids-5.3.1/CHANGELOG.markdown
--- old/semigroupoids-5.2.2/CHANGELOG.markdown 2018-01-18 21:07:06.000000000 +0100
+++ new/semigroupoids-5.3.1/CHANGELOG.markdown 2018-07-02 20:08:27.000000000 +0200
@@ -1,3 +1,16 @@
+5.3.1 [2018.07.02]
+------------------
+* Fix a regression introduced in `semigroupoids-5.3` in which some modules
+ regressed from `Trustworthy` to `Unsafe`.
+
+5.3 [2018.07.02]
+----------------
+* Allow building with `containers-0.6`.
+* Add `Alt` instances for `First` and `Last` from `Data.Semigroup`, and
+ `Alt` and `Plus` instances for `First` and `Last` from `Data.Monoid`.
+* Add missing `Apply`, `Bind`, `Extend`, `Foldable1` and `Traversable1`
+ instances for `Data.Semigroups`, `Data.Monoid` and `GHC.Generics`.
+
5.2.2 [2018.01.18]
------------------
* Add `optional` to `Data.Functor.Alt` (analogous to the `optional` function
@@ -7,6 +20,8 @@
definitions in terms of the other.
* Allow building with GHC 8.4
* `Apply` and `Bind` instances for `Q`, from the `template-haskell` package.
+ (As a consequence, `Data.Semigroup.Foldable` is no longer a `Trustworthy`
+ module.)
* Add instances for `(:~:)` and `(:~~:)` from `Data.Type.Equality`, and
`Coercion` from `Data.Type.Coercion`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/semigroupoids-5.2.2/semigroupoids.cabal new/semigroupoids-5.3.1/semigroupoids.cabal
--- old/semigroupoids-5.2.2/semigroupoids.cabal 2018-01-18 21:07:06.000000000 +0100
+++ new/semigroupoids-5.3.1/semigroupoids.cabal 2018-07-02 20:08:27.000000000 +0200
@@ -1,6 +1,6 @@
name: semigroupoids
category: Control, Comonads
-version: 5.2.2
+version: 5.3.1
license: BSD3
cabal-version: >= 1.8
license-file: LICENSE
@@ -18,7 +18,8 @@
, GHC == 7.10.3
, GHC == 8.0.2
, GHC == 8.2.2
- , GHC == 8.4.1
+ , GHC == 8.4.3
+ , GHC == 8.6.1
build-type: Custom
synopsis: Semigroupoids: Category sans id
extra-source-files:
@@ -137,12 +138,12 @@
library
build-depends:
base >= 4.3 && < 5,
- base-orphans >= 0.5.4 && < 1,
+ base-orphans >= 0.8 && < 1,
bifunctors >= 5 && < 6,
semigroups >= 0.8.3.1 && < 1,
template-haskell,
transformers >= 0.2 && < 0.6,
- transformers-compat >= 0.5 && < 0.6
+ transformers-compat >= 0.5 && < 0.7
if impl(ghc >= 7.0 && < 7.2)
build-depends: generic-deriving >= 1.11 && < 1.13
@@ -151,7 +152,7 @@
build-depends: ghc-prim
if flag(containers)
- build-depends: containers >= 0.3 && < 0.6
+ build-depends: containers >= 0.3 && < 0.7
if flag(contravariant)
build-depends: contravariant >= 0.2.0.1 && < 2
@@ -196,6 +197,9 @@
ghc-options: -Wall -fno-warn-warnings-deprecations
+ if impl(ghc >= 7.10)
+ ghc-options: -fno-warn-trustworthy-safe
+
test-suite doctests
type: exitcode-stdio-1.0
main-is: doctests.hs
@@ -207,5 +211,5 @@
else
build-depends:
base >= 4 && < 5,
- doctest >= 0.11.1 && < 0.14,
+ doctest >= 0.11.1 && < 0.17,
semigroupoids
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/semigroupoids-5.2.2/src/Data/Functor/Alt.hs new/semigroupoids-5.3.1/src/Data/Functor/Alt.hs
--- old/semigroupoids-5.2.2/src/Data/Functor/Alt.hs 2018-01-18 21:07:06.000000000 +0100
+++ new/semigroupoids-5.3.1/src/Data/Functor/Alt.hs 2018-07-02 20:08:27.000000000 +0200
@@ -52,7 +52,9 @@
import Data.Functor.Product
import Data.Functor.Reverse
import Data.List.NonEmpty (NonEmpty(..))
+import qualified Data.Monoid as Monoid
import Data.Semigroup (Option(..), Semigroup(..))
+import qualified Data.Semigroup as Semigroup
import Prelude (($),Either(..),Maybe(..),const,IO,Ord,(++),(.),either,seq,undefined)
import Unsafe.Coerce
@@ -268,3 +270,15 @@
instance Alt f => Alt (Reverse f) where
Reverse a Reverse b = Reverse (a b)
+
+instance Alt Semigroup.First where
+ () = (<>)
+
+instance Alt Semigroup.Last where
+ () = (<>)
+
+instance Alt Monoid.First where
+ () = mappend
+
+instance Alt Monoid.Last where
+ () = mappend
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/semigroupoids-5.2.2/src/Data/Functor/Bind/Class.hs new/semigroupoids-5.3.1/src/Data/Functor/Bind/Class.hs
--- old/semigroupoids-5.2.2/src/Data/Functor/Bind/Class.hs 2018-01-18 21:07:06.000000000 +0100
+++ new/semigroupoids-5.3.1/src/Data/Functor/Bind/Class.hs 2018-07-02 20:08:27.000000000 +0200
@@ -1,10 +1,16 @@
{-# LANGUAGE CPP #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE StandaloneDeriving #-}
+{-# LANGUAGE TypeOperators #-}
+#if __GLASGOW_HASKELL__ >= 708
+{-# LANGUAGE EmptyCase #-}
+#endif
#ifndef MIN_VERSION_semigroups
#define MIN_VERSION_semigroups(x,y,z) 1
#endif
-#if __GLASGOW_HASKELL__ >= 702 && __GLASGOW_HASKELL <= 706 && defined(MIN_VERSION_comonad) && !(MIN_VERSION_comonad(3,0,3))
+#if __GLASGOW_HASKELL__ >= 702
{-# LANGUAGE Trustworthy #-}
#endif
@@ -18,7 +24,7 @@
-----------------------------------------------------------------------------
-- |
--- Copyright : (C) 2011-2015 Edward Kmett
+-- Copyright : (C) 2011-2018 Edward Kmett
-- License : BSD-style (see the file LICENSE)
--
-- Maintainer : Edward Kmett