diff options
author | Ben Sima <ben@bsima.me> | 2021-06-10 08:14:16 -0400 |
---|---|---|
committer | Ben Sima <ben@bsima.me> | 2021-11-26 13:47:35 -0500 |
commit | 72a7aaa39e7552970f466e712e1f7ef91aeb03c8 (patch) | |
tree | 8b8d501d28a9c1d56a0150d8129ff6324f196ad9 /Alpha.hs | |
parent | 0ff0a23c8c7425b0d56b95e318c2087e74cb6605 (diff) |
Upgrade to nixos-21.05
Getting me closer to the latest GHC. This release also includes my own packages
that I submitted some time ago.
GHCJS is not present in 21.05 for some reason, but I think it's back in master,
so I might do another upgrade soon, but for now I just disabled my GHCJS
support. I'm not really using it anyway.
I also had to bring it string-quote, update nixos-mailserver, and a few other
things.
Diffstat (limited to 'Alpha.hs')
-rw-r--r-- | Alpha.hs | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -79,10 +79,10 @@ where import qualified Data.Char as Char import qualified Data.List as List import Data.String -import Data.Text (Text) import qualified Data.Text as Text import qualified Data.Text.Lazy as LazyText import Protolude as X hiding (list, ($), (&), (.), (>>=)) +import Protolude.Conv import qualified Prelude -- | Create a list. This should be @Data.List.singleton@ but that doesn't exist. @@ -233,8 +233,8 @@ wrap lim = Text.words .> wrap_ 0 .> Text.unwords where lw = Text.length w -str :: StringConv a b => a -> b -str = toS +str :: (StringConv a b) => a -> b +str = Protolude.Conv.toS tshow :: Show a => a -> Text tshow = show |