From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 2GE0BeU3UGL79QAAgWs5BA (envelope-from ) for ; Fri, 08 Apr 2022 15:25:57 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id WFHrAeU3UGL3WQEAauVa8A (envelope-from ) for ; Fri, 08 Apr 2022 15:25:57 +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 BEF6A8962 for ; Fri, 8 Apr 2022 15:25:56 +0200 (CEST) Received: from localhost ([::1]:60392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncocd-0004vp-Ku for larch@yhetil.org; Fri, 08 Apr 2022 09:25:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoau-0002Nc-6s for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40404) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoat-0001R7-UV for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoat-0007tj-Qy for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 15/25] gnu: Add ocaml-ppx-sexp-value. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:07 +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.164942423030167 (code B ref 53882); Fri, 08 Apr 2022 13:24:07 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:50 +0000 Received: from localhost ([127.0.0.1]:34268 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoac-0007qO-76 for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:50 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:55167) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaQ-0007mD-2E for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:39 -0400 Received: by mail-wm1-f41.google.com with SMTP id r64so5461424wmr.4 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:38 -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=f/IG5enwbzjbLOzaeuzrkf1tZys2nvi8BqEG/cWSRao=; b=iG+/k+hqiR8XOv0NIW48Wo8zVNPy7E7au07p1k7UPQ3fZ9BPFvK5bfvhE7IeVSJ0M9 M+P9MzuX9SThjDrfRfPyX1p514NETUI36n68UhVf4k5FuJM5Yjg5TVLi3xWoJ8ECZTPw I0VeYlvK6DEOaxmx8tUdzk+Ic4+GoJqiXC/LsAW59fR2KaQILh0PKz0gDvXvTC3O/GCm RZpZp4Qt8S+jnCZbKYROj9qKCJmUpKqY/ztY2KJx/hghY2qeFuLIPrx5OlSM4Pz4f/1p Vy/gmEmk3kafWv0BBKO8swbgcIqqUjodx262HEfJYQIDQDBPcGKyhelUNZIh7L63RsOd P6NQ== 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=f/IG5enwbzjbLOzaeuzrkf1tZys2nvi8BqEG/cWSRao=; b=1XdxpMWujw+jI5AcQ/3d4eQaWvWJt7+4MlKlvgm6neqpwptq4oCkboToLvEQ2reZhJ bKdv2UyrdwcwWsCuhC11b9fvhidla84ePr6SrhqmhZHAvPMimotmX7l6+hpl5XFAI83V 14gZO0Vnj7WPvPV7xYAHWV3Q5YJvQTPXF0+4mVdcy4pTKXD2ofITv2vKFSVUGIc9hoix qO17yL8rh46FXPoryPOej9+mKd+buJ291jvtSph9J12gQGrtWyFZ5/4o+WpfMS272OQO Qxg4OTioGdNghdsKlH+99olHcaZOPS4Fd0MP3vggfOJm9vdy7NrFHl9B5ucCGjeLQgXT MNPg== X-Gm-Message-State: AOAM532RyE78Fm46o2uCohBmQqLifw6+s/f4vORgRXnzLRRSSHTajnRS 4ggHcbvKsQWBCo68+b66e2LDbKJ3OL0= X-Google-Smtp-Source: ABdhPJyMLqSoeBULMBkvnOrvPSFZaLEK9JEqzdAX2FnN6FSgfRAp27VnvbPfKGg5KqBTLHZA51Uwrg== X-Received: by 2002:a05:600c:1909:b0:38c:e8f3:8e3d with SMTP id j9-20020a05600c190900b0038ce8f38e3dmr16672112wmq.152.1649424212470; Fri, 08 Apr 2022 06:23:32 -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.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:32 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:55 +0200 Message-Id: <20220408132305.3301350-15-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=1649424356; 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=f/IG5enwbzjbLOzaeuzrkf1tZys2nvi8BqEG/cWSRao=; b=p3biaGzcFuj6Ec4hg8lA0fg80P7hd0waICqZ0pFttjVm1joH4AWa8b3oBejVOwuBkN3VQi Fv486nTA1X7sdWYNOxe/PAQIRHdDAhw3sjVlBnCHqZtZEn7jUG2dFKPThg35HaxQR7+q1W Yj6jM67XVx3K17Ve+52p7bbqidB+THAuw9H7jO03hmgbBjU4Ni4EnQ670PX8l0evPrFfms e+z2jrz//poL5ERPsbKQp6U4GTWNSBBXCOCVCQNECYcLDt1dRzkPmtsfTqDxhTgVJxhPbf WkGBMwY6dwBNrEUGhN1GWz8fwhYqZUzbj47yNFw0vHQTfpV+5JlbxQabGW6Hgg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1649424356; a=rsa-sha256; cv=none; b=moVTKjDCaY8/ZIlU7sfhi+0fnH7Se90xMTzjHFlW8D5Z+Mzm6UL+yQy7Sf301Gm2j81tTS CLl5j4hVwrb4B2BRxQfl89+uGkfPNb5NJ+QgSXTkiLVdv/fvkEM+IP2EtSS7EEvWyr/K8d jNWnO2nfT8PBQvlEJfmpfj5xPKN9H+Wc9DFlTHZVhCl53OdtGS+GOljABPfHUEffV76ji8 iph93azRKLcvzmE97fPFWIl6CQ1zEBwfyvPh/N20i211W/KqGIkCzEF1gVq1yrq26B5L3W 5Prt/bW6tfV0jO6SlkvCOFCX5bEkBFRP03AQLSoHTTHzCSKB9xvpWf+kzOnilQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="iG+/k+hq"; 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="iG+/k+hq"; 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: BEF6A8962 X-Spam-Score: 5.13 X-Migadu-Scanner: scn0.migadu.com X-TUID: wZ3+6LwF9DhX From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-sexp-value): New variable. (ocaml4.07-ppx-sexp-value): Inherit from it. --- 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 baa269c8ce..ab97ee27d6 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5856,36 +5856,51 @@ (define-public ocaml4.07-typerep (properties '()) (license license:asl2.0)))) -(define-public ocaml4.07-ppx-sexp-value +(define-public ocaml-ppx-sexp-value (package - (name "ocaml4.07-ppx-sexp-value") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_sexp_value-v" version ".tar.gz")) - (sha256 - (base32 - "1xnalfrln6k5khsyxvxkg6v32q8fpr4cqamsjqfih29jdv486xrs")))) + (name "ocaml-ppx-sexp-value") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_sexp_value") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1d1c92pyypqkd9473d59j0sfppxvcxggbc62w8bkqnbxrdmvirn9")))) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_sexp_value"))) + (list ocaml-base ocaml-ppx-here ocaml-ppx-sexp-conv ocaml-ppxlib)) + (properties `((upstream-name . "ppx_sexp_value") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-sexp-value)))) (home-page "https://github.com/janestreet/ppx_sexp_value") (synopsis "Simplify building s-expressions from ocaml values") - (description "A ppx rewriter that simplifies building s-expressions from -ocaml values.") - (license license:asl2.0))) + (description "@samp{ppx-sexp-value} is a ppx rewriter that simplifies +building s-expressions from ocaml values.") + (license license:expat))) + +(define-public ocaml4.07-ppx-sexp-value + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-sexp-value) + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_sexp_value-v" version ".tar.gz")) + (sha256 + (base32 + "1xnalfrln6k5khsyxvxkg6v32q8fpr4cqamsjqfih29jdv486xrs")))) + (propagated-inputs + (list ocaml-base + ocaml-ppx-here + ocaml-ppx-sexp-conv + ocaml-migrate-parsetree + ocaml-ppxlib)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml4.07-ppx-sexp-message (package -- 2.34.0