From efbf08e97e43b9759f02696153caae3799c7a5c5 Mon Sep 17 00:00:00 2001 From: Harendra Kumar Date: Mon, 18 Dec 2023 16:31:45 +0530 Subject: [PATCH] Revert "Remove the CABAL_HACKAGE_MIRROR option" This reverts commit cba7192822548dc11c4021a0a29388e0b8682044. --- .circleci/config.yml | 1 + .github/workflows/packcheck.yml | 1 + README.md | 1 + appveyor.yml | 1 + packcheck.sh | 6 +----- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bc11754..2958ac0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -45,6 +45,7 @@ env: &env # cabal options # ------------------------------------------------------------------------ CABAL_CHECK_RELAX: "y" + CABAL_HACKAGE_MIRROR: "hackage.haskell.org:http://hackage.fpcomplete.com" CABAL_PROJECT: "cabal.project" # ------------------------------------------------------------------------ diff --git a/.github/workflows/packcheck.yml b/.github/workflows/packcheck.yml index 67a34cd..c6f5e29 100644 --- a/.github/workflows/packcheck.yml +++ b/.github/workflows/packcheck.yml @@ -67,6 +67,7 @@ jobs: # cabal options # ------------------------------------------------------------------------ CABAL_CHECK_RELAX: y + CABAL_HACKAGE_MIRROR: "hackage.haskell.org:http://hackage.fpcomplete.com" CABAL_PROJECT: "cabal.project" # ------------------------------------------------------------------------ diff --git a/README.md b/README.md index 18ef939..99476f2 100644 --- a/README.md +++ b/README.md @@ -331,6 +331,7 @@ CABAL_BUILD_OPTIONS : ADDITIONAL cabal v2-build options to append to default CABAL_DISABLE_DEPS : [y] Do not install dependencies, do not do cabal update CABAL_BUILD_TARGETS : cabal v2-build targets, default is 'all' CABAL_CHECK_RELAX : [y] Do not fail if cabal check fails on the package. +CABAL_HACKAGE_MIRROR : DESTRUCTIVE! Specify an alternative mirror, modifies the cabal config file. -------------------------------------------------- stack options diff --git a/appveyor.yml b/appveyor.yml index 173df7b..de865d1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,6 +43,7 @@ environment: # cabal options # ------------------------------------------------------------------------ CABAL_CHECK_RELAX: "y" + CABAL_HACKAGE_MIRROR: "hackage.haskell.org:http://hackage.fpcomplete.com" CABAL_PROJECT: "cabal.project" # ------------------------------------------------------------------------ diff --git a/packcheck.sh b/packcheck.sh index afe3e50..9d9f5e2 100755 --- a/packcheck.sh +++ b/packcheck.sh @@ -397,8 +397,7 @@ show_help() { help_envvar CABAL_DISABLE_DEPS "[y] Do not install dependencies, do not do cabal update" help_envvar CABAL_BUILD_TARGETS "cabal v2-build targets, default is 'all'" help_envvar CABAL_CHECK_RELAX "[y] Do not fail if cabal check fails on the package." - # XXX Untested/Unsupported, should be removed - #help_envvar CABAL_HACKAGE_MIRROR "DESTRUCTIVE! Specify an alternative mirror, modifies the cabal config file." + help_envvar CABAL_HACKAGE_MIRROR "DESTRUCTIVE! Specify an alternative mirror, modifies the cabal config file." show_step1 "stack options" help_envvar STACK_YAML "Alternative stack config file path relative to project root" @@ -2025,9 +2024,6 @@ esac test -z "$CHECK_ENV" || check_boolean_var CHECK_ENV test -z "$CHECK_ENV" || check_clean_env -# XXX This is broken, not used -unset CABAL_HACKAGE_MIRROR - echo bash --version