Merge pull request #262 from ntc2/master

Only require cryptol-server's build depends when it's being built. Workaround for haskell/cabal#1725

Author: acfoltzer

cryptol.cabal

@@ -208,7 +208,14 @@ executable cryptol-server
   main-is:             Main.hs
   hs-source-dirs:      cryptol-server
   other-modules:       Cryptol.Aeson
-  build-depends:       aeson >= 0.9
+  default-language:    Haskell2010
+  default-extensions:  OverloadedStrings
+  GHC-options:         -Wall -O2
+  ghc-prof-options:    -auto-all -prof -rtsopts
+  if os(linux) && flag(static)
+      ld-options:      -static -pthread
+  if flag(server)
+      build-depends:   aeson >= 0.9
                      , aeson-pretty >= 0.7
                      , base
                      , bytestring >= 0.10
@@ -219,13 +226,5 @@ executable cryptol-server
                      , transformers
                      , unordered-containers >= 0.2
                      , zeromq4-haskell >= 0.6
-  default-language:    Haskell2010
-  default-extensions:  OverloadedStrings
-  GHC-options:         -Wall -O2
-  ghc-prof-options:    -auto-all -prof -rtsopts
-  if os(linux) && flag(static)
-      ld-options:      -static -pthread
-  if flag(server)
-      buildable: True
   else
       buildable: False