Skip to content

Commit 6925ce8

Browse files
committed
hackport.cabal: Fix doctest-v2
build-tool-depends doesn't play nice with Setup.hs installs, and tries to rebuild cabal-install/doctest locally. This has recently caused some compilation errors when it tries to build cabal-install, so we'll just remove it from build-tool-depends on the assumption that whoever is running doctest-v2 probably has /usr/bin/cabal on their system. All Cabal versions except 3.8 fail on GitHub tests complaining that they cannot build ghc: ``` cabal: Failed to build ghc-8.10.7 (which is required by exe:doctest from doctest-0.21.1) ``` This reverts commit 51bc8c1. See: gentoo-haskell/gentoo-haskell#1074 See: haskell/cabal#8434 Signed-off-by: hololeap <[email protected]>
1 parent eeb7398 commit 6925ce8

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

.github/workflows/haskell.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ jobs:
1414
matrix:
1515
cabal:
1616
[ "3.4"
17-
, "3.6"
1817
, "3.8"
1918
]
2019
ghc:
@@ -61,5 +60,5 @@ jobs:
6160
cabal build --only-dependencies
6261
- name: Build
6362
run: cabal build
64-
- name: Run spec test
65-
run: cabal test --test-option=--color --test-show-details=streaming spec
63+
- name: Run all enabled tests
64+
run: cabal test --test-option=--color --test-show-details=streaming

hackport.cabal

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,9 +1026,6 @@ test-suite doctests
10261026

10271027
test-suite doctests-v2
10281028
import: warnings
1029-
-- doctests-v2 is causing problems, looking for ghc lib and alex on
1030-
-- github CI. This may be fixable.
1031-
buildable: False
10321029
type: exitcode-stdio-1.0
10331030
default-language: Haskell98
10341031
hs-source-dirs: tests/doctests-v2
@@ -1038,7 +1035,7 @@ test-suite doctests-v2
10381035
, process
10391036

10401037
build-tool-depends:
1041-
, cabal-install:cabal >=3.4
1038+
-- cabal-install should already be installed if this is being built...
10421039
, doctest:doctest >=0.8
10431040

10441041
if flag(cabal-v1)

0 commit comments

Comments
 (0)