From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id cFmnDC84UGJy/gAAgWs5BA (envelope-from ) for ; Fri, 08 Apr 2022 15:27:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 4JYkBS84UGK4bwAAG6o9tA (envelope-from ) for ; Fri, 08 Apr 2022 15:27:11 +0200 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 ACD8232714 for ; Fri, 8 Apr 2022 15:27:10 +0200 (CEST) Received: from localhost ([::1]:36028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncodp-0007aH-SI for larch@yhetil.org; Fri, 08 Apr 2022 09:27:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncobE-0002Y8-86 for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:28 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40413) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoax-0001Ra-Lr for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:27 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoax-0007un-Ie for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 25/25] gnu: Add ocaml-core. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24: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 Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942423430233 (code B ref 53882); Fri, 08 Apr 2022 13:24:11 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:54 +0000 Received: from localhost ([127.0.0.1]:34286 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaf-0007rS-TT for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:54 -0400 Received: from mail-wr1-f54.google.com ([209.85.221.54]:42780) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaU-0007nZ-DL for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:43 -0400 Received: by mail-wr1-f54.google.com with SMTP id r13so12806899wrr.9 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I8BT/F+Eigrc3/WWaBjZkBkoyfH07q4C+R6/HPHgJbE=; b=KJRHJl4aIXze9WRWly0L7qRoJRW3NY3ta635bwt1a4Qo6I/9d2u/2Z3FVga5CQesbQ wsSA1Z+waqxiH5deSaZA/d1rv3n5SZ5ArjYMjYO07vLdlZiFVuyD/BihyRXNHtXG+jdq tohbPwEFz2QlH1/hukI+uxU+xMbfgkQlSHc3TJmPO9czKmFgZqWXnN+bWp1s55a/H9cp t/k3iAgwtjkop8rt4spdLbgK064J7oY35iSvFc945T6QihPzvwSjL234SYzY+zE3hwY7 CHPF/Qq1D5nZ7ErnkoyVrIyJeOU7rMAM6+nodBwDHs8g6cUzMLHmLbGR4JhOBIsQc3h5 MU4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=I8BT/F+Eigrc3/WWaBjZkBkoyfH07q4C+R6/HPHgJbE=; b=bkeIwgoa2+nSsnLtqkBTKSAB/Gp5qowJSHrRRV98T4yGrztTC5P1gBOFZ1DQplqMna Bta/z9zI+Hl9X6DwrM9IRZPwkf7+CgK59H+t07TAQSQ0EHDnFTJxbv9gBZjwkDLmGy5q jATKnVlfJR/vGO4tf3XUgrEr7V7m9/o8+MpS3pU0pod31gW6MV03/IbJ1CYxfkXOPeE8 CXHhwyp02PWfPr2Ll+kiUFUwgF5q++Uv83jaOmSnSWWTP0QppDbrbFOojbN0vE3FOOkI M0IVDG9yosd8BuWmvUe0EnheuY+QyCqDUMDppJXWcZbG7BUUV7AKCXq8uxi7Hzk1ZZgc xZoQ== X-Gm-Message-State: AOAM533MEX1oygxEKuBrz6mP2nKQuuKwIqrqUe97HHzZKHg+1MkAEFYj SWudviMZL3kCGn4mrJBYiRSK/3aoU6Q= X-Google-Smtp-Source: ABdhPJw79UoTw0Ya1IXQfIedmthMH9+ZV/arDlbG0iamHCiXfdFrYsSpaZr3la3GuyPP3yMx0hxnCA== X-Received: by 2002:a5d:64a2:0:b0:207:8c2d:122b with SMTP id m2-20020a5d64a2000000b002078c2d122bmr5745087wrp.93.1649424216840; Fri, 08 Apr 2022 06:23:36 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:36 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:23:05 +0200 Message-Id: <20220408132305.3301350-25-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1649424430; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=I8BT/F+Eigrc3/WWaBjZkBkoyfH07q4C+R6/HPHgJbE=; b=bv8941voeCPiLzFleqV3pT/kTqjwqB4hka9VzaEwa8auKpiqaxTbB2VUjXNkIwD1MaR5cP GoGBw0gFGnqRMJpoqr+SXEBCg3D9Y7rECoPGVLKG+xmYXYdq32zELWh3EgzQEoqCuJXffa fnSU+OoEhM/y4y5/W318c23Hzmwj6tnkbqYmVaxtxTDvKvrBUIUWqZPUOW1FuUhTqFq14m zZS0u3RpfA5pCv/lT8KIuqv2h83YTQMpcrQv0jzP3SuwNFFeHOeSTNpxVHPAl8N1Gz9dqh zcKPNzRIcM3JWuS+PlKv+W4PP6tbUCYdgLA2rHeIEWwjnVRebhcsA0D/NJ4+Vg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1649424430; a=rsa-sha256; cv=none; b=CWOAd0Fe3AGyw7ioLvKIFa628aCQz1WEFK39+dVcnSmY9SlKdGvU4RbxMKX3heOkUeqFpa PTELDPga0ycBx0hTz5Az4Oh2a7LQzxUvEabkBi2RzUZWAvRhCRJKZ+QLUC8RN5NWCdNidy gw6TOys+7cE3hnaIdfICpuFyioKzJYOCDhdu7G0JyvADgpzHfDEenphwf8YmssUj+HExLT 4iS9mILdP3dvPz/NQRJsT6wKeWFt/CyYHq1Q0wq3fEI+drBCjpJ+dzMxytoV7RkovtC5j8 9iTtiQcOvID0tW2wxoqODa0gt9F86Ezm0TJxjn+Bs4J9IITZqch2MmfENMw74Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=KJRHJl4a; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (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: 5.13 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=KJRHJl4a; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (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: ACD8232714 X-Spam-Score: 5.13 X-Migadu-Scanner: scn0.migadu.com X-TUID: RaY0ILf8H3UJ From: Julien Lepiller * 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 e3092e8434..2cfe94106d 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