Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean cabal project (backport #2097) #2110

Merged
merged 2 commits into from
Aug 18, 2021
Merged

Clean cabal project (backport #2097) #2110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8002d25
Clean cabal project (#2097)
jneira Aug 18, 2021
ccd63ec
Resolve conflicts
jneira Aug 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 6 additions & 43 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,65 +23,28 @@ packages:
./plugins/hls-module-name-plugin
./plugins/hls-ormolu-plugin
./plugins/hls-call-hierarchy-plugin

tests: true

package *
ghc-options: -haddock
test-show-details: direct

-- ghc-api-compat-8.6
-- see https://gitlab.haskell.org/haskell/ghc-api-compat/-/issues/1#note_371055
source-repository-package
type: git
location: https://github.com/hsyl20/ghc-api-compat
tag: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15

write-ghc-environment-files: never

index-state: 2021-08-01T00:00:00Z
index-state: 2021-08-12T12:00:38Z

constraints:
-- Diagrams doesn't support optparse-applicative >= 0.16 yet
optparse-applicative < 0.16,
hyphenation +embed


allow-newer:
active:base,
assoc:base,
cryptohash-md5:base,
cryptohash-sha1:base,
constraints-extras:template-haskell,
data-tree-print:base,
deepseq:base,
dependent-sum:some,
dependent-sum:constraints,
diagrams-contrib:base,
diagrams-contrib:lens,
diagrams-contrib:random,
diagrams-core:base,
diagrams-core:lens,
diagrams-lib:base,
diagrams-lib:lens,
diagrams-postscript:base,
diagrams-postscript:lens,
diagrams-svg:base,
diagrams-svg:lens,
dual-tree:base,
-- Does this make any sense?
entropy:Cabal,
force-layout:base,
force-layout:lens,
floskell:ghc-prim,
floskell:base,
hashable:base,
hslogger:base,
monoid-extras:base,
newtype-generics:base,
parallel:base,
regex-base:base,
regex-tdfa:base,
statestack:base,
svg-builder:base,
these:base,
time-compat:base

-- for shake-bench
Chart-diagrams:diagrams-core,
SVGFonts:diagrams-core
2 changes: 1 addition & 1 deletion ghcide/ghcide.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ library
hls-plugin-api ^>= 1.2.0.0,
lens,
hiedb == 0.4.0.*,
lsp-types >= 1.2 && < 1.4,
lsp-types >= 1.3.0.1 && < 1.4,
lsp == 1.2.*,
mtl,
network-uri,
Expand Down
2 changes: 1 addition & 1 deletion stack-8.10.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ extra-deps:
- some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
- unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
- lsp-1.2.0.1
- lsp-types-1.3.0.0
- lsp-types-1.3.0.1
- lsp-test-0.14.0.1

configure-options:
Expand Down
2 changes: 1 addition & 1 deletion stack-8.10.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ extra-deps:
- some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
- unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
- lsp-1.2.0.1
- lsp-types-1.3.0.0
- lsp-types-1.3.0.1
- lsp-test-0.14.0.1

configure-options:
Expand Down
2 changes: 1 addition & 1 deletion stack-8.10.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ extra-deps:
- some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
- unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
- lsp-1.2.0.1
- lsp-types-1.3.0.0
- lsp-types-1.3.0.1
- lsp-test-0.14.0.1

# Enable these when supported by all formatters
Expand Down
2 changes: 1 addition & 1 deletion stack-8.10.5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ extra-deps:
- some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
- unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
- lsp-1.2.0.1
- lsp-types-1.3.0.0
- lsp-types-1.3.0.1
- lsp-test-0.14.0.1

# Enable these when supported by all formatters
Expand Down
2 changes: 1 addition & 1 deletion stack-8.6.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ extra-deps:
- unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
- resourcet-1.2.3
- lsp-1.2.0.1
- lsp-types-1.3.0.0
- lsp-types-1.3.0.1
- lsp-test-0.14.0.1

flags:
Expand Down
2 changes: 1 addition & 1 deletion stack-8.6.5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ extra-deps:
- unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
- resourcet-1.2.3
- lsp-1.2.0.1
- lsp-types-1.3.0.0
- lsp-types-1.3.0.1
- lsp-test-0.14.0.1

configure-options:
Expand Down
2 changes: 1 addition & 1 deletion stack-8.8.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ extra-deps:
- some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
- unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
- lsp-1.2.0.1
- lsp-types-1.3.0.0
- lsp-types-1.3.0.1
- lsp-test-0.14.0.1

configure-options:
Expand Down
2 changes: 1 addition & 1 deletion stack-8.8.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ extra-deps:
- some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
- unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
- lsp-1.2.0.1
- lsp-types-1.3.0.0
- lsp-types-1.3.0.1
- lsp-test-0.14.0.1

configure-options:
Expand Down
2 changes: 1 addition & 1 deletion stack-9.0.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ extra-deps:
- retrie-1.0.0.0
- some-1.0.2@sha256:3d460998df32ad7b93bf55657aeae988d97070155e71718b4bc75d0997ce9d62,2244
- lsp-1.2.0.1
- lsp-types-1.3.0.0
- lsp-types-1.3.0.1
- lsp-test-0.14.0.1

# Upstream patches for ghc-9.0.1 compatability
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ extra-deps:
- some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
- unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
- lsp-1.2.0.1
- lsp-types-1.3.0.0
- lsp-types-1.3.0.1
- lsp-test-0.14.0.1

configure-options:
Expand Down