gnu: txr: Update to 273.

* gnu/packages/lisp.scm (txr): Update to 273.
[arguments]: Don't explicitly return #t from phases.
This commit is contained in:
Tobias Geerinckx-Rice 2022-01-07 04:27:19 +01:00
parent 58fd238520
commit 363d872167
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79

View file

@ -915,7 +915,7 @@ the HTML documentation of TXR.")
(define-public txr (define-public txr
(package (package
(name "txr") (name "txr")
(version "270") (version "273")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -924,7 +924,7 @@ the HTML documentation of TXR.")
(commit (string-append "txr-" version)))) (commit (string-append "txr-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1kp64h3ls8mddvrlaqqylrb3brckfrqvkk8049xn15mimfggg0xv")))) (base32 "1m4akw64458qcrfbqv71z9y8q9dszj26d7jfqblcn6nn8akx2jyb"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -939,8 +939,7 @@ the HTML documentation of TXR.")
(("INSTALL(,.*LICENSE,.*)\\$\\(datadir\\)" _ match) (("INSTALL(,.*LICENSE,.*)\\$\\(datadir\\)" _ match)
(string-append "INSTALL" match (string-append "INSTALL" match
(assoc-ref outputs "out") (assoc-ref outputs "out")
"/share/doc/" ,name "-" ,version))) "/share/doc/" ,name "-" ,version)))))
#t))
(delete 'install-license-files) (delete 'install-license-files)
(add-after 'unpack 'inhibit-doc-syms-generation (add-after 'unpack 'inhibit-doc-syms-generation
(lambda _ (lambda _
@ -950,8 +949,7 @@ the HTML documentation of TXR.")
;; each release (and is already compiled to stdlib/doc-syms.tlo ;; each release (and is already compiled to stdlib/doc-syms.tlo
;; when genman.txr is run). ;; when genman.txr is run).
(("^@\\(output \"stdlib/doc-syms\\.tl\"\\).*" line) (("^@\\(output \"stdlib/doc-syms\\.tl\"\\).*" line)
(string-append "@(do (exit))\n" line))) (string-append "@(do (exit))\n" line)))))
#t))
(add-after 'unpack 'fix-paths (add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "stream.c" (substitute* "stream.c"
@ -967,20 +965,17 @@ the HTML documentation of TXR.")
;; autotools arguments like CONFIG_SHELL. ;; autotools arguments like CONFIG_SHELL.
(lambda* (#:key configure-flags #:allow-other-keys) (lambda* (#:key configure-flags #:allow-other-keys)
(setenv "txr_shell" (which "bash")) (setenv "txr_shell" (which "bash"))
(apply invoke "./configure" configure-flags) (apply invoke "./configure" configure-flags)))
#t))
(add-after 'build 'build-doc (add-after 'build 'build-doc
(lambda _ (lambda _
(setenv "GS_GENERATE_UUIDS" "0") (setenv "GS_GENERATE_UUIDS" "0")
(invoke "make" "txr-manpage.html" "txr-manpage.pdf") (invoke "make" "txr-manpage.html" "txr-manpage.pdf")))
#t))
(add-after 'install 'install-doc (add-after 'install 'install-doc
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((doc (string-append (assoc-ref outputs "out") (let ((doc (string-append (assoc-ref outputs "out")
"/share/doc/" ,name "-" ,version))) "/share/doc/" ,name "-" ,version)))
(for-each (lambda (f) (install-file f doc)) (for-each (lambda (f) (install-file f doc))
'("txr-manpage.html" "txr-manpage.pdf"))) '("txr-manpage.html" "txr-manpage.pdf"))))))))
#t)))))
(native-inputs (native-inputs
;; Required to build the documentation. ;; Required to build the documentation.
(list ghostscript (list ghostscript