git.iko.soy/typeable/servant-reflex
on master help sign in
Switch from try-reflex to most recent reflex-platform
commita29373c993af51ffc9b6153d95fefe85f6b8e290 authorDoug Beardsley <mightybyte@gmail.com> dateSat 12 Mar 2016, 10:48 (11 years ago) parent7241e0c
6 files changed+10−11
compare with master
unifiedsplit
.gitmodules+3−3 build.sh+1−1 deps/reflex-platform+1 deps/try-reflex−1 overrides.nix+4−5 shell.sh+1−1
.gitmodules+3−3
@@ -1,9 +1,6 @@
11[submodule "deps/reflex-dom-contrib"]
22 path = deps/reflex-dom-contrib
33 url = git@github.com:reflex-frp/reflex-dom-contrib.git
4−[submodule "deps/try-reflex"]
5− path = deps/try-reflex
6− url = git@github.com:ryantrinkle/try-reflex.git
74[submodule "deps/servant"]
85 path = deps/servant
96 url = https://github.com/haskell-servant/servant.git
@@ -16,3 +13,6 @@
1613[submodule "deps/reflex"]
1714 path = deps/reflex
1815 url = https://github.com/ryantrinkle/reflex
16+[submodule "deps/reflex-platform"]
17+ path = deps/reflex-platform
18+ url = https://github.com/reflex-frp/reflex-platform.git
build.sh+1−1
@@ -1,3 +1,3 @@
11#!/bin/sh
22
3−deps/try-reflex/work-on ./overrides.nix ./. --run "cabal configure --ghcjs ; cabal build"
3+deps/reflex-platform/work-on ./overrides.nix ./. --run "cabal configure --ghcjs ; cabal build"
deps/reflex-platformnew file+1

Submodule changed.

deps/try-reflexdeleted−1

Submodule changed.

overrides.nix+4−5
@@ -1,11 +1,10 @@
1−{ try-reflex, ... }:
1+{ reflex-platform, ... }:
22let
33 pkgs = import <nixpkgs> {};
4− try-reflex = import deps/try-reflex {};
5−in try-reflex.ghcjs.override {
4+ reflex-platform = import deps/reflex-platform {};
5+in reflex-platform.ghcjs.override {
66 overrides = self: super: {
7− self.lens = pkgs.haskell.lib.dontCheck (self.lens);
87 reflex-dom-contrib = pkgs.haskell.lib.dontCheck (self.callPackage deps/reflex-dom-contrib {});
9− servant = self.callPackage (try-reflex.cabal2nixResult deps/servant/servant) {};
8+ servant = self.callPackage (reflex-platform.cabal2nixResult deps/servant/servant) {};
109 };
1110}
shell.sh+1−1
@@ -1,3 +1,3 @@
11#!/bin/sh
22
3−deps/try-reflex/work-on ./overrides.nix ./.
3+deps/reflex-platform/work-on ./overrides.nix ./.