From patchwork Mon Sep 4 09:02:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 53422 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 4629227BBE2; Mon, 4 Sep 2023 10:03:48 +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 D51CB27BBE9 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 1qd5UW-00079v-Oh; Mon, 04 Sep 2023 05:03:28 -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 1qd5U7-0006yf-Qj for guix-patches@gnu.org; Mon, 04 Sep 2023 05:03: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 1qd5U7-0002hQ-I1 for guix-patches@gnu.org; Mon, 04 Sep 2023 05:03:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qd5U7-00067W-92; Mon, 04 Sep 2023 05:03:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65351] [PATCH v2 1/7] gnu: cgit: Make git-source a native input. 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.169381817223449 (code B ref 65351); Mon, 04 Sep 2023 09:03:03 +0000 Received: (at 65351) by debbugs.gnu.org; 4 Sep 2023 09:02:52 +0000 Received: from localhost ([127.0.0.1]:48619 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qd5Tv-000668-QE for submit@debbugs.gnu.org; Mon, 04 Sep 2023 05:02:52 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:38266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qd5Tn-00065N-VE for 65351@debbugs.gnu.org; Mon, 04 Sep 2023 05:02:48 -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=Mk3PQKbfJJ6c/gOUWp+Kvwd453QtKE1g/YlNPe76PS8=; b=QtE2kLGg7q6oOERokpyVxz+/oy 5eo1ECTeWRDZ9bCvOCBobZck5BbX4jTHE9YFlCUscQQJzuirOfM+2c6vxUEwvCaTmieV30nonEb3g YVawESm1r23oySMtzgs+pjiTORAxB0TRkJez8unYrDL43r5GfmN/NuqGA81YE1mo6x7wncykDPfXj I1P87G6767k/hdwO8xuww4tajdYdnOKpVgfnoXGY2ns8+pKL8k/vbl6DZJSrM9CLz8GxJltx2Z5NH PfKliGLLgyPxDX3wjC5ToglUW/qhyO66S7Y/6P24wXfgOZk254ShL3aeMmRmrU7d6M90DNMS+TAiI 8pMST4JA==; 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 1qd5Tk-001498-2j; Mon, 04 Sep 2023 10:02:41 +0100 From: Arun Isaac Date: Mon, 4 Sep 2023 10:02:02 +0100 Message-ID: <4a837cf5e2a54fae057bb983fb60b0bc9c997602.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)[inputs]: Move git-source to ... [native-inputs]: ... here. --- gnu/packages/version-control.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 86dcea908c..c977da468d 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 Mon Sep 4 09:02:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 53419 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 988E927BBE9; Mon, 4 Sep 2023 10:03:35 +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 9960927BBE2 for ; Mon, 4 Sep 2023 10:03:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qd5UG-0006zp-3M; Mon, 04 Sep 2023 05:03:12 -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 1qd5U7-0006yg-Qk for guix-patches@gnu.org; Mon, 04 Sep 2023 05:03: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 1qd5U7-0002hP-Hw for guix-patches@gnu.org; Mon, 04 Sep 2023 05:03:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qd5U6-00067N-Q6; Mon, 04 Sep 2023 05:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65351] [PATCH v2 2/7] gnu: cgit: Make bzip2, gzip and xz inputs. 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: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: 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.169381816823432 (code B ref 65351); Mon, 04 Sep 2023 09:03:02 +0000 Received: (at 65351) by debbugs.gnu.org; 4 Sep 2023 09:02:48 +0000 Received: from localhost ([127.0.0.1]:48616 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qd5Ts-00065n-9T for submit@debbugs.gnu.org; Mon, 04 Sep 2023 05:02:48 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:50150) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qd5Tr-00065Z-8w for 65351@debbugs.gnu.org; Mon, 04 Sep 2023 05:02:47 -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=miE4hOJJcOCnnc9hvfQQ7/aXZfGtPmjNi6LkcEXFW58=; b=ehcPcn/kYMT968m6BmAk81PwKF x4qJ2IRLn+YG9jC/G2258MpRYBCRfvTG4fF4nBbUJdJ/fNjreW9s986ircTJmZF6xT3YAe/DtOkVc gzU/wExnQwvxsmOF1vAsKTAEuhwIWh+UbnILpVqGjgmK+wApp71cTVG94ARhhyTMjA4r2YbA/NpO/ GIBBsqISYfrjEe8YcGRPIju25J6FNtPV1g/773dSazvctYGY/Py1erKuXGoyoEyLX6FKPzPQZSYHz WLyN0zIMkmFePgSAqvTOfOegXsMGMh3/BR3ogmYHRnb1hMrI6lgdJzxSMejZM5gVbLuPdmPlzI5kX BNqo2nwQ==; 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 1qd5To-001498-0V; Mon, 04 Sep 2023 10:02:44 +0100 From: Arun Isaac Date: Mon, 4 Sep 2023 10:02:03 +0100 Message-ID: <2118b0829093de0dab600d0e8bbe1bbbbae5d13a.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)[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 c977da468d..22fd9371ff 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 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" From patchwork Mon Sep 4 09:02:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 53423 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 E848827BBE9; Mon, 4 Sep 2023 10:03:56 +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 A4BC327BBE2 for ; Mon, 4 Sep 2023 10:03:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qd5UT-000788-LT; Mon, 04 Sep 2023 05:03:25 -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-0006yx-PY 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-0002hs-HS 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 1qd5U8-00067s-8I; Mon, 04 Sep 2023 05:03:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65351] [PATCH v2 4/7] gnu: cgit: Use G-expressions. 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: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: 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.169381817623472 (code B ref 65351); Mon, 04 Sep 2023 09:03:04 +0000 Received: (at 65351) by debbugs.gnu.org; 4 Sep 2023 09:02:56 +0000 Received: from localhost ([127.0.0.1]:48624 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qd5Tz-00066W-JL for submit@debbugs.gnu.org; Mon, 04 Sep 2023 05:02:56 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:50170) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qd5Tx-00066G-Q0 for 65351@debbugs.gnu.org; Mon, 04 Sep 2023 05:02:54 -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=oGz1lTQFuc7EY9ARCELu50V5OwdnqfM/7XkRPnC4Kks=; b=SyKsZ9EJXmCTgcgvNGqS57Fv1v 6nqJJBBs4t9q5fTYGY2/4ZpqquPvu5uphWIjGtvybPZbo8bqOMCEvWOru8W/caA69QjsbqoNMhNZm 6rTtsomLEYwswdxAwynTyABV0GJDv5qm7TOO02Vix3jCQsvyre+KFkswyQ4Ywni/uhro1TxoEX2NL Icd/z8Pv9i3sPFfX6e45UCC0U26aU7EyMBRD9Aynj1RaJC/frWH6dnqUygglCQZGaW0m/AIYnvUtL 0gERnI/V3BZXbZENKYJA1IQN93/URByBL857lOoxnxnjFUqTJTifY5VH0iR3L8+Ho797k9j3KyGLC j9OCOXkg==; 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 1qd5Tu-001498-2W; Mon, 04 Sep 2023 10:02:51 +0100 From: Arun Isaac Date: Mon, 4 Sep 2023 10:02:05 +0100 Message-ID: <9d236785c3e66570380bec84f861dc04c73a98e1.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]: Rewrite using G-expressions. --- gnu/packages/version-control.scm | 121 ++++++++++++++++--------------- 1 file changed, 61 insertions(+), 60 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 450e74bde1..a275d4e197 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1039,66 +1039,67 @@ (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 '("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 Mon Sep 4 09:02:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 53424 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 2252627BBE9; Mon, 4 Sep 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 8F04827BBE2 for ; Mon, 4 Sep 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 1qd5UT-00077T-DM; Mon, 04 Sep 2023 05:03:25 -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 1qd5UA-0006z4-3w 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 1qd5U9-0002i8-QR for guix-patches@gnu.org; Mon, 04 Sep 2023 05:03:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qd5U8-000682-S4; Mon, 04 Sep 2023 05:03:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65351] [PATCH v2 5/7] gnu: cgit: Add bash-minimal to inputs. 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: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: 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.169381817923489 (code B ref 65351); Mon, 04 Sep 2023 09:03:04 +0000 Received: (at 65351) by debbugs.gnu.org; 4 Sep 2023 09:02:59 +0000 Received: from localhost ([127.0.0.1]:48627 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qd5U3-00066m-6P for submit@debbugs.gnu.org; Mon, 04 Sep 2023 05:02:59 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:48856) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qd5U1-00066d-9q for 65351@debbugs.gnu.org; Mon, 04 Sep 2023 05:02:58 -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=mWjVm07Zf63aMvN5sgS2bYY9knFjM5lYc+N094SwuBA=; b=MdQa/hd3T/3ZF2Ivp+USbsF+Y3 LMgAYSQxVMTt0QFzLvbH4jYnEcrfWgi+5lOqL18Jzjr2LuuQ7UN06FadE6XRaxOJo3OPNsaZ8MH1+ tkbB1CbhBTAeSPlgofvp+up/3dK1qrjLGg+xEJd6N5JvnT9purVhlFdnIauWzls/Mh/wamHlFz12C D6RZGLV4W2qG29tAYY1Yq2lMEmdQiSvargXdiUeXOaKFixy0oCOuYAshELiQuB7ptlvvCvk+o9hTo lKoQFHUqNQmPfOEY6rYUD3642sbTOb/NBIPFO84s4nBYZJuAJ96A/BTUtse1lonL+Fz8qpCCCnQhA QNX6enaA==; 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 1qd5Ty-001498-03; Mon, 04 Sep 2023 10:02:54 +0100 From: Arun Isaac Date: Mon, 4 Sep 2023 10:02:06 +0100 Message-ID: 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)[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 a275d4e197..e963328564 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 Mon Sep 4 09:02:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 53420 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 A985827BBEA; Mon, 4 Sep 2023 10:03:38 +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 7A71F27BBE2 for ; Mon, 4 Sep 2023 10:03:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qd5UP-000764-Gb; Mon, 04 Sep 2023 05:03:23 -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 1qd5U9-0006z3-V6 for guix-patches@gnu.org; Mon, 04 Sep 2023 05:03:07 -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 1qd5U9-0002i5-LV for guix-patches@gnu.org; Mon, 04 Sep 2023 05:03:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qd5U9-00068A-C5; Mon, 04 Sep 2023 05:03:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65351] [PATCH v2 6/7] gnu: cgit: Use cc-for-target. 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:05 +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.169381818123503 (code B ref 65351); Mon, 04 Sep 2023 09:03:05 +0000 Received: (at 65351) by debbugs.gnu.org; 4 Sep 2023 09:03:01 +0000 Received: from localhost ([127.0.0.1]:48630 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qd5U5-000671-FY for submit@debbugs.gnu.org; Mon, 04 Sep 2023 05:03:01 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:48862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qd5U4-00066n-6y for 65351@debbugs.gnu.org; Mon, 04 Sep 2023 05:03:00 -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=5N0f14HWi5hqzs0j2lyevCESWyD07SghVxQuE+aq67c=; b=mPdeINQcgbGhXF094P1N0TJkay FzUy4+Ab1NuG/xKmOto/WgFlGbW2rUPmR/a6mPYCvERR9R2iZq2kv3/E/MNuQHHbGjM4y20OqIyOQ 9nKNg46lmWxLlVrOMH+/kQ4Y39OQQEWwoLmX3IkMt7pl4LHeyTCkGDX1Y3y8EU07QRZCptwIlFM8I rR9qENVq3JbpGBEOthuhALZzAsWMPkWfM6FATpwK7MMITrjEgDCi+wLhFaIdMOnuyxjF3GV4EBIsZ la88yWeMdDzR8q1TQXSpnwijfrjjKasTeCe0Q2WeJ6fJpcaAj34sxCD3rZoof/6ZydNteJfQobTGN hBuBIOkw==; 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 1qd5U1-001498-13; Mon, 04 Sep 2023 10:02:58 +0100 From: Arun Isaac Date: Mon, 4 Sep 2023 10:02:07 +0100 Message-ID: <3de455562aaa4dbbc3116aa6c35b0de19d3ddaab.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]: 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 e963328564..f911460492 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1042,7 +1042,8 @@ (define-public cgit (list #:tests? #f ; XXX: fail to build the in-source git. #:test-target "test" - #:make-flags '("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 Mon Sep 4 09:02:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 53425 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 19A8D27BBE9; Mon, 4 Sep 2023 10:04: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=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 021D827BBE2 for ; Mon, 4 Sep 2023 10:04:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qd5VI-0007iE-K3; Mon, 04 Sep 2023 05:04:17 -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 1qd5V5-0007Yy-Hc for guix-patches@gnu.org; Mon, 04 Sep 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 1qd5V4-0002sh-9l for guix-patches@gnu.org; Mon, 04 Sep 2023 05:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qd5V3-0006Ar-P7; Mon, 04 Sep 2023 05:04:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65351] [PATCH v2 7/7] gnu: Add cgit-pink. 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:04:01 +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.169381818823622 (code B ref 65351); Mon, 04 Sep 2023 09:04:01 +0000 Received: (at 65351) by debbugs.gnu.org; 4 Sep 2023 09:03:08 +0000 Received: from localhost ([127.0.0.1]:48656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qd5UB-00068v-OL for submit@debbugs.gnu.org; Mon, 04 Sep 2023 05:03:08 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:48866) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qd5U7-00067L-JD for 65351@debbugs.gnu.org; Mon, 04 Sep 2023 05:03:06 -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=fJ8mN0svwzIMSocHoLOPh3QiVUw7P1gPdkXYv/1ZmRg=; b=pB/QAJ0wJ7oJK4HH51ITEAETWn gXuGZyxwEql41YRgnHHkTT4GWokBOVRML4eNS4AThrWOztwkFsFKqxVBo4pbO0jBMbuQjl3dAy/cl IND7+iqaxJQhUmS8GA2YLAdWxHS3PV4MigGNJu8ScOBnNPR4gc/4ocEC8/vYKFWsuWQfis8mpk77y 5NW2bAFjf3d+a77XE/ExGqkw3bU1+cc/XqBKEEt1rRc2JVoa7GaG+HUnHSwSSm9CkFFeFnBBXMCI/ 2tVFAnKJJVUKd0fd2+deHtqMIbhItsv+MpWlS6y0/59bibI+cQE0HtdQBIyxI61jHWCtOPG8/YS89 uy+MncIQ==; 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 1qd5U4-001498-2F; Mon, 04 Sep 2023 10:03:01 +0100 From: Arun Isaac Date: Mon, 4 Sep 2023 10:02:08 +0100 Message-ID: <029eaf77aeade7a10211dff78c6976856702343f.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-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 f911460492..15a51ff151 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1124,6 +1124,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")