Bump to ghc 8.10.7

.obelisk/impl/github.json

@@ -1,8 +1,8 @@
 {
-  "owner": "kadena-io",
+  "owner": "hsloan",
   "repo": "obelisk",
-  "branch": "jam/add-externs",
+  "branch": "is/ghc8_10-with-jam-add-externs",
   "private": false,
-  "rev": "60748a31cbf3e779f910398f7c8980dd06b43ad8",
-  "sha256": "1i29pkv3vx1m9d50q23p9npi7abg2rxlvqs3ynw7pzvlq1vl16w6"
+  "rev": "70d1ddff93f4bfc4ae6d471df88233d996bc0edf",
+  "sha256": "0q0g4y0g2mrqjnb6ryy4scrdabc4r21gxmxk4814pvc4m2y8y8zh"
 }

.obelisk/impl/thunk.nix

@@ -2,7 +2,10 @@
 let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
   if !fetchSubmodules && !private then builtins.fetchTarball {
     url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
-  } else (import <nixpkgs> {}).fetchFromGitHub {
+  } else (import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
+  sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
+}) {}).fetchFromGitHub {
     inherit owner repo rev sha256 fetchSubmodules private;
   };
   json = builtins.fromJSON (builtins.readFile ./github.json);

common/src/Common/Api.hs

@@ -21,14 +21,14 @@ getVerificationServerUrl = do
   pure $ T.dropWhileEnd (== '/') . T.decodeUtf8With T.lenientDecode <$> mUri
 
 -- | Get "config/common/route" normalized.
-getConfigRoute :: HasConfigs m => m Text
+getConfigRoute :: (HasConfigs m) => m Text
 getConfigRoute =
   T.dropWhileEnd (== '/') <$> getMandatoryTextCfg "common/route"
 
-getTextCfg :: HasConfigs m => Text -> m (Maybe Text)
+getTextCfg :: (HasConfigs m) => Text -> m (Maybe Text)
 getTextCfg p = fmap (T.strip . T.decodeUtf8With T.lenientDecode) <$> getConfig p
 
-getMandatoryTextCfg :: HasConfigs m => Text -> m Text
+getMandatoryTextCfg :: (HasConfigs m) => Text -> m Text
 getMandatoryTextCfg p = getTextCfg p >>= \case
-  Nothing -> fail $ "Obelisk.ExecutableConfig, could not find: '" <> T.unpack p <> "'!"
+  Nothing -> error $ "Obelisk.ExecutableConfig, could not find: '" <> T.unpack p <> "'!"
   Just r -> pure r

default.nix

@@ -6,7 +6,7 @@ args@{ system ? builtins.currentSystem
 , kpkgs ? import ./dep/kpkgs { inherit system; }  # If you want a custom package set, pass it into
                                                   # kpkgs arg
 , obelisk ? (import ./.obelisk/impl { inherit system iosSdkVersion terms; inherit (kpkgs) reflex-platform-func;})
-, withHoogle ? false
+, withHoogle ? true
 }:
 with obelisk;
 let

dep/attoparsec/default.nix

@@ -0,0 +1,2 @@
+# DO NOT HAND-EDIT THIS FILE
+import (import ./thunk.nix)

dep/attoparsec/github.json

@@ -0,0 +1,8 @@
+{
+  "owner": "dfordivam",
+  "repo": "attoparsec",
+  "branch": "text-jsstring",
+  "private": false,
+  "rev": "cbfb944aeff61144059a28ada93c579e93ccf7d2",
+  "sha256": "0bbr4943439sy3grwpwbna4mk7iv87ijaiv3jjfhxhp7y67z51h8"
+}

dep/attoparsec/thunk.nix

@@ -0,0 +1,9 @@
+# DO NOT HAND-EDIT THIS FILE
+let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
+  if !fetchSubmodules && !private then builtins.fetchTarball {
+    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
+  } else (import <nixpkgs> {}).fetchFromGitHub {
+    inherit owner repo rev sha256 fetchSubmodules private;
+  };
+  json = builtins.fromJSON (builtins.readFile ./github.json);
+in fetch json

