From 87d798623ba3fafeca574a0f1ca5343425459f13 Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Wed, 19 Jun 2019 17:33:18 +0200 Subject: [PATCH 1/3] Remove brittany submodule in favour of hackage version --- .gitmodules | 4 ---- stack-8.2.2.yaml | 3 +-- stack-8.4.2.yaml | 3 +-- stack-8.4.3.yaml | 2 +- stack-8.4.4.yaml | 3 +-- stack-8.6.1.yaml | 2 +- stack-8.6.2.yaml | 2 +- stack-8.6.3.yaml | 2 +- stack-8.6.4.yaml | 2 +- stack-8.6.5.yaml | 2 +- stack.yaml | 2 +- 11 files changed, 10 insertions(+), 17 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4e873c34d..2ca9d7a2a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -15,10 +15,6 @@ # url = https://github.com/bubba/HaRe.git url = https://github.com/alanz/HaRe.git -[submodule "submodules/brittany"] - path = submodules/brittany - url = https://github.com/lspitzner/brittany.git - [submodule "submodules/cabal-helper"] path = submodules/cabal-helper # url = https://github.com/arbor/cabal-helper.git diff --git a/stack-8.2.2.yaml b/stack-8.2.2.yaml index 2ebcc6d44..184c45494 100644 --- a/stack-8.2.2.yaml +++ b/stack-8.2.2.yaml @@ -5,13 +5,12 @@ packages: extra-deps: - ./submodules/HaRe -- ./submodules/brittany - ./submodules/cabal-helper - ./submodules/ghc-mod - ./submodules/ghc-mod/core - ./submodules/ghc-mod/ghc-project-types -# - brittany-0.11.0.0 +- brittany-0.12.0.0 - butcher-1.3.1.1 - cabal-plan-0.3.0.0 - conduit-parse-0.2.1.0 diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml index 2dccd4d5d..2a908d531 100644 --- a/stack-8.4.2.yaml +++ b/stack-8.4.2.yaml @@ -5,13 +5,12 @@ packages: extra-deps: - ./submodules/HaRe -- ./submodules/brittany - ./submodules/cabal-helper - ./submodules/ghc-mod - ./submodules/ghc-mod/core - ./submodules/ghc-mod/ghc-project-types -# - brittany-0.11.0.0 +- brittany-0.12.0.0 - base-compat-0.9.3 - cabal-plan-0.3.0.0 - constrained-dynamic-0.1.0.0 diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml index 8fc7c5bc5..67b6df6e3 100644 --- a/stack-8.4.3.yaml +++ b/stack-8.4.3.yaml @@ -5,13 +5,13 @@ packages: extra-deps: - ./submodules/HaRe -- ./submodules/brittany - ./submodules/cabal-helper - ./submodules/ghc-mod - ./submodules/ghc-mod/core - ./submodules/ghc-mod/ghc-project-types - base-compat-0.9.3 +- brittany-0.12.0.0 - cabal-plan-0.3.0.0 - constrained-dynamic-0.1.0.0 - floskell-0.10.0 diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml index b77dd3d33..3037eff15 100644 --- a/stack-8.4.4.yaml +++ b/stack-8.4.4.yaml @@ -5,13 +5,12 @@ packages: extra-deps: - ./submodules/HaRe -- ./submodules/brittany - ./submodules/cabal-helper - ./submodules/ghc-mod - ./submodules/ghc-mod/core - ./submodules/ghc-mod/ghc-project-types -# - brittany-0.11.0.0 +- brittany-0.12.0.0 - cabal-plan-0.4.0.0 - constrained-dynamic-0.1.0.0 - floskell-0.10.0 diff --git a/stack-8.6.1.yaml b/stack-8.6.1.yaml index 6c7e43ccb..faa4c3080 100644 --- a/stack-8.6.1.yaml +++ b/stack-8.6.1.yaml @@ -5,13 +5,13 @@ packages: extra-deps: - ./submodules/HaRe -- ./submodules/brittany - ./submodules/cabal-helper - ./submodules/ghc-mod - ./submodules/ghc-mod/core - ./submodules/ghc-mod/ghc-project-types - apply-refact-0.6.0.0 +- brittany-0.12.0.0 - butcher-1.3.2.1 - cabal-install-2.4.0.0 - cabal-plan-0.4.0.0 diff --git a/stack-8.6.2.yaml b/stack-8.6.2.yaml index c0424c775..2ca931f02 100644 --- a/stack-8.6.2.yaml +++ b/stack-8.6.2.yaml @@ -5,12 +5,12 @@ packages: extra-deps: - ./submodules/HaRe -- ./submodules/brittany - ./submodules/cabal-helper - ./submodules/ghc-mod - ./submodules/ghc-mod/core - ./submodules/ghc-mod/ghc-project-types +- brittany-0.12.0.0 - butcher-1.3.2.1 - cabal-plan-0.4.0.0 - constrained-dynamic-0.1.0.0 diff --git a/stack-8.6.3.yaml b/stack-8.6.3.yaml index 0af5b4a14..18cfecaa3 100644 --- a/stack-8.6.3.yaml +++ b/stack-8.6.3.yaml @@ -5,12 +5,12 @@ packages: extra-deps: - ./submodules/HaRe -- ./submodules/brittany - ./submodules/cabal-helper - ./submodules/ghc-mod - ./submodules/ghc-mod/core - ./submodules/ghc-mod/ghc-project-types +- brittany-0.12.0.0 - butcher-1.3.2.1 - cabal-plan-0.4.0.0 - constrained-dynamic-0.1.0.0 diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index b1087ee4f..e9451f6ae 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -5,12 +5,12 @@ packages: extra-deps: - ./submodules/HaRe -- ./submodules/brittany - ./submodules/cabal-helper - ./submodules/ghc-mod - ./submodules/ghc-mod/core - ./submodules/ghc-mod/ghc-project-types +- brittany-0.12.0.0 - butcher-1.3.2.1 - cabal-plan-0.4.0.0 - constrained-dynamic-0.1.0.0 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index 149f26a17..4d031beba 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -5,12 +5,12 @@ packages: extra-deps: - ./submodules/HaRe -- ./submodules/brittany - ./submodules/cabal-helper - ./submodules/ghc-mod - ./submodules/ghc-mod/core - ./submodules/ghc-mod/ghc-project-types +- brittany-0.12.0.0 - butcher-1.3.2.1 - cabal-plan-0.4.0.0 - constrained-dynamic-0.1.0.0 diff --git a/stack.yaml b/stack.yaml index 49a947db9..0bf95c7a7 100644 --- a/stack.yaml +++ b/stack.yaml @@ -5,7 +5,6 @@ packages: extra-deps: - ./submodules/HaRe -- ./submodules/brittany - ./submodules/cabal-helper - ./submodules/ghc-mod - ./submodules/ghc-mod/core @@ -13,6 +12,7 @@ extra-deps: - ansi-terminal-0.8.2 - ansi-wl-pprint-0.6.8.2 +- brittany-0.12.0.0 - butcher-1.3.2.1 - cabal-plan-0.4.0.0 - constrained-dynamic-0.1.0.0 From 0878f557fb24a749392b47254e93ee9989c7cb7d Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Wed, 19 Jun 2019 17:39:34 +0200 Subject: [PATCH 2/3] Remove brittany submodule --- submodules/brittany | 1 - 1 file changed, 1 deletion(-) delete mode 160000 submodules/brittany diff --git a/submodules/brittany b/submodules/brittany deleted file mode 160000 index 6c187da8f..000000000 --- a/submodules/brittany +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6c187da8f8166d595f36d6aaf419370283b3d1e9 From 1e740c708305384a535ce2a7ad39dcf4f444877d Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Wed, 19 Jun 2019 19:36:04 +0200 Subject: [PATCH 3/3] Remove brittany submodule from cabal project too --- cabal.project | 1 - 1 file changed, 1 deletion(-) diff --git a/cabal.project b/cabal.project index 809c1948d..27c72c99c 100644 --- a/cabal.project +++ b/cabal.project @@ -3,7 +3,6 @@ packages: ./hie-plugin-api/ ./submodules/HaRe - ./submodules/brittany ./submodules/cabal-helper/ ./submodules/ghc-mod/ ./submodules/ghc-mod/core/