mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 22:08:16 -05:00
gnu: admin: Return #t from all phases.
* gnu/packages/admin.scm (daemon-tools, rottlog, wpa-supplicant-minimal) (wakelan, cpulimit, nmap, sunxi-tools): Return #t from all phases.
This commit is contained in:
Mark H Weaver
parent
21f7d88e7a
commit
cb8ba848d2
1 changed files with 38 additions and 37 deletions
|
|
@ -227,13 +227,15 @@ (define-public daemontools
|
|||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'chdir
|
||||
(lambda _
|
||||
(chdir ,(string-append name "-" version))))
|
||||
(chdir ,(string-append name "-" version))
|
||||
#t))
|
||||
(delete 'configure)
|
||||
(add-before 'build 'patch
|
||||
(lambda _
|
||||
(substitute* "src/error.h"
|
||||
(("extern int errno;")
|
||||
"#include <errno.h>"))))
|
||||
"#include <errno.h>"))
|
||||
#t))
|
||||
(replace 'build
|
||||
(lambda _
|
||||
(invoke "package/compile")))
|
||||
|
|
@ -243,7 +245,8 @@ (define-public daemontools
|
|||
(bin (string-append out "/bin")))
|
||||
(for-each (lambda (file)
|
||||
(install-file file bin))
|
||||
(find-files "command"))))))))
|
||||
(find-files "command")))
|
||||
#t)))))
|
||||
(synopsis "Tools for managing UNIX style services")
|
||||
(description
|
||||
"@code{daemontools} is a collection of tools for managing UNIX
|
||||
|
|
@ -965,7 +968,7 @@ (define-public rottlog
|
|||
#t))
|
||||
(add-after 'install 'install-info
|
||||
(lambda _
|
||||
(zero? (system* "make" "install-info")))))))
|
||||
(invoke "make" "install-info"))))))
|
||||
(native-inputs `(("texinfo" ,texinfo)
|
||||
("util-linux" ,util-linux))) ; for 'cal'
|
||||
(home-page "https://www.gnu.org/software/rottlog/")
|
||||
|
|
@ -1096,7 +1099,8 @@ (define-public wpa-supplicant-minimal
|
|||
CFLAGS += $(shell pkg-config libnl-3.0 --cflags)
|
||||
CONFIG_LIBNL32=y
|
||||
CONFIG_READLINE=y\n" port)
|
||||
(close-port port))))
|
||||
(close-port port))
|
||||
#t))
|
||||
(add-after 'install 'install-man-pages
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
|
|
@ -1235,11 +1239,10 @@ (define-public wakelan
|
|||
;; It's an old configure script that doesn't understand
|
||||
;; the extra options we pass.
|
||||
(setenv "CONFIG_SHELL" (which "bash"))
|
||||
(zero?
|
||||
(system* "./configure"
|
||||
(invoke "./configure"
|
||||
(string-append "--prefix=" out)
|
||||
(string-append "--mandir=" out
|
||||
"/share/man")))))))
|
||||
"/share/man"))))))
|
||||
#:tests? #f))
|
||||
(home-page "https://www.kernel.org") ; really, no home page
|
||||
(synopsis "Send a wake-on-LAN packet")
|
||||
|
|
@ -1641,20 +1644,18 @@ (define-public cpulimit
|
|||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(replace
|
||||
'build
|
||||
(replace 'build
|
||||
(lambda _
|
||||
(zero? (system* "make" "CC=gcc" "-Csrc"))))
|
||||
(replace
|
||||
'check
|
||||
(invoke "make" "CC=gcc" "-Csrc")))
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(zero? (system* "make" "CC=gcc" "-Ctests"))))
|
||||
(replace
|
||||
'install
|
||||
(invoke "make" "CC=gcc" "-Ctests")))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin")))
|
||||
(install-file "src/cpulimit" bin)))))))
|
||||
(install-file "src/cpulimit" bin))
|
||||
#t)))))
|
||||
(home-page "https://github.com/opsengine/cpulimit")
|
||||
(synopsis "Limit CPU usage")
|
||||
(description
|
||||
|
|
@ -1863,10 +1864,9 @@ (define-public nmap
|
|||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(define (make out . args)
|
||||
(unless (zero? (apply system* "make"
|
||||
(apply invoke "make"
|
||||
(string-append "prefix=" out)
|
||||
args))
|
||||
(error "make failed")))
|
||||
(define (python-path dir)
|
||||
(string-append dir "/lib/python2.7/site-packages"))
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
|
|
@ -1880,13 +1880,14 @@ (define (python-path dir)
|
|||
(make ndiff "install-ndiff")
|
||||
(wrap-program (string-append ndiff "/bin/ndiff")
|
||||
`("PYTHONPATH" prefix
|
||||
(,(python-path ndiff)))))))
|
||||
(,(python-path ndiff)))))
|
||||
#t))
|
||||
;; These are the tests that do not require network access.
|
||||
(replace 'check
|
||||
(lambda _ (zero? (system* "make"
|
||||
(lambda _ (invoke "make"
|
||||
"check-nse"
|
||||
"check-ndiff"
|
||||
"check-dns")))))
|
||||
"check-dns"))))
|
||||
;; Nmap can't cope with out-of-source building.
|
||||
#:out-of-source? #f))
|
||||
(home-page "https://nmap.org/")
|
||||
|
|
@ -2192,15 +2193,15 @@ (define (filter-environment! filter-predicate
|
|||
#t))
|
||||
(replace 'build
|
||||
(lambda* (#:key make-flags #:allow-other-keys)
|
||||
(zero? (apply system* "make" "tools" "misc" make-flags))))
|
||||
(apply invoke "make" "tools" "misc" make-flags)))
|
||||
(add-after 'build 'build-armhf
|
||||
(lambda* (#:key make-flags #:allow-other-keys)
|
||||
(setenv "LIBRARY_PATH" #f)
|
||||
(zero? (apply system* "make" "target-tools" make-flags))))
|
||||
(apply invoke "make" "target-tools" make-flags)))
|
||||
(replace 'install
|
||||
(lambda* (#:key make-flags #:allow-other-keys)
|
||||
(zero? (apply system* "make" "install-all" "install-misc"
|
||||
make-flags)))))))
|
||||
(apply invoke "make" "install-all" "install-misc"
|
||||
make-flags))))))
|
||||
(home-page "https://github.com/linux-sunxi/sunxi-tools")
|
||||
(synopsis "Hardware management tools for Allwinner computers")
|
||||
(description "This package contains tools for Allwinner devices:
|
||||
|
|
|
|||
Loading…
Reference in a new issue