From 2361a40f5ba3670318b6988fc6cf5f605d4fe1f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Tue, 26 Mar 2024 15:18:34 +0100 Subject: [PATCH] Bump brick, vty, free --- flake.nix | 1 + monad-bayes.cabal | 29 ++++++++++++------------ src/Control/Monad/Bayes/Inference/TUI.hs | 1 + 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/flake.nix b/flake.nix index dd63341a..838884af 100644 --- a/flake.nix +++ b/flake.nix @@ -77,6 +77,7 @@ # https://github.com/tweag/monad-bayes/pull/256: Don't run tests on Mac because of machine precision issues modifier = drv: if system == "x86_64-linux" then drv else pkgs.haskell.lib.dontCheck drv; overrides = self: super: with pkgs.haskell.lib; { # Please check after flake.lock updates whether some of these overrides can be removed + brick = super.brick_2_3_1; }; }; ghcs = [ # Always keep this up to date with the tested-with section in monad-bayes.cabal! diff --git a/monad-bayes.cabal b/monad-bayes.cabal index 3f057eb0..6907cac8 100644 --- a/monad-bayes.cabal +++ b/monad-bayes.cabal @@ -38,34 +38,35 @@ flag dev common deps build-depends: - , base >=4.15 && <4.19 - , brick >=1.0 && <2.0 - , containers >=0.5.10 && <0.7 + , base >=4.15 && <4.19 + , brick ^>=2.3.1 + , containers >=0.5.10 && <0.7 , foldl ^>=1.4 - , free >=5.0.2 && <5.2 + , free ^>=5.2 , histogram-fill ^>=0.9 , ieee754 ^>=0.8.0 , integration ^>=0.2 , lens ^>=5.2 , linear ^>=1.22 - , log-domain >=0.12 && <0.14 - , math-functions >=0.2.1 && <0.4 + , log-domain >=0.12 && <0.14 + , math-functions >=0.2.1 && <0.4 , matrix ^>=0.3 , monad-coroutine ^>=0.9.0 , monad-extras ^>=0.6 - , mtl >=2.2.2 && <2.4 - , mwc-random >=0.13.6 && <0.16 + , mtl >=2.2.2 && <2.4 + , mwc-random >=0.13.6 && <0.16 , pipes ^>=4.3 , pretty-simple ^>=4.1 - , primitive >=0.7 && <0.9 + , primitive >=0.7 && <0.9 , random ^>=1.2 , safe ^>=0.3.17 , scientific ^>=0.3 - , statistics >=0.14.0 && <0.17 - , text >=1.2 && <2.1 - , transformers >=0.5.6 && <0.7 - , vector >=0.12.0 && <0.14 - , vty ^>=5.38 + , statistics >=0.14.0 && <0.17 + , text >=1.2 && <2.1 + , transformers >=0.5.6 && <0.7 + , vector >=0.12.0 && <0.14 + , vty ^>=6.1 + , vty-unix ^>=0.2.0.0 common test-deps build-depends: diff --git a/src/Control/Monad/Bayes/Inference/TUI.hs b/src/Control/Monad/Bayes/Inference/TUI.hs index 56addd34..97a4aa54 100644 --- a/src/Control/Monad/Bayes/Inference/TUI.hs +++ b/src/Control/Monad/Bayes/Inference/TUI.hs @@ -28,6 +28,7 @@ import Data.Text.Lazy.IO qualified as TL import GHC.Float (double2Float) import Graphics.Vty import Graphics.Vty qualified as V +import Graphics.Vty.Platform.Unix qualified as V import Numeric.Log (Log (ln)) import Pipes (runEffect, (>->)) import Pipes qualified as P