diff --git a/backend/backend.cabal b/backend/backend.cabal index cab10ec..8eb7d79 100644 --- a/backend/backend.cabal +++ b/backend/backend.cabal @@ -23,6 +23,7 @@ executable backend , API.Catalogue , API.Channels , API.Users + , Configuration , Database , Database.Book , Database.Channel @@ -145,4 +146,4 @@ test-suite spec default-extensions: DeriveGeneric , NoImplicitPrelude , OverloadedStrings - , RecordWildCards \ No newline at end of file + , RecordWildCards diff --git a/common/common.cabal b/common/common.cabal index 98e5704..2bb27c0 100644 --- a/common/common.cabal +++ b/common/common.cabal @@ -13,13 +13,10 @@ extra-source-files: ChangeLog.md cabal-version: >=1.10 library - exposed-modules: Configuration - , Data.Versioned + exposed-modules: 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 @@ -48,4 +44,4 @@ test-suite spec , validity , genvalidity-hspec , genvalidity-property - , hspec \ No newline at end of file + , hspec diff --git a/common/src/Configuration.hs b/common/src/Configuration.hs deleted file mode 100644 index 3f22b3d..0000000 --- a/common/src/Configuration.hs +++ /dev/null @@ -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 diff --git a/frontend/frontend.cabal b/frontend/frontend.cabal index 5d63e6e..a113da2 100644 --- a/frontend/frontend.cabal +++ b/frontend/frontend.cabal @@ -23,5 +23,6 @@ executable frontend , miso , jsaddle-warp , mtl + , common hs-source-dirs: src default-language: Haskell2010 diff --git a/project.nix b/project.nix index 91c74c6..c32cf76 100644 --- a/project.nix +++ b/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}"; diff --git a/release.nix b/release.nix index c29eb4e..975411f 100644 --- a/release.nix +++ b/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);