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

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 2018-06-27 19:14:51 -04:00
parent 21f7d88e7a
commit cb8ba848d2
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
gnu/packages/admin.scm
View File

@ -227,13 +227,15 @@ interface and is based on GNU Guile.")
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'chdir (add-after 'unpack 'chdir
(lambda _ (lambda _
(chdir ,(string-append name "-" version)))) (chdir ,(string-append name "-" version))
#t))
(delete 'configure) (delete 'configure)
(add-before 'build 'patch (add-before 'build 'patch
(lambda _ (lambda _
(substitute* "src/error.h" (substitute* "src/error.h"
(("extern int errno;") (("extern int errno;")
"#include <errno.h>")))) "#include <errno.h>"))
#t))
(replace 'build (replace 'build
(lambda _ (lambda _
(invoke "package/compile"))) (invoke "package/compile")))
@ -243,7 +245,8 @@ interface and is based on GNU Guile.")
(bin (string-append out "/bin"))) (bin (string-append out "/bin")))
(for-each (lambda (file) (for-each (lambda (file)
(install-file file bin)) (install-file file bin))
(find-files "command")))))))) (find-files "command")))
#t)))))
(synopsis "Tools for managing UNIX style services") (synopsis "Tools for managing UNIX style services")
(description (description
"@code{daemontools} is a collection of tools for managing UNIX "@code{daemontools} is a collection of tools for managing UNIX
@ -965,7 +968,7 @@ at once based on a Perl regular expression.")
#t)) #t))
(add-after 'install 'install-info (add-after 'install 'install-info
(lambda _ (lambda _
(zero? (system* "make" "install-info"))))))) (invoke "make" "install-info"))))))
(native-inputs `(("texinfo" ,texinfo) (native-inputs `(("texinfo" ,texinfo)
("util-linux" ,util-linux))) ; for 'cal' ("util-linux" ,util-linux))) ; for 'cal'
(home-page "https://www.gnu.org/software/rottlog/") (home-page "https://www.gnu.org/software/rottlog/")
@ -1096,7 +1099,8 @@ commands and their arguments.")
CFLAGS += $(shell pkg-config libnl-3.0 --cflags) CFLAGS += $(shell pkg-config libnl-3.0 --cflags)
CONFIG_LIBNL32=y CONFIG_LIBNL32=y
CONFIG_READLINE=y\n" port) CONFIG_READLINE=y\n" port)
(close-port port)))) (close-port port))
#t))
(add-after 'install 'install-man-pages (add-after 'install 'install-man-pages
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -1235,11 +1239,10 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.")
;; It's an old configure script that doesn't understand ;; It's an old configure script that doesn't understand
;; the extra options we pass. ;; the extra options we pass.
(setenv "CONFIG_SHELL" (which "bash")) (setenv "CONFIG_SHELL" (which "bash"))
(zero? (invoke "./configure"
(system* "./configure" (string-append "--prefix=" out)
(string-append "--prefix=" out) (string-append "--mandir=" out
(string-append "--mandir=" out "/share/man"))))))
"/share/man")))))))
#:tests? #f)) #:tests? #f))
(home-page "https://www.kernel.org") ; really, no home page (home-page "https://www.kernel.org") ; really, no home page
(synopsis "Send a wake-on-LAN packet") (synopsis "Send a wake-on-LAN packet")
@ -1641,20 +1644,18 @@ things like zero-downtime rolling updates with load balancers.")
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(replace (replace 'build
'build (lambda _
(lambda _ (invoke "make" "CC=gcc" "-Csrc")))
(zero? (system* "make" "CC=gcc" "-Csrc")))) (replace 'check
(replace (lambda _
'check (invoke "make" "CC=gcc" "-Ctests")))
(lambda _ (replace 'install
(zero? (system* "make" "CC=gcc" "-Ctests")))) (lambda* (#:key outputs #:allow-other-keys)
(replace (let* ((out (assoc-ref outputs "out"))
'install (bin (string-append out "/bin")))
(lambda* (#:key outputs #:allow-other-keys) (install-file "src/cpulimit" bin))
(let* ((out (assoc-ref outputs "out")) #t)))))
(bin (string-append out "/bin")))
(install-file "src/cpulimit" bin)))))))
(home-page "https://github.com/opsengine/cpulimit") (home-page "https://github.com/opsengine/cpulimit")
(synopsis "Limit CPU usage") (synopsis "Limit CPU usage")
(description (description
@ -1863,10 +1864,9 @@ done with the @code{auditctl} utility.")
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(define (make out . args) (define (make out . args)
(unless (zero? (apply system* "make" (apply invoke "make"
(string-append "prefix=" out) (string-append "prefix=" out)
args)) args))
(error "make failed")))
(define (python-path dir) (define (python-path dir)
(string-append dir "/lib/python2.7/site-packages")) (string-append dir "/lib/python2.7/site-packages"))
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
@ -1880,13 +1880,14 @@ done with the @code{auditctl} utility.")
(make ndiff "install-ndiff") (make ndiff "install-ndiff")
(wrap-program (string-append ndiff "/bin/ndiff") (wrap-program (string-append ndiff "/bin/ndiff")
`("PYTHONPATH" prefix `("PYTHONPATH" prefix
(,(python-path ndiff))))))) (,(python-path ndiff)))))
#t))
;; These are the tests that do not require network access. ;; These are the tests that do not require network access.
(replace 'check (replace 'check
(lambda _ (zero? (system* "make" (lambda _ (invoke "make"
"check-nse" "check-nse"
"check-ndiff" "check-ndiff"
"check-dns"))))) "check-dns"))))
;; Nmap can't cope with out-of-source building. ;; Nmap can't cope with out-of-source building.
#:out-of-source? #f)) #:out-of-source? #f))
(home-page "https://nmap.org/") (home-page "https://nmap.org/")
@ -2192,15 +2193,15 @@ Kerberos and Heimdal and FAST is supported with recent MIT Kerberos.")
#t)) #t))
(replace 'build (replace 'build
(lambda* (#:key make-flags #:allow-other-keys) (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 (add-after 'build 'build-armhf
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(setenv "LIBRARY_PATH" #f) (setenv "LIBRARY_PATH" #f)
(zero? (apply system* "make" "target-tools" make-flags)))) (apply invoke "make" "target-tools" make-flags)))
(replace 'install (replace 'install
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(zero? (apply system* "make" "install-all" "install-misc" (apply invoke "make" "install-all" "install-misc"
make-flags))))))) make-flags))))))
(home-page "https://github.com/linux-sunxi/sunxi-tools") (home-page "https://github.com/linux-sunxi/sunxi-tools")
(synopsis "Hardware management tools for Allwinner computers") (synopsis "Hardware management tools for Allwinner computers")
(description "This package contains tools for Allwinner devices: (description "This package contains tools for Allwinner devices: