From patchwork Fri Aug 18 09:03:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 52974 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 3E51027BBEA; Fri, 18 Aug 2023 10:04:17 +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 A328A27BBE2 for ; Fri, 18 Aug 2023 10:04:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWvOm-00014Q-4o; Fri, 18 Aug 2023 05:04:04 -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 1qWvOk-0000zQ-Kk for guix-patches@gnu.org; Fri, 18 Aug 2023 05:04:02 -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-0007IR-Ch 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 1qWvOk-0004mM-Kp for guix-patches@gnu.org; Fri, 18 Aug 2023 05:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65351] [PATCH 1/7] gnu: cgit: Make git-source a native input. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Aug 2023 09:04:02 +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.169234942718288 (code B ref 65351); Fri, 18 Aug 2023 09:04:02 +0000 Received: (at 65351) by debbugs.gnu.org; 18 Aug 2023 09:03:47 +0000 Received: from localhost ([127.0.0.1]:46117 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWvOU-0004kp-Iv for submit@debbugs.gnu.org; Fri, 18 Aug 2023 05:03:47 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:36380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWvOQ-0004kT-T2 for 65351@debbugs.gnu.org; Fri, 18 Aug 2023 05:03:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender :Reply-To: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=v1nTyWy/gsIhvMkyQODyLnOC6pEa7OZ9zICVB3ItNoQ=; b=pGUNCKoIRoiF5wnT75hYPdHIUY Zq4CzXdFA9kHwHKOCnBDd7jvWJCCc6tSALKiLC8wnKQGs5Vf86bRTnKZKxa9MQV46fyXIdl8ddYJr 6ynxAFHEA50E/eIKS2JnjLCXAevEYD6bqxXRmC5crF7sOu6gUquYI9G/rRo5Q1fzsEazuGvEHxX93 Dp9YtVZCiqxyWE9jFdl5L9BTMS04QSbfR8qlJJJYoniHYH31hVWZy+vLWb6S98B7Qco/GhyOV8IzR ifwplRqekraj39hyp9gaSEOc2Nhw2ofMHUsk7nPTnYo/diiaVbZHAmt4DyQk7tPc6l6W+8P2T2Us/ 68LaWf+g==; 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 1qWvOF-000luT-2M; Fri, 18 Aug 2023 10:03:32 +0100 From: Arun Isaac Date: Fri, 18 Aug 2023 10:03:13 +0100 Message-ID: <441ad3b27b278d465e9e3fb92f7bcaf9f6e45256.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)[inputs]: Move git-source to ... [native-inputs]: ... here. --- gnu/packages/version-control.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) base-commit: 1b2d43fe016848ea2ec16ff18cbc14340944fc4e diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 699a091642..7475de8fc1 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2018 Sou Bunnbu ;;; Copyright © 2018 Christopher Baines ;;; Copyright © 2018 Timothy Sample -;;; Copyright © 2018 Arun Isaac +;;; Copyright © 2018, 2023 Arun Isaac ;;; Copyright © 2019 Jovany Leandro G.C ;;; Copyright © 2019 Kei Kebreau ;;; Copyright © 2019, 2020 Alex Griffin @@ -1104,9 +1104,6 @@ (define-public cgit "html-converters/md2html")) #t))))) (native-inputs - ;; For building manpage. - (list asciidoc gzip bzip2 xz)) - (inputs `(;; Building cgit requires a Git source tree. ("git-source" ,(origin @@ -1116,13 +1113,15 @@ (define-public cgit (uri "mirror://kernel.org/software/scm/git/git-2.25.4.tar.xz") (sha256 (base32 "11am6s46wmn1yll5614smjhzlghbqq6gysgcs64igjr9y5wzpdxq")))) - ("openssl" ,openssl) - ("groff" ,groff) - ("python" ,python) - ("python-docutils" ,python-docutils) - ("python-markdown" ,python-markdown) - ("python-pygments" ,python-pygments) - ("zlib" ,zlib))) + ;; For building manpage. + ("asciidoc" ,asciidoc) + ("gzip" ,gzip) + ("bzip2" ,bzip2) + ("xz" ,xz))) + (inputs + (list openssl groff + python python-docutils python-markdown python-pygments + zlib)) (home-page "https://git.zx2c4.com/cgit/") (synopsis "Web frontend for git repositories") (description From patchwork Fri Aug 18 09:03:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 52972 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 9F93027BBE9; Fri, 18 Aug 2023 10:04:13 +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 CDAD627BBE2 for ; Fri, 18 Aug 2023 10:04:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWvOl-000109-PG; Fri, 18 Aug 2023 05:04:03 -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 1qWvOk-0000zE-5I for guix-patches@gnu.org; Fri, 18 Aug 2023 05:04:02 -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 1qWvOj-0007IL-TG for guix-patches@gnu.org; Fri, 18 Aug 2023 05:04:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWvOk-0004mF-5E for guix-patches@gnu.org; Fri, 18 Aug 2023 05:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65351] [PATCH 2/7] gnu: cgit: Make bzip2, gzip and xz inputs. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Aug 2023 09:04:02 +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.169234942618282 (code B ref 65351); Fri, 18 Aug 2023 09:04:02 +0000 Received: (at 65351) by debbugs.gnu.org; 18 Aug 2023 09:03:46 +0000 Received: from localhost ([127.0.0.1]:46115 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWvOU-0004km-B4 for submit@debbugs.gnu.org; Fri, 18 Aug 2023 05:03:46 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:36390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWvOS-0004kW-88 for 65351@debbugs.gnu.org; Fri, 18 Aug 2023 05:03:44 -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=lFgWpHzhaWQmIFENBB+8tfc2Q0f00cpxtatAIzbdVrM=; b=WWeaqBT+JPtHb8eytbCoFV/Q9l g8X4wphuWWuuyl/8zwISXwPc7vsfki882tTdchNN8Sb1mPbSP0r3I1WZ/1ugXgdX16kDpxNAizmxO 9DRWnhFbTKNUVw4MN/cTwgYIiY57yGbr7wkmXIGCFS36CJF/Y+yEAU9V6ds4fiIMD8g+uVW4k3STM y0pWmaS18TJ34qoJ/YHFa3pPyHDz3/BKaoCO39YYDxCs6GvRUaYFY4mzQ21Bw6Jq7od5v7mAOy128 OQFLoqKc/NjkUhV2pldkvHqg5/i+zX/no7piH27x5XxkbdrM6ai08oNMpMiK6qE2MQG88iGPAPuGz NZQqq5ew==; 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 1qWvOJ-000luT-0p; Fri, 18 Aug 2023 10:03:35 +0100 From: Arun Isaac Date: Fri, 18 Aug 2023 10:03:14 +0100 Message-ID: <05b4638f854ba9d1659ff7fbcabf50f186c51594.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)[native-inputs]: Move bzip2, gzip and xz to ... [inputs]: ... here. --- gnu/packages/version-control.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 7475de8fc1..754019a5cf 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1114,14 +1114,11 @@ (define-public cgit (sha256 (base32 "11am6s46wmn1yll5614smjhzlghbqq6gysgcs64igjr9y5wzpdxq")))) ;; For building manpage. - ("asciidoc" ,asciidoc) - ("gzip" ,gzip) - ("bzip2" ,bzip2) - ("xz" ,xz))) + ("asciidoc" ,asciidoc))) (inputs - (list openssl groff + (list bzip2 openssl groff gzip python python-docutils python-markdown python-pygments - zlib)) + xz zlib)) (home-page "https://git.zx2c4.com/cgit/") (synopsis "Web frontend for git repositories") (description 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" From patchwork Fri Aug 18 09:03:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 52976 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 2B23627BBE2; Fri, 18 Aug 2023 10:04:24 +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 F337C27BBE9 for ; Fri, 18 Aug 2023 10:04:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWvOn-0001AH-In; Fri, 18 Aug 2023 05:04:05 -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 1qWvOl-00012u-PG for guix-patches@gnu.org; Fri, 18 Aug 2023 05:04:03 -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 1qWvOl-0007If-G2 for guix-patches@gnu.org; Fri, 18 Aug 2023 05:04:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWvOl-0004mg-P6 for guix-patches@gnu.org; Fri, 18 Aug 2023 05:04:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65351] [PATCH 4/7] gnu: cgit: Use G-expressions. 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.169234943418321 (code B ref 65351); Fri, 18 Aug 2023 09:04:03 +0000 Received: (at 65351) by debbugs.gnu.org; 18 Aug 2023 09:03:54 +0000 Received: from localhost ([127.0.0.1]:46123 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWvOb-0004lQ-FB for submit@debbugs.gnu.org; Fri, 18 Aug 2023 05:03:53 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:56600) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWvOZ-0004lA-8Q for 65351@debbugs.gnu.org; Fri, 18 Aug 2023 05:03:52 -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=o54AsaZhwgfOSve0+So/rSy3JyUpCyrwG4E3O4UgLGk=; b=KBbT50D23o+594A73W3f88guQu iGZycma2NtHDFv7dNAcveToJRD3oZ0gsOAVGuLh+UEQVTbnruJvrJoT8+Mk3/sITEYAK8BnTEpim4 IOOPh020ISO2qbTYZZaeCfosNzBZRi6+8+/e4RXHOcPKsYDO5zFrfdMPSQaFCuCd2LfIHcE8fWqFW WxqE6bO0LEbeAFTsOMW5O3E7Yt7g2nGpu/Xij55PmznzBt0g1TS/Ur/U9F9rHaXd9VRhRS1zM3CJ6 VNZG1knq0PLOhEcqxDib6sqmvD87ph4mZLJhKPiE/qfEeTdVd3zOspxm6yHhZNYvQNQT1t3m38eJC HATiQrFw==; 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 1qWvOQ-000luT-19; Fri, 18 Aug 2023 10:03:43 +0100 From: Arun Isaac Date: Fri, 18 Aug 2023 10:03:16 +0100 Message-ID: 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]: Rewrite using G-expressions. --- gnu/packages/version-control.scm | 120 +++++++++++++++---------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 73c4d8f2df..e2afd92286 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1039,66 +1039,66 @@ (define-public cgit "193d990ym10qlslk0p8mjwp2j6rhqa7fq0y1iff65lvbyv914pss")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; XXX: fail to build the in-source git. - #:test-target "test" - #:make-flags '("CC=gcc" "SHELL_PATH=sh") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'unpack-git - (lambda* (#:key inputs #:allow-other-keys) - ;; Unpack the source of git into the 'git' directory. - (invoke "tar" "--strip-components=1" "-C" "git" "-xf" - (assoc-ref inputs "git-source")))) - (add-after 'unpack 'patch-absolute-file-names - (lambda* (#:key inputs #:allow-other-keys) - (define (quoted-file-name input path) - (string-append "\"" input path "\"")) - (substitute* "ui-snapshot.c" - (("\"gzip\"") - (quoted-file-name (assoc-ref inputs "gzip") "/bin/gzip")) - (("\"bzip2\"") - (quoted-file-name (assoc-ref inputs "bzip2") "/bin/bzip2")) - (("\"xz\"") - (quoted-file-name (assoc-ref inputs "xz") "/bin/xz"))) - - (substitute* "filters/about-formatting.sh" - (("$\\(dirname $0\\)") (string-append (assoc-ref outputs "out") - "/lib/cgit/filters")) - (("\\| tr") (string-append "| " (which "tr")))) - - (substitute* "filters/html-converters/txt2html" - (("sed") (which "sed"))) - - (substitute* "filters/html-converters/man2html" - (("groff") (which "groff"))) - - (substitute* "filters/html-converters/rst2html" - (("rst2html\\.py") (which "rst2html.py"))))) - (delete 'configure) ; no configure script - (add-after 'build 'build-man - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "doc-man" make-flags))) - (replace 'install - (lambda* (#:key make-flags outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (apply invoke - "make" "install" "install-man" - (string-append "prefix=" out) - (string-append "CGIT_SCRIPT_PATH=" out "/share/cgit") - make-flags) - ;; 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"))))) - (add-after 'install 'wrap-python-scripts - (lambda* (#:key outputs #:allow-other-keys) - (for-each - (lambda (file) - (wrap-program (string-append (assoc-ref outputs "out") - "/lib/cgit/filters/" file) - `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))) - '("syntax-highlighting.py" - "html-converters/md2html"))))))) + (list #:tests? #f ; XXX: fail to build the in-source git. + #:test-target "test" + #:make-flags #~(list "CC=gcc" "SHELL_PATH=sh") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'unpack-git + (lambda* (#:key inputs #:allow-other-keys) + ;; Unpack the source of git into the 'git' directory. + (invoke "tar" "--strip-components=1" "-C" "git" "-xf" + (assoc-ref inputs "git-source")))) + (add-after 'unpack 'patch-absolute-file-names + (lambda* (#:key inputs #:allow-other-keys) + (define (quoted-file-name input path) + (string-append "\"" input path "\"")) + (substitute* "ui-snapshot.c" + (("\"gzip\"") + (quoted-file-name (assoc-ref inputs "gzip") "/bin/gzip")) + (("\"bzip2\"") + (quoted-file-name (assoc-ref inputs "bzip2") "/bin/bzip2")) + (("\"xz\"") + (quoted-file-name (assoc-ref inputs "xz") "/bin/xz"))) + + (substitute* "filters/about-formatting.sh" + (("$\\(dirname $0\\)") (string-append (assoc-ref outputs "out") + "/lib/cgit/filters")) + (("\\| tr") (string-append "| " (which "tr")))) + + (substitute* "filters/html-converters/txt2html" + (("sed") (which "sed"))) + + (substitute* "filters/html-converters/man2html" + (("groff") (which "groff"))) + + (substitute* "filters/html-converters/rst2html" + (("rst2html\\.py") (which "rst2html.py"))))) + (delete 'configure) ; no configure script + (add-after 'build 'build-man + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "doc-man" make-flags))) + (replace 'install + (lambda* (#:key make-flags outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (apply invoke + "make" "install" "install-man" + (string-append "prefix=" out) + (string-append "CGIT_SCRIPT_PATH=" out "/share/cgit") + make-flags) + ;; 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"))))) + (add-after 'install 'wrap-python-scripts + (lambda* (#:key outputs #:allow-other-keys) + (for-each + (lambda (file) + (wrap-program (string-append (assoc-ref outputs "out") + "/lib/cgit/filters/" file) + `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))) + '("syntax-highlighting.py" + "html-converters/md2html"))))))) (native-inputs `(;; Building cgit requires a Git source tree. ("git-source" From patchwork Fri Aug 18 09:03:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 52975 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 CFD0327BBE2; Fri, 18 Aug 2023 10:04:23 +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 152BE27BBEA for ; Fri, 18 Aug 2023 10:04:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWvOn-0001A8-HV; Fri, 18 Aug 2023 05:04:05 -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-00014w-6e 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 1qWvOl-0007Is-Ui for guix-patches@gnu.org; Fri, 18 Aug 2023 05:04:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWvOm-0004mn-7H for guix-patches@gnu.org; Fri, 18 Aug 2023 05:04:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65351] [PATCH 5/7] gnu: cgit: Use cc-for-target. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Aug 2023 09:04:04 +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.169234943718336 (code B ref 65351); Fri, 18 Aug 2023 09:04:04 +0000 Received: (at 65351) by debbugs.gnu.org; 18 Aug 2023 09:03:57 +0000 Received: from localhost ([127.0.0.1]:46126 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWvOf-0004lg-0t for submit@debbugs.gnu.org; Fri, 18 Aug 2023 05:03:57 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:56602) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWvOc-0004lR-Ki for 65351@debbugs.gnu.org; Fri, 18 Aug 2023 05:03:55 -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=YLa3kRep+z6VDbiMIE+MtuV80nRte3VetiKguJwWbHQ=; b=TtXYbO3Wnhq3QLpMPhApwyJO5x 8ReA/GQb3JZWxvocY6Vp3eh6XZyIdUDFSgPXEunEXvSW+Tp7VuDpIEBU6RW6HJHMnbTuuSNebr6cq f29sOQdgUvZveKKU6NQSQUJ1O00DGYbMPEeMeP1AyRa5pBflRxKkEBCYV0HY/+NBfYqFLpO7oMAn+ Qn5dzFONJYfAbIlOd1vEThuO1Qscknahlp+uHsHjHMQe2nXq8ul8F50UjrivjDPfzbOekbinaFwpG 7PagzD4AV1jxY3IxgVzZ7/jexcKPyAGzrt324Ag9Hiwi6JT6I1sXDEy8xf5/vfDcWNJ1IcZwl1kDu yBbpfvqA==; 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 1qWvOT-000luT-36; Fri, 18 Aug 2023 10:03:46 +0100 From: Arun Isaac Date: Fri, 18 Aug 2023 10:03:17 +0100 Message-ID: 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]: Use cc-for-target. --- gnu/packages/version-control.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index e2afd92286..398194252e 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1041,7 +1041,8 @@ (define-public cgit (arguments (list #:tests? #f ; XXX: fail to build the in-source git. #:test-target "test" - #:make-flags #~(list "CC=gcc" "SHELL_PATH=sh") + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + "SHELL_PATH=sh") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'unpack-git From patchwork Fri Aug 18 09:03:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 52971 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 0B13427BBE9; Fri, 18 Aug 2023 10:04:13 +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 2F4AE27BBEA for ; Fri, 18 Aug 2023 10:04:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWvOn-0001Aa-Rq; Fri, 18 Aug 2023 05:04:05 -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-00017t-OU 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 1qWvOm-0007J0-Fa for guix-patches@gnu.org; Fri, 18 Aug 2023 05:04:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWvOm-0004mw-OL for guix-patches@gnu.org; Fri, 18 Aug 2023 05:04:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65351] [PATCH 6/7] gnu: cgit: Add bash-minimal to inputs. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Aug 2023 09:04:04 +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.169234944118355 (code B ref 65351); Fri, 18 Aug 2023 09:04:04 +0000 Received: (at 65351) by debbugs.gnu.org; 18 Aug 2023 09:04:01 +0000 Received: from localhost ([127.0.0.1]:46129 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWvOj-0004lz-AI for submit@debbugs.gnu.org; Fri, 18 Aug 2023 05:04:01 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:56512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWvOh-0004lp-2k for 65351@debbugs.gnu.org; Fri, 18 Aug 2023 05:03:59 -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=pM7bF1ki/0Wjt+6AxTHrANpXTLZPV6+/vd5QymR1zCo=; b=gDPVioZiJaHlJafcjlckK/V7Uw 3ALq513tT6h8eWVzIZZxRE7fito7/54puse0meEUx8bsv6QEkhEiZbe3j+5aS/8jsBYGm/B3k4FR5 dvI/vdczh+WwASPHwJTndGFZAixW4twP82a8XkDfnKMghXQdPvhml6/7yFGzjch3bhIYhpc5tIVic cLI7aNbfiCTO4nZYsCKfNbswl5Ndupkv7k47zmNfHJXerlZQTDuze67AuM4U8HwtN/raaD4FAqzcJ xkFAmGGfnvV4VjkudWG8WFnIriNnRk3byd7XfvBWQ3EdHVdaQVMeuIEsWQUGtZFNX5mYL6c/Ni5jQ LjnUHi0Q==; 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 1qWvOX-000luT-1m; Fri, 18 Aug 2023 10:03:50 +0100 From: Arun Isaac Date: Fri, 18 Aug 2023 10:03:18 +0100 Message-ID: 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)[inputs]: Add bash-minimal. --- gnu/packages/version-control.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 398194252e..bc2b06c0d5 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1113,7 +1113,7 @@ (define-public cgit ;; For building manpage. ("asciidoc" ,asciidoc))) (inputs - (list bzip2 openssl groff gzip + (list bash-minimal bzip2 openssl groff gzip python python-docutils python-markdown python-pygments xz zlib)) (home-page "https://git.zx2c4.com/cgit/") From patchwork Fri Aug 18 09:03:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 52977 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 6615027BBEA; Fri, 18 Aug 2023 10:05:20 +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 C3FC427BBE2 for ; Fri, 18 Aug 2023 10:05:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWvPj-0001lc-Tm; Fri, 18 Aug 2023 05:05:03 -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 1qWvPi-0001lP-Ef for guix-patches@gnu.org; Fri, 18 Aug 2023 05:05:02 -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 1qWvPi-0007W2-2C for guix-patches@gnu.org; Fri, 18 Aug 2023 05:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWvPi-0004oY-Ac for guix-patches@gnu.org; Fri, 18 Aug 2023 05:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65351] [PATCH 7/7] gnu: Add cgit-pink. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Aug 2023 09:05:02 +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.169234944518420 (code B ref 65351); Fri, 18 Aug 2023 09:05:02 +0000 Received: (at 65351) by debbugs.gnu.org; 18 Aug 2023 09:04:05 +0000 Received: from localhost ([127.0.0.1]:46137 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWvOm-0004mv-Hu for submit@debbugs.gnu.org; Fri, 18 Aug 2023 05:04:05 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:56514) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWvOj-0004lx-Oq for 65351@debbugs.gnu.org; Fri, 18 Aug 2023 05:04:02 -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=IuVHvjHqWYPFuvbzbXr9A4HSkrqXUzY76dkw30KUolo=; b=Oht6dbaO7qOV0F1Hf9PhQdZhiD Gi18wIprPBga7zp93dkSUNKfTt3LjUW3Qvu3fTd6w01uH40CVHW8KAIg1DgqxHpkhtMQXqEZWIvEY 5tRZ2olwqin7PnvBmE6x59gT+UibBfN8wF5c9Xtz9TF5zHqaaFolMJVCRD0Lh+TB6K1rpSZs1QGlc TeVQ8VhLHn9d3dO3UgMYuWP5TA2H3QKuUh9+bxtOJkQ9gMoTW/XVif4sZqzauDieKaS/lJwp2pDo8 4lUGhLrp+VMbl4QGFLouvN/17s/XclfDCzBAmrwS5G+82FS49bMRKtwXikSrgWyzi34vm2ORmi6xA fk7+YDLQ==; 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 1qWvOb-000luT-0U; Fri, 18 Aug 2023 10:03:53 +0100 From: Arun Isaac Date: Fri, 18 Aug 2023 10:03:19 +0100 Message-ID: <2f479e801734ba8be42d771ace533863de085041.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-pink): New variable. --- gnu/packages/version-control.scm | 43 ++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index bc2b06c0d5..00b2f66f5a 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1123,6 +1123,49 @@ (define-public cgit a built-in cache to decrease server I/O pressure.") (license license:gpl2))) +(define-public cgit-pink + (package + (inherit cgit) + (name "cgit-pink") + (version "1.4.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.causal.agency/cgit-pink") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0yp6rm60pz8pj8wrm1aglix51hhy00al86mm94ag2bifc92q23ar")))) + (arguments + (substitute-keyword-arguments (package-arguments cgit) + ((#:tests? _ #f) + (not (%current-target-system))) + ((#:make-flags make-flags '()) + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PERL_PATH=" + (search-input-file %build-inputs "/bin/perl")) + ;; It is important to set an absolute path in SHELL_PATH + ;; because it is used as the shebang of generated scripts. + (string-append "SHELL_PATH=" + (search-input-file %build-inputs "/bin/sh")))))) + (native-inputs + (modify-inputs (package-native-inputs cgit) + (replace "git-source" + ;; cgit-pink is tightly bound to git. Use GIT_VER from the Makefile, + ;; which may not match the current (package-version git). + (origin + (method url-fetch) + (uri "mirror://kernel.org/software/scm/git/git-2.36.1.tar.xz") + (sha256 + (base32 + "0w43a35mhc2qf2gjkxjlnkf2lq8g0snf34iy5gqx2678yq7llpa0")))) + (append gnu-gettext perl))) + (home-page "https://git.causal.agency/cgit-pink/about/") + (description "cgit-pink is a fast web interface for the Git SCM, using a +built-in cache to decrease server I/O pressure. cgit-pink is a fork of +cgit."))) + (define-public python-git-multimail (package (name "python-git-multimail")