Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to Stackage LTS 20.26 #242

Merged
merged 4 commits into from
May 2, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions examples/Capabilities.gr.output
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
()
1 change: 1 addition & 0 deletions examples/effects_nondet.gr.output
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Next (True, True) (Next (True, False) (Next (False, True) (Next (False, False) Empty)))
1 change: 1 addition & 0 deletions examples/rankN.gr.output
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
((42, 'a'), (42, ()))
1 change: 1 addition & 0 deletions examples/sensitivity.gr.output
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
413.5
4 changes: 2 additions & 2 deletions frontend/granule-frontend.cabal
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.35.2.
-- This file has been generated from package.yaml by hpack version 0.36.0.
--
-- see: https://github.com/sol/hpack

name: granule-frontend
version: 0.9.4.0
version: 0.9.5.0
synopsis: The Granule abstract-syntax-tree, parser and type checker libraries
homepage: https://github.com/granule-project/granule#readme
bug-reports: https://github.com/granule-project/granule/issues
Expand Down
7 changes: 5 additions & 2 deletions interpreter/granule-interpreter.cabal
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.35.2.
-- This file has been generated from package.yaml by hpack version 0.36.0.
--
-- see: https://github.com/sol/hpack

name: granule-interpreter
version: 0.9.4.0
version: 0.9.5.0
synopsis: The Granule interpreter
homepage: https://github.com/dorchard/granule#readme
bug-reports: https://github.com/dorchard/granule/issues
Expand Down Expand Up @@ -42,6 +42,7 @@ library
, base >=4.10 && <5
, clock
, concurrent-extra
, containers
, directory
, extra
, filepath
Expand Down Expand Up @@ -77,6 +78,7 @@ executable gr
, base >=4.10 && <5
, clock
, concurrent-extra
, containers
, directory
, extra
, filepath
Expand Down Expand Up @@ -112,6 +114,7 @@ test-suite gr-golden
, base >=4.10 && <5
, clock
, concurrent-extra
, containers
, directory
, extra
, filepath
Expand Down
4 changes: 2 additions & 2 deletions repl/granule-repl.cabal
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.35.2.
-- This file has been generated from package.yaml by hpack version 0.36.0.
--
-- see: https://github.com/sol/hpack

name: granule-repl
version: 0.9.4.0
version: 0.9.5.0
synopsis: The Granule interactive interpreter (grepl)
homepage: https://github.com/dorchard/granule#readme
bug-reports: https://github.com/dorchard/granule/issues
Expand Down
4 changes: 2 additions & 2 deletions server/granule-language-server.cabal
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.35.2.
-- This file has been generated from package.yaml by hpack version 0.36.0.
--
-- see: https://github.com/sol/hpack

name: granule-language-server
version: 0.9.4.0
version: 0.9.5.0
synopsis: The Granule language server (grls)
author: Daniel Marshall
maintainer: Daniel Marshall
Expand Down
19 changes: 7 additions & 12 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-20.0
resolver: lts-20.26
packages:
- frontend/
- interpreter/
Expand All @@ -9,17 +9,11 @@ packages:
- benchmark/

# Dependency packages to be pulled from upstream that are not in the resolver
# (e.g., acme-missiles-0.3)
extra-deps:
- ConfigFile-1.1.4
- text-replace-0.1.0.2
- syz-0.2.0.0@sha256:7307acb8f6ae7720e7e235c974281ecee912703c1394ebcac19caf83d70bb492,2345
- clock-0.8.3
# Dependencies for language server
- lsp-1.6.0.0
- co-log-core-0.3.1.0
- text-replace-0.1.0.3
- syz-0.2.0.0
- git: https://github.com/jackohughes/haskell-src-exts
commit: 5c2647fa0746bdac046897f5a6b7e4f5ef3afa79
commit: 5c2647fa0746bdac046897f5a6b7e4f5ef3afa79

# Override default flag values for local packages and extra-deps
flags: {}
Expand All @@ -40,8 +34,9 @@ extra-package-dbs: []
#
# Extra directories used by stack for building

extra-include-dirs:
- /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi
## Superfluous?
# extra-include-dirs:
# - /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi
buggymcbugfix marked this conversation as resolved.
Show resolved Hide resolved

# extra-lib-dirs: [/path/to/dir]

Expand Down