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 QOXZAPaXtmCYBQEAgWs5BA (envelope-from ) for ; Tue, 01 Jun 2021 22:26: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 2Fi/N/WXtmAcTgAA1q6Kng (envelope-from ) for ; Tue, 01 Jun 2021 20:26: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 6F48E2201A for ; Tue, 1 Jun 2021 22:26:29 +0200 (CEST) Received: from localhost ([::1]:60404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loAy2-0003Dk-V7 for larch@yhetil.org; Tue, 01 Jun 2021 16:26:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43368) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loAxl-0002iG-5Y for guix-patches@gnu.org; Tue, 01 Jun 2021 16:26:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54663) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1loAxk-0001DL-TD for guix-patches@gnu.org; Tue, 01 Jun 2021 16:26:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1loAxk-00073G-OX for guix-patches@gnu.org; Tue, 01 Jun 2021 16:26:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v3 38/42] gnu: Add ocaml-variantslib. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Jun 2021 20:26:08 +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.162257915526908 (code B ref 47768); Tue, 01 Jun 2021 20:26:08 +0000 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:55 +0000 Received: from localhost ([127.0.0.1]:37942 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxW-0006zw-Uf for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:55 -0400 Received: from mout01.posteo.de ([185.67.36.65]:58031) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxV-0006zN-RE for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:54 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 4CEAF240029 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579148; bh=7ZdnwIIYxGDMcruNj2IakJsJUsfrOfUKBi2ZqSpXMtY=; h=From:To:Cc:Subject:Date:From; b=CK2HHtnxOPiLVhSs6KlEwutOLT6aQo3v7KnXGSf9lLdcO8tdUyTwe42kKXGNvMgcE qSA+YDra8K5PmcR+TVBNdTbq9ihCetgOnEHHZYm/CNLNZ83wsjehVFFFZLcwNNm14y CoASEDcI5NwD9ibkqho5DWwL1tJWhu13OKKfJXZwvfpoOie+Akp/GG6XK4xAWlttxt qpg18CHbLdZ5lFwOkedjAAaCmpV+MWbOsd0TdYjAzCHWWQYtjzLi3Tg4uao1fBWKVp ako1fks3z4KAZozC9SxA+ko3e2Z+0elLf+bjcu/fsIvDc6pgd5zTChnfDNdRGYNNoV ELj2Z2LAae63A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkF62WnCz9rxM; Tue, 1 Jun 2021 22:25:46 +0200 (CEST) From: pukkamustard Date: Tue, 1 Jun 2021 20:23:21 +0000 Message-Id: <20210601202325.8777-39-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=1622579189; 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=2X0GZrG4fQ6dxEieUbU5iaPDvGTl+S3rj+r1JKsMXhA=; b=LqD7VMWv7hQrIsOMgh2VcW9eJTL+uBwnAMczkzG0v65hD4+kYMbnW899cqzdBcGfRFWUYu UygMS/DIZONrT4oZq9FDpniWmCtDnmTA2RAyPLAlJtMwKDgAfObXOYYrHD1uZgBfGDyyWr npjuJRx4DmUogUwidZ2tqykaxS1W+Mq1BzVP9ZDRb2UZKVMXfHNeq2hFRLAi0rY2LuYgZU S0QVK0Nsbl7vqdWONR7haE6/q3eXR5yQD7w5xHI7AV9g4mBqOxg2KZxEVZqMPJ6tboBeNN hA3mxj/mEZR1B7eBzKp2LhbPYRrases4quGvtRQlam0DfiD9gTX8HXJJQAHwzg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1622579189; a=rsa-sha256; cv=none; b=Z7myWS4uRC8PCr5xgs0/yEurqzckGNneXV94Y33u8kGekPomtbNMpf0ch87Bd7GFDow3Gm 0oMpHW6IRJLcsfECxV3BRPNq2St5NQrEhWv4CXoIYkQw1UcfMrPBFALV3VkjnRu+8KpTcq OLRPUm0AckkOQJwnGkfmgJVioSdyutqGCA6Q2MkCwHkll7bGSgSBsW+fkEGv+Dae3NjVpr I+HReON7NE7BpZHUtmtSh0PdqVvpvWIcrYgFyEfr9Nbt4mEBJOzx+pbKn4pFKLSjzZ2//f NCTDzhRNP2hSJgiatN0TSc+fH+xEPQxxV+gT5QeLVds7foiuxgza0fbAufzJZA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=CK2HHtnx; 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=CK2HHtnx; 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: 6F48E2201A X-Spam-Score: 3.67 X-Migadu-Scanner: scn1.migadu.com X-TUID: wAyoP8b23k1x * 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 d2db62ebfe..882348e136 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5150,37 +5150,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") @@ -5281,7 +5289,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)))) @@ -6325,7 +6333,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