From 560903cf8ff3e8e02532792353cbf19f2a55334f Mon Sep 17 00:00:00 2001 From: Mikhail Glushenkov Date: Fri, 21 Jul 2017 14:05:45 +0100 Subject: [PATCH 1/4] Use 'canonicalizePath' instead of 'makeAbsolute'. 'makeAbsolute' is not compatible with old versions of 'directory' and we know at this place in the code that the directory we refer to does exist, so the potential exception is not a problem. Fixes #4606. --- Cabal/Distribution/Simple/Test/LibV09.hs | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/Cabal/Distribution/Simple/Test/LibV09.hs b/Cabal/Distribution/Simple/Test/LibV09.hs index 51eb3312ea3..494190124f1 100644 --- a/Cabal/Distribution/Simple/Test/LibV09.hs +++ b/Cabal/Distribution/Simple/Test/LibV09.hs @@ -35,9 +35,10 @@ import Distribution.Verbosity import qualified Control.Exception as CE import System.Directory - ( createDirectoryIfMissing, doesDirectoryExist, doesFileExist + ( createDirectoryIfMissing, canonicalizePath + , doesDirectoryExist, doesFileExist , getCurrentDirectory, removeDirectoryRecursive, removeFile - , setCurrentDirectory, makeAbsolute ) + , setCurrentDirectory ) import System.Exit ( ExitCode(..), exitWith ) import System.FilePath ( (), (<.>) ) import System.IO ( hClose, hGetContents, hPutStr ) @@ -90,14 +91,14 @@ runTest pkg_descr lbi clbi flags suite = do shellEnv = [("HPCTIXFILE", tixFile) | isCoverageEnabled] ++ pkgPathEnv -- Add (DY)LD_LIBRARY_PATH if needed - shellEnv' <- if LBI.withDynExe lbi - then do - let (Platform _ os) = LBI.hostPlatform lbi - paths <- LBI.depLibraryPaths - True False lbi clbi - cpath <- makeAbsolute $ LBI.componentBuildDir lbi clbi - return (addLibraryPath os (cpath : paths) shellEnv) - else return shellEnv + shellEnv' <- + if LBI.withDynExe lbi + then do + let (Platform _ os) = LBI.hostPlatform lbi + paths <- LBI.depLibraryPaths True False lbi clbi + cpath <- canonicalizePath $ LBI.componentBuildDir lbi clbi + return (addLibraryPath os (cpath : paths) shellEnv) + else return shellEnv createProcessWithEnv verbosity cmd opts Nothing (Just shellEnv') -- these handles are closed automatically CreatePipe (UseHandle wOut) (UseHandle wOut) From 8bc9fbd4996344a172df31e6c8b3c2444f4b0a73 Mon Sep 17 00:00:00 2001 From: Mikhail Glushenkov Date: Fri, 21 Jul 2017 15:13:42 +0100 Subject: [PATCH 2/4] Update AUTHORS. [ci skip] --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 9dc51196001..8d1c5f7c5d6 100644 --- a/AUTHORS +++ b/AUTHORS @@ -273,4 +273,5 @@ Wojciech Danilo Yitzchak Gale Yuras Shumovich capsjac +ilovezfs Łukasz Dąbek From 89ef359f8c0fa25e54ee79d4762472941098251e Mon Sep 17 00:00:00 2001 From: Mikhail Glushenkov Date: Fri, 21 Jul 2017 14:11:16 +0100 Subject: [PATCH 3/4] Bump lib:Cabal and cabal-testsuite versions to 2.0.0.2. Fixes #4611. --- Cabal/Cabal.cabal | 2 +- Cabal/Makefile | 2 +- Cabal/changelog | 2 +- Cabal/default.nix | 2 +- appveyor.yml | 4 ++-- cabal-install/bootstrap.sh | 2 +- cabal-install/changelog | 2 +- cabal-testsuite/cabal-testsuite.cabal | 2 +- travis-common.sh | 5 +++-- travis-deploy.sh | 2 +- 10 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal index 5a5e6242865..3bb6f3bdfd9 100644 --- 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 index 912709dfb61..a27917e3cc8 100644 --- 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 index 6a48502d78b..3d0504772d7 100644 --- a/Cabal/changelog +++ b/Cabal/changelog @@ -1,6 +1,6 @@ -*-change-log-*- -2.0.0.0 Ryan Thomas May 2017 +2.0.0.2 Ryan Thomas July 2017 * The 2.0 migration guide gives advice on adapting Custom setup scripts to backwards-incompatible changes in this release: https://github.com/haskell/cabal/wiki/2.0-migration-guide diff --git a/Cabal/default.nix b/Cabal/default.nix index 25dfb935708..ac752b31a11 100644 --- 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 index 4c6fcd8d7aa..e3ef77a921b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,9 +27,9 @@ build_script: - Setup install # hackage-repo-tool doesn't build on Windows: # https://github.com/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 index 66ea6caecd3..eac16b0c174 100755 --- 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 index ae1f74d78dd..c49c87b2f86 100644 --- a/cabal-install/changelog +++ b/cabal-install/changelog @@ -1,6 +1,6 @@ -*-change-log-*- -2.0.0.0 Ryan Thomas May 2017 +2.0.0.0 Ryan Thomas 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 index 5f5dfc4b342..4ecc1955264 100644 --- 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 index 729fcbe2bd1..9d05b85950a 100644 --- 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 index 6be6d129f35..6512c45dacd 100755 --- 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 && \ From 132cf21bbc134ad6f58705d0b819bb5051ca5e22 Mon Sep 17 00:00:00 2001 From: Mikhail Glushenkov Date: Fri, 21 Jul 2017 14:41:26 +0100 Subject: [PATCH 4/4] bootstrap.sh: Bump versions. --- cabal-install/bootstrap.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cabal-install/bootstrap.sh b/cabal-install/bootstrap.sh index eac16b0c174..3bb15bcf45e 100755 --- a/cabal-install/bootstrap.sh +++ b/cabal-install/bootstrap.sh @@ -208,9 +208,9 @@ PREFIX=${PREFIX:-${DEFAULT_PREFIX}} # Versions of the packages to install. # The version regex says what existing installed versions are ok. -PARSEC_VER="3.1.9"; PARSEC_VER_REGEXP="[3]\.[01]\." +PARSEC_VER="3.1.11"; PARSEC_VER_REGEXP="[3]\.[01]\." # >= 3.0 && < 3.2 -DEEPSEQ_VER="1.4.2.0"; DEEPSEQ_VER_REGEXP="1\.[1-9]\." +DEEPSEQ_VER="1.4.3.0"; DEEPSEQ_VER_REGEXP="1\.[1-9]\." # >= 1.1 && < 2 case "$GHC_VER" in @@ -221,21 +221,21 @@ case "$GHC_VER" in ;; *) # GHC >= 7.8 - BINARY_VER="0.8.3.0" + BINARY_VER="0.8.5.1" BINARY_VER_REGEXP="[0]\.[78]\." # >= 0.7 && < 0.9 ;; esac -TEXT_VER="1.2.2.1"; TEXT_VER_REGEXP="((1\.[012]\.)|(0\.([2-9]|(1[0-1]))\.))" +TEXT_VER="1.2.2.2"; TEXT_VER_REGEXP="((1\.[012]\.)|(0\.([2-9]|(1[0-1]))\.))" # >= 0.2 && < 1.3 -NETWORK_VER="2.6.3.1"; NETWORK_VER_REGEXP="2\.[0-6]\." +NETWORK_VER="2.6.3.2"; 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.2"; CABAL_VER_REGEXP="2\.0\.[0-9]" # >= 2.0 && < 2.1 -TRANS_VER="0.5.2.0"; TRANS_VER_REGEXP="0\.[45]\." +TRANS_VER="0.5.4.0"; TRANS_VER_REGEXP="0\.[45]\." # >= 0.2.* && < 0.6 MTL_VER="2.2.1"; MTL_VER_REGEXP="[2]\." # >= 2.0 && < 3 @@ -243,8 +243,8 @@ HTTP_VER="4000.3.7"; HTTP_VER_REGEXP="4000\.(2\.([5-9]|1[0-9]|2[0-9])|3\.?)" # >= 4000.2.5 < 4000.4 ZLIB_VER="0.6.1.2"; ZLIB_VER_REGEXP="(0\.5\.([3-9]|1[0-9])|0\.6)" # >= 0.5.3 && <= 0.7 -TIME_VER="1.7" TIME_VER_REGEXP="1\.[1-7]\.?" - # >= 1.1 && < 1.8 +TIME_VER="1.8.0.2" TIME_VER_REGEXP="1\.[1-8]\.?" + # >= 1.1 && < 1.9 RANDOM_VER="1.1" RANDOM_VER_REGEXP="1\.[01]\.?" # >= 1 && < 1.2 STM_VER="2.4.4.1"; STM_VER_REGEXP="2\." @@ -274,7 +274,7 @@ HACKAGE_SECURITY_VER="0.5.2.2"; HACKAGE_SECURITY_VER_REGEXP="0\.5\.(2\.[2-9]|[3- BYTESTRING_BUILDER_VER="0.10.8.1.0"; BYTESTRING_BUILDER_VER_REGEXP="0\.10\.?" TAR_VER="0.5.0.3"; TAR_VER_REGEXP="0\.5\.([1-9]|1[0-9]|0\.[3-9]|0\.1[0-9])\.?" # >= 0.5.0.3 && < 0.6 -HASHABLE_VER="1.2.6.0"; HASHABLE_VER_REGEXP="1\." +HASHABLE_VER="1.2.6.1"; HASHABLE_VER_REGEXP="1\." # 1.* HACKAGE_URL="https://hackage.haskell.org/package"