Merge pull request #672 from berberman/patch-misc

correct tactic plugin package metadata and cabal.hie.yaml/stack.hie.yaml
haskell · Dec 14, 2020 · 60f811c · 60f811c
2 parents d30ec19 + 2fd380d
commit 60f811c
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -685,16 +685,16 @@ templates.
 #### Using Cabal
 
 ```shell
-$ cp hie.yaml.cbl hie.yaml
-$ cp install/hie.yaml.cbl install/hie.yaml
+$ cp hie-cabal.yaml hie.yaml
+$ cp install/hie-cabal.yaml install/hie.yaml
 ```
 
 #### Using Stack
 
 ```shell
-$ cp hie.yaml.stack hie.yaml
-$ cp install/hie.yaml.stack install/hie.yaml
-$ cp ghcide/hie.yaml.stack ghcide/hie.yaml
+$ cp hie-stack.yaml hie.yaml
+$ cp install/hie-stack.yaml install/hie.yaml
+$ cp ghcide/hie-stack.yaml ghcide/hie.yaml
 $ stack build --test --no-run-tests
 $ cd install
 $ stack build

diff --git a/hie.yaml.cbl → hie-cabal.yaml b/hie.yaml.cbl → hie-cabal.yaml
@@ -25,9 +25,6 @@ cradle:
             - path: "./plugins/default/src"
               component: "haskell-language-server:exe:haskell-language-server"
 
-            - path: "./plugins/tactics/src"
-              component: "lib:hls-tactics-plugin"
-
             - path: "./exe/Wrapper.hs"
               component: "haskell-language-server:exe:haskell-language-server-wrapper"
 
@@ -44,7 +41,21 @@ cradle:
               component: "ghcide:exe:ghcide"
 
             - path: "./hls-plugin-api/src"
-              component: "hls-plugin-api:lib:hls-plugin-api"
+              component: "hls-plugin-api"
+
+# Plugins:
+
+            - path: "./plugins/tactics/src"
+              component: "hls-tactics-plugin:lib:hls-tactics-plugin"
+
+            - path: "./plugins/tactics/test"
+              component: "hls-tactics-plugin:test:tests"
 
             - path: "./plugins/hls-hlint-plugin/src"
-              component: "lib:hls-hlint-plugin"
+              component: "hls-hlint-plugin"
+
+            - path: "./plugins/hls-retrie-plugin/src"
+              component: "hls-retrie-plugin"
+
+            - path: "./plugins/hls-explicit-imports-plugin/src"
+              component: "hls-explicit-imports-plugin"
diff --git a/hie.yaml.stack → hie-stack.yaml b/hie.yaml.stack → hie-stack.yaml
@@ -36,15 +36,17 @@ cradle:
             - path: "./test/wrapper"
               component: "haskell-language-server:test:wrapper-test"
 
+            - path: "./hls-plugin-api/src"
+              component: "hls-plugin-api:lib"
+
+# Plugins:
+
             - path: "./plugins/hls-explicit-imports-plugin/src"
               component: "hls-explicit-imports-plugin:lib"
 
             - path: "./plugins/hls-hlint-plugin/src"
               component: "hls-hlint-plugin:lib"
 
-            - path: "./hls-plugin-api/src"
-              component: "hls-plugin-api:lib"
-
             - path: "./plugins/hls-retrie-plugin/src"
               component: "hls-retrie-plugin:lib"
 

diff --git a/install/hie.yaml.cbl → install/hie-cabal.yaml b/install/hie.yaml.cbl → install/hie-cabal.yaml
diff --git a/install/hie.yaml.stack → install/hie-stack.yaml b/install/hie.yaml.stack → install/hie-stack.yaml
diff --git a/plugins/tactics/hls-tactics-plugin.cabal b/plugins/tactics/hls-tactics-plugin.cabal
@@ -2,12 +2,8 @@ cabal-version:      2.2
 category:           Development
 name:               hls-tactics-plugin
 version:            0.5.1.0
-synopsis:           LSP server for GHC
-description:
-  Please see the README on GitHub at <https://github.com/isovector/hls-tactics-plugin#readme>
-
-homepage:           https://github.com/isovector/hls-tactics-plugin#readme
-bug-reports:        https://github.com/isovector/hls-tactics-plugin/issues
+synopsis:           Tactics plugin for Haskell Language Server
+description:        Please see README.md
 author:             Sandy Maguire, Reed Mullanix
 maintainer:         [email protected]
 copyright:          Sandy Maguire, Reed Mullanix
@@ -23,10 +19,6 @@ flag pedantic
   default:     False
   manual:      True
 
-source-repository head
-  type:     git
-  location: https://github.com/isovector/hls-tactics-plugin
-
 library
   hs-source-dirs:   src
   exposed-modules: