diff --git a/flake.lock b/flake.lock index d636ff26..256b7dce 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -17,12 +17,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1652776076, - "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -38,11 +41,11 @@ ] }, "locked": { - "lastModified": 1653257836, - "narHash": "sha256-eCegA8VPrOODmi+NTpFt3WEMDbifyXdrGzcTe078w2c=", + "lastModified": 1672412555, + "narHash": "sha256-Kaa8F7nQFR3KuS6Y9WRUxeJeZlp6CCubyrRfmiEsW4k=", "owner": "ivanovs-4", "repo": "haskell-flake-utils", - "rev": "e18a8fcd6c32226c4b64617c5ffda2599cda9223", + "rev": "896219e5bde6efac72198550454e9dd9b5ed9ac9", "type": "github" }, "original": { @@ -53,11 +56,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1676534113, - "narHash": "sha256-bKHSdUUFSsVdxb5hcuBb2NnSpOzQrAR0srLawOPVWmE=", + "lastModified": 1697343899, + "narHash": "sha256-66Dosy7YYVhkesbHXB4xxZZ+2NOi9CmFDyHOI1ZTAbQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4987c7aacdeeed0b08fcd12ab1c5813b683be7d6", + "rev": "982b24c40e743793c966b47b3bb3699881489ae0", "type": "github" }, "original": { @@ -74,6 +77,21 @@ "haskell-flake-utils": "haskell-flake-utils", "nixpkgs": "nixpkgs" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/rhine-bayes/ChangeLog.md b/rhine-bayes/ChangeLog.md index 2fe627d1..39f00a78 100644 --- a/rhine-bayes/ChangeLog.md +++ b/rhine-bayes/ChangeLog.md @@ -1,5 +1,9 @@ # Revision history for rhine-gloss +## 1.1 + +* dunai-0.11 compatibility + ## 1.0 * Removed schedules. See the [page about changes in version 1](/version1.md). diff --git a/rhine-bayes/rhine-bayes.cabal b/rhine-bayes/rhine-bayes.cabal index a1e6cc5b..0b446d44 100644 --- a/rhine-bayes/rhine-bayes.cabal +++ b/rhine-bayes/rhine-bayes.cabal @@ -1,5 +1,5 @@ name: rhine-bayes -version: 1.0 +version: 1.1 synopsis: monad-bayes backend for Rhine description: This package provides a backend to the @monad-bayes@ library, @@ -23,7 +23,7 @@ source-repository head source-repository this type: git location: git@github.com:turion/rhine.git - tag: v1.0 + tag: v1.1 library exposed-modules: @@ -32,8 +32,8 @@ library Data.MonadicStreamFunction.Bayes build-depends: base >= 4.11 && < 4.18 , transformers >= 0.5 - , rhine == 1.0 - , dunai ^>= 0.9 + , rhine == 1.1 + , dunai ^>= 0.11 , log-domain >= 0.12 , monad-bayes ^>= 1.1 hs-source-dirs: src diff --git a/rhine-examples/ChangeLog.md b/rhine-examples/ChangeLog.md index 623401d5..e18a7783 100644 --- a/rhine-examples/ChangeLog.md +++ b/rhine-examples/ChangeLog.md @@ -1,5 +1,9 @@ # Revision history for rhine-examples +## 1.1 + +* dunai-0.11 compatibility + ## 0.9 * Added Ball example diff --git a/rhine-examples/rhine-examples.cabal b/rhine-examples/rhine-examples.cabal index 9ef8eb71..b78942b3 100644 --- a/rhine-examples/rhine-examples.cabal +++ b/rhine-examples/rhine-examples.cabal @@ -2,7 +2,7 @@ -- documentation, see http://haskell.org/cabal/users-guide/ name: rhine-examples -version: 1.0 +version: 1.1 -- synopsis: -- description: license: BSD3 @@ -20,7 +20,7 @@ executable HelloWorld main-is: HelloWorld.hs ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N build-depends: base >= 4.14 && < 4.18 - , rhine == 1.0 + , rhine == 1.1 default-language: Haskell2010 default-extensions: TypeOperators @@ -32,7 +32,7 @@ executable Demonstration main-is: Demonstration.hs ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N build-depends: base >= 4.14 && < 4.18 - , rhine == 1.0 + , rhine == 1.1 default-language: Haskell2010 default-extensions: TypeOperators @@ -44,7 +44,7 @@ executable ADSR main-is: ADSR.hs ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N build-depends: base >= 4.14 && < 4.18 - , rhine == 1.0 + , rhine == 1.1 default-language: Haskell2010 default-extensions: TypeOperators @@ -56,7 +56,7 @@ executable Ball main-is: Ball.hs ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N build-depends: base >= 4.14 && < 4.18 - , rhine == 1.0 + , rhine == 1.1 , vector-sized >= 1.4 , random >= 1.1 default-language: Haskell2010 @@ -74,7 +74,7 @@ executable Periodic main-is: Periodic.hs ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N build-depends: base >= 4.14 && < 4.18 - , rhine == 1.0 + , rhine == 1.1 , transformers >= 0.5 , monad-schedule >= 0.1 default-language: Haskell2010 @@ -88,7 +88,7 @@ executable EventClock main-is: EventClock.hs ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N build-depends: base >= 4.14 && < 4.18 - , rhine == 1.0 + , rhine == 1.1 , random >= 1.1 default-language: Haskell2010 default-extensions: @@ -101,7 +101,7 @@ executable Sawtooth main-is: Sawtooth.hs ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N build-depends: base >= 4.14 && < 4.18 - , rhine == 1.0 + , rhine == 1.1 default-language: Haskell2010 default-extensions: TypeOperators @@ -113,7 +113,7 @@ executable RandomWalk main-is: RandomWalk.hs ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N build-depends: base >= 4.14 && < 4.18 - , rhine == 1.0 + , rhine == 1.1 , random >= 1.1 , simple-affine-space default-language: Haskell2010 diff --git a/rhine-gloss/ChangeLog.md b/rhine-gloss/ChangeLog.md index dcc5da24..e2c686ee 100644 --- a/rhine-gloss/ChangeLog.md +++ b/rhine-gloss/ChangeLog.md @@ -1,5 +1,9 @@ # Revision history for rhine-gloss +## 1.1 + +* dunai-0.11 compatibility + ## 1.0 * Removed schedules. See the [page about changes in version 1](/version1.md). diff --git a/rhine-gloss/rhine-gloss.cabal b/rhine-gloss/rhine-gloss.cabal index bc806fce..98b3199a 100644 --- a/rhine-gloss/rhine-gloss.cabal +++ b/rhine-gloss/rhine-gloss.cabal @@ -2,7 +2,7 @@ -- documentation, see http://haskell.org/cabal/users-guide/ name: rhine-gloss -version: 1.0 +version: 1.1 synopsis: Gloss backend for Rhine description: This package provides a simple wrapper for the `gloss` library, @@ -26,7 +26,7 @@ source-repository head source-repository this type: git location: https://github.com/turion/rhine.git - tag: v1.0 + tag: v1.1 library @@ -38,8 +38,8 @@ library FRP.Rhine.Gloss.Pure.Combined build-depends: base >= 4.14 && < 4.18 , transformers >= 0.5 - , rhine == 1.0 - , dunai ^>= 0.9 + , rhine == 1.1 + , dunai ^>= 0.11 , gloss >= 1.12 , mmorph >= 1.1 , monad-schedule >= 0.1 diff --git a/rhine-terminal/ChangeLog.md b/rhine-terminal/ChangeLog.md index 7bf71281..4f5ca9ef 100644 --- a/rhine-terminal/ChangeLog.md +++ b/rhine-terminal/ChangeLog.md @@ -1,5 +1,9 @@ # Revision history for rhine-terminal +## 1.1 + +* dunai-0.11 compatibility + ## 1.0 * Removed schedules. See the [page about changes in version 1](/version1.md). diff --git a/rhine-terminal/rhine-terminal.cabal b/rhine-terminal/rhine-terminal.cabal index d73debf0..d76dae3e 100644 --- a/rhine-terminal/rhine-terminal.cabal +++ b/rhine-terminal/rhine-terminal.cabal @@ -2,7 +2,7 @@ -- documentation, see http://haskell.org/cabal/users-guide/ name: rhine-terminal -version: 1.0 +version: 1.1 synopsis: Terminal backend for Rhine description: This package provides an example of a `terminal` based program using rhine. @@ -24,7 +24,7 @@ source-repository head source-repository this type: git location: https://github.com/turion/rhine.git - tag: v1.0 + tag: v1.1 library exposed-modules: @@ -32,8 +32,8 @@ library build-depends: base >= 4.11 && < 4.18 , exceptions >= 0.10.4 , transformers >= 0.5 - , rhine == 1.0 - , dunai ^>= 0.9 + , rhine == 1.1 + , dunai ^>= 0.11 , terminal >= 0.2.0.0 , time >= 1.9.3 , monad-schedule >= 0.1.2 @@ -49,7 +49,7 @@ executable rhine-terminal-simple main-is: TerminalSimple.hs ghc-options: -threaded build-depends: base >= 4.14 && < 4.18 - , rhine == 1.0 + , rhine == 1.1 , rhine-terminal , terminal >= 0.2.0.0 , text >= 1.2.5.0 @@ -67,7 +67,7 @@ test-suite rhine-terminal-tests main-is: tests/Main.hs ghc-options: -threaded build-depends: base >= 4.14 && < 4.18 - , rhine == 1.0 + , rhine == 1.1 , rhine-terminal , exceptions >= 0.10.4 , transformers >= 0.5 diff --git a/rhine/ChangeLog.md b/rhine/ChangeLog.md index d3b888e8..aa7903d7 100644 --- a/rhine/ChangeLog.md +++ b/rhine/ChangeLog.md @@ -1,5 +1,9 @@ # Revision history for rhine +## 1.1 + +* dunai-0.11 compatibility + ## 1.0 * Removed schedules. See the [page about changes in version 1](/version1.md). diff --git a/rhine/rhine.cabal b/rhine/rhine.cabal index 6ee4c369..09571356 100644 --- a/rhine/rhine.cabal +++ b/rhine/rhine.cabal @@ -2,7 +2,7 @@ cabal-version: 2.2 name: rhine -version: 1.0 +version: 1.1 synopsis: Functional Reactive Programming with type-level clocks @@ -129,7 +129,7 @@ library -- Other library packages from which modules are imported. build-depends: - , dunai ^>= 0.9 + , dunai ^>= 0.11 , transformers >= 0.5 , time >= 1.8 , free >= 5.1 @@ -137,8 +137,7 @@ library , deepseq >= 1.4 , random >= 1.1 , MonadRandom >= 0.5 - -- Remove version pin when https://github.com/ivanperez-keera/dunai/issues/298 is resolved: - , simple-affine-space == 0.1.1 + , simple-affine-space ^>= 0.2 , time-domain , monad-schedule >= 0.1.2 diff --git a/rhine/src/FRP/Rhine/ClSF/Util.hs b/rhine/src/FRP/Rhine/ClSF/Util.hs index 037c4b1c..fe28061c 100644 --- a/rhine/src/FRP/Rhine/ClSF/Util.hs +++ b/rhine/src/FRP/Rhine/ClSF/Util.hs @@ -27,6 +27,7 @@ import Control.Monad.Trans.Reader (ask, asks) -- dunai import Control.Monad.Trans.MSF.Reader (readerS) +import Data.MonadicStreamFunction.Instances.Num () import Data.MonadicStreamFunction.Instances.VectorSpace () -- simple-affine-space @@ -197,6 +198,7 @@ threePointDerivativeFrom :: ( Monad m , VectorSpace v s , s ~ Diff td + , Num s ) => -- | The initial position v -> @@ -213,6 +215,7 @@ threePointDerivative :: ( Monad m , VectorSpace v s , s ~ Diff td + , Num s ) => BehaviorF m td v v threePointDerivative = threePointDerivativeFrom zeroVector @@ -231,6 +234,7 @@ weightedAverageFrom :: ( Monad m , VectorSpace v s , s ~ Diff td + , Num s ) => -- | The initial position v -> @@ -282,6 +286,7 @@ average = averageFrom zeroVector averageLinFrom :: ( Monad m , VectorSpace v s + , Floating s , s ~ Diff td ) => -- | The initial position @@ -299,6 +304,7 @@ averageLinFrom v0 t = proc v -> do averageLin :: ( Monad m , VectorSpace v s + , Floating s , s ~ Diff td ) => -- | The time scale on which the signal is averaged @@ -324,6 +330,7 @@ highPass :: ( Monad m , VectorSpace v s , Floating s + , Eq s , s ~ Diff td ) => -- | The time constant @t@ @@ -336,6 +343,7 @@ bandPass :: ( Monad m , VectorSpace v s , Floating s + , Eq s , s ~ Diff td ) => -- | The time constant @t@ @@ -348,6 +356,7 @@ bandStop :: ( Monad m , VectorSpace v s , Floating s + , Eq s , s ~ Diff td ) => -- | The time constant @t@ diff --git a/rhine/src/FRP/Rhine/ResamplingBuffer/Interpolation.hs b/rhine/src/FRP/Rhine/ResamplingBuffer/Interpolation.hs index bc7a76d8..7c1b820c 100644 --- a/rhine/src/FRP/Rhine/ResamplingBuffer/Interpolation.hs +++ b/rhine/src/FRP/Rhine/ResamplingBuffer/Interpolation.hs @@ -26,6 +26,7 @@ linear :: , Clock m cl1 , Clock m cl2 , VectorSpace v s + , Num s , s ~ Diff (Time cl1) , s ~ Diff (Time cl2) ) => @@ -93,6 +94,7 @@ cubic :: , VectorSpace v s , Floating v , Eq v + , Fractional s , s ~ Diff (Time cl1) , s ~ Diff (Time cl2) ) => diff --git a/stack.8.10.7.yaml b/stack.8.10.7.yaml index 8b1f73a8..55eacfbf 100644 --- a/stack.8.10.7.yaml +++ b/stack.8.10.7.yaml @@ -9,7 +9,8 @@ packages: extra-deps: - brick-1.6@sha256:4a94b18be68d2d27da9e84eff7f8b4dc8bfa3a40d28d536fb737828d73a0e3eb,18899 -- dunai-0.9.2@sha256:8f289fdaac0da709a6d9a0408f68da69f53b21707a9b5b1921ba75846399a40b,6384 +- dunai-0.11.0@sha256:fc82a2ac6e2f7efcc2cd7f01412544ebe10d25143febdb0c3ebfb090220f4660,6372 +- simple-affine-space-0.2.1@sha256:bc9b1f5ae236b2898cd6f20da2d4589fd662fac2e2057f29b01330f65c030434,2046 - histogram-fill-0.9.1.0@sha256:e6233fe467a5a68a2f913e8b31a78e2db81de5c1a8f282be77757ccc040305a8,1928 - terminal-0.2.0.0@sha256:de6770ecaae3197c66ac1f0db5a80cf5a5b1d3b64a66a05b50f442de5ad39570,2977 - time-domain-0.1.0.1@sha256:d56e0e8033c12128bf76517433bc146ea8720e1e2a119dbc9723598cfa6cc0a9,999 diff --git a/stack.9.0.2.yaml b/stack.9.0.2.yaml index a5c7d19a..cd2341bf 100644 --- a/stack.9.0.2.yaml +++ b/stack.9.0.2.yaml @@ -15,7 +15,8 @@ extra-deps: - bimap-0.5.0@sha256:aba506d02a1c93fc2b50dcbe728d2a4d07cca89b7033945418061a0b08576ebd,1889 - text-zipper-0.12@sha256:e96110598fc25e57a99ffcd8e583351af8b325b813aa5e3bd0adc627e3e02b6b,1472 - vty-5.38@sha256:c3b46c8072f92b61dad09dac45ede37f1a093836e14ac84ece6515a4d3222864,5628 -- dunai-0.9.2@sha256:8f289fdaac0da709a6d9a0408f68da69f53b21707a9b5b1921ba75846399a40b,6384 +- dunai-0.11.0@sha256:fc82a2ac6e2f7efcc2cd7f01412544ebe10d25143febdb0c3ebfb090220f4660,6372 +- simple-affine-space-0.2.1@sha256:bc9b1f5ae236b2898cd6f20da2d4589fd662fac2e2057f29b01330f65c030434,2046 - monad-schedule-0.1.2.1@sha256:95d6b9c6fd36f585e4a52938ebd1762c2e2caa8bb3c11ce86985dd11a2caae1a,1776 nix: diff --git a/stack.9.2.5.yaml b/stack.9.2.5.yaml index 0de69d9b..5f0478dc 100644 --- a/stack.9.2.5.yaml +++ b/stack.9.2.5.yaml @@ -11,6 +11,8 @@ extra-deps: - terminal-0.2.0.0@sha256:de6770ecaae3197c66ac1f0db5a80cf5a5b1d3b64a66a05b50f442de5ad39570,2977 - monad-bayes-1.1.0@sha256:8929887b2883e553b928dcc9b1326171c87b6aa26f11800dc8c55b119a9e9649,6123 - monad-schedule-0.1.2.1@sha256:95d6b9c6fd36f585e4a52938ebd1762c2e2caa8bb3c11ce86985dd11a2caae1a,1776 +- dunai-0.11.0@sha256:fc82a2ac6e2f7efcc2cd7f01412544ebe10d25143febdb0c3ebfb090220f4660,6372 +- simple-affine-space-0.2.1@sha256:bc9b1f5ae236b2898cd6f20da2d4589fd662fac2e2057f29b01330f65c030434,2046 nix: packages: diff --git a/stack.9.4.4.yaml b/stack.9.4.4.yaml index a4e7dc1c..20282dd7 100644 --- a/stack.9.4.4.yaml +++ b/stack.9.4.4.yaml @@ -9,6 +9,8 @@ packages: extra-deps: - terminal-0.2.0.0@sha256:de6770ecaae3197c66ac1f0db5a80cf5a5b1d3b64a66a05b50f442de5ad39570,2977 - monad-schedule-0.1.2.1@sha256:95d6b9c6fd36f585e4a52938ebd1762c2e2caa8bb3c11ce86985dd11a2caae1a,1776 +- dunai-0.11.0@sha256:fc82a2ac6e2f7efcc2cd7f01412544ebe10d25143febdb0c3ebfb090220f4660,6372 +- simple-affine-space-0.2.1@sha256:bc9b1f5ae236b2898cd6f20da2d4589fd662fac2e2057f29b01330f65c030434,2046 nix: packages: