From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 8HDyC/fdAmK3/AAAgWs5BA (envelope-from ) for ; Tue, 08 Feb 2022 22:17:43 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 6EGuBPfdAmJnTwEAG6o9tA (envelope-from ) for ; Tue, 08 Feb 2022 22:17:43 +0100 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 9EBED2AAA0 for ; Tue, 8 Feb 2022 22:17:42 +0100 (CET) Received: from localhost ([::1]:57174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHXro-0007Gn-RC for larch@yhetil.org; Tue, 08 Feb 2022 16:17:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuK-0000gK-7e for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:16 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54962) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuJ-0007Zs-Gf for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuJ-0002ch-DG for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 24/24] gnu: Add ocaml-core. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16:11 +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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513239847 (code B ref 53882); Tue, 08 Feb 2022 20:16:11 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:23 +0000 Received: from localhost ([127.0.0.1]:48836 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtW-0002Yf-LY for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:23 -0500 Received: from lepiller.eu ([89.234.186.109]:47110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtM-0002Sz-Vt for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:13 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id fb5f5739 for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:15:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=pCIPMHT9oP7Y5S0GuoBF6kS2j jYo/wUnZ2WZ2pN5lOI=; b=PdwxCv9PKcoM91EapNFUNsp5tFGF2u7CRXGdcgkEU 8ziaAOHBaTiNoxNPZHairTHMilS1VMGU4KGMkTq1MCLlay0D9a0D6c4BH1/sxc7O ue5lIlCvdsRcJ+iuwrgVwx7JTSj86UUUXYHeb+ci95zBgE26P6etvtK0w8SiRlY1 Oy46awQUOGnaFlv+sQaMG/LZxTjXVIJJm/AltsMOAypHfIzutSed8oqdjTy+WWXq JXS0PZd0SA4MP20NqbC4byJRatGqmsTrQJyDUEsvX8moXV+MLS9diGgqgH99VKS5 S4kjquqqF/kdFoE0mqSsGLwH+N1OW8RdmY1uIKDp6m7YA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 549823d2 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:59 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:50 +0100 Message-Id: <80dbbdafe5be728aa5387fb9937a959095a4ffd0.1644350658.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> 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-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1644355062; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=puQbw6s5HuazRzmhdW4HcsTY3Ou76Jq2XDu6cBmVfO0=; b=cppRro6uS8Qs63t+xUsLH7qLug7quLYX+YuVKu2A7EjiTvWUvDSbrMFYh+F5+t/qqVV7GY PTmBHHDfnc3C4i+9O6XGn94ucbA8lmDb0isPMhpyfeJw/BC0N8FA3aM+3Vs8sJVBXrYbiG 8hYzLGJvLljwx1SuEt4cSH/27bevZ1xxyfjZUBcfHKqSTs3SHIdGt4YKyctt/0RKubWQhu G3raX1/q1xaidXm48DF9jO81e0uDoHlMMRnafwHMGeWVQKilIRDXeFofETbBMMeEwPQhZt R+Es6Q5oKqnmqx0Zim3t75H2UlIUveA6b7Gya9ha6zix5w1Rhwr5MH1AvYTAtA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1644355062; a=rsa-sha256; cv=none; b=nqyHSCapLXT/zb3WZ+/B2SMSbFLK4BijiwVtWjmg2lhsmEwgua+g9jg4I0x1Aod3zVE8VX M6p0wDEUZW9vVT6Jccj/H3x7QbDg6uqTFrFfd4yek53lAvrugtyFh2XiaIBI7ZKmg73SH0 /zwR8kEanZTLjzRbE2lioaN3DUFp1FE+WH8kqT/xiluSs0itylFKRQxJKwFzwOfJMi4IBu Ru7YLXyx4qq5bbN6YOposJ7H61Q9fSlFoihGKlk/rB6G0K5sPetTkGJwwPiyUCWYCMMMeh P3R5h78GvSie7QY0QGLMbuBwLHfBt9XjdjJy3IrvidOtOl6O8skBZeGmh2eoUA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=PdwxCv9P; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (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: -0.53 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=PdwxCv9P; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (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: 9EBED2AAA0 X-Spam-Score: -0.53 X-Migadu-Scanner: scn1.migadu.com X-TUID: /s2orXaxN7HY * gnu/packages/ocaml.scm (ocaml-core): New variable. (ocaml4.07-core): Inherit from it. --- gnu/packages/ocaml.scm | 79 ++++++++++++++++++++++++++---------------- 1 file changed, 50 insertions(+), 29 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b01b598f5f..d829b1e2cd 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6848,45 +6848,66 @@ (define-public ocaml4.07-spawn (propagated-inputs '()) (properties '())))) -(define-public ocaml4.07-core +(define-public ocaml-core (package - (name "ocaml4.07-core") - (version "0.11.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/core") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0pzl8n09z4f3i7z2wq4cjxfqrr8mj6xcdp7rbg0nxap2zdhjgvrq")))) + (name "ocaml-core") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/core") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1isrcl07nkmdm6akqsqs9z8s6zvva2lvg47kaagy7gsbyszrqb82")))) (build-system dune-build-system) (arguments `(#:package "core" - #:tests? #f; Require a cyclic dependency: core_extended - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + #:tests? #f)); Require a cyclic dependency: core_extended (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-configurator" ,ocaml4.07-configurator) - ("ocaml-core-kernel" ,ocaml4.07-core-kernel) - ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) - ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) - ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) - ("ocaml-spawn" ,ocaml4.07-spawn) - ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) + (list ocaml-core-kernel + ocaml-jst-config + ocaml-ppx-jane + ocaml-sexplib + ocaml-timezone + ocaml-spawn)) (home-page "https://github.com/janestreet/core") (synopsis "Alternative to OCaml's standard library") (description "The Core suite of libraries is an alternative to OCaml's standard library that was developed by Jane Street.") - ;; Also contains parts of OCaml, relicensed to asl2.0, as permitted + ;; Also contains parts of OCaml, relicensed to expat, as permitted ;; by OCaml's license for consortium members (see THIRD-PARTY.txt). - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-core + (package-with-ocaml4.07 + (package + (inherit ocaml-core) + (version "0.11.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/core") + (commit (string-append "v" version)))) + (file-name (git-file-name "ocaml4.07-core" version)) + (sha256 + (base32 + "0pzl8n09z4f3i7z2wq4cjxfqrr8mj6xcdp7rbg0nxap2zdhjgvrq")))) + (propagated-inputs + (list ocaml-base + ocaml4.07-configurator + ocaml-core-kernel + ocaml-ppx-assert + ocaml-ppx-jane + ocaml-sexplib + ocaml-spawn + ocaml-stdio + ocaml-migrate-parsetree + ocaml-ppxlib)) + ;; Also contains parts of OCaml, relicensed to asl2.0, as permitted + ;; by OCaml's license for consortium members (see THIRD-PARTY.txt). + (license license:asl2.0)))) (define-public ocaml-core-kernel (package -- 2.34.0