From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id SGOdAoHCmGATVwEAgWs5BA (envelope-from ) for ; Mon, 10 May 2021 07:20:01 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id oIrIOYDCmGBIbgAAB5/wlQ (envelope-from ) for ; Mon, 10 May 2021 05:20:00 +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 A4EE5AEEA for ; Mon, 10 May 2021 07:20:00 +0200 (CEST) Received: from localhost ([::1]:43076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyKl-0005fq-RI for larch@yhetil.org; Mon, 10 May 2021 01:19:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJB-0000Ll-Kr for guix-patches@gnu.org; Mon, 10 May 2021 01:18:21 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45562) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJB-0003hg-Bx for guix-patches@gnu.org; Mon, 10 May 2021 01:18:21 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJB-0000XG-7z for guix-patches@gnu.org; Mon, 10 May 2021 01:18:21 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 29/43] gnu: Add ocaml-ppx-fields-conv. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:21 +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.16206238871799 (code B ref 47768); Mon, 10 May 2021 05:18:21 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:07 +0000 Received: from localhost ([127.0.0.1]:57067 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIw-0000Sj-UE for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:07 -0400 Received: from mout02.posteo.de ([185.67.36.66]:48303) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIU-0000LO-Kf for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:40 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 06B422400FD for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623853; bh=KBprn7AwU7/ykRFvaa6Qx8LhfC0XpBWruHHfwoYUdh8=; h=From:To:Cc:Subject:Date:From; b=rLAEOHcIWS08KG6Sp/wIoozeoNKnKFc+HBUsvH/QmcU1OdZUxZfsgLXIlod9qJ36G FHNRrQdGSeIeo7E2WvoQ6zdYJ9ilwYYzWIrzhJo+K5+X4oL/4AbhXlI1fZWUro0m2x nFbYAFtJjNOBGyOm0V1WDcEfWgX31mLiqB49KrWjwL506hxWQy1ooIisiaQRlDU3Ha /2mvBAuqqcbNgDyWi9rp/ukTsOO5c9SZR4Gvr8K0/GdZSgQOtGL8/uAewqQWNDawgP 9DeeflalkmtLh/ColjtoxmXXZs49S1CJ1zLwEYCC/7pd5mSD+C0iSoSkb0pQeXrGD4 C3RDLLc9KPLAw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7J2TJrz9rxR; Mon, 10 May 2021 07:17:32 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:14 +0000 Message-Id: <20210510051628.15359-30-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=1620624000; 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=Rx9QFkyFQSpBew7KUeosyunEeyEzMkpJQzS4bFP+z+0=; b=nGydbudOUagviv9sE2oGtsoFDw2uLvWJWJ0dgeuo1tGPjykQxCsbcTHpd8vDe3/X08Ju9a dC6hYL/vicGN2HivNtkkzYoocrJyu2QS3EwD4VjyxurE063cPQ0jd3g1nejXJjUJIglQQN mW3vjTPXmTkNd7G98VWIGf1HbCMRgix4WQJj85C8QnJ1C2MQaLEdYYw+GvuakvX+f1Ctw2 0DriUz6vSD80ai5+Eck33SdX7XQSDxe/pFapewVERhdW3uoBazl5fT7dPfygByXMN0KW3r eAlunfpMilToLHSs46IT/ujqhyp7U75WnatLJaIGaMuyeVSxqEIzHyIWLfhjtw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1620624000; a=rsa-sha256; cv=none; b=kHAjYzjM7Q5OR2AP4WopPsdLAZO7z/Rzs/fTuQtTDWlAksqfuei0ixLKDK3/6XVjpEBRu4 TBao7IQKnvQnOpL5ZLxAAGbJYJWoqw5zVCSNuMr8qiNiqzuNkZIv7z7z3dCO6QJSMiIs7T t9rvVM1tAKIz9h3fk/GugBK9v83/Sez9lFJ8OfilGXb6EjiZ/ePlXEH9X53HtIPbAzTJyx JqQVOR8rb3bmgcODe6ga5EURHsYpyrzU5kev6EINwhayWkFLEQAX+Tj7fq5O6PF6IRdY7f kH5XHJCHfDUgo9s3NIh8ADSTriM4yvkZYP1Q9guUvLRZCN/blyhEblC8yHtvuA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=rLAEOHcI; 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=rLAEOHcI; 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: A4EE5AEEA X-Spam-Score: 3.65 X-Migadu-Scanner: scn0.migadu.com X-TUID: YX612uLIsIr/ * gnu/packages/ocaml.scm (ocaml-ppx-fields-conv): New variable. (ocaml4.07-ppx-fields-conv): Inherit from ocaml-ppx-fields-conv. --- gnu/packages/ocaml.scm | 58 ++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index aa8437985e..d3fe5b51e9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5050,31 +5050,29 @@ of a record and create new record values.") standard library.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-fields-conv +(define-public ocaml-ppx-fields-conv (package - (name "ocaml4.07-ppx-fields-conv") - (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_fields_conv-v" version ".tar.gz")) - (sha256 - (base32 - "07zrd3qky2ppbfl55gpm90rvqa5860xgwcsvihrjmkrw6d0jirkc")))) + (name "ocaml-ppx-fields-conv") + (version "0.14.2") + (home-page "https://github.com/janestreet/ppx_fields_conv") + (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 + "1zwirwqry24b48bg7d4yc845hvcirxyymzbw95aaxdcck84d30n8")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-fieldslib" ,(package-with-ocaml4.07 ocaml-fieldslib)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (properties `((upstream-name . "ppx_fields_conv"))) - (home-page "https://github.com/janestreet/ppx_fields_conv") + `(("ocaml-base" ,ocaml-base) + ("ocaml-fieldslib" ,ocaml-fieldslib) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_fields_conv") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-fields-conv)))) (synopsis "Generation of accessor and iteration functions for ocaml records") (description "Ppx_fields_conv is a ppx rewriter that can be used to define first class values representing record fields, and additional routines, to get @@ -5082,6 +5080,16 @@ and set record fields, iterate and fold over all fields of a record and create new record values.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-fields-conv + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-fields-conv) + (version "0.11.0") + (source (janestreet-origin + "ppx_fields_conv" version + "07zrd3qky2ppbfl55gpm90rvqa5860xgwcsvihrjmkrw6d0jirkc")) + (properties `((upstream-name . "ppx_fields_conv")))))) + (define-public ocaml-ppx-sexp-conv (package (name "ocaml-ppx-sexp-conv") @@ -5216,7 +5224,7 @@ string conversion.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) - ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) + ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) ("ocaml-migrate-parsetree" @@ -5738,7 +5746,7 @@ useful errors on failure.") ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml4.07-ppx-assert)) ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) - ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) + ("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" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) @@ -5932,7 +5940,7 @@ functions from type definitions.") ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("ocaml-ppx-expect" ,ocaml4.07-ppx-expect) ("ocaml-ppx-fail" ,ocaml4.07-ppx-fail) - ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) + ("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" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) -- 2.31.1