From patchwork Tue Jul 13 23:45:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 31389 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BC56827BC82; Wed, 14 Jul 2021 00:46:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id ABF5427BC6B for ; Wed, 14 Jul 2021 00:46:11 +0100 (BST) Received: from localhost ([::1]:58624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3S6M-0001ZP-F9 for patchwork@mira.cbaines.net; Tue, 13 Jul 2021 19:46:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3S6F-0001Yq-CA for guix-patches@gnu.org; Tue, 13 Jul 2021 19:46:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59122) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3S6E-0005vE-3H for guix-patches@gnu.org; Tue, 13 Jul 2021 19:46:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m3S6D-0002v4-VH for guix-patches@gnu.org; Tue, 13 Jul 2021 19:46:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49517] [PATCH] gnu: txr: Build documentation and update to 265. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 13 Jul 2021 23:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49517 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49517@debbugs.gnu.org Cc: Kaz Kylheku X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.162621996011212 (code B ref -1); Tue, 13 Jul 2021 23:46:01 +0000 Received: (at submit) by debbugs.gnu.org; 13 Jul 2021 23:46:00 +0000 Received: from localhost ([127.0.0.1]:42435 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3S62-0002uW-Ki for submit@debbugs.gnu.org; Tue, 13 Jul 2021 19:46:00 -0400 Received: from lists.gnu.org ([209.51.188.17]:46122) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3S5z-0002uN-HG for submit@debbugs.gnu.org; Tue, 13 Jul 2021 19:45:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3S5z-0001YW-8l for guix-patches@gnu.org; Tue, 13 Jul 2021 19:45:47 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:43718) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3S5t-0005aq-F1 for guix-patches@gnu.org; Tue, 13 Jul 2021 19:45:46 -0400 Date: Tue, 13 Jul 2021 23:45:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail3; t=1626219936; bh=Qlw+IHTYK1FdheLiVBpEQNagnR9fsG064l4PYPumBLg=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=lxtDiKrLtGfo193fnsT7eyQgnfS+g2njMQbwZIfN3BiGHkHs+F4S08iEY9R07bdQy TLiyZfW2cVviY/wpvhliaUBjv4fWIYyu0q2Smt2BlktLp4X4oAL8bbR53Lft6cIaR5 tUxmPsu5yxWwqU6wenTjV8UcdP++RsmB0AZJBUaav4bc/mlkWioheBJ0CYCvdzRL49 PL6qsrvg4uAtWOc/QYUzcgtmWmlsvPRKqKfIKgUdVohJUNhpnhTs1uE7dx4dyOjWW+ ukPiaAlno56o+3i0jVOmrQiJKijdjU897unvyZOvs63bnJwou4lOMk128XYiANedEj dBSCHF7ZSzP8g== From: "Paul A. Patience" Message-ID: In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.134; envelope-from=paul@apatience.com; helo=mail-40134.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches On Sunday, July 11th, 2021 at 21:01, Paul A. Patience wrote: > I've managed to fix one of the failing tests > and narrowed down the problem of the others. Kaz Kylheku has determined the cause of the failing tests, so I've updated the comment to reflect his conclusions. There has been a new release so I've updated the package to TXR version 266. Once again, only the second attached patch is different from my initial submission. Best regards, Paul From c1295a3b83c7d446ea42a683b1384acd5645bfe8 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Tue, 13 Jul 2021 19:38:12 -0400 Subject: [PATCH 2/2] 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 8f3be7dafe..8d2acc81e2 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. @@ -938,7 +938,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 @@ -946,6 +946,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