From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 6OYkDMM3UGL89QAAgWs5BA (envelope-from ) for ; Fri, 08 Apr 2022 15:25:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id UL+5BMM3UGKZ5wAAG6o9tA (envelope-from ) for ; Fri, 08 Apr 2022 15:25:23 +0200 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 B685A8B16 for ; Fri, 8 Apr 2022 15:25:22 +0200 (CEST) Received: from localhost ([::1]:59544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncoc5-0004Jz-QY for larch@yhetil.org; Fri, 08 Apr 2022 09:25:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoar-0002NQ-U6 for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40395) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoaq-0001Q5-Eq for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoaq-0007se-BY for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 06/25] gnu: Add ocaml-ppx-typerep-conv. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942422130056 (code B ref 53882); Fri, 08 Apr 2022 13:24:04 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:41 +0000 Received: from localhost ([127.0.0.1]:34243 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaR-0007oR-Vo for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:40 -0400 Received: from mail-wm1-f51.google.com ([209.85.128.51]:37512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaM-0007lu-3p for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:35 -0400 Received: by mail-wm1-f51.google.com with SMTP id f16-20020a7bcd10000000b0038e9ce3b2a9so1125730wmj.2 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oBUhwxCGoBUYFb30pJ3u1qIUKPKfZ5tvqIxpt+b7bJA=; b=TCwEpYcWGAsrVMndqKis1XYkn9bGhsciv7jGhCKMfvToec2rahyyFYYuy8NuQ8yFdW vP1Ai9fMib6yOIsVzWK5bMSzs00gdLUovJ3gqAna9nDCQ1v3V4U7eIPvFP9XGR1hUH2E a5co0ZwzjQcb8mnQH0AT184sYF9w1akAC7xPK63qEcAaD6s1uwxszadM+uSX9XKpA42N 0QYWnf35oMMBFCjM7I8XykYl1/4lzZEkztFh8+/D62pkQCRbgnEZuYTWIElIQjPhBwyp BRTB/2huSDE2Fm0JrCZZTISb0ndBHq0BHObbZp2ShxINCeWV4DbZ5RWHCvPgq0bN6UXU qV7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oBUhwxCGoBUYFb30pJ3u1qIUKPKfZ5tvqIxpt+b7bJA=; b=NPmXDkL3cgDNtGV/62iQ2pC17yGTv6kjWZoxoIDX2oaIGQCMgV982KvcsbHRSLGjV/ hwv5qfInJlVjKwXtCJGzwpiUQHjCBkZrLVuTAB7d7ElcH7HoYMlIea/asCETFYVEVdge kZR19oWTBJwwe3yxBZU5lj/HMiDsXNMPw57+75b0r2wP+94ZA6PkN6CQv1z4oJ4eExAK oiYjvIx6g33xaTKtVq7swIAVphH5fmYQHz1G6G9zyI30OjS3oPdvGDmn7W8Xm41eNjfZ 8m0b/J38R1mh4hCeYHDhp1lTx5u0oFJRyhmO1VL4pft5fAT4OP3KNH5mZ/r/A2reAgea uwZQ== X-Gm-Message-State: AOAM5309q2iLmiGmimv7S5ir9ohVez1ISKXqjRHJjoRbaEQvWDuVX5BU EC3jgMTErClVW4oJRfdMdlYbFpeokhU= X-Google-Smtp-Source: ABdhPJwc+QFYH/a8UaSHz1rt4+9x50kOjMoifqZZiaX7/oZWVF/NL/mQsfGIS4kWwuWk5OsbNh4+vw== X-Received: by 2002:a05:600c:154d:b0:38c:e9b8:d13f with SMTP id f13-20020a05600c154d00b0038ce9b8d13fmr16936991wmg.183.1649424208478; Fri, 08 Apr 2022 06:23:28 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:28 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:46 +0200 Message-Id: <20220408132305.3301350-6-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1649424322; 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=oBUhwxCGoBUYFb30pJ3u1qIUKPKfZ5tvqIxpt+b7bJA=; b=bCCCPthudLFo0psYkmvQ8LPotxlkgiWW95U1iM2H4uwVePxJ31zxH9Gocg3xqdQW3R7MLA 7Z+8w9+G7/TQQS1hlokSoxQDLzGV2MsyVEBfNmwm4jtHolFsTbFa7WuKc0Xk+weH8XdeFD DBIm5UbxG8Ad3AAaxZSheQs+dDfBGXiDecmfKWu3/uQtaIQCTcDyGandMLf+LxkrBz4NKv z0pXpVYLzpkhyKxh7tqk2oqpMsFFc1rRAge9Z3HFK2f31621FYo/nvid8AQpMycnFKHiyl HYEPeKaJR53aPHJ8N7rWFq+HZ9vfkl+SIn3pYPDZRCaxoAPQHGJr3x4t33SZrw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1649424322; a=rsa-sha256; cv=none; b=fj/4vP6iw94VnH2+l5wmAycCSUP++n7bt13WZH3FcATBDIf6WWUp5q87Lz7Fvd3avXzQ05 Ky2lL5/AthzBKJpq6ppdIFiHTbAvCc8Omlh7nEGwqRbrwSMGsAOJtyPmaMuFZC5kBoJvJz xWyeVBgsVJuvN6K0MwemuyTYbSqjtMdhX7QQ00VVGB8DoLxCIHbC6KTtv2qQMKHepCUXOD Rrl7KoJuV1QFrVhg5iqKWS1skFYu4e60PVlwDKnkrxxYvsqwT0jIIFhAuxnKPxJ9/MRceK jAT0Ccx/OEUWQp9szDtUKD/e2UJnRwn2y/ZGhxxLdmKaufgrnggFLe3mIUjXMw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=TCwEpYcW; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 5.13 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=TCwEpYcW; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: B685A8B16 X-Spam-Score: 5.13 X-Migadu-Scanner: scn0.migadu.com X-TUID: Vf61YHPvvqlF From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-typerep-conv): New variable. (ocaml4.07-ppx-typerep-conv): Inherit from it. --- gnu/packages/ocaml.scm | 60 +++++++++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8c464147f5..8ec5953730 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6203,37 +6203,49 @@ (define-public ocaml4.07-ppx-js-style "0z3fc55jdjhhsblla6z4fqc13kljpcz29q79rvs5h2vsraqrldr2")) (properties `((upstream-name . "ppx_js_style")))))) -(define-public ocaml4.07-ppx-typerep-conv +(define-public ocaml-ppx-typerep-conv (package - (name "ocaml4.07-ppx-typerep-conv") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_typerep_conv") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0a13dpfrrg0rsm8qni1bh7pqcda30l70z8r6yzi5a64bmwk7g5ah")))) + (name "ocaml-ppx-typerep-conv") + (version "0.14.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_typerep_conv/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yk9vkpnwr8labgfncqdi4rfkj88d8mb3cr8m4gdqpi3f2r27hf0")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-typerep" ,ocaml4.07-typerep) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_typerep_conv"))) + `(#:test-target ".")) + (propagated-inputs (list ocaml-base ocaml-typerep ocaml-ppxlib)) + (properties `((upstream-name . "ppx_typerep_conv") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-typerep-conv)))) (home-page "https://github.com/janestreet/ppx_typerep_conv") (synopsis "Generation of runtime types from type declarations") (description "This package can automatically generate runtime types from type definitions.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-ppx-typerep-conv + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-typerep-conv) + (version "0.11.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_typerep_conv") + (commit (string-append "v" version)))) + (file-name (git-file-name "ocaml4.07-ppx-typerep-conv" version)) + (sha256 + (base32 + "0a13dpfrrg0rsm8qni1bh7pqcda30l70z8r6yzi5a64bmwk7g5ah")))) + (properties '()) + (propagated-inputs + (list ocaml-base ocaml-typerep ocaml-migrate-parsetree ocaml-ppxlib)) + (license license:asl2.0)))) (define-public ocaml-ppx-base (package -- 2.34.0