[PATCH] gnu: Add tmux. licenses: add ISC.

[PATCH] gnu: Add tmux. licenses: add ISC.

[Cyril Roelandt]

* gnu/packages/tmux.scm: New file.
* Makefile.am (MODULES): Use it.
* guix/licenses.scm: add ISC.
---
Hey !

Adding tmux was easy, I just had to add the ISC license (aka "the OpenBSD
license") to guix/licenses.scm. If you're okay with that, I'll push the patch.

Cyril Roelandt.

 Makefile.am           |    1 +
 gnu/packages/tmux.scm |   51 +++++++++++++++++++++++++++++++++++++++++++++++++
 guix/licenses.scm     |    6 ++++++
 3 files changed, 58 insertions(+)
 create mode 100644 gnu/packages/tmux.scm

diff --git a/Makefile.am b/Makefile.am
index f9b64e7..3c47dd0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -143,6 +143,7 @@ MODULES =					\
   gnu/packages/texinfo.scm			\
   gnu/packages/texlive.scm			\
   gnu/packages/time.scm				\
+  gnu/packages/tmux.scm 			\
   gnu/packages/tor.scm				\
   gnu/packages/wget.scm				\
   gnu/packages/which.scm			\
diff --git a/gnu/packages/tmux.scm b/gnu/packages/tmux.scm
new file mode 100644
index 0000000..84a5262
--- /dev/null
+++ b/gnu/packages/tmux.scm
@@ -0,0 +1,51 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages tmux)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages libevent)
+  #:use-module (gnu packages ncurses))
+
+(define-public tmux
+  (package
+    (name "tmux")
+    (version "1.7")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append
+                    "http://downloads.sourceforge.net/project/tmux/tmux/tmux-"
+                    version "/tmux-" version ".tar.gz"))
+             (sha256
+              (base32
+               "0ywy1x2g905hmhkdz418ik42lcvnhnwr8fv63rcqczfg27d6nd38"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("libevent" ,libevent)
+       ("ncurses" ,ncurses)))
+    (home-page "http://tmux.sourceforge.net/")
+    (synopsis "A BSD-licensed terminal multiplexer")
+    (description
+     "tmux is a terminal multiplexer: it enables a number of terminals (or
+windows), each running a separate program, to be created, accessed, and
+controlled from a single screen. tmux may be detached from a screen and
+continue running in the background, then later reattached.")
+    (license isc)))
diff --git a/guix/licenses.scm b/guix/licenses.scm
index 1b149b5..4e4aee2 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -30,6 +30,7 @@
             expat
             freetype
             gpl1 gpl1+ gpl2 gpl2+ gpl3 gpl3+
+            isc
             ijg
             ibmpl1.0
             lgpl2.0 lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3 lgpl3+
@@ -149,6 +150,11 @@ which may be a file:// URI pointing the package's tree."
            "https://www.gnu.org/licenses/gpl.html"
            "https://www.gnu.org/licenses/license-list#GNUGPLv3"))
 
+(define isc
+  (license "ISC"
+           "http://directory.fsf.org/wiki/License:ISC"
+           "https://www.gnu.org/licenses/license-list.html#ISC"))
+
 (define ijg
   (license "IJG"
            "http://directory.fsf.org/wiki/License:JPEG"
-- 
1.7.10.4

Re: [PATCH] gnu: Add tmux. licenses: add ISC.

[Ludovic Courtès]

Hi,

Cyril Roelandt <tipecaml@gmail.com> skribis:

> Adding tmux was easy, I just had to add the ISC license (aka "the OpenBSD
> license") to guix/licenses.scm. If you're okay with that, I'll push the patch.

Looks good to me.  Just a couple of comments:

> +             (uri (string-append
> +                    "http://downloads.sourceforge.net/project/tmux/tmux/tmux-"
> +                    version "/tmux-" version ".tar.gz"))

Please use mirror://sourceforge/tmus/tmux/tmux-... here (make sure you
got the URL right by testing it with guix-download.)

> +    (synopsis "A BSD-licensed terminal multiplexer")

Maybe just “a terminal multiplexer”?

Feel free to push once changed accordingly.

Thanks!

Ludo’.

Re: [PATCH] gnu: Add tmux. licenses: add ISC.

[Cyril Roelandt]

On 02/11/2013 09:18 AM, Ludovic Courtès wrote:
> Feel free to push once changed accordingly.
>

Done !

Thanks,
Cyril.