summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hallgren <th-github@altocumulus.org>2018-12-03 01:34:49 +0100
committerThomas Hallgren <th-github@altocumulus.org>2018-12-03 01:34:49 +0100
commitbd7bb9b34a2e44735b957bdfb5bdf538bfd2dbf9 (patch)
tree9819ec5b777253152296565b2c76de5c5410dedf
parent18251e57a3ffe12f6523bf1437bef93cb510ddca (diff)
parentd06539c35cbc4e8010f2f49cffb89b8a0cf51706 (diff)
Merge branch 'master' of https://github.com/GrammaticalFramework/gf-core
-rw-r--r--download/index.md10
-rw-r--r--gf.cabal2
-rw-r--r--index.html6
3 files changed, 9 insertions, 9 deletions
diff --git a/download/index.md b/download/index.md
index b5e90647c..5c5aa7014 100644
--- a/download/index.md
+++ b/download/index.md
@@ -17,7 +17,7 @@ What's new? See the [release notes](release-3.10.html).
<!--
| macOS | [gf-3.10-bin-intel-mac.tar.gz](gf-3.10-bin-intel-mac.tar.gz) | GF,S,C,J,P | `sudo tar -C /usr/local -zxf gf-3.10-bin-intel-mac.tar.gz` |
-| Raspian 9.1 | [gf\_3.10-1\_armhf.deb](gf_3.10-1_armhf.deb) | GF,S,C,J,P | `sudo dpkg -i gf_3.10-1_armhf.deb` |
+| Raspbian 9.1 | [gf\_3.10-1\_armhf.deb](gf_3.10-1_armhf.deb) | GF,S,C,J,P | `sudo dpkg -i gf_3.10-1_armhf.deb` |
| Ubuntu (32-bit) | [gf\_3.10-1\_i386.deb](gf_3.10-1_i386.deb) | GF,S,C,J,P | `sudo dpkg -i gf_3.10-1_i386.deb` |
-->
@@ -34,15 +34,15 @@ The Windows package is installed by just unpacking it anywhere. You will
probably need to set the `PATH` and `GF_LIB_PATH` environment variables,
see Inari's notes on [Installing GF on Windows](http://www.grammaticalframework.org/~inari/gf-windows.html#toc3).
-The Ubuntu `.deb` packages should work on Ubuntu 16.04 and 17.04 and
+The Ubuntu `.deb` packages should work on Ubuntu 16.04 and 18.04 and
similar Linux distributions.
-<!-- The Raspian `.deb` package was created on a Raspberry Pi 3 and will
+<!-- The Raspbian `.deb` package was created on a Raspberry Pi 3 and will
probably work on other ARM-based systems running Debian 9 (stretch) or
similar Linux distributions. -->
-The packages for macOS (Mac OS X) should work on at least 10.11 and
-10.12 (El Capitan and Sierra).
+The packages for macOS (Mac OS X) should work on at least 10.13 and
+10.14 (High Sierra and Mojave)
<!-- The Mac OS and Linux `.tar.gz` packages are designed to be installed in
`/usr/local`. You can install them in other locations, but then you need
diff --git a/gf.cabal b/gf.cabal
index ddbc90438..4ec02950c 100644
--- a/gf.cabal
+++ b/gf.cabal
@@ -11,7 +11,7 @@ description: GF, Grammatical Framework, is a programming language for multilingu
homepage: http://www.grammaticalframework.org/
bug-reports: https://github.com/GrammaticalFramework/gf-core/issues
maintainer: Thomas Hallgren
-tested-with: GHC==7.6.3, GHC==7.8.3, GHC==7.10.3, GHC==8.0.2
+tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
data-dir: src
data-files:
diff --git a/index.html b/index.html
index 329fe6370..c026efada 100644
--- a/index.html
+++ b/index.html
@@ -219,11 +219,11 @@ least one, it may help you to get a first idea of what GF is.
<dd class="col-sm-9">
<a href="http://school.grammaticalframework.org/2018/">Sixth GF Summer School</a> in Stellenbosch (South Africa), 3–14 December 2018
</dd>
- <!-- <dt class="col-sm-3 text-center text-nowrap">2018-11-28</dt>
+ <dt class="col-sm-3 text-center text-nowrap">2018-12-02</dt>
<dd class="col-sm-9">
<strong>GF 3.10 released.</strong>
- <a href="download/release-3.10.html">Release notes</a>
- </dd> -->
+ <!-- <a href="download/release-3.10.html">Release notes</a> -->
+ </dd>
<dt class="col-sm-3 text-center text-nowrap">2018-07-25</dt>
<dd class="col-sm-9">
The GF repository has been split in two: