Commit 9b93feaf authored by Herbert Valerio Riedel's avatar Herbert Valerio Riedel 🕺

Bump Cabal versions from 2.5 -> 3.0

parent 996e2e63
cabal-version: >=1.10
name: Cabal
version: 2.5.0.0
version: 3.0.0.0
copyright: 2003-2019, Cabal Development Team (see AUTHORS file)
license: BSD3
license-file: LICENSE
......@@ -16,7 +17,6 @@ description:
The Haskell Cabal is part of a larger infrastructure for distributing,
organizing, and cataloging Haskell libraries and tools.
category: Distribution
cabal-version: >=1.10
build-type: Simple
-- If we use a new Cabal feature, this needs to be changed to Custom so
-- we can bootstrap.
......
# 2.6.0.0 (current development version)
# 3.0.0.0 (current development version)
* TODO
* Introduce set notation for `^>=` and `==` operators.
* 'check' reports warnings for various ghc-\*-options fields separately
......
VERSION=2.5.0.0
VERSION=3.0.0.0
#KIND=devel
KIND=rc
......
......@@ -13,7 +13,7 @@ import sphinx_rtd_theme
sys.path.insert(0, os.path.abspath('.'))
import cabaldomain
version = "2.5.0.0"
version = "3.0.0.0"
extensions = ['sphinx.ext.extlinks', 'sphinx.ext.todo']
......
......@@ -45,7 +45,7 @@ build_script:
- cabal %CABOPTS% new-test Cabal
- appveyor-retry cabal %CABOPTS% new-build exe:cabal exe:cabal-tests --only-dependencies
- cabal %CABOPTS% new-build exe:cabal
- cabal %CABOPTS% new-run cabal-tests -- -j3 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.0.2\cabal-install-2.5.0.0\x\cabal\build\cabal\cabal.exe
- cabal %CABOPTS% new-run cabal-tests -- -j3 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.0.2\cabal-install-3.0.0.0\x\cabal\build\cabal\cabal.exe
- appveyor-retry cabal %CABOPTS% new-build cabal-install:tests --only-dependencies
- cd cabal-install
- cabal %CABOPTS% new-run cabal-install:memory-usage-tests
......
......@@ -224,7 +224,7 @@ NETWORK_URI_VER="2.6.1.0"; NETWORK_URI_VER_REGEXP="2\.6\.(0\.[2-9]|[1-9])"
# >= 2.6.0.2 && < 2.7
NETWORK_VER="2.7.0.0"; NETWORK_VER_REGEXP="2\.[0-7]\."
# >= 2.0 && < 2.7
CABAL_VER="2.5.0.0"; CABAL_VER_REGEXP="2\.5\.[0-9]"
CABAL_VER="3.0.0.0"; CABAL_VER_REGEXP="3\.0\.[0-9]"
# >= 2.5 && < 2.6
TRANS_VER="0.5.5.0"; TRANS_VER_REGEXP="0\.[45]\."
# >= 0.2.* && < 0.6
......
......@@ -4,7 +4,7 @@ Cabal-Version: >= 1.10
-- To update this file, edit 'cabal-install.cabal.pp' and run
-- 'make cabal-install-prod' in the project's root folder.
Name: cabal-install
Version: 2.5.0.0
Version: 3.0.0.0
Synopsis: The command-line interface for Cabal and Hackage.
Description:
The \'cabal\' command-line program simplifies the process of managing
......@@ -311,7 +311,7 @@ executable cabal
base16-bytestring >= 0.1.1 && < 0.2,
binary >= 0.7.3 && < 0.9,
bytestring >= 0.10.6.0 && < 0.11,
Cabal == 2.5.*,
Cabal == 3.0.*,
containers >= 0.5.6.2 && < 0.7,
cryptohash-sha256 >= 0.11 && < 0.12,
deepseq >= 1.4.1.1 && < 1.5,
......
......@@ -10,7 +10,7 @@ Cabal-Version: >= 1.10
-- To update this file, edit 'cabal-install.cabal.pp' and run
-- 'make cabal-install-prod' in the project's root folder.
Name: cabal-install
Version: 2.5.0.0
Version: 3.0.0.0
#
# NOTE: when updating build-depends, don't forget to update version regexps in bootstrap.sh.
#
......@@ -22,7 +22,7 @@ Version: 2.5.0.0
base16-bytestring >= 0.1.1 && < 0.2,
binary >= 0.7.3 && < 0.9,
bytestring >= 0.10.6.0 && < 0.11,
Cabal == 2.5.*,
Cabal == 3.0.*,
containers >= 0.5.6.2 && < 0.7,
cryptohash-sha256 >= 0.11 && < 0.12,
deepseq >= 1.4.1.1 && < 1.5,
......@@ -472,7 +472,7 @@ executable cabal
cpp-options: -DMONOLITHIC
build-depends:
Cabal == 2.5.*,
Cabal == 3.0.*,
cabal-install-solver-dsl,
QuickCheck >= 2.8.2,
array,
......
name: cabal-testsuite
version: 2.5.0.0
version: 3.0.0.0
copyright: 2003-2019, Cabal Development Team (see AUTHORS file)
license: BSD3
license-file: LICENSE
......@@ -64,7 +64,7 @@ executable cabal-tests
build-depends:
async,
base,
Cabal == 2.5.0.0,
Cabal == 3.0.0.0,
clock,
filepath,
process,
......@@ -81,5 +81,5 @@ custom-setup
-- lib:Cabal dependency, and some stable lib:Cabal version for its
-- custom-setup's one (due to 'setupMaxCabalVersionConstraint' in
-- 'D.C.ProjectPlanning').
setup-depends: Cabal == 2.5.0.0,
setup-depends: Cabal == 3.0.0.0,
base
name: solver-benchmarks
version: 2.5.0.0
version: 3.0.0.0
copyright: 2003-2017, Cabal Development Team (see AUTHORS file)
license: BSD3
license-file: LICENSE
......
set -e
HACKAGE_REPO_TOOL_VERSION="0.1.1.1"
CABAL_VERSION="2.5.0.0"
CABAL_INSTALL_VERSION="2.5.0.0"
CABAL_VERSION="3.0.0.0"
CABAL_INSTALL_VERSION="3.0.0.0"
if [ "$TRAVIS_OS_NAME" = "linux" ]; then
ARCH="x86_64-linux"
......
......@@ -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/`uname -m`-$TRAVIS_OS_NAME/ghc-$GHCVER/Cabal-2.5.0.0/doc/html/Cabal \
mv dist-newstyle/build/`uname -m`-$TRAVIS_OS_NAME/ghc-$GHCVER/Cabal-3.0.0.0/doc/html/Cabal \
cabal-website/doc/html/Cabal
(cd cabal-website && git add --all .)
(cd cabal-website && \
......
......@@ -177,7 +177,7 @@ timed $CABALPLAN --version
#######################################################################
# NOTE: This should match cabal-testsuite version
CABAL_VERSION="2.5.0.0"
CABAL_VERSION="3.0.0.0"
if [ "$(uname)" = "Linux" ]; then
ARCH="x86_64-linux"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment