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

Commit ddf513b

Browse files
alanzalanz
authored
Merge pull request #1724 from alanz/bump-resolvers
Bump resolvers
2 parents b7fd5fb + 76ed58a commit ddf513b

10 files changed

+23
-65
lines changed

‎cabal.project

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ packages:
66

77
source-repository-package
88
type: git
9-
location: https://github.com/jneira/cabal-helper.git
10-
tag: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2
9+
location: https://github.com/DanielG/cabal-helper.git
10+
tag: a18bbb2af92e9b4337e7f930cb80754f2408bcfd
1111

1212
tests: true
1313

@@ -21,4 +21,4 @@ constraints:
2121

2222
write-ghc-environment-files: never
2323

24-
index-state: 2020-03-03T21:13:56Z
24+
index-state: 2020-04-06T20:27:36Z

‎cabal.project-8.8.2

-32
This file was deleted.

‎stack-8.4.2.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ extra-deps:
1414
- brittany-0.12.1.1
1515
- bytestring-trie-0.2.5.0
1616
# - cabal-helper-1.0.0.0
17-
- github: jneira/cabal-helper
18-
commit: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2
17+
- github: DanielG/cabal-helper
18+
commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd
1919
- cabal-plan-0.5.0.0
2020
- connection-0.3.1 # for network and network-bsd
2121
- constrained-dynamic-0.1.0.0

‎stack-8.4.3.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ extra-deps:
1919
- brittany-0.12.1.1
2020
- bytestring-trie-0.2.5.0
2121
# - cabal-helper-1.0.0.0
22-
- github: jneira/cabal-helper
23-
commit: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2
22+
- github: DanielG/cabal-helper
23+
commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd
2424
- cabal-plan-0.6.2.0
2525
- connection-0.3.1 # for network and network-bsd
2626
- constrained-dynamic-0.1.0.0

‎stack-8.4.4.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ extra-deps:
1313
- brittany-0.12.1.1
1414
- bytestring-trie-0.2.5.0
1515
# - cabal-helper-1.0.0.0
16-
- github: jneira/cabal-helper
17-
commit: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2
16+
- github: DanielG/cabal-helper
17+
commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd
1818
- cabal-plan-0.5.0.0
1919
- connection-0.3.1 # for network and network-bsd
2020
- constrained-dynamic-0.1.0.0

‎stack-8.6.4.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ extra-deps:
1212
- butcher-1.3.2.1
1313
- bytestring-trie-0.2.5.0
1414
# - cabal-helper-1.0.0.0
15-
- github: jneira/cabal-helper
16-
commit: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2
15+
- github: DanielG/cabal-helper
16+
commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd
1717
- cabal-plan-0.5.0.0
1818
- constrained-dynamic-0.1.0.0
1919
- extra-1.6.21

‎stack-8.6.5.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ extra-deps:
1414
- brittany-0.12.1.1
1515
- bytestring-trie-0.2.5.0
1616
# - cabal-helper-1.0.0.0
17-
- github: jneira/cabal-helper
18-
commit: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2
17+
- github: DanielG/cabal-helper
18+
commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd
1919
- cabal-plan-0.6.2.0
2020
- clock-0.7.2
2121
- constrained-dynamic-0.1.0.0

‎stack-8.8.1.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ extra-deps:
1111
- brittany-0.12.1.1
1212
- bytestring-trie-0.2.5.0
1313
# - cabal-helper-1.0.0.0
14-
- github: jneira/cabal-helper
15-
commit: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2
14+
- github: DanielG/cabal-helper
15+
commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd
1616
- clock-0.7.2
1717
- constrained-dynamic-0.1.0.0
1818
- extra-1.6.21

‎stack-8.8.2.yaml

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: lts-15.2
1+
resolver: lts-15.3 # Last 8.8.2
22
packages:
33
- .
44
- hie-plugin-api
@@ -10,20 +10,14 @@ extra-deps:
1010
- brittany-0.12.1.1
1111
- bytestring-trie-0.2.5.0
1212
# - cabal-helper-1.0.0.0
13-
- github: jneira/cabal-helper
14-
commit: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2
13+
- github: DanielG/cabal-helper
14+
commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd
1515
- clock-0.7.2
1616
- constrained-dynamic-0.1.0.0
1717
- floskell-0.10.2
1818
- ghc-lib-parser-8.8.2.20200205
1919
- ghc-lib-parser-ex-8.8.5.3
20-
# To avoid build error with ghc-8.8.2
21-
# See https://github.com/haskell/haddock/issues/1123
22-
- git: https://github.com/haskell/haddock.git
23-
commit: be8b02c4e3cffe7d45b3dad0a0f071d35a274d65
24-
subdirs:
25-
- haddock-api
26-
# - haddock-api-2.23.0
20+
- haddock-api-2.23.1
2721
- haddock-library-1.8.0
2822
- haskell-lsp-0.20.0.0
2923
- haskell-lsp-types-0.20.0.0

‎stack.yaml

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: nightly-2020-03-01
1+
resolver: nightly-2020-03-09 # Last GHC 8.8.2
22
packages:
33
- .
44
- hie-plugin-api
@@ -10,18 +10,14 @@ extra-deps:
1010
- brittany-0.12.1.1
1111
- bytestring-trie-0.2.5.0
1212
# - cabal-helper-1.0.0.0
13-
- github: jneira/cabal-helper
14-
commit: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2
13+
- github: DanielG/cabal-helper
14+
commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd
1515
- clock-0.7.2
1616
- constrained-dynamic-0.1.0.0
1717
- floskell-0.10.2
1818
- ghc-lib-parser-8.8.2.20200205
1919
- ghc-lib-parser-ex-8.8.5.3
20-
# - haddock-api-2.23.0
21-
- git: https://github.com/haskell/haddock.git
22-
commit: be8b02c4e3cffe7d45b3dad0a0f071d35a274d65
23-
subdirs:
24-
- haddock-api
20+
- haddock-api-2.23.1
2521
- haddock-library-1.8.0
2622
- haskell-lsp-0.20.0.0
2723
- haskell-lsp-types-0.20.0.0

0 commit comments

Comments
 (0)