Skip to content

Commit

Permalink
Drop '--allow-newer=Cabal' from various places.
Browse files Browse the repository at this point in the history
  • Loading branch information
23Skidoo committed Feb 25, 2016
1 parent 5c046d6 commit 243e8eb
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion HACKING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 243e8eb

Please sign in to comment.