diff --git a/ChangeLog.md b/ChangeLog.md --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,9 @@ # Revision history for vessel +## 0.2.0.0 + +* Add an orphan instance for 'Additive' of 'Compose' this is in line with the other orphans for 'Compose' that will be phased out in a future release in favor of an upstream solution. + ## 0.1.0.0 * Initial release diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # vessel: functor-parametric containers [![Haskell](https://img.shields.io/badge/language-Haskell-orange.svg)](https://haskell.org) [![Hackage](https://img.shields.io/hackage/v/vessel.svg)](https://hackage.haskell.org/package/vessel) [![Hackage CI](https://matrix.hackage.haskell.org/api/v2/packages/vessel/badge)](https://matrix.hackage.haskell.org/#/package/vessel) [![Github CI](https://github.com/obsidiansystems/vessel/workflows/github-action/badge.svg)](https://github.com/obsidiansystems/vessel/actions) [![BSD3 License](https://img.shields.io/badge/license-BSD3-blue.svg)](https://github.com/obsidiansystems/vessel/blob/master/LICENSE) -See the [tutorial](tutorial/Tutorial.md) for a worked example of how to use this library. +See the [tutorial](https://github.com/obsidiansystems/vessel/blob/develop/tutorial/Tutorial.md) for a worked example of how to use this library. *** diff --git a/src/Data/Vessel/Internal.hs b/src/Data/Vessel/Internal.hs --- a/src/Data/Vessel/Internal.hs +++ b/src/Data/Vessel/Internal.hs @@ -96,6 +96,8 @@ mempty = Compose mempty mappend (Compose x) (Compose y) = Compose (mappend x y) +instance (Additive (f (g a))) => Additive (Compose f g a) + ------- Miscellaneous stuff to be moved elsewhere ------- -- TODO: These belong in Data.Functor.Compose -- good luck to anyone who wants to upstream them into base though. diff --git a/vessel.cabal b/vessel.cabal --- a/vessel.cabal +++ b/vessel.cabal @@ -1,5 +1,5 @@ name: vessel -version: 0.1.0.0 +version: 0.2.0.0 description: A dependently-typed key-value data structure that allows for storage of both "queries", (wherein keys are stored along with reasons for selecting the items or counts of the number of times something has been selected), as well as the responses to those queries, in which the type of the key additionally determines the type of the response @@ -9,6 +9,7 @@ maintainer: maintainer@obsidian.systems copyright: Obsidian Systems LLC build-type: Simple +extra-doc-files: tutorial/Tutorial.md extra-source-files: ChangeLog.md README.md @@ -46,20 +47,20 @@ build-depends: aeson >=1.4 && <1.6 , base >=4.9 && <4.15 - , bifunctors >=5.5 && <5.6 + , bifunctors ^>=5.5 , constraints >=0.10 && <0.15 - , constraints-extras >=0.3 && <0.4 - , containers >=0.6 && <0.7 - , dependent-map >=0.4 && <0.5 - , dependent-monoidal-map >=0.1.1.0 && <0.2 - , dependent-sum >=0.7 && <0.8 - , dependent-sum-aeson-orphans >=0.3 && <0.4 - , monoidal-containers >=0.6 && <0.7 - , mtl >=2.2 && <2.3 - , patch >=0.0.4.0 && <0.1 + , constraints-extras ^>=0.3 + , containers ^>=0.6 + , dependent-map ^>=0.4 + , dependent-monoidal-map ^>=0.1.1.0 + , dependent-sum ^>=0.7 + , dependent-sum-aeson-orphans ^>=0.3 + , monoidal-containers ^>=0.6 + , mtl ^>=2.2 + , patch ^>=0.0.4.0 , reflex >=0.6.4 && <0.9 , semialign >=1 - , these >=1 && <1.1 + , these ^>=1 , witherable >=0.2 && <=0.3.2 hs-source-dirs: src @@ -68,9 +69,10 @@ library vessel-tutorial if impl(ghcjs) buildable: False - hs-source-dirs: tutorial - exposed-modules: Tutorial - default-language: Haskell2010 + + hs-source-dirs: tutorial + exposed-modules: Tutorial + default-language: Haskell2010 default-extensions: ConstraintKinds FlexibleContexts @@ -89,8 +91,9 @@ TemplateHaskell TypeFamilies UndecidableInstances - ghc-options: -Wall -pgmL markdown-unlit - build-tool-depends: markdown-unlit:markdown-unlit + + ghc-options: -Wall -pgmL markdown-unlit + build-tool-depends: markdown-unlit:markdown-unlit -any build-depends: aeson , aeson-gadt-th