Fix builds for GHC 9.10+

Author: bravit

ch05/weapons.hs

@@ -1,8 +1,11 @@
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE UndecidableInstances #-}
 import Data.List (group, sort)
 import Control.Monad
 import Control.Monad.State
 import System.Random
-import System.Random.Stateful (uniformRM, uniformM)
+import System.Random.Stateful
 
 data Weapon = Rock | Paper | Scissors
   deriving (Show, Bounded, Enum, Eq)
@@ -19,11 +22,10 @@ winner (w1, w2)
   | otherwise = Second
 
 instance UniformRange Weapon where
-  uniformRM (lo, hi) rng = do
-    res <- uniformRM (fromEnum lo :: Int, fromEnum hi) rng
-    pure $ toEnum res
+  uniformRM (lo, hi) g = toEnum <$> uniformRM (fromEnum lo, fromEnum hi) g
+  isInRange (lo, hi) x = fromEnum x >= fromEnum lo && fromEnum x <= fromEnum hi
 
-instance Uniform Weapon where
+instance UniformRange Weapon => Uniform Weapon where
   uniformM rng = uniformRM (minBound, maxBound) rng
 
 randomWeapon :: State StdGen Weapon

ch07/logging.hs

@@ -10,7 +10,7 @@ popAndLog :: LoggingT (StateT [Int] IO) ()
 popAndLog = do
   _:xs <- lift get
   lift (put xs)
-  $logDebug ("***" <> (pack $ show xs) <> "***")
+  $logDebug ("***" <> (pack $ Prelude.show xs) <> "***")
 
 logStateEx :: LoggingT (StateT [Int] IO) Int
 logStateEx =  do

hid-examples.cabal

@@ -4,7 +4,7 @@ cabal-version: 2.0
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 3a83185a1a255aa08e871ef0a8fcabde2c05975f2556603454bce153bad1d11f
+-- hash: df9bdff20c7b93fa747ba6e542d129c1a39765b56d9e6b7e3081327b44667265
 
 name:           hid-examples
 version:        0.5
@@ -168,7 +168,7 @@ library rpc-lib
     , mtl >=2.0 && <2.4
     , network >=2.8 && <3.3
     , network-simple >=0.4.5 && <0.5
-    , template-haskell >=2.13 && <2.23
+    , template-haskell >=2.13 && <2.24
   default-language: Haskell2010
 
 library shunting-yard
@@ -362,7 +362,7 @@ executable covid
       attoparsec >=0.13 && <0.15
     , base >=4.12 && <5
     , bytestring >=0.10 && <0.13
-    , containers >=0.5 && <0.8
+    , containers >=0.5 && <0.9
     , lens >=4.17 && <5.4
     , resourcet >=1.2 && <1.4
     , streaming >=0.2.2 && <0.4
@@ -403,7 +403,7 @@ executable dicegame
   build-depends:
       base >=4.12 && <5
     , mtl >=2.0 && <2.4
-    , random ==1.2.*
+    , random >=1.2 && <1.4
   default-language: Haskell2010
 
 executable div
@@ -453,7 +453,7 @@ executable door-gen
   build-depends:
       base >=4.12 && <5
     , singletons ==3.0.*
-    , singletons-base >=3.0 && <3.5
+    , singletons-base >=3.0 && <3.6
   default-language: Haskell2010
 
 executable dots
@@ -489,7 +489,7 @@ executable dots-async-cancel
   build-depends:
       async >=2.0 && <2.3
     , base >=4.12 && <5
-    , random ==1.2.*
+    , random >=1.2 && <1.4
   default-language: Haskell2010
 
 executable dots-async-interrupted
@@ -543,7 +543,7 @@ executable du
   build-depends:
       base >=4.12 && <5
     , directory ==1.3.*
-    , extra >=1.5 && <1.8
+    , extra >=1.5 && <1.9
     , filepath >=1.4.1 && <1.6
     , mtl >=2.0 && <2.4
     , optparse-applicative >=0.14 && <0.19
@@ -582,7 +582,7 @@ executable elevator
     , fin >=0.1 && <0.4
     , mtl >=2.0 && <2.4
     , singletons ==3.0.*
