Hello community, here is the log from the commit of package ghc-semigroups for openSUSE:Factory checked in at 2019-05-17 23:43:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-semigroups (Old) and /work/SRC/openSUSE:Factory/.ghc-semigroups.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-semigroups" Fri May 17 23:43:09 2019 rev:15 rq:703478 version:0.19 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-semigroups/ghc-semigroups.changes 2018-10-25 09:04:16.402580607 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-semigroups.new.5148/ghc-semigroups.changes 2019-05-17 23:43:10.457912450 +0200 @@ -1,0 +2,18 @@ +Sat May 11 02:00:51 UTC 2019 - [email protected] + +- Update semigroups to version 0.19. + 0.19 [2019.05.10] + ----------------- + * The `(<>)` method of the backported `Semigroup` class no longer has a default + implementation in terms of `mappend`. This mirrors the `Data.Semigroup` API + that was introduced in `base-4.9`. This is a breaking change for any + `Semigroup` instances that are defined in tandem with versions of `base` + older than 4.9. + * Make the backported `Hashable Arg` instance reflect its respective variants + in the `hashable` package. In `hashable-1.3`, the `Hashable Arg` instance + only hashes the first argument, lest equal values have different hashes. + * Backport the `Lift (NonEmpty a)` instance introduced in + `template-haskell-2.15.0.0`. + * `Data.List.NonEmpty` is now unconditionally `Trustworthy`. + +------------------------------------------------------------------- Old: ---- semigroups-0.18.5.tar.gz New: ---- semigroups-0.19.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-semigroups.spec ++++++ --- /var/tmp/diff_new_pack.k4iP25/_old 2019-05-17 23:43:13.641910702 +0200 +++ /var/tmp/diff_new_pack.k4iP25/_new 2019-05-17 23:43:13.641910702 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-semigroups # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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,7 +18,7 @@ %global pkg_name semigroups Name: ghc-%{pkg_name} -Version: 0.18.5 +Version: 0.19 Release: 0 Summary: Anything that associates License: BSD-3-Clause ++++++ semigroups-0.18.5.tar.gz -> semigroups-0.19.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/semigroups-0.18.5/.travis.yml new/semigroups-0.19/.travis.yml --- old/semigroups-0.18.5/.travis.yml 2018-07-03 00:09:07.000000000 +0200 +++ new/semigroups-0.19/.travis.yml 2001-09-09 03:46:40.000000000 +0200 @@ -1,158 +1,196 @@ # This Travis job script has been generated by a script via # -# 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' +# haskell-ci '-o' '.travis.yml' '--config=cabal.haskell-ci' 'cabal.project' # -# For more information, see https://github.com/hvr/multi-ghc-travis +# For more information, see https://github.com/haskell-CI/haskell-ci +# +# version: 0.3.20190429 # language: c -sudo: false - +dist: xenial git: - submodules: false # whether to recursively clone submodules - + # whether to recursively clone submodules + submodules: false notifications: irc: channels: - - "irc.freenode.org#haskell-lens" + - irc.freenode.org#haskell-lens skip_join: true template: - - "\x0313semigroups\x03/\x0306%{branch}\x03 \x0314%{commit}\x03 %{build_url} %{message}" - + - "\"\\x0313semigroups\\x03/\\x0306%{branch}\\x03 \\x0314%{commit}\\x03 %{build_url} %{message}\"" cache: directories: - $HOME/.cabal/packages - $HOME/.cabal/store - before_cache: - - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log + - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log # remove files that are regenerated by 'cabal update' - - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.* - - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json - - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache - - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar - - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx - - - rm -rfv $HOME/.cabal/packages/head.hackage - + - rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.* + - rm -fv $CABALHOME/packages/hackage.haskell.org/*.json + - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache + - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar + - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx + - rm -rfv $CABALHOME/packages/head.hackage matrix: include: - - compiler: "ghc-8.6.1" + - compiler: ghc-8.8.1 + addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}} 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: [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: [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: [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: [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: [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: [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: [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: [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" + - compiler: ghc-8.6.5 + addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}} + - compiler: ghc-8.4.4 + addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}} + - compiler: ghc-8.2.2 + addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-2.4"]}} + - compiler: ghc-8.0.2 + addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-2.4"]}} + - compiler: ghc-7.10.3 + addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-2.4"]}} + - compiler: ghc-7.8.4 + addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-2.4"]}} + - compiler: ghc-7.6.3 + addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.6.3","cabal-install-2.4"]}} + - compiler: ghc-7.4.2 + addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.4.2","cabal-install-2.4"]}} + - compiler: ghc-7.2.2 + addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.2.2","cabal-install-2.4"]}} + - compiler: ghc-7.0.4 + addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.0.4","cabal-install-2.4"]}} + - compiler: ghc-head + addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-head","cabal-install-head"]}} env: GHCHEAD=true - 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.6.1" - + - compiler: ghc-head + - compiler: ghc-8.8.1 before_install: - - HC=${CC} - - HCPKG=${HC/ghc/ghc-pkg} + - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//') + - HCPKG="$HC-pkg" - unset CC - - ROOTDIR=$(pwd) - - mkdir -p $HOME/.local/bin - - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH" + - CABAL=/opt/ghc/bin/cabal + - CABALHOME=$HOME/.cabal + - export PATH="$CABALHOME/bin:$PATH" + - TOP=$(pwd) - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') )) - echo $HCNUMVER - + - CABAL="$CABAL -vnormal+nowrap+markoutput" + - set -o pipefail + - | + echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk + echo 'BEGIN { state = "output"; }' >> .colorful.awk + echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk + echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk + echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk + echo ' if (state == "cabal") {' >> .colorful.awk + echo ' print blue($0)' >> .colorful.awk + echo ' } else {' >> .colorful.awk + echo ' print $0' >> .colorful.awk + echo ' }' >> .colorful.awk + echo '}' >> .colorful.awk + - cat .colorful.awk + - | + color_cabal_output () { + awk -f $TOP/.colorful.awk + } + - echo text | color_cabal_output install: - - cabal --version + - ${CABAL} --version - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]" - - BENCH=${BENCH---enable-benchmarks} - - TEST=${TEST---enable-tests} - - HADDOCK=${HADDOCK-true} - - UNCONSTRAINED=${UNCONSTRAINED-true} - - NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false} + - TEST=--enable-tests + - BENCH=--enable-benchmarks - GHCHEAD=${GHCHEAD-false} - - travis_retry cabal update -v - - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config" - - rm -fv cabal.project cabal.project.local - # Overlay Hackage Package Index for GHC HEAD: https://github.com/hvr/head.hackage + - rm -f $CABALHOME/config + - | + echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config + echo "remote-build-reporting: anonymous" >> $CABALHOME/config + echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config + echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config + echo "world-file: $CABALHOME/world" >> $CABALHOME/config + echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config + echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config + echo "installdir: $CABALHOME/bin" >> $CABALHOME/config + echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config + echo "store-dir: $CABALHOME/store" >> $CABALHOME/config + echo "install-dirs user" >> $CABALHOME/config + echo " prefix: $CABALHOME" >> $CABALHOME/config + echo "repository hackage.haskell.org" >> $CABALHOME/config + echo " url: http://hackage.haskell.org/"; >> $CABALHOME/config - | if $GHCHEAD; then - 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 - echo ' secure: True' >> ${HOME}/.cabal/config - echo ' root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740' >> ${HOME}/.cabal/config - echo ' 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb' >> ${HOME}/.cabal/config - 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 + echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1/g')" >> $CABALHOME/config + + echo "repository head.hackage" >> $CABALHOME/config + echo " url: http://head.hackage.haskell.org/"; >> $CABALHOME/config + echo " secure: True" >> $CABALHOME/config + echo " root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740" >> $CABALHOME/config + echo " 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb" >> $CABALHOME/config + echo " 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e" >> $CABALHOME/config + echo " key-threshold: 3" >> $CABALHOME/config fi - - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$' - - "printf 'packages: \".\"\\n' > 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 $CABALHOME/config + - rm -fv cabal.project cabal.project.local cabal.project.freeze + - travis_retry ${CABAL} v2-update -v + # Generate cabal.project + - rm -rf cabal.project cabal.project.local cabal.project.freeze + - touch cabal.project + - | + echo 'packages: "."' >> cabal.project + - | + echo "write-ghc-environment-files: always" >> cabal.project + - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(semigroups)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" - 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 - - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX) - -# 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. + - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi + - ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output + - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'" + - rm cabal.project.freeze + - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all | color_cabal_output script: - # test that source-distributions can be generated - - (cd "." && cabal sdist) - - mv "."/dist/semigroups-*.tar.gz ${DISTDIR}/ + - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX) + # Packaging... + - ${CABAL} v2-sdist all | color_cabal_output + # Unpacking... + - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/ - cd ${DISTDIR} || false - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \; - - "printf 'packages: semigroups-*/*.cabal\\n' > 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" + # Generate cabal.project + - rm -rf cabal.project cabal.project.local cabal.project.freeze + - touch cabal.project + - | + echo 'packages: "semigroups-*/*.cabal"' >> cabal.project + - | + echo "write-ghc-environment-files: always" >> cabal.project + - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(semigroups)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" - cat cabal.project || true - cat cabal.project.local || true - + # Building with tests and benchmarks... # build & run tests, build benchmarks - - cabal new-build -w ${HC} ${TEST} ${BENCH} all - - # cabal check - - (cd semigroups-* && cabal check) - - # haddock - - rm -rf ./dist-newstyle - - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi + - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} all | color_cabal_output + # cabal check... + - (cd semigroups-* && ${CABAL} -vnormal check) + # haddock... + - ${CABAL} v2-haddock -w ${HC} ${TEST} ${BENCH} all | color_cabal_output + # Constraint sets + - rm -rf cabal.project.local + # Constraint set no-binary + - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --constraint='semigroups -binary' all | color_cabal_output + # Constraint set no-bytestring + - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --constraint='semigroups -bytestring' all | color_cabal_output + # Constraint set no-containers + - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --constraint='semigroups -containers' all | color_cabal_output + # Constraint set no-deepseq + - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --constraint='semigroups -deepseq' all | color_cabal_output + # Constraint set no-tagged + - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --constraint='semigroups -tagged' all | color_cabal_output + # Constraint set no-text + - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --constraint='semigroups -text' all | color_cabal_output + # Constraint set no-hashable + - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --constraint='semigroups -hashable' all | color_cabal_output + # Constraint set no-unordered-containers + - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --constraint='semigroups -hashable' --constraint='semigroups -unordered-containers' all | color_cabal_output + # Constraint set no-transformers + - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --constraint='semigroups -transformers' all | color_cabal_output + # Constraint set no-template-haskell + - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --constraint='semigroups -template-haskell' all | color_cabal_output -# REGENDATA ["-o",".travis.yml","--ghc-head","--irc-channel=irc.freenode.org#haskell-lens","--no-no-tests-no-bench","--no-unconstrained","cabal.project"] +# REGENDATA ["-o",".travis.yml","--config=cabal.haskell-ci","cabal.project"] # EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/semigroups-0.18.5/CHANGELOG.markdown new/semigroups-0.19/CHANGELOG.markdown --- old/semigroups-0.18.5/CHANGELOG.markdown 2018-07-03 00:09:07.000000000 +0200 +++ new/semigroups-0.19/CHANGELOG.markdown 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,17 @@ +0.19 [2019.05.10] +----------------- +* The `(<>)` method of the backported `Semigroup` class no longer has a default + implementation in terms of `mappend`. This mirrors the `Data.Semigroup` API + that was introduced in `base-4.9`. This is a breaking change for any + `Semigroup` instances that are defined in tandem with versions of `base` + older than 4.9. +* Make the backported `Hashable Arg` instance reflect its respective variants + in the `hashable` package. In `hashable-1.3`, the `Hashable Arg` instance + only hashes the first argument, lest equal values have different hashes. +* Backport the `Lift (NonEmpty a)` instance introduced in + `template-haskell-2.15.0.0`. +* `Data.List.NonEmpty` is now unconditionally `Trustworthy`. + 0.18.5 [2018.07.02] ------------------- * Use a more efficient `sconcat` for the `Semigroup` instances for strict and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/semigroups-0.18.5/semigroups.cabal new/semigroups-0.19/semigroups.cabal --- old/semigroups-0.18.5/semigroups.cabal 2018-07-03 00:09:07.000000000 +0200 +++ new/semigroups-0.19/semigroups.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,6 +1,6 @@ name: semigroups category: Algebra, Data, Data Structures, Math -version: 0.18.5 +version: 0.19 license: BSD3 cabal-version: >= 1.10 license-file: LICENSE @@ -23,8 +23,9 @@ , GHC == 7.10.3 , GHC == 8.0.2 , GHC == 8.2.2 - , GHC == 8.4.3 - , GHC == 8.6.1 + , GHC == 8.4.4 + , GHC == 8.6.5 + , GHC == 8.8.1 source-repository head type: git @@ -90,6 +91,14 @@ default: True manual: True +flag template-haskell + description: + You can disable the use of the `template-haskell` package using `-f-template-haskell`. + . + Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. + default: True + manual: True + flag text description: You can disable the use of the `text` package using `-f-text`. @@ -163,7 +172,7 @@ build-depends: text >= 0.10 && < 2 if flag(hashable) - build-depends: hashable >= 1.1 && < 1.3 + build-depends: hashable >= 1.2.5.0 && < 1.4 if flag(hashable) && flag(unordered-containers) build-depends: unordered-containers >= 0.2 && < 0.3 @@ -171,3 +180,7 @@ if flag(transformers) build-depends: transformers >= 0.2 && < 0.6 , transformers-compat >= 0.5 && < 1 + + if flag(template-haskell) + build-depends: template-haskell >=2.5.0.0 && <2.11 + other-modules: Paths_semigroups diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/semigroups-0.18.5/src-ghc7/Data/List/NonEmpty.hs new/semigroups-0.19/src-ghc7/Data/List/NonEmpty.hs --- old/semigroups-0.18.5/src-ghc7/Data/List/NonEmpty.hs 2018-07-03 00:09:07.000000000 +0200 +++ new/semigroups-0.19/src-ghc7/Data/List/NonEmpty.hs 2001-09-09 03:46:40.000000000 +0200 @@ -1,12 +1,7 @@ {-# LANGUAGE CPP #-} #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 702 -#if defined(MIN_VERSION_hashable) || __GLASGOW_HASKELL__ == 702 \ - || __GLASGOW_HASKELL__ >= 708 {-# LANGUAGE Trustworthy #-} -#else -{-# LANGUAGE Safe #-} -#endif #endif #ifdef __GLASGOW_HASKELL__ @@ -171,6 +166,14 @@ import GHC.Generics #endif +#ifdef MIN_VERSION_template_haskell +import qualified Language.Haskell.TH.Syntax as TH +#ifndef CURRENT_PACKAGE_KEY +import Data.Version (showVersion) +import Paths_semigroups (version) +#endif +#endif + infixr 5 :|, <| data NonEmpty a = a :| [a] deriving @@ -188,11 +191,7 @@ #ifdef MIN_VERSION_hashable instance Hashable a => Hashable (NonEmpty a) where -#if MIN_VERSION_hashable(1,2,0) hashWithSalt p (a :| as) = p `hashWithSalt` a `hashWithSalt` as -#else - hash (a :| as) = hash a `combine` hash as -#endif #endif #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 708 @@ -346,6 +345,24 @@ toList = toList #endif +#ifdef MIN_VERSION_template_haskell +-- | @since 0.19 +instance TH.Lift a => TH.Lift (NonEmpty a) where + lift (x :| xs) = do + x' <- TH.lift x + xs' <- TH.lift xs + return $ TH.InfixE (Just x') (TH.ConE neConsName) (Just xs') + where + neConsName = TH.mkNameG_d semigroupsPackageKey "Data.List.NonEmpty" ":|" + +semigroupsPackageKey :: String +#ifdef CURRENT_PACKAGE_KEY +semigroupsPackageKey = CURRENT_PACKAGE_KEY +#else +semigroupsPackageKey = "semigroups-" ++ showVersion version +#endif +#endif + -- | Extract the first element of the stream. head :: NonEmpty a -> a head ~(a :| _) = a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/semigroups-0.18.5/src-ghc7/Data/Semigroup.hs new/semigroups-0.19/src-ghc7/Data/Semigroup.hs --- old/semigroups-0.18.5/src-ghc7/Data/Semigroup.hs 2018-07-03 00:09:07.000000000 +0200 +++ new/semigroups-0.19/src-ghc7/Data/Semigroup.hs 2001-09-09 03:46:40.000000000 +0200 @@ -6,14 +6,7 @@ #endif #if __GLASGOW_HASKELL__ >= 702 -#define LANGUAGE_DefaultSignatures -{-# LANGUAGE DefaultSignatures #-} -#if (defined(MIN_VERSION_hashable)) || __GLASGOW_HASKELL__ == 702 \ - || __GLASGOW_HASKELL__ >= 708 {-# LANGUAGE Trustworthy #-} -#else -{-# LANGUAGE Safe #-} -#endif #endif #if __GLASGOW_HASKELL__ >= 702 @@ -213,10 +206,6 @@ -- ('<>') = 'mappend' -- @ (<>) :: a -> a -> a -#ifdef LANGUAGE_DefaultSignatures - default (<>) :: Monoid a => a -> a -> a - (<>) = mappend -#endif -- | Reduce a non-empty list with @\<\>@ -- @@ -481,11 +470,7 @@ #ifdef MIN_VERSION_hashable instance Hashable a => Hashable (Min a) where -#if MIN_VERSION_hashable(1,2,0) hashWithSalt p (Min a) = hashWithSalt p a -#else - hash (Min a) = hash a -#endif #endif instance Ord a => Semigroup (Min a) where @@ -588,11 +573,7 @@ #ifdef MIN_VERSION_hashable instance Hashable a => Hashable (Max a) where -#if MIN_VERSION_hashable(1,2,0) hashWithSalt p (Max a) = hashWithSalt p a -#else - hash (Max a) = hash a -#endif #endif instance Ord a => Semigroup (Max a) where @@ -711,11 +692,14 @@ #endif #ifdef MIN_VERSION_hashable +#if MIN_VERSION_hashable(1,3,0) +-- | Instance like defined in @hashable-1.3@ +instance Hashable a => Hashable (Arg a b) where + hashWithSalt p (Arg a _b) = hashWithSalt p a +#else +-- | Instance like defined in @hashable-1.2@ instance (Hashable a, Hashable b) => Hashable (Arg a b) where -#if MIN_VERSION_hashable(1,2,0) hashWithSalt p (Arg a b) = hashWithSalt p a `hashWithSalt` b -#else - hash (Arg a b) = hashWithSalt (hash a) b #endif #endif @@ -776,11 +760,7 @@ #ifdef MIN_VERSION_hashable instance Hashable a => Hashable (First a) where -#if MIN_VERSION_hashable(1,2,0) hashWithSalt p (First a) = hashWithSalt p a -#else - hash (First a) = hash a -#endif #endif instance Semigroup (First a) where @@ -867,11 +847,7 @@ #ifdef MIN_VERSION_hashable instance Hashable a => Hashable (Last a) where -#if MIN_VERSION_hashable(1,2,0) hashWithSalt p (Last a) = hashWithSalt p a -#else - hash (Last a) = hash a -#endif #endif instance Semigroup (Last a) where @@ -996,11 +972,7 @@ #ifdef MIN_VERSION_hashable instance Hashable a => Hashable (WrappedMonoid a) where -#if MIN_VERSION_hashable(1,2,0) hashWithSalt p (WrapMonoid a) = hashWithSalt p a -#else - hash (WrapMonoid a) = hash a -#endif #endif instance Monoid m => Semigroup (WrappedMonoid m) where @@ -1089,11 +1061,7 @@ #ifdef MIN_VERSION_hashable instance Hashable a => Hashable (Option a) where -#if MIN_VERSION_hashable(1,2,0) hashWithSalt p (Option a) = hashWithSalt p a -#else - hash (Option a) = hash a -#endif #endif instance Functor Option where
