summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2025-07-21 15:10:46 +0200
committertv <tv@krebsco.de>2025-07-21 15:40:30 +0200
commit3f3432ad9f50903577f0efbf4c7407d5644e3759 (patch)
treefd423b655c5839926ca152573390e35a4bb5dd0c
parent2cff03b003f323af5380ca7b4068335566d97c47 (diff)
admit wide characters
-rw-r--r--config/kmein.hs2
-rw-r--r--config/tv.hs2
-rw-r--r--much.cabal12
-rw-r--r--src/Much/Action.hs2
-rw-r--r--src/Much/Core.hs2
5 files changed, 12 insertions, 8 deletions
diff --git a/config/kmein.hs b/config/kmein.hs
index 806072e..361aecc 100644
--- a/config/kmein.hs
+++ b/config/kmein.hs
@@ -12,7 +12,7 @@ import Much.TreeView (TreeView(TVMessagePart), treeViewId, getMessage)
import Notmuch (notmuchShowPart)
import Notmuch.Message
-import Blessings.String (Blessings(..))
+import Blessings.String.WCWidth (Blessings(..))
import Control.Monad ((>=>), unless)
import Data.Default (Default(..))
import Data.Functor (($>))
diff --git a/config/tv.hs b/config/tv.hs
index ea9542a..84eda6b 100644
--- a/config/tv.hs
+++ b/config/tv.hs
@@ -4,7 +4,7 @@
module Main (main) where
-import Blessings.String
+import Blessings.String.WCWidth
import Data.Default
import Data.Maybe
import Much.Action
diff --git a/much.cabal b/much.cabal
index e63a62b..f4537bb 100644
--- a/much.cabal
+++ b/much.cabal
@@ -1,19 +1,23 @@
+cabal-version: 3.8
name: much
version: 1.3.2
license: MIT
author: tv <tv@krebsco.de>
maintainer: tv@krebsco.de
build-type: Simple
-cabal-version: >=1.10
+
+common common-stuff
+ build-depends:
+ blessings >= 2.5.0
executable much-tv
+ import: common-stuff
hs-source-dirs: config
main-is: tv.hs
default-language: Haskell2010
ghc-options: -O2 -threaded -with-rtsopts=-N
build-depends: much
, base
- , blessings
, data-default
, deepseq
, transformers
@@ -32,13 +36,13 @@ executable much-tv
, rosezipper
executable much-kmein
+ import: common-stuff
hs-source-dirs: config
main-is: kmein.hs
default-language: Haskell2010
ghc-options: -O2 -threaded -with-rtsopts=-N
build-depends: much
, base
- , blessings
, bytestring
, data-default
, directory
@@ -50,6 +54,7 @@ executable much-kmein
, unix
library
+ import: common-stuff
hs-source-dirs: src
exposed-modules: Much.Core
, Much.Action
@@ -84,7 +89,6 @@ library
, attoparsec
, base64-bytestring
, blaze-builder
- , blessings
, bytestring
, case-insensitive
, containers
diff --git a/src/Much/Action.hs b/src/Much/Action.hs
index 6613eb1..4b1d4b1 100644
--- a/src/Much/Action.hs
+++ b/src/Much/Action.hs
@@ -3,7 +3,7 @@
{-# LANGUAGE RecordWildCards #-}
module Much.Action where
-import Blessings.String
+import Blessings.String.WCWidth
import Data.Maybe
import Scanner
import Much.State
diff --git a/src/Much/Core.hs b/src/Much/Core.hs
index 2ce5ad7..1c8daa7 100644
--- a/src/Much/Core.hs
+++ b/src/Much/Core.hs
@@ -4,7 +4,7 @@
{-# LANGUAGE RecordWildCards #-}
module Much.Core where
-import Blessings.String (Blessings(Plain,SGR),pp)
+import Blessings.String.WCWidth (Blessings(Plain,SGR),pp)
import Control.Concurrent
import Control.Monad
import Data.Aeson