Skip to content

Commit af09351

Browse files
authored
Merge pull request #183 from inariksit/ghc-9.6.7
replace 9.6.6 with 9.6.7
2 parents 2324fe7 + 8c89ba4 commit af09351

File tree

6 files changed

+116
-101
lines changed

6 files changed

+116
-101
lines changed

.github/workflows/build-all-versions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- "8.6.5"
2121
- "8.8.3"
2222
- "8.10.7"
23-
- "9.6.6"
23+
- "9.6.7"
2424
exclude:
2525
- os: macos-latest
2626
ghc: 8.8.3
@@ -73,7 +73,7 @@ jobs:
7373
fail-fast: false
7474
matrix:
7575
stack: ["latest"]
76-
ghc: ["8.4.4", "8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.6.6"]
76+
ghc: ["8.4.4", "8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.6.7"]
7777

7878
steps:
7979
- uses: actions/checkout@v2

doc/gf-editor-modes.md

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
# Editor modes & IDE integration for GF
2+
3+
We collect GF modes for various editors on this page. Contributions are welcome!
4+
5+
## Emacs
6+
7+
[gf.el](https://github.com/GrammaticalFramework/gf-emacs-mode) by Johan
8+
Bockgård provides syntax highlighting and automatic indentation and
9+
lets you run the GF Shell in an emacs buffer. See installation
10+
instructions inside.
11+
12+
## Atom
13+
14+
[language-gf](https://atom.io/packages/language-gf), by John J. Camilleri
15+
16+
## Visual Studio Code
17+
18+
* [Grammatical Framework Language Server](https://marketplace.visualstudio.com/items?itemName=anka-213.gf-vscode) by Andreas Källberg.
19+
This provides syntax highlighting and a client for the Grammatical Framework language server. Follow the installation instructions in the link.
20+
* [Grammatical Framework](https://marketplace.visualstudio.com/items?itemName=GrammaticalFramework.gf-vscode) is a simpler extension
21+
without any external dependencies which provides only syntax highlighting.
22+
23+
## Eclipse
24+
25+
[GF Eclipse Plugin](https://github.com/GrammaticalFramework/gf-eclipse-plugin/), by John J. Camilleri
26+
27+
## Gedit
28+
29+
By John J. Camilleri
30+
31+
Copy the file below to
32+
`~/.local/share/gtksourceview-3.0/language-specs/gf.lang` (under Ubuntu).
33+
34+
* [gf.lang](../src/tools/gf.lang)
35+
36+
Some helpful notes/links:
37+
38+
* The code is based heavily on the `haskell.lang` file which I found in
39+
`/usr/share/gtksourceview-2.0/language-specs/haskell.lang`.
40+
* Ruslan Osmanov recommends
41+
[registering your file extension as its own MIME type](http://osmanov-dev-notes.blogspot.com/2011/04/how-to-add-new-highlight-mode-in-gedit.html)
42+
(see also [here](https://help.ubuntu.com/community/AddingMimeTypes)),
43+
however on my system the `.gf` extension was already registered
44+
as a generic font (`application/x-tex-gf`) and I didn't want to risk
45+
messing any of that up.
46+
* This is a quick 5-minute job and might require some tweaking.
47+
[The GtkSourceView language definition tutorial](http://developer.gnome.org/gtksourceview/stable/lang-tutorial.html)
48+
is the place to start looking.
49+
* Contributions are welcome!
50+
51+
## Geany
52+
53+
By John J. Camilleri
54+
55+
[Custom filetype](http://www.geany.org/manual/dev/index.html#custom-filetypes)
56+
config files for syntax highlighting in [Geany](http://www.geany.org/).
57+
58+
For version 1.36 and above, copy one of the files below to
59+
`/usr/share/geany/filedefs/filetypes.GF.conf` (under Ubuntu).
60+
If you're using a version older than 1.36, copy the file to `/usr/share/geany/filetypes.GF.conf`.
61+
You will need to manually create the file.
62+
63+
* [light-filetypes.GF.conf](../src/tools/light-filetypes.GF.conf)
64+
* [dark-filetypes.GF.conf](../src/tools/dark-filetypes.GF.conf)
65+
66+
You will also need to edit the `filetype_extensions.conf` file and add the
67+
following line somewhere:
68+
69+
```
70+
GF=*.gf
71+
```
72+
73+
## Vim
74+
75+
[vim-gf](https://github.com/gdetrez/vim-gf)

doc/gf-editor-modes.t2t

Lines changed: 0 additions & 81 deletions
This file was deleted.

stack-ghc9.6.6.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

stack-ghc9.6.7.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
resolver: ghc-9.6.7
2+
3+
extra-deps:
4+
- multipart-0.2.1@sha256:559c04eed5218a9673e9fb6a225287fee1aeb38a45a0caf91a2598967bd75659,1150
5+
- cgi-3001.5.1.0@sha256:408e1f96ac6134965484c891b5fae35c7303fa841b09ce5baea52ddb078eef6b,3442
6+
- alex-3.5.3.0@sha256:f6fde8ff59e7e38f9e95eca8f5154fb611c9789d1d9538aa9745c6c3cd9495b4,4502
7+
- happy-2.1.6@sha256:1e963a137b650e766d1d0433e3404727fd64bebb850aa587702bfe199347f6da,5017
8+
- happy-lib-2.1.6@sha256:552a82e07605d6f8017f513be59b43219425aa0e4be71f9dddb2527f5accbce4,6081
9+
- httpd-shed-0.4.1.2@sha256:ab0fbd57acd32e0d5a5f7402dcc23192a1ffa142d86eeed051f59cf54a74ce38,1838
10+
- json-0.11@sha256:3afa37628415992fe648da6f002672f5a0119aa5d49022bf928d10a927c29318,3250
11+
- network-3.1.4.0@sha256:e152cdb03243afb52bbc740cfbe96905ca298a6f6342f0c47b3f2e227ff19def,5208
12+
- network-bsd-2.8.1.0@sha256:cc7867f81c6eb3f1924bbb1029757af6e3b67a3c224c1faa329be3ea70ad729c,3780
13+
- network-uri-2.6.4.2@sha256:6fffb57373962b5651a2db8b0af732098b3bf029a7ced76a9855615de2026588,3217
14+
- parallel-3.2.2.0@sha256:9d7b34ac537940f67732eca31d48a43bd78fb65a91baebddf63bee4fc3813d81,1961
15+
- random-1.2.1.3@sha256:117541ba0a177397a3333f94870f789ef050dca31b0688a19824b2bc401b8823,6237
16+
- splitmix-0.1.3.1@sha256:d0002f3fb16a2cc5ba8afd47a6657726386edccfe8853d310e3479fe3b45201b,6552
17+
- stringsearch-0.3.6.6@sha256:cd72bb03946006b18a6a374b7dc4a1c783a29df1889861604f95b1de1da98607,4258
18+
- syb-0.7.2.4@sha256:936d5a92084ad9d88c5a9dd2e622deab57ce48ce85be93e6273b3f8eb64c12ca,3872
19+
- th-compat-0.1.6@sha256:e83d97946f84fe492762ceb3b4753b4770c78b0b70e594078700baa91a5106c2,2885
20+
- utf8-string-1.0.2@sha256:79416292186feeaf1f60e49ac5a1ffae9bf1b120e040a74bf0e81ca7f1d31d3f,1538

stack.yaml

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
1-
# This default stack file is a copy of stack-ghc8.10.7.yaml
1+
# This default stack file is a copy of stack-ghc9.6.7.yaml
22
# But committing a symlink can be problematic on Windows, so it's a real copy.
33
# See: https://github.com/GrammaticalFramework/gf-core/pull/106
4-
resolver: lts-18.27 # ghc 8.10.7
4+
resolver: ghc-9.6.7
55

66
extra-deps:
7-
- network-2.6.3.6
8-
- httpd-shed-0.4.0.3
9-
10-
# flags:
11-
# gf:
12-
# server: true
13-
# c-runtime: true
14-
# extra-lib-dirs:
15-
# - /usr/local/lib
7+
- multipart-0.2.1@sha256:559c04eed5218a9673e9fb6a225287fee1aeb38a45a0caf91a2598967bd75659,1150
8+
- cgi-3001.5.1.0@sha256:408e1f96ac6134965484c891b5fae35c7303fa841b09ce5baea52ddb078eef6b,3442
9+
- alex-3.5.3.0@sha256:f6fde8ff59e7e38f9e95eca8f5154fb611c9789d1d9538aa9745c6c3cd9495b4,4502
10+
- happy-2.1.6@sha256:1e963a137b650e766d1d0433e3404727fd64bebb850aa587702bfe199347f6da,5017
11+
- happy-lib-2.1.6@sha256:552a82e07605d6f8017f513be59b43219425aa0e4be71f9dddb2527f5accbce4,6081
12+
- httpd-shed-0.4.1.2@sha256:ab0fbd57acd32e0d5a5f7402dcc23192a1ffa142d86eeed051f59cf54a74ce38,1838
13+
- json-0.11@sha256:3afa37628415992fe648da6f002672f5a0119aa5d49022bf928d10a927c29318,3250
14+
- network-3.1.4.0@sha256:e152cdb03243afb52bbc740cfbe96905ca298a6f6342f0c47b3f2e227ff19def,5208
15+
- network-bsd-2.8.1.0@sha256:cc7867f81c6eb3f1924bbb1029757af6e3b67a3c224c1faa329be3ea70ad729c,3780
16+
- network-uri-2.6.4.2@sha256:6fffb57373962b5651a2db8b0af732098b3bf029a7ced76a9855615de2026588,3217
17+
- parallel-3.2.2.0@sha256:9d7b34ac537940f67732eca31d48a43bd78fb65a91baebddf63bee4fc3813d81,1961
18+
- random-1.2.1.3@sha256:117541ba0a177397a3333f94870f789ef050dca31b0688a19824b2bc401b8823,6237
19+
- splitmix-0.1.3.1@sha256:d0002f3fb16a2cc5ba8afd47a6657726386edccfe8853d310e3479fe3b45201b,6552
20+
- stringsearch-0.3.6.6@sha256:cd72bb03946006b18a6a374b7dc4a1c783a29df1889861604f95b1de1da98607,4258
21+
- syb-0.7.2.4@sha256:936d5a92084ad9d88c5a9dd2e622deab57ce48ce85be93e6273b3f8eb64c12ca,3872
22+
- th-compat-0.1.6@sha256:e83d97946f84fe492762ceb3b4753b4770c78b0b70e594078700baa91a5106c2,2885
23+
- utf8-string-1.0.2@sha256:79416292186feeaf1f60e49ac5a1ffae9bf1b120e040a74bf0e81ca7f1d31d3f,1538

0 commit comments

Comments
 (0)