Hello community, here is the log from the commit of package ghc-free for openSUSE:Leap:15.2 checked in at 2020-02-19 18:39:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/ghc-free (Old) and /work/SRC/openSUSE:Leap:15.2/.ghc-free.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-free" Wed Feb 19 18:39:03 2020 rev:11 rq:771313 version:5.1.3 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/ghc-free/ghc-free.changes 2020-01-15 15:02:03.377798556 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.ghc-free.new.26092/ghc-free.changes 2020-02-19 18:39:03.978025351 +0100 @@ -1,0 +2,32 @@ +Wed Nov 27 03:01:05 UTC 2019 - [email protected] + +- Update free to version 5.1.3. + 5.1.3 [2019.11.26] + ------------------ + * Allow building with `template-haskell-2.16` (GHC 8.10). + * Add `Eq{1,2}`, `Ord{1,2}`, `Read{1,2}`, and `Show{1,2}` instances for + `CofreeF`. + +------------------------------------------------------------------- +Fri Nov 8 16:13:46 UTC 2019 - Peter Simons <[email protected]> + +- Drop obsolete group attributes. + +------------------------------------------------------------------- +Wed Aug 28 02:02:43 UTC 2019 - [email protected] + +- Update free to version 5.1.2. + 5.1.2 [2019.08.27] + ------------------ + * Implement more performant versions of `some` and `many` in the `Alternative` + instance for the final `Alt` encoding. + +------------------------------------------------------------------- +Fri May 3 02:02:58 UTC 2019 - [email protected] + +- Update free to version 5.1.1. + 5.1.1 [2019.05.02] + ------------------ + * Allow building with `base-4.13` (GHC 8.8). + +------------------------------------------------------------------- Old: ---- free-5.1.tar.gz New: ---- free-5.1.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-free.spec ++++++ --- /var/tmp/diff_new_pack.bQCiZs/_old 2020-02-19 18:39:04.234025886 +0100 +++ /var/tmp/diff_new_pack.bQCiZs/_new 2020-02-19 18:39:04.234025886 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-free # -# 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,11 +18,10 @@ %global pkg_name free Name: ghc-%{pkg_name} -Version: 5.1 +Version: 5.1.3 Release: 0 Summary: Monads for free License: BSD-3-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 BuildRequires: ghc-Cabal-devel @@ -60,7 +59,6 @@ %package devel Summary: Haskell %{pkg_name} library development files -Group: Development/Libraries/Haskell Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} ++++++ free-5.1.tar.gz -> free-5.1.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-5.1/.hlint.yaml new/free-5.1.3/.hlint.yaml --- old/free-5.1/.hlint.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/free-5.1.3/.hlint.yaml 2001-09-09 03:46:40.000000000 +0200 @@ -0,0 +1,15 @@ +- arguments: [--cpp-define=HLINT, --cpp-ansi, --cpp-include=include] + +- fixity: "infixr 5 :<" + +# This affects performance +- ignore: {name: Redundant lambda} + +# This is not valid for improve +- ignore: {name: Eta reduce} + +# DeriveDataTypable noise +- ignore: {name: Unused LANGUAGE pragma} + +# They are clearer in places +- ignore: {name: Avoid lambda} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-5.1/.travis.yml new/free-5.1.3/.travis.yml --- old/free-5.1/.travis.yml 2018-07-03 13:58:21.000000000 +0200 +++ new/free-5.1.3/.travis.yml 2001-09-09 03:46:40.000000000 +0200 @@ -1,159 +1,207 @@ # 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 '--output=.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.9.20191126 +# +version: ~> 1.0 language: c -sudo: false - +os: linux +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: - - "\x0313free\x03/\x0306%{branch}\x03 \x0314%{commit}\x03 %{build_url} %{message}" - + - "\"\\x0313free\\x03/\\x0306%{branch}\\x03 \\x0314%{commit}\\x03 %{build_url} %{message}\"" cache: directories: - $HOME/.cabal/packages - $HOME/.cabal/store - + - $HOME/.hlint 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 - -matrix: + - 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 +jobs: include: - - 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: [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-head" - env: GHCHEAD=true - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-head], sources: [hvr-ghc]}} - + - compiler: ghc-8.10.1 + addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.10.1","cabal-install-3.0"]}} + os: linux + - compiler: ghc-8.8.1 + addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.1","cabal-install-3.0"]}} + os: linux + - compiler: ghc-8.6.5 + addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.0"]}} + os: linux + - compiler: ghc-8.4.4 + addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.4.4","cabal-install-3.0"]}} + os: linux + - compiler: ghc-8.2.2 + addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.2.2","cabal-install-3.0"]}} + os: linux + - compiler: ghc-8.0.2 + addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.0.2","cabal-install-3.0"]}} + os: linux + - compiler: ghc-7.10.3 + addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.10.3","cabal-install-3.0"]}} + os: linux + - compiler: ghc-7.8.4 + addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.8.4","cabal-install-3.0"]}} + os: linux + - compiler: ghc-7.6.3 + addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.6.3","cabal-install-3.0"]}} + os: linux + - compiler: ghc-7.4.2 + addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.4.2","cabal-install-3.0"]}} + os: linux + - compiler: ghc-head + addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-head","cabal-install-head"]}} + os: linux allow_failures: - - compiler: "ghc-head" - - compiler: "ghc-8.6.1" - + - compiler: ghc-head + - compiler: ghc-8.10.1 before_install: - - HC=${CC} - - HCPKG=${HC/ghc/ghc-pkg} + - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//') + - WITHCOMPILER="-w $HC" + - HADDOCK=$(echo "/opt/$CC/bin/haddock" | 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" - - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') )) + - CABAL=/opt/ghc/bin/cabal + - CABALHOME=$HOME/.cabal + - export PATH="$CABALHOME/bin:$PATH" + - TOP=$(pwd) + - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $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} - - 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 - - | - 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 + - TEST=--enable-tests + - BENCH=--enable-benchmarks + - HEADHACKAGE=false + - if [ $HCNUMVER -ge 81000 ] ; then HEADHACKAGE=true ; fi + - rm -f $CABALHOME/config + - | + echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config + echo "remote-build-reporting: anonymous" >> $CABALHOME/config + echo "write-ghc-environment-files: always" >> $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 + echo " secure: True" >> $CABALHOME/config + echo " key-threshold: 3" >> $CABALHOME/config + echo " root-keys:" >> $CABALHOME/config + echo " fe331502606802feac15e514d9b9ea83fee8b6ffef71335479a2e68d84adc6b0" >> $CABALHOME/config + echo " 1ea9ba32c526d1cc91ab5e5bd364ec5e9e8cb67179a471872f6e26f0ae773d42" >> $CABALHOME/config + echo " 2c6c3627bd6c982990239487f1abd02e08a02e6cf16edb105a8012d444d870c3" >> $CABALHOME/config + echo " 0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d" >> $CABALHOME/config + echo " 51f0161b906011b52c6613376b1ae937670da69322113a246a09f807c62f6921" >> $CABALHOME/config + - | + if $HEADHACKAGE; then + echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1/g')" >> $CABALHOME/config + echo "repository head.hackage.ghc.haskell.org" >> $CABALHOME/config + echo " url: https://ghc.gitlab.haskell.org/head.hackage/"; >> $CABALHOME/config + echo " secure: True" >> $CABALHOME/config + echo " root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d" >> $CABALHOME/config + echo " 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329" >> $CABALHOME/config + echo " f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89" >> $CABALHOME/config + echo " key-threshold: 3" >> $CABALHOME/config fi - - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$' - - "printf 'packages: \".\" \"./examples\"\\n' > cabal.project" - - echo 'package free-examples' >> cabal.project - - "echo ' flags: -mandelbrot-iter' >> 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" + - | + echo "program-default-options" >> $CABALHOME/config + echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config + - 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 "packages: ./examples" >> cabal.project + - | + echo "package free-examples" >> cabal.project + echo " flags: -mandelbrot-iter" >> cabal.project + - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(free|free-examples)$' || 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 - - if [ -f "./examples/configure.ac" ]; then - (cd "./examples" && 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 "./examples"/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 + - if [ -f "./examples/configure.ac" ]; then (cd "./examples" && autoreconf -i); fi + - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output + - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'" + - rm cabal.project.freeze + - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output script: - # test that source-distributions can be generated - - (cd "." && cabal sdist) - - (cd "./examples" && cabal sdist) - - mv "."/dist/free-*.tar.gz "./examples"/dist/free-examples-*.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: free-*/*.cabal free-examples-*/*.cabal\\n' > cabal.project" - - echo 'package free-examples' >> cabal.project - - "echo ' flags: -mandelbrot-iter' >> 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" + - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \; + - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \; + - PKGDIR_free="$(find . -maxdepth 1 -type d -regex '.*/free-[0-9.]*')" + - PKGDIR_free_examples="$(find . -maxdepth 1 -type d -regex '.*/free-examples-[0-9.]*')" + # Generate cabal.project + - rm -rf cabal.project cabal.project.local cabal.project.freeze + - touch cabal.project + - | + echo "packages: ${PKGDIR_free}" >> cabal.project + echo "packages: ${PKGDIR_free_examples}" >> cabal.project + - | + echo "package free-examples" >> cabal.project + echo " flags: -mandelbrot-iter" >> cabal.project + - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(free|free-examples)$' || 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 free-* && cabal check) - - (cd free-examples-* && 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 $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output + # cabal check... + - (cd ${PKGDIR_free} && ${CABAL} -vnormal check) + - (cd ${PKGDIR_free_examples} && ${CABAL} -vnormal check) + # haddock... + - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} 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 ("0.9.20191126",["--output=.travis.yml","--config=cabal.haskell-ci","cabal.project"]) # EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-5.1/CHANGELOG.markdown new/free-5.1.3/CHANGELOG.markdown --- old/free-5.1/CHANGELOG.markdown 2018-07-03 13:58:21.000000000 +0200 +++ new/free-5.1.3/CHANGELOG.markdown 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,18 @@ +5.1.3 [2019.11.26] +------------------ +* Allow building with `template-haskell-2.16` (GHC 8.10). +* Add `Eq{1,2}`, `Ord{1,2}`, `Read{1,2}`, and `Show{1,2}` instances for + `CofreeF`. + +5.1.2 [2019.08.27] +------------------ +* Implement more performant versions of `some` and `many` in the `Alternative` + instance for the final `Alt` encoding. + +5.1.1 [2019.05.02] +------------------ +* Allow building with `base-4.13` (GHC 8.8). + 5.1 [2018.07.03] ---------------- * Generalize the type of `_Free`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-5.1/HLint.hs new/free-5.1.3/HLint.hs --- old/free-5.1/HLint.hs 2018-07-03 13:58:21.000000000 +0200 +++ new/free-5.1.3/HLint.hs 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -import "hint" HLint.HLint - -infixr 5 :< - --- This affects performance -ignore "Redundant lambda" - --- This is not valid for improve -ignore "Eta reduce" - --- DeriveDataTypable noise -ignore "Unused LANGUAGE pragma" - --- They are clearer in places -ignore "Avoid lambda" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-5.1/examples/PerfTH.hs new/free-5.1.3/examples/PerfTH.hs --- old/free-5.1/examples/PerfTH.hs 2018-07-03 13:58:21.000000000 +0200 +++ new/free-5.1.3/examples/PerfTH.hs 2001-09-09 03:46:40.000000000 +0200 @@ -12,6 +12,7 @@ import Data.Word import Control.Monad import Control.Monad.State.Strict +import Control.Monad.Fail (MonadFail) import Control.Monad.Free import Control.Monad.Free.TH import qualified Control.Monad.Free.Church as Church @@ -65,7 +66,7 @@ return a -- | Church-based interpreter -runPerfF :: (MonadIO m) => [String] -> Church.F PerfF () -> m () +runPerfF :: (MonadFail m, MonadIO m) => [String] -> Church.F PerfF () -> m () runPerfF [] _ = return () runPerfF ss0 f = fst `liftM` do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-5.1/examples/RetryTH.hs new/free-5.1.3/examples/RetryTH.hs --- old/free-5.1/examples/RetryTH.hs 2018-07-03 13:58:21.000000000 +0200 +++ new/free-5.1.3/examples/RetryTH.hs 2001-09-09 03:46:40.000000000 +0200 @@ -5,9 +5,11 @@ module Main where import Control.Monad +import Control.Monad.Fail as Fail import Control.Monad.Free import Control.Monad.Free.TH import Control.Monad.IO.Class +import Control.Monad.Trans.Instances () import Control.Monad.Trans.Maybe import qualified Data.Foldable as F import Text.Read.Compat (readMaybe) @@ -53,10 +55,10 @@ -- retry :: MonadFree RetryF m => m a -- | We can run a retriable program in any MonadIO. -runRetry :: MonadIO m => Retry a -> m a +runRetry :: (MonadFail m, MonadIO m) => Retry a -> m a runRetry = iterM run where - run :: MonadIO m => RetryF (m a) -> m a + run :: (MonadFail m, MonadIO m) => RetryF (m a) -> m a run (Output s next) = do liftIO $ putStrLn s @@ -66,7 +68,7 @@ s <- liftIO getLine case readMaybe s of Just x -> next x - Nothing -> fail "invalid input" + Nothing -> Fail.fail "invalid input" run (WithRetry block next) = do -- Here we use @@ -76,7 +78,7 @@ Just x <- runMaybeT . F.msum $ repeat (runRetry block) next x - run Retry = fail "forced retry" + run Retry = Fail.fail "forced retry" -- | Sample program. test :: Retry () @@ -92,4 +94,3 @@ main :: IO () main = runRetry test - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-5.1/examples/free-examples.cabal new/free-5.1.3/examples/free-examples.cabal --- old/free-5.1/examples/free-examples.cabal 2018-07-03 13:58:21.000000000 +0200 +++ new/free-5.1.3/examples/free-examples.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -16,8 +16,10 @@ , 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 + , GHC == 8.10.1 synopsis: Monads for free description: Examples projects using @free@ build-type: Simple @@ -41,6 +43,9 @@ mtl >= 2.0.1 && < 2.3, transformers >= 0.2 && < 0.6 +-- This example depends on the HGL library which, unfortunately, fails to +-- compile on GHC 8.4 or later. (See https://github.com/xpika/hgl/issues/3.) +-- Build at your own risk. executable free-mandelbrot-iter if !flag(mandelbrot-iter) buildable: False @@ -73,6 +78,7 @@ build-depends: base == 4.*, base-compat, + fail == 4.9.*, free, mtl >= 2.0.1 && < 2.3, rdtsc, @@ -82,12 +88,14 @@ hs-source-dirs: . default-language: Haskell2010 main-is: RetryTH.hs - ghc-options: -Wall + ghc-options: -Wall -fno-warn-orphans build-depends: - base == 4.*, + base == 4.*, base-compat, + fail == 4.9.*, free, - transformers >= 0.2 && < 0.6 + transformers >= 0.2 && < 0.6, + transformers-compat >= 0.6.4 && < 0.7 executable free-teletype hs-source-dirs: . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-5.1/free.cabal new/free-5.1.3/free.cabal --- old/free-5.1/free.cabal 2018-07-03 13:58:21.000000000 +0200 +++ new/free-5.1.3/free.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,6 +1,6 @@ name: free category: Control, Monads -version: 5.1 +version: 5.1.3 license: BSD3 cabal-version: 1.18 license-file: LICENSE @@ -16,8 +16,10 @@ , 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 + , GHC == 8.10.1 synopsis: Monads for free description: Free monads are useful for many tree-like structures and domain specific languages. @@ -43,11 +45,11 @@ extra-source-files: .ghci .gitignore + .hlint.yaml .travis.yml .vim.custom README.markdown CHANGELOG.markdown - HLint.hs doc/proof/Control/Comonad/Cofree/*.md doc/proof/Control/Comonad/Trans/Cofree/*.md examples/free-examples.cabal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-5.1/src/Control/Alternative/Free/Final.hs new/free-5.1.3/src/Control/Alternative/Free/Final.hs --- old/free-5.1/src/Control/Alternative/Free/Final.hs 2018-07-03 13:58:21.000000000 +0200 +++ new/free-5.1.3/src/Control/Alternative/Free/Final.hs 2001-09-09 03:46:40.000000000 +0200 @@ -48,6 +48,8 @@ instance Alternative (Alt f) where empty = Alt (\_ -> empty) Alt x <|> Alt y = Alt (\k -> x k <|> y k) + some (Alt x) = Alt $ \k -> some (x k) + many (Alt x) = Alt $ \k -> many (x k) instance Semigroup (Alt f a) where (<>) = (<|>) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-5.1/src/Control/Comonad/Trans/Cofree.hs new/free-5.1.3/src/Control/Comonad/Trans/Cofree.hs --- old/free-5.1/src/Control/Comonad/Trans/Cofree.hs 2018-07-03 13:58:21.000000000 +0200 +++ new/free-5.1.3/src/Control/Comonad/Trans/Cofree.hs 2001-09-09 03:46:40.000000000 +0200 @@ -7,6 +7,7 @@ {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} #endif +#include "free-common.h" ----------------------------------------------------------------------------- -- | @@ -42,6 +43,7 @@ import Data.Bifoldable import Data.Bitraversable import Data.Foldable +import Data.Functor.Classes import Data.Functor.Identity import Data.Traversable import Control.Monad (liftM) @@ -67,6 +69,74 @@ #endif ) +#ifdef LIFTED_FUNCTOR_CLASSES +instance Show1 f => Show2 (CofreeF f) where + liftShowsPrec2 spa _sla spb slb d (a :< fb) = + showParen (d > 5) $ + spa 6 a . showString " :< " . liftShowsPrec spb slb 6 fb + +instance (Show1 f, Show a) => Show1 (CofreeF f a) where + liftShowsPrec = liftShowsPrec2 showsPrec showList + +#else +instance (Functor f, Show1 f, Show a) => Show1 (CofreeF f a) where + showsPrec1 d (a :< fb) = showParen (d > 5) $ + showsPrec 6 a . showString " :< " . showsPrec1 6 fb +#endif + +#ifdef LIFTED_FUNCTOR_CLASSES +instance Read1 f => Read2 (CofreeF f) where + liftReadsPrec2 rpa _rla rpb rlb d = + readParen (d > 5) $ + (\r' -> [ (u :< v, w) + | (u, s) <- rpa 6 r' + , (":<", t) <- lex s + , (v, w) <- liftReadsPrec rpb rlb 6 t + ]) + +instance (Read1 f, Read a) => Read1 (CofreeF f a) where + liftReadsPrec = liftReadsPrec2 readsPrec readList +#else +instance (Read1 f, Read a) => Read1 (CofreeF f a) where + readsPrec1 d = + readParen (d > 5) $ + (\r' -> [ (u :< v,w) + | (u, s) <- readsPrec 6 r' + , (":<", t) <- lex s + , (v, w) <- readsPrec1 6 t + ]) +#endif + +#ifdef LIFTED_FUNCTOR_CLASSES +instance Eq1 f => Eq2 (CofreeF f) where + liftEq2 eqa eqfb (a :< fb) (a' :< fb') = eqa a a' && liftEq eqfb fb fb' + +instance (Eq1 f, Eq a) => Eq1 (CofreeF f a) where + liftEq = liftEq2 (==) +#else +instance (Eq1 f, Eq a) => Eq1 (CofreeF f a) where + eq1 (a :< fb) (a' :< fb') = a == a' && eq1 fb fb' +#endif + +#ifdef LIFTED_FUNCTOR_CLASSES +instance Ord1 f => Ord2 (CofreeF f) where + liftCompare2 cmpa cmpfb (a :< fb) (a' :< fb') = + case cmpa a a' of + LT -> LT + EQ -> liftCompare cmpfb fb fb' + GT -> GT + +instance (Ord1 f, Ord a) => Ord1 (CofreeF f a) where + liftCompare = liftCompare2 compare +#else +instance (Ord1 f, Ord a) => Ord1 (CofreeF f a) where + compare1 (a :< fb) (a' :< fb') = + case compare a a' of + LT -> LT + EQ -> compare1 fb fb' + GT -> GT +#endif + -- | Extract the head of the base functor headF :: CofreeF f a b -> a headF (a :< _) = a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-5.1/src/Control/Monad/Free/TH.hs new/free-5.1.3/src/Control/Monad/Free/TH.hs --- old/free-5.1/src/Control/Monad/Free/TH.hs 2018-07-03 13:58:21.000000000 +0200 +++ new/free-5.1.3/src/Control/Monad/Free/TH.hs 2001-09-09 03:46:40.000000000 +0200 @@ -110,9 +110,9 @@ [ "expected final return type `" ++ pprint n ++ "'" , "but got `" ++ pprint name ++ "'" , "in a constructor's argument type: `" ++ pprint t ++ "'" ] - let tup = foldl AppT (TupleT $ length ts) ts + let tup = nonUnaryTupleT ts xs <- mapM (const $ newName "x") ts - return $ Captured tup (LamE (map VarP xs) (TupE (map VarE xs))) + return $ Captured tup (LamE (map VarP xs) (nonUnaryTupE $ map VarE xs)) _ -> fail $ unlines [ "expected a type variable `" ++ pprint n ++ "'" , "or a type like (a1 -> ... -> aN -> " ++ pprint n ++ ")" @@ -129,6 +129,18 @@ , "but got `" ++ pprint rt ++ "'" , "in a constructor's argument type: `" ++ pprint t ++ "'" ] + nonUnaryTupleT :: [Type] -> Type + nonUnaryTupleT [t'] = t' + nonUnaryTupleT ts = foldl AppT (TupleT $ length ts) ts + + nonUnaryTupE :: [Exp] -> Exp + nonUnaryTupE [e] = e + nonUnaryTupE es = TupE $ +#if MIN_VERSION_template_haskell(2,16,0) + map Just +#endif + es + mkArg n _ = fail $ unlines [ "expected a type variable" , "but got `" ++ pprint n ++ "'" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-5.1/src/Control/Monad/Free.hs new/free-5.1.3/src/Control/Monad/Free.hs --- old/free-5.1/src/Control/Monad/Free.hs 2018-07-03 13:58:21.000000000 +0200 +++ new/free-5.1.3/src/Control/Monad/Free.hs 2001-09-09 03:46:40.000000000 +0200 @@ -82,7 +82,7 @@ -- -- then 'Free' is the left adjoint to @U@. -- --- Being 'Free' being left adjoint to @U@ means that there is an isomorphism between +-- 'Free' being left adjoint to @U@ means that there is an isomorphism between -- -- @'Free' f -> m@ in the category of monads and @f -> U m@ in the category of functors. -- @@ -355,7 +355,7 @@ iterM _ (Pure x) = return x iterM phi (Free f) = phi (iterM phi <$> f) --- | Lift a natural transformation from @f@ to @g@ into a natural transformation from @'FreeT' f@ to @'FreeT' g@. +-- | Lift a natural transformation from @f@ to @g@ into a natural transformation from @'Free' f@ to @'Free' g@. hoistFree :: Functor g => (forall a. f a -> g a) -> Free f b -> Free g b hoistFree _ (Pure a) = Pure a hoistFree f (Free as) = Free (hoistFree f <$> f as) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-5.1/src/Control/Monad/Trans/Free/Ap.hs new/free-5.1.3/src/Control/Monad/Trans/Free/Ap.hs --- old/free-5.1/src/Control/Monad/Trans/Free/Ap.hs 2018-07-03 13:58:21.000000000 +0200 +++ new/free-5.1.3/src/Control/Monad/Trans/Free/Ap.hs 2001-09-09 03:46:40.000000000 +0200 @@ -307,10 +307,12 @@ FreeT m >>= f = FreeT $ m >>= \v -> case v of Pure a -> runFreeT (f a) Free w -> return (Free (fmap (>>= f) w)) - fail = Fail.fail - -instance (Applicative f, Applicative m, Monad m) => Fail.MonadFail (FreeT f m) where +#if !MIN_VERSION_base(4,13,0) fail e = FreeT (fail e) +#endif + +instance (Applicative f, Applicative m, Fail.MonadFail m) => Fail.MonadFail (FreeT f m) where + fail e = FreeT (Fail.fail e) instance MonadTrans (FreeT f) where lift = FreeT . liftM Pure diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-5.1/src/Control/Monad/Trans/Free.hs new/free-5.1.3/src/Control/Monad/Trans/Free.hs --- old/free-5.1/src/Control/Monad/Trans/Free.hs 2018-07-03 13:58:21.000000000 +0200 +++ new/free-5.1.3/src/Control/Monad/Trans/Free.hs 2001-09-09 03:46:40.000000000 +0200 @@ -308,10 +308,12 @@ Pure a -> runFreeT (f a) Free w -> return (Free (fmap (>>= f) w)) - fail = Fail.fail - -instance (Functor f, Monad m) => Fail.MonadFail (FreeT f m) where +#if !MIN_VERSION_base(4,13,0) fail e = FreeT (fail e) +#endif + +instance (Functor f, Fail.MonadFail m) => Fail.MonadFail (FreeT f m) where + fail e = FreeT (Fail.fail e) instance MonadTrans (FreeT f) where lift = FreeT . liftM Pure diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-5.1/src/Control/Monad/Trans/Iter.hs new/free-5.1.3/src/Control/Monad/Trans/Iter.hs --- old/free-5.1/src/Control/Monad/Trans/Iter.hs 2018-07-03 13:58:21.000000000 +0200 +++ new/free-5.1.3/src/Control/Monad/Trans/Iter.hs 2001-09-09 03:46:40.000000000 +0200 @@ -219,8 +219,10 @@ {-# INLINE return #-} IterT m >>= k = IterT $ m >>= either (runIterT . k) (return . Right . (>>= k)) {-# INLINE (>>=) #-} +#if !MIN_VERSION_base(4,13,0) fail = Fail.fail {-# INLINE fail #-} +#endif instance Monad m => Fail.MonadFail (IterT m) where fail _ = never
