From patchwork Fri Dec 16 13:25:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45376 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 208D627BBED; Fri, 16 Dec 2022 13:28:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 87AD927BBE9 for ; Fri, 16 Dec 2022 13:28:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Aj6-0005ry-G6; Fri, 16 Dec 2022 08:26:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p6Aj4-0005ql-7K for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Aj3-0007Al-S7 for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aj3-00035t-Mf for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 10/28] gnu: Add ocaml5.0-base. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:26:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119716211749 (code B ref 60120); Fri, 16 Dec 2022 13:26:09 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:02 +0000 Received: from localhost ([127.0.0.1]:49298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aiv-00033D-PK for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:02 -0500 Received: from mout01.posteo.de ([185.67.36.65]:56757) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aim-00030q-Tj for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:53 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 68CC524002B for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197147; bh=iipsy3q6VMcQRaw1JMQJF/qf3XKOsMuQbWrrHPxNLoM=; h=From:To:Cc:Subject:Date:From; b=hp/Iu1NP6dDJuSs6F9Ry9bQ3+9lYthhopf7MElhm0tmaK5FzZoAqZCirh3q7zSCez s57JDQXMJxnoRrZdSke7Ol/TzlNbEUi9AawYS2e/0Jyd6Pp2rbTWTqtML7DVdn7kQb Qk924MFNayN/ocuS3OXs5G2W3aqe7L0wHsu4wT5d5rO7hzRsabgmxyB3/SHFKOIa/z e7giTFIhnk0QbKr9HuWZZ+C8Bp+6iO84AhxP+AfeIehaZ1d8M8QH+7lxhOSFnqUYYx M/STfCzyEqt4yJYEX4zQ7Oh5SK/i2KRSAS86Dr6yLvTo7HjNFTja6CWNr1xCxAljXK T4dHyfJK4cBwQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGg0330z6tmS; Fri, 16 Dec 2022 14:25:46 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:09 +0000 Message-Id: <20221216132527.2539-10-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml5.0-base): New variable. --- gnu/packages/ocaml.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6a7abed03c..035a692d08 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5484,7 +5484,8 @@ (define-public ocaml-base (build-system dune-build-system) (propagated-inputs (list ocaml-sexplib0)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-base)))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-base)) + (ocaml5.0-variant . ,(delay ocaml5.0-base)))) (synopsis "Full standard library replacement for OCaml") (description @@ -5499,6 +5500,28 @@ (define-public ocaml-base @url{https://github.com/janestreet/stdio, ocaml-stdio}.") (license license:expat))) +(define-public ocaml5.0-base + ;; This version contains fixes for OCaml 5.0 + ;; (see https://github.com/ocaml/opam-repository/pull/21851) + (let ((commit "423dbad212f55506767d758b1ceb2d6e0ee8e7f5") + (revision "0")) + (package-with-ocaml5.0 + (package + (inherit ocaml-base) + (name "ocaml-base") + (version (git-version "0.15.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kit-ty-kate/base") + (commit commit))) + (file-name (git-file-name "ocaml5.0-base" version)) + (sha256 + (base32 + "15vsiv3q53l1bzrvqgspf3lp2104s9dzw62z3nl75f53jvjvsyf6")))) + (properties '()))))) + (define-public ocaml4.07-base (package-with-ocaml4.07 (package