From dfd4147f5992b561ac1a72bbc32c738724c855f9 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Tue, 13 Jul 2021 19:38:12 -0400 Subject: [PATCH 3/3] gnu: txr: Update to 266. * gnu/packages/lisp.scm (txr)[version]: Update to 266. [arguments]<#:phases>{inhibit-doc-syms-generation}: Correct the path to doc-syms.tl to its new location. {fix-tests}: Fix another test. {disable-failing-tests}: New phase. --- gnu/packages/lisp.scm | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 6a1cc4dcfd..6ec59f5231 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -906,7 +906,7 @@ the HTML documentation of TXR.") (define-public txr (package (name "txr") - (version "263") + (version "266") (source (origin (method git-fetch) @@ -915,7 +915,7 @@ the HTML documentation of TXR.") (commit (string-append "txr-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "14zaziymnbr2ld79x4h7sf88bzzzj82w3xpavmcx7mhwannb2swh")))) + (base32 "1k9mj3zaxdsylgnb8g6cq0cmp6420x7fp3nnsqdmds4gh8ib95wn")))) (build-system gnu-build-system) (native-inputs ;; Required to build the documentation. @@ -947,7 +947,7 @@ the HTML documentation of TXR.") ;; stdlib/doc-syms.tl, which is anyway kept up to date with ;; each release (and is already compiled to stdlib/doc-syms.tlo ;; when genman.txr is run). - (("^@\\(output \"share/txr/stdlib/doc-syms\\.tl\"\\).*" line) + (("^@\\(output \"stdlib/doc-syms\\.tl\"\\).*" line) (string-append "@(do (exit))\n" line))) #t)) (add-after 'unpack 'fix-tests @@ -955,6 +955,22 @@ the HTML documentation of TXR.") (substitute* (list "tests/017/realpath.tl" "tests/017/realpath.expected") (("/usr/bin") "/")) + (substitute* "tests/018/path-test.tl" + (("/bin") (dirname (which "sh")))) + #t)) + (add-after 'unpack 'disable-failing-tests + (lambda _ + (for-each delete-file + ;; These tests fail because they call external commands + ;; (like ls and cat) that don't run because the forked + ;; child processes' execvp calls cannot find the + ;; hardcoded /bin/sh. + ;; (The tests pass when run manually in the directory + ;; left by --keep-failed.) + (map (lambda (f) (string-append "tests/" f)) + '("002/query-1.txr" + "010/json.tl" + "018/process.tl"))) #t)) (replace 'configure ;; ./configure is a hand-written script that can't handle standard -- 2.32.0