From patchwork Fri Apr 8 13:23:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38398 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CA77A27BBEA; Fri, 8 Apr 2022 14:26:04 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4122D27BBE9 for ; Fri, 8 Apr 2022 14:26:04 +0100 (BST) Received: from localhost ([::1]:60464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncocj-0004y4-TG for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:26:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncobE-0002Xk-58 for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:28 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40411) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoaw-0001RX-RU 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 1ncoaw-0007uZ-ON for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 22/25] gnu: Add ocaml-core-kernel. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:10 +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.164942423330218 (code B ref 53882); Fri, 08 Apr 2022 13:24:10 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:53 +0000 Received: from localhost ([127.0.0.1]:34282 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoae-0007rE-Ur for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:53 -0400 Received: from mail-wr1-f46.google.com ([209.85.221.46]:34532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaT-0007n8-5W for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:42 -0400 Received: by mail-wr1-f46.google.com with SMTP id m30so12871922wrb.1 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:41 -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=z0T9ACY2rx/RRj1XnAu281QCAB3eI3/k33Y3QS8mFbc=; b=WAuMrGFe6ukMS9CZhP8tm9nBwBIbTViL1fm3n1cMEgbCj8zmS361wQWj3VAFM7H8jd fiy0nMe/coRSiasHnARPObIBilVT+ewvJ/0X2Biui4JrPz9Sgrxr3RfqkAqWeCnsUaQx dSc2OIluozg7iBNIxN2xpzrjVGKwKko3EputcOpbG3MJftW+MvTSQw+p/evUTd9I2oyX RRijdLtn3bcRWQh79LX28oijooA2w/UCSn2rzdRmfb+QyJVBko9H7UM8g9gNAQro0mUe fUHYoO5UKzzZrEEWyI3e1zxqAOKU7Bbw53f4SiEahYem1gJ37meO1J44ePZEA+DQKskq zBog== 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=z0T9ACY2rx/RRj1XnAu281QCAB3eI3/k33Y3QS8mFbc=; b=BRi9i9bi2nquPqgeMDp7NerJ0N51EGUzcJ6nWjOU3zv0eHEe7x3+VMNNqE8NzEKqTx YhD9N/bMGPuCxA7iVdEQMMZbebN+1uWcvXG8/7dv42E7cXz99ai1A8UK49LfHJNeTvV4 2KXlkCvH7FOK9+KS7YD/gkMWk+Nr5qW2tHQxWynaE+litUgEYtuE3+QAfzpcHMrj0kUG q1cTRtVU4lerDeq6Dk3XRS8i9beZJi+U/JnVqg9FwwXWKnHUR4/ipwJuFyA4ExyJ3QUw nV5Oby5dkUC7TO6mb7n+DjZFTwWRwNmxW68GOrXI3Q1vYELF76r/6c5YVE7zagKX/3Ga BRxQ== X-Gm-Message-State: AOAM530HRRTY4IL0zOVN50l932Pb194BzSEUZNjtnWPfMYYAs4ANDyiT Y+HoBcDygHt543Qhdc1JJBM/ra4Cxnw= X-Google-Smtp-Source: ABdhPJwtvanXr3/08PlbX/yH+NYxROR130AtL8mwbS/GqTCtster8CvRnJ12Ud197yMtfL+AoCzGug== X-Received: by 2002:adf:e301:0:b0:205:db69:6dba with SMTP id b1-20020adfe301000000b00205db696dbamr15266950wrj.605.1649424215492; Fri, 08 Apr 2022 06:23:35 -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.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:35 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:23:02 +0200 Message-Id: <20220408132305.3301350-22-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 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-core-kernel): New variable. (ocaml4.07-core-kernel): Inherit from it. --- gnu/packages/ocaml.scm | 118 +++++++++++++++++++++++++++-------------- 1 file changed, 77 insertions(+), 41 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ba21f76759..be6477edbe 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6887,58 +6887,94 @@ (define-public ocaml4.07-core ;; by OCaml's license for consortium members (see THIRD-PARTY.txt). (license license:asl2.0))) -(define-public ocaml4.07-core-kernel +(define-public ocaml-core-kernel (package - (name "ocaml4.07-core-kernel") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/core_kernel") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1dg7ygy7i64c5gaakb1cp1b26p9ks81vbxmb8fd7jff2q60j2z2g")))) + (name "ocaml-core-kernel") + (version "0.14.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/core_kernel") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vxv9rq6m52n60gprm4sqjj1i1p4dd4sgns068hkp9g558d8zdjx")))) (build-system dune-build-system) (arguments ;; Cyclic dependency with ocaml-core - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:tests? #f)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-bin-prot" ,ocaml4.07-bin-prot) - ("ocaml-configurator" ,ocaml4.07-configurator) - ("ocaml-fieldslib" ,(package-with-ocaml4.07 ocaml-fieldslib)) - ("ocaml-jane-street-headers" ,ocaml4.07-jane-street-headers) - ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) - ("ocaml-ppx-base" ,(package-with-ocaml4.07 ocaml-ppx-base)) - ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) - ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) - ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) - ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) - ("ocaml-splittable-random" ,ocaml4.07-splittable-random) - ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-typerep" ,ocaml4.07-typerep) - ("ocaml-variantslib" ,(package-with-ocaml4.07 ocaml-variantslib)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) - (properties `((upstream-name . "core_kernel"))) + (list ocaml-base + ocaml-base-bigstring + ocaml-base-quickcheck + ocaml-bin-prot + ocaml-fieldslib + ocaml-jane-street-headers + ocaml-jst-config + ocaml-ppx-assert + ocaml-ppx-base + ocaml-ppx-hash + ocaml-ppx-inline-test + ocaml-ppx-jane + ocaml-ppx-sexp-conv + ocaml-ppx-sexp-message + ocaml-sexplib + ocaml-splittable-random + ocaml-stdio + ocaml-time-now + ocaml-typerep + ocaml-variantslib + ocaml-ppx-optcomp)) + (properties `((upstream-name . "core_kernel") + (ocaml4.07-variant . ,(delay ocaml4.07-core-kernel)))) (home-page "https://github.com/janestreet/core_kernel") (synopsis "Portable standard library for OCaml") (description "Core is an alternative to the OCaml standard library. Core_kernel is the system-independent part of Core. It is aimed for cases when the full Core is not available, such as in Javascript.") - (license (list - ;; this package and parts of OCaml, relicensed by janestreet - license:asl2.0 - ;; MLton and sjs - license:expat)))) + (license license:expat))) + +(define-public ocaml4.07-core-kernel + (package-with-ocaml4.07 + (package + (inherit ocaml-core-kernel) + (version "0.11.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/core_kernel") + (commit (string-append "v" version)))) + (file-name (git-file-name "ocaml4.07-core-kernel" version)) + (sha256 + (base32 + "1dg7ygy7i64c5gaakb1cp1b26p9ks81vbxmb8fd7jff2q60j2z2g")))) + (propagated-inputs + (list ocaml-base + ocaml-bin-prot + ocaml4.07-configurator + ocaml-fieldslib + ocaml-jane-street-headers + ocaml-ppx-assert + ocaml-ppx-base + ocaml-ppx-hash + ocaml-ppx-inline-test + ocaml-ppx-jane + ocaml-ppx-sexp-conv + ocaml-ppx-sexp-message + ocaml-sexplib + ocaml-splittable-random + ocaml-stdio + ocaml-typerep + ocaml-variantslib + ocaml-migrate-parsetree)) + (properties '()) + (license (list + ;; this package and parts of OCaml, relicensed by janestreet + license:asl2.0 + ;; MLton and sjs + license:expat))))) (define-public ocaml-markup (package