From 7c9cc283d91c4d49cef8d9e6927b5a66e2179580 Mon Sep 17 00:00:00 2001 From: Lucas Hoffmann Date: Mon, 20 Nov 2023 08:01:19 +0100 Subject: [PATCH 1/4] nix: update dependencies for brick 2.1 --- .nix/brick.nix | 4 ++-- .nix/text-zipper.nix | 4 ++-- .nix/vty.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.nix/brick.nix b/.nix/brick.nix index 1db9b3af..7115f5ea 100644 --- a/.nix/brick.nix +++ b/.nix/brick.nix @@ -6,8 +6,8 @@ }: mkDerivation { pname = "brick"; - version = "1.5"; - sha256 = "6290081719d68c149dc9bd0098f36aac235b615334a3510fda89e19bbdb95f4f"; + version = "2.1"; + sha256 = "4edb005d87defbbbdda9d81e0f9fc5432b75f2787d4b7f490908fc4df5db8c9d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/.nix/text-zipper.nix b/.nix/text-zipper.nix index d93fa9d4..b852733e 100644 --- a/.nix/text-zipper.nix +++ b/.nix/text-zipper.nix @@ -2,8 +2,8 @@ }: mkDerivation { pname = "text-zipper"; - version = "0.12"; - sha256 = "86aba7244c9ed0d8e24e9d1fa64ee317a062e7bd777018053517daefb0696702"; + version = "0.13"; + sha256 = "06521cc7c435f8e85aeb3ed3f2b872000c52087d73518de31e65bdca072a98a9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base deepseq text vector ]; testHaskellDepends = [ base hspec QuickCheck text ]; diff --git a/.nix/vty.nix b/.nix/vty.nix index 16f88b2a..68ecbc75 100644 --- a/.nix/vty.nix +++ b/.nix/vty.nix @@ -8,8 +8,8 @@ }: mkDerivation { pname = "vty"; - version = "5.36"; - sha256 = "f1bb8d161f467801404b60d8754c496af66cb741a3f04e5b013a6890390c04a5"; + version = "6.1"; + sha256 = "2fc64b7d09f16bce9c6456e234e6aca3a86be9a40f360435499fc087b94f7bd6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ From d379939063c47b4f459a38468a24acca9b7aeb30 Mon Sep 17 00:00:00 2001 From: Lucas Hoffmann Date: Mon, 20 Nov 2023 08:08:51 +0100 Subject: [PATCH 2/4] nix: update brick to 2.1.1 --- .nix/brick.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.nix/brick.nix b/.nix/brick.nix index 7115f5ea..ba53c8f8 100644 --- a/.nix/brick.nix +++ b/.nix/brick.nix @@ -6,8 +6,8 @@ }: mkDerivation { pname = "brick"; - version = "2.1"; - sha256 = "4edb005d87defbbbdda9d81e0f9fc5432b75f2787d4b7f490908fc4df5db8c9d"; + version = "2.1.1"; + sha256 = "30280d6f7130eb3e6cbf5a55465a06a825169cb536d3b2e91883aec23532b31e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ From 397af4598cfd7aa91988bf14263775c353f91cd3 Mon Sep 17 00:00:00 2001 From: Lucas Hoffmann Date: Mon, 20 Nov 2023 08:12:42 +0100 Subject: [PATCH 3/4] nix: update changed dependency of brick --- .nix/brick.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.nix/brick.nix b/.nix/brick.nix index ba53c8f8..6b4eef90 100644 --- a/.nix/brick.nix +++ b/.nix/brick.nix @@ -1,7 +1,7 @@ { mkDerivation, base, bimap, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, exceptions , filepath, lib, microlens, microlens-mtl, microlens-th, mtl -, QuickCheck, stm, template-haskell, text, text-zipper, unix +, QuickCheck, stm, template-haskell, text, text-zipper, unix-compat , vector, vty, word-wrap }: mkDerivation { @@ -14,7 +14,7 @@ mkDerivation { base bimap bytestring config-ini containers contravariant data-clist deepseq directory exceptions filepath microlens microlens-mtl microlens-th mtl stm template-haskell text - text-zipper unix vector vty word-wrap + text-zipper unix-compat vector vty word-wrap ]; testHaskellDepends = [ base containers microlens QuickCheck vector vty From 8aafd0f265cb400cf52e269d4555b1791218064c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3man=20Joost?= Date: Tue, 21 Nov 2023 11:23:30 +1000 Subject: [PATCH 4/4] Upgrade dependencies too --- .nix/brick.nix | 19 ++++++++++--------- .nix/overlays.nix | 2 ++ .nix/vty-crossplatform.nix | 11 +++++++++++ .nix/vty-unix.nix | 21 +++++++++++++++++++++ .nix/vty.nix | 29 +++++++---------------------- 5 files changed, 51 insertions(+), 31 deletions(-) create mode 100644 .nix/vty-crossplatform.nix create mode 100644 .nix/vty-unix.nix diff --git a/.nix/brick.nix b/.nix/brick.nix index 6b4eef90..1aae0f4e 100644 --- a/.nix/brick.nix +++ b/.nix/brick.nix @@ -1,8 +1,8 @@ { mkDerivation, base, bimap, bytestring, config-ini, containers -, contravariant, data-clist, deepseq, directory, exceptions -, filepath, lib, microlens, microlens-mtl, microlens-th, mtl -, QuickCheck, stm, template-haskell, text, text-zipper, unix-compat -, vector, vty, word-wrap +, data-clist, deepseq, directory, exceptions, filepath, lib +, microlens, microlens-mtl, microlens-th, mtl, QuickCheck, stm +, template-haskell, text, text-zipper, unix-compat, vector, vty +, vty-crossplatform, vty-unix, word-wrap }: mkDerivation { pname = "brick"; @@ -10,14 +10,15 @@ mkDerivation { sha256 = "30280d6f7130eb3e6cbf5a55465a06a825169cb536d3b2e91883aec23532b31e"; isLibrary = true; isExecutable = true; + doCheck = false; libraryHaskellDepends = [ - base bimap bytestring config-ini containers contravariant - data-clist deepseq directory exceptions filepath microlens - microlens-mtl microlens-th mtl stm template-haskell text - text-zipper unix-compat vector vty word-wrap + base bimap bytestring config-ini containers data-clist deepseq + directory exceptions filepath microlens microlens-mtl microlens-th + mtl stm template-haskell text text-zipper unix-compat vector vty + vty-crossplatform word-wrap ]; testHaskellDepends = [ - base containers microlens QuickCheck vector vty + base containers microlens QuickCheck vector vty vty-unix ]; homepage = "https://github.com/jtdaugherty/brick/"; description = "A declarative terminal user interface library"; diff --git a/.nix/overlays.nix b/.nix/overlays.nix index 80ed58b5..642590b4 100644 --- a/.nix/overlays.nix +++ b/.nix/overlays.nix @@ -10,6 +10,8 @@ let text-zipper = hsuper.callPackage ./text-zipper.nix { }; bimap = hsuper.callPackage ./bimap.nix { }; vty = hsuper.callPackage ./vty.nix { }; + vty-unix = hsuper.callPackage ./vty-unix.nix { }; + vty-crossplatform = hsuper.callPackage ./vty-crossplatform.nix { }; notmuch = hsuper.callPackage ./hsnotmuch.nix { notmuch = self.pkgs.notmuch; talloc = self.pkgs.talloc; diff --git a/.nix/vty-crossplatform.nix b/.nix/vty-crossplatform.nix new file mode 100644 index 00000000..c9690cd3 --- /dev/null +++ b/.nix/vty-crossplatform.nix @@ -0,0 +1,11 @@ +{ mkDerivation, base, lib, vty, vty-unix }: +mkDerivation { + pname = "vty-crossplatform"; + version = "0.4.0.0"; + sha256 = "35e5433512b883e83aa8bb8c3475221174445a87e51f162b2ce07f9cf1eb3c1a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base vty vty-unix ]; + description = "Cross-platform support for Vty"; + license = lib.licenses.bsd3; +} diff --git a/.nix/vty-unix.nix b/.nix/vty-unix.nix new file mode 100644 index 00000000..369d7149 --- /dev/null +++ b/.nix/vty-unix.nix @@ -0,0 +1,21 @@ +{ mkDerivation, ansi-terminal, base, blaze-builder, bytestring +, containers, deepseq, lib, microlens, microlens-mtl, microlens-th +, mtl, parsec, stm, terminfo, transformers, unix, utf8-string +, vector, vty +}: +mkDerivation { + pname = "vty-unix"; + version = "0.2.0.0"; + sha256 = "c2ab67e09edc4bade04e269adc059320e83f68b31e428d11a69b20c4f161ddc1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-builder bytestring containers deepseq microlens + microlens-mtl microlens-th mtl parsec stm terminfo transformers + unix utf8-string vector vty + ]; + executableHaskellDepends = [ ansi-terminal base vty ]; + description = "Unix backend for Vty"; + license = lib.licenses.bsd3; + mainProgram = "vty-unix-build-width-table"; +} diff --git a/.nix/vty.nix b/.nix/vty.nix index 68ecbc75..c37407bf 100644 --- a/.nix/vty.nix +++ b/.nix/vty.nix @@ -1,31 +1,16 @@ -{ mkDerivation, ansi-terminal, base, binary, blaze-builder -, bytestring, Cabal, containers, deepseq, directory, filepath -, hashable, HUnit, lib, microlens, microlens-mtl, microlens-th, mtl -, parallel, parsec, QuickCheck, quickcheck-assertions, random -, smallcheck, stm, string-qq, terminfo, test-framework -, test-framework-hunit, test-framework-smallcheck, text -, transformers, unix, utf8-string, vector +{ mkDerivation, base, binary, blaze-builder, bytestring, deepseq +, directory, filepath, lib, microlens, microlens-mtl, microlens-th +, mtl, parsec, stm, text, utf8-string, vector }: mkDerivation { pname = "vty"; version = "6.1"; sha256 = "2fc64b7d09f16bce9c6456e234e6aca3a86be9a40f360435499fc087b94f7bd6"; - isLibrary = true; - isExecutable = true; + revision = "1"; + editedCabalFile = "1wy4vfyr4nbb8ycfx80yrp59ggigcbfrsh5w1qk768y04d114kaj"; libraryHaskellDepends = [ - ansi-terminal base binary blaze-builder bytestring containers - deepseq directory filepath hashable microlens microlens-mtl - microlens-th mtl parallel parsec stm terminfo text transformers - unix utf8-string vector - ]; - executableHaskellDepends = [ - base containers directory filepath microlens microlens-mtl mtl - ]; - testHaskellDepends = [ - base blaze-builder bytestring Cabal containers deepseq HUnit - microlens microlens-mtl mtl QuickCheck quickcheck-assertions random - smallcheck stm string-qq terminfo test-framework - test-framework-hunit test-framework-smallcheck text unix + base binary blaze-builder bytestring deepseq directory filepath + microlens microlens-mtl microlens-th mtl parsec stm text utf8-string vector ]; homepage = "https://github.com/jtdaugherty/vty";