Skip to content

Use cabal-helper-1.1, add stack-8.10.1.yaml and unify cabal.project's #108

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

Merged
merged 12 commits into from
May 14, 2020
Merged

Use cabal-helper-1.1, add stack-8.10.1.yaml and unify cabal.project's #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
aaa3c91
Use cabal-helper-1.1 in stack config
jneira May 13, 2020
987c6e8
Use cabal-helper-1.1 in default stack.yaml
jneira May 13, 2020
fac8555
Unify cabal.project config
jneira May 13, 2020
8c68354
Use cabal-helper-1.1 in cabal config
jneira May 13, 2020
2d50a75
Add stack-8.10.1.yaml
jneira May 13, 2020
49307ea
Remove restriction over opentelemetry
jneira May 14, 2020
ce4845d
Remove trailing whitespace
jneira May 14, 2020
9791dc7
Be consistent with resolver comment
jneira May 14, 2020
1ba4ab3
Use last lts for ghc-8.6.5
jneira May 14, 2020
456d890
Use last lts for ghc-8.8.3
jneira May 14, 2020
6f8820d
Use opentelemetry last version 0.4
jneira May 14, 2020
7c7b786
We need rev:2 for brittany
jneira May 14, 2020
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
15 changes: 11 additions & 4 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,20 @@ packages:

source-repository-package
type: git
location: https://github.com/DanielG/cabal-helper.git
tag: 5b85a4b9e1c6463c94ffa595893ad02c9a3d2ec3
location: https://github.com/wz1000/shake
tag: fb3859dca2e54d1bbb2c873e68ed225fa179fbef

-- See https://github.com/haskell-hvr/cabal-plan/pull/55
source-repository-package
type: git
location: https://github.com/wz1000/shake
tag: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
location: https://github.com/peti/cabal-plan
tag: 894b76c0b6bf8f7d2f881431df1f13959a8fce87

-- See https://github.com/ennocramer/floskell/pull/45
source-repository-package
type: git
location: https://github.com/jneira/floskell
tag: 78f888f46dae96922d855af1e6a00ea6bb856987

tests: true
documentation: true
Expand Down
32 changes: 0 additions & 32 deletions cabal.project-8.10.1
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion haskell-language-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ library
, binary
, bytestring
, Cabal
, cabal-helper >= 1.0
, cabal-helper >= 1.1
, containers
, data-default
, deepseq
Expand Down
42 changes: 42 additions & 0 deletions stack-8.10.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
resolver: nightly-2020-05-12
compiler: ghc-8.10.1

packages:
- .
- ./ghcide/

extra-deps:
- Cabal-3.2.0.0
- cabal-helper-1.1.0.0
# See https://github.com/haskell-hvr/cabal-plan/pull/55
- github: peti/cabal-plan
commit: 894b76c0b6bf8f7d2f881431df1f13959a8fce87
- clock-0.7.2
# - floskell-0.10.2
# See https://github.com/ennocramer/floskell/pull/45
- github: jneira/floskell
commit: 78f888f46dae96922d855af1e6a00ea6bb856987
# - ghcide-0.1.0
- ghc-exactprint-0.6.3
- lens-4.19.1
- monad-dijkstra-0.1.1.2
- optics-core-0.3
- github: wz1000/shake
commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
- semigroups-0.18.5
- temporary-1.2.1.1

flags:
haskell-language-server:
pedantic: true
# We want to let agpl be the default value in .cabal (True)
# but brittany is not usable with ghc-8.10.1
# see https://github.com/lspitzner/brittany/issues/269
agpl: false

# allow-newer: true

nix:
packages: [ icu libcxx zlib ]

concurrent-tests: false
19 changes: 13 additions & 6 deletions stack-8.6.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
resolver: lts-13.19 # GHC 8.6.4
resolver: lts-13.19 # Last 8.6.4

packages:
- .
- ./ghcide/

extra-deps:
- aeson-1.4.3.0
- brittany-0.12.1.0
- butcher-1.3.2.1
- bytestring-trie-0.2.5.0
# - cabal-helper-1.0.0.0
- github: DanielG/cabal-helper
commit: 5b85a4b9e1c6463c94ffa595893ad02c9a3d2ec3
- Cabal-3.0.2.0
- cabal-doctest-1.0.8
- cabal-helper-1.1.0.0
- cabal-plan-0.5.0.0
- constrained-dynamic-0.1.0.0
# - ghcide-0.1.0
Expand All @@ -21,16 +22,20 @@ extra-deps:
- ghc-exactprint-0.6.2 # for HaRe
- ghc-lib-parser-8.10.1.20200412
- ghc-lib-parser-ex-8.10.0.4
- haddock-api-2.22.0
- ghc-paths-0.1.0.12
- haddock-api-2.22.0@rev:1
- haddock-library-1.8.0
- happy-1.19.12
- haskell-lsp-0.22.0.0
- haskell-lsp-types-0.22.0.0
- haskell-src-exts-1.21.1
- hie-bios-0.5.0
- hlint-2.2.8
- hoogle-5.0.17.11
- hsimport-0.11.0
- hsimport-0.11.0@rev:2
- lens-4.18
- lsp-test-0.10.3.0
- microlens-th-0.4.2.3@rev:1
- monad-dijkstra-0.1.1.2
- monad-memo-0.4.1
- multistate-0.8.0.1
Expand All @@ -46,6 +51,8 @@ extra-deps:
- syz-0.2.0.0
- tasty-rerun-1.1.17
- temporary-1.2.1.1
- th-abstraction-0.3.1.0
- type-equality-1
- unix-compat-0.5.2
- unordered-containers-0.2.10.0
- yaml-0.11.1.2
Expand Down
12 changes: 7 additions & 5 deletions stack-8.6.5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-14.22
resolver: lts-14.27 # Last 8.6.5

