Merge pull request #1124 from alanz/remove-monad-dijkstra-submodule

Remove monad dijkstra submodule

Author: alanz

.gitmodules

@@ -34,9 +34,6 @@
 
 [submodule "submodules/floskell"]
 	path = submodules/floskell
-	# url = https://github.com/ennocramer/floskell
-	url = https://github.com/alanz/floskell
-[submodule "submodules/monad-dijkstra"]
-	path = submodules/monad-dijkstra
-	# url = https://github.com/alanz/monad-dijkstra.git
-	url = https://github.com/ennocramer/monad-dijkstra.git
+	url = https://github.com/ennocramer/floskell
+	# url = https://github.com/alanz/floskell
+

appveyor.yml

@@ -1,6 +1,7 @@
 version: 1.0.{build}
 environment:
   matrix:
+#  - GHCVER: 8.6.4
   - GHCVER: 8.6.2
   - GHCVER: 8.6.1
   - GHCVER: 8.4.4

cabal.project

@@ -5,7 +5,6 @@ packages:
          ./submodules/HaRe
          ./submodules/brittany
          ./submodules/cabal-helper/
+         ./submodules/floskell
          ./submodules/ghc-mod/
          ./submodules/ghc-mod/core/
-         ./submodules/floskell
-         ./submodules/monad-dijkstra

stack-8.6.4.yaml

@@ -10,7 +10,6 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 - ./submodules/floskell
-- ./submodules/monad-dijkstra
 
 - ansi-terminal-0.8.2
 - butcher-1.3.2.1
@@ -20,14 +19,11 @@ extra-deps:
 - ghc-exactprint-0.5.8.2
 - haddock-api-2.22.0
 - hsimport-0.8.8
-# - monad-dijkstra-0.1.1.2
+- monad-dijkstra-0.1.1.2@rev:1
 - monad-memo-0.4.1
 - multistate-0.8.0.1
-# - optparse-simple-0.1.0
-# - pretty-show-1.9.5
 - syz-0.2.0.0
 - temporary-1.2.1.1
-# - transformers-0.5.6.2
 - yaml-0.8.32
 
 flags:

stack.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2019-03-02 # GHC 8.6.3
+resolver: nightly-2019-03-07 # GHC 8.6.4
 packages:
 - .
 - hie-plugin-api
@@ -17,18 +17,13 @@ extra-deps:
 - constrained-dynamic-0.1.0.0
 - deque-0.2.7
 - ghc-exactprint-0.5.8.2
-- haddock-api-2.21.0
-- haskell-src-exts-1.21.0
-- hlint-2.1.15
-- hoogle-5.0.17.5
+- haddock-api-2.22.0
 - hsimport-0.8.8
-- monad-dijkstra-0.1.1.2
+- monad-dijkstra-0.1.1.2@rev:1
 - monad-memo-0.4.1
 - multistate-0.8.0.1
-- optparse-simple-0.1.0
 - syz-0.2.0.0
 - temporary-1.2.1.1
-- unordered-containers-0.2.9.0
 - yaml-0.8.32
 
 flags: