diff -Nru haskell-diagrams-lib-1.4.3/CHANGELOG.md haskell-diagrams-lib-1.4.5.1/CHANGELOG.md --- haskell-diagrams-lib-1.4.3/CHANGELOG.md 2001-09-09 01:46:40.000000000 +0000 +++ haskell-diagrams-lib-1.4.5.1/CHANGELOG.md 2001-09-09 01:46:40.000000000 +0000 @@ -1,3 +1,30 @@ +## [v1.4.5.1](https://github.com/diagrams/diagrams-lib/tree/v1.4.5.1) (2021-12-17) + +- Bug fix: make things compile again under versions of `lens` before 5.1. + +## [v1.4.5](https://github.com/diagrams/diagrams-lib/tree/v1.4.5) (2021-12-16) + +- Allow `base-4.16` (tested with GHC 9.2.1) +- Allow `semigroups-0.20`, `lens-5.1`, `hashable-1.4`, + `transformers-0.6` +- Add `Eq` instance for `SizeSpec` + +## [v1.4.4-r1](https://github.com/diagrams/diagrams-lib/tree/v1.4.4-r1) (2021-06-05) + +- Bumps to dependency upper bounds: + - Allow `tasty-1.4` + - Allow `bytestring-0.11` + +## [v1.4.4](https://github.com/diagrams/diagrams-lib/tree/v1.4.4) (2021-05-24) + +- Bumps to upper bounds, to allow building with: + - `base-4.15` (tested with GHC 9.0.1) + - `optparse-applicative` (tested with GHC 8.8.4 & 8.10.2) + +- Updated use of Kinds thoughout the package + +- Drop support for GHC 8.2 or earlier + ## [v1.4.3](https://github.com/diagrams/diagrams-lib/tree/v1.4.3) (2019-11-06) - Bumps to upper bounds, to allow building with: diff -Nru haskell-diagrams-lib-1.4.3/debian/changelog haskell-diagrams-lib-1.4.5.1/debian/changelog --- haskell-diagrams-lib-1.4.3/debian/changelog 2020-10-29 20:24:40.000000000 +0000 +++ haskell-diagrams-lib-1.4.5.1/debian/changelog 2022-07-26 17:55:07.000000000 +0000 @@ -1,32 +1,13 @@ -haskell-diagrams-lib (1.4.3-1build5) hirsute; urgency=medium +haskell-diagrams-lib (1.4.5.1-1) unstable; urgency=medium - * No-change rebuild for new GHC ABIs + [ Ilias Tsitsimpis ] + * Declare compliance with Debian policy 4.6.1 + * Remove retired developer, Joachim Breitner, from Uploaders. - -- Steve Langasek Thu, 29 Oct 2020 20:24:40 +0000 + [ Clint Adams ] + * New upstream version. -haskell-diagrams-lib (1.4.3-1build4) groovy; urgency=medium - - * No-change rebuild for new GHC ABIs - - -- Steve Langasek Sat, 29 Aug 2020 17:56:39 +0000 - -haskell-diagrams-lib (1.4.3-1build3) groovy; urgency=medium - - * Rebuild against new GHC ABI. - - -- Gianfranco Costamagna Fri, 14 Aug 2020 11:39:00 +0200 - -haskell-diagrams-lib (1.4.3-1build2) groovy; urgency=medium - - * Rebuild against new GHC abi. - - -- Gianfranco Costamagna Fri, 24 Jul 2020 18:29:33 +0200 - -haskell-diagrams-lib (1.4.3-1build1) groovy; urgency=medium - - * No change rebuild against new ghc ABI. - - -- Dimitri John Ledkov Thu, 09 Jul 2020 15:19:27 +0100 + -- Clint Adams Tue, 26 Jul 2022 13:55:07 -0400 haskell-diagrams-lib (1.4.3-1) unstable; urgency=medium diff -Nru haskell-diagrams-lib-1.4.3/debian/control haskell-diagrams-lib-1.4.5.1/debian/control --- haskell-diagrams-lib-1.4.3/debian/control 2020-07-09 14:19:27.000000000 +0000 +++ haskell-diagrams-lib-1.4.5.1/debian/control 2022-07-26 17:55:07.000000000 +0000 @@ -1,8 +1,7 @@ Source: haskell-diagrams-lib -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Haskell Group +Maintainer: Debian Haskell Group Uploaders: - Joachim Breitner , + Ilias Tsitsimpis , Priority: optional Section: haskell Rules-Requires-Root: no @@ -31,7 +30,7 @@ libghc-data-default-class-dev (<< 0.2), libghc-data-default-class-prof, libghc-diagrams-core-dev (>= 1.4), - libghc-diagrams-core-dev (<< 1.5), + libghc-diagrams-core-dev (<< 1.6), libghc-diagrams-core-prof, libghc-diagrams-solve-dev (<< 0.2), libghc-diagrams-solve-dev (>= 0.1), @@ -52,7 +51,7 @@ libghc-fsnotify-dev (<< 0.4), libghc-fsnotify-prof, libghc-hashable-dev (>= 1.1), - libghc-hashable-dev (<< 1.4), + libghc-hashable-dev (<< 1.5), libghc-hashable-prof, libghc-juicypixels-dev (<< 3.4), libghc-juicypixels-dev (>= 3.1.5), @@ -61,22 +60,22 @@ libghc-intervals-dev (<< 0.10), libghc-intervals-prof, libghc-lens-dev (>= 4.6), - libghc-lens-dev (<< 4.20), + libghc-lens-dev (<< 5.2), libghc-lens-prof, libghc-linear-dev (>= 1.20.1), libghc-linear-dev (<< 1.22), libghc-linear-prof, - libghc-monoid-extras-dev (>= 0.3), - libghc-monoid-extras-dev (<< 0.6), + libghc-monoid-extras-dev (>= 0.6), + libghc-monoid-extras-dev (<< 0.7), libghc-monoid-extras-prof, libghc-optparse-applicative-dev (>= 0.11), - libghc-optparse-applicative-dev (<< 0.16), + libghc-optparse-applicative-dev (<< 0.17), libghc-optparse-applicative-prof, libghc-profunctors-dev (>= 5.0), libghc-profunctors-dev (<< 6.0), libghc-profunctors-prof, libghc-semigroups-dev (>= 0.3.4), - libghc-semigroups-dev (<< 0.20), + libghc-semigroups-dev (<< 0.21), libghc-semigroups-prof, libghc-tagged-dev (>= 0.7), libghc-tagged-prof, @@ -108,7 +107,7 @@ libghc-semigroups-doc, libghc-tagged-doc, libghc-unordered-containers-doc, -Standards-Version: 4.5.0 +Standards-Version: 4.6.1 Homepage: https://diagrams.github.io Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-diagrams-lib Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-diagrams-lib] diff -Nru haskell-diagrams-lib-1.4.3/debian/patches/newer-deps haskell-diagrams-lib-1.4.5.1/debian/patches/newer-deps --- haskell-diagrams-lib-1.4.3/debian/patches/newer-deps 2020-06-16 17:17:27.000000000 +0000 +++ haskell-diagrams-lib-1.4.5.1/debian/patches/newer-deps 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ ---- a/diagrams-lib.cabal -+++ b/diagrams-lib.cabal -@@ -100,7 +100,7 @@ - Diagrams.TwoD.Types, - Diagrams.TwoD.Vector, - Diagrams.Util -- Build-depends: base >= 4.8 && < 4.14, -+ Build-depends: base >= 4.8 && < 5, - containers >= 0.3 && < 0.7, - array >= 0.3 && < 0.6, - semigroups >= 0.3.4 && < 0.20, -@@ -113,13 +113,13 @@ - data-default-class < 0.2, - fingertree >= 0.1 && < 0.2, - intervals >= 0.7 && < 0.10, -- lens >= 4.6 && < 4.19, -+ lens >= 4.6 && < 4.20, - tagged >= 0.7, - optparse-applicative >= 0.11 && < 0.16, - filepath, - JuicyPixels >= 3.3.4 && < 3.4, - hashable >= 1.1 && < 1.4, -- linear >= 1.20.1 && < 1.21, -+ linear >= 1.20.1 && < 1.22, - adjunctions >= 4.0 && < 5.0, - distributive >=0.2.2 && < 1.0, - process >= 1.1 && < 1.7, diff -Nru haskell-diagrams-lib-1.4.3/debian/patches/series haskell-diagrams-lib-1.4.5.1/debian/patches/series --- haskell-diagrams-lib-1.4.3/debian/patches/series 2020-06-16 17:17:27.000000000 +0000 +++ haskell-diagrams-lib-1.4.5.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -newer-deps diff -Nru haskell-diagrams-lib-1.4.3/diagrams-lib.cabal haskell-diagrams-lib-1.4.5.1/diagrams-lib.cabal --- haskell-diagrams-lib-1.4.3/diagrams-lib.cabal 2001-09-09 01:46:40.000000000 +0000 +++ haskell-diagrams-lib-1.4.5.1/diagrams-lib.cabal 2001-09-09 01:46:40.000000000 +0000 @@ -1,5 +1,5 @@ Name: diagrams-lib -Version: 1.4.3 +Version: 1.4.5.1 Synopsis: Embedded domain-specific language for declarative graphics Description: Diagrams is a flexible, extensible EDSL for creating graphics of many types. Graphics can be created @@ -21,7 +21,7 @@ Cabal-version: 1.18 Extra-source-files: CHANGELOG.md, README.markdown, diagrams/*.svg Extra-doc-files: diagrams/*.svg -Tested-with: GHC ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.3 || ==8.6.5 || ==8.8.1 +Tested-with: GHC ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.4 || ==9.0.1 || ==9.2.1 Source-repository head type: git location: http://github.com/diagrams/diagrams-lib.git @@ -100,26 +100,26 @@ Diagrams.TwoD.Types, Diagrams.TwoD.Vector, Diagrams.Util - Build-depends: base >= 4.8 && < 4.14, + Build-depends: base >= 4.9 && < 4.17, containers >= 0.3 && < 0.7, array >= 0.3 && < 0.6, - semigroups >= 0.3.4 && < 0.20, - monoid-extras >= 0.3 && < 0.6, + semigroups >= 0.3.4 && < 0.21, + monoid-extras >= 0.6 && < 0.7, dual-tree >= 0.2 && < 0.3, - diagrams-core >= 1.4 && < 1.5, + diagrams-core >= 1.4 && < 1.6, diagrams-solve >= 0.1 && < 0.2, active >= 0.2 && < 0.3, colour >= 2.3.2 && < 2.4, data-default-class < 0.2, fingertree >= 0.1 && < 0.2, intervals >= 0.7 && < 0.10, - lens >= 4.6 && < 4.19, + lens >= 4.6 && < 5.2, tagged >= 0.7, - optparse-applicative >= 0.11 && < 0.16, + optparse-applicative >= 0.11 && < 0.17, filepath, JuicyPixels >= 3.3.4 && < 3.4, - hashable >= 1.1 && < 1.4, - linear >= 1.20.1 && < 1.21, + hashable >= 1.1 && < 1.5, + linear >= 1.20.1 && < 1.22, adjunctions >= 4.0 && < 5.0, distributive >=0.2.2 && < 1.0, process >= 1.1 && < 1.7, @@ -128,11 +128,11 @@ unordered-containers >= 0.2 && < 0.3, text >= 0.7.1 && < 1.3, mtl >= 2.0 && < 2.3, - transformers >= 0.3.0 && < 0.6.0, + transformers >= 0.3.0 && < 0.7.0, profunctors >= 5.0 && < 6.0, exceptions >= 0.6 && < 1.0, cereal >=0.4.1.1 && <0.6, - bytestring >=0.9 && <0.11 + bytestring >=0.9 && <0.12 if impl(ghc < 7.6) Build-depends: ghc-prim if !impl(ghc >= 8.0) @@ -161,7 +161,7 @@ , Instances hs-source-dirs: test build-depends: base, - tasty >= 0.10 && < 1.3, + tasty >= 0.10 && < 1.5, tasty-hunit >= 0.9.2 && < 0.11, tasty-quickcheck >= 0.8 && < 0.11, QuickCheck >= 2.7, diff -Nru haskell-diagrams-lib-1.4.3/src/Diagrams/Attributes/Compile.hs haskell-diagrams-lib-1.4.5.1/src/Diagrams/Attributes/Compile.hs --- haskell-diagrams-lib-1.4.3/src/Diagrams/Attributes/Compile.hs 2001-09-09 01:46:40.000000000 +0000 +++ haskell-diagrams-lib-1.4.5.1/src/Diagrams/Attributes/Compile.hs 2001-09-09 01:46:40.000000000 +0000 @@ -25,6 +25,7 @@ import Control.Arrow (second) import Control.Lens ((%~), (&), _Wrapping') +import Data.Kind (Type) import qualified Data.HashMap.Strict as HM import Data.Semigroup import Data.Tree (Tree (..)) @@ -39,8 +40,8 @@ -- splitFills; it's done this way to facilitate testing. class (AttributeClass (AttrType code), Typeable (PrimType code)) => SplitAttribute code where - type AttrType code :: * - type PrimType code :: * + type AttrType code :: Type + type PrimType code :: Type primOK :: code -> PrimType code -> Bool diff -Nru haskell-diagrams-lib-1.4.3/src/Diagrams/Backend/CmdLine.hs haskell-diagrams-lib-1.4.5.1/src/Diagrams/Backend/CmdLine.hs --- haskell-diagrams-lib-1.4.3/src/Diagrams/Backend/CmdLine.hs 2001-09-09 01:46:40.000000000 +0000 +++ haskell-diagrams-lib-1.4.5.1/src/Diagrams/Backend/CmdLine.hs 2001-09-09 01:46:40.000000000 +0000 @@ -23,7 +23,7 @@ -- executables. -- -- For a tutorial on command-line diagram creation see --- . +-- . -- ----------------------------------------------------------------------------- @@ -98,6 +98,7 @@ import Data.Data import Data.Functor.Identity import Data.IORef +import Data.Kind (Type) import Data.List (delete) import Data.Maybe (fromMaybe) import Data.Monoid @@ -220,11 +221,17 @@ -- Taken from Options.Applicative.Extra but without the -- short option 'h'. We want the 'h' for Height. helper' :: Parser (a -> a) -helper' = abortOption ShowHelpText $ mconcat +helper' = abortOption param $ mconcat [ long "help" , short '?' , help "Show this help text" ] + where +#if MIN_VERSION_optparse_applicative(0,16,0) + param = ShowHelpText Nothing +#else + param = ShowHelpText +#endif -- | Apply a parser to the command line that includes the standard -- program description and help behavior. Results in parsed commands @@ -355,8 +362,8 @@ -- at once, and a type @'ResultOf' d@ that is the type of the final result from -- some base case instance. class ToResult d where - type Args d :: * - type ResultOf d :: * + type Args d :: Type + type ResultOf d :: Type toResult :: d -> Args d -> ResultOf d @@ -430,7 +437,7 @@ class Mainable d where -- | Associated type that describes the options which need to be parsed -- from the command-line and passed to @mainRender@. - type MainOpts d :: * + type MainOpts d :: Type -- | This method invokes the command-line parser resulting in an options -- value or ending the program with an error or help message. diff -Nru haskell-diagrams-lib-1.4.3/src/Diagrams/BoundingBox.hs haskell-diagrams-lib-1.4.5.1/src/Diagrams/BoundingBox.hs --- haskell-diagrams-lib-1.4.3/src/Diagrams/BoundingBox.hs 2001-09-09 01:46:40.000000000 +0000 +++ haskell-diagrams-lib-1.4.5.1/src/Diagrams/BoundingBox.hs 2001-09-09 01:46:40.000000000 +0000 @@ -80,7 +80,7 @@ type instance N (NonEmptyBoundingBox v n) = n fromNonEmpty :: NonEmptyBoundingBox v n -> BoundingBox v n -fromNonEmpty = BoundingBox . Option . Just +fromNonEmpty = BoundingBox . Just fromMaybeEmpty :: Maybe (NonEmptyBoundingBox v n) -> BoundingBox v n fromMaybeEmpty = maybe emptyBox fromNonEmpty @@ -95,7 +95,7 @@ -- | A bounding box is an axis-aligned region determined by two points -- indicating its \"lower\" and \"upper\" corners. It can also represent -- an empty bounding box - the points are wrapped in @Maybe@. -newtype BoundingBox v n = BoundingBox (Option (NonEmptyBoundingBox v n)) +newtype BoundingBox v n = BoundingBox (Maybe (NonEmptyBoundingBox v n)) deriving (Eq, Functor) deriving instance (Additive v, Ord n) => Semigroup (BoundingBox v n) @@ -166,7 +166,7 @@ -- | An empty bounding box. This is the same thing as @mempty@, but it doesn't -- require the same type constraints that the @Monoid@ instance does. emptyBox :: BoundingBox v n -emptyBox = BoundingBox $ Option Nothing +emptyBox = BoundingBox Nothing -- | Create a bounding box from a point that is component-wise @(<=)@ than the -- other. If this is not the case, then @mempty@ is returned. @@ -196,17 +196,17 @@ -- | Queries whether the BoundingBox is empty. isEmptyBox :: BoundingBox v n -> Bool -isEmptyBox (BoundingBox (Option Nothing)) = True +isEmptyBox (BoundingBox Nothing) = True isEmptyBox _ = False -- | Gets the lower and upper corners that define the bounding box. getCorners :: BoundingBox v n -> Maybe (Point v n, Point v n) -getCorners (BoundingBox p) = nonEmptyCorners <$> getOption p +getCorners (BoundingBox p) = nonEmptyCorners <$> p -- | Computes all of the corners of the bounding box. getAllCorners :: (Additive v, Traversable v) => BoundingBox v n -> [Point v n] -getAllCorners (BoundingBox (Option Nothing)) = [] -getAllCorners (BoundingBox (Option (Just (NonEmptyBoundingBox (l, u))))) +getAllCorners (BoundingBox Nothing) = [] +getAllCorners (BoundingBox (Just (NonEmptyBoundingBox (l, u)))) = T.sequence (liftI2 (\a b -> [a,b]) l u) -- | Get the size of the bounding box - the vector from the (component-wise) diff -Nru haskell-diagrams-lib-1.4.3/src/Diagrams/Combinators.hs haskell-diagrams-lib-1.4.5.1/src/Diagrams/Combinators.hs --- haskell-diagrams-lib-1.4.3/src/Diagrams/Combinators.hs 2001-09-09 01:46:40.000000000 +0000 +++ haskell-diagrams-lib-1.4.5.1/src/Diagrams/Combinators.hs 2001-09-09 01:46:40.000000000 +0000 @@ -165,7 +165,7 @@ => n -> v n -> QDiagram b v n m -> QDiagram b v n m deformEnvelope s v = over (envelope . _Wrapping Envelope) deformE where - deformE = Option . fmap deformE' . getOption + deformE = fmap deformE' deformE' env v' | dp > 0 = Max $ getMax (env v') + (dp * s) / quadrance v' | otherwise = env v' diff -Nru haskell-diagrams-lib-1.4.3/src/Diagrams/Coordinates.hs haskell-diagrams-lib-1.4.5.1/src/Diagrams/Coordinates.hs --- haskell-diagrams-lib-1.4.3/src/Diagrams/Coordinates.hs 2001-09-09 01:46:40.000000000 +0000 +++ haskell-diagrams-lib-1.4.5.1/src/Diagrams/Coordinates.hs 2001-09-09 01:46:40.000000000 +0000 @@ -19,8 +19,8 @@ ) where +import Data.Kind (Type) import Diagrams.Points - import Linear (V2 (..), V3 (..), V4 (..)) -- | Types which are instances of the @Coordinates@ class can be @@ -36,13 +36,13 @@ class Coordinates c where -- | The type of the final coordinate. - type FinalCoord c :: * + type FinalCoord c :: Type -- | The type of everything other than the final coordinate. - type PrevDim c :: * + type PrevDim c :: Type -- | Decomposition of @c@ into applications of ':&'. - type Decomposition c :: * + type Decomposition c :: Type -- Decomposition c = Decomposition (PrevDim c) :& FinalCoord c (essentially) -- | Construct a value of type @c@ by providing something of one diff -Nru haskell-diagrams-lib-1.4.3/src/Diagrams/Parametric.hs haskell-diagrams-lib-1.4.5.1/src/Diagrams/Parametric.hs --- haskell-diagrams-lib-1.4.3/src/Diagrams/Parametric.hs 2001-09-09 01:46:40.000000000 +0000 +++ haskell-diagrams-lib-1.4.5.1/src/Diagrams/Parametric.hs 2001-09-09 01:46:40.000000000 +0000 @@ -22,12 +22,13 @@ ) where +import Data.Kind (Type) import Diagrams.Core.V import qualified Numeric.Interval.Kaucher as I -- | Codomain of parametric classes. This is usually either @(V p)@, for relative -- vector results, or @(Point (V p))@, for functions with absolute coordinates. -type family Codomain p :: * -> * +type family Codomain p :: Type -> Type -- | Type class for parametric functions. class Parametric p where diff -Nru haskell-diagrams-lib-1.4.3/src/Diagrams/Size.hs haskell-diagrams-lib-1.4.5.1/src/Diagrams/Size.hs --- haskell-diagrams-lib-1.4.3/src/Diagrams/Size.hs 2001-09-09 01:46:40.000000000 +0000 +++ haskell-diagrams-lib-1.4.5.1/src/Diagrams/Size.hs 2001-09-09 01:46:40.000000000 +0000 @@ -67,6 +67,7 @@ -- the dimensions. newtype SizeSpec v n = SizeSpec (v n) deriving ( + Eq, Typeable, Functor, Generic, diff -Nru haskell-diagrams-lib-1.4.3/src/Diagrams/Trail.hs haskell-diagrams-lib-1.4.5.1/src/Diagrams/Trail.hs --- haskell-diagrams-lib-1.4.3/src/Diagrams/Trail.hs 2001-09-09 01:46:40.000000000 +0000 +++ haskell-diagrams-lib-1.4.5.1/src/Diagrams/Trail.hs 2001-09-09 01:46:40.000000000 +0000 @@ -311,7 +311,7 @@ -- (along with a default value) to a function on an entire trail. trailMeasure :: ( SegMeasure v n :>: m, FT.Measured (SegMeasure v n) t ) => a -> (m -> a) -> t -> a -trailMeasure d f = option d f . get . FT.measure +trailMeasure d f = maybe d f . get . FT.measure -- | Compute the number of segments of anything measured by -- 'SegMeasure' (/e.g./ @SegMeasure@ itself, @Segment@, @SegTree@, diff -Nru haskell-diagrams-lib-1.4.3/src/Diagrams/Transform/Matrix.hs haskell-diagrams-lib-1.4.5.1/src/Diagrams/Transform/Matrix.hs --- haskell-diagrams-lib-1.4.3/src/Diagrams/Transform/Matrix.hs 2001-09-09 01:46:40.000000000 +0000 +++ haskell-diagrams-lib-1.4.5.1/src/Diagrams/Transform/Matrix.hs 2001-09-09 01:46:40.000000000 +0000 @@ -30,7 +30,7 @@ -- | Build a matrix from a 'Transformation', ignoring the translation. mkMat :: (HasBasis v, Num n) => Transformation v n -> v (v n) -mkMat t = distribute . tabulate $ apply t . unit . el +mkMat t = distribute . tabulate $ apply t . unit . (\x -> el x) -- | Build a 3D transformation matrix in homogeneous coordinates from -- a 'Transformation V3'. diff -Nru haskell-diagrams-lib-1.4.3/src/Diagrams/Transform.hs haskell-diagrams-lib-1.4.5.1/src/Diagrams/Transform.hs --- haskell-diagrams-lib-1.4.3/src/Diagrams/Transform.hs 2001-09-09 01:46:40.000000000 +0000 +++ haskell-diagrams-lib-1.4.5.1/src/Diagrams/Transform.hs 2001-09-09 01:46:40.000000000 +0000 @@ -125,4 +125,4 @@ -- @ translated :: (InSpace v n a, SameSpace a b, Transformable a, Transformable b) => v n -> Iso a b a b -translated = transformed . translation +translated v = transformed $ translation v diff -Nru haskell-diagrams-lib-1.4.3/src/Diagrams/TwoD/Arrow.hs haskell-diagrams-lib-1.4.5.1/src/Diagrams/TwoD/Arrow.hs --- haskell-diagrams-lib-1.4.3/src/Diagrams/TwoD/Arrow.hs 2001-09-09 01:46:40.000000000 +0000 +++ haskell-diagrams-lib-1.4.5.1/src/Diagrams/TwoD/Arrow.hs 2001-09-09 01:46:40.000000000 +0000 @@ -18,7 +18,7 @@ -- -- Drawing arrows in two dimensions. For a tutorial on drawing arrows -- using this module, see the diagrams website: --- . +-- . -- ----------------------------------------------------------------------------- @@ -401,7 +401,7 @@ -- uniformly as the transformation applied to the entire arrow. -- See https://github.com/diagrams/diagrams-lib/issues/112. delayedArrow da g n = - let (trans, globalSty) = option mempty untangle . fst $ da + let (trans, globalSty) = maybe mempty untangle . fst $ da in dArrow globalSty trans len g n -- Build an arrow and set its endpoints to the image under tr of origin and (len,0). diff -Nru haskell-diagrams-lib-1.4.3/src/Diagrams/TwoD/Image.hs haskell-diagrams-lib-1.4.5.1/src/Diagrams/TwoD/Image.hs --- haskell-diagrams-lib-1.4.3/src/Diagrams/TwoD/Image.hs 2001-09-09 01:46:40.000000000 +0000 +++ haskell-diagrams-lib-1.4.5.1/src/Diagrams/TwoD/Image.hs 2001-09-09 01:46:40.000000000 +0000 @@ -38,6 +38,7 @@ import Codec.Picture import Data.Colour (AlphaColour) +import Data.Kind (Type) import Data.Semigroup import Data.Typeable (Typeable) @@ -56,12 +57,12 @@ data Embedded deriving Typeable data External deriving Typeable -data Native (t :: *) deriving Typeable +data Native (t :: Type) deriving Typeable -- | 'ImageData' is either a JuicyPixels @DynamicImage@ tagged as 'Embedded' or -- a reference tagged as 'External'. Additionally 'Native' is provided for -- external libraries to hook into. -data ImageData :: * -> * where +data ImageData :: Type -> Type where ImageRaster :: DynamicImage -> ImageData Embedded ImageRef :: FilePath -> ImageData External ImageNative :: t -> ImageData (Native t) @@ -71,7 +72,7 @@ -- Will typically be created by @loadImageEmb@ or @loadImageExt@ which, -- will handle setting the width and height to the actual width and height -- of the image. -data DImage :: * -> * -> * where +data DImage :: Type -> Type -> Type where DImage :: ImageData t -> Int -> Int -> Transformation V2 n -> DImage n t deriving Typeable diff -Nru haskell-diagrams-lib-1.4.3/src/Diagrams/TwoD/Offset.hs haskell-diagrams-lib-1.4.5.1/src/Diagrams/TwoD/Offset.hs --- haskell-diagrams-lib-1.4.3/src/Diagrams/TwoD/Offset.hs 2001-09-09 01:46:40.000000000 +0000 +++ haskell-diagrams-lib-1.4.5.1/src/Diagrams/TwoD/Offset.hs 2001-09-09 01:46:40.000000000 +0000 @@ -19,7 +19,7 @@ -- -- Compute offsets to segments in two dimensions. More details can be -- found in the manual at --- . +-- . -- ----------------------------------------------------------------------------- module Diagrams.TwoD.Offset diff -Nru haskell-diagrams-lib-1.4.3/src/Diagrams/TwoD/Transform.hs haskell-diagrams-lib-1.4.5.1/src/Diagrams/TwoD/Transform.hs --- haskell-diagrams-lib-1.4.3/src/Diagrams/TwoD/Transform.hs 2001-09-09 01:46:40.000000000 +0000 +++ haskell-diagrams-lib-1.4.5.1/src/Diagrams/TwoD/Transform.hs 2001-09-09 01:46:40.000000000 +0000 @@ -98,7 +98,7 @@ -- @ rotated :: (InSpace V2 n a, Floating n, SameSpace a b, Transformable a, Transformable b) => Angle n -> Iso a b a b -rotated = transformed . rotation +rotated a = transformed $ rotation a -- | @rotationAbout p@ is a rotation about the point @p@ (instead of -- around the local origin).