From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id eFeWJh6YtmCPBgEAgWs5BA (envelope-from ) for ; Tue, 01 Jun 2021 22:27:10 +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 QFARIh6YtmDOUgAA1q6Kng (envelope-from ) for ; Tue, 01 Jun 2021 20:27:10 +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 3A72B24B62 for ; Tue, 1 Jun 2021 22:27:10 +0200 (CEST) Received: from localhost ([::1]:34480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loAyj-0004nT-82 for larch@yhetil.org; Tue, 01 Jun 2021 16:27:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loAxl-0002k7-J6 for guix-patches@gnu.org; Tue, 01 Jun 2021 16:26:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54664) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1loAxl-0001Dx-8G for guix-patches@gnu.org; Tue, 01 Jun 2021 16:26:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1loAxl-00073N-4d for guix-patches@gnu.org; Tue, 01 Jun 2021 16:26:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v3 39/42] gnu: Add ocaml-ppx-variants-conv. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Jun 2021 20:26:09 +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.162257915826925 (code B ref 47768); Tue, 01 Jun 2021 20:26:09 +0000 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:58 +0000 Received: from localhost ([127.0.0.1]:37946 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxa-00070C-9x for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:58 -0400 Received: from mout01.posteo.de ([185.67.36.65]:55301) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxY-0006zY-FK for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:56 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id E793C24002D for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579150; bh=KFhqeQnFnOcN5IJwgd+RBtPcOxOJv3s7RxyAcW37Qnk=; h=From:To:Cc:Subject:Date:From; b=ABCRENOPxXQmni6qUCo+LbSClLlRPt2Sn/nizmb+HNb6RGSWk0VeRXwIZJnbFqtfG +SjGWyAY9M8VrrAv3vk6Z59pmvoWVVbOK6LcKGrkWuN9yLZngY5hsEbLoC6Y6QS2Gm dP0S0sBiWQCYLCAtuyMQFlfdNpmNc5+DysES8hGmj6lKDU1+dPfrzSDXQ0VGSMz+hl r42Sf4atXCfcYx8M+tedZZC4v4tE/svV6rfLB5qguDpxKqq1GPiBy+ZbLJzLh1kGjH imrlLrBH8MUstZU84NrndGNozYe0qgd9wKJn4GpId2y5p6qMfwWALamgW/PcEdLPBV FTpLTDv/R7p9w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkF84WLmz9rxS; Tue, 1 Jun 2021 22:25:48 +0200 (CEST) From: pukkamustard Date: Tue, 1 Jun 2021 20:23:22 +0000 Message-Id: <20210601202325.8777-40-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=1622579230; 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=+e3wJ9SVunXUafG9zysYnPLJ076YSmjhn7I3wmTXFhs=; b=gBwmQ8Il5uk3PFirosjqcI7+KLNUf8YwfdgTuX7JgihPW9e2kLCXJ60LtZTgAXsTtIGG8F aExYTLu9g6VP8f6ge4anp2K6Vx6Xr54iouHbHH4tPKbHq4Ev/GmkzQnqeFarCmYX5NlJ3e uIQ5sA8GxRPm4ysvO4k5YnzOcv/N6N5CNnm/Tu634OHxxpmi8fcSahgRHkbnAANJ86M57z RhbqqZbh2DkbplCJJelppduVjSCqGSrx8txXoX+WTSeIfJNvP6L+0S5poO3skcvB2FOzvo rz8062E/nKbuz9Q1KhaLa3bIlLlhbyDPkviQGJRggoOFReIfHq4zftC8oPaGiw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1622579230; a=rsa-sha256; cv=none; b=ta+aGcKoUY7kLvaxByXCIazOPmfmsAaoDv3zTdmCfPL2IB6TyBUwHBvdWa8W1BZk2n3W72 DnSIK8EFkqlbtTEkrOUd9l+4SI3+eM9h2EUN/zIJTJvYzDvMF8ml+gZNQ6mrxOEcvRgGJG W2aFA1X350aeuGR5+cWReFrF+tk/8rUXw/1YDESgexkAmNOgAULKZXQGCQpXqLmSBPGKD0 bz/w8Vj+rtIbbn2alZs+2FkVe9RPVOtA+Z1q7Q9d2X4rCEHz9Ru3xdZx/RQDTJMhhfU4QJ f2PTQWgc+p/bSZsEQ1T6wVJS00k2sYO67u9z7wd/dwMjYmsLhQ/1ftDYb8DoIA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=ABCRENOP; 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=ABCRENOP; 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: 3A72B24B62 X-Spam-Score: 3.67 X-Migadu-Scanner: scn0.migadu.com X-TUID: u5INPCYfinSh * gnu/packages/ocaml.scm (ocaml-ppx-variants-conv): New variable. (ocaml4.07-ppx-variants-conv): Inherit from ocaml-ppx-variants-conv. --- gnu/packages/ocaml.scm | 65 ++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 25 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 882348e136..5710629d9d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5273,32 +5273,29 @@ definitions.") "0pqwnqy1xp309wvdcaax4lg02yk64lq2w03mbgfvf6ps5ry4gis9")))) (properties `((upstream-name . "ppx_sexp_conv")))))) -(define-public ocaml4.07-ppx-variants-conv +(define-public ocaml-ppx-variants-conv (package - (name "ocaml4.07-ppx-variants-conv") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_variants_conv") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1yc0gsds5m2nv39zga8nnrca2n75rkqy5dz4xj1635ybz20hhbjd")))) + (name "ocaml-ppx-variants-conv") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_variants_conv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0q6a43zrwqzdz7aja0k44a2llyjjj5xzi2kigwhsnww3g0r5ig84")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-variantslib" ,(package-with-ocaml4.07 ocaml-variantslib)) - ("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)) + `(("ocaml-base" ,ocaml-base) + ("ocaml-variantslib" ,ocaml-variantslib) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) (properties - `((upstream-name . "ppx_variants_conv"))) + `((upstream-name . "ppx_variants_conv") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-variants-conv)))) (home-page "https://github.com/janestreet/ppx_variants_conv") (synopsis "Generation of accessor and iteration functions for OCaml variant types") @@ -5307,6 +5304,24 @@ definitions.") variant types.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-variants-conv + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-variants-conv) + (name "ocaml-ppx-variants-conv") + (version "0.11.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_variants_conv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yc0gsds5m2nv39zga8nnrca2n75rkqy5dz4xj1635ybz20hhbjd")))) + (properties `((upstream-name . "ppx_variants_conv")))))) + (define-public ocaml-ppx-custom-printf (package (name "ocaml-ppx-custom-printf") @@ -5365,7 +5380,7 @@ string conversion.") ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("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-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) (arguments @@ -5901,7 +5916,7 @@ useful errors on failure.") ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) + ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) @@ -6101,7 +6116,7 @@ functions from type definitions.") ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) ("ocaml-ppx-sexp-value" ,ocaml4.07-ppx-sexp-value) ("ocaml-ppx-typerep-conv" ,ocaml4.07-ppx-typerep-conv) - ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) + ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) -- 2.31.1