From patchwork Wed Jan 10 07:43:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58731 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1D79227BBEA; Wed, 10 Jan 2024 07:44:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AACC727BBE2 for ; Wed, 10 Jan 2024 07:44:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTFq-0001H4-JV; Wed, 10 Jan 2024 02:44:03 -0500 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 1rNTFl-0001GS-0b for guix-patches@gnu.org; Wed, 10 Jan 2024 02:43:57 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTFk-0003TT-Kb for guix-patches@gnu.org; Wed, 10 Jan 2024 02:43:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTFr-00082t-Ss for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 01/34] gnu: ocaml: Update to 4.14.1. References: In-Reply-To: Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:44:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487263330729 (code B ref 64249); Wed, 10 Jan 2024 07:44:03 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: pukkamustard * gnu/packages/ocaml.scm (ocaml): Update to 4.14.1. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: e541f9593f8bfc84b6140c2408b393243289fae6 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 From patchwork Wed Jan 10 07:43:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58729 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2E38627BBEA; Wed, 10 Jan 2024 07:44:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8D74427BBE2 for ; Wed, 10 Jan 2024 07:44:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTFs-0001K7-GJ; Wed, 10 Jan 2024 02:44:04 -0500 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 1rNTFl-0001Ge-K4 for guix-patches@gnu.org; Wed, 10 Jan 2024 02:43:58 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTFl-0003TY-4k for guix-patches@gnu.org; Wed, 10 Jan 2024 02:43:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTFs-000830-D0 for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 02/34] gnu: Update coq-flocq to 4.1.1. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:44:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487263530761 (code B ref 64249); Wed, 10 Jan 2024 07:44:04 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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)) From patchwork Wed Jan 10 07:43:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58732 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 61A3027BBE2; Wed, 10 Jan 2024 07:44:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0172D27BBEB for ; Wed, 10 Jan 2024 07:44:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTFr-0001Ij-Ir; Wed, 10 Jan 2024 02:44:03 -0500 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 1rNTFl-0001Gm-Tx for guix-patches@gnu.org; Wed, 10 Jan 2024 02:43:58 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTFl-0003Te-MJ for guix-patches@gnu.org; Wed, 10 Jan 2024 02:43:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTFs-00083D-Ve for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 03/34] gnu: Update coq-gappa to 1.5.3. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:44:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487263530770 (code B ref 64249); Wed, 10 Jan 2024 07:44:04 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 From patchwork Wed Jan 10 07:43:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58730 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7678227BBE9; Wed, 10 Jan 2024 07:44:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A7D9227BBE2 for ; Wed, 10 Jan 2024 07:44:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTFu-0001KB-Na; Wed, 10 Jan 2024 02:44:06 -0500 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 1rNTFm-0001H0-An for guix-patches@gnu.org; Wed, 10 Jan 2024 02:43:59 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTFm-0003Tn-39 for guix-patches@gnu.org; Wed, 10 Jan 2024 02:43:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTFt-00083K-CU for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 04/34] gnu: Update coq-coquelicot to 3.4.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:44:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487263630789 (code B ref 64249); Wed, 10 Jan 2024 07:44:05 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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)) From patchwork Wed Jan 10 07:43:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58734 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8F1CD27BBEC; Wed, 10 Jan 2024 07:45:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EC70C27BBE9 for ; Wed, 10 Jan 2024 07:45:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTGj-00023Y-Vz; Wed, 10 Jan 2024 02:44:58 -0500 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 1rNTGh-0001ye-94 for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:56 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGg-0003xh-GQ for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGn-00088J-Pk for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 05/34] gnu: Update coq-mathcomp to 1.17.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487264630983 (code B ref 64249); Wed, 10 Jan 2024 07:45:01 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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)) From patchwork Wed Jan 10 07:43:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58740 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 79A2827BBEA; Wed, 10 Jan 2024 07:45:53 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AEEBB27BBE2 for ; Wed, 10 Jan 2024 07:45:52 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTGk-00024W-NZ; Wed, 10 Jan 2024 02:44:58 -0500 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 1rNTGj-00022N-55 for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:57 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGh-0003yE-BB for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGo-0008C0-Ie for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 06/34] gnu: Update coq-autosubst to 1.8. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487264730997 (code B ref 64249); Wed, 10 Jan 2024 07:45:02 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 From patchwork Wed Jan 10 07:43:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58760 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1981A27BBEA; Wed, 10 Jan 2024 07:47:07 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CFE6127BBE2 for ; Wed, 10 Jan 2024 07:47:06 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTGm-00027e-IS; Wed, 10 Jan 2024 02:45:00 -0500 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 1rNTGh-0001yi-Bs for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:56 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGg-0003xq-Ti for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGo-0008AH-67 for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 07/34] gnu: Update coq-stdpp to 1.8.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487264730990 (code B ref 64249); Wed, 10 Jan 2024 07:45:02 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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)) From patchwork Wed Jan 10 07:43:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58754 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9904B27BBE9; Wed, 10 Jan 2024 07:46:36 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1953727BBEB for ; Wed, 10 Jan 2024 07:46:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTGm-00027s-QT; Wed, 10 Jan 2024 02:45:00 -0500 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 1rNTGj-00022Q-5y for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:57 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGh-0003yL-M6 for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGo-0008E4-VY for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 08/34] gnu: Update coq-interval to 4.8.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487264831005 (code B ref 64249); Wed, 10 Jan 2024 07:45:02 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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)) From patchwork Wed Jan 10 07:43:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58733 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 112A427BBE9; Wed, 10 Jan 2024 07:45:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2682027BBE2 for ; Wed, 10 Jan 2024 07:45:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTGl-00025D-2f; Wed, 10 Jan 2024 02:44:59 -0500 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 1rNTGj-00022R-8D for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:57 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGi-0003yi-Rn for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGq-0008JG-2M for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 09/34] gnu: coq: Update to 8.17.1. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard , Josselin Poiret Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487264931027 (code B ref 64249); Wed, 10 Jan 2024 07:45:04 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 - From patchwork Wed Jan 10 07:43:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58739 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E0EF327BBE9; Wed, 10 Jan 2024 07:45:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0941127BBE2 for ; Wed, 10 Jan 2024 07:45:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTGl-000259-1d; Wed, 10 Jan 2024 02:44:59 -0500 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 1rNTGj-00022O-5z for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:57 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGi-0003yN-1N for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGp-0008Ft-As for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 10/34] gnu: dune-bootstrap: Update to 3.11.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487264831012 (code B ref 64249); Wed, 10 Jan 2024 07:45:03 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 From patchwork Wed Jan 10 07:43:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58743 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9DFFC27BBEC; Wed, 10 Jan 2024 07:46:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E830D27BBE2 for ; Wed, 10 Jan 2024 07:46:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTGn-00028R-2s; Wed, 10 Jan 2024 02:45:01 -0500 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 1rNTGl-00026F-DE for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:59 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGk-00040M-B5 for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGr-0008Pi-Ju for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 11/34] gnu: opam: Split build into smaller sub-packages. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487265131057 (code B ref 64249); Wed, 10 Jan 2024 07:45:05 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 From patchwork Wed Jan 10 07:43:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58751 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5017727BBEA; Wed, 10 Jan 2024 07:46:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EE0D827BBE2 for ; Wed, 10 Jan 2024 07:46:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTGk-00024V-Mi; Wed, 10 Jan 2024 02:44:58 -0500 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 1rNTGj-00022P-5z for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:57 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGi-0003yT-Eb for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGp-0008Hg-Me for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 12/34] gnu: ocaml-alcotest: Update to 1.7.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487264831019 (code B ref 64249); Wed, 10 Jan 2024 07:45:03 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-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" From patchwork Wed Jan 10 07:43:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58738 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 77EA327BBEC; Wed, 10 Jan 2024 07:45:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 10AC927BBE9 for ; Wed, 10 Jan 2024 07:45:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTGn-00027a-Jf; Wed, 10 Jan 2024 02:45:01 -0500 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 1rNTGl-00025j-82 for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:59 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGj-0003ze-5w for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGq-0008Ky-Em for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 13/34] gnu: ocaml-sexplib: Update to 0.16.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487264931034 (code B ref 64249); Wed, 10 Jan 2024 07:45:04 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-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)) From patchwork Wed Jan 10 07:43:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58748 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9637B27BBE2; Wed, 10 Jan 2024 07:46:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A2DD027BBE9 for ; Wed, 10 Jan 2024 07:46:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTGq-0002Bc-Ow; Wed, 10 Jan 2024 02:45:04 -0500 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 1rNTGl-00026D-Ck for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:59 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGj-0003zj-IP for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGq-0008Mm-RK for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 14/34] gnu: ocaml-ppxlib: Update to 0.28. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487265031042 (code B ref 64249); Wed, 10 Jan 2024 07:45:04 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-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)) From patchwork Wed Jan 10 07:43:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58741 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A0CAB27BBEB; Wed, 10 Jan 2024 07:46:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 20CCB27BBE2 for ; Wed, 10 Jan 2024 07:46:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTGo-00029l-1j; Wed, 10 Jan 2024 02:45:02 -0500 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 1rNTGl-00026G-DU for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:59 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGj-0003zq-UR for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGr-0008Od-75 for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 15/34] gnu: Add ocaml-ppx-stable-witness. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487265031049 (code B ref 64249); Wed, 10 Jan 2024 07:45:05 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-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") From patchwork Wed Jan 10 07:43:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58735 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C05EC27BBE9; Wed, 10 Jan 2024 07:45:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DD41927BBE2 for ; Wed, 10 Jan 2024 07:45:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTGp-0002BS-Ud; Wed, 10 Jan 2024 02:45:04 -0500 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 1rNTGl-00026I-Dc for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:59 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGk-00040W-P7 for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGs-0008RH-17 for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 16/34] gnu: ocaml-bin-prot: Update to 0.16.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487265231064 (code B ref 64249); Wed, 10 Jan 2024 07:45:05 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (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") From patchwork Wed Jan 10 07:43:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58742 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 70E4027BBEC; Wed, 10 Jan 2024 07:46:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0781827BBEB for ; Wed, 10 Jan 2024 07:46:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTGo-0002AV-Kz; Wed, 10 Jan 2024 02:45:02 -0500 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 1rNTGl-00026a-Hs for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:59 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGl-00041b-7K for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGs-0008T4-ED for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 17/34] gnu: ocaml-ppx-bin-prot: Update to 0.16.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487265231072 (code B ref 64249); Wed, 10 Jan 2024 07:45:06 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-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 From patchwork Wed Jan 10 07:43:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58752 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8775B27BBE9; Wed, 10 Jan 2024 07:46:35 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EFCBA27BBE2 for ; Wed, 10 Jan 2024 07:46:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTGs-0002C1-2w; Wed, 10 Jan 2024 02:45:06 -0500 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 1rNTGm-00027W-2H for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:00 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGl-00042M-QL for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGt-0008Ua-3G for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 18/34] gnu: ocaml-jst-config: Update to 0.16.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487265231079 (code B ref 64249); Wed, 10 Jan 2024 07:45:07 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-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 From patchwork Wed Jan 10 07:43:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58750 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5553B27BBE2; Wed, 10 Jan 2024 07:46:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2032427BBEB for ; Wed, 10 Jan 2024 07:46:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTGn-00029g-Vr; Wed, 10 Jan 2024 02:45:02 -0500 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 1rNTGm-00027g-J9 for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:00 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGm-00042U-76 for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGt-0008WS-Gd for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 19/34] gnu: ocaml-ppx-bench: Update to 0.16.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487265331086 (code B ref 64249); Wed, 10 Jan 2024 07:45:07 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-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 From patchwork Wed Jan 10 07:43:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58737 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5696B27BBE2; Wed, 10 Jan 2024 07:45:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7EE8A27BBE9 for ; Wed, 10 Jan 2024 07:45:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTGs-0002D9-DW; Wed, 10 Jan 2024 02:45:06 -0500 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 1rNTGm-000287-Tr for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:00 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGm-00043V-Jf for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGt-00006o-SR for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 20/34] gnu: Add ocaml-ppx-deriving-yojson. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: Arnaud DABY-SEESARAM Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487265331094 (code B ref 64249); Wed, 10 Jan 2024 07:45:07 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 From patchwork Wed Jan 10 07:43:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58736 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2C56827BBEA; Wed, 10 Jan 2024 07:45:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A030727BBE2 for ; Wed, 10 Jan 2024 07:45:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTH4-0002HC-3r; Wed, 10 Jan 2024 02:45:18 -0500 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 1rNTGn-00028y-7P for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:01 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGm-00044A-Uz for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGu-00008h-8D for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 21/34] gnu: Add ocaml-junit. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: Arnaud DABY-SEESARAM Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487265331101 (code B ref 64249); Wed, 10 Jan 2024 07:45:08 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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") From patchwork Wed Jan 10 07:43:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58753 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 06D2227BBE2; Wed, 10 Jan 2024 07:46:40 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1B66727BBE9 for ; Wed, 10 Jan 2024 07:46:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTI3-0002xK-LF; Wed, 10 Jan 2024 02:46:19 -0500 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 1rNTGn-00029c-Pz for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:01 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGn-00044J-Am for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGu-0000AN-KM for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 22/34] gnu: Add ocaml-junit-alcotest. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: Arnaud DABY-SEESARAM Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487265431108 (code B ref 64249); Wed, 10 Jan 2024 07:45:08 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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") From patchwork Wed Jan 10 07:43:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58755 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8A23A27BBE9; Wed, 10 Jan 2024 07:46:48 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7419A27BBE2 for ; Wed, 10 Jan 2024 07:46:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTGs-0002Cu-Af; Wed, 10 Jan 2024 02:45:06 -0500 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 1rNTGo-00029q-3V for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:02 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGn-00044l-OV for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGv-0000CE-13 for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 23/34] gnu: Add ocaml-yaml. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: Arnaud DABY-SEESARAM Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487265431115 (code B ref 64249); Wed, 10 Jan 2024 07:45:08 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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") From patchwork Wed Jan 10 07:43:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58745 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id ABD7F27BBE2; Wed, 10 Jan 2024 07:46:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 98DDB27BBEA for ; Wed, 10 Jan 2024 07:46:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTHP-0002MX-8J; Wed, 10 Jan 2024 02:45:41 -0500 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 1rNTGo-0002AR-Ii for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:02 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGo-00044t-5f for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGv-0000Dq-EZ for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 24/34] gnu: Add ocaml-ppx-deriving-yaml. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: Arnaud DABY-SEESARAM Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487265531123 (code B ref 64249); Wed, 10 Jan 2024 07:45:09 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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") From patchwork Wed Jan 10 07:43:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58744 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 73D5127BBEA; Wed, 10 Jan 2024 07:46:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A236827BBE2 for ; Wed, 10 Jan 2024 07:46:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTH3-0002GZ-WA; Wed, 10 Jan 2024 02:45:18 -0500 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 1rNTGo-0002Ay-S7 for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:02 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGo-000450-IF for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGv-0000FJ-RM for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 25/34] gnu: Add ocaml-ppx-import. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: Arnaud DABY-SEESARAM Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487265531130 (code B ref 64249); Wed, 10 Jan 2024 07:45:09 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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") From patchwork Wed Jan 10 07:43:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58759 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4002C27BBE9; Wed, 10 Jan 2024 07:47:05 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 098EF27BBEA for ; Wed, 10 Jan 2024 07:47:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTI4-0002za-1h; Wed, 10 Jan 2024 02:46:20 -0500 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 1rNTGr-0002By-05 for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:05 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGq-0004G3-IL for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGx-0000Lf-Qo for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 26/34] gnu: Add ocaml-pp. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487265731161 (code B ref 64249); Wed, 10 Jan 2024 07:45:11 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-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") From patchwork Wed Jan 10 07:43:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58749 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7253627BBE2; Wed, 10 Jan 2024 07:46:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1C13B27BBEA for ; Wed, 10 Jan 2024 07:46:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTHl-0002T3-NO; Wed, 10 Jan 2024 02:46:02 -0500 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 1rNTGp-0002BB-Ek for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGo-000457-V4 for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGw-0000Gu-7y for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 27/34] gnu: Add dune-ordering. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487265531138 (code B ref 64249); Wed, 10 Jan 2024 07:45:10 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (dune-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") From patchwork Wed Jan 10 07:43:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58756 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EEEFB27BBEA; Wed, 10 Jan 2024 07:46:52 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DEEB027BBEB for ; Wed, 10 Jan 2024 07:46:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTI3-0002yf-TC; Wed, 10 Jan 2024 02:46:19 -0500 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 1rNTGp-0002BK-O1 for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGp-000482-Di for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGw-0000Ik-Mj for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 28/34] gnu: Add dune-dyn. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487265631145 (code B ref 64249); Wed, 10 Jan 2024 07:45:10 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (dune-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") From patchwork Wed Jan 10 07:43:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58747 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 695C727BBE9; Wed, 10 Jan 2024 07:46:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0E6CA27BBE2 for ; Wed, 10 Jan 2024 07:46:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTI0-0002j7-C9; Wed, 10 Jan 2024 02:46:16 -0500 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 1rNTGq-0002Ba-6L for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGp-0004C9-TX for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGx-0000KC-5V for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 29/34] gnu: Add dune-stdune. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487265631153 (code B ref 64249); Wed, 10 Jan 2024 07:45:11 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (dune-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") From patchwork Wed Jan 10 07:43:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58746 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8D37227BBEA; Wed, 10 Jan 2024 07:46:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0FCAA27BBE2 for ; Wed, 10 Jan 2024 07:46:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTI2-0002r9-T2; Wed, 10 Jan 2024 02:46:18 -0500 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 1rNTGr-0002CI-L1 for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:05 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGr-0004G9-19 for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGy-0000NU-9f for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:12 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 30/34] gnu: Add dune-private-libs. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487265731170 (code B ref 64249); Wed, 10 Jan 2024 07:45:12 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (dune-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") From patchwork Wed Jan 10 07:43:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58758 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9BFF627BBEC; Wed, 10 Jan 2024 07:47:04 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E41C427BBE9 for ; Wed, 10 Jan 2024 07:47:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTI3-0002wA-FN; Wed, 10 Jan 2024 02:46:19 -0500 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 1rNTGr-0002CJ-RK for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:06 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGr-0004GA-FP for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGy-0000PC-NU for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:12 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 31/34] gnu: Add dune-site. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487265831178 (code B ref 64249); Wed, 10 Jan 2024 07:45:12 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (dune-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") From patchwork Wed Jan 10 07:43:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58762 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id ADE3727BBE9; Wed, 10 Jan 2024 08:06:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AF73527BBE2 for ; Wed, 10 Jan 2024 08:06:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTb3-0003jr-B4; Wed, 10 Jan 2024 03:05:57 -0500 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 1rNTb1-0003iX-9F for guix-patches@gnu.org; Wed, 10 Jan 2024 03:05:55 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTb1-0005Ds-0i for guix-patches@gnu.org; Wed, 10 Jan 2024 03:05:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTb8-0005VV-2O for guix-patches@gnu.org; Wed, 10 Jan 2024 03:06:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 32/34] gnu: frama-c: Update to 27.1. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 08:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487390521096 (code B ref 64249); Wed, 10 Jan 2024 08:06:02 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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") From patchwork Wed Jan 10 07:43:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58757 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7FA6527BBE9; Wed, 10 Jan 2024 07:46:53 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C49F027BBE2 for ; Wed, 10 Jan 2024 07:46:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTI8-00034M-6k; Wed, 10 Jan 2024 02:46:24 -0500 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 1rNTGs-0002CL-3U for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:06 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGr-0004GQ-RL for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGz-0000Q8-4H for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:13 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 33/34] gnu: ocaml-base64: Update to 3.5.1. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487265831185 (code B ref 64249); Wed, 10 Jan 2024 07:45:13 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-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)) From patchwork Wed Jan 10 07:43:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58761 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0A3E527BBEA; Wed, 10 Jan 2024 07:47:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DBA6027BBE9 for ; Wed, 10 Jan 2024 07:47:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTI4-000308-Bq; Wed, 10 Jan 2024 02:46:20 -0500 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 1rNTGs-0002DK-IB for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:09 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTGs-0004GZ-8M for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGz-0000Rd-HY for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:13 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 34/34] gnu: opam: Update to 2.1.5. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487266031194 (code B ref 64249); Wed, 10 Jan 2024 07:45:13 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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