diff --git a/package.yaml b/package.yaml index 83daa6bd2..88dbd639d 100644 --- a/package.yaml +++ b/package.yaml @@ -36,7 +36,6 @@ dependencies: - network >= 3.1.2.7 && < 3.2 - network-transport == 0.5.6 - optparse-applicative >= 0.15 && < 0.17 - - process == 1.6.* - random >= 1.1 && < 1.3 - record-hasfield == 1.0.* - simple-logger == 0.1.* @@ -64,11 +63,13 @@ when: - condition: impl(ghc >= 9.6.2) dependencies: - bytestring == 0.11.* + - process == 1.6.* - template-haskell == 2.20.* - text >= 2.0.1 && < 2.2 - condition: impl(ghc < 9.6.2) dependencies: - bytestring == 0.10.* + - process >= 1.6 && < 1.6.18 - template-haskell == 2.16.* - text >= 1.2.3.0 && < 1.3 @@ -125,13 +126,19 @@ tests: - apps/simplex-broadcast-bot/src - apps/simplex-directory-service/src main: Test.hs + when: + - condition: impl(ghc >= 9.6.2) + dependencies: + - hspec == 2.11.* + - condition: impl(ghc < 9.6.2) + dependencies: + - hspec == 2.7.* dependencies: - QuickCheck == 2.14.* - simplex-chat - async == 2.2.* - deepseq == 1.4.* - generic-random == 1.5.* - - hspec == 2.11.* - network == 3.1.* - silently == 1.2.* - stm == 2.5.* diff --git a/simplex-chat.cabal b/simplex-chat.cabal index 275a82ce7..d74d57523 100644 --- a/simplex-chat.cabal +++ b/simplex-chat.cabal @@ -197,7 +197,6 @@ library , network >=3.1.2.7 && <3.2 , network-transport ==0.5.6 , optparse-applicative >=0.15 && <0.17 - , process ==1.6.* , random >=1.1 && <1.3 , record-hasfield ==1.0.* , simple-logger ==0.1.* @@ -217,11 +216,13 @@ library if impl(ghc >= 9.6.2) build-depends: bytestring ==0.11.* + , process ==1.6.* , template-haskell ==2.20.* , text >=2.0.1 && <2.2 if impl(ghc < 9.6.2) build-depends: bytestring ==0.10.* + , process >=1.6 && <1.6.18 , template-haskell ==2.16.* , text >=1.2.3.0 && <1.3 @@ -256,7 +257,6 @@ executable simplex-bot , network >=3.1.2.7 && <3.2 , network-transport ==0.5.6 , optparse-applicative >=0.15 && <0.17 - , process ==1.6.* , random >=1.1 && <1.3 , record-hasfield ==1.0.* , simple-logger ==0.1.* @@ -277,11 +277,13 @@ executable simplex-bot if impl(ghc >= 9.6.2) build-depends: bytestring ==0.11.* + , process ==1.6.* , template-haskell ==2.20.* , text >=2.0.1 && <2.2 if impl(ghc < 9.6.2) build-depends: bytestring ==0.10.* + , process >=1.6 && <1.6.18 , template-haskell ==2.16.* , text >=1.2.3.0 && <1.3 @@ -316,7 +318,6 @@ executable simplex-bot-advanced , network >=3.1.2.7 && <3.2 , network-transport ==0.5.6 , optparse-applicative >=0.15 && <0.17 - , process ==1.6.* , random >=1.1 && <1.3 , record-hasfield ==1.0.* , simple-logger ==0.1.* @@ -337,11 +338,13 @@ executable simplex-bot-advanced if impl(ghc >= 9.6.2) build-depends: bytestring ==0.11.* + , process ==1.6.* , template-haskell ==2.20.* , text >=2.0.1 && <2.2 if impl(ghc < 9.6.2) build-depends: bytestring ==0.10.* + , process >=1.6 && <1.6.18 , template-haskell ==2.16.* , text >=1.2.3.0 && <1.3 @@ -378,7 +381,6 @@ executable simplex-broadcast-bot , network >=3.1.2.7 && <3.2 , network-transport ==0.5.6 , optparse-applicative >=0.15 && <0.17 - , process ==1.6.* , random >=1.1 && <1.3 , record-hasfield ==1.0.* , simple-logger ==0.1.* @@ -399,11 +401,13 @@ executable simplex-broadcast-bot if impl(ghc >= 9.6.2) build-depends: bytestring ==0.11.* + , process ==1.6.* , template-haskell ==2.20.* , text >=2.0.1 && <2.2 if impl(ghc < 9.6.2) build-depends: bytestring ==0.10.* + , process >=1.6 && <1.6.18 , template-haskell ==2.16.* , text >=1.2.3.0 && <1.3 @@ -439,7 +443,6 @@ executable simplex-chat , network ==3.1.* , network-transport ==0.5.6 , optparse-applicative >=0.15 && <0.17 - , process ==1.6.* , random >=1.1 && <1.3 , record-hasfield ==1.0.* , simple-logger ==0.1.* @@ -461,11 +464,13 @@ executable simplex-chat if impl(ghc >= 9.6.2) build-depends: bytestring ==0.11.* + , process ==1.6.* , template-haskell ==2.20.* , text >=2.0.1 && <2.2 if impl(ghc < 9.6.2) build-depends: bytestring ==0.10.* + , process >=1.6 && <1.6.18 , template-haskell ==2.16.* , text >=1.2.3.0 && <1.3 @@ -505,7 +510,6 @@ executable simplex-directory-service , network >=3.1.2.7 && <3.2 , network-transport ==0.5.6 , optparse-applicative >=0.15 && <0.17 - , process ==1.6.* , random >=1.1 && <1.3 , record-hasfield ==1.0.* , simple-logger ==0.1.* @@ -526,11 +530,13 @@ executable simplex-directory-service if impl(ghc >= 9.6.2) build-depends: bytestring ==0.11.* + , process ==1.6.* , template-haskell ==2.20.* , text >=2.0.1 && <2.2 if impl(ghc < 9.6.2) build-depends: bytestring ==0.10.* + , process >=1.6 && <1.6.18 , template-haskell ==2.16.* , text >=1.2.3.0 && <1.3 @@ -592,7 +598,6 @@ test-suite simplex-chat-test , exceptions ==0.10.* , filepath ==1.4.* , generic-random ==1.5.* - , hspec ==2.11.* , http-types ==0.12.* , http2 >=4.2.2 && <4.3 , memory ==0.18.* @@ -600,7 +605,6 @@ test-suite simplex-chat-test , network ==3.1.* , network-transport ==0.5.6 , optparse-applicative >=0.15 && <0.17 - , process ==1.6.* , random >=1.1 && <1.3 , record-hasfield ==1.0.* , silently ==1.2.* @@ -622,10 +626,18 @@ test-suite simplex-chat-test if impl(ghc >= 9.6.2) build-depends: bytestring ==0.11.* + , process ==1.6.* , template-haskell ==2.20.* , text >=2.0.1 && <2.2 if impl(ghc < 9.6.2) build-depends: bytestring ==0.10.* + , process >=1.6 && <1.6.18 , template-haskell ==2.16.* , text >=1.2.3.0 && <1.3 + if impl(ghc >= 9.6.2) + build-depends: + hspec ==2.11.* + if impl(ghc < 9.6.2) + build-depends: + hspec ==2.7.*