dep/dependent-sum-aeson-orphans/default.nix

@@ -1,7 +1,2 @@
 # DO NOT HAND-EDIT THIS FILE
-import ((import <nixpkgs> {}).fetchFromGitHub (
-  let json = builtins.fromJSON (builtins.readFile ./github.json);
-  in { inherit (json) owner repo rev sha256;
-       private = json.private or false;
-     }
-))
+import (import ./thunk.nix)

dep/dependent-sum-aeson-orphans/github.json

@@ -2,6 +2,7 @@
   "owner": "obsidiansystems",
   "repo": "dependent-sum-aeson-orphans",
   "branch": "develop",
-  "rev": "4bc8e674edb37a304746de0e59e43c460d59e33f",
-  "sha256": "1a5yy8r1zyqzj7iqjd7py84p3c788cpkqi3b8k0kb7psyjwwcg9w"
+  "private": false,
+  "rev": "b11f0f5365334a4054044ef099dbc533c396af42",
+  "sha256": "11w68wvx745k0g4v6g2y8xpxpkxfyba8s813nfpw3gp26qamhz41"
 }

dep/dependent-sum-aeson-orphans/thunk.nix

@@ -0,0 +1,12 @@
+# DO NOT HAND-EDIT THIS FILE
+let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
+  if !fetchSubmodules && !private then builtins.fetchTarball {
+    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
+  } else (import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
+  sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
+}) {}).fetchFromGitHub {
+    inherit owner repo rev sha256 fetchSubmodules private;
+  };
+  json = builtins.fromJSON (builtins.readFile ./github.json);
+in fetch json

dep/hashable/default.nix

@@ -0,0 +1,2 @@
+# DO NOT HAND-EDIT THIS FILE
+import (import ./thunk.nix)

dep/hashable/github.json

@@ -0,0 +1,8 @@
+{
+  "owner": "kadena-io",
+  "repo": "hashable",
+  "branch": "is/hashable-with-overlays",
+  "private": false,
+  "rev": "ee7eeb631fca6209b66d7cdd8ffaa8221463fe4b",
+  "sha256": "0m0km5ybqhfnnqqhv7j0r66gpjrly6x7853l1i0z8nwshmyhzxz1"
+}

dep/hashable/thunk.nix

@@ -0,0 +1,12 @@
+# DO NOT HAND-EDIT THIS FILE
+let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
+  if !fetchSubmodules && !private then builtins.fetchTarball {
+    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
+  } else (import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
+  sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
+}) {}).fetchFromGitHub {
+    inherit owner repo rev sha256 fetchSubmodules private;
+  };
+  json = builtins.fromJSON (builtins.readFile ./github.json);
+in fetch json

dep/jsaddle/default.nix

@@ -1,7 +1,2 @@
 # DO NOT HAND-EDIT THIS FILE
-import ((import <nixpkgs> {}).fetchFromGitHub (
-  let json = builtins.fromJSON (builtins.readFile ./github.json);
-  in { inherit (json) owner repo rev sha256;
-       private = json.private or false;
-     }
-))
+import (import ./thunk.nix)

dep/jsaddle/github.json

@@ -1,7 +1,8 @@
 {
   "owner": "obsidiansystems",
   "repo": "jsaddle",
-  "branch": "ae@bump-warp",
-  "rev": "86b166033186c1724d4d52eeaf0935f0f29fe1ca",
-  "sha256": "1m1xxy4l9ii91k1k504qkxh9k1ybprm1m66mkb9dqlwcpyhcccmv"
+  "branch": "is/ghc8_10-ae@bump-warp",
+  "private": false,
+  "rev": "60a7fe39908fafc8e641d5c1207fe63d982f0ddf",
+  "sha256": "0mrml13xjh7kb3lhqncpqy9jjw1zng46w67z5wk9dry9sspwv6p7"
 }

