Skip to content

Commit edce221

Browse files
mmhatGabriella439
andauthored
Add Stack setup for GHC 9.4.8 (#2591)
* Updated hnix dependencies in all Stack configurations Also added `mkParsec` method to MonadParsec instance for megaparsec>=9.4 * Require turtle >=1.6 * Removed depecated functions * Use normalized filepaths in tests * Made normalization tests a bit more chatty * Fix: Exclude unit test from beta-normalization in Dhall.Test.Normalization * Improved usage of guards for path selection in test suite * Normalize filepath in guards for path selection * Added turtle-1.6.2 to Nix setup * Unconditionally import Data.List in Dhall.Test.Util * Added small comment on the use of toDhallPath in Dhall.Test.Tags * Ran stylish-haskell * Log pkg-config path of libsodium in the CI * Log the libsodium version in the CI * Do not install a GHC with ghcup in the CI * Fixed pkg-config output in the CI * Bump cache_generation * Bumped version of some GH actions * Changed cache key * Small comment on pkg-config output * Added .envrc to .gitignore * Fixed deprecation warnings in dhall-nixpkgs package * Add Stack setup for GHC 9.4.8 * Added missing extra-deps * Added kind signatures in boot files --------- Co-authored-by: Gabriella Gonzalez <GenuineGabriella@gmail.com>
1 parent 51c22e4 commit edce221

File tree

5 files changed

+44
-1
lines changed

5 files changed

+44
-1
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ jobs:
3131
- os:
3232
runner: "ubuntu-latest"
3333
stack-yaml: "stack.ghc-8.10.yaml"
34+
- os:
35+
runner: "ubuntu-latest"
36+
stack-yaml: "stack.ghc-9.2.yaml"
3437
fail-fast: false
3538
name: ${{ matrix.os.runner }} - ${{ matrix.stack-yaml }}
3639
runs-on: ${{ matrix.os.runner }}

dhall/src/Dhall/Syntax/Chunks.hs-boot

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
{-# LANGUAGE StandaloneKindSignatures #-}
2+
13
module Dhall.Syntax.Chunks where
24

5+
import Data.Kind (Type)
6+
7+
type Chunks :: Type -> Type -> Type
38
data Chunks s a

dhall/src/Dhall/Syntax/Types.hs-boot

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1+
{-# LANGUAGE StandaloneKindSignatures #-}
2+
13
module Dhall.Syntax.Types where
24

5+
import Data.Kind (Type)
6+
37
data DhallDouble
48

59
data PreferAnnotation
610

11+
type FieldSelection :: Type -> Type
712
data FieldSelection s
813

914
data WithComponent

stack.ghc-9.4.yaml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
resolver: lts-21.25
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+
- lsp-test-0.15.0.1
15+
- algebraic-graphs-0.6.1@sha256:b0b0a916a74f9cba3e678cde25e27f045d7b026a8d0f1a55a05e86f2877fdfd2,8807
16+
- hnix-0.17.0@sha256:57e172f915d70be2dd88c6377caebe8bd63337123ffef42df49b05dc0b1f168b,19224
17+
- hnix-store-core-0.6.1.0@sha256:0171c3a571ab263c3e3aa3e6daca15602f2030a6862cb032038017e6d0265898,3882
18+
- hnix-store-remote-0.6.0.0@sha256:a8ea18bb355164bfd357fac12b0c5d32c95ffd455260f8b6c7fcaeddebf5918c,3270
19+
- lens-family-th-0.5.3.1@sha256:725700a89f26f790ee7d6630a4fa394ac0305ae8d2cff06c037ee47cb3499654,1700
20+
- lsp-2.1.0.0@sha256:ef6fc28eac6dc27672cd8471c9f83f14de646a9c1fcaf993a451d2ae4de274e8,3533
21+
- tomland-1.3.3.2@sha256:8dd15cd2e8178a9bc3c3db4ef53e706e36ee093417a98b1d26131524629c3c07,9483
22+
- validation-selective-0.2.0.0@sha256:cc847f1a110e3b1bd437a5356f115881b61cafcb11781b570b180efd88bf0907,3917
23+
nix:
24+
packages:
25+
- ncurses
26+
- zlib
27+
flags:
28+
# https://github.com/RyanGlScott/mintty/issues/4
29+
mintty:
30+
Win32-2-13-1: false

stack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
stack.ghc-9.2.yaml
1+
stack.ghc-9.4.yaml

0 commit comments

Comments
 (0)