From patchwork Wed Sep 9 09:55:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. Arne Babenhauserheide" X-Patchwork-Id: 23979 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 1B85427BBE8; Wed, 9 Sep 2020 11:02:08 +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, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, T_DKIM_INVALID,T_HK_NAME_FM_DR,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 970DF27BBE7 for ; Wed, 9 Sep 2020 11:02:07 +0100 (BST) Received: from localhost ([::1]:33074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFwvW-0005y5-Gq for patchwork@mira.cbaines.net; Wed, 09 Sep 2020 06:02:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFwpe-0004ly-OI for guix-patches@gnu.org; Wed, 09 Sep 2020 05:56:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45693) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kFwpe-0000TY-8t for guix-patches@gnu.org; Wed, 09 Sep 2020 05:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kFwpe-0003cC-8K for guix-patches@gnu.org; Wed, 09 Sep 2020 05:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43290] [PATCH] gnu: mercurial: update to 5.5.1 Resent-From: "Dr. Arne Babenhauserheide" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 09 Sep 2020 09:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43290@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159964531813843 (code B ref -1); Wed, 09 Sep 2020 09:56:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Sep 2020 09:55:18 +0000 Received: from localhost ([127.0.0.1]:57239 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kFwov-0003bC-N4 for submit@debbugs.gnu.org; Wed, 09 Sep 2020 05:55:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:58774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kFwou-0003b5-4l for submit@debbugs.gnu.org; Wed, 09 Sep 2020 05:55:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFwot-0003RP-Kl for guix-patches@gnu.org; Wed, 09 Sep 2020 05:55:15 -0400 Received: from mout.web.de ([212.227.17.12]:53599) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFwor-0000FV-4B for guix-patches@gnu.org; Wed, 09 Sep 2020 05:55:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1599645309; bh=vZXa4HbUtjL9PzTV0O/0e1TVim6JEcL7UxSTlQiy8ik=; h=X-UI-Sender-Class:From:To:Subject:Date; b=Q4nUc83PRBm1LuSkIfGkfJ/buYpWlSjtQh5arAKYsdkoYs4trRefhKweg88hdPZdx ZfkrReamoxy6Af9GJU41ZmIGQ5DnAf/JInBvAYrIOsaiA+BjtYIZZreXcmqLZgy5sa HdFeQTlW3BRzx/NNxa0ya8/sJLhZ6ztVMIEPPtZk= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from fluss ([80.136.29.179]) by smtp.web.de (mrweb102 [213.165.67.124]) with ESMTPSA (Nemesis) id 0MA5v3-1kMnUy1lxh-00BM92; Wed, 09 Sep 2020 11:55:09 +0200 User-agent: mu4e 1.4.13; emacs 26.3 From: "Dr. Arne Babenhauserheide" Date: Wed, 09 Sep 2020 11:55:05 +0200 Message-ID: <87a6xzff5y.fsf@web.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:lBQDQwNaMINLKQqS1LYLFnLqR7j8ZzDZUGKU6ymoHQBp3/4sb6d dzc1y5nTJ+CRNclp7dIjqpfxiejfjJolB6L+KVnX1pjmz8cU/tvxmDMUC9QK+m/7jcIis0u 7Z+ICujqFm5ckWypiU+eHvypU0/7klGvyItERrN6aBHbNOOMOx8osMwHQZ8fkeTzEmK5I3h BIV7WH2QQ6YXkCKuX2DcQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:Wc4AKNqVqqM=:akQ3L3uWe8PanJXM4jo9cW waGmEP9SyYou6DkfOKUwzE7TmsFB28vvz9tijlbdZmlIyKZPOCSfrpCdt4UvGoY0Fcudf1Cfc 3PYZuNd4iuBxO7JyTuD54CmzAMwb5sTyraO/bulVaeIvQM1uCZ0+zhODj89eN0jbpem4iZ8pA f5Mn1yLq/Yb928PSQeh1n43wnvpDuFYigGwTokVPCvMdUXmYvUKdWs5UVycIEv6XAIb7ck/kw ngmmgfqwX90nEVPPP/zuMm+ehLDXhIgDyc81Ajfo0VXhW4UMUf8szRx5PuoGxAXqZFF00nXIG tOSc7KMYm5zlTqTsxuX78FybaC1swcD+5Kg9Tzf0oF/j/wkYldSaqu4JYav+tFBhXzkZepAnw mdAEFNGbp8zwHbCcgOWzXf4+5Pyg+h3M7BTlnbxdOUe/N/XRM42AP27k0rSi+IhFtmspt6oPi 5FY5+5sjjfwY3q4zld9cSSYVLILHAD6uJI7CqBsNTTesuX9MzqKA+4xO0ml5uHd304jkHQrbh O6WgtE2ZV4yY1HDLEOYyGis8ubW4iMW+AbQhg8t6XcsU37/YLSgqHBI4YQKM/27jUmDvYdHqP Qyds7llR5i2szZCeovu0X0ITHmvlnohcc5+BNDM7L30/aiY9EdQY3CNmildpgC56q/VKShiMP cHqPI/B3e2uuNkQq+DPXWVju6tFpYX0FoUxJiUqD2+Z9kKQ5kfTs/lGSNUre4h2zza9I2/j/1 hX+TyS9cU5qjWalJ9qdb+OZMq5AkL0uEsxC2bQGxRcgkmTlxaPO9jLDeSitR4/Kqz55S1f8Cx N6gBV5oBy+i+llPHeGmt3xMIRCrp9W+Ilx/7aNEWpoMv35A+HP4H3vcMmujYgFSwsf+ADbGdF 5pscYFkr+wrq/5iAtC7s1SM6oA+DSUI3Jk/jc3TCMDAfMG5LV4Yh5yCDTkpLzSf1mVBaxf7jw cE+IM8IVJW2LwwcPYV+SJkg/jwIhBaK/nEk0B7+oEru+U+Yr0QWBvl00xlpKLcE47y7uy3TSu at9l2I6fyvjxdL1fpqlcBJQKaqdFCCaKb3/05QVDYrevPdZHypiuYSe5RHW88a4uLw2yflfrr hu8d6Ee1wKo4mUOOBqAsa8dX1KjARXQE7OCS4Iz2251EajM/OgfjEZD7RsI43Sfop0IpFDL+m uV8KU8THF+G0WYiLE3frW0URBfFA0BOSCWrR86q24Wf8FuX3qtVQJgJUCD3kkBOWvKvY4qcIS vC/JV4QNY18aJO4ZV Received-SPF: pass client-ip=212.227.17.12; envelope-from=arne_bab@web.de; helo=mout.web.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/09 05:55:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/version-control.scm (mercurial): Update to 5.5.1 --- gnu/packages/version-control.scm | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 86e30b0ba5..6fc55c08a1 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1560,33 +1560,17 @@ execution of any hook written in any language before every commit.") (file-name (string-append "mercurial-" name ".patch")) (sha256 (base32 hash)))) -(define %mercurial-patches - (list - ;; These three patches fixes compatibility with the updated gzip module - ;; in Python 3.8.2: . - (mercurial-patch "python-mtime" "6c36a521572edf3a79ee567b118469b3192037cc" - "0bmm7y40r8s081ws2sjvn1v8kvyfan4a97jl0fhdh7yc2pzxlzqq") - (mercurial-patch "indent-gzip" "a23b859ad17dd0a5b9bb37846b69b5e30f99c44c" - "1spscv9dgqv38m7h1liki93ax6w97gxayg17fr7wr6acjdfccpr9") - (mercurial-patch "python-gzip" "b7ca03dff14c63d64ad7bfa36a2d0a36a6b62253" - "0p88ffhx0kk21ssrsb156ffhpcb7g8mkwwkmq49qpmbm5ag2paf0") - ;; This fixes an incompatibility with os.isfile in Python 3.8: - ;; . - (mercurial-patch "os-isfile" "6a8738dc4a019da4c9df5c26961aa09d45ce1c68" - "0lr069m12kzrkmr1pmhaxg5lxmdwxabsza61qp1i1q70g7sy8lvy"))) - (define-public mercurial (package (name "mercurial") - (version "5.3.1") + (version "5.5.1") (source (origin (method url-fetch) (uri (string-append "https://www.mercurial-scm.org/" "release/mercurial-" version ".tar.gz")) - (patches %mercurial-patches) (sha256 (base32 - "1nbjpzjrzgql4hrvslpxwbcgn885ikq6ba1yb4w6p78rw9nzkhgp")))) + "0x08yjs26j88kh1bvl2g3r24lnfc023ry3i1cxfq6haray6sv5ag")))) (build-system python-build-system) (arguments `(#:phases @@ -1615,6 +1599,13 @@ execution of any hook written in any language before every commit.") ;; not in 'guix environment -C' (even without /bin/sh)? "test-nointerrupt.t" + ;; FIXME: This gets killed but does not receive an interrupt. + "test-commandserver.t" + + ;; Only works when run in a hg-repo, not in an + ;; extracted tarball + "test-doctest.py" + ;; TODO: the fqaddr() call fails in the build ;; container, causing these server tests to fail. "test-hgwebdir.t"