From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id YJjQLFOrHGWVhAEAG6o9tA:P1 (envelope-from ) for ; Wed, 04 Oct 2023 02:01:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id YJjQLFOrHGWVhAEAG6o9tA (envelope-from ) for ; Wed, 04 Oct 2023 02:01:23 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 820D4556F7 for ; Wed, 4 Oct 2023 02:01:23 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=systemreboot.net header.s=default header.b="QOO9T2/v"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=systemreboot.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1696377683; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Jlp2eJxcpVmJp+kmEhcNq6FiITvMWzfg7Kcps0RVY8U=; b=ikrpjtIp1WgT8i2wTRmAFiL4IJFwmmskuYCaxKrxvxlbvuAGcS9+Vwo9DbLJyA0fYYQXUz YuarjBea9e8LJh6rwDaQTqDPUde2ZA6PP6/HXs5C5x+ZwbrczvD1hEjcgpAj8KMWdi5zd6 c5UH1U+Zr5p6DIMe/tRuyFsVzNZwSH3gQOXoJ83H+2WxO9Sav1RHguSiF865Fn6V6zoTnO BcdoKsBL6XXRvviK3VWeh894mWZnIyJhGpbsKsiHFUdXyActj8mYx4DRflvwgdzAyPwtNn M1LKRih7+IyA1eMN22/A2BLO49f/6apYBjsBGg+AbWIfg7XXDmcrnJkXs9ENjg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=systemreboot.net header.s=default header.b="QOO9T2/v"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=systemreboot.net (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1696377683; a=rsa-sha256; cv=none; b=dnX9akDPtI1WNhaRtKtG6I1o6GcIEDGjoazGtq4DJ64N99O4hoiAm8Kh0qrF3BVdAlb4M7 axMcxuF+YAPf8w6UX0izTkYOBt9Fz9Vao8g/3gwVOIFiZk9/q1K61QOpvLM1KjVYNd7jDN S1pleAPdgyupGzZrrzGivbSCZHONzixBkXgCFEY+uqLQ5I/9x5IgfFLfiB+G2QT9X7snk0 JK3SbdqTm/WpIxwjchrFqEg1xYsHpZC/6FeWjI5Q9y+jcoxkFqPaX9qWQy8ognlsKb95w6 iopc7CBsCX8TpQK2TFlVMTFKTxILoHrNcg4Dh0wYnyABybP3BxruXunG7OwoTA== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qnpJw-0008EA-Gv; Tue, 03 Oct 2023 20:00:56 -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 1qnpJm-00088w-21 for guix-patches@gnu.org; Tue, 03 Oct 2023 20:00:47 -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 1qnpJl-0006sa-QQ for guix-patches@gnu.org; Tue, 03 Oct 2023 20:00:45 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qnpK2-0004x8-Fu; Tue, 03 Oct 2023 20:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65351] [PATCH v3 1/3] gnu: cgit: Update package style. References: In-Reply-To: Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: arunisaac@systemreboot.net, liliana.prikler@gmail.com, , guix-patches@gnu.org Resent-Date: Wed, 04 Oct 2023 00:01: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.169637760918940 (code B ref 65351); Wed, 04 Oct 2023 00:01:02 +0000 Received: (at 65351) by debbugs.gnu.org; 4 Oct 2023 00:00:09 +0000 Received: from localhost ([127.0.0.1]:40933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qnpJB-0004vL-2b for submit@debbugs.gnu.org; Tue, 03 Oct 2023 20:00:09 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:50584) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qnpJ6-0004t7-Dc for 65351@debbugs.gnu.org; Tue, 03 Oct 2023 20:00:07 -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: 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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Jlp2eJxcpVmJp+kmEhcNq6FiITvMWzfg7Kcps0RVY8U=; b=QOO9T2/vbBdfFspv/GzS96rLYh UGp9oV4j9Rfmb9E6/uRnf1vTWA+4ybLBc+SlKAVFUyMfyTi79UQIF1U+C3jEivGuCi9b03KkLErQ7 uZWaVwYlp4tLieFMHyR9A+IZ4f6SJ3Cz0WfQXXe/Fb5XExX/5MZkQhqnvoqhU7Yj1QEe+AssraEXm lOT/t5Q/1HnQLB4rj8b3rRgG2VzASZaBpjOpCAQzM9XTDqdFr/Tm85m5ufo5Uq4bX6JLbJyTCEXBK I8KxHxkWIDNv+VAm+C1bNxe9hxUm887E6J0egL5ySL4grDyY2e8YOeOgsIpFbkpigcEhq4RgXi7LV 6ehxuUdQ==; Received: from [192.168.2.1] (port=49584 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 1qnpIj-0002bg-1u; Wed, 04 Oct 2023 00:59:42 +0100 From: Arun Isaac Date: Wed, 4 Oct 2023 00:59:27 +0100 Message-ID: <4ad543017994ac442e12a6943356ec4358938ae9.1696375547.git.arunisaac@systemreboot.net> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -2.09 X-Migadu-Scanner: mx2.migadu.com X-Migadu-Queue-Id: 820D4556F7 X-Spam-Score: -2.09 X-TUID: kVNOnPFm+8cl * gnu/packages/version-control.scm (cgit)[arguments]: Rewrite using G-expressions. Do not return #t from custom phases. --- gnu/packages/version-control.scm | 125 +++++++++++++++---------------- 1 file changed, 61 insertions(+), 64 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 9716a6f27a..53c476d607 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1040,70 +1040,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"))) - - #t)) - (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")) - #t))) - (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")) - #t))))) + (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 ;; For building manpage. (list asciidoc gzip bzip2 xz)) base-commit: 8e6022732ab6c4ba256f99d925f5fd413a87372c -- 2.41.0