Merge branch 'main' into peterl/moviebench

Author: ulysses4ever

.devcontainer/Dockerfile

@@ -16,7 +16,11 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     libgmp-dev \
     racket \
     uthash-dev \
-    vim
+    vim \
+    python3-pip
+
+# install Python libraries
+RUN pip3 install cplex docplex
 
 # update path
 USER ${USERNAME}
@@ -47,4 +51,10 @@ ARG RUST=1.71.0
 # install rustup, rustc, and cargo
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain=${RUST} -y
 
+# naively install mlton
+RUN wget https://github.com/MLton/mlton/releases/download/on-20210117-release/mlton-20210117-1.amd64-linux-glibc2.31.tgz
+RUN tar -xvzf mlton-20210117-1.amd64-linux-glibc2.31.tgz
+RUN rm mlton-20210117-1.amd64-linux-glibc2.31.tgz
+ENV PATH="/home/${USERNAME}/mlton-20210117-1.amd64-linux-glibc2.31/bin:$PATH"
+
 CMD ["bash"]

.github/workflows/haskell-ci.yml

@@ -28,9 +28,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.4.6
+          - compiler: ghc-9.6.2
             compilerKind: ghc
-            compilerVersion: 9.4.6
+            compilerVersion: 9.6.2
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.4.5

.github/workflows/test-gibbon-examples.yml

@@ -14,15 +14,10 @@ jobs:
           sudo apt update
           sudo apt-get install -y libgc-dev libgmp-dev uthash-dev gcc-11 racket
           sudo unlink /usr/bin/gcc && sudo ln -s /usr/bin/gcc-11 /usr/bin/gcc
-      - name: cplex and docplex
-        run: | 
-          sudo apt-get install python3
-          pip3 install cplex
-          pip3 install docplex
       - name: ghc and cabal
         env:
           HCKIND: ghc
-          HCVER: 9.4.6
+          HCVER: 9.6.2
         run: |
             mkdir -p "$HOME/.ghcup/bin"
             curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"

README.md

@@ -25,10 +25,12 @@ similar to Typed Racket, and a small subset of Haskell.
 
 ## Building Gibbon
 
-Gibbon is implemented in Haskell, and is set up to be built with
-[Cabal](https://cabal.readthedocs.io/en/3.4/).
+### Getting Dependencies
 
-Follow the instructions below to have all dependencies. 
+Gibbon is implemented in Haskell, and is set up to be built with
+[Cabal](https://cabal.readthedocs.io/en/latest/), but it has a number of native dependencies.
+Follow the instructions below to get all dependencies or enter the Nix shell
+with `nix-shell` to get them via [Nix](https://nix.dev/).
 
 - Ubuntu 22.04:
 (Parallelism support temporarily not available with ubuntu 22.04 as Cilk support is not avaiable with newer gcc)
@@ -77,24 +79,25 @@ Others require a few extra steps:
 
 2. [uthash](https://github.com/troydhanson/uthash): Clone the [repository](https://github.com/troydhanson/uthash) and copy all the `.h` files in `src` to `/usr/local/include`
 
+### Actually Building Gibbon
 
 After you have both Cabal and all the dependencies installed, you can build
 Gibbon from source:
 
     $ git clone https://github.com/iu-parfunc/gibbon
     $ cd gibbon && source set_env.sh
-    $ cd gibbon-compiler && cabal v2-build . -w ghc-9.4.6
+    $ cd gibbon-compiler && cabal v2-build
 
 At this point you can run the Gibbon executable:
 
-    $ cabal v2-exec -w ghc-9.4.6 gibbon -- -h
+    $ cabal v2-run gibbon -- -h
 
 If you'd like to run the testsuite, you can do so with:
 
-    $ cd $GIBBONDIR && ./run_all_tests.sh
+    $ ./run_all_tests.sh
 
 
-## Building a Developement docker container for Gibbon 
+### Building a Developement docker container for Gibbon 
 
 To build the Dockerfile for dev purposes run the command below from the gibbon directory.
 

cabal.project

@@ -1 +1,4 @@
 packages: gibbon-compiler
+
+program-options
+    ghc-options: -Werror