wip

backend/backend.cabal

@@ -23,6 +23,7 @@ executable backend
                      , API.Catalogue
                      , API.Channels
                      , API.Users
+                     , Configuration
                      , Database
                      , Database.Book
                      , Database.Channel

common/common.cabal

@@ -13,13 +13,10 @@ extra-source-files:  ChangeLog.md
 cabal-version:       >=1.10
 
 library
-  exposed-modules:     Configuration
+  exposed-modules:     Data.Versioned
-                     , Data.Versioned
   -- other-extensions:
   build-depends:       base >=4.10
                      , classy-prelude
-                     , dhall
-                     , foreign-store
                      , generic-lens
                      , lens
                      , mtl
@@ -38,7 +35,6 @@ test-suite spec
   hs-source-dirs:      src
   build-depends:       base >=4.10
                      , classy-prelude
-                     , dhall
                      , foreign-store
                      , generic-lens
                      , lens

common/src/Configuration.hs

@@ -1,25 +0,0 @@
-{-# Language NoImplicitPrelude #-}
-{-# Language DeriveGeneric #-}
-{-# Language DuplicateRecordFields #-}
-module Configuration where
-
-import ClassyPrelude
-import Dhall (Interpret)
-
-data Pg = Pg { username :: Text
-             , password :: Text
-             , host :: Text
-             , database :: Text }
-        deriving (Show, Generic)
-
-data Store = Filestore { path :: Text }
-           | IPFS { common :: Text }
-           deriving (Show, Generic)
-
-data Config = Config { database :: Pg
-                     , store :: Store }
-            deriving (Show, Generic)
-
-instance Interpret Pg
-instance Interpret Store
-instance Interpret Config

frontend/frontend.cabal

@@ -23,5 +23,6 @@ executable frontend
                      , miso
                      , jsaddle-warp
                      , mtl
+                     , common
   hs-source-dirs:      src
   default-language:    Haskell2010

project.nix

@@ -23,7 +23,12 @@ let
   mkShell = name: pkg:
   let
     n =  "${name}-shell";
-    deps = haskellPackages'.ghcWithHoogle (pkgs: pkg.buildInputs ++ pkg.propagatedBuildInputs);
+    deps = with haskellPackages'; [
+      ghcid
+      cabal-install
+      hasktags
+      (haskellPackages'.ghcWithHoogle (pkgs: pkg.buildInputs ++ pkg.propagatedBuildInputs))
+    ];
   in
   {
     name = "${n}";

release.nix

@@ -22,6 +22,11 @@ let
           ghcjscustom = pkgs.haskell.packages.ghcjs84.override {
             overrides = self: super: {
               doctest = null;
+              comonad = dontCheck (super.comonad);
+              classy-prelude = dontCheck (super.classy-prelude);
+              unliftio = dontCheck (super.unliftio);
+              semigroupoids = dontCheck (super.semigroupoids);
+              lens = dontCheck (super.lens);
               directory-tree = dontCheck (super.directory-tree);
               http-types = dontCheck (super.http-types);
               tasty-quickcheck = dontCheck (super.tasty-quickcheck);