From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 23 09:44:18 2023 Received: (at submit) by debbugs.gnu.org; 23 Jun 2023 13:44:18 +0000 Received: from localhost ([127.0.0.1]:37888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCh5F-0006yg-N8 for submit@debbugs.gnu.org; Fri, 23 Jun 2023 09:44:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:44584) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCh5A-0006yV-3w for submit@debbugs.gnu.org; Fri, 23 Jun 2023 09:44:16 -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 1qCh59-0007VM-PI for guix-patches@gnu.org; Fri, 23 Jun 2023 09:44:11 -0400 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCh57-0002jO-FB for guix-patches@gnu.org; Fri, 23 Jun 2023 09:44:11 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id AE76624002A for ; Fri, 23 Jun 2023 15:44:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687527840; bh=PvS3361pzwNR1ioiSyUNT87kOFCRqgi0r49fGuav/D4=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=R7zvvvhiGavswTfRjcHnA3Q6yRMbpg7HqkpNS70/NJ26lwHHI6N8DosH0N3aihRJi DQfGdT0h1PvhrLM9sJ2+lWSQaGreu98yexqpRP0wQrkafuMvmadRfHVK1s7S16SAIJ wDSrIDOQ7MsE/Y5CU9fKjjF6KocrBm+SMhk6WACIJo/BUPCoZrZCL7HlkW58GL/VNi 43DoHdtRYFk3euJXAtcIKzrNpW8VBtJmoEF1IgBoe3NDwH3EXpr/B3C/CGjfW7U1p1 PmsN25ePRE85zxzxhfyIEOV/N75tAZEhB4JndAsbjIjkAhUJN6h7pRW/yDRgOkWtCA gIK/IzMiEZ12A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QndkS1PPqz6tsB; Fri, 23 Jun 2023 15:44:00 +0200 (CEST) From: pukkamustard To: guix-patches@gnu.org Subject: [PATCH ocaml-team 1/2] gnu: ocaml: Update to 4.14.1. Date: Fri, 23 Jun 2023 13:43:38 +0000 Message-Id: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.65; envelope-from=pukkamustard@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * 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 ab0aa0574a..6ffde41cc0 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 base-commit: 6e1215fb9c03ccb4a2d4440990aee5a66a935268 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 23 09:46:49 2023 Received: (at 64249) by debbugs.gnu.org; 23 Jun 2023 13:46:49 +0000 Received: from localhost ([127.0.0.1]:37895 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCh7g-00073J-Sw for submit@debbugs.gnu.org; Fri, 23 Jun 2023 09:46:49 -0400 Received: from mout01.posteo.de ([185.67.36.65]:50527) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCh7f-000736-64 for 64249@debbugs.gnu.org; Fri, 23 Jun 2023 09:46:48 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id E94CB240027 for <64249@debbugs.gnu.org>; Fri, 23 Jun 2023 15:46:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687528000; bh=PtkNjpERXsMbyAn8bdVY2yLQ/1v7TYGUOaH/abi3USA=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=KqgblMBfLZ5dGNRyagvi+LQfocwLak2+MWHMxuHg/ab4aTHoK36ygMhJftwBDRuBx AMo/5VftRFbfQhMSMkvrFK+pr+JoSPnH9kXz/5Wwmax67LbjXVLhzoDQGJQHWbPCOl J0YOKlD7EYqmY1sHFA07GsB6m3HadCiuyEO6BxQtn73q6gtsJnbmRM8As7bSI/vtnA sMJA0cso81GuB/dAYUgvz31g2jqfHSYmffNSe2SYerzc6YxOZp+LZPUiGFDEDGEjle 9VrUlK8J+uyMDVoIb2/majTQHDqunuC+TxiVGzORZiQ78zQTwaix59Mgj9gYJAtPIL HEn38lgJNdjbA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QndnX13NLz9rxS; Fri, 23 Jun 2023 15:46:40 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team 2/2] gnu: dune-bootstrap: Update to 3.8.2. Date: Fri, 23 Jun 2023 13:46:28 +0000 Message-Id: <6e376acaf2b79d5c0c34820275528549da85757d.1687527699.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (dune-bootstrap): Update to 3.8.2. [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 6ffde41cc0..8d7c0d60a8 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1819,7 +1819,7 @@ (define-public ocaml-stringext (define dune-bootstrap (package (name "dune") - (version "3.6.1") + (version "3.8.2") (source (origin (method git-fetch) (uri (git-reference @@ -1828,7 +1828,7 @@ (define dune-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "0gv851wxbv5ln20429nj7p92spzxgw8vngg9z94q39aawn6q8lx6")))) + "02f8wrqhflgvd1gz3y181r9kmlpqmrc8az902ndihyvg58xxi83r")))) (build-system ocaml-build-system) (arguments `(#:tests? #f; require odoc @@ -1845,9 +1845,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 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 15 13:39:03 2023 Received: (at 64249) by debbugs.gnu.org; 15 Jul 2023 17:39:03 +0000 Received: from localhost ([127.0.0.1]:45958 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKjEU-0006st-J6 for submit@debbugs.gnu.org; Sat, 15 Jul 2023 13:39:02 -0400 Received: from mout01.posteo.de ([185.67.36.65]:35137) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKjER-0006rq-V7 for 64249@debbugs.gnu.org; Sat, 15 Jul 2023 13:39:01 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id D07A1240028 for <64249@debbugs.gnu.org>; Sat, 15 Jul 2023 19:38:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1689442733; bh=pMcSoZ7W+E2JwybeZIxM9QwuafJbId4Y/+ij1Frn3PY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=icBkqgd+UbYAblc3OWSNFnPgfpKQ5Iy91oqHTSffA2B8BBs8mwIK0vT4JzTSn9aYE wEqi/HiCdAH6m7V56xbAH8oVHVlCV2FK67SbdmV1l8Xa75xCPs1+trfeJ/6XqiYa09 vRuUCghhoTCYv3lAVHzt+xDP9ht+kZVa866afNU3BPpYh2sZHEvYk6oTeY/olIG8Ir EwcKRWldwTJdAJDV2WrPA8KsLsr8HVQOvX9OdMOOwVFh/lcCyz/Bzv4zkzpmntn8Eu zyPzS/PZd7j/se8OhMrq0+UHT+nsWsQD0OFGeL47g72FmhSo44AmFuKaJ/tuZ13cES yKPi8CqdSA35g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4R3FvK1nclz9rxN; Sat, 15 Jul 2023 19:38:52 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v2 0/7] Attempt to update ocaml, coq, dune and opam. Date: Sat, 15 Jul 2023 17:38:27 +0000 Message-Id: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello Guix, This is a WIP v2 for some updates to the OCaml packages. See also https://lists.gnu.org/archive/html/guix-devel/2023-06/msg00075.html. Some changes to the v1: - Update coq to 8.17.1. This fixes a build failure caused by the v1 of this series. - Attempt to update opam to 2.1.5. Build fails with `Error: Unbound value Base64.decode_exn` even though the base64 library seems to be available properly. When keeping the failed build directory and manually building, build seems to work. I'm a bit clueless on what is going on and just posting this in the hope that somebody can spot the issue or provide some clues. - opam package is split into individual sub-libraries. This reduces the size of the final `opam` package considerably (tested for 2.1.3). - The update to `ocaml-dose3` needs to be merged with the opam update commit as old opam (2.1.3) does not compile with the new ocaml-dose3. Thanks, pukkamustard pukkamustard (7): gnu: ocaml: Update to 4.14.1. gnu: coq: Update to 8.17.1. gnu: dune-bootstrap: Update to 3.9.1. gnu: ocaml-graph: Update to 2.0.0. gnu: ocaml-base64: Update to 3.5.1. gnu: ocaml-dose3: Update to 7.0.0. WIP: gnu: opam: Update to 2.1.5. gnu/local.mk | 4 - gnu/packages/coq.scm | 24 +- gnu/packages/ocaml.scm | 316 +++++++++++++++--- .../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 - 7 files changed, 268 insertions(+), 295 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 base-commit: 01412c6c6a98e4da10676560638640d0f33e1a02 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 15 13:39:04 2023 Received: (at 64249) by debbugs.gnu.org; 15 Jul 2023 17:39:04 +0000 Received: from localhost ([127.0.0.1]:45961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKjEV-0006t8-W5 for submit@debbugs.gnu.org; Sat, 15 Jul 2023 13:39:04 -0400 Received: from mout01.posteo.de ([185.67.36.65]:32887) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKjEV-0006s2-2t for 64249@debbugs.gnu.org; Sat, 15 Jul 2023 13:39:03 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 8C391240027 for <64249@debbugs.gnu.org>; Sat, 15 Jul 2023 19:38:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1689442737; bh=115OQxc3IqNLZuN/HjSsNW9EJVtxXdRY7gI9Rv5b4gQ=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=jhCzIlI0zd8Mbhi911yGF2jmZr4I7rR4nqgsGKvAM7iUj0Y3ccjHh/GcN5H/gdajs XEa+8D5WzyGvocUniAUohiAe6McFTwMeQXGnqtqOqmRl5v2/MqZMgzhLQ1BytckkJR enO270oOK6ungOVvmPYZBHt22c7BLSVlMAq+gRymXXjP0XXBZEe39F2IQJbpjAMLn7 hecNWMuBoueiMsDtc37nPoTjYhLO1AZraWTzXizuIIma7E62AOgeDBuPFk25i/bFfg SHb4Y1wXKBjnX0AySvRwma5zRytcH96ksGYP0B71TYZyd+pTGBRr+dDye482eujZsh Op1KDE3wvzi0g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4R3FvP0hzRz9rxG; Sat, 15 Jul 2023 19:38:57 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v2 1/7] gnu: ocaml: Update to 4.14.1. Date: Sat, 15 Jul 2023 17:38:28 +0000 Message-Id: <3d4419719af956eac5e207468d8f19afccc16a62.1689442089.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 ab0aa0574a..6ffde41cc0 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 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 15 13:39:08 2023 Received: (at 64249) by debbugs.gnu.org; 15 Jul 2023 17:39:08 +0000 Received: from localhost ([127.0.0.1]:45968 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKjEZ-0006ti-G2 for submit@debbugs.gnu.org; Sat, 15 Jul 2023 13:39:07 -0400 Received: from mout02.posteo.de ([185.67.36.66]:38655) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKjEW-0006s6-4n for 64249@debbugs.gnu.org; Sat, 15 Jul 2023 13:39:06 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 3F230240101 for <64249@debbugs.gnu.org>; Sat, 15 Jul 2023 19:38:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1689442738; bh=UaEQVNH8CpU+ilH6DM8veOcIBQz7pq0KN7sbcKxPb00=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=PCDzQG6W6pXVbxijKgVmy9yhUlkKERoWPXmW0Xr+bhOJlHRz6CRIuUSQBaBFi/84B HqoSXCmkxSZjS5CE75v4ZAtLTTBRYrPqhYYUKZYrxHdtHgzcJwPp0i1q0cy4scgzUe 2YpiGfPaesPKSbyju9KNPBJyvN6we4y9tjwg2VMltk73G3ob5Pq2qHLCsx9pPndFX3 UwwAXe3QqHuiKzJ0ZvIuAtzuXIkZ/DRNVx+ag+TKWX7eT4JvdSdq8esSXx0+ER/ic8 jkXUutr0r+tBqhbBDYJ5mtgycJPX6w1vPvmaUsBmj8VMWbDQ70UoAtXw/ckFXAvquV dVbig2iMZ8QAg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4R3FvP5f73z9rxG; Sat, 15 Jul 2023 19:38:57 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v2 2/7] gnu: coq: Update to 8.17.1. Date: Sat, 15 Jul 2023 17:38:29 +0000 Message-Id: <858ebb8d740c7bfd0d55eaaf8a67db2298d4081a.1689442089.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/coq.scm (coq-core, coq-stdlib, coq): Update to 8.17.1 and remove test-target argument. --- gnu/packages/coq.scm | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 09ca4030ea..3332707a71 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -53,7 +53,7 @@ (define-module (gnu packages coq) (define-public coq-core (package (name "coq-core") - (version "8.16.1") + (version "8.17.1") (source (origin (method git-fetch) @@ -63,7 +63,7 @@ (define-public coq-core (file-name (git-file-name name version)) (sha256 (base32 - "0ljpqhh5lfsim29fcfp2xfcvm3j84pf1mb0gnpdr8vcqqw7mqwpf")) + "0gg6hizq0i08lk741b579cbswhy6qvkh6inc3d3i5a2af98psq63")) (patches (search-patches "coq-fix-envvars.patch")))) (native-search-paths (list (search-path-specification @@ -83,8 +83,7 @@ (define-public coq-core (native-inputs (list ocaml-ounit2 which)) (arguments - `(#:package "coq-core" - #:test-target ".")) + `(#:package "coq-core")) (properties '((upstream-name . "coq"))) ; also for inherited packages (home-page "https://coq.inria.fr") (synopsis "Proof assistant for higher-order logic") @@ -101,19 +100,7 @@ (define-public coq-stdlib (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")) - " ")))))))) + `(#:package "coq-stdlib")) (inputs (list coq-core gmp ocaml-zarith)) (native-inputs '()))) @@ -123,8 +110,7 @@ (define-public coq (inherit coq-core) (name "coq") (arguments - `(#:package "coq" - #:test-target ".")) + `(#:package "coq")) (propagated-inputs (list coq-core coq-stdlib)) (native-inputs '()))) -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 15 13:39:08 2023 Received: (at 64249) by debbugs.gnu.org; 15 Jul 2023 17:39:09 +0000 Received: from localhost ([127.0.0.1]:45971 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKjEa-0006tl-14 for submit@debbugs.gnu.org; Sat, 15 Jul 2023 13:39:08 -0400 Received: from mout02.posteo.de ([185.67.36.66]:57667) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKjEY-0006sI-5c for 64249@debbugs.gnu.org; Sat, 15 Jul 2023 13:39:06 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id A2092240101 for <64249@debbugs.gnu.org>; Sat, 15 Jul 2023 19:39:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1689442740; bh=PakorzIwtyE98g7FeA7wnQuylkJjSmN+i3jaW4IQD58=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=iMt+n+EazJ5wEjY3XAHuhA2Xl6w9LkC6BOtY5d4jERrr9RgSMsiAM66ottzbpgpad k9VOoKMLwUDbmcK9D9vPyeQGJl5x+jxCCcnclAuIA8tfoBpRIsfFuiA2VcOjtj7DMs 3qMAB39HS9hita62/BrtHo1EQjFwG0txV4aa1HBAkfrOdydQEEbVgdgmu8sAuFQZn7 jx+a6yM5G1nsJyMbDA2m4iUFyyfWwF6s7nm+IsEx/X43IT3Sn2s9NNZQ9HmvJjaps8 0vqJz7HkvHd6Q/LEKF8pF2ThNz6f545pb2kUO0sU4vSK0Y5ae17nkp2/OGgZQV2wq+ JPwSxmUpoyQpQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4R3FvS1BKDz9rxH; Sat, 15 Jul 2023 19:39:00 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v2 5/7] gnu: ocaml-base64: Update to 3.5.1. Date: Sat, 15 Jul 2023 17:38:32 +0000 Message-Id: <72e1634d2ef135ce44a5b01c3e4a9f2e1e8cc81e.1689442089.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-base64): Update to 3.5.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 02c808b599..73c82bf7c7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4325,7 +4325,7 @@ (define-public ocaml-ocurl (define-public ocaml-base64 (package (name "ocaml-base64") - (version "3.5.0") + (version "3.5.1") (source (origin (method git-fetch) (uri (git-reference @@ -4334,7 +4334,7 @@ (define-public ocaml-base64 (file-name (git-file-name name version)) (sha256 (base32 - "068hwdbpl7vx9jjpxdc6a10zqd8xa55j3xx7ga6fnwrlfsbs2pjj")))) + "1jq349jp663hq51a941afr2y4yyh34r19zsxla73ks9bywj4mm2q")))) (build-system dune-build-system) (native-inputs (list ocaml-alcotest ocaml-bos ocaml-rresult)) -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 15 13:39:09 2023 Received: (at 64249) by debbugs.gnu.org; 15 Jul 2023 17:39:09 +0000 Received: from localhost ([127.0.0.1]:45973 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKjEa-0006u1-PO for submit@debbugs.gnu.org; Sat, 15 Jul 2023 13:39:09 -0400 Received: from mout02.posteo.de ([185.67.36.66]:45813) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKjEW-0006s9-JH for 64249@debbugs.gnu.org; Sat, 15 Jul 2023 13:39:06 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 1756B240101 for <64249@debbugs.gnu.org>; Sat, 15 Jul 2023 19:38:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1689442739; bh=lkUe6q2HSNyGVI4pv2ummI8FCUgPLlIg6L/JxDdfQ/I=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=kvf01Dy5ETelf6hl7Tr2a9+VzS+d3bbFoOHUZz7SR6IgSmSm10nNWxgrQx6teRnOY C9cMiIUdBp38io3M/GVQ26/fUf0h1p6nuAx6jTVQn5Ri9bXugqn4EwqRb2OJBXJDYN hOvXNC1+S8e1LcLwBZrFHeC3N7uQF6QW/JPbXKw9dNJwzcS6DVjTKcHBSveNFP3En7 zrG4yS17Pkgb5ztQswnj/v7biU0sx+anqs0lkQwXn+pz9oeMVr8+X/hvWgiKbkPvu8 A8ycKggBWtHKo+kGOlYOjzFP9IOZdYmtMrzEqIhJ7vcoRn8LcHGb/ZYYXMK9yZAWpC FfzowGR9QNxiQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4R3FvQ4D1kz9rxV; Sat, 15 Jul 2023 19:38:58 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v2 3/7] gnu: dune-bootstrap: Update to 3.9.1. Date: Sat, 15 Jul 2023 17:38:30 +0000 Message-Id: <78010b3f2b18cb49d9742777ec9ba79b15d137cc.1689442089.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (dune-bootstrap): Update to 3.8.2. [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 6ffde41cc0..d2bc7cc118 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1819,7 +1819,7 @@ (define-public ocaml-stringext (define dune-bootstrap (package (name "dune") - (version "3.6.1") + (version "3.9.1") (source (origin (method git-fetch) (uri (git-reference @@ -1828,7 +1828,7 @@ (define dune-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "0gv851wxbv5ln20429nj7p92spzxgw8vngg9z94q39aawn6q8lx6")))) + "0bgqsam21ah8piqhnrkfzn8r75w83pkn75751jks2rlppkgx9g3y")))) (build-system ocaml-build-system) (arguments `(#:tests? #f; require odoc @@ -1845,9 +1845,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 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 15 13:39:14 2023 Received: (at 64249) by debbugs.gnu.org; 15 Jul 2023 17:39:14 +0000 Received: from localhost ([127.0.0.1]:45975 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKjEf-0006uT-Ef for submit@debbugs.gnu.org; Sat, 15 Jul 2023 13:39:14 -0400 Received: from mout01.posteo.de ([185.67.36.65]:56177) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKjEY-0006sX-TL for 64249@debbugs.gnu.org; Sat, 15 Jul 2023 13:39:08 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 5E2ED240027 for <64249@debbugs.gnu.org>; Sat, 15 Jul 2023 19:39:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1689442741; bh=bDktCXJPsjID+6FBkUDGBmELWFQ8vBt6hroPqlrbyX4=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=kv53K/flGmRrVUm8zRMPiSsvWknXOTnYRliU7goCBPbPk7RylRz5G2AwQa5modvbJ XcnM13oeeVJ0do2IXF4y7PFXo72V4jIOE2rUA8iaulvNrsr/uAwnD3+K55qmNWdncY emmSvJXAbjl8zz7JXkWxARx6gCDQmtvQTFJ32PY9McNCWpP9satUmMDvEI1NIMB6X7 pDewjzKfVx6jkL2dLfjt351QiJ/B2qME4o15cl3oo1FQOm6Em7dywFvfuxqRI5uut1 KyyYa7tDvhKdYA29ghlD7+cEx4CPpRSxzmrwoPHO8A6WYVzFuOyMHH/skqlgImdJxe +t4BFXGtyV1DQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4R3FvS6RZ8z9rxH; Sat, 15 Jul 2023 19:39:00 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v2 6/7] gnu: ocaml-dose3: Update to 7.0.0. Date: Sat, 15 Jul 2023 17:38:33 +0000 Message-Id: <4c636e6c328766def8cb6b45e34aa72dcdf9ab51.1689442089.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (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 | 48 +++---- .../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, 21 insertions(+), 250 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 06a376a99a..f28baefdb6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1646,10 +1646,6 @@ dist_patch_DATA = \ %D%/packages/patches/nyacc-binary-literals.patch \ %D%/packages/patches/oath-toolkit-xmlsec-compat.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 73c82bf7c7..289b86cc27 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,30 +722,17 @@ (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)) - (home-page "https://www.mancoosi.org/software/") + "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 "http://www.mancoosi.org/software/") (synopsis "Package distribution management framework") (description "Dose3 is a framework made of several OCaml libraries for managing distribution packages and their dependencies. Though not tied to @@ -4336,8 +4323,7 @@ (define-public ocaml-base64 (base32 "1jq349jp663hq51a941afr2y4yyh34r19zsxla73ks9bywj4mm2q")))) (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") @@ -4346,6 +4332,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 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 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 15 13:39:14 2023 Received: (at 64249) by debbugs.gnu.org; 15 Jul 2023 17:39:14 +0000 Received: from localhost ([127.0.0.1]:45977 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKjEg-0006uX-AU for submit@debbugs.gnu.org; Sat, 15 Jul 2023 13:39:14 -0400 Received: from mout01.posteo.de ([185.67.36.65]:58959) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKjEX-0006sE-Al for 64249@debbugs.gnu.org; Sat, 15 Jul 2023 13:39:09 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id C585B240027 for <64249@debbugs.gnu.org>; Sat, 15 Jul 2023 19:38:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1689442739; bh=DAJSp/jQyZdKtEXRqjLZHc44a0hAOOLn+2osbS5HWoA=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=LuQu8xkhhjcemrRJ5c+jjjhUG93VLgGq3hEjquBSk6swlypUl18S4DL7RiYOeN2Ib 8h31hbhZaI7cd+p2QzpMa9OSWLWYhTyltXXcN4YeQeMvl1UoeLofETf9i5ObQfzvfh gf/MtR6S8ta6qKbOorxZv7bjJzpxzQDqfabjeVsBfLONQEHandv06Wsj4ifcX31Sec 2WlzR7f1oI5G50OOVAja/qldQTxKUtARQHbnTCNjxAIQpI5PONR5/mCpClBvjCyEv7 T3p5cQ8ZWgvwathfvhbJFh7Fu4fh5VGlQKWJ2OoizDYMIb3z9oT2zdDcz0HtvQThQ3 X7dA69WhPbERw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4R3FvR2K2Jz9rxN; Sat, 15 Jul 2023 19:38:59 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v2 4/7] gnu: ocaml-graph: Update to 2.0.0. Date: Sat, 15 Jul 2023 17:38:31 +0000 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-graph): Update to 2.0.0. --- gnu/packages/ocaml.scm | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d2bc7cc118..02c808b599 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5218,27 +5218,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))) -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 15 13:39:15 2023 Received: (at 64249) by debbugs.gnu.org; 15 Jul 2023 17:39:15 +0000 Received: from localhost ([127.0.0.1]:45979 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKjEg-0006ue-Lm for submit@debbugs.gnu.org; Sat, 15 Jul 2023 13:39:15 -0400 Received: from mout02.posteo.de ([185.67.36.66]:54467) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKjEZ-0006ss-JQ for 64249@debbugs.gnu.org; Sat, 15 Jul 2023 13:39:09 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 14360240104 for <64249@debbugs.gnu.org>; Sat, 15 Jul 2023 19:39:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1689442742; bh=iDSmw+MJr8Ri8I8yFPcmMhBe9JvJWmHvF18hqmczPxM=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=B26IPfcO8ALMpk1KCc48tQbA+WN4TANGpTkF4MG48orKL1GaIijBdIIAVO0dDJTOt RzAyhdKmiWZRwI0deynkZ3pDcRqII/JiUfidmLKIpzWAc9XvNXA5ba0yw1xmazc90B L6pdgfrTJeO8YfDTZqxOnggX9qVkF0UMQrWyrOcguIQduUq0AqOZC7A/hO+sx/KBoD dOx1zZNU/evftJ1dxWPAsnd7Bev0PeNEwFbaQvFkNoXwNBT925zG4f6Aqo40ljwcaz bjm7VrZ3ISpHHToSFO5khzenxrBo/epNUKkl9zpupUfasa0mRyZCuKko5Ijm1yj7SR LJL9cOB/nW/gw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4R3FvT4Rqnz9rxQ; Sat, 15 Jul 2023 19:39:01 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v2 7/7] WIP: gnu: opam: Update to 2.1.5. Date: Sat, 15 Jul 2023 17:38:34 +0000 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --- gnu/packages/ocaml.scm | 220 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 220 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 289b86cc27..d96af0ee2d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -833,7 +833,225 @@ (define-public ocaml-opam-file-format ;; With static-linking exception (license license:lgpl2.1+))) +(define-public ocaml-opam-core + (package + (name "ocaml-opam-core") + (version "2.1.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml/opam") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ckd87rcmcz11iyhhm5qnmy27jbdffx6n1fr06hvrqqrzi00jljh")))) + (build-system dune-build-system) + (native-inputs (list ocaml-cppo)) + (propagated-inputs (list ocaml-graph ocaml-re)) + (arguments `(#:package "opam-core" + ;; tests require the opam-client library that is not yet available + #:tests? #f)) + (home-page "https://opam.ocaml.org/") + (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-public ocaml-opam-format + (package + (inherit ocaml-opam-core) + (name "ocaml-opam-format") + (native-inputs '()) + (propagated-inputs (list ocaml-opam-core + ocaml-opam-file-format + ocaml-re)) + (arguments `(#:package "opam-format" + ;; tests require the opam-client library that is not yet available + #:tests? #f)))) + +(define-public ocaml-opam-repository + (package + (inherit ocaml-opam-core) + (name "ocaml-opam-repository") + (native-inputs '()) + (propagated-inputs (list ocaml-opam-format)) + (arguments `(#:package "opam-repository" + ;; tests require the opam-client library that is not yet available + #:tests? #f)))) + +(define-public ocaml-opam-state + (package + (inherit ocaml-opam-core) + (name "ocaml-opam-state") + (native-inputs '()) + (propagated-inputs (list ocaml-opam-repository)) + (arguments `(#:package "opam-state" + ;; tests require the opam-client library that is not yet available + #:tests? #f)))) + +(define-public ocaml-opam-solver + (package + (inherit ocaml-opam-core) + (name "ocaml-opam-solver") + (native-inputs '()) + (propagated-inputs (list ocaml-opam-format + ocaml-mccs + ocaml-dose3)) + (arguments `(#:package "opam-solver" + ;; tests require the opam-client library that is not yet available + #:tests? #f)))) + +(define-public ocaml-opam-client + (package + (inherit ocaml-opam-core) + (name "ocaml-opam-client") + (native-inputs '()) + (propagated-inputs '()) + (inputs (list ocaml-opam-state + ocaml-opam-solver + ocaml-base64-boot + ocaml-opam-repository + ocaml-re + ocaml-cmdliner)) + (arguments `(#:package "opam-client" + ;; TODO + #:tests? #f)))) + (define-public opam + (package + (inherit ocaml-opam-core) + (name "opam") + (arguments + `(#: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 + ;; home directory. + (mkdir-p "test-home") + (setenv "HOME" (string-append (getcwd) "/test-home")) + (with-output-to-file (string-append (getcwd) "/test-home/.gitconfig") + (lambda _ + (display "[user] +email = guix@localhost.none +name = Guix Builder") + (newline))) + + ;; Opam tests require data from opam-repository. Instead of + ;; downloading them with wget from the guix environment, copy the + ;; content to the expected directory. + (substitute* "tests/reftests/dune.inc" + (("tar -C.*opam-archive-([0-9a-f]*)[^)]*" _ commit) + (string-append "rmdir %{targets}) (run cp -r " + (assoc-ref inputs (string-append "opam-repo-" commit)) + "/ %{targets}) (run chmod +w -R %{targets}")) + (("wget[^)]*") "touch %{targets}") + ;; Disable a failing test because it tries to clone a git + ;; repository from inside bwrap + (("diff upgrade-format.test upgrade-format.out") "run true") + ;; Disable a failing test because it tries to figure out which + ;; distro this is, and it doesn't know Guix + (("diff pin.unix.test pin.unix.out") "run true") + ;; Disable a failing test because of a failed expansion + (("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")) + (substitute* "tests/reftests/dune" + ;; Because of our changes to the previous file, we cannot check + ;; it can be regenerated + (("diff dune.inc dune.inc.gen") "run true")) + ;; Ensure we can run the generated build.sh (no /bin/sh) + (substitute* '("tests/reftests/legacy-local.test" + "tests/reftests/legacy-git.test") + (("#! ?/bin/sh") + (string-append "#!" + (search-input-file inputs "/bin/sh")))) + (substitute* "tests/reftests/testing-env" + (("OPAMSTRICT=1") + (string-append "OPAMSTRICT=1\nLIBRARY_PATH=" + (assoc-ref inputs "libc") "/lib")))))))) + (native-inputs + (let ((opam-repo (lambda (commit hash) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml/opam-repository") + (commit commit))) + (file-name (git-file-name "opam-repo" commit)) + (sha256 (base32 hash)))))) + `(;; For tests. + ("bubblewrap" ,bubblewrap) + ("git" ,git-minimal/pinned) + ("openssl" ,openssl) + ("python" ,python-wrapper) + ("rsync" ,rsync) + ("unzip" ,unzip) + ("which" ,which) + + ("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"))))) + (propagated-inputs '()) + (inputs (list ocaml-opam-client + ocaml-opam-state + ocaml-opam-solver + ocaml-base64-boot + ocaml-opam-repository + ocaml-re + ocaml-cmdliner)))) + +(define-public opam-2.1.3 (package (name "opam") (version "2.1.3") @@ -941,6 +1159,8 @@ (define-public opam ("which" ,which) ;; Data for tests + ("opam-repo-0070613707" ,(opam-repo "00706137074d536d2019d2d222fbe1bea929deda" + "1wwy0rwrsjf4q10j1rh1dbzk32fbzhzy5f7zl6qmndidx9b1bq7w")) ("opam-repo-009e00fa" ,(opam-repo "009e00fa86300d11c311309a2544e5c6c3eb8de2" "1wwy0rwrsjf4q10j1rh1dazk32fbzhzy6f7zl6qmndidx9b1bq7w")) ("opam-repo-7090735c" ,(opam-repo "7090735c9d1dd2dc481c4128c5ef4d3667238f15" -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 18 07:46:16 2023 Received: (at 64249) by debbugs.gnu.org; 18 Jul 2023 11:46:16 +0000 Received: from localhost ([127.0.0.1]:51789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLj9k-0001Ax-Bu for submit@debbugs.gnu.org; Tue, 18 Jul 2023 07:46:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLj9h-0001Ag-2B for 64249@debbugs.gnu.org; Tue, 18 Jul 2023 07:46:15 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qLj9a-0005iA-2k; Tue, 18 Jul 2023 07:46:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=W12C1d66BPbSOYJMU2OKF8eKV15RhTIvtJcggIN7K80=; b=NjJ32rjDX5M473ka8K47 pwafSU1vi5mEkqrhs4GW+yZdY1EG+cgMpD0T8jVlbCOXtaNZo0op43FvbmxVXCWsQoGDrryXbtNbl ISF0JcNAHcXHvDy+9ObksYDCOKuUt+Llh13xjeHuXjsyM/B7heOyFaRSOCvxed7Gd4mlrcKxcmLv1 NLIxHhSnujl9zU0X5CZm04vV0KWwbX/dSAhNGQ69BBxy5qt2xCLJ6Gkh9hsHpTIVWDSvW1epfAVY+ tRNkdxk0GZxbiw2hV8U4WvhGF9zCcUh13K6PAYhQ9vZZaDDtOcJi1vyDLc3b6C1q9me+9HDaVOy7P JKQESeNOaSVehQ==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qLj9Z-0006K1-Lu; Tue, 18 Jul 2023 07:46:05 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: pukkamustard Subject: Re: bug#64249: [PATCH ocaml-team 1/2] gnu: ocaml: Update to 4.14.1. References: Date: Tue, 18 Jul 2023 13:46:04 +0200 In-Reply-To: (pukkamustard@posteo.net's message of "Sat, 15 Jul 2023 17:38:27 +0000") Message-ID: <877cqxl9xf.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: 64249@debbugs.gnu.org, Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello! pukkamustard skribis: > This is a WIP v2 for some updates to the OCaml packages.=20 There=E2=80=99s a cyclic dependency in here: --8<---------------cut here---------------start------------->8--- (exception %exception (non-self-quoting 140736850154944 "#<&package-= cyclic-dependency-error package: #<package ocaml4.07-alcotest@1.0.1 gnu/= packages/ocaml.scm:2838 7fffde9308f0> cycle: (#<package ocaml4.07-bas= e64@3.2.0 gnu/packages/ocaml.scm:4565 7fffde93f2c0> #<package ocaml4.= 07-dose3@7.0.0 gnu/packages/ocaml.scm:714 7fffde2bb6e0> #<package oca= ml4.07-opam-solver@2.1.5 gnu/packages/ocaml.scm:897 7fffde2aff20> #<p= ackage ocaml4.07-opam-client@2.1.5 gnu/packages/ocaml.scm:909 7fffde2a7210&= gt; #<package ocaml4.07-opam@2.1.5 gnu/packages/ocaml.scm:925 7fffde2a74= d0> #<package ocaml4.07-astring@0.8.5 gnu/packages/ocaml.scm:2759 7ff= fde2a7b00> #<package ocaml4.07-alcotest@1.0.1 gnu/packages/ocaml.scm:= 2838 7fffde9308f0>)>")) builder for `/gnu/store/qpfyz17ihan78a9cb6ln3c57zs8bwqw9-guix-package-cache= .drv' failed to produce output path `/gnu/store/gl6n9k7i6xnvkrnyk799y2bxxw5= 1by75-guix-package-cache' @ build-failed /gnu/store/qpfyz17ihan78a9cb6ln3c57zs8bwqw9-guix-package-cac= he.drv - 1 builder for `/gnu/store/qpfyz17ihan78a9cb6ln3c57zs8bwqw9-guix-pa= ckage-cache.drv' failed to produce output path `/gnu/store/gl6n9k7i6xnvkrny= k799y2bxxw51by75-guix-package-cache' --8<---------------cut here---------------end--------------->8--- Via . Could you take a look and submit an updated version? Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 18 08:11:31 2023 Received: (at 64249) by debbugs.gnu.org; 18 Jul 2023 12:11:31 +0000 Received: from localhost ([127.0.0.1]:51850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLjYB-0001xI-1Z for submit@debbugs.gnu.org; Tue, 18 Jul 2023 08:11:31 -0400 Received: from mout01.posteo.de ([185.67.36.65]:34977) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLjY6-0001x3-QW for 64249@debbugs.gnu.org; Tue, 18 Jul 2023 08:11:29 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id D6C4D240027 for <64249@debbugs.gnu.org>; Tue, 18 Jul 2023 14:11:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1689682280; bh=fcGbT0HytL6EXhuIFIyriaiQe6cMNI4dH++kSy+M5aQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=hJ0/MItEjC+TLuAU3hH6bZBlt9U9DWgGHl+d4gEbvbiW0wpA6PsiP8KPABh32+HG+ wPnq+nT61tjXwdKOLfJRNJdEzTdWO/4oNmjd3eQ1aeSOM2UEBfLfay20qZYZE2Mhx8 rmpWVxcirfFL9r2xWktjRDgOyhcArfGwkL+L1fcMX93OTZqWprt9b7AVLt1srnvG36 BvOKKYrsAjWseTJebvUZ2rbbLZs6wc2fMkO/oaTc9xg+YWmg4Uv4oz8OLLfoxCCseb naQkvdqO4MJzCKPw/iZIiVbL3SsCLgJXSzBd+QMUNT/qD9ADySLzHyJcL34jofiR16 /5YgUWZfPBerw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4R4yTr2hVmz9rxm; Tue, 18 Jul 2023 14:11:12 +0200 (CEST) References: <877cqxl9xf.fsf_-_@gnu.org> From: pukkamustard To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#64249: [PATCH ocaml-team 1/2] gnu: ocaml: Update to 4.14.1. Date: Tue, 18 Jul 2023 12:05:15 +0000 In-reply-to: <877cqxl9xf.fsf_-_@gnu.org> Message-ID: <86sf9lju74.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: 64249@debbugs.gnu.org, Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hm, weird. I'm pretty sure this was not the case in my local checkout. In any case, I have a v3 ready that solves some issues - and should be cyclic dependency free. Will send it in asap. Thanks for having a look! -pukkamustard Ludovic Court=C3=A8s writes: > Hello! > > pukkamustard skribis: > >> This is a WIP v2 for some updates to the OCaml packages.=20 > > There=E2=80=99s a cyclic dependency in here: > > (exception %exception (non-self-quoting 140736850154944 "#<&packag= e-cyclic-dependency-error package: #<package ocaml4.07-alcotest@1.0.1 gn= u/packages/ocaml.scm:2838 7fffde9308f0> cycle: (#<package ocaml4.07-b= ase64@3.2.0 gnu/packages/ocaml.scm:4565 7fffde93f2c0> #<package ocaml= 4.07-dose3@7.0.0 gnu/packages/ocaml.scm:714 7fffde2bb6e0> #<package o= caml4.07-opam-solver@2.1.5 gnu/packages/ocaml.scm:897 7fffde2aff20> #<= ;package ocaml4.07-opam-client@2.1.5 gnu/packages/ocaml.scm:909 7fffde2a721= 0> #<package ocaml4.07-opam@2.1.5 gnu/packages/ocaml.scm:925 7fffde2a= 74d0> #<package ocaml4.07-astring@0.8.5 gnu/packages/ocaml.scm:2759 7= fffde2a7b00> #<package ocaml4.07-alcotest@1.0.1 gnu/packages/ocaml.sc= m:2838 7fffde9308f0>)>")) > builder for `/gnu/store/qpfyz17ihan78a9cb6ln3c57zs8bwqw9-guix-package-cac= he.drv' failed to produce output path `/gnu/store/gl6n9k7i6xnvkrnyk799y2bxx= w51by75-guix-package-cache' > @ build-failed /gnu/store/qpfyz17ihan78a9cb6ln3c57zs8bwqw9-guix-package-c= ache.drv - 1 builder for `/gnu/store/qpfyz17ihan78a9cb6ln3c57zs8bwqw9-guix-= package-cache.drv' failed to produce output path `/gnu/store/gl6n9k7i6xnvkr= nyk799y2bxxw51by75-guix-package-cache' > > Via . > > Could you take a look and submit an updated version? > > Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 18 08:24:35 2023 Received: (at 64249) by debbugs.gnu.org; 18 Jul 2023 12:24:35 +0000 Received: from localhost ([127.0.0.1]:51880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLjkp-0002JY-50 for submit@debbugs.gnu.org; Tue, 18 Jul 2023 08:24:35 -0400 Received: from mout02.posteo.de ([185.67.36.66]:51931) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLjkm-0002JG-Vg for 64249@debbugs.gnu.org; Tue, 18 Jul 2023 08:24:33 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 063F1240104 for <64249@debbugs.gnu.org>; Tue, 18 Jul 2023 14:24:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1689683067; bh=ICBBMpdvYO0eb2W6YBh6EpgEdaSnXnczwwzgmZJB3e0=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=fOldRjjQGCHBO8pF8M8ohuiBhuZCZDfuujbtKYHqz1JcdCx1xBAoq2vW/OrdadR7s 6l0uFsTxw1kSi0pnGwEfxtlyPzwTEynGrOJoz/fHP7Xbiw19vzXHnL/AHEuZbq2RJ6 pa4XQAEY2VM1ZpHlzCDTZc9GgatSjJdWJ1e2yvxFqnWTUFAkdJEYGY41ZDHToFn2fs 7dYAdQCPeKNWT6QZZXkgVG/9If2WjhB5VHM4wGF55hSablNskDGYHsLdsl/jg3msel ldx6zBtGdOrVB6eE4/hleP+vuYKUJ3XnggOyhPJxwejWG5b59d4g6li/NcN1BbUMa7 keq60/kGqfC6g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4R4yn60f4Dz6twc; Tue, 18 Jul 2023 14:24:26 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v3 0/6] Update and break opam (but nothing else) Date: Tue, 18 Jul 2023 12:23:57 +0000 Message-Id: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard , ludo@gnu.org, julien@lepiller.eu X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello! Some changes versus v2: - opam is split into smaller builds before updating. The size of the new opam package decreases from ~600MiB to ~80MiB (mostly as the OCaml compiler is no longer referenced). - We add the `opam-installer` package. This can be used by packages that require opam for installation (e.g. ocaml-react or ocaml-jsonm). There are no more packages that require opam as build dependency. - Update `opam` to 2.1.5 as last step. This still breaks the build of `opam`, but nothing else as `opam-installer` builds at version 2.1.5. -pukkamustard pukkamustard (6): gnu: ocaml: Update to 4.14.1. gnu: coq: Update to 8.17.1. gnu: dune-bootstrap: Update to 3.9.1. gnu: opam: Split build into smaller sub-packages. gnu: Add opam-installer. FIXME: gnu: opam: Update to 2.1.5. gnu/local.mk | 4 - gnu/packages/coq.scm | 24 +- gnu/packages/ocaml.scm | 365 ++++++++++++------ .../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 - 7 files changed, 242 insertions(+), 370 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 base-commit: 01412c6c6a98e4da10676560638640d0f33e1a02 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 18 08:24:43 2023 Received: (at 64249) by debbugs.gnu.org; 18 Jul 2023 12:24:43 +0000 Received: from localhost ([127.0.0.1]:51883 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLjkx-0002Jz-IK for submit@debbugs.gnu.org; Tue, 18 Jul 2023 08:24:43 -0400 Received: from mout01.posteo.de ([185.67.36.65]:58351) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLjkw-0002Jh-0S for 64249@debbugs.gnu.org; Tue, 18 Jul 2023 08:24:42 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 4AEFC240029 for <64249@debbugs.gnu.org>; Tue, 18 Jul 2023 14:24:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1689683076; bh=115OQxc3IqNLZuN/HjSsNW9EJVtxXdRY7gI9Rv5b4gQ=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=Jo5c6QO3v+rucooxXNVQy5n/lsJZs8KFPOOz3evYsPF2yY/hZVBdPOQ0DhrCHrPXm ysVoyo1eRKkpPUm4P1FMAShPPOSi6eNY2Ec+FzYaKHzPgNHR/JdJ7TA8Y4o/z1f5+v fRJ+t/9z0XxzT450kqR96P3DqSnFOeinfc1RLyJfC+1cZfesisPpM8go0B+bPLmABn jXI0DgyH4vS1mnPcjz4T6aGdLVsAX1ybBgqqoQiqZLNYl/Sk5r6fscBdqt2OCUGmxu DXPmIwErrdLAMgWTTT3DDeMPdRnogduSeBvqjJDuUZgbcYeofjZlnxBjCqXMd+eLU2 jTD7KLAlw5vKg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4R4ynD399lz6txZ; Tue, 18 Jul 2023 14:24:32 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v3 1/6] gnu: ocaml: Update to 4.14.1. Date: Tue, 18 Jul 2023 12:23:58 +0000 Message-Id: <3d4419719af956eac5e207468d8f19afccc16a62.1689682321.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 ab0aa0574a..6ffde41cc0 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 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 18 08:24:51 2023 Received: (at 64249) by debbugs.gnu.org; 18 Jul 2023 12:24:51 +0000 Received: from localhost ([127.0.0.1]:51886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLjl4-0002KJ-Qg for submit@debbugs.gnu.org; Tue, 18 Jul 2023 08:24:51 -0400 Received: from mout01.posteo.de ([185.67.36.65]:54193) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLjl2-0002Jx-JE for 64249@debbugs.gnu.org; Tue, 18 Jul 2023 08:24:49 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 0DB16240027 for <64249@debbugs.gnu.org>; Tue, 18 Jul 2023 14:24:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1689683083; bh=UaEQVNH8CpU+ilH6DM8veOcIBQz7pq0KN7sbcKxPb00=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=V0KmjmWZNS2E9AsnYjuCVlQlObWlnnRSgQJqg38u7q/VbWuqMBSZ0AVpHWpM/s1/8 ho5yWkf4+FTpADBhT5z500KJO9JMkOhecRIeR+kr2x+TNRiAMcV/K2jga1bJg75IFv yfqZTXreHWpz2BY6SfPkCbqJ2Xy7O4BusPk0lbVncm8YH5GaXaxirAUX75nUyEjtiD xyP8FlwkWhKJ/ODED46+c2LpJTQugn+u8BdxoMr8UsZ6UTnxY8P2h9P/ypNNNa6dDs Av/tY8LeGWkDiFBHBPn34gnwo4koZxiUzosyD6K1EQvHpBVpJZZTTY/SQsUPeKJuTr nYr/zwEHGAUwg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4R4ynQ29f9z6txZ; Tue, 18 Jul 2023 14:24:42 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v3 2/6] gnu: coq: Update to 8.17.1. Date: Tue, 18 Jul 2023 12:23:59 +0000 Message-Id: <858ebb8d740c7bfd0d55eaaf8a67db2298d4081a.1689682321.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/coq.scm (coq-core, coq-stdlib, coq): Update to 8.17.1 and remove test-target argument. --- gnu/packages/coq.scm | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 09ca4030ea..3332707a71 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -53,7 +53,7 @@ (define-module (gnu packages coq) (define-public coq-core (package (name "coq-core") - (version "8.16.1") + (version "8.17.1") (source (origin (method git-fetch) @@ -63,7 +63,7 @@ (define-public coq-core (file-name (git-file-name name version)) (sha256 (base32 - "0ljpqhh5lfsim29fcfp2xfcvm3j84pf1mb0gnpdr8vcqqw7mqwpf")) + "0gg6hizq0i08lk741b579cbswhy6qvkh6inc3d3i5a2af98psq63")) (patches (search-patches "coq-fix-envvars.patch")))) (native-search-paths (list (search-path-specification @@ -83,8 +83,7 @@ (define-public coq-core (native-inputs (list ocaml-ounit2 which)) (arguments - `(#:package "coq-core" - #:test-target ".")) + `(#:package "coq-core")) (properties '((upstream-name . "coq"))) ; also for inherited packages (home-page "https://coq.inria.fr") (synopsis "Proof assistant for higher-order logic") @@ -101,19 +100,7 @@ (define-public coq-stdlib (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")) - " ")))))))) + `(#:package "coq-stdlib")) (inputs (list coq-core gmp ocaml-zarith)) (native-inputs '()))) @@ -123,8 +110,7 @@ (define-public coq (inherit coq-core) (name "coq") (arguments - `(#:package "coq" - #:test-target ".")) + `(#:package "coq")) (propagated-inputs (list coq-core coq-stdlib)) (native-inputs '()))) -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 18 08:24:54 2023 Received: (at 64249) by debbugs.gnu.org; 18 Jul 2023 12:24:54 +0000 Received: from localhost ([127.0.0.1]:51889 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLjl8-0002KY-7E for submit@debbugs.gnu.org; Tue, 18 Jul 2023 08:24:54 -0400 Received: from mout01.posteo.de ([185.67.36.65]:55043) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLjl6-0002K9-4T for 64249@debbugs.gnu.org; Tue, 18 Jul 2023 08:24:52 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 790AB240029 for <64249@debbugs.gnu.org>; Tue, 18 Jul 2023 14:24:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1689683086; bh=lkUe6q2HSNyGVI4pv2ummI8FCUgPLlIg6L/JxDdfQ/I=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=azy+1uQcBAevcbfFoJeiwIc/7uMIidL8ppP3CwjMdE9NM92XFKImxSEQ+W3tZZn9R poKS46Snob2iONJicO38F3MHR33GofFi+KcRs9zepI0gzPOZdthE4CUdhHJAxfg/cl oOmo0ArAFcp70GHD5hxKrLDs/3N+ktpLBAKcPe3RjG3Nyag/wcbhotWpBBXshSlrDx xRkV+rfQMZ7KcP+nzyHTGaoV0Y1ru/FoWWE92glJUTAlSeKEmgNh2KqBxDfagHh3rT y0lGfELJIgCGBlncpXKp3vc9yjv978tc3z0l1Lc8z75MuyhuWq7/7IrxrbLaIKuVmm CfLUy4nD8Rivw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4R4ynT0gSmz6tyc; Tue, 18 Jul 2023 14:24:45 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v3 3/6] gnu: dune-bootstrap: Update to 3.9.1. Date: Tue, 18 Jul 2023 12:24:00 +0000 Message-Id: <78010b3f2b18cb49d9742777ec9ba79b15d137cc.1689682321.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (dune-bootstrap): Update to 3.8.2. [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 6ffde41cc0..d2bc7cc118 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1819,7 +1819,7 @@ (define-public ocaml-stringext (define dune-bootstrap (package (name "dune") - (version "3.6.1") + (version "3.9.1") (source (origin (method git-fetch) (uri (git-reference @@ -1828,7 +1828,7 @@ (define dune-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "0gv851wxbv5ln20429nj7p92spzxgw8vngg9z94q39aawn6q8lx6")))) + "0bgqsam21ah8piqhnrkfzn8r75w83pkn75751jks2rlppkgx9g3y")))) (build-system ocaml-build-system) (arguments `(#:tests? #f; require odoc @@ -1845,9 +1845,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 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 18 08:25:02 2023 Received: (at 64249) by debbugs.gnu.org; 18 Jul 2023 12:25:02 +0000 Received: from localhost ([127.0.0.1]:51892 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLjlB-0002Kr-MR for submit@debbugs.gnu.org; Tue, 18 Jul 2023 08:25:02 -0400 Received: from mout01.posteo.de ([185.67.36.65]:46633) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLjl9-0002KI-KE for 64249@debbugs.gnu.org; Tue, 18 Jul 2023 08:24:56 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 1527E240028 for <64249@debbugs.gnu.org>; Tue, 18 Jul 2023 14:24:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1689683090; bh=AE6egnh9p8KeIR9WngIaz7Ysnw6bAepv2pqQJjccwiA=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=VNP14kNGWWEu/lrs0ZjWkgOcMS/naK3MdMm9E76psTMDDmnBpVdviWtw2c4vErCqb Y6kS4OY+r048NOIl/R5Zjw+ds7zxstPfKpgg7afGhJVtSK8YQVv5O1qKL7rUc+liKQ BlQPEXhuVj26yU8ogRgO6dTqaD3kdC4cVscpVDRd6eeQu7mlIwjQ5J5wPehc2XAjvI VjUKcPRdTHKU2vjGUaoWBbS1Z3KYnemm7aF7n0INz2C3CmW++IhOK6FEcrz4b9GtMo kPkNG1rQpf728JZj735/4Hm5jU88VxJ/v3ijDmjr3WE6o4MB9N7D4uM70h0sdHQbij b2ArpMlReQqRw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4R4ynY3YCwz6tyb; Tue, 18 Jul 2023 14:24:49 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v3 4/6] gnu: opam: Split build into smaller sub-packages. Date: Tue, 18 Jul 2023 12:24:01 +0000 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (opam): Split build into smaller sub-packages. --- gnu/packages/ocaml.scm | 164 +++++++++++++++++++++++++++++++---------- 1 file changed, 125 insertions(+), 39 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d2bc7cc118..0d78f4d864 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -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,129 @@ (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 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-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 +1063,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 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 18 08:25:03 2023 Received: (at 64249) by debbugs.gnu.org; 18 Jul 2023 12:25:04 +0000 Received: from localhost ([127.0.0.1]:51895 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLjlG-0002LR-AW for submit@debbugs.gnu.org; Tue, 18 Jul 2023 08:25:03 -0400 Received: from mout01.posteo.de ([185.67.36.65]:55623) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLjlD-0002Kb-PX for 64249@debbugs.gnu.org; Tue, 18 Jul 2023 08:25:01 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 3F23B240027 for <64249@debbugs.gnu.org>; Tue, 18 Jul 2023 14:24:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1689683094; bh=3CEtR37R50aLzKWg7206Cum8u8tjLG3CUbWnf2VaZro=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=YHKO7wXEKdjRlw2w31rvnXnyN8XxPX4g4qhlq0hvLJIl1RsnlOPecPB1Lor9QKKWC wQrADlvQz8Gc/caisuoU+KrjZGosRupglyHsi3ZIKFpxrjjorMKJa3rkaFbZynKISN GXy6NGw8ucw/wpdigNOIWbg4eNxFQQwYmH/t1Vk/9AZgaSn1aLNjH4XfaMAUuZXbpm 7hmyaXiw5Rw58UC8LcTJE5WioX7KHFYgToYtqsljUR5TeNPMQ4Cj3M93T+4E9mrybP bbYX/98ZZGPekbVfIXKAGpYKzcUI+bX/4kh9NNTHBjj1s9Hw0qlGZalby5JpVJLi9d C9FXBnNk1w4Mw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4R4ynd4MjPz6tvn; Tue, 18 Jul 2023 14:24:53 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v3 5/6] gnu: Add opam-installer. Date: Tue, 18 Jul 2023 12:24:02 +0000 Message-Id: <829d10a062184b49e0ce970e4c800e72d5415833.1689682321.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (opam-installer): New variable. (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) [native-inputs]: Replace opam with opam-installer. --- gnu/packages/ocaml.scm | 90 ++++++++++++++++++++++++++---------------- 1 file changed, 55 insertions(+), 35 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0d78f4d864..90fedc2e88 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 @@ -901,6 +901,27 @@ (define ocaml-opam-format #: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) @@ -2325,7 +2346,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 @@ -2355,7 +2376,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 @@ -2470,7 +2491,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 @@ -2600,13 +2621,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") @@ -2647,9 +2668,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") @@ -2869,7 +2890,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") @@ -2993,7 +3014,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 @@ -3455,7 +3476,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) @@ -3489,7 +3510,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))) @@ -3519,7 +3540,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) @@ -3593,7 +3614,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 @@ -3734,7 +3755,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 @@ -3760,9 +3781,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))) @@ -3807,7 +3828,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" @@ -3848,9 +3869,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))) @@ -4268,7 +4289,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 @@ -5275,7 +5296,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))) @@ -5921,7 +5942,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) @@ -9641,7 +9662,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 @@ -9669,7 +9690,7 @@ (define-public ocaml-uucp (modify-phases %standard-phases (delete 'configure)))) (native-inputs - (list opam + (list opam-installer ocaml-findlib ocamlbuild ocaml-topkg @@ -9703,7 +9724,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 @@ -10164,8 +10185,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 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 18 08:25:13 2023 Received: (at 64249) by debbugs.gnu.org; 18 Jul 2023 12:25:13 +0000 Received: from localhost ([127.0.0.1]:51916 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLjlP-0002Mu-RA for submit@debbugs.gnu.org; Tue, 18 Jul 2023 08:25:13 -0400 Received: from mout02.posteo.de ([185.67.36.66]:47113) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLjlH-0002Kt-Cq for 64249@debbugs.gnu.org; Tue, 18 Jul 2023 08:25:10 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id D111F240101 for <64249@debbugs.gnu.org>; Tue, 18 Jul 2023 14:24:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1689683097; bh=irzh3NitpBPjTzfbJVtxtfTswy2l3e6MBrFhBG7UN1Q=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=Uw+JrjR9LyXTYtQHfOKfq22nFO5rNwpQr5WOq4m1D6TWg23l6mV1UUqQRHgifRw1m 4OAhKF0gMXcr8QKvUQfdLQNmX7KAUeGxjva1s2DGOgAOZPVcNrLvH7gvPY7nV3i0Xo O6PfPyqGcp1dsjAqoQRezYubx7M4+H4p1aa7jwuCKyBU4Fmap7hMvMGLAfcl3yDQr4 ydMPbtPJR8UgS1WoOgOVfHj9PwUMQw1809P9ZxMaS0FPssDRTJCQ4aJ2jiC2II4FMD sEZOWcUaX/6sPlWpH2cg+jfZ+GX3SyWIGq+dx4yuiLKh/BRqn4MGD34IAFS7XCZ94R yYUDECsErzwgw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4R4ynh64ZKz6txJ; Tue, 18 Jul 2023 14:24:56 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v3 6/6] FIXME: gnu: opam: Update to 2.1.5. Date: Tue, 18 Jul 2023 12:24:03 +0000 Message-Id: <038aa45a69fa8ec7870ef658bcf4ca809c23eee9.1689682321.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (opam): Update to 2.1.5. [native-inputs]: Add more test data. (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 | 96 ++++++------- .../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, 49 insertions(+), 270 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 06a376a99a..f28baefdb6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1646,10 +1646,6 @@ dist_patch_DATA = \ %D%/packages/patches/nyacc-binary-literals.patch \ %D%/packages/patches/oath-toolkit-xmlsec-compat.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 90fedc2e88..badc898648 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,30 +722,17 @@ (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)) - (home-page "https://www.mancoosi.org/software/") + "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 "http://www.mancoosi.org/software/") (synopsis "Package distribution management framework") (description "Dose3 is a framework made of several OCaml libraries for managing distribution packages and their dependencies. Though not tied to @@ -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 @@ -1072,6 +1059,8 @@ (define-public opam ("which" ,which) ;; Data for tests + ("opam-repo-0070613707" ,(opam-repo "00706137074d536d2019d2d222fbe1bea929deda" + "1gv1vvmfscj7wirfv6qncp8pf81wygnpzjwd0lyqcxm7g8r8lb4w")) ("opam-repo-009e00fa" ,(opam-repo "009e00fa86300d11c311309a2544e5c6c3eb8de2" "1wwy0rwrsjf4q10j1rh1dazk32fbzhzy6f7zl6qmndidx9b1bq7w")) ("opam-repo-7090735c" ,(opam-repo "7090735c9d1dd2dc481c4128c5ef4d3667238f15" @@ -1080,10 +1069,21 @@ (define-public opam "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"))))) + "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 @@ -4443,8 +4443,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") @@ -4453,6 +4452,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 @@ -5325,27 +5332,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 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 19 14:19:00 2023 Received: (at 64249) by debbugs.gnu.org; 19 Jul 2023 18:19:00 +0000 Received: from localhost ([127.0.0.1]:57108 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMBlM-0005IU-Bw for submit@debbugs.gnu.org; Wed, 19 Jul 2023 14:19:00 -0400 Received: from lepiller.eu ([89.234.186.109]:52016) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMBlJ-0005IK-AH for 64249@debbugs.gnu.org; Wed, 19 Jul 2023 14:18:59 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id fc8cfc7b; Wed, 19 Jul 2023 18:18:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=I58ozrwourQm ozdteuThirHVfymu3AHI0R1Non4iDjY=; b=ngTOvlj2RsztmRkc7xrAGo2fwSR/ o7tEWvqepjUPxMWBKO1RsQmgzLrjLpGYCSIlG0ALn1do0K3u3H0E1jwTL8GZ4fqc 1l2qim3a8nJgVRZM1fF5fFkY5RFJ8P63CARoO91ufyvfX9NvTPsqiHeez+heLF5f u0m/kccidgkOkMMdbpKcNMhTR8oGhXJ3DWs27mzkBOPS+ugcEM0mweF6A23wbIRx k/Xj/6HFMd9WI7hFrflbSO6mft2UukioYNoo4f1RVONVzsW7lKaKXchjuhDs5wAN o4g43YDmMJZ9FaqmgekNZMCRW4DliV/QGZQXAdrLuKMp4Gu3YkMS3qIPYQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id e5ee75b0 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 19 Jul 2023 18:18:52 +0000 (UTC) Date: Wed, 19 Jul 2023 20:18:43 +0200 From: Julien Lepiller To: pukkamustard Subject: Re: [bug#64249] [PATCH ocaml-team v3 2/6] gnu: coq: Update to 8.17.1. Message-ID: <20230719201843.31b30208@lepiller.eu> In-Reply-To: <858ebb8d740c7bfd0d55eaaf8a67db2298d4081a.1689682321.git.pukkamustard@posteo.net> References: <858ebb8d740c7bfd0d55eaaf8a67db2298d4081a.1689682321.git.pukkamustard@posteo.net> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: 64249@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, I'm not sure why, but this is breaking all coq dependents, with messages similar to: 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. I think this is because coq-stdlib is mostly empty for some reason. Le Tue, 18 Jul 2023 12:23:59 +0000, pukkamustard a =C3=A9crit : > * gnu/packages/coq.scm (coq-core, coq-stdlib, coq): Update to 8.17.1 > and remove test-target argument. > --- > gnu/packages/coq.scm | 24 +++++------------------- > 1 file changed, 5 insertions(+), 19 deletions(-) >=20 > diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm > index 09ca4030ea..3332707a71 100644 > --- a/gnu/packages/coq.scm > +++ b/gnu/packages/coq.scm > @@ -53,7 +53,7 @@ (define-module (gnu packages coq) > (define-public coq-core > (package > (name "coq-core") > - (version "8.16.1") > + (version "8.17.1") > (source > (origin > (method git-fetch) > @@ -63,7 +63,7 @@ (define-public coq-core > (file-name (git-file-name name version)) > (sha256 > (base32 > - "0ljpqhh5lfsim29fcfp2xfcvm3j84pf1mb0gnpdr8vcqqw7mqwpf")) > + "0gg6hizq0i08lk741b579cbswhy6qvkh6inc3d3i5a2af98psq63")) > (patches (search-patches "coq-fix-envvars.patch")))) > (native-search-paths > (list (search-path-specification > @@ -83,8 +83,7 @@ (define-public coq-core > (native-inputs > (list ocaml-ounit2 which)) > (arguments > - `(#:package "coq-core" > - #:test-target ".")) > + `(#:package "coq-core")) > (properties '((upstream-name . "coq"))) ; also for inherited > packages (home-page "https://coq.inria.fr") > (synopsis "Proof assistant for higher-order logic") > @@ -101,19 +100,7 @@ (define-public coq-stdlib > (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")) > - " ")))))))) > + `(#:package "coq-stdlib")) > (inputs > (list coq-core gmp ocaml-zarith)) > (native-inputs '()))) > @@ -123,8 +110,7 @@ (define-public coq > (inherit coq-core) > (name "coq") > (arguments > - `(#:package "coq" > - #:test-target ".")) > + `(#:package "coq")) > (propagated-inputs > (list coq-core coq-stdlib)) > (native-inputs '()))) From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 24 11:11:50 2023 Received: (at 64249) by debbugs.gnu.org; 24 Jul 2023 15:11:50 +0000 Received: from localhost ([127.0.0.1]:43788 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNxDx-0002Vo-JA for submit@debbugs.gnu.org; Mon, 24 Jul 2023 11:11:50 -0400 Received: from mout01.posteo.de ([185.67.36.65]:44731) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNxDu-0002VV-NB for 64249@debbugs.gnu.org; Mon, 24 Jul 2023 11:11:48 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 1E5B2240027 for <64249@debbugs.gnu.org>; Mon, 24 Jul 2023 17:11:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1690211500; bh=b6GCDCO7oQe2jtYkdwe+DbC/J4j1kEzGyaRzEAbxfDw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:From; b=rdLBVJF6v04WAJq5X3+ZeQcNShNSsZ0ZtaSEr7NZoMzMEXxOVwgwzjqumrxtWtSz5 XMpmT8/2Q0qIik2i/GLuHdsh3RjNAxEqzJApVmrAJ3k6aSKBD+u3kaAMM/6uBCP98i ZHvFYInH7VniEGOV4N3MEdNFR6ZgylzemZcX8iOLR++FDkEgyXlTYrwEpj47jCfsZa INKPOCwwuKKvF7MFAF3SvtC5k0HGsj2XjWvTEsVfIv0Suky4ylOhrVtA3H9l/wMTW5 N/Odm78TTNjqacUYtzG27HjpM56k3v/ioD9l3NOfFFICoVK/azb4n2OPcmuH470gm9 r/KijPnBnsSbQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4R8kCG5Qqqz9s41; Mon, 24 Jul 2023 17:11:38 +0200 (CEST) References: <858ebb8d740c7bfd0d55eaaf8a67db2298d4081a.1689682321.git.pukkamustard@posteo.net> <20230719201843.31b30208@lepiller.eu> From: pukkamustard To: Julien Lepiller Subject: Re: [bug#64249] [PATCH ocaml-team v3 2/6] gnu: coq: Update to 8.17.1. Date: Mon, 24 Jul 2023 14:54:05 +0000 In-reply-to: <20230719201843.31b30208@lepiller.eu> Message-ID: <86sf9dny39.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: DABY-SEESARAM Arnaud , 64249@debbugs.gnu.org, Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Julien Lepiller writes: > I'm not sure why, but this is breaking all coq dependents, with > messages similar to: > > 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. > > I think this is because coq-stdlib is mostly empty for some reason. A couple of build failures later this is where I'm at: - Coq 8.17.1 includes considerable changes to the build system. - Some `dune` files are autogenerated with `make dunestrap` (which runs the OCaml program `tools/dune_rule_gen/gen_rules.ml`. - In the v3 patches I submitted `make dunestrap` was not being run, resulting in missing dune files and a quite empty `coq-stdlib` package. - The 8.17.1 generated dune files for `coq-stdlib` reference things in `coq-core` directly with relative paths instead of letting dune/findlib find them (with entries in the `libraries` stanza in dune files). This makes building `coq-core` and `coq-stdlib` seperately more tricky. I've asked in #coq for ideas on how `coq-stdlib` and `coq-core` can be built seperately/kept in separate packages. Nothing yet. What do you think about merging `coq-core`, `coq-stdlib` and `coq` into a single package? Not as nice as the current situation, but maybe a way to go without too many custom patches/hacks? CC: Arnaud and Josselin who might be interested in Coq stuff. Thanks, pukkamustard >> * gnu/packages/coq.scm (coq-core, coq-stdlib, coq): Update to 8.17.1 >> and remove test-target argument. >> --- >> gnu/packages/coq.scm | 24 +++++------------------- >> 1 file changed, 5 insertions(+), 19 deletions(-) >> >> diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm >> index 09ca4030ea..3332707a71 100644 >> --- a/gnu/packages/coq.scm >> +++ b/gnu/packages/coq.scm >> @@ -53,7 +53,7 @@ (define-module (gnu packages coq) >> (define-public coq-core >> (package >> (name "coq-core") >> - (version "8.16.1") >> + (version "8.17.1") >> (source >> (origin >> (method git-fetch) >> @@ -63,7 +63,7 @@ (define-public coq-core >> (file-name (git-file-name name version)) >> (sha256 >> (base32 >> - "0ljpqhh5lfsim29fcfp2xfcvm3j84pf1mb0gnpdr8vcqqw7mqwpf")) >> + "0gg6hizq0i08lk741b579cbswhy6qvkh6inc3d3i5a2af98psq63")) >> (patches (search-patches "coq-fix-envvars.patch")))) >> (native-search-paths >> (list (search-path-specification >> @@ -83,8 +83,7 @@ (define-public coq-core >> (native-inputs >> (list ocaml-ounit2 which)) >> (arguments >> - `(#:package "coq-core" >> - #:test-target ".")) >> + `(#:package "coq-core")) >> (properties '((upstream-name . "coq"))) ; also for inherited >> packages (home-page "https://coq.inria.fr") >> (synopsis "Proof assistant for higher-order logic") >> @@ -101,19 +100,7 @@ (define-public coq-stdlib >> (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")) >> - " ")))))))) >> + `(#:package "coq-stdlib")) >> (inputs >> (list coq-core gmp ocaml-zarith)) >> (native-inputs '()))) >> @@ -123,8 +110,7 @@ (define-public coq >> (inherit coq-core) >> (name "coq") >> (arguments >> - `(#:package "coq" >> - #:test-target ".")) >> + `(#:package "coq")) >> (propagated-inputs >> (list coq-core coq-stdlib)) >> (native-inputs '()))) From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 24 11:22:27 2023 Received: (at 64249) by debbugs.gnu.org; 24 Jul 2023 15:22:28 +0000 Received: from localhost ([127.0.0.1]:43799 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNxOF-0002n2-CP for submit@debbugs.gnu.org; Mon, 24 Jul 2023 11:22:27 -0400 Received: from lepiller.eu ([2a00:5884:8208::1]:49504) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNxOC-0002mm-7V for 64249@debbugs.gnu.org; Mon, 24 Jul 2023 11:22:26 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 261af57a; Mon, 24 Jul 2023 15:22:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:in-reply-to:references:message-id:mime-version :content-type:content-transfer-encoding; s=dkim; bh=/fLOl++g9cn1 /h9gBvSdt9xq6ev1cKRA/bZAcUhtCnY=; b=Ryn2n4c0urGStDEDiQLxv2PZm8J2 W5W5zgT2IcVEb6Ev8QDLDdnORLHLB7NEhC6LzqPSS/A2/D15UMEpBgfgHkuyosKX N6fIIR415Z7aoinKSL6bSt/FLxxvW3gyxSEIPt3Znx8IcJD14SyH7Jtd4+ZoQo59 /0NbZwQn2vdumFgycPiNJKN0toRjXZFbXtUYNwxI8vXSNAJCJajC9soXdnfLoEvK z7THYhFqB02nbEoLL1Q9j5tFaY3j0sM3zV8rb3CZPjzm76hLQMtjaujZQWDsVVpq y5mRo/YC5JWSW3+VWiSI91oDx9fIpdNjD4Egr1wP56UP7vBLtWpLKCmeEQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id ab35c659 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 24 Jul 2023 15:22:19 +0000 (UTC) Date: Mon, 24 Jul 2023 17:22:14 +0200 From: Julien Lepiller To: pukkamustard Subject: Re: [bug#64249] [PATCH ocaml-team v3 2/6] gnu: coq: Update to 8.17.1. User-Agent: K-9 Mail for Android In-Reply-To: <86sf9dny39.fsf@posteo.net> References: <858ebb8d740c7bfd0d55eaaf8a67db2298d4081a.1689682321.git.pukkamustard@posteo.net> <20230719201843.31b30208@lepiller.eu> <86sf9dny39.fsf@posteo.net> Message-ID: <7F0D4C89-4838-4C95-82FA-42A49E4119A9@lepiller.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: DABY-SEESARAM Arnaud , 64249@debbugs.gnu.org, Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) I don't see how one would use coq-core without coq-stdlib and coq-stdlib de= pends on coq-core, so I think it's fine to merge these packages=2E It might= make the package definition a bit harder, since there isn't a single dune = target, but I'm fine with it=2E Le 24 juillet 2023 16:54:05 GMT+02:00, pukkamustard a =C3=A9crit=C2=A0: > >Hi, > >Julien Lepiller writes: > >> I'm not sure why, but this is breaking all coq dependents, with >> messages similar to: >> >> 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=2E >> >> I think this is because coq-stdlib is mostly empty for some reason=2E > >A couple of build failures later this is where I'm at: > >- Coq 8=2E17=2E1 includes considerable changes to the build system=2E > >- Some `dune` files are autogenerated with `make dunestrap` (which runs > the OCaml program `tools/dune_rule_gen/gen_rules=2Eml`=2E > >- In the v3 patches I submitted `make dunestrap` was not being run, > resulting in missing dune files and a quite empty `coq-stdlib` > package=2E > >- The 8=2E17=2E1 generated dune files for `coq-stdlib` reference things i= n > `coq-core` directly with relative paths instead of letting > dune/findlib find them (with entries in the `libraries` stanza in dune > files)=2E This makes building `coq-core` and `coq-stdlib` seperately > more tricky=2E > >I've asked in #coq for ideas on how `coq-stdlib` and `coq-core` can be >built seperately/kept in separate packages=2E Nothing yet=2E > >What do you think about merging `coq-core`, `coq-stdlib` and `coq` into >a single package? Not as nice as the current situation, but maybe a way >to go without too many custom patches/hacks? > >CC: Arnaud and Josselin who might be interested in Coq stuff=2E > >Thanks, >pukkamustard > > >>> * gnu/packages/coq=2Escm (coq-core, coq-stdlib, coq): Update to 8=2E17= =2E1 >>> and remove test-target argument=2E >>> --- >>> gnu/packages/coq=2Escm | 24 +++++------------------- >>> 1 file changed, 5 insertions(+), 19 deletions(-) >>>=20 >>> diff --git a/gnu/packages/coq=2Escm b/gnu/packages/coq=2Escm >>> index 09ca4030ea=2E=2E3332707a71 100644 >>> --- a/gnu/packages/coq=2Escm >>> +++ b/gnu/packages/coq=2Escm >>> @@ -53,7 +53,7 @@ (define-module (gnu packages coq) >>> (define-public coq-core >>> (package >>> (name "coq-core") >>> - (version "8=2E16=2E1") >>> + (version "8=2E17=2E1") >>> (source >>> (origin >>> (method git-fetch) >>> @@ -63,7 +63,7 @@ (define-public coq-core >>> (file-name (git-file-name name version)) >>> (sha256 >>> (base32 >>> - "0ljpqhh5lfsim29fcfp2xfcvm3j84pf1mb0gnpdr8vcqqw7mqwpf")) >>> + "0gg6hizq0i08lk741b579cbswhy6qvkh6inc3d3i5a2af98psq63")) >>> (patches (search-patches "coq-fix-envvars=2Epatch")))) >>> (native-search-paths >>> (list (search-path-specification >>> @@ -83,8 +83,7 @@ (define-public coq-core >>> (native-inputs >>> (list ocaml-ounit2 which)) >>> (arguments >>> - `(#:package "coq-core" >>> - #:test-target "=2E")) >>> + `(#:package "coq-core")) >>> (properties '((upstream-name =2E "coq"))) ; also for inherited >>> packages (home-page "https://coq=2Einria=2Efr") >>> (synopsis "Proof assistant for higher-order logic") >>> @@ -101,19 +100,7 @@ (define-public coq-stdlib >>> (inherit coq-core) >>> (name "coq-stdlib") >>> (arguments >>> - `(#:package "coq-stdlib" >>> - #:test-target "=2E" >>> - #:phases >>> - (modify-phases %standard-phases >>> - (add-before 'build 'fix-dune >>> - (lambda _ >>> - (substitute* "user-contrib/Ltac2/dune" >>> - (("coq-core=2Eplugins=2Eltac2") >>> - (string-join >>> - (map (lambda (plugin) (string-append >>> "coq-core=2Eplugins=2E" plugin)) >>> - '("ltac2" "number_string_notation" "tauto" >>> "cc" >>> - "firstorder")) >>> - " ")))))))) >>> + `(#:package "coq-stdlib")) >>> (inputs >>> (list coq-core gmp ocaml-zarith)) >>> (native-inputs '()))) >>> @@ -123,8 +110,7 @@ (define-public coq >>> (inherit coq-core) >>> (name "coq") >>> (arguments >>> - `(#:package "coq" >>> - #:test-target "=2E")) >>> + `(#:package "coq")) >>> (propagated-inputs >>> (list coq-core coq-stdlib)) >>> (native-inputs '()))) > From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 28 07:08:54 2023 Received: (at 64249) by debbugs.gnu.org; 28 Jul 2023 11:08:54 +0000 Received: from localhost ([127.0.0.1]:43820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPLL4-0008U0-Ah for submit@debbugs.gnu.org; Fri, 28 Jul 2023 07:08:54 -0400 Received: from mout01.posteo.de ([185.67.36.65]:41949) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPLL1-0008Tj-Kf for 64249@debbugs.gnu.org; Fri, 28 Jul 2023 07:08:52 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 7664C240029 for <64249@debbugs.gnu.org>; Fri, 28 Jul 2023 13:08:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1690542525; bh=hSMamd2C6gqmZBYWHr2k2cdyMC4r3gBYQ4oBfhIJQ24=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=YJVJm8iHjnkayWSedESA6bETpcWuM2dW4mPTMmZP9kcOCQCqzy+Bd5Wl0EsWqbzoK YV2IwX5I+8cschrQtionCNx3AldnQI1RZPeW5rD22stSyJJSGNXRBx0S5UVyX0QzOc InGoAIyHo0Xv9ygfQqWp6gn7q951oSTtmBshgXteWKOARQC+rRqi10F1wj+wn1H5ij 6O4Iklr9RCEarMhAa4xQfGI9o0oZ3NrosJa5Pt01+xDWq/sYGQk2BAKofNm5EoayXu +5tCSzrVV41L8SrbhDLJHTTdnxRfYpnpBhFvXI/bfkyQf+ugHRWY0srZ0eBi2oJsnE D+pbRVdN7hROA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RC4d82bH1z6twS; Fri, 28 Jul 2023 13:08:44 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v4 0/9] Date: Fri, 28 Jul 2023 11:08:22 +0000 Message-ID: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard , DABY-SEESARAM Arnaud , Julien Lepiller , Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello, This v4 fixes the previously broken Coq packages. As mentioned (https://issues.guix.gnu.org/64249#20) this merges coq-core and coq-stdlib into coq. It turns out that dune allows multiple package to be built at the same time by providing a comma-seperated list. Our #:package field can be fed such a comma-seperated list. With this trick only the 'install phase needs some tweaking. Eventually it would be nice to allow our #:package field to be a proper Scheme list. Some Coq packages need to be updated for 8.17.1 compatibility. I have not systematically checked all Coq packages. Let's see what CI says. opam is still broken. Very gracious if another pair of eyes could have a look. Thanks, pukkamustard pukkamustard (9): gnu: ocaml: Update to 4.14.1. gnu: Update coq-flocq to 4.1.1. gnu: Update coq-gappa to 1.5.3. gnu: Update coq-mathcomp to 1.17.0. gnu: coq: Update to 8.17.1. gnu: dune-bootstrap: Update to 3.9.1. gnu: opam: Split build into smaller sub-packages. gnu: Add opam-installer. FIXME: gnu: opam: Update to 2.1.5. gnu/local.mk | 4 - gnu/packages/coq.scm | 77 ++-- gnu/packages/ocaml.scm | 365 ++++++++++++------ .../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 - 7 files changed, 267 insertions(+), 398 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 base-commit: 01412c6c6a98e4da10676560638640d0f33e1a02 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 28 07:08:58 2023 Received: (at 64249) by debbugs.gnu.org; 28 Jul 2023 11:08:58 +0000 Received: from localhost ([127.0.0.1]:43824 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPLL7-0008UO-NZ for submit@debbugs.gnu.org; Fri, 28 Jul 2023 07:08:57 -0400 Received: from mout02.posteo.de ([185.67.36.66]:55127) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPLL4-0008Tn-Ss for 64249@debbugs.gnu.org; Fri, 28 Jul 2023 07:08:55 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 0DDFE240101 for <64249@debbugs.gnu.org>; Fri, 28 Jul 2023 13:08:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1690542529; bh=115OQxc3IqNLZuN/HjSsNW9EJVtxXdRY7gI9Rv5b4gQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=YcTUY7gZrl0sTBQ8lPi1jB43rrp9u6jGYASsyxMn5QeruSuGdGUlNqo3rnEOiHy/w 8basRoOT5XZlnFoXyR9yjcZi0OxX99ZmSZyaA8bX8XdcvwPS/LOL5PmbCkJq2nJCRe brBjlqXmQy8imoJLF5xP2kZtVbPyG++JxfsdTbeM2+01bjaEv8LZf9tKdBXn9RgIyT /U3fjAQkVvtZ6E/i/Z0VlSIrMSEZ3eS6wVF2V+Sn0SfTzVQcytOqoNv9AMkISArESi TifyOgaeE91M3ZWYTdlRjT2EAeQkhKemNQt+bQhYdeySRZkgTYnByJTsYIR2Ri4WKD 0NspGd8r5ImeQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RC4dD2fTnz6tsj; Fri, 28 Jul 2023 13:08:48 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v4 1/9] gnu: ocaml: Update to 4.14.1. Date: Fri, 28 Jul 2023 11:08:23 +0000 Message-ID: <3d4419719af956eac5e207468d8f19afccc16a62.1690541801.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 ab0aa0574a..6ffde41cc0 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 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 28 07:08:58 2023 Received: (at 64249) by debbugs.gnu.org; 28 Jul 2023 11:08:58 +0000 Received: from localhost ([127.0.0.1]:43827 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPLL8-0008UR-0u for submit@debbugs.gnu.org; Fri, 28 Jul 2023 07:08:58 -0400 Received: from mout01.posteo.de ([185.67.36.65]:55585) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPLL6-0008Tq-Iq for 64249@debbugs.gnu.org; Fri, 28 Jul 2023 07:08:56 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 0A42924002D for <64249@debbugs.gnu.org>; Fri, 28 Jul 2023 13:08:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1690542531; bh=2KQjyhZBWAOZElKnOLnFTVK3DEBRBdgrBsCgkA50FlU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=kRAoi7qK7lhiYofRuDYsfPwa78nDFO1Y1fddWsK3dq27PsrNgn59g4Oc3I7IE011p YBleoSj59o1K2KdcShCGOrCjtKVqSBaje9Ao1SjBgc7/1TIsgy2w47rVQOwSGpCEOp ZxBhE//+3cCN8q+MiFOMtFSp2j4/TlhGjCSOdn8VaHotyksOag9+53jEwd7TC77NDS YTfrQyLYqetFUY9HWK0YdH5tYV5WrAMGK1FZxCp6cu745OH7qPsLTqqwLSyqithOOX 4/uqgY7f4HWzqrCWNm5TQ95//UfpC7/qvIGDz/umbJkoXfXK12P0/gcgpW4gaafTHk d1Rmh06SMd5fw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RC4dG3VMqz6twS; Fri, 28 Jul 2023 13:08:50 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v4 2/9] gnu: Update coq-flocq to 4.1.1. Date: Fri, 28 Jul 2023 11:08:24 +0000 Message-ID: <5f2cae191723166ffd3f492af6e1cf921a7d2f89.1690541801.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 28 07:09:05 2023 Received: (at 64249) by debbugs.gnu.org; 28 Jul 2023 11:09:05 +0000 Received: from localhost ([127.0.0.1]:43843 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPLLF-0008W0-GT for submit@debbugs.gnu.org; Fri, 28 Jul 2023 07:09:05 -0400 Received: from mout01.posteo.de ([185.67.36.65]:54693) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPLL7-0008Ts-SB for 64249@debbugs.gnu.org; Fri, 28 Jul 2023 07:08:58 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 501F5240027 for <64249@debbugs.gnu.org>; Fri, 28 Jul 2023 13:08:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1690542532; bh=iDuYl+NZjT0HbFLy6F1zyZvehLzekvdRtQ2GAT0H8so=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=T7cWnhF8OPAD5cKiYeOLczpWYkldrSnBkJ2FdFW8I7iKMpP2O1RYFCcmWtZQUeBi0 W1o5ViRx6D7PMGD+tinvPYDV09+wi46xp2LeZ2USwnYy4peHAXJeV+EBo4VjZo4H9w FIfOEqogZXSN/Vkxdt6qhbc04yzivd3WpC/cu/Btgj7Z6vdNOD/oBL8yhrmPCPa8AH 8EVVxgLBXqPt0cm+zluW94esuVAHXy6ePCZW0s0NVIEb9TpY++zLkL7qc+sbZKY2tp 2uFu5EMhglt35NKSMYglVdJRYC6IRDa4eEUU/PD29i7t97Q49tML2WE9t1KQMs3ay/ +uxIsWQgL9jQw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RC4dH6GQJz6tyd; Fri, 28 Jul 2023 13:08:51 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v4 3/9] gnu: Update coq-gappa to 1.5.3. Date: Fri, 28 Jul 2023 11:08:25 +0000 Message-ID: <0ecaf2c0a4704a361187d69a696118f54112fbba.1690541801.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 28 07:09:06 2023 Received: (at 64249) by debbugs.gnu.org; 28 Jul 2023 11:09:06 +0000 Received: from localhost ([127.0.0.1]:43845 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPLLF-0008W3-Pn for submit@debbugs.gnu.org; Fri, 28 Jul 2023 07:09:06 -0400 Received: from mout02.posteo.de ([185.67.36.66]:60545) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPLL9-0008Tz-52 for 64249@debbugs.gnu.org; Fri, 28 Jul 2023 07:08:59 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 97B0C240101 for <64249@debbugs.gnu.org>; Fri, 28 Jul 2023 13:08:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1690542533; bh=B9g25xQC+VlWV4nAoGJPea43S47XVcYNbXJ6gijs9XU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=IMBpRKin+9+zUTd4r6i0x0sezoLcOYtZO3IeOI1oaJs20xhfiVkQGbn7guwD2T68f 2F8YGnCLD96mElcUvmqJ7CNbU6Tp7leKfum765rCoYgbkzxKQFnizxJOXg4HVBipoO gaRSq76uOY3jVP0l/DFXq+JxPUdmhJxlfrDzgMMb1Tus98L4PQ5U8xRFKVm5N4v3WU owhLJKu91oM98KS+nPWimj+O+DJzaULzQs92dBwMdLxjdiPCDmapxrggBHnVGIqO0Y su8HHM8Spy5o9U+0BExnhj8Z0TiRMwY2SSLNcR/iBWZM0tGtj2ec7ub4JSMyqsxsNm gAw7Q+asiUvXQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RC4dK12DXz6tyj; Fri, 28 Jul 2023 13:08:53 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v4 4/9] gnu: Update coq-mathcomp to 1.17.0. Date: Fri, 28 Jul 2023 11:08:26 +0000 Message-ID: <64830fd90936cc3da91187d036887bc6296b165a.1690541801.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 86a9aef0f4..cc914422d4 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)) -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 28 07:09:07 2023 Received: (at 64249) by debbugs.gnu.org; 28 Jul 2023 11:09:07 +0000 Received: from localhost ([127.0.0.1]:43847 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPLLG-0008WA-42 for submit@debbugs.gnu.org; Fri, 28 Jul 2023 07:09:07 -0400 Received: from mout01.posteo.de ([185.67.36.65]:44247) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPLLA-0008U8-Dl for 64249@debbugs.gnu.org; Fri, 28 Jul 2023 07:09:01 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id D9B4D240028 for <64249@debbugs.gnu.org>; Fri, 28 Jul 2023 13:08:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1690542534; bh=X/eXZDk7vm2Oqyo6tDMFe2VA5E2J75zBAJSmx++V3kE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=rz8HM2ewVykeMxTS94PhdRgbfH2snfyri1PEtjtQwH50cvYbVOz5QUdlba89YrjVI a34F3+AZndgFSDJaHCkVKPDH82KwIVPa8cB7Jgb1fundS8pTZMtWl8zZICWIRtyllj PdgzIk8F1Z3BH/qRYY85nnNOGUz1gWyWnIF/cOqTXZnyUYVtptDLEJPXxDMXhl3bWH Scuxj9i+2yNYIrHOfQGzixce6YNRoIR/REBtkxb7Xh9dLwMh4saeoh8rwJZj4w3eFE PBbeMssgA9cbb9kLv82MNSeT7OHmeQA7oAN6zr3a54MjJrtjr+16c05NxI1aOqGWgW cp0nRQ05B21xg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RC4dL34b5z6txd; Fri, 28 Jul 2023 13:08:54 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v4 5/9] gnu: coq: Update to 8.17.1. Date: Fri, 28 Jul 2023 11:08:27 +0000 Message-ID: <97754585bac7132fd7ab70f7c7b5372ddad049c3.1690541801.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 (coq-core): Remove variable. (coq-stdlib): Remove variable. (coq-mathcomp-bigenough)[propagated-inputs] Remove coq-core. --- gnu/packages/coq.scm | 65 ++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 41 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index cc914422d4..6f9205cfb0 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -50,10 +50,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,7 +63,7 @@ (define-public coq-core (file-name (git-file-name name version)) (sha256 (base32 - "0ljpqhh5lfsim29fcfp2xfcvm3j84pf1mb0gnpdr8vcqqw7mqwpf")) + "0gg6hizq0i08lk741b579cbswhy6qvkh6inc3d3i5a2af98psq63")) (patches (search-patches "coq-fix-envvars.patch")))) (native-search-paths (list (search-path-specification @@ -78,13 +78,29 @@ (define-public coq-core (files (list "lib/ocaml/site-lib/coq-core")) (separator #f)))) (build-system dune-build-system) + (arguments + `(#: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")) + (libdir (string-append out "/lib/ocaml/site-lib"))) + (invoke "./configure" "-prefix" out + "-libdir" libdir)))) + (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-core" "coq-stdlib" "coq"))))))) (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 +112,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) @@ -761,7 +744,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 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 28 07:09:07 2023 Received: (at 64249) by debbugs.gnu.org; 28 Jul 2023 11:09:07 +0000 Received: from localhost ([127.0.0.1]:43850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPLLH-0008WI-9P for submit@debbugs.gnu.org; Fri, 28 Jul 2023 07:09:07 -0400 Received: from mout02.posteo.de ([185.67.36.66]:44353) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPLLB-0008UF-LD for 64249@debbugs.gnu.org; Fri, 28 Jul 2023 07:09:02 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 1E28B240103 for <64249@debbugs.gnu.org>; Fri, 28 Jul 2023 13:08:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1690542536; bh=lkUe6q2HSNyGVI4pv2ummI8FCUgPLlIg6L/JxDdfQ/I=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=SgAZfSQI9HjUlHA780mdQ4ydp4f6Xpg/k9SeaR9WnawtJBRCAWrs/Mp3zDT9sVoIe GOxHbBIgUK/3n0dpG1KUskojw0e4wvvcLeitjXCVTp6o1AAo+Y6G6w+CetLUPwLw7Y w2Imm3XmhnOnRa2NN4tqel8UzdZOmoEyzgAT9hCHGiKn5s+RvjBCW5GgSih/RTB2kO oeOgU20hz1EPLeltVr10AphDYgMGnSqnps/EUsI8Hpu++HS0dJzdGOtmAih4CSnQAh Qn952Wrqqy/bbOMK+pyVIZ92RzZ+jslkWfdlOwgTvQ6FfXVHGLD3hUu7JKpvDxFyMe crgeboZ/usQ/A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RC4dM4zpmz6ty7; Fri, 28 Jul 2023 13:08:55 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v4 6/9] gnu: dune-bootstrap: Update to 3.9.1. Date: Fri, 28 Jul 2023 11:08:28 +0000 Message-ID: <54108cad3e6d8ff5a0a6f3071b3e7f61752621c2.1690541801.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (dune-bootstrap): Update to 3.8.2. [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 6ffde41cc0..d2bc7cc118 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1819,7 +1819,7 @@ (define-public ocaml-stringext (define dune-bootstrap (package (name "dune") - (version "3.6.1") + (version "3.9.1") (source (origin (method git-fetch) (uri (git-reference @@ -1828,7 +1828,7 @@ (define dune-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "0gv851wxbv5ln20429nj7p92spzxgw8vngg9z94q39aawn6q8lx6")))) + "0bgqsam21ah8piqhnrkfzn8r75w83pkn75751jks2rlppkgx9g3y")))) (build-system ocaml-build-system) (arguments `(#:tests? #f; require odoc @@ -1845,9 +1845,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 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 28 07:09:08 2023 Received: (at 64249) by debbugs.gnu.org; 28 Jul 2023 11:09:08 +0000 Received: from localhost ([127.0.0.1]:43852 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPLLH-0008WQ-OO for submit@debbugs.gnu.org; Fri, 28 Jul 2023 07:09:08 -0400 Received: from mout02.posteo.de ([185.67.36.66]:56947) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPLLC-0008UN-Sh for 64249@debbugs.gnu.org; Fri, 28 Jul 2023 07:09:04 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 56BFC240101 for <64249@debbugs.gnu.org>; Fri, 28 Jul 2023 13:08:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1690542537; bh=AE6egnh9p8KeIR9WngIaz7Ysnw6bAepv2pqQJjccwiA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=Qebhiq5833ThcI9Fc9jd3UsvRdqyWBwHJUGKRfdk+dSvKIQt0TaiPR8wJw8g7I4/s NMLVUhT7R4k2jOczf6IhCaW+89ncqN0fzGfdjkrL+NUh/WkoyrmxwpAtSeScsN7Bxo sIIT1n+3RR7LAaL1cF3V6wlPaM/V4RDGgvufiD7EZiXQpvWKloU28pmkdiVEJLdp+J 2sl8tVzOg/LZg02YQHl0C8ZMhpBpfE05WpsQSskGyarCZEM1CerVsgJ90h67k/Ybdl himZXZoH6kmnM3am427Hoi2xSwTKQg0uCU9d9r8hTIOnGmdQ3uQRipY60WLm3UjWBt T3LDwzsM/UqwA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RC4dN6WG5z6ty7; Fri, 28 Jul 2023 13:08:56 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v4 7/9] gnu: opam: Split build into smaller sub-packages. Date: Fri, 28 Jul 2023 11:08:29 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (opam): Split build into smaller sub-packages. --- gnu/packages/ocaml.scm | 164 +++++++++++++++++++++++++++++++---------- 1 file changed, 125 insertions(+), 39 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d2bc7cc118..0d78f4d864 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -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,129 @@ (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 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-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 +1063,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 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 28 07:09:09 2023 Received: (at 64249) by debbugs.gnu.org; 28 Jul 2023 11:09:09 +0000 Received: from localhost ([127.0.0.1]:43854 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPLLI-000051-Sm for submit@debbugs.gnu.org; Fri, 28 Jul 2023 07:09:09 -0400 Received: from mout02.posteo.de ([185.67.36.66]:33777) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPLLE-0008Uj-66 for 64249@debbugs.gnu.org; Fri, 28 Jul 2023 07:09:05 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 9E6BA240101 for <64249@debbugs.gnu.org>; Fri, 28 Jul 2023 13:08:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1690542538; bh=3CEtR37R50aLzKWg7206Cum8u8tjLG3CUbWnf2VaZro=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=U1f8XrjMpL6Txp0q4LzbNQHdJITudqOerMmgsZ2uQLckkY1gs7OxFwPcPXH9QbbVF bE/kVCxDI4ksnXLRkYYllQvAIUdttzFTZtRxZ7qESb5pGv0A7+RGIocn0Xg3JTWZPl rtymIfiSPM6s2Hb/DlA5lgp47m2AhJf4bW1DLO6ZGXTiUkGXtNW2A5PKDz8PMLXgzU zWvCHk6li4/DIYFypCcr4Gj5BgCgfkAqo/VBuUg33D0ojJ98Bapt8PVKkJ3gErjja6 dLCUcXe8bPnA8IUY5JBspGfPNqdZObbPyT713LPp8xY4HIa9VvFiPNg4vIoF3qMZmy IZVMgcXJezHAg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RC4dQ1W0Tz6ty7; Fri, 28 Jul 2023 13:08:58 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v4 8/9] gnu: Add opam-installer. Date: Fri, 28 Jul 2023 11:08:30 +0000 Message-ID: <736385d685b5a9b8074265a8e063f9d666680966.1690541801.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (opam-installer): New variable. (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) [native-inputs]: Replace opam with opam-installer. --- gnu/packages/ocaml.scm | 90 ++++++++++++++++++++++++++---------------- 1 file changed, 55 insertions(+), 35 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0d78f4d864..90fedc2e88 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 @@ -901,6 +901,27 @@ (define ocaml-opam-format #: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) @@ -2325,7 +2346,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 @@ -2355,7 +2376,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 @@ -2470,7 +2491,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 @@ -2600,13 +2621,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") @@ -2647,9 +2668,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") @@ -2869,7 +2890,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") @@ -2993,7 +3014,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 @@ -3455,7 +3476,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) @@ -3489,7 +3510,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))) @@ -3519,7 +3540,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) @@ -3593,7 +3614,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 @@ -3734,7 +3755,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 @@ -3760,9 +3781,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))) @@ -3807,7 +3828,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" @@ -3848,9 +3869,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))) @@ -4268,7 +4289,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 @@ -5275,7 +5296,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))) @@ -5921,7 +5942,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) @@ -9641,7 +9662,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 @@ -9669,7 +9690,7 @@ (define-public ocaml-uucp (modify-phases %standard-phases (delete 'configure)))) (native-inputs - (list opam + (list opam-installer ocaml-findlib ocamlbuild ocaml-topkg @@ -9703,7 +9724,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 @@ -10164,8 +10185,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 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 28 07:09:24 2023 Received: (at 64249) by debbugs.gnu.org; 28 Jul 2023 11:09:24 +0000 Received: from localhost ([127.0.0.1]:43856 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPLLX-00005U-Ml for submit@debbugs.gnu.org; Fri, 28 Jul 2023 07:09:24 -0400 Received: from mout02.posteo.de ([185.67.36.66]:41245) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPLLG-0008Ut-Em for 64249@debbugs.gnu.org; Fri, 28 Jul 2023 07:09:08 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id E17C8240101 for <64249@debbugs.gnu.org>; Fri, 28 Jul 2023 13:09:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1690542540; bh=irzh3NitpBPjTzfbJVtxtfTswy2l3e6MBrFhBG7UN1Q=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=kG4k+7pqrgP7eqqVYycVKxfNoE5avlFwFZrLp1eqtEwHJOler+6jEO3Ks9wNrXxLc Mg+IHW71+83mooPnI8VeDVAehnPevdS6IRPAp8WLiDkRKL+bGfbeQpT5KLffFiEL8/ Y6r6GPYZ8NAFC8TPWjEiy07j8acSXm5YcVqpH1LnIZiATKVW/v9Sv++NK7ftsBD6nW r6wbIWh5VH3uNxDoec2wOy+EdQQ/o1NrNtGtILw+A9AKzccCVwnnOwRvKS6IxNpPL8 9a3+rT+EJsVKItKnfQ5xvCvYtIFsi1YFOvtrIT7MXO9BX1an0zTtxnLgkQ7nYApPb6 4rsEXUt9D2Hyw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RC4dS2MMbz6tyq; Fri, 28 Jul 2023 13:09:00 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v4 9/9] FIXME: gnu: opam: Update to 2.1.5. Date: Fri, 28 Jul 2023 11:08:31 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (opam): Update to 2.1.5. [native-inputs]: Add more test data. (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 | 96 ++++++------- .../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, 49 insertions(+), 270 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 06a376a99a..f28baefdb6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1646,10 +1646,6 @@ dist_patch_DATA = \ %D%/packages/patches/nyacc-binary-literals.patch \ %D%/packages/patches/oath-toolkit-xmlsec-compat.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 90fedc2e88..badc898648 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,30 +722,17 @@ (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)) - (home-page "https://www.mancoosi.org/software/") + "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 "http://www.mancoosi.org/software/") (synopsis "Package distribution management framework") (description "Dose3 is a framework made of several OCaml libraries for managing distribution packages and their dependencies. Though not tied to @@ -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 @@ -1072,6 +1059,8 @@ (define-public opam ("which" ,which) ;; Data for tests + ("opam-repo-0070613707" ,(opam-repo "00706137074d536d2019d2d222fbe1bea929deda" + "1gv1vvmfscj7wirfv6qncp8pf81wygnpzjwd0lyqcxm7g8r8lb4w")) ("opam-repo-009e00fa" ,(opam-repo "009e00fa86300d11c311309a2544e5c6c3eb8de2" "1wwy0rwrsjf4q10j1rh1dazk32fbzhzy6f7zl6qmndidx9b1bq7w")) ("opam-repo-7090735c" ,(opam-repo "7090735c9d1dd2dc481c4128c5ef4d3667238f15" @@ -1080,10 +1069,21 @@ (define-public opam "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"))))) + "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 @@ -4443,8 +4443,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") @@ -4453,6 +4452,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 @@ -5325,27 +5332,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 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 30 13:42:33 2023 Received: (at 64249) by debbugs.gnu.org; 30 Jul 2023 17:42:33 +0000 Received: from localhost ([127.0.0.1]:51210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qQAR6-0004Go-OG for submit@debbugs.gnu.org; Sun, 30 Jul 2023 13:42:33 -0400 Received: from lepiller.eu ([2a00:5884:8208::1]:40148) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qQAR1-0004GZ-F2 for 64249@debbugs.gnu.org; Sun, 30 Jul 2023 13:42:31 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 5ec5cc41; Sun, 30 Jul 2023 17:42:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=dLYqki3kKGOg AueC6ct4gVY82KByg5LwdA/cUenEutg=; b=IWV5kAnoV0qxQE0SVYOW1xR3Ufzz 2FIUyOjkN5JvPYVqjiYx/ggOV/CTD+vLGxXWV6BrbNggrvFzDnzoZfglgL4KVAHt KFHw6C5TcUo4g6+TD38xYHtjNooOddHu5KY/q9LhyV/eVoNip3x+ik3jFTpUv97h tkf6gCyik4OB4c3TYynzMIjbz5NjdKiPYki/xk89xDsxDDPUfvzug/s3Gqv1uWFW pbQG+ykfmzlbrGkgGOoVi68ptBS+Ib8cGWg1TMO/3lTr1Pz1t521dbdBtNGD+ddb tekdT0b8DUZ4GIMtnYxm0tM7k8QZeo69i+eNxUaOJhWJn0ICGmG+3WE4xg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 481e8b9d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 30 Jul 2023 17:42:22 +0000 (UTC) Date: Sun, 30 Jul 2023 19:42:21 +0200 From: Julien Lepiller To: pukkamustard Subject: Re: [bug#64249] [PATCH ocaml-team v4 0/9] Message-ID: <20230730194221.50deb15c@lepiller.eu> In-Reply-To: References: X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: 64249@debbugs.gnu.org, DABY-SEESARAM Arnaud , Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le Fri, 28 Jul 2023 11:08:22 +0000, pukkamustard a =C3=A9crit : > Hello, >=20 > This v4 fixes the previously broken Coq packages. >=20 > As mentioned (https://issues.guix.gnu.org/64249#20) this merges > coq-core and coq-stdlib into coq. >=20 > It turns out that dune allows multiple package to be built at the > same time by providing a comma-seperated list. Our #:package field > can be fed such a comma-seperated list. With this trick only the > 'install phase needs some tweaking. Eventually it would be nice to > allow our #:package field to be a proper Scheme list. >=20 > Some Coq packages need to be updated for 8.17.1 compatibility. I have > not systematically checked all Coq packages. Let's see what CI says. >=20 > opam is still broken. Very gracious if another pair of eyes could > have a look. >=20 > Thanks, > pukkamustard >=20 > pukkamustard (9): > gnu: ocaml: Update to 4.14.1. > gnu: Update coq-flocq to 4.1.1. > gnu: Update coq-gappa to 1.5.3. > gnu: Update coq-mathcomp to 1.17.0. This patch breaks coq-coquelicot, but it can be updated to 1.4.0, and that fixes the issue. > gnu: coq: Update to 8.17.1. You've missed a coq-stdlib reference in coq-mathcomp-finmap, but simply removing it fixes the issue. coq-autosubst-1, coq-equations, coqstdpp, coq-interval and coq-mathcomp-bigenough fail to build with the newer coq. coq-ide also fails, but it used to fail already. > gnu: dune-bootstrap: Update to 3.9.1. > gnu: opam: Split build into smaller sub-packages. there are quite a few more failures with this patch. For instance, ocaml-topkg fails because it can't find the opam-installer binary. > gnu: Add opam-installer. And of course this patch fixes the issue. I haven't followed closely recent changes to policy, but it used to be that, if there were no other solutions we would prefer to have multiple changes in a single patch if separating them would break something, even in an intermediate commit. ocaml-ocb-stubblr still fails because it has opam instead of opam-installer. It can be switche to new style inputs too :) > FIXME: gnu: opam: Update to 2.1.5. You replaced the home-page of dose3 with the http version, but the https version still works. I looked into the build issue, but I can only see deprecation warnings. Did I miss something? >=20 > gnu/local.mk | 4 - > gnu/packages/coq.scm | 77 ++-- > gnu/packages/ocaml.scm | 365 > ++++++++++++------ .../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 - > 7 files changed, 267 insertions(+), 398 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 >=20 >=20 > base-commit: 01412c6c6a98e4da10676560638640d0f33e1a02 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 06 11:20:07 2023 Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:20:07 +0000 Received: from localhost ([127.0.0.1]:59810 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfY7-0002K6-3F for submit@debbugs.gnu.org; Sun, 06 Aug 2023 11:20:07 -0400 Received: from mout02.posteo.de ([185.67.36.66]:49265) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfY2-0002JR-Qt for 64249@debbugs.gnu.org; Sun, 06 Aug 2023 11:20:05 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id ED7CD240101 for <64249@debbugs.gnu.org>; Sun, 6 Aug 2023 17:19:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1691335197; bh=OhEF2vmyCYqF4N5NlnbfbCUdVwbKPL3khaaqVf2W0G8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=pcMXuy2w3OFeaULRBS5g9W3ZQZrdfYJHY/kyyXw8M1rNpFMJASflycGY4lt0Yjflz g6G1VRwczTEGaUkuh1Zd0PDOmrZNTY/1v95GFbDBYBzgd7e+dyU1ShF420UcjvFCvo P3IDJMy4oWpiV/LBGjsTBPvxMDJDCPBa3kztIJelSA8zXR3IoHqseWER5vi4E/iIOL PFWXBzAJWRc9UKcn4HWmSJN9+qXuAt0sFHipozvsx0nesimgfMZtw9Ta0wDIcUUrOR UXRsTKnhjqym8987Zgs8pPKuxbTxZTXYpVVQxx1wn5J/IVIZaTe1mfrRL9KcFnI97F 0e37eR/doCxpA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RJjmr0Dnlz9rxD; Sun, 6 Aug 2023 17:19:55 +0200 (CEST) References: <20230730194221.50deb15c@lepiller.eu> From: pukkamustard To: Julien Lepiller Subject: Re: [bug#64249] [PATCH ocaml-team v4 0/9] Date: Sun, 06 Aug 2023 14:09:42 +0000 In-reply-to: <20230730194221.50deb15c@lepiller.eu> Message-ID: <86y1io8ag9.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Spam-Score: -3.3 (---) X-Debbugs-Envelope-To: 64249 Cc: 64249@debbugs.gnu.org, DABY-SEESARAM Arnaud , Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.3 (----) Hi Julien, Thanks for your comments! Will send in updated patches as a v5. Julien Lepiller writes: >> pukkamustard (9): >> gnu: ocaml: Update to 4.14.1. >> gnu: Update coq-flocq to 4.1.1. >> gnu: Update coq-gappa to 1.5.3. >> gnu: Update coq-mathcomp to 1.17.0. > > This patch breaks coq-coquelicot, but it can be updated to 1.4.0, and > that fixes the issue. Updated coq-coquelicot to 3.4.0. >> gnu: coq: Update to 8.17.1. > > You've missed a coq-stdlib reference in coq-mathcomp-finmap, but simply > removing it fixes the issue. Done. > coq-autosubst-1, coq-equations, coqstdpp, coq-interval and > coq-mathcomp-bigenough fail to build with the newer coq. coq-ide also > fails, but it used to fail already. - Fixed coq-ide by adding zlib to propagated-inputs. - Fixed coq-autosubst by updating to 1.8 - Fixed coq-equations by updating to 1.3-8.17 (I chose to add the release variant in the version string) - Fixed coq-stdpp by updating to 1.8.0. - Fixed coq-interval by updating to 4.8.0. coq-mathcomp-bigenough is still broken. There is a (to me) cryptic but seemingly related message on the issue tracker: https://github.com/math-comp/bigenough/issues/9. Maybe somebody with more insight/interest in Coq could look into this? >> gnu: dune-bootstrap: Update to 3.9.1. >> gnu: opam: Split build into smaller sub-packages. > > there are quite a few more failures with this patch. For instance, > ocaml-topkg fails because it can't find the opam-installer binary. > >> gnu: Add opam-installer. > > And of course this patch fixes the issue. I haven't followed closely > recent changes to policy, but it used to be that, if there were no > other solutions we would prefer to have multiple changes in a single > patch if separating them would break something, even in an intermediate > commit. > > ocaml-ocb-stubblr still fails because it has opam instead of > opam-installer. It can be switche to new style inputs too :) Merged the commit to add opam-installer to the previous commit and fixed ocaml-ocb-stubblr. >> FIXME: gnu: opam: Update to 2.1.5. > > You replaced the home-page of dose3 with the http version, but the > https version still works. I re-imported dose3 with `guix import opam` and it seems like http is used in the opam metadata. Fixed to use https. > I looked into the build issue, but I can only see deprecation warnings. > Did I miss something? Yes, the error is quite hidden: --8<---------------cut here---------------start------------->8--- (cd _build/default && /gnu/store/qpbrmd6qaakv0zw3f2w2x2cw4nwy5lsg-ocaml-4.1= 4.1/bin/ocamlc.opt -w -40 -w +a-4-40-42-44-48 -safe-string -g -bin-annot -I= src/client/.opam_client.objs/byte -I /gnu/store/1zzqn0z6rkgb1bwh2hn5in1wfj= jcr7ik-ocaml-opam-format-2.1.5/lib/ocaml/site-lib/opam-format -I /gnu/store= /46q0hi0bzinsp4jl4921rfw2yd2hxyhd-ocaml-opam-repository-2.1.5/lib/ocaml/sit= e-lib/opam-repository -I /gnu/store/4ldlmhrq0nrbh9sf29r17d9y3qndwch4-ocaml-= mccs-1.1+14/lib/ocaml/site-lib/mccs -I /gnu/store/4ldlmhrq0nrbh9sf29r17d9y3= qndwch4-ocaml-mccs-1.1+14/lib/ocaml/site-lib/mccs/glpk/internal -I /gnu/sto= re/5pj64sfvin4apb2364gnza0srm7jwibd-ocaml-re-1.10.4/lib/ocaml/site-lib/re -= I /gnu/store/5pj64sfvin4apb2364gnza0srm7jwibd-ocaml-re-1.10.4/lib/ocaml/sit= e-lib/re/pcre -I /gnu/store/7h1nbgpy8c2vyisq6dyvwww2di2xnx9n-ocaml-graph-2.= 0.0/lib/ocaml/site-lib/ocamlgraph -I /gnu/store/87njknpz4803bcfvx9flwchqf4l= 8prcj-ocaml-cudf-0.10/lib/ocaml/site-lib/cudf -I /gnu/store/ai8z8r9ykib0003= 9gq0gylyps6xzs55w-ocaml-opam-file-format-2.1.4/lib/ocaml/site-lib/opam-file= -format -I /gnu/store/fz8a8plnh2j7z020jljy66fg4mmbp3hv-ocaml-extlib-1.7.9/l= ib/ocaml/site-lib/extlib -I /gnu/store/hmsqsalxyda0c0g41rl3znj8lqnbc1cy-oca= ml-opam-solver-2.1.5/lib/ocaml/site-lib/opam-solver -I /gnu/store/k51jkvxz1= smwl3bvi13yh3myg4av3fva-ocaml-dose3-7.0.0/lib/ocaml/site-lib/dose3/algo -I = /gnu/store/k51jkvxz1smwl3bvi13yh3myg4av3fva-ocaml-dose3-7.0.0/lib/ocaml/sit= e-lib/dose3/common -I /gnu/store/lvhm3dnkqbacm7gy2r6ppvng9rq8rqzx-ocaml-seq= -0.1/lib/ocaml/site-lib/seq -I /gnu/store/qpxf86c2qkyjwidlf5dhj17jwg5pfwz5-= ocaml-opam-core-2.1.5/lib/ocaml/site-lib/opam-core -I /gnu/store/rav2kpix7f= b1gj9x609qzrd6a3cla9b1-ocaml-base64-3.5.0/lib/ocaml/site-lib/base64 -I /gnu= /store/v63rrnbsq9806s8q0qz0fkrw1napqn0f-ocaml-stdlib-shims-0.3.0/lib/ocaml/= site-lib/stdlib-shims -I /gnu/store/vw64xzqqkz8gzg6ikrp4ks5bqdbjash3-ocaml-= cmdliner-1.1.1/lib/ocaml/site-lib/cmdliner -I /gnu/store/ylwbjd8fmi6mrk2lxs= vh7yrjajh7qbi4-ocaml-opam-state-2.1.5/lib/ocaml/site-lib/opam-state -intf-s= uffix .ml -no-alias-deps -o src/client/.opam_client.objs/byte/opamSwitchCom= mand.cmo -c -impl src/client/opamSwitchCommand.ml) File "src/client/opamSwitchCommand.ml", line 405, characters 18-35: 405 | let value =3D Base64.decode_exn content in ^^^^^^^^^^^^^^^^^ Error: Unbound value Base64.decode_exn --8<---------------cut here---------------end--------------->8--- In the meantime dune 3.10.0 was released and the v5 updates to it. So, happy recompiling! :) Thanks, pukkamustard From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 06 11:21:14 2023 Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:14 +0000 Received: from localhost ([127.0.0.1]:59815 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZB-0002MQ-OK for submit@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:14 -0400 Received: from mout01.posteo.de ([185.67.36.65]:45785) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZ8-0002M0-6c for 64249@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:12 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 22933240029 for <64249@debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1691335264; bh=zeJt3uWTgIaqQkBsywLXCIv63sI6woY9G+3vrK5j8pY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=AB9o2kRfYH02HhhWt7e60LUNtzOaQqgR9UZrYGhq+qB5PF0/4GLCyom8eDuf4BY2s 08aU+Seu9ya6jpfRw/8pgPbNhrh5CMkwo/F1cIY5/6kf+G53gQhivVeu5E/ENCoZad g9lCOmfZ88KVi1QueTqOmGP75bNIEhiMMK8D/b4YYBWHmcex5XZBoc6/gtH3Ky8V3t Fop3QisgZMxl1uweEQCjJD8vPP89kvgxjqh7yXxkb3SNw5O1q4vU/OhdTszmomSlGO ZFE3nFlZjvYz3ZtFZaCfXosi07WJvg+uc4FRi/Wr9MpUHe+cWSSA6l6u4/JPgZ2gWz RTRfdvRxyUP3w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RJjp73rKWz6twM; Sun, 6 Aug 2023 17:21:03 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v5 01/12] gnu: ocaml: Update to 4.14.1. Date: Sun, 6 Aug 2023 15:20:20 +0000 Message-ID: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -3.3 (---) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.3 (----) * 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 8ff755aea9..56661b1977 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 base-commit: c4b9f726e3a1889b92a4b14a2af1c25f10798469 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 06 11:21:14 2023 Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:14 +0000 Received: from localhost ([127.0.0.1]:59817 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZC-0002MS-2o for submit@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:14 -0400 Received: from mout01.posteo.de ([185.67.36.65]:58997) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZA-0002M3-6L for 64249@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:12 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id A1111240029 for <64249@debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1691335266; bh=mLI5ysOOklCMR/BcBN4xlWZjYyU1Dk4LWaltXZK92w4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=cnmu5E83Rs9E1jUk20LAc2XnLaSNDI3MrsrB9FsqunDsa52k1E/F0It/4rPYWEO6J ux8DiG222ebu/luD/fF3dxy01cyIc9+UJdIOqhXz220rl2f+oUDko5VsJgF52d/n/B QpIon3eFT1eak9fBLr7QAlGh6IXlAt/VakQ7N1+yVuNlYp109s2rg7ojqa4ENwfpfc Nz5BphgSUFmdq31c3UqJpPt4bFSLy35PFWmhrmyUSbL+ZGfawCI9v8yHpm1+9QqXvS Vohbivh6PCsrPxppivTvL0LMTXXyeX8GsaPd1oFleAXKwUXgejDNHQEu9dIf48dSVO cA2fxTqV/bBDQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RJjp96Y4Cz6tmv; Sun, 6 Aug 2023 17:21:05 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v5 02/12] gnu: Update coq-flocq to 4.1.1. Date: Sun, 6 Aug 2023 15:20:21 +0000 Message-ID: <73ed93b86a64df74487769342b492c7d46b94661.1691335142.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -3.3 (---) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.3 (----) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 06 11:21:16 2023 Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:16 +0000 Received: from localhost ([127.0.0.1]:59821 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZE-0002Mt-Gi for submit@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:16 -0400 Received: from mout02.posteo.de ([185.67.36.66]:50861) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZC-0002M6-7W for 64249@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:14 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id AA2CA240101 for <64249@debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1691335268; bh=USsFpWtosQw0jiSzUqhY4+NKI7rSidpzXUdE3CTTKrA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=aim+g9tTYkVdMyWOeSR6eKy588sf7dM5oYBgHD7TgFvX2pw7Pj2/vcN0eSdDc22fR vv5qjIAFAsveaRf9BPCVipT+ktJ6EeqvUrZMgjZrPq9JhNIlUWH1XeSBIU6r58R0Si lbMT5rUVrQPD9EHdlQuiVtHxlGec0rz4rkhSvr2bHqNMmYF9TdjphPJkfdviOlAHKT qnqQve5SeNVBGTYKIlsrUkdZJDv1sUe7hsR4slJ8kKWsbnWvTtCXALcifuU2S7UcHO zCsey80gh1FvNijAri/wpoOe/XYIk9exFPME5Q5LOCCrceK3DpJzwySjM7ETLyEk3o XIl6684W3PXag== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RJjpD1j5Fz6tmv; Sun, 6 Aug 2023 17:21:08 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v5 03/12] gnu: Update coq-gappa to 1.5.3. Date: Sun, 6 Aug 2023 15:20:22 +0000 Message-ID: <752d12d40ab4c114d828c2918dbda39ab3f0615d.1691335142.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -3.3 (---) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.3 (----) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 06 11:21:20 2023 Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:20 +0000 Received: from localhost ([127.0.0.1]:59825 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZH-0002NF-Qw for submit@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:20 -0400 Received: from mout01.posteo.de ([185.67.36.65]:46791) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZD-0002MA-KL for 64249@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:16 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 16CE9240028 for <64249@debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1691335270; bh=Jw3lcd3fwGlgSvEtz/83YRCQDBb4wJL8gc/SkZXJV5Q=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=lPCVx3B54OCRit/Hy7oLzTxLMqzIB25gA+Y6bs0UMa3Vc1a/0x1gN+mAKEwL4fuD4 aSirk0gG0PRSUSBZecPQyuNtjSofm7ZO/54kRe6HVRKgkgjmfLmtHG2cB8oJ7QalGI MJu9OOGEFrIZkFXPWFT/DbzyzWj8tV9ZM9WiuIVZhHnHcsSVIQDT5X0USIHtnc3tHR u3yopbfK5u7AUVvro5IFk71CVYPCjcwhE+roqFeMKXxWsEfORgq4saPM69zaTi7jD1 s3nSCWe0645EEVdN4GoRKBn3+Sfc4tg/p8ookWrZT2sHxfMAS3IZkr4Hp8Y0X6Cqxb JvZ48ARLR/ryA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RJjpF4K2Jz6tmv; Sun, 6 Aug 2023 17:21:09 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v5 04/12] gnu: Update coq-coquelicot to 3.4.0. Date: Sun, 6 Aug 2023 15:20:23 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -3.3 (---) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.3 (----) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 06 11:21:20 2023 Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:20 +0000 Received: from localhost ([127.0.0.1]:59827 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZI-0002NI-4V for submit@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:20 -0400 Received: from mout01.posteo.de ([185.67.36.65]:53343) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZF-0002MC-2z for 64249@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:17 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 8568C240028 for <64249@debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1691335271; bh=6FOdUlmxEHICSNTr1g+TOa6TOJldBzoMc903jLchMvw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=l1MJCbYvHi44DEgEST3t3guUUde+OoMhxDDqC8lqgLkgtcI12dIbspgS875v2wpOo cQgtZCSDQCKrE09PL9EmsQAiBsZ1T+OpWhRYd7k+828x1Q1269vMjyHDLBVmarroyb iy2mT/Im89Xj19jYGhiNujmbrK+s4fvzBL3oSdOgorjy1wNUH4NcBTyC72vx7IrN4r X+pFB9V7LLPz3Yt2lBpGb8Y02BQKMZDgawgSXJyM2WUO15D9QmWOzyukNY4cdrn+p7 M1fUP40T5LjKLnhWzKrK0j9dhXR8K0/kGuxxzvsRsmbbffLOhS+XZ5/e1aqsz1Qq4+ j0DpFMmFw8W9A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RJjpH0QFhz6twB; Sun, 6 Aug 2023 17:21:10 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v5 05/12] gnu: Update coq-mathcomp to 1.17.0. Date: Sun, 6 Aug 2023 15:20:24 +0000 Message-ID: <3d6710d69735a054c6d09477ec6fcb9a7c84e904.1691335142.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -3.3 (---) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.3 (----) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 06 11:21:22 2023 Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:22 +0000 Received: from localhost ([127.0.0.1]:59830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZJ-0002Nb-IR for submit@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:22 -0400 Received: from mout01.posteo.de ([185.67.36.65]:37375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZG-0002MP-EE for 64249@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:19 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id DBDEC240028 for <64249@debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1691335272; bh=SgJKdMREMRQboQFtn+xDepNVKNrWZ6gNo1SAKIibcpM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=GYHQUJ6s2Z8oOHr9/A2YfJAyTHwvuXyBeXiyvmJf5Rn3IWEslIv/xoCXSL11pMcXJ NV5LFZqCVUmyAolUHkPu5M1xX0Tex+lgZE61m2gNljjrsvOH2Fglrpug9x0qSDv358 emJL1p8D/gDbJM4HkA++5dJw8r9A6RrBf1uIW3ykErGxiOeYR0PPWXYEwXisd/i8ke JzY1j9qavFY1aMSuZUHAOwRkloH/gBgBz8bH74Af0dr6bIdnOdUd/t6QkuNg4H0CgI yNOJd3WStNAdeqkqOniCWogQlrQNVZeCt+SUFYL2R6zxu+TVmnD97Jg/o8J6v26Jp4 Q0vJ66DEAv6BA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RJjpJ2jSxz6tw6; Sun, 6 Aug 2023 17:21:12 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v5 06/12] gnu: Update coq-autosubst to 1.8. Date: Sun, 6 Aug 2023 15:20:25 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -3.3 (---) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.3 (----) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 06 11:21:22 2023 Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:22 +0000 Received: from localhost ([127.0.0.1]:59833 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZK-0002Nk-D4 for submit@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:22 -0400 Received: from mout02.posteo.de ([185.67.36.66]:53799) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZI-0002Mk-2F for 64249@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:20 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 8427D240101 for <64249@debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1691335274; bh=lYoZklyMBeerw17+BMpstr3oLoDOx1+bN5PZCYLO6ZA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=eyOVmFfYgP+NSAHlf559dw0mf6g9ud1igkdMhGwvyUX2g7V6tuJqBC72Evxbkgk7N BlC7cx3PQ2lN0qwy0PJSRgOJvIUXt/ZdFo8JrZ7Ad/Oodb/L5Kxjp47DCI2dOqY8yC 8qvR0X5j1H/gK2UrkhEOCYt8Th2523gPzX1raMPJscfepfrt/W64dizUcc+pl+7eJl PfsTBJZVbXMgDYqRnSnAyighxJWIh+Cd+VdEu3Q+nFqMwCFeRXJsPc0jX9nLxW/aKZ bI6WIp0g+i+rrOTjU1fww4bClMk3ICKIwGL5y7N0thfo13W3ddgWVLMnCFJyQD5zZM Em/MJw9T4mY7w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RJjpL0P0jz6tw6; Sun, 6 Aug 2023 17:21:13 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v5 07/12] gnu: Update coq-stdpp to 1.8.0. Date: Sun, 6 Aug 2023 15:20:26 +0000 Message-ID: <9e1deab704644c0c63f13516c946b97a03b753c5.1691335142.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -3.3 (---) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.3 (----) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 06 11:21:27 2023 Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:27 +0000 Received: from localhost ([127.0.0.1]:59837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZO-0002OC-OJ for submit@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:26 -0400 Received: from mout01.posteo.de ([185.67.36.65]:33391) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZJ-0002Mr-Kv for 64249@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:21 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 1A73C240027 for <64249@debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1691335276; bh=z7OGXUHqCkdk7ed6rmbCOwjX7roIWap9sNgsChFn4zU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=mwuhkmN4VQp5gMHkI2bqsvyhPQ/GqiPIAPy9sBerGQ8uBKk2W65XS/4g+TzaMvxCD uSAnVUxFC6sUW3n1WUjWPopp1riu8D3IbHoDv8maW6g5frXc5isbEB3Acc5bv/QBA7 i637hzm5rFtynWy6f17/7ZtLKxh5M9Zw4xW1YwvxbVXYK7iJ9fGETLaIVCn3jsJFpF LZTILaOaFkDMfv9nq/3n5D9U/RWGsnMw9khhHmjuPdJ+oq97s22g24q4Xsl6q+/vz0 dg8hkaepBiVrDlduuhyZk4Z/bAaxt4r0RT7Czzl3cjRhCjn6VKI6TDD+AnDl3RkXWN F37AtnMG6sNCg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RJjpM4Lbkz6twv; Sun, 6 Aug 2023 17:21:15 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v5 08/12] gnu: Update coq-interval to 4.8.0. Date: Sun, 6 Aug 2023 15:20:27 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -3.3 (---) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.3 (----) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 06 11:21:27 2023 Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:27 +0000 Received: from localhost ([127.0.0.1]:59839 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZP-0002OE-1B for submit@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:27 -0400 Received: from mout01.posteo.de ([185.67.36.65]:46899) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZL-0002N7-9Z for 64249@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:24 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id B844A240027 for <64249@debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1691335277; bh=n5Ws/qt9fUICNgzqxNKmTzzeTN4zWWZV4A3caGTx0ao=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=ifaXy/6gO7fpXWklKWgYD9kxT7G2rGfGYPt2OIY9d3JyjrVXqhqwWwMBH4Ev3RIcW Z+9Jw0ZGfThiRYkEx/qLmpclIZoTEISRsvczYXYYDourbtYnPFjG53FCRFGqh1sPVl 5rR74CWZOqIQlHjnE1s1rEaMAMazZmwiWoWeSCRRAmsA9TXEgJJAGy7FNrjTmuKDn+ KKe0wWHH98rhyOCnYTfPHOsqlfyr3050h9SuC3jNi56hlBsV7KqltoeE+/qGG4sUFz 3R31yupK0lr9rXtFTwsp6AF6WjZg0AJDVHPujQ0it2PnciC0+oiFBk9SAo5sohOXFQ Y/bQO41s7b+Ig== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RJjpP1rh3z6txn; Sun, 6 Aug 2023 17:21:17 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v5 09/12] gnu: coq: Update to 8.17.1. Date: Sun, 6 Aug 2023 15:20:28 +0000 Message-ID: <7c82263ece8fff6106930babd4afe2c7a107f3d8.1691335142.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -3.3 (---) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.3 (----) * 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. (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/coq.scm | 76 +++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 46 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 663265f5be..b63239b99e 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,7 +64,7 @@ (define-public coq-core (file-name (git-file-name name version)) (sha256 (base32 - "0ljpqhh5lfsim29fcfp2xfcvm3j84pf1mb0gnpdr8vcqqw7mqwpf")) + "0gg6hizq0i08lk741b579cbswhy6qvkh6inc3d3i5a2af98psq63")) (patches (search-patches "coq-fix-envvars.patch")))) (native-search-paths (list (search-path-specification @@ -78,13 +79,29 @@ (define-public coq-core (files (list "lib/ocaml/site-lib/coq-core")) (separator #f)))) (build-system dune-build-system) + (arguments + `(#: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")) + (libdir (string-append out "/lib/ocaml/site-lib"))) + (invoke "./configure" "-prefix" out + "-libdir" libdir)))) + (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-core" "coq-stdlib" "coq"))))))) (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 +113,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 +131,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 +539,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 +700,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 @@ -757,7 +741,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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 06 11:21:28 2023 Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:28 +0000 Received: from localhost ([127.0.0.1]:59842 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZP-0002OL-Lj for submit@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:28 -0400 Received: from mout02.posteo.de ([185.67.36.66]:40653) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZM-0002NE-SW for 64249@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:25 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 5541A240101 for <64249@debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1691335279; bh=PLEmvDq0xvloDrPOj2Mg4kX4D+EsOCUZnGUC3b5RtLU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=OmfbX3ZRj4IyfVuNkpDcSiJ9XyNapBqrOKnoXj1MPrf0tVSYUSmE5DHVNw4Eb7uvP pLVe+o/iMCuBu7X7og+3C294ZTCzgVOWqNRlGd558WOSH7yvBBQtvnvr0tXRquUUPa LIUS9Rom0m0s6nOYefI+V5lP96f/LhPJ2H2+T7A89pZiDY1JGcZ/x1jNj2fP5UtMQG G7gRcSju4VEhknpUBkki4Uz3ftwFFYuOo38qXBiooS/vWq6uY1L/zJfzwPiTiKWgQT IE3YsSLrnbbyQhvqU78pAGj+A8dXe7sZQXycXanKz/rimjuTyPqNjKB88lHq67TBkC ZjaUnNsdO287A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RJjpQ5qp0z6txv; Sun, 6 Aug 2023 17:21:18 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v5 10/12] gnu: dune-bootstrap: Update to 3.10.0. Date: Sun, 6 Aug 2023 15:20:29 +0000 Message-ID: <5cb71a21794085eff5bdf0c9ac355991a644845d.1691335142.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -3.3 (---) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.3 (----) * 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 56661b1977..6646632397 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1818,7 +1818,7 @@ (define-public ocaml-stringext (define dune-bootstrap (package (name "dune") - (version "3.6.1") + (version "3.10.0") (source (origin (method git-fetch) (uri (git-reference @@ -1827,7 +1827,7 @@ (define dune-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "0gv851wxbv5ln20429nj7p92spzxgw8vngg9z94q39aawn6q8lx6")))) + "0zwih4fwwrc8lwi2i4mmps9ng7z6mf46pps2i503lmx0dh8dl606")))) (build-system ocaml-build-system) (arguments `(#:tests? #f; require odoc @@ -1844,9 +1844,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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 06 11:21:32 2023 Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:32 +0000 Received: from localhost ([127.0.0.1]:59845 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZT-0002Oh-2e for submit@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:32 -0400 Received: from mout01.posteo.de ([185.67.36.65]:36755) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZP-0002Nc-6N for 64249@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:28 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 9EBF5240027 for <64249@debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1691335281; bh=65jhgDCRVMZXKq9zi7Mhgkigu9tIBzh5ietohx9Z4TU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=k8r70NPGVknAW5d5bz8QtuMWqtiyGQ1pyxtvtxJm5shJVRtFmDs3OdrDQoAyh0WUK vaKG155poRooXv1h/ZqDxScZPtih3a2b3HtTHaR1EjYtKX5FV5j/9a7GdkYRqtvexa pCbpG74EjlWGiQu/lhzHQtCXWOugH3Z09gq4xu1fYMxJJZaAGiQyUsTA7fF0AaSQj1 1QaQnjSelxlDCmLnCdTkB9y6S3OJvguWd6IkQ1//RvuM1cF9yygq+NyzunS5mo9Jy3 WlZzYkPYmuq2gbwgmVEnBfEIGIzn16XmCrPHA86W6SwKgvHH++aZR1635PU8j4yLTf 60GHf27+E+KQg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RJjpT10psz6twb; Sun, 6 Aug 2023 17:21:21 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v5 11/12] gnu: opam: Split build into smaller sub-packages. Date: Sun, 6 Aug 2023 15:20:30 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -3.3 (---) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.3 (----) * 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 | 262 ++++++++++++++++++++++++++++------------- 1 file changed, 182 insertions(+), 80 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6646632397..e5b1ea47ba 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,150 @@ (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-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 +1084,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 @@ -2238,7 +2345,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 @@ -2268,7 +2375,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 @@ -2383,7 +2490,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 @@ -2513,13 +2620,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") @@ -2560,9 +2667,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") @@ -2782,7 +2889,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") @@ -2906,7 +3013,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 @@ -3368,7 +3475,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) @@ -3402,7 +3509,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))) @@ -3432,7 +3539,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) @@ -3506,7 +3613,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 @@ -3647,7 +3754,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 @@ -3673,9 +3780,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))) @@ -3720,7 +3827,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" @@ -3761,9 +3868,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))) @@ -4181,7 +4288,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 @@ -5188,7 +5295,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))) @@ -5801,12 +5908,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 @@ -5834,7 +5937,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) @@ -9554,7 +9657,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 @@ -9582,7 +9685,7 @@ (define-public ocaml-uucp (modify-phases %standard-phases (delete 'configure)))) (native-inputs - (list opam + (list opam-installer ocaml-findlib ocamlbuild ocaml-topkg @@ -9616,7 +9719,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 @@ -10077,8 +10180,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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 06 11:21:33 2023 Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:33 +0000 Received: from localhost ([127.0.0.1]:59847 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZU-0002Oq-FF for submit@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:33 -0400 Received: from mout02.posteo.de ([185.67.36.66]:54355) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZS-0002O3-0O for 64249@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:31 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 7518E240103 for <64249@debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1691335284; bh=ELz5EQl2rzDo6A/HbVWqHDy3gVibxzJqqY6MBByA/Q4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=hRASPhgnjFqEoufMjr4sZ1Ll/Skz8NrJAz/G/OVGx5gXgNAKC9VYP6L/x9L5Y/Sco rfeVVJHuzQr7AYynDi6YpCutEesUBWVb4sucP6vk//wG8hFbdm9kpjUOpVFFBtYRkS 60Jv7o0HcpDqyKVSx03+a3SCFkXZar92i2kaqY1cvUbxvPe1fpyTazG4hhgThbBXyR 96W+Wcs57hFa3S43BAIrlNH98X8KpbpGbit9I9aFWHpXWx/6DKrADkEBFaezjabH4V L2z8rs3iCkiX298OlISqwynRIl9vR9oddegMfWPbp55h10zmRNT9y7K2joAfvG7E/p 5Oxr3QlMKsxow== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RJjpW5PsFz6twM; Sun, 6 Aug 2023 17:21:23 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v5 12/12] FIXME: gnu: opam: Update to 2.1.5. Date: Sun, 6 Aug 2023 15:20:31 +0000 Message-ID: <20d984b3c59be1e76679da7312e0851a577006e2.1691335142.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -3.3 (---) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.3 (----) * gnu/packages/ocaml.scm (opam): Update to 2.1.5. [native-inputs]: Add more test data. (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 | 94 +++++++------ .../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, 48 insertions(+), 269 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 77707127a7..efe507905f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1657,10 +1657,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 e5b1ea47ba..999b3a3ef2 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 @@ -1072,6 +1059,8 @@ (define-public opam ("which" ,which) ;; Data for tests + ("opam-repo-0070613707" ,(opam-repo "00706137074d536d2019d2d222fbe1bea929deda" + "1gv1vvmfscj7wirfv6qncp8pf81wygnpzjwd0lyqcxm7g8r8lb4w")) ("opam-repo-009e00fa" ,(opam-repo "009e00fa86300d11c311309a2544e5c6c3eb8de2" "1wwy0rwrsjf4q10j1rh1dazk32fbzhzy6f7zl6qmndidx9b1bq7w")) ("opam-repo-7090735c" ,(opam-repo "7090735c9d1dd2dc481c4128c5ef4d3667238f15" @@ -1080,10 +1069,21 @@ (define-public opam "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"))))) + "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 @@ -4442,8 +4442,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") @@ -4452,6 +4451,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 @@ -5324,27 +5331,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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 15 17:26:02 2023 Received: (at 64249) by debbugs.gnu.org; 15 Aug 2023 21:26:02 +0000 Received: from localhost ([127.0.0.1]:36955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qW1YA-0001GH-DB for submit@debbugs.gnu.org; Tue, 15 Aug 2023 17:26:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37100) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qW1Y8-0001Fm-BD for 64249@debbugs.gnu.org; Tue, 15 Aug 2023 17:26:00 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qW1Y2-0003eQ-GO; Tue, 15 Aug 2023 17:25:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=lIMMTtBrDz2Pboc1Jo3LaNsrU2PmSlNHSpFaWFtp9lo=; b=pL0O3ZGA/hHCft+4jxu2 I7kFNmUePSvPmdVc+yv15VdDMo/hG+mN4d65sGvhbmt+uGQRsDBeJLbG1KP1DevnxFTAXJp/j5w1D FDONgiUtEByzI0AU7TfuDvvc1ocEQDXYgMtAKBugNc057AFPZBNmS/hI8D/Jm4RVyaJXg4e/3ggr+ SE3PIJYavc7dfUCv4VqjnG8+hWdN6eQM35jR2qwn0XGzjlEn3DDmve/JcPgKunMQoGjZ7ZpPMXEVk acfSJiCefuIbvfuWuS3710QMoZvszJFTcmVwH0Wpq9Hh+c6X5Bj9DJPqk3LD9gKkjvUPYHJdLW1zP 9PuW8ru7pJ9L7Q==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: pukkamustard Subject: Re: bug#64249: [PATCH ocaml-team 1/2] gnu: ocaml: Update to 4.14.1. References: Date: Tue, 15 Aug 2023 23:25:52 +0200 In-Reply-To: (pukkamustard@posteo.net's message of "Sun, 6 Aug 2023 15:20:20 +0000") Message-ID: <87sf8k6lr3.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: 64249@debbugs.gnu.org, Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello! hasn=E2=80=99t caught up yet. Julien, do you have further reservations or do you think it=E2=80=99s OK to commit, assuming there=E2=80=99s no build breakage? Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 17 15:08:51 2023 Received: (at 64249) by debbugs.gnu.org; 17 Aug 2023 19:08:52 +0000 Received: from localhost ([127.0.0.1]:45639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWiMV-0004Wz-5s for submit@debbugs.gnu.org; Thu, 17 Aug 2023 15:08:51 -0400 Received: from lepiller.eu ([2a00:5884:8208::1]:48492) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWiMQ-0004Wk-6h for 64249@debbugs.gnu.org; Thu, 17 Aug 2023 15:08:50 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 6d3e72bc; Thu, 17 Aug 2023 19:08:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=z2LK7+6Fw/52 CckzKJXqZdADGCAbXJkA9oORk5hDhs0=; b=KOEfv4RpokZEbF/sEZvLG2lrDcgW Qt9mPVvKTqbl3rjA1J8ZCv/E2b/HPAQ5gApaXMeSdkUCcmhrpaoprg1iDV22B1SY lqaG0b90B4X2Q2dawudMfEGyo8btb0dKAh4Hvk7piVa3KmI7zRI5w9dwLhawiR3i IPV33XwIF1Vsau20QIzNCdj/+g8o0I+ZDI+zoqJ6Npwoa8NAOUkUo5Vo1DVUGZcC 1kO8iU4LkQQzfizAE8riqLkSDQGu7rAXLuKpNpr5ROtP8JFx9C4CAPheiCUpkfVG OMrGxse5deJisM7Xa+AQGp2Pg2VCLoP+VGaT+X+vspOsRKq8eP8oZ7MivQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id b6e32bc2 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 17 Aug 2023 19:08:41 +0000 (UTC) Date: Thu, 17 Aug 2023 21:08:24 +0200 From: Julien Lepiller To: pukkamustard Subject: Re: [bug#64249] [PATCH ocaml-team v5 09/12] gnu: coq: Update to 8.17.1. Message-ID: <20230817210824.22f673e2@tachikoma.lepiller.eu> In-Reply-To: <7c82263ece8fff6106930babd4afe2c7a107f3d8.1691335142.git.pukkamustard@posteo.net> References: <7c82263ece8fff6106930babd4afe2c7a107f3d8.1691335142.git.pukkamustard@posteo.net> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: 64249@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) this looks good to me, but there's a new failure in coq-mathcomp-bigenough after that. Replacing "coq-core" with "coq" in the configure flags fix the issue. Le Sun, 6 Aug 2023 15:20:28 +0000, pukkamustard a =C3=A9crit : > * 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. (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/coq.scm | 76 > +++++++++++++++++--------------------------- 1 file changed, 30 > insertions(+), 46 deletions(-) >=20 > diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm > index 663265f5be..b63239b99e 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))) > =20 > -(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,7 +64,7 @@ (define-public coq-core > (file-name (git-file-name name version)) > (sha256 > (base32 > - "0ljpqhh5lfsim29fcfp2xfcvm3j84pf1mb0gnpdr8vcqqw7mqwpf")) > + "0gg6hizq0i08lk741b579cbswhy6qvkh6inc3d3i5a2af98psq63")) > (patches (search-patches "coq-fix-envvars.patch")))) > (native-search-paths > (list (search-path-specification > @@ -78,13 +79,29 @@ (define-public coq-core > (files (list "lib/ocaml/site-lib/coq-core")) > (separator #f)))) > (build-system dune-build-system) > + (arguments > + `(#: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")) > + (libdir (string-append out > "/lib/ocaml/site-lib"))) > + (invoke "./configure" "-prefix" out > + "-libdir" libdir)))) > + (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-core" "coq-stdlib" "coq"))))))) > (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 +113,6 @@ (define-public coq-core > ;; Some of the documentation is distributed under opl1.0+. > (license (list license:lgpl2.1 license:opl1.0+)))) > =20 > -(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 +131,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)))) > =20 > @@ -555,16 +539,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 +700,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 @@ -757,7 +741,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 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 17 16:54:41 2023 Received: (at 64249) by debbugs.gnu.org; 17 Aug 2023 20:54:41 +0000 Received: from localhost ([127.0.0.1]:45688 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWk0u-0007RZ-A5 for submit@debbugs.gnu.org; Thu, 17 Aug 2023 16:54:41 -0400 Received: from lepiller.eu ([89.234.186.109]:56800) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWk0p-0007RJ-Ch for 64249@debbugs.gnu.org; Thu, 17 Aug 2023 16:54:38 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 59f8963b; Thu, 17 Aug 2023 20:54:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=nctW4225hVVG HYH6hUtnt+Oco0EFVO57HICkiRFv4FQ=; b=bA4wu4ewKV9xhzX11b9UmylcafEt hXO5hRozIn8CPshA28hJbHnF6dIdjusFBsMeFMdHkBMY9y5EUWixVd1VDbJxPMux oRK7U8dyV0vSZBkW9uQ7o8ADtlXmgfHFl6h25IMb8LY+V1fNQuPMujJNi2EkWoq8 AKizV+RaPgPCIJo4/1UehqBAn0Dxl+3+sTlNsk8iytnL7CPbPBk/YT2czuFC84Tb BZKBxfQfn4ZstVUcRmdf12tCPbfY3m2lhPTF8sO1bJ0Hmdgnn2fFoLoAUh9wUWXJ brzsqtR4Riwt3ZqJLUhWLyr2yQqM5/QYdZwZMwlLBaRE+Kc9QU/Zj3UQDA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 07f77f0a (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 17 Aug 2023 20:54:31 +0000 (UTC) Date: Thu, 17 Aug 2023 22:54:21 +0200 From: Julien Lepiller To: pukkamustard Subject: Re: [bug#64249] [PATCH ocaml-team v5 12/12] FIXME: gnu: opam: Update to 2.1.5. Message-ID: <20230817225421.35482a31@tachikoma.lepiller.eu> In-Reply-To: <20d984b3c59be1e76679da7312e0851a577006e2.1691335142.git.pukkamustard@posteo.net> References: <20d984b3c59be1e76679da7312e0851a577006e2.1691335142.git.pukkamustard@posteo.net> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: 64249@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Adding ocaml-base64 to opam-client seems to fix this first issue, but one test fails in opam: File "tests/reftests/init.test", line 1, characters 0-0: /gnu/store/s6nii4iazxdn9i60p39sa2p0k8yc5y4i-git-minimal-2.33.1/bin/git --no= -pager diff --no-index --color=3Dalways -u _build/default/tests/reftests/in= it.test _build/default/tests/reftests/init.out diff --git a/_build/default/tests/reftests/init.test b/_build/default/tests= /reftests/init.out index 9768567..2defa37 100644 --- a/_build/default/tests/reftests/init.test +++ b/_build/default/tests/reftests/init.out @@ -220,6 +220,9 @@ wrap-install-commands: ["%{hooks}%/a-script.sh" "wrap-i= nstall" ] post-session-commands: ["%{hooks}%/a-script.sh" "post-session" ] ### opam init --bypass-checks --bare --no-setup --config opamrc Configuring from ${BASEDIR}/opamrc and then from built-in defaults. +[ERROR] Sandboxing is not working on your platform linux: + /tmp/guix-build-opam-2.1.5.drv-0/source/_build/default/src/client/= opamMain.exe: "create_process" failed on ${BASEDIR}/OPAM/opam-init/hooks/sa= ndbox.sh: No such file or directory +Do you want to disable it? Note that this will result in less secure pack= age builds, so please ensure that you have some other isolation mechanisms = in place (such as running within a container or virtual machine). [y/N] y =20 <><> Fetching repository information ><><><><><><><><><><><><><><><><><><>= <><><> [norepo] Initialised @@ -237,9 +240,7 @@ opam-version: "2.0" post-session-commands: ["%{hooks}%/a-script.sh" "post-session"] pre-build-commands: ["%{hooks}%/a-script.sh" "pre-build"] repositories: "norepo" -wrap-build-commands: ["%{hooks}%/sandbox.sh" "build"] {os =3D "linux" | os= =3D "macos"} wrap-install-commands: ["%{hooks}%/a-script.sh" "wrap-install"] -wrap-remove-commands: ["%{hooks}%/sandbox.sh" "remove"] {os =3D "linux" | = os =3D "macos"} ### opam-cat $OPAMROOT/repo/repos-config opam-version: "2.0" repositories: "norepo" {"file://${BASEDIR}/REPO"} Le Sun, 6 Aug 2023 15:20:31 +0000, pukkamustard a =C3=A9crit : > * gnu/packages/ocaml.scm (opam): Update to 2.1.5. > [native-inputs]: Add more test data. > (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 | 94 +++++++------ > .../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, 48 insertions(+), 269 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 >=20 > diff --git a/gnu/local.mk b/gnu/local.mk > index 77707127a7..efe507905f 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1657,10 +1657,6 @@ dist_patch_DATA =3D > \ %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 > e5b1ea47ba..999b3a3ef2 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=3D" > - #+(file-append (canonical-package > bash-minimal) > - "/bin/sh"))) > - #:make-flags > - ,#~(list (string-append "LIBDIR=3D" #$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 > @@ -1072,6 +1059,8 @@ (define-public opam > ("which" ,which) > =20 > ;; Data for tests > + ("opam-repo-0070613707" ,(opam-repo > "00706137074d536d2019d2d222fbe1bea929deda" > + > "1gv1vvmfscj7wirfv6qncp8pf81wygnpzjwd0lyqcxm7g8r8lb4w")) > ("opam-repo-009e00fa" ,(opam-repo > "009e00fa86300d11c311309a2544e5c6c3eb8de2" > "1wwy0rwrsjf4q10j1rh1dazk32fbzhzy6f7zl6qmndidx9b1bq7w")) > ("opam-repo-7090735c" ,(opam-repo > "7090735c9d1dd2dc481c4128c5ef4d3667238f15" @@ -1080,10 +1069,21 @@ > (define-public opam > "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"))))) > + > "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 @@ -4442,8 +4442,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") > @@ -4452,6 +4451,14 @@ (define-public ocaml-base64 > radix-64 representation. It is specified in RFC 4648.") > (license license:isc))) > =20 > +;; 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 > @@ -5324,27 +5331,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 =3D Lexing.lexeme_char lexbuf 2 in (* the delimiter can be > any character *) > - (* find the terminating delimiter *) > - let endpos =3D > -- 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 =3D endpos - (lexbuf.lex_start_pos + 3) in > -- let s =3D 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 =3D 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 > -=20 > - } > -=20 > -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) =3D struct > - let clean label =3D > - try=20 > - let s =3D Filename.chop_extension (Filename.basename label) in > -- String.capitalize s > -+ String.capitalize_ascii s > - with Invalid_argument _ -> label > -=20 > - let create ?(enabled=3Dfalse) label =3D > ---=20 > -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 > -=20 > -@@ -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 > -=20 > -@@ -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 > -=20 > -@@ -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 > -=20 > -@@ -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 > -=20 > -@@ -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 > -=20 > -@@ -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 > -=20 > -@@ -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 > -=20 > -@@ -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 > -=20 > -@@ -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 > -=20 > -@@ -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 > -=20 > -@@ -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 > -=20 > -@@ -223,7 +223,7 @@ INSTALL_STUFF_ =3D META > - INSTALL_STUFF_ +=3D $(wildcard _build/doselibs/*.cma > _build/doselibs/*.cmi) > - INSTALL_STUFF_ +=3D $(wildcard _build/doselibs/*.cmxa > _build/doselibs/*.cmxs) > - INSTALL_STUFF_ +=3D $(wildcard _build/doselibs/*.a) > --#INSTALL_STUFF_ +=3D $(wildcard _build/*/*.mli) > -+INSTALL_STUFF_ +=3D $(wildcard _build/doselibs/*.mli) $(wildcard > _build/doselibs/*.cmti) $(wildcard _build/doselibs/*.cmx) > - INSTALL_STUFF_ +=3D $(wildcard _build/rpm/*.so) > -=20 > - exclude_cudf =3D $(wildcard _build/doselibs/*cudf* _build/cudf/*) > ---=20 > -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 =3D "@PACKAGE_VERSION@" > - archive(byte) =3D "common.cma" > - archive(native) =3D "common.cmxa" > --requires =3D "extlib, re.pcre, cudf, @ZIP@, @BZ2@" > -+requires =3D "extlib, re.pcre, cudf, unix, @ZIP@, @BZ2@" > - ) > -=20 > - package "algo" ( > ---=20 > -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" !=3D 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 From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 12 02:57:26 2023 Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:26 +0000 Received: from localhost ([127.0.0.1]:55820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxKw-0005Yq-CQ for submit@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:26 -0400 Received: from mout02.posteo.de ([185.67.36.66]:41501) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxKq-0005YU-Qq for 64249@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:24 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 8098E240104 for <64249@debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1694501830; bh=5EUGGd81PiXw6Rn9VjBgH25/YK9tNHRqzbCw83esF6k=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=P8B98KA+cj3VRYgXFfXin5KOi8R/w79wKoBh0iIZxAdDZItEjlTJ9w8Ur0kwbuAxW hdgnzqdumzxQATNYjFkjNMomM0kvR4fPqbrLyUfi6UAtofUKcG1lOjMHuykPpBK+ro YyKJ9L7qxD4J4/6vHCTEB5fh92JoJw5/eTqC5M5crvieHO1eakUEw7Ao+YT+kur+bp 5petnxa0BKTT8D/49jX+0t+A2Q/D4sqw67iEoP5jdYWRgt8g2qOjs1JQgZsT34yP39 b+WmAbxWFqEcDYM4pP5An1C1QjLSE5HInYDu7Gce2o1DTkZtZJouoEty999W1s+5KP J8nBXPbVRII/A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RlDsd6Wv2z6tw3; Tue, 12 Sep 2023 08:57:09 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v6 00/12] The one where OPAM finally works Date: Tue, 12 Sep 2023 06:56:50 +0000 Message-ID: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello Guix, Thanks to Julien's help this version finally build OPAM! I'm currently very slow and it will probably take quite a bit of time for me to look into the other things that could be updated in Guix's OCaml land (see https://yhetil.org/guix/86bkhgc7jj.fsf@posteo.net/). Maybe it would make sense to merge this patch series into master instead of having a too long-lived ocaml-team branch? What do you think? Cheers, pukkamustard pukkamustard (12): gnu: ocaml: Update to 4.14.1. gnu: Update coq-flocq to 4.1.1. gnu: Update coq-gappa to 1.5.3. gnu: Update coq-coquelicot to 3.4.0. gnu: Update coq-mathcomp to 1.17.0. gnu: Update coq-autosubst to 1.8. gnu: Update coq-stdpp to 1.8.0. gnu: Update coq-interval to 4.8.0. gnu: coq: Update to 8.17.1. gnu: dune-bootstrap: Update to 3.10.0. gnu: opam: Split build into smaller sub-packages. gnu: opam: Update to 2.1.5. gnu/local.mk | 4 - gnu/packages/coq.scm | 152 +++---- gnu/packages/ocaml.scm | 410 +++++++++++------- .../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 - 7 files changed, 331 insertions(+), 454 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 base-commit: 5db78e7c1b06d1b4892bdb3e153b95b21577271e -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 12 02:57:30 2023 Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:30 +0000 Received: from localhost ([127.0.0.1]:55823 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxKz-0005Z7-PW for submit@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:30 -0400 Received: from mout02.posteo.de ([185.67.36.66]:50359) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxKx-0005Yf-QU for 64249@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:28 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id AA9F1240106 for <64249@debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1694501837; bh=uwMf5kjaCNDFzB04knvb2m7/xPAe3+UTMkaL/uYnqsQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=VO7qwd/mVKYJiyk4oXRFkuoKWjrOGrarqssnWSzkY46Z8wjZLLnD8e9e+lq7bAxGu PkpRRb/ByhfADiy1bvRF7uzIZYah9BVtY5+WwAcvjK3qr6PWJaVlgt/HC3k2pGFS3a z6UfXb365eaeytcBdIw/lI3RRQNVvrfltAS4f3irGFTDHrbi/CvF7dX2Ubc4RMkI5U tppbZMD4KhppI5uSypS/2c2Gifm1RxO/G9i1BHjwK/a4pCwgTI78VZbyr5g7IBCgNg rfuXgB6kb4biKl3HbCaUlJrP327RKwi9grYe1xb02bFeLh4S2+1c8xnXOja5+YSecX G3HfLgynr6qOg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RlDsl5GfFz6tx5; Tue, 12 Sep 2023 08:57:15 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v6 01/12] gnu: ocaml: Update to 4.14.1. Date: Tue, 12 Sep 2023 06:56:51 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 8ff755aea9..56661b1977 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 12 02:57:34 2023 Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:34 +0000 Received: from localhost ([127.0.0.1]:55828 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxL4-0005ZV-3q for submit@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:34 -0400 Received: from mout01.posteo.de ([185.67.36.65]:60381) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxKz-0005Yh-NX for 64249@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:32 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 399CD24002A for <64249@debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1694501839; bh=mLI5ysOOklCMR/BcBN4xlWZjYyU1Dk4LWaltXZK92w4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=lwcgYLW2aOf1/CKW9L4A5yu4jIcGtnIKI5s8CDZxW6X0l0j6qeu5npA1Ns+LvqjAu e2MENB8wLJ/6RspE0OPhsqjHKEvGS4FvQgXVKJZZu/DMhJqCIU9i2ExO35XJ80rH4T /lzi7lvijCJ3coplZ6AFjGoGPJfinTVFR1BB/gyZxUws4W2nMje06u/dYs9o6SIACv cumf1l/qJp3MIZEh/hvkVy4BTVbaaYsPnkI3UXJhnBTIORXn4il8vlobqXRXiFmtpD ioJiiynLHr+dud1D2FJLrW3fNXOLf6ijyyhG5nZps7p5RWnrob4iEVxp+BKHfW9Qa1 9hKx5uzrj3Chw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RlDsp3z7xz6tw3; Tue, 12 Sep 2023 08:57:18 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v6 02/12] gnu: Update coq-flocq to 4.1.1. Date: Tue, 12 Sep 2023 06:56:52 +0000 Message-ID: <86fe39332cc526337d07afa4d963f584f39cac01.1694501410.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 12 02:57:36 2023 Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:36 +0000 Received: from localhost ([127.0.0.1]:55831 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxL6-0005Zl-Is for submit@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:36 -0400 Received: from mout01.posteo.de ([185.67.36.65]:46771) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxL3-0005Yy-7V for 64249@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:33 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 1AFAF24002A for <64249@debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1694501843; bh=Jw3lcd3fwGlgSvEtz/83YRCQDBb4wJL8gc/SkZXJV5Q=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=TTCAVuczY1fNj8tYKCgR2UMky7wLUkdd3PsEWJgXD0Gw9TTI3YSI9ftYFINN5lUl5 TDHr0SWaXsRKASPrQ+n/myYV8UAKcgZujNXcSfxAbgAbjDu4mbhAj0ykzzBC1TPdlB 0v4vL28VNdq2HMlwsRipwMXFmUSFfxsqGJrZy+mC8MnG6o/XozV3J0ZqtucJAz2yTy EDDtCHQfND+kf1N4uYbApF/SOp0jmTMXkmeU8awaKUuI5mIZA6vLUdiO4i89MTtaFN 8Gn60peu4+J+xmoNWAfgW7PhueG3z0pdu9DoisXx/L2IfSDhwYoz8p2KIjRYQ+++hh dmfkmmCjgYciw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RlDst4Kbyz6tx1; Tue, 12 Sep 2023 08:57:22 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v6 04/12] gnu: Update coq-coquelicot to 3.4.0. Date: Tue, 12 Sep 2023 06:56:54 +0000 Message-ID: <9aec7c4dc4287c1a05fbc2504bace122fa139bbb.1694501410.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 12 02:57:37 2023 Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:37 +0000 Received: from localhost ([127.0.0.1]:55833 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxL6-0005Zo-SW for submit@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:37 -0400 Received: from mout02.posteo.de ([185.67.36.66]:51531) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxL5-0005ZD-D2 for 64249@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:35 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 45445240103 for <64249@debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1694501845; bh=6FOdUlmxEHICSNTr1g+TOa6TOJldBzoMc903jLchMvw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=ro9JNU2RNQnsZSCjsv8iq8r3njIM+CliRIVrY9YUeAydy8Vpt6c4sD5cnMuZkepGM PNvrG1iTIJpC+VOtAyHwP5LsE8nS3lBOG/P4Tjs4JfVreDzrsKy1owVe4CfhpGdRsp GpYR2XTvhvviEkEp1DP2pvMO2g3WOWOZfkigGYR59v6CmlyZdrDwA4sY5OHuQdEaN1 pp2Me00LaTBiA+MtXMKPfPEyOheYRAYMvrGJ20xB1/Jl56CH8yTujOEep6QSdeNUeE ohrAJ4vWjMYJLnl4bIwA0QuyUuSt6ziW9X1IxNxgyV4DlePzYZDP06nCyrDTLZpi/u GCYJRQTN7zB/A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RlDsw5vbKz6tsj; Tue, 12 Sep 2023 08:57:24 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v6 05/12] gnu: Update coq-mathcomp to 1.17.0. Date: Tue, 12 Sep 2023 06:56:55 +0000 Message-ID: <5a5d300c25c0c5f084cdf9a5a04141031e536fbc.1694501410.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 12 02:57:41 2023 Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:41 +0000 Received: from localhost ([127.0.0.1]:55838 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxLB-0005aN-6x for submit@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:41 -0400 Received: from mout01.posteo.de ([185.67.36.65]:48293) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxL7-0005ZH-1s for 64249@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:38 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id E4F5B240028 for <64249@debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1694501846; bh=SgJKdMREMRQboQFtn+xDepNVKNrWZ6gNo1SAKIibcpM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=Aj2S5HtiGTsFomJwTDpKEzkfDwO16DoKkMomfbiqwSaaMXHglvwsvWB9vA/QuhYb2 qOcAkXeOp14FERaf7N6/S2+hV9K80EdaMHpj0apfGxcE2y69PWZPHVm8SooYF8r/89 Vn7+ZGXhQQB+ukUi8+YXCD+kqzgPL94JMI0Lv8MMhiuBjGS4rKlRR1YXgCJUck0Rgv bTJRvTxLJkHk8q8emBSJ3kNhRtnC4UEGnLYU9peADSgolT5/+mVKQjWoYveAU1MTMf gvdn8UsyK3Qqtd3cxx2E2IeBlg68pr3/p8/xh4JFeHAR3MtDUkB7NM23quoeMCEFB+ oADLTyNEuvx8w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RlDsy3SZgz6tw4; Tue, 12 Sep 2023 08:57:26 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v6 06/12] gnu: Update coq-autosubst to 1.8. Date: Tue, 12 Sep 2023 06:56:56 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 12 02:57:42 2023 Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:42 +0000 Received: from localhost ([127.0.0.1]:55840 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxLB-0005aP-Kj for submit@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:41 -0400 Received: from mout01.posteo.de ([185.67.36.65]:40647) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxL8-0005ZO-Jl for 64249@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:38 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 7685C240028 for <64249@debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1694501848; bh=lYoZklyMBeerw17+BMpstr3oLoDOx1+bN5PZCYLO6ZA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=dQuFjlFC45cDStG2+ucT2Cphb4i7w4V+LVaIwGk8qZFZuLMwRxDeMSJVhB3xFnN1s ooPEO4c1NakCxuuPllfx+Ne9LM+k7YeVbM4TRBW6FZSjjz8N0uB39erAp6gCOwe++f +OD+y92kvlRjki7DmXHggdU6VK3+KZ5zB25fLS4O7zu94YzAhcncpUa4yOvCB9XTR5 et3jbEOYqjjsUepNiNrNpXmAEWlkRD04u6zuMDKktWC2jy/KBzSv7DXh8g4cNVVPcm PXq+O+hgTOhOAbvsxtLvG4BLQm2+9OZiRK4r7E8KIGd07g06g/6zu+8yMhzruQqRAW VLJ4NwsCalktQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RlDt00Bdkz6twF; Tue, 12 Sep 2023 08:57:27 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v6 07/12] gnu: Update coq-stdpp to 1.8.0. Date: Tue, 12 Sep 2023 06:56:57 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 12 02:57:42 2023 Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:42 +0000 Received: from localhost ([127.0.0.1]:55842 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxLB-0005aY-Vo for submit@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:42 -0400 Received: from mout02.posteo.de ([185.67.36.66]:56889) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxLA-0005Ze-9V for 64249@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:40 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 2C894240104 for <64249@debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1694501850; bh=z7OGXUHqCkdk7ed6rmbCOwjX7roIWap9sNgsChFn4zU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=ie76M4/VMbAV+KRtWqkguLLHa9qQX33c2gW7gfRG6ZS0FjqW6mI3NGNsimuMv6Wgz if78FH8zgrlrgc8330FAoNv0f5Dm/C5CZ9EbCVhL7zSOVjlwBbJXe/9LW+sil77i+e HKDUj8iCLQ7nucoEII+iIfOyxHXXHcVv2wORqpilKuTFjYIAGkkCtEdfCLpT5xIRDA hhybJIbuU90mrlOsgVNFQ38Rd1l+pkrY1y6DXervazELEq18OB4fm/qtIdhb6/uTFn CSZNGw8I1kDvwEsvFy09aDlLodTpmflpUTxVyiazMIm/vl1pdGiaK+rc1otWAH4BeU 38rucdKliCfRg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RlDt150xZz6txp; Tue, 12 Sep 2023 08:57:29 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v6 08/12] gnu: Update coq-interval to 4.8.0. Date: Tue, 12 Sep 2023 06:56:58 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 12 02:57:50 2023 Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:50 +0000 Received: from localhost ([127.0.0.1]:55848 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxLJ-0005bG-Ea for submit@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:49 -0400 Received: from mout02.posteo.de ([185.67.36.66]:50103) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxLB-0005Zm-Qr for 64249@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:43 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id AE8BF240103 for <64249@debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1694501851; bh=4cRTLvRtK/Ovb3+vr5MSKQlbvJibRpnqVWuQzGXKhpE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=IKmDEQ51/BqQbLV78TcSCSZHG5OG3Q4hpb6HA9GTTX95NbpoCp6RQj6n0tr00AXIe jbIZd9vvGEwsagEQPKoy/Ftx8e4/Qr4nYf7yDMjh7HvLBWcJdgGlnTiB6hd+SAchLF 8iz58P3WVdA7hkhWGYSJz2J/8o/VTC5iHfqq4G4V0Tw/Ej1QCYwfJmBrAjfS54a0Cm uuHK4n14DxyLE/fOUuKrsy4H4V61/pK8Px/x7cB6kyMmnq0ju3zhXlmDHkT0dFS562 WJuzwDCNdZxY8Ib+PCMiATz+u1Ze1BaQMOzy/pgUvyhRmSvX+4CRd+kzVF2tOPq/FG OEF6iBsEl6L2A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RlDt31YmTz6txp; Tue, 12 Sep 2023 08:57:31 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v6 09/12] gnu: coq: Update to 8.17.1. Date: Tue, 12 Sep 2023 06:56:59 +0000 Message-ID: <11daee2634fa3df963864662c6c3aba35f63d90c.1694501410.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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. (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/coq.scm | 78 ++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 47 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 663265f5be..d68f00a63c 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,7 +64,7 @@ (define-public coq-core (file-name (git-file-name name version)) (sha256 (base32 - "0ljpqhh5lfsim29fcfp2xfcvm3j84pf1mb0gnpdr8vcqqw7mqwpf")) + "0gg6hizq0i08lk741b579cbswhy6qvkh6inc3d3i5a2af98psq63")) (patches (search-patches "coq-fix-envvars.patch")))) (native-search-paths (list (search-path-specification @@ -78,13 +79,29 @@ (define-public coq-core (files (list "lib/ocaml/site-lib/coq-core")) (separator #f)))) (build-system dune-build-system) + (arguments + `(#: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")) + (libdir (string-append out "/lib/ocaml/site-lib"))) + (invoke "./configure" "-prefix" out + "-libdir" libdir)))) + (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-core" "coq-stdlib" "coq"))))))) (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 +113,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 +131,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 +539,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 +700,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 +731,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 +741,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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 12 02:57:50 2023 Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:50 +0000 Received: from localhost ([127.0.0.1]:55850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxLJ-0005bI-WC for submit@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:50 -0400 Received: from mout01.posteo.de ([185.67.36.65]:39227) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxLD-0005a7-Bq for 64249@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:43 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 39FBB240027 for <64249@debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1694501853; bh=PLEmvDq0xvloDrPOj2Mg4kX4D+EsOCUZnGUC3b5RtLU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=oK5Al11BdvoBhcpaJLPD/U+tWRJSGhoyrGGB4YIOZYhKidKc7/Iuormc1yMUNhWGQ bkGZhGZdog/aruxahHttRmMhleSOqVKndZJGCDG9A6WJSYAOGO6hvy7LnXfEWuL9BD R977Lvd/mw8DcQMSnrQ0N4hr8JkmZa788zTQaCZIBrmesE7IBKVmXHXC2X9ElXXrRx Gf+Sl21cYZzupx9QbZyWSO3TGVIPMLwh/WBZTsjjBA/QFFEvMltMAMCznYuTrB0J49 +OQpev2CLTaF4tRNPx7xs7UJl7dR+58g5HDz09du22pscvESlV1TUR1HWvTVBvgJeQ IJw/0MChkFm8g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RlDt45bfKz6tx9; Tue, 12 Sep 2023 08:57:32 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v6 10/12] gnu: dune-bootstrap: Update to 3.10.0. Date: Tue, 12 Sep 2023 06:57:00 +0000 Message-ID: <31b19cdfc460cdbad5ff3d156e6f05580fd7e502.1694501410.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 56661b1977..6646632397 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1818,7 +1818,7 @@ (define-public ocaml-stringext (define dune-bootstrap (package (name "dune") - (version "3.6.1") + (version "3.10.0") (source (origin (method git-fetch) (uri (git-reference @@ -1827,7 +1827,7 @@ (define dune-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "0gv851wxbv5ln20429nj7p92spzxgw8vngg9z94q39aawn6q8lx6")))) + "0zwih4fwwrc8lwi2i4mmps9ng7z6mf46pps2i503lmx0dh8dl606")))) (build-system ocaml-build-system) (arguments `(#:tests? #f; require odoc @@ -1844,9 +1844,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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 12 02:57:50 2023 Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:51 +0000 Received: from localhost ([127.0.0.1]:55852 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxLK-0005bQ-F0 for submit@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:50 -0400 Received: from mout01.posteo.de ([185.67.36.65]:36289) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxL1-0005Yp-GO for 64249@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:44 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 5F17A240027 for <64249@debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1694501841; bh=USsFpWtosQw0jiSzUqhY4+NKI7rSidpzXUdE3CTTKrA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=gkEDtaujRRUbVLDSSBdcllID0cXTXw9MXYy5Kc+RfCmb3QuPi23w9wJnsn0zHjIXH A6XK+DF5QBC1Tq/08tOQrXiKU436LiMELXtvpesfk/Qse8DRt98jx9jf/5GBjJ82OG E9QZng88w5dRY/i3yZHNuTmn88VwunR+puC+F6DNEV1ixju/isMCA82pQEgZSVDJRF xCYvlaJRg8ZP4lbwXWsu38NdtgeKo+/keyJUSLISmFtsqZ6bIJbKtpmbW+VuB9Rh/5 m3X65uNWWR91DWxRXWXbjs+E720TlVx58b3DJx0xKaI2aJbjHrbRQ3yittyaLmVA3a jqQ3NeuRIGYIw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RlDsr6kNlz6tvp; Tue, 12 Sep 2023 08:57:20 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v6 03/12] gnu: Update coq-gappa to 1.5.3. Date: Tue, 12 Sep 2023 06:56:53 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 12 02:57:51 2023 Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:52 +0000 Received: from localhost ([127.0.0.1]:55854 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxLK-0005bX-Qq for submit@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:51 -0400 Received: from mout02.posteo.de ([185.67.36.66]:45769) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxLF-0005aF-4D for 64249@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:46 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 02A84240105 for <64249@debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1694501855; bh=b2QV2bTbF7H20kms1Ll/DOjp5XtozGLYvRfQTloj4mI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=jEzEVbTHESWcPLUWx4LZr4EzDsuMSTG7XZBLQsX16H3rsJmd0KZ0F+0GRm7yxDbut r6nTD3w+thrLfN7c4lnNJuNqtOh42ApMmMGjumGkpk5t5mFaGXI7wUc6fFYulN55nM jjUlP9TlhibR4+W+i2kYBWpL/ZJbhddL4tapSnofmV50Nk9pCAxCsW9nhgfZW1Z+vT wg/B7A3NdjMwru5IOwCWNzi8xPzNW0tVgzM/ehT4KGV83LUFZzTtvmoBVvZ4ehqsfm pkuUJr0O2fJEEdM8NcFvcjqSwzAuraOXFkXhqO1vLZi0i1FxZjLLKbz50lcVfnA51V Zv0RtuLiTA+Bg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RlDt63KcLz6tw6; Tue, 12 Sep 2023 08:57:34 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v6 11/12] gnu: opam: Split build into smaller sub-packages. Date: Tue, 12 Sep 2023 06:57:01 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 6646632397..81b30aa8ea 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 @@ -2238,7 +2346,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 @@ -2268,7 +2376,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 @@ -2383,7 +2491,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 @@ -2513,13 +2621,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") @@ -2560,9 +2668,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") @@ -2782,7 +2890,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") @@ -2906,7 +3014,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 @@ -3368,7 +3476,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) @@ -3402,7 +3510,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))) @@ -3432,7 +3540,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) @@ -3506,7 +3614,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 @@ -3647,7 +3755,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 @@ -3673,9 +3781,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))) @@ -3720,7 +3828,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" @@ -3761,9 +3869,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))) @@ -4181,7 +4289,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 @@ -5188,7 +5296,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))) @@ -5801,12 +5909,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 @@ -5834,7 +5938,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) @@ -9554,7 +9658,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 @@ -9582,7 +9686,7 @@ (define-public ocaml-uucp (modify-phases %standard-phases (delete 'configure)))) (native-inputs - (list opam + (list opam-installer ocaml-findlib ocamlbuild ocaml-topkg @@ -9616,7 +9720,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 @@ -10077,8 +10181,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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 12 02:57:57 2023 Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 06:57:57 +0000 Received: from localhost ([127.0.0.1]:55856 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxLQ-0005bo-0b for submit@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:57 -0400 Received: from mout02.posteo.de ([185.67.36.66]:58435) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxLH-0005aj-NU for 64249@debbugs.gnu.org; Tue, 12 Sep 2023 02:57:49 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 95CB7240105 for <64249@debbugs.gnu.org>; Tue, 12 Sep 2023 08:57:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1694501857; bh=oCvwRMvkBE2OmuymuJ9FjnuxK+fbBfvUQvaEKdyNNsI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=iAyht/S5V6QEZ6eMWOQBF3fzgm54zCFbKixZE1NNxXhki5JovV8s1yQoZix0JJw2B nhRvg77aRpEnmh6nZHHTrt1pauPin+OLhbf9tgSBajoGlW+v/7Jkt3/F3VoZ9ZLAvC eTzLS4uLgzkPunL8xwofhPDqOuxjDmRgn8dvudu4AbMKLui6aknhcC1JggtxFrc8iP lrAkuMY5r6CjYGUjECdfBTt1Ys2O6qrTc8Jik8IRHqu6KAZsRCnJs50J5J+GizdcVP joHl5vazEz95wwhIeAAZSFnpcTl/76nivx4GI+QlaAh2MCsJv7WwxOFa0oO6300FQx 2Xw607Jo8egkg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RlDt90L3Bz6tvJ; Tue, 12 Sep 2023 08:57:36 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH ocaml-team v6 12/12] gnu: opam: Update to 2.1.5. Date: Tue, 12 Sep 2023 06:57:02 +0000 Message-ID: <30fab02e9f44c827616e14c9b349b268a7e5239f.1694501410.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 4f8637418a..d9b4229729 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1666,10 +1666,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 81b30aa8ea..396c5851e2 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 @@ -4443,8 +4457,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") @@ -4453,6 +4466,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 @@ -5325,27 +5346,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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 12 07:31:40 2023 Received: (at 64249) by debbugs.gnu.org; 12 Sep 2023 11:31:40 +0000 Received: from localhost ([127.0.0.1]:56310 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qg1cK-0007LG-7E for submit@debbugs.gnu.org; Tue, 12 Sep 2023 07:31:40 -0400 Received: from jpoiret.xyz ([206.189.101.64]:40060) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qg1cC-0007Kp-Cp for 64249@debbugs.gnu.org; Tue, 12 Sep 2023 07:31:35 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id C3C00184D43; Tue, 12 Sep 2023 11:31:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1694518285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZEDLNjLNA4/CQSSkZxqNdA5M+mmwYfyx5H/OwS2ggtI=; b=nprYa0X0BzjqCrFxSBqoP7RbTDA3N34LiChcp7rWyXsprFzEtrV4Y0G7F/9MHww1L9kvGO miMT2giGzvWZ8IMudJDomqbvbBwPZI77DlEaHyoEiGfo/RL3TCKHOH2McgkHsXF3Y6kU3P 8XEytt1syn/kUwJqD4h0oYaTGs2RCdrq8K01KURVxVON558HhW/NLMpcCMNeaghvFV02ov qWJzHdZM/YU7y6DLziBCil+5SI15a8eRRP64Zev4UqL+v8G7915k+Hq3dkZOp4z0oYKaFL 57jx1Vww4nzegVmHST4RvfR62Ho4k8Na9Ho4Jf6uYelHs1JEBnTknp80E1p4jA== From: Josselin Poiret To: pukkamustard , 64249@debbugs.gnu.org Subject: [PATCH] fixup! gnu: coq: Update to 8.17.1. Date: Tue, 12 Sep 2023 13:31:06 +0200 Message-ID: <4c1fa55b62e1e172f123f18a334575c7c0a4f7a9.1694517929.git.dev@jpoiret.xyz> In-Reply-To: <11daee2634fa3df963864662c6c3aba35f63d90c.1694501410.git.pukkamustard@posteo.net> References: <11daee2634fa3df963864662c6c3aba35f63d90c.1694501410.git.pukkamustard@posteo.net> MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Level: **** X-Spamd-Bar: ++++ Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: Julien Lepiller , Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Josselin Poiret --- Hi pukkamustard, Since we're dropping the coq-core and coq-stdlib separation, why not get rid of all our custom stuff that came with it? Here's a fixup patch that does precisely that! Best, gnu/local.mk | 1 - gnu/packages/coq.scm | 49 ++++++++------------ gnu/packages/patches/coq-fix-envvars.patch | 53 ---------------------- 3 files changed, 20 insertions(+), 83 deletions(-) delete mode 100644 gnu/packages/patches/coq-fix-envvars.patch diff --git a/gnu/local.mk b/gnu/local.mk index d9b4229729..8925e483b5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1036,7 +1036,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 d68f00a63c..6169b5f819 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -64,40 +64,31 @@ (define-public coq (file-name (git-file-name name version)) (sha256 (base32 - "0gg6hizq0i08lk741b579cbswhy6qvkh6inc3d3i5a2af98psq63")) - (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 - `(#: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")) - (libdir (string-append out "/lib/ocaml/site-lib"))) - (invoke "./configure" "-prefix" out - "-libdir" libdir)))) - (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-core" "coq-stdlib" "coq"))))))) + (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 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 - base-commit: 9996896dc252a02ba3b17473a685ce8957237546 prerequisite-patch-id: 86064275d4e6973b4c6e0e92928e9f0492f1c1e8 prerequisite-patch-id: 1e373b37413142bb32fa4a3eac0c429cc06aade6 prerequisite-patch-id: 62f9047b558dc9ad8be2415eda1ca5a7f45afbd5 prerequisite-patch-id: f419c33161039acab8d70e190fbcf155ce69c392 prerequisite-patch-id: d03ea10df36ace9b645d943ee867c8ae3837871e prerequisite-patch-id: fa3b358bf025ea4632af1d04265129af844583c3 prerequisite-patch-id: 30facf29a23518f813ee17eb213c9dda2c9891e9 prerequisite-patch-id: 4dffccb9ce6bc4446f8683035567e06d2dc7c98d prerequisite-patch-id: d33f5858aa29cc2a674b4bd53170fc3484e6bc2a prerequisite-patch-id: cde7bed13eeac7d6e836f2d02528885985f0fffb prerequisite-patch-id: c6b875244504ca1effdd8a81e96dab5f988607be prerequisite-patch-id: d04a32a675e2c778d3fa96eea636f44ae50b4968 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 20 02:52:45 2023 Received: (at 64249) by debbugs.gnu.org; 20 Sep 2023 06:52:45 +0000 Received: from localhost ([127.0.0.1]:58141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qir4n-00021H-Ap for submit@debbugs.gnu.org; Wed, 20 Sep 2023 02:52:45 -0400 Received: from mout02.posteo.de ([185.67.36.66]:40677) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qir4j-000211-5c for 64249@debbugs.gnu.org; Wed, 20 Sep 2023 02:52:43 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 7FA59240101 for <64249@debbugs.gnu.org>; Wed, 20 Sep 2023 08:52:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695192745; bh=Ltm9yVCwVCDYKd8NgI0JXmL1Yp6NEUUjF8Y228oD4bY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:From; b=Gn4xK3zdHVo90rP8dGFp9RKjQHZJNXxrZDalt2pXFrD8p4Z6I3/hhy6Qm9YV5l9RI FDvnEozj5h1DGM3DRBEcqxQRlMsEZu58uvgtX2vZfqP2L6yPe6McrSX+A+SNeWWPSV /1ZO2SOa0/JctdQRUpGlEmKpMiA5fM/eYGFN47dUZSU6dBRKm8SQSaa3YL6h47N8bL nt+x4JJgeMQb1O6uemYu3iayWKcSx/7pY2QRlAAhSM0n3KoPyrSSSA0AsS0H/gwE93 lkvMkSiD3VsLyyfo+7bnAOwGVdkQ6h5+QAFuFvN1DRAF/BdJW/NTjGfVBxLHHgctqT yLBv+etlabClQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Rr8NS4Hx2z6v4Q; Wed, 20 Sep 2023 08:52:24 +0200 (CEST) References: <11daee2634fa3df963864662c6c3aba35f63d90c.1694501410.git.pukkamustard@posteo.net> <4c1fa55b62e1e172f123f18a334575c7c0a4f7a9.1694517929.git.dev@jpoiret.xyz> From: pukkamustard To: Josselin Poiret Subject: Re: [PATCH] fixup! gnu: coq: Update to 8.17.1. Date: Wed, 20 Sep 2023 06:43:30 +0000 In-reply-to: <4c1fa55b62e1e172f123f18a334575c7c0a4f7a9.1694517929.git.dev@jpoiret.xyz> Message-ID: <86r0mt5obc.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: 64249@debbugs.gnu.org, Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Josselin, Josselin Poiret writes: > Since we're dropping the coq-core and coq-stdlib separation, why not get rid of > all our custom stuff that came with it? Here's a fixup patch that does > precisely that! Beautiful, thanks! I'll refrain from sending in a V7 of the entire series, but this is the adapted commit message: --8<---------------cut here---------------start------------->8--- gnu: coq: Update to 8.17.1. * 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 --8<---------------cut here---------------end--------------->8--- Cheers, pukkamustard From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 22 11:25:30 2023 Received: (at 64249) by debbugs.gnu.org; 22 Sep 2023 15:25:30 +0000 Received: from localhost ([127.0.0.1]:37117 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qji25-0004BU-Pk for submit@debbugs.gnu.org; Fri, 22 Sep 2023 11:25:30 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:40128) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qji22-0004BD-Fq for 64249@debbugs.gnu.org; Fri, 22 Sep 2023 11:25:27 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-40471c054f9so7121055e9.0 for <64249@debbugs.gnu.org>; Fri, 22 Sep 2023 08:25:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695396309; x=1696001109; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=3T7KeWTLJb2RjeeruGnKcmDElojPGnzNcgQdEwP1wsE=; b=bd7h/87qWpHHWUfOaz8SnrouFZW7tpHD86KE+yXgyvyyPQPqUag1Dl+rR6fu/h6HHz j3MUk7HecrN3apqcJBjTrLEoHQFJOG3B0/cq473AvQEpqh5W2yjw/QGnLMHZsNKHBd4h YCPzDrN7XK1jS/pSOdP1G2AH9yHQCRZxxidg5Oxo5YJKzhiHzPR7ZM/HSwvo/VfLgx9H SU3b+E0KFUhsEqKqf/vHCef5+o7etkbwAqE10vSnXPDFyFCDHweSG+xrxClnza0OXXOB nKMxB7PDOD/VIP9wLCqbXPuw26guhhm/GyGe0oEfrL0EhAcj5qPfyAJ05q4LcU2dWCrT Filw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695396309; x=1696001109; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=3T7KeWTLJb2RjeeruGnKcmDElojPGnzNcgQdEwP1wsE=; b=c8EaVcNx9U0f9kHG4mRCnsgbbm/CnPMIn3espcFOZRYFbLG/sXMk4MWNDh1Y9UoxgW UVLU4/aCH9J9SCWEtNdxPuU+vQ6Rz5/7sDUGdiTQKV2kvxw16LYXXjvJcpxd8sQJEUkO b0ZLYYj7RuTrV/PU7J73Jrk8iBSi7XLtt0I78leEPdNnnEKuZhSoRBvUPfm3y+Bpy/ta u8tjc3PS6aYd//SHltDmhUhvDTsq6RLUpINbGko4kfBQ2e9QqklQQo6q/I8z+UNh/UtS zEyG3GvO+opOa+V3lSkPHveDWeza8qFMSBctRsV3ZW92kGpwSPD8AuQT0sBjJ2QJ7G9c y3SQ== X-Gm-Message-State: AOJu0YygStK2B7mKREiIZDd4HumIg+Gxc+PeIgPkDPZ+SlQjCIYZryBI tIz+ncG+7InnJuovA1QZbA4= X-Google-Smtp-Source: AGHT+IF8+qY6htwODzTgmGQZs8vTlcsJktTcYJNZ9gKIjljMVBQir3iGbae5JviKingI4YHvTSjR2g== X-Received: by 2002:a05:600c:358d:b0:401:b53e:6c3e with SMTP id p13-20020a05600c358d00b00401b53e6c3emr8221754wmq.1.1695396309397; Fri, 22 Sep 2023 08:25:09 -0700 (PDT) Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id hu23-20020a05600ca29700b003fef5e76f2csm239653wmb.0.2023.09.22.08.25.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 08:25:08 -0700 (PDT) From: Simon Tournier To: pukkamustard Subject: Re: bug#64249: [PATCH ocaml-team 1/2] gnu: ocaml: Update to 4.14.1. References: <30fab02e9f44c827616e14c9b349b268a7e5239f.1694501410.git.pukkamustard@posteo.net> Date: Fri, 22 Sep 2023 16:21:38 +0200 In-Reply-To: <30fab02e9f44c827616e14c9b349b268a7e5239f.1694501410.git.pukkamustard@posteo.net> (pukkamustard@posteo.net's message of "Tue, 12 Sep 2023 06:57:02 +0000") Message-ID: <87msxe8f0t.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: 64249@debbugs.gnu.org, Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, On Tue, 12 Sep 2023 at 06:57, pukkamustard wrote: > * 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 I get: --8<---------------cut here---------------start------------->8--- Applying: gnu: opam: Update to 2.1.5. error: corrupt patch at line 292 error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 gnu: opam: Update to 2.1.5. When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". --8<---------------cut here---------------end--------------->8--- And as suggested by base-commit: 5db78e7c1b06d1b4892bdb3e153b95b21577271e from the cover letter, I am on the top of it. What do I miss? Cheers, simon From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 22 15:48:51 2023 Received: (at 64249) by debbugs.gnu.org; 22 Sep 2023 19:48:51 +0000 Received: from localhost ([127.0.0.1]:37312 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjm8w-0002cx-VY for submit@debbugs.gnu.org; Fri, 22 Sep 2023 15:48:51 -0400 Received: from lepiller.eu ([89.234.186.109]:53438 helo=localhost) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjm8p-0002cD-Op for 64249@debbugs.gnu.org; Fri, 22 Sep 2023 15:48:49 -0400 Received: from localhost (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id f5a5c15b; Fri, 22 Sep 2023 19:48:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=kiND/g5wY28W /lhp1nivxkgquTwIMCDJaVzHIgDPNCc=; b=BkZOwbTudWUlcs90TxL4MbPrbIl5 GXrs482iHZj1o+bCsLH7aRvZCmtyqUKAt6dtnr+Sz62+Jy0bMtf7Htns+U97DqD6 D4RgrTjFwLf7TYDuJ3PSksjPT6c8J8enr0bJSLI4qSYQA+gDW5vf05Dpnx9H3NEb 6RXXtCDtcFz9ZtawSQ3dppAb38igXqikuczZCOQNQlGgxqilcqq4zf5x5N3XSUVR eL1eyxV3Uim/D5CnnBqRnk9DTW5r4rObNvF0hpGsToIL2CCX0xmmLXp3yDjoGKzk UkvmWc2Im/QmyNtf8gr2jrrcKJ2EcBYEqE70Z5vN5ycZmhIX2RhNS+kmww== Received: by localhost (OpenSMTPD) with ESMTPSA id f147bfb4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 22 Sep 2023 19:48:30 +0000 (UTC) Date: Fri, 22 Sep 2023 21:48:28 +0200 From: Julien Lepiller To: pukkamustard Subject: Re: [bug#64249] [PATCH ocaml-team v6 12/12] gnu: opam: Update to 2.1.5. Message-ID: <20230922214828.5fb95e61@lepiller.eu> In-Reply-To: <30fab02e9f44c827616e14c9b349b268a7e5239f.1694501410.git.pukkamustard@posteo.net> References: <30fab02e9f44c827616e14c9b349b268a7e5239f.1694501410.git.pukkamustard@posteo.net> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: For some reason this last patch makes why3 fail to build, but the latest version builds fine. It's only used by frama-c, which fails to build with this newer why3. Now, updating frama-c would be nice, [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FSL_HELO_NON_FQDN_1 No description available. 3.6 HELO_LOCALHOST No description available. -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 64249 Cc: 64249@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: For some reason this last patch makes why3 fail to build, but the latest version builds fine. It's only used by frama-c, which fails to build with this newer why3. Now, updating frama-c would be nice, [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FSL_HELO_NON_FQDN_1 No description available. 3.6 HELO_LOCALHOST No description available. -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager For some reason this last patch makes why3 fail to build, but the latest version builds fine. It's only used by frama-c, which fails to build with this newer why3. Now, updating frama-c would be nice, but it requires a bit more work, as it switched to dune and has a few more dependencies. Otherwise, the whole series LGTM, including the coq fixup. From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 26 05:35:09 2023 Received: (at 64249) by debbugs.gnu.org; 26 Sep 2023 09:35:09 +0000 Received: from localhost ([127.0.0.1]:47310 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ql4TF-0006ki-2B for submit@debbugs.gnu.org; Tue, 26 Sep 2023 05:35:09 -0400 Received: from lepiller.eu ([89.234.186.109]:50660 helo=localhost) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ql4T9-0006kH-Ev for 64249@debbugs.gnu.org; Tue, 26 Sep 2023 05:35:07 -0400 Received: from localhost (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 522d4322; Tue, 26 Sep 2023 09:34:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:in-reply-to:references:message-id:mime-version :content-type:content-transfer-encoding; s=dkim; bh=lJV1rLcIZM3C CTx80hoYBeY6+wpab2CGzXA0HfxWpA0=; b=ZBI7hWOovQpu9c++z6bM5D9xeg0n kOtYQ4Vmg9e/NRH/xnQ3V2wx0Yd+C9R0t6XPDv4qMCOFPNdjBsP2JHVE+gINsemg b6r4xjRuh9XpizZicrHj9gkBasZq1ms42Q6Ej2EMsStEmcD6mg2L2QBAJX41BT2y zkOp7mXsDxAe4ZSH+qvWRHxifKdhPrQ2onuz7Lf8NUi1f4oa6h1dVy6OtzJuNZiW cMc+2OlFOWfmGjnC0Y4xTqlvGLh1Sa6FPfnYqhjA41lEdhQTQqf5mxxAAPqSXV9n NbCGYvGUebJGbEb1btWyPfuJ1MZUzMQj7dA7GRK7+VAA6ffih7Wygz+5KQ== Received: by localhost (OpenSMTPD) with ESMTPSA id b3305209 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 26 Sep 2023 09:34:47 +0000 (UTC) Date: Tue, 26 Sep 2023 11:34:43 +0200 From: Julien Lepiller To: guix-patches@gnu.org, pukkamustard Subject: =?US-ASCII?Q?Re=3A_=5Bbug=2364249=5D_=5BPATCH_ocaml-team_v?= =?US-ASCII?Q?6_12/12=5D_gnu=3A_opam=3A_Update_to_2=2E1=2E5=2E?= User-Agent: K-9 Mail for Android In-Reply-To: <20230922214828.5fb95e61@lepiller.eu> References: <30fab02e9f44c827616e14c9b349b268a7e5239f.1694501410.git.pukkamustard@posteo.net> <20230922214828.5fb95e61@lepiller.eu> Message-ID: <46D665FB-7145-4D96-BA33-548318863E31@lepiller.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: If you agree, I could push the first 11 patches to master. Then, we only have to deal with package updates, which I could take over from you. I was looking at what would be needed for updating frama-c to a compatible version yesterday, and it's only ~5 new packages, so it's not that bad, but they also require an update to at least ppxlib, w [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FSL_HELO_NON_FQDN_1 No description available. 3.6 HELO_LOCALHOST No description available. -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 64249 Cc: 64249@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: If you agree, I could push the first 11 patches to master. Then, we only have to deal with package updates, which I could take over from you. I was looking at what would be needed for updating frama-c to a compatible version yesterday, and it's only ~5 new packages, so it's not that bad, but they also require an update to at least ppxlib, w [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FSL_HELO_NON_FQDN_1 No description available. 3.6 HELO_LOCALHOST No description available. -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager If you agree, I could push the first 11 patches to master=2E Then, we only = have to deal with package updates, which I could take over from you=2E I was looking at what would be needed for updating frama-c to a compatible= version yesterday, and it's only ~5 new packages, so it's not that bad, bu= t they also require an update to at least ppxlib, which could trigger more = failures and require more fixes=2E I'll work on that for a few days and see if I find a good solution to upda= te everything that's needed=2E Le 22 septembre 2023 21:48:28 GMT+02:00, Julien Lepiller a =C3=A9crit=C2=A0: >For some reason this last patch makes why3 fail to build, but the >latest version builds fine=2E It's only used by frama-c, which fails to >build with this newer why3=2E Now, updating frama-c would be nice, but it >requires a bit more work, as it switched to dune and has a few more >dependencies=2E > >Otherwise, the whole series LGTM, including the coq fixup=2E > > > From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 28 16:11:33 2023 Received: (at 64249) by debbugs.gnu.org; 28 Sep 2023 20:11:33 +0000 Received: from localhost ([127.0.0.1]:54595 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlxMD-0003yw-BK for submit@debbugs.gnu.org; Thu, 28 Sep 2023 16:11:33 -0400 Received: from lepiller.eu ([89.234.186.109]:43056 helo=localhost) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlxM8-0003yi-G3 for 64249@debbugs.gnu.org; Thu, 28 Sep 2023 16:11:31 -0400 Received: from localhost (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id bf7fb2cf; Thu, 28 Sep 2023 20:11:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=gMVrqo7nSeq5 wan5MSwtsTMKirCXt3zpSOltobk4R9Q=; b=ZGLlc/nmoi12764oOv1tNVszgnt9 RNmV2Uw8tKYCtqK1FiZE+x88MIPQFRvE8xDdOAhzDCl/jcAkCjzPw10FgGFPMMFm ruc/B26CveYHlS9mX/GWXm4UPJRwtv4m65vfQ1KipIu/wgPMKprgqggqBgyUSofF lFlzuxIQp/1OA8Rikw6a5eMzKc2b1+hiWmUitEKs53pMLXSpO6Qnead8wCh1AJ48 1sE0i6Me0Wco0Z263YNelIvOMK+sOSDG777h3eLdGOTs+vw/h1qtm8HSlW4y9r9H 66amq18eSerRSZG0upyR4ci6/sbFXQoefF4DGuXpH0YpbPrbf4eqcv4ncQ== Received: by localhost (OpenSMTPD) with ESMTPSA id 26fae74a (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 28 Sep 2023 20:11:11 +0000 (UTC) Date: Thu, 28 Sep 2023 22:11:10 +0200 From: Julien Lepiller To: 64249@debbugs.gnu.org, pukkamustard@posteo.net Subject: Re: [bug#64249] [PATCH ocaml-team v6 12/12] gnu: opam: Update to 2.1.5. Message-ID: <20230928221110.19ee39a7@lepiller.eu> In-Reply-To: <46D665FB-7145-4D96-BA33-548318863E31@lepiller.eu> References: <30fab02e9f44c827616e14c9b349b268a7e5239f.1694501410.git.pukkamustard@posteo.net> <20230922214828.5fb95e61@lepiller.eu> <46D665FB-7145-4D96-BA33-548318863E31@lepiller.eu> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Le Tue, 26 Sep 2023 11:34:43 +0200, Julien Lepiller a écrit : > If you agree, I could push the first 11 patches to master. Then, we > only have to deal with package updates, which I could take over from > you. > > I was looking at what would be needed for updati [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FSL_HELO_NON_FQDN_1 No description available. 3.6 HELO_LOCALHOST No description available. -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 64249 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Le Tue, 26 Sep 2023 11:34:43 +0200, Julien Lepiller a écrit : > If you agree, I could push the first 11 patches to master. Then, we > only have to deal with package updates, which I could take over from > you. > > I was looking at what would be needed for updati [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FSL_HELO_NON_FQDN_1 No description available. 3.6 HELO_LOCALHOST No description available. -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Le Tue, 26 Sep 2023 11:34:43 +0200, Julien Lepiller a =C3=A9crit : > If you agree, I could push the first 11 patches to master. Then, we > only have to deal with package updates, which I could take over from > you. >=20 > I was looking at what would be needed for updating frama-c to a > compatible version yesterday, and it's only ~5 new packages, so it's > not that bad, but they also require an update to at least ppxlib, > which could trigger more failures and require more fixes. >=20 > I'll work on that for a few days and see if I find a good solution to > update everything that's needed. >=20 > Le 22 septembre 2023 21:48:28 GMT+02:00, Julien Lepiller > a =C3=A9crit=C2=A0: > >For some reason this last patch makes why3 fail to build, but the > >latest version builds fine. It's only used by frama-c, which fails to > >build with this newer why3. Now, updating frama-c would be nice, but > >it requires a bit more work, as it switched to dune and has a few > >more dependencies. > > > >Otherwise, the whole series LGTM, including the coq fixup. > > > > > > =20 >=20 >=20 >=20 I managed to find all the required package updates and new packages to get frama-c to build again. I just need to figure out a good order and I'll send an updated patchset. From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 12 05:28:33 2023 Received: (at 64249) by debbugs.gnu.org; 12 Oct 2023 09:28:33 +0000 Received: from localhost ([127.0.0.1]:40631 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqrzc-0006iT-Oi for submit@debbugs.gnu.org; Thu, 12 Oct 2023 05:28:33 -0400 Received: from mout01.posteo.de ([185.67.36.65]:52687) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqrzU-0006hu-SW for 64249@debbugs.gnu.org; Thu, 12 Oct 2023 05:28:31 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 39C7B240029 for <64249@debbugs.gnu.org>; Thu, 12 Oct 2023 11:27:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1697102876; bh=oaC1KVvZYOymxElPa2tZBpBSVWQLGjJ2JqwlDgBom2k=; h=From:To:Subject:Date:Message-ID:MIME-Version:From; b=IVrji5pW8Cr5v4am56O+pziq3ixKvtCkastnRdqXP7/vE9HNzb46aYzt/2GketT+u xoXRGF9P+8F0HkXKPzWTbbWRc0FX2m6VQxl6sy5w0sUZ8+wlucJsrppjpyDbMMJZ+Q YsF0epuEGq6ADUWYiiiw888Qza61AVsg5ZeF35cybJ1RaECx/6mYFx0eBMSCMZKrZj K7X1X7KcgNXO+ZZW5d1bgfshIwuwJctOYVQN7bgBULz9/BotQ/MQ5XlVULu2Sy7KK1 bbEsZsz5ZI4y9ca+waHn9rbkgtZ0LCXlsOy+bgeOFAG8cI6WGpakJudZ3QeHiJDDDW nGxJYSezEel3A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S5knl3LWMz9rxK; Thu, 12 Oct 2023 11:27:55 +0200 (CEST) References: From: pukkamustard To: julien@lepiller.eu, 64249@debbugs.gnu.org Subject: Re: [PATCH ocaml-team v6 00/12] The one where OPAM finally works Date: Thu, 12 Oct 2023 09:18:46 +0000 In-reply-to: <20230922214828.5fb95e61@lepiller.eu> Message-ID: <86o7h46vhh.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Salut Julien, I'm afraid your last messages somehow got dropped and I only saw them now after checking the issue on issues.guix.gnu.org. Sorry for delayed response. > If you agree, I could push the first 11 patches to master. Sounds good to me! Only thing is that dune was updated again (dune releases are too fast for us!). Maybe we can bump it to 3.11.0 before pushing to master? If you think we should run it trough CI once again I can send in a V7 that bumps dune to 3.11.0 and includes Josselin's coq fixup. > I managed to find all the required package updates and new packages to > get frama-c to build again. I just need to figure out a good order and > I'll send an updated patchset. \o/ woohoo, nice! Let me know if I can help in anyway. -pukkamustard pukkamustard writes: > Hello Guix, > > Thanks to Julien's help this version finally build OPAM! > > I'm currently very slow and it will probably take quite a bit of time for me to > look into the other things that could be updated in Guix's OCaml land (see > https://yhetil.org/guix/86bkhgc7jj.fsf@posteo.net/). Maybe it would make sense > to merge this patch series into master instead of having a too long-lived > ocaml-team branch? What do you think? > > Cheers, > pukkamustard > > pukkamustard (12): > gnu: ocaml: Update to 4.14.1. > gnu: Update coq-flocq to 4.1.1. > gnu: Update coq-gappa to 1.5.3. > gnu: Update coq-coquelicot to 3.4.0. > gnu: Update coq-mathcomp to 1.17.0. > gnu: Update coq-autosubst to 1.8. > gnu: Update coq-stdpp to 1.8.0. > gnu: Update coq-interval to 4.8.0. > gnu: coq: Update to 8.17.1. > gnu: dune-bootstrap: Update to 3.10.0. > gnu: opam: Split build into smaller sub-packages. > gnu: opam: Update to 2.1.5. > > gnu/local.mk | 4 - > gnu/packages/coq.scm | 152 +++---- > gnu/packages/ocaml.scm | 410 +++++++++++------- > .../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 - > 7 files changed, 331 insertions(+), 454 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 > > > base-commit: 5db78e7c1b06d1b4892bdb3e153b95b21577271e From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 12 06:25:12 2023 Received: (at 64249) by debbugs.gnu.org; 12 Oct 2023 10:25:12 +0000 Received: from localhost ([127.0.0.1]:41147 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqssR-0001Wv-Lv for submit@debbugs.gnu.org; Thu, 12 Oct 2023 06:25:12 -0400 Received: from lepiller.eu ([89.234.186.109]:56258 helo=localhost) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqssM-0001Tm-UZ for 64249@debbugs.gnu.org; Thu, 12 Oct 2023 06:25:10 -0400 Received: from localhost (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 4734375a; Thu, 12 Oct 2023 10:24:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:subject:in-reply-to:references:message-id:mime-version :content-type:content-transfer-encoding; s=dkim; bh=2hsWDdcAOcA1 q19pmdoo/hALROxxwZXFmuUORMIEvvw=; b=ZZ2HgxuE7y/CE5/YTIq1DGeHjEfI Jw8xtmLzgCcgtk2bGlbxmYZKxsxeDERVCimWYH2aKYcCUizF9hksEGQOiA1ksvfT ZRhI+Nct8z6S70hA6qlqT/7yi6PJLk8lobVj6Bg7mQcBkDyO7XBgG3t3tV7P4XDH XJ6ZORNJw85qm5GeUl4nMFg9Y5XUbepUfX3ozn2Z2bsgErlilo4YS1+LmOF8SuQw uGywXI07Dd6vxGepwsu83S+wh/xGg9lN0LQqqUiAKNqU3UcvfbP0cMF++zT+Lln0 rVRAI2tnQESasVuMOEssYmwD4fFvqMLBDexrFKYCbq9P9GldkJpPNvDqBQ== Received: by localhost (OpenSMTPD) with ESMTPSA id 8c3593f3 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 12 Oct 2023 10:24:41 +0000 (UTC) Date: Thu, 12 Oct 2023 12:24:36 +0200 From: Julien Lepiller To: pukkamustard , 64249@debbugs.gnu.org Subject: Re: [PATCH ocaml-team v6 00/12] The one where OPAM finally works User-Agent: K-9 Mail for Android In-Reply-To: <86o7h46vhh.fsf@posteo.net> References: <86o7h46vhh.fsf@posteo.net> Message-ID: <6DA64946-F0C1-4C78-9F68-491689CB2BD9@lepiller.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Le 12 octobre 2023 11:18:46 GMT+02:00, pukkamustard a écrit : > >Salut Julien, > >I'm afraid your last messages somehow got dropped and I only saw them >now after checking [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 HELO_LOCALHOST No description available. 0.0 FSL_HELO_NON_FQDN_1 No description available. -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 64249 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Le 12 octobre 2023 11:18:46 GMT+02:00, pukkamustard a écrit : > >Salut Julien, > >I'm afraid your last messages somehow got dropped and I only saw them >now after checking [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 HELO_LOCALHOST No description available. 0.0 FSL_HELO_NON_FQDN_1 No description available. -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Le 12 octobre 2023 11:18:46 GMT+02:00, pukkamustard a =C3=A9crit=C2=A0: > >Salut Julien, > >I'm afraid your last messages somehow got dropped and I only saw them >now after checking the issue on issues=2Eguix=2Egnu=2Eorg=2E Sorry for de= layed >response=2E > >> If you agree, I could push the first 11 patches to master=2E > >Sounds good to me! > >Only thing is that dune was updated again (dune releases are too fast >for us!)=2E Maybe we can bump it to 3=2E11=2E0 before pushing to master? > >If you think we should run it trough CI once again I can send in a V7 >that bumps dune to 3=2E11=2E0 and includes Josselin's coq fixup=2E That would be best > >> I managed to find all the required package updates and new packages to >> get frama-c to build again=2E I just need to figure out a good order an= d >> I'll send an updated patchset=2E > >\o/ woohoo, nice! > >Let me know if I can help in anyway=2E Well, I managed to fix frama-c and update it, but the changes then broke o= ther packages=2E After a few more updates, bap is the only failing package = left=2E I added a few changes to the recipe that makes it go a bit further, but I = still get errors=2E I'll try updating more packages to see if that's a conf= lict of versions, but I'm not-very confident about that=2E The most important change I needed was updating ppxlib and the janestreet = packages, but bap is not compatible with the new version, even on their mas= ter branch=2E > >-pukkamustard > >pukkamustard writes: > >> Hello Guix, >> >> Thanks to Julien's help this version finally build OPAM! >> >> I'm currently very slow and it will probably take quite a bit of time f= or me to >> look into the other things that could be updated in Guix's OCaml land (= see >> https://yhetil=2Eorg/guix/86bkhgc7jj=2Efsf@posteo=2Enet/)=2E Maybe it w= ould make sense >> to merge this patch series into master instead of having a too long-liv= ed >> ocaml-team branch? What do you think? >> >> Cheers, >> pukkamustard >> >> pukkamustard (12): >> gnu: ocaml: Update to 4=2E14=2E1=2E >> gnu: Update coq-flocq to 4=2E1=2E1=2E >> gnu: Update coq-gappa to 1=2E5=2E3=2E >> gnu: Update coq-coquelicot to 3=2E4=2E0=2E >> gnu: Update coq-mathcomp to 1=2E17=2E0=2E >> gnu: Update coq-autosubst to 1=2E8=2E >> gnu: Update coq-stdpp to 1=2E8=2E0=2E >> gnu: Update coq-interval to 4=2E8=2E0=2E >> gnu: coq: Update to 8=2E17=2E1=2E >> gnu: dune-bootstrap: Update to 3=2E10=2E0=2E >> gnu: opam: Split build into smaller sub-packages=2E >> gnu: opam: Update to 2=2E1=2E5=2E >> >> gnu/local=2Emk | 4 - >> gnu/packages/coq=2Escm | 152 +++---- >> gnu/packages/ocaml=2Escm | 410 +++++++++++-----= -- >> =2E=2E=2E/ocaml-dose3-Fix-for-ocaml-4=2E06=2Epatch | 52 --- >> =2E=2E=2E/ocaml-dose3-Install-mli-cmx-etc=2Epatch | 133 ------ >> =2E=2E=2E/ocaml-dose3-add-unix-dependency=2Epatch | 25 -- >> =2E=2E=2E/ocaml-dose3-dont-make-printconf=2Epatch | 9 - >> 7 files changed, 331 insertions(+), 454 deletions(-) >> delete mode 100644 gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4=2E= 06=2Epatch >> delete mode 100644 gnu/packages/patches/ocaml-dose3-Install-mli-cmx-et= c=2Epatch >> delete mode 100644 gnu/packages/patches/ocaml-dose3-add-unix-dependenc= y=2Epatch >> delete mode 100644 gnu/packages/patches/ocaml-dose3-dont-make-printcon= f=2Epatch >> >> >> base-commit: 5db78e7c1b06d1b4892bdb3e153b95b21577271e > From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 24 12:01:50 2023 Received: (at 64249) by debbugs.gnu.org; 24 Oct 2023 16:01:50 +0000 Received: from localhost ([127.0.0.1]:56397 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJqm-0004fx-Kp for submit@debbugs.gnu.org; Tue, 24 Oct 2023 12:01:50 -0400 Received: from mout01.posteo.de ([185.67.36.65]:56423) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvJqh-0004fd-Qb for 64249@debbugs.gnu.org; Tue, 24 Oct 2023 12:01:47 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 7C6E1240028 for <64249@debbugs.gnu.org>; Tue, 24 Oct 2023 18:01:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1698163267; bh=jUY0TWSiuKlrQJz4uVIEc6gdEua1Cw/PRVkpcZrczVs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=MJj1wSldate63iJiyAXfYClv/6ZZew/aztuwsSJ1UYwTG8uLbp1WfCwds8JgBDZlV dHtka06Iu+ygC9b7r5KjdBrtPNu7eupWENBMn3hLB87nPbN/otj1ecFOVdiqU4/OcS HJDravvU9cuMnpeckJCPVdbdcGYPke8+8JCu8ZGjtIBzvm6EkRNAju/W8wA8PRhC6r tlWAPpX84MuELa/1Kiu9d7jahCFwXaqCZwGuU58AZ5l6iSxGhsU3YdhPnL7pPIJrWa LgOioR3K2muQpo2h5eT6o1ZNA8yjWw+WH/A/EWhO6e7dSbpccDQQEaULOfhj+XJO/b xP84RhBP18ReQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SFGxt3vBGz9rxK; Tue, 24 Oct 2023 18:01:06 +0200 (CEST) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH v7 00/12] gnu: ocaml: Update to 4.14.1 - The one for CI Date: Tue, 24 Oct 2023 16:00:03 +0000 Message-ID: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard , Julien Lepiller , Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello Guix, Hello CI, This is a V7 that bumps dune to 3.11.0, applies the coq fixup provided by Josselin and rebases on master. As discussed (https://issues.guix.gnu.org/64249#69) this is mostly for CI to do its thing. Julien, sorry for the delay. Your mail again didn't make it to my inbox...will investigate. -pukkamustard pukkamustard (12): gnu: ocaml: Update to 4.14.1. gnu: Update coq-flocq to 4.1.1. gnu: Update coq-gappa to 1.5.3. gnu: Update coq-coquelicot to 3.4.0. gnu: Update coq-mathcomp to 1.17.0. gnu: Update coq-autosubst to 1.8. gnu: Update coq-stdpp to 1.8.0. gnu: Update coq-interval to 4.8.0. gnu: coq: Update to 8.17.1. gnu: dune-bootstrap: Update to 3.11.0. gnu: opam: Split build into smaller sub-packages. gnu: opam: Update to 2.1.5. gnu/local.mk | 5 - gnu/packages/coq.scm | 163 +++---- gnu/packages/ocaml.scm | 410 +++++++++++------- gnu/packages/patches/coq-fix-envvars.patch | 53 --- .../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 - 8 files changed, 332 insertions(+), 518 deletions(-) delete mode 100644 gnu/packages/patches/coq-fix-envvars.patch 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 base-commit: d22d2a05c389207f8cdcf824be7738b1499a987c -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 24 12:01:53 2023 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 To: 64249@debbugs.gnu.org Subject: [PATCH v7 01/12] gnu: ocaml: Update to 4.14.1. 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-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 24 12:02:05 2023 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 To: 64249@debbugs.gnu.org Subject: [PATCH v7 03/12] gnu: Update coq-gappa to 1.5.3. 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-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 24 12:02:06 2023 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 To: 64249@debbugs.gnu.org Subject: [PATCH v7 04/12] gnu: Update coq-coquelicot to 3.4.0. Date: Tue, 24 Oct 2023 16:00:07 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 24 12:02:06 2023 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 To: 64249@debbugs.gnu.org Subject: [PATCH v7 02/12] gnu: Update coq-flocq to 4.1.1. 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-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 24 12:02:06 2023 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 To: 64249@debbugs.gnu.org Subject: [PATCH v7 05/12] gnu: Update coq-mathcomp to 1.17.0. Date: Tue, 24 Oct 2023 16:00:08 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 24 12:02:07 2023 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 To: 64249@debbugs.gnu.org Subject: [PATCH v7 11/12] gnu: opam: Split build into smaller sub-packages. 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-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 24 12:02:08 2023 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 To: 64249@debbugs.gnu.org Subject: [PATCH v7 07/12] gnu: Update coq-stdpp to 1.8.0. Date: Tue, 24 Oct 2023 16:00:10 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 24 12:02:08 2023 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 To: 64249@debbugs.gnu.org Subject: [PATCH v7 08/12] gnu: Update coq-interval to 4.8.0. 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-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 24 12:02:09 2023 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 To: 64249@debbugs.gnu.org Subject: [PATCH v7 06/12] gnu: Update coq-autosubst to 1.8. 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-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 24 12:02:10 2023 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 To: 64249@debbugs.gnu.org Subject: [PATCH v7 09/12] gnu: coq: Update to 8.17.1. 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-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard , Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 - -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 24 12:02:11 2023 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 To: 64249@debbugs.gnu.org Subject: [PATCH v7 12/12] gnu: opam: Update to 2.1.5. Date: Tue, 24 Oct 2023 16:00:15 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 24 12:02:11 2023 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 To: 64249@debbugs.gnu.org Subject: [PATCH v7 10/12] gnu: dune-bootstrap: Update to 3.11.0. 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-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 29 07:17:12 2023 Received: (at 64249) by debbugs.gnu.org; 29 Oct 2023 11:17:13 +0000 Received: from localhost ([127.0.0.1]:40522 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qx3n3-0004lQ-Su for submit@debbugs.gnu.org; Sun, 29 Oct 2023 07:17:12 -0400 Received: from nanein.fr ([185.230.78.41]:38512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qx22n-0001Nu-QR for 64249@debbugs.gnu.org; Sun, 29 Oct 2023 05:25:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nanein.fr; s=mail; t=1698571478; bh=2ls09bjJX+WfDpiVv8OOyTiOyrHRUiodLgIZzyHnyXg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=cCAFkga0DXeQiiqqZZG0/7T84vj2vKmpbkVk1QzBtKqe59v4ruDTq+FLhdWVvRXCz dpHTg+YU4H7kQdVuF98wv4MdxatngmWjqlwhlhFTTJk6Xv2nZwNqEeZjfcLiOSXIpF muOdg7+GWOb14ozJgYv+9n4oE4h8tsC23nEgK3vhjSO/3riJMT3hKC8obezfV7nHaH OxH3+n8z4tLrAmZ+tMOxLc3ahy5ZWWG5Kv7p+nXQAj/BI0B4uNH/qxNujitYVQ1ep4 TZrrKi21pQq6CIYkbN1UmkN41LF9UsyKWhehM3aRV3baZm0gMXch9XTOPWK8v4s91m by6cR3mfyq4UFWaL/xN/FnQCGzGjavyIPyjd8c76+MUTn0BcPDgS8gyrYShYKRPZcA RrJpXmeQMkaB2lRyZ7y22GKjkETdw+oMtiDkQPw8nQls7KnH+/qslBNLUwVzpaW2nz qUlI6j5UI4fHQGAmXnHtQxdMTM2Tgc2858Eyt5wDnaaFDyFGPkrxzSebYpZN+WN0MR OPWMGhTeBHYCxjV4iAi93GYcXwjvCK7r32Nyx+i/+STvnMSbwNWQ+sESlWcRLKw0en VbK0NTMPHJa/qOihquVucoMnHh0cIxdvyQiz+R5+XskjH9Y6W3TgmmGK4OsNOiTR+I Pzw+tvffJnf3Hjq8Px/saKUc= Received: from Arnaud (6.17.61.188.dynamic.wline.res.cust.swisscom.ch [188.61.17.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by nanein.fr (Postfix) with ESMTPSA id 6A8641401F5; Sun, 29 Oct 2023 10:24:38 +0100 (CET) Date: Sun, 29 Oct 2023 10:24:31 +0100 From: DABY-SEESARAM Arnaud To: pukkamustard Subject: Re: [bug#64249] [PATCH ocaml-team v4 0/9] Message-ID: References: <20230730194221.50deb15c@lepiller.eu> <86y1io8ag9.fsf@posteo.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="RX68F4ZppZ8m9vE5" Content-Disposition: inline In-Reply-To: <86y1io8ag9.fsf@posteo.net> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 X-Mailman-Approved-At: Sun, 29 Oct 2023 07:17:06 -0400 Cc: Julien Lepiller , 64249@debbugs.gnu.org, Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --RX68F4ZppZ8m9vE5 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, I am (very) late to the party, but finally take the time to look at OCaml-related upgrades in Guix. Thank you all for your work (especially with difficulties associated with Coq)! It seems that in the recent patch series (number 19770), the package ocaml-opam-file-format was not upgraded from version 2.1.4 to 2.1.5. Is there a reason for this choice? After applying all patches of the series and with this modification,=20 opam seems to work properly on my machine, but it does not build without=20 the upgrade of ocaml-opam-file-format. Best, --=20 ds-ac Le Sun, Aug 06, 2023 at 02:09:42PM +0000, pukkamustard a =E9crit >=20 > Hi Julien, >=20 > Thanks for your comments! Will send in updated patches as a v5. >=20 > Julien Lepiller writes: >=20 > >> pukkamustard (9): > >> gnu: ocaml: Update to 4.14.1. > >> gnu: Update coq-flocq to 4.1.1. > >> gnu: Update coq-gappa to 1.5.3. > >> gnu: Update coq-mathcomp to 1.17.0. > > > > This patch breaks coq-coquelicot, but it can be updated to 1.4.0, and > > that fixes the issue. >=20 > Updated coq-coquelicot to 3.4.0. >=20 > >> gnu: coq: Update to 8.17.1. > > > > You've missed a coq-stdlib reference in coq-mathcomp-finmap, but simply > > removing it fixes the issue. >=20 > Done. >=20 > > coq-autosubst-1, coq-equations, coqstdpp, coq-interval and > > coq-mathcomp-bigenough fail to build with the newer coq. coq-ide also > > fails, but it used to fail already. >=20 > - Fixed coq-ide by adding zlib to propagated-inputs. > - Fixed coq-autosubst by updating to 1.8 > - Fixed coq-equations by updating to 1.3-8.17 (I chose to add the > release variant in the version string) > - Fixed coq-stdpp by updating to 1.8.0. > - Fixed coq-interval by updating to 4.8.0. >=20 > coq-mathcomp-bigenough is still broken. There is a (to me) cryptic but > seemingly related message on the issue tracker: >=20 > https://github.com/math-comp/bigenough/issues/9. >=20 > Maybe somebody with more insight/interest in Coq could look into this? >=20 > >> gnu: dune-bootstrap: Update to 3.9.1. > >> gnu: opam: Split build into smaller sub-packages. > > > > there are quite a few more failures with this patch. For instance, > > ocaml-topkg fails because it can't find the opam-installer binary. > > > >> gnu: Add opam-installer. > > > > And of course this patch fixes the issue. I haven't followed closely > > recent changes to policy, but it used to be that, if there were no > > other solutions we would prefer to have multiple changes in a single > > patch if separating them would break something, even in an intermediate > > commit. > > > > ocaml-ocb-stubblr still fails because it has opam instead of > > opam-installer. It can be switche to new style inputs too :) >=20 > Merged the commit to add opam-installer to the previous commit and fixed > ocaml-ocb-stubblr. >=20 > >> FIXME: gnu: opam: Update to 2.1.5. > > > > You replaced the home-page of dose3 with the http version, but the > > https version still works. >=20 > I re-imported dose3 with `guix import opam` and it seems like http is > used in the opam metadata. Fixed to use https. >=20 > > I looked into the build issue, but I can only see deprecation warnings. > > Did I miss something? >=20 > Yes, the error is quite hidden: >=20 > --8<---------------cut here---------------start------------->8--- > (cd _build/default && /gnu/store/qpbrmd6qaakv0zw3f2w2x2cw4nwy5lsg-ocaml-4= =2E14.1/bin/ocamlc.opt -w -40 -w +a-4-40-42-44-48 -safe-string -g -bin-anno= t -I src/client/.opam_client.objs/byte -I /gnu/store/1zzqn0z6rkgb1bwh2hn5in= 1wfjjcr7ik-ocaml-opam-format-2.1.5/lib/ocaml/site-lib/opam-format -I /gnu/s= tore/46q0hi0bzinsp4jl4921rfw2yd2hxyhd-ocaml-opam-repository-2.1.5/lib/ocaml= /site-lib/opam-repository -I /gnu/store/4ldlmhrq0nrbh9sf29r17d9y3qndwch4-oc= aml-mccs-1.1+14/lib/ocaml/site-lib/mccs -I /gnu/store/4ldlmhrq0nrbh9sf29r17= d9y3qndwch4-ocaml-mccs-1.1+14/lib/ocaml/site-lib/mccs/glpk/internal -I /gnu= /store/5pj64sfvin4apb2364gnza0srm7jwibd-ocaml-re-1.10.4/lib/ocaml/site-lib/= re -I /gnu/store/5pj64sfvin4apb2364gnza0srm7jwibd-ocaml-re-1.10.4/lib/ocaml= /site-lib/re/pcre -I /gnu/store/7h1nbgpy8c2vyisq6dyvwww2di2xnx9n-ocaml-grap= h-2.0.0/lib/ocaml/site-lib/ocamlgraph -I /gnu/store/87njknpz4803bcfvx9flwch= qf4l8prcj-ocaml-cudf-0.10/lib/ocaml/site-lib/cudf -I /gnu/store/ai8z8r9ykib= 00039gq0gylyps6xzs55w-ocaml-opam-file-format-2.1.4/lib/ocaml/site-lib/opam-= file-format -I /gnu/store/fz8a8plnh2j7z020jljy66fg4mmbp3hv-ocaml-extlib-1.7= =2E9/lib/ocaml/site-lib/extlib -I /gnu/store/hmsqsalxyda0c0g41rl3znj8lqnbc1= cy-ocaml-opam-solver-2.1.5/lib/ocaml/site-lib/opam-solver -I /gnu/store/k51= jkvxz1smwl3bvi13yh3myg4av3fva-ocaml-dose3-7.0.0/lib/ocaml/site-lib/dose3/al= go -I /gnu/store/k51jkvxz1smwl3bvi13yh3myg4av3fva-ocaml-dose3-7.0.0/lib/oca= ml/site-lib/dose3/common -I /gnu/store/lvhm3dnkqbacm7gy2r6ppvng9rq8rqzx-oca= ml-seq-0.1/lib/ocaml/site-lib/seq -I /gnu/store/qpxf86c2qkyjwidlf5dhj17jwg5= pfwz5-ocaml-opam-core-2.1.5/lib/ocaml/site-lib/opam-core -I /gnu/store/rav2= kpix7fb1gj9x609qzrd6a3cla9b1-ocaml-base64-3.5.0/lib/ocaml/site-lib/base64 -= I /gnu/store/v63rrnbsq9806s8q0qz0fkrw1napqn0f-ocaml-stdlib-shims-0.3.0/lib/= ocaml/site-lib/stdlib-shims -I /gnu/store/vw64xzqqkz8gzg6ikrp4ks5bqdbjash3-= ocaml-cmdliner-1.1.1/lib/ocaml/site-lib/cmdliner -I /gnu/store/ylwbjd8fmi6m= rk2lxsvh7yrjajh7qbi4-ocaml-opam-state-2.1.5/lib/ocaml/site-lib/opam-state -= intf-suffix .ml -no-alias-deps -o src/client/.opam_client.objs/byte/opamSwi= tchCommand.cmo -c -impl src/client/opamSwitchCommand.ml) > File "src/client/opamSwitchCommand.ml", line 405, characters 18-35: > 405 | let value =3D Base64.decode_exn content in > ^^^^^^^^^^^^^^^^^ > Error: Unbound value Base64.decode_exn > --8<---------------cut here---------------end--------------->8--- >=20 > In the meantime dune 3.10.0 was released and the v5 updates to it. So, > happy recompiling! :) >=20 > Thanks, > pukkamustard --RX68F4ZppZ8m9vE5 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEMgqfJ4U0fby1t860ojLKXoMTiAwFAmU+JM4ACgkQojLKXoMT iAx5Tg/9Hudcy9Ey6XeaBaSqz/fIksVF/1tcVKpPIsi2WDffZT3WoR76GZx2KA3z 8J39/gHPl5Mm3aPtWfnksB6CSHIhvrPDMcmJPhal1cLofu2sz4IpGw+mh1Z4FZo9 HiA0IykwPLZvgeq4NIkifCfrrYba23hrDScyML/3EaAnJ0l94nSGYrAamC4/9to4 eIg8EQEcdWmhyBVR4CKWxHZ/J2d1hf9Kke73MA98cxaJg+Pca0WAY0K/DGCjNXnE 6aXhtOzt526Fd+Y+OBn0v5m+50GU7kkpCLAUVwFZtfaKl9L+Dr+dOWF5FU152TV8 ltUoWjErvIojs5tgclcQCMonSFAOAlpM9PZHR/O+P37s+F/MMSrr4m9uV5Cy1rQ8 jiOl9G926H/E7V9yzFuexXWhWYp+yLeuqktk8SBlJTHhogslEPpyzbDogXPLDnoY lEyPrGwr7LTYIgq4i8cFBrJ3u9Xdib1I2LW+nIfdTT8XQ09HKzH5Q1ZOyRf1FTSs JN+9yl018UVg/bm/OsboxaiVoArhfvqIay2IUihntEur3JqIM1mZf3rX55ErhLVY jyFSwDJvBQ8qurCDja+ZyRIt+DpW5F1D4YPUNBPGxags3fkFBr8jHdGrml02m1iV IbeTCji2jwaQ4LntSMMdw+iF1Jlsfts/Te+gfsF3j2liVUlgFps= =sr7c -----END PGP SIGNATURE----- --RX68F4ZppZ8m9vE5-- From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 03 07:47:43 2023 Received: (at 64249) by debbugs.gnu.org; 3 Nov 2023 11:47:43 +0000 Received: from localhost ([127.0.0.1]:57118 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyseN-00080B-84 for submit@debbugs.gnu.org; Fri, 03 Nov 2023 07:47:43 -0400 Received: from mout01.posteo.de ([185.67.36.65]:59809) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyseK-0007zq-AA for 64249@debbugs.gnu.org; Fri, 03 Nov 2023 07:47:41 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 47ED7240029 for <64249@debbugs.gnu.org>; Fri, 3 Nov 2023 12:46:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1699012018; bh=0trmPAZb1u1ZSNiQBfMTbZEo2rZNYHUv3mao1L4S7s8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:From; b=YeIowg439btrUFYPdHTmkLOPdedPQCiZmb9e9KCIyRjXMvhN6cC0iCXUu/pf9mufV qR8fmBb726Omwv33bRliXcNk6Tlx26r9xH/ecmOdoUc06/K8t0rQQ/GI9k4Q1QOR9d +JzR5Gouu/sX8ThcWgTKjMjM4gXBO73LxT9jOWSDG5NWTOkptwpLKmaDMwyMkKnlNS mrrGeMeT1F0W7GMC7MLkHMo2DoPpwrlamN309Ky+BUK7L8NKmlxNWmp99waZsoZa3+ 9gHEQz38t8/lZHVBtq1pU5sZwbnBq47kAi8lfrIkeR1b+RX/9BSpJXi2NBudu5Rqb9 0I67oaR2aP18w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SMJr11XXGz6tx6; Fri, 3 Nov 2023 12:46:57 +0100 (CET) References: <20230730194221.50deb15c@lepiller.eu> <86y1io8ag9.fsf@posteo.net> From: pukkamustard To: DABY-SEESARAM Arnaud Subject: Re: [bug#64249] [PATCH ocaml-team v4 0/9] Date: Fri, 03 Nov 2023 11:11:56 +0000 In-reply-to: Message-ID: <86msvvcb4f.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: Julien Lepiller , 64249@debbugs.gnu.org, Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Thanks for the report! DABY-SEESARAM Arnaud writes: > It seems that in the recent patch series (number 19770), the package > ocaml-opam-file-format was not upgraded from version 2.1.4 to 2.1.5. > Is there a reason for this choice? No particular reason. I was unaware that opam 2.1.5 requires an updated ocaml-opam-file-format. I think the v6 of the series built with ocaml-opam-file-format at 2.1.4? Did updating dune mess up something? In any case, I can confirm your findings that opam was not building in the v7 (patchwork series 19770) and updating ocaml-opam-file-format to 2.1.6 fixes it. Hold on for v8! Cheers, pukka From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 03 07:51:21 2023 Received: (at 64249) by debbugs.gnu.org; 3 Nov 2023 11:51:21 +0000 Received: from localhost ([127.0.0.1]:57129 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyshs-0008Bh-Rh for submit@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:21 -0400 Received: from mout01.posteo.de ([185.67.36.65]:35339) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyshq-0008B4-R1 for 64249@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:19 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id A854924002A for <64249@debbugs.gnu.org>; Fri, 3 Nov 2023 12:50:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1699012237; bh=mLI5ysOOklCMR/BcBN4xlWZjYyU1Dk4LWaltXZK92w4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=UD31bRY+ymOMuJjPrkfIMNnYMGANeDb/5EJCFZjJPbVh2B2viiWE87EEHy5ZKpMQj Zh6wTlxfNTuR42iVLU1hAukjVDMcoQ3di7XN8sjNbAHb7qwru3BdygRT/cgccEKTlN KTqKWWJ1IfsPtXTpc+dOT6DNQSbM9lkizzSes+mFO7iOzs9ljkon49ybV9hN/lLS/T sdzLZjySVaSGsEpkORz6QY2QVyrsF8NdOSBbr+9KKJn8XeLadVEN33HJvkpAHg7kRt CqoWFIDI2KKMpBKAFjzhv2MSvEnGZ0ph8m9fWe46uOQ8GeGrwSrJ3DmZnShkYqRIiM NzO/nJuHkotiA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SMJwF1b5Bz9rxV; Fri, 3 Nov 2023 12:50:37 +0100 (CET) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH v8 02/13] gnu: Update coq-flocq to 4.1.1. Date: Fri, 3 Nov 2023 11:50:10 +0000 Message-ID: <21ad36c9a819c21d5979b35261ef5b81e10ba72d.1699012157.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 03 07:51:21 2023 Received: (at 64249) by debbugs.gnu.org; 3 Nov 2023 11:51:21 +0000 Received: from localhost ([127.0.0.1]:57133 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qysht-0008Bn-9D for submit@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:21 -0400 Received: from mout02.posteo.de ([185.67.36.66]:56837) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyshq-0008B2-S9 for 64249@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:19 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 3E502240101 for <64249@debbugs.gnu.org>; Fri, 3 Nov 2023 12:50:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1699012237; bh=9cVe6Yicx+8svO5gmqTWy3hrk2dhE/UpSvxLXFhiCZs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=EInc++WZQcXLNTNMM+lCBWXUbr4AyCIngnEy9Acn0uVLhHRhuDfLHxJb3Mf7vLaD1 5sOYpsYvkhnN48QVh19U5voUNqkoB2IpDycMCtjQQsZ5w8W2N1sF/l2A8b6zGe9bag DNuX5kl87RJJ674uPB+jFD8xWe/Q8hkJvMEadF4mX1eydp0MvBNqNy4iMrol8P+GMq 5Vjw/uHDKi5ymHA8DgvvlWbV7GVQLvrztiBC3TQuNxnoF1enai6fx71XQaROYhvUIA pwgqjdGUsGCh5abVigBZZtl1JRHFN+fvQYUHmTQ3MmLfpZ6QKzRV+NAalvNcmkMwgO 4eVKekZ6Bj2tg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SMJwD4GrVz9rxB; Fri, 3 Nov 2023 12:50:36 +0100 (CET) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH v8 01/13] gnu: ocaml: Update to 4.14.1. Date: Fri, 3 Nov 2023 11:50:09 +0000 Message-ID: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 base-commit: 28ebbe2be8829a4767b9789c6353ad5e826d1164 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 03 07:51:22 2023 Received: (at 64249) by debbugs.gnu.org; 3 Nov 2023 11:51:22 +0000 Received: from localhost ([127.0.0.1]:57137 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qysht-0008Bz-NI for submit@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:22 -0400 Received: from mout01.posteo.de ([185.67.36.65]:53087) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyshr-0008B7-Eu for 64249@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:19 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 4B84D24002A for <64249@debbugs.gnu.org>; Fri, 3 Nov 2023 12:50:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1699012238; bh=USsFpWtosQw0jiSzUqhY4+NKI7rSidpzXUdE3CTTKrA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=f92aWH9iP6TYrv1IqjkVrPBKLoyoZlinHgsYI/JKd7/cXny5sPtlwoXV92p9JAiGh xAGoCBE5XA7TbsZyF04LfQ7mA+W2yuaiMUSFUsWZ5E3eDydG5+izjwUqVoC+2RwF6h cXUjV0E3ER9Fmq27upoohU1qqkz7Hu2pQ6mzrxcx9cq6nDGsRclQ53cb6OZ5Z1koUp +lNdnnc60nY38mKABD0eG4Bo4QyQElvwBKI74il5ZL13nRJa7+4YrvBepqWTn2AaAw llOuEWmCjFpSc9WWlOHUCSuAAuMhuGQK0CYO5Ld06pHvF6Hg55gCXKrSLttz+BKSmr yQ1VWJcKjYYPg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SMJwF60JVz9rxS; Fri, 3 Nov 2023 12:50:37 +0100 (CET) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH v8 03/13] gnu: Update coq-gappa to 1.5.3. Date: Fri, 3 Nov 2023 11:50:11 +0000 Message-ID: <7563c243df77c1aa7603a2bfec9a762f51141a9d.1699012157.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 03 07:51:24 2023 Received: (at 64249) by debbugs.gnu.org; 3 Nov 2023 11:51:24 +0000 Received: from localhost ([127.0.0.1]:57145 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyshw-0008CS-Aj for submit@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:24 -0400 Received: from mout02.posteo.de ([185.67.36.66]:48269) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyshs-0008B9-44 for 64249@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:20 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id EEDC0240101 for <64249@debbugs.gnu.org>; Fri, 3 Nov 2023 12:50:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1699012239; bh=Jw3lcd3fwGlgSvEtz/83YRCQDBb4wJL8gc/SkZXJV5Q=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=rmQmIISkPqZPtGPuxCPVXqMleeKulVmkfJbpurX59kbm+IXPJHHrYYqnSRzt0UOCb krW3pw7YfvVpRsGD/bu3FI5UkO/1+jrOVuCTeXSXMtDmWHH9qn7wtV39RlV3t/aH4q a2K2xswyHORAAQryfxS77FgIWZII5DuT3OJqkRa/FA4gW/oThuy+GNGCDAn/A/0jhN CRCU9U0UeXxph3dDohTOaKAbUc9WTUIEEw+j+I0NC6F3yrguBbZHbXIWWiZCOCaT18 pW1oHmnxrb/CmFD846Wb3l3j846BEkHpE49H/yROvHP1IXvXOK6EnbAYME9/L/D+RC JaCZe7HTJP/bw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SMJwG3SP2z9rxB; Fri, 3 Nov 2023 12:50:38 +0100 (CET) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH v8 04/13] gnu: Update coq-coquelicot to 3.4.0. Date: Fri, 3 Nov 2023 11:50:12 +0000 Message-ID: <6997b83e29aa835e16030d13c82609df1f5e7df9.1699012157.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 03 07:51:25 2023 Received: (at 64249) by debbugs.gnu.org; 3 Nov 2023 11:51:25 +0000 Received: from localhost ([127.0.0.1]:57147 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyshw-0008Ca-N9 for submit@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:25 -0400 Received: from mout01.posteo.de ([185.67.36.65]:36203) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyshs-0008BA-ON for 64249@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:21 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 91872240027 for <64249@debbugs.gnu.org>; Fri, 3 Nov 2023 12:50:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1699012239; bh=6FOdUlmxEHICSNTr1g+TOa6TOJldBzoMc903jLchMvw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=hjCFbbS4PhwdJxINIrFM3hlc5KDMoUpN62oAdWEYU4zZjxN2zUloyYjQpET7RmDBl /FeQLreXadAnfhkeOIze35RWLqGh1r9gukB3B6amfBJxala3eX0dR02mVnhymhXsVt 3CzSJHyjEeO/wBbEUrvwm+rRi0+sr0Lm4js11awOS3idt+sWR6no02rU6SA83IDWKU 5izRpHmDJ1++lD7yyNk3+lmTLx1uT9vbuNE2VEc7bdBIsolb45gJ9qyvXI6ecjWMfM UuCfb5RxH4H+mJQtKus5C04cMyRgbZ52ssugXSGNqtCPImd1bbHjCFjUEBGYvKZ8EV wjAdAYzL4is0w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SMJwH13w1z9rxB; Fri, 3 Nov 2023 12:50:39 +0100 (CET) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH v8 05/13] gnu: Update coq-mathcomp to 1.17.0. Date: Fri, 3 Nov 2023 11:50:13 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 03 07:51:26 2023 Received: (at 64249) by debbugs.gnu.org; 3 Nov 2023 11:51:26 +0000 Received: from localhost ([127.0.0.1]:57151 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyshx-0008Ci-5A for submit@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:25 -0400 Received: from mout01.posteo.de ([185.67.36.65]:41365) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qysht-0008BD-WD for 64249@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:22 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id CE9BA240027 for <64249@debbugs.gnu.org>; Fri, 3 Nov 2023 12:50:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1699012240; bh=lYoZklyMBeerw17+BMpstr3oLoDOx1+bN5PZCYLO6ZA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=AO7DC+VzZcMhO4JT7TxlrLrJORCHokokr0krL5/EpiYd2PRHM2xagK/g1uiSgV5gb /b/HGHtUrXt3zgrwVy0TcAiUIG+35KFISRs3NJ1ElOdg4uTYr8i2zZ1JoiIOHhtRuK l7HGdLNgjVr59sK/onOn/UR/pbirDNMmhXsGQawHlxQhNKg9CW3DuCQco0BXcXPjJT 08H3JVH1BV80vj2cvCx24IEDL7r2P8Q8LvceIucFJZ6ua2Mrb97Txmy7THsCe27AQe FiooLBvzcBBbmFLknAJuqlCudhb4odKCux9+jlD6eCqIAoVp8Pt+ezZjuTlivGpJSY Gbgb373HdLDUQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SMJwJ2QNVz9rxB; Fri, 3 Nov 2023 12:50:40 +0100 (CET) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH v8 07/13] gnu: Update coq-stdpp to 1.8.0. Date: Fri, 3 Nov 2023 11:50:15 +0000 Message-ID: <0dcfa507073fd429a3120964f893234b7d71002b.1699012157.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 03 07:51:27 2023 Received: (at 64249) by debbugs.gnu.org; 3 Nov 2023 11:51:27 +0000 Received: from localhost ([127.0.0.1]:57157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyshx-0008Cs-Ve for submit@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:27 -0400 Received: from mout02.posteo.de ([185.67.36.66]:36523) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qysht-0008BC-Ch for 64249@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:22 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 3CB49240101 for <64249@debbugs.gnu.org>; Fri, 3 Nov 2023 12:50:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1699012240; bh=SgJKdMREMRQboQFtn+xDepNVKNrWZ6gNo1SAKIibcpM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=q9I9JJ+83jH58U2nFIS1g7l67dLsssdCtcX4uS22k4w9co91UPVbz7N5DWI4VjtTQ 8rNgHE5CYaFBIO0/gsVc7FV/zhQ7d7dvo8Iv3aw049qzrTT2A+BojdNi34P5LJltU3 LOmcoNTuxmiSzm8QoTdBShXMaPVIv90vm71I7ssYQhsHe5GfTyXbRmljlDgC3uwaLN i8nZwPL7EsDNcA6vLcdZFMRhSXdUYLcgqiixxECmIII2+3jETcQZh0YBUhJainwSSi c4lhqV8K4gafL6orbNkqwq7MGHb59I4EPJ8ZPBrNQcjiXDRoL2HOvJ8YC/Dds3eGmf o4jUHcTCVdBZQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SMJwH5ZHmz9rxD; Fri, 3 Nov 2023 12:50:39 +0100 (CET) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH v8 06/13] gnu: Update coq-autosubst to 1.8. Date: Fri, 3 Nov 2023 11:50:14 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 03 07:51:27 2023 Received: (at 64249) by debbugs.gnu.org; 3 Nov 2023 11:51:27 +0000 Received: from localhost ([127.0.0.1]:57161 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyshz-0008DC-2k for submit@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:27 -0400 Received: from mout01.posteo.de ([185.67.36.65]:51695) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyshu-0008BF-I6 for 64249@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:22 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 633D1240027 for <64249@debbugs.gnu.org>; Fri, 3 Nov 2023 12:50:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1699012241; bh=z7OGXUHqCkdk7ed6rmbCOwjX7roIWap9sNgsChFn4zU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=Jskwge2rXVcHlPBMDGPEihK6jLXYK0dGYJ7OZgZiDiky4lUAu2rqFceEAcohbrnWJ eZwn0MV7cZCHy9/ZBcp8BVDQoo8MnlLarNt7DFhQsUJQnYv5NNjszCYV7XdvdteF26 +xlf1mIoXu8Tyo4/nZnvlf8QPOhvikXrR2s91aGxGrH03iAyMg0uCiPhFtx7BOXlS9 tMHX4IL/dZOQj6rdZN5OZ/HK85/CdaYYjEcHrCH6TO0OKHoDYk9anSksuslnNK3ha2 eGWYq9GpebAxDQrjYX+FIa/f7CzKVcgVffUqYnkc3kJv+97rOmCwJFisfdL54bMyGn MCTxerFo2kXoQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SMJwJ6hVxz9rxB; Fri, 3 Nov 2023 12:50:40 +0100 (CET) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH v8 08/13] gnu: Update coq-interval to 4.8.0. Date: Fri, 3 Nov 2023 11:50:16 +0000 Message-ID: <9e225106621432067baacb0c46dd89188e25b6d4.1699012157.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 03 07:51:28 2023 Received: (at 64249) by debbugs.gnu.org; 3 Nov 2023 11:51:28 +0000 Received: from localhost ([127.0.0.1]:57163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyshz-0008DN-ND for submit@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:28 -0400 Received: from mout02.posteo.de ([185.67.36.66]:45485) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyshv-0008BH-WD for 64249@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:24 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id D013F240101 for <64249@debbugs.gnu.org>; Fri, 3 Nov 2023 12:50:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1699012242; bh=tGQR3L+v/G5BQGtPdw7fN7SSGK+sElr+br0RJHnZkSI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=VvaBLs6Q0NazuQfQAbhlWu7pzUSOwmzp5rKujg/0OhalKhMwobHsblYtJZuRiPSzZ hWtW7cOyjH70jSyKx94yPE1qh+GyucNtgEnxlTQgKf70fNRjmdABw8URSf0FSmpDwj 69RBTSfwDEP5hF0G6+5l329Qxk+eRcxByjS917HNui2bUkT2puAxFx2sqdQJ1hhrPB VM7iIRla+Rvk4TALMfJDSVibebMwfWBXN1H0hWyYlHnI9LykXcuti8QQjXo7HKaN92 BpOghZEsdNWRX/Yn5P6e9lkrEnQqkStrSOsxpGu9jewLbi0zO45ABfYX0rqkkCFtps /4YuJcwMX1K+w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SMJwL1jXcz9rxB; Fri, 3 Nov 2023 12:50:42 +0100 (CET) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH v8 10/13] gnu: dune-bootstrap: Update to 3.11.0. Date: Fri, 3 Nov 2023 11:50:18 +0000 Message-ID: <4c322edfe5a5fcd5e3d7da267a4ac05b160bdf03.1699012157.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 03 07:51:28 2023 Received: (at 64249) by debbugs.gnu.org; 3 Nov 2023 11:51:28 +0000 Received: from localhost ([127.0.0.1]:57165 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qysi0-0008DT-4a for submit@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:28 -0400 Received: from mout02.posteo.de ([185.67.36.66]:50791) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyshx-0008Ba-BF for 64249@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:26 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 2FB6E240103 for <64249@debbugs.gnu.org>; Fri, 3 Nov 2023 12:50:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1699012244; bh=fa+Gl0Htansr4gpnQGPKwGCmkrB2qkM0E9DrdgfRH6U=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=Vm7diS1/kiuhA9YyqsZjK6AR1YEd38cXIExXLCkWB7PWOV6iLCdiwdUIlJyFHQx4X 1aCWUXvnpsXKAKic06THQ85F3Ddf5gZGQg57j/u5dOtDE74efcsrGLegx5nreUBjqs pyWjCf4VXSQ81JzGHnLi3pM2Rwzmv+NFLkmzPG036OaiAl7naYwo9i9hV3j2im/8qw 6cCZGK4zhJ86g7mm5jznMl0FxnU0DF2I2ocqYVJN9tW8lpWrwY4hmLxo3wrkteWr6l VAvEIQxX7ElgSlB7JiVTKGEtdkBqNZOOCaHmo79sXdUZtHQwP3ivEz+Sc1vvjaa7Sb ZUkhXG/0WFfHQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SMJwM5KDtz9rxW; Fri, 3 Nov 2023 12:50:43 +0100 (CET) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH v8 12/13] gnu: ocaml-opam-file-format: Update to 2.1.6. Date: Fri, 3 Nov 2023 11:50:20 +0000 Message-ID: <5a2639c81a538d36cd7bf5f348e9ab200d038918.1699012157.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-opam-file-format): Update to 2.1.6. --- 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 eccc870c08..8fd2f2a3cf 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -821,7 +821,7 @@ (define-public ocaml-down (define-public ocaml-opam-file-format (package (name "ocaml-opam-file-format") - (version "2.1.4") + (version "2.1.6") (source (origin (method git-fetch) (uri (git-reference @@ -830,7 +830,7 @@ (define-public ocaml-opam-file-format (file-name (git-file-name name version)) (sha256 (base32 - "0dmnb1mqdy4913f9ma446hi5m99q7hfibj6j0m8x2wsfnfy2fw62")))) + "0s2wv92664prpsgc3fcrif72n1fyfp8pzw3ywlz47xkxh0qnkbr9")))) (build-system ocaml-build-system) (arguments `(#:tests? #f; No tests -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 03 07:51:29 2023 Received: (at 64249) by debbugs.gnu.org; 3 Nov 2023 11:51:29 +0000 Received: from localhost ([127.0.0.1]:57167 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qysi0-0008Dd-HS for submit@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:29 -0400 Received: from mout01.posteo.de ([185.67.36.65]:58737) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyshw-0008BT-P0 for 64249@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:26 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 1E901240027 for <64249@debbugs.gnu.org>; Fri, 3 Nov 2023 12:50:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1699012242; bh=jfiBOIU9SNMBr9VcSnfgUH4xxYTDc2NmOtp9J4UcAQQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=kg795uP9U/3pPaqO0LrUjHqLPTLIkAJo3FgC4DBQri9+AwQws9KSclLyBQdeimx0Y RwkJPqgn1P9h7O4aEgtDBGjkFE2BZgkhboUPzeWDtzBWsPAxBjnlI3NygG5Jy1IZrv eQaQDQncrH4QB6gmGKA5Uwbku+kaUP6mUH0WGt+QSDNgfnjpB+veOkQt9ys4cgKLjU BRK43ChvtfusDZZfCYkKPLRh9L3EIdCSClK9hx1+pKzj1CPo4EaPoVrotQCN/Tz8/V XgNF66U//oBgpyybRdKLNwYBIVUoX0VBPKKMI+/X27PhC21jvHarbzfqaFuEkQoaFj eVlh8pUDM3VBw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SMJwK3hb8z9rxB; Fri, 3 Nov 2023 12:50:41 +0100 (CET) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH v8 09/13] gnu: coq: Update to 8.17.1. Date: Fri, 3 Nov 2023 11:50:17 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard , Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 8d817379a7..22aeebc0b6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1041,7 +1041,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 - -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 03 07:51:32 2023 Received: (at 64249) by debbugs.gnu.org; 3 Nov 2023 11:51:32 +0000 Received: from localhost ([127.0.0.1]:57169 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qysi3-0008Dz-IV for submit@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:32 -0400 Received: from mout01.posteo.de ([185.67.36.65]:49473) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyshx-0008BW-0V for 64249@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:28 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id D3897240027 for <64249@debbugs.gnu.org>; Fri, 3 Nov 2023 12:50:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1699012243; bh=IytCOYO+KOwhQG8M+MdMYCPdsgSw7BH7Q/gqLSvhWsw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=DL3wekspSSWmD+M70spYkX/jnF/UqN2PbAvsZA2+SBCUqOBFu/JwKITwvtXcAaLQQ acfbXLGLcbmo4kmyPZyMjR8Sbt8kDhDQR4U6t0iSKeK73+4s4sELRsh3O7BG991ItA nlIiAtqLBRk/Gd2h+J/qt/aIH4LW2wA5Q5FjHXo8NHX5plsPfetBoEvG8Dsr1iqI+0 14iuXauvwEbUKoZUHYc5p1EXwrsE3kxd7MOdSubq70BRVk+OtvPz5BlhqXigrTtpJQ 1IUxaHocCyGfbraDfkiAxAehCp8gvqkkRIRSw7xd2NoyYs5vf6yduUx5NF6MwY+zDw 01mXqimVrYOpw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SMJwL6ymXz9rxX; Fri, 3 Nov 2023 12:50:42 +0100 (CET) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH v8 11/13] gnu: opam: Split build into smaller sub-packages. Date: Fri, 3 Nov 2023 11:50:19 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 03 07:51:33 2023 Received: (at 64249) by debbugs.gnu.org; 3 Nov 2023 11:51:34 +0000 Received: from localhost ([127.0.0.1]:57171 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qysi4-0008E2-P4 for submit@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:33 -0400 Received: from mout01.posteo.de ([185.67.36.65]:45089) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyshy-0008Bi-20 for 64249@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:28 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id DE124240027 for <64249@debbugs.gnu.org>; Fri, 3 Nov 2023 12:50:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1699012244; bh=Zribc0v+yHjolQpQaaQ7Sou3iHkwbJCRgS7ontzcg3w=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=FCNpaA0xsavo+Bo7Xeuf1WCCPM/wCqA2/vm3T91gTbYrxn4YEitCRNl8PqNuf1zcj gbnl7RoRtW6G1w9c9LgOOdZ2I+HZ/AlvHYIS+xsnU1YenS5+8VcnfOeWAQwid6pt2i QeSHanIlWXbH2gbBCp8BnGn192mF/yOwaizZ7IInUEKJqCMkRUI6QnM1SfHx2q/FTe QilivzlHjBGlg702a3bcdDqjuewa8Lkj+UxwXrzvdWxQEma4MVTydPpGL3y448VFX1 87M7pjR1Jil+wy3sw/ZOgSNEzSpJujI54zCSMJQd5XVyacWBuTriUz9rwy/ylUPfFe L6UotBQVQIc0w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SMJwN2Z7Lz9rxB; Fri, 3 Nov 2023 12:50:44 +0100 (CET) From: pukkamustard To: 64249@debbugs.gnu.org Subject: [PATCH v8 13/13] gnu: opam: Update to 2.1.5. Date: Fri, 3 Nov 2023 11:50:21 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 22aeebc0b6..5e5c948e68 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1691,10 +1691,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 8fd2f2a3cf..12c8d5c27d 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 08 17:20:35 2023 Received: (at 64249) by debbugs.gnu.org; 8 Nov 2023 22:20:35 +0000 Received: from localhost ([127.0.0.1]:46423 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0quV-00073h-98 for submit@debbugs.gnu.org; Wed, 08 Nov 2023 17:20:35 -0500 Received: from nanein.fr ([185.230.78.41]:42226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0o1h-00026c-4O for 64249@debbugs.gnu.org; Wed, 08 Nov 2023 14:15:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nanein.fr; s=mail; t=1699470899; bh=onr2yA6/z9cd5OJcLS7S9CldIGDHVOEoBG+A05PtT6k=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=LL+Lc5glsyYTWIrwJNhiTjPIhqb1LLP/j+rz+KJjL8Oy8Ut4bZ55EBG6N+Dxg7/3x TA9DfbzGCRih+ozbWFR5Jtde6o8YFXZdjpfHHVGPZnlX2sNqRPBImqh2JV0DE/P1pc 8HYp38McrZkcCZKZcPzcqBuMGqMckGrFq9ywf0KBylQWEwG+oAhZ4mXpJ8xAJQfDME lm2RPKzt0GqRY1Iw93N/82SNGmxIIDWzZbSFb9u8PunEhZ5pMe3pfaO99Dt0jM+Vto xBr8e3qx74Y0UdbTANsRlZ3EmyJTOzJebmkpECZM2ycUzzEjnbLarHr77OIQut8qyG 6RWYRsqn5tl4U4ri9N4x+qm3CKKBs7+y+9xG5HO5vqvxhVDoN+FozLxGNuymyXxekK kVwiSbFAxncVRvNZqTngtPS/H9XisCqpPE8m4vvETlbrQYfXtGzeeZM1JkrF5PF/53 lxVMJwof7YCQnZUOTGBQnckPTAC51uMwkyk2t5F9iDhEtReou/QUjGZaeCuE2sny5y HRYD0GtzyDdThBPs+MFlIi6mqgvrrIkeI+NRPwWDD0jfMvib9rrNUy6K/Zt1mgVYcv ZXE3Wpgg3WT93RBHgWZo3qI/KVJS6Mku97jxLkhBeh7zHTyd12dIKp8y7lTzPKA6dw Xb1CLZhTQIo5a99BQlfkdbNQ= Received: from Arnaud (6.17.61.188.dynamic.wline.res.cust.swisscom.ch [188.61.17.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by nanein.fr (Postfix) with ESMTPSA id 425FF1401F5; Wed, 8 Nov 2023 20:14:59 +0100 (CET) Date: Wed, 8 Nov 2023 20:14:53 +0100 From: DABY-SEESARAM Arnaud To: pukkamustard Subject: Re: [bug#64249] [PATCH v8 13/13] gnu: opam: Update to 2.1.5. Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="1hVIeNX3usid+aq1" Content-Disposition: inline In-Reply-To: X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 X-Mailman-Approved-At: Wed, 08 Nov 2023 17:20:27 -0500 Cc: 64249@debbugs.gnu.org, DABY-SEESARAM Arnaud X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --1hVIeNX3usid+aq1 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, After applying V8 series, I could build - all packages starting by "coq", - all packages starting by "ocaml" which do not start by "ocaml4.07". (I used the guile function `fold-packages` to check this). Some packages still fail to build. - At least some ocaml4.07* packages are broken. I have not looked at them, as some of them seem to be broken on master=20 as well. - why3 was broken. Upgrading it to 1.6.0 fixes it. - frama-c was broken. This too could be fixed by upgrading frama-c. The build process of frama-c has changed between the last packaged=20 version (24.0-Chromium) and the current one (27.1-Cobalt). I was able to get frama-c 27.1 to build by switching from=20 ocaml-build-system to dune-build-system and adding a few new=20 dependencies. Although it is not very satisfying yet, as I had to=20 disable tests for some of these dependencies. I can send you my additional patches to complete the V8 series if you=20 wish. Best, --=20 ds-ac Le Fri, Nov 03, 2023 at 11:50:21AM +0000, pukkamustard a =E9crit > * 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.p= atch > 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 >=20 > diff --git a/gnu/local.mk b/gnu/local.mk > index 22aeebc0b6..5e5c948e68 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1691,10 +1691,6 @@ dist_patch_DATA =3D \ > %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.patc= h \ > %D%/packages/patches/ocaml-4.09-dynamically-allocate-signal-stack.patc= h \ > diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm > index 8fd2f2a3cf..12c8d5c27d 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=3D" > - #+(file-append (canonical-package bash-mi= nimal) > - "/bin/sh"))) > - #:make-flags > - ,#~(list (string-append "LIBDIR=3D" #$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 f= or > @@ -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") "r= un true") > ;; Disable a failing test, probably because the repositor= y 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) > =20 > ;; Data for tests > - ("opam-repo-009e00fa" ,(opam-repo "009e00fa86300d11c311309a2544= e5c6c3eb8de2" > - "1wwy0rwrsjf4q10j1rh1dazk32fb= zhzy6f7zl6qmndidx9b1bq7w")) > - ("opam-repo-7090735c" ,(opam-repo "7090735c9d1dd2dc481c4128c5ef= 4d3667238f15" > - "1bccsgjhlp64lmvfjfn6viywf3x7= 3ji75myg9ssf1ij1fkmabn0z")) > - ("opam-repo-a5d7cdc0" ,(opam-repo "a5d7cdc0c91452b0aef4fa71c331= ee5237f6dddd" > - "0z7kawqisy07088p5xjxwpvmvzlb= j1d9cgdipsj90yx7nc5qh369")) > - ("opam-repo-ad4dd344" ,(opam-repo "ad4dd344fe5cd1cab49ced49d675= 8a9844549fb4" > - "1a1qj47kj8xjdnc4zc50ijrix1ky= m1n7k20n3viki80a7518baw8")) > - ("opam-repo-c1d23f0e" ,(opam-repo "c1d23f0e17ec83a036ebfbad1c78= 311b898a2ca0" > - "0j9abisx3ifzm66ci3p45mngmz4f= 0fx7yd9jjxrz3f8w5jffc9ii")) > - ("opam-repo-f372039d" ,(opam-repo "f372039db86a970ef3e662adbfe0= d4f5cd980701" > - "0ld7fcry6ss6fmrpswvr6bikgx29= 9w97h0gwrjjh7kd7rydsjdws"))))) > + ("opam-repo-0070613707" > + ,(opam-repo "00706137074d536d2019d2d222fbe1bea929deda" > + "1gv1vvmfscj7wirfv6qncp8pf81wygnpzjwd0lyqcxm7g8r8l= b4w")) > + ("opam-repo-009e00fa" > + ,(opam-repo "009e00fa86300d11c311309a2544e5c6c3eb8de2" > + "1wwy0rwrsjf4q10j1rh1dazk32fbzhzy6f7zl6qmndidx9b1b= q7w")) > + ("opam-repo-7090735c" > + ,(opam-repo "7090735c9d1dd2dc481c4128c5ef4d3667238f15" > + "1bccsgjhlp64lmvfjfn6viywf3x73ji75myg9ssf1ij1fkmab= n0z")) > + ("opam-repo-a5d7cdc0" > + ,(opam-repo "a5d7cdc0c91452b0aef4fa71c331ee5237f6dddd" > + "0z7kawqisy07088p5xjxwpvmvzlbj1d9cgdipsj90yx7nc5qh= 369")) > + ("opam-repo-ad4dd344" > + ,(opam-repo "ad4dd344fe5cd1cab49ced49d6758a9844549fb4" > + "1a1qj47kj8xjdnc4zc50ijrix1kym1n7k20n3viki80a7518b= aw8")) > + ("opam-repo-c1842d168d" > + ,(opam-repo "c1842d168de956caf06d7ac8588e65020d7594d8" > + "142y1ac7sprygyh91shcp0zcyfxjjkshi9g44qgg4rx60rbsb= hai")) > + ("opam-repo-c1d23f0e" > + ,(opam-repo "c1d23f0e17ec83a036ebfbad1c78311b898a2ca0" > + "0j9abisx3ifzm66ci3p45mngmz4f0fx7yd9jjxrz3f8w5jffc= 9ii")) > + ("opam-repo-f372039d" > + ,(opam-repo "f372039db86a970ef3e662adbfe0d4f5cd980701" > + "0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsj= dws")) > + ("opam-repo-11ea1cb" > + ,(opam-repo "11ea1cb6f2418b1f8a6679e4422771a04c9c3655" > + "1s4p0wfn3bx97yvm8xvj3yhzv2pz0jwml68g2ybv37hj9mpbr= sq0")) > + ("opam-repo-297366c" > + ,(opam-repo "297366cd01c3aaf29b967bf0b34ccc7989d4d5b3" > + "1ysg69gys37nc2cxivs2ikh6xp0gj85if4rcrr874mqb9z12d= m0j")) > + ("opam-repo-3235916" > + ,(opam-repo "3235916a162a59d7c82dac3fe24214975d48f1aa" > + "1yf73rv2n740a4s9g7a9k4j91b4k7al88nwnw9cdw0k2ncbmr= 486")) > + ("opam-repo-de897adf36c4230dfea812f40c98223b31c4521a" > + ,(opam-repo "de897adf36c4230dfea812f40c98223b31c4521a" > + "1m18x9gcwnbar8yv9sbfz8a3qpw412fp9cf4d6fb7syn0p0h9= 6jw"))))) > (inputs (list ocaml-opam-client)) > (properties > ;; OPAM is used as a tool and not as a library, we can use the OCam= l 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))) > =20 > +;; A variant without tests that is used to prevent a cyclic dependency w= hen > +;; 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 =3D Lexing.lexeme_char lexbuf 2 in (* the delimiter can be an= y character *) > - (* find the terminating delimiter *) > - let endpos =3D > -- 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 =3D endpos - (lexbuf.lex_start_pos + 3) in > -- let s =3D String.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) l= en in > -- lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((Strin= g.length s)+4); > -- s > -+ let s =3D Bytes.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) le= n in > -+ lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((Bytes= =2Elength s)+4); > -+ Bytes.to_string s > -=20 > - } > -=20 > -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) = =3D struct > - let clean label =3D > - try=20 > - let s =3D Filename.chop_extension (Filename.basename label) in > -- String.capitalize s > -+ String.capitalize_ascii s > - with Invalid_argument _ -> label > -=20 > - let create ?(enabled=3Dfalse) label =3D > ---=20 > -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 > -=20 > -@@ -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 > -=20 > -@@ -78,7 +78,7 @@ $(DOSELIBS)/versioning.%: versioning/*.ml versioning/*= =2Emli > - if [ -e $$i ]; then \ > - cp $$i $(DOSELIBS) ; \ > - rm $$i ;\ > -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ > -+ rm -f $(DOSELIBS)/*.mlpack ; \ > - fi ; \ > - done > -=20 > -@@ -88,7 +88,7 @@ $(DOSELIBS)/algo.%: algo/*.ml algo/*.mli $(DOSELIBS)/c= ommon.% > - if [ -e $$i ]; then \ > - cp $$i $(DOSELIBS) ; \ > - rm $$i ;\ > -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ > -+ rm -f $(DOSELIBS)/*.mlpack ; \ > - fi ; \ > - done > -=20 > -@@ -98,7 +98,7 @@ $(DOSELIBS)/debian.%: deb/*.ml deb/*.mli $(DOSELIBS)/p= ef.% > - if [ -e $$i ]; then \ > - cp $$i $(DOSELIBS) ; \ > - rm $$i ;\ > -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ > -+ rm -f $(DOSELIBS)/*.mlpack ; \ > - fi ; \ > - done > -=20 > -@@ -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 > -=20 > -@@ -118,7 +118,7 @@ $(DOSELIBS)/npm.%: npm/*.ml npm/*.mli $(DOSELIBS)/ve= rsioning.% $(DOSELIBS)/pef.% > - if [ -e $$i ]; then \ > - cp $$i $(DOSELIBS) ; \ > - rm $$i ;\ > -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ > -+ rm -f $(DOSELIBS)/*.mlpack ; \ > - fi ; \ > - done > -=20 > -@@ -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 > -=20 > -@@ -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 > -=20 > -@@ -148,7 +148,7 @@ $(DOSELIBS)/csw.%: opencsw/*.ml $(DOSELIBS)/versioni= ng.% > - if [ -e $$i ]; then \ > - cp $$i $(DOSELIBS) ; \ > - rm $$i ;\ > -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ > -+ rm -f $(DOSELIBS)/*.mlpack ; \ > - fi ; \ > - done > -=20 > -@@ -158,7 +158,7 @@ $(DOSELIBS)/doseparse.%: $(DOSELIBS)/pef.% $(DOSELIB= S)/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 > -=20 > -@@ -168,7 +168,7 @@ $(DOSELIBS)/doseparseNoRpm.%: $(DOSELIBS)/pef.% $(DO= SELIBS)/debian.% > - if [ -e $$i ]; then \ > - cp $$i $(DOSELIBS) ;\ > - rm $$i ;\ > -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ;\ > -+ rm -f $(DOSELIBS)/*.mlpack ;\ > - fi ; \ > - done > -=20 > -@@ -223,7 +223,7 @@ INSTALL_STUFF_ =3D META > - INSTALL_STUFF_ +=3D $(wildcard _build/doselibs/*.cma _build/doselibs/*.= cmi) > - INSTALL_STUFF_ +=3D $(wildcard _build/doselibs/*.cmxa _build/doselibs/*= =2Ecmxs) > - INSTALL_STUFF_ +=3D $(wildcard _build/doselibs/*.a) > --#INSTALL_STUFF_ +=3D $(wildcard _build/*/*.mli) > -+INSTALL_STUFF_ +=3D $(wildcard _build/doselibs/*.mli) $(wildcard _build= /doselibs/*.cmti) $(wildcard _build/doselibs/*.cmx) > - INSTALL_STUFF_ +=3D $(wildcard _build/rpm/*.so) > -=20 > - exclude_cudf =3D $(wildcard _build/doselibs/*cudf* _build/cudf/*) > ---=20 > -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 =3D "@PACKAGE_VERSION@" > - archive(byte) =3D "common.cma" > - archive(native) =3D "common.cmxa" > --requires =3D "extlib, re.pcre, cudf, @ZIP@, @BZ2@" > -+requires =3D "extlib, re.pcre, cudf, unix, @ZIP@, @BZ2@" > - ) > -=20 > - package "algo" ( > ---=20 > -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 "$enabl= e_option_checking" !=3D no; then > - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized option= s: $ac_unrecognized_opts" >&5 > - $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts"= >&2;} > - fi > -- > -- > --make printconf > --=20 > 2.41.0 >=20 >=20 >=20 >=20 --1hVIeNX3usid+aq1 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEMgqfJ4U0fby1t860ojLKXoMTiAwFAmVL3i0ACgkQojLKXoMT iAwm2Q//STwE8RsxllEcIpV/BEl+Pp6rGqURCLyqwil7Bhcf0f8ks8tygC+3yhVX TRgwHGMD9GfSUUU6e/QlFzaF8DxDEion0zLOYm3aBXtXy9Yo7kQf2RkG6pgJyMVZ CEYq0V34c1L7aKRvjvxg63e6CMUmiGmo7hOoXTPZLEqYCRKjRucdWOsBgkMV5pA6 LB6UPkUliiFaUUJX1H/JYpAaiA3TpxykrmT0twGnIWUBPsOvd0r5dbchOzxL2dp3 6BZsJ/kLFfHeriKt3mH6BGEnvIDgEhd2k4MmKyN/dM1+QK3zseWrROqG+Fx9YbVt hm4o7NDFFnKN84bLkmG+cR7KbPPzLLeO/UNyZ9yXOhUg8X5LNeDNWt8xZwn8Id/x bHz/8KpCMXC5biT8nipAA2ht7QRH+z3BlBQrH5yjGinCe1HVaSov/IBimya0Nbcq 7hO0WctAWFw/GoW4tvGi5/zah02NsLGGHhIl1AjzJ4qsua9nM+NA2vkps8TydODb ktzDkT39/OE7X/9BEzz4jv7RTgQf9m6YiMJ9HQV/jQK1mSq5Nhqrppn2jkchogMW +nOqW0+TcFAyswGMQtgNzK9X+Qf3VjrPt7GNkZFSHPZ/7P0abDZUT32V7VDAVbB+ HefIAUzi/f5R3TwK+8Ell5B2y2eB4IdV2ufe4gQaqNdSiZv3aSE= =/U7Y -----END PGP SIGNATURE----- --1hVIeNX3usid+aq1-- From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 24 02:23:38 2023 Received: (at 64249) by debbugs.gnu.org; 24 Dec 2023 07:23:38 +0000 Received: from localhost ([127.0.0.1]:51647 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHIpm-0004Fx-6x for submit@debbugs.gnu.org; Sun, 24 Dec 2023 02:23:38 -0500 Received: from nanein.fr ([185.230.78.41]:48438) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rH6Bf-000216-Vz for 64249@debbugs.gnu.org; Sat, 23 Dec 2023 12:53:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nanein.fr; s=mail; t=1703353992; bh=J7zH5p94bWHNw+aw/IYqr3vkDG+xLiE97IIMp8sGBhI=; h=Date:From:To:Cc:Subject:From; b=AGct9t+txz942pV8lr/72sCwqBdOPATdgleem/4gT9HYwlobK/zkYLMEOg6HlfL71 i9Zs3OmvoyMjn3+bKBu/l1rkIz5xDptnGQjtAwBk8+gFXC4gH/ySJup1g3BAiokJeB q/7Zn0YO0ZxQjaQJsmfLI9M/JCHHLHWAWJf4Wf5ivEC8XlaiPWilAmR7A40wB3bHlO r/rH/M/gyOFn0GVPD/Ia7Wi0OCQiBJk+x35Xf1rn4ofQv9GUqc4Gb0vXTWV2tokcJ7 hFAzmjSntnJoy6n5ha1RxZ2uhTfzY1aHooGtyHdHYYISwzb/3SrKKv+SRQHefn22jt VhQ7fijk7M3QK/oxjvGUGrdh6S7mpRdBC+PzoQ9jvVTMoxA6LGz/ghLD5LQm7HDDGm 9oA/ZDNv6KUgGQ5+vGQaxvj41IJuw2gtCV8252NSqoCGfbIDG2SDERsO/QkbNtWXWh SLHZXJcfYmYDJWH/pbg/DHIQwwEntyIbfOnnwAU2W/LsEF3cugzNT2WPivDeoZFxK7 24XisA0dq8ncrniu6vek7zCpiPbxs+l7j4kkbEw718G89aoR46FVgqEIZ0BcNkhlrN 4e1LuI6S0ipjc3zWKt/NKnWMIqI5U7mvwrndasInd+f0UDyn1duFtnGfjMX25aJy6x 5A7foAl4TcPNV9NudLVlzsz8= Received: from Arnaud (unknown [IPv6:2a01:e0a:a9e:a4c0:9d01:2b7b:5834:e51]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by nanein.fr (Postfix) with ESMTPSA id B33A01401EE; Sat, 23 Dec 2023 18:53:11 +0100 (CET) Date: Sat, 23 Dec 2023 18:53:03 +0100 From: Arnaud Daby-Seesaram To: 64249@debbugs.gnu.org Subject: OCaml-related updates Message-ID: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="WouVKPsICJo2WLB+" Content-Disposition: inline X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 X-Mailman-Approved-At: Sun, 24 Dec 2023 02:23:37 -0500 Cc: pukkamustard@posteo.net, ds-ac@nanein.fr, Josselin Poiret , Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --WouVKPsICJo2WLB+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, Just a gentle ping to get your opinions on ocaml4.07. Should Guix keep=20 support for it? (With current Guix, (at least some) ocaml4.07 packages=20 are already broken.) If not, is it possible to move forward with pukkamustard's patch series=20 (optionally after updating why3 and frama-c to limit broken packages)? =20 This would also enable other ocaml-related contributions, such as 67495,=20 66119, 64209, ... which might need adjustments after the update of=20 dune. Best regards, --=20 ds-ac --WouVKPsICJo2WLB+ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEMgqfJ4U0fby1t860ojLKXoMTiAwFAmWHHn4ACgkQojLKXoMT iAxkLw//aAY+LWQURSuSqkk0LPcHDjKxZtQSPceFmZulLdPgIL5AAhM5mVsqY0ad b19++MvoWrlT49O3FY3fMxjvv23P4kEnpooux19Ce7i9IYplsfwowK0gXZhnBOuD kv7nlYjIAwyS35G4AiAIWzlMVhBYPWORw+aLaZmwfnMi01ihkW/hxISNi0zYhx/P UgBq9MtM+9wIMQja7WR0zTBBv53KQHtCoDc37YOlHJDqV4ozv9Xl7+A0dPuXLWWU lxR6gMyY7VTf2B0+5QAMAI5Z6Ubac2azv3/fHUnWbKK3/d2EyIQPGtqkTCK5gIPb W6ryIWZw+aC6b2EQ9ZFp+7DljatUcfapHYPfAxB1KxsdWSs+klj3nyvqqlSpE8t5 6/Kq1JH+/w9vqL54wO/tcpovjqog4QTrS5ANst2OSr58eP/lkF00X7KhEUILGgJp pCxZnpFxhDPxJVpq70kq4SiXnIRL0/pXNNrAOX2be22T2J3FY3Lol1f/3LHTszkV QKRr0uY6LtjOCVy8ENIAo65ardo7Xe5OeuwlvaydxLPM553cxzBA+kY+ljYyWuRG gklZlm8qTrQAfLccSWJN4UGkPd1hnsx1+iE8sxKlF4H28GNbqh8P8wgJUIE01rVW D2Ae6B6f+a8ontLGC9E1Cjfl8I7LVGn4mxeaRBvLetRylxmmNv8= =8mjm -----END PGP SIGNATURE----- --WouVKPsICJo2WLB+-- From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 24 08:07:48 2023 Received: (at 64249) by debbugs.gnu.org; 24 Dec 2023 13:07:48 +0000 Received: from localhost ([127.0.0.1]:51790 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHOCp-0006Zy-Ny for submit@debbugs.gnu.org; Sun, 24 Dec 2023 08:07:48 -0500 Received: from lepiller.eu ([89.234.186.109]:60728 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHOCm-0006Zm-Et for 64249@debbugs.gnu.org; Sun, 24 Dec 2023 08:07:46 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 1c2d2a8f; Sun, 24 Dec 2023 13:07:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=acJ0QsZEa/2X 4hhIlxz114WGvDr8AvKcBUMx8v3cYtw=; b=hM5XdCwmXA0+/Pv1Et2tn/CrwJZi S0kOM/uiP50ry0uxfoIW063LcvGL7eceXOJUVl0QtgyeM1NbLAKMP9uJPQW/wRhP nBRUir2183rX2qxjKLVz7+yh/2No449zjVa4HnI1Y/xRVX6MCcnHOqGPkV7F6ALn e5gR8zoG9zQs80Hubw4MM52aPRglQm+wbzFpj7V+g1XM8hsKoUEATKsq931P8Pl2 c8NrB/ZWxcurNua8dF4BjxIksHH/W3C4ZNME06qemfC4iU8S/hicEglB/EpJzhLq pgmQ3M02K91rX4v7yP/6Q3un8wKsGOdiG8bxPc2vjhuveMN7+nSJuzwQwQ== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 61dcbcdb (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 24 Dec 2023 13:07:35 +0000 (UTC) Date: Sun, 24 Dec 2023 14:07:32 +0100 From: Julien Lepiller To: Arnaud Daby-Seesaram Subject: Re: OCaml-related updates Message-ID: <20231224140732.4467c1fa@tachikoma.lepiller.eu> In-Reply-To: References: X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard@posteo.net, 64249@debbugs.gnu.org, Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le Sat, 23 Dec 2023 18:53:03 +0100, Arnaud Daby-Seesaram a =C3=A9crit : > Hi, >=20 > Just a gentle ping to get your opinions on ocaml4.07. Should Guix > keep support for it? (With current Guix, (at least some) ocaml4.07 > packages are already broken.) We plan to remove ocaml4.07* packages (except ocaml itself since it represents the first step for a future bootstrap). Since most of them are already failing, we shouldn't care too much about that. At laest, we're not breaking them *more* ;) >=20 > If not, is it possible to move forward with pukkamustard's patch > series (optionally after updating why3 and frama-c to limit broken > packages)? This would also enable other ocaml-related contributions, > such as 67495, 66119, 64209, ... which might need adjustments after > the update of dune. Please send your patches to prevent frama-c breakage. I have already done some work to fix other packages, but it' on another computer. I'll be able to send a (final?) version early January. In the meantime, I will send a series to remove ocaml4.07 packages, since they're no longer of any use, obsolete and mostly broken anyway. It should be independent of this series. Note that the right way to discover impacted packages is with `guix refresh -l ocaml@4`. >=20 >=20 > Best regards, >=20 From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 24 11:46:35 2023 Received: (at 64249) by debbugs.gnu.org; 24 Dec 2023 16:46:35 +0000 Received: from localhost ([127.0.0.1]:53415 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHRcZ-0001IQ-0i for submit@debbugs.gnu.org; Sun, 24 Dec 2023 11:46:35 -0500 Received: from nanein.fr ([185.230.78.41]:38330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHRcV-0001FQ-H6 for 64249@debbugs.gnu.org; Sun, 24 Dec 2023 11:46:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nanein.fr; s=mail; t=1703436379; bh=HRl2Ko13kEYf0CW5diLww+DgBgQLR0ix7YgRDueOYPc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AjeThcgoFXhJSSqfn7szKhl28S1mPT/KSM3d7oGc+9plCozXR6WkKaYYrd6sW5ZhG 0DE1H9Jt/BuBTn0QVExoZQyKUPFMd1zROuxalawK5DYWAZSwXZ6HWBvK7UtxU9PkZ8 vWVQByCIgctsplYctSTerRjwsiI/MtkN+8sp6rX2/2GMqZgPWDUQgaAyxUE+LM+SPW QTJ5NIb/BhImLZEYPkNQb6b+3n+k3dJqu2WJebg+7+A/LvydE1TI6g2shFkUTOK0jo r35fVSWZaohZiGqYVrovOU/Ap3caggitGx1Nw418qvAxVEb25wJQHAcBVgf0tHisXe PWiNXUMrtQzGizevIaVkmhaG1W88yGSgmN55DAQpPSE4Wlz7wCfvmzZgu0XhJBJDd1 R8jpDjO+VQXS013UfNR+QvaSsd6HMTVPNm5hD/dpYUW2OhcW4eL4LQt21E/Rfznp4J WOrPo+WaNEeO19guu+FXO0bbx2gTKiSYceDGxp70Q6KvhAHWDaDe/ILX14HyxlO9Ye jkEnD3PC9l5OUZtOI4MWfERpA6y3OM60PbDBB2pYmFZ8xRREhxV7N7SNV4mmUfbuQt DvrBYOKeUQpAvMTALcx41ii1jLv8LcXYd+207axmXVUHjYbTj9ZvyIB4TiFASb9LcN FrmHXBSKyAQRClm6/rBMow68= Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:a9e:a4c0:9d01:2b7b:5834:e51]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by nanein.fr (Postfix) with ESMTPSA id 64F161401EE; Sun, 24 Dec 2023 17:46:18 +0100 (CET) From: ds-ac@nanein.fr To: 64249@debbugs.gnu.org Subject: [PATCH 0/9] Fix frama-c Date: Sun, 24 Dec 2023 17:43:35 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231224140732.4467c1fa@tachikoma.lepiller.eu> References: <20231224140732.4467c1fa@tachikoma.lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard@posteo.net, Arnaud Daby-Seesaram , Josselin Poiret , Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Arnaud Daby-Seesaram This patch series is built on top of 8b5b9fc21ea504eb5d226546884db2ebc6287b7d from https://git.guix-patches.cbaines.net/guix-patches/. It: - updates Why3 (the non-trivial diff comes from `guix style` changes). - adds new dependencies of frama-c. These definitions come from the Guix importer for opam, with small edits. I had to disable checks for two of them. Note: tests are disabled for similar Guix packages and are not run by opam. - updates frama-c to its latest stable version. I switched the package to dune-build-system. Arnaud DABY-SEESARAM (9): gnu: why3: Update to 1.6.0. gnu: Add ocaml-ppx-deriving-yojson. gnu: Add ocaml-junit gnu: Add ocaml-junit-alcotest gnu: Add ocaml-yaml gnu: Add ocaml-ppx-deriving-yaml. gnu: Add ocaml-ppx-import. gnu: Add ocaml-dune-site. gnu: update frama-c to 27.1-Cobalt. gnu/packages/maths.scm | 145 +++++++++++++++++++------------------- gnu/packages/ocaml.scm | 154 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 229 insertions(+), 70 deletions(-) base-commit: 8b5b9fc21ea504eb5d226546884db2ebc6287b7d -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 24 11:46:38 2023 Received: (at 64249) by debbugs.gnu.org; 24 Dec 2023 16:46:38 +0000 Received: from localhost ([127.0.0.1]:53417 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHRcc-0001Ib-Bj for submit@debbugs.gnu.org; Sun, 24 Dec 2023 11:46:38 -0500 Received: from nanein.fr ([185.230.78.41]:38338) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHRcY-0001I0-9N for 64249@debbugs.gnu.org; Sun, 24 Dec 2023 11:46:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nanein.fr; s=mail; t=1703436382; bh=fHR5Kuq8/1tPdpNp02+s0fOECJToxnHrqzKG6PrgfzM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A1NG8JklyQllwG73o3RjdOUBGqkH725IY3uYcTHIyEHMMtQPwc+Qqs+SijevazEy4 LXUl1bNhaouezYHp/px8UDM6KOTw6lBY6rc54/kHo/Apu1p+4BAdlgx3z1SiQH81eC K1/TzZ0wJH/bElGa3zV3NGTIXLTI16TNVgx8QERCaF+G8GMsKiLDjlJFr/7lI+oQ61 inkp8mH/abtwxFLsN9qLejU37WqkMoxKia4MRgTKvnhSMUMIesk5CTA/9x/mJJlcBH NfmCN5srzBdnYE4MdWlOECn5rCj7gERczqFAC2+FAQ3JSSGtrw6wG0Jd9gN4TlR8MX TH5fOb7E1iV4x1szM0NK14ZcFJ0FrdpW3QwgKGJIBHIg6agFJvzayN38q8Ik1/uVLI SxBjNYqnefxkhv6t1T4mtpdY6T0o6g/+WXISYqH4eH3DfdORUWuYasPrxBpbh7yCwz 7IVAZqB8QHj1gx7uCQsNVjLTI+iTC8nk+BDvi3Cx9HD0uiAH/qme5kfAfTTZv5g3pJ 9uJQONfNTRDyBeR2EYeBc7vEEVCK/XUaSprFTlLYab+8j/6NseE40bPtbDHM9QfeXP JSpEn+aGR+LJjuP9G8sax+U6wpC9JlmSyycHSU31Lx/1iZDXlj2ejSGWymigIs7+lD YOV4ZGXU7PXlTxsR5k468qJU= Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:a9e:a4c0:9d01:2b7b:5834:e51]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by nanein.fr (Postfix) with ESMTPSA id 1429C140243; Sun, 24 Dec 2023 17:46:21 +0100 (CET) From: ds-ac@nanein.fr To: 64249@debbugs.gnu.org Subject: [PATCH 4/9] gnu: Add ocaml-junit-alcotest Date: Sun, 24 Dec 2023 17:43:39 +0100 Message-ID: <0fc595423dec08344ea74a378141c2a68af48487.1703436224.git.ds-ac@nanein.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231224140732.4467c1fa@tachikoma.lepiller.eu> References: <20231224140732.4467c1fa@tachikoma.lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard@posteo.net, Arnaud DABY-SEESARAM , Josselin Poiret , Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Arnaud DABY-SEESARAM * gnu/packages/ocaml.scm (ocaml-junit-alcotest): New variable. Change-Id: I377bbba90e8625a47680643db2ef84fabbe60908 --- gnu/packages/ocaml.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f664f6db81b..b14f69cae1d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1666,6 +1666,24 @@ (define-public ocaml-junit (description "JUnit XML reports generation library") (license #f))) +(define-public ocaml-junit-alcotest + (package + (inherit ocaml-junit) + (name "ocaml-junit-alcotest") + (propagated-inputs (list ocaml-odoc ocaml-alcotest ocaml-junit)) + (build-system dune-build-system) + (arguments + `(#:package "junit_alcotest" + #:tests? #f ;Check fails + #:phases (modify-phases %standard-phases + (add-before 'build 'dune-subst + (lambda _ + (invoke "dune" "subst") #t))))) + (properties `((upstream-name . "junit_alcotest"))) + (synopsis "JUnit XML reports generation for alcotest tests") + (description "JUnit XML reports generation for alcotest tests") + (license #f))) + (define-public camlzip (package (name "camlzip") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 24 11:46:39 2023 Received: (at 64249) by debbugs.gnu.org; 24 Dec 2023 16:46:39 +0000 Received: from localhost ([127.0.0.1]:53419 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHRcc-0001Id-O8 for submit@debbugs.gnu.org; Sun, 24 Dec 2023 11:46:39 -0500 Received: from nanein.fr ([185.230.78.41]:38332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHRcV-0001GQ-Qu for 64249@debbugs.gnu.org; Sun, 24 Dec 2023 11:46:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nanein.fr; s=mail; t=1703436380; bh=DNHQAJZ1TWGYGxeQ26DphKVDXhXWOIvhDr3jGDc3Eu8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sY7z1h6B8ugTrtG9RYOC60jOTo2Kk4MvE0o6YtKRJ+HlvxpdIVbtKoK0JelLoCD8H CYz2yKzFKB0+OVA+YrldMNx2C/q4aY2EWpwckKaYA61yTjc4oE7RPMk1+8kyJBAGw3 oaK1/a8N8IgrjHDdruT5i/8Jk9umcwU/b9zmZ4OkBBXgLvajipEUiDdlTe4WWSie78 1Bfa+uEvS/O+YoA+aR22LfAjeE7P1nW+EGIOLcitVKpY0tMkZxR61Tg9lr6eecmoKZ G8pOTLi9xzc+csW2g5mP+6J9NsiqsXcVSV59tDIiMFpjWpPNRLLuu5Gpj9uLe/RIjW pWXdUnnfNNl3gXdRSdNBOu9KWqjOaqCYvcVvyGXnoh2fpPSU2jBYeCvJbzpm9g2J+D ZMl7jDgIPjB67gHEbf9r9LtwbusKM5MXNDACFvA7UAHoKbMqA45Wy+iSPHCGOY4onR 9VZe4otXiJiyJgZBj5+NYKbeslbSR20kkD0WPD4cFMbcj990awRRo99WE6cUD0gcza KF7YyHICQeiPqRuprr8z6Mw0ACcA9OVKguVTMXZipr9gjo9x148EJRoOTA/TtKzhDv pl9SmcK9B0s30WiCbKH4zyS3D7+5cJqFGSfiHHYMncawp/CNCSebtnWkdH+JcGw8ld +xH7tvlvlGvR5/n2fiql8saE= Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:a9e:a4c0:9d01:2b7b:5834:e51]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by nanein.fr (Postfix) with ESMTPSA id A7C3D140211; Sun, 24 Dec 2023 17:46:19 +0100 (CET) From: ds-ac@nanein.fr To: 64249@debbugs.gnu.org Subject: [PATCH 2/9] gnu: Add ocaml-ppx-deriving-yojson. Date: Sun, 24 Dec 2023 17:43:37 +0100 Message-ID: <4e55d427dcd30dc164b996abc3c9b78e05469026.1703436224.git.ds-ac@nanein.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231224140732.4467c1fa@tachikoma.lepiller.eu> References: <20231224140732.4467c1fa@tachikoma.lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard@posteo.net, Arnaud DABY-SEESARAM , Josselin Poiret , Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Arnaud DABY-SEESARAM * gnu/packages/ocaml.scm (ocaml-ppx-deriving-yojson): New variable. Change-Id: I3f5dfdf39c7e7d9655fc26ee6cc88a2c30485d57 --- gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 12c8d5c27de..38bf7b2a7d4 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6823,6 +6823,28 @@ (define-public ocaml-ppx-derivers as part of the same ocaml-migrate-parsetree driver.") (license license:bsd-3))) +(define-public ocaml-ppx-deriving-yojson + (package + (name "ocaml-ppx-deriving-yojson") + (version "3.6.1") + (home-page "https://github.com/ocaml-ppx/ppx_deriving_yojson") + (source + (origin + (method url-fetch) + (uri (string-append home-page "/archive/refs/tags/v" version ".tar.gz")) + (sha256 + (base32 "1ds3hfcrwyhkal3y5ychzy79r0kpfvn68n492jww70rbii48nz03")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-yojson ocaml-result ocaml-ppx-deriving + ocaml-ppxlib)) + (native-inputs (list ocaml-ounit)) + (properties `((upstream-name . "ppx_deriving_yojson"))) + (synopsis "JSON codec generator for OCaml") + (description + "ppx_deriving_yojson is a ppx_deriving plugin that provides a JSON codec + generator.") + (license license:expat))) + (define-public ocaml-cinaps ;; The commit removes the unused dependency of ocaml-ppx-jane. We need to ;; use this as we would otherwise have a dependency loop between -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 24 11:46:47 2023 Received: (at 64249) by debbugs.gnu.org; 24 Dec 2023 16:46:47 +0000 Received: from localhost ([127.0.0.1]:53425 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHRcl-0001J8-3g for submit@debbugs.gnu.org; Sun, 24 Dec 2023 11:46:47 -0500 Received: from nanein.fr ([185.230.78.41]:55504) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHRce-0001IK-2o for 64249@debbugs.gnu.org; Sun, 24 Dec 2023 11:46:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nanein.fr; s=mail; t=1703436384; bh=OGJ4JAQkYVPItkih+TtC0msbpDeEnbpVjuCdHQUb0NQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nqe3LShVFNoDo+0ZxocJIMElF1W+ad/T36u3bNflFDCXuv+3Oetd1GF8190FbQPQm SWR2Enk7v565rdNaiiTU4PbaCxnZrmPV/iuPYGwH/wMiCtsYTxUb/xnxhT/DD2fE4U oEssc9qtYxUM2MmtLkVhv/HKDIxlZzBKywyxfIjqMSFttg8bz/eZ5+8iXWyABZsQ1a ETUj7vx9JVHRcOZA0QUu5ZMW1MOi2DsQxLzoT883RiKjKDlH1+SZ2miTawSxPGQs1P /rITF7fdGCL30ky5NcfhhE2Fm3ax/U4kUhcFjNlFvDPC6yBQ2mK6wxDQKJZPg8Q7+R UVGPbOWso2ZsoAIu0YKUnPQbfviAATMdExKIbq0VJ3mfGf4CQnZb2tUSOp1ORCp7mz NdE+K4FNrb4+diZvaYZklE8N/kUdrR6GFt+saWvEiKJ8q21HEWsrkWUtynfQUC8mew Dn9VODkS2Tws1G5nQ41J1PVw2H7vwjSIihlkYZg62/xoyD17S8+Gxg+v1FttUdoe96 +lr/2SdgaqU6uuVS4WUtL+Wcrg5SSfvpLYGutmVRdFwAEGbLyZgxTiwZKBQDEzo0la CixbhuMNkN2V+i1UggG5v9zqCC0JdDtbvCOAc4KNSsbYY1KgM0pbhsMBz+9eets4rU cmP92BpG8IOoFopDgpnvHsS8= Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:a9e:a4c0:9d01:2b7b:5834:e51]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by nanein.fr (Postfix) with ESMTPSA id 1B2EC140246; Sun, 24 Dec 2023 17:46:24 +0100 (CET) From: ds-ac@nanein.fr To: 64249@debbugs.gnu.org Subject: [PATCH 7/9] gnu: Add ocaml-ppx-import. Date: Sun, 24 Dec 2023 17:43:42 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231224140732.4467c1fa@tachikoma.lepiller.eu> References: <20231224140732.4467c1fa@tachikoma.lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard@posteo.net, Arnaud DABY-SEESARAM , Josselin Poiret , Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Arnaud DABY-SEESARAM * gnu/packages/ocaml.scm (ocaml-ppx-import): New variable. Change-Id: Ie9619653f2b3ecc4458394709e37c4a433f875dd --- gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7f80052c079..f21285171c3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6940,6 +6940,28 @@ (define-public ocaml-ppx-deriving-yaml "Deriving conversion functions to and from yaml for your OCaml types.") (license license:isc))) +(define-public ocaml-ppx-import + (package + (name "ocaml-ppx-import") + (version "1.9.1") + (home-page "https://github.com/ocaml-ppx/ppx_import") + (source + (origin + (method url-fetch) + (uri (string-append home-page "/archive/refs/tags/" version ".tar.gz")) + (sha256 + (base32 "1yj2gjhnasarcsk8s0i8njww4rs6ny3nr246psxdilsm5g8yraps")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-ppx-deriving ocaml-ppxlib + ocaml-ppx-sexp-conv)) + (native-inputs (list ocaml-ounit ocaml-sexplib0)) + (properties `((upstream-name . "ppx_import"))) + (synopsis "Extension for importing declarations from interface files.") + (description + "ppx_import is a syntax extension for importing declarations from + interface files.") + (license license:expat))) + (define-public ocaml-cinaps ;; The commit removes the unused dependency of ocaml-ppx-jane. We need to ;; use this as we would otherwise have a dependency loop between -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 24 11:46:48 2023 Received: (at 64249) by debbugs.gnu.org; 24 Dec 2023 16:46:48 +0000 Received: from localhost ([127.0.0.1]:53427 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHRcl-0001JB-Ks for submit@debbugs.gnu.org; Sun, 24 Dec 2023 11:46:48 -0500 Received: from nanein.fr ([185.230.78.41]:55510) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHRce-0001IR-6f for 64249@debbugs.gnu.org; Sun, 24 Dec 2023 11:46:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nanein.fr; s=mail; t=1703436385; bh=bHX4xxT5WVN7orLA1cgwIAsPaSZK4MLykQQSNPz4Wfk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tdWOFxn5s7bXa1rkIvv6nKQEsUSVvX9gXDpHO68VSCQYxDZNIKxtIlabsLmGvPeID C1XYI4azNIPhCnxScnvmolH9EcaUw+rKa6MQf6W6b1wmFmAtr2/5ivBFN/PHVVx9QH dBgPQeK17Oc4pH+jQCxg5tUV2PWj5iLoeDSElpmldvJWy1UHWXpT8vJqlf00iaA9By YPXKeJfS7Pqm3sE0qvLluIdKvEavaxvmOG8l99N36dir9U9ppylIGd1ta4qhVZTrUQ JJrYWSxbTtc4wtAyvvzzM7mvgfXJY0iGi9Q8fnjPwSbq7/CLJU1h7IGWbs7l7IplP/ SAP1XOVZdnYyn0Gew+8dLtMDER3owMoay3hDVrlbP/mf2ekqsMvD9ysuPooXg29M/B Ut6OevAQomjAbCXfTMRT9WjYf1wcaghwhQbytEtsPtkituS5YSh9VHACTeOJho9y6H kdo2dVx3Xmj5xYG8cqLx+FuzGm3qsxQWH/7ODJg3taeMiKS2y/z5WPtJNAj9+jaL+k j7IW2LNYCcrFxp0SlPAqQ6XuOTCPXgTHww04h97RczhOB3bY/ocfqJNgojGTaZmOZj i49XPeNKcA5R8VfJrwwRatZ3Q7jevAPcS8C24jXQjUJaLt6fw3m7hAAVMVm9TF4QFf zfbrlV5iphRniyUYmhMU3OFc= Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:a9e:a4c0:9d01:2b7b:5834:e51]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by nanein.fr (Postfix) with ESMTPSA id 28212140249; Sun, 24 Dec 2023 17:46:25 +0100 (CET) From: ds-ac@nanein.fr To: 64249@debbugs.gnu.org Subject: [PATCH 9/9] gnu: update frama-c to 27.1-Cobalt. Date: Sun, 24 Dec 2023 17:43:44 +0100 Message-ID: <93766019c37d07b5742943971944ebf0fc502736.1703436224.git.ds-ac@nanein.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231224140732.4467c1fa@tachikoma.lepiller.eu> References: <20231224140732.4467c1fa@tachikoma.lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard@posteo.net, Arnaud DABY-SEESARAM , Josselin Poiret , Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Arnaud DABY-SEESARAM * gnu/packages/maths.scm (frama-c): Update to 27.1-Cobalt. [build-system] switch from ocaml-build-system to dune-build-system. add new dependencies Change-Id: Iaf48692db5af281636e2907be4d681b8d94353fa --- gnu/packages/maths.scm | 64 ++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 7d17ee58ae6..99326c2f5c8 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -96,6 +96,7 @@ (define-module (gnu packages maths) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system ocaml) + #:use-module (guix build-system dune) #:use-module (guix build-system perl) #:use-module (guix build-system pyproject) #:use-module (guix build-system python) @@ -9259,36 +9260,38 @@ (define-public why3 (define-public frama-c (package (name "frama-c") - (version "24.0") - (source (origin - (method url-fetch) - (uri (string-append "http://frama-c.com/download/frama-c-" - version "-Chromium.tar.gz")) - (sha256 - (base32 - "0x1xgip50jdz1phsb9rzwf2ra8lshn1hmd9g967xia402wrg3sjf")))) - (build-system ocaml-build-system) + (version "27.1-Cobalt") + (source + (origin + (method url-fetch) + (uri (string-append "http://frama-c.com/download/frama-c-" version + ".tar.gz")) + (sha256 + (base32 "1lirkvhf5m53d33l0aw5jzc1fyzkwx5fkgh9g71732d52r55f4sv")))) + (build-system dune-build-system) (arguments - `(#:tests? #f; no test target in Makefile - #:configure-flags - (list "--enable-verbosemake") ; to aid debugging - #:phases - (modify-phases %standard-phases - (add-before 'configure 'export-shell - (lambda* (#:key inputs #:allow-other-keys) - (setenv "CONFIG_SHELL" - (search-input-file inputs "/bin/sh"))))))) - (inputs - (list gmp zlib)) - (propagated-inputs - (list ocaml-biniou - ocaml-easy-format - ocaml-graph - ocaml-yojson - ocaml-zarith - ocaml-lablgtk3-sourceview3 - lablgtk3 - why3)) + '(#:phases (modify-phases %standard-phases + (add-before 'build 'set-environment-variables + (lambda* (#:key outputs #:allow-other-keys) + (setenv "CC" "gcc")))))) + (inputs (list python + perl + gcc + dune + gmp + zlib)) + (propagated-inputs (list ocaml-biniou + ocaml-easy-format + ocaml-graph + ocaml-yojson + ocaml-dune-site + ocaml-ppx-deriving-yaml + ocaml-zarith + ocaml-ppx-deriving-yojson + ocaml-ppx-import + ocaml-lablgtk3-sourceview3 + lablgtk3 + why3)) (native-search-paths (list (search-path-specification (variable "FRAMAC_SHARE") @@ -9300,7 +9303,8 @@ (define-public frama-c (separator #f)))) (home-page "https://frama-c.com") (synopsis "C source code analysis platform") - (description "Frama-C is an extensible and collaborative platform dedicated + (description + "Frama-C is an extensible and collaborative platform dedicated to source-code analysis of C software. The Frama-C analyzers assist you in various source-code-related activities, from the navigation through unfamiliar projects up to the certification of critical software.") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 24 11:47:04 2023 Received: (at 64249) by debbugs.gnu.org; 24 Dec 2023 16:47:04 +0000 Received: from localhost ([127.0.0.1]:53436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHRd2-0001Kb-7D for submit@debbugs.gnu.org; Sun, 24 Dec 2023 11:47:04 -0500 Received: from nanein.fr ([185.230.78.41]:59788) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHRd0-0001JX-L4 for 64249@debbugs.gnu.org; Sun, 24 Dec 2023 11:47:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nanein.fr; s=mail; t=1703436381; bh=aLp42JGK4G9dakXaD0G9obW6v6XTfZrOCp2E0unR5iY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NQmkff72mF6QviYFhPewtWKbnF95C3EWWXyHh8+3tjmySCRlcNWWVivQPcQOyeP3q NapfR27fdG/lFhElL9qQ7/yAPk5/o1lpk/ZQk/EoxnDW8x/5kmUDmN+XdHfeEonrOW W3onEaLn/GLFSAmtpQ04DWvIxplfbCmLK+mIZP8V7JXN6F9R7A3GpcjNmJQztPICqC StHjjfZ9FHRnCym21NJNWgb7wNSac/SSqJJcmgimaHIqiDLrKVGbjdCDOk1igV053U oJ+bly3570Etj3imCveUSPebNPr8vGIESO5pjI/KXoLDuliSO2uFbSKxDzxEk/+zs/ 9NLvhRXOFG/R64grkwEdwhguCBrF2f+bRXTuwhLb7BJlMEY3rz9aFU8td6x6fSD+c5 jf17FqH/fzbMDGoOKADin/8HhD3qjTgUw4nsgmV17QbCr66R92uhMeGSShqk53Wiqw YVAeQWrjfnmLWrTdk55OXhZ1xiQS9p07xFt9aTiZP6jn1QAhugT9UKkDyDgQlRPmHR D5lllLFZyGvwfy8UiLlwh02wND5tAa/Kijrp34X9oxGNi/ck800fymSIDlIwrWcI0M pPek7WmYbd26oo3Gj9jGT8pXReojS/jNY7icPxHp8s2zCEYkEBEaOjexb/dEruXwF2 3AeWpAKTCRIr0/pWki4DtSto= Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:a9e:a4c0:9d01:2b7b:5834:e51]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by nanein.fr (Postfix) with ESMTPSA id 86229140241; Sun, 24 Dec 2023 17:46:20 +0100 (CET) From: ds-ac@nanein.fr To: 64249@debbugs.gnu.org Subject: [PATCH 3/9] gnu: Add ocaml-junit Date: Sun, 24 Dec 2023 17:43:38 +0100 Message-ID: <42a243a1221f340d3a6151e28ae72c873c2a4e7d.1703436224.git.ds-ac@nanein.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231224140732.4467c1fa@tachikoma.lepiller.eu> References: <20231224140732.4467c1fa@tachikoma.lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard@posteo.net, Arnaud DABY-SEESARAM , Josselin Poiret , Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Arnaud DABY-SEESARAM * gnu/packages/ocaml.scm (ocaml-junit): New variable. Change-Id: I69fd4302b0a178765a79a72801eed694b3bd3ebd --- gnu/packages/ocaml.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 38bf7b2a7d4..f664f6db81b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1642,6 +1642,30 @@ (define-public ocaml-ounit other XUnit testing frameworks.") (license license:expat))) +(define-public ocaml-junit + (package + (name "ocaml-junit") + (version "2.0.2") + (home-page "https://github.com/Khady/ocaml-junit") + (source + (origin + (method url-fetch) + (uri (string-append home-page "/archive/refs/tags/v" version ".tar.gz")) + (sha256 + (base32 "00bbx5j8vsy9fqbc04xa3lsalaxicirmbczr65bllfk1afv43agx")))) + (build-system dune-build-system) + (arguments + `(#:package "junit" + #:phases (modify-phases %standard-phases + (add-before 'build 'dune-subst + (lambda _ + (invoke "dune" "subst") #t))))) + (properties `((upstream-name . "junit"))) + (propagated-inputs (list ocaml-ounit ocaml-ptime ocaml-tyxml ocaml-odoc)) + (synopsis "JUnit XML reports generation library") + (description "JUnit XML reports generation library") + (license #f))) + (define-public camlzip (package (name "camlzip") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 24 11:47:10 2023 Received: (at 64249) by debbugs.gnu.org; 24 Dec 2023 16:47:11 +0000 Received: from localhost ([127.0.0.1]:53444 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHRd8-0001L5-K6 for submit@debbugs.gnu.org; Sun, 24 Dec 2023 11:47:10 -0500 Received: from nanein.fr ([185.230.78.41]:59800) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHRd7-0001KP-5e for 64249@debbugs.gnu.org; Sun, 24 Dec 2023 11:47:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nanein.fr; s=mail; t=1703436383; bh=BTEU9ncnDInFy7mqFmEMPBTUFcMiKsfRuKOxklTusHU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lHMErhUIjdgxMGzTpeORng4+OVfTBzgjnqGfIJ78evAIzPbY99C/mPdBTg7xjkY5x Wmge9kXmlg+T0wtJzvD/AiHPtPJ5jtilcGMhxBWec5WXvseoViQ0HA/2MI1SOEkryz aWZkMk6pK5S27XZLbRD95WnYZ8NN3ujg2GVk8ucceNsTtwJ8o0SPHyCMnHJ9xcU01K cpm38tisOjxEFzaZHD+UDvaqlmSP0EZ7IrUKZapdihjpIvH89nVWyj1KpadHKb2QqF BFE4FDR6BzUL8wtsgBuXDCEw4m018Bg+rRoiC2svSU4aOaZM1tfN482st1oi8jaKg5 FvGI4UH+f8g21hLeg9s4bi/6rHLnTrPuk3xEy+cfstJ1h33Q3D8PF+m7p7GbHvgXV9 53KPz9YARiHi47WbfHCatBU7X/jB5a9enqd9SQcSS+W2oNc7CuEODpwhLtoq9+rHiK FznK4m/XYtCSpIgilfLrNNmnV6FZcL/AkMhA9PVDpnnTNiQFhDsQf+KLqIWdtkiBPJ 2669sVDzvs+cuAQW7/5cB7+pHb9kuyEmZRYRSVfLMz4BlPGCskCNEuo0UdfZXgjH8w CcAQKrkAYQJT58/h31I9BLJoh8Vwz+NIjibfkzTltwkdOmGo6urQQm9sQhIFI2rbd/ Hbt90eJ0AcSRJKlHWW5MQzJc= Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:a9e:a4c0:9d01:2b7b:5834:e51]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by nanein.fr (Postfix) with ESMTPSA id A41BF140245; Sun, 24 Dec 2023 17:46:23 +0100 (CET) From: ds-ac@nanein.fr To: 64249@debbugs.gnu.org Subject: [PATCH 6/9] gnu: Add ocaml-ppx-deriving-yaml. Date: Sun, 24 Dec 2023 17:43:41 +0100 Message-ID: <41e9bcba6db5a3eb93045b927df561f10137cb76.1703436224.git.ds-ac@nanein.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231224140732.4467c1fa@tachikoma.lepiller.eu> References: <20231224140732.4467c1fa@tachikoma.lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard@posteo.net, Arnaud DABY-SEESARAM , Josselin Poiret , Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Arnaud DABY-SEESARAM * gnu/packages/ocaml.scm (ocaml-ppx-deriving-yaml): New variable. Change-Id: I2677ce5b630b77abdec7743cd25c4193ca7b351e --- gnu/packages/ocaml.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 4c01af75d84..7f80052c079 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6919,6 +6919,27 @@ (define-public ocaml-ppx-deriving-yojson generator.") (license license:expat))) +(define-public ocaml-ppx-deriving-yaml + (package + (name "ocaml-ppx-deriving-yaml") + (version "0.2.1") + (home-page "https://github.com/patricoferris/ppx_deriving_yaml") + (source + (origin + (method url-fetch) + (uri (string-append home-page "/archive/refs/tags/v" version ".tar.gz")) + (sha256 + (base32 "1h5jbd5l4i6l656avjwxl1cp6p4nl91wbpfqzkqr8r03q89qqm0c")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-ppxlib ocaml-ppx-deriving ocaml-yaml + ocaml-odoc)) + (native-inputs (list ocaml-alcotest ocaml-bos ocaml-mdx ocaml-ezjsonm)) + (properties `((upstream-name . "ppx_deriving_yaml"))) + (synopsis "Yaml PPX Deriver") + (description + "Deriving conversion functions to and from yaml for your OCaml types.") + (license license:isc))) + (define-public ocaml-cinaps ;; The commit removes the unused dependency of ocaml-ppx-jane. We need to ;; use this as we would otherwise have a dependency loop between -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 24 11:47:11 2023 Received: (at 64249) by debbugs.gnu.org; 24 Dec 2023 16:47:11 +0000 Received: from localhost ([127.0.0.1]:53446 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHRd8-0001L7-T6 for submit@debbugs.gnu.org; Sun, 24 Dec 2023 11:47:11 -0500 Received: from nanein.fr ([185.230.78.41]:59796) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHRd7-0001KO-5Z for 64249@debbugs.gnu.org; Sun, 24 Dec 2023 11:47:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nanein.fr; s=mail; t=1703436383; bh=LhGt9G+Ah82latxCrzqRwsfspGUtW9jwr3oD0hvKGHE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Lkrbk0tlX4i4q59afnJErgqhjxVL+5DksQ6DXnjunT9TgsklCBincstue7NpK+LEH A1uCL6IA8vaaVhh4rV62Q2OnXId6tade+DV8EFCSYBc4H/ddY3Nf/6PEvO8oNxxfef yN8Y0XbguLth6YgZhBbe9C6PVQYQtgNweTQCXr1zsWzLxNv+xFgMh+jaPq+Ep7S+wC 8k4ivNelztU2PX7tWTs4BkPH7A0xII3NEVz4qWQZtZc5tOogMXdKR+ZyLzgNh6NlCR q8+C4TeH8iBFkIIPswTLfTgoaGtoblg3Kjm3zR3Fgd1Er7uOTSYIiln6v2nScv5bwr t80jl6pT/CpX/vA0B/AP8qmdpjdsbKRnjHZEzlLTRnxRsoQfIWOvlI2R/Vvfyl+IFP oSjl/pdITPG+x8ONiF/LpoX6a4i77RBnTvnFYosaqJHbwDhkChDqgZPXwx+XdLXFjg wv0C1eLrZcqNXdsvfPnrPLiC6xTTtIwcadR5Aci2GIl9cmfaYosW45+as0my0xSfhf Z/bhtCvgBa9Ma5OwpJLfDG8Iv7vKQ1m/cTDxqU6Frxm/mq8HHCDwyjwyMvlGh0vXVd w5X0zTI+1w0f/x8q2fNUwkz+Ho2nyq/MHv/a7Ee7lX8N5L05OAX0AyMiCluEQO6MYM bX0X5kwoImNkDUY4H2aB4gYQ= Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:a9e:a4c0:9d01:2b7b:5834:e51]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by nanein.fr (Postfix) with ESMTPSA id 01531140244; Sun, 24 Dec 2023 17:46:22 +0100 (CET) From: ds-ac@nanein.fr To: 64249@debbugs.gnu.org Subject: [PATCH 5/9] gnu: Add ocaml-yaml Date: Sun, 24 Dec 2023 17:43:40 +0100 Message-ID: <0b7f4fd08392068e3f88c9c4dde91e81db53b96b.1703436224.git.ds-ac@nanein.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231224140732.4467c1fa@tachikoma.lepiller.eu> References: <20231224140732.4467c1fa@tachikoma.lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard@posteo.net, Arnaud DABY-SEESARAM , Josselin Poiret , Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Arnaud DABY-SEESARAM * gnu/packages/ocaml.scm (ocaml-yaml): New variable. Change-Id: Ia890e505dd3ff0fe9a8c243adef460e0475d9e81 --- gnu/packages/ocaml.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b14f69cae1d..4c01af75d84 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2829,6 +2829,38 @@ (define-public ocaml-ppx-tools syntactic tools.") (license license:expat))) +(define-public ocaml-yaml + (package + (name "ocaml-yaml") + (version "3.2.0") + (home-page "https://github.com/avsm/ocaml-yaml") + (source + (origin + (method url-fetch) + (uri (string-append home-page "/archive/refs/tags/v" version ".tar.gz")) + (sha256 + (base32 "054ca6071bfkdbm5vlmnk6ic43561xl9igv87zgkbq4qry16a7s7")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-ppx-sexp-conv ocaml-ctypes ocaml-bos)) + (native-inputs (list ocaml-fmt + ocaml-sexplib + ocaml-logs + ocaml-mdx + ocaml-alcotest + ocaml-crowbar + ocaml-junit-alcotest + ocaml-ezjsonm)) + (synopsis "Parse and generate YAML 1.1/1.2 files") + (description + "This is an OCaml library to parse and generate the YAML file format. It is + intended to interoperable with the [Ezjsonm](https://github.com/mirage/ezjsonm) + JSON handling library, if the simple common subset of Yaml is used. Anchors and + other advanced Yaml features are not implemented in the JSON compatibility + layer. The [Yaml module + docs](http://anil-code.recoil.org/ocaml-yaml/yaml/Yaml/index.html) are + browseable online.") + (license license:isc))) + (define-public ocaml-parmap (package (name "ocaml-parmap") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 24 11:47:17 2023 Received: (at 64249) by debbugs.gnu.org; 24 Dec 2023 16:47:17 +0000 Received: from localhost ([127.0.0.1]:53448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHRdF-0001LQ-8u for submit@debbugs.gnu.org; Sun, 24 Dec 2023 11:47:17 -0500 Received: from nanein.fr ([185.230.78.41]:39826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHRd8-0001Ki-3Y for 64249@debbugs.gnu.org; Sun, 24 Dec 2023 11:47:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nanein.fr; s=mail; t=1703436384; bh=uGSw5yoqh58NDzIlOlDAgffb8drdZBZEX3MYKfLS+9w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SnBx0oyGIsB8uANs0288oUripLYRGh81Dnrlj/ntZ7IihJnGah3nNhuRdwuc2NG25 xN+SnWzqmdFbbWwpZrfk6WrjDAaq/H2M0RM+0sffKn7FIU8F8OOP8V/qQxThJLp8Y7 9yB7I6ma/jL9/jQqB9EnIGJ55xaclGJ8lxfoPxRfFVxaSvvHOtmHeJZ3sSRy4hj4/l Wr8Rv/LzhcqxQ5CO4A+7cbN8uuYiJh+4PGdM0W0+dFJ5d9Wv2qsVGcIcNbdy74qFjp 8ldBy1PfgVIKATkN8xnV8C8GHr3YYwnSFj9fTODKr+UM8uVq+dY0WYTeJUoorM0d/a 39LTAu1Z8Q0UoSdnojFW1frTSnuxA0HfTckOLJDHfuItjMWyiAKoK3LQXzcgGC2dO8 MLo9tN2DH/VNhwRZ5TTg7+x2kLUQfpKYSgYo8tmzYpk5MDWc21YMkwVyNNjFFGZBE5 SmVu/AHcGpXTscnRk7xotW40ndkXaq/W6OCFwtz4ntWwGH8ErpkPcUFADGxlafriDT JMLQYqZ6yk8FLEdUoaV0bVizZGEjRbLEzfUBQP9CSbZPPz7vdKjDGU8TP4DherZla0 GOtz/f2F/6mXycGoe9+y6K3Fild3lbwB9t0DLqoZXfcyx1A3v+kjTlEYRLtckZzjrd 7PIHgDv5Tu+7GIbc3MwwV+sE= Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:a9e:a4c0:9d01:2b7b:5834:e51]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by nanein.fr (Postfix) with ESMTPSA id B1574140248; Sun, 24 Dec 2023 17:46:24 +0100 (CET) From: ds-ac@nanein.fr To: 64249@debbugs.gnu.org Subject: [PATCH 8/9] gnu: Add ocaml-dune-site. Date: Sun, 24 Dec 2023 17:43:43 +0100 Message-ID: <6820ccff3650d19308b587859099f5f2152dbe7c.1703436224.git.ds-ac@nanein.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231224140732.4467c1fa@tachikoma.lepiller.eu> References: <20231224140732.4467c1fa@tachikoma.lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard@posteo.net, Arnaud DABY-SEESARAM , Josselin Poiret , Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Arnaud DABY-SEESARAM * gnu/packages/ocaml.scm (ocaml-dune-site): New variable. Change-Id: I6fa740c1595c9bbdcd55717bddf24d825263ac41 --- gnu/packages/ocaml.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f21285171c3..e222b6f27f0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2020,6 +2020,21 @@ (define-public dune-configurator @item generate config.h file @end itemize"))) +(define-public ocaml-dune-site + (package + (inherit dune-bootstrap) + (name "ocaml-dune-site") + (build-system dune-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + ;; Tests fail. + (delete 'check)))) + (propagated-inputs (list dune-common ocaml-odoc ocaml-lwt)) + (home-page "https://github.com/ocaml/dune") + (synopsis "Embed locations information inside executable and libraries") + (description #f) + (license license:expat))) + (define-public ocaml4.09-dune-configurator (package (inherit dune-configurator) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 24 11:51:35 2023 Received: (at 64249) by debbugs.gnu.org; 24 Dec 2023 16:51:35 +0000 Received: from localhost ([127.0.0.1]:53457 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHRhP-0001Xd-29 for submit@debbugs.gnu.org; Sun, 24 Dec 2023 11:51:35 -0500 Received: from nanein.fr ([185.230.78.41]:40124) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHRhL-0001XO-6j for 64249@debbugs.gnu.org; Sun, 24 Dec 2023 11:51:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nanein.fr; s=mail; t=1703436379; bh=LQkarKPtNTty/5Ta7T3Rm6ABqv4fqp0B/S3AM9Hj+Qg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iicazK9zBLMAO9bh0y7E0m+6awoU2e7BhAoIPCGdZ3ILBEHPwWvYxS5BONYQSY+i2 J52yXKKQ7j9qTXpedukCX6hR0aj3U0mwl83itBUy3W8uN1pYzJ5aZwaoMISYHvCJJP H/OY+dO2mUhw6QxqLH0rBRwpwK7imTcoDloQr2E8iuoNfAuhMyj9UbPwynGlrBHTkW C8V+CZken3aQEAut/oacVVHvNDPznj1vQUdGQ9UuHtT4XN3kevJdFOhZEcE7dxN5WK NvpjE+lnEohVG8BlkyPVymsNWyGGPxGisRQGXZtpFRJuvm00t0rTjQbaY/iRfaqn6O n76+0s+PWr0eoUvT8xTLON//y2pp+scAp2cU73hEQg79c0RPSuxYOXEVuF+In6icFb 6QOPp4cXdykEZTYOcdTFOrVwrqylBc0xWRmv1II4Z3pE1fmSuZvsMbruDY1b9tK6V2 SZUW5Ba99snQH0LSlDgfTmn/5d5b+jt8kUllosZMnsutmSe7Ata9fG0exmp/HTlfmP P3HQdv7MhKpujeThxxItylp8m3J8oCfAv4tr5x1IVuz76ZNL/NB7sD5tGVsmqFu3X4 pLUFJ+IgsppCnTllmwnE9GHQ0wInw3PIyni1Hih80XNuf+WmUiOUDHmt/pJcE8jZJA AP4vpb12Xmki0cOV5BHr9vcQ= Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:a9e:a4c0:9d01:2b7b:5834:e51]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by nanein.fr (Postfix) with ESMTPSA id 7F6621401F2; Sun, 24 Dec 2023 17:46:19 +0100 (CET) From: ds-ac@nanein.fr To: 64249@debbugs.gnu.org Subject: [PATCH 1/9] gnu: why3: Update to 1.6.0. Date: Sun, 24 Dec 2023 17:43:36 +0100 Message-ID: <3bb1fdf1696f86080333f71d8b41aaa4b242a154.1703436224.git.ds-ac@nanein.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231224140732.4467c1fa@tachikoma.lepiller.eu> References: <20231224140732.4467c1fa@tachikoma.lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard@posteo.net, Arnaud DABY-SEESARAM , Josselin Poiret , Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Arnaud DABY-SEESARAM * gnu/packages/maths.scm (why3): Update to 1.6.0. Change-Id: I4d6e0e2224f1ffe85b84493f1834114bc8687d1b --- gnu/packages/maths.scm | 81 +++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ed1708c77b1..7d17ee58ae6 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9201,50 +9201,51 @@ (define-public numdiff (define-public why3 (package (name "why3") - (version "1.4.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.inria.fr/why3/why3") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1yca6mx8bjm8x0i594ivh31aw45s6fbimmwfj8g2v9zwrgmr1i4s")))) + (version "1.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.inria.fr/why3/why3") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0k3y98xzhrl44vwzq2m6k4nrllrwp3ll69lc2gfl8d77w0wg7gkp")))) (build-system ocaml-build-system) - (native-inputs - (list autoconf automake coq ocaml which)) - (propagated-inputs - (list camlzip ocaml-graph ocaml-menhir ocaml-num ocaml-zarith)) - (inputs - (list coq-flocq emacs-minimal zlib)) + (native-inputs (list autoconf automake coq ocaml which)) + (propagated-inputs (list camlzip ocaml-graph ocaml-menhir ocaml-num + ocaml-zarith)) + (inputs (list coq-flocq emacs-minimal zlib)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'bootstrap - (lambda _ - (invoke "./autogen.sh") - (setenv "CONFIG_SHELL" (which "sh")) - (substitute* "configure" - (("#! /bin/sh") (string-append "#!" (which "sh"))) - ;; find ocaml-num in the correct directory - (("\\$DIR/nums.cma") "$DIR/num.cma") - (("\\$DIR/num.cmi") "$DIR/core/num.cmi")) - #t)) - (add-after 'configure 'fix-makefile - (lambda _ - (substitute* "Makefile" - ;; find ocaml-num in the correct directory - (("site-lib/num") "site-lib")) - #t)) - (add-after 'install 'install-lib - (lambda _ - (invoke "make" "byte") - (invoke "make" "install-lib") - #t))))) + `(#:phases (modify-phases %standard-phases + (add-before 'configure 'bootstrap + (lambda _ + (invoke "./autogen.sh") + (setenv "CONFIG_SHELL" + (which "sh")) + (substitute* "configure" + (("#! /bin/sh") + (string-append "#!" + (which "sh"))) + ;; find ocaml-num in the correct directory + (("\\$DIR/nums.cma") + "$DIR/num.cma") + (("\\$DIR/num.cmi") + "$DIR/core/num.cmi")) #t)) + (add-after 'configure 'fix-makefile + (lambda _ + (substitute* "Makefile" + ;; find ocaml-num in the correct directory + (("site-lib/num") + "site-lib")) #t)) + (add-after 'install 'install-lib + (lambda _ + (invoke "make" "byte") + (invoke "make" "install-lib") #t))))) (home-page "https://why3.lri.fr") (synopsis "Deductive program verification") - (description "Why3 provides a language for specification and programming, + (description + "Why3 provides a language for specification and programming, called WhyML, and relies on external theorem provers, both automated and interactive, to discharge verification conditions. Why3 comes with a standard library of logical theories (integer and real arithmetic, Boolean operations, -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:34:22 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:34:22 +0000 Received: from localhost ([127.0.0.1]:41634 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNT6U-0007js-8a for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:34:22 -0500 Received: from 46.233.146.77.rev.sfr.net ([77.146.233.46]:34622 helo=localhost) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNT6R-0007jb-OD for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:34:21 -0500 Received: from localhost (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 17ffc748; Wed, 10 Jan 2024 07:34:05 +0000 (UTC) Received: by localhost (OpenSMTPD) with ESMTPSA id cce971bc (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 10 Jan 2024 07:34:05 +0000 (UTC) Date: Wed, 10 Jan 2024 08:34:04 +0100 From: Julien Lepiller To: ds-ac@nanein.fr Subject: Re: [PATCH 0/9] Fix frama-c Message-ID: <20240110083404.1ce4f833@lepiller.eu> In-Reply-To: References: <20231224140732.4467c1fa@tachikoma.lepiller.eu> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 4.0 (++++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Le Sun, 24 Dec 2023 17:43:35 +0100, ds-ac@nanein.fr a écrit : > From: Arnaud Daby-Seesaram > > > This patch series is built on top of > 8b5b9fc21ea504eb5d226546884db2ebc6287b7d from > https://git.guix-patches.cbaines.net/guix-patches/. > > It: [...] Content analysis details: (4.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FSL_HELO_NON_FQDN_1 No description available. 3.6 HELO_LOCALHOST No description available. 0.0 TVD_RCVD_IP Message was received from an IP address -0.0 SPF_PASS SPF: sender matches SPF record 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 64249 Cc: pukkamustard@posteo.net, 64249@debbugs.gnu.org, Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 3.0 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Le Sun, 24 Dec 2023 17:43:35 +0100, ds-ac@nanein.fr a écrit : > From: Arnaud Daby-Seesaram > > > This patch series is built on top of > 8b5b9fc21ea504eb5d226546884db2ebc6287b7d from > https://git.guix-patches.cbaines.net/guix-patches/. > > It: [...] Content analysis details: (3.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FSL_HELO_NON_FQDN_1 No description available. 3.6 HELO_LOCALHOST No description available. -0.0 SPF_PASS SPF: sender matches SPF record 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Le Sun, 24 Dec 2023 17:43:35 +0100, ds-ac@nanein.fr a =C3=A9crit : > From: Arnaud Daby-Seesaram >=20 >=20 > This patch series is built on top of > 8b5b9fc21ea504eb5d226546884db2ebc6287b7d from > https://git.guix-patches.cbaines.net/guix-patches/. >=20 > It: > - updates Why3 (the non-trivial diff comes from `guix style` changes). >=20 > - adds new dependencies of frama-c. > These definitions come from the Guix importer for opam, with small > edits. I had to disable checks for two of them. > Note: tests are disabled for similar Guix packages and are not run > by opam. >=20 > - updates frama-c to its latest stable version. > I switched the package to dune-build-system. >=20 > Arnaud DABY-SEESARAM (9): > gnu: why3: Update to 1.6.0. > gnu: Add ocaml-ppx-deriving-yojson. > gnu: Add ocaml-junit > gnu: Add ocaml-junit-alcotest > gnu: Add ocaml-yaml > gnu: Add ocaml-ppx-deriving-yaml. > gnu: Add ocaml-ppx-import. > gnu: Add ocaml-dune-site. > gnu: update frama-c to 27.1-Cobalt. >=20 > gnu/packages/maths.scm | 145 +++++++++++++++++++------------------- > gnu/packages/ocaml.scm | 154 > +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 229 > insertions(+), 70 deletions(-) >=20 >=20 > base-commit: 8b5b9fc21ea504eb5d226546884db2ebc6287b7d I managed to perform the complete update without breaking a single dependent of ocaml@4! I used the first 12 patches from pukkamustard, added a few updates of my own (including a more recent ocaml-ppxlib, but not the latest, to ensure compatibility with both janestreet 0.15 and 0.16), added your patches (I reworked the order a bit and merged the first and last one), fixing descriptions, license, source and adding a copyright header for you. I also extended the dune-site definition to run the tests by adding a few more packages. Lastly, I included pukkamustard's last patch, and everything seems to be working now. In total, we get 34 patches, and I checked that each intermediate commit still builds and doesn't break any package. I'm sending them momentarily, so QA can have a chance to build them. From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:43:53 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:43:53 +0000 Received: from localhost ([127.0.0.1]:41649 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFh-0007zX-64 for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:43:53 -0500 Received: from lepiller.eu ([89.234.186.109]:59302 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFe-0007zA-2D for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:43:51 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 6a8357e7; Wed, 10 Jan 2024 07:43:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :cc:subject:date:message-id:mime-version :content-transfer-encoding; s=dkim; bh=5zOCkku8QKV/xDUVsc13XRUnO Py8ZvlHpS7W7JVGQ40=; b=N5xvH+DZKtVVu3zBx1nW/omqRooRKMjDnNJdnu9YE clnxyND+OcgFkuQiWAkQ7M7zvXsYKIyFonuo+4y14his97gnITCnNdWuIRsa6qUU ENA8hCSKTcx8CWmp0RFg8kJtlRQLv8jEMv9wk4ft6UcCPkLMF5E6NYKQmEu15syb 6IWctsRpZmy4M74AhHn5/3a2KDF3SKn1cdJs2LoUu0GT3iEjWXRHDkQ+uYyKwc3j qDmH6rNyuLeUJnGARzmFVohVbFrqs4VjtwHA01WWR1xA++n180/mN2BUbBmb53Rs Z+GJMOQZjfhTDGwZ0RXeHW46V9KJANXw59238ZKHt4PbA== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id dfddd083 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 10 Jan 2024 07:43:40 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 01/34] gnu: ocaml: Update to 4.14.1. Date: Wed, 10 Jan 2024 08:43:02 +0100 Message-ID: <20240110074336.24651-1-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: pukkamustard * 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 a8c497da95..ddedbf3dc2 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 base-commit: e541f9593f8bfc84b6140c2408b393243289fae6 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:43:55 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:43:55 +0000 Received: from localhost ([127.0.0.1]:41655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFi-0007zt-GO for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:43:54 -0500 Received: from lepiller.eu ([89.234.186.109]:59302 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFf-0007zA-HO for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:43:52 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 19a9fafa; Wed, 10 Jan 2024 07:43:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :cc:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=wmuqZjj33f8k2nAxIT7YEUYeC ti+FmJKe1bxeiXUFm4=; b=ZQJZVFpuD/ETrKqzF5OY8JbZmqZ5GbRJW03XLtC/d trAC8HCagw53ynm78eDjiKfTF+oqoOEDfx6eVJCEk17oBRPMej7GO+gDLAHmbwM3 wc1M4ZuCrGOfnvy+HRmRoPiTeLPNi7dmdkel2IraIY7YPPiHE3Eh2eaA1hFebSkM 52RuwQrOFj4DXZHRy+JTUQPEsUfaldKk2U3jeAVi3MTJiYa1z3xfmhO8ru8f6aNU 9QxGHNYGPcw3QrBXgvUhUSu/OEV2uRXc17/CV8482+fG+3/UUZDfuf52Ginnh1ZX D2NswsDn3wcSLcBegZertrHg6VJmkCP5M4TCgudgbmFrA== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id f40cc855 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 10 Jan 2024 07:43:40 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 02/34] gnu: Update coq-flocq to 4.1.1. Date: Wed, 10 Jan 2024 08:43:03 +0100 Message-ID: <20240110074336.24651-2-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: pukkamustard * 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 f30f231f3b..26216ab323 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -242,7 +242,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) @@ -252,7 +252,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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:43:55 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:43:55 +0000 Received: from localhost ([127.0.0.1]:41658 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFi-000806-WC for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:43:55 -0500 Received: from lepiller.eu ([89.234.186.109]:59302 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFg-0007zA-Hn for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:43:52 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 1c085d32; Wed, 10 Jan 2024 07:43:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :cc:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=ankJo9h+fdh/uDBu3qy04otZl KGcKKNUSyVOKQYdjOo=; b=mxDYBx6XqpU0vu2LoYf745RDx0SgCRdqBg5enPSjl fMdzKACmYSnukQgsTF0+qQXAPOwNDZ34PqSNbEmWUFew/nhggT/kj+X24zuXpPVa 3+CS7e4q9gUEDnJiDDwCZqg5l3Ug2d2xjouQU+9dSmWI04gbnxQ6Z/6a1DdCppwk lDFndYXWCiaWvh/VhOMiKEeC+FLGgu0h7HHOE9+wKGDT/ufYzVJyW097E2ZNlgdg 7tLTU2HI7U3W5SoMu1tlth7l4fk6N9bA7OLqRZOQIs6ixsWg9LK5v6zJdz2su1TN hDDqmFzv73iuhIoaZlQ7puuANI80LX9arONsSDgmyvzFg== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 356f78db (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 10 Jan 2024 07:43:40 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 03/34] gnu: Update coq-gappa to 1.5.3. Date: Wed, 10 Jan 2024 08:43:04 +0100 Message-ID: <20240110074336.24651-3-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: pukkamustard * 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 26216ab323..0903b6e9aa 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -315,7 +315,7 @@ (define-public coq-for-coqtail (define-public coq-gappa (package (name "coq-gappa") - (version "1.5.2") + (version "1.5.3") (source (origin (method git-fetch) @@ -325,7 +325,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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:43:56 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:43:56 +0000 Received: from localhost ([127.0.0.1]:41662 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFj-00080E-Gn for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:43:56 -0500 Received: from lepiller.eu ([89.234.186.109]:59302 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFh-0007zA-8t for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:43:53 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id b198efe8; Wed, 10 Jan 2024 07:43:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :cc:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=oiGNXrcIeV9vlk2458MFaiXd/ 4VhjLXvUJ5abSC/7IA=; b=RBu6ygLY06G/AXyL/WiOUeTu7joQCj85p3RN/Vbie W9W+iYp7YlRImW1VQV9BN5Ytq7dQr1JYfetWvnVvYxzZbX62xnEPi1mQySnltx+7 XlSU+1/EKOM346l9pgCa9vwMEps3Szm+tTU36xsvMs/paEnkyUwraTSqBulaE1Ik JqtRTpJWZCdiWjgI0kUvWSnzVqfTg3yQgy3J+5uyq9MQYh7O7VPTL8YtKQl7FM2S wvR5fiDQCAHzZrT5DfYFNRWX0C3BvuX+Mud/NtnB2Ln9FIzHbKkcnSSxb8ATKclt q/7jsrVvMZUDD6eQTO+jEq2/HUsnGCEWHxEBYytRgzHQQ== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id ec25b4f4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 10 Jan 2024 07:43:41 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 04/34] gnu: Update coq-coquelicot to 3.4.0. Date: Wed, 10 Jan 2024 08:43:05 +0100 Message-ID: <20240110074336.24651-4-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: pukkamustard * 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 0903b6e9aa..b2b97a42f3 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -412,7 +412,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) @@ -422,7 +422,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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:06 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:06 +0000 Received: from localhost ([127.0.0.1]:41692 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFu-00083c-DU for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:06 -0500 Received: from lepiller.eu ([2a00:5884:8208::1]:40392 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFh-0007zF-B0 for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:43:54 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 61458773; Wed, 10 Jan 2024 07:43:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :cc:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=Q8z0MbzIDEllI8K0UjdbzfGHA 8gqog7MrjDSNe+fGZY=; b=AbN14SIEhO3wCGmwOisLDPkQubqzMJAh96mmsxdoI nztAHxNC0ASjrXmmrzs5TPtg7QVFQoW0MdZm9P0lPQgSDINAkl2aynTNIr1l3+Ex IWGH0Ng/sTP82fe8tfcD55tgB1rxtErUfQWl0IQ2rVBHM+9dxyuzpW1dQPEaDg7P vlVWIajGo4FJbQRYLEzwRfSof85xi8r9jrz8spHFdoay+yF+WveKnNGrHQbFKlzJ z+YItvIjKzbgurAQkIKNgQwXJzkBC+q8gttF7Hx3Ic6wwXqjIdMCTc5UXkf48iix yd29uQXF1VAJnqRzPboQZ0Xqr+cq5ke7YZcTDmUbr/WCg== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id fe91722a (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 10 Jan 2024 07:43:41 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 05/34] gnu: Update coq-mathcomp to 1.17.0. Date: Wed, 10 Jan 2024 08:43:06 +0100 Message-ID: <20240110074336.24651-5-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: pukkamustard * 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 b2b97a42f3..473ce014a6 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -375,7 +375,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) @@ -384,7 +384,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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:07 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:07 +0000 Received: from localhost ([127.0.0.1]:41694 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFu-00083g-OB for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:07 -0500 Received: from lepiller.eu ([89.234.186.109]:59302 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFi-0007zA-5P for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:43:54 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id abed9a7f; Wed, 10 Jan 2024 07:43:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :cc:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=EcrXz+Q8IejvFRIus/XCDiM6o Zy5L9gptNeBPKOMOqI=; b=USSuPfby61qy59esSnwQpPGsItBAJOPnUodILvkVG bffoFkXytDDqWLmmcS3jtHSAs1a+ZVFOUSwiXV4TkHxcNscaT34WOZA5/NediNri 6uQRNVUiZQzeUGVZjeT5RnTbzSkf4Rwyd2NiJwcupCPNFJELW4t1Mt1B9UIUXUBB wl32JQ0AVzRm9pMH3kr00eA8BcMHFpkTuZ0EFfOmYDuutCVO2OsUBau9gSm7ooE1 qBMChj2UHbJueEArql8e01lelykzVL1/WAhId5/+rRWb714JzgHkyAXnu1VxtFb2 WCx6pvNhA5klrPWwn3DptGwt578sNfRA6UNGXgI2NQeJA== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 3e559121 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 10 Jan 2024 07:43:41 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 07/34] gnu: Update coq-stdpp to 1.8.0. Date: Wed, 10 Jan 2024 08:43:08 +0100 Message-ID: <20240110074336.24651-7-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: pukkamustard * 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 bfd55306a4..68a61c4b21 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -669,7 +669,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) @@ -679,7 +679,7 @@ (define-public coq-stdpp (file-name (git-file-name name version)) (sha256 (base32 - "0447wbzm23f9rl8byqf6vglasfn6c1wy6cxrrwagqjwsh3i5lx8y")))) + "0xawh3xkh76yhs689zw52k55cbzga2gyzl4g1a3pgg6yy420chjn")))) (build-system gnu-build-system) (inputs (list coq)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:07 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:07 +0000 Received: from localhost ([127.0.0.1]:41696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFv-00083n-2g for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:07 -0500 Received: from lepiller.eu ([89.234.186.109]:59318 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFh-0007zZ-OQ for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:43:54 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 525d556d; Wed, 10 Jan 2024 07:43:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :cc:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=DGSoGo/ddbxskB8dISzXlxVGI x28pgPfRoqYD7R9r2Y=; b=daCtT8rz3lImouIFCYvOVsn9lE8dWkAJhAN9YSAz9 t+TOJT7tQ80SW1DSR76a+sqce0iO2KMVfYuRF0cgpUzbqPu2b1gsFxnh4+pF86wN jM95K8Tfuy6NMwsVmO0Arl6cFO71Xzdt3K6U5aOOIIeom+ByEQZfq/HuKKpO4Fqu hIw6Z5InVDZ9hEDPLyeyMqt3LyTMLhfb0D0T6yb5kT3N/FDT607gd1HcN2v7dMgZ xaZYX63B+2AYqX71Hn/u5Ote3RnZ4gCVayx032roI5dbIlYlkSp+D1pWptxUfFG0 Q68xzBLinb/Vy0jsKp5Xjt3jQhd9IVrsjsNdQgVQ3HCow== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 256ed749 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 10 Jan 2024 07:43:41 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 06/34] gnu: Update coq-autosubst to 1.8. Date: Wed, 10 Jan 2024 08:43:07 +0100 Message-ID: <20240110074336.24651-6-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: pukkamustard * 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 473ce014a6..bfd55306a4 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -542,35 +542,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 @@ -581,7 +577,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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:07 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:08 +0000 Received: from localhost ([127.0.0.1]:41698 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFv-00083w-Gf for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:07 -0500 Received: from lepiller.eu ([2a00:5884:8208::1]:40392 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFi-0007zF-KV for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:43:55 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 48b36c71; Wed, 10 Jan 2024 07:43:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :cc:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=rAwND6FQb5q5FNFInfC5H9PUt wy8uYbTjhjaaBpUQAg=; b=HRLAb5nzpVYYHei8Jbvj4OiC2hd7Ib23qWWZiM0IP MVknAlNZ/luxZBXyqzLuARvbmR01BQVQN3dc/ERYHARF1KmqVRxMePqe4frO9WSv Gd7g5L8M5x4P/j6Vt15v/6onbpJdvrUSzKbDdDpZfGM8xDlBgNr0W5Uxrr/VQFx+ yYddsmpxE0EwS6NjUh/1hqHQ20FOItDHYMmIP3ThXJ1YYIXuohEKnOY477kL5Xl0 ujyoecbbZ2lprF5+g8/MfRhEqShtBbkX5WE37yNMpiYwGgvBN6SSlQKVe0gJ1Qum nx1PVuYALqk0TuPm+0wY5Ia86mNuKZl6u6hmoJ6kqUfGQ== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 348aea2e (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 10 Jan 2024 07:43:42 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 08/34] gnu: Update coq-interval to 4.8.0. Date: Wed, 10 Jan 2024 08:43:09 +0100 Message-ID: <20240110074336.24651-8-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: pukkamustard * 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 68a61c4b21..57f8489a18 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -495,7 +495,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) @@ -505,7 +505,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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:08 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:08 +0000 Received: from localhost ([127.0.0.1]:41700 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFv-000842-S6 for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:08 -0500 Received: from lepiller.eu ([89.234.186.109]:59318 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFj-0007zZ-5O for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:43:56 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 3d280b6d; Wed, 10 Jan 2024 07:43:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :cc:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=HgU54KzU7rTVkJHwj25m9uspr YhZJ557QQFoaN+ugTc=; b=UKuGYNUZ0cU4ACob8/9oRohjzSdA7ui6TDKjidQI9 r4GGjBCrtiOEA3ib1904P03GYDF+gz2VtfpWl3rtyOA4d300i10Fn3MrPc4BN2uy zFXxcTQAKA/1XPz1YPpD5OoU7XH1EU5kKY17KHbG8mU4CRDmlsg0tCk/qKM44Qwr d82oJeoHwgmRFSQTa6u9heOfo8tMzm7kXumGx2Ab9eRnHMIVzJv1Y0vwpwyxYvzT KKUbXQpUFbVtpG8WTWQesxxuRudZeX7wyfbMoNME/2GmmgVVkDWSNClXeWFOgEQy IlvwNxtYSZ+Nu8v+0D3T+uCVgJRzXjTr95DvTBLiQHeaw== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 3871403c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 10 Jan 2024 07:43:42 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 10/34] gnu: dune-bootstrap: Update to 3.11.0. Date: Wed, 10 Jan 2024 08:43:11 +0100 Message-ID: <20240110074336.24651-10-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: pukkamustard * 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 ddedbf3dc2..62ec570af2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1716,7 +1716,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 @@ -1725,7 +1725,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 @@ -1742,9 +1742,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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:08 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:08 +0000 Received: from localhost ([127.0.0.1]:41702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFw-000849-7y for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:08 -0500 Received: from lepiller.eu ([2a00:5884:8208::1]:40392 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFk-0007zF-1G for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:43:56 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 6eb2a012 for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=OKv3UgpJcQ1k9REuYuFunZKix XH9NHeZgoMDEi85pss=; b=GilYRCHxtw33VUTW50eIHjk7zyyp0EGxaCKvWFfWW fQpI/guwMh84JLSCpXm5Sp2f6aAmmXyfvdj8yDLHual4PpUSJaKj0NcQdpFB3dZL a0cRXaUKMOk1XycVXZ/g9NhWCqkpT9D5YYaObfMc/cp5J2WkhpM6bjrH0we7Zv+o 3cW4AyDnist4Pymc4JUYsB+nqJ5McpWJzO2XO2qcPSs5QmSBV+bZgX0qpSdH9cm2 HHEHbxy/aAi6A5jSH8va7YpqToDzFW4e2esHCSKP6Agvf37Ys86vgTLIm83przHi aJOt1PBrFGaiDR6+HJg/qPWrcUtRaDHe3RiFEQj/AbdyA== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 2b78a6de (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:43 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 12/34] gnu: ocaml-alcotest: Update to 1.7.0. Date: Wed, 10 Jan 2024 08:43:13 +0100 Message-ID: <20240110074336.24651-12-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/ocaml.scm (ocaml-alcotest): Update to 1.7.0. Change-Id: I87bb7eec4a8b36c499448685df3e11c2edaba31b --- 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 e890dec566..6bd42db9ae 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2467,7 +2467,7 @@ (define-public ocaml-astring (define-public ocaml-alcotest (package (name "ocaml-alcotest") - (version "1.6.0") + (version "1.7.0") (source (origin (method git-fetch) (uri (git-reference @@ -2476,7 +2476,7 @@ (define-public ocaml-alcotest (file-name (git-file-name name version)) (sha256 (base32 - "195612n7p8y5ba6n19glql7qffl8n3aqkl9nrlln5lb9739gpv4w")))) + "0v01vciihd12r30pc4dai70s15p38gy990b4842sn16pvl0ab1az")))) (build-system dune-build-system) (arguments `(#:package "alcotest" -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:09 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:09 +0000 Received: from localhost ([127.0.0.1]:41704 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFw-00084I-HP for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:09 -0500 Received: from lepiller.eu ([89.234.186.109]:59302 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFj-0007zA-1r for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:43:57 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id dba7fac4; Wed, 10 Jan 2024 07:43:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :cc:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=/wdRa9E/+/UQyyQuL5OJ3YXDU QywKbtiHK7upvb8b8A=; b=NES+EgftLIvrFb3M48UdjdwiLd1XA36z0IIiKapo5 YsRwGWFlitVaKSO4EmZJFtlZB1ev8yP4rhQ4lPgA4voOFkqfygwVSnIncwJCP2CB zAYyc/p97OZtIjCSucf6FlO/fewD9FHayc4X4lzsFenIRUnI7BqG7XaeBFbRW1Lc GN1KhUUmKkO8ahV0wqKl2BIpTHMnvGVyH9gpQX41LOifsQmCcShQdW85qKtlyH63 lgAVC/Mp/AAB63G75qFvR2SUpwmzIFT6j09lcqfvOjinfq48Md2qPnJ2k6TlY4tk G1hBzavR+m9nUntx99mtPlqh8TfoMqEck8xE2MculsxpA== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 78d7f009 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 10 Jan 2024 07:43:42 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 09/34] gnu: coq: Update to 8.17.1. Date: Wed, 10 Jan 2024 08:43:10 +0100 Message-ID: <20240110074336.24651-9-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard , Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: pukkamustard * 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 62242d8c62..c5b9ef6338 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1051,7 +1051,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 57f8489a18..105b942ad3 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) @@ -51,10 +52,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) @@ -64,28 +65,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") @@ -97,39 +105,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) @@ -148,7 +123,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)))) @@ -582,16 +557,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)) @@ -743,7 +718,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 @@ -774,7 +749,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") @@ -784,7 +759,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 - -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:09 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:09 +0000 Received: from localhost ([127.0.0.1]:41706 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFx-00084O-GN for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:09 -0500 Received: from lepiller.eu ([89.234.186.109]:59318 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFk-0007zZ-JJ for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:43:57 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 1b9f74c5 for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=ghcVZVrvkm7YB+d4AUTLNhYLn Z6vop+56aqmiMpbEiA=; b=FftDxRQRlVRcgjYkKSLUc2yCkXukD/PZuCwTwl6vi aLjaej4Hl8SHNTLKRVP5Rn6QwBj3Fns5Uo3M/ggrNmrLTlidx2JOMDo6xWLmo01I 4ORYxFVYIr41NyTbaTWOEOlQ8KidgxWKOUmXx8eAGs2rzAcviHChFRHkY4lKhN3k rHl5zfTUwRXQ6n3/NYkSf9SDEqOfaVTc1A11Bzo17M/WO8gox7fruDivzECwIY3e vdrsnVAr1X3by72OYK1Imv13tgAntnGlU6noyh680HVwybRpFQo8kSiTmMT9PBrN DG+zQP/tgZbF6GBMWRbKMYVn1Mqax4Ah6ctqPUL7Uqx2g== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 5cb488bf (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:43 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 13/34] gnu: ocaml-sexplib: Update to 0.16.0. Date: Wed, 10 Jan 2024 08:43:14 +0100 Message-ID: <20240110074336.24651-13-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/ocaml.scm (ocaml-sexplib): Update to 0.16.0. --- 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 6bd42db9ae..c3095df3a2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6009,7 +6009,7 @@ (define-public ocaml-parsexp (define-public ocaml-sexplib (package (name "ocaml-sexplib") - (version "0.15.1") + (version "0.16.0") (home-page "https://github.com/janestreet/sexplib") (source (origin (method git-fetch) @@ -6019,7 +6019,7 @@ (define-public ocaml-sexplib (file-name (git-file-name name version)) (sha256 (base32 - "1gcvcc0jw6pb69wwfjnaqz1jk5simap2kdb7g43v7v7mksg8sh9f")))) + "0hl0zf2cgjivvlsrf85f5lg4xprcgbz7qg2z51k838y7k2121k78")))) (build-system dune-build-system) (propagated-inputs (list ocaml-base ocaml-num ocaml-parsexp ocaml-sexplib0)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:10 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:10 +0000 Received: from localhost ([127.0.0.1]:41708 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFx-00084V-RQ for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:10 -0500 Received: from lepiller.eu ([2a00:5884:8208::1]:40392 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFl-0007zF-4D for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:43:58 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 070a6812 for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=4ag62xBcYNjyCE56/5cJXF2pC BvKDgtAm1v/9yy5mYI=; b=NGJIsDIHOVreGuTdDvaFnrlsqNXl0a5X6D2HSM/yw akRuQILhlC++HvK4OChIcmtsoTkH4hOFu445NzDFRYwSHXGz3EmhCc12cWF7PGRQ GHNKZUr1FXzNzeaO+SYpQwllXj6ieoKSsKZXckcbej1AXYKdhArnTM2M8efHrRFz FVQhf59qTrWFyNRakK0+aBb9tSTEkECWRA98SQ/5SuuPY/EooPPx8O5SvARv6VLE dRtgc3SHVGBrVc9vKGy7XpjS0lA/FtXmer5s/PI0YovDHK3hD1chvkDBTccW5IN2 8RgmIPv5an60rM97ReokPLtcvlkMQKA88/VLsU/UOG7sw== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 266e8191 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:43 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 14/34] gnu: ocaml-ppxlib: Update to 0.28. Date: Wed, 10 Jan 2024 08:43:15 +0100 Message-ID: <20240110074336.24651-14-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/ocaml.scm (ocaml-ppxlib): Update to 0.28. (ocaml-sedlex): Update to 2.6. (ocaml-ppx-sexp-conv): Update to 0.15.1. (ocaml-bisect-ppx): Update to 2.8.3. --- gnu/packages/ocaml.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c3095df3a2..56ef2abcfe 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3390,7 +3390,7 @@ (define-public ocaml-gen (define-public ocaml-sedlex (package (name "ocaml-sedlex") - (version "2.5") + (version "2.6") (source (origin (method git-fetch) (uri (git-reference @@ -3399,7 +3399,7 @@ (define-public ocaml-sedlex (file-name (git-file-name name version)) (sha256 (base32 - "062a5dvrzvb81l3a9phljrhxfw9nlb61q341q0a6xn65hll3z2wy")))) + "1z8mmk1idh9hjhh2b9rp5b1h8kmzcxhagqkw0pvxn6ykx1brskq1")))) (build-system dune-build-system) (arguments `(#:tests? #f ; no tests @@ -6238,7 +6238,7 @@ (define-public ocaml-cinaps (define-public ocaml-ppxlib (package (name "ocaml-ppxlib") - (version "0.25.1") + (version "0.28.0") (home-page "https://github.com/ocaml-ppx/ppxlib") (source (origin @@ -6249,7 +6249,7 @@ (define-public ocaml-ppxlib (file-name (git-file-name name version)) (sha256 (base32 - "1402fzv5mg5grf3hb82fqsdkzxk07yfp9hvjh33dzjwjsqfhx3wi")))) + "0alwn1bnc228z6ivj7dpcszrylbg1z3img8vrcihaa9crbx3xxcb")))) (build-system dune-build-system) (arguments `(#:phases @@ -6393,7 +6393,7 @@ (define-public ocaml-ppx-fields-conv (define-public ocaml-ppx-sexp-conv (package (name "ocaml-ppx-sexp-conv") - (version "0.15.0") + (version "0.15.1") (home-page "https://github.com/janestreet/ppx_sexp_conv") (source (origin @@ -6404,7 +6404,7 @@ (define-public ocaml-ppx-sexp-conv (file-name (git-file-name name version)) (sha256 (base32 - "1fyf7hgxprn7pj58rmmrfpv938a0avpzvvk6wzihpmfm6whgbdm8")))) + "163kn5gv1va84s1ysa1fm40fw3hm9xm3788qsvxmm4l3gij2g29m")))) (build-system dune-build-system) (propagated-inputs (list ocaml-base ocaml-ppxlib)) @@ -7768,7 +7768,7 @@ (define-public ocaml-tyxml (define-public ocaml-bisect-ppx (package (name "ocaml-bisect-ppx") - (version "2.8.1") + (version "2.8.3") (source (origin (method git-fetch) @@ -7778,7 +7778,7 @@ (define-public ocaml-bisect-ppx (file-name (git-file-name name version)) (sha256 (base32 - "0562rwwnhqlf5alxl1wd1n0xs0k4aamxafrh8bbmh5yl3i5rxrx4")))) + "1albx01qvr4fax4wkdmy0dd21q0fd9ixsgsvnr1z32ngj9nyi9fy")))) (build-system dune-build-system) (propagated-inputs (list ocaml-ppxlib ocaml-cmdliner)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:10 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:10 +0000 Received: from localhost ([127.0.0.1]:41710 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFy-00084d-8G for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:10 -0500 Received: from lepiller.eu ([89.234.186.109]:59302 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFl-0007zA-Hv for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:43:58 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 78a1ae51 for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=cO2lzs70ti3ThOXjBV2qNaQ2G 1ETO1xLkf92VZITQas=; b=dS1DBrZF33PMwYHiL20Y4zWzRhZTnlCwVoNal9Y+N amlX9XKy82E6d67zKzRIKqXlrMLfxvRCPD0pXGIel44A6NH4sWdpxiCq/3OiEFs5 ijdZaNw9+t4bd9WZHx/11r/F8sNq1kO2qyYRFrDHxug2ZmqAOlTXBZC034HEa/IK NPdEgK349j5mSQSETyD98jU38Wl3fnZXqqKUG6N3UzZdP9kTOcUN3UbPJE7kP6MZ xwY10tiCC8mpMAGNxVHOw9YSJG+XsPMqe7NqjN4fg4qW5rgBEIHWjz5yOB94TbiQ V7v48WAQGFAnhWnTi32psk/94wXZmiDrbml0blAJ60g1Q== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 463b8383 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:44 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 15/34] gnu: Add ocaml-ppx-stable-witness. Date: Wed, 10 Jan 2024 08:43:16 +0100 Message-ID: <20240110074336.24651-15-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/ocaml.scm (ocaml-ppx-stable-witness): New variable. --- gnu/packages/ocaml.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 56ef2abcfe..062bef401a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6467,6 +6467,30 @@ (define-public ocaml-ppx-custom-printf string conversion.") (license license:asl2.0))) +(define-public ocaml-ppx-stable-witness + (package + (name "ocaml-ppx-stable-witness") + (version "0.16.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_stable_witness") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ppmazy1vw0j44z1p60ln6fddz414zmyrqkpi54w6cr93giqsl2v")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-base ocaml-ppxlib)) + (properties `((upstream-name . "ppx_stable_witness"))) + (home-page "https://github.com/janestreet/ppx_stable_witness") + (synopsis "Mark a type as stable across versions") + (description "This ppx extension is used for deriving a witness that a +type is intended to be stable. In this context, stable means that the +serialization format will never change. This allows programs running at +different versions of the code to safely communicate.") + (license license:expat))) + (define-public ocaml-bin-prot (package (name "ocaml-bin-prot") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:11 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:11 +0000 Received: from localhost ([127.0.0.1]:41712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFy-00084k-JC for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:11 -0500 Received: from lepiller.eu ([2a00:5884:8208::1]:36422 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFj-00080C-Lf for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:43:58 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 777f5bc3; Wed, 10 Jan 2024 07:43:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :cc:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=YYT4qYojvbdXNXP774up2dspz qQEbxFVJHPhnZ+9srY=; b=f0YqxuyUjqbeVX14+JEhwG9nf78WyXgb2cq+BcYej 7S95lL25TSHfRJFDiN/TBtAn8hHBBK2L9CLOK6xV9aXjayxRJ7LoUBQfGnB5Am58 C6/8qQ4Jw0uOBv4P1u61f3ld6HIrlV2GS7D10wf3i+ocyk5LSc3qDvcqTC+uyryt ixYcwZNIub8JHkouwAHBb0y6aj6schJzM58TbdyCtq0cdsELSRG0cpblAmfogIn0 TTP3AgOx6K1MWuQPZSPSCgOGww1OhUIWmbb8qFVojp44ybzMBsewVB/98l99x4Mm Xct4hDwGXh1vPdPYUzD8/ceg//1NDTyGB3RhQ/q+ggGAg== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id e0bb6802 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 10 Jan 2024 07:43:43 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 11/34] gnu: opam: Split build into smaller sub-packages. Date: Wed, 10 Jan 2024 08:43:12 +0100 Message-ID: <20240110074336.24651-11-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: pukkamustard * 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 62ec570af2..e890dec566 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 @@ -2071,7 +2179,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 @@ -2101,7 +2209,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 @@ -2189,7 +2297,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 @@ -2304,13 +2412,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") @@ -2336,9 +2444,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") @@ -2539,7 +2647,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") @@ -2663,7 +2771,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 @@ -3107,7 +3215,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) @@ -3141,7 +3249,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))) @@ -3171,7 +3279,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) @@ -3245,7 +3353,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 @@ -3365,7 +3473,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 @@ -3391,9 +3499,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))) @@ -3438,7 +3546,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" @@ -3479,9 +3587,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))) @@ -3899,7 +4007,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 @@ -4769,7 +4877,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))) @@ -5305,12 +5413,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 @@ -5338,7 +5442,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) @@ -8105,7 +8209,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 @@ -8133,7 +8237,7 @@ (define-public ocaml-uucp (modify-phases %standard-phases (delete 'configure)))) (native-inputs - (list opam + (list opam-installer ocaml-findlib ocamlbuild ocaml-topkg @@ -8167,7 +8271,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 @@ -8628,8 +8732,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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:12 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:12 +0000 Received: from localhost ([127.0.0.1]:41714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFz-00084s-Ob for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:12 -0500 Received: from lepiller.eu ([89.234.186.109]:59318 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFl-0007zZ-L2 for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:43:58 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id bcba2b2b for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=urxdlNiPNXMdrHU5gHXcG114q /yDOetUG2Lgk2olLng=; b=MgLE1Go9o+oMUullHukGij90tEA29DnKLDjgybnkr 8x8NlruozxzxgOOOgii0c5ElXHuSeKWas4tw0NhQkI2DFL3NQKEu4YuGD9MxwCAM MwBoZ6GlHkqHxw9REX0cq/+RdfRhaqPVViL552/d5CKowNfc/bN6bsiJDN0Iep+6 KqDvXydW5zLkel4i3MK7HJtUtHQw2b5Fu2yk5tkDaT+ghTUX2UFvfG3IHqwkjF3y QqXPuXRIxXCpwcbvQAHG3BHNCkJ7wgC0DmQWl7hGsvkDz6/ZUbPw8fC6+39eORSG Y07BJdCYW+4QAqrx4fAa8zY663KRLyHV+OMmaVKBIwLtw== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 71241bc1 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:44 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 16/34] gnu: ocaml-bin-prot: Update to 0.16.0. Date: Wed, 10 Jan 2024 08:43:17 +0100 Message-ID: <20240110074336.24651-16-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/ocaml.scm (ocam-bin-prot): Update to 0.16.0. (bap)[arguments]: Fix code after ocaml-bin-prot changes. --- gnu/packages/ocaml.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 062bef401a..dcb66d7f59 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5036,6 +5036,11 @@ (define-public bap ;; We don't have a monolithic llvm (substitute* "oasis/llvm.setup.ml.in" (("llvm_static = \"true\"") "true")) + ;; Package update removed Make_binable, which was an alias + ;; for Make_binable_without_uuid + (substitute* (find-files "." ".") + (("Utils.Make_binable1\\(") "Utils.Make_binable1_without_uuid(") + (("Utils.Make_binable\\(") "Utils.Make_binable_without_uuid(")) (invoke "./configure" "--prefix" (assoc-ref outputs "out") "--libdir" @@ -6494,7 +6499,7 @@ (define-public ocaml-ppx-stable-witness (define-public ocaml-bin-prot (package (name "ocaml-bin-prot") - (version "0.15.0") + (version "0.16.0") (source (origin (method git-fetch) @@ -6503,7 +6508,7 @@ (define-public ocaml-bin-prot (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1qfqglscc25wwnjx7byqmjcnjww1msnr8940gyg8h93wdq43fjnh")))) + (base32 "1ybs0152ilgr8sa1hqnc2jj0gbvg855ixl3c5b2pjbnk7blhqnd8")))) (build-system dune-build-system) (propagated-inputs (list ocaml-base @@ -6512,6 +6517,7 @@ (define-public ocaml-bin-prot ocaml-ppx-fields-conv ocaml-ppx-optcomp ocaml-ppx-sexp-conv + ocaml-ppx-stable-witness ocaml-ppx-variants-conv)) (properties `((upstream-name . "bin_prot"))) (home-page "https://github.com/janestreet/bin_prot") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:12 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:12 +0000 Received: from localhost ([127.0.0.1]:41716 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTG0-00084z-3S for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:12 -0500 Received: from lepiller.eu ([2a00:5884:8208::1]:40392 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFm-0007zF-98 for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:43:59 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 4cd0362d for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=Om73u9DSqjicqTJanIZOV1F6H N3dOcLbKrd0i1YMiAI=; b=Ttp3MXPqse4xwwhVcbG0uyNmEmsBxIB7Ie9y+ngaZ rHl6d7Ey6Lq43yrA1T0GeWC1o8PbLHDu2P0iiTelPP4QgypiG1zRvk4QM+wU45az wnEuiJLBHdCynAU/rzWw1zIHnJi9b00zefQCNlFVoXHJK3rpR6Ze1IN9DoGlPRW+ LrRM+Sn2sADJJEhtuYnZqW+qhsKFgZOnpQH/b3tnfigyfrhU8BM1hBvMRrDy+WxD mvCYzFderECLwQ4B5ywetgnGSAv+qw/EjrtkYUI7u3vKEf6s1BSgiQiIP59JNcSl Y8s/t7Ft75G8lfYXfdqRcq9pY7JWg5/cdwCIyUvPMTNdA== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id b3b9edc9 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:44 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 17/34] gnu: ocaml-ppx-bin-prot: Update to 0.16.0. Date: Wed, 10 Jan 2024 08:43:18 +0100 Message-ID: <20240110074336.24651-17-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/ocaml.scm (ocaml-ppx-bin-prot): Update to 0.16.0. --- 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 dcb66d7f59..64cf9eef0d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7141,7 +7141,7 @@ (define-public ocaml-ppx-base (define-public ocaml-ppx-bin-prot (package (name "ocaml-ppx-bin-prot") - (version "0.15.0") + (version "0.16.0") (source (origin (method git-fetch) @@ -7150,7 +7150,7 @@ (define-public ocaml-ppx-bin-prot (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1280wsls061fmvmdysjqn3lv4mnkyg400jnjf4jyfr14s33h1ad5")))) + (base32 "091l1gvgbibrqzy9a31vz03wzfs7z5zmk5ldl5yvg742x7idmmwj")))) (build-system dune-build-system) (arguments ;; Cyclic dependency with ocaml-ppx-jane -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:12 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:12 +0000 Received: from localhost ([127.0.0.1]:41718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTG0-000857-D9 for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:12 -0500 Received: from lepiller.eu ([89.234.186.109]:59302 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFm-0007zA-NI for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:43:59 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 56565400 for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=eMgf+A1jYWtxBCXG01gofpDWH elBIAZRQBB0Wb+tfcg=; b=j1FO3R1AK/28b4n4f8e4BtDSYJPelq6kfVp9yckAg tjysbyDmDk6kv+AFuC5/g/rGdOptH/61pP6FSROBTCYESsOsC7PCmB0YYW8gSNup A3TgtcAVNVuOs6BVBTuWLtdmdL52poGQ/AlFeBTW0EZpIq4FfyLRQNFSlE4g6yD8 LqAGiU3NUBmjPWAiZI8qPnrFvCG48HNE1FKTBYZvsMmHx3cShZ09uMdMqX0Vtr9V y/MdFN57yYwt7AkXkynIkskl+aSThJqgdUvXw3eIFswL1MrXSDNi9LCw/2g4ifVR j+iAEdIKnOB4OUHSLDYsCWjSxvrqG9m5Ayli/8/u0AXaw== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id c4f8f8bf (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:44 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 18/34] gnu: ocaml-jst-config: Update to 0.16.0. Date: Wed, 10 Jan 2024 08:43:19 +0100 Message-ID: <20240110074336.24651-18-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/ocaml.scm (ocaml-jst-config): Update to 0.16.0. --- 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 64cf9eef0d..76ae9af6ac 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5489,7 +5489,7 @@ (define-public dedukti (define-public ocaml-jst-config (package (name "ocaml-jst-config") - (version "0.15.1") + (version "0.16.0") (source (origin (method git-fetch) @@ -5499,7 +5499,7 @@ (define-public ocaml-jst-config (file-name (git-file-name name version)) (sha256 (base32 - "1yp5p63clvaxmkf7vlasgyapxc31x29c154pyq63n0fvi2fpf4y3")))) + "01419gk2w2r1xqz11rw1glngi8fi6gq9sh79c06vasrk6vxriy0s")))) (build-system dune-build-system) (arguments '(#:tests? #f)) ; no tests (propagated-inputs -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:13 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:13 +0000 Received: from localhost ([127.0.0.1]:41720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTG0-00085E-ON for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:13 -0500 Received: from lepiller.eu ([89.234.186.109]:46418 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFm-000810-Oh for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:43:59 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 849984e6 for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=nJr8bBVksQdtGTZJYxxz+YXFS 3v/8C0Wy6Ng8tKvNqM=; b=czCZHGR7femOlOs8MlkpgWWx45dMOxphAaFTwBVz9 i/rnQ51XGF6yj02X48j67W2LzbBRDShdM3v3R+lbqFRzQJSFMIHcOEUXh47mFWW5 1L6tAKlztTRL9V8ikemaWbcNRzUsFbWL7Yb5xcWdqKqw3SqQ0FzJKMcok3G1PJCu EdQ3hIvzNZcqU6BSweV4/ccK2wXFHRrvJFu4KVwLQ0mH3KL4Cdc/ZL2alhjd0sIE qU8I4cB54j2alv9qXVCqVLXXl8J+v1J235AlkYkXyG4MWiLZBc3wNU2tFPtov4+r Dug8HeJe0dEcF+9d/BNQedPKvIyABRrfCUOr7T9FOrdsQ== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id f1f0be68 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:44 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 19/34] gnu: ocaml-ppx-bench: Update to 0.16.0. Date: Wed, 10 Jan 2024 08:43:20 +0100 Message-ID: <20240110074336.24651-19-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/ocaml.scm (ocaml-ppx-bench): Update to 0.16.0. Change-Id: If65570f4baff82200bf30c0277f2dccad9e23732 --- 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 76ae9af6ac..cba67159ac 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6649,7 +6649,7 @@ (define-public ocaml-ppx-enumerate (define-public ocaml-ppx-bench (package (name "ocaml-ppx-bench") - (version "0.15.0") + (version "0.16.0") (source (origin (method git-fetch) @@ -6658,7 +6658,7 @@ (define-public ocaml-ppx-bench (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0bc0gbm922417wqisafxh35jslcp7xy1s0h0a1q32rhx0ivxx3g6")))) + (base32 "0pry0vgi1ilwdi5viqydyf9n7y289c17s8wfn16wyzzfr887769m")))) (build-system dune-build-system) (arguments ;; No tests -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:13 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:13 +0000 Received: from localhost ([127.0.0.1]:41722 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTG1-00085L-1k for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:13 -0500 Received: from lepiller.eu ([2a00:5884:8208::1]:36422 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFm-00080C-Sb for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:00 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id a1ebd9ce; Wed, 10 Jan 2024 07:43:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :cc:subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=6/vY11pB22U0 +eYvNCj+6rqxvVFd5V9ulrGBWc6NfAE=; b=K6BXoCpLl6uUlhAAGYzHeKq4YHMj nhHQJWOQKtXG56RwJXrpJVhMYUPtgiUzpUX2Gu+9PkS8JUKn69ZMjwOV1Uif5eLh 3XudLjK5MgiK2Ed09opD0qXbmM8aCb+tHh1sIZ7rL5ks/axwxzGkOS+uXkiC7Ob3 /HdDv7kUdL+W4uucu0UbOLfNjSX66VzvCits/gOV37Fq1g1yq79EjanQTkLykPva 6w0Y2mGzh8gQOwTWRqYYmgBrTN5yyH4JXrQ5IW3gSdcrGQAjhVWdIQlUbPdVRU4Q 6GXPjPAa8ox563Io3AfD6HRNASNhMbwNoLyiafQ64aPiauNaGDvrzQclTg== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id f8ff400b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 10 Jan 2024 07:43:45 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 20/34] gnu: Add ocaml-ppx-deriving-yojson. Date: Wed, 10 Jan 2024 08:43:21 +0100 Message-ID: <20240110074336.24651-20-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: Arnaud DABY-SEESARAM X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Arnaud DABY-SEESARAM * gnu/packages/ocaml.scm (ocaml-ppx-deriving-yojson): New variable. Change-Id: I3f5dfdf39c7e7d9655fc26ee6cc88a2c30485d57 --- gnu/packages/ocaml.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index cba67159ac..49d6ea9f4d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2022 Garek Dyszel ;;; Copyright © 2023 Csepp ;;; Copyright © 2023 Foundation Devices, Inc. +;;; Copyright © 2023 Arnaud DABY-SEESARAM ;;; ;;; This file is part of GNU Guix. ;;; @@ -6210,6 +6211,31 @@ (define-public ocaml-ppx-derivers as part of the same ocaml-migrate-parsetree driver.") (license license:bsd-3))) +(define-public ocaml-ppx-deriving-yojson + (package + (name "ocaml-ppx-deriving-yojson") + (version "3.7.0") + (home-page "https://github.com/ocaml-ppx/ppx_deriving_yojson") + (source + (origin + (method url-fetch) + (uri (string-append home-page "/archive/refs/tags/v" version ".tar.gz")) + (sha256 + (base32 "1h7vz7lhvsgn6nl68g3dhhghlm884xpa1xawm6wm54pjc57gc6xx")))) + (build-system dune-build-system) + (propagated-inputs + (list ocaml-yojson + ocaml-result + ocaml-ppx-deriving + ocaml-ppxlib)) + (native-inputs (list ocaml-ounit)) + (properties `((upstream-name . "ppx_deriving_yojson"))) + (synopsis "JSON codec generator for OCaml") + (description + "ppx_deriving_yojson is a ppx_deriving plugin that provides a JSON codec +generator.") + (license license:expat))) + (define-public ocaml-cinaps ;; The commit removes the unused dependency of ocaml-ppx-jane. We need to ;; use this as we would otherwise have a dependency loop between -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:13 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:13 +0000 Received: from localhost ([127.0.0.1]:41724 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTG1-00085T-F4 for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:13 -0500 Received: from lepiller.eu ([89.234.186.109]:59318 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFm-0007zZ-UJ for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:00 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 9ba148af; Wed, 10 Jan 2024 07:43:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :cc:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=BGR0SstFgygAFkhcLbLJY8cyO XM6HByJbZoWdskrOOc=; b=m30WS5WfANionTgRTki9cYo+mMtr3HI7k6H4eDdKL rmKhlDDHqm72ilGxWh8e2XtmXj4xfSwx/sV5Q2zZbCIrt2lGQumDPJYN9BP59Wr3 GTMFdpdF32UKAzck07mwAyYcUqY7QO0/MjkfzPobl1Qcu+o4NO9T5vYC3Ms6eSMF JyfbN+5YWatQPPZ13h1GwF3kcwW7+wUlcHE3O7HyiwsMpwZNqt+Roo+hgAlhamMv qTxvSHna6hITzYfilKp6ANCMo3RLyjVNmeXlPaQWfd7ojXpqcG/+3/KvJvoRRyHz 3oZIbUEoR5bgxHfodg/LM8iCYxC2Qs1dv8ILxSJszjvdg== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id f8776272 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 10 Jan 2024 07:43:45 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 21/34] gnu: Add ocaml-junit. Date: Wed, 10 Jan 2024 08:43:22 +0100 Message-ID: <20240110074336.24651-21-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: Arnaud DABY-SEESARAM X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Arnaud DABY-SEESARAM * gnu/packages/ocaml.scm (ocaml-junit): New variable. Change-Id: I69fd4302b0a178765a79a72801eed694b3bd3ebd --- gnu/packages/ocaml.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 49d6ea9f4d..93da7dab2c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1618,6 +1618,36 @@ (define-public ocaml-ounit other XUnit testing frameworks.") (license license:expat))) +(define-public ocaml-junit + (package + (name "ocaml-junit") + (version "2.0.2") + (home-page "https://github.com/Khady/ocaml-junit") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1cam7zzarrh9p1l5m3ba3h5rkh9mhark8j37rjgw35a66qd0gds1")))) + (build-system dune-build-system) + (arguments + `(#:package "junit" + #:phases (modify-phases %standard-phases + (add-before 'build 'dune-subst + (lambda _ + (invoke "dune" "subst") #t))))) + (properties `((upstream-name . "junit"))) + (propagated-inputs (list ocaml-ounit ocaml-ptime ocaml-tyxml ocaml-odoc)) + (synopsis "JUnit XML reports generation library") + (description "Ocaml-junit is a package for the creation of JUnit XML +reports. It provides a typed API to produce valid reports. They are supposed +to be accepted by Jenkins.") + ;; with OCaml linking exception + (license license:gpl3+))) + (define-public camlzip (package (name "camlzip") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:14 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:14 +0000 Received: from localhost ([127.0.0.1]:41726 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTG1-00085a-Qy for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:14 -0500 Received: from lepiller.eu ([2a00:5884:8208::1]:40392 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFn-0007zF-A9 for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:00 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 546a8d9f; Wed, 10 Jan 2024 07:43:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :cc:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=GsXJ7KdtB7vtmpNevbpxSxXmr ceji6y1vmPFx7WISd4=; b=F8omr2W1qXzK2Y1+raCDn2hVDIRNTv7lj5WxgzIrn K5U4nnLb6BWXhmB9xoxXl6/Rv/NtUgk4G6yrmoDQkaL3fzFBUYTIOGSfUMneYHXG v52DYx/+leNqxQB79ycMOlgdHBpBHSTOvqrLaKaiE73MVNaOXIYDoNSJf/MDw12t 9FjHxnz8hrBQ4UdoSeAjQhIYQz/xA66WyKu/aqxEUpXaULFsaenNybxQmP1uJgj8 XiwLGfP+Ck8V9T21VMGiywYD2HY6p4LJx6LRpgrhAPgYDDhsp+tRiCiyBi965UNk EBbeItqzayu/mkXhL8IRnyAxkI23KQAnSY9pNoxK8QUfg== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id bb86c693 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 10 Jan 2024 07:43:45 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 22/34] gnu: Add ocaml-junit-alcotest. Date: Wed, 10 Jan 2024 08:43:23 +0100 Message-ID: <20240110074336.24651-22-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: Arnaud DABY-SEESARAM X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Arnaud DABY-SEESARAM * gnu/packages/ocaml.scm (ocaml-junit-alcotest): New variable. Change-Id: I377bbba90e8625a47680643db2ef84fabbe60908 --- gnu/packages/ocaml.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 93da7dab2c..8cfa1ab300 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1648,6 +1648,22 @@ (define-public ocaml-junit ;; with OCaml linking exception (license license:gpl3+))) +(define-public ocaml-junit-alcotest + (package + (inherit ocaml-junit) + (name "ocaml-junit-alcotest") + (propagated-inputs (list ocaml-odoc ocaml-alcotest ocaml-junit)) + (build-system dune-build-system) + (arguments + `(#:package "junit_alcotest" + #:tests? #f)); tests fail + (properties `((upstream-name . "junit_alcotest"))) + (synopsis "JUnit XML reports generation for alcotest tests") + (description "This package generates JUnit XML reports from ocaml-alcotest +test suites.") + ;; with OCaml linking exception + (license license:gpl3+))) + (define-public camlzip (package (name "camlzip") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:14 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:14 +0000 Received: from localhost ([127.0.0.1]:41728 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTG2-00085h-6m for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:14 -0500 Received: from lepiller.eu ([89.234.186.109]:59302 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFn-0007zA-LF for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:00 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 32009021; Wed, 10 Jan 2024 07:43:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :cc:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=thZNE+LFJH8VkKCCD455zY96F WbU2M50wXmHxOn+E9A=; b=fbUwF+SgX6q1EsucAsLFRgA/zO1DKTIgVDEryWUqn Fq/sKCIUFjTipFFMXFaLOpu8TpSgvhDlMrDFB2MDQIWm5Mcw9W9vS8In1oCWk0pN CpYx+6zAXyhLyPAtCnTqSE4e5925MGVlVveubmfw5zlmU39WPZu/EoJnmi9H+MX2 pEz9+wz9Pjd7B2KYliRAIWVmsN3QN0wEqhNqbRGNCixcahD/IyFAr+Tps6V86Rl+ RjierGqofc4basYJWhVzwp3U7xZGGruJ4toWX0HS2aY6VF4ccWB1Q3O9LFTz5Jg5 bIrwRneZB61tT2994xvFPQivgvIFRVG4iy/3n5PDjUoeg== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 87e15425 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 10 Jan 2024 07:43:46 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 23/34] gnu: Add ocaml-yaml. Date: Wed, 10 Jan 2024 08:43:24 +0100 Message-ID: <20240110074336.24651-23-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: Arnaud DABY-SEESARAM X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Arnaud DABY-SEESARAM * gnu/packages/ocaml.scm (ocaml-yaml): New variable. Change-Id: Ia890e505dd3ff0fe9a8c243adef460e0475d9e81 --- gnu/packages/ocaml.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8cfa1ab300..3e7f99407a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2611,6 +2611,39 @@ (define-public ocaml-ppx-tools syntactic tools.") (license license:expat))) +(define-public ocaml-yaml + (package + (name "ocaml-yaml") + (version "3.2.0") + (home-page "https://github.com/avsm/ocaml-yaml") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "054ca6071bfkdbm5vlmnk6ic43561xl9igv87zgkbq4qry16a7s7")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-ppx-sexp-conv ocaml-ctypes ocaml-bos)) + (native-inputs (list ocaml-fmt + ocaml-sexplib + ocaml-logs + ocaml-mdx + ocaml-alcotest + ocaml-crowbar + ocaml-junit-alcotest + ocaml-ezjsonm)) + (synopsis "Parse and generate YAML 1.1/1.2 files") + (description + "This package is an OCaml library to parse and generate the YAML file +format. It is intended to be interoperable with the @code{Ezjsonm} +JSON handling library, if the simple common subset of Yaml is used. Anchors and +other advanced Yaml features are not implemented in the JSON compatibility +layer.") + (license license:isc))) + (define-public ocaml-parmap (package (name "ocaml-parmap") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:14 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:15 +0000 Received: from localhost ([127.0.0.1]:41730 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTG2-00085t-J6 for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:14 -0500 Received: from lepiller.eu ([89.234.186.109]:46418 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFn-000810-QN for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:00 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 0a849b96; Wed, 10 Jan 2024 07:43:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :cc:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=cayqrsfjff0j4MteWoiqGRMwE R6bJgI7coDUhxoB0lM=; b=P8hHWP/oFRBguwMh2QVlauXX3zNupbGPiVpyKv+Y7 l92OsRCN/meYJwGjI+oePkumv5RdO+ygmn4OWpQICBf5fQGJrP58OiskhBUMnsji u6F7hXNPKDOUJi5DuXQOjOatfUG7GDuUFv1kuoST9Hdlbqh3x2F+yFjyi4yZHO5L ZPhtlZPTNRoqUDO/17pkXHQN0BUVX42lkzbR2CtxQiX2nuEEgU3RN9E33n3M+q+J rbyMBYfDE8B/PnCLrnOKguyV0ptUispCBlacsKDoE27TXtjO0JvIzXpQrUChjSPo GTPgNrw3eNoxV8jaBGtsCOyrpraL3jEPNCfN/ewebxj9A== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 4e7fe921 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 10 Jan 2024 07:43:46 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 24/34] gnu: Add ocaml-ppx-deriving-yaml. Date: Wed, 10 Jan 2024 08:43:25 +0100 Message-ID: <20240110074336.24651-24-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: Arnaud DABY-SEESARAM X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Arnaud DABY-SEESARAM * gnu/packages/ocaml.scm (ocaml-ppx-deriving-yaml): New variable. Change-Id: I2677ce5b630b77abdec7743cd25c4193ca7b351e --- gnu/packages/ocaml.scm | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3e7f99407a..2a513bf149 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2621,10 +2621,10 @@ (define-public ocaml-yaml (method git-fetch) (uri (git-reference (url home-page) - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "054ca6071bfkdbm5vlmnk6ic43561xl9igv87zgkbq4qry16a7s7")))) + (base32 "1m0i9qdazmziswfw1bz4m1x9mlzqyv336vbrss0c21am4im9n6k6")))) (build-system dune-build-system) (propagated-inputs (list ocaml-ppx-sexp-conv ocaml-ctypes ocaml-bos)) (native-inputs (list ocaml-fmt @@ -2644,6 +2644,31 @@ (define-public ocaml-yaml layer.") (license license:isc))) +(define-public ocaml-ppx-deriving-yaml + (package + (name "ocaml-ppx-deriving-yaml") + (version "0.2.1") + (home-page "https://github.com/patricoferris/ppx_deriving_yaml") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1cxcqgvyl4ykyl86mf2d4ka6frnq51m1yqy0z5v6vdxkixllf9jd")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-ppxlib ocaml-ppx-deriving ocaml-yaml + ocaml-odoc)) + (native-inputs (list ocaml-alcotest ocaml-bos ocaml-mdx ocaml-ezjsonm)) + (properties `((upstream-name . "ppx_deriving_yaml"))) + (synopsis "Yaml PPX Deriver") + (description + "This package contains @code{deriving} conversion functions to and from +yaml for OCaml types.") + (license license:isc))) + (define-public ocaml-parmap (package (name "ocaml-parmap") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:15 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:15 +0000 Received: from localhost ([127.0.0.1]:41732 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTG2-00085w-TX for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:15 -0500 Received: from lepiller.eu ([2a00:5884:8208::1]:36422 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFo-00080C-FH for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:01 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 666efbc2; Wed, 10 Jan 2024 07:43:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :cc:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=QubVgs12RQlvl+Ztw1SxmzoQ3 wwhuEejuasVgS/ORqo=; b=CUH7iPy3x2BkA6KVwO/hbaTXIR1qyklN6GEENQGUl 2i8mZIf3AoOM61CeNhd5l8nyqse5lQXxTZXh2gjDmS5oHw/zX6EIXNdDQ9O08Got lzFLcU/Ol9AlmPJT/Hg26X2r1q8+mxan3R8kIgcIKNbA9iPiJ7q/jfhvyz3GJxkv z1nIdsFiDAneD2f3kETWAlTBKgDP6/ZMXA/KhncQZyvYftzo9RJvSKOkeI8KeRI2 XJHRG7MfSpDsmhXWK2vboDswww0XEWXEzWq3Wezl3ARRcUKY0m5I9GcmLqOTEJA7 Q8Yz7efBs4+xuZvSo3bHhQ/FZl85xy5c4llHk6AflekbQ== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 5456791b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 10 Jan 2024 07:43:46 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 25/34] gnu: Add ocaml-ppx-import. Date: Wed, 10 Jan 2024 08:43:26 +0100 Message-ID: <20240110074336.24651-25-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: Arnaud DABY-SEESARAM X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Arnaud DABY-SEESARAM * gnu/packages/ocaml.scm (ocaml-ppx-import): New variable. Change-Id: Ie9619653f2b3ecc4458394709e37c4a433f875dd --- gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 2a513bf149..c2927e4f70 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2669,6 +2669,31 @@ (define-public ocaml-ppx-deriving-yaml yaml for OCaml types.") (license license:isc))) +(define-public ocaml-ppx-import + (package + (name "ocaml-ppx-import") + (version "1.10.0") + (home-page "https://github.com/ocaml-ppx/ppx_import") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06srfd6whfwkmjvl6m61kvc65fb7j9b25bhfr1mp338zm87smv5p")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-ppx-deriving ocaml-ppxlib + ocaml-ppx-sexp-conv)) + (native-inputs (list ocaml-ounit ocaml-sexplib0)) + (properties `((upstream-name . "ppx_import"))) + (synopsis "Extension for importing declarations from interface files.") + (description + "Ppx-import is a syntax extension for importing declarations from +interface files.") + (license license:expat))) + (define-public ocaml-parmap (package (name "ocaml-parmap") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:15 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:15 +0000 Received: from localhost ([127.0.0.1]:41734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTG3-000863-91 for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:15 -0500 Received: from lepiller.eu ([2a00:5884:8208::1]:40392 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFo-0007zF-MN for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:01 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id e163d08b for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=3K5P4VR8iTSadB9ywByVcDAFJ ie0myGei2yeS3JH3NQ=; b=Rf54qNTi6xn+K+p/EmuU70HrNq+7d4XOSEZdr+uTu 2o+idA5M4p6p6cpdJHI7lrLYLNlbX8hm16782flxT2BySwslFFw+/sW1Qil6dHyO fuKkSCXcyK1hxrblgPWonWxGrZg7nzYL8SIYbk90robUprnPDBvlcUkEmQXfbvTY Vxl1Rrx2lazoHSppKJXwzDNn9NUn/S1XFBVh53oqlJp9wCbOFfeKoEA3QHOyigdP +zOAgyZdKc2/9LS0JhaDN48fsX6unhFpgUz68k6yUMDcIEogNkTEi/1/mQNJqaA1 uu8COKHOyJed//IUciEmfK50MK2RZNPDoRuzWVcWYGOrQ== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id aa861c88 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:47 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 27/34] gnu: Add dune-ordering. Date: Wed, 10 Jan 2024 08:43:28 +0100 Message-ID: <20240110074336.24651-27-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/ocaml.scm (dune-ordering): New variable. Change-Id: I78d81dfc2523b47bdca6430e2f9961cf39c7335a --- gnu/packages/ocaml.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 070fb4d433..39724a5f1f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2027,6 +2027,25 @@ (define-public ocaml-pp about.") (license license:expat))) +(define-public dune-ordering + (package + (inherit dune) + (name "dune-ordering") + (source (origin + (inherit (package-source dune)) + (modules '((guix build utils))) + (snippet + `(begin + (delete-file-recursively "vendor/pp") + (delete-file-recursively "vendor/csexp"))))) + (build-system dune-build-system) + (arguments + `(#:package "ordering" + ;; Tests have a cyclic dependency on stdune + #:tests? #f)) + (synopsis "Dune element ordering") + (description "This library represents element ordering in OCaml."))) + (define-public ocaml-csexp (package (name "ocaml-csexp") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:16 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:16 +0000 Received: from localhost ([127.0.0.1]:41736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTG3-00086B-LH for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:15 -0500 Received: from lepiller.eu ([89.234.186.109]:59302 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFp-0007zA-0s for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:01 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id c7e301bd for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=lzTkXEoxsCj1xBJU/jgoKOZUg AjjVRjAT4PqSNj34H8=; b=NdnFqPX3GmU34M6AaMlh36ztqeepKVfJFwICTKtIe Q4lalbdnBExT33emK3HIsLLfQePWhp3k/YURxOiaoDjKL/JJmUWhkag0deYt+rwg 41Els0yCAvo2OSJT/K34vHMRA1PhxjqY0zDkmWp7bYH6Etj/5/yVMM9O2qXSllbM cqv0Y7RQghy7PxzC0lJeeZ8XH2HnyvGWjaExADmaCbcZwRPpTsmM+avv1XNBAafy P58dsfBkUV5+ctjwW8J0HTnw3xowogDCvyT0iuSCRsXFeagXUx4DKKTChu6Dd2n6 ivKCodrGgL5NclqeGuIpDgPHOJizHp7E87d/zde5aZMSA== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id f8c52263 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:47 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 28/34] gnu: Add dune-dyn. Date: Wed, 10 Jan 2024 08:43:29 +0100 Message-ID: <20240110074336.24651-28-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/ocaml.scm (dune-dyn): New variable. Change-Id: I34907a758c146d9f18ab5807c069dfe104e6854f --- gnu/packages/ocaml.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 39724a5f1f..6bbc1d1e94 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2046,6 +2046,19 @@ (define-public dune-ordering (synopsis "Dune element ordering") (description "This library represents element ordering in OCaml."))) +(define-public dune-dyn + (package + (inherit dune-ordering) + (name "dune-dyn") + (build-system dune-build-system) + (arguments + `(#:package "dyn" + ;; Tests have a cyclic dependency on stdune + #:tests? #f)) + (propagated-inputs (list ocaml-pp dune-ordering)) + (synopsis "Dune dynamic types") + (description "This library represents dynamic types in OCaml."))) + (define-public ocaml-csexp (package (name "ocaml-csexp") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:16 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:16 +0000 Received: from localhost ([127.0.0.1]:41738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTG4-00086I-1d for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:16 -0500 Received: from lepiller.eu ([89.234.186.109]:46418 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFp-000810-47 for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:01 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id a2dffb68 for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=G9iImUOYPjUOULPtNcZ7+lZrj qCRFQCAKUXavhblyfA=; b=Rkdw/A9EeRq36YwwR0CXNUvcYjIOnN32coxkxkbOf HzJYiYzjdVXubuDQD6P4LpB7p/WsPh+17C/tmc6MOgfYqHvsMZcTA+FqPXf+Ospd 8pxqAUv+bKIXAHinVLxnCHShyH4tY43KZaYg8H3bDNRW1f/dq4DylZ97dC5fg1kq G7yS/66r/W5pIWAueRvGDtysI0HHTxHRP88SQfeUJ2CbfoR92YzJ2ZUjEmFtEdtv fFZWrqU5tg2zVowoD3rgBM//GV+4/FlpsZSDBEThrCfQzDM+mHjQgOeW/R6gu8Sr +tpRfbhpIevHXGfzJTwKYgiRZsBo5DKhEIiiR503yiXgw== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id b0207326 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:47 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 29/34] gnu: Add dune-stdune. Date: Wed, 10 Jan 2024 08:43:30 +0100 Message-ID: <20240110074336.24651-29-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/ocaml.scm (dune-stdune): New variable. Change-Id: I8993bd7157f6edd0f02d5c9a5bbc54915918ff15 --- gnu/packages/ocaml.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6bbc1d1e94..3db709cefa 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2059,6 +2059,19 @@ (define-public dune-dyn (synopsis "Dune dynamic types") (description "This library represents dynamic types in OCaml."))) +(define-public dune-stdune + (package + (inherit dune-ordering) + (name "dune-stdune") + (build-system dune-build-system) + (arguments + `(#:package "stdune" + ;; Tests have a cyclic dependency on itself + #:tests? #f)) + (propagated-inputs (list dune-dyn ocaml-pp)) + (synopsis "Unstable standard library from Dune") + (description "This library implements the standard functions used by Dune."))) + (define-public ocaml-csexp (package (name "ocaml-csexp") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:17 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:17 +0000 Received: from localhost ([127.0.0.1]:41740 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTG4-00086Q-CC for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:16 -0500 Received: from lepiller.eu ([89.234.186.109]:59318 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFo-0007zZ-LL for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:02 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 4cb4b97a for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=C5r6zttqNWl+ v6FnKshnZCCJfTyi6sCyfSeoJH8Xr7M=; b=KIwpdCRazxx8z+3VvpKRlvF2IIsk 1LgBmas5ZFk0bZPfREC4ASt8O38923zQnFL0L4+cIAdYMPNXbktWpq3FUXXaWEQw vCy6q+R+7Y1OW5QjsAiTL3elDAKvlYcTShHh/ll3Ty+vJdP7LrRkNeXKbZvoSfkB Du4JQZUyJLyaR+/7tPOmrJDlpnwkmNVmMfJZNtLXx7GyOV+dx9Nz+drhXCxdmNd5 w2K59acojxM2hJoHidoSKKiKrj+kwX7tYIzB7rcZmvYxgp0hOx/C30Fp6tqpZTEa 4N8su75QYDIIudv2+0iqmklnQuIULFwsxTloveqOGNa9Jo1lEjBf1salfA== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 206dc8b6 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:46 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 26/34] gnu: Add ocaml-pp. Date: Wed, 10 Jan 2024 08:43:27 +0100 Message-ID: <20240110074336.24651-26-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/ocaml.scm (ocaml-pp): New variable. Change-Id: Ib97bceddda4b7037667cdb1a1b7152c8dc06acd7 --- gnu/packages/ocaml.scm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c2927e4f70..070fb4d433 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016, 2018-2020, 2023 Efraim Flashner -;;; Copyright © 2016-2022 Julien Lepiller +;;; Copyright © 2016-2024 Julien Lepiller ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Peter Kreye @@ -2001,6 +2001,32 @@ (define-public ocaml5.0-dune (propagated-inputs (list ocaml5.0-dune-configurator)))) +(define-public ocaml-pp + (package + (name "ocaml-pp") + (version "1.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml-dune/pp") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ylwb8lbjzj1prnal3c5p404dvh7bv4s19cvgrplnd7s46lvnj50")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-odoc)) + (native-inputs (list ocaml-ppx-expect)) + (home-page "https://github.com/ocaml-dune/pp") + (synopsis "Pretty-printing library") + (description + "This library provides an alternative to the @code{Format} module of the OCaml +standard library. Pp uses the same concepts of boxes and break hints, and the +final rendering is done to formatter from the @code{Format} module. However it +defines its own algebra which some might find easier to work with and reason +about.") + (license license:expat))) + (define-public ocaml-csexp (package (name "ocaml-csexp") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:17 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:17 +0000 Received: from localhost ([127.0.0.1]:41742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTG5-00086Y-04 for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:17 -0500 Received: from lepiller.eu ([2a00:5884:8208::1]:36422 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFp-00080C-NH for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:02 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id b75cb75a for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=mnI8A4yHdoj5J2B+b4gzydFFB Q+d2CAurKHSGV28TQw=; b=KLzz3l1UOjHuWaKhz0XPHVB/Gm9SFhEHRZM6U4su1 SmfPnVqTOVT9OammWzb2etl/6CCAbxzFhbX2NgCFbCMpQmvXnJo6dOp17h2J+SQC lAT5Ir9tzVnF+JxLshpuEpMf4e2jlUe+sGLHV6W4NifSGtxRwGbb76EsppJEXeH4 hXQOBgGmmy/QLQqgZ/j2zmgbvs5V0EjYUINXRpLipEqbbIrLyNrdGIbvwrRJT4Hg 0HKKrHxjcnTdrkL3j2GGailZbfB1NP1X9sIODWycN+QAXkBxnx02h+4+Yxz/I72j Y0MGX7buG7pCSMF74TPGCY6ukA8u6OU55IB4NtqlYonPg== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id ab9ef1e7 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:47 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 30/34] gnu: Add dune-private-libs. Date: Wed, 10 Jan 2024 08:43:31 +0100 Message-ID: <20240110074336.24651-30-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/ocaml.scm (dune-private-libs): New variable. Change-Id: I6d2b62745459626d5d1363c1251449b959f8a544 --- gnu/packages/ocaml.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3db709cefa..f434bdfbbe 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2072,6 +2072,20 @@ (define-public dune-stdune (synopsis "Unstable standard library from Dune") (description "This library implements the standard functions used by Dune."))) +(define-public dune-private-libs + (package + (inherit dune-ordering) + (name "dune-private-libs") + (build-system dune-build-system) + (arguments + `(#:package "dune-private-libs" + #:tests? #f)) + (native-inputs (list dune-stdune ocaml-ppx-expect ocaml-ppx-inline-test)) + (synopsis "Private libraries of Dune") + (description "This package contains code that is shared between various +dune packages. However, it is not meant for public consumption and provides +no stability guarantee."))) + (define-public ocaml-csexp (package (name "ocaml-csexp") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:18 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:18 +0000 Received: from localhost ([127.0.0.1]:41744 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTG5-00086h-Fe for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:17 -0500 Received: from lepiller.eu ([2a00:5884:8208::1]:40392 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFp-0007zF-Rb for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:02 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 7d7b1aee for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=ZH4VhjJ/R26I2vjd7yVdEkdgc 2ntQMcnBcbZ7qzqCiQ=; b=WlvwabIf00xHEi6bj3Qi1EnT1+GAFPwWKUYtczWJz l2mQaNoUqQ6D5qHOcukjrGTBivjNjH7RmpSYXWLuozrwOl7ECyfHOD46oj8gagZf n0rR84TD57Htf/Vi6958w9U2s1sOabRHyGxqXZ6g8CBgF+GpcBaBxYM7njtd2tLp NHvkmfGAqxFB6wiMN8FEwpcbu8w3/4C+qxEK6NT4hPRNVkrIItlAj5ULfOItH9MP QHLLwGehQ2dXwNmNzrDeo+Lf/fgqLVMwEHVsj7otXdPZSQ3YafxfLAp5sIy6ZUfv hP/BCMGUFCYbrL26YwhtdkV7Q2wE7JB3eAKTBU965KADg== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 0da400ed (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:47 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 31/34] gnu: Add dune-site. Date: Wed, 10 Jan 2024 08:43:32 +0100 Message-ID: <20240110074336.24651-31-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/ocaml.scm (dune-site): New variable. Change-Id: Idbb555f023a179d52bcf6839c7f37506813ae2b4 --- gnu/packages/ocaml.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f434bdfbbe..92c8fe6119 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2086,6 +2086,19 @@ (define-public dune-private-libs dune packages. However, it is not meant for public consumption and provides no stability guarantee."))) +(define-public dune-site + (package + (inherit dune-ordering) + (name "dune-site") + (build-system dune-build-system) + (arguments + `(#:package "dune-site" + #:tests? #f)) + (propagated-inputs (list dune-private-libs)) + (synopsis "Location information embedder") + (description "This library helps embed location information inside +executables and libraries"))) + (define-public ocaml-csexp (package (name "ocaml-csexp") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:18 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:18 +0000 Received: from localhost ([127.0.0.1]:41746 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTG6-00086p-0M for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:18 -0500 Received: from lepiller.eu ([89.234.186.109]:46418 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFq-000810-7F for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:03 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id c4c5858e for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=bqBLylSivUGFlfbRPnfroMqkw Us3LteAkcjgF4a5bTw=; b=jek2meSOLrzsvkSCWWcSu7YwZ2vEwP7L1C5YZwXdy 3TpsNky7wb+K+xlnyi/FUTYHPkkruaF5392jpyrlVQdqLq7N/3YmZMK5QvO2U28t HUS1P5xf1MDUTXYSZyG7mUQlBGQoErMCBB4iP46DBKN+GC0SMyzMPCHntWexDRP2 gBM3ZqCB6fQMtsCoKklGUrX9wzUdTMNhW5MbByvWEsi9MHWQN0B6lc6ABCLOrduz 4+g7lF1dQVXZQxDRBF/byjmw44rH+wmNKhkvaZe3Eapul3K5gYdHJBeh+DMMw075 NkfxJg7etYmLRXvZJuGFjSeXvBUXCQJDrBMlYo7P79/SA== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 249932d8 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:48 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 33/34] gnu: ocaml-base64: Update to 3.5.1. Date: Wed, 10 Jan 2024 08:43:34 +0100 Message-ID: <20240110074336.24651-33-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/ocaml.scm (ocaml-base64): Update to 3.5.1. Change-Id: I4732c7b8711af79e09536adc478d84ca0e29408c --- 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 92c8fe6119..d66af11327 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4378,7 +4378,7 @@ (define-public ocaml-ocurl (define-public ocaml-base64 (package (name "ocaml-base64") - (version "3.5.0") + (version "3.5.1") (source (origin (method git-fetch) (uri (git-reference @@ -4387,7 +4387,7 @@ (define-public ocaml-base64 (file-name (git-file-name name version)) (sha256 (base32 - "068hwdbpl7vx9jjpxdc6a10zqd8xa55j3xx7ga6fnwrlfsbs2pjj")))) + "1jq349jp663hq51a941afr2y4yyh34r19zsxla73ks9bywj4mm2q")))) (build-system dune-build-system) (native-inputs (list ocaml-alcotest ocaml-bos ocaml-rresult)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 02:44:20 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:20 +0000 Received: from localhost ([127.0.0.1]:41748 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTG6-00086w-DM for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:20 -0500 Received: from lepiller.eu ([89.234.186.109]:59318 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFq-0007zZ-EB for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:04 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 7fb51c23; Wed, 10 Jan 2024 07:43:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :cc:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=xpZH9STz6m7LCs76DfVGzA2rJ Oxg8hEDcUg3dV5LiV8=; b=iY23iA0pDP0t3GvH3l39butZOZaT5pGxMm/tuAVca Cs4crxr6xi2iMEYbsg0Vs9E/6HPQMIHTARRK8dtKssJvr1vvj3hnrtWFNnso7QYK lCHooORd1ye2C2zR01WI5nTR66+3ENO9qbYKsZSagAOIBIxrwK8iDRwm1affKLFs 1dgnyUrHAgSX4ha1anmjHHLsEZfwdUry4VXToqrdeVcgG2/oEM0/9+PCtNxSNMZ9 5VKQzXgSZCqEhbrT5wrtGip8Mkp8m583VW1SRIykl9M1aHiSB0OOzkBx8i62fldX 1ECVACT5koofXiS7hK9MguIDJipBkEmayazKALY0VSJwA== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 7d7b6d1b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 10 Jan 2024 07:43:48 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 34/34] gnu: opam: Update to 2.1.5. Date: Wed, 10 Jan 2024 08:43:35 +0100 Message-ID: <20240110074336.24651-34-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: pukkamustard * 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. Change-Id: Ie715998a6d7740332187e1fe0742631964ba5a8a --- 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 c5b9ef6338..d6542b6cad 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1718,10 +1718,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 d66af11327..ecd087674e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -714,7 +714,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 @@ -723,29 +723,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 @@ -850,7 +837,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 @@ -859,7 +846,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 @@ -1038,7 +1025,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 @@ -1074,18 +1064,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 @@ -4389,8 +4403,7 @@ (define-public ocaml-base64 (base32 "1jq349jp663hq51a941afr2y4yyh34r19zsxla73ks9bywj4mm2q")))) (build-system dune-build-system) - (native-inputs - (list ocaml-alcotest ocaml-bos ocaml-rresult)) + (native-inputs (list ocaml-alcotest ocaml-bos ocaml-rresult)) (home-page "https://github.com/mirage/ocaml-base64") (synopsis "Base64 encoding for OCaml") (description "Base64 is a group of similar binary-to-text encoding schemes @@ -4398,6 +4411,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 ocamlify (package (name "ocamlify") @@ -5119,27 +5140,22 @@ (define-public ocaml-uuidm (define-public ocaml-graph (package (name "ocaml-graph") - (version "1.8.8") + (version "2.0.0") + (home-page "https://github.com/backtracking/ocamlgraph/") (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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 03:05:05 2024 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 08:05:05 +0000 Received: from localhost ([127.0.0.1]:41780 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTaC-0005U9-8P for submit@debbugs.gnu.org; Wed, 10 Jan 2024 03:05:05 -0500 Received: from lepiller.eu ([89.234.186.109]:59302 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFq-0007zA-4a for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:03 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 3729dd71 for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=WHdSGjdlVhcJ SOq6HTnKEXhPaPdI99GA9F4w/4heFv4=; b=Byr0uv9dUNDBj3kTT/c1ywV5FeEN MLmLsWGxikgs6eMwsncXOXMvJflD77mkB5hmE+CpkLjspPHDnc4K6kzg7Tl8YYKj ibqgM5xN5wISqsboxIvHPXB7GrnuRfL0mERUB2kYhoaDK2bTbc2LzxMRrWwVuv/h DWJ7eX40b2DcCf9Uo5GuAT15VQGLoZ+cy8yRT99fbVbo0zBugY+r9EBEF9gGAKi1 g0IBZd03er00o0SKibd4bmpzrTbaqPF/eC5MOUptaqaLlz9Hp3vhXR1g1NoDD0FA X1ijbTS630WaDbP/pGdXZTR4hG28SDnywiSGELVLQUwMnOofkvm86NijPw== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 863585a9 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:48 +0000 (UTC) From: Julien Lepiller To: 64249@debbugs.gnu.org Subject: [PATCH v9 32/34] gnu: frama-c: Update to 27.1. Date: Wed, 10 Jan 2024 08:43:33 +0100 Message-ID: <20240110074336.24651-32-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maths.scm (frama-c): Update to 27.1. (why3): Update to 1.6.0. Change-Id: I74191e4274d58a88a772413875fbf7de4d243fec --- gnu/packages/maths.scm | 54 +++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index adc7beb655..400c240577 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2018 Adam Massmann ;;; Copyright © 2018, 2020-2022 Marius Bakke ;;; Copyright © 2018 Eric Brown -;;; Copyright © 2018, 2021 Julien Lepiller +;;; Copyright © 2018, 2021, 2024 Julien Lepiller ;;; Copyright © 2018 Amin Bandali ;;; Copyright © 2019, 2021-2023 Nicolas Goaziou ;;; Copyright © 2019 Steve Sprang @@ -93,6 +93,7 @@ (define-module (gnu packages maths) #:use-module (guix build-system ant) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) + #:use-module (guix build-system dune) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) @@ -183,6 +184,7 @@ (define-module (gnu packages maths) #:use-module (gnu packages tcl) #:use-module (gnu packages texinfo) #:use-module (gnu packages tex) + #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages wxwidgets) @@ -9352,7 +9354,7 @@ (define-public numdiff (define-public why3 (package (name "why3") - (version "1.4.1") + (version "1.6.0") (source (origin (method git-fetch) (uri (git-reference @@ -9361,7 +9363,7 @@ (define-public why3 (file-name (git-file-name name version)) (sha256 (base32 - "1yca6mx8bjm8x0i594ivh31aw45s6fbimmwfj8g2v9zwrgmr1i4s")))) + "0k3y98xzhrl44vwzq2m6k4nrllrwp3ll69lc2gfl8d77w0wg7gkp")))) (build-system ocaml-build-system) (native-inputs (list autoconf automake coq ocaml which)) @@ -9409,36 +9411,38 @@ (define-public why3 (define-public frama-c (package (name "frama-c") - (version "24.0") + (version "27.1") (source (origin (method url-fetch) (uri (string-append "http://frama-c.com/download/frama-c-" - version "-Chromium.tar.gz")) + version "-Cobalt.tar.gz")) (sha256 (base32 - "0x1xgip50jdz1phsb9rzwf2ra8lshn1hmd9g967xia402wrg3sjf")))) - (build-system ocaml-build-system) + "1lirkvhf5m53d33l0aw5jzc1fyzkwx5fkgh9g71732d52r55f4sv")))) + (build-system dune-build-system) (arguments - `(#:tests? #f; no test target in Makefile - #:configure-flags - (list "--enable-verbosemake") ; to aid debugging - #:phases - (modify-phases %standard-phases - (add-before 'configure 'export-shell - (lambda* (#:key inputs #:allow-other-keys) - (setenv "CONFIG_SHELL" - (search-input-file inputs "/bin/sh"))))))) + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'set-env + (lambda _ + (setenv "CC" "gcc")))))) (inputs (list gmp zlib)) - (propagated-inputs - (list ocaml-biniou - ocaml-easy-format - ocaml-graph - ocaml-yojson - ocaml-zarith - ocaml-lablgtk3-sourceview3 - lablgtk3 - why3)) + (propagated-inputs (list + graphviz + lablgtk3 + ocaml-graph + ocaml-odoc + ocaml-lablgtk3-sourceview3 + ocaml-yaml + ocaml-yojson + ocaml-zarith + ocaml-ppx-deriving + ocaml-ppx-deriving-yojson + ocaml-ppx-deriving-yaml + ocaml-ppx-import + why3)) + (native-inputs (list dune-site time ocaml-menhir ocaml-graph)) (native-search-paths (list (search-path-specification (variable "FRAMAC_SHARE") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 28 09:58:09 2024 Received: (at 64249) by debbugs.gnu.org; 28 Jan 2024 14:58:09 +0000 Received: from localhost ([127.0.0.1]:58179 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rU6bp-0007Tn-7I for submit@debbugs.gnu.org; Sun, 28 Jan 2024 09:58:09 -0500 Received: from nanein.fr ([185.230.78.41]:38952) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rU6bn-0007TI-Kt for 64249@debbugs.gnu.org; Sun, 28 Jan 2024 09:58:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nanein.fr; s=mail; t=1706453873; bh=hiUUA7BVKKrn0N5nn8re2SaZ7rSg4War2CIdj5o03Bw=; h=From:To:Subject:Date:From; b=QSLvG+OCYLpoHixadp7QfcbMNLhHKbYrD3H6x7p21DnwCZ909gE5MBoYrV/2qfsUN UMetkDrKTfIRNIkyN/q0Ceof13mm4FjGMlcErddAgD1BoxWzcjlKWj/Y0RoZHFzqpB JwkF9hiQAtA+XumFA3CgTqNnzUw7if7jMsVGK0wLBSdBob4A/JvDbVb7UmO8XygQfx VzNR7j7jwA3XkCh9HK9U8Rd5MNsQ2RzmqpDAPbAw5rIYP4RzBQw0baWfUYYMjXxZaL GlJHw3VRzD90wB7G62uZWwhDgcCNweBHfxwKLpwyS6L7uHs+jA5hwC6no9QhU5ipdE 7uzZZh5WeXD+0/IVYZ6x8pIXAr2jpYi+y4839N5zUxTqeUp7cvGLDoZ+lknZRsHiNG bgn9LNiJSwBZeFwAH01HEusCDgk0wqIhMXcefbXHp4+Bgx/HPi/Z85Ykw+j5FbEcge fOHgDn+eXQDuwGADiyHUFnr7gJniEtT6ojVLh9fnhWc8O3LjcK/e2ts3cwF59Z/fMf XGwh+TiOK55Hy8nUNHEOKxd4h1VI4OAe5d7S/fVC6gr6nH/HCqLn5ELxe2RPNZKtcb AosFr1NWGkp1xGiSpfldceVwihyFh50USsGURsiN86Wqkkl7bW6ZnJOwqamvkdvWPn bruuzuzAlT5zwyTiCnHScW/M= Received: from portableArnaud (wg.nanein.fr [IPv6:2a0c:700:12:50:1::109]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by nanein.fr (Postfix) with ESMTPSA id 68305140216 for <64249@debbugs.gnu.org>; Sun, 28 Jan 2024 15:57:53 +0100 (CET) User-agent: mu4e 1.10.8; emacs 29.1 From: ds-ac To: 64249@debbugs.gnu.org Subject: Gentle ping Date: Sun, 28 Jan 2024 15:54:49 +0100 Message-ID: <878r49sdxq.fsf@nanein.fr> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, As, ocaml4.07* packages have been removed, do you think that it is time to apply this patch series on master, or are there checks to perform first? Have a nice day, -- ds-ac From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 08 15:09:05 2024 Received: (at 64249) by debbugs.gnu.org; 8 Feb 2024 20:09:05 +0000 Received: from localhost ([127.0.0.1]:33702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rYAhl-0002xS-Av for submit@debbugs.gnu.org; Thu, 08 Feb 2024 15:09:05 -0500 Received: from nanein.fr ([185.230.78.41]:58022) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rYAhg-0002wt-KL for 64249@debbugs.gnu.org; Thu, 08 Feb 2024 15:09:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nanein.fr; s=mail; t=1707422917; bh=jxmcFQDX133i81xi8VXXD5xfrvq5YphLEIXFi0oQQqk=; h=References:From:To:Cc:Subject:Date:In-reply-to:From; b=DFq0zYO0rKT5BBgSEb6MBz3fXzs215ShdJtdnQV+un4DyhkVNIXtgmrQBSTQecIkz C5XWAZF+zfOXJAYp+3zu5SINZ3FlsgBlbEfetmXFJCoUxiv2soAPlBFVUKNXjob94V S4vhz1HnLy8VL/sNXEl1UO391N0Nmez1XH6DKJNExiz+dd2y+7ekgA8c8ungZha4sV 224eqDBgwsyD/3JllPiz2/97qCv6aEdGmOj24vCgMsWNab2pDlO3RDRbNoH5nULp1+ HIHmt5dpmF4WfQTgkt/npA+kHTGMB1yuEO2pJwbm5yIqOhU4tA7k+DA5uQFG2i4qWI 6/u8yd9LtTIdr+mdvJWVwQts6p9FDm4NF/SwQcEH461cu/V2kk2j1dFxVp8ncdyz/I UYsdK2PVWGoCEVRANdceHOSxTvCfLVwRWWLcvrIK9IhY3x2GqBCfq9+yyiSGHasBKO jW3RgOPCBHp1zHQMkxby8ZlJQblqxlhb3SuiEOPh4aPjJW9YhoRnWQg4iQsPT90uGn 2GZH+MV65f4qQOH0azMO1UsVBJE3blSTPACJlQVFsGPzKFacOqvtLqJA1ciJutfc5h GT/PQOVjUCrhI/1VFJ8JxfBS6RT02Bdf3nc+EZEifhgX3mGb2m7uoqKvLu+sZiEJzz RUnVraP1fq4Zug3OjQ6HzWcc= Received: from portableArnaud (eduroam-269-0-229.epfl.ch [192.33.196.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by nanein.fr (Postfix) with ESMTPSA id 4DF701401F2; Thu, 8 Feb 2024 21:08:37 +0100 (CET) References: <20230730194221.50deb15c@lepiller.eu> <86y1io8ag9.fsf@posteo.net> <86msvvcb4f.fsf@posteo.net> User-agent: mu4e 1.10.8; emacs 29.1 From: Arnaud Daby-Seesaram To: pukkamustard , Julien Lepiller , 64249@debbugs.gnu.org, Josselin Poiret Subject: Re: [bug#64249] [PATCH ocaml-team v4 0/9] Date: Thu, 08 Feb 2024 21:05:46 +0100 In-reply-to: <86msvvcb4f.fsf@posteo.net> Message-ID: <8734u23eim.fsf@nanein.fr> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64249 Cc: Arnaud Daby-Seesaram X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi, Here is a new remainder to ask you to push the patch series associated with bug 64249 upstream. (I realised that I forgot to CC you on my last email). I do hope that I do not bother you with these mails. Please do tell me if it is the case, in which case I will non longer send remainders :). Best, =2D-=20 Arnaud --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJEBAEBCgAuFiEEMgqfJ4U0fby1t860ojLKXoMTiAwFAmXFNMEQHGRzLWFjQG5h bmVpbi5mcgAKCRCiMspegxOIDCkxD/4trHBpElRRszQqP36VkHMxq6oV3YI1k3Ed z5ShatQwEstmw283HCCvlW+NyjI2YHNdHFRMJGl2uvnAjd1x2xGWb6deWa+TLHEV OYse7sJrB6KhcXRR0HrFYbgKS44xsGg3MzzCadz0L5hl4yRVg9fJYt7wyNEfqUxN /F2PZDzrKZVtTXw+CZc5ca5BU+2d/iZra8q+wX3NYd2WAlsHuEb3dV0ZalkCXcBi OGhBcjKmA/vQMM474+htSDRt6dC/Kra7IINeNCRKhPzagJyX++4D2qH/FTfkhq0j lNIqyMMdAHuzjaE6T0EWbFdxoUmMPNSvc1Uoa3owzFheRLNoPZZwY3yFjlQ9ob+B oDz+gHbiFlsDaEMEPFgkLrM/Mpb6jj7625YvKi0QP57LpiO1CO325vmwbXT++nYP /Xfwz6AVHnSqPXB6xCi5WRb3nBumhvJb7Ja085ob9h5VHz0jiFxAiqAPXSPRwurP SlplGg9qiSk6fU5+NanB5ediC9YVnpwgm+d9FwG80mg91VG4ajns0n4buCwPMl9g Lx1ZqZr7TybVHFz5Kj7zPpSqAS2EEo+8k8Xu+54HD7+vO3wii/X1KCijDZUtEulF VTghTB4D2CfNCn98evfkg4WynMuQRHR0f2chZQD3xqN4JcsyLnOdomCe6QQ2pEiL 9t8j3Gue3w== =BcD/ -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 08 17:27:26 2024 Received: (at 64249-done) by debbugs.gnu.org; 8 Feb 2024 22:27:27 +0000 Received: from localhost ([127.0.0.1]:36176 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rYCre-00081t-F0 for submit@debbugs.gnu.org; Thu, 08 Feb 2024 17:27:26 -0500 Received: from 46.233.146.77.rev.sfr.net ([77.146.233.46]:40014 helo=localhost) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rYCrc-00081C-Br for 64249-done@debbugs.gnu.org; Thu, 08 Feb 2024 17:27:25 -0500 Received: from localhost (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 363328b1; Thu, 8 Feb 2024 22:27:02 +0000 (UTC) Received: by localhost (OpenSMTPD) with ESMTPSA id f3b9048a (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 8 Feb 2024 22:27:02 +0000 (UTC) Date: Thu, 8 Feb 2024 23:27:02 +0100 From: Julien Lepiller To: 64249-done@debbugs.gnu.org Subject: Re: [bug#64249] [PATCH v9 34/34] gnu: opam: Update to 2.1.5. Message-ID: <20240208232702.5a1ee4bf@lepiller.eu> In-Reply-To: <20240110074336.24651-34-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> <20240110074336.24651-34-julien@lepiller.eu> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: 4.0 (++++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Finally pushed to master as fe0c13b1f9f8546525d7e7380fae9d409aebe269 to 01ee39cfee10583402e9fc252ca5c0e8232435db ! Thanks to everyone involved :) Content analysis details: (4.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 HELO_LOCALHOST No description available. 0.0 FSL_HELO_NON_FQDN_1 No description available. 0.0 TVD_RCVD_IP Message was received from an IP address -0.0 SPF_PASS SPF: sender matches SPF record -0.0 T_SCC_BODY_TEXT_LINE No description available. 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS X-Debbugs-Envelope-To: 64249-done Cc: pukkamustard , ds-ac X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 3.0 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Finally pushed to master as fe0c13b1f9f8546525d7e7380fae9d409aebe269 to 01ee39cfee10583402e9fc252ca5c0e8232435db ! Thanks to everyone involved :) Content analysis details: (3.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 HELO_LOCALHOST No description available. 0.0 FSL_HELO_NON_FQDN_1 No description available. -0.0 SPF_PASS SPF: sender matches SPF record -0.0 T_SCC_BODY_TEXT_LINE No description available. 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Finally pushed to master as fe0c13b1f9f8546525d7e7380fae9d409aebe269 to 01ee39cfee10583402e9fc252ca5c0e8232435db ! Thanks to everyone involved :) From unknown Mon Aug 18 15:39:20 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 08 Mar 2024 12:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator