From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id AHCSKpPCmGC5VgEAgWs5BA (envelope-from ) for ; Mon, 10 May 2021 07:20:19 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id sKYtJpPCmGBJcAAAB5/wlQ (envelope-from ) for ; Mon, 10 May 2021 05:20:19 +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 5499DBEB5 for ; Mon, 10 May 2021 07:20:19 +0200 (CEST) Received: from localhost ([::1]:43684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyL3-00062u-PK for larch@yhetil.org; Mon, 10 May 2021 01:20:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJC-0000Rs-TY for guix-patches@gnu.org; Mon, 10 May 2021 01:18:22 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45565) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJC-0003kE-J7 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:22 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJC-0000Xc-Eu for guix-patches@gnu.org; Mon, 10 May 2021 01:18:22 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 39/43] gnu: Add ocaml-variantslib. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:22 +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.16206238891841 (code B ref 47768); Mon, 10 May 2021 05:18:22 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:09 +0000 Received: from localhost ([127.0.0.1]:57076 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIy-0000TQ-QP for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:09 -0400 Received: from mout01.posteo.de ([185.67.36.65]:53931) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIa-0000Mz-1i for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:44 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 80CE0240026 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623858; bh=0HG02pElc2iOQRXMuhtmtNTP6uMdzRyR3k6thJSGBAI=; h=From:To:Cc:Subject:Date:From; b=XBUW00eJ4YhgjBSW9QhWRTXCsw5MQvHbi6oBrchZgROjYyxiMOavqnrM6v/PbHaO/ 7zDourOqjoe7fRsPodfS84XtyJjuCYhzhsVe/Fu7wQRLtWl3pOYjjA2Zbwk4p0Wxod 2SEQPBFPwd6gc8ntlPqd2WFG71S5n8yY1i8dobnHAntJEc3BjleWwJdQBgAmfLRgA/ yMfheIJtq3D8tcKVLoqr6aRV7bzo/D+gpIR49RA08+GrWcG0WDjPItMDeUolRAUTPK QTubjL7eHj+zWDMLL+r/AaW1kQjfQ31TGqKqvPToSU3fhBQe5VTsoROE7LLrSIJNgl oWA0F1VDVGX6w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7P6z70z9rxY; Mon, 10 May 2021 07:17:37 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:24 +0000 Message-Id: <20210510051628.15359-40-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=1620624019; 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=tFAEl5glE+bzWkHaXM5JtyLQcNUJ3BDAdoy3YJ6L1fM=; b=MMxUha8jVj9Ent8EnrGXt3OpVb6K0AsrdMqkOLefI32Vl/crx6cp2CZia7QjXtgMIr37Yl g5rWIbnG5/Raj5cceFIZQ77Ii7KBv1Sxfrw+OmjbNgwu3m31VV9P+FPIZvyHf5biqts8SO WPIouw4U4oOqKB/TFR8lDzNnhk55lNm3FN7gUrAXfaq0cWz+GBXFyq9tjvv8huquJdjyCA qr6gihHTspa3cYdI1a4z2fZrfSpTCb1HHNF0lN7OkF/uM50RVb67yB6ILVOtU8WwwTt1xI MplwtD4b8ULmGqQ12rRdmTEtKIJSUxaAv7zq/kfYYoRggVeRVnHevodnwZhnAw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1620624019; a=rsa-sha256; cv=none; b=WK15Yzg2GCwJTASAhu+IzPjs/0F8whsV2n+WRCi6WHtc4eRTFNF+5hC1BvswHLD+aCOEov jnhcm0OaHtiWGzVFjVBnaa9UVTIFOXWuqWeb3DiA4J70Vd0TSkNwYym2/E4D7Ew7HYRAW1 zn9nNNAgts3m7XmdqRMbQ2NNDjF7T/w11CmHQKT3Xbw0IyJDXaacSFKah5RFztVgDafi44 wCuApEnIKypEt32y4iyunQIL2X+h69rhzIh98qWoq2lDKFivZAtiz/zjI9OEC5Fy6DSqKw sgu2gRV6XNV53mMjUAKeS3stFhpmUhut/bUOy6Wifp5x7LxXnIUCbYWhrbqV1A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=XBUW00eJ; 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=XBUW00eJ; 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: 5499DBEB5 X-Spam-Score: 3.65 X-Migadu-Scanner: scn0.migadu.com X-TUID: HBepQzycr3Tj * gnu/packages/ocaml.scm (ocaml-variantslib): New variable. (ocaml4.07-variantslib): Inherit from ocaml-variantslib. --- gnu/packages/ocaml.scm | 52 ++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 4727b294d9..e40bc78db2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5137,37 +5137,45 @@ of a record and create new record values.") "12948pzxrl360lybm9fzyvplgcl87zjbn4m3sk1aw75zk85p1388")) (properties `((upstream-name . "fieldslib")))))) -(define-public ocaml4.07-variantslib +(define-public ocaml-variantslib (package - (name "ocaml4.07-variantslib") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/variantslib-v" version ".tar.gz")) - (sha256 - (base32 - "1hsdwmkslvk4cznqr4lyyiy7vvk5spil226k0z2in26fxq6y0hf3")))) + (name "ocaml-variantslib") + (version "0.14.0") + (source + (janestreet-origin "variantslib" version + "11zp27gh282dx9ifbhcp6i7fkc97fvk8amaj58mf1g1hwklc0lm3")) (build-system dune-build-system) (arguments ;; No tests - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:tests? #f)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "variantslib"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "variantslib") + (ocaml4.07-variant . ,(delay ocaml4.07-variantslib)))) (home-page "https://github.com/janestreet/variantslib") (synopsis "OCaml variants as first class values") (description "The Core suite of libraries is an alternative to OCaml's standard library.") (license license:asl2.0))) +(define-public ocaml4.07-variantslib + (package-with-ocaml4.07 + (package + (inherit ocaml-variantslib) + (name "ocaml-variantslib") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/variantslib-v" version ".tar.gz")) + (sha256 + (base32 + "1hsdwmkslvk4cznqr4lyyiy7vvk5spil226k0z2in26fxq6y0hf3")))) + (properties `((upstream-name . "variantslib")))))) + (define-public ocaml-ppx-fields-conv (package (name "ocaml-ppx-fields-conv") @@ -5268,7 +5276,7 @@ definitions.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-variantslib" ,ocaml4.07-variantslib) + ("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)))) @@ -6312,7 +6320,7 @@ standard library that was developed by Jane Street.") ("ocaml-splittable-random" ,ocaml4.07-splittable-random) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-typerep" ,ocaml4.07-typerep) - ("ocaml-variantslib" ,ocaml4.07-variantslib) + ("ocaml-variantslib" ,(package-with-ocaml4.07 ocaml-variantslib)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) (properties `((upstream-name . "core_kernel"))) -- 2.31.1