Merge pull request #270 from turion/ghc_9.8

Ghc 9.8
turion · May 13, 2024 · 8cc4198 · 8cc4198
2 parents 93f8f28 + 0fce881
commit 8cc4198
Show file tree

Hide file tree

Showing 16 changed files with 160 additions and 75 deletions.
diff --git a/automaton/automaton.cabal b/automaton/automaton.cabal
@@ -20,7 +20,7 @@ extra-doc-files:
 common opts
   build-depends:
     MonadRandom >=0.5,
-    base >=4.14 && <4.19,
+    base >=4.14 && <4.20,
     mmorph ^>=1.2,
     mtl >=2.2 && <2.4,
     profunctors ^>=5.6,
@@ -89,7 +89,7 @@ test-suite automaton-test
   build-depends:
     QuickCheck ^>=2.14,
     automaton,
-    tasty ^>=1.4,
+    tasty >=1.4 && <1.6,
     tasty-hunit ^>=0.10,
     tasty-quickcheck ^>=0.10,
 

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -34,14 +34,18 @@ outputs = { self, nixpkgs, flake-utils, haskell-flake-utils, flake-compat, ... }
     hpPreOverrides = { pkgs, ... }: self: super:
       with pkgs.haskell.lib;
       with haskell-flake-utils.lib;
