From patchwork Mon Sep 4 09:02:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 53421 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 50C4727BBE2; Mon, 4 Sep 2023 10:03:47 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 88BAC27BBEC for ; Mon, 4 Sep 2023 10:03:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qd5UR-00076j-AJ; Mon, 04 Sep 2023 05:03:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qd5U8-0006yw-GG for guix-patches@gnu.org; Mon, 04 Sep 2023 05:03:08 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qd5U8-0002he-7K for guix-patches@gnu.org; Mon, 04 Sep 2023 05:03:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qd5U7-00067j-Ni; Mon, 04 Sep 2023 05:03:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65351] [PATCH v2 3/7] gnu: cgit: Do not return #t from custom phases. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: arunisaac@systemreboot.net, liliana.prikler@gmail.com, , guix-patches@gnu.org Resent-Date: Mon, 04 Sep 2023 09:03:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65351 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65351@debbugs.gnu.org Cc: Arun Isaac , Arun Isaac , Liliana Marie Prikler , ( X-Debbugs-Original-Xcc: Arun Isaac , Liliana Marie Prikler , ( Received: via spool by 65351-submit@debbugs.gnu.org id=B65351.169381817323458 (code B ref 65351); Mon, 04 Sep 2023 09:03:03 +0000 Received: (at 65351) by debbugs.gnu.org; 4 Sep 2023 09:02:53 +0000 Received: from localhost ([127.0.0.1]:48621 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qd5Tx-00066H-7x for submit@debbugs.gnu.org; Mon, 04 Sep 2023 05:02:53 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:50160) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qd5Tu-000661-JV for 65351@debbugs.gnu.org; Mon, 04 Sep 2023 05:02:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Dx1iii5Z8RxNlIYDpYs4GtF5yGlR9w0o6CphHfDi3EA=; b=JSzui1MHQF5Bo55111nxLDSSJi f5wmfPBj9AU1W9JxEYUcP6x5L4JeD3mSchisHDsK2sBnne4S4kdsRLRLRi/69xMdbQiXyBelvEzWu 0zjnAQL3LRK9ugYzllIsGIGaT8up4+fGMI+/mnumzHkG0ProEfmCE/Q6a4KwQsN87WV+PBSGE5uxb 5ashGLpxzYmkM4wGFIuMvX8Blda37zr0HH2/bHL9zH5ApVN1C4PpIX7WZcInvF85fD0n3HBp6xjsr NFLw5zo+38DNpUCJpE0NeudjtFlStraVOGL7AiwLOo8Yro8cdnXrNFNqmQj9tml//u/X6onR9BToL iMGrdchw==; Received: from [192.168.2.1] (port=36862 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1qd5Tr-001498-1V; Mon, 04 Sep 2023 10:02:48 +0100 From: Arun Isaac Date: Mon, 4 Sep 2023 10:02:04 +0100 Message-ID: <59a9aca56706d6d57ce20117df9e79943892a65e.1693746463.git.arunisaac@systemreboot.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/version-control.scm (cgit)[arguments]: Do not return #t from custom phases. --- gnu/packages/version-control.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 22fd9371ff..450e74bde1 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1073,9 +1073,7 @@ (define-public cgit (("groff") (which "groff"))) (substitute* "filters/html-converters/rst2html" - (("rst2html\\.py") (which "rst2html.py"))) - - #t)) + (("rst2html\\.py") (which "rst2html.py"))))) (delete 'configure) ; no configure script (add-after 'build 'build-man (lambda* (#:key make-flags #:allow-other-keys) @@ -1091,8 +1089,7 @@ (define-public cgit ;; Move the platform-dependent 'cgit.cgi' into lib to get it ;; stripped. (rename-file (string-append out "/share/cgit/cgit.cgi") - (string-append out "/lib/cgit/cgit.cgi")) - #t))) + (string-append out "/lib/cgit/cgit.cgi"))))) (add-after 'install 'wrap-python-scripts (lambda* (#:key outputs #:allow-other-keys) (for-each @@ -1101,8 +1098,7 @@ (define-public cgit "/lib/cgit/filters/" file) `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))) '("syntax-highlighting.py" - "html-converters/md2html")) - #t))))) + "html-converters/md2html"))))))) (native-inputs `(;; Building cgit requires a Git source tree. ("git-source"