![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package ghc-distributive for openSUSE:Factory checked in at 2016-01-28 17:23:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-distributive (Old)
and /work/SRC/openSUSE:Factory/.ghc-distributive.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-distributive"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-distributive/ghc-distributive.changes 2015-05-22 16:36:01.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-distributive.new/ghc-distributive.changes 2016-01-28 17:24:37.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Jan 26 08:40:30 UTC 2016 - mimi.vx@gmail.com
+
+- update to 0.5.0.2
+* Added flags for removing some dependencies.
+* upport doctests when building to non-standard locations (such as when using stack.)
+* Support base-orphans
+
+-------------------------------------------------------------------
Old:
----
distributive-0.4.4.tar.gz
New:
----
distributive-0.5.0.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-distributive.spec ++++++
--- /var/tmp/diff_new_pack.iKKsux/_old 2016-01-28 17:24:38.000000000 +0100
+++ /var/tmp/diff_new_pack.iKKsux/_new 2016-01-28 17:24:38.000000000 +0100
@@ -21,7 +21,7 @@
%bcond_with tests
Name: ghc-distributive
-Version: 0.4.4
+Version: 0.5.0.2
Release: 0
Summary: Distributive functors -- Dual to Traversable
License: BSD-2-Clause
@@ -34,6 +34,7 @@
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
# Begin cabal-rpm deps:
+BuildRequires: ghc-base-orphans-devel
BuildRequires: ghc-tagged-devel
BuildRequires: ghc-transformers-compat-devel
BuildRequires: ghc-transformers-devel
++++++ distributive-0.4.4.tar.gz -> distributive-0.5.0.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distributive-0.4.4/.ghci new/distributive-0.5.0.2/.ghci
--- old/distributive-0.4.4/.ghci 2014-05-05 22:51:17.000000000 +0200
+++ new/distributive-0.5.0.2/.ghci 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-:set -isrc -idist/build/autogen -optP-include -optPdist/build/autogen/cabal_macros.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distributive-0.4.4/.travis.yml new/distributive-0.5.0.2/.travis.yml
--- old/distributive-0.4.4/.travis.yml 2014-05-05 22:51:17.000000000 +0200
+++ new/distributive-0.5.0.2/.travis.yml 2016-01-17 01:07:48.000000000 +0100
@@ -1,17 +1,118 @@
-language: haskell
-before_install:
- # Uncomment whenever hackage is down.
- # - mkdir -p ~/.cabal && cp config ~/.cabal/config && cabal update
+# This file has been generated -- see https://github.com/hvr/multi-ghc-travis
+language: c
+sudo: false
+
+cache:
+ directories:
+ - $HOME/.cabsnap
+ - $HOME/.cabal/packages
+ - $HOME/.stack
+
+before_cache:
+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.tar
+
+matrix:
+ include:
+ - env: CABALVER=1.18 GHCVER=7.4.2 BUILD=cabal
+ compiler: ": #GHC 7.4.2"
+ addons: {apt: {packages: [cabal-install-1.18,ghc-7.4.2,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}}
+
+ - env: CABALVER=1.18 GHCVER=7.6.3 BUILD=cabal
+ compiler: ": #GHC 7.6.3"
+ addons: {apt: {packages: [cabal-install-1.18,ghc-7.6.3,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}}
+
+ - env: CABALVER=1.18 GHCVER=7.8.4 BUILD=cabal
+ compiler: ": #GHC 7.8.4"
+ addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}}
+
+# - env: BUILD=stack STACK_YAML=stack-7.8.yaml STACK_OPTIONS=--skip-ghc-check
+# addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}}
+
+# - env: BUILD=stack STACK_YAML=stack-7.8.yaml
+# os: osx
- # Try installing some of the build-deps with apt-get for speed.
- - ./travis-cabal-apt-install --only-dependencies --force-reinstall $mode
+ - env: CABALVER=1.22 GHCVER=7.10.1 BUILD=cabal
+ compiler: ": #GHC 7.10.1"
+ addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.1,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}}
+ - env: CABALVER=1.22 GHCVER=7.10.2 BUILD=cabal
+ compiler: ": #GHC 7.10.2"
+ addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.2,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}}
+
+ - env: BUILD=stack STACK_OPTIONS=--skip-ghc-check
+ addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.2,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}}
+
+ - env: BUILD=stack
+ os: osx
+
+
+before_install:
+ - unset CC
+ - case "$BUILD" in
+ stack)
+ export STACK_VERSION=0.1.3.0;
+ export PATH=~/bin:$PATH;
+ mkdir -p ~/bin;
+ travis_retry curl -L https://github.com/commercialhaskell/stack/releases/download/v$STACK_VERSION... | gunzip > ~/bin/stack;
+ chmod a+x ~/bin/stack;
+ scripts/travis_long stack --no-terminal setup;;
+ cabal)
+ export HAPPYVER=1.19.5
+ export ALEXVER=3.1.4
+ export PATH=~/.cabal/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:/opt/happy/$HAPPYVER/bin:/opt/alex/$ALEXVER/bin:$PATH;;
+ esac
install:
- - cabal configure -flib-Werror $mode
- - cabal build
+ - case "$BUILD" in
+ stack)
+ scripts/travis_long stack --no-terminal $STACK_OPTIONS build --only-snapshot -j2;;
+ cabal)
+ echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
+ cabal --version;
+ if [ -f $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz ];
+ then
+ zcat $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz >
+ $HOME/.cabal/packages/hackage.haskell.org/00-index.tar;
+ fi;
+ travis_retry cabal update;
+ cabal install --only-dependencies --enable-tests --enable-benchmarks --dry -v > installplan.txt;
+ sed -i -e '1,/^Resolving /d' installplan.txt; cat installplan.txt;
+ if diff -u installplan.txt $HOME/.cabsnap/installplan.txt; then
+ echo "cabal build-cache HIT";
+ rm -rfv .ghc;
+ cp -a $HOME/.cabsnap/ghc $HOME/.ghc;
+ cp -a $HOME/.cabsnap/lib $HOME/.cabsnap/share $HOME/.cabsnap/bin $HOME/.cabal/;
+ else
+ echo "cabal build-cache MISS";
+ rm -rf $HOME/.cabsnap;
+ mkdir -p $HOME/.ghc $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin;
+ cabal install --only-dependencies --enable-tests --enable-benchmarks;
+ if [ "$GHCVER" = "7.10.1" ]; then cabal install Cabal-1.22.4.0; fi;
+ fi;
+ if [ ! -d $HOME/.cabsnap ]; then
+ echo "snapshotting package-db to build-cache";
+ mkdir $HOME/.cabsnap;
+ cp -a $HOME/.ghc $HOME/.cabsnap/ghc;
+ cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin installplan.txt $HOME/.cabsnap/;
+ fi;;
+ esac
+
+# snapshot package-db on cache miss
+# Here starts the actual work to be performed for the package under test;
+# any command which exits with a non-zero exit code causes the build to fail.
script:
- - $script
+ - case "$BUILD" in
+ stack)
+ scripts/travis_long stack --no-terminal $STACK_OPTIONS build -j2;;
+ cabal)
+ cabal configure --enable-tests -v2;
+ cabal build;
+ cabal test;
+ cabal bench || true;
+ cabal sdist || true;
+ SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz && (cd dist && cabal install --force-reinstalls "$SRC_TGZ");;
+ esac
notifications:
irc:
@@ -19,7 +120,5 @@
- "irc.freenode.org#haskell-lens"
skip_join: true
template:
- - "\x0313distributive\x03/\x0306%{branch}\x03 \x0314%{commit}\x03 %{build_url} %{message}"
-
-env:
- - mode="--enable-tests" script="cabal test"
+ - "\x0313distributive\x0f/\x0306%{branch}\x0f \x0314%{commit}\x0f %{message} \x0302\x1f%{build_url}\x0f"
+# EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distributive-0.4.4/CHANGELOG.markdown new/distributive-0.5.0.2/CHANGELOG.markdown
--- old/distributive-0.4.4/CHANGELOG.markdown 2014-05-05 22:51:17.000000000 +0200
+++ new/distributive-0.5.0.2/CHANGELOG.markdown 2016-01-17 01:07:48.000000000 +0100
@@ -1,3 +1,17 @@
+0.5.0.2
+-------
+* A more elegant fix for builds on GHC 7.2
+
+0.5.0.1
+-------
+* Fix builds on GHC 7.2
+
+0.5
+---
+* Added flags for removing some dependencies.
+* Support `doctests` when building to non-standard locations (such as when using `stack`.)
+* Support `base-orphans`
+
0.4.4
-----
* `transformers 0.4` compatibility
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distributive-0.4.4/LICENSE new/distributive-0.5.0.2/LICENSE
--- old/distributive-0.4.4/LICENSE 2014-05-05 22:51:17.000000000 +0200
+++ new/distributive-0.5.0.2/LICENSE 2016-01-17 01:07:48.000000000 +0100
@@ -1,4 +1,4 @@
-Copyright 2011-2014 Edward Kmett
+Copyright 2011-2016 Edward Kmett
All rights reserved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distributive-0.4.4/README.markdown new/distributive-0.5.0.2/README.markdown
--- old/distributive-0.4.4/README.markdown 2014-05-05 22:51:17.000000000 +0200
+++ new/distributive-0.5.0.2/README.markdown 2016-01-17 01:07:48.000000000 +0100
@@ -1,7 +1,7 @@
distributive
============
-[![Build Status](https://secure.travis-ci.org/ekmett/distributive.png?branch=master)](http://travis-ci.org/ekmett/distributive)
+[![Hackage](https://img.shields.io/hackage/v/distributive.svg)](https://hackage.haskell.org/package/distributive) [![Build Status](https://secure.travis-ci.org/ekmett/distributive.png?branch=master)](http://travis-ci.org/ekmett/distributive)
This package provides the notion that is categorically dual to `Traversable`.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distributive-0.4.4/Setup.lhs new/distributive-0.5.0.2/Setup.lhs
--- old/distributive-0.4.4/Setup.lhs 2014-05-05 22:51:17.000000000 +0200
+++ new/distributive-0.5.0.2/Setup.lhs 2016-01-17 01:07:48.000000000 +0100
@@ -30,6 +30,10 @@
withTestLBI pkg lbi $ \suite suitecfg -> do
rewriteFile (dir > "Build_" ++ testName suite ++ ".hs") $ unlines
[ "module Build_" ++ testName suite ++ " where"
+ , ""
+ , "autogen_dir :: String"
+ , "autogen_dir = " ++ show dir
+ , ""
, "deps :: [String]"
, "deps = " ++ (show $ formatdeps (testDeps libcfg suitecfg))
]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distributive-0.4.4/distributive.cabal new/distributive-0.5.0.2/distributive.cabal
--- old/distributive-0.4.4/distributive.cabal 2014-05-05 22:51:17.000000000 +0200
+++ new/distributive-0.5.0.2/distributive.cabal 2016-01-17 01:07:48.000000000 +0100
@@ -1,6 +1,6 @@
name: distributive
category: Data Structures
-version: 0.4.4
+version: 0.5.0.2
license: BSD3
cabal-version: >= 1.8
license-file: LICENSE
@@ -9,12 +9,11 @@
stability: provisional
homepage: http://github.com/ekmett/distributive/
bug-reports: http://github.com/ekmett/distributive/issues
-copyright: Copyright (C) 2011-2014 Edward A. Kmett
+copyright: Copyright (C) 2011-2016 Edward A. Kmett
synopsis: Distributive functors -- Dual to Traversable
description: Distributive functors -- Dual to Traversable
build-type: Custom
extra-source-files:
- .ghci
.travis.yml
.vim.custom
config
@@ -26,15 +25,19 @@
type: git
location: git://github.com/ekmett/distributive.git
-flag lib-Werror
+flag tagged
manual: True
- default: False
+ default: True
+ description:
+ You can disable the use of the `tagged` package using `-f-tagged`.
+ .
+ Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
library
build-depends:
base >= 4 && < 5,
- tagged >= 0.7 && < 1,
- transformers >= 0.2 && < 0.5,
+ base-orphans >= 0.5 && < 1,
+ transformers >= 0.2 && < 0.6,
transformers-compat >= 0.3 && < 1
hs-source-dirs: src
@@ -43,12 +46,14 @@
if impl(ghc>=7.2)
exposed-modules: Data.Distributive.Generic
+
+ if flag(tagged)
+ build-depends: tagged >= 0.7 && < 1
+
+ if impl(ghc>=7.2 && < 7.6)
build-depends: ghc-prim
- if flag(lib-Werror)
- ghc-options: -Werror
- else
- ghc-options: -Wall
+ ghc-options: -Wall
-- Verify the results of the examples
test-suite doctests
@@ -60,6 +65,4 @@
doctest >= 0.9.1,
filepath >= 1.2
ghc-options: -Wall -threaded
- if impl(ghc<7.6.1)
- ghc-options: -Werror
hs-source-dirs: tests
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distributive-0.4.4/src/Data/Distributive/Generic.hs new/distributive-0.5.0.2/src/Data/Distributive/Generic.hs
--- old/distributive-0.4.4/src/Data/Distributive/Generic.hs 2014-05-05 22:51:17.000000000 +0200
+++ new/distributive-0.5.0.2/src/Data/Distributive/Generic.hs 2016-01-17 01:07:48.000000000 +0100
@@ -4,7 +4,7 @@
-----------------------------------------------------------------------------
-- |
-- Module : Data.Distributive
--- Copyright : (C) 2011-2014 Edward Kmett
+-- Copyright : (C) 2011-2016 Edward Kmett
-- License : BSD-style (see the file LICENSE)
--
-- Maintainer : Edward Kmett