Bump lib:Cabal and cabal-testsuite versions to 2.0.0.2.

Fixes #4611.
haskell · Jul 21, 2017 · 89ef359 · 89ef359
1 parent 8bc9fbd
commit 89ef359
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 12 deletions.
diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
@@ -1,5 +1,5 @@
 name: Cabal
-version: 2.0.0.0
+version: 2.0.0.2
 copyright: 2003-2017, Cabal Development Team (see AUTHORS file)
 license: BSD3
 license-file: LICENSE

diff --git a/Cabal/Makefile b/Cabal/Makefile
@@ -1,5 +1,5 @@
 
-VERSION=2.0.0.0
+VERSION=2.0.0.2
 
 #KIND=devel
 KIND=rc

diff --git a/Cabal/changelog b/Cabal/changelog
@@ -1,6 +1,6 @@
 -*-change-log-*-
 
-2.0.0.0 Ryan Thomas <[email protected]> May 2017
+2.0.0.2 Ryan Thomas <[email protected]> July 2017
  * The 2.0 migration guide gives advice on adapting Custom setup
  scripts to backwards-incompatible changes in this release:
  https:/haskell/cabal/wiki/2.0-migration-guide

diff --git a/Cabal/default.nix b/Cabal/default.nix
@@ -4,7 +4,7 @@
 }:
 mkDerivation {
  pname = "Cabal";
- version = "2.0.0.0";
+ version = "2.0.0.2";
  src = ./.;
  libraryHaskellDepends = [
  array base binary bytestring containers deepseq directory filepath

diff --git a/appveyor.yml b/appveyor.yml
@@ -27,9 +27,9 @@ build_script:
  - Setup install
  # hackage-repo-tool doesn't build on Windows:
  # https:/well-typed/hackage-security/issues/175
- # - echo "" | ..\cabal install hackage-repo-tool --allow-newer=Cabal,time --constraint="Cabal == 2.0.0.0"
+ # - echo "" | ..\cabal install hackage-repo-tool --allow-newer=Cabal,time --constraint="Cabal == 2.0.0.2"
  - cd ..\cabal-testsuite
- - ghc --make -threaded -i Setup.hs -package Cabal-2.0.0.0
+ - ghc --make -threaded -i Setup.hs -package Cabal-2.0.0.2
  - echo "" | ..\appveyor-retry ..\cabal install --only-dependencies --enable-tests --constraint="unbounded-delays < 0.1.0.10"
  - Setup configure --user --ghc-option=-Werror --enable-tests
  - Setup build

diff --git a/cabal-install/bootstrap.sh b/cabal-install/bootstrap.sh
@@ -233,7 +233,7 @@ NETWORK_VER="2.6.3.1"; NETWORK_VER_REGEXP="2\.[0-6]\."
  # >= 2.0 && < 2.7
 NETWORK_URI_VER="2.6.1.0"; NETWORK_URI_VER_REGEXP="2\.6\."
  # >= 2.6 && < 2.7
-CABAL_VER="2.0.0.0"; CABAL_VER_REGEXP="2\.0\.[0-9]"
+CABAL_VER="2.0.0.2"; CABAL_VER_REGEXP="2\.0\.[0-9]"
  # >= 2.0 && < 2.1
 TRANS_VER="0.5.2.0"; TRANS_VER_REGEXP="0\.[45]\."
  # >= 0.2.* && < 0.6

diff --git a/cabal-install/changelog b/cabal-install/changelog
@@ -1,6 +1,6 @@
 -*-change-log-*-
 
-2.0.0.0 Ryan Thomas <[email protected]> May 2017
+2.0.0.0 Ryan Thomas <[email protected]> July 2017
  * Removed the '--root-cmd' parameter of the 'install' command
  (#3356).
  * Deprecated 'cabal install --global' (#3356).

diff --git a/cabal-testsuite/cabal-testsuite.cabal b/cabal-testsuite/cabal-testsuite.cabal
@@ -1,5 +1,5 @@
 name: cabal-testsuite
-version: 2.0.0.0
+version: 2.0.0.2
 copyright: 2003-2017, Cabal Development Team (see AUTHORS file)
 license: BSD3
 license-file: LICENSE

diff --git a/travis-common.sh b/travis-common.sh
@@ -1,13 +1,14 @@
 set -e
 
 HACKAGE_REPO_TOOL_VERSION="0.1.1"
-CABAL_VERSION="2.0.0.0"
+CABAL_VERSION="2.0.0.2"
+CABAL_INSTALL_VERSION="2.0.0.0"
 
 CABAL_STORE_DB="${HOME}/.cabal/store/ghc-${GHCVER}/package.db"
 CABAL_LOCAL_DB="${TRAVIS_BUILD_DIR}/dist-newstyle/packagedb/ghc-${GHCVER}"
 CABAL_BDIR="${TRAVIS_BUILD_DIR}/dist-newstyle/build/Cabal-${CABAL_VERSION}"
 CABAL_TESTSUITE_BDIR="${TRAVIS_BUILD_DIR}/dist-newstyle/build/cabal-testsuite-${CABAL_VERSION}"
-CABAL_INSTALL_BDIR="${TRAVIS_BUILD_DIR}/dist-newstyle/build/cabal-install-${CABAL_VERSION}"
+CABAL_INSTALL_BDIR="${TRAVIS_BUILD_DIR}/dist-newstyle/build/cabal-install-${CABAL_INSTALL_VERSION}"
 CABAL_INSTALL_SETUP="${CABAL_INSTALL_BDIR}/setup/setup"
 HACKAGE_REPO_TOOL_BDIR="${TRAVIS_BUILD_DIR}/dist-newstyle/build/hackage-repo-tool-${HACKAGE_REPO_TOOL_VERSION}"
 

diff --git a/travis-deploy.sh b/travis-deploy.sh
@@ -8,7 +8,7 @@ deploy() {
  (cd cabal-website && git checkout --track -b gh-pages origin/gh-pages)
  rm -rf cabal-website/doc
  mkdir -p cabal-website/doc/html
- mv dist-newstyle/build/Cabal-2.0.0.0/doc/html/Cabal \
+ mv dist-newstyle/build/Cabal-2.0.0.2/doc/html/Cabal \
  cabal-website/doc/html/Cabal
  (cd cabal-website && git add --all .)
  (cd cabal-website && \