summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Yan <felixonmars@archlinux.org>2023-06-22 19:56:09 +0300
committerGitHub <noreply@github.com>2023-06-22 09:56:09 -0700
commit3fb69c634c08ea1da2832adf24065601292deac5 (patch)
tree8d8b40cc9177bf75cc01ca0f3b03bf7ee51f5e12
parent25c797e9d4e7628563518fb2eb28553fc9399054 (diff)
Use crypton-connection instead of connection (#8896)
Follows the change introduced in tls 1.7.0. Fixes building. Remove tls < 1.7 from cabal.project
-rw-r--r--cabal.project1
-rw-r--r--pandoc.cabal2
-rw-r--r--stack.yaml7
3 files changed, 8 insertions, 2 deletions
diff --git a/cabal.project b/cabal.project
index 4655a92d8..c61c4fd8f 100644
--- a/cabal.project
+++ b/cabal.project
@@ -2,7 +2,6 @@ packages: .
pandoc-lua-engine
pandoc-server
pandoc-cli
-constraints: tls < 1.7
tests: True
flags: +embed_data_files
constraints: skylighting-format-blaze-html >= 0.1.1,
diff --git a/pandoc.cabal b/pandoc.cabal
index 6f7bd8ba2..5bd251111 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -478,8 +478,8 @@ library
commonmark >= 0.2.2 && < 0.3,
commonmark-extensions >= 0.2.3.4 && < 0.3,
commonmark-pandoc >= 0.2.1.3 && < 0.3,
- connection >= 0.3.1,
containers >= 0.6.0.1 && < 0.7,
+ crypton-connection >= 0.3.1,
data-default >= 0.4 && < 0.8,
deepseq >= 1.3 && < 1.5,
directory >= 1.2.3 && < 1.4,
diff --git a/stack.yaml b/stack.yaml
index 2e52511c8..483fc73eb 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -16,6 +16,13 @@ extra-deps:
- skylighting-0.13.3
- skylighting-core-0.13.3
- typst-0.1.0.0
+- tls-1.7.0
+- crypton-0.32
+- crypton-connection-0.3.1
+- crypton-x509-1.7.6
+- crypton-x509-store-1.6.9
+- crypton-x509-system-1.6.7
+- crypton-x509-validation-1.6.12
ghc-options:
"$locals": -fhide-source-paths -Wno-missing-home-modules