WIP ghcjs

.travis.yml

@@ -8,5 +8,5 @@ before_script:
   - mkdir -p ~/.config/nixpkgs
 
 script:
-  - 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://cache.nixos.org https://masser-ebook-manager.cachix.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
+  - nix-build ./release.nix --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" -A ghcjs.frontend

backend/backend.cabal

@@ -23,7 +23,6 @@ executable backend
                      , API.Catalogue
                      , API.Channels
                      , API.Users
-                     , Configuration
                      , Database
                      , Database.Book
                      , Database.Channel
@@ -146,4 +145,4 @@ test-suite spec
   default-extensions:  DeriveGeneric
                      , NoImplicitPrelude
                      , OverloadedStrings
-                     , RecordWildCards
+                     , RecordWildCards

common/common.cabal

@@ -13,10 +13,13 @@ extra-source-files:  ChangeLog.md
 cabal-version:       >=1.10
 
 library
-  exposed-modules:     Data.Versioned
+  exposed-modules:     Configuration
+                     , Data.Versioned
   -- other-extensions:
   build-depends:       base >=4.10
                      , classy-prelude
+                     , dhall
+                     , foreign-store
                      , generic-lens
                      , lens
                      , mtl
@@ -29,19 +32,20 @@ library
                      , RecordWildCards
   default-language:    Haskell2010
 
--- test-suite spec
+test-suite spec
---   type:                exitcode-stdio-1.0
+  type:                exitcode-stdio-1.0
---   main-is:             Spec.hs
+  main-is:             Spec.hs
---   hs-source-dirs:      src
+  hs-source-dirs:      src
---   build-depends:       base >=4.10
+  build-depends:       base >=4.10
---                      , classy-prelude
+                     , classy-prelude
---                      , foreign-store
+                     , dhall
---                      , generic-lens
+                     , foreign-store
---                      , lens
+                     , generic-lens
---                      , mtl
+                     , lens
---                      , text
+                     , mtl
---                      , transformers
+                     , text
---                      , validity
+                     , transformers
---                      , genvalidity-hspec
+                     , validity
---                      , genvalidity-property
+                     , genvalidity-hspec
---                      , hspec
+                     , genvalidity-property
+                     , hspec

common/src/Configuration.hs

@@ -23,4 +23,3 @@ data Config = Config { database :: Pg
 instance Interpret Pg
 instance Interpret Store
 instance Interpret Config
-

default.nix

@@ -1,6 +1,12 @@
 { nixpkgs, haskellPackages }:
 
 let
+  jsaddle = nixpkgs.fetchFromGitHub {
+    owner = "ghcjs";
+    repo = "jsaddle";
+    rev = "34fe7d61b3f387b81aa748294ac8d993243f53b4";
+    sha256 = "0qdh5qdk23vcp1yp910zgw2hs4zpbx9ig25xgaax0iwj2m1ifh5x";
+  };
   miso = nixpkgs.fetchFromGitHub {
     owner = "dmjio";
     repo = "miso";
@@ -22,6 +28,8 @@ 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;

frontend/frontend.cabal

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

ghcjs.patch

@@ -1,16 +0,0 @@
-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);
- }

jsaddle-warp-ghcjs.nix

@@ -1,14 +0,0 @@
-{ 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;
-}

project.nix

@@ -18,17 +18,12 @@ let
     (self: super: mapAttrs (name: path: self.callCabal2nix name path {}) packages)
     overrides
   ];
-  haskellPackages' = haskellPackages.extend overrides';
+  haskellPackages' = haskellPackages.override { overrides = overrides'; };
   packages' = mapAttrs (name: _: haskellPackages'."${name}") packages;
   mkShell = name: pkg:
   let
     n =  "${name}-shell";
-    deps = with haskellPackages'; [
+    deps = haskellPackages'.ghcWithHoogle (pkgs: pkg.buildInputs ++ pkg.propagatedBuildInputs);
-      ghcid
-      cabal-install
-      hasktags
-      (haskellPackages'.ghcWithHoogle (pkgs: pkg.buildInputs ++ pkg.propagatedBuildInputs))
-    ];
   in
   {
     name = "${n}";

release.nix

@@ -2,31 +2,13 @@
 
 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 {
+          ghcjs84 = pkgs.haskell.packages.ghcjs84.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);
@@ -37,7 +19,7 @@ let
                 ghcjsSrc = pkgs.fetchgit {
                   url = "https://github.com/ghcjs/ghcjs.git";
                   rev = "dc190b1bb2453cfa484124e9f335ee3cad1492f7";
-                  sha256 = "0dh52gj0f3700zfyrhisy44b6y9p1bsawwrmd5pllpdyw21zd9lw";
+                  sha256 = "0dh52aj0f3700zfyrhisy44b6y9p1bsawwrmd5pllpdyw21zd9lw";
                   fetchSubmodules = true;
                 };
               }) (drv: { patches = (drv.patches or []) ++ [ ./ghcjs.patch ]; });
@@ -53,20 +35,11 @@ let
     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
 
 {
-  inherit ghc ghcjs;
+  ghc = import ./default.nix { nixpkgs = pinnedPkgs; haskellPackages = pinnedPkgs.haskell.packages.ghc843; };
-  deps = pkgs.buildEnv {
+  ghcjs = import ./default.nix { nixpkgs = pinnedPkgs; haskellPackages = pinnedPkgs.haskell.packages.ghcjs84; };
-    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 = [ ];
-  };
 }