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

Commit 9327f63

committed

Correct ghc-8.8.3 stack.yaml's

1 parent 6765fa6 commit 9327f63Copy full SHA for 9327f63

File tree

-22

lines changed

-22

lines changed

Lines changed: 5 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,20 +9,16 @@ extra-deps:`
`9`	`9`	`- apply-refact-0.7.0.0`
`10`	`10`	`- bytestring-trie-0.2.5.0@rev1`
`11`	`11`	`# - cabal-helper-1.0.0.0`
`12`		`-- github: jneira/cabal-helper`
`13`		`- commit: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2`
	`12`	`+- github: DanielG/cabal-helper`
	`13`	`+ commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd`
`14`	`14`	`- clock-0.7.2`
`15`	`15`	`- constrained-dynamic-0.1.0.0`
`16`	`16`	`- floskell-0.10.2`
`17`		`-# To avoid build error with ghc-8.8.2`
`18`		`-# See https://github.com/haskell/haddock/issues/1123`
`19`		`-- git: https://github.com/haskell/haddock.git`
`20`		`- commit: be8b02c4e3cffe7d45b3dad0a0f071d35a274d65`
`21`		`- subdirs:`
`22`		`- - haddock-api`
`23`		`-# - haddock-api-2.23.0`
	`17`	`+- haddock-api-2.23.1`
`24`	`18`	`- hoogle-5.0.17.15`
`25`	`19`	`- hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170`
	`20`	`+- ghc-lib-parser-8.8.2.20200205`
	`21`	`+- ghc-lib-parser-ex-8.8.5.3`
`26`	`22`	`- ilist-0.3.1.0`
`27`	`23`	`- monad-dijkstra-0.1.1.2`
`28`	`24`	`- semigroups-0.18.5`

Lines changed: 2 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-resolver: nightly-2020-03-18`
	`1`	`+resolver: nightly-2020-04-09`
`2`	`2`
`3`	`3`	`packages:`
`4`	`4`	`- .`
`@@ -15,25 +15,14 @@ extra-deps:`
`15`	`15`	`- clock-0.7.2`
`16`	`16`	`- constrained-dynamic-0.1.0.0`
`17`	`17`	`- floskell-0.10.2`
`18`		`-<<<<<<< HEAD`
`19`	`18`	`- ghc-lib-parser-8.8.2.20200205`
`20`	`19`	`- ghc-lib-parser-ex-8.8.5.3`
`21`	`20`	`- haddock-api-2.23.1`
`22`	`21`	`- haddock-library-1.8.0`
`23`	`22`	`- haskell-lsp-0.20.0.0`
`24`	`23`	`- haskell-lsp-types-0.20.0.0`
	`24`	`+- haskell-src-exts-1.22.0`
`25`	`25`	`- lsp-test-0.10.1.0`
`26`		`-- hie-bios-0.4.0`
`27`		`-- hlint-2.2.11`
`28`		`-=======`
`29`		`-# To avoid build error with ghc-8.8.2`
`30`		`-# See https://github.com/haskell/haddock/issues/1123`
`31`		`-- git: https://github.com/haskell/haddock.git`
`32`		`- commit: be8b02c4e3cffe7d45b3dad0a0f071d35a274d65`
`33`		`- subdirs:`
`34`		`- - haddock-api`
`35`		`-# - haddock-api-2.23.0`
`36`		`->>>>>>> a8e55590... Update ghc-8.8.3 stackage resolvers`
`37`	`26`	`- hoogle-5.0.17.15`
`38`	`27`	`- hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170`
`39`	`28`	`- ilist-0.3.1.0`

Comments

(0)