From patchwork Fri Jan 13 10:54:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 46083 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 BD13527BBEB; Fri, 13 Jan 2023 10:56: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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 AE43427BBE9 for ; Fri, 13 Jan 2023 10:56:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGHjB-0002Xg-1R; Fri, 13 Jan 2023 05:56:05 -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 1pGHj9-0002Wf-3n for guix-patches@gnu.org; Fri, 13 Jan 2023 05:56:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pGHj8-0002n5-HR for guix-patches@gnu.org; Fri, 13 Jan 2023 05:56:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pGHj8-0007Yh-Dv for guix-patches@gnu.org; Fri, 13 Jan 2023 05:56:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59487] [PATCH v3 1/6] gnu: Add ocaml-cinaps. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Jan 2023 10:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59487 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59487@debbugs.gnu.org Cc: pukkamustard , julien@lepiller.eu, raingloom Received: via spool by 59487-submit@debbugs.gnu.org id=B59487.167360731328919 (code B ref 59487); Fri, 13 Jan 2023 10:56:02 +0000 Received: (at 59487) by debbugs.gnu.org; 13 Jan 2023 10:55:13 +0000 Received: from localhost ([127.0.0.1]:49680 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiK-0007WI-ON for submit@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:13 -0500 Received: from mout01.posteo.de ([185.67.36.65]:55741) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiI-0007Vt-Mt for 59487@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:11 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 2C7092402B2 for <59487@debbugs.gnu.org>; Fri, 13 Jan 2023 11:55:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1673607305; bh=tTjzM73dIKBsgYaSDhp2WhTeg//SSSj0uOw3Rs/OGIo=; h=From:To:Cc:Subject:Date:From; b=ab9U1UYzVGt2Pm2EzdvIN2VkSRXiPfM1d7qcz/0f+UVzZR9bldFmix2zkwNKifAkt IR3+WpPGA4dEvYnTLRLRcsa80oBsrTricBRqiildVnltXD69/V68CFz7+8JEn9gRWy +uXJHktUf7aTfDexWBFtnrjCAE8CWvo8M2ppmrRl41bt/j7WrIpMmIiXlCNZFDgllg mB0bIKIoltavayXDko0kmfGuie8jcRWLPWq90f+6coK3Db0FP2R/TEHnxhxVnRtlls y4Ru7wqLfnI/YdKtr+BejR7zw2s3d25p8/vrl9Hg8XxfphryP7VWO7DZdOTiStOiFn hE/myPUjdLStQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Ntdbr343yz6tmQ; Fri, 13 Jan 2023 11:55:04 +0100 (CET) From: pukkamustard Date: Fri, 13 Jan 2023 10:54:35 +0000 Message-Id: <20230113105440.28258-2-pukkamustard@posteo.net> In-Reply-To: <20230113105440.28258-1-pukkamustard@posteo.net> References: <20230113105440.28258-1-pukkamustard@posteo.net> 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-cinaps): New variable. --- gnu/packages/ocaml.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5109cd052a..b37cfa4681 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5939,6 +5939,36 @@ (define-public ocaml-ppx-derivers as part of the same ocaml-migrate-parsetree driver.") (license license:bsd-3))) +(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 + ;; ocaml-ppxlib and ocaml-ppx-jane. + (let ((commit "d974bb2db3ab1ab14e81f989b5bdb609462bff47") + (revision "0")) + (package + (name "ocaml-cinaps") + (version (git-version "0.15.1" revision commit)) + (home-page "https://github.com/ocaml-ppx/cinaps") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "00kb04vqlnk1pynqjhna5qhn8790ab17baxf4na5py1l1h1js8qx")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-re)) + (synopsis "Trivial metaprogramming tool for OCaml") + (description + "Cinaps is a trivial Metaprogramming tool using the OCaml toplevel. It is based +on the same idea as expectation tests. The user write some OCaml code inside +special comments and cinaps make sure that what follows is what is printed by +the OCaml code.") + (license license:expat)))) + (define-public ocaml-ppxlib (package (name "ocaml-ppxlib") From patchwork Fri Jan 13 10:54:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 46086 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 BFF7327BBED; Fri, 13 Jan 2023 10:57:02 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 1D74527BBE9 for ; Fri, 13 Jan 2023 10:57:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGHjD-0002YU-Bg; Fri, 13 Jan 2023 05:56:07 -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 1pGHjA-0002X8-C1 for guix-patches@gnu.org; Fri, 13 Jan 2023 05:56:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pGHj8-0002n6-UB for guix-patches@gnu.org; Fri, 13 Jan 2023 05:56:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pGHj8-0007Yo-QM for guix-patches@gnu.org; Fri, 13 Jan 2023 05:56:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59487] [PATCH v3 2/6] gnu: ocaml-ppxlib: Clean up inputs. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Jan 2023 10:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59487 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59487@debbugs.gnu.org Cc: pukkamustard , julien@lepiller.eu, raingloom Received: via spool by 59487-submit@debbugs.gnu.org id=B59487.167360731728951 (code B ref 59487); Fri, 13 Jan 2023 10:56:02 +0000 Received: (at 59487) by debbugs.gnu.org; 13 Jan 2023 10:55:17 +0000 Received: from localhost ([127.0.0.1]:49688 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiP-0007Ws-2Y for submit@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:17 -0500 Received: from mout02.posteo.de ([185.67.36.66]:38567) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiN-0007Vy-77 for 59487@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:15 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 6C54E2402F8 for <59487@debbugs.gnu.org>; Fri, 13 Jan 2023 11:55:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1673607309; bh=PNqlwpLcnTyBJ+6V/GdlHe+PuA+581uEGM5K0VGGwaA=; h=From:To:Cc:Subject:Date:From; b=UA4ygi3yGrSKX2X/SmZo3Xnt1g11SKThgF/ZlpZ+Cr3yH0+bmuTi6J3wLctcGlm7J ze/Grgq7zb0Bgy+/0gqXz1aQA7ECFdlmqcE1ID72IdCQ9HzczNd++/H/54Zep2jxBu mZw8tBtIK/yOYnv0p+wr7QbyEAbZrLMMkY58OGCkU39w41DFb4y4DAIArLt1KlTJl9 R2TnCRxMpANGeVlJXZBKmaBGecpuFdi3CFGiACgZOu5UtXaPEEXcE8wMtbdjNfhH4j 3utOYsEluuaJmMG8qwuv6Z0N3nuy+rpWKW1vaiOVqLaStk25Q0Uvu7tXkMFi40g1e6 HitlqWhT6wD+A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Ntdbt0CL0z6tmH; Fri, 13 Jan 2023 11:55:05 +0100 (CET) From: pukkamustard Date: Fri, 13 Jan 2023 10:54:36 +0000 Message-Id: <20230113105440.28258-3-pukkamustard@posteo.net> In-Reply-To: <20230113105440.28258-1-pukkamustard@posteo.net> References: <20230113105440.28258-1-pukkamustard@posteo.net> 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): [propagated-inputs] Remove unused inputs. [native-inputs] Move test dependencies from propagated-inputs here and add ocaml-cinaps. --- gnu/packages/ocaml.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b37cfa4681..1507405f7e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6003,14 +6003,14 @@ (define-public ocaml-ppxlib ((" \"(Some ppx-es.*)\")" _ m) (string-append " \"" m "\".")))))))) (propagated-inputs - (list ocaml-base - ocaml-compiler-libs - ocaml-migrate-parsetree - ocaml-stdlib-shims + (list ocaml-compiler-libs ocaml-ppx-derivers - ocaml-stdio - ocaml-result - ocaml-sexplib0)) + ocaml-sexplib0 + ocaml-stdlib-shims)) + (native-inputs + (list ocaml-stdio + ocaml-cinaps + ocaml-base)) (properties `((ocaml4.07-variant . ,(delay ocaml4.07-ppxlib)))) (synopsis "Base library and tools for ppx rewriters") From patchwork Fri Jan 13 10:54:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 46084 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 CACE227BBEB; Fri, 13 Jan 2023 10:56:57 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 5BA0127BBE9 for ; Fri, 13 Jan 2023 10:56:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGHjC-0002YI-TD; Fri, 13 Jan 2023 05:56: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 1pGHjA-0002X5-C8 for guix-patches@gnu.org; Fri, 13 Jan 2023 05:56:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pGHj9-0002nF-BN for guix-patches@gnu.org; Fri, 13 Jan 2023 05:56:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pGHj9-0007Yv-7e for guix-patches@gnu.org; Fri, 13 Jan 2023 05:56:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59487] [PATCH v3 3/6] gnu: ocaml-cohttp: Run tests. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Jan 2023 10:56:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59487 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59487@debbugs.gnu.org Cc: pukkamustard , julien@lepiller.eu, raingloom Received: via spool by 59487-submit@debbugs.gnu.org id=B59487.167360731728959 (code B ref 59487); Fri, 13 Jan 2023 10:56:03 +0000 Received: (at 59487) by debbugs.gnu.org; 13 Jan 2023 10:55:17 +0000 Received: from localhost ([127.0.0.1]:49690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiP-0007Wu-Ae for submit@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:17 -0500 Received: from mout02.posteo.de ([185.67.36.66]:33561) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiN-0007Vx-8W for 59487@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:15 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 6C5302401B7 for <59487@debbugs.gnu.org>; Fri, 13 Jan 2023 11:55:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1673607309; bh=DYDQyBmfiOVcdKDJyM2khAYgy7iOS748wuPQdM4Kccg=; h=From:To:Cc:Subject:Date:From; b=hUFe4kOLjDxqje6VHcbG5sjW8ZNjBFY9DSBDXWmErE0Id/Td8sIogfKn46YP1WetG uxnZaqdCCs3obxrZX1blmETicZiNErabJQKFM4ZO2kuhVCA7ok1dEb1IXVHGoxAPGd UMNaIQS9C7UaIRK3d2tuPwyPGwjr4J9qc7hD6PBFBdCkpHzRAgd5XxDtWxlOCr+uTY LUyXkZCVKgluVVWkmrBvbWTfDS7KhYlVwo9mUlIijBVWEx3/fC30DWp34vdI/AoPuy 6eAKXW2NZ8erA75nsGypws0X7MFxWiR7RbxDbIrPtiiQahd4J4rFwM8yA5qUtdGrmw iG+mgTH3Ckj6A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Ntdbv4d02z6tmH; Fri, 13 Jan 2023 11:55:07 +0100 (CET) From: pukkamustard Date: Fri, 13 Jan 2023 10:54:37 +0000 Message-Id: <20230113105440.28258-4-pukkamustard@posteo.net> In-Reply-To: <20230113105440.28258-1-pukkamustard@posteo.net> References: <20230113105440.28258-1-pukkamustard@posteo.net> 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 Tests were not being run as test-target was pointing to a testing library and not tests. - gnu/package/ocaml.scm (ocaml-cohttp): [arguments]: Remove test-target. [native-inputs]: Add ocaml-crowbar. --- gnu/packages/ocaml.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1507405f7e..1ed837eccd 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8961,9 +8961,7 @@ (define-public ocaml-cohttp (base32 "074xis3wmr76gadh1ffmfzjfx13mw4kr2s6rkwqwzcl6l85n9x2z")))) (build-system dune-build-system) - (arguments - '(#:package "cohttp" - #:test-target "cohttp_test/src")) + (arguments '(#:package "cohttp")) (propagated-inputs (list ocaml-re ocaml-uri @@ -8973,7 +8971,10 @@ (define-public ocaml-cohttp ocaml-stringext ocaml-base64)) (native-inputs - (list ocaml-fmt ocaml-jsonm ocaml-alcotest)) + (list ocaml-fmt + ocaml-jsonm + ocaml-alcotest + ocaml-crowbar)) (home-page "https://github.com/mirage/ocaml-cohttp") (synopsis "OCaml library for HTTP clients and servers") (description From patchwork Fri Jan 13 10:54:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 46082 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 4C0EB27BBEB; Fri, 13 Jan 2023 10:56:42 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 0179C27BBE9 for ; Fri, 13 Jan 2023 10:56:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGHjB-0002Xl-O3; Fri, 13 Jan 2023 05:56:05 -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 1pGHjA-0002X2-Bt for guix-patches@gnu.org; Fri, 13 Jan 2023 05:56:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pGHj9-0002nG-Op for guix-patches@gnu.org; Fri, 13 Jan 2023 05:56:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pGHj9-0007Z3-L0 for guix-patches@gnu.org; Fri, 13 Jan 2023 05:56:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59487] [PATCH v3 4/6] guix: dune-build-system: Run all tests. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Jan 2023 10:56:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59487 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59487@debbugs.gnu.org Cc: pukkamustard , julien@lepiller.eu, raingloom Received: via spool by 59487-submit@debbugs.gnu.org id=B59487.167360732128981 (code B ref 59487); Fri, 13 Jan 2023 10:56:03 +0000 Received: (at 59487) by debbugs.gnu.org; 13 Jan 2023 10:55:21 +0000 Received: from localhost ([127.0.0.1]:49696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiS-0007XG-QG for submit@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:21 -0500 Received: from mout02.posteo.de ([185.67.36.66]:60193) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiN-0007W0-D3 for 59487@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:16 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id D9DC02401B7 for <59487@debbugs.gnu.org>; Fri, 13 Jan 2023 11:55:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1673607309; bh=tIEUPTKPAymEXbxC+7GqAm5PBGVLawgY6X0nExXLad8=; h=From:To:Cc:Subject:Date:From; b=JVoWZHSPTBByGmRYC51p3qpYZg4LzGnz9wbOC6k6bPJ+vGLo7cf5E1VYlquIs1Bj4 bBxlZYybWmjV8Rn27h1Pywk0uQ7RLLaXMDVDMVoTB0hv9G8VpKukbjskGrD+3mfi09 dhwmf9vanmf7FvqW/kCimGctF12rRl51KWhVgnRrwFXN6JAjS2HdvI7aatbtpKKNpY icPKH4pBSBVwIOM02P9p4K5eyRyRC0Mahf7oGjKGN0YCDZw0IiX0vCQ2s2tM5rxzHX juxBQCd9qfFVzSE+nwiBv3iw5hBLbgFg+lRxJpjYwBdKRZ95/Qa2H/bjLU6Tc6cSA7 SWOxX1VlxTtNA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Ntdbx1FjLz6tn4; Fri, 13 Jan 2023 11:55:09 +0100 (CET) From: pukkamustard Date: Fri, 13 Jan 2023 10:54:38 +0000 Message-Id: <20230113105440.28258-5-pukkamustard@posteo.net> In-Reply-To: <20230113105440.28258-1-pukkamustard@posteo.net> References: <20230113105440.28258-1-pukkamustard@posteo.net> 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 * guix/build/dune-build-system.scm (check): Do not use test-target argument and let dune run all tests for a given package. --- guix/build/dune-build-system.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/build/dune-build-system.scm b/guix/build/dune-build-system.scm index e9ccc71057..f311cd37f1 100644 --- a/guix/build/dune-build-system.scm +++ b/guix/build/dune-build-system.scm @@ -42,13 +42,13 @@ (define* (build #:key (build-flags '()) (jbuild? #f) build-flags))) #t) -(define* (check #:key (test-flags '()) (test-target "test") tests? +(define* (check #:key (test-flags '()) tests? (jbuild? #f) (package #f) (dune-release-flags '()) #:allow-other-keys) "Test the given package." (when tests? (let ((program (if jbuild? "jbuilder" "dune"))) - (apply invoke program "runtest" test-target + (apply invoke program "runtest" (append (if package (list "-p" package) dune-release-flags) test-flags)))) From patchwork Fri Jan 13 10:54:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 46087 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 838FF27BBED; Fri, 13 Jan 2023 10:57:09 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 8A06527BBE9 for ; Fri, 13 Jan 2023 10:57:06 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGHjC-0002Y4-6A; Fri, 13 Jan 2023 05:56: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 1pGHjA-0002XA-E0 for guix-patches@gnu.org; Fri, 13 Jan 2023 05:56:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pGHjA-0002nH-4l for guix-patches@gnu.org; Fri, 13 Jan 2023 05:56:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pGHjA-0007ZA-0F for guix-patches@gnu.org; Fri, 13 Jan 2023 05:56:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59487] [PATCH v3 5/6] guix: dune-build-system: Remove usage of test-target argument. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Jan 2023 10:56:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59487 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59487@debbugs.gnu.org Cc: julien@lepiller.eu, raingloom Received: via spool by 59487-submit@debbugs.gnu.org id=B59487.167360732228988 (code B ref 59487); Fri, 13 Jan 2023 10:56:03 +0000 Received: (at 59487) by debbugs.gnu.org; 13 Jan 2023 10:55:22 +0000 Received: from localhost ([127.0.0.1]:49698 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiT-0007XO-2V for submit@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:22 -0500 Received: from mout01.posteo.de ([185.67.36.65]:46525) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiP-0007WF-Jy for 59487@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:19 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 19F2E2402A0 for <59487@debbugs.gnu.org>; Fri, 13 Jan 2023 11:55:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1673607312; bh=xDcOdoGYs8FUspkfINbNGeZBIux91o3JHg2m3MLv2NE=; h=From:To:Cc:Subject:Date:From; b=GG6e6+luUdjQId4Cg2a8Uo0RxKxyb3KC9xn1bVCgDH4wF7U3uFS7/y/FjSkBTb3Mi UCTvBW1GIo6utjNxqTg/TUBBeqZt75s3Ew9nc+ZhkF6yOKORjSdk7uhHL8k3xZbbVJ Ki3KHezo5l9ghZHk9nwEpY3zusXdqSmni3hH1V2vQEMzePzLdtxtEMnkVbBKAGhGe/ AJWGcF+IZ49IKbwxzD2RS6zNW9boQpln3fZT19VRY7n2WnR0NGYbMMgeKKIMr10mJj RKRqvsyV5ExTsprCbY8n8kuBNLPPQl1hHnCN+wmF1V4zE+R1BBmkcvXW8Zzv4xt180 0KJztYtHQLQug== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Ntdbz2WyMz6tn4; Fri, 13 Jan 2023 11:55:11 +0100 (CET) From: pukkamustard Date: Fri, 13 Jan 2023 10:54:39 +0000 Message-Id: <20230113105440.28258-6-pukkamustard@posteo.net> In-Reply-To: <20230113105440.28258-1-pukkamustard@posteo.net> References: <20230113105440.28258-1-pukkamustard@posteo.net> 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: raingloom gnu/packages/ocaml.scm: Remove test-target argument from packages built with dune-build-system. Co-authored: pukkamustard --- gnu/packages/ocaml.scm | 153 +++++++++++------------------------------ 1 file changed, 39 insertions(+), 114 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1ed837eccd..371c3ebb71 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -664,8 +664,6 @@ (define-public ocaml-cudf (base32 "1lvrmpscbk1kjv5ag5bzlzv520xk5zw2haf6q7chvz98gcm9g0hk")))) (build-system dune-build-system) - (arguments - '(#:test-target ".")) (propagated-inputs (list ocaml-extlib)) (native-inputs (list ocaml-ounit2)) (home-page "https://www.mancoosi.org/cudf/") @@ -855,8 +853,7 @@ (define-public opam "1mw535zsw7xlvpgwnk1dan76z3f7lh5imlg0s6kdyhfg0iqisjd7")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'build 'pre-build (lambda* (#:key inputs make-flags #:allow-other-keys) @@ -1628,8 +1625,7 @@ (define-public ocaml-frontc "1mi1vh4qgscnb470qwidccaqd068j1bqlz6pf6wddk21paliwnqb")))) (build-system dune-build-system) (arguments - `(#:test-target "test.t" - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'make-writable (lambda _ @@ -1699,8 +1695,6 @@ (define-public ocaml-qcheck (sha256 (base32 "1r0m5p1dd06lbgfxqdpl1ya4vb8252z7hqkvdi9k444g4rx2ay3p")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-alcotest ocaml-ounit ocaml-ppxlib)) (native-inputs @@ -1744,8 +1738,6 @@ (define-public ocaml-qtest (base32 "04ghjshh6104xyglm0db9kv90m62qla5f4bfrlndv6dsvgw3rdjl")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (propagated-inputs `(("ounit" ,ocaml-ounit) ("qcheck" ,ocaml-qcheck))) @@ -1771,8 +1763,6 @@ (define-public ocaml-stringext (base32 "1m09cmn3vrk3gdm60fb730qsygcfyxsyv7gl9xfzck08q1x2x9qx")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (native-inputs `(("ocamlbuild" ,ocamlbuild) ("qtest" ,ocaml-qtest))) @@ -2047,8 +2037,7 @@ (define-public ocaml4.07-ppx-tools-versioned "07lnj4yzwvwyh5fhpp1dxrys4ddih15jhgqjn59pmgxinbnddi66")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:package "ppx_tools_versioned")) + `(#:package "ppx_tools_versioned")) (propagated-inputs (list ocaml-migrate-parsetree)) (properties `((upstream-name . "ppx_tools_versioned"))) @@ -2167,8 +2156,7 @@ (define-public ocaml-result "166laj8qk7466sdl037c6cjs4ac571hglw4l5qpyll6df07h6a7q")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:dune ,dune-bootstrap)) + `(#:dune ,dune-bootstrap)) (properties `((ocaml4.09-variant . ,(delay ocaml4.09-result)) (ocaml5.0-variant . ,(delay ocaml5.0-result)))) (home-page "https://github.com/janestreet/result") @@ -2183,8 +2171,7 @@ (define-public ocaml4.09-result (inherit ocaml-result) (name "ocaml4.09-result") (arguments - `(#:test-target "." - #:dune ,ocaml4.09-dune-bootstrap + `(#:dune ,ocaml4.09-dune-bootstrap #:ocaml ,ocaml-4.09 #:findlib ,ocaml4.09-findlib)))) @@ -2193,8 +2180,7 @@ (define-public ocaml5.0-result (inherit ocaml-result) (name "ocaml5.0-result") (arguments - `(#:test-target "." - #:dune ,ocaml5.0-dune-bootstrap + `(#:dune ,ocaml5.0-dune-bootstrap #:ocaml ,ocaml-5.0 #:findlib ,ocaml5.0-findlib)))) @@ -2331,8 +2317,7 @@ (define-public ocaml-csv "0y2hlqlmqs7r4y5mfzc5qdv7gdp3wxbwpz458vf7fj4593vg94cf")))) (build-system dune-build-system) (arguments - `(#:package "csv" - #:test-target ".")) + `(#:package "csv")) (home-page "https://github.com/Chris00/ocaml-csv") (synopsis "Pure OCaml functions to read and write CSV") (description @@ -2570,7 +2555,6 @@ (define-public ocaml-alcotest (build-system dune-build-system) (arguments `(#:package "alcotest" - #:test-target "." #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-test-format @@ -2615,8 +2599,7 @@ (define-public ocaml4.07-alcotest (base32 "1frwi185z4aadmaf0vp8xk5227nyg7nmh28ijj5l7ncjr5slvhz8")))) (arguments - `(#:package "alcotest" - #:test-target ".")) + `(#:package "alcotest")) (properties '())))) (define-public ocaml-ppx-tools @@ -2689,8 +2672,6 @@ (define-public ocaml-ssl (sha256 (base32 "1bg5vagklq6yfxsvcnj2i76xis8hb59088hkic82smyrxdjd1kjs")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (native-inputs (list autoconf automake ocaml-alcotest which)) (propagated-inputs (list openssl)) @@ -2760,7 +2741,6 @@ (define-public ocaml-optint (sha256 (base32 "1qj32bcw1in7s6raxdvbmjr3lvj99iwv98x1ar9cwxp4zf8ybfss")))) (build-system dune-build-system) - (arguments `(#:test-target ".")) (native-inputs (list ocaml-crowbar ocaml-monolith ocaml-fmt)) (synopsis "Efficient integer types on 64-bit architectures for OCaml") (description @@ -2811,8 +2791,7 @@ (define ocaml-eio (sha256 (base32 "118raxdwv6pn5b152ffdhmwdi0l4wlwflcj2nmckfmm7v1z2fq4s")))) (build-system dune-build-system) - (arguments `(#:package "eio" - #:test-target ".")) + (arguments `(#:package "eio")) (propagated-inputs (list ocaml-bigstringaf ocaml-cstruct ocaml-lwt @@ -2837,8 +2816,7 @@ (define ocaml-eio-luv (package (inherit ocaml-eio) (name "ocaml-eio-luv") - (arguments `(#:package "eio_luv" - #:test-target ".")) + (arguments `(#:package "eio_luv")) (propagated-inputs (list ocaml-eio ocaml-luv)) (native-inputs (list ocaml-mdx)) (synopsis "Libuv-based backend for Ocaml Eio") @@ -2863,7 +2841,6 @@ (define-public ocaml-uring (sha256 (base32 "0k70y7nb2wrk2yql0pwnrhsp1x7k9ld4gd8iihbv6r34kcm3a5m1")))) (build-system dune-build-system) - (arguments `(#:test-target ".")) (propagated-inputs (list ocaml-cstruct ocaml-fmt @@ -2884,8 +2861,7 @@ (define ocaml-eio-linux (package (inherit ocaml-eio) (name "ocaml-eio-linux") - (arguments `(#:package "eio_linux" - #:test-target ".")) + (arguments `(#:package "eio_linux")) (propagated-inputs (list ocaml-eio ocaml-uring @@ -2908,7 +2884,6 @@ (define ocaml-eio-main (inherit ocaml-eio) (name "ocaml-eio-main") (arguments `(#:package "eio_main" - #:test-target "." ;; tests require network #:tests? #f)) (propagated-inputs @@ -3243,8 +3218,7 @@ (define-public ocaml-gen "1z5nw5wljvcqp8q07h336bbvf9paynia0jsdh4486hlkbmr1ask1")))) (build-system dune-build-system) (arguments - `(#:package "gen" - #:test-target ".")) + `(#:package "gen")) (propagated-inputs (list ocaml-odoc ocaml-seq)) (native-inputs @@ -3504,8 +3478,6 @@ (define-public ocaml-ocp-indent (base32 "1dvcl108ir9nqkk4mjm9xhhj4p9dx9bmg8bnms54fizs1x3x8ar3")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (propagated-inputs (list ocaml-cmdliner)) (home-page "https://www.typerex.org/ocp-indent.html") @@ -3729,7 +3701,6 @@ (define-public ocaml-benchmark (sha256 (base32 "0d0vdfjgjzf1y6wkd714d8b0piv1z9qav5ahsapynqzk4b4ahhnp")))) (build-system dune-build-system) - (arguments `(#:test-target "tests")) (home-page "https://github.com/Chris00/ocaml-benchmark") (synopsis "Benchmark running times of code") (description @@ -4070,8 +4041,6 @@ (define-public ocaml-re (sha256 (base32 "1g0vmpx6ylv8m0w77zarn215pgb4czc6gcpb2fi5da1s307zwr0w")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-seq)) (native-inputs @@ -4094,8 +4063,7 @@ (define-public ocaml4.07-re (package (inherit ocaml-re) (arguments - `(#:test-target "." - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'fix-dune-version (lambda _ @@ -4116,8 +4084,6 @@ (define-public ocaml-ocplib-endian "1klj4g451s7m5r8bxmwc1rpvngpqdm40csnx9smgc06pwy2fax2c")) (file-name (git-file-name name version)))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (native-inputs `(("cppo" ,ocaml-cppo))) (home-page "https://github.com/OCamlPro/ocplib-endian") @@ -4144,8 +4110,7 @@ (define-public ocaml-cstruct "0dpbirs6lzp0bclr3wcw407jjspll7iy66z18zks3mjccvlxd21w")))) (build-system dune-build-system) (arguments - `(#:package "cstruct" - #:test-target ".")) + `(#:package "cstruct")) (propagated-inputs (list ocaml-bigarray-compat)) (native-inputs @@ -4188,8 +4153,6 @@ (define-public ocaml-hex (base32 "0xnl5wxd2qrba7phm3mdrjwd2kk26kb17dv94ciwp49ljcj28qc1")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs `(("ocaml-bigarray-compat" ,ocaml-bigarray-compat) ("cstruct" ,ocaml-cstruct))) @@ -4213,8 +4176,7 @@ (define-public ocaml-ezjsonm (base32 "004knljxqxn9zq0rnq7q7wxl4nwlzydm8p9f5cqkl8il5yl5zkjm")))) (build-system dune-build-system) (arguments - `(#:package "ezjsonm" - #:test-target ".")) + `(#:package "ezjsonm")) (native-inputs (list ocaml-alcotest js-of-ocaml node)) (propagated-inputs (list ocaml-jsonm ocaml-uutf ocaml-sexplib0 ocaml-hex)) (home-page "https://github.com/mirage/ezjsonm/") @@ -4241,8 +4203,7 @@ (define-public ocaml-uri (base32 "1bgkc66cq00mgnkz3i535srwzwc4cpdsv0mly5dzvvq33451xwf0")))) (build-system dune-build-system) - (arguments '(#:package "uri" - #:test-target ".")) + (arguments '(#:package "uri")) (propagated-inputs (list ocaml-stringext ocaml-angstrom)) (native-inputs @@ -4268,8 +4229,7 @@ (define-public ocaml4.07-uri (base32 "1ppbav41mszpjcl0zi3fyg958cxyfs57i7kvha4ds9ydn89bjmrh")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'build 'update-deprecated (lambda _ @@ -4624,8 +4584,7 @@ (define-public ocaml-camomile "0chn7ldqb3wyf95yhmsxxq65cif56smgz1mhhc7m0dpwmyq1k97h")))) (build-system dune-build-system) (arguments - `(#:test-target "camomile-test" - #:tests? #f ; Tests fail, see https://github.com/yoriyuki/Camomile/issues/82 + `(#:tests? #f ; Tests fail, see https://github.com/yoriyuki/Camomile/issues/82 #:phases (modify-phases %standard-phases (add-before 'build 'fix-usr-share @@ -4692,8 +4651,6 @@ (define-public ocaml-zed ocaml-uucp ocaml-uuseg ocaml-odoc)) - (arguments - `(#:test-target ".")) (properties `((ocaml4.07-variant . ,(delay ocaml4.07-zed)))) (synopsis "Abstract engine for text edition in OCaml") (description @@ -4741,8 +4698,6 @@ (define-public ocaml-lambda-term (base32 "1pkamblc6h0rsbk901cqn3xr9gqa3g8wrwyx5zryaqvb2xpbhp8b")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-logs ocaml-lwt @@ -4796,8 +4751,6 @@ (define-public ocaml-utop (sha256 (base32 "1pcix3h9f7is06581iax4i08zkd6sv8y5hy1vvxhqhcsd9z0qfl3")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (native-inputs (list ocaml-cppo)) (propagated-inputs @@ -4852,8 +4805,6 @@ (define-public ocaml-ansiterminal (base32 "052qnc23vmxp90yympjz9q6lhqw98gs1yvb3r15kcbi1j678l51h")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (properties `((upstream-name . "ANSITerminal"))) (home-page "https://github.com/Chris00/ANSITerminal") (synopsis @@ -5078,8 +5029,6 @@ (define-public dedukti (base32 "1dsr3s88kgmcg3najhc29cwfvsxa2plvjws1127fz75kmn15np28")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (inputs (list gmp ocaml-cmdliner ocaml-z3 z3)) (native-inputs (list ocaml-menhir)) (synopsis "Proof-checker for the λΠ-calculus modulo theory, an extension of @@ -5233,8 +5182,6 @@ (define-public ocaml-bindlib (base32 "1viyws3igy49hfaj4jaiwm4iggck9zdn7r3g6kh1n4zxphqk57yk")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (native-inputs (list ocamlbuild ocaml-findlib)) (home-page "https://rlepigre.github.io/ocaml-bindlib/") @@ -5261,8 +5208,6 @@ (define-public ocaml-earley (base32 "1vi58zdxchpw6ai0bz9h2ggcmg8kv57yk6qbx82lh47s5wb3mz5y")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-stdlib-shims)) (synopsis "Parsing library based on Earley Algorithm") @@ -5287,8 +5232,6 @@ (define-public ocaml-timed "1aqmkpjv5jk95lc2m3qyyrhw8ra7n9wj8pv3bfc83l737zv0hjn1")) (file-name (git-file-name name version)))) (build-system dune-build-system) - (arguments - '(#:test-target ".")) (synopsis "Timed references for imperative state") (description "Timed references for imperative state. This module provides an alternative type for references (or mutable cells) supporting undo/redo @@ -5353,8 +5296,7 @@ (define-public ocaml-yojson "1habsh00ihjhk1g1csxqg3hj8izk5zvgc7wm579wyjw35vzcmwr1")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:package "yojson")) + `(#:package "yojson")) (propagated-inputs (list ocaml-seq)) (native-inputs (list ocaml-alcotest ocaml-cppo)) (synopsis "Low-level JSON library for OCaml") @@ -5504,8 +5446,7 @@ (define-public ocaml-gsl "1l5zkkkg8sglsihrbf10ivq9s8xzl1y6ag89i4jqpnmi4m43fy34")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'fix-gsl-directory (lambda* (#:key inputs #:allow-other-keys) @@ -5898,8 +5839,6 @@ (define-public ocaml-ppx-deriving (base32 "1wqcnw4wi6pfjjhixpakckm03dpj990259za432804471a6spm2j")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-ppx-derivers ocaml-ppxlib ocaml-result)) (native-inputs @@ -6975,7 +6914,6 @@ (define-public ocaml-ppx-cold (janestreet-origin "ppx_cold" version "13gqmfw2sq80anag9bwpm35600l1fnfn7mh9cbj1291k84rsx7wb")) (build-system dune-build-system) - (arguments `(#:test-target "tests")) (propagated-inputs (list ocaml-base ocaml-ppxlib)) (properties `((upstream-name . "ppx_cold"))) @@ -7160,8 +7098,6 @@ (define-public ocaml-ppx-typerep-conv (sha256 (base32 "1q1lzykpm83ra4l5jh4rfddhd3c96kx4s4rvx0w4b51z1qk56zam")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-base ocaml-typerep ocaml-ppxlib)) (properties `((upstream-name . "ppx_typerep_conv") (ocaml4.07-variant . ,(delay ocaml4.07-ppx-typerep-conv)))) @@ -7227,8 +7163,6 @@ (define-public ocaml-ppx-stable (sha256 (base32 "1as0v0x8c9ilyhngax55lvwyyi4a2wshyan668v0f2s1608cwb1l")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (propagated-inputs (list ocaml-base ocaml-ppxlib)) (properties `((upstream-name . "ppx_stable"))) (home-page "https://github.com/janestreet/ppx_stable") @@ -7246,8 +7180,6 @@ (define-public ocaml-ppx-base "ppx_base" version "181w7y2has8jsrqdsvd08q5nhnkx523vwsk3lg0cjix55qssvfyn")) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-ppx-compare ocaml-ppx-cold @@ -7403,8 +7335,6 @@ (define-public ocaml-ppx-disable-unused-warnings (sha256 (base32 "0sb5i4v7p9df2bxk66rjs30k9fqdrwsq1jgykjv6wyrx2d9bv955")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (propagated-inputs (list ocaml-base ocaml-ppxlib)) (properties `((upstream-name . "ppx_disable_unused_warnings"))) (home-page "https://github.com/janestreet/ppx_disable_unused_warnings") @@ -7427,8 +7357,6 @@ (define-public ocaml-ppx-jane (sha256 (base32 "1p6847gdfnnj6qpa4yh57s6wwpsl7rfgy0q7993chz24h9mhz5lk")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-base-quickcheck ocaml-ppx-assert @@ -7621,8 +7549,7 @@ (define-public ocaml4.07-jane-street-headers "0afhzm08l9v883fhpqqh2lmy7az609pxif40bp7x1sk8c0yszqsh")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:ocaml ,ocaml-4.07 + `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (home-page "https://github.com/janestreet/jane-street-headers") @@ -8095,8 +8022,7 @@ (define-public ocaml4.07-bisect-ppx (native-inputs `(("ocaml-ounit2" ,ocaml-ounit2))) (arguments - `(#:test-target "." - ;; tests require git and network + `(;; tests require git and network #:tests? #f)) (properties '((upstream-name . "bisect_ppx")))))) @@ -8235,8 +8161,6 @@ (define-public ocaml-fftw3 (base32 "07ljbin9dsclsqh24p7haqjccz1w828sf5xfwlzl298d4a6zsbhs")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (propagated-inputs (list fftw fftwf)) (native-inputs @@ -8296,8 +8220,6 @@ (define-public ocaml-cairo2 (base32 "06ag9b88ihhr7yd3s9l0ac7ysig02fmlmsswybbsvz71ni0mb105")))) (build-system dune-build-system) - (arguments - `(#:test-target "tests")) (inputs `(("cairo" ,cairo) ("gtk+-2" ,gtk+-2) @@ -8469,7 +8391,18 @@ (define-public lablgtk3 (build-system dune-build-system) (arguments `(#:package "lablgtk3" - #:test-target ".")) + #:phases + (modify-phases %standard-phases + (add-before 'build 'make-writable + (lambda _ + (for-each (lambda (file) + (chmod file #o644)) + (find-files "." ".")))) + (add-before 'build 'set-version + (lambda _ + (substitute* "dune-project" + (("\\(name lablgtk3\\)") + (string-append "(name lablgtk3)\n(version " ,version ")")))))))) (propagated-inputs (list ocaml-cairo2 ocaml-camlp-streams)) (inputs @@ -8494,8 +8427,7 @@ (define-public ocaml-lablgtk3-sourceview3 (propagated-inputs (list lablgtk3)) (native-inputs (list gtksourceview-3 pkg-config)) (arguments - `(#:package "lablgtk3-sourceview3" - #:test-target ".")) + `(#:package "lablgtk3-sourceview3")) (synopsis "OCaml interface to GTK+ gtksourceview library") (description "This package provides the lablgtk interface to the GTK+ gtksourceview library."))) @@ -8757,8 +8689,6 @@ (define-public ocaml-bigstringaf (base32 "188j9awxg99vrp2l3rqfmdxdazq5xrjmg1wf62vfqsks9sff6wqx")))) (build-system dune-build-system) - (arguments - '(#:test-target ".")) (propagated-inputs (list ocaml-bigarray-compat)) (native-inputs @@ -8890,8 +8820,7 @@ (define-public ocaml-angstrom (build-system dune-build-system) (arguments ;; Only build the base angstrom package. - '(#:package "angstrom" - #:test-target ".")) + '(#:package "angstrom")) (propagated-inputs (list ocaml-bigstringaf)) (native-inputs @@ -8938,8 +8867,7 @@ (define-public ocaml-uri-sexp (inherit ocaml-uri) (name "ocaml-uri-sexp") (arguments - '(#:package "uri-sexp" - #:test-target ".")) + '(#:package "uri-sexp")) (propagated-inputs (list ocaml-uri ocaml-ppx-sexp-conv ocaml-sexplib0)) (native-inputs (list ocaml-ounit)) @@ -8998,8 +8926,8 @@ (define-public js-of-ocaml (base32 "14ig69iyc9yzniclfsc6cz9g9zqp96bs66y6dy4rzrm78s81w6i1")))) (build-system dune-build-system) (arguments - `(#:tests? #f ;tests assume ocaml 4.13 - #:test-target ".")) + ;;tests assume ocaml 4.13 + `(#:tests? #f)) (propagated-inputs (list ocaml-ppxlib ocaml-uchar @@ -9072,7 +9000,6 @@ (define-public ocaml-monolith (base32 "1b6jj4ivl9ni8kba7wls4xsqdy8nm7q9mnx9347jvb99dmmlj5mc")))) (build-system dune-build-system) - (arguments `(#:test-target ".")) (propagated-inputs (list ocaml-afl-persistent ocaml-pprint ocaml-seq)) (home-page "https://gitlab.inria.fr/fpottier/monolith") (synopsis "Framework for testing an OCaml library using afl-fuzz") @@ -9123,8 +9050,6 @@ (define-public ocaml-crowbar (base32 "11f3kiw58g8njx15akx16xcplzvzdw9y6c4jpyfxylkxws4g0f6j")))) (build-system dune-build-system) - (arguments - `(#:test-target ".")) (propagated-inputs (list ocaml-ocplib-endian ocaml-cmdliner From patchwork Fri Jan 13 10:54:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 46085 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 1063F27BBED; Fri, 13 Jan 2023 10:57:01 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 6479827BBE9 for ; Fri, 13 Jan 2023 10:57:00 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGHjD-0002YV-QJ; Fri, 13 Jan 2023 05:56:07 -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 1pGHjB-0002Y2-Ta for guix-patches@gnu.org; Fri, 13 Jan 2023 05:56:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pGHjA-0002na-Fm for guix-patches@gnu.org; Fri, 13 Jan 2023 05:56:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pGHjA-0007ZH-Bg for guix-patches@gnu.org; Fri, 13 Jan 2023 05:56:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59487] [PATCH v3 6/6] gnu: ocaml-ppx-expect: Disable tests. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Jan 2023 10:56:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59487 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59487@debbugs.gnu.org Cc: pukkamustard , julien@lepiller.eu, raingloom Received: via spool by 59487-submit@debbugs.gnu.org id=B59487.167360732729004 (code B ref 59487); Fri, 13 Jan 2023 10:56:04 +0000 Received: (at 59487) by debbugs.gnu.org; 13 Jan 2023 10:55:27 +0000 Received: from localhost ([127.0.0.1]:49702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiY-0007Xj-B4 for submit@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:26 -0500 Received: from mout01.posteo.de ([185.67.36.65]:34101) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiS-0007WZ-H5 for 59487@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:20 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 017DB24027F for <59487@debbugs.gnu.org>; Fri, 13 Jan 2023 11:55:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1673607315; bh=U3IrL8sEOKnHlmEN5B6lOSrBA4utknT3APBQN4nkhvs=; h=From:To:Cc:Subject:Date:From; b=VvqFk9161zPcQq6qhCWi/FvAtpsKLasO2pjzwuh3UAZ8xy3fZqq5IBNrOVddPKM8U hdplGuCN8rl+D3dkGQo1zWKgicLj8kcSJE6+1BARZiksi2qhtpqAMYhtlprYEqVF+p qPTu1x387bygLS3teh+u2RLPmh9ZJsJLKfhGuBzAdJtxJhs/jIUAJs7CAKeQ+2H92h vT/IgpkmKmzO7K3uiW8f5qbs/8mTOaRMZR1d+/MUU6TD90bnDgOt4GdE7P/8Nmwa+m c2wtRmyh2ibm0Uj0j0ZodxzxtM5D9ROs8eip76ZX6/5lKLfchJ2Af7W/DLfoUOzSCL 91+vadDsIxMxw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Ntdc21Dtrz6tnG; Fri, 13 Jan 2023 11:55:14 +0100 (CET) From: pukkamustard Date: Fri, 13 Jan 2023 10:54:40 +0000 Message-Id: <20230113105440.28258-7-pukkamustard@posteo.net> In-Reply-To: <20230113105440.28258-1-pukkamustard@posteo.net> References: <20230113105440.28258-1-pukkamustard@posteo.net> 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 Tests require a package that would cause a cyclic dependency. * gnu/packages/ocaml.scm (ocaml-ppx-expect): Disable tests. --- gnu/packages/ocaml.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 371c3ebb71..a8412a6903 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6981,6 +6981,9 @@ (define-public ocaml-ppx-expect (base32 "134dl5qhjxsj2mcmrx9f3m0iys0n5mjfpz9flj8zn8d2jir43776")))) (build-system dune-build-system) + (arguments + ;; Cyclic dependency with ocaml-ppx-jane + `(#:tests? #f)) (propagated-inputs (list ocaml-base ocaml-ppx-here