Merge master into tp_nix_flake

This felt like a bunch of bloat and it makes nix ask about if you
want to trust cachix cache for devenv even when you don't use it

.github/workflows/build-binary-packages.yml

@@ -66,14 +66,14 @@ jobs:
       run: |
         mv dist/gf_*.deb dist/gf-${{ github.event.release.tag_name }}-${{ matrix.os }}.deb
 
-    #- uses: actions/upload-release-asset@v1.0.2
-    #  env:
-    #    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    #  with:
-    #    upload_url: ${{ github.event.release.upload_url }}
-    #    asset_path: dist/gf-${{ github.event.release.tag_name }}-${{ matrix.os }}.deb
-    #    asset_name: gf-${{ github.event.release.tag_name }}-${{ matrix.os }}.deb
-    #    asset_content_type: application/octet-stream
+    - uses: actions/upload-release-asset@v1.0.2
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: dist/gf-${{ github.event.release.tag_name }}-${{ matrix.os }}.deb
+        asset_name: gf-${{ github.event.release.tag_name }}-${{ matrix.os }}.deb
+        asset_content_type: application/octet-stream
 
 # ---
 
@@ -121,14 +121,14 @@ jobs:
       run: |
         mv dist/gf-*.pkg dist/gf-${{ github.event.release.tag_name }}-macos.pkg
 
-    #- uses: actions/upload-release-asset@v1.0.2
-    #  env:
-    #    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    #  with:
-    #    upload_url: ${{ github.event.release.upload_url }}
-    #    asset_path: dist/gf-${{ github.event.release.tag_name }}-macos.pkg
-    #    asset_name: gf-${{ github.event.release.tag_name }}-macos.pkg
-    #    asset_content_type: application/octet-stream
+    - uses: actions/upload-release-asset@v1.0.2
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: dist/gf-${{ github.event.release.tag_name }}-macos.pkg
+        asset_name: gf-${{ github.event.release.tag_name }}-macos.pkg
+        asset_content_type: application/octet-stream
 
 # ---
 
@@ -230,11 +230,11 @@ jobs:
     - name: Create archive
       run: |
         Compress-Archive C:\tmp-dist C:\gf-${{ github.event.release.tag_name }}-windows.zip
-    #- uses: actions/upload-release-asset@v1.0.2
-    #  env:
-    #    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    #  with:
-    #    upload_url: ${{ github.event.release.upload_url }}
-    #    asset_path: C:\gf-${{ github.event.release.tag_name }}-windows.zip
-    #    asset_name: gf-${{ github.event.release.tag_name }}-windows.zip
-    #    asset_content_type: application/zip
+    - uses: actions/upload-release-asset@v1.0.2
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: C:\gf-${{ github.event.release.tag_name }}-windows.zip
+        asset_name: gf-${{ github.event.release.tag_name }}-windows.zip
+        asset_content_type: application/zip

download/index-3.12.md

@@ -1,16 +1,16 @@
 ---
 title: Grammatical Framework Download and Installation
-date: 8 August 2025
+date: 3 August 2025
 ---
 
-**GF 3.12** was released on 8 August 2025.
+**GF 3.12** was released on 3 August 2025.
 
 What's new? See the [release notes](release-3.12.html).
 
 #### Note: GF core and the RGL
 
 The following instructions explain how to install **GF core**, i.e. the compiler, shell and run-time systems.
