summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2016-01-21 20:11:21 -0500
committerLeo Famulari <leo@famulari.name>2016-01-21 20:11:21 -0500
commitc2af02602ab19deca27db776406b35860cf47d97 (patch)
tree9ba75e658aa3061ef4229aeddbe1e63d34fae01f
parent45da8c6dd10c93280277d17463d09fce6a25afe9 (diff)
Revert "gnu: Add iftop."
This reverts commit 45da8c6dd10c93280277d17463d09fce6a25afe9.
-rw-r--r--gnu/packages/admin.scm23
-rw-r--r--gnu/packages/zsh.scm56
2 files changed, 22 insertions, 57 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 953c5b4cf8..6e783502e6 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -6,7 +6,6 @@
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015 Alex Sassmannshausen <alex.sassmannshausen@gmail.com>
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
-;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1378,25 +1377,3 @@ command that learns\". It works by maintaining a database of the directories
you use the most from the command line and allows you to \"jump\" to
frequently used directories by typing only a small pattern.")
(license license:gpl3+)))
-
-(define-public iftop
- (package
- (name "iftop")
- (version "1.0pre4")
- (source (origin
- (method url-fetch)
- (uri (string-append "http://www.ex-parrot.com/~pdw/iftop/download"
- "/iftop-" version ".tar.gz"))
- (sha256
- (base32
- "15sgkdyijb7vbxpxjavh5qm5nvyii3fqcg9mzvw7fx8s6zmfwczp"))))
- (build-system gnu-build-system)
- (inputs
- `(("libpcap" ,libpcap)
- ("ncurses" ,ncurses)))
- (synopsis "Monitor network usage")
- (description "Iftop does for network usage what @command{top} does
-for CPU usage. It listens to network traffic on a named interface and
-displays a table of current bandwidth usage by pairs of hosts.")
- (home-page "http://www.ex-parrot.com/~pdw/iftop/")
- (license license:gpl3)))
diff --git a/gnu/packages/zsh.scm b/gnu/packages/zsh.scm
index 2ce36d066b..6d25fd4671 100644
--- a/gnu/packages/zsh.scm
+++ b/gnu/packages/zsh.scm
@@ -23,7 +23,6 @@
#:use-module (gnu packages autotools)
#:use-module (guix packages)
#:use-module (guix download)
-; #:use-module (guix build utils)
#:use-module (guix build-system gnu)
#:use-module (guix licenses))
@@ -43,39 +42,28 @@
(base32
"11shllzhq53fg8ngy3bgbmpf09fn2czifg7hsb41nxi3410mpvcl"))))
(build-system gnu-build-system)
- (arguments `(#:parallel-build? #f
- #:configure-flags '("--with-tcsetpgrp" "--enable-pcre")
- #:make-flags '("ZTST_verbose=2")
- #:phases (modify-phases %standard-phases
- (add-before 'configure 'fix-sh
- (lambda _
- ;; Some of the files are ISO-8859-1 encoded.
- (with-fluids ((%default-port-encoding #f))
- (substitute*
- '("configure"
- "configure.ac"
- "Src/exec.c"
- "Src/mkmakemod.sh"
- "Config/installfns.sh"
- "Config/defs.mk.in"
- "Test/E01options.ztst"
- "Test/A05execution.ztst"
- "Test/A01grammar.ztst"
- "Test/A06assign.ztst"
- "Test/B02typeset.ztst"
- "Completion/Unix/Command/_init_d"
- "Util/preconfig")
- (("/bin/sh") (which "sh"))))))
-; (add-before 'check 'provide-zsh-interpreter
-; (lambda _
-; (substitute* "Test/runtests.zsh"
-; (("#!/bin/zsh -f")
-; (string-append "#!" (getcwd) "/Src/zsh -f")))
-; (substitute* "Test/ztst.zsh"
-; (("#!/bin/zsh -f")
-; (string-append "#!" (getcwd) "/Src/zsh -f")))
-; ))
- )))
+ (arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre")
+ #:phases (alist-cons-before
+ 'configure 'fix-sh
+ (lambda _
+ ;; Some of the files are ISO-8859-1 encoded.
+ (with-fluids ((%default-port-encoding #f))
+ (substitute*
+ '("configure"
+ "configure.ac"
+ "Src/exec.c"
+ "Src/mkmakemod.sh"
+ "Config/installfns.sh"
+ "Config/defs.mk.in"
+ "Test/E01options.ztst"
+ "Test/A05execution.ztst"
+ "Test/A01grammar.ztst"
+ "Test/A06assign.ztst"
+ "Test/B02typeset.ztst"
+ "Completion/Unix/Command/_init_d"
+ "Util/preconfig")
+ (("/bin/sh") (which "sh")))))
+ %standard-phases)))
(native-inputs `(("autoconf", autoconf)))
(inputs `(("ncurses", ncurses)
("pcre", pcre)