From patchwork Tue Oct 24 16:00:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 55318 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 3087327BBEA; Tue, 24 Oct 2023 17:01:53 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5C33727BBE9 for ; Tue, 24 Oct 2023 17:01:52 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvJqi-0003GA-Pd; Tue, 24 Oct 2023 12:01:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qvJqZ-0002mc-4f for guix-patches@gnu.org; Tue, 24 Oct 2023 12:01:41 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qvJqY-0003uh-RU for guix-patches@gnu.org; Tue, 24 Oct 2023 12:01:34 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qvJr0-0004ht-Bq; Tue, 24 Oct 2023 12:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v7 01/12] gnu: ocaml: Update to 4.14.1. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Tue, 24 Oct 2023 16:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.169816331318018 (code B ref 64249); Tue, 24 Oct 2023 16:02:02 +0000 Received: (at 64249) by debbugs.gnu.org; 24 Oct 2023 16:01:53 +0000 Received: from localhost ([127.0.0.1]:56402 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJqr-0004gU-12 for submit@debbugs.gnu.org; Tue, 24 Oct 2023 12:01:53 -0400 Received: from mout01.posteo.de ([185.67.36.65]:52799) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJqp-0004fn-Og for 64249@debbugs.gnu.org; Tue, 24 Oct 2023 12:01:52 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 74A93240028 for <64249@debbugs.gnu.org>; Tue, 24 Oct 2023 18:01:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1698163276; bh=COHijXbV5pY1P/y+QyL/zHosR7z04uDezizxkHfvavg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=lB5dIC3xZ1RmFas+xhOjpvFTFlXy4UewyZi/GJSYSxNHbPuxTuuMmsoqXcUHMJFY2 a7AWqgKSLwhi+g8QdvOwUJN23eoToDiOVD4TDJOWe9PJFBlNDrHRuKOZWXLvLXZmk8 DMHkzxa3s2XWFd8vaOALehArjz3TsD0IhlFLm6kJ1c0RilQ5t+ivMtKRjbT15uY+E7 vE9KddPedneFuWjn8L6/mrdS5WQzmT9QOIkZLUVFImW6nD8gReKYDDvsjMSH5OyL1J FFoSxXT/JzUI+yMPOf1zuykJsV745JY4X8Mg8EOurgqiyL3AVfjsb1pHue4T67wlln dqLNkhksBQQUw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SFGy36QS4z9rxB; Tue, 24 Oct 2023 18:01:15 +0200 (CEST) From: pukkamustard Date: Tue, 24 Oct 2023 16:00:04 +0000 Message-ID: <3a888c7c72b86684cfd8d22e123304c05a3c71c8.1698162760.git.pukkamustard@posteo.net> In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml): Update to 4.14.1. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7993dbaa73..face1f9d9c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -253,7 +253,7 @@ (define-public ocaml-5.0 (define-public ocaml-4.14 (package (name "ocaml") - (version "4.14.0") + (version "4.14.1") (source (origin (method url-fetch) (uri (string-append @@ -262,7 +262,7 @@ (define-public ocaml-4.14 "/ocaml-" version ".tar.xz")) (sha256 (base32 - "0axcc7c23pf4qinz4vxgkba6pwziwbp9i2ydwzar7x9zlp6diarn")))) + "0vxvwxxycpc3r5p7ys59d86vw5vdr2lhmck1f3s6qms2096rf9y1")))) (build-system gnu-build-system) (native-search-paths (list (search-path-specification From patchwork Tue Oct 24 16:00:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 55322 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 2A6E527BBE2; Tue, 24 Oct 2023 17:03:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 06DEA27BBEA for ; Tue, 24 Oct 2023 17:03:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvJrf-00054g-Bs; Tue, 24 Oct 2023 12:02:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qvJrV-0004t6-SF for guix-patches@gnu.org; Tue, 24 Oct 2023 12:02:33 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qvJrV-0004Ej-64 for guix-patches@gnu.org; Tue, 24 Oct 2023 12:02:33 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qvJry-0004lf-PD; Tue, 24 Oct 2023 12:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v7 02/12] gnu: Update coq-flocq to 4.1.1. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Tue, 24 Oct 2023 16:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.169816332618178 (code B ref 64249); Tue, 24 Oct 2023 16:03:02 +0000 Received: (at 64249) by debbugs.gnu.org; 24 Oct 2023 16:02:06 +0000 Received: from localhost ([127.0.0.1]:56429 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJr4-0004j2-0L for submit@debbugs.gnu.org; Tue, 24 Oct 2023 12:02:06 -0400 Received: from mout02.posteo.de ([185.67.36.66]:34249) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJqr-0004fu-5C for 64249@debbugs.gnu.org; Tue, 24 Oct 2023 12:01:54 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 6684A240104 for <64249@debbugs.gnu.org>; Tue, 24 Oct 2023 18:01:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1698163277; bh=mLI5ysOOklCMR/BcBN4xlWZjYyU1Dk4LWaltXZK92w4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=m9o8KSF1HT/KVfZxL69ScqgzpEe1wu4Bs5oP9CyKyhMn4VJVejYfRuYTybBcepaDK 5Yhxljuly6IyFytAZ4zKNZyRxupWWuS0Tanq3p5CUKxaZqXFsP0a7euhWLWPN0nMMj x0nTdIXAXSTAsp6nP/hxW4aov7DqZhmRxX4kfTKOp/+J95ML4ODKm8fAsOFEqA6raD V0+xPdmLqpu0eqo3WMX74O7O/iPyJEcTl4jimnhjpJaa60EUJ1mRfq79lal2rwQxcq A3vCKlpu+juDMRG2hBNewz4G9cQPItvDyhP+ljKcY0hBn/jQL2OsWoSSGrup2lzylK WruKirPt5P66Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SFGy44ZjDz9rxB; Tue, 24 Oct 2023 18:01:16 +0200 (CEST) From: pukkamustard Date: Tue, 24 Oct 2023 16:00:05 +0000 Message-ID: <52e39ce21d255de604beb0ecd46d0bb8a188fd49.1698162760.git.pukkamustard@posteo.net> In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/coq.scm (coq-flocq): Update to 4.1.1. --- gnu/packages/coq.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 09ca4030ea..215e947fd4 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -241,7 +241,7 @@ (define-public proof-general (define-public coq-flocq (package (name "coq-flocq") - (version "4.1.0") + (version "4.1.1") (source (origin (method git-fetch) @@ -251,7 +251,7 @@ (define-public coq-flocq (file-name (git-file-name name version)) (sha256 (base32 - "1yscj1120wch6myakaia03j11qji416v78ylx842d23hrbaqwmw5")))) + "01x38w58j95ba9679vpb5wv4bvfnrapd5dzjqlyz8k7i8a9sfqn0")))) (build-system gnu-build-system) (native-inputs (list autoconf automake ocaml which coq)) From patchwork Tue Oct 24 16:00:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 55319 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 2F36D27BBE9; Tue, 24 Oct 2023 17:03:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2CC2B27BBE2 for ; Tue, 24 Oct 2023 17:03:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvJre-00052M-OZ; Tue, 24 Oct 2023 12:02:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qvJrU-0004pB-Ql for guix-patches@gnu.org; Tue, 24 Oct 2023 12:02:33 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qvJrU-0004ES-DD for guix-patches@gnu.org; Tue, 24 Oct 2023 12:02:32 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qvJry-0004lL-0L; Tue, 24 Oct 2023 12:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v7 03/12] gnu: Update coq-gappa to 1.5.3. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Tue, 24 Oct 2023 16:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.169816332518164 (code B ref 64249); Tue, 24 Oct 2023 16:03:01 +0000 Received: (at 64249) by debbugs.gnu.org; 24 Oct 2023 16:02:05 +0000 Received: from localhost ([127.0.0.1]:56425 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJr3-0004is-AM for submit@debbugs.gnu.org; Tue, 24 Oct 2023 12:02:05 -0400 Received: from mout01.posteo.de ([185.67.36.65]:47153) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJqr-0004fw-60 for 64249@debbugs.gnu.org; Tue, 24 Oct 2023 12:01:53 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id DA0C7240028 for <64249@debbugs.gnu.org>; Tue, 24 Oct 2023 18:01:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1698163277; bh=USsFpWtosQw0jiSzUqhY4+NKI7rSidpzXUdE3CTTKrA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=QWwY0Up2zzk+h0LigXXDEa3Vn+RL7y6fNi9ZHxCpgO0htVY5EYMK3vihBOGezU8kf 9XDdSvgOyWsHeci/M7tpOze/fHvnmNafN+SO2fhr1mJ2p/IgFJPRMtNhGc9Lc+CtEn k+47vFIXYzlytq78sIGvKABMcKYBhKtblyDVGhHNiBEJ6Pt3X3qfgvXmiTzQpHopbG vrDcwIbw/fEd8kjoPnmjesEqD9mfaKxkuBpt4pId6X4U7a7YiavfAsDRFCvjTQjzDU p5Xn1KDmSlyNay3OiDZxDEkhbFhiSQJAZhrNoe8IFCCJfwaR9es2fanp7m5OZItp/1 I5GLx4W8SFVGA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SFGy52gQjz9rxB; Tue, 24 Oct 2023 18:01:17 +0200 (CEST) From: pukkamustard Date: Tue, 24 Oct 2023 16:00:06 +0000 Message-ID: <4b2dce6f9042beff6ca2110628df59e6dbb020a1.1698162760.git.pukkamustard@posteo.net> In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/coq.scm (coq-gappa): Update to 1.5.3. --- gnu/packages/coq.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 215e947fd4..86a9aef0f4 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -288,7 +288,7 @@ (define-public coq-flocq (define-public coq-gappa (package (name "coq-gappa") - (version "1.5.2") + (version "1.5.3") (source (origin (method git-fetch) @@ -298,7 +298,7 @@ (define-public coq-gappa (file-name (git-file-name name version)) (sha256 (base32 - "0l65ah81yj9vabgkwqh47c02qvscvl8nl60gqn1qrs47dx1pi80q")))) + "1dzkb2sfglhik2ymw8p65khl163xxjsaqji9agnnkvlk5r6589v6")))) (build-system gnu-build-system) (native-inputs (list autoconf From patchwork Tue Oct 24 16:00:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 55321 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 F3F0827BBE9; Tue, 24 Oct 2023 17:03:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9488127BBEC for ; Tue, 24 Oct 2023 17:03:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvJs2-0005PA-LD; Tue, 24 Oct 2023 12:03:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qvJrV-0004qz-22 for guix-patches@gnu.org; Tue, 24 Oct 2023 12:02:33 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qvJrU-0004Ec-P5 for guix-patches@gnu.org; Tue, 24 Oct 2023 12:02:32 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qvJry-0004lU-C0; Tue, 24 Oct 2023 12:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v7 04/12] gnu: Update coq-coquelicot to 3.4.0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Tue, 24 Oct 2023 16:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.169816332618171 (code B ref 64249); Tue, 24 Oct 2023 16:03:02 +0000 Received: (at 64249) by debbugs.gnu.org; 24 Oct 2023 16:02:06 +0000 Received: from localhost ([127.0.0.1]:56427 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJr3-0004iu-Kp for submit@debbugs.gnu.org; Tue, 24 Oct 2023 12:02:05 -0400 Received: from mout01.posteo.de ([185.67.36.65]:40719) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJqr-0004fy-R9 for 64249@debbugs.gnu.org; Tue, 24 Oct 2023 12:01:54 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 8828F240028 for <64249@debbugs.gnu.org>; Tue, 24 Oct 2023 18:01:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1698163278; bh=Jw3lcd3fwGlgSvEtz/83YRCQDBb4wJL8gc/SkZXJV5Q=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=NR33ImAE+QekbFVRZZgz+PLeOVWD/aeE12TdQRPApwjXtqAcBlK1WTg11lj92mijf g5NAfwDNg7S9FyN4GzjHmlCZAgvBt2SL2+ES3ImdIaH+zq+NQJzQLkcW12jmTPmJeR QXBeszOk/lnwQxEx+LLl8qEuoBH2KrCgb7XzbwkEgCNlq+nMn3EI7vBqeo1xT3LVes kYsyUEk5aJls4Hgsdjtn45/8Rgy33aCOmn4xirK7DRBfwD1FLvw8T+NwoezlTubLhw N76dqVGmMcQ9GDmDJd7c1cCXU/WSMaOYz7K9Og2yM9Zgjtn0C5/UxK4qoLZVzycAxA cZUB73bb1FMUg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SFGy60Qhbz9rxG; Tue, 24 Oct 2023 18:01:18 +0200 (CEST) From: pukkamustard Date: Tue, 24 Oct 2023 16:00:07 +0000 Message-ID: In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/coq.scm (coq-coquelicot): Update to 3.4.0. --- gnu/packages/coq.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 86a9aef0f4..6371084a71 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -385,7 +385,7 @@ (define-public coq-mathcomp (define-public coq-coquelicot (package (name "coq-coquelicot") - (version "3.2.0") + (version "3.4.0") (source (origin (method git-fetch) @@ -395,7 +395,7 @@ (define-public coq-coquelicot (file-name (git-file-name name version)) (sha256 (base32 - "146s5y2xsc7wb43m1pq1n4p14hw99gqbzx0ic3a4naxq16v7cv4w")))) + "1f6zim6hnm6zrij964vas6rfbxh5p147qsxxmmbxm7gyb85hhy45")))) (build-system gnu-build-system) (native-inputs (list autoconf automake ocaml which coq)) From patchwork Tue Oct 24 16:00:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 55323 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 E223127BBE9; Tue, 24 Oct 2023 17:03:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3814D27BBE2 for ; Tue, 24 Oct 2023 17:03:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvJs3-0005Wg-0P; Tue, 24 Oct 2023 12:03:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qvJrV-0004tR-Sr for guix-patches@gnu.org; Tue, 24 Oct 2023 12:02:33 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qvJrV-0004En-HU for guix-patches@gnu.org; Tue, 24 Oct 2023 12:02:33 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qvJrz-0004ln-4m; Tue, 24 Oct 2023 12:03:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v7 05/12] gnu: Update coq-mathcomp to 1.17.0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Tue, 24 Oct 2023 16:03:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.169816332618185 (code B ref 64249); Tue, 24 Oct 2023 16:03:03 +0000 Received: (at 64249) by debbugs.gnu.org; 24 Oct 2023 16:02:06 +0000 Received: from localhost ([127.0.0.1]:56431 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJr4-0004j9-BF for submit@debbugs.gnu.org; Tue, 24 Oct 2023 12:02:06 -0400 Received: from mout02.posteo.de ([185.67.36.66]:50461) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJqs-0004g6-Kh for 64249@debbugs.gnu.org; Tue, 24 Oct 2023 12:01:55 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 58ADD240104 for <64249@debbugs.gnu.org>; Tue, 24 Oct 2023 18:01:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1698163279; bh=6FOdUlmxEHICSNTr1g+TOa6TOJldBzoMc903jLchMvw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=h5DzwX4jSk1JRjVJkOnUoZPhIO2S1HF1DG7eiSl40NCUdM7/953qP+G/JCx+8xTiN UkoVVzVfuY/rqKPiEg7aaF5Lpo7OSK8Y2bEnk5Cfjd0NTbEf8FB9RUsTnOjKKLMFRY Zp7urjHWbzHTQW/ASEkLZgL06cSCLZIuYW10ISvsrz5ScQrylqqA8WsUz2JCwFjvew 7KGAXxwBjKFXRjqj8WIH9zmgmHm0XttfCIDgZGXTPLoT0FwB2JuQXrDJiR5kv3rZak C0wOBeOFK/WxJ1LLWElSbEGQwoD0quHeZi9uqSDN6Edn2BzRhNJ5bZl/oBC7uAeOJn Brp90i+CGoKfA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SFGy65Yywz9rxB; Tue, 24 Oct 2023 18:01:18 +0200 (CEST) From: pukkamustard Date: Tue, 24 Oct 2023 16:00:08 +0000 Message-ID: In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/coq.scm (coq-mathcomp): Update to 1.17.0. --- gnu/packages/coq.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 6371084a71..f9e3d89867 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -348,7 +348,7 @@ (define-public coq-gappa (define-public coq-mathcomp (package (name "coq-mathcomp") - (version "1.15.0") + (version "1.17.0") (source (origin (method git-fetch) @@ -357,7 +357,7 @@ (define-public coq-mathcomp (commit (string-append "mathcomp-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "158zl36zbvi5qx2nqbfnrg00jpgp6hjr5hmls7d8d0421ar6b67i")))) + (base32 "06i6kw5p2024n6h9mf8bvwn54il1a4z2h4qrgc8y0iq8hkvx4fnd")))) (build-system gnu-build-system) (native-inputs (list ocaml which coq)) From patchwork Tue Oct 24 16:00:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 55326 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 A7B9627BBEA; Tue, 24 Oct 2023 17:03:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EAAE627BBE9 for ; Tue, 24 Oct 2023 17:03:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvJs6-00063f-5x; Tue, 24 Oct 2023 12:03:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qvJra-0005A2-8Q for guix-patches@gnu.org; Tue, 24 Oct 2023 12:02:41 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qvJrZ-0004GE-9V for guix-patches@gnu.org; Tue, 24 Oct 2023 12:02:37 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qvJs0-0004mO-Sr; Tue, 24 Oct 2023 12:03:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v7 06/12] gnu: Update coq-autosubst to 1.8. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Tue, 24 Oct 2023 16:03:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.169816332918216 (code B ref 64249); Tue, 24 Oct 2023 16:03:04 +0000 Received: (at 64249) by debbugs.gnu.org; 24 Oct 2023 16:02:09 +0000 Received: from localhost ([127.0.0.1]:56439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJr6-0004jd-NS for submit@debbugs.gnu.org; Tue, 24 Oct 2023 12:02:09 -0400 Received: from mout01.posteo.de ([185.67.36.65]:41543) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJqt-0004gA-D1 for 64249@debbugs.gnu.org; Tue, 24 Oct 2023 12:01:57 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 1A66724002A for <64249@debbugs.gnu.org>; Tue, 24 Oct 2023 18:01:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1698163280; bh=SgJKdMREMRQboQFtn+xDepNVKNrWZ6gNo1SAKIibcpM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=fBnM9G+JV+vs+MMun/EqDpdp4vbJ1WgMzTwC6s9hRRCwB62VqUN3fHsH3cPF0WIe6 +bnPXc776SY4FlWwxxLYsKiCuIemiK07cw1Vze37ecWDsPeSCN+y5fYVPOVhIlZuHT gpgJkq5Kh6Y2NKNUpCwchJo1Ol+qBKcUmeXanTPgH/Zb/VK/DZyJ1gTxFejJZO6U/K tQ8T6d3zPkZfUw+vs9AybxbHb6uQbLCh26yNxz+WiI99etGuu/P5Mp+WIVBBKRIZBr k8J6zYzLJQ5jR3xbR90v62W86/T+LW0c4sAZGwRyfEF+ljcumThK6cyyUaDYtI+yRF y/05t3jdx2PkQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SFGy73xg6z9rxB; Tue, 24 Oct 2023 18:01:19 +0200 (CEST) From: pukkamustard Date: Tue, 24 Oct 2023 16:00:09 +0000 Message-ID: <150e501c7bf6946276c6b81585355f8eb198a958.1698162760.git.pukkamustard@posteo.net> In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/coq.scm (coq-autosubst): Update to 1.8. --- gnu/packages/coq.scm | 50 ++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index f9e3d89867..5ce4880f4b 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -515,35 +515,31 @@ (define-public coq-interval (license license:cecill-c))) (define-public coq-autosubst - ;; Latest commit on that branch, where work on supporting coq 8.6 and - ;; more recent versions of coq happen. - (let ((branch "coq86-devel") - (commit "fa6ef30664511ffa659cbcf3c962715cbee03572")) - (package - (name "coq-autosubst") - (version (git-version "1" branch commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "git://github.com/uds-psl/autosubst") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1cl0bp96bk6lplbl7n5c703vd3gvbs5mvf2qrf8q333kkqd7jqq4")))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f + (package + (name "coq-autosubst") + (version "1.8") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/coq-community/autosubst") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0qk72r6cqxwhqqkl2kmryhw365w3l2016qii1q1sk3md7zq46jcz")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f #:make-flags (list (string-append "COQLIBINSTALL=" (assoc-ref %outputs "out") "/lib/coq/user-contrib")) - #:phases - (modify-phases %standard-phases - (delete 'configure)))) - (native-inputs - (list coq)) - (home-page "https://www.ps.uni-saarland.de/autosubst/") - (synopsis "Coq library for parallel de Bruijn substitutions") - (description "Formalizing syntactic theories with variable binders is + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + (list coq)) + (home-page "https://www.ps.uni-saarland.de/autosubst/") + (synopsis "Coq library for parallel de Bruijn substitutions") + (description "Formalizing syntactic theories with variable binders is not easy. Autosubst is a library for the Coq proof assistant to automate this process. Given an inductive definition of syntactic objects in de Bruijn representation augmented with binding annotations, Autosubst @@ -554,7 +550,7 @@ (define-public coq-autosubst work on a decision procedure for the equational theory of an extension of the sigma-calculus by Abadi et al. The library is completely written in Coq and uses Ltac to synthesize the substitution operation.") - (license license:bsd-3)))) + (license license:bsd-3))) (define-public coq-equations (package From patchwork Tue Oct 24 16:00:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 55325 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 D1AA627BBEE; Tue, 24 Oct 2023 17:03:50 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2A34C27BBE9 for ; Tue, 24 Oct 2023 17:03:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvJsW-0006f4-7o; Tue, 24 Oct 2023 12:03:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qvJrg-0005D6-AG for guix-patches@gnu.org; Tue, 24 Oct 2023 12:02:45 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qvJrg-0004HA-0Y for guix-patches@gnu.org; Tue, 24 Oct 2023 12:02:44 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qvJs0-0004m6-0A; Tue, 24 Oct 2023 12:03:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v7 07/12] gnu: Update coq-stdpp to 1.8.0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Tue, 24 Oct 2023 16:03:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.169816332818201 (code B ref 64249); Tue, 24 Oct 2023 16:03:03 +0000 Received: (at 64249) by debbugs.gnu.org; 24 Oct 2023 16:02:08 +0000 Received: from localhost ([127.0.0.1]:56435 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJr5-0004jO-Ok for submit@debbugs.gnu.org; Tue, 24 Oct 2023 12:02:08 -0400 Received: from mout02.posteo.de ([185.67.36.66]:49493) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJqu-0004gH-3t for 64249@debbugs.gnu.org; Tue, 24 Oct 2023 12:01:57 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id CD025240104 for <64249@debbugs.gnu.org>; Tue, 24 Oct 2023 18:01:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1698163280; bh=lYoZklyMBeerw17+BMpstr3oLoDOx1+bN5PZCYLO6ZA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=dYqaOErbZSqFp0EEOQQ9oyXQZ8F8oCDch/XZKWXCDIG4CC7MUGpVXXxkiOyAZ26IO f09lQ2DMA2PQgFjbD8lKA47Q/UQuTM49x2imMEEMcRcWr55sQYtmFaV6LGTPpSi1im m4Cj/rtWKNY1haR73c+A6meQnafp/bPM43hGaptFH6whRKcdF8xlkAa6HA2HYbNNAM ZFI4VmOxMWiP6QqERLQfpyxArEaV02E4S6R1hHZpOw1SX8V5Vs2Lrb+lAa5fxStRGB 9jbrzQcfK6nLEpQwtlGejhiJ8Ako5ygDWSI1rQpf1fLXaWj0OBGHU4idYC6W5WnCoy LdI+TkAV2D8Gg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SFGy820q6z9rxG; Tue, 24 Oct 2023 18:01:20 +0200 (CEST) From: pukkamustard Date: Tue, 24 Oct 2023 16:00:10 +0000 Message-ID: In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/coq.scm (coq-stdpp): Update to 1.8.0. --- gnu/packages/coq.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 5ce4880f4b..4a929c6bed 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -642,7 +642,7 @@ (define-public coq-semantics (define-public coq-stdpp (package (name "coq-stdpp") - (version "1.7.0") + (version "1.8.0") (synopsis "Alternative Coq standard library std++") (source (origin (method git-fetch) @@ -652,7 +652,7 @@ (define-public coq-stdpp (file-name (git-file-name name version)) (sha256 (base32 - "0447wbzm23f9rl8byqf6vglasfn6c1wy6cxrrwagqjwsh3i5lx8y")))) + "0xawh3xkh76yhs689zw52k55cbzga2gyzl4g1a3pgg6yy420chjn")))) (build-system gnu-build-system) (inputs (list coq)) From patchwork Tue Oct 24 16:00:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 55320 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 0DA4027BBE9; Tue, 24 Oct 2023 17:03:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 34F5427BBE2 for ; Tue, 24 Oct 2023 17:03:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvJs3-0005fO-TN; Tue, 24 Oct 2023 12:03:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qvJrX-0004yg-9t for guix-patches@gnu.org; Tue, 24 Oct 2023 12:02:35 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qvJrW-0004FM-Rw for guix-patches@gnu.org; Tue, 24 Oct 2023 12:02:34 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qvJs0-0004mE-FF; Tue, 24 Oct 2023 12:03:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v7 08/12] gnu: Update coq-interval to 4.8.0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Tue, 24 Oct 2023 16:03:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.169816332818208 (code B ref 64249); Tue, 24 Oct 2023 16:03:04 +0000 Received: (at 64249) by debbugs.gnu.org; 24 Oct 2023 16:02:08 +0000 Received: from localhost ([127.0.0.1]:56437 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJr6-0004jW-BW for submit@debbugs.gnu.org; Tue, 24 Oct 2023 12:02:08 -0400 Received: from mout02.posteo.de ([185.67.36.66]:60421) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJqu-0004gJ-V8 for 64249@debbugs.gnu.org; Tue, 24 Oct 2023 12:01:57 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id A3C68240101 for <64249@debbugs.gnu.org>; Tue, 24 Oct 2023 18:01:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1698163281; bh=z7OGXUHqCkdk7ed6rmbCOwjX7roIWap9sNgsChFn4zU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=ihLyz/7QvSSee53shK/PZKQWfZgudz2I2jClQd9/KTfGqTWMElcRf86iLOM3fn74v j1kcnmE0K25i5ZLtFWr3Sa3Y4UY2MZ5xf8VHvw2mvcF6EmLfFIfJMbO6qbw9sw43vi fDp3I3glsy3ZjsYopK4KytVHQyhBRQvbpaJh1UfHk3pFpfU1jd81ZbMGN9F4HNOWEA lgb1U6GVYGdqjhxk6abk49EsPwoWduqaHocKf5KaF6p8Fqgh+LKjTxm5xe6Y3PJDub DRb+THoSnmHoNprjJKnmfBnGcvgKlbX8pJysZZ+w7tOGZTtnZAl/0p1rI76MeWJPIP dQ0X8/gVql23w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SFGy910c5z9rxB; Tue, 24 Oct 2023 18:01:21 +0200 (CEST) From: pukkamustard Date: Tue, 24 Oct 2023 16:00:11 +0000 Message-ID: <6da35566e7f9bb4089721168ebcedec8b26f52ed.1698162760.git.pukkamustard@posteo.net> In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/coq.scm (coq-interval): Update to 4.8.0. --- gnu/packages/coq.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 4a929c6bed..663265f5be 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -468,7 +468,7 @@ (define-public coq-bignums (define-public coq-interval (package (name "coq-interval") - (version "4.5.2") + (version "4.8.0") (source (origin (method git-fetch) @@ -478,7 +478,7 @@ (define-public coq-interval (file-name (git-file-name name version)) (sha256 (base32 - "138vgb0bq6wkygrhkahjgb9spwpzc6x6kkycj2qnf5naxx1z412w")))) + "0m3icx77p99ld9qfl3xjq62q572pyi4m77i1kc3whvipvg7834rh")))) (build-system gnu-build-system) (native-inputs (list autoconf automake ocaml which coq)) From patchwork Tue Oct 24 16:00:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 55324 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 C4D4427BBEA; Tue, 24 Oct 2023 17:03:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0AF1327BBE9 for ; Tue, 24 Oct 2023 17:03:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvJsG-0006GF-PX; Tue, 24 Oct 2023 12:03:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qvJrf-0005CY-Fo for guix-patches@gnu.org; Tue, 24 Oct 2023 12:02:44 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qvJre-0004Gu-Nz for guix-patches@gnu.org; Tue, 24 Oct 2023 12:02:43 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qvJs1-0004mX-Dx; Tue, 24 Oct 2023 12:03:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v7 09/12] gnu: coq: Update to 8.17.1. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Tue, 24 Oct 2023 16:03:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard , Josselin Poiret , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.169816333018224 (code B ref 64249); Tue, 24 Oct 2023 16:03:05 +0000 Received: (at 64249) by debbugs.gnu.org; 24 Oct 2023 16:02:10 +0000 Received: from localhost ([127.0.0.1]:56441 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJr7-0004jl-5T for submit@debbugs.gnu.org; Tue, 24 Oct 2023 12:02:10 -0400 Received: from mout01.posteo.de ([185.67.36.65]:35905) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJqv-0004gR-RF for 64249@debbugs.gnu.org; Tue, 24 Oct 2023 12:01:59 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 873A4240028 for <64249@debbugs.gnu.org>; Tue, 24 Oct 2023 18:01:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1698163282; bh=C2sjEm2FT+JB3RSadGtOGp9AWE0qZgwltNmw+FxFugs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=Ru737u1qv/9ugeWbWgdpgPtyQ0oRvmdJfyxMvH9TrNLa9bDtENiB/wElePEPiC/R2 ZDCFKeS/x1KNvQxKQYEHEVhlYUNwv0sOQeLxgAA2UEkywfttGLbZ/pxcz1eLtxChtf dTgplZZOmd8JcGFchsIME2AWnNTZjLJQDrc4ybM4/Q5euAe89AtyTgU4JvfTRTFXrB NxmbH/2XU2d3Vj2Vn7VvnB2QdVzqc0is5/GI8QGv1MMSYjlJ6mcrbt69IYStJGAJBE EgRh5bXuwTwMGKN/e20qpeMOj2M0CNDizmjndTYu+Cd5sOvWT955swajPuDgQxQ54/ AgVxsGrs3hoiA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SFGy9616nz9rxB; Tue, 24 Oct 2023 18:01:21 +0200 (CEST) From: pukkamustard Date: Tue, 24 Oct 2023 16:00:12 +0000 Message-ID: <62d7c240a4b580050927739b5814eddfba06ecb9.1698162760.git.pukkamustard@posteo.net> In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/coq.scm (coq): Update to 8.17.1 and merge with coq-core and coq-stdlib. [arguments] Merge with coq-core and coq-stdlib. Add pre-build phases and add a custom install phase. Remove unnecessary test-target. [source](patches): Remove. [native-search-paths]: Remove COQLIBPATH and COQCORELIB. (coq-core): Remove variable. (coq-stdlib): Remove variable. (coq-ide)[propagated-inputs]: Add zlib. (coq-mathcomp-bigenough)[propagated-inputs]: Remove coq-core. (coq-mathcomp-finmap)[inputs]: Remove coq-stdlib. (coq-equations): Update to 1.3-8.17. * gnu/packages/patches/coq-fix-envvars.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. Co-authored-by: Josselin Poiret --- gnu/local.mk | 1 - gnu/packages/coq.scm | 89 ++++++++-------------- gnu/packages/patches/coq-fix-envvars.patch | 53 ------------- 3 files changed, 32 insertions(+), 111 deletions(-) delete mode 100644 gnu/packages/patches/coq-fix-envvars.patch diff --git a/gnu/local.mk b/gnu/local.mk index 43145caf80..ffb8082eec 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1040,7 +1040,6 @@ dist_patch_DATA = \ %D%/packages/patches/converseen-hide-non-free-pointers.patch \ %D%/packages/patches/cool-retro-term-wctype.patch \ %D%/packages/patches/coreutils-gnulib-tests.patch \ - %D%/packages/patches/coq-fix-envvars.patch \ %D%/packages/patches/cppcheck-disable-char-signedness-test.patch \ %D%/packages/patches/cpuinfo-system-libraries.patch \ %D%/packages/patches/cpulimit-with-glib-2.32.patch \ diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 663265f5be..6169b5f819 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -31,6 +31,7 @@ (define-module (gnu packages coq) #:use-module (gnu packages base) #:use-module (gnu packages bison) #:use-module (gnu packages boost) + #:use-module (gnu packages compression) #:use-module (gnu packages emacs) #:use-module (gnu packages flex) #:use-module (gnu packages gawk) @@ -50,10 +51,10 @@ (define-module (gnu packages coq) #:use-module (guix utils) #:use-module ((srfi srfi-1) #:hide (zip))) -(define-public coq-core +(define-public coq (package - (name "coq-core") - (version "8.16.1") + (name "coq") + (version "8.17.1") (source (origin (method git-fetch) @@ -63,28 +64,35 @@ (define-public coq-core (file-name (git-file-name name version)) (sha256 (base32 - "0ljpqhh5lfsim29fcfp2xfcvm3j84pf1mb0gnpdr8vcqqw7mqwpf")) - (patches (search-patches "coq-fix-envvars.patch")))) + "0gg6hizq0i08lk741b579cbswhy6qvkh6inc3d3i5a2af98psq63")))) (native-search-paths (list (search-path-specification (variable "COQPATH") - (files (list "lib/ocaml/site-lib/coq/user-contrib" - "lib/coq/user-contrib"))) - (search-path-specification - (variable "COQLIBPATH") - (files (list "lib/ocaml/site-lib/coq"))) - (search-path-specification - (variable "COQCORELIB") - (files (list "lib/ocaml/site-lib/coq-core")) - (separator #f)))) + (files (list "lib/coq/user-contrib"))))) (build-system dune-build-system) + (arguments + (list + #:package "coq-core,coq-stdlib,coq" + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (coqlib (string-append out "/lib/ocaml/site-lib/coq/"))) + (invoke "./configure" "-prefix" out + "-libdir" coqlib)))) + (add-before 'build 'make-dunestrap + (lambda _ (invoke "make" "dunestrap"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (libdir (string-append out "/lib/ocaml/site-lib"))) + (invoke "dune" "install" "--prefix" out + "--libdir" libdir "coq" "coq-core" "coq-stdlib"))))))) (inputs (list gmp ocaml-zarith)) (native-inputs (list ocaml-ounit2 which)) - (arguments - `(#:package "coq-core" - #:test-target ".")) (properties '((upstream-name . "coq"))) ; also for inherited packages (home-page "https://coq.inria.fr") (synopsis "Proof assistant for higher-order logic") @@ -96,39 +104,6 @@ (define-public coq-core ;; Some of the documentation is distributed under opl1.0+. (license (list license:lgpl2.1 license:opl1.0+)))) -(define-public coq-stdlib - (package - (inherit coq-core) - (name "coq-stdlib") - (arguments - `(#:package "coq-stdlib" - #:test-target "." - #:phases - (modify-phases %standard-phases - (add-before 'build 'fix-dune - (lambda _ - (substitute* "user-contrib/Ltac2/dune" - (("coq-core.plugins.ltac2") - (string-join - (map (lambda (plugin) (string-append "coq-core.plugins." plugin)) - '("ltac2" "number_string_notation" "tauto" "cc" - "firstorder")) - " ")))))))) - (inputs - (list coq-core gmp ocaml-zarith)) - (native-inputs '()))) - -(define-public coq - (package - (inherit coq-core) - (name "coq") - (arguments - `(#:package "coq" - #:test-target ".")) - (propagated-inputs - (list coq-core coq-stdlib)) - (native-inputs '()))) - (define-public coq-ide-server (package (inherit coq) @@ -147,7 +122,7 @@ (define-public coq-ide `(#:tests? #f #:package "coqide")) (propagated-inputs - (list coq coq-ide-server)) + (list coq coq-ide-server zlib)) (inputs (list lablgtk3 ocaml-lablgtk3-sourceview3)))) @@ -555,16 +530,16 @@ (define-public coq-autosubst (define-public coq-equations (package (name "coq-equations") - (version "1.3") + (version "1.3-8.17") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/mattam82/Coq-Equations") - (commit (string-append "v" version "-8.16")))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "08f756vgdd1wklkarg0b93j4n5mhkqm5ixxrhyb23dcv2dwhc8yg")))) + "0g68h4c1ijpphixvl9wkd7sibds38v4236dpvvh194j5ii42vnn8")))) (build-system gnu-build-system) (native-inputs (list ocaml coq camlp5)) @@ -716,7 +691,7 @@ (define-public coq-mathcomp-finmap "/lib/coq/user-contrib")) #:phases (modify-phases %standard-phases (delete 'configure)))) - (inputs (list coq coq-stdlib coq-mathcomp which)) + (inputs (list coq coq coq-mathcomp which)) (synopsis "Finite sets and finite types for coq-mathcomp") (description "This library is an extension of coq-mathcomp which supports finite sets @@ -747,7 +722,7 @@ (define-public coq-mathcomp-bigenough ;; by the packaged project in the future. #:tests? #f #:make-flags ,#~(list (string-append "COQBIN=" - #$(this-package-input "coq-core") + #$(this-package-input "coq") "/bin/") (string-append "COQMF_COQLIB=" (assoc-ref %outputs "out") @@ -757,7 +732,7 @@ (define-public coq-mathcomp-bigenough "/lib/coq/user-contrib")) #:phases (modify-phases %standard-phases (delete 'configure)))) - (propagated-inputs (list coq coq-core coq-mathcomp which)) + (propagated-inputs (list coq coq-mathcomp which)) (home-page "https://math-comp.github.io/") (synopsis "Small library to do epsilon - N reasoning") (description diff --git a/gnu/packages/patches/coq-fix-envvars.patch b/gnu/packages/patches/coq-fix-envvars.patch deleted file mode 100644 index 6c48224c64..0000000000 --- a/gnu/packages/patches/coq-fix-envvars.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 0e76cda958a4d3e4bcbb96e171c26b6b3478c6c2 Mon Sep 17 00:00:00 2001 -From: Julien Lepiller -Date: Thu, 10 Feb 2022 16:44:10 +0100 -Subject: [PATCH] Fix environment variable usage. - ---- - boot/env.ml | 26 +++++++++++++++++++------- - 1 file changed, 19 insertions(+), 7 deletions(-) - -diff --git a/boot/env.ml b/boot/env.ml -index e8521e7..d834a3a 100644 ---- a/boot/env.ml -+++ b/boot/env.ml -@@ -32,17 +32,29 @@ let fail_msg = - - let fail s = Format.eprintf "%s@\n%!" fail_msg; exit 1 - -+let path_to_list p = -+ let sep = if String.equal Sys.os_type "Win32" then ';' else ':' in -+ String.split_on_char sep p -+ - (* This code needs to be refactored, for now it is just what used to be in envvars *) - let guess_coqlib () = - Util.getenv_else "COQLIB" (fun () -> - let prelude = "theories/Init/Prelude.vo" in -- Util.check_file_else -- ~dir:Coq_config.coqlibsuffix -- ~file:prelude -- (fun () -> -- if Sys.file_exists (Filename.concat Coq_config.coqlib prelude) -- then Coq_config.coqlib -- else fail ())) -+ let coqlibpath = Util.getenv_else "COQLIBPATH" (fun () -> Coq_config.coqlibsuffix) in -+ let paths = path_to_list coqlibpath in -+ let valid_paths = -+ List.filter -+ (fun dir -> (Util.check_file_else ~dir:dir ~file:prelude (fun () -> "")) <> "") -+ paths in -+ match valid_paths with -+ | [] -> -+ if Sys.file_exists (Filename.concat Coq_config.coqlib prelude) -+ then Coq_config.coqlib -+ else -+ fail "cannot guess a path for Coq libraries; please use -coqlib option \ -+ or ensure you have installed the package containing Coq's stdlib (coq-stdlib in OPAM) \ -+ If you intend to use Coq without a standard library, the -boot -noinit options must be used." -+ | p::_ -> p) - - (* Build layout uses coqlib = coqcorelib *) - let guess_coqcorelib lib = --- -2.34.0 - From patchwork Tue Oct 24 16:00:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 55329 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 1EA2327BBEA; Tue, 24 Oct 2023 17:04:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6040827BBE2 for ; Tue, 24 Oct 2023 17:04:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvJsm-0007P9-LF; Tue, 24 Oct 2023 12:03:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qvJrh-0005FR-JR for guix-patches@gnu.org; Tue, 24 Oct 2023 12:02:46 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qvJrg-0004HC-6g for guix-patches@gnu.org; Tue, 24 Oct 2023 12:02:45 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qvJs2-0004mp-CH; Tue, 24 Oct 2023 12:03:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v7 10/12] gnu: dune-bootstrap: Update to 3.11.0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Tue, 24 Oct 2023 16:03:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.169816333118238 (code B ref 64249); Tue, 24 Oct 2023 16:03:06 +0000 Received: (at 64249) by debbugs.gnu.org; 24 Oct 2023 16:02:11 +0000 Received: from localhost ([127.0.0.1]:56445 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJr9-0004k1-8B for submit@debbugs.gnu.org; Tue, 24 Oct 2023 12:02:11 -0400 Received: from mout01.posteo.de ([185.67.36.65]:40631) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJqw-0004ge-Hf for 64249@debbugs.gnu.org; Tue, 24 Oct 2023 12:02:03 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 3EF63240027 for <64249@debbugs.gnu.org>; Tue, 24 Oct 2023 18:01:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1698163283; bh=tGQR3L+v/G5BQGtPdw7fN7SSGK+sElr+br0RJHnZkSI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=KZ8FlGnV9t7FsfZ+Mtsh5qfQyiggTNDYP6b+i0JtdJlHJTUC3leKQQ3c3O1Cr6cYa D0rd7p8Q7H3ST7t3BuaogHkDIYTqOtyHblIZosmHIOqABkjsiGh0p07UHhP4yo4RLj otdos2+wVf0v24V2+mgRM+wFEvj4NFdb+aKhenRN9YC3LJHTLGSl9jbndms7L1utf9 nAw7ioinZvNGEcEtvnijl2Lvvxa+xH51KeaHxo/llp1CDpoh5hIDIeHyQzl7Nu1u4j znNTgiFPwdB+AktLwqFdmnH9HzlJVHiqzzSp+79rrhnzqzJ1bkkdWlA2vyBgLkE6XP ZFynLe3byziQA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SFGyB56Wjz9rxG; Tue, 24 Oct 2023 18:01:22 +0200 (CEST) From: pukkamustard Date: Tue, 24 Oct 2023 16:00:13 +0000 Message-ID: <29833648582d28fc3a7e5b96588d6ab561416599.1698162760.git.pukkamustard@posteo.net> In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (dune-bootstrap): Update to 3.10.0. [description]: Revise and de-emphasize historic origin. --- gnu/packages/ocaml.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index face1f9d9c..c448e64bc7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1784,7 +1784,7 @@ (define-public ocaml-stringext (define dune-bootstrap (package (name "dune") - (version "3.6.1") + (version "3.11.0") (source (origin (method git-fetch) (uri (git-reference @@ -1793,7 +1793,7 @@ (define dune-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "0gv851wxbv5ln20429nj7p92spzxgw8vngg9z94q39aawn6q8lx6")))) + "12k8k2964s1z05mj71f9imwyvk0jyh5h6mpw4hpyr2d73iw53ink")))) (build-system ocaml-build-system) (arguments `(#:tests? #f; require odoc @@ -1810,9 +1810,10 @@ (define dune-bootstrap #t))))) (home-page "https://github.com/ocaml/dune") (synopsis "OCaml build system") - (description "Dune is a build system that was designed to simplify the -release of Jane Street packages. It reads metadata from @file{dune} files -following a very simple s-expression syntax.") + (description "Dune is a build system for OCaml. It provides a consistent +experience and takes care of the low-level details of OCaml compilation. +Descriptions of projects, libraries and executables are provided in +@file{dune} files following a s-expression syntax.") (license license:expat))) (define ocaml4.09-dune-bootstrap From patchwork Tue Oct 24 16:00:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 55327 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 9C4DD27BBE9; Tue, 24 Oct 2023 17:03:57 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2933127BBE2 for ; Tue, 24 Oct 2023 17:03:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvJs4-0005gr-9h; Tue, 24 Oct 2023 12:03:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qvJra-0005A3-8u for guix-patches@gnu.org; Tue, 24 Oct 2023 12:02:41 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qvJrZ-0004GJ-Jl for guix-patches@gnu.org; Tue, 24 Oct 2023 12:02:37 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qvJrz-0004lx-KD; Tue, 24 Oct 2023 12:03:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v7 11/12] gnu: opam: Split build into smaller sub-packages. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Tue, 24 Oct 2023 16:03:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.169816332718193 (code B ref 64249); Tue, 24 Oct 2023 16:03:03 +0000 Received: (at 64249) by debbugs.gnu.org; 24 Oct 2023 16:02:07 +0000 Received: from localhost ([127.0.0.1]:56433 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJr4-0004jG-Lz for submit@debbugs.gnu.org; Tue, 24 Oct 2023 12:02:07 -0400 Received: from mout01.posteo.de ([185.67.36.65]:47153) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJqs-0004fw-7e for 64249@debbugs.gnu.org; Tue, 24 Oct 2023 12:01:57 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 262D7240028 for <64249@debbugs.gnu.org>; Tue, 24 Oct 2023 18:01:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1698163284; bh=IytCOYO+KOwhQG8M+MdMYCPdsgSw7BH7Q/gqLSvhWsw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=SpDOqjN2eDRIm1mG6U3bKLwhq80jZoIZMHndojQjXA6y0st3UtDE8wSIVP6fobZjl ueYMFND8Dq/hZfHP++y4gNllHRwirqeIQ+CFfkxHnA+SLLcpB0qThjSI+glGeCCCjU WTuLESSo8jO/90znlsRBCuJS3aSp7tP9cyvG71flOxZ2lu4ISFnd4+LhUqiiQbk/O7 WQSxmBakYTuf95JzpLmPjPEXAx5rj5+oKxTAJp8pxocJiFBmHje32KhDyAMpRXcrTZ gKdTz5SAka6Z5IjZtHBurBGKGAM735u06wrOgoVvIANcSv4qvF837uwF2puNzfraQr +UuS6vnTX647g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SFGyC3Nvfz9rxK; Tue, 24 Oct 2023 18:01:23 +0200 (CEST) From: pukkamustard Date: Tue, 24 Oct 2023 16:00:14 +0000 Message-ID: <96b27aa4aef36a023721c086b087ae194f4fb68a.1698162760.git.pukkamustard@posteo.net> In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (opam): Split build into smaller sub-packages. (ocaml-down, ocaml-topkg, ocaml-rresult, ocaml-mtime, ocaml-fmt, ocaml-astring, ocaml-react, ocaml-hmap, ocaml-logs, ocaml-fpath, ocaml-bos, ocaml-xmlm, ocaml-uchar, ocaml-uutf, ocaml-uunf, ocaml-jsonm, ocaml-ptime, ocaml-uuidm, ocaml-tsdl, ocaml-uucp, ocaml-uucd, ocaml-uuseg, ocaml-afl-persistent, ocaml-ocb-stubblr) [native-inputs]: Replace opam with opam-installer. --- gnu/packages/ocaml.scm | 263 ++++++++++++++++++++++++++++------------- 1 file changed, 183 insertions(+), 80 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c448e64bc7..eccc870c08 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -780,7 +780,7 @@ (define-public ocaml-down ,#~(list "build" "--lib-dir" (string-append #$output "/lib/ocaml/site-lib")))) (native-inputs - (list ocaml-findlib ocamlbuild ocaml-topkg opam)) + (list ocaml-findlib ocamlbuild ocaml-topkg opam-installer)) (home-page "https://erratique.ch/software/down") (synopsis "OCaml toplevel (REPL) upgrade") (description "Down is an unintrusive user experience upgrade for the @@ -846,9 +846,9 @@ (define-public ocaml-opam-file-format ;; With static-linking exception (license license:lgpl2.1+))) -(define-public opam +(define ocaml-opam-core (package - (name "opam") + (name "ocaml-opam-core") (version "2.1.3") (source (origin (method git-fetch) @@ -860,32 +860,151 @@ (define-public opam (base32 "1mw535zsw7xlvpgwnk1dan76z3f7lh5imlg0s6kdyhfg0iqisjd7")))) (build-system dune-build-system) + (arguments `(#:package "opam-core" + ;; tests are run with the opam package + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'build 'pre-build + (lambda* (#:key inputs make-flags #:allow-other-keys) + (let ((bash (assoc-ref inputs "bash")) + (bwrap (search-input-file inputs "/bin/bwrap"))) + (substitute* "src/core/opamSystem.ml" + (("\"/bin/sh\"") + (string-append "\"" bash "/bin/sh\"")) + (("getconf") + (which "getconf"))))))))) + (propagated-inputs + (list ocaml-graph + ocaml-re + ocaml-cppo)) + (inputs (list bubblewrap)) + (home-page "https://opam.ocamlpro.com/") + (synopsis "Package manager for OCaml") + (description + "OPAM is a tool to manage OCaml packages. It supports multiple +simultaneous compiler installations, flexible package constraints, and a +Git-friendly development workflow.") + ;; The 'LICENSE' file waives some requirements compared to LGPLv3. + (license license:lgpl3))) + +(define ocaml-opam-format + (package + (inherit ocaml-opam-core) + (name "ocaml-opam-format") + (inputs '()) + (propagated-inputs (list ocaml-opam-core + ocaml-opam-file-format + ocaml-re)) + (arguments `(#:package "opam-format" + ;; tests are run with the opam package + #:tests? #f + #:phases %standard-phases)))) + +(define-public opam-installer + (package + (inherit ocaml-opam-core) + (name "opam-installer") + (native-inputs (list ocaml-opam-format + ocaml-cmdliner)) + (inputs '()) + (propagated-inputs '()) + (arguments `(#:package "opam-installer" + ;; requires all of opam + #:tests? #f)) + (synopsis "Tool for installing OCaml packages") + (description "@var{opam-installer} is a tool for installing OCaml packages +based on @code{.install} files defined by the OPAM package manager. It is +useful for installing OCaml packages without requiring the entirety of +OPAM.") + (properties + ;; opam-installer is used as a tool and not as a library, we can use the + ;; OCaml 4.14 compiled opam until opam is compatible with OCaml 5.0. + `((ocaml5.0-variant . ,(delay opam-installer)))))) + +(define ocaml-opam-repository + (package + (inherit ocaml-opam-core) + (name "ocaml-opam-repository") + (inputs '()) + (propagated-inputs (list ocaml-opam-format)) + (arguments `(#:package "opam-repository" + ;; tests are run with the opam package + #:tests? #f + #:phases %standard-phases)))) + +(define ocaml-opam-state + (package + (inherit ocaml-opam-core) + (name "ocaml-opam-state") + (arguments `(#:package "opam-state" + ;; tests are run with the opam package + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'build 'pre-build + (lambda* (#:key inputs make-flags #:allow-other-keys) + (let ((bwrap (search-input-file inputs "/bin/bwrap"))) + ;; Use bwrap from the store directly. + (substitute* "src/state/shellscripts/bwrap.sh" + (("-v bwrap") (string-append "-v " bwrap)) + (("exec bwrap") (string-append "exec " bwrap)) + ;; Mount /gnu and /run/current-system in the + ;; isolated environment when building with opam. + ;; This is necessary for packages to find external + ;; dependencies, such as a C compiler, make, etc... + (("^add_sys_mounts /usr") + (string-append "add_sys_mounts " + (%store-directory) + " /run/current-system /usr"))))))))) + (inputs (list bubblewrap)) + (propagated-inputs (list ocaml-opam-repository)))) + +(define ocaml-opam-solver + (package + (inherit ocaml-opam-core) + (name "ocaml-opam-solver") + (inputs '()) + (propagated-inputs (list ocaml-opam-format + ocaml-mccs + ocaml-dose3)) + (arguments `(#:package "opam-solver" + ;; tests are run with the opam package + #:tests? #f + #:phases %standard-phases)))) + +(define ocaml-opam-client + (package + (inherit ocaml-opam-core) + (name "ocaml-opam-client") + (arguments `(#:package "opam-client" + ;; tests are run with the opam package + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'build 'pre-build + (lambda* (#:key inputs make-flags #:allow-other-keys) + (let ((bwrap (search-input-file inputs "/bin/bwrap"))) + (substitute* "src/client/opamInitDefaults.ml" + (("\"bwrap\"") (string-append "\"" bwrap "\""))))))))) + (inputs (list bubblewrap)) + (propagated-inputs + (list ocaml-opam-state + ocaml-opam-solver + ocaml-opam-repository + ocaml-base64 + ocaml-re + ocaml-cmdliner)))) + +(define-public opam + (package + (inherit ocaml-opam-core) + (name "opam") + (build-system dune-build-system) (arguments - `(#:phases + `(#:package "opam" + #:phases (modify-phases %standard-phases - (add-before 'build 'pre-build - (lambda* (#:key inputs make-flags #:allow-other-keys) - (let ((bash (assoc-ref inputs "bash")) - (bwrap (search-input-file inputs "/bin/bwrap"))) - (substitute* "src/core/opamSystem.ml" - (("\"/bin/sh\"") - (string-append "\"" bash "/bin/sh\"")) - (("getconf") - (which "getconf"))) - ;; Use bwrap from the store directly. - (substitute* "src/state/shellscripts/bwrap.sh" - (("-v bwrap") (string-append "-v " bwrap)) - (("exec bwrap") (string-append "exec " bwrap)) - ;; Mount /gnu and /run/current-system in the - ;; isolated environment when building with opam. - ;; This is necessary for packages to find external - ;; dependencies, such as a C compiler, make, etc... - (("^add_sys_mounts /usr") - (string-append "add_sys_mounts " - (%store-directory) - " /run/current-system /usr"))) - (substitute* "src/client/opamInitDefaults.ml" - (("\"bwrap\"") (string-append "\"" bwrap "\"")))))) (add-before 'check 'prepare-checks (lambda* (#:key inputs #:allow-other-keys) ;; Opam tests need to run an isolated environment from a writable @@ -966,22 +1085,11 @@ (define-public opam "0j9abisx3ifzm66ci3p45mngmz4f0fx7yd9jjxrz3f8w5jffc9ii")) ("opam-repo-f372039d" ,(opam-repo "f372039db86a970ef3e662adbfe0d4f5cd980701" "0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws"))))) - (inputs - (list ocaml ncurses curl bubblewrap ocaml-cmdliner ocaml-dose3 - ocaml-mccs ocaml-opam-file-format ocaml-re)) + (inputs (list ocaml-opam-client)) (properties ;; OPAM is used as a tool and not as a library, we can use the OCaml 4.14 ;; compiled opam until opam is compatible with OCaml 5.0. - `((ocaml5.0-variant . ,(delay opam)))) - (home-page "https://opam.ocamlpro.com/") - (synopsis "Package manager for OCaml") - (description - "OPAM is a tool to manage OCaml packages. It supports multiple -simultaneous compiler installations, flexible package constraints, and a -Git-friendly development workflow.") - - ;; The 'LICENSE' file waives some requirements compared to LGPLv3. - (license license:lgpl3))) + `((ocaml5.0-variant . ,(delay opam)))))) (define-public ocaml-opam-monorepo (package @@ -2204,7 +2312,7 @@ (define-public ocaml-topkg "11ycfk0prqvifm9jca2308gw8a6cjb1hqlgfslbji2cqpan09kpq")))) (build-system ocaml-build-system) (native-inputs - (list opam ocamlbuild)) + (list opam-installer ocamlbuild)) (propagated-inputs `(("result" ,ocaml-result))) (arguments @@ -2234,7 +2342,7 @@ (define-public ocaml-rresult "0h2mjyzhay1p4k7n0mzaa7hlc7875kiy6m1i3r1n03j6hddpzahi")))) (build-system ocaml-build-system) (native-inputs - (list opam ocamlbuild)) + (list opam-installer ocamlbuild)) (propagated-inputs `(("topkg" ,ocaml-topkg))) (arguments @@ -2349,7 +2457,7 @@ (define-public ocaml-mtime "1ss4w3qxsfp51d88r0j7dzqs05dbb1xdx11hn1jl9cvd03ma0g9z")))) (build-system ocaml-build-system) (native-inputs - (list ocamlbuild opam)) + (list ocamlbuild opam-installer)) (propagated-inputs `(("topkg" ,ocaml-topkg))) (arguments @@ -2479,13 +2587,13 @@ (define-public ocaml-fmt "0q8j2in2473xh7k4hfgnppv9qy77f2ih89yp6yhpbp92ba021yzi")))) (build-system ocaml-build-system) (native-inputs - `(("ocamlbuild" ,ocamlbuild) - ("opam" ,opam) - ("topkg" ,ocaml-topkg))) + (list ocamlbuild + opam-installer + ocaml-topkg)) (propagated-inputs - `(("cmdliner" ,ocaml-cmdliner) - ("ocaml-stdlib-shims" ,ocaml-stdlib-shims) - ("ocaml-uchar" ,ocaml-uchar))) + (list ocaml-cmdliner + ocaml-stdlib-shims + ocaml-uchar)) (arguments `(#:tests? #f #:build-flags (list "build" "--with-base-unix" "true" "--with-cmdliner" "true") @@ -2526,9 +2634,9 @@ (define-public ocaml-astring "1ykhg9gd3iy7zsgyiy2p9b1wkpqg9irw5pvcqs3sphq71iir4ml6")))) (build-system ocaml-build-system) (native-inputs - `(("ocamlbuild" ,ocamlbuild) - ("opam" ,opam) - ("topkg" ,ocaml-topkg))) + (list ocamlbuild + opam-installer + ocaml-topkg)) (arguments `(#:tests? #f #:build-flags (list "build") @@ -2748,7 +2856,7 @@ (define-public ocaml-react "16cg4byj8lfbbw96dhh8sks5y9n1c3fshz7f2p8m7wgisqax7bf4")))) (build-system ocaml-build-system) (native-inputs - (list ocamlbuild opam ocaml-topkg)) + (list ocamlbuild opam-installer ocaml-topkg)) (arguments `(#:tests? #f #:build-flags (list "build") @@ -2872,7 +2980,7 @@ (define-public ocaml-hmap #:phases (modify-phases %standard-phases (delete 'configure)))) - (native-inputs (list ocaml-topkg ocamlbuild opam)) + (native-inputs (list ocaml-topkg ocamlbuild opam-installer)) (home-page "https://erratique.ch/software/hmap") (synopsis "Heterogeneous value maps for OCaml") (description @@ -3334,7 +3442,7 @@ (define-public ocaml-logs (modify-phases %standard-phases (delete 'configure)))) (native-inputs - (list ocamlbuild opam)) + (list ocamlbuild opam-installer)) (propagated-inputs `(("fmt" ,ocaml-fmt) ("lwt" ,ocaml-lwt) @@ -3368,7 +3476,7 @@ (define-public ocaml-fpath (modify-phases %standard-phases (delete 'configure)))) (native-inputs - (list ocamlbuild opam)) + (list ocamlbuild opam-installer)) (propagated-inputs `(("topkg" ,ocaml-topkg) ("astring" ,ocaml-astring))) @@ -3398,7 +3506,7 @@ (define-public ocaml-bos (modify-phases %standard-phases (delete 'configure)))) (native-inputs - (list ocamlbuild opam)) + (list ocamlbuild opam-installer)) (propagated-inputs `(("topkg" ,ocaml-topkg) ("astring" ,ocaml-astring) @@ -3472,7 +3580,7 @@ (define-public ocaml-xmlm (modify-phases %standard-phases (delete 'configure)))) (native-inputs - (list ocamlbuild ocaml-topkg opam)) + (list ocamlbuild ocaml-topkg opam-installer)) (home-page "https://erratique.ch/software/xmlm") (synopsis "Streaming XML codec for OCaml") (description "Xmlm is a streaming codec to decode and encode the XML data @@ -3613,7 +3721,7 @@ (define-public ocaml-uchar (modify-phases %standard-phases (delete 'configure)))) (native-inputs - (list ocamlbuild opam)) + (list ocamlbuild opam-installer)) (home-page "https://github.com/ocaml/uchar") (synopsis "Compatibility library for OCaml's Uchar module") (description "The uchar package provides a compatibility library for the @@ -3639,9 +3747,9 @@ (define-public ocaml-uutf (modify-phases %standard-phases (delete 'configure)))) (native-inputs - `(("ocamlbuild" ,ocamlbuild) - ("opam" ,opam) - ("topkg" ,ocaml-topkg))) + (list ocamlbuild + opam-installer + ocaml-topkg)) (propagated-inputs `(("uchar" ,ocaml-uchar) ("cmdliner" ,ocaml-cmdliner))) @@ -3686,7 +3794,7 @@ (define-public ocaml-uunf #t))))) (native-inputs `(("ocamlbuild" ,ocamlbuild) - ("opam" ,opam) + ("opam-installer" ,opam-installer) ("topkg" ,ocaml-topkg) ;; Test data is otherwise downloaded with curl ("NormalizationTest.txt" @@ -3727,9 +3835,9 @@ (define-public ocaml-jsonm (modify-phases %standard-phases (delete 'configure)))) (native-inputs - `(("ocamlbuild" ,ocamlbuild) - ("opam" ,opam) - ("topkg" ,ocaml-topkg))) + (list ocamlbuild + opam-installer + ocaml-topkg)) (propagated-inputs `(("uutf" ,ocaml-uutf) ("cmdliner" ,ocaml-cmdliner))) @@ -4147,7 +4255,7 @@ (define-public ocaml-ptime #:phases (modify-phases %standard-phases (delete 'configure)))) (propagated-inputs (list ocaml-result js-of-ocaml)) - (native-inputs (list ocaml-findlib ocamlbuild ocaml-topkg opam)) + (native-inputs (list ocaml-findlib ocamlbuild ocaml-topkg opam-installer)) (home-page "https://erratique.ch/software/ptime") (synopsis "POSIX time for OCaml") (description @@ -5154,7 +5262,7 @@ (define-public ocaml-uuidm (modify-phases %standard-phases (delete 'configure)))) (native-inputs - (list ocamlbuild opam)) + (list ocamlbuild opam-installer)) (propagated-inputs `(("cmdliner" ,ocaml-cmdliner) ("topkg" ,ocaml-topkg))) @@ -5771,12 +5879,8 @@ (define-public ocaml-ocb-stubblr ;; Guix doesn't have cc, but it has gcc (("\"cc\"") "\"gcc\"")) #t))))) - (inputs - `(("topkg" ,ocaml-topkg) - ("opam" ,opam))) - (native-inputs - `(("astring" ,ocaml-astring) - ("ocamlbuild" ,ocamlbuild))) + (inputs (list ocaml-topkg opam-installer)) + (native-inputs (list ocaml-astring ocamlbuild)) (synopsis "OCamlbuild plugin for C stubs") (description "Ocb-stubblr is about ten lines of code that you need to repeat over, over, over and over again if you are using ocamlbuild to build @@ -5804,7 +5908,7 @@ (define-public ocaml-tsdl (modify-phases %standard-phases (delete 'configure)))) (native-inputs - (list ocamlbuild ocaml-astring opam pkg-config)) + (list ocamlbuild ocaml-astring opam-installer pkg-config)) (inputs `(("topkg" ,ocaml-topkg) ("sdl2" ,sdl2) @@ -9524,7 +9628,7 @@ (define-public ocaml-uucd (propagated-inputs (list ocaml-xmlm)) (native-inputs - (list opam ocaml-findlib ocamlbuild ocaml-topkg)) + (list opam-installer ocaml-findlib ocamlbuild ocaml-topkg)) (home-page "https://erratique.ch/software/uucd") (synopsis "Unicode character database decoder for OCaml") (description "Uucd is an OCaml module to decode the data of the Unicode @@ -9552,7 +9656,7 @@ (define-public ocaml-uucp (modify-phases %standard-phases (delete 'configure)))) (native-inputs - (list opam + (list opam-installer ocaml-findlib ocamlbuild ocaml-topkg @@ -9586,7 +9690,7 @@ (define-public ocaml-uuseg (propagated-inputs (list ocaml-uucp ocaml-uutf ocaml-cmdliner)) (native-inputs - (list opam ocaml-findlib ocamlbuild ocaml-topkg)) + (list opam-installer ocaml-findlib ocamlbuild ocaml-topkg)) (home-page "https://erratique.ch/software/uuseg") (synopsis "Unicode text segmentation for OCaml") (description "Uuseg is an OCaml library for segmenting Unicode text. It @@ -10047,8 +10151,7 @@ (define-public ocaml-afl-persistent (invoke "./build.sh"))) ;; XXX: The tests are already run in the build.sh script. (delete 'check)))) - (native-inputs - `(("opam" ,opam))) + (native-inputs (list opam-installer)) (home-page "https://github.com/stedolan/ocaml-afl-persistent") (synopsis "Use afl-fuzz in persistent mode") (description From patchwork Tue Oct 24 16:00:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 55328 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 0CC2627BBE2; Tue, 24 Oct 2023 17:03:58 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5DE7827BBEC for ; Tue, 24 Oct 2023 17:03:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvJsD-0006Ej-Rk; Tue, 24 Oct 2023 12:03:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qvJrY-00056U-PQ for guix-patches@gnu.org; Tue, 24 Oct 2023 12:02:41 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qvJrY-0004Fw-9r for guix-patches@gnu.org; Tue, 24 Oct 2023 12:02:36 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qvJs1-0004mg-T4; Tue, 24 Oct 2023 12:03:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v7 12/12] gnu: opam: Update to 2.1.5. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Tue, 24 Oct 2023 16:03:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.169816333118232 (code B ref 64249); Tue, 24 Oct 2023 16:03:05 +0000 Received: (at 64249) by debbugs.gnu.org; 24 Oct 2023 16:02:11 +0000 Received: from localhost ([127.0.0.1]:56443 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJr8-0004js-2k for submit@debbugs.gnu.org; Tue, 24 Oct 2023 12:02:11 -0400 Received: from mout02.posteo.de ([185.67.36.66]:36381) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJqy-0004h3-DV for 64249@debbugs.gnu.org; Tue, 24 Oct 2023 12:02:02 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 20272240104 for <64249@debbugs.gnu.org>; Tue, 24 Oct 2023 18:01:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1698163285; bh=5QaFe8/8tXgDuFZ43JDl3get8oHrPxnnIwXf9g4Jm9A=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=b4TIdzddTvqap0H4exR/j0VR0EjtG4Z97dw/4Raky5Wuby0N0wJN77SLI6zESLSKh QRlrJgv4Caqv209R/67WmHXNdRC7Y/I0pd8j1AW8Hg77NWXuypivBGTb087pX6d+O7 6HwM7jkD97Sr7NM4pQrJK67h21YYRWurINEk0Z/crmNB4a1YVTo+gWyVuegK1e5oKQ tV5btijWVabSqN0ie4nwi5F3y5hDt/wRoOj5oILYQ9iwSTf3LNiTgjd6V++NAzw/hx 5RUd5aC3AAPooG206CuwJGy4A70oBLIoRTC2yqBgLPPJhb+VNg0AhqvQ6hDbgBBqwX UZYwfJxLB1XYA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SFGyD32pjz9rxK; Tue, 24 Oct 2023 18:01:24 +0200 (CEST) From: pukkamustard Date: Tue, 24 Oct 2023 16:00:15 +0000 Message-ID: In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (opam): Update to 2.1.5. [native-inputs]: Add more test data. [arguments]: Disable failing test. (ocaml-graph): Update to 2.0.0. (ocaml-dose3): Update to 7.0.0. * gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch: Remove. * gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch: Remove. * gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch: Remove. * gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch: Remove. * gnu/local.mk (dist_path_DATA): Unregister removed patches. --- gnu/local.mk | 4 - gnu/packages/ocaml.scm | 132 +++++++++-------- .../ocaml-dose3-Fix-for-ocaml-4.06.patch | 52 ------- .../ocaml-dose3-Install-mli-cmx-etc.patch | 133 ------------------ .../ocaml-dose3-add-unix-dependency.patch | 25 ---- .../ocaml-dose3-dont-make-printconf.patch | 9 -- 6 files changed, 74 insertions(+), 281 deletions(-) delete mode 100644 gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch delete mode 100644 gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch delete mode 100644 gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch delete mode 100644 gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch diff --git a/gnu/local.mk b/gnu/local.mk index ffb8082eec..508be95479 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1689,10 +1689,6 @@ dist_patch_DATA = \ %D%/packages/patches/nvi-db4.patch \ %D%/packages/patches/nyacc-binary-literals.patch \ %D%/packages/patches/obs-modules-location.patch \ - %D%/packages/patches/ocaml-dose3-add-unix-dependency.patch \ - %D%/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch \ - %D%/packages/patches/ocaml-dose3-dont-make-printconf.patch \ - %D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch \ %D%/packages/patches/ocaml-multiple-definitions.patch \ %D%/packages/patches/ocaml-4.07-dynamically-allocate-signal-stack.patch \ %D%/packages/patches/ocaml-4.09-dynamically-allocate-signal-stack.patch \ diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index eccc870c08..0500ab5693 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -713,7 +713,7 @@ (define-public ocaml-mccs (define-public ocaml-dose3 (package (name "ocaml-dose3") - (version "5.0.1") + (version "7.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -722,29 +722,16 @@ (define-public ocaml-dose3 (file-name (git-file-name name version)) (sha256 (base32 - "0dxkw37gj8z45kd0dnrlfgpj8yycq0dphs8kjm9kvq9xc8rikxp3")) - (patches - (search-patches - "ocaml-dose3-add-unix-dependency.patch" - "ocaml-dose3-Fix-for-ocaml-4.06.patch" - "ocaml-dose3-dont-make-printconf.patch" - "ocaml-dose3-Install-mli-cmx-etc.patch")))) - (build-system ocaml-build-system) - (arguments - `(#:tests? #f ;the test suite requires python 2 - #:configure-flags - ,#~(list (string-append "SHELL=" - #+(file-append (canonical-package bash-minimal) - "/bin/sh"))) - #:make-flags - ,#~(list (string-append "LIBDIR=" #$output "/lib/ocaml/site-lib")))) - (propagated-inputs - (list ocaml-graph ocaml-cudf ocaml-extlib ocaml-re)) - (native-inputs - (list perl - ocaml-extlib - ocamlbuild - ocaml-cppo)) + "0hcjh68svicap7j9bghgkp49xa12qhxa1pygmrgc9qwm0m4dhirb")))) + (build-system dune-build-system) + (arguments `(#:package "dose3")) + (propagated-inputs (list ocaml-extlib + ocaml-base64-boot + ocaml-cudf + ocaml-graph + ocaml-re + ocaml-stdlib-shims)) + (native-inputs (list ocaml-ounit)) (home-page "https://www.mancoosi.org/software/") (synopsis "Package distribution management framework") (description "Dose3 is a framework made of several OCaml libraries for @@ -849,7 +836,7 @@ (define-public ocaml-opam-file-format (define ocaml-opam-core (package (name "ocaml-opam-core") - (version "2.1.3") + (version "2.1.5") (source (origin (method git-fetch) (uri (git-reference @@ -858,7 +845,7 @@ (define ocaml-opam-core (file-name (git-file-name name version)) (sha256 (base32 - "1mw535zsw7xlvpgwnk1dan76z3f7lh5imlg0s6kdyhfg0iqisjd7")))) + "0ckd87rcmcz11iyhhm5qnmy27jbdffx6n1fr06hvrqqrzi00jljh")))) (build-system dune-build-system) (arguments `(#:package "opam-core" ;; tests are run with the opam package @@ -1037,7 +1024,10 @@ (define-public opam (("diff opamroot-versions.test opamroot-versions.out") "run true") ;; Disable a failing test, probably because the repository we ;; replaced is not as expected - (("diff opamrt-big-upgrade.test opamrt-big-upgrade.out") "run true")) + (("diff opamrt-big-upgrade.test opamrt-big-upgrade.out") "run true") + ;; Disable a failing test because of missing sandboxing + ;; functionality + (("diff init.test init.out") "run true")) (substitute* "tests/reftests/dune" ;; Because of our changes to the previous file, we cannot check ;; it can be regenerated @@ -1073,18 +1063,42 @@ (define-public opam ("which" ,which) ;; Data for tests - ("opam-repo-009e00fa" ,(opam-repo "009e00fa86300d11c311309a2544e5c6c3eb8de2" - "1wwy0rwrsjf4q10j1rh1dazk32fbzhzy6f7zl6qmndidx9b1bq7w")) - ("opam-repo-7090735c" ,(opam-repo "7090735c9d1dd2dc481c4128c5ef4d3667238f15" - "1bccsgjhlp64lmvfjfn6viywf3x73ji75myg9ssf1ij1fkmabn0z")) - ("opam-repo-a5d7cdc0" ,(opam-repo "a5d7cdc0c91452b0aef4fa71c331ee5237f6dddd" - "0z7kawqisy07088p5xjxwpvmvzlbj1d9cgdipsj90yx7nc5qh369")) - ("opam-repo-ad4dd344" ,(opam-repo "ad4dd344fe5cd1cab49ced49d6758a9844549fb4" - "1a1qj47kj8xjdnc4zc50ijrix1kym1n7k20n3viki80a7518baw8")) - ("opam-repo-c1d23f0e" ,(opam-repo "c1d23f0e17ec83a036ebfbad1c78311b898a2ca0" - "0j9abisx3ifzm66ci3p45mngmz4f0fx7yd9jjxrz3f8w5jffc9ii")) - ("opam-repo-f372039d" ,(opam-repo "f372039db86a970ef3e662adbfe0d4f5cd980701" - "0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws"))))) + ("opam-repo-0070613707" + ,(opam-repo "00706137074d536d2019d2d222fbe1bea929deda" + "1gv1vvmfscj7wirfv6qncp8pf81wygnpzjwd0lyqcxm7g8r8lb4w")) + ("opam-repo-009e00fa" + ,(opam-repo "009e00fa86300d11c311309a2544e5c6c3eb8de2" + "1wwy0rwrsjf4q10j1rh1dazk32fbzhzy6f7zl6qmndidx9b1bq7w")) + ("opam-repo-7090735c" + ,(opam-repo "7090735c9d1dd2dc481c4128c5ef4d3667238f15" + "1bccsgjhlp64lmvfjfn6viywf3x73ji75myg9ssf1ij1fkmabn0z")) + ("opam-repo-a5d7cdc0" + ,(opam-repo "a5d7cdc0c91452b0aef4fa71c331ee5237f6dddd" + "0z7kawqisy07088p5xjxwpvmvzlbj1d9cgdipsj90yx7nc5qh369")) + ("opam-repo-ad4dd344" + ,(opam-repo "ad4dd344fe5cd1cab49ced49d6758a9844549fb4" + "1a1qj47kj8xjdnc4zc50ijrix1kym1n7k20n3viki80a7518baw8")) + ("opam-repo-c1842d168d" + ,(opam-repo "c1842d168de956caf06d7ac8588e65020d7594d8" + "142y1ac7sprygyh91shcp0zcyfxjjkshi9g44qgg4rx60rbsbhai")) + ("opam-repo-c1d23f0e" + ,(opam-repo "c1d23f0e17ec83a036ebfbad1c78311b898a2ca0" + "0j9abisx3ifzm66ci3p45mngmz4f0fx7yd9jjxrz3f8w5jffc9ii")) + ("opam-repo-f372039d" + ,(opam-repo "f372039db86a970ef3e662adbfe0d4f5cd980701" + "0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws")) + ("opam-repo-11ea1cb" + ,(opam-repo "11ea1cb6f2418b1f8a6679e4422771a04c9c3655" + "1s4p0wfn3bx97yvm8xvj3yhzv2pz0jwml68g2ybv37hj9mpbrsq0")) + ("opam-repo-297366c" + ,(opam-repo "297366cd01c3aaf29b967bf0b34ccc7989d4d5b3" + "1ysg69gys37nc2cxivs2ikh6xp0gj85if4rcrr874mqb9z12dm0j")) + ("opam-repo-3235916" + ,(opam-repo "3235916a162a59d7c82dac3fe24214975d48f1aa" + "1yf73rv2n740a4s9g7a9k4j91b4k7al88nwnw9cdw0k2ncbmr486")) + ("opam-repo-de897adf36c4230dfea812f40c98223b31c4521a" + ,(opam-repo "de897adf36c4230dfea812f40c98223b31c4521a" + "1m18x9gcwnbar8yv9sbfz8a3qpw412fp9cf4d6fb7syn0p0h96jw"))))) (inputs (list ocaml-opam-client)) (properties ;; OPAM is used as a tool and not as a library, we can use the OCaml 4.14 @@ -4409,8 +4423,7 @@ (define-public ocaml-base64 (base32 "068hwdbpl7vx9jjpxdc6a10zqd8xa55j3xx7ga6fnwrlfsbs2pjj")))) (build-system dune-build-system) - (native-inputs - (list ocaml-alcotest ocaml-bos ocaml-rresult)) + (native-inputs (list ocaml-alcotest ocaml-bos ocaml-rresult)) (properties `((ocaml4.07-variant . ,(delay ocaml4.07-base64)))) (home-page "https://github.com/mirage/ocaml-base64") (synopsis "Base64 encoding for OCaml") @@ -4419,6 +4432,14 @@ (define-public ocaml-base64 radix-64 representation. It is specified in RFC 4648.") (license license:isc))) +;; A variant without tests that is used to prevent a cyclic dependency when +;; compiling ocaml-dose3. +(define ocaml-base64-boot + (package + (inherit ocaml-base64) + (arguments `(#:tests? #f)) + (native-inputs '()))) + (define-public ocaml4.07-base64 (package-with-ocaml4.07 (package @@ -5291,27 +5312,22 @@ (define-public ocaml4.07-uuidm (define-public ocaml-graph (package (name "ocaml-graph") - (version "1.8.8") + (home-page "https://github.com/backtracking/ocamlgraph/") + (version "2.0.0") (source (origin - (method url-fetch) - (uri (string-append "http://ocamlgraph.lri.fr/download/" - "ocamlgraph-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0m9g16wrrr86gw4fz2fazrh8nkqms0n863w7ndcvrmyafgxvxsnr")))) - (build-system ocaml-build-system) - (arguments - `(#:install-target "install-findlib" - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-before 'configure 'set-shell - (lambda* (#:key inputs #:allow-other-keys) - (setenv "CONFIG_SHELL" - (search-input-file inputs "/bin/sh"))))))) - (inputs (list lablgtk)) + "1gjrsyyamvvn2rd9n9yjx6hsglhw0dbm4cgazq0dpx0bbr4inwc3")))) + (build-system dune-build-system) + (arguments `(#:package "ocamlgraph")) + (propagated-inputs (list ocaml-stdlib-shims)) + (native-inputs (list ocaml-graphics)) (properties `((upstream-name . "ocamlgraph"))) - (home-page "https://ocamlgraph.lri.fr/") (synopsis "Graph library for OCaml") (description "OCamlgraph is a generic graph library for OCaml.") (license license:lgpl2.1))) diff --git a/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch b/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch deleted file mode 100644 index 2c344af821..0000000000 --- a/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch +++ /dev/null @@ -1,52 +0,0 @@ -From aeca7656f499d7f4595319858f242276920e31bb Mon Sep 17 00:00:00 2001 -From: Louis Gesbert -Date: Sat, 2 Dec 2017 12:51:01 +0100 -Subject: [PATCH] Fix for ocaml 4.06 - ---- - common/criteria_lexer.mll | 8 ++++---- - common/util.ml | 2 +- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/common/criteria_lexer.mll b/common/criteria_lexer.mll -index 71f9178..fc4eae3 100644 ---- a/common/criteria_lexer.mll -+++ b/common/criteria_lexer.mll -@@ -18,7 +18,7 @@ - let c = Lexing.lexeme_char lexbuf 2 in (* the delimiter can be any character *) - (* find the terminating delimiter *) - let endpos = -- try String.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with -+ try Bytes.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with - |Invalid_argument _ -> - raise (Format822.Syntax_error ( - Format822.error lexbuf "String too short")) -@@ -27,9 +27,9 @@ - Format822.error lexbuf (Printf.sprintf "cannot find: %c" c))) - in - let len = endpos - (lexbuf.lex_start_pos + 3) in -- let s = String.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in -- lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((String.length s)+4); -- s -+ let s = Bytes.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in -+ lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((Bytes.length s)+4); -+ Bytes.to_string s - - } - -diff --git a/common/util.ml b/common/util.ml -index 598f266..36ca3d1 100644 ---- a/common/util.ml -+++ b/common/util.ml -@@ -87,7 +87,7 @@ module MakeMessages(X : sig val label : string end) = struct - let clean label = - try - let s = Filename.chop_extension (Filename.basename label) in -- String.capitalize s -+ String.capitalize_ascii s - with Invalid_argument _ -> label - - let create ?(enabled=false) label = --- -2.11.0 - diff --git a/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch b/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch deleted file mode 100644 index 41494e7b3c..0000000000 --- a/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch +++ /dev/null @@ -1,133 +0,0 @@ -From b5314c20d8e3caf62fe0dc96ad937a2950158b23 Mon Sep 17 00:00:00 2001 -From: Louis Gesbert -Date: Thu, 2 Mar 2017 12:19:56 +0100 -Subject: [PATCH] Install mli, cmx, etc. - ---- - Makefile | 26 +++++++++++++------------- - 1 file changed, 13 insertions(+), 13 deletions(-) - -diff --git a/Makefile b/Makefile -index 09464ff..5044d7f 100644 ---- a/Makefile -+++ b/Makefile -@@ -56,7 +56,7 @@ $(DOSELIBS)/cudf.%: - @for i in _build/cudf/cudf.*; do \ - if [ -e $$i ]; then \ - cp $$i $(DOSELIBS) ; \ -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ -+ rm -f $(DOSELIBS)/*.mlpack ; \ - fi ; \ - done - -@@ -67,7 +67,7 @@ $(DOSELIBS)/common.%: common/*.ml common/*.mli - if [ -e $$i ]; then \ - cp $$i $(DOSELIBS) ; \ - rm $$i ;\ -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ -+ rm -f $(DOSELIBS)/*.mlpack ; \ - fi ; \ - done - -@@ -78,7 +78,7 @@ $(DOSELIBS)/versioning.%: versioning/*.ml versioning/*.mli - if [ -e $$i ]; then \ - cp $$i $(DOSELIBS) ; \ - rm $$i ;\ -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ -+ rm -f $(DOSELIBS)/*.mlpack ; \ - fi ; \ - done - -@@ -88,7 +88,7 @@ $(DOSELIBS)/algo.%: algo/*.ml algo/*.mli $(DOSELIBS)/common.% - if [ -e $$i ]; then \ - cp $$i $(DOSELIBS) ; \ - rm $$i ;\ -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ -+ rm -f $(DOSELIBS)/*.mlpack ; \ - fi ; \ - done - -@@ -98,7 +98,7 @@ $(DOSELIBS)/debian.%: deb/*.ml deb/*.mli $(DOSELIBS)/pef.% - if [ -e $$i ]; then \ - cp $$i $(DOSELIBS) ; \ - rm $$i ;\ -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ -+ rm -f $(DOSELIBS)/*.mlpack ; \ - fi ; \ - done - -@@ -108,7 +108,7 @@ $(DOSELIBS)/opam.%: opam/*.ml opam/*.mli $(DOSELIBS)/pef.% - if [ -e $$i ]; then \ - cp $$i $(DOSELIBS) ; \ - rm $$i ;\ -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ -+ rm -f $(DOSELIBS)/*.mlpack ; \ - fi ; \ - done - -@@ -118,7 +118,7 @@ $(DOSELIBS)/npm.%: npm/*.ml npm/*.mli $(DOSELIBS)/versioning.% $(DOSELIBS)/pef.% - if [ -e $$i ]; then \ - cp $$i $(DOSELIBS) ; \ - rm $$i ;\ -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ -+ rm -f $(DOSELIBS)/*.mlpack ; \ - fi ; \ - done - -@@ -128,7 +128,7 @@ $(DOSELIBS)/rpm.%: rpm/*.ml $(DOSELIBS)/algo.% - if [ -e $$i ]; then \ - cp $$i $(DOSELIBS) ; \ - rm $$i ;\ -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ -+ rm -f $(DOSELIBS)/*.mlpack ; \ - fi ; \ - done - -@@ -138,7 +138,7 @@ $(DOSELIBS)/pef.%: pef/*.ml pef/*.mli - if [ -e $$i ]; then \ - cp $$i $(DOSELIBS) ; \ - rm $$i ;\ -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ -+ rm -f $(DOSELIBS)/*.mlpack ; \ - fi ; \ - done - -@@ -148,7 +148,7 @@ $(DOSELIBS)/csw.%: opencsw/*.ml $(DOSELIBS)/versioning.% - if [ -e $$i ]; then \ - cp $$i $(DOSELIBS) ; \ - rm $$i ;\ -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ -+ rm -f $(DOSELIBS)/*.mlpack ; \ - fi ; \ - done - -@@ -158,7 +158,7 @@ $(DOSELIBS)/doseparse.%: $(DOSELIBS)/pef.% $(DOSELIBS)/debian.% - if [ -e $$i ]; then \ - cp $$i $(DOSELIBS) ; \ - rm $$i ;\ -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx $(DOSELIBS)/*.ml ; \ -+ rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.ml ; \ - fi ; \ - done - -@@ -168,7 +168,7 @@ $(DOSELIBS)/doseparseNoRpm.%: $(DOSELIBS)/pef.% $(DOSELIBS)/debian.% - if [ -e $$i ]; then \ - cp $$i $(DOSELIBS) ;\ - rm $$i ;\ -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ;\ -+ rm -f $(DOSELIBS)/*.mlpack ;\ - fi ; \ - done - -@@ -223,7 +223,7 @@ INSTALL_STUFF_ = META - INSTALL_STUFF_ += $(wildcard _build/doselibs/*.cma _build/doselibs/*.cmi) - INSTALL_STUFF_ += $(wildcard _build/doselibs/*.cmxa _build/doselibs/*.cmxs) - INSTALL_STUFF_ += $(wildcard _build/doselibs/*.a) --#INSTALL_STUFF_ += $(wildcard _build/*/*.mli) -+INSTALL_STUFF_ += $(wildcard _build/doselibs/*.mli) $(wildcard _build/doselibs/*.cmti) $(wildcard _build/doselibs/*.cmx) - INSTALL_STUFF_ += $(wildcard _build/rpm/*.so) - - exclude_cudf = $(wildcard _build/doselibs/*cudf* _build/cudf/*) --- -2.11.0 - diff --git a/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch b/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch deleted file mode 100644 index d2cc44c784..0000000000 --- a/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b94cf24739818e5aff397e0a83b19ea32dc81f42 Mon Sep 17 00:00:00 2001 -From: Louis Gesbert -Date: Tue, 6 Feb 2018 10:15:45 +0100 -Subject: [PATCH 3/3] Add "unix" as dependency to dose3.common in META.in - ---- - META.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/META.in b/META.in -index aa2cd8d..0f9d337 100644 ---- a/META.in -+++ b/META.in -@@ -8,7 +8,7 @@ package "common" ( - version = "@PACKAGE_VERSION@" - archive(byte) = "common.cma" - archive(native) = "common.cmxa" --requires = "extlib, re.pcre, cudf, @ZIP@, @BZ2@" -+requires = "extlib, re.pcre, cudf, unix, @ZIP@, @BZ2@" - ) - - package "algo" ( --- -2.11.0 - diff --git a/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch b/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch deleted file mode 100644 index 84b6a3b81b..0000000000 --- a/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/configure -+++ b/configure -@@ -6552,6 +6552,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 - $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} - fi -- -- --make printconf