From patchwork Fri Aug 18 09:03:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 52973 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 31FD827BBE9; Fri, 18 Aug 2023 10:04:15 +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=unavailable 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 E312527BBE2 for ; Fri, 18 Aug 2023 10:04:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWvOp-0001DU-Sb; Fri, 18 Aug 2023 05:04:07 -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 1qWvOm-00014p-6f for guix-patches@gnu.org; Fri, 18 Aug 2023 05:04:04 -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 1qWvOk-0007IX-Un for guix-patches@gnu.org; Fri, 18 Aug 2023 05:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWvOl-0004mY-3u for guix-patches@gnu.org; Fri, 18 Aug 2023 05:04:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65351] [PATCH 3/7] gnu: cgit: Do not return #t from custom phases. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Aug 2023 09:04: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: "(" , Liliana Marie Prikler Cc: Arun Isaac , 65351@debbugs.gnu.org, jgart Received: via spool by 65351-submit@debbugs.gnu.org id=B65351.169234943118306 (code B ref 65351); Fri, 18 Aug 2023 09:04:03 +0000 Received: (at 65351) by debbugs.gnu.org; 18 Aug 2023 09:03:51 +0000 Received: from localhost ([127.0.0.1]:46120 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWvOZ-0004lC-3g for submit@debbugs.gnu.org; Fri, 18 Aug 2023 05:03:51 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:56586) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWvOW-0004l1-9n for 65351@debbugs.gnu.org; Fri, 18 Aug 2023 05:03:49 -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=mi9AZL/201DSSECEJ2WePnZdi2Z7ed0g7wKaR1uyfk4=; b=h3dWHF6NEn4m7w+R94xT0Z5BWU pqovxfqbi4td74IgVaO6DMUck+w1Z8hszwbm6ktBNzsezjpJhOnQMOvdhrSr7IpaxSmbqq3oWUhI+ GbaqnZiz61HhO9W98Zu3D015WrG078+TgbX3/Xp3rXZ+MQntUMLsvlOITYyrVgPJDBrEB4Xqwxdtc I+fh5aDo9/0qX/0umSUw8QEddfVoqhipOajHipQaJ0EQ10l647UBOCXWO8XeM+f6JgguulttC3pcn XFpD/PyICSE1+jQvRQLEncuxsTx0Li/wlcP//a9jqJuowk5pLej7jCXM4NSwHwme2XJ5rpa92bQTb SBQtpMZw==; Received: from [192.168.2.1] (port=47464 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 1qWvOM-000luT-2Y; Fri, 18 Aug 2023 10:03:39 +0100 From: Arun Isaac Date: Fri, 18 Aug 2023 10:03:15 +0100 Message-ID: <4ff202db0479e9bf07eec575518827c4a5b0ea0a.1692348727.git.arunisaac@systemreboot.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: <87v8dd8k08.fsf@disroot.org> References: <87v8dd8k08.fsf@disroot.org> 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 754019a5cf..73c4d8f2df 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"