dep/jsaddle/thunk.nix

@@ -0,0 +1,12 @@
+# DO NOT HAND-EDIT THIS FILE
+let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
+  if !fetchSubmodules && !private then builtins.fetchTarball {
+    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
+  } else (import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
+  sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
+}) {}).fetchFromGitHub {
+    inherit owner repo rev sha256 fetchSubmodules private;
+  };
+  json = builtins.fromJSON (builtins.readFile ./github.json);
+in fetch json

dep/kpkgs/github.json

@@ -1,8 +1,8 @@
 {
   "owner": "kadena-io",
   "repo": "kpkgs",
-  "branch": "master",
+  "branch": "is/ghc8_10-beta",
   "private": false,
-  "rev": "905ac27a05db959db3ce27c4f258310746a9f12b",
-  "sha256": "0mw6zsxkc93pqravvjmjiaq3bhydfabkvh12wbndj2jgv3i4z3qx"
+  "rev": "73a945dfb49d0faa9bd5cc917a95d840844184e7",
+  "sha256": "1qicaimn2srxiahvbw16ngqd8ykav3fzm90bgzm0cprx1d52cj3m"
 }

dep/kpkgs/thunk.nix

@@ -2,7 +2,10 @@
 let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
   if !fetchSubmodules && !private then builtins.fetchTarball {
     url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
-  } else (import <nixpkgs> {}).fetchFromGitHub {
+  } else (import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
+  sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
+}) {}).fetchFromGitHub {
     inherit owner repo rev sha256 fetchSubmodules private;
   };
   json = builtins.fromJSON (builtins.readFile ./github.json);

dep/obelisk-oauth/default.nix

@@ -1,7 +1,2 @@
 # DO NOT HAND-EDIT THIS FILE
-import ((import <nixpkgs> {}).fetchFromGitHub (
-  let json = builtins.fromJSON (builtins.readFile ./github.json);
-  in { inherit (json) owner repo rev sha256;
-       private = json.private or false;
-     }
-))
+import (import ./thunk.nix)

dep/obelisk-oauth/github.json

@@ -1,7 +1,8 @@
 {
   "owner": "obsidiansystems",
   "repo": "obelisk-oauth",
-  "branch": "ts-improvements",
-  "rev": "b7fd1f4f1b96ee14c5af4d90a3db3a6b38eb1995",
-  "sha256": "0pg3ibfas7piqcjr79444jp2i0c4yxgqd71yf1lkf1l1147yj6m1"
+  "branch": "is/ghc8_10-ts-improvements",
+  "private": false,
+  "rev": "3e51b4bb33ad6548d37e16d0d4aaa7faf7af847d",
+  "sha256": "0nkq1x6idm54wg5xbafg553gj8lmgclal7y9abx4m0wg1wk7mgvz"
 }

dep/obelisk-oauth/thunk.nix

@@ -0,0 +1,12 @@
+# DO NOT HAND-EDIT THIS FILE
+let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
+  if !fetchSubmodules && !private then builtins.fetchTarball {
+    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
+  } else (import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
+  sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
+}) {}).fetchFromGitHub {
+    inherit owner repo rev sha256 fetchSubmodules private;
+  };
+  json = builtins.fromJSON (builtins.readFile ./github.json);
+in fetch json

dep/pact/github.json

@@ -1,8 +1,8 @@
 {
   "owner": "kadena-io",
   "repo": "pact",
-  "branch": "johnw/musl",
+  "branch": "master",
   "private": false,
-  "rev": "d15d87d5b0375169264a9b97cacfe1e51a10ff6e",
-  "sha256": "0jwif9vkna4ysw5f552qi4z1z4lxkg0nyxz2h2wax9zx6jxq9ca3"
+  "rev": "603f1523162c95742fb3e040ac065ff82f2b2aea",
+  "sha256": "0p4afnbsmm44hc4v4z4cr13h8dhnkr92zvra9rnlw7hdjrh8h2dy"
 }

