guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/03: gnu: clusterssh: Don't propagate xterm.


From: guix-commits
Subject: 02/03: gnu: clusterssh: Don't propagate xterm.
Date: Thu, 25 Jul 2019 15:59:16 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit 12ea2571221fc08b961c9fd38420648126ac6674
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Thu Jul 25 18:59:38 2019 +0200

    gnu: clusterssh: Don't propagate xterm.
    
    * gnu/packages/admin.scm (clusterssh)[arguments]: Add ‘refer-to-inputs’ and 
‘delete-failing-tests’ phases.
    [inputs]: Move xterm to here…
    [propagated-inputs]: …from here.
---
 gnu/packages/admin.scm | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 5801313..42dc439 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -913,6 +913,25 @@ by bandwidth they use.")
                (base32
                 "0rmk2p3f2wz1h092anidjclh212rv3gxyk0c641qk3frlrjnw6mp"))))
     (build-system perl-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'refer-to-inputs
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* (list "lib/App/ClusterSSH/Config.pm"
+                                "t/15config.t")
+               (("xterm")
+                (which "xterm")))
+             #t))
+         (add-before 'check 'delete-failing-tests
+           (lambda _
+             ;; This checks whether all code is nicely formatted.  The above
+             ;; ‘refer-to-inputs’ phase breaks this pedantry, so disable it.
+             (delete-file "t/perltidy.t")
+             ;; Update the manifest so t/manifest.t happily passes.
+             (substitute* "MANIFEST"
+               (("t/perltidy.t\n") ""))
+             #t)))))
     (native-inputs
      `(("perl-cpan-changes" ,perl-cpan-changes)
        ("perl-file-slurp" ,perl-file-slurp)
@@ -926,9 +945,10 @@ by bandwidth they use.")
        ("perl-test-pod-coverage" ,perl-test-pod-coverage)
        ("perl-test-trap" ,perl-test-trap)
        ("perltidy" ,perltidy)))
+    (inputs
+     `(("xterm" ,xterm)))
     (propagated-inputs
-     `(("xterm" ,xterm)
-       ("perl-exception-class" ,perl-exception-class)
+     `(("perl-exception-class" ,perl-exception-class)
        ("perl-sort-naturally" ,perl-sort-naturally)
        ("perl-tk" ,perl-tk)
        ("perl-try-tiny" ,perl-try-tiny)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]