[PATCH] gnu: Add perl-tk, perl-x11-protocol, and clusterssh

[PATCH] gnu: Add perl-tk, perl-x11-protocol, and clusterssh

[Eric Bavier]

[-- Attachment #1: 0001-gnu-Add-perl-tk-perl-x11-protocol-and-clusterssh.patch --]
[-- Type: text/x-diff, Size: 7854 bytes --]

From 61b06fceed500729230e87a721d37b5d3af7bc26 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Fri, 4 Apr 2014 10:12:00 -0500
Subject: [PATCH] gnu: Add perl-tk, perl-x11-protocol, and clusterssh

* gnu/packages/admin.scm (clusterssh): New variable
* gnu/packages/tcl.scm (perl-tk): New variable
* gnu/packages/xorg.scm (perl-x11-protocol): New variable
---
 gnu/packages/admin.scm |   51 +++++++++++++++++++++++++++++++++++++++++++++++-
 gnu/packages/tcl.scm   |   32 ++++++++++++++++++++++++++++++
 gnu/packages/xorg.scm  |   24 +++++++++++++++++++++++
 3 files changed, 106 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 89df1a9..1dcb458 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -33,6 +34,7 @@
   #:use-module (gnu packages guile)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages perl)
+  #:use-module (gnu packages tcl)
   #:use-module ((gnu packages base)
                 #:select (tar))
   #:use-module ((gnu packages compression)
@@ -40,7 +42,8 @@
   #:use-module (gnu packages bison)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages glib)
-  #:use-module (gnu packages pkg-config))
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages xorg))
 
 (define-public dmd
   (package
@@ -490,3 +493,49 @@ network statistics collection, security monitoring, network debugging, etc.")
 through the host it is running from and displays streams sorted
 by bandwidth they use.")
     (license gpl2+)))
+
+(define-public clusterssh
+  (package
+    (name "clusterssh")
+    (version "3.28")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/clusterssh/"
+                                  "clusterssh-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1bwggpvaj2al5blg1ynapviv2kpydffpzq2zkhi81najnvzc1rr7"))))
+    (build-system gnu-build-system)
+    (inputs `(("perl" ,perl)))
+    (propagated-inputs `(("xterm" ,xterm)
+                         ("perl-tk" ,perl-tk)
+                         ("perl-x11-protocol" ,perl-x11-protocol)))
+    (arguments
+     `(#:phases
+       (alist-cons-after
+        'install 'set-load-paths
+        (lambda* (#:key inputs outputs #:allow-other-keys)
+          ;; Put the perl-tk and perl-x11-protocol modules in the perl inc
+          ;; path for PROG
+          (let* ((out  (assoc-ref outputs "out"))
+                 (prog (string-append out "/bin/cssh"))
+                 (perl-ver ,(package-version perl))
+                 (x11-inc (string-append
+                           (assoc-ref inputs "perl-x11-protocol")
+                           "/lib/perl5/site_perl/" perl-ver))
+                 (tk-inc (string-append
+                          (assoc-ref inputs "perl-tk")
+                          "/lib/perl5/site_perl/" perl-ver
+                          "/x86_64-linux")))
+            (wrap-program
+             prog
+             `("PERL5LIB" ":" prefix (,x11-inc ,tk-inc)))))
+        %standard-phases)))
+    ;; The clusterssh.sourceforge.net address requires login to view
+    (home-page "http://sourceforge.net/projects/clusterssh/")
+    (synopsis "Secure concurrent multi-server terminal control")
+    (description
+     "ClusterSSH controls a number of xterm windows via a single graphical
+console window to allow commands to be interactively run on multiple servers
+over an ssh connection.")
+    (license gpl2)))
diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm
index 3ebdcbe..9c4ed42 100644
--- a/gnu/packages/tcl.scm
+++ b/gnu/packages/tcl.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,6 +22,11 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system perl)
+  #:use-module (gnu packages libpng)
+  #:use-module (gnu packages libjpeg)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages xorg)
   #:use-module (guix licenses))
 
@@ -159,3 +165,29 @@ X11 GUIs.")
      "Tk is a graphical toolkit for building graphical user interfaces
 (GUIs) in the Tcl language.")
     (license (package-license tcl))))
+
+(define-public perl-tk
+  (package
+    (name "perl-tk")
+    (version "804.032")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append
+                   "mirror://cpan/authors/id/S/SR/SREZIC/Tk-"
+                   version ".tar.gz"))
+             (sha256
+              (base32
+               "0jarvplhfvnm0shhdm2a5zczlnk9mkf8jvfjiwyhjrr3cy1gl0w0"))))
+    (build-system perl-build-system)
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (inputs `(("libx11" ,libx11)
+              ("libpng" ,libpng)
+              ("libjpeg" ,libjpeg)))
+    (arguments
+     `(#:make-maker-flags `(,(string-append
+                              "X11=" (assoc-ref %build-inputs "libx11")))))
+    (license (package-license perl))
+    (synopsis "Graphical user interface toolkit for Perl")
+    (description
+     "Tk is a Graphical User Interface ToolKit.")
+    (home-page (string-append "http://search.cpan.org/~srezic/Tk-" version))))
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 2e1eeda..a06f9be 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -23,6 +24,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system perl)
   #:use-module (gnu packages)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages compression)
@@ -4768,3 +4770,25 @@ icccm: Both client and window-manager helpers for ICCCM.")
 provides DEC VT102/VT220 (VTxxx) and Tektronix 4014 compatible terminals for
 programs that cannot use the window system directly.")
     (license license:x11)))
+
+(define-public perl-x11-protocol
+  (package
+    (name "perl-x11-protocol")
+    (version "0.56")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append
+                   "mirror://cpan/authors/id/S/SM/SMCCAM/X11-Protocol-"
+                   version ".tar.gz"))
+             (sha256
+              (base32
+               "1dq89bh6fqv7l5mbffqcismcljpq5f869bx7g8lg698zgindv5ny"))))
+    (build-system perl-build-system)
+    (arguments '(#:tests? #f))          ;tests require a running x server
+    (synopsis "Raw interface to X Window System servers")
+    (description
+     "X11::Protocol is a client-side interface to the X11 Protocol, allowing
+perl programs to display windows and graphics on X11 servers.")
+    (home-page
+     (string-append "http://search.cpan.org/~smccam/X11-Protocol-" version))
+    (license (package-license perl))))
-- 
1.7.9.5


