From 1e4f04f0101f6ac4898bd43dcfbb2646d67629ad Mon Sep 17 00:00:00 2001 From: flip111 Date: Fri, 8 Sep 2023 19:16:53 +0200 Subject: [PATCH 1/2] Updated to LTS-21.10 --- haskell-names.cabal | 50 +++++++++---------- src/Language/Haskell/Names/Exports.hs | 12 ++--- src/Language/Haskell/Names/Imports.hs | 1 - .../Haskell/Names/LocalSymbolTable.hs | 1 - src/Language/Haskell/Names/Open/Base.hs | 1 - src/Language/Haskell/Names/ScopeUtils.hs | 1 - stack.yaml | 3 +- 7 files changed, 31 insertions(+), 38 deletions(-) diff --git a/haskell-names.cabal b/haskell-names.cabal index c67fc9c..bf95e94 100644 --- a/haskell-names.cabal +++ b/haskell-names.cabal @@ -1,5 +1,7 @@ +cabal-version: 1.12 + Name: haskell-names -Version: 0.9.9 +Version: 0.10.0 License: BSD3 Author: Philipp Schuster, Roman Cheplyaka, Lennart Augustsson Maintainer: Philipp Schuster @@ -10,8 +12,6 @@ Description: Homepage: http://documentup.com/haskell-suite/haskell-names Stability: Experimental Build-Type: Simple -Cabal-Version: >= 1.10 -Tested-With: GHC == 8.0.1, GHC == 8.2.1 extra-source-files: README.md @@ -235,19 +235,17 @@ source-repository head Library Default-Language: Haskell2010 Build-depends: - base >= 4 && < 5 - , haskell-src-exts >= 1.21 && < 1.24 - , mtl >= 2.2.1 && < 2.3 - , transformers >=0.4.2.0 && < 0.6 - , filepath >= 1.1 && < 1.5 - , containers >= 0.2 && < 0.7 - , uniplate >= 1.5.1 && < 1.7 - , aeson >= 0.8.0.2 && < 1.6 - , bytestring >= 0.10.4.0 && < 0.11 - , data-lens-light >= 0.1.2.1 && < 0.2 - , traverse-with-class >= 1.0.0.0 && < 1.1 - if impl(ghc <= 7.8) - Build-depends: tagged >= 0.8.4 && < 0.9 + base + , haskell-src-exts + , mtl + , transformers + , filepath + , containers + , uniplate + , aeson + , bytestring + , data-lens-light + , traverse-with-class Hs-source-dirs: src Ghc-options: -Wall -fno-warn-name-shadowing @@ -281,15 +279,15 @@ Test-suite test Main-is: run.hs Build-depends: - base >= 4 && < 5 + base , haskell-names - , haskell-src-exts >= 1.21 && < 1.24 - , mtl >= 2.2.1 && < 2.3 - , filepath >= 1.1 && <1.5 - , containers >= 0.2 && < 0.7 - , tasty >= 0.12 && < 1.3 - , tasty-golden >= 2.2.1 && < 2.4 - , filemanip >= 0.3.6.3 && < 0.4 - , pretty-show >= 1.6.1 && < 1.11 - , traverse-with-class >= 1.0.0.0 && < 1.1 + , haskell-src-exts + , mtl + , filepath + , containers + , tasty + , tasty-golden + , filemanip + , pretty-show + , traverse-with-class diff --git a/src/Language/Haskell/Names/Exports.hs b/src/Language/Haskell/Names/Exports.hs index c90782a..13b6229 100644 --- a/src/Language/Haskell/Names/Exports.hs +++ b/src/Language/Haskell/Names/Exports.hs @@ -4,18 +4,16 @@ module Language.Haskell.Names.Exports , annotateExportSpecList ) where -import qualified Data.Map as Map -import qualified Data.Set as Set import Control.Monad -import Control.Monad.Writer import Data.Data import Language.Haskell.Exts -import Language.Haskell.Names.Types +import Language.Haskell.Names.GlobalSymbolTable as Global +import Language.Haskell.Names.ModuleSymbols import Language.Haskell.Names.ScopeUtils import Language.Haskell.Names.SyntaxUtils -import Language.Haskell.Names.ModuleSymbols -import Language.Haskell.Names.GlobalSymbolTable as Global -import qualified Data.Set as Set (fromList, toList) +import Language.Haskell.Names.Types +import qualified Data.Map as Map +import qualified Data.Set as Set -- | Compute the list of symbols the given module exports using the given diff --git a/src/Language/Haskell/Names/Imports.hs b/src/Language/Haskell/Names/Imports.hs index f7d9c83..3e7cb10 100644 --- a/src/Language/Haskell/Names/Imports.hs +++ b/src/Language/Haskell/Names/Imports.hs @@ -6,7 +6,6 @@ module Language.Haskell.Names.Imports ) where -import Data.Monoid import Data.Maybe import Data.Either diff --git a/src/Language/Haskell/Names/LocalSymbolTable.hs b/src/Language/Haskell/Names/LocalSymbolTable.hs index bee7124..45d5172 100644 --- a/src/Language/Haskell/Names/LocalSymbolTable.hs +++ b/src/Language/Haskell/Names/LocalSymbolTable.hs @@ -8,7 +8,6 @@ module Language.Haskell.Names.LocalSymbolTable ) where import qualified Data.Map as Map -import Data.Semigroup import Language.Haskell.Exts import Language.Haskell.Names.SyntaxUtils (dropAnn) import Language.Haskell.Names.Types diff --git a/src/Language/Haskell/Names/Open/Base.hs b/src/Language/Haskell/Names/Open/Base.hs index 3f05ff2..6b66e1f 100644 --- a/src/Language/Haskell/Names/Open/Base.hs +++ b/src/Language/Haskell/Names/Open/Base.hs @@ -18,7 +18,6 @@ import Data.List import Data.Lens.Light import Data.Generics.Traversable import Data.Typeable -import Data.Monoid import Data.Functor.Constant -- | Describes how we should treat names in the current context diff --git a/src/Language/Haskell/Names/ScopeUtils.hs b/src/Language/Haskell/Names/ScopeUtils.hs index 2e4e8f7..bb7ac9b 100644 --- a/src/Language/Haskell/Names/ScopeUtils.hs +++ b/src/Language/Haskell/Names/ScopeUtils.hs @@ -1,7 +1,6 @@ module Language.Haskell.Names.ScopeUtils where import Control.Arrow -import Data.Monoid import Language.Haskell.Names.Types import Language.Haskell.Names.SyntaxUtils import Language.Haskell.Exts diff --git a/stack.yaml b/stack.yaml index 932a65d..e0c577f 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1 +1,2 @@ -resolver: lts-15.14 +resolver: + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/10.yaml From ef035af794abb25cacebb58b98c63dd10666e3a2 Mon Sep 17 00:00:00 2001 From: flip111 Date: Fri, 8 Sep 2023 19:59:48 +0200 Subject: [PATCH 2/2] Update cabal version --- haskell-names.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haskell-names.cabal b/haskell-names.cabal index bf95e94..cad4771 100644 --- a/haskell-names.cabal +++ b/haskell-names.cabal @@ -1,8 +1,8 @@ -cabal-version: 1.12 +cabal-version: 3.8 Name: haskell-names Version: 0.10.0 -License: BSD3 +License: BSD-3-Clause Author: Philipp Schuster, Roman Cheplyaka, Lennart Augustsson Maintainer: Philipp Schuster Category: Language