From mboxrd@z Thu Jan 1 00:00:00 1970 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 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-Message-ID: From: Brett Gilio Date: Mon, 06 Jan 2020 02:26:51 -0600 Message-ID: <87v9ppvvlg.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/x-patch 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. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 38965@debbugs.gnu.org >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