From patchwork Wed Sep 16 08:16:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 24168 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 B067027BBE8; Wed, 16 Sep 2020 09:17:18 +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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,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 E87B827BBE7 for ; Wed, 16 Sep 2020 09:17:17 +0100 (BST) Received: from localhost ([::1]:50506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIScv-00061Q-48 for patchwork@mira.cbaines.net; Wed, 16 Sep 2020 04:17:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kISch-0005dr-4I for guix-patches@gnu.org; Wed, 16 Sep 2020 04:17:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49831) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kIScg-0004WA-PH for guix-patches@gnu.org; Wed, 16 Sep 2020 04:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kIScg-0005Bl-Jy for guix-patches@gnu.org; Wed, 16 Sep 2020 04:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43442] [PATCH 2/2] gnu: gmp-ecm: Replace 'url-fetch' by 'svn-fetch'. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Sep 2020 08:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43442 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43442@debbugs.gnu.org Cc: zimoun Received: via spool by 43442-submit@debbugs.gnu.org id=B43442.160024421619915 (code B ref 43442); Wed, 16 Sep 2020 08:17:02 +0000 Received: (at 43442) by debbugs.gnu.org; 16 Sep 2020 08:16:56 +0000 Received: from localhost ([127.0.0.1]:33141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kISca-0005B8-7i for submit@debbugs.gnu.org; Wed, 16 Sep 2020 04:16:56 -0400 Received: from mail-wr1-f54.google.com ([209.85.221.54]:40485) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kIScY-0005Aq-Ex for 43442@debbugs.gnu.org; Wed, 16 Sep 2020 04:16:55 -0400 Received: by mail-wr1-f54.google.com with SMTP id j2so5890379wrx.7 for <43442@debbugs.gnu.org>; Wed, 16 Sep 2020 01:16:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LCViRX8zDrlOWVj91b/FUlvacrnQUnuXBgUzO+aQPNs=; b=GTlOyIzyKpEY7Pe419DRMRbZzRotHuLEIneQsZbDShyY75x/Bl+f9cId2rDQKwnbBk N1kCi5OqAwAmCLSwYfBardg4XEeEGkq4zNpGJI+jVsZtBNWRbfqIL03kfpzL3FNNv2+M ZtDTzNy2gGA2ZnVId0790LbCD+IAP5Q4ms8vhEfIA4eoar21O5U2LAOrQK/7tQQ6n8LD 7v1bGjmI00F2e9P+AmA80klVvYWJTib8y+cl2KkxH8xxQIb9w1ef6rrSMT9XDE8YtniU IVR7PMqDQf+KSbIYNUfpDnv2qtnPlROYdB+sl4OeV+Q6HdRHARkMxsEr54jqtJPBBmDF K5TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LCViRX8zDrlOWVj91b/FUlvacrnQUnuXBgUzO+aQPNs=; b=RPKo4X10H2uHD+pdA4zWqUcIqiHgWwWYB46J3XcPsT+wOKoH+z0PrxoYxqjFzzOr7b y51BtElyUDBtIHmfaqyVAfOjHIyTpx+HhGKs2KtDPPPvtHeE3u/XNH7cX66uyd5J8vCr gij4SYPxdJ6WrRAMIchTl7oE/YAyY4iiAEnkgxNfengpeccAGh5H1DuggEuJqLFi5iFT VwMoKK9F3C0uAsD4reokHnO3HgPQS0zaMIrHptMeEiQAY1OKaLHa/1V1n6kAgoOZUZcN VN9gFm8C/2jL152xXPc3E4lcpnMB2ghfjM7Vwj+ej64DTVOzeKQa1pz7TeDKInQn0J7d 0cjQ== X-Gm-Message-State: AOAM5302HLyu77XWddFgH8dFPBU4DjLI8SHE12wkEK3GlXbli+j+UeLr 31duBTjeqncVftOz9zoiYik5eMUbgmI= X-Google-Smtp-Source: ABdhPJyqFU+qBst5PTuPjLrzMs71ErYgdxm+1s47u8as3ZIlNztzpNw2NEPZLo3r9t+iZ//xgh3Yfw== X-Received: by 2002:adf:e690:: with SMTP id r16mr25186005wrm.15.1600244208456; Wed, 16 Sep 2020 01:16:48 -0700 (PDT) Received: from lili.univ-paris-diderot.fr ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id w15sm33271135wro.46.2020.09.16.01.16.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 01:16:48 -0700 (PDT) From: zimoun Date: Wed, 16 Sep 2020 10:16:42 +0200 Message-Id: <20200916081642.6716-2-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200916081642.6716-1-zimon.toutoune@gmail.com> References: <20200916081642.6716-1-zimon.toutoune@gmail.com> 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 Fixes . * gnu/packages/algebra.scm (gmp-ecm)[source]: Replace 'url-fetch' by 'svn-fetch'. [natice-inputs]: Add requirements. [arguments]: Adjust 'check phase to substitute correct path. --- gnu/packages/algebra.scm | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 318d653618..1cf293f17a 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -66,6 +67,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix hg-download) + #:use-module (guix svn-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils)) @@ -670,15 +672,20 @@ geometry and singularity theory.") (define-public gmp-ecm (package (name "gmp-ecm") - (version "7.0.4") + (version "7.0.4-3088") (source (origin - (method url-fetch) - ;; Use the ‘Latest version’ link for a stable URI across releases. - (uri (string-append "https://gforge.inria.fr/frs/download.php/" - "latestfile/160/ecm-" version ".tar.gz")) + (method svn-fetch) + (uri + (svn-reference + (url "https://scm.gforge.inria.fr/anonscm/svn/ecm/trunk") + (revision 3088))) (sha256 (base32 - "0hxs24c2m3mh0nq1zz63z3sb7dhy1rilg2s1igwwcb26x3pb7xqc")))) + "0g1jqgp9baqz4x9mzksch69i4kp3207d3wn56g9vnsmanrrb4qvb")))) (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) (inputs `(("gmp" ,gmp))) (arguments @@ -686,7 +693,14 @@ geometry and singularity theory.") ;; Disable specific assembly routines, which depend ;; on the subarchitecture of the build machine, ;; and use gmp instead. - "--disable-asm-redc"))) + "--disable-asm-redc") + #:phases (modify-phases %standard-phases + (add-before 'check 'replace-/bin/rm + (lambda _ + (substitute* + (list "test.ecm") + (("/bin/rm") (which "rm"))) + #t))))) (synopsis "Integer factorization library using the elliptic curve method") (description "GMP-ECM factors integers using the elliptic curve method (ECM) as well