diff --git a/cabal.project b/cabal.project index 976451f13d..4b23567f98 100644 --- a/cabal.project +++ b/cabal.project @@ -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 diff --git a/cabal.project-8.10.1 b/cabal.project-8.10.1 deleted file mode 100644 index 12685d74b9..0000000000 --- a/cabal.project-8.10.1 +++ /dev/null @@ -1,32 +0,0 @@ -packages: - ./ - ghcide - -source-repository-package - type: git - location: https://github.com/DanielG/cabal-helper.git - tag: 5b85a4b9e1c6463c94ffa595893ad02c9a3d2ec3 - -source-repository-package - type: git - location: https://github.com/mpickering/hie-bios.git - tag: 501cc337691cc9da45ff12db46d8b3af9a2a0eda - -source-repository-package - type: git - location: https://github.com/wz1000/shake - tag: fb3859dca2e54d1bbb2c873e68ed225fa179fbef - -tests: true -documentation: false - -package haskell-language-server - test-show-details: direct -package ghcide - test-show-details: direct - -write-ghc-environment-files: never - -index-state: 2020-05-05T17:33:00Z - -allow-newer: cabal-plan:base,floskell:base,floskell:ghc-prim,tasty-rerun:base \ No newline at end of file diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index b3453f3d06..16ec322d5e 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -62,7 +62,7 @@ library , binary , bytestring , Cabal - , cabal-helper >= 1.0 + , cabal-helper >= 1.1 , containers , data-default , deepseq diff --git a/stack-8.10.1.yaml b/stack-8.10.1.yaml new file mode 100644 index 0000000000..4665200055 --- /dev/null +++ b/stack-8.10.1.yaml @@ -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 \ No newline at end of file diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index e942572698..1cb36fefe8 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -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 @@ -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 @@ -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 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index acf76388f1..e6da9d6237 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -1,4 +1,4 @@ -resolver: lts-14.22 +resolver: lts-14.27 # Last 8.6.5 packages: - . @@ -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 @@ -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 @@ -41,6 +42,7 @@ extra-deps: commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef - tasty-rerun-1.1.17 - temporary-1.2.1.1 +- type-equality-1 - topograph-1 flags: diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml index d303395aa2..4b2acdc525 100644 --- a/stack-8.8.2.yaml +++ b/stack-8.8.2.yaml @@ -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 diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml index bea720472b..ce8fd7e26c 100644 --- a/stack-8.8.3.yaml +++ b/stack-8.8.3.yaml @@ -1,4 +1,4 @@ -resolver: lts-15.10 +resolver: lts-15.12 packages: - . @@ -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 @@ -17,7 +15,6 @@ extra-deps: - 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 diff --git a/stack.yaml b/stack.yaml index acf76388f1..f1b8d73c23 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-14.22 +resolver: lts-14.27 # Last 8.6.5 packages: - . @@ -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 @@ -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 @@ -41,6 +41,7 @@ extra-deps: commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef - tasty-rerun-1.1.17 - temporary-1.2.1.1 +- type-equality-1 - topograph-1 flags: