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 aCXkAQyYtmCYBQEAgWs5BA (envelope-from ) for ; Tue, 01 Jun 2021 22:26:52 +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 8Ob0OAuYtmBHeQAAB5/wlQ (envelope-from ) for ; Tue, 01 Jun 2021 20:26:51 +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 5BAFA22073 for ; Tue, 1 Jun 2021 22:26:51 +0200 (CEST) Received: from localhost ([::1]:33022 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loAyQ-0003po-CB for larch@yhetil.org; Tue, 01 Jun 2021 16:26:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43288) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loAxh-0002Qo-9F for guix-patches@gnu.org; Tue, 01 Jun 2021 16:26:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54650) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1loAxh-000193-0x for guix-patches@gnu.org; Tue, 01 Jun 2021 16:26:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1loAxg-00071q-U9 for guix-patches@gnu.org; Tue, 01 Jun 2021 16:26:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v3 28/42] gnu: Add ocaml-ppx-fields-conv. 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.162257913226757 (code B ref 47768); Tue, 01 Jun 2021 20:26:04 +0000 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:32 +0000 Received: from localhost ([127.0.0.1]:37904 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxA-0006xV-6B for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:32 -0400 Received: from mout02.posteo.de ([185.67.36.66]:47795) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAx8-0006wk-0G for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:30 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 5D2DF2400E5 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579124; bh=kjIJpyE6HozXKrIGALNadeigFsGaPiu0gvqGcFpyJrs=; h=From:To:Cc:Subject:Date:From; b=CN06NK37xICT1I6xeaDqyWKl21KMMbsZ+G+BklNx0kb4yfdLWVAd7tERSmVcWQlFG 57jT+FvDUH22rtJroH1l3meyLE6OjXh2ijPBSonYTDjYO6z/2I4bisRgH0uogXxvXo YWOBYwIgjwn2Pcx9TcRkUxJoNitmA3RSsPNC/Lq9YDesppkBKopTUT22PDLx1WmgDF eW0h4wtvlEdXpOMMbaN+AodPtRKedkXvZeN2b/MTaU/J2Yewzn3HqxTggAk9xl1AT4 fz+wt/dN1D39ej584FQJt+SYFMAKPm1i9g6XpmkW6e7OAkycSzscrtxkkQkKFkRFLU e9CkMNSg8G3Hg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkDd5kNDz9rxG; Tue, 1 Jun 2021 22:25:21 +0200 (CEST) From: pukkamustard Date: Tue, 1 Jun 2021 20:23:11 +0000 Message-Id: <20210601202325.8777-29-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=1622579211; 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=uWjf9TB9g84tMrK9HqjWX1mBT+IzSuhjgN+VvTGCMLk=; b=tlJg8EEIqv63546rjp6AwQBiEWS8IRZ5Vo6VRBrVoPTYEXXaW1LV6VMlVzXWusXGzUVsQ0 Jn9LUwYMh2TXHaxmtp4LeX68YILam/7cyH+IyUfe7btKfylRkM7/GEk/tFPFLAWnPWbCqk CiwITDPyKNRaXI7mtYSS30oFguMKbCh6X93e1LUhMqDOTaZYGz884UTN888jsoW4dbZ43F YNvAMcQOcUt6soyQT3t5bAcMkGml//XtNgDyQwg6/mQ6C2B+g73BcDV9tD6oNrP3Y9+Vep UItEDSflaZXZQ3a3hAxL43ykMJvx1bDPgiZuyZ+hrQ4A0AcWD7UdQR3z6xA7yg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1622579211; a=rsa-sha256; cv=none; b=lA65UvPO+NljVTgiGk6+rY0SwxWQB6r2k7iHxYgg7+SZZT29xNOPKSBHrM+5FJ9RftUYdB QjufDWt4kvYb2BoOzIhKWwpTULqAZ0EIiCtymmlXL8rRX3ddwL1FifyVsDxwkZSfABAZ9O 90CSrbqhJ764xhGEjPNmx1/I6mJZ95d8atKgPJ5GlZ+l3ssYQLVs4UWLmohy8451RIArbw ph2tg2wBee3wKLxjmW8RO/RS1m+oZ3//H5k8R6h9Fl/fDBKbov5uU2MS5fb7RYG7fXrF4Q Vt6di90C1YU26V9gw9vB+qp+F2bJPREdKs/ptA9KJHG+gPDTyBmC38GWg2jkcg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=CN06NK37; 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=CN06NK37; 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: 5BAFA22073 X-Spam-Score: 3.67 X-Migadu-Scanner: scn0.migadu.com X-TUID: 8BgWSA2+qN2z * 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 129f9322ee..1cdc536b2e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5063,31 +5063,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 @@ -5095,6 +5093,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") @@ -5229,7 +5237,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" @@ -5751,7 +5759,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)) @@ -5945,7 +5953,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