adblock2privoxy: Update to version 2.1.1

Author: essandess

adblock2privoxy-utils/adblock2privoxy-utils.cabal

@@ -1,5 +1,5 @@
 name:           adblock2privoxy-utils
-version:        2.1.0
+version:        2.1.1
 cabal-version:  >= 1.10
 build-type:     Simple
 tested-with:    GHC==8.10.7
@@ -25,7 +25,7 @@ executable adblock2privoxy-utils
   default-extensions:
                      FlexibleInstances
   build-depends:
-                base >= 4 && < 5,
+                base >= 4 && < 9.9,
                 pandoc,
                 Cabal >=1.6,
                 pandoc-types >=1.12.3,
@@ -45,4 +45,4 @@ source-repository this
   type:         git
   location:     https://github.com/essandess/adblock2privoxy.git
   subdir:       adblock2privoxy-utils
-  tag:          v2.1.0
+  tag:          v2.1.1

adblock2privoxy/adblock2privoxy.cabal

@@ -1,9 +1,9 @@
 name:           adblock2privoxy
-version:        2.1.0
+version:        2.1.1
 cabal-version:  >= 1.10
 build-type:     Simple
 tested-with:
-                GHC==8.10.7
+                GHC==9.6.3
 author:         Alexey Zubritsky <[email protected]>, Steven Thomas Smith <[email protected]>
 data-files:
                 templates/ab2p.system.action,
@@ -64,7 +64,7 @@ executable adblock2privoxy
                 GeneralizedNewtypeDeriving,
                 FlexibleContexts
   build-depends:
-                base >= 4 && < 5,
+                base >= 4 && < 9.9,
                 parsec,
                 mtl,
                 containers,
@@ -103,4 +103,4 @@ source-repository this
   type:         git
   location:     https://github.com/essandess/adblock2privoxy.git
   subdir:       adblock2privoxy
-  tag:          v2.1.0
+  tag:          v2.1.1

adblock2privoxy/changelog

@@ -1,3 +1,6 @@
+2.1.1
+	* Fix compilation issues for ghc 9.6.3
+
 2.1.0
 	* Use TLS for CSS server to avoid mixed content errors
 	* Add --useHTTP option

adblock2privoxy/src/ParsecExt.hs

@@ -11,7 +11,7 @@ module ParsecExt (
 import Utils
 import Control.Applicative hiding (many)
 import Text.ParserCombinators.Parsec hiding ((<|>),State)
-import Control.Monad.Trans
+import Control.Monad
 import Control.Monad.RWS
 import Control.Monad.State
 import Data.Maybe

adblock2privoxy/src/PatternConverter.hs

@@ -5,6 +5,7 @@ parseUrl
 import InputParser
 import Control.Applicative hiding (many)
 import Text.ParserCombinators.Parsec hiding (Line, (<|>))
+import Control.Monad
 import Control.Monad.State
 import Data.List
 import Data.Maybe

adblock2privoxy/src/Statistics.hs

@@ -5,6 +5,7 @@ import qualified Data.Map as Map
 import InputParser
 import Data.Maybe
 import Control.Applicative
+import Control.Monad
 import Control.Monad.State
 
 type Stat = Map.Map String Int

adblock2privoxy/src/Utils.hs

@@ -24,8 +24,8 @@ pure'',
 (.*.)
 ) where
 import Control.Applicative hiding (many)
-import Control.Monad.Writer
 import Control.Monad.State
+import Data.Monoid
 
 ------------------------------------------------------------------------------------------
 ----------------------------- export -----------------------------------------------------