From patchwork Tue May 4 21:00:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 29120 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 24E3827BC82; Tue, 4 May 2021 22:01:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BDCFB27BC81 for ; Tue, 4 May 2021 22:01:21 +0100 (BST) Received: from localhost ([::1]:43338 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1le2AS-0004w3-W9 for patchwork@mira.cbaines.net; Tue, 04 May 2021 17:01:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1le2AA-0004vn-S4 for guix-patches@gnu.org; Tue, 04 May 2021 17:01:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43879) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1le2AA-0003ip-K4 for guix-patches@gnu.org; Tue, 04 May 2021 17:01:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1le2AA-00005G-J3 for guix-patches@gnu.org; Tue, 04 May 2021 17:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48232] [PATCH 1/2] gnu: Add mercurial-commitsigs. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 May 2021 21:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48232 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48232@debbugs.gnu.org Received: via spool by 48232-submit@debbugs.gnu.org id=B48232.162016201732748 (code B ref 48232); Tue, 04 May 2021 21:01:02 +0000 Received: (at 48232) by debbugs.gnu.org; 4 May 2021 21:00:17 +0000 Received: from localhost ([127.0.0.1]:55419 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1le29Q-0008W8-K5 for submit@debbugs.gnu.org; Tue, 04 May 2021 17:00:16 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:59508 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1le29O-0008Vw-QU for 48232@debbugs.gnu.org; Tue, 04 May 2021 17:00:15 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1620162004; bh=mK8am1Rf+eMxQkhagXYXa/9vgPgK6x66adIS+6cRTDQ=; h=From:To:Subject:In-Reply-To:References:Date; b=HJ0hDV6mKNs6Z2NQRKdEGppufHtnesK4DwSPio7WTyYFXOb4RWSDwkvYg7PULenF3 +ei3PpsxZiWnjpLKwHpS8gEhNXFsa81M3EXPaysTlmds0Utx6M9ZLGh2PKjhhD2yuL zH6kqpdwO95zGH49XzJnqom5LYXlwP66LceUb5qE= In-Reply-To: References: Message-Id: Date: Tue, 04 May 2021 23:00:03 +0200 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/version-control.scm (mercurial-commitsigs): New variable. --- Note: I am using ‘git-version’ and ‘git-file-name’, maybe we should add the equivalent procedures in (guix hg-download) ? gnu/packages/version-control.scm | 63 ++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 0cad83c4b0..3a1cb33fc3 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -62,6 +62,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix hg-download) + #:use-module (guix build python-build-system) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) @@ -88,6 +89,7 @@ #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) #:use-module (gnu packages groff) #:use-module (gnu packages guile) @@ -1741,6 +1743,67 @@ and offers an easy and intuitive interface.") history. It implements the changeset evolution concept for Mercurial.") (license license:gpl2))) +(define-public mercurial-commitsigs + ;; Latest tag is 11 years old. + (let ((changeset "b53eb6862bff") + (revision "0")) + (package + (name "mercurial-commitsigs") + (version (git-version "0.1.0" revision changeset)) + (source (origin + (method hg-fetch) + (uri (hg-reference + (url "https://foss.heptapod.net/mercurial/commitsigs") + (changeset changeset))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "059gm66q06m6ayl4brsc517zkw3ahmz249b6xm1m32ac5y24wb9x")))) + (build-system copy-build-system) + (arguments + `(#:imported-modules ((guix build python-build-system) + ,@%copy-build-system-modules) + #:modules ((srfi srfi-1) + (guix build python-build-system) + ;; Don't use `%copy-build-system-modules' because + ;; `standard-phases' from (guix build gnu-build-system) + ;; shadows the one from (guix build copy-build-system), + ;; which is the one we actually want. + (guix build copy-build-system) + ((guix build gnu-build-system) #:prefix gnu) + (guix build utils) + (guix build gremlin) + (ice-9 ftw) + (guix elf)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((gpg (string-append (assoc-ref inputs "gnupg") + "/bin/gpg")) + (openssl (string-append (assoc-ref inputs "openssl") + "/bin/openssl"))) + (substitute* "commitsigs.py" + (("b'gpg',") (string-append "b'" gpg "',")) + (("b'openssl',") (string-append "b'" openssl "',"))))))) + #:install-plan + `(("commitsigs.py" ,(string-append "lib/python" + (python-version + (assoc-ref %build-inputs "python")) + "/site-packages/hgext3rd/commitsigs.py"))))) + (native-inputs + `(("python" ,python))) + (inputs + `(("gnupg" ,gnupg) + ("openssl" ,openssl))) + (home-page "https://foss.heptapod.net/mercurial/commitsigs") + (synopsis "Automatic signing of changeset hashes") + (description "This package provides a Mercurial extension for signing +the changeset hash of commits. The signure is embedded directly in the +changeset itself; there won't be any extra commits. Either GnuPG or OpenSSL +can be used for signing.") + (license license:gpl3+)))) + (define-public neon (package (name "neon")