Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated to LTS-21.10 #118

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 25 additions & 27 deletions haskell-names.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
cabal-version: 3.8

Name: haskell-names
Version: 0.9.9
License: BSD3
Version: 0.10.0
License: BSD-3-Clause
Author: Philipp Schuster, Roman Cheplyaka, Lennart Augustsson
Maintainer: Philipp Schuster
Category: Language
Expand All @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

12 changes: 5 additions & 7 deletions src/Language/Haskell/Names/Exports.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/Language/Haskell/Names/Imports.hs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ module Language.Haskell.Names.Imports
)
where

import Data.Monoid
import Data.Maybe
import Data.Either

Expand Down
1 change: 0 additions & 1 deletion src/Language/Haskell/Names/LocalSymbolTable.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/Language/Haskell/Names/Open/Base.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/Language/Haskell/Names/ScopeUtils.hs
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
resolver: lts-15.14
resolver:
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/10.yaml