From 685141b12800393f21f2e3baa53a41c05b7f6742 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Mon, 1 May 2023 16:50:29 +0200 Subject: [PATCH] Remove cabal flag `cpphs` Haskell's `cpphs` has not been actively maintained since 2020 and does not work correctly under Windows in some setups. https://github.com/hackage-trustees/malcolm-wallace-universe/pull/20 Starting 2018 we have not been building with `cpphs` by default, but with the system CPP; no problems have been reported since then. Then, we already discussed removing cpphs entirely. https://github.com/agda/agda/issues/3223 I think we can go through with it now. --- .github/workflows/cabal.yml | 4 ---- .github/workflows/stack-dry-run.yml | 3 +-- .github/workflows/stack.yml | 3 +-- Agda.cabal | 12 ------------ CHANGELOG.md | 5 +++++ doc/user-manual/getting-started/installation.rst | 5 ----- src/github/workflows/cabal.yml | 6 ------ src/github/workflows/stack-dry-run.yml | 2 +- src/github/workflows/stack.yml | 2 +- 9 files changed, 9 insertions(+), 33 deletions(-) diff --git a/.github/workflows/cabal.yml b/.github/workflows/cabal.yml index 87b11bf8bee..09372430174 100644 --- a/.github/workflows/cabal.yml +++ b/.github/workflows/cabal.yml @@ -116,10 +116,6 @@ jobs: description: Linux w/o tests ghc-ver: 9.6.1 os: ubuntu-22.04 - - cabal-flags: --enable-tests -f cpphs - description: Linux cpphs - ghc-ver: 9.6.1 - os: ubuntu-22.04 - cabal-flags: --enable-tests -f debug description: Linux debug ghc-ver: 9.6.1 diff --git a/.github/workflows/stack-dry-run.yml b/.github/workflows/stack-dry-run.yml index 398a50c8bd3..c9ae2f5b5e7 100644 --- a/.github/workflows/stack-dry-run.yml +++ b/.github/workflows/stack-dry-run.yml @@ -23,8 +23,7 @@ jobs: shell: bash env: EXTRA_ARGS: --dry-run - NON_DEFAULT_FLAGS: --flag Agda:enable-cluster-counting --flag Agda:cpphs --flag - Agda:debug + NON_DEFAULT_FLAGS: --flag Agda:enable-cluster-counting --flag Agda:debug needs: auto-cancel runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml index e4b761ca41a..7e1867f3a01 100644 --- a/.github/workflows/stack.yml +++ b/.github/workflows/stack.yml @@ -24,8 +24,7 @@ jobs: env: EXTRA_ARGS: --fast ICU_URL: https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-icu-69.1-1-any.pkg.tar.zst - NON_DEFAULT_FLAGS: --flag Agda:enable-cluster-counting --flag Agda:cpphs --flag - Agda:debug + NON_DEFAULT_FLAGS: --flag Agda:enable-cluster-counting --flag Agda:debug needs: auto-cancel runs-on: ${{ matrix.os }} steps: diff --git a/Agda.cabal b/Agda.cabal index 10f95515eca..acab5719d17 100644 --- a/Agda.cabal +++ b/Agda.cabal @@ -157,11 +157,6 @@ source-repository this -- Build flags --------------------------------------------------------------------------- -flag cpphs - default: False - manual: True - description: Use cpphs instead of cpp. - flag debug default: False manual: True @@ -344,13 +339,6 @@ library -- An exceptions are packages that are only needed for certain configurations, -- like for flags, Windows, etc. - if flag(cpphs) - -- We don't write an upper bound for cpphs because the - -- `build-tool-depends` field can not be modified in Hackage. - - build-tool-depends: cpphs:cpphs >= 1.20.9 - ghc-options: -pgmP cpphs -optP --cpp - if flag(debug) cpp-options: -DDEBUG diff --git a/CHANGELOG.md b/CHANGELOG.md index 358a7c89bb2..bbf686c2b55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Release notes for Agda version 2.6.4 ==================================== +Installation +------------ + +* Removed the cabal flag `cpphs` that enabled building Agda with `cpphs` instead of the default C preprocessor. + Reflection ---------- diff --git a/doc/user-manual/getting-started/installation.rst b/doc/user-manual/getting-started/installation.rst index c78c07e8f5b..36f1bcada78 100644 --- a/doc/user-manual/getting-started/installation.rst +++ b/doc/user-manual/getting-started/installation.rst @@ -472,11 +472,6 @@ Installation Flags When installing Agda the following flags can be used: -.. option:: cpphs - - Use `cpphs `_ instead - of cpp. Default: off. - .. option:: debug Enable debugging features that may slow Agda down. Default: off. diff --git a/src/github/workflows/cabal.yml b/src/github/workflows/cabal.yml index cb2a0ce7b41..67f428e9d87 100644 --- a/src/github/workflows/cabal.yml +++ b/src/github/workflows/cabal.yml @@ -64,12 +64,6 @@ jobs: # Can't leave cabal-flags empty here lest it becomes the default value. cabal-flags: '--disable-tests' - # Linux, with -f cpphs - - os: ubuntu-22.04 - description: Linux cpphs - ghc-ver: '9.6.1' - cabal-flags: '--enable-tests -f cpphs' - # Linux, without -f enable-cluster-counting but with -f debug - os: ubuntu-22.04 description: Linux debug diff --git a/src/github/workflows/stack-dry-run.yml b/src/github/workflows/stack-dry-run.yml index 84587a92c9c..e1586133e23 100644 --- a/src/github/workflows/stack-dry-run.yml +++ b/src/github/workflows/stack-dry-run.yml @@ -56,7 +56,7 @@ jobs: env: EXTRA_ARGS: "--dry-run" # stack build --only-configure also installs dependencies, so we need --dry-run - NON_DEFAULT_FLAGS: "--flag Agda:enable-cluster-counting --flag Agda:cpphs --flag Agda:debug" + NON_DEFAULT_FLAGS: "--flag Agda:enable-cluster-counting --flag Agda:debug" defaults: run: diff --git a/src/github/workflows/stack.yml b/src/github/workflows/stack.yml index a6fb1475e20..104ada45698 100644 --- a/src/github/workflows/stack.yml +++ b/src/github/workflows/stack.yml @@ -76,7 +76,7 @@ jobs: ## ARGS is set later, depending on the actually picked GHC version # ARGS: "--stack-yaml=stack-${{ matrix.ghc-ver }}.yaml --no-terminal" EXTRA_ARGS: "--fast" - NON_DEFAULT_FLAGS: "--flag Agda:enable-cluster-counting --flag Agda:cpphs --flag Agda:debug" + NON_DEFAULT_FLAGS: "--flag Agda:enable-cluster-counting --flag Agda:debug" # Liang-Ting Chen (2021-08-18): # Let pacman choose the file name for ICU4C.