From 24332bb2ed199a76e9db6aeabae711bf369e5a2c Mon Sep 17 00:00:00 2001 From: Raveline Date: Thu, 4 Apr 2024 14:12:38 +0200 Subject: [PATCH 1/2] Fix unneeded bounds in cabal files and syntax of tested-with --- tracing-effectful/tracing-effectful.cabal | 4 +-- tracing.cabal | 39 +++++++++++------------ 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/tracing-effectful/tracing-effectful.cabal b/tracing-effectful/tracing-effectful.cabal index 8d9bdc3..7dacdb2 100644 --- a/tracing-effectful/tracing-effectful.cabal +++ b/tracing-effectful/tracing-effectful.cabal @@ -32,8 +32,8 @@ library build-depends: , base <5 , effectful-core >=1.0.0.0 && <3.0.0.0 - , exceptions <0.11 - , tracing ==1.0.0.0 + , exceptions >=0.10 + , tracing >=1.0 hs-source-dirs: src diff --git a/tracing.cabal b/tracing.cabal index 25925a4..9a2bd6c 100644 --- a/tracing.cabal +++ b/tracing.cabal @@ -14,8 +14,7 @@ maintainer: mtth@apache.org copyright: 2020 Matthieu Monsch build-type: Simple extra-source-files: README.md -tested-with: - GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 +tested-with: GHC == { 8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.4, 9.8.2 } source-repository head type: git @@ -32,24 +31,24 @@ library other-modules: Control.Monad.Trace.Internal build-depends: - , aeson <=2.3 - , base <5 - , base16-bytestring <=1.1 - , bytestring <=0.13 - , case-insensitive <=1.3 - , containers <=0.7 - , exceptions <=0.11 - , http-client <=0.8 - , lifted-base <=0.3 - , monad-control <=1.1 - , mtl <=2.3.1 - , network <=3.2 - , random <=1.3 - , stm <=2.6 - , text <=2.1.1 - , time <=1.13 - , transformers <=0.6.1.0 - , transformers-base <=0.5 + aeson >= 2.0 + , base >= 4.14 && < 5 + , base16-bytestring >= 1.0 + , bytestring >= 0.10 + , case-insensitive >= 1.2 + , containers >= 0.6 + , exceptions >= 0.10 + , http-client >= 0.5 + , lifted-base >= 0.2.3 + , monad-control >= 1.0 + , mtl >= 2.2 + , network >= 2.8 + , random >= 1.1 + , stm >= 2.5 + , text >= 1.2 + , time >= 1.8 + , transformers >= 0.5 + , transformers-base >= 0.4 ghc-options: -Wall default-language: Haskell2010 From 3737d69d3ddd4934f437ec67d609de028795ffff Mon Sep 17 00:00:00 2001 From: Raveline Date: Thu, 4 Apr 2024 14:17:19 +0200 Subject: [PATCH 2/2] Drop subdirectory cabal.project --- tracing-effectful/cabal.project | 3 --- tracing-effectful/tracing-effectful.cabal | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 tracing-effectful/cabal.project diff --git a/tracing-effectful/cabal.project b/tracing-effectful/cabal.project deleted file mode 100644 index dc765d1..0000000 --- a/tracing-effectful/cabal.project +++ /dev/null @@ -1,3 +0,0 @@ -packages: - . - ../ diff --git a/tracing-effectful/tracing-effectful.cabal b/tracing-effectful/tracing-effectful.cabal index 7dacdb2..f85e638 100644 --- a/tracing-effectful/tracing-effectful.cabal +++ b/tracing-effectful/tracing-effectful.cabal @@ -12,8 +12,7 @@ description: build-type: Simple extra-doc-files: CHANGELOG.md -tested-with: - GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 +tested-with: GHC == { 8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.4, 9.8.2 } common language ghc-options: -Wall -Wcompat -Wno-unticked-promoted-constructors