From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id MBupEOPPAmIirwAAgWs5BA (envelope-from ) for ; Tue, 08 Feb 2022 21:17:39 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id +EBtCePPAmIS5QAAG6o9tA (envelope-from ) for ; Tue, 08 Feb 2022 21:17:39 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B6413292B9 for ; Tue, 8 Feb 2022 21:17:38 +0100 (CET) Received: from localhost ([::1]:39614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHWvh-0001iB-UF for larch@yhetil.org; Tue, 08 Feb 2022 15:17:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuH-0000et-QM for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54957) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuH-0007ZN-GO for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuH-0002c7-DI for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 19/24] gnu: Add ocmal-ppx-jane. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513219811 (code B ref 53882); Tue, 08 Feb 2022 20:16:09 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:21 +0000 Received: from localhost ([127.0.0.1]:48826 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtU-0002Y4-TV for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:21 -0500 Received: from lepiller.eu ([89.234.186.109]:47112) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtK-0002TE-Tj for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:11 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 4d19649b for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:15:00 +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=JeyvD+br8Qcpbtidvf88e6qlG Ir+6KQ7mOnTTXekcHs=; b=GE6k6byYuMDqE71beZkKFEb6cgubpvRFQ9tsfTYQR 7GlKbO0CjVBJZvPQzY8X5EDPBFrZeh58MzojCW8MXjetROk04ogYwGc52NAwM/vZ bYXMCN7IyfA4ZY4b/VpL5AchxeanNMkhyWB4ObO6JriX3mKozuUAdGIFJfrg7cGU nMSzXgBBRQS1QD6iwCVYQ7yPqMoDUyWsMhiew8cXdNq44sFnDS93rTpq4UbpfBTT dTWhQq9c6SviBw6aTC+HqyVs7prhp3S9QUHH6TXrSY+u9D/6unvaMqfnLZYkyoIj G7K5Ow4BW+/MgNTTUR37BJiia4ZSuQagtUA8YFMOOfpdw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 13958be0 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:45 +0100 Message-Id: <34da3833791425a6168fdcf79c91381ecf469af1.1644350658.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1644351458; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=6R9sReFb+xRNEQYcAiECTH1CzPtLmEc0qrD3gMOE/zo=; b=nwh4r2jZ2kQI7rewZByAqdzz1cAj7SRViJYaaDFi9cDvj8HW69Vk5eHrfaEXnr4KRK7FNj 4Ozgh3kq9MSJ/kUKyoDOGzvp0B+p9LrrBDFRi8jHCYIl1Y5Ua17HuPqk3HfhOxrYtl2uZD NKYTiqigC3QFwswSUpEtRgCdhJ7lwpUXAo4KPVWHRr3xfsJi6GZ9uWGjOuh7Gqe6V3/rEp mTD6A0ICq81oJuonerSAGFuk0VUDCooO5xxv1XHCDI4Ila0RDS1LAXXJvWlzj8M3tOjgz9 /wg9UEk902OUwo/wsFSKq2dOcetYk8UUZjZySit8cQ8vUkXAs1nZKGcLjrMTwQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1644351458; a=rsa-sha256; cv=none; b=RwYYmfjNh4+vBFxR5c5StrVhBXF+gUu73vFmp6DpFGT4elYHzss1aYD3LQUHkNc70cChYu d+UUstSdzXUbNC8/npSah6KJwDsyGI8D4Akz3PgX5IDrzt1Gd6yqYsgH7LTjguDcCpVoI4 OOFF2jOmVixuf+IG1FsMIElEbR0qboo60GSmyOi67XUt/rAJKt6lFFQtb7ohTSbiTkp2TB W7sHZwIYVaPgNfk8YbI7Uh8QjpUYkkWPeLVBiNZHAGG6ulWPht6bQtobSFLxkhgzmMgtEO fH3WHlSqtugS6jiAmTQmWWfbBpV3oLpXvFCyxdG3BxgBGrAooT+xRMlMmjzxog== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=GE6k6byY; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.53 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=GE6k6byY; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: B6413292B9 X-Spam-Score: -0.53 X-Migadu-Scanner: scn1.migadu.com X-TUID: ztXzVZZ+Tkkr * gnu/packages/ocaml.scm (ocaml-ppx-jane): New variable. (ocaml4.07-ppx-jane): Inherit from it. --- gnu/packages/ocaml.scm | 116 +++++++++++++++++++++++++++-------------- 1 file changed, 77 insertions(+), 39 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ec05987e2c..259b6551f2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6527,52 +6527,90 @@ (define-public ocaml4.07-ppx-bin-prot (properties '()) (license license:asl2.0)))) -(define-public ocaml4.07-ppx-jane +(define-public ocaml-ppx-jane (package - (name "ocaml4.07-ppx-jane") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_jane-v" version ".tar.gz")) - (sha256 - (base32 - "0lgppkw3aixrfnixihrsz2ipafv8fpvkdpy3pw8n0r615gg8x8la")))) + (name "ocaml-ppx-jane") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_jane") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1kk238fvrcylymwm7xwc7llbyspmx1y662ypq00vy70g112rir7j")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:test-target ".")) (propagated-inputs - `(("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) - ("ocaml-ppx-base" ,(package-with-ocaml4.07 ocaml-ppx-base)) - ("ocaml-ppx-bench" ,ocaml4.07-ppx-bench) - ("ocaml-ppx-bin-prot" ,ocaml4.07-ppx-bin-prot) - ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) - ("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect)) - ("ocaml-ppx-fail" ,ocaml4.07-ppx-fail) - ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) - ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) - ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) - ("ocaml-ppx-optcomp" ,(package-with-ocaml4.07 ocaml-ppx-optcomp)) - ("ocaml-ppx-optional" ,(package-with-ocaml4.07 ocaml-ppx-optional)) - ("ocaml-ppx-pipebang" ,ocaml4.07-ppx-pipebang) - ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) - ("ocaml-ppx-sexp-value" ,ocaml4.07-ppx-sexp-value) - ("ocaml-ppx-typerep-conv" ,ocaml4.07-ppx-typerep-conv) - ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_jane"))) + (list ocaml-base-quickcheck + ocaml-ppx-assert + ocaml-ppx-base + ocaml-ppx-bench + ocaml-ppx-bin-prot + ocaml-ppx-custom-printf + ocaml-ppx-expect + ocaml-ppx-fields-conv + ocaml-ppx-fixed-literal + ocaml-ppx-here + ocaml-ppx-inline-test + ocaml-ppx-let + ocaml-ppx-module-timer + ocaml-ppx-optcomp + ocaml-ppx-optional + ocaml-ppx-pipebang + ocaml-ppx-sexp-message + ocaml-ppx-sexp-value + ocaml-ppx-stable + ocaml-ppx-string + ocaml-ppx-typerep-conv + ocaml-ppx-variants-conv + ocaml-ppxlib)) + (properties `((upstream-name . "ppx_jane") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-jane)))) (home-page "https://github.com/janestreet/ppx_jane") (synopsis "Standard Jane Street ppx rewriters") (description "This package installs a ppx-jane executable, which is a ppx driver including all standard Jane Street ppx rewriters.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-ppx-jane + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-jane) + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_jane-v" version ".tar.gz")) + (sha256 + (base32 + "0lgppkw3aixrfnixihrsz2ipafv8fpvkdpy3pw8n0r615gg8x8la")))) + (propagated-inputs + (list ocaml-ppx-assert + ocaml-ppx-base + ocaml-ppx-bench + ocaml-ppx-bin-prot + ocaml-ppx-custom-printf + ocaml-ppx-expect + ocaml-ppx-fail + ocaml-ppx-fields-conv + ocaml-ppx-here + ocaml-ppx-inline-test + ocaml-ppx-let + ocaml-ppx-optcomp + ocaml-ppx-optional + ocaml-ppx-pipebang + ocaml-ppx-sexp-message + ocaml-ppx-sexp-value + ocaml-ppx-typerep-conv + ocaml-ppx-variants-conv + ocaml-migrate-parsetree + ocaml-ppxlib)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml-splittable-random (package @@ -6621,7 +6659,7 @@ (define-public ocaml4.07-splittable-random (base32 "0l1wbd881mymlnpzlq5q53mmdz3g5d7qjhyc7lfaq1x0iaccn5lc")))) (propagated-inputs - (list ocaml-base ocaml4.07-ppx-jane ocaml-migrate-parsetree)) + (list ocaml-base ocaml-ppx-jane ocaml-migrate-parsetree)) (properties '()) (license license:asl2.0)))) -- 2.34.0