From e5ed4d81696b8a6c32c314050cf54b2a420aa99a Mon Sep 17 00:00:00 2001 From: Jana Chadt Date: Tue, 3 Aug 2021 18:37:50 +0200 Subject: [PATCH] Remove stack support from cabal-fmt plugin --- stack-8.10.2.yaml | 13 ++++--------- stack-8.10.3.yaml | 12 ++++-------- stack-8.10.4.yaml | 12 ++++-------- stack-8.10.5.yaml | 12 ++++-------- stack-8.6.4.yaml | 12 ++++-------- stack-8.6.5.yaml | 12 ++++-------- stack-8.8.3.yaml | 12 ++++-------- stack-8.8.4.yaml | 12 ++++-------- stack-9.0.1.yaml | 11 +---------- stack.yaml | 12 ++++-------- 10 files changed, 37 insertions(+), 83 deletions(-) diff --git a/stack-8.10.2.yaml b/stack-8.10.2.yaml index 610fa715a51..b9832130135 100644 --- a/stack-8.10.2.yaml +++ b/stack-8.10.2.yaml @@ -20,8 +20,7 @@ packages: - ./plugins/hls-tactics-plugin - ./plugins/hls-brittany-plugin - ./plugins/hls-stylish-haskell-plugin - - ./plugins/hls-cabal-fmt-plugin - + #- ./plugins/hls-cabal-fmt-plugin - ./plugins/hls-floskell-plugin - ./plugins/hls-fourmolu-plugin - ./plugins/hls-pragmas-plugin @@ -42,9 +41,6 @@ extra-deps: - # ghc-api-compat-8.6 github: hsyl20/ghc-api-compat commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15 - - # 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 @@ -58,10 +54,7 @@ extra-deps: - refinery-0.4.0.0 - retrie-0.1.1.1 - shake-0.19.4 - - # stylish haskell - github: VeryMilkyJoe/stylish-haskell - commit: 9279aad535de624fca990ed50f010a1743c0043a - #- stylish-haskell-0.12.2.0 + - stylish-haskell-0.12.2.0 - semigroups-0.18.5 - temporary-1.2.1.1 - th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854 @@ -88,6 +81,8 @@ configure-options: flags: haskell-language-server: pedantic: true + + cabalfmt: false retrie: BuildExecutable: false # Stack doesn't support automatic flags. diff --git a/stack-8.10.3.yaml b/stack-8.10.3.yaml index 669165e2dab..42a90d87f9f 100644 --- a/stack-8.10.3.yaml +++ b/stack-8.10.3.yaml @@ -20,7 +20,7 @@ packages: - ./plugins/hls-tactics-plugin - ./plugins/hls-brittany-plugin - ./plugins/hls-stylish-haskell-plugin - - ./plugins/hls-cabal-fmt-plugin + #- ./plugins/hls-cabal-fmt-plugin - ./plugins/hls-floskell-plugin - ./plugins/hls-fourmolu-plugin - ./plugins/hls-pragmas-plugin @@ -41,9 +41,6 @@ extra-deps: - # ghc-api-compat-8.6 github: hsyl20/ghc-api-compat commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15 - - # 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 @@ -57,10 +54,7 @@ extra-deps: - refinery-0.4.0.0 - retrie-0.1.1.1 - shake-0.19.4 - - # stylish haskell - github: VeryMilkyJoe/stylish-haskell - commit: 9279aad535de624fca990ed50f010a1743c0043a - #- stylish-haskell-0.12.2.0 + - stylish-haskell-0.12.2.0 - semigroups-0.18.5 - temporary-1.2.1.1 - th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854 @@ -87,6 +81,8 @@ configure-options: flags: haskell-language-server: pedantic: true + + cabalfmt: false retrie: BuildExecutable: false # Stack doesn't support automatic flags. diff --git a/stack-8.10.4.yaml b/stack-8.10.4.yaml index 7b279927d0b..7ca3740c4fa 100644 --- a/stack-8.10.4.yaml +++ b/stack-8.10.4.yaml @@ -20,7 +20,7 @@ packages: - ./plugins/hls-tactics-plugin - ./plugins/hls-brittany-plugin - ./plugins/hls-stylish-haskell-plugin - - ./plugins/hls-cabal-fmt-plugin + #- ./plugins/hls-cabal-fmt-plugin - ./plugins/hls-floskell-plugin - ./plugins/hls-fourmolu-plugin - ./plugins/hls-pragmas-plugin @@ -41,9 +41,6 @@ extra-deps: - # ghc-api-compat-8.6 github: hsyl20/ghc-api-compat commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15 - - # 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 @@ -53,10 +50,7 @@ extra-deps: - monad-dijkstra-0.1.1.2 - refinery-0.4.0.0 - retrie-0.1.1.1 - - # stylish haskell - github: VeryMilkyJoe/stylish-haskell - commit: 9279aad535de624fca990ed50f010a1743c0043a - #- stylish-haskell-0.12.2.0 + - stylish-haskell-0.12.2.0 - semigroups-0.18.5 - temporary-1.2.1.1 - th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854 @@ -89,6 +83,8 @@ configure-options: flags: haskell-language-server: pedantic: true + + cabalfmt: false retrie: BuildExecutable: false # Stack doesn't support automatic flags. diff --git a/stack-8.10.5.yaml b/stack-8.10.5.yaml index e7162f67b26..4c945f06e98 100644 --- a/stack-8.10.5.yaml +++ b/stack-8.10.5.yaml @@ -22,7 +22,7 @@ packages: - ./plugins/hls-tactics-plugin - ./plugins/hls-brittany-plugin - ./plugins/hls-stylish-haskell-plugin - - ./plugins/hls-cabal-fmt-plugin + #- ./plugins/hls-cabal-fmt-plugin - ./plugins/hls-floskell-plugin - ./plugins/hls-fourmolu-plugin - ./plugins/hls-pragmas-plugin @@ -43,9 +43,6 @@ extra-deps: - # ghc-api-compat-8.6 github: hsyl20/ghc-api-compat commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15 - - # 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 @@ -55,10 +52,7 @@ extra-deps: - monad-dijkstra-0.1.1.2 - refinery-0.4.0.0 - retrie-1.0.0.0 - - # stylish haskell - github: VeryMilkyJoe/stylish-haskell - commit: 9279aad535de624fca990ed50f010a1743c0043a - #- stylish-haskell-0.12.2.0 + - stylish-haskell-0.12.2.0 - semigroups-0.18.5 - temporary-1.2.1.1 - th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854 @@ -91,6 +85,8 @@ configure-options: flags: haskell-language-server: pedantic: true + + cabalfmt: false retrie: BuildExecutable: false # Stack doesn't support automatic flags. diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index e03eb31e0fa..34a91a0c68d 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -21,7 +21,7 @@ packages: - ./plugins/hls-tactics-plugin - ./plugins/hls-brittany-plugin - ./plugins/hls-stylish-haskell-plugin - - ./plugins/hls-cabal-fmt-plugin + #- ./plugins/hls-cabal-fmt-plugin - ./plugins/hls-floskell-plugin - ./plugins/hls-fourmolu-plugin - ./plugins/hls-pragmas-plugin @@ -48,9 +48,6 @@ extra-deps: - # ghc-api-compat-8.6 github: hsyl20/ghc-api-compat commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15 - - # cabal-fmt - github: VeryMilkyJoe/cabal-fmt - commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706 - ghc-check-0.5.0.4 - ghc-events-0.13.0 - ghc-exactprint-0.6.4 @@ -87,10 +84,7 @@ extra-deps: - retrie-0.1.1.1 - semialign-1.1 - shake-0.19.4 - - # stylish haskell - github: VeryMilkyJoe/stylish-haskell - commit: 9279aad535de624fca990ed50f010a1743c0043a - #- stylish-haskell-0.12.2.0 + - stylish-haskell-0.12.2.0 - tasty-rerun-1.1.17 - temporary-1.2.1.1 - these-1.1.1.1 @@ -116,6 +110,8 @@ extra-deps: flags: haskell-language-server: pedantic: true + + cabalfmt: false retrie: BuildExecutable: false # Stack doesn't support automatic flags. diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index b30e9814617..20372b53de4 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -20,7 +20,7 @@ packages: - ./plugins/hls-tactics-plugin - ./plugins/hls-brittany-plugin - ./plugins/hls-stylish-haskell-plugin - - ./plugins/hls-cabal-fmt-plugin + #- ./plugins/hls-cabal-fmt-plugin - ./plugins/hls-floskell-plugin - ./plugins/hls-fourmolu-plugin - ./plugins/hls-pragmas-plugin @@ -49,9 +49,6 @@ extra-deps: - # ghc-api-compat-8.6 github: hsyl20/ghc-api-compat commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15 - - # cabal-fmt - github: VeryMilkyJoe/cabal-fmt - commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706 - ghc-check-0.5.0.4 - ghc-events-0.13.0 - ghc-exactprint-0.6.4 @@ -88,10 +85,7 @@ extra-deps: - retrie-0.1.1.1 - semialign-1.1 - shake-0.19.4 - - # stylish haskell - github: VeryMilkyJoe/stylish-haskell - commit: 9279aad535de624fca990ed50f010a1743c0043a - #- stylish-haskell-0.12.2.0 + - stylish-haskell-0.12.2.0 - tasty-rerun-1.1.17 - temporary-1.2.1.1 - these-1.1.1.1 @@ -125,6 +119,8 @@ configure-options: flags: haskell-language-server: pedantic: true + + cabalfmt: false retrie: BuildExecutable: false # Stack doesn't support automatic flags. diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml index 29cd962e4e6..0726fffbc79 100644 --- a/stack-8.8.3.yaml +++ b/stack-8.8.3.yaml @@ -20,7 +20,7 @@ packages: - ./plugins/hls-tactics-plugin - ./plugins/hls-brittany-plugin - ./plugins/hls-stylish-haskell-plugin - - ./plugins/hls-cabal-fmt-plugin + #- ./plugins/hls-cabal-fmt-plugin - ./plugins/hls-floskell-plugin - ./plugins/hls-fourmolu-plugin - ./plugins/hls-pragmas-plugin @@ -43,9 +43,6 @@ extra-deps: - # ghc-api-compat-8.6 github: hsyl20/ghc-api-compat commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15 - - # 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 @@ -71,10 +68,7 @@ extra-deps: - retrie-0.1.1.1 - semigroups-0.18.5 - shake-0.19.4 - - # stylish haskell - github: VeryMilkyJoe/stylish-haskell - commit: 9279aad535de624fca990ed50f010a1743c0043a - #- stylish-haskell-0.12.2.0 + - stylish-haskell-0.12.2.0 - temporary-1.2.1.1 - uniplate-1.6.13 - th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854 @@ -104,6 +98,8 @@ configure-options: flags: haskell-language-server: pedantic: true + + cabalfmt: false retrie: BuildExecutable: false # Stack doesn't support automatic flags. diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml index d380866bd51..8397280fb1f 100644 --- a/stack-8.8.4.yaml +++ b/stack-8.8.4.yaml @@ -20,7 +20,7 @@ packages: - ./plugins/hls-tactics-plugin - ./plugins/hls-brittany-plugin - ./plugins/hls-stylish-haskell-plugin - - ./plugins/hls-cabal-fmt-plugin + #- ./plugins/hls-cabal-fmt-plugin - ./plugins/hls-floskell-plugin - ./plugins/hls-fourmolu-plugin - ./plugins/hls-pragmas-plugin @@ -43,9 +43,6 @@ extra-deps: - # ghc-api-compat-8.6 github: hsyl20/ghc-api-compat commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15 - - # 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 @@ -70,10 +67,7 @@ extra-deps: - retrie-0.1.1.1 - semigroups-0.18.5 - shake-0.19.4 - - # stylish haskell - github: VeryMilkyJoe/stylish-haskell - commit: 9279aad535de624fca990ed50f010a1743c0043a - #- stylish-haskell-0.12.2.0 + - stylish-haskell-0.12.2.0 - temporary-1.2.1.1 - th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854 - bytestring-encoding-0.1.0.0@sha256:460b49779fbf0112e8e2f1753c1ed9131eb18827600c298f4d6bb51c4e8c1c0d,1727 @@ -101,6 +95,8 @@ configure-options: flags: haskell-language-server: pedantic: true + + cabalfmt: false retrie: BuildExecutable: false # Stack doesn't support automatic flags. diff --git a/stack-9.0.1.yaml b/stack-9.0.1.yaml index 115ea19e500..2f056b5ab73 100644 --- a/stack-9.0.1.yaml +++ b/stack-9.0.1.yaml @@ -92,16 +92,6 @@ 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 commit: 16e19aaf34e286f3d27b3988c61040823ec66537 @@ -127,6 +117,7 @@ flags: fourmolu: false stylishHaskell: false brittany: false + cabalfmt: false retrie: BuildExecutable: false # Stack doesn't support automatic flags. diff --git a/stack.yaml b/stack.yaml index e53885b3b9a..459363f7774 100644 --- a/stack.yaml +++ b/stack.yaml @@ -20,7 +20,7 @@ packages: - ./plugins/hls-tactics-plugin - ./plugins/hls-brittany-plugin - ./plugins/hls-stylish-haskell-plugin - - ./plugins/hls-cabal-fmt-plugin + #- ./plugins/hls-cabal-fmt-plugin - ./plugins/hls-floskell-plugin - ./plugins/hls-fourmolu-plugin - ./plugins/hls-pragmas-plugin @@ -47,10 +47,7 @@ extra-deps: - monad-dijkstra-0.1.1.2 - refinery-0.4.0.0 - retrie-0.1.1.1 - - # stylish haskell - github: VeryMilkyJoe/stylish-haskell - commit: 9279aad535de624fca990ed50f010a1743c0043a - #- stylish-haskell-0.12.2.0 + - stylish-haskell-0.12.2.0 - semigroups-0.18.5 - temporary-1.2.1.1 - th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854 @@ -65,9 +62,6 @@ extra-deps: - lsp-1.2.0.1 - lsp-types-1.3.0.0 - lsp-test-0.14.0.1 - - # cabal-fmt - github: VeryMilkyJoe/cabal-fmt - commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706 configure-options: $targets: @@ -82,6 +76,8 @@ configure-options: flags: haskell-language-server: pedantic: true + + cabalfmt: false retrie: BuildExecutable: false # Stack doesn't support automatic flags.