Relax base's bounds to allow GHC 9.0

Author: Kleidukos

.github/workflows/ci.yml

@@ -73,9 +73,6 @@ jobs:
     - name: Running hlint
       run: nix-shell --pure -I ${{ env.NIX_PATH }} --argstr ghcVersion ${{env.GHC}} --run './.github/workflows/hlint-runner.sh' .github/workflows/shell.nix
 
-    - name: Running stylish-haskell
-      run: nix-shell --pure -I ${{ env.NIX_PATH }} --argstr ghcVersion ${{env.GHC}} --run './.github/workflows/stylish-haskell-runner.sh' .github/workflows/shell.nix
-
     - name: Build
       run: nix-shell --pure -I ${{ env.NIX_PATH }} --argstr ghcVersion ${{env.GHC}} --run 'make build' .github/workflows/shell.nix
 

.github/workflows/deploy-docs.yml

@@ -8,7 +8,6 @@ in with pkgs;
       cabal-install
       hlint
       haskellPackages.apply-refact
-      stylish-haskell
 
       # DB Deps
       postgresql_13
@@ -19,7 +18,6 @@ in with pkgs;
       # Extra
       parallel
       git
-      # mkdocs
       gnumake
     ];
     shellHook = ''

.github/workflows/shell.nix

@@ -16,9 +16,6 @@ test: ## Run the test suite
 lint: ## Run the code linter (HLint)
 	@find test src -name "*.hs" | parallel -j $(PROCS) -- hlint --refactor-options="-i" --refactor {}
 
-style: ## Run the code styler (stylish-haskell)
-	@stylish-haskell -i -r src test
-
 help:
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.* ?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 

Makefile

@@ -1,4 +1,4 @@
-# Display [![CI-badge][CI-badge]][CI-url] ![simple-haskell][simple-haskell]
+# Display [![CI-badge][CI-badge]][CI-url]
 
 _A Typeclass for user-facing output_
 
@@ -7,8 +7,6 @@ _A Typeclass for user-facing output_
 The `display` library offers a way for developers to print a textual representation of datatypes that does not
 have to abide by the rules of the [Show typeclass][Show].
 
-If you need some more instances from `base` or 
-
 ## Examples
 
 There are two methods to implement `Display` for your type:
@@ -75,8 +73,6 @@ As such, in order to avoid dangerously blind conversions, it is recommended to u
 function such as `decodeUtf8` or `decodeUtf8Strict` if you wish to turn a UTF8-encoded ByteString
 to Text.
 
-
-[simple-haskell]: https://img.shields.io/badge/Simple-Haskell-purple?style=flat-square
 [Show]: https://hackage.haskell.org/package/base/docs/Text-Show.html#v:Show
 [CI-badge]: https://img.shields.io/github/workflow/status/Kleidukos/display/CI?style=flat-square
 [CI-url]: https://github.com/Kleidukos/display/actions

README.md

@@ -41,7 +41,7 @@ library
   hs-source-dirs:  src
   exposed-modules: Data.Text.Display
   build-depends:
-    , base        ^>=4.14
+    , base        >= 4.12 && <= 4.16
     , bytestring  ^>=0.11
     , text        ^>=1.2
 

display.cabal

@@ -1,5 +1,5 @@
 {-# LANGUAGE DataKinds #-}
-{-# LANGUAGE DerivingStrategies #-}
+
 {-# LANGUAGE DerivingVia #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE OverloadedStrings #-}
@@ -30,6 +30,7 @@ module Data.Text.Display
 import Control.Exception hiding (TypeError)
 import Data.ByteString
 import qualified Data.ByteString.Lazy as BL
+import Data.Foldable (foldMap')
 import Data.Int
 import Data.Kind
 import Data.List.NonEmpty
@@ -38,7 +39,6 @@ import qualified Data.Text as T
 import qualified Data.Text.Lazy as TL
 import Data.Word
 import GHC.TypeLits
-import Data.Foldable (foldMap')
 
 -- | A typeclass for user-facing output.
 --
@@ -89,7 +89,7 @@ class Display a where
   displayList (x:xs) = displayList' xs ("[" <> display x)
     where
       displayList' :: Display a => [a] -> Text -> Text
-      displayList' [] acc = acc <> "]"
+      displayList' [] acc     = acc <> "]"
       displayList' (y:ys) acc = displayList' ys (acc <> "," <> display y)
 
 -- | 🚫 You should not derive Display for function types!
@@ -149,10 +149,11 @@ type family CannotDisplayByteStrings :: Constraint where
 -- >    via (ShowInstance AutomaticallyDerived)
 --
 -- @since 0.0.1.0
-newtype (Show e) => ShowInstance e
+newtype ShowInstance e
   = ShowInstance e
-  deriving newtype ( Show -- ^ @since 0.0.1.0
-                   )
+  deriving newtype
+    ( Show -- ^ @since 0.0.1.0
+    )
 
 -- | This wrapper allows you to rely on a pre-existing 'Show' instance in order to derive 'Display' from it.
 --
@@ -199,7 +200,7 @@ instance Display a => Display (NonEmpty a) where
 
 -- | @since 0.0.1.0
 instance Display a => Display (Maybe a) where
-  display Nothing = T.pack "Nothing"
+  display Nothing  = T.pack "Nothing"
   display (Just a) = T.pack "Just " <> display a
 
 -- | @since 0.0.1.0

src/Data/Text/Display.hs

@@ -1,23 +1,22 @@
-{-# LANGUAGE DerivingStrategies #-}
-{-# LANGUAGE TypeApplications #-}
+
 {-# LANGUAGE DerivingVia #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TypeApplications #-}
 
 module Main where
 
+import Data.List.NonEmpty
+import qualified Data.List.NonEmpty as NE
 import Data.Text (Text)
 import qualified Data.Text as T
-import qualified Data.List.NonEmpty as NE
-import Data.List.NonEmpty
 import Test.Hspec
 
 import Data.Text.Display
 
 main :: IO ()
 main = hspec spec
 
-data AutomaticallyDerived = AD
-  deriving stock (Show)
+data AutomaticallyDerived = AD deriving stock (Show)
   deriving (Display)
     via (ShowInstance AutomaticallyDerived)