nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "gnu: Add iftop." 

This reverts commit 45da8c6dd1.
This commit is contained in:
Leo Famulari 2016-01-21 20:11:21 -05:00
parent 45da8c6dd1
commit c2af02602a
2 changed files with 22 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gnu/packages/admin.scm
View File

@ -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)))

22
gnu/packages/zsh.scm
View File

@ -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,11 +42,9 @@
(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
(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))
@ -65,17 +62,8 @@
"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")))
; ))
)))
(("/bin/sh") (which "sh")))))
%standard-phases)))
(native-inputs `(("autoconf", autoconf)))
(inputs `(("ncurses", ncurses)
("pcre", pcre)