Skip to content
This repository has been archived by the owner on Oct 7, 2020. It is now read-only.

Commit

Permalink
Merge pull request #1724 from alanz/bump-resolvers
Browse files Browse the repository at this point in the history 
Bump resolvers
  • Loading branch information
@alanz
alanz authored Apr 7, 2020
2 parents b7fd5fb + 76ed58a commit ddf513b
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 65 deletions.
6 changes: 3 additions & 3 deletions cabal.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ packages:

source-repository-package
type: git
location: https://github.com/jneira/cabal-helper.git
tag: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2
location: https://github.com/DanielG/cabal-helper.git
tag: a18bbb2af92e9b4337e7f930cb80754f2408bcfd

tests: true

Expand All @@ -21,4 +21,4 @@ constraints:

write-ghc-environment-files: never

index-state: 2020-03-03T21:13:56Z
index-state: 2020-04-06T20:27:36Z
32 changes: 0 additions & 32 deletions cabal.project-8.8.2
View file

This file was deleted.

4 changes: 2 additions & 2 deletions stack-8.4.2.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ extra-deps:
- brittany-0.12.1.1
- bytestring-trie-0.2.5.0
# - cabal-helper-1.0.0.0
- github: jneira/cabal-helper
commit: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2
- github: DanielG/cabal-helper
commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd
- cabal-plan-0.5.0.0
- connection-0.3.1 # for network and network-bsd
- constrained-dynamic-0.1.0.0
Expand Down
4 changes: 2 additions & 2 deletions stack-8.4.3.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ extra-deps:
- brittany-0.12.1.1
- bytestring-trie-0.2.5.0
# - cabal-helper-1.0.0.0
- github: jneira/cabal-helper
commit: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2
- github: DanielG/cabal-helper
commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd
- cabal-plan-0.6.2.0
- connection-0.3.1 # for network and network-bsd
- constrained-dynamic-0.1.0.0
Expand Down
4 changes: 2 additions & 2 deletions stack-8.4.4.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ extra-deps:
- brittany-0.12.1.1
- bytestring-trie-0.2.5.0
# - cabal-helper-1.0.0.0
- github: jneira/cabal-helper
commit: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2
- github: DanielG/cabal-helper
commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd
- cabal-plan-0.5.0.0
- connection-0.3.1 # for network and network-bsd
- constrained-dynamic-0.1.0.0
Expand Down
4 changes: 2 additions & 2 deletions stack-8.6.4.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ extra-deps:
- butcher-1.3.2.1
- bytestring-trie-0.2.5.0
# - cabal-helper-1.0.0.0
- github: jneira/cabal-helper
commit: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2
- github: DanielG/cabal-helper
commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd
- cabal-plan-0.5.0.0
- constrained-dynamic-0.1.0.0
- extra-1.6.21
Expand Down
4 changes: 2 additions & 2 deletions stack-8.6.5.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ extra-deps:
- brittany-0.12.1.1
- bytestring-trie-0.2.5.0
# - cabal-helper-1.0.0.0
- github: jneira/cabal-helper
commit: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2
- github: DanielG/cabal-helper
commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd
- cabal-plan-0.6.2.0
- clock-0.7.2
- constrained-dynamic-0.1.0.0
Expand Down
4 changes: 2 additions & 2 deletions stack-8.8.1.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ extra-deps:
- brittany-0.12.1.1
- bytestring-trie-0.2.5.0
# - cabal-helper-1.0.0.0
- github: jneira/cabal-helper
commit: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2
- github: DanielG/cabal-helper
commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd
- clock-0.7.2
- constrained-dynamic-0.1.0.0
- extra-1.6.21
Expand Down
14 changes: 4 additions & 10 deletions stack-8.8.2.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-15.2
resolver: lts-15.3 # Last 8.8.2
packages:
- .
- hie-plugin-api
Expand All @@ -10,20 +10,14 @@ extra-deps:
- brittany-0.12.1.1
- bytestring-trie-0.2.5.0
# - cabal-helper-1.0.0.0
- github: jneira/cabal-helper
commit: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2
- github: DanielG/cabal-helper
commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd
- clock-0.7.2
- constrained-dynamic-0.1.0.0
- floskell-0.10.2
- ghc-lib-parser-8.8.2.20200205
- ghc-lib-parser-ex-8.8.5.3
# To avoid build error with ghc-8.8.2
# See https://github.com/haskell/haddock/issues/1123
- git: https://github.com/haskell/haddock.git
commit: be8b02c4e3cffe7d45b3dad0a0f071d35a274d65
subdirs:
- haddock-api
# - haddock-api-2.23.0
- haddock-api-2.23.1
- haddock-library-1.8.0
- haskell-lsp-0.20.0.0
- haskell-lsp-types-0.20.0.0
Expand Down
12 changes: 4 additions & 8 deletions stack.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: nightly-2020-03-01
resolver: nightly-2020-03-09 # Last GHC 8.8.2
packages:
- .
- hie-plugin-api
Expand All @@ -10,18 +10,14 @@ extra-deps:
- brittany-0.12.1.1
- bytestring-trie-0.2.5.0
# - cabal-helper-1.0.0.0
- github: jneira/cabal-helper
commit: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2
- github: DanielG/cabal-helper
commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd
- clock-0.7.2
- constrained-dynamic-0.1.0.0
- floskell-0.10.2
- ghc-lib-parser-8.8.2.20200205
- ghc-lib-parser-ex-8.8.5.3
# - haddock-api-2.23.0
- git: https://github.com/haskell/haddock.git
commit: be8b02c4e3cffe7d45b3dad0a0f071d35a274d65
subdirs:
- haddock-api
- haddock-api-2.23.1
- haddock-library-1.8.0
- haskell-lsp-0.20.0.0
- haskell-lsp-types-0.20.0.0
Expand Down

0 comments on commit ddf513b

Please sign in to comment.