From 62c2fb1ac7f9f0513b9525167ef80d0f9a38bf6f Mon Sep 17 00:00:00 2001 From: Pi Delport Date: Wed, 4 Jun 2025 16:22:38 +0200 Subject: [PATCH 1/3] .gitignore: Add dist-newstyle --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 78a69e1..bb32e32 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *~ *#* /dist +/dist-newstyle .hpc *.hi *.core From f102cb30ec3369fa5ce31c24ed04089831f2cc48 Mon Sep 17 00:00:00 2001 From: Pi Delport Date: Wed, 4 Jun 2025 16:24:51 +0200 Subject: [PATCH 2/3] Deps: Increase upper bounds --- postmark.cabal | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/postmark.cabal b/postmark.cabal index 7040493..fc6efb0 100644 --- a/postmark.cabal +++ b/postmark.cabal @@ -27,12 +27,12 @@ Flag demo Library Build-Depends: base >= 3 && < 5 - , aeson >= 0.6 && < 2.1 + , aeson >= 0.6 && < 2.3 , attoparsec >= 0.10 && < 0.15 - , bytestring >= 0.9 && < 0.12 - , containers >= 0.4 && < 0.7 - , http-types >= 0.6 && < 1 - , text >= 0.11 && < 1.4 + , bytestring >= 0.9 && < 0.13 + , containers >= 0.4 && < 0.9 + , http-types >= 0.6 && < 1.13 + , text >= 0.11 && < 2.2 , network-api-support >= 0.3.0 && < 0.4 , http-client-tls >= 0.2.1.1 && < 0.4 From b22f2678f52241c2f3eb4f8b2aae9402cf1a8940 Mon Sep 17 00:00:00 2001 From: Pi Delport Date: Wed, 4 Jun 2025 16:25:20 +0200 Subject: [PATCH 3/3] Qualify imports to avoid ambiguity errors --- src/Network/Api/Postmark/Error.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Network/Api/Postmark/Error.hs b/src/Network/Api/Postmark/Error.hs index 27dfa2e..6465ec8 100644 --- a/src/Network/Api/Postmark/Error.hs +++ b/src/Network/Api/Postmark/Error.hs @@ -4,8 +4,8 @@ module Network.Api.Postmark.Error ( PostmarkErrorType (..) ) where -import Data.Aeson -import Data.Text +import Data.Aeson (FromJSON (..), Value (..), (.:)) +import Data.Text (Text) -- * Error types