-Obtaining the **Resource Grammar Library (RGL)** is done separately; see the section [at the bottom of this page](#installing-the-rgl-from-a-binary-release).
+Obtaining the **Resource Grammar Library (RGL)** is done separately; see the section at the bottom of this page.
 
 ---
 
@@ -21,36 +21,35 @@ Binary packages are available for Debian/Ubuntu, macOS, and Windows and include:
 - GF shell and grammar compiler
 - `gf -server` mode
 - C run-time system
-- Python bindings to the C run-time system
+- Java & Python bindings to the C run-time system
+
+Unlike in previous versions, the binaries **do not** include the RGL.
 
 [Binary packages on GitHub](https://github.com/GrammaticalFramework/gf-core/releases/tag/3.12)
 
 #### Debian/Ubuntu
 
-The package targets Ubuntu 24.04 (Noble).
-To install it, use:
+There are two versions: `gf-3.12-ubuntu-18.04.deb` for Ubuntu 18.04 (Cosmic), and `gf-3.12-ubuntu-20.04.deb` for Ubuntu 20.04 (Focal).
+
+To install the package use:
 
 ```
-sudo apt install ./gf-3.12-ubuntu-24.04.deb 
+sudo apt-get install ./gf-3.12-ubuntu-*.deb
 ```
 
+<!-- The Ubuntu `.deb` packages should work on Ubuntu 16.04, 18.04 and similar Linux distributions. -->
+
 #### macOS
 
-If you are on an Intel Mac (2019 or older), use `gf-3.12-macos-intel.pkg`.<br>
-For newer ARM-based Macs (Apple Silicon M1, M2, M3), use `gf-3.12-macos-arm.pkg`.
+To install the package, just double-click it and follow the installer instructions.
 
-After downloading, right click on the file and click on Open.[^1]
-You will see a dialog saying that "macOS cannot verify the developer of "gf-3.12-macos-intel.pkg". Are you sure you want to open it?". 
-Press Open.
-
-[^1]: If you just double click on the file, you will get an error message "gf-3.12-macos-intel.pkg" cannot be opened because it is from an unidentified developer.
+The packages should work on at least Catalina and Big Sur.
 
 #### Windows
 
-To install the package:
+To install the package, unpack it anywhere.
 
-1. unpack it anywhere and take note of the full path to the folder containing the `.exe` file. 
-2. add it to the `PATH` environment variable
+You will probably need to update the `PATH` environment variable to include your chosen install location.
 
 For more information, see [Using GF on Windows](https://www.grammaticalframework.org/~inari/gf-windows.html) (latest updated for Windows 10).
 
@@ -68,22 +67,23 @@ cabal install gf-3.12
 
 ### Notes
 
-#### GHC version
+**GHC version**
 
-The GF source code is known to be compilable with GHC versions 7.10 through to 9.6.7.
+The GF source code is known to be compilable with GHC versions 7.10 through to 8.10.
 
-#### Obtaining Haskell
+**Obtaining Haskell**
 
 There are various ways of obtaining Haskell, including:
 
 - ghcup
-    1. Install from https://www.haskell.org/ghcup/
-    2. `ghcup install ghc 9.6.7`
-    3. `ghcup set ghc 9.6.7`
-- Stack: https://haskellstack.org/
+    1.  Install from https://www.haskell.org/ghcup/
+    2.  `ghcup install ghc 8.10.4`
+    3.  `ghcup set ghc 8.10.4`
+- Haskell Platform https://www.haskell.org/platform/
+- Stack https://haskellstack.org/
 
 
-#### Installation location
+**Installation location**
 
 The above steps install GF for a single user.
 The executables are put in `$HOME/.cabal/bin` (or on macOS in `$HOME/Library/Haskell/bin`),
@@ -93,7 +93,7 @@ so you might want to add this directory to your path (in `.bash_profile` or simi
 PATH=$HOME/.cabal/bin:$PATH
 ```
 
-#### Haskeline
+**Haskeline**
 
 GF uses [`haskeline`](http://hackage.haskell.org/package/haskeline), which
 on Linux depends on some non-Haskell libraries that won't be installed
@@ -105,7 +105,7 @@ Here is one way to do this:
 
 ## Installing from source code
 
-### Obtaining
+**Obtaining**
 
 To obtain the source code for the **release**,
 download it from [GitHub](https://github.com/GrammaticalFramework/gf-core/releases).
@@ -121,7 +121,8 @@ git clone https://github.com/GrammaticalFramework/gf-core.git
 git pull
 ```
 
-### Installing
+
+**Installing**
 
 You can then install with:
 ```
@@ -138,6 +139,8 @@ stack install
 For more info on working with the GF source code, see the
 [GF Developers Guide](../doc/gf-developers.html).
 
+For macOS Sequoia, you need to downgrade the LLVM package, see instructions [here](https://github.com/GrammaticalFramework/gf-core/issues/172#issuecomment-2599365457).
+
 ## Installing the Python bindings from PyPI
 
 The Python library is available on PyPI as `pgf`, so it can be installed using:
@@ -146,7 +149,10 @@ The Python library is available on PyPI as `pgf`, so it can be installed using:
 pip install pgf
 ```
 
-If this doesn't work, you will need to install the C runtime manually; see the instructions [here](https://www.grammaticalframework.org/doc/gf-developers.html#toc12).
+We provide binary wheels for Linux and macOS, which include the C runtime and are ready-to-go.
+If there is no binary distribution for your platform, this will install the source tarball,
+which will attempt to build the binding during installation,
+and requires the GF C runtime to be installed on your system.
 
 ---
 
@@ -158,8 +164,6 @@ In general the steps to follow are:
 1. Download a binary release and extract it somewhere on your system.
 2. Set the environment variable `GF_LIB_PATH` to point to wherever you extracted the RGL.
 
-For more information, see [Using GF on Windows](https://www.grammaticalframework.org/~inari/gf-windows.html) (latest updated for Windows 10).
-
 ## Installing the RGL from source
 
 To compile the RGL, you will need to have GF already installed and in your path.

download/release-3.12.md

@@ -1,6 +1,6 @@
 ---
 title: GF 3.12 Release Notes
-date: 08 August 2025
+date: 03 August 2025
 ---
 
 ## Installation

gf.cabal

@@ -11,7 +11,7 @@ description: GF, Grammatical Framework, is a programming language for multilingu
 maintainer: John J. Camilleri <john@digitalgrammars.com>
 homepage: https://www.grammaticalframework.org/
 bug-reports: https://github.com/GrammaticalFramework/gf-core/issues
-tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.10.4, GHC==9.0.2, GHC==9.2.4, GHC==9.6.7
+tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.10.4, GHC==9.0.2, GHC==9.2.4
 
 data-dir: src
 extra-source-files:
@@ -159,7 +159,7 @@ library
     parallel >= 3.2.1.1 && < 3.3,
     process >= 1.4.3 && < 1.7,
     time >= 1.6.0 && <= 1.12.2,
-    template-haskell >= 2.13.0.0 && < 2.21
+    template-haskell >= 2.13.0.0
 
   hs-source-dirs: src/compiler
   exposed-modules:
@@ -350,7 +350,7 @@ library
       terminfo >=0.4.0 && < 0.5
 
     if impl(ghc >= 9.6.6)
-      build-depends: unix >= 2.8 && < 2.9
+      build-depends: unix >= 2.8
 
     else
       build-depends: unix >= 2.7.2 && < 2.8
@@ -365,7 +365,7 @@ executable gf
   default-language: Haskell2010
   build-depends:
     gf,
-    base >= 4.9.1 && < 4.22
+    base
   ghc-options: -threaded
 --ghc-options: -fwarn-unused-imports
 
@@ -399,7 +399,7 @@ test-suite gf-tests
   main-is: run.hs
   hs-source-dirs: testsuite
   build-depends:
-    base >= 4.9.1 && < 4.22,
+    base >= 4.9.1,
     Cabal >= 1.8,
     directory >= 1.3.0 && < 1.4,
     filepath >= 1.4.1 && < 1.5,

src/runtime/python/pgf.egg-info/PKG-INFO

@@ -1,17 +0,0 @@
-Metadata-Version: 2.4
-Name: pgf
-Version: 1.0
-Summary: Python bindings to the Grammatical Framework's PGF runtime
-Home-page: https://www.grammaticalframework.org/
-Author: Krasimir Angelov
-Author-email: kr.angelov@gmail.com
-License: BSD
-Dynamic: author
-Dynamic: author-email
-Dynamic: description
-Dynamic: home-page
-Dynamic: license
-Dynamic: summary
-
-Grammatical Framework (GF) is a programming language for multilingual grammar applications.
-This package provides Python bindings to GF runtime, which allows you to parse and generate text using GF grammars compiled into the PGF format.

src/runtime/python/pgf.egg-info/SOURCES.txt

@@ -1,12 +0,0 @@
-INSTALL
-README.org
-pypgf.c
-setup.py
-test.py
-examples/README
-examples/gf_utils.py
-examples/translation_pipeline.py
-pgf.egg-info/PKG-INFO
-pgf.egg-info/SOURCES.txt
-pgf.egg-info/dependency_links.txt
-pgf.egg-info/top_level.txt

src/runtime/python/pgf.egg-info/dependency_links.txt

@@ -1 +0,0 @@
-

src/runtime/python/pgf.egg-info/top_level.txt

@@ -1 +0,0 @@
-pgf