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

Jump to bottom

Clean cabal project #2097

Merged
merged 13 commits into from Aug 18, 2021
Merged

Clean cabal project #2097

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c758eae
Remove superflous things
jneira Aug 12, 2021
a7da94c
Set index-state
jneira Aug 13, 2021
e53c0f9
Add ghc-api-compat and remove shake-bench
jneira Aug 14, 2021
0c9a26b
Correct comment about ghc-api-compat
jneira Aug 15, 2021
a02992e
Add specific project file for benchs
jneira Aug 15, 2021
3302bdf
Use specific project file for benchmarks
jneira Aug 15, 2021
07861e9
Ensure we use lsp-1.3.0.1
jneira Aug 15, 2021
61d5395
Use lsp-types-1.3.0.1 for stack
jneira Aug 15, 2021
37048ce
Use lsp-types-1.3.0.1 for default stack
jneira Aug 15, 2021
d62bd39
Remove some more allow-newer
jneira Aug 16, 2021
19bb487
Use one cabal.project
jneira Aug 16, 2021
4593b9c
Merge branch 'master' into clean-cabal-project
pepeiborra Aug 17, 2021
14411b5
Merge branch 'master' into clean-cabal-project
mergify[bot] Aug 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 3 additions & 31 deletions cabal.project
View file
Open in desktop
Expand Up @@ -23,56 +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-08T02:21:16Z
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,
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,
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
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
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
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
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
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
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
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
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
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
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
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