From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id WL6eMbAF/1+oUwAA0tVLHw (envelope-from ) for ; Wed, 13 Jan 2021 14:37:36 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id OLOWLbAF/1+YGwAAB5/wlQ (envelope-from ) for ; Wed, 13 Jan 2021 14:37:36 +0000 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 1F0FA9403EB for ; Wed, 13 Jan 2021 14:37:36 +0000 (UTC) Received: from localhost ([::1]:39154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzhHD-0003kH-1F for larch@yhetil.org; Wed, 13 Jan 2021 09:37:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzh9u-0006Y2-O0 for bug-guix@gnu.org; Wed, 13 Jan 2021 09:30:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51427) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzh9u-0005Cr-FZ for bug-guix@gnu.org; Wed, 13 Jan 2021 09:30:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kzh9u-0002fg-AG for bug-guix@gnu.org; Wed, 13 Jan 2021 09:30:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#42162: gforge.inria.fr to be taken off-line in Dec. 2020 Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Wed, 13 Jan 2021 14:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42162 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 42162@debbugs.gnu.org Received: via spool by 42162-submit@debbugs.gnu.org id=B42162.161054815210191 (code B ref 42162); Wed, 13 Jan 2021 14:30:02 +0000 Received: (at 42162) by debbugs.gnu.org; 13 Jan 2021 14:29:12 +0000 Received: from localhost ([127.0.0.1]:34740 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kzh90-0002eD-04 for submit@debbugs.gnu.org; Wed, 13 Jan 2021 09:29:12 -0500 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:17014) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kzh8u-0002di-Us for 42162@debbugs.gnu.org; Wed, 13 Jan 2021 09:29:04 -0500 X-IronPort-AV: E=Sophos;i="5.79,344,1602540000"; d="scan'208";a="369891605" Received: from 91-160-117-201.subs.proxad.net (HELO ribbon) ([91.160.117.201]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Jan 2021 15:28:53 +0100 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87a6tdce94.fsf@inria.fr> <87mu4iv0gc.fsf@inria.fr> Date: Wed, 13 Jan 2021 15:28:53 +0100 In-Reply-To: (GNU bug Tracking System's message of "Wed, 13 Jan 2021 10:40:02 +0000") Message-ID: <87v9c0ap22.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maurice Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -2.36 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: 1F0FA9403EB X-Spam-Score: -2.36 X-Migadu-Scanner: scn1.migadu.com X-TUID: klEeFiI6iLK3 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable help-debbugs@gnu.org (GNU bug Tracking System) skribis: > We can already change Scotch and CMH to =E2=80=98git-fetch=E2=80=99 I thi= nk. For Scotch, the =E2=80=98v6.1.0=E2=80=99 tag at gitlab.inria.fr provides di= fferent content than the tarball on gforge: --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=scotch.patch Content-Description: the diff Nur en /tmp/scotch_6.1.0/: bin Nur en /tmp/scotch_6.1.0/doc/src/ptscotch: p.ps Nur en /gnu/store/h84nd9h3131l63y4rllvzpnk6q0dsaq2-scotch-6.1.0-checkout: .gitignore Nur en /gnu/store/h84nd9h3131l63y4rllvzpnk6q0dsaq2-scotch-6.1.0-checkout: .gitlab-ci.yml Nur en /tmp/scotch_6.1.0/: include Nur en /tmp/scotch_6.1.0/: lib diff -ru /tmp/scotch_6.1.0/src/libscotch/library.h /gnu/store/h84nd9h3131l63y4rllvzpnk6q0dsaq2-scotch-6.1.0-checkout/src/libscotch/library.h --- /tmp/scotch_6.1.0/src/libscotch/library.h 1970-01-01 01:00:01.000000000 +0100 +++ /gnu/store/h84nd9h3131l63y4rllvzpnk6q0dsaq2-scotch-6.1.0-checkout/src/libscotch/library.h 1970-01-01 01:00:01.000000000 +0100 @@ -67,8 +67,6 @@ /*+ Integer type. +*/ -#include - typedef DUMMYIDX SCOTCH_Idx; typedef DUMMYINT SCOTCH_Num; diff -ru /tmp/scotch_6.1.0/src/libscotch/Makefile /gnu/store/h84nd9h3131l63y4rllvzpnk6q0dsaq2-scotch-6.1.0-checkout/src/libscotch/Makefile --- /tmp/scotch_6.1.0/src/libscotch/Makefile 1970-01-01 01:00:01.000000000 +0100 +++ /gnu/store/h84nd9h3131l63y4rllvzpnk6q0dsaq2-scotch-6.1.0-checkout/src/libscotch/Makefile 1970-01-01 01:00:01.000000000 +0100 @@ -2320,28 +2320,6 @@ common.h \ scotch.h -library_graph_diam$(OBJ) : library_graph_diam.c \ - module.h \ - common.h \ - graph.h \ - scotch.h - -library_graph_diam_f$(OBJ) : library_graph_diam.c \ - module.h \ - common.h \ - scotch.h - -library_graph_induce$(OBJ) : library_graph_diam.c \ - module.h \ - common.h \ - graph.h \ - scotch.h - -library_graph_induce_f$(OBJ) : library_graph_diam.c \ - module.h \ - common.h \ - scotch.h - library_graph_io_chac$(OBJ) : library_graph_io_chac.c \ module.h \ common.h \ diff -ru /tmp/scotch_6.1.0/src/libscotchmetis/library_metis.h /gnu/store/h84nd9h3131l63y4rllvzpnk6q0dsaq2-scotch-6.1.0-checkout/src/libscotchmetis/library_metis.h --- /tmp/scotch_6.1.0/src/libscotchmetis/library_metis.h 1970-01-01 01:00:01.000000000 +0100 +++ /gnu/store/h84nd9h3131l63y4rllvzpnk6q0dsaq2-scotch-6.1.0-checkout/src/libscotchmetis/library_metis.h 1970-01-01 01:00:01.000000000 +0100 @@ -106,7 +106,6 @@ */ #ifndef SCOTCH_H /* In case "scotch.h" not included before */ -#include typedef DUMMYINT SCOTCH_Num; #endif /* SCOTCH_H */ diff -ru /tmp/scotch_6.1.0/src/libscotchmetis/library_parmetis.h /gnu/store/h84nd9h3131l63y4rllvzpnk6q0dsaq2-scotch-6.1.0-checkout/src/libscotchmetis/library_parmetis.h --- /tmp/scotch_6.1.0/src/libscotchmetis/library_parmetis.h 1970-01-01 01:00:01.000000000 +0100 +++ /gnu/store/h84nd9h3131l63y4rllvzpnk6q0dsaq2-scotch-6.1.0-checkout/src/libscotchmetis/library_parmetis.h 1970-01-01 01:00:01.000000000 +0100 @@ -106,7 +106,6 @@ */ #ifndef SCOTCH_H /* In case "scotch.h" not included before */ -#include typedef DUMMYINT SCOTCH_Num; #endif /* SCOTCH_H */ --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable There=E2=80=99s not much we can do if upstream isn=E2=80=99t more cautious = though. Perhaps we can still update to the =E2=80=9Cnew=E2=80=9D 6.1.0, maybe label= ing it =E2=80=9C6.1.0b=E2=80=9D? Attached a tentative patch. Thanks, Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 7866bcc6eb..4f8f79052d 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -12,7 +12,7 @@ ;;; Copyright =C2=A9 2015 Fabian Harfert ;;; Copyright =C2=A9 2016 Roel Janssen ;;; Copyright =C2=A9 2016, 2018, 2020 Kei Kebreau -;;; Copyright =C2=A9 2016, 2017, 2018, 2019, 2020 Ludovic Court=C3=A8s +;;; Copyright =C2=A9 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Court=C3= =A8s ;;; Copyright =C2=A9 2016 Leo Famulari ;;; Copyright =C2=A9 2016, 2017 Thomas Danckaert ;;; Copyright =C2=A9 2017, 2018, 2019, 2020 Paul Garlick @@ -3083,13 +3083,15 @@ implemented in ANSI C, and MPI for communications.") (package (name "scotch") (version "6.1.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://gforge.inria.fr/frs/download.php/" - "latestfile/298/scotch_" version ".tar.gz")) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.inria.fr/scotch/scotch") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "1184fcv4wa2df8szb5lan6pjh0raarr45pk8ilpvbz23naikzg53")) + (base32 + "164jqsy75j7zfnwngj10jc4060shhxni3z8ykklhqjykdrinir55")) (patches (search-patches "scotch-build-parallelism.patch" "scotch-integer-declarations.patch"= )))) (build-system gnu-build-system) --=-=-=--