dep/pact/thunk.nix

@@ -2,7 +2,10 @@
 let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
   if !fetchSubmodules && !private then builtins.fetchTarball {
     url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
-  } else (import <nixpkgs> {}).fetchFromGitHub {
+  } else (import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
+  sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
+}) {}).fetchFromGitHub {
     inherit owner repo rev sha256 fetchSubmodules private;
   };
   json = builtins.fromJSON (builtins.readFile ./github.json);

dep/reflex-dom-contrib/default.nix

@@ -1,7 +1,2 @@
 # DO NOT HAND-EDIT THIS FILE
-import ((import <nixpkgs> {}).fetchFromGitHub (
-  let json = builtins.fromJSON (builtins.readFile ./github.json);
-  in { inherit (json) owner repo rev sha256;
-       private = json.private or false;
-     }
-))
+import (import ./thunk.nix)

dep/reflex-dom-contrib/github.json

@@ -1,7 +1,8 @@
 {
   "owner": "reflex-frp",
   "repo": "reflex-dom-contrib",
-  "branch": "master",
-  "rev": "11db20865fd275362be9ea099ef88ded425789e7",
-  "sha256": "1rmcqg97hr87blp1vl15rnvsxp836c2dh89lwpyb7lvh86d7jwaf"
+  "branch": "is/ghc8_10-mods",
+  "private": false,
+  "rev": "97b2e87ea410b1e1fd4a2821244cca85c27fdb05",
+  "sha256": "128zn47mzdzzsin9chacbgg70wx38h020wv46jl2kzyi2p6kafra"
 }

dep/reflex-dom-contrib/thunk.nix

@@ -0,0 +1,12 @@
+# DO NOT HAND-EDIT THIS FILE
+let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
+  if !fetchSubmodules && !private then builtins.fetchTarball {
+    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
+  } else (import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
+  sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
+}) {}).fetchFromGitHub {
+    inherit owner repo rev sha256 fetchSubmodules private;
+  };
+  json = builtins.fromJSON (builtins.readFile ./github.json);
+in fetch json

dep/reflex-dom/github.json

@@ -1,7 +1,9 @@
 {
   "owner": "reflex-frp",
   "repo": "reflex-dom",
-  "branch": "develop",
-  "rev": "2028ff64becdfc28032b7e6a91fcdbc285d39d2f",
-  "sha256": "0d0gvi44lra11ms7dkkl4czrki000y2qywk8bdar2ipsgsh36391"
+  "branch": "release/reflex-dom-core/0.7.0.2",
+  "private": false,
+  "rev": "6b8f6e8074ae9bd9b2603dc068141b577806bdda",
+  "sha256": "1f6vlp10wj4cgig8pbps08lwc2zqz0mrwjrxgvyhn1ly6lypm9rr"
 }
+

dep/servant-jsaddle/default.nix

@@ -1,7 +1,2 @@
 # DO NOT HAND-EDIT THIS FILE
-import ((import <nixpkgs> {}).fetchFromGitHub (
-  let json = builtins.fromJSON (builtins.readFile ./github.json);
-  in { inherit (json) owner repo rev sha256;
-       private = json.private or false;
-     }
-))
+import (import ./thunk.nix)

dep/servant-jsaddle/github.json

@@ -1,7 +1,8 @@
 {
-  "owner": "kadena-io",
+  "owner": "obsidiansystems",
   "repo": "servant-jsaddle",
-  "branch": "fix-encoding-error",
-  "rev": "2ccf13d185e26d4cb4a51622e748ec64336435f4",
-  "sha256": "066vr1rfq6bjn3xx9g52z2vgp1ibyz50z3hzwaqq3fzxnr2srpjs"
+  "branch": "is/ghc8_10-mods",
+  "private": false,
+  "rev": "4354e7a5dab0105b99ffc2c61e9dff1ac77eb6af",
+  "sha256": "0x2xmr52ld1ra2lfz6kkw41n2hji44n2bc9s7i6lnyrg8ns7ymhj"
 }

