Skip to content

Commit

Permalink
[ #2957 ] Added support for async 2.2.*.
Browse files Browse the repository at this point in the history
Dropped support for earlier versions.
  • Loading branch information
nad committed Feb 5, 2018
1 parent cbdac42 commit d609d39
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Agda.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ library
build-depends: Win32 >= 2.3.1.0 && < 2.6

build-depends: array >= 0.5.1.0 && < 0.6
, async >= 2.0.2 && < 2.2
, async >= 2.2 && < 2.3
, base >= 4.8.0.0 && < 4.12
, binary >= 0.7.3.0 && < 0.9
, blaze-html >= 0.8 && < 0.10
Expand Down
3 changes: 1 addition & 2 deletions src/full/Agda/Interaction/InteractionTop.hs
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,7 @@ handleCommand wrap onFail cmd = handleNastyErrors $ wrap $ do
Right <$>
(toIO $ handleErr $ Exception noRange $ text $ show e)

asyncHandler e@E.ThreadKilled = return (Left e)
asyncHandler e = handle e
asyncHandler e@AsyncCancelled = return (Left e)

generalHandler (e :: E.SomeException) = handle e

Expand Down
1 change: 1 addition & 0 deletions stack-7.10.3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ extra-deps:
- STMonadTrans-0.4.3
- cpphs-1.20.8
- equivalence-0.3.2
- async-2.2.1

# Local packages, usually specified by relative directory name
packages:
Expand Down
3 changes: 3 additions & 0 deletions stack-8.0.2.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
resolver: lts-9.20

extra-deps:
- async-2.2.1

# Local packages, usually specified by relative directory name
packages:
- '.'
3 changes: 3 additions & 0 deletions stack-8.2.2.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
resolver: lts-10.0

extra-deps:
- async-2.2.1

# Local packages, usually specified by relative directory name
packages:
- '.'

0 comments on commit d609d39

Please sign in to comment.