Skip to content

Commit 8238d67

Browse files
committed
Bump dependencies and support GHC 9.6
We still have to run the build script with GHC 9.4, since we need to override `dhall`, and can't override `source-repository-package` for scripts (haskell/cabal#8562, haskell/cabal#8024 (comment)).
1 parent 0b4d097 commit 8238d67

File tree

6 files changed

+42
-11
lines changed

6 files changed

+42
-11
lines changed

Build.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{- cabal:
99
build-depends:
1010
base >= 4.16,
11-
dhall ^>= 1.41,
11+
dhall ^>= {1.41, 1.42},
1212
directory ^>= 1.3.7.0,
1313
extra ^>= 1.7.4,
1414
language-javascript ^>= 0.7.1.0,

cabal.project

+28
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,31 @@ source-repository-package
1010
type: git
1111
location: https://github.com/georgefst/haskell-to-elm
1212
tag: fbe8417ebac8d5936bc2f7ca5f39348f7e341b46
13+
14+
--TODO waiting for release with https://github.com/folq/elm-syntax/pull/7
15+
source-repository-package
16+
type: git
17+
location: https://github.com/folq/elm-syntax
18+
tag: 464cc76582e12ca33d31a3f023b2e3c65317330f
19+
20+
--TODO waiting for release with https://github.com/dhall-lang/dhall-haskell/pull/2532
21+
source-repository-package
22+
type: git
23+
location: https://github.com/dhall-lang/dhall-haskell
24+
subdir: dhall
25+
tag: 55aff097b49ff85bb4eff1cc4f42c9fe40df3f49
26+
27+
--TODO waiting for release - https://github.com/composewell/streamly/issues/2597
28+
source-repository-package
29+
type: git
30+
location: https://github.com/composewell/streamly
31+
subdir: . core
32+
tag: 8e04e4b9885d573bef9a3ccac0f891a35212aaf6
33+
34+
allow-newer:
35+
--TODO https://github.com/well-typed/cborg/pull/313#issuecomment-1649639449
36+
cborg-json:base,
37+
--TODO https://github.com/dhall-lang/dhall-haskell/pull/2532#issuecomment-1747799074
38+
dhall:template-haskell,
39+
--TODO only necessary because `streamly` hasn't had a revision and the Git version we use is marked 0.10 not 0.9
40+
streamly-fsnotify:streamly,

haskell/linux/OS.hs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
module OS (conf, keyUnknown) where
22

3+
import Control.Monad
34
import Control.Monad.Reader
45
import Control.Monad.State
56
import Data.Either

haskell/monpad.cabal

+10-10
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ common common
3232
build-depends:
3333
georgefst-utils,
3434
base >= 4.16,
35-
ansi-terminal ^>= 0.11.1,
35+
ansi-terminal ^>= {0.11.1, 1.0},
3636
binary ^>= 0.8.9,
37-
bytestring ^>= {0.10.8, 0.11},
37+
bytestring ^>= {0.10.8, 0.11, 0.12},
3838
composition ^>= 1.0.2.1,
3939
concurrent-extra ^>= 0.7.0.12,
40-
containers ^>= 0.6.2.1,
41-
dhall ^>= 1.41,
40+
containers ^>= {0.6.2.1, 0.7},
41+
dhall ^>= 1.42,
4242
directory ^>= 1.3.3,
4343
either ^>= 5.0.1.1,
4444
extra ^>= 1.7.4,
@@ -52,9 +52,9 @@ common common
5252
pretty-simple ^>= 4.1,
5353
random ^>= 1.2.0,
5454
safe ^>= 0.3.19,
55-
streamly ^>= {0.8, 0.9},
55+
streamly ^>= {0.8, 0.9, 0.10},
5656
streams ^>= 3.3,
57-
text ^>= {1.2.3, 1.3, 1.4, 1.5, 2.0},
57+
text ^>= {1.2.3, 1.3, 1.4, 1.5, 2.0, 2.1},
5858
time ^>= {1.10, 1.11, 1.12, 1.13},
5959
transformers ^>= {0.5.6, 0.6},
6060
unordered-containers ^>= 0.2.10,
@@ -127,14 +127,14 @@ library
127127
if flag(release)
128128
build-depends: file-embed ^>= 0.0.11.2
129129
build-depends:
130-
aeson ^>= {1.5, 2.0, 2.1},
130+
aeson ^>= {1.5, 2.0, 2.1, 2.2},
131131
bifunctors ^>= {5.5.7, 5.6},
132132
colour ^>= 2.3.5,
133133
convertible ^>= 1.1.1,
134134
deriving-aeson ^>= 0.2.6.1,
135135
elm-syntax ^>= 0.3.0,
136136
exceptions ^>= 0.10.4,
137-
fsnotify ^>= 0.3,
137+
fsnotify ^>= {0.3, 0.4},
138138
generic-data ^>= {0.9.2, 1.1},
139139
generic-functor ^>= {0.2, 1.1},
140140
generics-sop ^>= 0.5.0,
@@ -175,11 +175,11 @@ executable monpad
175175
if os(linux)
176176
hs-source-dirs: linux
177177
other-modules: Orphans.Evdev
178-
build-depends: evdev ^>= {2.1, 2.2}
178+
build-depends: evdev ^>= {2.1, 2.2, 2.3}
179179
if os(darwin)
180180
hs-source-dirs: mac
181181
hs-source-dirs:
182182
app
183183
build-depends:
184184
monpad,
185-
optparse-applicative ^>= {0.15.1.0, 0.16, 0.17},
185+
optparse-applicative ^>= {0.15.1.0, 0.16, 0.17, 0.18},

haskell/src/Monpad.hs

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ module Monpad (
3939
import Control.Concurrent
4040
import Control.Concurrent.STM
4141
import Control.Exception
42+
import Control.Monad
4243
import Control.Monad.Base
4344
import Control.Monad.Catch (MonadThrow)
4445
import Control.Monad.Except

haskell/src/Monpad/Plugins/Logger.hs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
module Monpad.Plugins.Logger (plugin, Settings (..)) where
22

3+
import Control.Monad
34
import Control.Monad.Reader
45
import Data.Time
56
import Optics

0 commit comments

Comments
 (0)