dep/servant-jsaddle/thunk.nix

@@ -0,0 +1,12 @@
+# DO NOT HAND-EDIT THIS FILE
+let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
+  if !fetchSubmodules && !private then builtins.fetchTarball {
+    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
+  } else (import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
+  sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
+}) {}).fetchFromGitHub {
+    inherit owner repo rev sha256 fetchSubmodules private;
+  };
+  json = builtins.fromJSON (builtins.readFile ./github.json);
+in fetch json

dep/signing-api/github.json

@@ -1,8 +1,8 @@
 {
-  "owner": "kadena-io",
+  "owner": "obsidiansystems",
   "repo": "signing-api",
-  "branch": "master",
+  "branch": "is/ghc8_10-mods",
   "private": false,
-  "rev": "0b454c020bbfa67366c9e8da29212e88af75a10b",
-  "sha256": "0w5nh4xrpfjdipi1n91x3b72ra8389qr6yybn3ifi6liyx61fqxb"
+  "rev": "6caf7221adf7862b05b5011888475e169256a12b",
+  "sha256": "1kcvghr98cnvcs4971r31lhgysfadbgwvmj7gfm9jds0472xvp61"
 }

dep/signing-api/thunk.nix

@@ -2,7 +2,10 @@
 let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
   if !fetchSubmodules && !private then builtins.fetchTarball {
     url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
-  } else (import <nixpkgs> {}).fetchFromGitHub {
+  } else (import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
+  sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
+}) {}).fetchFromGitHub {
     inherit owner repo rev sha256 fetchSubmodules private;
   };
   json = builtins.fromJSON (builtins.readFile ./github.json);

desktop/src/Desktop/Crypto/BIP.hs

@@ -99,7 +99,7 @@ newtype BIPCryptoT t m a = BIPCryptoT
     ( Functor, Applicative, Monad
     , MonadFix, MonadIO, MonadRef, MonadAtomicRef
     , DomBuilder t, NotReady t, MonadHold t, MonadSample t
-    , TriggerEvent t, PostBuild t, HasJS x
+    , TriggerEvent t, PostBuild t
     , MonadReflexCreateTrigger t, MonadQuery t q, Requester t
     , HasStorage, HasDocument
     , Routed t r, RouteToUrl r, SetRoute t r, EventWriter t w
@@ -216,9 +216,6 @@ instance PrimMonad m => PrimMonad (BIPCryptoT t m) where
   type PrimState (BIPCryptoT t m) = PrimState m
   primitive = lift . primitive
 
-instance HasJSContext m => HasJSContext (BIPCryptoT t m) where
-  type JSContextPhantom (BIPCryptoT t m) = JSContextPhantom m
-  askJSContext = BIPCryptoT askJSContext
 #if !defined(ghcjs_HOST_OS)
 instance MonadJSM m => MonadJSM (BIPCryptoT t m)
 #endif
@@ -232,7 +229,7 @@ instance (Adjustable t m, MonadHold t m, MonadFix m) => Adjustable t (BIPCryptoT
   traverseDMapWithKeyWithAdjustWithMove f dm0 dm' = BIPCryptoT $ traverseDMapWithKeyWithAdjustWithMove (coerce . f) dm0 dm'
   traverseIntMapWithKeyWithAdjust f im0 im' = BIPCryptoT $ traverseIntMapWithKeyWithAdjust (coerce f) im0 im'
 
-instance (Prerender js t m, Monad m, Reflex t) => Prerender js t (BIPCryptoT t m) where
+instance (Prerender t m, Monad m, Reflex t) => Prerender t (BIPCryptoT t m) where
   type Client (BIPCryptoT t m) = BIPCryptoT t (Client m)
   prerender a b = BIPCryptoT $ prerender (unBIPCryptoT a) (unBIPCryptoT b)