From 243e8eb1f13de96e4ba690ac158a08ca1f17313b Mon Sep 17 00:00:00 2001 From: Mikhail Glushenkov Date: Thu, 25 Feb 2016 15:02:05 +0100 Subject: [PATCH] Drop '--allow-newer=Cabal' from various places. See https://github.com/well-typed/hackage-security/pull/151. --- .travis.yml | 2 +- HACKING.md | 2 +- appveyor.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a295e69a69f..6c1244137ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,7 @@ script: - cp Setup.hs ./dist/setup/setup.hs - ghc --make -odir ./dist/setup -hidir ./dist/setup -i -i. ./dist/setup/setup.hs -o ./dist/setup/setup -Wall -Werror -threaded # the command cabal-install would use to build setup - - cabal install --only-dependencies --enable-tests --enable-benchmarks --allow-newer=Cabal + - cabal install --only-dependencies --enable-tests --enable-benchmarks - ./dist/setup/setup configure --user --ghc-option=-Werror --enable-tests --enable-benchmarks -v2 # -v2 provides useful information for debugging - ./dist/setup/setup build - ./dist/setup/setup haddock # see https://github.com/haskell/cabal/issues/2198 diff --git a/HACKING.md b/HACKING.md index 965298f4ae8..7fd19a97bba 100644 --- a/HACKING.md +++ b/HACKING.md @@ -122,7 +122,7 @@ identical; only the first two steps are different: ~~~~ cabal sandbox init cabal sandbox add-source ../Cabal/ - cabal install --only-dependencies --enable-tests --allow-newer=Cabal + cabal install --only-dependencies --enable-tests ~~~~ (In addition, the absolute sandbox path will be slightly different diff --git a/appveyor.yml b/appveyor.yml index 514825f6253..5585ce52b4d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,7 +21,7 @@ build_script: - Setup install - cd ..\cabal-install - ghc --make -threaded -i -i. Setup.hs -Wall -Werror - - echo "" | ..\cabal install --only-dependencies --enable-tests --force-reinstalls --allow-newer=Cabal + - echo "" | ..\cabal install --only-dependencies --enable-tests --force-reinstalls - ..\cabal configure --user --ghc-option=-Werror --enable-tests - ..\cabal build - ..\cabal test unit-tests --show-details=streaming --test-option=--pattern=!FileMonitor