From 86e213ab6ef7ff5aac5af991358390790e16e83f Mon Sep 17 00:00:00 2001
From: Jappie Klooster <jappieklooster@hotmail.com>
Date: Sun, 4 Aug 2019 20:30:24 +0200
Subject: [PATCH] Upgrade tags and bulmex

---
 default.nix                     |  1 +
 frontend/src/Awe/Front/Main.hs  |  2 +-
 packages/bulmex.nix             | 12 +++++++-----
 packages/reflex-dom-helpers.nix | 20 ++++++++++++++++++++
 4 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 packages/reflex-dom-helpers.nix

diff --git a/default.nix b/default.nix
index eeed5d4..8e94dd8 100644
--- a/default.nix
+++ b/default.nix
@@ -5,6 +5,7 @@
         frontend = ./frontend;
     };
     overrides = self: super: rec {
+      reflex-dom-helpers = self.callPackage ./packages/reflex-dom-helpers.nix { };
       servant-fiat-content = self.callPackage ./packages/servant-fiat-content.nix { };
       bulmex = self.callPackage ./packages/bulmex.nix { };
       beam-core = self.callPackage ./packages/beam-core.nix { };
diff --git a/frontend/src/Awe/Front/Main.hs b/frontend/src/Awe/Front/Main.hs
index e3fcd47..f8a482e 100644
--- a/frontend/src/Awe/Front/Main.hs
+++ b/frontend/src/Awe/Front/Main.hs
@@ -20,8 +20,8 @@ import qualified Data.Text                       as Text
 import           GHC.Generics                    (Generic)
 import           Reflex
 import           Reflex.Bulmex.Event
+import           Reflex.Bulmex.Html
 import           Reflex.Bulmex.Input.Polymorphic
-import           Reflex.Bulmex.Load
 import           Reflex.Dom                      as Dom hiding (TextInput,
                                                          textInput,
                                                          _textInput_value)
diff --git a/packages/bulmex.nix b/packages/bulmex.nix
index f6c8536..35aa8b0 100644
--- a/packages/bulmex.nix
+++ b/packages/bulmex.nix
@@ -1,21 +1,23 @@
 { mkDerivation, aeson, base, bytestring, containers, fetchgit
 , jsaddle, jsaddle-dom, lens, network-uri, reflex, reflex-dom-core
-, stdenv, text, time, witherable
+, reflex-dom-helpers, stdenv, text, time, witherable
 }:
 mkDerivation {
   pname = "bulmex";
-  version = "1.0.0.0";
+  version = "2.0.0";
   src = fetchgit {
     url = "https://github.com/jappeace/bulmex";
-    sha256 = "0fbbzfg8qlxpw7ydh4qqgaqbi20jjm4pmf27hmizxnx6hmlsm50j";
-    rev = "4458fcdd36a7c9b2bc947d3e7666fd09b37e5869";
+    sha256 = "00gmnnk1y2lp0mfx04zmiq4fgxvl5kmg5gydlrz813bq5bd7jkbw";
+    rev = "161afcd390ed249f807ec7bf514a52c31799ea60";
     fetchSubmodules = true;
   };
   postUnpack = "sourceRoot+=/bulmex; echo source root reset to $sourceRoot";
   libraryHaskellDepends = [
     aeson base bytestring containers jsaddle jsaddle-dom lens
-    network-uri reflex reflex-dom-core text time witherable
+    network-uri reflex reflex-dom-core reflex-dom-helpers text time
+    witherable
   ];
   homepage = "https://github.com/jappeace/bulmex#readme";
+  description = "Reflex infused with bulma (css)";
   license = stdenv.lib.licenses.mit;
 }
diff --git a/packages/reflex-dom-helpers.nix b/packages/reflex-dom-helpers.nix
new file mode 100644
index 0000000..bb84913
--- /dev/null
+++ b/packages/reflex-dom-helpers.nix
@@ -0,0 +1,20 @@
+{ mkDerivation, base, fetchgit, reflex, reflex-dom-core, stdenv
+, template-haskell, text
+}:
+mkDerivation {
+  pname = "reflex-dom-helpers";
+  version = "0.2.0.1";
+  src = fetchgit {
+    url = "https://github.com/layer-3-communications/reflex-dom-helpers";
+    sha256 = "12k5jr1rif2yi1xa4a43gx1rchj1ywmh4m1wdj00mjslisjdndgm";
+    rev = "e247c3ee5f9d957f994aeb57b9fe4d9f0a35beea";
+    fetchSubmodules = true;
+  };
+  libraryHaskellDepends = [
+    base reflex reflex-dom-core template-haskell text
+  ];
+  testHaskellDepends = [ base ];
+  homepage = "https://github.com/layer-3-communications/reflex-dom-helpers";
+  description = "Html tag helpers for reflex-dom";
+  license = stdenv.lib.licenses.bsd3;
+}