-      tunePackages pkgs {
-        monad-bayes = super.callHackageDirect {
-          pkg = "monad-bayes";
-          ver = "1.3.0";
-          sha256 = "sha256-9cNoHvqZ1D0PEykZMvh8yAx3nZjMGFrsgnNRmANwIUk=";
+      {
+        time-domain = super.callHackageDirect {
+          pkg = "time-domain";
+          ver = "0.1.0.4";
+          sha256 = "sha256-6o0dsCDUSjyBx7X979o3oDSRbrWYvkf45DUF5AyvbGY=";
         } {};
-      } {
-        monad-bayes = [ (jailbreakUnbreak pkgs) dontCheck ];
+        brick = super.brick_2_3_1; # monad-bayes
+        monad-bayes = dontCheck (super.callHackageDirect {
+          pkg = "monad-bayes";
+          ver = "1.3.0.1";
+          sha256 = "sha256-66IUFRWNY7flGR3Qb22keSb3FDP4zIjoYXfRH7yvCts=";
+        } {});
       };
 
     name = "rhine";

diff --git a/rhine-bayes/ChangeLog.md b/rhine-bayes/ChangeLog.md
@@ -5,7 +5,7 @@
 
 * Dropped `dunai` dependency in favour of state automata.
   See [the versions readme](./versions.md) for details.
-* Support GHC 9.6
+* Support GHC 9.6 and 9.8
 * Updated to monad-bayes 1.3
 
 ## 1.2

diff --git a/rhine-bayes/rhine-bayes.cabal b/rhine-bayes/rhine-bayes.cabal
@@ -33,7 +33,7 @@ library
   other-modules: Data.Automaton.Bayes
   build-depends:
     automaton,
-    base >=4.11 && <4.19,
+    base >=4.14 && <4.20,
     log-domain >=0.12,
     mmorph ^>=1.2,
     monad-bayes ^>=1.3,
@@ -66,7 +66,7 @@ executable rhine-bayes-gloss
   hs-source-dirs: app
   build-depends:
     automaton,
-    base >=4.11 && <4.19,
+    base >=4.14 && <4.20,
     log-domain,
     mmorph,
     monad-bayes,

diff --git a/rhine-examples/rhine-examples.cabal b/rhine-examples/rhine-examples.cabal
@@ -25,7 +25,7 @@ executable HelloWorld
     -with-rtsopts=-N
 
   build-depends:
-    base >=4.14 && <4.19,
+    base >=4.14 && <4.20,
     rhine ==1.2
 
   default-language: Haskell2010
@@ -44,7 +44,7 @@ executable Demonstration
     -with-rtsopts=-N
 
   build-depends:
-    base >=4.14 && <4.19,
+    base >=4.14 && <4.20,
     rhine ==1.2
 
   default-language: Haskell2010
@@ -63,7 +63,7 @@ executable ADSR
     -with-rtsopts=-N
 
   build-depends:
-    base >=4.14 && <4.19,
+    base >=4.14 && <4.20,
     rhine ==1.2
 
   default-language: Haskell2010
@@ -82,7 +82,7 @@ executable Ball
     -with-rtsopts=-N
 
   build-depends:
-    base >=4.14 && <4.19,
+    base >=4.14 && <4.20,
     random >=1.1,
     rhine ==1.2,
     vector-sized >=1.4
@@ -108,7 +108,7 @@ executable Periodic
     -with-rtsopts=-N
 
   build-depends:
-    base >=4.14 && <4.19,
+    base >=4.14 && <4.20,
     monad-schedule >=0.1,
     rhine ==1.2,
     transformers >=0.5
@@ -129,7 +129,7 @@ executable EventClock
     -with-rtsopts=-N
 
   build-depends:
-    base >=4.14 && <4.19,
+    base >=4.14 && <4.20,
     random >=1.1,
     rhine ==1.2
 
@@ -149,7 +149,7 @@ executable Sawtooth
     -with-rtsopts=-N
 
   build-depends:
-    base >=4.14 && <4.19,
+    base >=4.14 && <4.20,
     rhine ==1.2
 
   default-language: Haskell2010
@@ -168,13 +168,14 @@ executable RandomWalk
     -with-rtsopts=-N
 
   build-depends:
-    base >=4.14 && <4.19,
+    base >=4.14 && <4.20,
     random >=1.1,
     rhine ==1.2,
     simple-affine-space
 
   default-language: Haskell2010
-  default-extensions: TypeOperators
+  default-extensions:
+    TypeOperators
 
   if flag(dev)
     ghc-options: -Werror

diff --git a/rhine-gloss/ChangeLog.md b/rhine-gloss/ChangeLog.md
@@ -4,7 +4,7 @@
 
 * Dropped `dunai` dependency in favour of state automata.
   See [the versions readme](./versions.md) for details.
-* Support GHC 9.6
+* Support GHC 9.6 and 9.8
 
 ## 1.1
 

diff --git a/rhine-gloss/rhine-gloss.cabal b/rhine-gloss/rhine-gloss.cabal
@@ -38,7 +38,7 @@ library
 
   build-depends:
     automaton,
-    base >=4.14 && <4.19,
+    base >=4.14 && <4.20,
     gloss >=1.12,
     mmorph >=1.1,
     monad-schedule >=0.1,
@@ -57,7 +57,7 @@ executable rhine-gloss-gears
   main-is: Main.hs
   ghc-options: -threaded
   build-depends:
-    base >=4.14 && <4.19,
+    base >=4.14 && <4.20,
     rhine-gloss
 
   default-language: Haskell2010

diff --git a/rhine-terminal/ChangeLog.md b/rhine-terminal/ChangeLog.md
@@ -4,7 +4,7 @@
 
 * Dropped `dunai` dependency in favour of state automata.
   See [the versions readme](./versions.md) for details.
-* Support GHC 9.6
+* Support GHC 9.6 and 9.8
 
 ## 1.1
 

diff --git a/rhine-terminal/rhine-terminal.cabal b/rhine-terminal/rhine-terminal.cabal
@@ -27,7 +27,7 @@ source-repository this
 library
   exposed-modules: FRP.Rhine.Terminal
   build-depends:
-    base >=4.11 && <4.19,
+    base >=4.11 && <4.20,
     exceptions >=0.10.4,
     monad-schedule >=0.1.2,
     rhine ==1.2,
@@ -47,7 +47,7 @@ executable rhine-terminal-simple
   main-is: TerminalSimple.hs
   ghc-options: -threaded
   build-depends:
-    base >=4.14 && <4.19,
+    base >=4.14 && <4.20,
     rhine ==1.2,
     rhine-terminal,
     terminal >=0.2.0.0,
@@ -71,7 +71,7 @@ test-suite rhine-terminal-tests
   main-is: tests/Main.hs
   ghc-options: -threaded
   build-depends:
-    base >=4.14 && <4.19,
+    base >=4.14 && <4.20,
     exceptions >=0.10.4,
     hspec,
     rhine ==1.2,

diff --git a/rhine/ChangeLog.md b/rhine/ChangeLog.md
@@ -8,7 +8,7 @@
   It is now `ClSFExcept cl a b m e` instead of `ClSFExcept m cl a b e`.
   The advantage is that now the type is an instance of `MonadTrans` and `MFunctor`.
   Analogous changes have been made to `BehaviourFExcept`.
-* Support GHC 9.6
+* Support GHC 9.6 and 9.8
 
 ## 1.2.1
 

diff --git a/rhine/rhine.cabal b/rhine/rhine.cabal
@@ -35,6 +35,7 @@ tested-with:
   ghc ==9.2.8
   ghc ==9.4.7
   ghc ==9.6.4
+  ghc ==9.8.2
 
 source-repository head
   type: git
@@ -48,11 +49,11 @@ source-repository this
 common opts
   build-depends:
     automaton ^>=0.1.0.0,
-    base >=4.14 && <4.19,
+    base >=4.14 && <4.20,
     monad-schedule ^>=0.1.2,
     mtl >=2.2 && <2.4,
     selective ^>=0.7,
-    text >=1.2 && <2.1,
+    text >=1.2 && <2.2,
     time >=1.8,
     transformers >=0.5,
     vector-sized >=1.4,
@@ -83,7 +84,7 @@ common opts
 common test-deps
   build-depends:
     QuickCheck ^>=2.14,
-    tasty ^>=1.4,
+    tasty >=1.4 && <1.6,
     tasty-hunit ^>=0.10,
     tasty-quickcheck ^>=0.10,
 
@@ -151,7 +152,7 @@ library
     random >=1.1,
     simple-affine-space ^>=0.2,
     sop-core ^>=0.5,
-    text >=1.2 && <2.1,
+    text >=1.2 && <2.2,
     time >=1.8,
     time-domain ^>=0.1.0.2,
     transformers >=0.5,

diff --git a/stack.9.8.1.yaml.lock b/stack.9.8.1.yaml.lock
@@ -0,0 +1,47 @@
+# This file was autogenerated by Stack.
+# You should not edit this file by hand.
+# For more information, please see the documentation at:
+#   https://docs.haskellstack.org/en/stable/lock_files
+
+packages:
+- completed:
+    hackage: gloss-1.13.2.2@sha256:cdb17d6c2f7cc32dc0893e60d6c047f12adeb1a7279064e0def9fdfd97477bee,4075
+    pantry-tree:
+      sha256: d6353a809bbbd8711d53e738ef4e1e503b19280057a5ccd8c9a3b5c164a4718f
+      size: 3807
+  original:
+    hackage: gloss-1.13.2.2@sha256:cdb17d6c2f7cc32dc0893e60d6c047f12adeb1a7279064e0def9fdfd97477bee,4075
+- completed:
+    hackage: monad-bayes-1.1.0@sha256:8929887b2883e553b928dcc9b1326171c87b6aa26f11800dc8c55b119a9e9649,6123
+    pantry-tree:
+      sha256: bf7f9b1351226a957c7ebd0c42316505be713690cd9d44425bd9cfd494a94161
+      size: 3568
+  original:
+    hackage: monad-bayes-1.1.0@sha256:8929887b2883e553b928dcc9b1326171c87b6aa26f11800dc8c55b119a9e9649,6123
+- completed:
+    hackage: monad-schedule-0.1.2.0@sha256:640b0dc483c2c0fef3fbbe91ddd2685aa13621fc1457497659d6c4c4d2d1ee74,1803
+    pantry-tree:
+      sha256: 76796faefab4dde5922e28a665051c18b849c0f3fe8caaf4ffc47039b6f79bb0
+      size: 792
+  original:
+    hackage: monad-schedule-0.1.2.0@sha256:640b0dc483c2c0fef3fbbe91ddd2685aa13621fc1457497659d6c4c4d2d1ee74,1803
+- completed:
+    hackage: terminal-0.2.0.0@sha256:de6770ecaae3197c66ac1f0db5a80cf5a5b1d3b64a66a05b50f442de5ad39570,2977
+    pantry-tree:
+      sha256: 54160663bf0cbcd1d9fa52e136740faaf91a82d1ca1efeb08e8e58575a7446e7
+      size: 1775
+  original:
+    hackage: terminal-0.2.0.0@sha256:de6770ecaae3197c66ac1f0db5a80cf5a5b1d3b64a66a05b50f442de5ad39570,2977
+- completed:
+    hackage: vector-sized-1.5.0@sha256:6b827805784b52ee9845ab5c930f627e6e27b6dea2354f6fc46295e63ccdb2ed,1758
+    pantry-tree:
+      sha256: c4010995ed0fbe9094142af691198f5b28a98b1ae0f7938b0d8a6e3fcf9769f1
+      size: 1302
+  original:
+    hackage: vector-sized-1.5.0@sha256:6b827805784b52ee9845ab5c930f627e6e27b6dea2354f6fc46295e63ccdb2ed,1758
+snapshots:
+- completed:
+    sha256: c69874537ef3f981cafca2e53d4607925991921ddab3219dae7cd7aa76d2ad42
+    size: 528649
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/12/31.yaml
+  original: nightly-2023-12-31
diff --git a/stack.9.8.2.yaml b/stack.9.8.2.yaml
@@ -0,0 +1,20 @@
+resolver: nightly-2024-05-01
+
+packages:
+- automaton
+- rhine
+- rhine-examples
+- rhine-gloss
+- rhine-terminal
+- rhine-bayes
+
+extra-deps:
+- monad-bayes-1.3.0.1
+- terminal-0.2.0.0@sha256:de6770ecaae3197c66ac1f0db5a80cf5a5b1d3b64a66a05b50f442de5ad39570,2977
+- time-domain-0.1.0.4@sha256:b5e499ede44d46554e0d0715002ae39d258ef81aac22604b6ad5dc46a6fd41fe,1174
+- vty-6.1@sha256:524d124223c02373260ebc409ddd622fbe97cacd1ea0ee98476b5992bddbc4f3,3661
+
+nix:
+  packages:
+    - libGL
+    - libGLU