Add unmerged changes as extra dependencies

Jana Chadt · VeryMilkyJoe · commit 7802d6d59634 · 2021-07-29T14:07:41.000+02:00
diff --git a/cabal.project b/cabal.project
@@ -24,6 +24,7 @@ packages:
          ./plugins/hls-ormolu-plugin
          ./plugins/hls-call-hierarchy-plugin
          ./plugins/hls-cabal-fmt-plugin
+
 tests: true
 
 package *
@@ -36,6 +37,19 @@ source-repository-package
   location: https://github.com/hsyl20/ghc-api-compat
   tag: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
 
+-- stylish haskell
+source-repository-package
+  type: git
+  location: https://github.com/VeryMilkyJoe/stylish-haskell
+  tag: 9279aad535de624fca990ed50f010a1743c0043a
+
+-- cabal-fmt
+source-repository-package
+  type: git
+  location: https://github.com/VeryMilkyJoe/cabal-fmt
+  tag: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
+
+
 write-ghc-environment-files: never
 
 index-state: 2021-07-14T20:31:09Z
diff --git a/stack-8.10.2.yaml b/stack-8.10.2.yaml
@@ -20,6 +20,8 @@ packages:
   - ./plugins/hls-tactics-plugin
   - ./plugins/hls-brittany-plugin
   - ./plugins/hls-stylish-haskell-plugin
+  - ./plugins/hls-cabal-fmt-plugin
+
   - ./plugins/hls-floskell-plugin
   - ./plugins/hls-fourmolu-plugin
   - ./plugins/hls-pragmas-plugin
@@ -40,6 +42,12 @@ extra-deps:
   - # ghc-api-compat-8.6
     github: hsyl20/ghc-api-compat
     commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
+  - # stylish haskell
+    github: VeryMilkyJoe/stylish-haskell
+    commit: 9279aad535de624fca990ed50f010a1743c0043a
+  - # cabal-fmt
+    github: VeryMilkyJoe/cabal-fmt
+    commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
   - ghc-check-0.5.0.4
   - ghc-exactprint-0.6.4
   - ghc-lib-8.10.4.20210206
diff --git a/stack-8.10.3.yaml b/stack-8.10.3.yaml
@@ -20,6 +20,7 @@ packages:
   - ./plugins/hls-tactics-plugin
   - ./plugins/hls-brittany-plugin
   - ./plugins/hls-stylish-haskell-plugin
+  - ./plugins/hls-cabal-fmt-plugin
   - ./plugins/hls-floskell-plugin
   - ./plugins/hls-fourmolu-plugin
   - ./plugins/hls-pragmas-plugin
@@ -40,6 +41,12 @@ extra-deps:
   - # ghc-api-compat-8.6
     github: hsyl20/ghc-api-compat
     commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
+  - # stylish haskell
+    github: VeryMilkyJoe/stylish-haskell
+    commit: 9279aad535de624fca990ed50f010a1743c0043a
+  - # cabal-fmt
+    github: VeryMilkyJoe/cabal-fmt
+    commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
   - ghc-check-0.5.0.4
   - ghc-exactprint-0.6.4
   - ghc-lib-8.10.4.20210206
diff --git a/stack-8.10.4.yaml b/stack-8.10.4.yaml
@@ -20,6 +20,7 @@ packages:
   - ./plugins/hls-tactics-plugin
   - ./plugins/hls-brittany-plugin
   - ./plugins/hls-stylish-haskell-plugin
+  - ./plugins/hls-cabal-fmt-plugin
   - ./plugins/hls-floskell-plugin
   - ./plugins/hls-fourmolu-plugin
   - ./plugins/hls-pragmas-plugin
@@ -40,6 +41,12 @@ extra-deps:
   - # ghc-api-compat-8.6
     github: hsyl20/ghc-api-compat
     commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
+  - # stylish haskell
+    github: VeryMilkyJoe/stylish-haskell
+    commit: 9279aad535de624fca990ed50f010a1743c0043a
+  - # cabal-fmt
+    github: VeryMilkyJoe/cabal-fmt
+    commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
   - ghc-check-0.5.0.4
   - ghc-exactprint-0.6.4
   - ghc-source-gen-0.4.1.0
diff --git a/stack-8.10.5.yaml b/stack-8.10.5.yaml
@@ -22,6 +22,7 @@ packages:
   - ./plugins/hls-tactics-plugin
   - ./plugins/hls-brittany-plugin
   - ./plugins/hls-stylish-haskell-plugin
+  - ./plugins/hls-cabal-fmt-plugin
   - ./plugins/hls-floskell-plugin
   - ./plugins/hls-fourmolu-plugin
   - ./plugins/hls-pragmas-plugin
@@ -42,6 +43,12 @@ extra-deps:
   - # ghc-api-compat-8.6
     github: hsyl20/ghc-api-compat
     commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
+  - # stylish haskell
+    github: VeryMilkyJoe/stylish-haskell
+    commit: 9279aad535de624fca990ed50f010a1743c0043a
+  - # cabal-fmt
+    github: VeryMilkyJoe/cabal-fmt
+    commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
   - ghc-check-0.5.0.4
   - ghc-exactprint-0.6.4
   - ghc-source-gen-0.4.1.0
diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml
@@ -21,6 +21,7 @@ packages:
   - ./plugins/hls-tactics-plugin
   - ./plugins/hls-brittany-plugin
   - ./plugins/hls-stylish-haskell-plugin
+  - ./plugins/hls-cabal-fmt-plugin
   - ./plugins/hls-floskell-plugin
   - ./plugins/hls-fourmolu-plugin
   - ./plugins/hls-pragmas-plugin
