34847fb · reflex-vty · git.iko.soy

README.md+1−2

compare with develop

unifiedsplit

@@ -14,10 +14,9 @@ is still experimental, so big changes are possible!

14

15Enter a nix-shell for the project:

16```bash

17−git clone https://github.com/reflex-frp/reflex-platform.git

18git clone https://github.com/reflex-frp/reflex-vty.git

17git clone https://github.com/reflex-frp/reflex-vty.git

19cd reflex-vty

18cd reflex-vty

20−../reflex-platform/scripts/work-on ghc ./.

19+nix-shell

21```

20```

22

21

23From within the nix-shell you can:

22From within the nix-shell you can:

reflex-platform/github.json+3−3

@@ -1,8 +1,8 @@

1{

2 "owner": "reflex-frp",

3 "repo": "reflex-platform",

4− "branch": "aa-bump-some",

4+ "branch": "develop",

5 "private": false,

6− "rev": "717b2afbb7530288f8e2d1699cb1033d6f217774",

6+ "rev": "f019863c21ee85498e6a6e0072e617b2462b70ed",

7− "sha256": "1n864wgyg8373q6prkqlck4prhjs1djx7l9a8g141caygsaclyjy"

7+ "sha256": "146xfjqdwd55s9jg1ggi6akcxxxd5c0pvc4bpjx3whwiikpcv8y4"

8}

reflex-vty.cabal+1−1

@@ -44,7 +44,7 @@ library

44 exception-transformers >= 0.4.0 && < 0.5,

45 primitive >= 0.6.3 && < 0.8,

46 ref-tf >= 0.4.0 && < 0.5,

47− reflex >= 0.7.2 && < 0.8,

47+ reflex >= 0.8 && < 0.9,

48 time >= 1.8.0 && < 1.10,

49 vty >= 5.28 && < 5.29

50 hs-source-dirs: src

release.nix+14−3

@@ -1,5 +1,16 @@

1−{ reflex-platform-fun ? import ./reflex-platform

1+{ reflex-platform ? import ./reflex-platform {}

2−}: {

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+{

3 reflex-vty =

14 reflex-vty =

4− (reflex-platform-fun {}).ghc.callCabal2nix "reflex-vty" ./. {};

15+ ghc.callCabal2nix "reflex-vty" ./. {};

5}

16}

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) =

264 , _displayLines_cursorY = sum

265 [ length spansBefore

266 , length spansCurrentBefore

267− , if cursorAfterEOL then cursorCharWidth else 0

267+ , if cursorAfterEOL then 1 else 0

268 ]

269 }

270 where