Revert "Remove the CABAL_HACKAGE_MIRROR option"

This reverts commit cba7192.
composewell · Dec 18, 2023 · efbf08e · efbf08e
1 parent 6883c53
commit efbf08e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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