.travis.yml

@@ -8,5 +8,4 @@ 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://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://cache.nixos.org https://masser-ebook-manager.cachix.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 backend -A frontend

default.nix

@@ -14,12 +14,9 @@ let
     sha256 = "1yq5y4vffslm6abnfnggp5m3k6vla6mzcwmhmm23l8yizsvdkwv2";
   };
 
-  dontCheck = nixpkgs.haskell.lib.dontCheck;
-
 in
 
 (import ./project.nix nixpkgs) {
-  haskellPackages = haskellPackages;
   packages = {
     common = ./common;
     backend = ./backend;
@@ -30,24 +27,6 @@ in
     jsaddle-warp = nixpkgs.haskell.lib.dontCheck (super.callPackage (jsaddle + "/jsaddle-warp") {});
     jsaddle = super.callPackage (jsaddle + "/jsaddle") {};
     miso = super.callPackage (miso + "/miso-ghc-jsaddle.nix") {};
-    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;
-    word8 = dontCheck super.word8;
-    http2 = dontCheck super.http2;
-    wai-extra = dontCheck super.wai-extra;
-    haskeline = super.callHackage "haskeline" "0.7.3.1" {};
-    terminfo = super.callHackage "terminfo" "0.4.1.1" {};
   };
   tools = with haskellPackages; [
     ghcid

project.nix

@@ -6,8 +6,7 @@ let
 
 in
 
-{ haskellPackages
-, packages
+{ packages
 , overrides ? _ : _ : {}
 , tools ? []
 }:
@@ -18,12 +17,12 @@ let
     (self: super: mapAttrs (name: path: self.callCabal2nix name path {}) packages)
     overrides
   ];
-  haskellPackages' = haskellPackages.override { overrides = overrides'; };
-  packages' = mapAttrs (name: _: haskellPackages'."${name}") packages;
+  haskellPackages = nixpkgs.haskellPackages.override { overrides = overrides'; };
+  packages' = mapAttrs (name: _: haskellPackages."${name}") packages;
   mkShell = name: pkg:
   let
     n =  "${name}-shell";
-    deps = haskellPackages'.ghcWithHoogle (pkgs: pkg.buildInputs ++ pkg.propagatedBuildInputs);
+    deps = haskellPackages.ghcWithHoogle (pkgs: pkg.buildInputs ++ pkg.propagatedBuildInputs);
   in
   {
     name = "${n}";

release.nix

@@ -12,7 +12,4 @@ let
 
   in
 
-{
-  ghc = import ./default.nix { nixpkgs = pinnedPkgs; haskellPackages = pinnedPkgs.haskell.packages.ghc843; };
-  ghcjs = import ./default.nix { nixpkgs = pinnedPkgs; haskellPackages = pinnedPkgs.haskell.packages.ghcjs84; };
-}
+import ./default.nix { nixpkgs = pinnedPkgs; haskellPackages = pinnedPkgs.haskellPackages; }