From b56cb0c40fb5f8b9b2e5f8a7aeeac0fb1c374b4d Mon Sep 17 00:00:00 2001 From: Stephanie Weirich Date: Wed, 5 Jul 2023 05:42:10 -0700 Subject: [PATCH] update unbound-generics cabal version, remove github dep --- full/README.md | 24 +++++++++++++----------- full/pi-forall.cabal | 2 +- full/stack.yaml | 5 ----- main/pi-forall.cabal | 2 +- main/stack.yaml | 5 ----- version1/pi-forall.cabal | 2 +- version1/stack.yaml | 5 ----- version2/pi-forall.cabal | 2 +- version2/stack.yaml | 5 ----- version3/pi-forall.cabal | 2 +- version3/stack.yaml | 5 ----- 11 files changed, 18 insertions(+), 41 deletions(-) diff --git a/full/README.md b/full/README.md index 62e3107..598187a 100644 --- a/full/README.md +++ b/full/README.md @@ -21,23 +21,24 @@ Installation Recommended tools (see links for instructions): - 1. [ghcup](https://www.haskell.org/ghcup/) + 1. [gchup](https://www.haskell.org/ghcup/) - The ghcup tool is an installer for general purpose Haskell tools, including GHC, Cabal, Stack and the Haskell language server (HLS). You'll want to install the recommended versions of all of these tools. Older versions are likely to work too, but the stack.yaml file will force a specific version of GHC. + The gchup tool is an installer for general purpose Haskell tools, including GHC, Cabal, Stack and the Haskell language server (HLS). You'll want to install the recommended versions of all of these tools. - 2. [VSCode](https://code.visualstudio.com/) and [Haskell language extension](https://marketplace.visualstudio.com/items?itemName=haskell.haskell) + 2. [VSCode](https://code.visualstudio.com/) and [Haskell language extension](https://marketplace.visualstudio.com/items?itemName=haskell.haskell) - I recommend using VSCode to browse and edit Haskell projects. When working with the `pi-forall` repository, you should open the folder for the specific implementation that you want to work with (i.e. `version1`/`version2`/`full`), so that the Haskell language server -can find the project metadata. If you open the toplevel `pi-forall` folder instead, you will get errors from vscode. - -Project Contents ------------------ +Contents +-------- There are several versions of `pi-forall` in the repository. See the [documentation](https://github.com/sweirich/pi-forall/blob/2023/doc/oplss.pdf) for an extended description of what parts of the language are covered by each version. +When you open the project in vscode, you should open the folder for the implementation that +you want to work with (i.e. `version1`/`version2`/`full`), so that the Haskell language server +can find the project metadata. + Each implementation has the following structure: ``` @@ -52,7 +53,7 @@ Each implementation has the following structure: ``` -To build each version, use a terminal to go to that directory and type: +To build each version, go to that directory and type: ``` stack build @@ -64,11 +65,12 @@ and to typecheck a source file: stack exec -- pi-forall ``` - Versioning ---------- -This repository has been tested with the current ghcup recommended tool versions for July 2023, including GHC 9.4.5, hsl 2.0.0.1 and stack lts-21.1. +This repository has been tested with the current ghcup recommended tool versions for June 2023, including GHC 9.2.7 and stack lts-20.24. + + Acknowledgement --------------- diff --git a/full/pi-forall.cabal b/full/pi-forall.cabal index ee29759..64c0728 100644 --- a/full/pi-forall.cabal +++ b/full/pi-forall.cabal @@ -32,7 +32,7 @@ common shared-properties parsec >= 3.1.8 && < 3.2, mtl >= 2.2.1, pretty >= 1.0.1.0, - unbound-generics >= 0.2, + unbound-generics >= 0.4.3, transformers, array >= 0.3.0.2 && < 0.6, containers, diff --git a/full/stack.yaml b/full/stack.yaml index 00ffc09..7bafbcf 100644 --- a/full/stack.yaml +++ b/full/stack.yaml @@ -4,11 +4,6 @@ resolver: lts-21.1 packages: - '.' -extra-deps: -- git: git@github.com:lambdageek/unbound-generics.git - commit: a2a558058012b09bb313b3eb03cddb734fcf4a98 - - flags: {} extra-package-dbs: [] diff --git a/main/pi-forall.cabal b/main/pi-forall.cabal index ee29759..64c0728 100644 --- a/main/pi-forall.cabal +++ b/main/pi-forall.cabal @@ -32,7 +32,7 @@ common shared-properties parsec >= 3.1.8 && < 3.2, mtl >= 2.2.1, pretty >= 1.0.1.0, - unbound-generics >= 0.2, + unbound-generics >= 0.4.3, transformers, array >= 0.3.0.2 && < 0.6, containers, diff --git a/main/stack.yaml b/main/stack.yaml index 00ffc09..7bafbcf 100644 --- a/main/stack.yaml +++ b/main/stack.yaml @@ -4,11 +4,6 @@ resolver: lts-21.1 packages: - '.' -extra-deps: -- git: git@github.com:lambdageek/unbound-generics.git - commit: a2a558058012b09bb313b3eb03cddb734fcf4a98 - - flags: {} extra-package-dbs: [] diff --git a/version1/pi-forall.cabal b/version1/pi-forall.cabal index ee29759..64c0728 100644 --- a/version1/pi-forall.cabal +++ b/version1/pi-forall.cabal @@ -32,7 +32,7 @@ common shared-properties parsec >= 3.1.8 && < 3.2, mtl >= 2.2.1, pretty >= 1.0.1.0, - unbound-generics >= 0.2, + unbound-generics >= 0.4.3, transformers, array >= 0.3.0.2 && < 0.6, containers, diff --git a/version1/stack.yaml b/version1/stack.yaml index 00ffc09..7bafbcf 100644 --- a/version1/stack.yaml +++ b/version1/stack.yaml @@ -4,11 +4,6 @@ resolver: lts-21.1 packages: - '.' -extra-deps: -- git: git@github.com:lambdageek/unbound-generics.git - commit: a2a558058012b09bb313b3eb03cddb734fcf4a98 - - flags: {} extra-package-dbs: [] diff --git a/version2/pi-forall.cabal b/version2/pi-forall.cabal index ee29759..64c0728 100644 --- a/version2/pi-forall.cabal +++ b/version2/pi-forall.cabal @@ -32,7 +32,7 @@ common shared-properties parsec >= 3.1.8 && < 3.2, mtl >= 2.2.1, pretty >= 1.0.1.0, - unbound-generics >= 0.2, + unbound-generics >= 0.4.3, transformers, array >= 0.3.0.2 && < 0.6, containers, diff --git a/version2/stack.yaml b/version2/stack.yaml index 00ffc09..7bafbcf 100644 --- a/version2/stack.yaml +++ b/version2/stack.yaml @@ -4,11 +4,6 @@ resolver: lts-21.1 packages: - '.' -extra-deps: -- git: git@github.com:lambdageek/unbound-generics.git - commit: a2a558058012b09bb313b3eb03cddb734fcf4a98 - - flags: {} extra-package-dbs: [] diff --git a/version3/pi-forall.cabal b/version3/pi-forall.cabal index ee29759..64c0728 100644 --- a/version3/pi-forall.cabal +++ b/version3/pi-forall.cabal @@ -32,7 +32,7 @@ common shared-properties parsec >= 3.1.8 && < 3.2, mtl >= 2.2.1, pretty >= 1.0.1.0, - unbound-generics >= 0.2, + unbound-generics >= 0.4.3, transformers, array >= 0.3.0.2 && < 0.6, containers, diff --git a/version3/stack.yaml b/version3/stack.yaml index 00ffc09..7bafbcf 100644 --- a/version3/stack.yaml +++ b/version3/stack.yaml @@ -4,11 +4,6 @@ resolver: lts-21.1 packages: - '.' -extra-deps: -- git: git@github.com:lambdageek/unbound-generics.git - commit: a2a558058012b09bb313b3eb03cddb734fcf4a98 - - flags: {} extra-package-dbs: []