guix_mirror_bot pushed a commit to branch haskell-team
in repository guix.
commit b80b2980cba8b178bb5d21ff7b1cadbf460a2339
Author: Saku Laesvuori <[email protected]>
AuthorDate: Sat Oct 18 16:01:49 2025 +0300
gnu: ghc-vty: Replace by ghc-vty-6
Nothing in Guix depended on vty@5 anymore and it no longer built.
* gnu/packages/haskell-xyz.scm (ghc-vty): Replace definition with that
of ghc-vty-6.
[arguments]: Add cabal revision 2.
(ghc-vty-6): Removed.
(ghc-brick-skylighting): Use ghc-vty instead of ghc-vty-6
* gnu/packages/haskell-apps.scm (matterhorn): Likewise.
Change-Id: Ib070724021c4f6485a3cc4bb108dc9040bfff042
Signed-off-by: Andreas Enge <[email protected]>
---
gnu/packages/haskell-apps.scm | 2 +-
gnu/packages/haskell-xyz.scm | 42 ++++--------------------------------------
2 files changed, 5 insertions(+), 39 deletions(-)
diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm
index 396dd03adf..c2b6ff8981 100644
--- a/gnu/packages/haskell-apps.scm
+++ b/gnu/packages/haskell-apps.scm
@@ -787,7 +787,7 @@ Wayland, and Linux console environments alike.")
ghc-utf8-string
ghc-uuid
ghc-vector
- ghc-vty-6
+ ghc-vty
ghc-vty-crossplatform
ghc-word-wrap
ghc-xdg-basedir))
diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index aee2eee7fe..26ede11428 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -14521,43 +14521,6 @@ given term should not exist.")
(license license:bsd-3)))
(define-public ghc-vty
- (package
- (name "ghc-vty")
- (version "5.37")
- (source
- (origin
- (method url-fetch)
- (uri (hackage-uri "vty" version))
- (sha256
- (base32 "1w6dc25npvlaflxcyzdssnymgi7x03zkwg7swyjw6cjjfdmkgqb7"))))
- (build-system haskell-build-system)
- (properties '((upstream-name . "vty")))
- (inputs (list ghc-blaze-builder
- ghc-microlens
- ghc-microlens-mtl
- ghc-microlens-th
- ghc-hashable
- ghc-parallel
- ghc-utf8-string
- ghc-vector
- ghc-ansi-terminal))
- (native-inputs (list ghc-hunit
- ghc-quickcheck
- ghc-quickcheck-assertions
- ghc-random
- ghc-smallcheck
- ghc-string-qq
- ghc-test-framework
- ghc-test-framework-hunit
- ghc-test-framework-smallcheck))
- (home-page "https://github.com/jtdaugherty/vty")
- (synopsis "Simple terminal UI library")
- (description
- "vty is a terminal GUI library in the niche of ncurses, intended to be
easy
-to use and to provide good support for common terminal types.")
- (license license:bsd-3)))
-
-(define-public ghc-vty-6
(package
(name "ghc-vty")
(version "6.4")
@@ -14568,6 +14531,9 @@ to use and to provide good support for common terminal
types.")
(sha256
(base32 "0iha15inmig2j2f4kljwb2jhbqa8vsh2aa8l7y5fsanjiciscrbi"))))
(build-system haskell-build-system)
+ (arguments
+ `(#:cabal-revision ("2"
+
"1dcnkfghflgn3qv72pdpa6npfdrrjqhil3wnxd75rbd4mf7812hf")))
(properties '((upstream-name . "vty")))
(inputs (list ghc-blaze-builder ghc-microlens ghc-microlens-mtl
ghc-utf8-string ghc-vector))
@@ -16521,7 +16487,7 @@ an event handler and a drawing function and the library
does the rest.")
(base32 "1nw2x9zn0jlvykm89v80fh4187bxgn8l4cljgnf4mp4ci7aqjmkr"))))
(build-system haskell-build-system)
(properties '((upstream-name . "brick-skylighting")))
- (inputs (list ghc-brick ghc-vty-6 ghc-skylighting-core))
+ (inputs (list ghc-brick ghc-vty ghc-skylighting-core))
(home-page "https://github.com/jtdaugherty/brick-skylighting/")
(synopsis "Show syntax-highlighted text in your Brick UI")
(description