@@ -47,6 +48,12 @@ extra-deps:
   - # ghc-api-compat-8.6
     github: hsyl20/ghc-api-compat
     commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
+  - # stylish haskell
+    github: VeryMilkyJoe/stylish-haskell
+    commit: 9279aad535de624fca990ed50f010a1743c0043a
+  - # cabal-fmt
+    github: VeryMilkyJoe/cabal-fmt
+    commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
   - ghc-check-0.5.0.4
   - ghc-events-0.13.0
   - ghc-exactprint-0.6.4
diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml
@@ -20,6 +20,7 @@ packages:
   - ./plugins/hls-tactics-plugin
   - ./plugins/hls-brittany-plugin
   - ./plugins/hls-stylish-haskell-plugin
+  - ./plugins/hls-cabal-fmt-plugin
   - ./plugins/hls-floskell-plugin
   - ./plugins/hls-fourmolu-plugin
   - ./plugins/hls-pragmas-plugin
@@ -48,6 +49,12 @@ extra-deps:
   - # ghc-api-compat-8.6
     github: hsyl20/ghc-api-compat
     commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
+  - # stylish haskell
+    github: VeryMilkyJoe/stylish-haskell
+    commit: 9279aad535de624fca990ed50f010a1743c0043a
+  - # cabal-fmt
+    github: VeryMilkyJoe/cabal-fmt
+    commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
   - ghc-check-0.5.0.4
   - ghc-events-0.13.0
   - ghc-exactprint-0.6.4
diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml
@@ -20,6 +20,7 @@ packages:
   - ./plugins/hls-tactics-plugin
   - ./plugins/hls-brittany-plugin
   - ./plugins/hls-stylish-haskell-plugin
+  - ./plugins/hls-cabal-fmt-plugin
   - ./plugins/hls-floskell-plugin
   - ./plugins/hls-fourmolu-plugin
   - ./plugins/hls-pragmas-plugin
@@ -42,6 +43,12 @@ extra-deps:
   - # ghc-api-compat-8.6
     github: hsyl20/ghc-api-compat
     commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
+  - # stylish haskell
+    github: VeryMilkyJoe/stylish-haskell
+    commit: 9279aad535de624fca990ed50f010a1743c0043a
+  - # cabal-fmt
+    github: VeryMilkyJoe/cabal-fmt
+    commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
   - ghc-check-0.5.0.4
   - ghc-exactprint-0.6.4
   - ghc-lib-8.10.4.20210206
diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml
@@ -20,6 +20,7 @@ packages:
   - ./plugins/hls-tactics-plugin
   - ./plugins/hls-brittany-plugin
   - ./plugins/hls-stylish-haskell-plugin
+  - ./plugins/hls-cabal-fmt-plugin
   - ./plugins/hls-floskell-plugin
   - ./plugins/hls-fourmolu-plugin
   - ./plugins/hls-pragmas-plugin
@@ -42,6 +43,12 @@ extra-deps:
   - # ghc-api-compat-8.6
     github: hsyl20/ghc-api-compat
     commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
+  - # stylish haskell
+    github: VeryMilkyJoe/stylish-haskell
+    commit: 9279aad535de624fca990ed50f010a1743c0043a
+  - # cabal-fmt
+    github: VeryMilkyJoe/cabal-fmt
+    commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
   - ghc-check-0.5.0.4
   - ghc-exactprint-0.6.4
   - ghc-lib-8.10.4.20210206
diff --git a/stack-9.0.1.yaml b/stack-9.0.1.yaml
@@ -21,6 +21,7 @@ packages:
   # - ./plugins/hls-tactics-plugin
   # - ./plugins/hls-brittany-plugin
   # - ./plugins/hls-stylish-haskell-plugin
+  # - ./plugins/hls-cabal-fmt-plugin
   # - ./plugins/hls-floskell-plugin
   # - ./plugins/hls-fourmolu-plugin
   - ./plugins/hls-pragmas-plugin
@@ -96,6 +97,15 @@ extra-deps:
   commit: ca23431a8dfa013992f9164ccc882a3277361f17
 # https://github.com/diagrams/active/pull/36
 
+- # stylish haskell
+  github: VeryMilkyJoe/stylish-haskell
+  commit: 9279aad535de624fca990ed50f010a1743c0043a
+# https://github.com/haskell/stylish-haskell/pull/375
+
+- # cabal-fmt
+  github: VeryMilkyJoe/cabal-fmt
+  commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
+# https://github.com/phadej/cabal-fmt/pull/33
 
 # benchmark dependency
 - github: HeinrichApfelmus/operational
diff --git a/stack.yaml b/stack.yaml
@@ -20,6 +20,7 @@ packages:
   - ./plugins/hls-tactics-plugin
   - ./plugins/hls-brittany-plugin
   - ./plugins/hls-stylish-haskell-plugin
+  - ./plugins/hls-cabal-fmt-plugin
   - ./plugins/hls-floskell-plugin
   - ./plugins/hls-fourmolu-plugin
   - ./plugins/hls-pragmas-plugin
@@ -58,6 +59,12 @@ extra-deps:
   - constraints-extras-0.3.0.2@sha256:013b8d0392582c6ca068e226718a4fe8be8e22321cc0634f6115505bf377ad26,1853
   - some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
   - unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
+  - # stylish haskell
+    github: VeryMilkyJoe/stylish-haskell
+    commit: 9279aad535de624fca990ed50f010a1743c0043a
+  - # cabal-fmt
+    github: VeryMilkyJoe/cabal-fmt
+    commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
 
   - github: haskell/lsp
     commit: ef59c28b41ed4c5775f0ab0c1e985839359cec96
