diff --git a/appveyor.yml b/appveyor.yml index f46ba183ac0..b9dfe07cc54 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,7 +19,7 @@ build_script: # 'echo "" |' works around an AppVeyor issue: # https://github.com/commercialhaskell/stack/issues/1097#issuecomment-145747849 - - echo "" | ..\appveyor-retry ..\cabal install --only-dependencies --enable-tests --constraint="unbounded-delays < 0.1.0.10" + - echo "" | ..\appveyor-retry ..\cabal install --only-dependencies --enable-tests - Setup configure --user --ghc-option=-Werror --enable-tests - Setup build @@ -30,7 +30,7 @@ build_script: # - echo "" | ..\cabal install hackage-repo-tool --allow-newer=Cabal,time --constraint="Cabal == 2.1.0.0" - cd ..\cabal-testsuite - ghc --make -threaded -i Setup.hs -package Cabal-2.1.0.0 - - echo "" | ..\appveyor-retry ..\cabal install --only-dependencies --enable-tests --constraint="unbounded-delays < 0.1.0.10" + - echo "" | ..\appveyor-retry ..\cabal install --only-dependencies --enable-tests - Setup configure --user --ghc-option=-Werror --enable-tests - Setup build # Must install the test suite, so that our GHCi invocation picks it up @@ -43,8 +43,8 @@ build_script: - cd ..\cabal-install - ghc --make -threaded -i -i. Setup.hs -Wall -Werror - echo "" | ..\appveyor-retry ..\cabal install happy - - echo "" | ..\appveyor-retry ..\cabal install --only-dependencies --enable-tests -flib --constraint="unbounded-delays < 0.1.0.10" - - ..\cabal configure --user --ghc-option=-Werror --enable-tests -flib --constraint="unbounded-delays < 0.1.0.10" + - echo "" | ..\appveyor-retry ..\cabal install --only-dependencies --enable-tests -flib + - ..\cabal configure --user --ghc-option=-Werror --enable-tests -flib - ..\cabal build # update package index again, this time for the cabal under test - dist\build\cabal\cabal.exe update diff --git a/cabal.project b/cabal.project index 678a8be4e56..c76659f9f01 100644 --- a/cabal.project +++ b/cabal.project @@ -1,6 +1,5 @@ packages: Cabal/ cabal-testsuite/ cabal-install/ constraints: unix >= 2.7.1.0, - unbounded-delays < 0.1.1.0, cabal-install +lib -- Uncomment to allow picking up extra local unpacked deps: