File tree Expand file tree Collapse file tree 5 files changed +41
-9
lines changed Expand file tree Collapse file tree 5 files changed +41
-9
lines changed Original file line number Diff line number Diff line change 3737 - os :
3838 runner : " ubuntu-latest"
3939 stack-yaml : " stack.ghc-9.4.yaml"
40+ - os :
41+ runner : " ubuntu-latest"
42+ stack-yaml : " stack.ghc-9.8.yaml"
4043 fail-fast : false
4144 name : ${{ matrix.os.runner }} - ${{ matrix.stack-yaml }}
4245 runs-on : ${{ matrix.os.runner }}
8487 dhall-yaml
8588 )
8689 for package in "${packages[@]}"; do
90+ if [ '${{matrix.stack-yaml}}' == 'stack.ghc-9.8.yaml' ] && [ "${package}" == 'dhall-nix' ]; then
91+ continue
92+ fi
8793 if [ '${{matrix.os.runner}}' == 'windows-latest' ] && [ "${package}" == 'dhall-nix' ]; then
8894 continue
8995 fi
@@ -109,6 +115,9 @@ jobs:
109115 dhall-yaml
110116 )
111117 for package in "${packages[@]}"; do
118+ if [ '${{matrix.stack-yaml}}' == 'stack.ghc-9.8.yaml' ] && [ "${package}" == 'dhall-nix' ]; then
119+ continue
120+ fi
112121 if [ '${{matrix.os.runner}}' == 'windows-latest' ] && [ "${package}" == 'dhall-nix' ]; then
113122 continue
114123 fi
Original file line number Diff line number Diff line change @@ -5,8 +5,11 @@ packages:
55 ./dhall-docs
66 ./dhall-json
77 ./dhall-lsp-server
8- ./dhall-nix
9- ./dhall-nixpkgs
108 ./dhall-openapi
119 ./dhall-toml
1210 ./dhall-yaml
11+
12+ if impl(ghc < 9.8 )
13+ packages :
14+ ./dhall-nix
15+ ./dhall-nixpkgs
Original file line number Diff line number Diff line change @@ -18,9 +18,10 @@ extra-deps:
1818 - hnix-store-core-0.6.1.0@sha256:0171c3a571ab263c3e3aa3e6daca15602f2030a6862cb032038017e6d0265898,3882
1919 - hnix-store-remote-0.6.0.0@sha256:a8ea18bb355164bfd357fac12b0c5d32c95ffd455260f8b6c7fcaeddebf5918c,3270
2020 - logict-0.7.0.3
21- - lsp-2.1.0.0
22- - lsp-types-2.0.1.0
23- - lsp-test-0.15.0.1
21+ - lsp-2.7.0.1@sha256:239f926026b6181ca5b35874f5458415baba46164444df434e0df6c4a586361c,3868
22+ - lsp-test-0.17.1.1@sha256:0eb5df735429ec88579c11ca1a8d8c20734ff049dc839ceeb697e53c845f701f,4422
23+ - lsp-types-2.3.0.1@sha256:a5497aa4ae7b27d956df8dab701495d3062b88eee52e3a6c65fc13fa28b7b191,34230
24+ - mod-0.2.0.1@sha256:eeb316fef3a8c12f4e83bbeeea748e74d75fca54d4498d574ace92e464adb05a,2409
2425 - optparse-applicative-0.18.1.0@sha256:b4cf8d9018e5e67cb1f14edb5130b6d05ad8bc1b5f6bd4efaa6ec0b7f28f559d,5132
2526 - optparse-generic-1.5.2
2627 - row-types-1.0.1.2@sha256:4d4c7cb95d06a32b28ba977852d52a26b4c1f695ef083a6fd874ab6d79933b64,3071
Original file line number Diff line number Diff line change 1- resolver : lts-22.23
1+ resolver : lts-22.43
22packages :
33 - dhall
44 - dhall-bash
@@ -11,15 +11,12 @@ packages:
1111 - dhall-toml
1212 - dhall-yaml
1313extra-deps :
14- - lsp-test-0.15.0.1
1514 - algebraic-graphs-0.6.1@sha256:b0b0a916a74f9cba3e678cde25e27f045d7b026a8d0f1a55a05e86f2877fdfd2,8807
1615 - free-5.1.10@sha256:58496bb68e5704be250ddc823622d50b5a3b8bdf0dc4f6539ecfde25bc4ef6e2,5169
1716 - hnix-0.17.0@sha256:57e172f915d70be2dd88c6377caebe8bd63337123ffef42df49b05dc0b1f168b,19224
1817 - hnix-store-core-0.6.1.0@sha256:0171c3a571ab263c3e3aa3e6daca15602f2030a6862cb032038017e6d0265898,3882
1918 - hnix-store-remote-0.6.0.0@sha256:a8ea18bb355164bfd357fac12b0c5d32c95ffd455260f8b6c7fcaeddebf5918c,3270
2019 - lens-family-th-0.5.3.1@sha256:725700a89f26f790ee7d6630a4fa394ac0305ae8d2cff06c037ee47cb3499654,1700
21- - lsp-2.1.0.0@sha256:ef6fc28eac6dc27672cd8471c9f83f14de646a9c1fcaf993a451d2ae4de274e8,3533
22- - lsp-types-2.0.2.0@sha256:a9a51c3cea0726d91fe63fa0670935ee720f7b31bc3f3b33b2483fc538152677,29421
2320 - tomland-1.3.3.2@sha256:8dd15cd2e8178a9bc3c3db4ef53e706e36ee093417a98b1d26131524629c3c07,9483
2421 - validation-selective-0.2.0.0@sha256:cc847f1a110e3b1bd437a5356f115881b61cafcb11781b570b180efd88bf0907,3917
2522nix :
Original file line number Diff line number Diff line change 1+ resolver : lts-23.6
2+ packages :
3+ - dhall
4+ - dhall-bash
5+ - dhall-csv
6+ - dhall-docs
7+ - dhall-json
8+ - dhall-lsp-server
9+ # - dhall-nix
10+ - dhall-openapi
11+ - dhall-toml
12+ - dhall-yaml
13+ extra-deps :
14+ - special-values-0.1.0.0@sha256:ea855ec644acac84d3a4c9aadae9ba70a11d1d48d00940805dbb81cc95672bbd,1416
15+ nix :
16+ packages :
17+ - ncurses
18+ - zlib
19+ flags :
20+ # https://github.com/RyanGlScott/mintty/issues/4
21+ mintty :
22+ Win32-2-13-1 : false
You can’t perform that action at this time.
0 commit comments