packages:
- .
Expand All @@ -7,11 +7,10 @@ packages:
extra-deps:
- ansi-terminal-0.10.2
- base-compat-0.11.0
- brittany-0.12.1.1
- brittany-0.12.1.1@rev:2
- butcher-1.3.3.1
# - cabal-helper-1.0.0.0
- github: DanielG/cabal-helper
commit: 5b85a4b9e1c6463c94ffa595893ad02c9a3d2ec3
- Cabal-3.0.2.0
- cabal-helper-1.1.0.0
- cabal-plan-0.6.2.0
- clock-0.7.2
- extra-1.7.1
Expand All @@ -21,11 +20,13 @@ extra-deps:
- ghc-check-0.3.0.1
- ghc-lib-parser-8.10.1.20200412
- ghc-lib-parser-ex-8.10.0.4
- haddock-api-2.22.0@rev:1
- haddock-library-1.8.0
- haskell-lsp-0.22.0.0
- haskell-lsp-types-0.22.0.0
- hie-bios-0.5.0
- indexed-profunctors-0.1
- lens-4.18
- lsp-test-0.10.3.0
- monad-dijkstra-0.1.1.2
- opentelemetry-0.4.0
Expand All @@ -41,6 +42,7 @@ extra-deps:
commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
- tasty-rerun-1.1.17
- temporary-1.2.1.1
- type-equality-1
- topograph-1

flags:
Expand Down
4 changes: 1 addition & 3 deletions stack-8.8.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ packages:
extra-deps:
- apply-refact-0.7.0.0
- bytestring-trie-0.2.5.0
# - cabal-helper-1.0.0.0
- github: DanielG/cabal-helper
commit: 5b85a4b9e1c6463c94ffa595893ad02c9a3d2ec3
- cabal-helper-1.1.0.0
- clock-0.7.2
- constrained-dynamic-0.1.0.0
- floskell-0.10.2
Expand Down
7 changes: 2 additions & 5 deletions stack-8.8.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-15.10
resolver: lts-15.12

packages:
- .
Expand All @@ -7,17 +7,14 @@ packages:
extra-deps:
- apply-refact-0.7.0.0
- bytestring-trie-0.2.5.0
# - cabal-helper-1.0.0.0
- github: DanielG/cabal-helper
commit: 5b85a4b9e1c6463c94ffa595893ad02c9a3d2ec3
- cabal-helper-1.1.0.0
- clock-0.7.2
- constrained-dynamic-0.1.0.0
- floskell-0.10.2
# - ghcide-0.1.0
- ghc-check-0.3.0.1
- ghc-lib-parser-8.10.1.20200412
- ghc-lib-parser-ex-8.10.0.4
- haddock-library-1.8.0
- haskell-lsp-0.22.0.0
- haskell-lsp-types-0.22.0.0
- haskell-src-exts-1.21.1
Expand Down
11 changes: 6 additions & 5 deletions stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-14.22
resolver: lts-14.27 # Last 8.6.5

packages:
- .
Expand All @@ -7,11 +7,9 @@ packages:
extra-deps:
- ansi-terminal-0.10.2
- base-compat-0.11.0
- brittany-0.12.1.1
- butcher-1.3.3.1
# - cabal-helper-1.0.0.0
- github: DanielG/cabal-helper
commit: 5b85a4b9e1c6463c94ffa595893ad02c9a3d2ec3
- Cabal-3.0.2.0
- cabal-helper-1.1.0.0
- cabal-plan-0.6.2.0
- clock-0.7.2
- extra-1.7.1
Expand All @@ -21,11 +19,13 @@ extra-deps:
- ghc-check-0.3.0.1
- ghc-lib-parser-8.10.1.20200412
- ghc-lib-parser-ex-8.10.0.4
- haddock-api-2.22.0@rev:1
- haddock-library-1.8.0
- haskell-lsp-0.22.0.0
- haskell-lsp-types-0.22.0.0
- hie-bios-0.5.0
- indexed-profunctors-0.1
- lens-4.18
- lsp-test-0.10.3.0
- monad-dijkstra-0.1.1.2
- opentelemetry-0.4.0
Expand All @@ -41,6 +41,7 @@ extra-deps:
commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
- tasty-rerun-1.1.17
- temporary-1.2.1.1
- type-equality-1
- topograph-1

flags:
Expand Down