From 51c85b46ba7212411feb709b5cc5da32cb5b2430 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?=
<303897+fabianhjr@users.noreply.github.com>
Date: Wed, 17 Nov 2021 19:29:01 -0600
Subject: [PATCH] Update build files (#7696)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Drop old windows 32-bit constraints
- basement >= 0.0.10 was 0.0.12 on stackage-18.10
- foundation >= 0.0.23 was 0.0.26.1 on stackage-18.10
* Update cabal `tested-with` field to correspond to `ci.yml` matrix
* ghc: 8.10.{2,4} → 8.10.7
---
.github/workflows/ci.yml | 4 ++--
.github/workflows/nightly.yml | 2 +-
pandoc.cabal | 7 +------
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4b73442bf..1b7e415ac 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -53,7 +53,7 @@ jobs:
prefix: ''
cabalopts: ''
testopts: '--test-option=--hide-successes --test-option=--ansi-tricks=false'
- - ghc: '8.10.4'
+ - ghc: '8.10.7'
cabal: '3.2'
prefix: ''
cabalopts: '-ftrypandoc'
@@ -212,7 +212,7 @@ jobs:
versions:
- ghc: '8.8.4'
cabal: '3.2'
- - ghc: '8.10.2'
+ - ghc: '8.10.7'
cabal: '3.2'
steps:
- uses: actions/checkout@v2
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 784c57276..a8afcee95 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -14,7 +14,7 @@ jobs:
- name: Install recent cabal/ghc
uses: haskell/actions/setup@v1
with:
- ghc-version: '8.10.3'
+ ghc-version: '8.10.7'
cabal-version: '3.2'
- name: Install dependencies
diff --git a/pandoc.cabal b/pandoc.cabal
index d379d2fa8..2514f6805 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -11,8 +11,7 @@ bug-reports: https://github.com/jgm/pandoc/issues
stability: alpha
homepage: https://pandoc.org
category: Text
-tested-with: GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5,
- GHC == 8.8.4, GHC == 8.10.2, GHC == 9.0.1
+tested-with: GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.1
synopsis: Conversion between markup formats
description: Pandoc is a Haskell library for converting from one markup
format to another, and a command-line tool that uses
@@ -507,10 +506,6 @@ library
yaml >= 0.11 && < 0.12,
zip-archive >= 0.2.3.4 && < 0.5,
zlib >= 0.5 && < 0.7
- if os(windows) && arch(i386)
- build-depends: basement >= 0.0.10,
- foundation >= 0.0.23
- -- basement 0.0.9 won't build on 32-bit windows.
if !os(windows)
build-depends: unix >= 2.4 && < 2.8
if flag(embed_data_files)