From 7f3a92ae270aec6bcba910a000e75b931ba22ec6 Mon Sep 17 00:00:00 2001 From: joshvera Date: Tue, 12 Sep 2017 12:16:03 -0400 Subject: [PATCH 1/5] Add ghc-mod as a submodule --- .gitmodules | 3 +++ vendor/ghc-mod | 1 + 2 files changed, 4 insertions(+) create mode 160000 vendor/ghc-mod diff --git a/.gitmodules b/.gitmodules index 4057676c3..30f257c39 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,3 +28,6 @@ [submodule "vendor/prettyprinter"] path = vendor/prettyprinter url = https://github.com/robrix/prettyprinter.git +[submodule "vendor/ghc-mod"] + path = vendor/ghc-mod + url = https://github.com/joshvera/ghc-mod diff --git a/vendor/ghc-mod b/vendor/ghc-mod new file mode 160000 index 000000000..0d13786a4 --- /dev/null +++ b/vendor/ghc-mod @@ -0,0 +1 @@ +Subproject commit 0d13786a4cc413cf12de0ace9ba6f43ddd7a032b From ddb09205dfc585d99285e4e3aeac8c8d7650127d Mon Sep 17 00:00:00 2001 From: joshvera Date: Tue, 12 Sep 2017 12:16:18 -0400 Subject: [PATCH 2/5] Bump ghc-mod and delete cabal.project --- cabal.project | 3 --- vendor/ghc-mod | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 cabal.project diff --git a/cabal.project b/cabal.project deleted file mode 100644 index 76859f12f..000000000 --- a/cabal.project +++ /dev/null @@ -1,3 +0,0 @@ -packages: ./ vendor/*/ vendor/haskell-tree-sitter/languages/*/ vendor/prettyprinter/*/ - -jobs: $ncpus diff --git a/vendor/ghc-mod b/vendor/ghc-mod index 0d13786a4..7fb380dae 160000 --- a/vendor/ghc-mod +++ b/vendor/ghc-mod @@ -1 +1 @@ -Subproject commit 0d13786a4cc413cf12de0ace9ba6f43ddd7a032b +Subproject commit 7fb380dae0ae877a24ac8258fcd193cd6256a171 From 177ec01e04bf8701ec8a015853e8c55edd898ba5 Mon Sep 17 00:00:00 2001 From: joshvera Date: Tue, 12 Sep 2017 12:17:00 -0400 Subject: [PATCH 3/5] bump haskell-tree-sitter --- vendor/haskell-tree-sitter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/haskell-tree-sitter b/vendor/haskell-tree-sitter index f13c52aa8..8d10e9044 160000 --- a/vendor/haskell-tree-sitter +++ b/vendor/haskell-tree-sitter @@ -1 +1 @@ -Subproject commit f13c52aa8076750f0d0b4d6536bd280ecefeca98 +Subproject commit 8d10e90446ff1fd200284ea89ab5b978a7fd0deb From 7b3ea0c278ca663e3a058717ce7c1386772213d7 Mon Sep 17 00:00:00 2001 From: joshvera Date: Wed, 13 Sep 2017 11:12:20 -0400 Subject: [PATCH 4/5] Add happy as a build tool for pretty-show --- semantic-diff.cabal | 1 + 1 file changed, 1 insertion(+) diff --git a/semantic-diff.cabal b/semantic-diff.cabal index 3b2a141b0..d742ce873 100644 --- a/semantic-diff.cabal +++ b/semantic-diff.cabal @@ -13,6 +13,7 @@ cabal-version: >=1.10 library hs-source-dirs: src + build-tools: happy exposed-modules: Algorithm , Alignment , Category From e9690076e2ece0bccbfc6c11ab11efeed30a65fe Mon Sep 17 00:00:00 2001 From: joshvera Date: Wed, 13 Sep 2017 11:22:20 -0400 Subject: [PATCH 5/5] Remove happy --- semantic-diff.cabal | 1 - 1 file changed, 1 deletion(-) diff --git a/semantic-diff.cabal b/semantic-diff.cabal index d742ce873..3b2a141b0 100644 --- a/semantic-diff.cabal +++ b/semantic-diff.cabal @@ -13,7 +13,6 @@ cabal-version: >=1.10 library hs-source-dirs: src - build-tools: happy exposed-modules: Algorithm , Alignment , Category