From patchwork Mon Jan 6 08:27:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brett Gilio X-Patchwork-Id: 19613 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 D523A179FE; Mon, 6 Jan 2020 08:28:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 80F4E1798D for ; Mon, 6 Jan 2020 08:28:14 +0000 (GMT) Received: from localhost ([::1]:49338 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioNkD-0001ZL-I7 for patchwork@mira.cbaines.net; Mon, 06 Jan 2020 03:28:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42163) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioNk3-0001Vr-EY for guix-patches@gnu.org; Mon, 06 Jan 2020 03:28:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ioNk2-0003e6-5G for guix-patches@gnu.org; Mon, 06 Jan 2020 03:28:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38993) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ioNk2-0003dv-2U for guix-patches@gnu.org; Mon, 06 Jan 2020 03:28:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ioNk2-00032r-0L for guix-patches@gnu.org; Mon, 06 Jan 2020 03:28:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38965] [PATCH 05/12] gnu: coq-flocq: Update to 3.2.0. References: <874kx9xa9u.fsf@gnu.org> In-Reply-To: <874kx9xa9u.fsf@gnu.org> Resent-From: Brett Gilio Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Jan 2020 08:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38965 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38965@debbugs.gnu.org Received: via spool by 38965-submit@debbugs.gnu.org id=B38965.157829923611589 (code B ref 38965); Mon, 06 Jan 2020 08:28:01 +0000 Received: (at 38965) by debbugs.gnu.org; 6 Jan 2020 08:27:16 +0000 Received: from localhost ([127.0.0.1]:44953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ioNjH-00030q-Ke for submit@debbugs.gnu.org; Mon, 06 Jan 2020 03:27:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:32842) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ioNjG-00030f-Dm for 38965@debbugs.gnu.org; Mon, 06 Jan 2020 03:27:15 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:50847) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ioNjB-00033F-9g for 38965@debbugs.gnu.org; Mon, 06 Jan 2020 03:27:09 -0500 Received: from [2605:6000:1a0d:4c95::3d] (port=48310 helo=oryx) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ioNj9-00069R-3I for 38965@debbugs.gnu.org; Mon, 06 Jan 2020 03:27:08 -0500 From: Brett Gilio Date: Mon, 06 Jan 2020 02:27:15 -0600 Message-ID: <87pnfxvvks.fsf@gnu.org> MIME-Version: 1.0 Content-Disposition: inline; filename=0005-gnu-coq-flocq-Update-to-3.2.0.patch Content-Description: [PATCH 05/12] gnu: coq-flocq: Update to 3.2.0. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 From 241cfab94794ed4edcaaa338ba48b8292e5c6a0a Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Mon, 6 Jan 2020 01:35:55 -0600 Subject: [PATCH 05/12] gnu: coq-flocq: Update to 3.2.0. To: guix-patches@gnu.org * gnu/packages/coq.scm (coq-flocq): Update to 3.2.0. [source]: Use GIT-FETCH and GIT-FILE-NAME. [native-inputs]: Add autoconf and automake for remake. [arguments]: Add remove-failing-examples phase to work around union error. --- gnu/packages/coq.scm | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index f0869b0d90..e7baae908c 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -207,18 +207,22 @@ provers.") (define-public coq-flocq (package (name "coq-flocq") - (version "3.1.0") - (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/" - "file/37901/flocq-" version ".tar.gz")) - (sha256 - (base32 - "02szrgz9m0ac51la1lqpiv6i2g0zbgx9gz5rp0q1g00ajldyna5c")))) + (version "3.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.inria.fr/flocq/flocq.git") + (commit (string-append "flocq-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "15bi36x7zj0glsb3s2gwqd4wswhfzh36rbp7imbyff53a7nna95l")))) (build-system gnu-build-system) (native-inputs - `(("ocaml" ,ocaml) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("ocaml" ,ocaml) ("which" ,which) ("coq" ,coq))) (arguments @@ -227,6 +231,12 @@ provers.") "/lib/coq/user-contrib/Flocq")) #:phases (modify-phases %standard-phases + (add-after 'unpack 'remove-failing-examples + (lambda _ + (substitute* "Remakefile.in" + ;; Fails on a union error. + (("Double_rounding_odd_radix.v") "")) + #t)) (add-before 'configure 'fix-remake (lambda _ (substitute* "remake.cpp" -- 2.24.1