-    , singletons-base >=3.0 && <3.5
+    , singletons-base >=3.0 && <3.6
   default-language: Haskell2010
 
 executable evalrpn1
@@ -654,7 +654,7 @@ executable filecount
   ghc-options: -Wall -Werror -Wcompat -Widentities -Wincomplete-uni-patterns -Wincomplete-record-updates -Wno-unused-top-binds -Wno-orphans -Wno-error=unrecognised-warning-flags
   build-depends:
       base >=4.12 && <5
-    , extra >=1.5 && <1.8
+    , extra >=1.5 && <1.9
   default-language: Haskell2010
 
 executable gcd
@@ -775,7 +775,7 @@ executable hello-th
   ghc-options: -Wall -Werror -Wcompat -Widentities -Wincomplete-uni-patterns -Wincomplete-record-updates -Wno-unused-top-binds -Wno-orphans -Wno-error=unrecognised-warning-flags
   build-depends:
       base >=4.12 && <5
-    , template-haskell >=2.13 && <2.23
+    , template-haskell >=2.13 && <2.24
   default-language: Haskell2010
 
 executable interleaving
@@ -907,7 +907,7 @@ executable mstr-literals
   ghc-options: -Wall -Werror -Wcompat -Widentities -Wincomplete-uni-patterns -Wincomplete-record-updates -Wno-unused-top-binds -Wno-orphans -Wno-error=unrecognised-warning-flags -Wno-missing-signatures -Wno-incomplete-patterns
   build-depends:
       base >=4.12 && <5
-    , template-haskell >=2.13 && <2.23
+    , template-haskell >=2.13 && <2.24
   default-language: Haskell2010
 
 executable mvar-deadlocks
@@ -1091,7 +1091,7 @@ executable predicates
   ghc-options: -Wall -Werror -Wcompat -Widentities -Wincomplete-uni-patterns -Wincomplete-record-updates -Wno-unused-top-binds -Wno-orphans -Wno-error=unrecognised-warning-flags -Wno-missing-signatures -Wno-incomplete-patterns
   build-depends:
       base >=4.12 && <5
-    , template-haskell >=2.13 && <2.23
+    , template-haskell >=2.13 && <2.24
   default-language: Haskell2010
 
 executable prefix-postfix
@@ -1117,7 +1117,7 @@ executable projectors
   ghc-options: -Wall -Werror -Wcompat -Widentities -Wincomplete-uni-patterns -Wincomplete-record-updates -Wno-unused-top-binds -Wno-orphans -Wno-error=unrecognised-warning-flags
   build-depends:
       base >=4.12 && <5
-    , template-haskell >=2.13 && <2.23
+    , template-haskell >=2.13 && <2.24
   default-language: Haskell2010
 
 executable pub-sub
@@ -1313,7 +1313,7 @@ executable sumtab
   ghc-options: -Wall -Werror -Wcompat -Widentities -Wincomplete-uni-patterns -Wincomplete-record-updates -Wno-unused-top-binds -Wno-orphans -Wno-error=unrecognised-warning-flags
   build-depends:
       base >=4.12 && <5
-    , extra >=1.5 && <1.8
+    , extra >=1.5 && <1.9
     , streaming >=0.2.2 && <0.4
     , text >=1.2 && <2.2
     , text-show >=3.0 && <4
@@ -1433,7 +1433,7 @@ executable type-families
   ghc-options: -Wall -Werror -Wcompat -Widentities -Wincomplete-uni-patterns -Wincomplete-record-updates -Wno-unused-top-binds -Wno-orphans -Wno-error=unrecognised-warning-flags -Wno-type-defaults
   build-depends:
       base >=4.12 && <5
-    , containers >=0.5 && <0.8
+    , containers >=0.5 && <0.9
   default-language: Haskell2010
 
 executable type-lits
@@ -1557,7 +1557,7 @@ executable wait-completion
   ghc-options: -Wall -Werror -Wcompat -Widentities -Wincomplete-uni-patterns -Wincomplete-record-updates -Wno-unused-top-binds -Wno-orphans -Wno-error=unrecognised-warning-flags -threaded
   build-depends:
       base >=4.12 && <5
