From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id SF4ABBlK6l/aWQAA0tVLHw (envelope-from ) for ; Mon, 28 Dec 2020 21:11:53 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 4aNtOxhK6l/zIAAAB5/wlQ (envelope-from ) for ; Mon, 28 Dec 2020 21:11:52 +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 B96DA9403CD for ; Mon, 28 Dec 2020 21:11:52 +0000 (UTC) Received: from localhost ([::1]:58176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktznz-00005v-Ms for larch@yhetil.org; Mon, 28 Dec 2020 16:11:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktznF-0007eZ-BZ for guix-patches@gnu.org; Mon, 28 Dec 2020 16:11:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53731) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktznE-0006Xz-FX for guix-patches@gnu.org; Mon, 28 Dec 2020 16:11:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktznE-0006kR-An for guix-patches@gnu.org; Mon, 28 Dec 2020 16:11:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH v3 04/14] gnu: Add ocaml-parsexp. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 21:11:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45498 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45498@debbugs.gnu.org Received: via spool by 45498-submit@debbugs.gnu.org id=B45498.160918983725780 (code B ref 45498); Mon, 28 Dec 2020 21:11:04 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 21:10:37 +0000 Received: from localhost ([127.0.0.1]:37015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzmm-0006hd-Lk for submit@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:37 -0500 Received: from mout01.posteo.de ([185.67.36.65]:42716) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzmj-0006gc-13 for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:33 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 5F12616005C for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 22:10:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609189827; bh=lje/MO0hATw9uBELU735PWtRN8lS97KodPJ7Ut1jU4Q=; h=From:To:Cc:Subject:Date:From; b=KuBXSl+ycPjSHoqG+QhZXHbUlrBiP8EyNIgocJHmiT1eUtuiLG6qP4wXzZVI5Z/dw D/RQPfuFXS4TKlnf7+pq25pzbcaJ6471ntl/Edpt8eo9TeHFcNAVBbt5WZupiyTl+D c2K8vAVU2t2dJnmK4jjpRCzg2/HrQ+OK3gUWEd9srvYW8NQYKC4rGfRh9R062REG/J WtGWpboAl6af5olvOtFdbj/r/0hTi5AIN9+gzL6zIHjzb2u3Amj84JF6Vc4JnLDeJX HlgA0tTIbA0P0LSqWT8+kFwpbmAQmRirIpGI2KctkrsvqMrTaRvVss4vmmLQStP3fq jFOGIOm0y0N0g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4VZC0G7Gz9rxH; Mon, 28 Dec 2020 22:10:27 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 22:10:06 +0100 Message-Id: <20201228211016.8448-4-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228211016.8448-1-pukkamustard@posteo.net> References: <86a6txfxiz.fsf@posteo.net> <20201228211016.8448-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 X-Migadu-Spam-Score: 3.78 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=posteo.net header.s=2017 header.b=KuBXSl+y; 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: B96DA9403CD X-Spam-Score: 3.78 X-Migadu-Scanner: scn1.migadu.com X-TUID: q4ZEEQQuet5k * gnu/packages/ocaml.scm (ocaml-parsexp): New variable. (ocaml4.07-parsexp): Inherit from ocaml-parsexp. --- gnu/packages/ocaml.scm | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6a232be8a7..31f524331f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4065,28 +4065,19 @@ that was developed by Jane Street, the largest industrial user of OCaml.") (arguments `(#:tests? #f)) ; no tests (properties '())))) -(define-public ocaml4.07-parsexp +(define-public ocaml-parsexp (package - (name "ocaml4.07-parsexp") - (version "0.11.0") + (name "ocaml-parsexp") + (version "0.14.0") (home-page "https://github.com/janestreet/parsexp") (source - (origin - (method git-fetch) - (uri (git-reference - (url (string-append home-page ".git")) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1nyq23s5igd8cf3n4qxprjvhbmb6ighb3fy5mw7hxl0mdgsw5fvz")))) + (janestreet-origin "parsexp" version + "158znj19dvfdcwsgzs3rdhxpj1g4aw0d4nkfr8c05bahf0lnshlb")) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (inputs - `(("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) + `(("ocaml-sexplib0" ,ocaml-sexplib0) + ("ocaml-base" ,ocaml-base))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-parsexp)))) (synopsis "S-expression parsing library") (description "This library provides generic parsers for parsing S-expressions from @@ -4115,6 +4106,17 @@ s-expressions from files or other external sources, you should use parsexp_io.") (license license:expat))) +(define-public ocaml4.07-parsexp + (package-with-ocaml4.07 + (package + (inherit ocaml-parsexp) + (name "ocaml-parsexp") + (version "0.11.0") + (source + (janestreet-origin "parsexp" version + "11a30zkfgbi6pb4whq22k1zc8ghdp9bwxl5s5cdlmx1z8s4yxsf0")) + (properties '())))) + (define-public ocaml4.07-sexplib (package (name "ocaml4.07-sexplib") @@ -4137,7 +4139,7 @@ parsexp_io.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-num" ,(package-with-ocaml4.07 ocaml-num)) - ("ocaml-parsexp" ,ocaml4.07-parsexp) + ("ocaml-parsexp" ,(package-with-ocaml4.07 ocaml-parsexp)) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) (synopsis "Library for serializing OCaml values to and from S-expressions") -- 2.29.2