From patchwork Sat May 8 11:53:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 29162 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 EA86927BC82; Sat, 8 May 2021 12:54:09 +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=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,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 A7AD927BC81 for ; Sat, 8 May 2021 12:54:09 +0100 (BST) Received: from localhost ([::1]:45422 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfLX6-0007n4-Ps for patchwork@mira.cbaines.net; Sat, 08 May 2021 07:54:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfLX0-0007mn-8b for guix-patches@gnu.org; Sat, 08 May 2021 07:54:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38232) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfLX0-0004Od-1I for guix-patches@gnu.org; Sat, 08 May 2021 07:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfLWz-00005c-Vz for guix-patches@gnu.org; Sat, 08 May 2021 07:54:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48283] [PATCH] gnu: mercurial: Update to 5.8. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 May 2021 11:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48283 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48283@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1620474804329 (code B ref -1); Sat, 08 May 2021 11:54:01 +0000 Received: (at submit) by debbugs.gnu.org; 8 May 2021 11:53:24 +0000 Received: from localhost ([127.0.0.1]:49776 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfLWN-00005F-Pq for submit@debbugs.gnu.org; Sat, 08 May 2021 07:53:24 -0400 Received: from lists.gnu.org ([209.51.188.17]:46916) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfLWL-000054-Rk for submit@debbugs.gnu.org; Sat, 08 May 2021 07:53:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43360) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfLWL-0007gJ-K1 for guix-patches@gnu.org; Sat, 08 May 2021 07:53:21 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:45108 helo=mail.yoctocell.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfLWJ-0003pO-HC for guix-patches@gnu.org; Sat, 08 May 2021 07:53:21 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1620474795; bh=7+Sug2ppsBNAppKfGOCD0INpNR8QSrx9M/E+1Dg1a5A=; h=From:To:Subject:Date; b=PlLd+rFAExUlOgz9ibUaUnq/DmZoZoCh510aoeslYGxMsfwTZ4MwG4uLwOHo5ZbZT 4h8r2j/5bS6vpUPZuIQNIegtW0TC/1lLIbERd8Fb+NezVvIV4eZckCPhzIaTEvr5Da 4qkHzmMzb/MwLEdmq4c5SP9nCKP4Aa9bwbWEvT2A= Message-Id: Date: Sat, 08 May 2021 13:53:14 +0200 MIME-Version: 1.0 Received-SPF: pass client-ip=87.96.130.155; envelope-from=public@yoctocell.xyz; helo=mail.yoctocell.xyz X-Spam_score_int: 34 X-Spam_score: 3.4 X-Spam_bar: +++ X-Spam_report: (3.4 / 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, FROM_SUSPICIOUS_NTLD=0.498, FROM_SUSPICIOUS_NTLD_FP=1.997, PDS_OTHER_BAD_TLD=1.997, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/version-control.scm (mercurial): Update to 5.8. [build-system]: Switch from ‘python-build-system’ to ‘gnu-build-system’, this will install additional things like man pages. [arguments]<#:make-flags>: Set PREFIX argument. [native-inputs]: Add ‘python-docutils’ for generating man pages. [inputs]: Add ‘python’. [description]: Fix formatting. --- gnu/packages/version-control.scm | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) base-commit: e5adaf6c2de917f33f90e24b551a8991e55b3eb6 diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 0cad83c4b0..b5c7800e12 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1638,18 +1638,21 @@ execution of any hook written in any language before every commit.") (define-public mercurial (package (name "mercurial") - (version "5.6.1") + (version "5.8") (source (origin (method url-fetch) (uri (string-append "https://www.mercurial-scm.org/" "release/mercurial-" version ".tar.gz")) (sha256 (base32 - "1bgz8f1a7lnmh6lzcvwg6q1yx6i7yibhwy06l4k55i04957jap75")))) - (build-system python-build-system) + "17rhlmmkqz5ll3k68jfzpcifg3nndbcbc2nx7kw8xn3qcj7nlpgw")))) + (build-system gnu-build-system) (arguments - `(#:phases + `(#:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases (modify-phases %standard-phases + (delete 'configure) (add-after 'unpack 'patch-tests (lambda _ (substitute* '("tests/test-extdiff.t" @@ -1702,17 +1705,20 @@ execution of any hook written in any language before every commit.") ;; The test suite takes a long time and produces little ;; output by default. Prevent timeouts due to silence. "-v")))))))) - ;; The following inputs are only needed to run the tests. (native-inputs - `(("python-nose" ,python-nose) + `(("python-docutils", python-docutils) + ;; The following inputs are only needed to run the tests. + ("python-nose" ,python-nose) ("unzip" ,unzip) ("which" ,which))) + (inputs + `(("python" ,python))) (home-page "https://www.mercurial-scm.org/") (synopsis "Decentralized version control system") (description - "Mercurial is a free, distributed source control management tool. -It efficiently handles projects of any size -and offers an easy and intuitive interface.") + "Mercurial is a free, distributed source control management tool. It +efficiently handles projects of any size and offers an easy and intuitive +interface.") (license license:gpl2+))) (define-public python-hg-evolve