Merge pull request #1488 from haskell/switch-back-c-h-submodule

Switch back to @DanielG cabal-helper
haskell · Dec 22, 2019 · d39ffe2 · d39ffe2
2 parents b8c99d1 + 08fbe56
commit d39ffe2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -12,10 +12,8 @@
 
 [submodule "submodules/cabal-helper"]
 	path = submodules/cabal-helper
-	# url = https://github.com/DanielG/cabal-helper.git
-	# Change this back once https://github.com/DanielG/cabal-helper/pull/85/ merged
-	url = https://github.com/bubba/cabal-helper.git
+	url = https://github.com/DanielG/cabal-helper.git
 
 [submodule "submodules/ghc-mod"]
 	path = submodules/ghc-mod
-	url = https://github.com/fendor/ghc-mod.git
+	url = https://github.com/fendor/ghc-mod.git
diff --git a/submodules/cabal-helper b/submodules/cabal-helper
+16 −2		lib/Distribution/Helper.hs
+0 −1		lib/Distribution/Helper/Discover.hs