diff --git a/ChangeLog.md b/ChangeLog.md --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,6 +1,13 @@ # Changelog for grid +7.8.14 Simplified nix config. + +7.8.13 Updated copyright year. + +7.8.12 Revamped to work with Nix + cabal-install. + 7.8.11 Revamped to work with Nix + Stack. + 7.8.10 Revamped to work with Stack v1.7.1. ## Unreleased changes diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright Amy de Buitléir (c) 2016-2018 +Copyright (c) 2019, Amy de Buitléir All rights reserved. diff --git a/grid.cabal b/grid.cabal --- a/grid.cabal +++ b/grid.cabal @@ -1,23 +1,21 @@ +cabal-version: >=1.10 name: grid -version: 7.8.12 +version: 7.8.14 synopsis: Tools for working with regular grids (graphs, lattices). -description: Please see the README on GitHub at -homepage: https://github.com/mhwombat/grid#readme +-- description: +homepage: https://github.com/mhwombat/grid +bug-reports: https://github.com/mhwombat/grid/issues license: BSD3 license-file: LICENSE author: Amy de Buitléir maintainer: amy@nualeargais.ie -copyright: 2010-2018 Amy de Buitléir +copyright: 2010-2019 Amy de Buitléir category: Math -bug-reports: https://github.com/mhwombat/grid/issues build-type: Simple -extra-source-files: - README.md - ChangeLog.md -cabal-version: >=1.10 +extra-source-files: ChangeLog.md, README.md library - exposed-modules: + exposed-modules: Math.Geometry.Grid Math.Geometry.Grid.Hexagonal Math.Geometry.Grid.Hexagonal2 @@ -32,15 +30,11 @@ Math.Geometry.GridInternal Math.Geometry.GridMap Math.Geometry.GridMap.Lazy - other-modules: - Paths_grid - hs-source-dirs: - src - ghc-options: -Wall - build-depends: - base >=4.7 && <5 - , containers ==0.5.* || ==0.6.* - default-language: Haskell2010 + other-modules: Paths_grid + other-extensions: TypeFamilies, FlexibleContexts, ConstrainedClassMethods, MultiParamTypeClasses, CPP, TypeSynonymInstances, FlexibleInstances, UndecidableInstances, DeriveGeneric + build-depends: base >=4.7 && <5, containers >=0.5 && <0.7 + hs-source-dirs: src + default-language: Haskell2010 test-suite grid-test type: exitcode-stdio-1.0 @@ -54,8 +48,7 @@ Math.Geometry.GridMap.LazyQC Math.Geometry.GridQC Paths_grid - hs-source-dirs: - test + hs-source-dirs: test ghc-options: -threaded -rtsopts -with-rtsopts=-N -Wall build-depends: QuickCheck diff --git a/src/Math/Geometry/Grid.hs b/src/Math/Geometry/Grid.hs --- a/src/Math/Geometry/Grid.hs +++ b/src/Math/Geometry/Grid.hs @@ -1,7 +1,7 @@ ----------------------------------------------------------------------------- -- | -- Module : Math.Geometry.Grid --- Copyright : (c) Amy de Buitléir 2012-2017 +-- Copyright : (c) Amy de Buitléir 2012-2019 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/Grid/Hexagonal.hs b/src/Math/Geometry/Grid/Hexagonal.hs --- a/src/Math/Geometry/Grid/Hexagonal.hs +++ b/src/Math/Geometry/Grid/Hexagonal.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.HexGrid --- Copyright : (c) Amy de Buitléir 2012-2017 +-- Copyright : (c) Amy de Buitléir 2012-2019 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/Grid/Hexagonal2.hs b/src/Math/Geometry/Grid/Hexagonal2.hs --- a/src/Math/Geometry/Grid/Hexagonal2.hs +++ b/src/Math/Geometry/Grid/Hexagonal2.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.HexGrid --- Copyright : (c) Amy de Buitléir 2012-2017 +-- Copyright : (c) Amy de Buitléir 2012-2019 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/Grid/HexagonalInternal.hs b/src/Math/Geometry/Grid/HexagonalInternal.hs --- a/src/Math/Geometry/Grid/HexagonalInternal.hs +++ b/src/Math/Geometry/Grid/HexagonalInternal.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.HexGridInternal --- Copyright : (c) Amy de Buitléir 2012-2017 +-- Copyright : (c) Amy de Buitléir 2012-2019 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/Grid/HexagonalInternal2.hs b/src/Math/Geometry/Grid/HexagonalInternal2.hs --- a/src/Math/Geometry/Grid/HexagonalInternal2.hs +++ b/src/Math/Geometry/Grid/HexagonalInternal2.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.HexGridInternal --- Copyright : (c) Amy de Buitléir 2012-2017 +-- Copyright : (c) Amy de Buitléir 2012-2019 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/Grid/Octagonal.hs b/src/Math/Geometry/Grid/Octagonal.hs --- a/src/Math/Geometry/Grid/Octagonal.hs +++ b/src/Math/Geometry/Grid/Octagonal.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.OctGrid --- Copyright : (c) Amy de Buitléir 2012-2017 +-- Copyright : (c) Amy de Buitléir 2012-2019 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/Grid/OctagonalInternal.hs b/src/Math/Geometry/Grid/OctagonalInternal.hs --- a/src/Math/Geometry/Grid/OctagonalInternal.hs +++ b/src/Math/Geometry/Grid/OctagonalInternal.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.OctGridInternal --- Copyright : (c) Amy de Buitléir 2012-2017 +-- Copyright : (c) Amy de Buitléir 2012-2019 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/Grid/Square.hs b/src/Math/Geometry/Grid/Square.hs --- a/src/Math/Geometry/Grid/Square.hs +++ b/src/Math/Geometry/Grid/Square.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.SquareGrid --- Copyright : (c) Amy de Buitléir 2012-2017 +-- Copyright : (c) Amy de Buitléir 2012-2019 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/Grid/SquareInternal.hs b/src/Math/Geometry/Grid/SquareInternal.hs --- a/src/Math/Geometry/Grid/SquareInternal.hs +++ b/src/Math/Geometry/Grid/SquareInternal.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.SquareGridInternal --- Copyright : (c) Amy de Buitléir 2012-2017 +-- Copyright : (c) Amy de Buitléir 2012-2019 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/Grid/Triangular.hs b/src/Math/Geometry/Grid/Triangular.hs --- a/src/Math/Geometry/Grid/Triangular.hs +++ b/src/Math/Geometry/Grid/Triangular.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.TriGrid --- Copyright : (c) Amy de Buitléir 2012-2017 +-- Copyright : (c) Amy de Buitléir 2012-2019 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/Grid/TriangularInternal.hs b/src/Math/Geometry/Grid/TriangularInternal.hs --- a/src/Math/Geometry/Grid/TriangularInternal.hs +++ b/src/Math/Geometry/Grid/TriangularInternal.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.TriGridInternal --- Copyright : (c) Amy de Buitléir 2012-2017 +-- Copyright : (c) Amy de Buitléir 2012-2019 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/GridInternal.hs b/src/Math/Geometry/GridInternal.hs --- a/src/Math/Geometry/GridInternal.hs +++ b/src/Math/Geometry/GridInternal.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.GridInternal --- Copyright : (c) Amy de Buitléir 2012-2017 +-- Copyright : (c) Amy de Buitléir 2012-2019 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/GridMap.hs b/src/Math/Geometry/GridMap.hs --- a/src/Math/Geometry/GridMap.hs +++ b/src/Math/Geometry/GridMap.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.GridMap --- Copyright : (c) Amy de Buitléir 2012-2017 +-- Copyright : (c) Amy de Buitléir 2012-2019 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/GridMap/Lazy.hs b/src/Math/Geometry/GridMap/Lazy.hs --- a/src/Math/Geometry/GridMap/Lazy.hs +++ b/src/Math/Geometry/GridMap/Lazy.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.GridMap.Lazy --- Copyright : (c) Amy de Buitléir 2012-2017 +-- Copyright : (c) Amy de Buitléir 2012-2019 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/test/Math/Geometry/Grid/Hexagonal2QC.hs b/test/Math/Geometry/Grid/Hexagonal2QC.hs --- a/test/Math/Geometry/Grid/Hexagonal2QC.hs +++ b/test/Math/Geometry/Grid/Hexagonal2QC.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.Grid.Hexagonal2QC --- Copyright : (c) Amy de Buitléir 2012-2017 +-- Copyright : (c) Amy de Buitléir 2012-2019 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/test/Math/Geometry/Grid/HexagonalQC.hs b/test/Math/Geometry/Grid/HexagonalQC.hs --- a/test/Math/Geometry/Grid/HexagonalQC.hs +++ b/test/Math/Geometry/Grid/HexagonalQC.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.Grid.RectangularQC --- Copyright : (c) Amy de Buitléir 2012-2017 +-- Copyright : (c) Amy de Buitléir 2012-2019 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/test/Math/Geometry/Grid/OctagonalQC.hs b/test/Math/Geometry/Grid/OctagonalQC.hs --- a/test/Math/Geometry/Grid/OctagonalQC.hs +++ b/test/Math/Geometry/Grid/OctagonalQC.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.Grid.OctagonalQC --- Copyright : (c) Amy de Buitléir 2012-2017 +-- Copyright : (c) Amy de Buitléir 2012-2019 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/test/Math/Geometry/Grid/SquareQC.hs b/test/Math/Geometry/Grid/SquareQC.hs --- a/test/Math/Geometry/Grid/SquareQC.hs +++ b/test/Math/Geometry/Grid/SquareQC.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.Grid.SquareQC --- Copyright : (c) Amy de Buitléir 2012-2017 +-- Copyright : (c) Amy de Buitléir 2012-2019 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/test/Math/Geometry/Grid/TriangularQC.hs b/test/Math/Geometry/Grid/TriangularQC.hs --- a/test/Math/Geometry/Grid/TriangularQC.hs +++ b/test/Math/Geometry/Grid/TriangularQC.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.Grid.TriangularQC --- Copyright : (c) Amy de Buitléir 2012-2017 +-- Copyright : (c) Amy de Buitléir 2012-2019 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/test/Math/Geometry/GridMap/LazyQC.hs b/test/Math/Geometry/GridMap/LazyQC.hs --- a/test/Math/Geometry/GridMap/LazyQC.hs +++ b/test/Math/Geometry/GridMap/LazyQC.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.GridMap.LazyQC --- Copyright : (c) Amy de Buitléir 2012-2017 +-- Copyright : (c) Amy de Buitléir 2012-2019 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/test/Math/Geometry/GridQC.hs b/test/Math/Geometry/GridQC.hs --- a/test/Math/Geometry/GridQC.hs +++ b/test/Math/Geometry/GridQC.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.Grid.GridQC --- Copyright : (c) Amy de Buitléir 2012-2017 +-- Copyright : (c) Amy de Buitléir 2012-2019 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/test/Spec.hs b/test/Spec.hs --- a/test/Spec.hs +++ b/test/Spec.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Main --- Copyright : (c) Amy de Buitléir 2012-2017 +-- Copyright : (c) Amy de Buitléir 2012-2019 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental