From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id Da/DFuy5dmA2EgAAgWs5BA (envelope-from ) for ; Wed, 14 Apr 2021 11:46:20 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id w67WD+y5dmAPRAAA1q6Kng (envelope-from ) for ; Wed, 14 Apr 2021 09:46:20 +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 29B532AB74 for ; Wed, 14 Apr 2021 11:17:23 +0200 (CEST) Received: from localhost ([::1]:44924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbeE-0000dV-9s for larch@yhetil.org; Wed, 14 Apr 2021 05:17:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbbF-0005nd-VD for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50252) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbbF-0002E5-Fq for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbbF-0007Hm-Bh for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 29/37] gnu: Add ocaml-ppx-fields-conv. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14:17 +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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839164427757 (code B ref 47768); Wed, 14 Apr 2021 09:14:17 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:14:04 +0000 Received: from localhost ([127.0.0.1]:33531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbb1-0007DW-GD for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:14:03 -0400 Received: from mout01.posteo.de ([185.67.36.65]:53995) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbad-00077x-Pd for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:56 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 04C471A0238 for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391613; bh=WlUgW/jX9k7SNIKFz8ET4QTY+tSWUMlADZz/uY1aVoE=; h=From:To:Cc:Subject:Date:From; b=BmNGCc/NiLATRYzjhxP/ma/OakoedzFrjYZaqFPkjkKU0Wq4eqQ9zTBUMXHzL693q zZlMsxkDSRvFOFciQcr6GMFNvgLpxFC64vdWGncXyuVGVEPAuf9WxhC4xUwSnY+bzi I/URlBWtcCQfy5pkLdvINwJtHRl1Ah5H1mBJsyFFR4DxyJcAx76rAljcXRYJ9m5SAq G6TBWjavaYgONFuFVEvrNkTOq4MS9R/eeEYvGbwVfKKK5K4fdLRsSUAO5b/oAtVB+O mblhI970vx/uzh+7t4guAPe52+c5BX4boT9pHpL8BVw8pOT5AOkHfwaFxdbypt0akX zVKTbvk0bTBRw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbc2P4xz9rxr; Wed, 14 Apr 2021 11:13:32 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:55 +0200 Message-Id: <20210414091303.6990-29-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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=1618391843; 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=QMkkY7DkGOgqB72kqLdaswuK8nG4uiYYWe2v0+FN0VE=; b=obj8QHRDueX73QaNz8cpQcvP7S+MqHF+wnIaOu/aAzftFumUM99ma+uj1Ptm9a0+Ul+T+R JkHqEB+jN2UeHuicgtSQjkeQ1dzjqJCcKsKj431hrWyZ8KBvjqdmgJx+awBDAi6R+zDEN0 bXjRFnkm/VYJct7pX3dehGKNKQGGu4S6RuNKbhst+pKm/OQz9lKvGpWt3lZ+fhhLU/3ye1 bs9EdRO3ANynBiTKt5O99PkJtTscUh9+i2srzj77rqNXCxhbt83hyeInMWR2M/1EGIefMD e5BWLRar+0ZO2ughKTekP57Wwxyk9C/UN9aFIyVgaJsLtVsqEA/e8QpTJ7cGCg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1618391843; a=rsa-sha256; cv=none; b=rwuFF/wGLL7typbXRHDt39nLbAGlDVZcuFbH8siDS3EYCJAJLaa8KX7HwnSo72EKgNmPxE kbi7w+4zCPnwgDVOq8iUdHaVJwu0m0Ds9OALkBEB6BLC96WIZ39sqMIQ8GS7xnU2Ht7o7c i/QyeElBkdT5wmlaFPJ8L4KgkJrAEhiVLnRSwh//upxfybFWu67yOn7ax68Z0qPuQRs4q3 QnPs1S+306pEiLb/g2W3HORmD9rMK5PNoq0M1OYIcVn4S/bbIZ0aETI7MW0aMVLhocJaP9 FRUB/8wgUBqSzg2X1QctSHSYFmhEes8Q8gaOSlfoHXrtTGajcantiD8UZ7ESPQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b="BmNGCc/N"; 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.66 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b="BmNGCc/N"; 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: 29B532AB74 X-Spam-Score: 3.66 X-Migadu-Scanner: scn0.migadu.com X-TUID: OD4MSV7wzxs8 * 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 6415e27ff9..66cec49a79 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