Reduce number of cabal projects, improving build time (#580)

Use src/ as library; and exe/Main.hs as executable. Just as it used to be before. Not using neuron on GHCJS anymore.

Author: srid

CONTRIBUTING.md

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 set -xe
-nix-shell --pure --run "find neuron/src -name \*.hs | xargs ormolu -m inplace"
+nix-shell --pure --run "find {lib,exe,test} -name \*.hs | xargs ormolu -m inplace"

bin/format

@@ -1,6 +1,6 @@
 cabal-version: 2.4
 name: neuron
-version: 1.9.24.0
+version: 1.9.24.1
 license: AGPL-3.0-only
 copyright: 2020 Sridhar Ratnakumar
 maintainer: [email protected]
@@ -11,9 +11,9 @@ bug-reports: https://github.com/srid/neuron/issues
 synopsis:
   Future-proof system for plain-text notes.
 description:
-  neuron is a future-proof system for managing your plain-text Zettelkasten notes.
+  neuron is a future-proof system for managing and publishing your plain-text Zettelkasten notes.
 data-files:
-  src-bash/neuron-search
+  neuron-search
 
 source-repository head
     type: git
@@ -34,46 +34,68 @@ common library-common
   default-language: Haskell2010
   build-depends:
     base >=4.12 && < 4.15,
-    aeson,
+    aeson-gadt-th >= 0.2.5.0,
     aeson-pretty,
-    mtl,
-    text,
-    time,
-    relude,
-    filepath,
+    aeson,
     algebraic-graphs >= 0.5,
-    parser-combinators,
-    feed,
-    containers,
-    filepattern,
-    megaparsec,
+    ansi-terminal,
+    async,
+    clay,
+    co-log,
     commonmark ^>= 0.1.0.2,
     commonmark-extensions ^>= 0.2.0.4,
     commonmark-pandoc >= 0.1.0.0 && < 0.3,
+    constraints-extras,
+    containers,
+    data-default,
+    dependent-map,
+    dependent-sum-aeson-orphans >= 0.2.1.0,
+    dependent-sum-template,
+    dependent-sum,
+    dhall >= 1.30,
+    directory-contents,
+    directory,
+    either,
+    exceptions,
+    feed,
+    file-embed,
+    filepath,
+    filepattern,
+    foldl,
+    fsnotify,
+    HsYAML,
+    iso8601-time,
+    lsp,
+    megaparsec,
+    modern-uri,
+    mtl,
+    optparse-applicative,
     pandoc-link-context >= 1.0.2,
     pandoc-types >= 1.21,
     parsec,
-    modern-uri,
-    HsYAML,
-    aeson-gadt-th >= 0.2.5.0,
-    dependent-sum,
-    dependent-sum-template,
-    dependent-sum-aeson-orphans >= 0.2.1.0,
-    dependent-map,
-    constraints-extras,
-    data-default,
-    reflex,
+    parser-combinators,
     reflex-dom-core,
     reflex-dom-pandoc >= 0.7.9.0,
-    clay,
-    tagged,
+    reflex-fsnotify,
+    reflex,
+    relude,
     shower,
+    tagged,
+    text,
+    time,
+    timeit,
+    unix,
     uri-encode,
-    directory-contents
+    uuid,
+    wai-app-static,
+    wai-extra,
+    warp,
+    which,
+    with-utf8,
 
 library
   import: library-common
-  hs-source-dirs: src/lib
+  hs-source-dirs: src
   exposed-modules:
     Neuron.Config.Type
     Neuron.Markdown
@@ -122,65 +144,6 @@ library
     Data.Time.DateMayTime
     Data.YAML.ToJSON
     Data.Structured.Breadcrumb
-
--- Everything below this marker should be deleted when using neuron.cabal in
--- GHCJS as a library.
--- ---------
--- LIBMARKER
-
-common app-common
-  import: library-common
-  default-language: Haskell2010
-  build-depends:
-    base >=4.12 && < 4.15,
-    aeson,
-    clay -any,
-    mtl,
-    containers,
-    directory,
-    exceptions,
-    file-embed,
-    optparse-applicative,
-    pandoc-types,
-    relude,
-    iso8601-time,
-    time,
-    text,
-    modern-uri,
-    foldl,
-    filepath,
-    dhall >= 1.30,
-    which,
-    unix,
-    megaparsec,
-    dependent-sum,
-    dependent-sum-template,
-    data-default,
-    uuid,
-    with-utf8,
-    either,
-    timeit,
-    reflex,
-    reflex-fsnotify,
-    fsnotify,
-    wai-app-static,
-    wai-extra,
-    warp,
-    async,
-    co-log,
-    ansi-terminal,
-    lsp
-
--- Everything below will have to be stripped away, if whoever uses this repo
--- will want to avoid non-core dependencies. Cabal doesn't seem to provide a way
--- to selectively dependent on a library without pulling in every stanza defined
--- here.
--- cf. https://www.srid.ca/2012605.html
-
-library neuron-app-lib
-  import: app-common
-  hs-source-dirs: src/app
-  exposed-modules:
     Data.Structured.OpenGraph
     Data.Structured.OpenGraph.Render
     System.Directory.Contents.Extra
@@ -208,15 +171,9 @@ library neuron-app-lib
     Paths_neuron
   other-modules:
     Paths_neuron
-  -- A trick to make ghcid reload if library dependencies change
-  -- https://www.srid.ca/2012605.html
-  if flag(ghcid)
-    hs-source-dirs: src/lib
-  else
-    build-depends: neuron
 
 test-suite neuron-test
-  import: app-common
+  import: library-common
   type: exitcode-stdio-1.0
   hs-source-dirs: test
   main-is: Spec.hs
@@ -227,9 +184,9 @@ test-suite neuron-test
     time
   default-language:    Haskell2010
   if (flag(ghcid))
-    hs-source-dirs: src/lib src/app
+    hs-source-dirs: src
   else
-    build-depends: neuron, neuron-app-lib
+    build-depends: neuron
     other-modules:
       Data.PathTreeSpec
       Data.TagTreeSpec
@@ -241,12 +198,12 @@ test-suite neuron-test
 
 -- To profile: ghc-options: -fexternal-interpreter -prof -fprof-auto -rtsopts
 executable neuron
-  import: app-common
-  hs-source-dirs: src/exe
+  import: library-common
+  hs-source-dirs: exe
   main-is: Main.hs
   -- FIXME: Threaded runtime causes high cpu usage when using reflex headless 
   -- ghc-options: -threaded -rtsopts -with-rtsopts=-N
   if (flag(ghcid))
-    hs-source-dirs: src/lib src/app
+    hs-source-dirs: src
   else
-    build-depends: neuron, neuron-app-lib
+    build-depends: neuron

cabal.project

@@ -34,7 +34,7 @@ let
   });
 
   sources = {
-    neuron = gitignoreSource ./neuron;
+    neuron = gitignoreSource ./.;
     reflex-dom-pandoc = thunkSource ./dep/reflex-dom-pandoc;
     pandoc-link-context = thunkSource ./dep/pandoc-link-context;
     directory-contents = thunkSource ./dep/directory-contents;
@@ -43,7 +43,7 @@ let
 
   searchBuilder = ''
     mkdir -p $out/bin
-    cp $src/src-bash/neuron-search $out/bin/neuron-search
+    cp $src/neuron-search $out/bin/neuron-search
     chmod +x $out/bin/neuron-search
     wrapProgram $out/bin/neuron-search --prefix 'PATH' ':' ${
       with (if pkgsForBins != null then pkgsForBins else pkgs);