From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id QHDWIziYtmA+BQEAgWs5BA (envelope-from ) for ; Tue, 01 Jun 2021 22:27:36 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id yIEeHziYtmAMUwAA1q6Kng (envelope-from ) for ; Tue, 01 Jun 2021 20:27:36 +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 E75B42209A for ; Tue, 1 Jun 2021 22:27:35 +0200 (CEST) Received: from localhost ([::1]:35524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loAz9-0005VL-0e for larch@yhetil.org; Tue, 01 Jun 2021 16:27:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43270) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loAxg-0002O4-GT for guix-patches@gnu.org; Tue, 01 Jun 2021 16:26:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54646) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1loAxg-00018H-7n for guix-patches@gnu.org; Tue, 01 Jun 2021 16:26:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1loAxg-00071W-4c for guix-patches@gnu.org; Tue, 01 Jun 2021 16:26:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v3 26/42] gnu: Add ocaml-ppx-base. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Jun 2021 20:26:04 +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: Xinglu Chen Cc: pukkamustard , 47768@debbugs.gnu.org Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.162257912626721 (code B ref 47768); Tue, 01 Jun 2021 20:26:04 +0000 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:26 +0000 Received: from localhost ([127.0.0.1]:37896 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAx4-0006wv-Eb for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:26 -0400 Received: from mout02.posteo.de ([185.67.36.66]:41117) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAx2-0006wD-Iv for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:25 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 0592B2400FE for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579119; bh=gUmKLm6ryZ46gLznQr9Udh6DWuwnFaDPyvu4+naWvzM=; h=From:To:Cc:Subject:Date:From; b=o2pOpYXvEKpKLnTjZm8bROfxpBpkD6Aud5o+02v4QqhqKwW7zSrE5rlBcJME4/d0C jqsNi/SPxPZTHDT2+4Wj8iBvXu4sxrbDOtQC3H+kNJMBY/XeS31u6K/FUIUrWED/ed 5VARsk1cWxiuvFkqMrLwp7R6HVFwG5g3oC5BDm5c0fwiMU+TrGVzk4XfOcvRF2XHf2 ViURPgrSUZaj3EO6sLeUrjITPVw77laSsia/aTugIAodcW9cUtwH5HW63FY1DB6u3G wZttBUOnGif5VonYod3zx/ocXvZh30Hr5Ig6/Y3w8IVK8ayR9XsU7MU7glqfBgGpK2 URn5U9Uxi87mg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkDX4zTYz9rxH; Tue, 1 Jun 2021 22:25:16 +0200 (CEST) From: pukkamustard Date: Tue, 1 Jun 2021 20:23:09 +0000 Message-Id: <20210601202325.8777-27-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> 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=1622579256; 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=GtPNrolZnzHDw+oHzbU+0B4Cr/9mcn7uQBKnS1zOCq8=; b=RmO25FWnjm1+KcxX7+0QvzdrbFITPEonDSTBa/CPrC3ndHM7+XvQmWK001hGB2ZGBupEYG pWd4a9Qbwyq5KpbHZxqafk6mavNovm0C6wu8kOzNaRg+YN7MS0Zgd17gcfLXGI89dzDe/5 Xe7sOGmpzXsPyf0eFweqKEmilk6D4YpGfuDLFD7y5XMd3ozN3tHW4HJqB7hHTNdNY3gaUk QEyrDqM+gb/5sMiyHRxHq/8zQR9GXPvovIS901SewPZ7U0U4Re6++VwUUzvtdzBPBXV1d4 leGLQ2l/wzCUAlGaXQUtiMJCQaGaSaKjbq+ft6U3uydzbQaoN2NZO4vduFCqOA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1622579256; a=rsa-sha256; cv=none; b=WQp4SewoV2xyGyr7L1n3nsbNeqYKNaC7k3WP0P+dA+T2gTeFtt7iHzzbz6TI8LBa7jZtfs VMppMVde7hAP52wRxJ8eKyMmzrrvdobqUZbYANpqUl7iU61SI4f+eijfpmaXdHRnNR4UrC 2YsE+b2w4W7CbIyTxJ80CZZRf3nC4QT//RwsjdO9Wxb4dxO0QOOQKzuquAm+aDH/79HiBl vdfV6KMcgV1ChqR0H0vm35K4hCWCWHxoFgjzQkJP2CByHAc/GeWuFIzuDPemkFoaNta6rw ZmkMZZARZFnLwRqX5ryLWvfQFmDCg3hc7KXdCcWZMzRzU02T62KvVCoBpINyJg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=o2pOpYXv; 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.67 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=o2pOpYXv; 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: E75B42209A X-Spam-Score: 3.67 X-Migadu-Scanner: scn0.migadu.com X-TUID: 48Yx2gD7pE/u * 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 61ff1ea15f..7ff1ef9e49 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5836,34 +5836,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. @@ -5872,6 +5866,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") @@ -5926,7 +5939,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)) @@ -6164,7 +6177,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