wip

Separate backend and frontend
2018-12-20 00:33:32 +02:00 · 2018-12-20 00:29:25 +02:00 · 2018-12-19 23:18:13 +02:00
13 changed files with 225 additions and 60 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -8,4 +8,5 @@ before_script:
  - mkdir -p ~/.config/nixpkgs

 script:
-  - nix-build ./release.nix -A backend --option trusted-public-keys "masser-ebook-manager.cachix.org-1:mtFSkQ2MO5MvjUpulZoFKjKUIa8g8CTcdPVuJaPKS1w= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" --option binary-caches "https://cache.nixos.org https://masser-ebook-manager.cachix.org"
+  - nix-build ./release.nix --option trusted-public-keys "masser-ebook-manager.cachix.org-1:mtFSkQ2MO5MvjUpulZoFKjKUIa8g8CTcdPVuJaPKS1w= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" --option binary-caches "https://masser-ebook-manager.cachix.org https://cache.nixos.org" -A ghc.backend -A ghc.frontend
+  - nix-build ./release.nix --option trusted-public-keys "masser-ebook-manager.cachix.org-1:mtFSkQ2MO5MvjUpulZoFKjKUIa8g8CTcdPVuJaPKS1w= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" --option binary-caches "https://masser-ebook-manager.cachix.org https://cache.nixos.org" -A ghcjs.frontend
--- 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
--- a/backend/src/API.hs
+++ b/backend/src/API.hs
@ -1,27 +1,27 @@
-{-# Language DataKinds #-}
-{-# Language TypeFamilies #-}
-{-# Language TypeOperators #-}
-{-# Language NoImplicitPrelude #-}
-{-# Language MultiParamTypeClasses #-}
-{-# Language OverloadedStrings #-}
-{-# Language TemplateHaskell #-}
-{-# Language QuasiQuotes #-}
-{-# Language RecordWildCards #-}
-{-# Language DeriveGeneric #-}
-{-# Language FlexibleInstances #-}
+{-# LANGUAGE DataKinds             #-}
+{-# LANGUAGE DeriveGeneric         #-}
+{-# LANGUAGE FlexibleInstances     #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE OverloadedStrings     #-}
+{-# LANGUAGE QuasiQuotes           #-}
+{-# LANGUAGE RecordWildCards       #-}
+{-# LANGUAGE TemplateHaskell       #-}
+{-# LANGUAGE TypeFamilies          #-}
+{-# LANGUAGE TypeOperators         #-}
 module API (API, handler) where


-import Servant
-import Servant.HTML.Lucid (HTML)
-import Types
+import           Servant
+import           Servant.HTML.Lucid (HTML)
+import           Types

-import View
+import           View

-import qualified API.Users as Users
-import qualified API.Channels as Channels
-import qualified API.Books as Books
-import qualified API.Catalogue as Catalogue
+import qualified API.Books          as Books
+import qualified API.Catalogue      as Catalogue
+import qualified API.Channels       as Channels
+import qualified API.Users          as Users

 data Index = Index

--- a/backend/src/Configuration.hs
+++ b/backend/src/Configuration.hs
@ -23,3 +23,4 @@ data Config = Config { database :: Pg
 instance Interpret Pg
 instance Interpret Store
 instance Interpret Config
+
--- 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
@ -32,20 +29,19 @@ library
                     , RecordWildCards
  default-language:    Haskell2010

-test-suite spec
-  type:                exitcode-stdio-1.0
-  main-is:             Spec.hs
-  hs-source-dirs:      src
-  build-depends:       base >=4.10
-                     , classy-prelude
-                     , dhall
-                     , foreign-store
-                     , generic-lens
-                     , lens
-                     , mtl
-                     , text
-                     , transformers
-                     , validity
-                     , genvalidity-hspec
-                     , genvalidity-property
-                     , hspec
+-- test-suite spec
+--   type:                exitcode-stdio-1.0
+--   main-is:             Spec.hs
+--   hs-source-dirs:      src
+--   build-depends:       base >=4.10
+--                      , classy-prelude
+--                      , foreign-store
+--                      , generic-lens
+--                      , lens
+--                      , mtl
+--                      , text
+--                      , transformers
+--                      , validity
+--                      , genvalidity-hspec
+--                      , genvalidity-property
+--                      , hspec
--- a/default.nix
+++ b/default.nix
@ -1,15 +1,20 @@
 { nixpkgs, haskellPackages }:

-let jsaddle = nixpkgs.fetchFromGitHub {
-  owner = "ghcjs";
-  repo = "jsaddle";
-  rev = "68208be806c49a2a0c9f037dfac85feae10a8c80";
-  sha256 = "0acj0x716ikfb08ndib36jmwxkwq399lvkip46sfkh1ynn0pvc1c";
-};
+let
+  miso = nixpkgs.fetchFromGitHub {
+    owner = "dmjio";
+    repo = "miso";
+    rev = "630e823dd40a434b73124e12b229a79d9fefb01d";
+    sha256 = "046gdp3ah2lsipfcy89rh20mn08xbhcgrj549v8zzy69j33xjm2l";
+  };
+  miso-jsaddle = super: if haskellPackages.ghc.isGhcjs or false then (super.callPackage (miso + "/miso-ghcjs.nix") {}) else (super.callPackage (miso + "/miso-ghc-jsaddle.nix") {});
+
+  dontCheck = nixpkgs.haskell.lib.dontCheck;

 in

 (import ./project.nix nixpkgs) {
+  haskellPackages = haskellPackages;
  packages = {
    common = ./common;
    backend = ./backend;
@ -17,8 +22,38 @@ in
  };
  overrides = self: super: {
    generic-lens = nixpkgs.haskell.lib.dontCheck super.generic-lens;
-    jsaddle-warp = nixpkgs.haskell.lib.dontCheck (super.callPackage (jsaddle + "/jsaddle-warp") {});
-    jsaddle = super.callPackage (jsaddle + "/jsaddle") {};
+    miso = miso-jsaddle super;
+    # doctest = null; # Not compilable with ghcjs
+    # comonad = dontCheck super.comonad;
+    # Glob = dontCheck super.Glob;
+    # SHA = dontCheck super.SHA;
+    # iproute = dontCheck super.iproute;
+    # semigroupoids = dontCheck super.semigroupoids;
+    # wai-app-static = dontCheck super.wai-app-static;
+    # attoparsec = dontCheck super.attoparsec;
+    # http-date = dontCheck super.http-date;
+    # lens = dontCheck super.lens;
+    # unix-time = dontCheck super.unix-time;
+    # http-types = dontCheck super.http-types;
+    # servant = dontCheck super.servant;
+    # servant-server = dontCheck super.servant-server;
+    # servant-auth-docs = dontCheck super.servant-auth-docs;
+    # lens-aeson = dontCheck super.lens-aeson;
+    # word8 = dontCheck super.word8;
+    # http2 = dontCheck super.http2;
+    # wai-extra = dontCheck super.wai-extra;
+    # pgp-wordlist = dontCheck super.pgp-wordlist;
+    # prettyprinter = dontCheck super.prettyprinter;
+    # unliftio = dontCheck super.unliftio;
+    # prettyprinter-ansi-terminal = dontCheck super.prettyprinter-ansi-terminal;
+    # distributive = dontCheck super.distributive;
+    # genvalidity-property = dontCheck super.genvalidity-property;
+    # genvalidity-hspec = dontCheck super.genvalidity-hspec;
+    # genvalidity = dontCheck super.genvalidity;
+    # megaparsec = dontCheck super.megaparsec;
+    # ncurses = null;
+    # haskeline = super.callHackage "haskeline" "0.7.4.2" {};
+    # terminfo = super.callHackage "terminfo" "0.4.1.1" {};
  };
  tools = with haskellPackages; [
    ghcid
--- a/frontend/frontend.cabal
+++ b/frontend/frontend.cabal
@ -20,8 +20,9 @@ executable frontend
  -- other-modules:
  -- other-extensions:
  build-depends:       base >=4.11 && <4.12
-                     , common
                     , miso
                     , jsaddle-warp
+                     , mtl
+                     , common
  hs-source-dirs:      src
  default-language:    Haskell2010
--- a/frontend/src/Main.hs
+++ b/frontend/src/Main.hs
@ -1,4 +1,41 @@
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE LambdaCase                 #-}
+{-# LANGUAGE OverloadedStrings          #-}
+{-# LANGUAGE RecordWildCards            #-}
 module Main where

+import           Control.Monad.Trans              (liftIO)
+import           Language.Javascript.JSaddle.Warp
+import           Miso
+import           Miso.String
+
+data Action = Add
+            | Subtract
+            | SayHello
+            | NoOp
+
+newtype Model = Model Int deriving (Eq, Num, ToMisoString)
+
+updateModel :: Action -> Model -> Effect Action Model
+updateModel Add m      = noEff (m + 1)
+updateModel Subtract m = noEff (m - 1)
+updateModel SayHello m = m <# (liftIO (putStrLn "Hello world") >> pure NoOp)
+updateModel NoOp m     = noEff m
+
+viewModel :: Model -> View Action
+viewModel x =
+  div_ [] [ button_  [ onClick Add ] [ text "+" ]
+          , text (ms x)
+          , button_ [ onClick Subtract ] [ text "-" ]
+  ]
+
 main :: IO ()
-main = putStrLn "Hello, Haskell!"
+main = run 8081 $ startApp App{..}
+  where
+    model = Model 0
+    initialAction = SayHello
+    update = updateModel
+    view = viewModel
+    subs = []
+    events = defaultEvents
+    mountPoint = Nothing
--- a/ghcjs.patch
+++ b/ghcjs.patch
@ -0,0 +1,16 @@
+diff --git a/lib/boot/shims/src/string.js b/lib/boot/shims/src/string.js
+index d82f75a..f16e55a 100644
+--- a/lib/boot/shims/src/string.js
+++ b/lib/boot/shims/src/string.js
+@@ -780,11 +780,7 @@ function h$throwJSException(e) {
+   // adding the Exception dictionary
+   var strVal = e.toString() + '\n' + Array.prototype.join.call(e.stack, '\n');
+   var someE = MK_SOMEEXCEPTION(HS_JSEXCEPTION_EXCEPTION,
+-#ifdef GHCJS_PROF
+-                               MK_JSEXCEPTION(MK_JSVAL(e), h$toHsString(strVal), h$CCS_SYSTEM))
+-#else
+                                MK_JSEXCEPTION(MK_JSVAL(e), h$toHsString(strVal))
+-#endif
+                               );
+   return h$throw(someE, true);
+ }
--- a/jsaddle-warp-ghcjs.nix
+++ b/jsaddle-warp-ghcjs.nix
@ -0,0 +1,14 @@
+{ mkDerivation, base, fetchgit, stdenv }:
+mkDerivation {
+  pname = "jsaddle-warp";
+  version = "0.9.5.0";
+  src = fetchgit {
+    url = "https://github.com/ghcjs/jsaddle.git";
+    rev = "34fe7d61b3f387b81aa748294ac8d993243f53b4";
+    sha256 = "0qdh5qdk23vcp1yp910zgw2hs4zpbx9ig25xgaax0iwj2m1ifh5x";
+  };
+  postUnpack = "sourceRoot+=/jsaddle-warp; echo source root reset to $sourceRoot";
+  libraryHaskellDepends = [ base ];
+  description = "Interface for JavaScript that works with GHCJS and GHC";
+  license = stdenv.lib.licenses.mit;
+}
--- a/nixpkgs-version.json
+++ b/nixpkgs-version.json
@ -1,7 +1,7 @@
 {
  "url": "https://github.com/nixos/nixpkgs.git",
-  "rev": "e0d250e5cf6d179e1ccc775472d89718f61fcfd1",
+  "rev": "4507926b80c6b8f73053775ffee17f6781c7e7c8",
  "date": "2018-01-08T11:52:28+01:00",
-  "sha256": "1iqpjz4czcpghbv924a5h4jvfmj6c8q6sl3b1z7blz3mi740aivs",
+  "sha256": "068v9xh7d8klk62p2qwr76fyfqfh1bp08xc12x138g5q6pg6yfzb",
  "fetchSubmodules": true
 }
--- a/project.nix
+++ b/project.nix
@ -6,7 +6,8 @@ let

 in

-{ packages
+{ haskellPackages
+, packages
 , overrides ? _ : _ : {}
 , tools ? []
 }:
@ -17,12 +18,17 @@ let
    (self: super: mapAttrs (name: path: self.callCabal2nix name path {}) packages)
    overrides
  ];
-  haskellPackages = nixpkgs.haskellPackages.override { overrides = overrides'; };
-  packages' = mapAttrs (name: _: haskellPackages."${name}") packages;
+  haskellPackages' = haskellPackages.extend overrides';
+  packages' = mapAttrs (name: _: haskellPackages'."${name}") packages;
  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}";
--- a/release.nix
+++ b/release.nix
@ -2,14 +2,71 @@

 let

+  jsaddle = nixpkgs.fetchFromGitHub {
+    owner = "ghcjs";
+    repo = "jsaddle";
+    rev = "34fe7d61b3f387b81aa748294ac8d993243f53b4";
+    sha256 = "0qdh5qdk23vcp1yp910zgw2hs4zpbx9ig25xgaax0iwj2m1ifh5x";
+  };
+  config = {
+    packageOverrides = pkgs: with pkgs.haskell.lib;  with pkgs.lib; {
+      haskell = pkgs.haskell // {
+        packages = pkgs.haskell.packages // {
+          ghccustom = pkgs.haskell.packages.ghc843.override {
+            overrides = self: super: {
+              jsaddle-warp = dontCheck (super.callPackage (jsaddle + "/jsaddle-warp") {});
+              # jsaddle-warp = super.callPackage ./jsaddle-warp-ghcjs.nix {};
+              jsaddle = dontCheck (super.callPackage (jsaddle + "/jsaddle") {});
+            };
+          };
+          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);
+              scientific = dontCheck (super.scientific);
+              servant = dontCheck (super.servant);
+              jsaddle-warp = super.callPackage ./jsaddle-warp-ghcjs.nix {};
+              ghc = overrideDerivation (super.ghc.override {
+                ghcjsSrc = pkgs.fetchgit {
+                  url = "https://github.com/ghcjs/ghcjs.git";
+                  rev = "dc190b1bb2453cfa484124e9f335ee3cad1492f7";
+                  sha256 = "0dh52gj0f3700zfyrhisy44b6y9p1bsawwrmd5pllpdyw21zd9lw";
+                  fetchSubmodules = true;
+                };
+              }) (drv: { patches = (drv.patches or []) ++ [ ./ghcjs.patch ]; });
+            };
+          };
+        };
+      };
+    };
+  };
  pinnedVersion = nixpkgs.lib.importJSON ./nixpkgs-version.json;
  pinnedPkgs = import (nixpkgs.fetchFromGitHub {
    owner = "NixOS";
    repo = "nixpkgs";
    inherit (pinnedVersion) rev sha256;
-  }) {};
+  }) { inherit config; };
+  ghc = import ./default.nix { nixpkgs = pinnedPkgs; haskellPackages = pinnedPkgs.haskell.packages.ghccustom; };
+  ghcjs = import ./default.nix { nixpkgs = pinnedPkgs; haskellPackages = pinnedPkgs.haskell.packages.ghcjscustom; };
  inherit (pinnedPkgs) pkgs;

  in

-import ./default.nix { nixpkgs = pinnedPkgs; haskellPackages = pinnedPkgs.haskellPackages; }
+{
+  inherit ghc ghcjs;
+  deps = pkgs.buildEnv {
+    name = "deps";
+    paths = [
+      (pkgs.haskell.packages.ghccustom.ghcWithPackages (_: ghc.backend.buildInputs ++ ghc.backend.propagatedBuildInputs))
+      (pkgs.haskell.packages.ghcjscustom.ghcWithPackages (_: ghcjs.frontend.buildInputs ++ ghcjs.frontend.propagatedBuildInputs))
+    ];
+    buildInputs = [ ];
+  };
+}
Author	SHA1	Message	Date
Mats Rauhala	c45ea0ecc8	wip	2018-12-20 00:33:32 +02:00
Mats Rauhala	6767813879	wip	2018-12-20 00:29:25 +02:00
Mats Rauhala	8818b6f495	Separate backend and frontend	2018-12-19 23:18:13 +02:00