From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id QARtCmXCmGAWVwEAgWs5BA (envelope-from ) for ; Mon, 10 May 2021 07:19:33 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id kFJ3BWXCmGBTQQAAbx9fmQ (envelope-from ) for ; Mon, 10 May 2021 05:19:33 +0000 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 C0C6BBE5F for ; Mon, 10 May 2021 07:19:32 +0200 (CEST) Received: from localhost ([::1]:41250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyKJ-0004V9-SG for larch@yhetil.org; Mon, 10 May 2021 01:19:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46982) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJA-0000GG-Eu for guix-patches@gnu.org; Mon, 10 May 2021 01:18:20 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45559) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJA-0003h1-5n for guix-patches@gnu.org; Mon, 10 May 2021 01:18:20 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJA-0000Wu-1s for guix-patches@gnu.org; Mon, 10 May 2021 01:18:20 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 27/43] gnu: Add ocaml-ppx-base. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:20 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238861760 (code B ref 47768); Mon, 10 May 2021 05:18:20 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:06 +0000 Received: from localhost ([127.0.0.1]:57059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIv-0000S7-9r for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:05 -0400 Received: from mout02.posteo.de ([185.67.36.66]:56161) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIT-0000L4-Lb for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:39 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 020772400E5 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623852; bh=ZPLbEy8aFX4vM6iol8w4SRkCuqqXh8OjKXhVaxXLg0Q=; h=From:To:Cc:Subject:Date:From; b=obZa4eYl7W1E5K7st9U1JtOtyq1+DQVAcBxW5aE/E3QEfIQX2vDxT21Rm08ZHuIRJ /98fB8usWSPYoJ2oU0N21Vc38Cx8ksYONL+R41GqyRf02IkgPa3BaOcou8GFHR+pEQ s07Wen4X3RpRbvO5qpXb+u+tpb5uHowGQXffkuzDEYFimTh5AhJTwqu5VuyAS0gpOq FUV43xgJl9jKnWIUATocEk73CNbQZCInYNBjC1ptuZnlD7xhWZBL6McmG5/XZLcfDw 51cpGxESd6tAW76dPTZXKNA/1iZhccRHEJD0QEqTO26oD4NqyUxCkUE/vj778gLcYb JPTsBuq0x/HRw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7H2LBGz9rxf; Mon, 10 May 2021 07:17:31 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:12 +0000 Message-Id: <20210510051628.15359-28-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1620623972; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=SwLBbi6JZE1Gf0s1XQRH72EkAhL66kMu55e6N8JND/Y=; b=lLfSy1FDkXzWMZvsRkZtwicbivXUJsA++7L909GdIS/Qeugz2UjnsTqrG5XCch7YMPXpJU +eJ6Pl5EmhYo35kO8mZ+jkbXNNy9mDbo//g59cQqUK04JqcgkSwH1s+OJtQjeqwvtpIJfA +47npywbQwFtvyCyJc0RHR9B+udUToXcdUjixGnG42Lp2cuVtex9WNOxwk61d31glWmf2O ssTzPa6qu7iC67bhuYV44czEsxbyWf4kNKLlHHaq8QstE5otz2C5pL03VW43IQwGCIVB6m 7rkTI9vWUbr+Kx4S+K4WcwbKan4G/YFRpfOcCi7UquKKdtH5QEfHjD6axkhp3g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1620623972; a=rsa-sha256; cv=none; b=BFHrwizRxjT0G18OQ1VOREgP7Q6GodIierp2aXQlCA1ss7xIvVJBttgAv7a6GpKC4vGQi4 SEX+RMdG0uDFVSR2GSQSq7314Gh/0aATQ8vevYZmbfqyGEciN2TgI0LdCBNvSyBZOsaKcZ I7dJkXFUxnqNhn8jEycPhKl+R3p4eTZt38rkXN4Y+U49O10m4/HHta8tfu2Yi5jitXO28a brDGW6o7o0/LPyYJJJ12aHixBMxI9PauldoY+7jJDHaxVcGT8sGzQPYI6Y296ri/HiPorx OIP7HCcxxJB9d5bg2Bi/+CW21ClZlIhiOP8EdFMqxFmmu6Jz4aWnVIVbTOE2Hg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=obZa4eYl; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.65 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=obZa4eYl; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: C0C6BBE5F X-Spam-Score: 3.65 X-Migadu-Scanner: scn0.migadu.com X-TUID: 2BEEr4Lzr1Wc * gnu/packages/ocaml.scm (ocaml-ppx-base): New variable. (ocaml4.07-ppx-base): Inherit from ocaml-ppx-base. --- gnu/packages/ocaml.scm | 65 +++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 309e9c7601..458bc117cf 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5823,34 +5823,28 @@ packages.") from type definitions.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-base +(define-public ocaml-ppx-base (package - (name "ocaml4.07-ppx-base") - (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_base-v" version ".tar.gz")) - (sha256 - (base32 - "0aq206pg330jmj7lhcagiiwm3a0b3gsqm801m8ajd4ysyw7idkym")))) + (name "ocaml-ppx-base") + (version "0.14.0") + (source + (janestreet-origin + "ppx_base" version + "0b7a3fmi90jk8paz0g36yzaq670fbnrbi1j8r5ibh9wbcfli7ji6")) (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-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-enumerate" ,(package-with-ocaml4.07 ocaml-ppx-enumerate)) - ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) - ("ocaml-ppx-js-style" ,(package-with-ocaml4.07 ocaml4.07-ppx-js-style)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_base"))) + `(("ocaml-ppx-compare" ,ocaml-ppx-compare) + ("ocaml-ppx-cold" ,ocaml-ppx-cold) + ("ocaml-ppx-enumerate" ,ocaml-ppx-enumerate) + ("ocaml-ppx-hash" ,ocaml-ppx-hash) + ("ocaml-ppx-js-style" ,ocaml-ppx-js-style) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_base") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-base)))) (home-page "https://github.com/janestreet/ppx_base") (synopsis "Base set of ppx rewriters") (description "Ppx_base is the set of ppx rewriters used for Base. @@ -5859,6 +5853,25 @@ Note that Base doesn't need ppx to build, it is only used as a verification tool.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-base + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-base) + (version "0.11.0") + (source + (janestreet-origin + "ppx_base" version + "0aq206pg330jmj7lhcagiiwm3a0b3gsqm801m8ajd4ysyw7idkym")) + (propagated-inputs + `(("ocaml-ppx-compare" ,ocaml-ppx-compare) + ("ocaml-ppx-enumerate" ,ocaml-ppx-enumerate) + ("ocaml-ppx-hash" ,ocaml-ppx-hash) + ("ocaml-ppx-js-style" ,ocaml-ppx-js-style) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_base")))))) + (define-public ocaml4.07-ppx-bin-prot (package (name "ocaml4.07-ppx-bin-prot") @@ -5913,7 +5926,7 @@ functions from type definitions.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) - ("ocaml-ppx-base" ,ocaml4.07-ppx-base) + ("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)) @@ -6151,7 +6164,7 @@ standard library that was developed by Jane Street.") ("ocaml-fieldslib" ,ocaml4.07-fieldslib) ("ocaml-jane-street-headers" ,ocaml4.07-jane-street-headers) ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) - ("ocaml-ppx-base" ,ocaml4.07-ppx-base) + ("ocaml-ppx-base" ,(package-with-ocaml4.07 ocaml-ppx-base)) ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) -- 2.31.1