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 2DnFK90g6l8XYQAA0tVLHw (envelope-from ) for ; Mon, 28 Dec 2020 18:15:57 +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 0MJZJ90g6l+9IAAAB5/wlQ (envelope-from ) for ; Mon, 28 Dec 2020 18:15:57 +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 5BEB09404FD for ; Mon, 28 Dec 2020 18:15:57 +0000 (UTC) Received: from localhost ([::1]:41612 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktx3k-0004PS-8u for larch@yhetil.org; Mon, 28 Dec 2020 13:15:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58742) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktx2u-0003b3-Qs for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53525) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktx2u-0006dr-Ic for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktx2u-0000Et-Dl for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH v2 05/13] gnu: Add ocaml-sexplib. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 18:15: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.1609179290823 (code B ref 45498); Mon, 28 Dec 2020 18:15:04 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 18:14:50 +0000 Received: from localhost ([127.0.0.1]:36826 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2g-0000DC-2K for submit@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:50 -0500 Received: from mout01.posteo.de ([185.67.36.65]:54034) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2U-0000BE-Lc for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:39 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id D9049160061 for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 19:14:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609179272; bh=d2kT8deGl8M+t/SmR61zwCxkAQC2wtb42P6soXvLLiQ=; h=From:To:Cc:Subject:Date:From; b=oDzIAxVCPGgYhhm3utxiE0k84wS6oK0kAg+UW0eDGdWeh1EaiWR2pNdekGU7fBXoa nP1+7T/nZ6INF0smTbSKClg8eqN5RfJhwcfndLMBofwGlveTdeRj7M9uedFiB0adBH ecszsbZ3zc65nKif5HW6vWvLIgRMXoJW551IB++3Qg9lHLUQn8XVj5znrg1/src3sT 7xu2SGEeFgmA4EI+gasgQuqWFxtrJHQDonjoITwcBClWnk41iCntWPlhmpqDP+mU4y OBB4fe8Zm2cONQ5r+DGqNDX15k9LFZaPs7Rm0dLaj37R+u5zaEgdAH99msRbBV0TRP 62+nbRpvH8n7A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4QgD1hcTz6tm5; Mon, 28 Dec 2020 19:14:32 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 19:14:06 +0100 Message-Id: <20201228181414.14196-5-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228181414.14196-1-pukkamustard@posteo.net> References: <86pn2tn6mv.fsf@posteo.net> <20201228181414.14196-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=oDzIAxVC; 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: 5BEB09404FD X-Spam-Score: 3.78 X-Migadu-Scanner: scn1.migadu.com X-TUID: LS0PFT6SOzNl * gnu/packages/ocaml.scm (ocaml-sexplib): New variable. (ocaml4.07-sexplib): Inherit from ocaml-sexplib. --- gnu/packages/ocaml.scm | 49 +++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 31f524331f..246141c618 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2886,7 +2886,7 @@ writing to these structures, and they are accessed via the Bigarray module.") (propagated-inputs `(("ocaml-hex" ,(package-with-ocaml4.07 ocaml-hex)) ("ocaml-jsonm" ,(package-with-ocaml4.07 ocaml-jsonm)) - ("ocaml-sexplib" ,ocaml4.07-sexplib))) + ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)))) (home-page "https://github.com/mirage/ezjsonm/") (synopsis "Read and write JSON data") (description "Ezjsonm provides more convenient (but far less flexible) input @@ -4117,37 +4117,38 @@ parsexp_io.") "11a30zkfgbi6pb4whq22k1zc8ghdp9bwxl5s5cdlmx1z8s4yxsf0")) (properties '())))) -(define-public ocaml4.07-sexplib +(define-public ocaml-sexplib (package - (name "ocaml4.07-sexplib") - (version "0.11.0") + (name "ocaml-sexplib") + (version "0.14.0") (home-page "https://github.com/janestreet/sexplib") (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 - "1qfl0m04rpcjvc4yw1hzh6r16jpwmap0sa9ax6zjji67dz4szpyb")))) + (janestreet-origin "sexplib" version + "12rlnc6fcrjfdn3gs2agi418sj54ighhs6dfll37zcv7mgywblm2")) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-num" ,(package-with-ocaml4.07 ocaml-num)) - ("ocaml-parsexp" ,(package-with-ocaml4.07 ocaml-parsexp)) - ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-num" ,ocaml-num) + ("ocaml-parsexp" ,ocaml-parsexp) + ("ocaml-sexplib0" ,ocaml-sexplib0))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-sexplib)))) (synopsis "Library for serializing OCaml values to and from S-expressions") (description - "This package is part of Jane Street's Core library. Sexplib contains + "This package is part of Jane Street's Core library. Sexplib contains functionality for parsing and pretty-printing s-expressions.") (license license:expat))) +(define-public ocaml4.07-sexplib + (package-with-ocaml4.07 + (package + (inherit ocaml-sexplib) + (version "0.11.0") + (source + (janestreet-origin "sexplib" version + "0ksx62zsxhz8xmdrsn41n2hbc2qbyh3bxxc6946xisvgwh42h3q3")) + (properties '())))) + (define-public ocaml-base (package (name "ocaml-base") @@ -5435,7 +5436,7 @@ thousands of times faster than fork. ("ocaml-core-kernel" ,ocaml4.07-core-kernel) ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) - ("ocaml-sexplib" ,ocaml4.07-sexplib) + ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-spawn" ,ocaml4.07-spawn) ("ocaml-stdio" ,ocaml4.07-stdio) ("ocaml-migrate-parsetree" @@ -5482,7 +5483,7 @@ standard library that was developed by Jane Street.") ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) - ("ocaml-sexplib" ,ocaml4.07-sexplib) + ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-splittable-random" ,ocaml4.07-splittable-random) ("ocaml-stdio" ,ocaml4.07-stdio) ("ocaml-typerep" ,ocaml4.07-typerep) @@ -5649,7 +5650,7 @@ then run the Bisect_ppx report tool on the generated visitation files.") (inputs `(("ocaml-alcotest" ,(package-with-ocaml4.07 ocaml-alcotest)) ("ocaml-markup" ,(package-with-ocaml4.07 ocaml-markup)) - ("ocaml-sexplib" ,ocaml4.07-sexplib) + ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-re" ,(package-with-ocaml4.07 ocaml-re)) ("ocaml-uutf" ,(package-with-ocaml4.07 ocaml-uutf)))) (native-inputs -- 2.29.2