From c385116ff14b0618d39c11e25979663cffacab85 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 28 Mar 2016 12:40:12 -0700
Subject: [PATCH] Editor once again depends on shared, both stack.yamls top
 level.

This basically reverts commit 5789edaca192c16532e9cb89bc0db4b7564ca577.
---
 editor/stack.yaml => editor.yaml |  3 ++-
 editor/shared-src                |  1 -
 editor/unison-editor.cabal       | 26 ++++++--------------------
 stack.yaml => node.yaml          |  0
 4 files changed, 8 insertions(+), 22 deletions(-)
 rename editor/stack.yaml => editor.yaml (97%)
 delete mode 120000 editor/shared-src
 rename stack.yaml => node.yaml (100%)

diff --git a/editor/stack.yaml b/editor.yaml
similarity index 97%
rename from editor/stack.yaml
rename to editor.yaml
index 534bf239d..5abd8b166 100644
--- a/editor/stack.yaml
+++ b/editor.yaml
@@ -1,7 +1,8 @@
 flags: {}
 
 packages:
-- '.' 
+- shared
+- editor
 - location:
     git: https://github.com/ryantrinkle/reflex.git
     commit: 784f9f79396ae713a03fc4d81f8a67b75d6ade1c # need a few package bumps not present in hackage release yet
diff --git a/editor/shared-src b/editor/shared-src
deleted file mode 120000
index cae12f338..000000000
--- a/editor/shared-src
+++ /dev/null
@@ -1 +0,0 @@
-../shared/src
\ No newline at end of file
diff --git a/editor/unison-editor.cabal b/editor/unison-editor.cabal
index feacb552f..5f8eecb41 100644
--- a/editor/unison-editor.cabal
+++ b/editor/unison-editor.cabal
@@ -42,7 +42,7 @@ flag quiet
   default: False
 
 library
-  hs-source-dirs: src shared-src
+  hs-source-dirs: src
 
   exposed-modules:
     Unison.DocView
@@ -56,26 +56,19 @@ library
 
   build-depends:
     base,
-    aeson,
-    base64-bytestring,
-    bifunctors,
-    bytestring,
-    comonad,
     containers,
     data-default,
     free,
-    ghcjs-base,
     ghcjs-dom,
+    ghcjs-base,
     mtl,
-    murmur-hash,
-    prelude-extras,
     reflex,
     reflex-dom,
     semigroups,
     text,
     these,
     transformers,
-    vector
+    unison-shared
 
   ghc-options: -Wall -fno-warn-name-shadowing -threaded -rtsopts -with-rtsopts=-N
 
@@ -87,7 +80,7 @@ library
 
 executable editor
   main-is: Editor.hs
-  hs-source-dirs: src shared-src
+  hs-source-dirs: src
   ghc-options: -Wall -fno-warn-name-shadowing -threaded -rtsopts -with-rtsopts=-N -v0
 
   if flag(optimized)
@@ -95,24 +88,17 @@ executable editor
 
   build-depends:
     base,
-    aeson,
-    base64-bytestring,
-    bifunctors,
-    bytestring,
-    comonad,
     containers,
     data-default,
     free,
-    ghcjs-base,
     ghcjs-dom,
+    ghcjs-base,
     mtl,
-    murmur-hash,
-    prelude-extras,
     reflex,
     reflex-dom,
     semigroups,
     text,
     these,
     transformers,
-    vector,
+    unison-shared,
     unison-editor
diff --git a/stack.yaml b/node.yaml
similarity index 100%
rename from stack.yaml
rename to node.yaml