-    , random ==1.2.*
+    , random >=1.2 && <1.4
   default-language: Haskell2010
 
 executable weapons
@@ -1572,7 +1572,7 @@ executable weapons
   build-depends:
       base >=4.12 && <5
     , mtl >=2.0 && <2.4
-    , random ==1.2.*
+    , random >=1.2 && <1.4
   default-language: Haskell2010
 
 test-suite expr-simple-test
@@ -1598,7 +1598,7 @@ test-suite iplookup-doctest
   ghc-options: -Wall -Werror -Wcompat -Widentities -Wincomplete-uni-patterns -Wincomplete-record-updates -Wno-unused-top-binds -Wno-orphans -Wno-error=unrecognised-warning-flags
   build-depends:
       base >=4.12 && <5
-    , doctest >=0.12 && <0.23
+    , doctest >=0.12 && <0.25
     , split ==0.2.*
   default-language: Haskell2010
 
@@ -1638,7 +1638,7 @@ test-suite radar-test
   build-depends:
       base >=4.12 && <5
     , radar-lib
-    , random ==1.2.*
+    , random >=1.2 && <1.4
   default-language: Haskell2010
 
 test-suite shunting-yard-test

package.yaml

@@ -155,7 +155,7 @@ executables:
         main: weapons.hs
         dependencies:
           - mtl >=2.0 && <2.4
-          - random >=1.2 && <1.3
+          - random >=1.2 && <1.4
     prefix-postfix:
         source-dirs: expr
         main: prefix-postfix.hs
@@ -170,15 +170,15 @@ executables:
         main: dicegame.hs
         dependencies:
           - mtl >=2.0 && <2.4
-          - random >=1.2 && <1.3
+          - random >=1.2 && <1.4
     ioref:
         source-dirs: ch05
         main: ioref.hs
     filecount:
         source-dirs: ch05
         main: filecount.hs
         dependencies:
-          - extra >=1.5 && <1.8
+          - extra >=1.5 && <1.9
     stref:
         source-dirs: ch05
         main: stref.hs
@@ -228,7 +228,7 @@ executables:
           - optparse-applicative >= 0.14 && < 0.19
           - text >=1.2 && <2.2
           - text-show >=3.0 && <4
-          - extra >=1.5 && <1.8
+          - extra >=1.5 && <1.9
         default-extensions:
           - RecordWildCards
           - NamedFieldPuns
@@ -368,7 +368,7 @@ executables:
         ghc-options:
           -Wno-type-defaults
         dependencies:
-          - containers >= 0.5 && < 0.8
+          - containers >= 0.5 && < 0.9
     dynvalues-gadt:
         main: ch11/dynvalues-gadt.hs
         other-extensions:
@@ -428,19 +428,19 @@ executables:
         main: Main.hs
         other-modules: [ Hello ]
         dependencies:
-          - template-haskell >=2.13 && <2.23
+          - template-haskell >=2.13 && <2.24
     projectors:
         source-dirs: ch12/th/projectors/
         main: Main.hs
         other-modules: [ Projectors ]
         dependencies:
-          - template-haskell >=2.13 && <2.23
+          - template-haskell >=2.13 && <2.24
     predicates:
         source-dirs: ch12/th/predicates/
         main: Main.hs
         other-modules: [ Predicates ]
         dependencies:
-          - template-haskell >=2.13 && <2.23
+          - template-haskell >=2.13 && <2.24
         ghc-options:
           - -Wno-missing-signatures
           - -Wno-incomplete-patterns
@@ -449,7 +449,7 @@ executables:
         main: Main.hs
         other-modules: [ Str ]
         dependencies:
-          - template-haskell >=2.13 && <2.23
+          - template-haskell >=2.13 && <2.24
         ghc-options:
           - -Wno-missing-signatures
           - -Wno-incomplete-patterns
@@ -527,7 +527,7 @@ executables:
           - StandaloneDeriving
         dependencies:
           - singletons >= 3.0 && < 3.1
-          - singletons-base >= 3.0 && < 3.5
+          - singletons-base >= 3.0 && < 3.6
         ghc-options:
           - -Wno-unticked-promoted-constructors
     elevator:
@@ -543,7 +543,7 @@ executables:
           - fin >= 0.1 && < 0.4
           - dec >= 0.0.3 && < 0.1
           - singletons >= 3.0 && < 3.1
-          - singletons-base >= 3.0 && < 3.5
+          - singletons-base >= 3.0 && < 3.6
           - mtl >=2.0 && <2.4
         ghc-options:
           - -Wno-unticked-promoted-constructors
@@ -556,7 +556,7 @@ executables:
         main: ch14/sumtab.hs
         dependencies:
           - streaming >=0.2.2 && <0.4
-          - extra >=1.5 && <1.8
+          - extra >=1.5 && <1.9
           - text >=1.2 && <2.2
           - text-show >=3.0 && <4
     chars:
@@ -592,7 +592,7 @@ executables:
           - time >=1.8 && <1.15
           - text >=1.2 && <2.2
           - text-show >=3.0 && <4
-          - containers >= 0.5 && < 0.8
+          - containers >= 0.5 && < 0.9
           - lens >= 4.17 && < 5.4
           - streaming-utils >=0.2 && <0.3
           - streaming-bytestring >=0.1.7 && <0.4
@@ -695,7 +695,7 @@ executables:
       ghc-options: -threaded
       dependencies:
         - async >= 2.0 && < 2.3
-        - random >=1.2 && <1.3
+        - random >=1.2 && <1.4
     dots-async-interrupted:
       main: ch16/dots-async-interrupted.hs
       ghc-options: -threaded
@@ -710,7 +710,7 @@ executables:
       main: ch16/wait-completion.hs
       ghc-options: -threaded
       dependencies:
-        - random >=1.2 && <1.3
+        - random >=1.2 && <1.4
     sum-numbers:
       main: ch16/sum-numbers.hs
       dependencies:
@@ -831,7 +831,7 @@ internal-libraries:
         - crypton-connection >= 0.3 && <0.5
         - network-simple >=0.4.5 && <0.5
         - exceptions >= 0.10 && < 0.11
-        - template-haskell >= 2.13 && <2.23
+        - template-haskell >= 2.13 && <2.24
         - haskell-src-exts >= 1.20 && <1.24
         - haskell-src-meta >= 0.6 && < 0.9
 tests:
@@ -842,7 +842,7 @@ tests:
         other-modules: []
         dependencies:
           - radar-lib
-          - random >=1.2 && <1.3
+          - random >=1.2 && <1.4
     expr-simple-test:
         source-dirs: tests/expr
         main: Test1.hs
@@ -879,7 +879,7 @@ tests:
     iplookup-doctest:
       main: tests/iplookup-doctest/Doctests.hs
       dependencies:
-        - doctest >= 0.12 && < 0.23
+        - doctest >= 0.12 && < 0.25
         - split >= 0.2 && < 0.3
 
 benchmarks:

tests/radar/Test.hs

@@ -5,22 +5,20 @@ import System.Exit (exitFailure)
 import Data.List (sort, nub)
 import Control.Monad (replicateM, when)
 import System.Random
-import System.Random.Stateful (uniformRM, uniformM)
+import System.Random.Stateful
 
 import Radar
 
 instance UniformRange Turn where
-  uniformRM (lo, hi) rng = do
-    res <- uniformRM (fromEnum lo :: Int, fromEnum hi) rng
-    pure $ toEnum res
+  uniformRM (lo, hi) g = toEnum <$> uniformRM (fromEnum lo, fromEnum hi) g
+  isInRange (lo, hi) x = fromEnum x >= fromEnum lo && fromEnum x <= fromEnum hi
 
 instance Uniform Turn where
   uniformM rng = uniformRM (minBound, maxBound) rng
 
 instance UniformRange Direction where
-  uniformRM (lo, hi) rng = do
-    res <- uniformRM (fromEnum lo :: Int, fromEnum hi) rng
-    pure $ toEnum res
+  uniformRM (lo, hi) g = toEnum <$> uniformRM (fromEnum lo, fromEnum hi) g
+  isInRange (lo, hi) x = fromEnum x >= fromEnum lo && fromEnum x <= fromEnum hi
 
 instance Uniform Direction where
   uniformM rng = uniformRM (minBound, maxBound) rng