[-- Attachment #2: Type: text/plain, Size: 12 bytes --]


-- 
`~Eric

Re: [PATCH] gnu: Add perl-tk, perl-x11-protocol, and clusterssh

[Sree Harsha Totakura]

On 04/04/2014 05:15 PM, Eric Bavier wrote:
> * gnu/packages/admin.scm (clusterssh): New variable

I am actually in need of something like this.  I am using parallel-ssh, but this
looks very promising.  Thank you!

> +    (description
> +     "ClusterSSH controls a number of xterm windows via a single graphical
> +console window to allow commands to be interactively run on multiple servers
> +over an ssh connection.")

Is there a typo here?  s/an ssh connection/ssh connections ?

It seems to interact with multiple servers by having a connection to each one of
them.

Sree

Re: [PATCH] gnu: Add perl-tk, perl-x11-protocol, and clusterssh

[Mark H Weaver]

I think these should be three separate commits.

    Mark

Re: [PATCH] gnu: Add perl-tk, perl-x11-protocol, and clusterssh

[Eric Bavier]

Sree Harsha Totakura <sreeharsha@totakura.in> writes:

> On 04/04/2014 05:15 PM, Eric Bavier wrote:
>> * gnu/packages/admin.scm (clusterssh): New variable
>
> I am actually in need of something like this.  I am using parallel-ssh, but this
> looks very promising.  Thank you!

Great.  I'm glad it can be of use to someone else.

>
>> +    (description
>> +     "ClusterSSH controls a number of xterm windows via a single graphical
>> +console window to allow commands to be interactively run on multiple servers
>> +over an ssh connection.")
>
> Is there a typo here?  s/an ssh connection/ssh connections ?
>
> It seems to interact with multiple servers by having a connection to each one of
> them.

I took that blurb from the packages website, but I would agree with your
wording suggestion.  Since this isn't a GNU package I think we're free
to apply our own judgement on such things.

Thanks for looking it over.

-- 
`~Eric

Re: [PATCH] gnu: Add perl-tk, perl-x11-protocol, and clusterssh

[Ludovic Courtès]

Eric Bavier <ericbavier@gmail.com> skribis:

> I took that blurb from the packages website, but I would agree with your
> wording suggestion.  Since this isn't a GNU package I think we're free
> to apply our own judgement on such things.

Yes.

Ludo’.

Re: [PATCH] gnu: Add perl-tk, perl-x11-protocol, and clusterssh

[Ludovic Courtès]

Mark H Weaver <mhw@netris.org> skribis:

> I think these should be three separate commits.

Either way is fine with me.  Since it doesn’t modify any existing
package, there’s little to gain by making it three commits, except
review/clarity.

Ludo’.

Re: [PATCH] gnu: Add perl-tk, perl-x11-protocol, and clusterssh

[Ludovic Courtès]

Eric Bavier <ericbavier@gmail.com> skribis:

> +    (license (package-license perl))

I think the license should be stated literally–changing Perl’s license
won’t automatically change the license of these packages.

OK to push with this change.

Thanks!

Ludo’.

Re: [PATCH] gnu: Add perl-tk, perl-x11-protocol, and clusterssh

[Andreas Enge]

Hi Eric,

perl-tk fails on i686 on hydra:
   http://hydra.gnu.org/build/54474  
Could you maybe have a look?

Andreas
   

Re: [PATCH] gnu: Add perl-tk, perl-x11-protocol, and clusterssh

[Eric Bavier]

[-- Attachment #1: Type: text/plain, Size: 188 bytes --]

Andreas Enge <andreas@enge.fr> writes:

> perl-tk fails on i686 on hydra:
>    http://hydra.gnu.org/build/54474  
> Could you maybe have a look?

The attached patch should fix the issue.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-perl-tk-Patch-for-i686.patch --]
[-- Type: text/x-diff, Size: 2877 bytes --]

From a689f8135aeb058ad852e6ede20a11791469df71 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Mon, 12 May 2014 11:42:53 -0500
Subject: [PATCH] gnu: perl-tk: Patch for i686

* gnu/packages/patches/perl-tk-x11-discover.patch: New patch.
* gnu-system.am [dist_patch_DATA]: Add it.
* gnu/packages/tcl.scm (perl-tk)[origin]: Use it.
---
 gnu-system.am                                   |    1 +
 gnu/packages/patches/perl-tk-x11-discover.patch |   14 ++++++++++++++
 gnu/packages/tcl.scm                            |    4 +++-
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/perl-tk-x11-discover.patch

diff --git a/gnu-system.am b/gnu-system.am
index fa8f6f7..eb58cc6 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -325,6 +325,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/patchelf-page-size.patch			\
   gnu/packages/patches/patchutils-xfail-gendiff-tests.patch	\
   gnu/packages/patches/perl-no-sys-dirs.patch			\
+  gnu/packages/patches/perl-tk-x11-discover.patch		\
   gnu/packages/patches/petsc-fix-threadcomm.patch		\
   gnu/packages/patches/plotutils-libpng-jmpbuf.patch		\
   gnu/packages/patches/procps-make-3.82.patch			\
diff --git a/gnu/packages/patches/perl-tk-x11-discover.patch b/gnu/packages/patches/perl-tk-x11-discover.patch
new file mode 100644
index 0000000..f4365e6
--- /dev/null
+++ b/gnu/packages/patches/perl-tk-x11-discover.patch
@@ -0,0 +1,14 @@
+On non-x86_64 systems, this conditional can cause a specified X11 build value
+to be overwritten to null, causing x11 discovery to fail.
+
+--- a/myConfig	2014-05-12 11:16:48.152719722 -0500
++++ b/myConfig	2014-05-12 11:16:24.704719113 -0500
+@@ -350,7 +350,7 @@
+   #
+   # Prefer 64bit libraries on certain architectures
+   #
+-  unless (defined $xlib and $Config{'archname'} =~ m/x86_64/)
++  unless (defined $xlib or not $Config{'archname'} =~ m/x86_64/)
+     {
+       $xlib64 = &lX11(0, chooseX11(</usr/X11*/lib64>));
+     }
diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm
index eb4c227..4859c2b 100644
--- a/gnu/packages/tcl.scm
+++ b/gnu/packages/tcl.scm
@@ -23,6 +23,7 @@
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system perl)
+  #:use-module (gnu packages)
   #:use-module (gnu packages libpng)
   #:use-module (gnu packages libjpeg)
   #:use-module (gnu packages perl)
