From aaa3c919194549d0abf6c2fde9116ad07277b9af Mon Sep 17 00:00:00 2001 From: jneira Date: Wed, 13 May 2020 14:38:00 +0200 Subject: [PATCH 01/12] Use cabal-helper-1.1 in stack config --- stack-8.6.4.yaml | 17 ++++++++++++----- stack-8.6.5.yaml | 8 +++++--- stack-8.8.2.yaml | 4 +--- stack-8.8.3.yaml | 4 +--- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index e942572698..67fb973b22 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -5,12 +5,13 @@ 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..1a212e9ab7 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -9,9 +9,8 @@ extra-deps: - 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 +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..cdf6784ddb 100644 --- a/stack-8.8.3.yaml +++ b/stack-8.8.3.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 From 987c6e82b7a3f81a33659f8ae6b69147cd9d2744 Mon Sep 17 00:00:00 2001 From: jneira Date: Wed, 13 May 2020 14:38:26 +0200 Subject: [PATCH 02/12] Use cabal-helper-1.1 in default stack.yaml --- stack.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/stack.yaml b/stack.yaml index acf76388f1..1a212e9ab7 100644 --- a/stack.yaml +++ b/stack.yaml @@ -9,9 +9,8 @@ extra-deps: - 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 +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: From fac8555774bc5e8407c2d5aea5ec3ff3c9ac2c7c Mon Sep 17 00:00:00 2001 From: jneira Date: Wed, 13 May 2020 14:39:01 +0200 Subject: [PATCH 03/12] Unify cabal.project config --- cabal.project | 18 ++++++++++++++---- cabal.project-8.10.1 | 32 -------------------------------- 2 files changed, 14 insertions(+), 36 deletions(-) delete mode 100644 cabal.project-8.10.1 diff --git a/cabal.project b/cabal.project index 976451f13d..31f511c29c 100644 --- a/cabal.project +++ b/cabal.project @@ -4,13 +4,23 @@ 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 + +-- TODO adapt code to last opentelemetry-0.4.0 +constraints: opentelemetry == 0.3.2 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 From 8c683541e702bc3ed2cf8ff9dde7f49700a7e914 Mon Sep 17 00:00:00 2001 From: jneira Date: Wed, 13 May 2020 14:39:19 +0200 Subject: [PATCH 04/12] Use cabal-helper-1.1 in cabal config --- haskell-language-server.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 2d50a75f985f091c0e76ff37e4053686cb883ed8 Mon Sep 17 00:00:00 2001 From: jneira Date: Wed, 13 May 2020 14:39:38 +0200 Subject: [PATCH 05/12] Add stack-8.10.1.yaml --- stack-8.10.1.yaml | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 stack-8.10.1.yaml diff --git a/stack-8.10.1.yaml b/stack-8.10.1.yaml new file mode 100644 index 0000000000..edbe385b9e --- /dev/null +++ b/stack-8.10.1.yaml @@ -0,0 +1,43 @@ +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 +- opentelemetry-0.3.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 From 49307ea3ed020fd6eaa1eeda49e6007c745bd4af Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 14 May 2020 07:29:03 +0200 Subject: [PATCH 06/12] Remove restriction over opentelemetry --- cabal.project | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cabal.project b/cabal.project index 31f511c29c..4b23567f98 100644 --- a/cabal.project +++ b/cabal.project @@ -7,7 +7,7 @@ source-repository-package location: https://github.com/wz1000/shake tag: fb3859dca2e54d1bbb2c873e68ed225fa179fbef --- See https://github.com/haskell-hvr/cabal-plan/pull/55 +-- See https://github.com/haskell-hvr/cabal-plan/pull/55 source-repository-package type: git location: https://github.com/peti/cabal-plan @@ -19,9 +19,6 @@ source-repository-package location: https://github.com/jneira/floskell tag: 78f888f46dae96922d855af1e6a00ea6bb856987 --- TODO adapt code to last opentelemetry-0.4.0 -constraints: opentelemetry == 0.3.2 - tests: true documentation: true From ce4845db0586777149ff7d8eecafc5734145d600 Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 14 May 2020 07:29:25 +0200 Subject: [PATCH 07/12] Remove trailing whitespace --- stack-8.10.1.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stack-8.10.1.yaml b/stack-8.10.1.yaml index edbe385b9e..914f3223f7 100644 --- a/stack-8.10.1.yaml +++ b/stack-8.10.1.yaml @@ -8,7 +8,7 @@ packages: extra-deps: - Cabal-3.2.0.0 - cabal-helper-1.1.0.0 -# See https://github.com/haskell-hvr/cabal-plan/pull/55 +# See https://github.com/haskell-hvr/cabal-plan/pull/55 - github: peti/cabal-plan commit: 894b76c0b6bf8f7d2f881431df1f13959a8fce87 - clock-0.7.2 @@ -30,7 +30,7 @@ extra-deps: flags: haskell-language-server: pedantic: true - # We want to let agpl be the default value in .cabal (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 From 9791dc7fa77a0b5f882fbff730931632c43774e9 Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 14 May 2020 10:35:23 +0200 Subject: [PATCH 08/12] Be consistent with resolver comment --- stack-8.6.4.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index 67fb973b22..1cb36fefe8 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -1,4 +1,4 @@ -resolver: lts-13.19 # GHC 8.6.4 +resolver: lts-13.19 # Last 8.6.4 packages: - . From 1ba4ab38fe9e4f3fc64dde09841c9b7ee61f5365 Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 14 May 2020 10:36:22 +0200 Subject: [PATCH 09/12] Use last lts for ghc-8.6.5 --- stack-8.6.5.yaml | 3 +-- stack.yaml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index 1a212e9ab7..f1b8d73c23 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,7 +7,6 @@ packages: extra-deps: - ansi-terminal-0.10.2 - base-compat-0.11.0 -- brittany-0.12.1.1 - butcher-1.3.3.1 - Cabal-3.0.2.0 - cabal-helper-1.1.0.0 diff --git a/stack.yaml b/stack.yaml index 1a212e9ab7..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,7 +7,6 @@ packages: extra-deps: - ansi-terminal-0.10.2 - base-compat-0.11.0 -- brittany-0.12.1.1 - butcher-1.3.3.1 - Cabal-3.0.2.0 - cabal-helper-1.1.0.0 From 456d890abeb2fe84e5b37074f044d59cabd56c7f Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 14 May 2020 10:36:59 +0200 Subject: [PATCH 10/12] Use last lts for ghc-8.8.3 --- stack-8.8.3.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml index cdf6784ddb..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: - . @@ -15,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 From 6f8820d5d6abf362e1b9759ece2bd3431e18b721 Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 14 May 2020 10:37:43 +0200 Subject: [PATCH 11/12] Use opentelemetry last version 0.4 --- stack-8.10.1.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/stack-8.10.1.yaml b/stack-8.10.1.yaml index 914f3223f7..4665200055 100644 --- a/stack-8.10.1.yaml +++ b/stack-8.10.1.yaml @@ -20,7 +20,6 @@ extra-deps: - ghc-exactprint-0.6.3 - lens-4.19.1 - monad-dijkstra-0.1.1.2 -- opentelemetry-0.3.2 - optics-core-0.3 - github: wz1000/shake commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef From 7c7b786c80316a7533ba3624b474af1cac2adcf5 Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 14 May 2020 10:57:15 +0200 Subject: [PATCH 12/12] We need rev:2 for brittany --- stack-8.6.5.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index f1b8d73c23..e6da9d6237 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -7,6 +7,7 @@ packages: extra-deps: - ansi-terminal-0.10.2 - base-compat-0.11.0 +- brittany-0.12.1.1@rev:2 - butcher-1.3.3.1 - Cabal-3.0.2.0 - cabal-helper-1.1.0.0