From patchwork Mon Jan 6 08:26:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brett Gilio X-Patchwork-Id: 19611 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 97B3A179FE; Mon, 6 Jan 2020 08:27:15 +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 54FEF1798D for ; Mon, 6 Jan 2020 08:27:15 +0000 (GMT) Received: from localhost ([::1]:49322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioNjG-0001KK-QC for patchwork@mira.cbaines.net; Mon, 06 Jan 2020 03:27:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41879) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioNj9-0001Jk-RX for guix-patches@gnu.org; Mon, 06 Jan 2020 03:27:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ioNj5-0002yp-Gy for guix-patches@gnu.org; Mon, 06 Jan 2020 03:27:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38973) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ioNj4-0002xk-7f for guix-patches@gnu.org; Mon, 06 Jan 2020 03:27:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ioNj4-000302-4p for guix-patches@gnu.org; Mon, 06 Jan 2020 03:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38965] [PATCH 03/12] gnu: coq: Update to 8.10.2. 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:27:02 +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.157829921511507 (code B ref 38965); Mon, 06 Jan 2020 08:27:02 +0000 Received: (at 38965) by debbugs.gnu.org; 6 Jan 2020 08:26:55 +0000 Received: from localhost ([127.0.0.1]:44945 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ioNix-0002zX-2M for submit@debbugs.gnu.org; Mon, 06 Jan 2020 03:26:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60980) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ioNit-0002zG-7y for 38965@debbugs.gnu.org; Mon, 06 Jan 2020 03:26:53 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:50843) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ioNik-0002la-Sr for 38965@debbugs.gnu.org; Mon, 06 Jan 2020 03:26:46 -0500 Received: from [2605:6000:1a0d:4c95::3d] (port=48302 helo=oryx) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ioNik-0005JS-82 for 38965@debbugs.gnu.org; Mon, 06 Jan 2020 03:26:42 -0500 From: Brett Gilio Date: Mon, 06 Jan 2020 02:26:51 -0600 Message-ID: <87v9ppvvlg.fsf@gnu.org> MIME-Version: 1.0 Content-Disposition: inline; filename=0003-gnu-coq-Update-to-8.10.2.patch Content-Description: [PATCH 03/12] gnu: coq: Update to 8.10.2. 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 23e916aebde29a97a00d1813d007fb6475449548 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Mon, 6 Jan 2020 01:32:09 -0600 Subject: [PATCH 03/12] gnu: coq: Update to 8.10.2. To: guix-patches@gnu.org * gnu/packages/coq.scm (coq): Update to 8.10.2. [inputs]: Replace lablgtk with ocaml-lablgtk3. [arguments]: Remove remove-lablgtk-references phase, as it no longer appears to be necessary. --- gnu/packages/coq.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 13ecd6c0ff..ce65ed82c8 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -44,7 +44,7 @@ (define-public coq (package (name "coq") - (version "8.9.1") + (version "8.10.2") (source (origin (method git-fetch) @@ -53,7 +53,8 @@ (commit (string-append "V" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1p4z967s18wkblayv12ygqsrqlyk5ax1pz40yf4kag8pva6gblhk")))) + (base32 + "0ji2rzd70b3hcwfw97qk7rv3m2977ylqnq82l1555dp3njr8nm3q")))) (native-search-paths (list (search-path-specification (variable "COQPATH") @@ -61,7 +62,7 @@ (build-system ocaml-build-system) (outputs '("out" "ide")) (inputs - `(("lablgtk" ,lablgtk) + `(("lablgtk" ,ocaml-lablgtk3) ("python" ,python-2) ("camlp5" ,camlp5) ("ocaml-num" ,ocaml-num))) @@ -74,13 +75,6 @@ (lambda _ (for-each make-file-writable (find-files ".")) #t)) - (add-after 'unpack 'remove-lablgtk-references - (lambda _ - ;; This is not used anywhere, but creates a reference to lablgtk in - ;; every binary - (substitute* '("config/coq_config.mli" "configure.ml") - ((".*coqideincl.*") "")) - #t)) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- 2.24.1