git.iko.soy/streamly
on master help sign in
Build streamly with ghc-9.6.1
commit8d7b837109c1a55346075c64779bc3e61e646cf9 authorRanjeet Ranjan <rnjt.ranjan@gmail.com> dateMon 5 Jun 2023, 12:26 (3 years ago) parent9ba9c6b
6 files changed+50−39
compare with master
unifiedsplit
.github/workflows/haskell.yml+8 benchmark/streamly-benchmarks.cabal+3−3 core/streamly-core.cabal+2−2 docs/streamly-docs.cabal+2−2 streamly.cabal+20−17 test/streamly-tests.cabal+15−15
.github/workflows/haskell.yml+8
@@ -74,6 +74,14 @@ jobs:
7474 cabal_project: cabal.project.ghc-head
7575 disable_sdist_build: "y"
7676 ignore_error: true
77+ - name: 9.6.1
78+ ghc_version: 9.6.1
79+ runner: ubuntu-latest
80+ build: cabal
81+ cabal_version: 3.10.1.0
82+ disable_sdist_build: "y"
83+ cabal_project: cabal.project
84+ ignore_error: true
7785 - name: 9.4.4-Werror
7886 ghc_version: 9.4.4
7987 runner: ubuntu-latest
benchmark/streamly-benchmarks.cabal+3−3
@@ -174,9 +174,9 @@ common bench-depends
174174 -- Core libraries shipped with ghc, the min and max
175175 -- constraints of these libraries should match with
176176 -- the GHC versions we support
177− base >= 4.9 && < 4.18
177+ base >= 4.9 && < 4.19
178178 , deepseq >= 1.4.1 && < 1.5
179− , mtl >= 2.2 && < 2.3
179+ , mtl >= 2.2 && < 2.3.2
180180
181181 -- other libraries
182182 , random >= 1.0 && < 2.0
@@ -187,7 +187,7 @@ common bench-depends
187187 , process >= 1.4 && < 1.7
188188 , directory >= 1.2.2 && < 1.4
189189 , filepath >= 1.4.1 && < 1.5
190− , ghc-prim >= 0.4 && < 0.10
190+ , ghc-prim >= 0.4 && < 0.11
191191
192192 if flag(use-streamly-core)
193193 build-depends: streamly-core
core/streamly-core.cabal+2−2
@@ -452,7 +452,7 @@ library
452452 -- packages depending on the "ghc" package (packages
453453 -- depending on doctest is a common example) can
454454 -- depend on streamly.
455− ghc-prim >= 0.5.3 && < 0.10
455+ ghc-prim >= 0.5.3 && < 0.11
456456 , fusion-plugin-types >= 0.1 && < 0.2
457457 , base >= 4.12 && < 4.19
458458 , exceptions >= 0.8.0 && < 0.11
@@ -460,7 +460,7 @@ library
460460 , filepath >= 1.4.2 && < 1.5
461461
462462 -- streamly-unicode-core
463− , template-haskell >= 2.14 && < 2.20
463+ , template-haskell >= 2.14 && < 2.21
464464
465465 -- streamly-filesystem-core
466466 , directory >= 1.3.3 && < 1.4
docs/streamly-docs.cabal+2−2
@@ -43,7 +43,7 @@ library
4343 User.Tutorials.ReactiveProgramming
4444
4545 build-depends:
46− base >= 4.9 && < 4.18
47− , transformers >= 0.4 && < 0.6
46+ base >= 4.9 && < 4.19
47+ , transformers >= 0.4 && < 0.6.2
4848 , streamly
4949 , streamly-core
streamly.cabal+20−17
@@ -401,12 +401,25 @@ library
401401 , Streamly.Network.Socket
402402 , Streamly.Network.Inet.TCP
403403
404− -- Deprecated
405− , Streamly
406− , Streamly.Data.Unicode.Stream
404+ -- Deprecated modules
407405 , Streamly.Memory.Array
408406 , Streamly.Data.Array.Foreign
407+
408+ if !impl(ghcjs) && flag(dev)
409+ exposed-modules:
410+ Streamly.Internal.System.IOVec.Type
411+ , Streamly.Internal.System.IOVec
412+ , Streamly.Internal.FileSystem.FDIO
413+ , Streamly.Internal.FileSystem.FD
414+
415+ if impl(ghc <= 9.4.5)
416+ exposed-modules:
417+ Streamly
418+ , Streamly.Data.Unicode.Stream
409419 , Streamly.Prelude
420+ , Streamly.Internal.Data.Stream.Async
421+ , Streamly.Internal.Data.Stream.Parallel
422+ , Streamly.Internal.Data.Stream.Ahead
410423
411424 -- Deprecated Internal modules
412425 , Streamly.Internal.Data.SVar.Worker
@@ -422,9 +435,6 @@ library
422435
423436 , Streamly.Internal.Data.Stream.Serial
424437 , Streamly.Internal.Data.Stream.Zip
425− , Streamly.Internal.Data.Stream.Async
426− , Streamly.Internal.Data.Stream.Parallel
427− , Streamly.Internal.Data.Stream.Ahead
428438 , Streamly.Internal.Data.Stream.ZipAsync
429439
430440 , Streamly.Internal.Data.Stream.IsStream.Type
@@ -441,13 +451,6 @@ library
441451 , Streamly.Internal.Data.Stream.IsStream.Top
442452 , Streamly.Internal.Data.Stream.IsStream
443453
444− if !impl(ghcjs) && flag(dev)
445− exposed-modules:
446− Streamly.Internal.System.IOVec.Type
447− , Streamly.Internal.System.IOVec
448− , Streamly.Internal.FileSystem.FDIO
449− , Streamly.Internal.FileSystem.FD
450−
451454 if flag(dev)
452455 exposed-modules: Streamly.Data.SmallArray
453456 , Streamly.Internal.Data.SmallArray
@@ -485,16 +488,13 @@ library
485488 , exceptions >= 0.8.0 && < 0.11
486489 , mtl >= 2.2.2 && < 2.4
487490 , transformers >= 0.5.5 && < 0.7
488− , template-haskell >= 2.14 && < 2.20
491+ , template-haskell >= 2.14 && < 2.21
489492
490493 -- The core streamly package
491494 , streamly-core == 0.1.0
492495
493496 , hashable >= 1.3 && < 1.5
494497 , unordered-containers >= 0.2 && < 0.3
495−
496− -- XXX to be removed
497− , transformers-base >= 0.4 && < 0.5
498498 , heaps >= 0.3 && < 0.5
499499
500500 -- concurrency
@@ -506,6 +506,9 @@ library
506506 -- Network
507507 , network >= 2.6 && < 3.2
508508
509+ if impl(ghc <= 9.4.5)
510+ build-depends: transformers-base >= 0.4 && < 0.5
511+
509512 if flag(use-unliftio)
510513 build-depends: unliftio-core >= 0.2 && < 0.3
511514 else
test/streamly-tests.cabal+15−15
@@ -145,12 +145,12 @@ common optimization-options
145145common test-dependencies
146146 build-depends:
147147 streamly-core
148− , base >= 4.9 && < 4.18
148+ , base >= 4.9 && < 4.19
149149 , containers >= 0.5 && < 0.7
150150 , exceptions >= 0.8 && < 0.11
151151 , ghc
152152 , hspec >= 2.0 && < 2.10
153− , mtl >= 2.2 && < 2.3
153+ , mtl >= 2.2 && < 2.3.2
154154 , random >= 1.0.0 && < 1.3
155155 , transformers >= 0.4 && < 0.7
156156 , QuickCheck >= 2.13 && < 2.15
@@ -180,7 +180,7 @@ library
180180 import: lib-options, test-dependencies
181181 hs-source-dirs: lib
182182 exposed-modules: Streamly.Test.Common
183− if !flag(use-streamly-core)
183+ if !flag(use-streamly-core) && impl(ghc < 9.4.5)
184184 exposed-modules: Streamly.Test.Prelude.Common
185185 if flag(limit-build-mem)
186186 ghc-options: +RTS -M1500M -RTS
@@ -386,7 +386,7 @@ test-suite Prelude
386386 type: exitcode-stdio-1.0
387387 main-is: Streamly/Test/Prelude.hs
388388 ghc-options: -main-is Streamly.Test.Prelude.main
389− if flag(use-streamly-core)
389+ if flag(use-streamly-core) || impl(ghc >= 9.6)
390390 buildable: False
391391
392392test-suite Prelude.Ahead
@@ -394,7 +394,7 @@ test-suite Prelude.Ahead
394394 type: exitcode-stdio-1.0
395395 main-is: Streamly/Test/Prelude/Ahead.hs
396396 ghc-options: -main-is Streamly.Test.Prelude.Ahead.main
397− if flag(use-streamly-core)
397+ if flag(use-streamly-core) || impl(ghc >= 9.6)
398398 buildable: False
399399
400400test-suite Prelude.Async
@@ -402,7 +402,7 @@ test-suite Prelude.Async
402402 type: exitcode-stdio-1.0
403403 main-is: Streamly/Test/Prelude/Async.hs
404404 ghc-options: -main-is Streamly.Test.Prelude.Async.main
405− if flag(use-streamly-core)
405+ if flag(use-streamly-core) || impl(ghc >= 9.6)
406406 buildable: False
407407
408408test-suite Data.Stream.Concurrent
@@ -420,7 +420,7 @@ test-suite Prelude.Concurrent
420420 ghc-options: -main-is Streamly.Test.Prelude.Concurrent.main
421421 if flag(limit-build-mem)
422422 ghc-options: +RTS -M2000M -RTS
423− if flag(use-streamly-core)
423+ if flag(use-streamly-core) || impl(ghc >= 9.6)
424424 buildable: False
425425
426426test-suite Prelude.Fold
@@ -428,7 +428,7 @@ test-suite Prelude.Fold
428428 type: exitcode-stdio-1.0
429429 main-is: Streamly/Test/Prelude/Fold.hs
430430 ghc-options: -main-is Streamly.Test.Prelude.Fold.main
431− if flag(use-streamly-core)
431+ if flag(use-streamly-core) || impl(ghc >= 9.6)
432432 buildable: False
433433
434434test-suite Prelude.Parallel
@@ -436,7 +436,7 @@ test-suite Prelude.Parallel
436436 type: exitcode-stdio-1.0
437437 main-is: Streamly/Test/Prelude/Parallel.hs
438438 ghc-options: -main-is Streamly.Test.Prelude.Parallel.main
439− if flag(use-streamly-core)
439+ if flag(use-streamly-core) || impl(ghc >= 9.6)
440440 buildable: False
441441
442442test-suite Prelude.Rate
@@ -458,14 +458,14 @@ test-suite Prelude.Serial
458458 ghc-options: -main-is Streamly.Test.Prelude.Serial.main
459459 if flag(limit-build-mem)
460460 ghc-options: +RTS -M1500M -RTS
461− if flag(use-streamly-core)
461+ if flag(use-streamly-core) || impl(ghc >= 9.6)
462462 buildable: False
463463
464464test-suite Prelude.Top
465465 import: test-options
466466 type: exitcode-stdio-1.0
467467 main-is: Streamly/Test/Prelude/Top.hs
468− if flag(use-streamly-core)
468+ if flag(use-streamly-core) || impl(ghc >= 9.6)
469469 buildable: False
470470
471471test-suite Prelude.WAsync
@@ -473,7 +473,7 @@ test-suite Prelude.WAsync
473473 type: exitcode-stdio-1.0
474474 main-is: Streamly/Test/Prelude/WAsync.hs
475475 ghc-options: -main-is Streamly.Test.Prelude.WAsync.main
476− if flag(use-streamly-core)
476+ if flag(use-streamly-core) || impl(ghc >= 9.6)
477477 buildable: False
478478
479479test-suite Prelude.WSerial
@@ -481,7 +481,7 @@ test-suite Prelude.WSerial
481481 type: exitcode-stdio-1.0
482482 main-is: Streamly/Test/Prelude/WSerial.hs
483483 ghc-options: -main-is Streamly.Test.Prelude.WSerial.main
484− if flag(use-streamly-core)
484+ if flag(use-streamly-core) || impl(ghc >= 9.6)
485485 buildable: False
486486
487487test-suite Prelude.ZipAsync
@@ -491,7 +491,7 @@ test-suite Prelude.ZipAsync
491491 ghc-options: -main-is Streamly.Test.Prelude.ZipAsync.main
492492 if flag(limit-build-mem)
493493 ghc-options: +RTS -M750M -RTS
494− if flag(use-streamly-core)
494+ if flag(use-streamly-core) || impl(ghc >= 9.6)
495495 buildable: False
496496
497497test-suite Prelude.ZipSerial
@@ -499,7 +499,7 @@ test-suite Prelude.ZipSerial
499499 type: exitcode-stdio-1.0
500500 main-is: Streamly/Test/Prelude/ZipSerial.hs
501501 ghc-options: -main-is Streamly.Test.Prelude.ZipSerial.main
502− if flag(use-streamly-core)
502+ if flag(use-streamly-core) || impl(ghc >= 9.6)
503503 buildable: False
504504
505505test-suite Unicode.Stream