From patchwork Thu Aug 17 13:51:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 52957 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 37A5827BBEA; Thu, 17 Aug 2023 14:53:59 +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 6C40A27BBEB for ; Thu, 17 Aug 2023 14:53:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWdRJ-0005y3-Pf; Thu, 17 Aug 2023 09:53:32 -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 1qWdQx-0005pn-4p for guix-patches@gnu.org; Thu, 17 Aug 2023 09:53:12 -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 1qWdQs-0006G1-03 for guix-patches@gnu.org; Thu, 17 Aug 2023 09:53:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWdQr-00040q-P1 for guix-patches@gnu.org; Thu, 17 Aug 2023 09:53:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65351] [PATCH] gnu: Add cgit-pink. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Aug 2023 13:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65351 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65351@debbugs.gnu.org Cc: Arun Isaac , jgart X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169228032315329 (code B ref -1); Thu, 17 Aug 2023 13:53:01 +0000 Received: (at submit) by debbugs.gnu.org; 17 Aug 2023 13:52:03 +0000 Received: from localhost ([127.0.0.1]:43013 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWdPu-0003ym-Id for submit@debbugs.gnu.org; Thu, 17 Aug 2023 09:52:03 -0400 Received: from lists.gnu.org ([2001:470:142::17]:56626) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWdPq-0003yK-VU for submit@debbugs.gnu.org; Thu, 17 Aug 2023 09:52:01 -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 1qWdPl-0005IV-74 for guix-patches@gnu.org; Thu, 17 Aug 2023 09:51:53 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qWdPg-0004tB-EZ for guix-patches@gnu.org; Thu, 17 Aug 2023 09:51:52 -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: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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=rdhnsVhvcmlhjBZiYpcooXFxZXJT7L9ts7EAsoAB2nk=; b=eCYgHCZUxSHMdjczBP/zYK0Fk9 gPsrOQFRhY0LU1mTu4uIS6AfzqbxwF5GVUqzKyS6OQ0V7FRF6rZJIMUGd1cm2+UNL7qTtZMHtmumR qkm/RjELlNwSM3/3vRWJaMFOZP/VKrRQB9VKbwPBJJxi2Lm/rts3il1FWthzVNT4pERGox+yOScoY hJNORSCDXP2UqfgGoWUfEVyi1nO/79vVusSk0VCGXBmgA2p556q1+mfzOTiyDgkuhh6KyPL9A80aB nEiLdiLcQaF8mhMsMVJ8LhT3S9vkRVmvVuh2uYd/3KwH7d5ERs9pCEZXob5l2Zpb/DNWdAmWPvmEd ZLoK+rQQ==; Received: from [192.168.2.1] (port=53040 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 1qWdPT-000enz-0g; Thu, 17 Aug 2023 14:51:35 +0100 From: Arun Isaac Date: Thu, 17 Aug 2023 14:51:28 +0100 Message-Id: X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=139.59.75.54; envelope-from=arunisaac@systemreboot.net; helo=mugam.systemreboot.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 (git-2.36.1-source, cgit-pink): New variable. --- gnu/packages/version-control.scm | 70 +++++++++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) base-commit: 1b2d43fe016848ea2ec16ff18cbc14340944fc4e diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 699a091642..20b2c80792 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 @@ -1130,6 +1130,74 @@ (define-public cgit a built-in cache to decrease server I/O pressure.") (license license:gpl2))) +(define git-2.36.1-source + (origin + (method url-fetch) + (uri "mirror://kernel.org/software/scm/git/git-2.36.1.tar.xz") + (sha256 + (base32 + "0w43a35mhc2qf2gjkxjlnkf2lq8g0snf34iy5gqx2678yq7llpa0")))) + +(define-public cgit-pink + (package + (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")))) + (build-system gnu-build-system) + (arguments + (list + #:test-target "test" + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PERL_PATH=" + (search-input-file %build-inputs "/bin/perl")) + (string-append "SHELL_PATH=" + (search-input-file %build-inputs "/bin/bash")) + ;; Set install paths so that cgit-pink is a drop-in + ;; replacement for cgit. + (string-append "prefix=" + (assoc-ref %outputs "out")) + (string-append "CGIT_SCRIPT_PATH=" + (assoc-ref %outputs "out") "/lib/cgit") + (string-append "CGIT_DATA_PATH=" + (assoc-ref %outputs "out") "/share/cgit")) + #:phases + #~(modify-phases %standard-phases + ;; cgit-pink depends on the source code of a specific version + ;; (mentioned in the GIT_VER variable in its Makefile) of + ;; git. Extract it. + (add-after 'unpack 'unpack-git-source + (lambda _ + (invoke "tar" + "-C" "git" + "--strip-components" "1" + "-xvf" #$git-2.36.1-source))) + ;; Install man pages. + (add-after 'install 'install-man-pages + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "install-man" make-flags))) + (delete 'configure)))) + (inputs + (list openssl zlib)) + (native-inputs + (list asciidoc gnu-gettext perl)) + (home-page "https://git.causal.agency/cgit-pink/about/") + (synopsis "Web fronted for git repositories") + (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. +Upstream cgit has long been stagnant, with the vast majority of patches sent +to the mailing list going silently ignored, despite their obvious merit in +many cases. This fork aims to incorporate a number of existing patches as +well as to provide a friendlier place to send new patches.") + (license license:gpl2))) + (define-public python-git-multimail (package (name "python-git-multimail")