From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id ABwlAGLCmGC5VgEAgWs5BA (envelope-from ) for ; Mon, 10 May 2021 07:19:30 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 0LB5N2HCmGA9NQAA1q6Kng (envelope-from ) for ; Mon, 10 May 2021 05:19:29 +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 98FC6BE5A for ; Mon, 10 May 2021 07:19:29 +0200 (CEST) Received: from localhost ([::1]:40934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyKG-0004KF-Nt for larch@yhetil.org; Mon, 10 May 2021 01:19:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47008) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJC-0000OE-31 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:22 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45563) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJB-0003iT-R7 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-0000XN-ME for guix-patches@gnu.org; Mon, 10 May 2021 01:18:21 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 40/43] gnu: Add ocaml-ppx-variants-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.16206238881813 (code B ref 47768); Mon, 10 May 2021 05:18:21 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:08 +0000 Received: from localhost ([127.0.0.1]:57070 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIx-0000Sy-Im for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:08 -0400 Received: from mout02.posteo.de ([185.67.36.66]:36489) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIV-0000Ko-Ec 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 1A35B2400FD for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623859; bh=OlFsz4kzYp5RTsHZCB1v1ugyJTa+l0QefKbyZb2TQtc=; h=From:To:Cc:Subject:Date:From; b=of2p41UfHDtftHMPR94eRvSe0xpZsBMe5reR0Wy7wzqlvt8NYnyfEgX/FGmj6mo1C soObSImZcarcy9QIndNKac/JD4PdmpRdpgGcK4zcCizfOTqBvTkrdpAAaMtwqQ7LGd UjS+8S737WlpeTdIudLqZFsCF8eRxS/pVA0bUlMo8sLQsMm5mzx+hDSx7IrX24TwZo oXP/XrEXRIuXVotzvAgajEOrwu5zORagKmZ/VdiC21C4QrSpfqWNo8Fv+j9cT7qRJB frtD7Z2KHUOOI8EDHwSQ3oCSZfCguWnWR50kYSbj7lkGBR6t00+eVcjfIdXLaqpdSi +TB8tKxmlAZhQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7Q3Znxz9rxR; Mon, 10 May 2021 07:17:38 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:25 +0000 Message-Id: <20210510051628.15359-41-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=1620623969; 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=tMKcVMzwzLpY/C6QGUjwnldN9lrSrj5u2hr3bQJUUlE=; b=eOuWvNRathSVUTos40+o5zaL7fh9p9Zl+j/CYaENPdIvrE+U2el12K38oDQPnED/+SN9ok G+yP36r1ITjQpnhAHfPuNV66BRjO0+dvxG+c7GZj3JnNWJOlXrxv6h0Py6PcPUg2EPUYQW BAiUnh9RyoDgX75nswW7VpieQqKwncdum9VwZg9WeeJ2PZs97hDHAq1EcdKNlmFYjqy9ca 1q8KZKw7XQjjKfGZJbJCvaZe/u99d5Djq68/TXl1hKkEoDo5q4VGhtAT/ILeyMel6ga93p fPkpOYfSwiuxIUG+YQsVVqwThJ2Wxzd6TNfJlAuBGxpAoHbW5ao2xEhKidFKcw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1620623969; a=rsa-sha256; cv=none; b=fLnOB8aqCB6G+B/5MWzuv6UuT+2WyidQQx4HoZAFOvlKyuhW2S34TBGxbTNgOzuJbkmvSE XKw8cR5TRHSHD2kNFa0ONXrIE/haq0KdauVLjaxMgmgoE4LK8KlrQCR45ILeSwfSljXxK4 SdZghNz933gD7wYPCknn7a5yubnsfdTQgVRXptG3QGZc1xZrq7HXYGD2zxU9U675wUBNSu NNEGPf8Heor7gal90EqrpRU/iM61JIP/9kcz7UPURbNRzFQvA+3pVyNmq9wW1dlYTNCOP0 2SkZtZeC71w9JaIGIMJiFuaa8QtDFP+rJBi212TNrOA5EzC/JkKc6wGViq1Ysg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=of2p41Uf; 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=of2p41Uf; 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: 98FC6BE5A X-Spam-Score: 3.65 X-Migadu-Scanner: scn0.migadu.com X-TUID: uwrQ2Jusn5UK * 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 e40bc78db2..019bfea9f9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5260,32 +5260,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") @@ -5294,6 +5291,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") @@ -5352,7 +5367,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 @@ -5888,7 +5903,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)) @@ -6088,7 +6103,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