From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 2B5mAhHU6V+RbQAA0tVLHw (envelope-from ) for ; Mon, 28 Dec 2020 12:48:17 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id KPmkORDU6V+9HgAAbx9fmQ (envelope-from ) for ; Mon, 28 Dec 2020 12:48:16 +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 C60CB9403CD for ; Mon, 28 Dec 2020 12:48:16 +0000 (UTC) Received: from localhost ([::1]:40810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktrwd-0007Fw-LY for larch@yhetil.org; Mon, 28 Dec 2020 07:48:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktrwR-0007Fi-8L for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51239) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktrwR-000420-1m for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktrwQ-0003wC-W7 for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH 02/12] gnu: Add ocaml-sexplib. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 12:48:02 +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.160915966215005 (code B ref 45498); Mon, 28 Dec 2020 12:48:02 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 12:47:42 +0000 Received: from localhost ([127.0.0.1]:34526 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrw5-0003tc-A2 for submit@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:42 -0500 Received: from mout02.posteo.de ([185.67.36.66]:36857) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrw3-0003sz-Cx for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:39 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 69A242400FF for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 13:47:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609159653; bh=idFXokDPq6zgaxFfrlh9vb8aocjQsWULvrjGJWl7wX8=; h=From:To:Cc:Subject:Date:From; b=hygCsgQyJUxMklwDFoJNqRNq7/O1tNkcM5DCfYEfmGZSkE+oSo57v1mLBk6kP9UZC 7ZoRq9ujTTSEEH20FIAhZAI8nK/4/s1wo0mtt/GKtswQ0VmDUASg7EQ6HJvAN5f9Q0 Rv+A+9whBOgN4jgQvyRgyUbfURT0tpts8CxWjL6DMHPq5bELKjiGOUk2G83AOF5GQx /ronwK3CKjNPtd57ktnVOFyIm6VDrCPcJn6PFwZLik/2DKYXApZfk2vavwIRvyogyg 48oOkyfBixvr38kRRuHNS3BH7KPUt6+Zl76yYtGD53t4753RGLuGKQNupS5ZDqyXrc 1MLElLmaULUDA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4HPq6kHYz6tmH; Mon, 28 Dec 2020 13:47:27 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 13:47:08 +0100 Message-Id: <20201228124718.24736-2-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124718.24736-1-pukkamustard@posteo.net> References: <20201228124718.24736-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=hygCsgQy; 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: C60CB9403CD X-Spam-Score: 3.78 X-Migadu-Scanner: scn1.migadu.com X-TUID: 0J2E+z73TTpf * gnu/packages/ocaml.scm (ocaml-sexplib0): New variable. (ocaml4.07-sexplib0): Inherit from ocaml-sexplib0. (janestreet-origin): New variable. --- gnu/packages/ocaml.scm | 46 +++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index aa9dfb3dae..917a82c514 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") @@ -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 (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 (inherit ocaml-sexplib0) + (name "ocaml4.07-sexplib0") + (version "0.11.0") + (source + (janestreet-origin "sexplib0" version + "1p06p2s7p9xsjn0z9qicniv1ai54d8sj11k8j633di2mm7jzxpin")) + (arguments + `(#:tests? #f ;no tests + #:ocaml ,ocaml-4.07 + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)))) (define-public ocaml4.07-parsexp (package -- 2.29.2