diff --git a/app/App/Commands.hs b/app/App/Commands.hs --- a/app/App/Commands.hs +++ b/app/App/Commands.hs @@ -2,7 +2,6 @@ import App.Commands.RangeStats import App.Commands.TextToWord -import Data.Semigroup ((<>)) import Options.Applicative commands :: Parser (IO ()) diff --git a/app/App/Commands/RangeStats.hs b/app/App/Commands/RangeStats.hs --- a/app/App/Commands/RangeStats.hs +++ b/app/App/Commands/RangeStats.hs @@ -8,7 +8,6 @@ import Control.Lens import Data.Generics.Product.Any -import Data.Semigroup ((<>)) import Options.Applicative hiding (columns) import qualified App.Commands.Types as Z diff --git a/app/App/Commands/TextToWord.hs b/app/App/Commands/TextToWord.hs --- a/app/App/Commands/TextToWord.hs +++ b/app/App/Commands/TextToWord.hs @@ -9,7 +9,6 @@ import Control.Lens import Data.Generics.Product.Any import Data.Maybe (catMaybes) -import Data.Semigroup ((<>)) import Options.Applicative hiding (columns) import Text.Read diff --git a/app/Main.hs b/app/Main.hs --- a/app/Main.hs +++ b/app/Main.hs @@ -2,7 +2,6 @@ import App.Commands import Control.Monad -import Data.Semigroup ((<>)) import Options.Applicative main :: IO () diff --git a/hw-ip.cabal b/hw-ip.cabal --- a/hw-ip.cabal +++ b/hw-ip.cabal @@ -1,20 +1,20 @@ cabal-version: 2.4 name: hw-ip -version: 2.4.1.0 +version: 2.4.2.0 license: BSD-3-Clause license-file: LICENSE -copyright: 2018-2019 John Ky, David Turnbull, Jian Wan +copyright: 2018-2020 John Ky + 2019-2020 David Turnbull + 2019-2020 Jian Wan maintainer: newhoggy@gmail.com -author: John Ky, - David Turnbull, - Jian Wan +author: John Ky, David Turnbull, Jian Wan homepage: https://github.com/haskell-works/hw-ip#readme bug-reports: https://github.com/haskell-works/hw-ip/issues synopsis: Library for manipulating IP addresses and CIDR blocks description: Library for manipulating IP addresses and CIDR blocks. Please see README.md category: Network -tested-with: GHC == 8.8.1, GHC == 8.6.5, GHC == 8.4.4, GHC == 8.2.2 +tested-with: GHC == 8.10.1, GHC == 8.8.3, GHC == 8.6.5, GHC == 8.4.4 build-type: Simple extra-source-files: README.md @@ -22,25 +22,23 @@ type: git location: https://github.com/haskell-works/hw-ip -common base { build-depends: base >= 4 && < 5 } - -common appar { build-depends: appar >= 0.1.8 && < 0.2 } -common binary { build-depends: binary >= 0.8 && < 0.9 } -common bytestring { build-depends: bytestring >= 0.10.6 && < 0.11 } -common containers { build-depends: containers >= 0.5 && < 0.7 } -common doctest { build-depends: doctest >= 0.16.2 && < 0.17 } -common doctest-discover { build-depends: doctest-discover >= 0.2 && < 0.3 } -common generic-lens { build-depends: generic-lens >= 1.1.0.0 && < 1.3 } -common hedgehog { build-depends: hedgehog >= 0.6 && < 1.1 } -common hspec { build-depends: hspec >= 2.4.4 && < 2.8 } -common hw-bits { build-depends: hw-bits >= 0.7 && < 0.8 } -common hw-hspec-hedgehog { build-depends: hw-hspec-hedgehog >= 0.1.0.2 && < 0.2 } -common iproute { build-depends: iproute >= 1.7.3 && < 1.8 } -common lens { build-depends: lens >= 4 && < 5 } -common optparse-applicative { build-depends: optparse-applicative >= 0.14 && < 0.16 } -common text { build-depends: text >= 1.2.3.1 && < 1.3 } +common base { build-depends: base >= 4.11 && < 5 } -common semigroups { if impl(ghc < 8 ) { build-depends: semigroups >= 0.16 && < 0.19 } } +common appar { build-depends: appar >= 0.1.8 && < 0.2 } +common binary { build-depends: binary >= 0.8 && < 0.9 } +common bytestring { build-depends: bytestring >= 0.10.6 && < 0.11 } +common containers { build-depends: containers >= 0.5 && < 0.7 } +common doctest { build-depends: doctest >= 0.16.2 && < 0.17 } +common doctest-discover { build-depends: doctest-discover >= 0.2 && < 0.3 } +common generic-lens { build-depends: generic-lens >= 1.1.0.0 && < 2.1 } +common hedgehog { build-depends: hedgehog >= 0.6 && < 1.1 } +common hspec { build-depends: hspec >= 2.4.4 && < 2.8 } +common hw-bits { build-depends: hw-bits >= 0.7 && < 0.8 } +common hw-hspec-hedgehog { build-depends: hw-hspec-hedgehog >= 0.1.0.2 && < 0.2 } +common iproute { build-depends: iproute >= 1.7.3 && < 1.8 } +common lens { build-depends: lens >= 4 && < 5 } +common optparse-applicative { build-depends: optparse-applicative >= 0.14 && < 0.16 } +common text { build-depends: text >= 1.2.3.1 && < 1.3 } common config default-language: Haskell2010 @@ -82,7 +80,6 @@ , hw-ip , lens , optparse-applicative - , semigroups , text other-modules: App.Commands App.Commands.RangeStats diff --git a/src/HaskellWorks/Data/Network/Ip/Ipv4.hs b/src/HaskellWorks/Data/Network/Ip/Ipv4.hs --- a/src/HaskellWorks/Data/Network/Ip/Ipv4.hs +++ b/src/HaskellWorks/Data/Network/Ip/Ipv4.hs @@ -34,7 +34,6 @@ import Control.Applicative ((<|>)) import Data.Bifunctor import Data.Foldable -import Data.Semigroup ((<>)) import Data.Word import Foreign.Storable import GHC.Generics