git.iko.soy/reflex-vty
on develop help sign in
Merge remote-tracking branch 'origin/develop' into aa/pdlla/layout2
commit34847fbbb7ca34af628a0b2a689c472b33c4e154 authorAli Abrar <aliabrar@gmail.com> dateMon 22 Mar 2021, 19:36 (6 years ago) parented239d33026641
6 files changed+21−10
compare with develop
unifiedsplit
README.md+1−2 reflex-platform/github.json+3−3 reflex-vty.cabal+1−1 release.nix+14−3 shell.nix+1 src/Data/Text/Zipper.hs+1−1
README.md+1−2
@@ -14,10 +14,9 @@ is still experimental, so big changes are possible!
1414
1515Enter a nix-shell for the project:
1616```bash
17−git clone https://github.com/reflex-frp/reflex-platform.git
1817git clone https://github.com/reflex-frp/reflex-vty.git
1918cd reflex-vty
20−../reflex-platform/scripts/work-on ghc ./.
19+nix-shell
2120```
2221
2322From within the nix-shell you can:
reflex-platform/github.json+3−3
@@ -1,8 +1,8 @@
11{
22 "owner": "reflex-frp",
33 "repo": "reflex-platform",
4− "branch": "aa-bump-some",
4+ "branch": "develop",
55 "private": false,
6− "rev": "717b2afbb7530288f8e2d1699cb1033d6f217774",
7− "sha256": "1n864wgyg8373q6prkqlck4prhjs1djx7l9a8g141caygsaclyjy"
6+ "rev": "f019863c21ee85498e6a6e0072e617b2462b70ed",
7+ "sha256": "146xfjqdwd55s9jg1ggi6akcxxxd5c0pvc4bpjx3whwiikpcv8y4"
88}
reflex-vty.cabal+1−1
@@ -44,7 +44,7 @@ library
4444 exception-transformers >= 0.4.0 && < 0.5,
4545 primitive >= 0.6.3 && < 0.8,
4646 ref-tf >= 0.4.0 && < 0.5,
47− reflex >= 0.7.2 && < 0.8,
47+ reflex >= 0.8 && < 0.9,
4848 time >= 1.8.0 && < 1.10,
4949 vty >= 5.28 && < 5.29
5050 hs-source-dirs: src
release.nix+14−3
@@ -1,5 +1,16 @@
1−{ reflex-platform-fun ? import ./reflex-platform
2−}: {
1+{ reflex-platform ? import ./reflex-platform {}
2+}:
3+let inherit (reflex-platform.nixpkgs.haskell) lib;
4+ ghc = reflex-platform.ghc.override {
5+ overrides = self: super: {
6+ vty = self.callHackage "vty" "5.28" {};
7+ ansi-terminal = self.callHackage "ansi-terminal" "0.10.3" {};
8+ ansi-wl-pprint = self.callHackage "ansi-wl-pprint" "0.6.9" {};
9+ test-framework = lib.doJailbreak super.test-framework;
10+ };
11+ };
12+in
13+{
314 reflex-vty =
4− (reflex-platform-fun {}).ghc.callCabal2nix "reflex-vty" ./. {};
15+ ghc.callCabal2nix "reflex-vty" ./. {};
516}
shell.nixnew file+1
@@ -0,0 +1 @@
1+(import ./release.nix {}).reflex-vty.env
src/Data/Text/Zipper.hs+1−1
@@ -264,7 +264,7 @@ displayLines width tag cursorTag (TextZipper lb b a la) =
264264 , _displayLines_cursorY = sum
265265 [ length spansBefore
266266 , length spansCurrentBefore
267− , if cursorAfterEOL then cursorCharWidth else 0
267+ , if cursorAfterEOL then 1 else 0
268268 ]
269269 }
270270 where