semigroups 0.19.1 → 0.19.2
raw patch · 6 files changed
+45/−203 lines, 6 filesdep ~hashable
Dependency ranges changed: hashable
Files
- .travis.yml +0/−196
- CHANGELOG.markdown +5/−0
- README.markdown +1/−1
- semigroups.cabal +7/−4
- src-ghc7/Data/List/NonEmpty.hs +5/−0
- src-ghc7/Data/Semigroup.hs +27/−2
− .travis.yml
@@ -1,196 +0,0 @@-# This Travis job script has been generated by a script via-#-# haskell-ci '-o' '.travis.yml' '--config=cabal.haskell-ci' 'cabal.project'-#-# For more information, see https://github.com/haskell-CI/haskell-ci-#-# version: 0.3.20190429-#-language: c-dist: xenial-git:- # whether to recursively clone submodules- submodules: false-notifications:- irc:- channels:- - irc.freenode.org#haskell-lens- skip_join: true- template:- - "\"\\x0313semigroups\\x03/\\x0306%{branch}\\x03 \\x0314%{commit}\\x03 %{build_url} %{message}\""-cache:- directories:- - $HOME/.cabal/packages- - $HOME/.cabal/store-before_cache:- - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log- # remove files that are regenerated by 'cabal update'- - 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.8.1- addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}- env: GHCHEAD=true- - 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- allow_failures:- - compiler: ghc-head- - compiler: ghc-8.8.1-before_install:- - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')- - HCPKG="$HC-pkg"- - unset CC- - 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- - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"- - TEST=--enable-tests- - BENCH=--enable-benchmarks- - GHCHEAD=${GHCHEAD-false}- - 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- 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- - 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- - ${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:- - 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 '{}' \;- # 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} 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","--config=cabal.haskell-ci","cabal.project"]-# EOF
CHANGELOG.markdown view
@@ -1,3 +1,8 @@+0.19.2 [2021.08.30]+-------------------+* Backport `Hashable1` instances for `NonEmpty`, `Min`, `Max`, `First`, `Last`,+ `WrappedMonoid`, and `Option`.+ 0.19.1 [2019.08.27] ------------------- * Add `GenericSemigroupMonoid`, an adapter newtype suitable for `DerivingVia`,
README.markdown view
@@ -1,7 +1,7 @@ semigroups ========== -[](https://hackage.haskell.org/package/semigroups) [](http://travis-ci.org/ekmett/semigroups)+[](https://hackage.haskell.org/package/semigroups) [](https://github.com/ekmett/semigroups/actions?query=workflow%3AHaskell-CI) Haskellers are usually familiar with monoids. A monoid has an appending operation `<>` or `mappend` and an identity element `mempty`. A Semigroup has an append `<>`, but does not require an `mempty` element. A Monoid can be made a Semigroup with just `instance Semigroup MyMonoid`
semigroups.cabal view
@@ -1,6 +1,6 @@ name: semigroups category: Algebra, Data, Data Structures, Math-version: 0.19.1+version: 0.19.2 license: BSD3 cabal-version: >= 1.10 license-file: LICENSE@@ -14,7 +14,7 @@ description: In mathematics, a semigroup is an algebraic structure consisting of a set together with an associative binary operation. A semigroup generalizes a monoid in that there might not exist an identity element. It also (originally) generalized a group (a monoid with all inverses) to a type where every element did not have to have an inverse, thus the name semigroup. build-type: Simple-extra-source-files: .travis.yml README.markdown CHANGELOG.markdown+extra-source-files: README.markdown CHANGELOG.markdown tested-with: GHC == 7.0.4 , GHC == 7.2.2 , GHC == 7.4.2@@ -25,7 +25,10 @@ , GHC == 8.2.2 , GHC == 8.4.4 , GHC == 8.6.5- , GHC == 8.8.1+ , GHC == 8.8.4+ , GHC == 8.10.7+ , GHC == 9.0.1+ , GHC == 9.2.* source-repository head type: git@@ -178,7 +181,7 @@ build-depends: unordered-containers >= 0.2 && < 0.3 if flag(transformers)- build-depends: transformers >= 0.2 && < 0.6+ build-depends: transformers >= 0.2 && < 0.7 , transformers-compat >= 0.5 && < 1 if flag(template-haskell)
src-ghc7/Data/List/NonEmpty.hs view
@@ -146,6 +146,7 @@ #ifdef MIN_VERSION_hashable import Data.Hashable+import Data.Hashable.Lifted #endif #ifdef MIN_VERSION_transformers@@ -192,6 +193,10 @@ #ifdef MIN_VERSION_hashable instance Hashable a => Hashable (NonEmpty a) where hashWithSalt p (a :| as) = p `hashWithSalt` a `hashWithSalt` as++-- | @since 0.19.2+instance Hashable1 NonEmpty where+ liftHashWithSalt h salt (a :| as) = liftHashWithSalt h (h salt a) as #endif #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 708
src-ghc7/Data/Semigroup.hs view
@@ -109,7 +109,7 @@ import Control.Monad.Fix import qualified Control.Monad.ST as Strict import qualified Data.Monoid as Monoid-import Data.List.NonEmpty+import Data.List.NonEmpty (NonEmpty(..)) #if MIN_VERSION_base(4,6,0) import Data.Ord (Down(..)) #else@@ -172,11 +172,12 @@ #ifdef MIN_VERSION_hashable import Data.Hashable+import Data.Hashable.Lifted #endif #ifdef MIN_VERSION_unordered_containers import Data.HashMap.Lazy as Lazy-import Data.HashSet+import Data.HashSet (HashSet) #endif #ifdef LANGUAGE_DeriveDataTypeable@@ -471,6 +472,10 @@ #ifdef MIN_VERSION_hashable instance Hashable a => Hashable (Min a) where hashWithSalt p (Min a) = hashWithSalt p a++-- | @since 0.19.2+instance Hashable1 Min where+ liftHashWithSalt h salt (Min a) = h salt a #endif instance Ord a => Semigroup (Min a) where@@ -574,6 +579,10 @@ #ifdef MIN_VERSION_hashable instance Hashable a => Hashable (Max a) where hashWithSalt p (Max a) = hashWithSalt p a++-- | @since 0.19.2+instance Hashable1 Max where+ liftHashWithSalt h salt (Max a) = h salt a #endif instance Ord a => Semigroup (Max a) where@@ -761,6 +770,10 @@ #ifdef MIN_VERSION_hashable instance Hashable a => Hashable (First a) where hashWithSalt p (First a) = hashWithSalt p a++-- | @since 0.19.2+instance Hashable1 First where+ liftHashWithSalt h salt (First a) = h salt a #endif instance Semigroup (First a) where@@ -848,6 +861,10 @@ #ifdef MIN_VERSION_hashable instance Hashable a => Hashable (Last a) where hashWithSalt p (Last a) = hashWithSalt p a++-- | @since 0.19.2+instance Hashable1 Last where+ liftHashWithSalt h salt (Last a) = h salt a #endif instance Semigroup (Last a) where@@ -973,6 +990,10 @@ #ifdef MIN_VERSION_hashable instance Hashable a => Hashable (WrappedMonoid a) where hashWithSalt p (WrapMonoid a) = hashWithSalt p a++-- | @since 0.19.2+instance Hashable1 WrappedMonoid where+ liftHashWithSalt h salt (WrapMonoid a) = h salt a #endif instance Monoid m => Semigroup (WrappedMonoid m) where@@ -1062,6 +1083,10 @@ #ifdef MIN_VERSION_hashable instance Hashable a => Hashable (Option a) where hashWithSalt p (Option a) = hashWithSalt p a++-- | @since 0.19.2+instance Hashable1 Option where+ liftHashWithSalt h salt (Option a) = liftHashWithSalt h salt a #endif instance Functor Option where