Skip to content

Commit

Permalink
Add Stack setup for GHC 9.4.8 (#2591)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
  • Loading branch information
mmhat and Gabriella439 authored Jun 17, 2024
1 parent 51c22e4 commit edce221
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ jobs:
- os:
runner: "ubuntu-latest"
stack-yaml: "stack.ghc-8.10.yaml"
- os:
runner: "ubuntu-latest"
stack-yaml: "stack.ghc-9.2.yaml"
fail-fast: false
name: ${{ matrix.os.runner }} - ${{ matrix.stack-yaml }}
runs-on: ${{ matrix.os.runner }}
Expand Down
5 changes: 5 additions & 0 deletions dhall/src/Dhall/Syntax/Chunks.hs-boot
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
{-# LANGUAGE StandaloneKindSignatures #-}

module Dhall.Syntax.Chunks where

import Data.Kind (Type)

type Chunks :: Type -> Type -> Type
data Chunks s a
5 changes: 5 additions & 0 deletions dhall/src/Dhall/Syntax/Types.hs-boot
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
{-# LANGUAGE StandaloneKindSignatures #-}

module Dhall.Syntax.Types where

import Data.Kind (Type)

data DhallDouble

data PreferAnnotation

type FieldSelection :: Type -> Type
data FieldSelection s

data WithComponent
30 changes: 30 additions & 0 deletions stack.ghc-9.4.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
resolver: lts-21.25
packages:
- dhall
- dhall-bash
- dhall-csv
- dhall-docs
- dhall-json
- dhall-lsp-server
- dhall-nix
- dhall-openapi
- dhall-toml
- dhall-yaml
extra-deps:
- lsp-test-0.15.0.1
- algebraic-graphs-0.6.1@sha256:b0b0a916a74f9cba3e678cde25e27f045d7b026a8d0f1a55a05e86f2877fdfd2,8807
- hnix-0.17.0@sha256:57e172f915d70be2dd88c6377caebe8bd63337123ffef42df49b05dc0b1f168b,19224
- hnix-store-core-0.6.1.0@sha256:0171c3a571ab263c3e3aa3e6daca15602f2030a6862cb032038017e6d0265898,3882
- hnix-store-remote-0.6.0.0@sha256:a8ea18bb355164bfd357fac12b0c5d32c95ffd455260f8b6c7fcaeddebf5918c,3270
- lens-family-th-0.5.3.1@sha256:725700a89f26f790ee7d6630a4fa394ac0305ae8d2cff06c037ee47cb3499654,1700
- lsp-2.1.0.0@sha256:ef6fc28eac6dc27672cd8471c9f83f14de646a9c1fcaf993a451d2ae4de274e8,3533
- tomland-1.3.3.2@sha256:8dd15cd2e8178a9bc3c3db4ef53e706e36ee093417a98b1d26131524629c3c07,9483
- validation-selective-0.2.0.0@sha256:cc847f1a110e3b1bd437a5356f115881b61cafcb11781b570b180efd88bf0907,3917
nix:
packages:
- ncurses
- zlib
flags:
# https://github.com/RyanGlScott/mintty/issues/4
mintty:
Win32-2-13-1: false
2 changes: 1 addition & 1 deletion stack.yaml

0 comments on commit edce221

Please sign in to comment.