diff options
author | Christopher Baines <mail@cbaines.net> | 2020-11-29 14:19:55 +0000 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2020-11-29 17:34:18 +0000 |
commit | ff01206345e2306cc633db48e0b29eab9077091a (patch) | |
tree | 25c7ee17005dadc9bf4fae3f0873e03a4704f782 /gnu/packages/tmux.scm | |
parent | ed2545f0fa0e2ad99d5a0c45f532c539b299b9fb (diff) | |
parent | 7c2e67400ffaef8eb6f30ef7126c976ee3d7e36c (diff) | |
download | guix-patches-ff01206345e2306cc633db48e0b29eab9077091a.tar guix-patches-ff01206345e2306cc633db48e0b29eab9077091a.tar.gz |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/tmux.scm')
-rw-r--r-- | gnu/packages/tmux.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gnu/packages/tmux.scm b/gnu/packages/tmux.scm index 910b3dd781..95a31f80fd 100644 --- a/gnu/packages/tmux.scm +++ b/gnu/packages/tmux.scm @@ -43,7 +43,7 @@ (define-public tmux (package (name "tmux") - (version "3.1b") + (version "3.1c") (source (origin (method url-fetch) (uri (string-append @@ -51,7 +51,7 @@ version "/tmux-" version ".tar.gz")) (sha256 (base32 - "1fbd93hzaz64h7j0h9nsll29avbq1ikqa438wrgsf1dga0fkagyr")))) + "11l3r337ly2wxwdrgjg19bdxkbqpagqaykrdj2hk7vvv8hh753wi")))) (build-system gnu-build-system) (inputs `(("libevent" ,libevent) @@ -145,7 +145,7 @@ windows.") (define-public python-libtmux (package (name "python-libtmux") - (version "0.8.3") + (version "0.8.5") (source (origin (method git-fetch) @@ -155,7 +155,7 @@ windows.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "18dqqd3jmgq3jb1l3xpgywlh4x82mzjxch61gwnlhfaqx5mzvjph")))) + (base32 "1vrd99kl2gsk49mvbp6k7l1k7r96vf1fczsqclb62yd4hdpp7zaa")))) (build-system python-build-system) (propagated-inputs `(("procps" ,procps))) ;tests need top @@ -171,6 +171,8 @@ windows.") (setenv "PYTHONPATH" (string-append (getcwd) "/build/lib:" (getenv "PYTHONPATH"))) + ;; Fix <https://github.com/tmux-python/libtmux/issues/265>. + (setenv "LANG" "en_US.utf8") ;; Skip tests that I suspect fail because of a change ;; in behavior in tmux 3 from tmux 2 ;; https://github.com/tmux-python/libtmux/issues/281 |