From: Pierre Neidhardt Date: Mon, 9 Dec 2019 11:20:48 +0000 (+0100) Subject: gnu: sbcl: Fix missing return value of phase. X-Git-Url: https://git.hcoop.net/jackhill/guix/guix.git/commitdiff_plain/02b6382169192367e97a2d1bc72f8eb3ed38b0dc?hp=0bfa8744ae7f085416da15b234dcfdfa08c3b104 gnu: sbcl: Fix missing return value of phase. * gnu/packages/lisp.scm (sbcl)[arguments]: Return #t in patch-unix-tool-paths phase. --- diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index dc44a9d133..d51b9a3662 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2018 Alex Vong -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018, 2019 Pierre Neidhardt ;;; Copyright © 2018, 2019 Pierre Langlois ;;; Copyright © 2019 Katherine Cox-Buday ;;; Copyright © 2019 Jesse Gildersleve @@ -354,10 +354,10 @@ an interpreter, a compiler, a debugger, and much more.") ;; ;; CCL is not bootstrappable so it won't do. CLISP 2.49 seems to work. ;; ECL too. ECL builds SBCL about 20% slower than CLISP. As of - ;; 2019-09-05, ECL was last updated in 2016 while CLISP was last update + ;; 2019-09-05, ECL was last updated in 2016 while CLISP was last updated ;; in 2010. ;; - ;; For now we stick to CLISP for all systems. We keep the `match' in to + ;; For now we stick to CLISP for all systems. We keep the `match' here to ;; make it easier to change the host compiler for various architectures. `(,@(match (%current-system) ((or "x86_64-linux" "i686-linux") @@ -422,7 +422,8 @@ an interpreter, a compiler, a debugger, and much more.") (("\\(deftest pwent\\.[12]" all) (string-append "#+nil ;disabled by Guix\n" all)) (("\\(deftest grent\\.[12]" all) - (string-append "#+nil ;disabled by Guix\n" all)))))) + (string-append "#+nil ;disabled by Guix\n" all)))) + #t)) ;; FIXME: the texlive-union insists on regenerating fonts. It stores ;; them in HOME, so it needs to be writeable. (add-before 'build 'set-HOME @@ -444,6 +445,7 @@ an interpreter, a compiler, a debugger, and much more.") (invoke "sh" "install.sh"))) (add-after 'build 'build-doc (lambda _ + ;; TODO: Doc is not deterministic, maybe there is a timespamp? (with-directory-excursion "doc/manual" (and (invoke "make" "info") (invoke "make" "dist")))))