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

guix: package-from-tarball: Allow PROGRAM-TO-TEST to be #f. 

* gnu/packages/bootstrap.scm (package-from-tarball): Allow PROGRAM-TO-TEST to
be #f.
This commit is contained in:
Jan Nieuwenhuizen 2018-09-09 12:32:07 +02:00
parent 517af02ea1
commit dbabfc470d
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/bootstrap.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -97,10 +98,10 @@
(define* (package-from-tarball name source program-to-test description (define* (package-from-tarball name source program-to-test description
#:key snippet) #:key snippet)
"Return a package that correspond to the extraction of SOURCE. "Return a package that correspond to the extraction of SOURCE.
PROGRAM-TO-TEST is a program to run after extraction of SOURCE, to check PROGRAM-TO-TEST is #f or a string: the program to run after extraction of
whether everything is alright. If SNIPPET is provided, it is evaluated after SOURCE to check whether everything is alright. If SNIPPET is provided, it is
extracting SOURCE. SNIPPET should raise an exception to signal an error; its evaluated after extracting SOURCE. SNIPPET should return true if successful,
return value is ignored." or false to signal an error."
(package (package
(name name) (name name)
(version "0") (version "0")
@ -123,8 +124,9 @@ return value is ignored."
(invoke tar "xvf" (invoke tar "xvf"
(string-append builddir "/binaries.tar")) (string-append builddir "/binaries.tar"))
,@(if snippet (list snippet) '()) ,@(if snippet (list snippet) '())
(or (not ,program-to-test)
(invoke (string-append "bin/" ,program-to-test) (invoke (string-append "bin/" ,program-to-test)
"--version")))))) "--version")))))))
(inputs (inputs
`(("tar" ,(search-bootstrap-binary "tar" (%current-system))) `(("tar" ,(search-bootstrap-binary "tar" (%current-system)))
("xz" ,(search-bootstrap-binary "xz" (%current-system))) ("xz" ,(search-bootstrap-binary "xz" (%current-system)))