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 YB5KI8kg6l/1XAAA0tVLHw (envelope-from ) for ; Mon, 28 Dec 2020 18:15:37 +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 cNcgH8kg6l+EJAAAB5/wlQ (envelope-from ) for ; Mon, 28 Dec 2020 18:15:37 +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 472039402A9 for ; Mon, 28 Dec 2020 18:15:37 +0000 (UTC) Received: from localhost ([::1]:40104 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktx3Q-0003cq-48 for larch@yhetil.org; Mon, 28 Dec 2020 13:15:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktx2t-0003aQ-Ey for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53522) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktx2t-0006dW-7F for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktx2t-0000EV-2S for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH v2 02/13] gnu: Add ocaml-sexplib0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 18:15:03 +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.1609179279747 (code B ref 45498); Mon, 28 Dec 2020 18:15:03 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 18:14:39 +0000 Received: from localhost ([127.0.0.1]:36811 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2U-0000Bq-Un for submit@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:39 -0500 Received: from mout02.posteo.de ([185.67.36.66]:48135) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2R-0000B7-1h for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:35 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 5B4FC2400FF for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 19:14:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609179269; bh=1ScI70MPP5NOcIV8Lu+M+ZmjJuKeaXerfnIinBSVYzk=; h=From:To:Cc:Subject:Date:From; b=Yu2lzd5t2ViTiGSeCke17W2K7C8ihCwZuy2OF3DI9zLbGdCc8O9K+c+c1KoRJfhlM mGkrgSStej7Un97AfwWGRq1sbuAPekcm+0ZC0WmMWsa9L/6mvPXE0JsjM90XN9Bp4B SBRBTnbBpZyujt4duL+A2y4JoyisvOWkwmWqZ8kDzXmj6xx2ujUsAWIIEB0MGjCXrb jbGVZfyTeT3XD6vsl0WmPoLxOJRfQUQlJlta8lvmovhKB24RjjkgYLKoWG8or7BJ3l xVpWq+OE78LGMVdensrRIYdg7/DhgHmhdnE4mUPcnOaACB+RFCuktCKCVrKBxrZp1Y U/U1XbXRjKsOw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4Qg90QzXz6tmL; Mon, 28 Dec 2020 19:14:29 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 19:14:03 +0100 Message-Id: <20201228181414.14196-2-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=Yu2lzd5t; 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: 472039402A9 X-Spam-Score: 3.78 X-Migadu-Scanner: scn0.migadu.com X-TUID: YVUKXPPjCebL * gnu/packages/ocaml.scm (ocaml-sexplib0): New variable. (ocaml4.07-sexplib0): Inherit from ocaml-sexplib0. (janestreet-origin): New variable. --- gnu/packages/ocaml.scm | 60 ++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index aa9dfb3dae..7dced949d3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -93,6 +93,14 @@ (number->string file-number) "/" name "-" version ".tar.gz")) +(define (janestreet-origin name version hash) + (origin (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) "/files/" + name "-v" (version-major+minor+point version) + ".tar.gz")) + (sha256 (base32 hash)))) + (define-public ocaml-4.11 (package (name "ocaml") @@ -2917,7 +2925,7 @@ JSON.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv))) (propagated-inputs `(("ocaml-re" ,(package-with-ocaml4.07 ocaml-re)) - ("ocaml-sexplib0" ,ocaml4.07-sexplib0) + ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) ("ocaml-stringext" ,(package-with-ocaml4.07 ocaml-stringext)))) (home-page "https://github.com/mirage/ocaml-uri") (synopsis "RFC3986 URI/URL parsing library") @@ -3648,7 +3656,7 @@ syntax checking on dedukti files.") ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs) - ("ocaml-sexplib0" ,ocaml4.07-sexplib0) + ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) ("ocaml-stdio" ,ocaml4.07-stdio) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (properties `((upstream-name . "ppx_inline_test"))) @@ -4027,33 +4035,35 @@ an arbitrary number of processes. Cache coherence protocols and mutual exclusion algorithms are typical examples of such systems.") (license license:asl2.0))) -(define-public ocaml4.07-sexplib0 +(define-public ocaml-sexplib0 (package - (name "ocaml4.07-sexplib0") - (version "0.11.0") + (name "ocaml-sexplib0") + (version "0.14.0") (home-page "https://github.com/janestreet/sexplib0") (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 - "07v3ggyss7xhfv14bjk1n87sr42iqwj4cgjiv2lcdfkqk49i2bmi")))) + (janestreet-origin "sexplib0" version + "0adrc0r1vvvr41dcpj8jwkzh1dfgqf0mks9xlnnskqfm3a51iavg")) (build-system dune-build-system) - (arguments - `(#:tests? #f ;no tests - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + (arguments `(#:tests? #f)) ;no tests + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-sexplib0)))) (synopsis "Library containing the definition of S-expressions and some base converters") (description "Part of Jane Street's Core library The Core suite of libraries is an industrial strength alternative to OCaml's standard library that was developed by Jane Street, the largest industrial user of OCaml.") -(license license:expat))) + (license license:expat))) + +(define-public ocaml4.07-sexplib0 + (package-with-ocaml4.07 + (package + (inherit ocaml-sexplib0) + (name "ocaml-sexplib0") + (version "0.11.0") + (source + (janestreet-origin "sexplib0" version + "1p06p2s7p9xsjn0z9qicniv1ai54d8sj11k8j633di2mm7jzxpin")) + (arguments `(#:tests? #f)) ; no tests + (properties '())))) (define-public ocaml4.07-parsexp (package @@ -4076,7 +4086,7 @@ that was developed by Jane Street, the largest industrial user of OCaml.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (inputs - `(("ocaml-sexplib0" ,ocaml4.07-sexplib0))) + `(("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) (synopsis "S-expression parsing library") (description "This library provides generic parsers for parsing S-expressions from @@ -4128,7 +4138,7 @@ parsexp_io.") (propagated-inputs `(("ocaml-num" ,(package-with-ocaml4.07 ocaml-num)) ("ocaml-parsexp" ,ocaml4.07-parsexp) - ("ocaml-sexplib0" ,ocaml4.07-sexplib0))) + ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) (synopsis "Library for serializing OCaml values to and from S-expressions") (description @@ -4153,7 +4163,7 @@ functionality for parsing and pretty-printing s-expressions.") "0j6xb4265jr41vw4fjzak6yr8s30qrnzapnc6rl1dxy8bjai0nir")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-sexplib0" ,ocaml4.07-sexplib0))) + `(("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) (arguments `(#:phases (modify-phases %standard-phases @@ -4224,7 +4234,7 @@ is now @code{Ocaml_common.Ast_helper}.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) - ("ocaml-sexplib0" ,ocaml4.07-sexplib0))) + ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) (arguments `(#:tests? #f ;no tests #:ocaml ,ocaml-4.07 @@ -4288,7 +4298,7 @@ as part of the same ocaml-migrate-parsetree driver.") ("ocaml-ppx-derivers" ,(package-with-ocaml4.07 ocaml-ppx-derivers)) ("ocaml-stdio" ,ocaml4.07-stdio) ("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) - ("ocaml-sexplib0" ,ocaml4.07-sexplib0))) + ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) (arguments `(#:phases (modify-phases %standard-phases -- 2.29.2