From cecd7c49bf55f99f9e6847c90abcef77369899f7 Mon Sep 17 00:00:00 2001 From: jneira Date: Tue, 12 May 2020 23:00:53 +0200 Subject: [PATCH 1/5] Use cabal-helper-1.1 in stack config --- stack-8.4.2.yaml | 12 ++++++++---- stack-8.4.3.yaml | 12 ++++++++---- stack-8.4.4.yaml | 12 ++++++++---- stack-8.6.4.yaml | 14 ++++++++++---- stack-8.6.5.yaml | 9 +++++---- stack-8.8.2.yaml | 5 ++--- stack-8.8.3.yaml | 7 +++---- stack.yaml | 4 +--- 8 files changed, 45 insertions(+), 30 deletions(-) diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml index 2bcbd5d9d..3801e7013 100644 --- a/stack-8.4.2.yaml +++ b/stack-8.4.2.yaml @@ -13,9 +13,9 @@ extra-deps: - bifunctors-5.5.6 - brittany-0.12.1.1 - bytestring-trie-0.2.5.0 -# - cabal-helper-1.0.0.0 -- github: DanielG/cabal-helper - commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd +- Cabal-3.0.2.0 +- cabal-doctest-1.0.8 +- cabal-helper-1.1.0.0 - cabal-plan-0.5.0.0 - connection-0.3.1 # for network and network-bsd - constrained-dynamic-0.1.0.0 @@ -27,8 +27,10 @@ extra-deps: - ghc-exactprint-0.6.2 # for HaRe - ghc-lib-parser-8.8.2.20200205 - ghc-lib-parser-ex-8.8.5.3 -- haddock-api-2.20.0 +- ghc-paths-0.1.0.12 +- haddock-api-2.20.0@rev:1 - haddock-library-1.6.0 +- happy-1.19.12 - haskell-lsp-0.20.0.0 - haskell-lsp-types-0.20.0.0 - haskell-src-exts-1.22.0 @@ -77,6 +79,8 @@ flags: hie-plugin-api: pedantic: true +# allow-newer: true + nix: packages: [ icu libcxx zlib ] diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml index 29319e028..18b1f96bb 100644 --- a/stack-8.4.3.yaml +++ b/stack-8.4.3.yaml @@ -18,9 +18,9 @@ extra-deps: - bifunctors-5.5.7 - brittany-0.12.1.1 - bytestring-trie-0.2.5.0 -# - cabal-helper-1.0.0.0 -- github: DanielG/cabal-helper - commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd +- Cabal-3.0.2.0 +- cabal-doctest-1.0.8 +- cabal-helper-1.1.0.0 - cabal-plan-0.6.2.0 - connection-0.3.1 # for network and network-bsd - constrained-dynamic-0.1.0.0 @@ -33,12 +33,14 @@ extra-deps: - ghc-exactprint-0.6.2 # for HaRe - ghc-lib-parser-8.8.2.20200205 - ghc-lib-parser-ex-8.8.5.3 -- haddock-api-2.20.0 +- ghc-paths-0.1.0.12 +- haddock-api-2.20.0@rev:1 - haddock-library-1.6.0 - haskell-lsp-0.20.0.0 - haskell-lsp-types-0.20.0.0 - haskell-src-exts-1.22.0 - haskell-src-exts-util-0.2.5 +- happy-1.19.12 - hie-bios-0.5.0 - hlint-2.2.11 - hoogle-5.0.17.15 @@ -95,6 +97,8 @@ flags: hie-plugin-api: pedantic: true +# allow-newer: true + nix: packages: [icu libcxx zlib] diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml index 4506146e5..270ee652e 100644 --- a/stack-8.4.4.yaml +++ b/stack-8.4.4.yaml @@ -12,9 +12,9 @@ extra-deps: - bifunctors-5.5.6 - brittany-0.12.1.1 - bytestring-trie-0.2.5.0 -# - cabal-helper-1.0.0.0 -- github: DanielG/cabal-helper - commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd +- Cabal-3.0.2.0 +- cabal-doctest-1.0.8 +- cabal-helper-1.1.0.0 - cabal-plan-0.5.0.0 - connection-0.3.1 # for network and network-bsd - constrained-dynamic-0.1.0.0 @@ -26,8 +26,10 @@ extra-deps: - ghc-exactprint-0.6.2 # for HaRe - ghc-lib-parser-8.8.2.20200205 - ghc-lib-parser-ex-8.8.5.3 -- haddock-api-2.20.0 +- ghc-paths-0.1.0.12 +- haddock-api-2.20.0@rev:1 - haddock-library-1.6.0 +- happy-1.19.12 - haskell-lsp-0.20.0.0 - haskell-lsp-types-0.20.0.0 - haskell-src-exts-1.22.0 @@ -75,6 +77,8 @@ flags: hie-plugin-api: pedantic: true +# allow-newer: true + nix: packages: [icu libcxx zlib] diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index 13adc304f..4bd7eb167 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -11,9 +11,9 @@ extra-deps: - brittany-0.12.1.1 - butcher-1.3.2.1 - bytestring-trie-0.2.5.0 -# - cabal-helper-1.0.0.0 -- github: DanielG/cabal-helper - commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd +- 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 - extra-1.6.21 @@ -21,7 +21,9 @@ extra-deps: - ghc-exactprint-0.6.2 # for HaRe - ghc-lib-parser-8.8.2.20200205 - ghc-lib-parser-ex-8.8.5.3 -- haddock-api-2.22.0 +- ghc-paths-0.1.0.12 +- haddock-api-2.22.0@rev:1 +- happy-1.19.12 - haskell-lsp-0.20.0.0 - haskell-lsp-types-0.20.0.0 - haskell-src-exts-1.22.0 @@ -29,7 +31,9 @@ extra-deps: - hlint-2.2.11 - hoogle-5.0.17.15 - hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170 +- lens-4.18 - lsp-test-0.10.1.0 +- microlens-th-0.4.2.3@rev:1 - monad-dijkstra-0.1.1.2@rev:1 - monad-memo-0.4.1 - multistate-0.8.0.1 @@ -39,7 +43,9 @@ extra-deps: - rope-utf16-splay-0.3.1.0 - syz-0.2.0.0 - temporary-1.2.1.1 +- th-abstraction-0.3.1.0 - time-compat-1.9.2.2 +- type-equality-1 - unix-compat-0.5.2 - unliftio-0.2.12.1 - unliftio-core-0.2.0.1 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index 5a235550e..bf14833cc 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -13,9 +13,8 @@ extra-deps: - base-compat-0.11.1 - brittany-0.12.1.1 - bytestring-trie-0.2.5.0 -# - cabal-helper-1.0.0.0 -- github: DanielG/cabal-helper - commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd +- Cabal-3.0.2.0 +- cabal-helper-1.1.0.0 - cabal-plan-0.6.2.0 - clock-0.7.2 - constrained-dynamic-0.1.0.0 @@ -24,7 +23,7 @@ extra-deps: - ghc-exactprint-0.6.2 # for HaRe - ghc-lib-parser-8.8.2.20200205 - ghc-lib-parser-ex-8.8.5.3 -- haddock-api-2.22.0 +- haddock-api-2.22.0@rev:1 - haskell-lsp-0.20.0.0 - haskell-lsp-types-0.20.0.0 - haskell-src-exts-1.22.0 @@ -33,6 +32,7 @@ extra-deps: - hoogle-5.0.17.15 - hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170 - indexed-profunctors-0.1 +- lens-4.18 - lsp-test-0.10.1.0 - monad-dijkstra-0.1.1.2 - optics-core-0.2 @@ -43,6 +43,7 @@ extra-deps: - semialign-1.1 - temporary-1.2.1.1 - topograph-1 +- type-equality-1 - unliftio-0.2.12.1 - unliftio-core-0.2.0.1 diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml index 055a0e27b..52aacabe7 100644 --- a/stack-8.8.2.yaml +++ b/stack-8.8.2.yaml @@ -9,9 +9,8 @@ extra-deps: - apply-refact-0.7.0.0 - brittany-0.12.1.1 - bytestring-trie-0.2.5.0 -# - cabal-helper-1.0.0.0 -- github: DanielG/cabal-helper - commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd +- Cabal-3.0.2.0 +- 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 52c956948..6a87a97f7 100644 --- a/stack-8.8.3.yaml +++ b/stack-8.8.3.yaml @@ -7,10 +7,9 @@ extra-deps: # - ./submodules/HaRe - apply-refact-0.7.0.0 -- bytestring-trie-0.2.5.0@rev:1 -# - cabal-helper-1.0.0.0 -- github: DanielG/cabal-helper - commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd +- bytestring-trie-0.2.5.0@rev1 +- Cabal-3.0.2.0 +- cabal-helper-1.1.0.0 - clock-0.7.2 - constrained-dynamic-0.1.0.0 - floskell-0.10.2 diff --git a/stack.yaml b/stack.yaml index 72e32158b..fb7cd6180 100644 --- a/stack.yaml +++ b/stack.yaml @@ -9,9 +9,7 @@ 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: a18bbb2af92e9b4337e7f930cb80754f2408bcfd +- cabal-helper-1.1.0.0 - clock-0.7.2 - constrained-dynamic-0.1.0.0 - floskell-0.10.2 From bf3ce5096ab4ab846593314125f2b92f09db3b0c Mon Sep 17 00:00:00 2001 From: jneira Date: Tue, 12 May 2020 23:02:03 +0200 Subject: [PATCH 2/5] Add cabal-helper-1.1 to cabal config --- cabal.project | 10 +++------- haskell-ide-engine.cabal | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/cabal.project b/cabal.project index c5850cb31..803bb6af0 100644 --- a/cabal.project +++ b/cabal.project @@ -4,11 +4,6 @@ packages: -- ./submodules/HaRe -source-repository-package - type: git - location: https://github.com/DanielG/cabal-helper.git - tag: a18bbb2af92e9b4337e7f930cb80754f2408bcfd - tests: true package haskell-ide-engine @@ -17,8 +12,9 @@ package haskell-ide-engine -- Match the flag settings we use in stac builds constraints: haskell-ide-engine +pedantic, - hie-plugin-api +pedantic + hie-plugin-api +pedantic, + ghc-lib-parser == 8.8.2.20200205 write-ghc-environment-files: never -index-state: 2020-05-10T18:26:01Z \ No newline at end of file +index-state: 2020-05-12T16:28:12Z diff --git a/haskell-ide-engine.cabal b/haskell-ide-engine.cabal index e532b56a1..cf5b8f3ce 100644 --- a/haskell-ide-engine.cabal +++ b/haskell-ide-engine.cabal @@ -61,7 +61,7 @@ library , brittany , bytestring , Cabal - , cabal-helper >= 1.0 && < 1.1 + , cabal-helper >= 1.1 && < 1.2 , containers , data-default , directory From e45ea115c5ded6deea90e8921ebac810b7a14478 Mon Sep 17 00:00:00 2001 From: jneira Date: Tue, 12 May 2020 23:02:55 +0200 Subject: [PATCH 3/5] Use Cabal version in CPP conditions instead GHC --- src/Haskell/Ide/Engine/Plugin/Package.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Haskell/Ide/Engine/Plugin/Package.hs b/src/Haskell/Ide/Engine/Plugin/Package.hs index 481cb7224..ea0c0a2ad 100644 --- a/src/Haskell/Ide/Engine/Plugin/Package.hs +++ b/src/Haskell/Ide/Engine/Plugin/Package.hs @@ -27,7 +27,8 @@ import qualified Data.Text.Encoding as T import Data.Maybe #if __GLASGOW_HASKELL__ < 808 import Data.Monoid ((<>)) -#else +#endif +#if MIN_VERSION_Cabal(3,0,0) import qualified Data.Set as S #endif #if MIN_VERSION_Cabal(2,2,0) @@ -301,7 +302,7 @@ editCabalPackage file modulePath pkgName fileMap = do -- Add it to the bottom of the dependencies list -- TODO: we could sort the depencies and then insert it, -- or insert it in order iff the list is already sorted. -#if __GLASGOW_HASKELL__ >= 808 +#if MIN_VERSION_Cabal(3,0,0) newDeps = oldDeps ++ [Dependency (mkPackageName (T.unpack dep)) anyVersion S.empty] #else newDeps = oldDeps ++ [Dependency (mkPackageName (T.unpack dep)) anyVersion] From 40fdd59d26143ca307c6aeb0853073a03650644d Mon Sep 17 00:00:00 2001 From: jneira Date: Wed, 13 May 2020 15:12:38 +0200 Subject: [PATCH 4/5] Use correct rev:n instead sha --- stack-8.4.2.yaml | 2 +- stack-8.4.3.yaml | 2 +- stack-8.4.4.yaml | 2 +- stack-8.6.4.yaml | 2 +- stack-8.6.5.yaml | 2 +- stack-8.8.2.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml index 3801e7013..1b7adb16a 100644 --- a/stack-8.4.2.yaml +++ b/stack-8.4.2.yaml @@ -38,7 +38,7 @@ extra-deps: - hie-bios-0.5.0 - hlint-2.2.11 - hoogle-5.0.17.15 -- hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170 +- hsimport-0.11.0@rev:2 - hslogger-1.3.1.0 - invariant-0.5.3 - lens-4.18.1 diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml index 18b1f96bb..2955c828b 100644 --- a/stack-8.4.3.yaml +++ b/stack-8.4.3.yaml @@ -44,7 +44,7 @@ extra-deps: - hie-bios-0.5.0 - hlint-2.2.11 - hoogle-5.0.17.15 -- hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170 +- hsimport-0.11.0@rev:2 - hslogger-1.3.1.0 - hspec-2.7.1 - hspec-core-2.7.1 diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml index 270ee652e..0c203a3e3 100644 --- a/stack-8.4.4.yaml +++ b/stack-8.4.4.yaml @@ -37,7 +37,7 @@ extra-deps: - hie-bios-0.5.0 - hlint-2.2.11 - hoogle-5.0.17.15 -- hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170 +- hsimport-0.11.0@rev:2 - hslogger-1.3.1.0 - invariant-0.5.3 - lens-4.18.1 diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index 4bd7eb167..011ed7af8 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -30,7 +30,7 @@ extra-deps: - hie-bios-0.5.0 - hlint-2.2.11 - hoogle-5.0.17.15 -- hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170 +- hsimport-0.11.0@rev:2 - lens-4.18 - lsp-test-0.10.1.0 - microlens-th-0.4.2.3@rev:1 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index bf14833cc..429f266aa 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -30,7 +30,7 @@ extra-deps: - hie-bios-0.5.0 - hlint-2.2.11 - hoogle-5.0.17.15 -- hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170 +- hsimport-0.11.0@rev:2 - indexed-profunctors-0.1 - lens-4.18 - lsp-test-0.10.1.0 diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml index 52aacabe7..68348ae4e 100644 --- a/stack-8.8.2.yaml +++ b/stack-8.8.2.yaml @@ -24,7 +24,7 @@ extra-deps: - hie-bios-0.5.0 - hlint-2.2.11 - hoogle-5.0.17.15 -- hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170 +- hsimport-0.11.0@rev:2 - ilist-0.3.1.0 - monad-dijkstra-0.1.1.2 - ormolu-0.0.3.1 From ae315a3648b64b962939b488552d945e2c151407 Mon Sep 17 00:00:00 2001 From: jneira Date: Wed, 13 May 2020 15:14:50 +0200 Subject: [PATCH 5/5] Correct revision again (lost in rebase) --- stack-8.8.3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml index 6a87a97f7..9200adfe1 100644 --- a/stack-8.8.3.yaml +++ b/stack-8.8.3.yaml @@ -7,7 +7,7 @@ extra-deps: # - ./submodules/HaRe - apply-refact-0.7.0.0 -- bytestring-trie-0.2.5.0@rev1 +- bytestring-trie-0.2.5.0@rev:1 - Cabal-3.0.2.0 - cabal-helper-1.1.0.0 - clock-0.7.2