From: ericbavier@openmailbox.org
To: guix-devel@gnu.org
Cc: Eric Bavier <bavier@member.fsf.org>
Subject: [PATCH 2/2] gnu: Add byobu.
Date: Sun, 1 Nov 2015 11:02:05 -0600 [thread overview]
Message-ID: <1446397325-1580-2-git-send-email-ericbavier@openmailbox.org> (raw)
In-Reply-To: <1446397325-1580-1-git-send-email-ericbavier@openmailbox.org>
From: Eric Bavier <bavier@member.fsf.org>
* gnu/packages/screen.scm (byobu): New variable.
* gnu/packages/patches/byobu-writable-status.patch: New patch.
* gnu-system.am (dist_patch_DATA): Add it.
---
gnu-system.am | 1 +
gnu/packages/patches/byobu-writable-status.patch | 13 ++++++
gnu/packages/screen.scm | 54 ++++++++++++++++++++++++
3 files changed, 68 insertions(+)
create mode 100644 gnu/packages/patches/byobu-writable-status.patch
diff --git a/gnu-system.am b/gnu-system.am
index 3e976e9..cc4f6fb 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -411,6 +411,7 @@ dist_patch_DATA = \
gnu/packages/patches/binutils-ld-new-dtags.patch \
gnu/packages/patches/binutils-loongson-workaround.patch \
gnu/packages/patches/bitlbee-configure-doc-fix.patch \
+ gnu/packages/patches/byobu-writable-status.patch \
gnu/packages/patches/boost-mips-avoid-m32.patch \
gnu/packages/patches/calibre-drop-unrar.patch \
gnu/packages/patches/calibre-no-updates-dialog.patch \
diff --git a/gnu/packages/patches/byobu-writable-status.patch b/gnu/packages/patches/byobu-writable-status.patch
new file mode 100644
index 0000000..2858280
--- /dev/null
+++ b/gnu/packages/patches/byobu-writable-status.patch
@@ -0,0 +1,13 @@
+Skeleton status files are installed read-only. When copying to the config dir
+upon initialization, make sure they end up writable.
+
+--- byobu-5.98/usr/bin/byobu-janitor.in
++++ byobu-5.98/usr/bin/byobu-janitor.in
+@@ -82,6 +82,7 @@
+ if [ ! -r "$BYOBU_CONFIG_DIR/$f" ]; then
+ # Copy from skeleton, if possible
+ cp -f "$BYOBU_PREFIX/share/$PKG/status/$f" "$BYOBU_CONFIG_DIR/$f"
++ chmod +w "$BYOBU_CONFIG_DIR/$f"
+ # Enable ec2_cost, if we're in ec2 and seeding a new setup
+ if metadata_available; then
+ $BYOBU_SED_INLINE -e "s/#ec2_cost/ec2_cost/g" "$($BYOBU_READLINK -f $BYOBU_CONFIG_DIR/$f)"
diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm
index 84cc8c9..5580060 100644
--- a/gnu/packages/screen.scm
+++ b/gnu/packages/screen.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -25,6 +26,8 @@
#:use-module (gnu packages)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages slang)
#:use-module (gnu packages texinfo))
(define-public screen
@@ -90,3 +93,54 @@ view to show two terminals at once.")
allowing you to run a program in an environment that is protected from the
controlling terminal and attach to it later.")
(license gpl2+)))
+
+(define-public byobu
+ (package
+ (name "byobu")
+ (version "5.98")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://launchpad.net/byobu/trunk/"
+ version "/+download/byobu_"
+ version ".orig.tar.gz"))
+ (sha256
+ (base32
+ "1s8nh4wbds1nh52i0d1hy1b308jjf4siwpq92lna1zh9ll4x71j5"))
+ (patches (list (search-patch "byobu-writable-status.patch")))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("python" ,python-wrapper) ;for config and session GUIs
+ ("python-newt" ,newt "python")))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before
+ 'configure 'provide-locale
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((libc (assoc-ref inputs "libc"))) ;implicit input
+ (substitute* "usr/bin/byobu.in"
+ (("locale") (string-append libc "/bin/locale"))))))
+ (add-after
+ 'install 'wrap-python-scripts
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((python (string-append (assoc-ref inputs "python")
+ "/bin/python"))
+ (newt (assoc-ref inputs "python-newt"))
+ (out (assoc-ref outputs "out"))
+ (config (string-append out "/bin/byobu-config"))
+ (select (string-append out "/bin/byobu-select-session")))
+ (wrap-program config
+ `("BYOBU_PYTHON" = (,python))
+ `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))
+ (wrap-program select
+ `("BYOBU_PYTHON" = (,python)))
+ #t))))))
+ (home-page "http://byobu.co/index.html")
+ (synopsis "Text-based window manager and terminal multiplexer")
+ (description
+ "Byobu is a Japanese term for decorative, multi-panel screens that serve
+as folding room dividers. The Byobu software includes an enhanced profile,
+configuration utilities, and system status notifications for the GNU Screen
+window manager as well as the Tmux terminal multiplexer.")
+ (license gpl3+)))
--
2.5.0
next prev parent reply other threads:[~2015-11-01 21:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-01 17:02 [PATCH 1/2] gnu: newt: Build python bindings ericbavier
2015-11-01 17:02 ` ericbavier [this message]
2015-11-03 13:30 ` [PATCH 2/2] gnu: Add byobu Ludovic Courtès
2015-11-03 13:29 ` [PATCH 1/2] gnu: newt: Build python bindings Ludovic Courtès
2015-11-03 23:16 ` Eric Bavier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1446397325-1580-2-git-send-email-ericbavier@openmailbox.org \
--to=ericbavier@openmailbox.org \
--cc=bavier@member.fsf.org \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.