@@ -177,7 +178,8 @@ X11 GUIs.")
                    version ".tar.gz"))
              (sha256
               (base32
-               "0jarvplhfvnm0shhdm2a5zczlnk9mkf8jvfjiwyhjrr3cy1gl0w0"))))
+               "0jarvplhfvnm0shhdm2a5zczlnk9mkf8jvfjiwyhjrr3cy1gl0w0"))
+             (patches (list (search-patch "perl-tk-x11-discover.patch")))))
     (build-system perl-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (inputs `(("libx11" ,libx11)
-- 
1.7.9.5


[-- Attachment #3: Type: text/plain, Size: 12 bytes --]


-- 
`~Eric

Re: [PATCH] gnu: Add perl-tk, perl-x11-protocol, and clusterssh

[Ludovic Courtès]

Eric Bavier <ericbavier@gmail.com> skribis:

> From a689f8135aeb058ad852e6ede20a11791469df71 Mon Sep 17 00:00:00 2001
> From: Eric Bavier <bavier@member.fsf.org>
> Date: Mon, 12 May 2014 11:42:53 -0500
> Subject: [PATCH] gnu: perl-tk: Patch for i686
>
> * gnu/packages/patches/perl-tk-x11-discover.patch: New patch.
> * gnu-system.am [dist_patch_DATA]: Add it.
> * gnu/packages/tcl.scm (perl-tk)[origin]: Use it.

Fine with me if it’s confirmed to solve the problem (you can use ‘guix
build --system=i686-linux’ to test.)

Ludo’.

Re: [PATCH] gnu: Add perl-tk, perl-x11-protocol, and clusterssh

[Andreas Enge]

Is it something you could forward upstream?

Andreas

Re: [PATCH] gnu: Add perl-tk, perl-x11-protocol, and clusterssh

[Eric Bavier]

Andreas Enge <andreas@enge.fr> writes:

> Is it something you could forward upstream?

https://rt.cpan.org/Public/Bug/Display.html?id=95590

-- 
`~Eric

Re: [PATCH] gnu: Add perl-tk, perl-x11-protocol, and clusterssh

[Eric Bavier]

ludo@gnu.org (Ludovic Courtès) writes:

> Eric Bavier <ericbavier@gmail.com> skribis:
>
>> From a689f8135aeb058ad852e6ede20a11791469df71 Mon Sep 17 00:00:00 2001
>> From: Eric Bavier <bavier@member.fsf.org>
>> Date: Mon, 12 May 2014 11:42:53 -0500
>> Subject: [PATCH] gnu: perl-tk: Patch for i686
>>
>> * gnu/packages/patches/perl-tk-x11-discover.patch: New patch.
>> * gnu-system.am [dist_patch_DATA]: Add it.
>> * gnu/packages/tcl.scm (perl-tk)[origin]: Use it.
>
> Fine with me if it’s confirmed to solve the problem (you can use ‘guix
> build --system=i686-linux’ to test.)

I tested the patch with `guix build perl-tk --system=i686-linux`

-- 
`~Eric

Re: [PATCH] gnu: Add perl-tk, perl-x11-protocol, and clusterssh

[Andreas Enge]

On Mon, May 12, 2014 at 03:40:22PM -0500, Eric Bavier wrote:
> https://rt.cpan.org/Public/Bug/Display.html?id=95590

Excellent!

Andreas

Re: [PATCH] gnu: Add perl-tk, perl-x11-protocol, and clusterssh

[Ludovic Courtès]

Eric Bavier <ericbavier@gmail.com> skribis:

> ludo@gnu.org (Ludovic Courtès) writes:
>
>> Eric Bavier <ericbavier@gmail.com> skribis:
>>
>>> From a689f8135aeb058ad852e6ede20a11791469df71 Mon Sep 17 00:00:00 2001
>>> From: Eric Bavier <bavier@member.fsf.org>
>>> Date: Mon, 12 May 2014 11:42:53 -0500
>>> Subject: [PATCH] gnu: perl-tk: Patch for i686
>>>
>>> * gnu/packages/patches/perl-tk-x11-discover.patch: New patch.
>>> * gnu-system.am [dist_patch_DATA]: Add it.
>>> * gnu/packages/tcl.scm (perl-tk)[origin]: Use it.
>>
>> Fine with me if it’s confirmed to solve the problem (you can use ‘guix
>> build --system=i686-linux’ to test.)
>
> I tested the patch with `guix build perl-tk --system=i686-linux`

Perfect, thanks!

Ludo’.