Skip to content

Commit

Permalink
Upgrade tags and bulmex
Browse files Browse the repository at this point in the history
  • Loading branch information
jappeace committed Aug 4, 2019
1 parent ac08cd3 commit 86e213a
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 6 deletions.
1 change: 1 addition & 0 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/Awe/Front/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 7 additions & 5 deletions packages/bulmex.nix
Original file line number Diff line number Diff line change
@@ -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;
}
20 changes: 20 additions & 0 deletions packages/reflex-dom-helpers.nix
Original file line number Diff line number Diff line change
@@ -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;
}

0 comments on commit 86e213a

Please sign in to comment.