From 579156be770d8d334e5d8e7143dfa67b6ee89b45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Mon, 13 May 2024 14:10:45 +0200 Subject: [PATCH 1/6] Remove unneeded monad-bayes override --- flake.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index 8820e6db2..81f904327 100644 --- a/flake.nix +++ b/flake.nix @@ -34,14 +34,8 @@ 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="; - } {}; - } { - monad-bayes = [ (jailbreakUnbreak pkgs) dontCheck ]; + tunePackages pkgs super { + monad-bayes = [ dontCheck ]; }; name = "rhine"; From 274524129114ab6a611d5c34fa73ba1fe1abb370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Tue, 2 Jan 2024 10:57:29 +0100 Subject: [PATCH 2/6] Bump time-domain --- flake.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/flake.nix b/flake.nix index 81f904327..065ab58dd 100644 --- a/flake.nix +++ b/flake.nix @@ -36,6 +36,12 @@ outputs = { self, nixpkgs, flake-utils, haskell-flake-utils, flake-compat, ... } with haskell-flake-utils.lib; tunePackages pkgs super { monad-bayes = [ dontCheck ]; + } // { + time-domain = super.callHackageDirect { + pkg = "time-domain"; + ver = "0.1.0.4"; + sha256 = "sha256-6o0dsCDUSjyBx7X979o3oDSRbrWYvkf45DUF5AyvbGY="; + } {}; }; name = "rhine"; From b5ee5f604e632c0158d4bd6d2bd362c9e49c2dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Sun, 31 Dec 2023 19:08:04 +0100 Subject: [PATCH 3/6] Add GHC 9.8 --- automaton/automaton.cabal | 4 +-- rhine-bayes/rhine-bayes.cabal | 4 +-- rhine-examples/rhine-examples.cabal | 19 ++++++------ rhine-gloss/rhine-gloss.cabal | 4 +-- rhine-terminal/rhine-terminal.cabal | 6 ++-- rhine/rhine.cabal | 9 +++--- stack.9.8.1.yaml.lock | 47 +++++++++++++++++++++++++++++ stack.9.8.2.yaml | 20 ++++++++++++ stack.9.8.2.yaml.lock | 40 ++++++++++++++++++++++++ stack.yaml.lock | 44 +++++---------------------- 10 files changed, 139 insertions(+), 58 deletions(-) create mode 100644 stack.9.8.1.yaml.lock create mode 100644 stack.9.8.2.yaml create mode 100644 stack.9.8.2.yaml.lock diff --git a/automaton/automaton.cabal b/automaton/automaton.cabal index f245a2c6f..c77b96550 100644 --- 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/rhine-bayes/rhine-bayes.cabal b/rhine-bayes/rhine-bayes.cabal index 9d654845b..631a5262f 100644 --- 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 index 507eda653..0e269fa44 100644 --- 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/rhine-gloss.cabal b/rhine-gloss/rhine-gloss.cabal index b1fdea297..ffcdb3aab 100644 --- 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/rhine-terminal.cabal b/rhine-terminal/rhine-terminal.cabal index f18aca8f1..0a5dbfdc0 100644 --- 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/rhine.cabal b/rhine/rhine.cabal index f8e1a6749..31002a05f 100644 --- 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 new file mode 100644 index 000000000..119988360 --- /dev/null +++ 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 new file mode 100644 index 000000000..74cb88adb --- /dev/null +++ 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@sha256:024ce97d7d6abc9b4ffa22bfe1cfabb420feac67ecbd34fe8777c2fd27f56fea,6551 +- 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 diff --git a/stack.9.8.2.yaml.lock b/stack.9.8.2.yaml.lock new file mode 100644 index 000000000..f78a2c8b5 --- /dev/null +++ b/stack.9.8.2.yaml.lock @@ -0,0 +1,40 @@ +# 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: monad-bayes-1.3.0.1@sha256:07d7ffae99ea52cf2da79b0824140d5be62a9e7e3ea22ef3c11db5778235c8ce,6588 + pantry-tree: + sha256: a039a2213f6351cc17b40fdee4d35d57ef06e414fea4827319ebeb326ff3f0ed + size: 4852 + original: + hackage: monad-bayes-1.3.0.1 +- 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: time-domain-0.1.0.4@sha256:b5e499ede44d46554e0d0715002ae39d258ef81aac22604b6ad5dc46a6fd41fe,1174 + pantry-tree: + sha256: a071cc04dc4c8b24bad5f9062b66065e9b465f94cebc173b70c1c26ff468da81 + size: 224 + original: + hackage: time-domain-0.1.0.4@sha256:b5e499ede44d46554e0d0715002ae39d258ef81aac22604b6ad5dc46a6fd41fe,1174 +- completed: + hackage: vty-6.1@sha256:524d124223c02373260ebc409ddd622fbe97cacd1ea0ee98476b5992bddbc4f3,3661 + pantry-tree: + sha256: 4ed3b229066617a0f3429b7b7dadc8e01d14111ac675801053cd35fbb6ee3f14 + size: 2104 + original: + hackage: vty-6.1@sha256:524d124223c02373260ebc409ddd622fbe97cacd1ea0ee98476b5992bddbc4f3,3661 +snapshots: +- completed: + sha256: 496a3c34464c7dc85d9bd413fe45aea6e86c376d1c368799164b85ed16f0ea2e + size: 631264 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/5/1.yaml + original: nightly-2024-05-01 diff --git a/stack.yaml.lock b/stack.yaml.lock index 1f3518d93..3a581d6a1 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -18,13 +18,6 @@ packages: size: 1775 original: hackage: terminal-0.2.0.0@sha256:de6770ecaae3197c66ac1f0db5a80cf5a5b1d3b64a66a05b50f442de5ad39570,2977 -- completed: - hackage: monad-bayes-1.2.0@sha256:bf83cf8e6d163c461b9964dbff48d4476b2a82421962af317b3a3d0d738ea2a2,6456 - pantry-tree: - sha256: ce4a9db9888b589ae56493862ae62f2efb5af8d17d3d55bac0b3f59177881b2b - size: 3823 - original: - hackage: monad-bayes-1.2.0@sha256:bf83cf8e6d163c461b9964dbff48d4476b2a82421962af317b3a3d0d738ea2a2,6456 - completed: hackage: hspec-2.11.7@sha256:2869580a2a29e7beb6268ea3dc561583f4ae229ed1f47fb1c92e8c09ce35acec,1763 pantry-tree: @@ -74,13 +67,6 @@ packages: size: 741 original: hackage: hspec-expectations-0.8.4@sha256:4237f094a7931202ff57ac6475542b0b314b50a7024550e2b6eb87cfb0d4ff93,1702 -- completed: - hackage: dunai-0.12.2@sha256:e769c1b89b5571138c20c387c304758f87f2b9c599fcfe6fc5a81cd7c4ec86b7,6982 - pantry-tree: - sha256: 79a567d02d6d018530dcfa5ac9f7d5e9fead24e9038ba63fa1ed902369f7df31 - size: 2232 - original: - hackage: dunai-0.12.2 - completed: hackage: criterion-1.6.3.0@sha256:cf27e6c83f91674fb67ef253cae644ad0ce079b7e2cfa6402e13e930f78499ec,5373 pantry-tree: @@ -110,33 +96,19 @@ packages: original: hackage: selective-0.7.0.1@sha256:542ab572491898552b42d62d43a7e8c70fb93d714c06c06a4de6f331fee87df2,3509 - completed: - hackage: semialign-1.3@sha256:7be9ef5ca1d6b052991f68c053aab68b9d1ab3b1938c9557ac84c97937815223,2888 - pantry-tree: - sha256: e5daa7e0023dabb1b21a04bf084364b94e45e81b380e950b90f51294a1990b87 - size: 537 - original: - hackage: semialign-1.3@sha256:7be9ef5ca1d6b052991f68c053aab68b9d1ab3b1938c9557ac84c97937815223,2888 -- completed: - hackage: these-1.2@sha256:011e22f6891ca028f87c04ea48796696c92d593313a9c699f7ff4f9ffd7aec6e,2882 - pantry-tree: - sha256: 37483703ce7326c07608b06f2f741fb0f708cb06bd10ec57d87108d068046b05 - size: 351 - original: - hackage: these-1.2@sha256:011e22f6891ca028f87c04ea48796696c92d593313a9c699f7ff4f9ffd7aec6e,2882 -- completed: - hackage: assoc-1.1.1@sha256:ad458c9e06a23dd275f8dbb02d13e250b8e40ac4858bc67e7992628563d14f5d,1381 + hackage: monad-bayes-1.3.0@sha256:024ce97d7d6abc9b4ffa22bfe1cfabb420feac67ecbd34fe8777c2fd27f56fea,6551 pantry-tree: - sha256: 6b353c95614aa239936eb4f6d0a4ac91b0c846c3b5356ff9537613a773648e89 - size: 290 + sha256: 1b1466cced4cd4734e44c266e3012a6e0d1c959c9d97aeac30de216e046f4787 + size: 4851 original: - hackage: assoc-1.1.1@sha256:ad458c9e06a23dd275f8dbb02d13e250b8e40ac4858bc67e7992628563d14f5d,1381 + hackage: monad-bayes-1.3.0@sha256:024ce97d7d6abc9b4ffa22bfe1cfabb420feac67ecbd34fe8777c2fd27f56fea,6551 - completed: - hackage: foldable1-classes-compat-0.1@sha256:f2f1c40f9e3322ce8d4101cb2925b420e19b993ef543a6b106d91accf08be78d,3782 + hackage: time-domain-0.1.0.4@sha256:b5e499ede44d46554e0d0715002ae39d258ef81aac22604b6ad5dc46a6fd41fe,1174 pantry-tree: - sha256: d022a7175e27fd85dd1053ac6f4bf8818cfe0d8e360908aba7d7a1c3d95b227b - size: 518 + sha256: a071cc04dc4c8b24bad5f9062b66065e9b465f94cebc173b70c1c26ff468da81 + size: 224 original: - hackage: foldable1-classes-compat-0.1@sha256:f2f1c40f9e3322ce8d4101cb2925b420e19b993ef543a6b106d91accf08be78d,3782 + hackage: time-domain-0.1.0.4@sha256:b5e499ede44d46554e0d0715002ae39d258ef81aac22604b6ad5dc46a6fd41fe,1174 snapshots: - completed: sha256: 5a59b2a405b3aba3c00188453be172b85893cab8ebc352b1ef58b0eae5d248a2 From 7fd132229bf86eb7f14f253b098e705dab9fa3fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Mon, 13 May 2024 13:59:36 +0200 Subject: [PATCH 4/6] Update changelog --- rhine-bayes/ChangeLog.md | 2 +- rhine-gloss/ChangeLog.md | 2 +- rhine-terminal/ChangeLog.md | 2 +- rhine/ChangeLog.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rhine-bayes/ChangeLog.md b/rhine-bayes/ChangeLog.md index f3810d1c9..0cf624934 100644 --- 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-gloss/ChangeLog.md b/rhine-gloss/ChangeLog.md index 0be330cd4..82fda37ee 100644 --- 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-terminal/ChangeLog.md b/rhine-terminal/ChangeLog.md index f35ec0b3b..bf22c431a 100644 --- 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/ChangeLog.md b/rhine/ChangeLog.md index 0c43b1177..1441513cc 100644 --- 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 From 49f26907121460844d1b26b09b51ca486bf99339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Mon, 13 May 2024 15:09:23 +0200 Subject: [PATCH 5/6] Bump monad-bayes --- flake.nix | 10 +++++++--- stack.9.8.2.yaml | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 065ab58dd..f15e9f572 100644 --- 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 super { - monad-bayes = [ dontCheck ]; - } // { + { time-domain = super.callHackageDirect { pkg = "time-domain"; ver = "0.1.0.4"; sha256 = "sha256-6o0dsCDUSjyBx7X979o3oDSRbrWYvkf45DUF5AyvbGY="; } {}; + 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/stack.9.8.2.yaml b/stack.9.8.2.yaml index 74cb88adb..5db3281a0 100644 --- a/stack.9.8.2.yaml +++ b/stack.9.8.2.yaml @@ -9,7 +9,7 @@ packages: - rhine-bayes extra-deps: -- monad-bayes-1.3.0@sha256:024ce97d7d6abc9b4ffa22bfe1cfabb420feac67ecbd34fe8777c2fd27f56fea,6551 +- 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 From 0fce881951a6419cc257c507ffabbe59f92ddfb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Mon, 13 May 2024 15:54:30 +0200 Subject: [PATCH 6/6] Bump flake --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 5ec6381e0..da288c455 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -56,11 +56,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709764733, - "narHash": "sha256-GptBnEUy8IcRrnd8X5WBJPDXG7M4bjj8OG4Wjg8dCDs=", + "lastModified": 1715571466, + "narHash": "sha256-7o7OwQ7D35K7fsBaDjEqHfpbbg+EKhAtz93cHg3LXBw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "edf9f14255a7ac20f8da7b70609e980a964fca7a", + "rev": "adc44ac0ee8454f4f51ef5dd1bdcc60080141e24", "type": "github" }, "original": {