Provide Data.Aeson.GADT from aeson-gadt-th's Data.Aeson.GADT.TH

Fixes #28
obsidiansystems · Jan 23, 2019 · 5a529a0 · 5a529a0
1 parent 54e9a1f
commit 5a529a0
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 156 deletions.
diff --git a/common/Data/Aeson/GADT.hs b/common/Data/Aeson/GADT.hs
diff --git a/common/default.nix b/common/default.nix
@@ -4,6 +4,7 @@
 , mime-mail, monad-control, monad-logger, monoidal-containers, mtl
 , network-uri, reflex, resource-pool, stdenv, template-haskell
 , text, these, time, transformers, transformers-base, vector
+, aeson-gadt-th
 , hostPlatform
 }:
 mkDerivation {
@@ -16,7 +17,7 @@ mkDerivation {
     dependent-sum file-embed filepath http-types mime-mail
     monad-control monoidal-containers mtl network-uri
     reflex resource-pool template-haskell text these time transformers
-    transformers-base vector
+    transformers-base vector aeson-gadt-th
   ] ++ (if hostPlatform.libc == "bionic" || hostPlatform.isAarch64 then [] else [
     monad-logger
   ]);

diff --git a/common/rhyolite-common.cabal b/common/rhyolite-common.cabal
@@ -13,6 +13,7 @@ library
 
   build-depends:
       aeson
+    , aeson-gadt-th
     , async
     , attoparsec
     , base
@@ -41,7 +42,6 @@ library
     , vector
 
   exposed-modules:
-    Data.Aeson.GADT
     Data.MonoidMap
     Rhyolite.Account
     Rhyolite.Api
@@ -58,6 +58,9 @@ library
     Rhyolite.TH
     Rhyolite.WebSocket
 
+  reexported-modules:
+    aeson-gadt-th:Data.Aeson.GADT.TH as Data.Aeson.GADT
+
   if !os(ios) && !arch(aarch64) && !arch(arm) && !impl(ghcjs)
     build-depends: monad-logger
     other-extensions: TemplateHaskell

diff --git a/default.nix b/default.nix
@@ -21,7 +21,16 @@ let
       };
     };
 
+    # TODO use `hackGet`, or even better `thunkSet` for all of them.
+    # (Both are from reflex-platform.)
     srcs = {
+      # TODO bump cabal hashes and use Hackage version.
+      aeson-gadt-th = let
+          json = builtins.fromJSON (builtins.readFile ./dep/aeson-gadt-th/github.json);
+        in pkgs.fetchFromGitHub {
+          inherit (json) owner repo rev sha256;
+          private = json.private or false;
+        };
       constraints-extras = pkgs.fetchFromGitHub {
         owner = "obsidiansystems";
         repo = "constraints-extras";

diff --git a/dep/aeson-gadt-th/default.nix b/dep/aeson-gadt-th/default.nix
@@ -0,0 +1,7 @@
+# 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;
+     }
+))
diff --git a/dep/aeson-gadt-th/github.json b/dep/aeson-gadt-th/github.json
@@ -0,0 +1,7 @@
+{
+  "owner": "obsidiansystems",
+  "repo": "aeson-gadt-th",
+  "branch": "master",
+  "rev": "f4c173747c8b83cb201975b5ce8c9c7e33f9b7fc",
+  "sha256": "18dva9sgg93s79m973qmc1j52jard6yq3ficxhwmzzy5yri6rry6"
+}