Skip to content

Commit

Permalink
#381, require shake-0.18.5, which ensures progress cancellation is ro…
Browse files Browse the repository at this point in the history
…bust (#400)

* #381, require shake-0.18.5, which ensures progress cancelation is robust

* Fix a GHC 8.8.2 warning

* Don't allow-newer, do pin hie-bios
  • Loading branch information
ndmitchell committed Feb 4, 2020
1 parent 1d04b09 commit 025fa5b
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/Development/IDE/GHC/CPP.hs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import DynFlags
import Panic
import FileCleanup
#if MIN_GHC_API_VERSION(8,8,2)
import LlvmCodeGen (LlvmVersion, llvmVersionList)
import LlvmCodeGen (llvmVersionList)
#elif MIN_GHC_API_VERSION(8,8,0)
import LlvmCodeGen (LlvmVersion (..))
#endif
Expand Down
2 changes: 1 addition & 1 deletion stack-ghc-lib.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ extra-deps:
- ghc-lib-parser-8.8.1
- ghc-lib-8.8.1
- fuzzy-0.1.0.0
- shake-0.18.4
- shake-0.18.5
- regex-base-0.94.0.0
- regex-tdfa-1.3.1.0
- haddock-library-1.8.0
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ extra-deps:
- regex-pcre-builtin-0.95.1.1.8.43
- regex-base-0.94.0.0
- regex-tdfa-1.3.1.0
- shake-0.18.4
- shake-0.18.5
- parser-combinators-1.2.1
- haddock-library-1.8.0
nix:
Expand Down
2 changes: 1 addition & 1 deletion stack84.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extra-deps:
- js-dgtable-0.5.2
- hie-bios-0.4.0
- fuzzy-0.1.0.0
- shake-0.18.4
- shake-0.18.5
- time-compat-1.9.2.2
- regex-base-0.94.0.0
- regex-tdfa-1.3.1.0
Expand Down
4 changes: 1 addition & 3 deletions stack88.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
resolver: nightly-2020-01-21
resolver: nightly-2020-02-03
packages:
- .
extra-deps:
- fuzzy-0.1.0.0
- hie-bios-0.4.0
allow-newer: true
nix:
packages: [zlib]

0 comments on commit 025fa5b

Please sign in to comment.