diff --git a/default.nix b/default.nix
index 6b1fa93..7f9e2c8 100644
--- a/default.nix
+++ b/default.nix
@@ -4,8 +4,8 @@ let
   jsaddle = nixpkgs.fetchFromGitHub {
     owner = "ghcjs";
     repo = "jsaddle";
-    rev = "68208be806c49a2a0c9f037dfac85feae10a8c80";
-    sha256 = "0acj0x716ikfb08ndib36jmwxkwq399lvkip46sfkh1ynn0pvc1c";
+    rev = "34fe7d61b3f387b81aa748294ac8d993243f53b4";
+    sha256 = "0qdh5qdk23vcp1yp910zgw2hs4zpbx9ig25xgaax0iwj2m1ifh5x";
   };
   miso = nixpkgs.fetchFromGitHub {
     owner = "dmjio";
@@ -13,6 +13,7 @@ let
     rev = "a9c4f0a3a6e7d87f9432dc6cf4b1d0c052bf7ef1";
     sha256 = "1yq5y4vffslm6abnfnggp5m3k6vla6mzcwmhmm23l8yizsvdkwv2";
   };
+  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;
 
@@ -29,7 +30,7 @@ in
     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 = super.callPackage (miso + "/miso-ghc-jsaddle.nix") {};
+    miso = miso-jsaddle super;
     doctest = null; # Not compilable with ghcjs
     comonad = dontCheck super.comonad;
     Glob = dontCheck super.Glob;
@@ -43,10 +44,23 @@ in
     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;
-    haskeline = super.callHackage "haskeline" "0.7.3.1" {};
+    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; [