From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id IEdPNaEYE2aF3QAAqHPOHw:P1 (envelope-from ) for ; Mon, 08 Apr 2024 00:05:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id IEdPNaEYE2aF3QAAqHPOHw (envelope-from ) for ; Mon, 08 Apr 2024 00:05:21 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mccd.space header.s=fm1 header.b=E464ARwJ; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b="T YKWRgM"; dmarc=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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1712527521; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=P8kkpEMd29mgOVhLfbvakJDXQzBEKbpp1fVbMdta9YU=; b=JqCvgYk03o+yayscIWyCt9lMEeeWzOJcb/WTZzpa6uzTLo8fzB6sILSG5F0L2sY4V3rc4P 44FVi+NOfKZctynB06DMW8cSXijMx3AOCK6azTarumrqotnR0EM2xuFx75MVxcegCicy/l vn+Tw1Nc4o2skvsyHBuWSWTsAnHWpxv/J/Jma0XNBwOJgLFYord58XC9VbRMnp4yrmSSJv UaUvkUnR8c/H/NpWUXxclO7xpl9esxcyoBTKCTj0uxBe25m81htyQj2pU+DBYnGZBDt+Bj fmaIUUAvTRJrjyJhGHhC1xILvq8tG0K3tgAWPpuS/xsirQWP9hOL0qSsQQbo5g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mccd.space header.s=fm1 header.b=E464ARwJ; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b="T YKWRgM"; dmarc=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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1712527521; a=rsa-sha256; cv=none; b=d9+CsVyKgdFNB9CajU9v+0CnjW9h2x3rzonVNQDxVC0T/W4cARsN9VLPSSfXl18unD9Hyc TDx+3am5puWWmWq5hdOgcuFq88O0DZRxsEWYDIXnhUUWc+8qx8e2tVhzir3jf1Bt7ZxNmI E8pPXMQ0ruEiHv9G8/zZN4wefWh0+c0YBPS8rTIoQ7PdYb6PRWtta9ynDY6GdF9e6ZoA0G mUf0o0a+a4xrzr955w7sLEGJGd7YRL60eFv4xHQAEjADEIRKhjuM5PYqLrVRwdlDN+8yxF GxY7B8y+Qlw++1q8EFv9MX4K+gfq/sxgCorIh+NGqopeGNYK6iJ0/L11+YQ/Eg== 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 8A7B33D50 for ; Mon, 08 Apr 2024 00:05:20 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtadF-0006ac-0K; Sun, 07 Apr 2024 18:04:57 -0400 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 1rtadD-0006aN-3c for guix-patches@gnu.org; Sun, 07 Apr 2024 18:04:55 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rtadC-00024L-SC for guix-patches@gnu.org; Sun, 07 Apr 2024 18:04:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rtadJ-0002Qk-Lr for guix-patches@gnu.org; Sun, 07 Apr 2024 18:05:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69185] [PATCH master] gnu: ocaml: Update to 5.1.1 Resent-From: Marc Coquand Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Apr 2024 22:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69185 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: Marc Coquand Cc: pukkamustard , Julien Lepiller , Ludovic =?UTF-8?Q?Court=C3=A8s?= , 69185@debbugs.gnu.org Received: via spool by 69185-submit@debbugs.gnu.org id=B69185.17125274849195 (code B ref 69185); Sun, 07 Apr 2024 22:05:01 +0000 Received: (at 69185) by debbugs.gnu.org; 7 Apr 2024 22:04:44 +0000 Received: from localhost ([127.0.0.1]:44927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtad1-0002OE-Fy for submit@debbugs.gnu.org; Sun, 07 Apr 2024 18:04:44 -0400 Received: from wfout2-smtp.messagingengine.com ([64.147.123.145]:46705) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtacy-0002O0-Ls for 69185@debbugs.gnu.org; Sun, 07 Apr 2024 18:04:42 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfout.west.internal (Postfix) with ESMTP id A2DC81C000AF; Sun, 7 Apr 2024 18:04:27 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sun, 07 Apr 2024 18:04:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mccd.space; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm1; t=1712527467; x=1712613867; bh=P8kkpEMd29mgOVhLfbvakJDXQzBEKbpp1fVbMdta9YU=; b= E464ARwJYXmZxgSMeVdEUPlzwjDK0izpS/JVysSdzUj0JWL4J/W3AwaYpe7z1xHo i1tePtxt/+dTRHi8oAy5QgOOqz+At2l8JvKSAwHTV0JVVRTOAZhjmdL8WkEAc72a eddDzJ3tYG4ErBnupzivCMnh+mGfMpP24vTllq8WvEvSYTvnJS/fSsoahxhZ/LVK 0ssceky+YcUv1D2xfoNZgPUwFAb+EMltuHoZc38auSqleKTVcOUAJ+JRdjID14K6 20ti5GnkJxMsLKGMrtzxo1UPmKh6KF9dWem7jUnamY2upuuBg79TNv2MvJBfDuHS G7nddVD0Ewii2P8G34Yk3w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1712527467; x= 1712613867; bh=P8kkpEMd29mgOVhLfbvakJDXQzBEKbpp1fVbMdta9YU=; b=T YKWRgMh0OHKhgYot86fvKymfwKfQdW4yvZ9M6m1kFznP7It8UA8WW4U21f73C032 hjLZZWl+9KLSH1OqBAtB641sBNbb5N8m77+eUME6plMqjxjnWEP3SvlzSo1uUr2n /1kGoEkKUSJZNJPvMjZ804hZNuYuumTbhx0T4Iet1d47uOTD9HmwonEBUG7OMW6s JrSzO4VzNjWq3zU1wHiZ62llz1zSTIR0tG+h4wHJHPSpau/buyXf0NZlCXo9IPIL povi0m38kGKUVk2WOK1apUJVWTpKbTLuScUByHLFAdDnq8FenFXCvsEOdt+CqOyF RPQpf42EkffkwxxFjMYQA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrudeghedgtdehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne goufhushhpvggtthffohhmrghinhculdegledmnegoteeftdduqddtudculdduhedmnecu jfgurhepfhgfhffvvefuffgjkfggtgfgsehtqhertddtreejnecuhfhrohhmpeforghrtg cuvehoqhhurghnugcuoehmrghrtgesmhgttggurdhsphgrtggvqeenucggtffrrghtthgv rhhnpeffhfefieetgfdufedttdeuvdejkeejieehueeuvdetveejkefgkeelkefhfeehje enucffohhmrghinhepihhnrhhirgdrfhhrpdhgihhthhhusgdrtghomhdpghhithhhuhgs rdhiohdptghorhgvughumhhprdgtgienucevlhhushhtvghrufhiiigvpedtnecurfgrrh grmhepmhgrihhlfhhrohhmpehmrghrtgesmhgttggurdhsphgrtggv X-ME-Proxy: Feedback-ID: ia2d149fd:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 7 Apr 2024 18:04:25 -0400 (EDT) References: <861q806r8g.fsf@posteo.net> <87edby3uac.fsf@mccd.space> <86zfukofrg.fsf@posteo.net> <87r0fsfzqh.fsf_-_@gnu.org> <8634s5a97o.fsf@posteo.net> <87h6gj3gsq.fsf@gnu.org> <878r1v1wwj.fsf@mccd.space> User-agent: mu4e 1.10.8; emacs 29.3 From: Marc Coquand Date: Sun, 07 Apr 2024 16:42:18 -0500 In-reply-to: <878r1v1wwj.fsf@mccd.space> Message-ID: <87cyr0bzix.fsf@mccd.space> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.47 X-Migadu-Scanner: mx11.migadu.com X-Spam-Score: -5.47 X-Migadu-Queue-Id: 8A7B33D50 X-TUID: UU+pDGaEIxgL Hey everyone, So I decided to attempt this today, but ran into issues with merlin. Current version of merlin is built for 5.0, and will break if attempted to be built on version 5.1. I tried to build to bump up the version but ran into the error when building ocaml-merlin-lib, which needs to be upgraded to at least version 4.11-501. However, when I tried to do so, I ran into the error. ``` Error: The functor was expected to be applicative at this position ``` And struggled with it for a bit but ultimately couldn't get it to work. I'm adding the diff in case anyone wants to have another attempt. I've made some more changes, basically I've replaced all instances of ocaml5.0 with ocaml5.1. Cheers Marc --- 82ded88c7751c0ad210f12b7b5a617031311f96f gnu: ocaml: Update to 5.1.1 diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7fad276b4e..1b12b4121a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -191,10 +191,10 @@ (define-public camlboot This package produces a native @command{ocamlc} and a bytecode @command{oc= amllex}.") (license license:expat)))) =20 -(define-public ocaml-5.0 +(define-public ocaml-5.1 (package (name "ocaml") - (version "5.0.0") + (version "5.1.0") (source (origin (method git-fetch) (uri (git-reference @@ -203,7 +203,7 @@ (define-public ocaml-5.0 (file-name (git-file-name name version)) (sha256 (base32 - "1p0p8wldrnbr61wfy3x4122017g4k5gjvfwlg3mvlqn8r2fxn2m5")))) + "1x3a6cyibmmyhqxq2y6vvj1bj3rngqkvppilchsmsn76p8nh8hcr")))) (build-system gnu-build-system) (native-search-paths (list (search-path-specification @@ -906,8 +906,8 @@ (define-public opam-installer OPAM.") (properties ;; opam-installer is used as a tool and not as a library, we can use = the - ;; OCaml 4.14 compiled opam until opam is compatible with OCaml 5.0. - `((ocaml5.0-variant . ,(delay opam-installer)))))) + ;; OCaml 4.14 compiled opam until opam is compatible with OCaml 5.1. + `((ocaml5.1-variant . ,(delay opam-installer)))))) =20 (define ocaml-opam-repository (package @@ -1102,8 +1102,8 @@ (define-public opam (inputs (list ocaml-opam-client)) (properties ;; OPAM is used as a tool and not as a library, we can use the OCaml = 4.14 - ;; compiled opam until opam is compatible with OCaml 5.0. - `((ocaml5.0-variant . ,(delay opam)))))) + ;; compiled opam until opam is compatible with OCaml 5.1. + `((ocaml5.1-variant . ,(delay opam)))))) =20 (define-public ocaml-opam-monorepo (package @@ -1382,6 +1382,36 @@ (define-public ocaml-menhir ;; are QPL licensed. (license (list license:gpl2+ license:qpl)))) =20 +(define-public ocaml5.1-menhir + (package + (name "ocaml-menhir") + (version "20231231") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.inria.fr/fpottier/menhir.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12a1zxbkipa2i0k7ay0frfzyibpdvh3hr0rcq18kgsp924wp9q5x")))) + (build-system dune-build-system) + (inputs + (list ocaml)) + (arguments + `(#:tests? #f)) ; No check target + (properties `((ocaml5.1-variant . ,(delay (strip-ocaml5.1-variant ocam= l5.1-menhir))))) + (home-page "https://gallium.inria.fr/~fpottier/menhir/") + (synopsis "Parser generator") + (description "Menhir is a parser generator. It turns high-level gramm= ar +specifications, decorated with semantic actions expressed in the OCaml +programming language into parsers, again expressed in OCaml. It is based = on +Knuth=E2=80=99s LR(1) parser construction technique.") + ;; The file src/standard.mly and all files listed in src/mnehirLib.mlp= ack + ;; that have an *.ml or *.mli extension are GPL licensed. All other fi= les + ;; are QPL licensed. + (license (list license:gpl2+ license:qpl)))) + (define-public ocaml-bigarray-compat (package (name "ocaml-bigarray-compat") @@ -1615,12 +1645,12 @@ (define-public ocaml4.09-findlib (native-inputs (list m4 ocaml-4.09)))) =20 -(define-public ocaml5.0-findlib +(define-public ocaml5.1-findlib (package (inherit ocaml-findlib) - (name "ocaml5.0-findlib") + (name "ocaml5.1-findlib") (native-inputs - (list m4 ocaml-5.0)))) + (list m4 ocaml-5.1)))) =20 (define-public ocaml-ounit2 (package @@ -1953,8 +1983,8 @@ (define-public dune-bootstrap (define-public ocaml4.09-dune-bootstrap (package-with-ocaml4.09 dune-bootstrap)) =20 -(define-public ocaml5.0-dune-bootstrap - (package-with-ocaml5.0 dune-bootstrap)) +(define-public ocaml5.1-dune-bootstrap + (package-with-ocaml5.1 dune-bootstrap)) =20 (define-public dune-configurator (package @@ -1977,7 +2007,7 @@ (define-public dune-configurator (propagated-inputs (list ocaml-csexp)) (properties `((ocaml4.09-variant . ,(delay ocaml4.09-dune-configurator= )) - (ocaml5.0-variant . ,(delay ocaml5.0-dune-configurator))= )) + (ocaml5.1-variant . ,(delay ocaml5.1-dune-configurator))= )) (synopsis "Dune helper library for gathering system configuration") (description "Dune-configurator is a small library that helps writing OCaml scripts that test features available on the system, in order to gene= rate @@ -2002,16 +2032,16 @@ (define-public ocaml4.09-dune-configurator (propagated-inputs `(("ocaml-csexp" ,ocaml4.09-csexp))))) =20 -(define-public ocaml5.0-dune-configurator +(define-public ocaml5.1-dune-configurator (package (inherit dune-configurator) - (name "ocaml5.0-dune-configurator") + (name "ocaml5.1-dune-configurator") (arguments `(,@(package-arguments dune-configurator) - #:dune ,ocaml5.0-dune-bootstrap - #:ocaml ,ocaml-5.0 - #:findlib ,ocaml5.0-findlib)) - (propagated-inputs (list ocaml5.0-csexp)))) + #:dune ,ocaml5.1-dune-bootstrap + #:ocaml ,ocaml-5.1 + #:findlib ,ocaml5.1-findlib)) + (propagated-inputs (list ocaml5.1-csexp)))) =20 (define-public dune (package @@ -2020,7 +2050,7 @@ (define-public dune (list dune-configurator)) (properties `((ocaml4.07-variant . ,(delay ocaml4.07-dune)) (ocaml4.09-variant . ,(delay ocaml4.09-dune)) - (ocaml5.0-variant . ,(delay ocaml5.0-dune)))))) + (ocaml5.1-variant . ,(delay ocaml5.1-dune)))))) =20 (define-public ocaml4.09-dune (package @@ -2042,11 +2072,11 @@ (define-public ocaml4.07-dune (base32 "0l4x0x2fz135pljv88zj8y6w1ninsqw0gn1mdxzprd6wbxbyn8wr"))))= )) =20 -(define-public ocaml5.0-dune +(define-public ocaml5.1-dune (package - (inherit ocaml5.0-dune-bootstrap) + (inherit ocaml5.1-dune-bootstrap) (propagated-inputs - (list ocaml5.0-dune-configurator)))) + (list ocaml5.1-dune-configurator)))) =20 (define-public ocaml-pp (package @@ -2172,7 +2202,7 @@ (define-public ocaml-csexp (propagated-inputs (list ocaml-result)) (properties `((ocaml4.09-variant . ,(delay ocaml4.09-csexp)) - (ocaml5.0-variant . ,(delay ocaml5.0-csexp)))) + (ocaml5.1-variant . ,(delay ocaml5.1-csexp)))) (home-page "https://github.com/ocaml-dune/csexp") (synopsis "Parsing and printing of S-expressions in Canonical form") (description "This library provides minimal support for Canonical @@ -2201,17 +2231,17 @@ (define-public ocaml4.09-csexp (propagated-inputs `(("ocaml-result" ,ocaml4.09-result))))) =20 -(define-public ocaml5.0-csexp +(define-public ocaml5.1-csexp (package (inherit ocaml-csexp) - (name "ocaml5.0-csexp") + (name "ocaml5.1-csexp") (arguments - `(#:ocaml ,ocaml-5.0 - #:findlib ,ocaml5.0-findlib + `(#:ocaml ,ocaml-5.1 + #:findlib ,ocaml5.1-findlib ,@(substitute-keyword-arguments (package-arguments ocaml-csexp) - ((#:dune _) ocaml5.0-dune-bootstrap)))) + ((#:dune _) ocaml5.1-dune-bootstrap)))) (propagated-inputs - `(("ocaml-result" ,ocaml5.0-result))))) + `(("ocaml-result" ,ocaml5.1-result))))) =20 (define-public ocaml-migrate-parsetree (package @@ -2332,7 +2362,7 @@ (define-public ocaml-result (arguments `(#:dune ,dune-bootstrap)) (properties `((ocaml4.09-variant . ,(delay ocaml4.09-result)) - (ocaml5.0-variant . ,(delay ocaml5.0-result)))) + (ocaml5.1-variant . ,(delay ocaml5.1-result)))) (home-page "https://github.com/janestreet/result") (synopsis "Compatibility Result module") (description "Uses the new result type defined in OCaml >=3D 4.03 while @@ -2349,14 +2379,14 @@ (define-public ocaml4.09-result #:ocaml ,ocaml-4.09 #:findlib ,ocaml4.09-findlib)))) =20 -(define-public ocaml5.0-result +(define-public ocaml5.1-result (package (inherit ocaml-result) - (name "ocaml5.0-result") + (name "ocaml5.1-result") (arguments - `(#:dune ,ocaml5.0-dune-bootstrap - #:ocaml ,ocaml-5.0 - #:findlib ,ocaml5.0-findlib)))) + `(#:dune ,ocaml5.1-dune-bootstrap + #:ocaml ,ocaml-5.1 + #:findlib ,ocaml5.1-findlib)))) =20 (define-public ocaml-iso8601 (package @@ -3169,8 +3199,8 @@ (define ocaml-eio OCaml with fibers.") (license license:isc))) =20 -(define-public ocaml5.0-eio - (package-with-ocaml5.0 ocaml-eio)) +(define-public ocaml5.1-eio + (package-with-ocaml5.1 ocaml-eio)) =20 (define ocaml-eio-luv (package @@ -3183,8 +3213,8 @@ (define ocaml-eio-luv (description "@code{Eio_luv} provides a cross-platform backend for @code{Ocaml Eio}'s APIs using luv (libuv)"))) =20 -(define-public ocaml5.0-eio-luv - (package-with-ocaml5.0 ocaml-eio-luv)) +(define-public ocaml5.1-eio-luv + (package-with-ocaml5.1 ocaml-eio-luv)) =20 (define-public ocaml-uring (package @@ -3236,8 +3266,8 @@ (define ocaml-eio-linux @code{Ocaml Eio} APIs, plus a low-level API that can be used directly (in non-portable code)."))) =20 -(define-public ocaml5.0-eio-linux - (package-with-ocaml5.0 ocaml-eio-linux)) +(define-public ocaml5.1-eio-linux + (package-with-ocaml5.1 ocaml-eio-linux)) =20 (define ocaml-eio-main (package @@ -3256,8 +3286,8 @@ (define ocaml-eio-main (description "@code{Eio_main} selects an appropriate backend (e.g. @samp{eio_linux} or @samp{eio_luv}), depending on your platform."))) =20 -(define-public ocaml5.0-eio-main - (package-with-ocaml5.0 ocaml-eio-main)) +(define-public ocaml5.1-eio-main + (package-with-ocaml5.1 ocaml-eio-main)) =20 (define-public ocaml-lwt (package @@ -5707,7 +5737,7 @@ (define-public ocaml-ctypes ("integers" ,ocaml-integers))) (inputs (list libffi)) - (properties `((ocaml5.0-variant . ,(delay ocaml5.0-ctypes)))) + (properties `((ocaml5.1-variant . ,(delay ocaml5.1-ctypes)))) (synopsis "Library for binding to C libraries using pure OCaml") (description "Ctypes is a library for binding to C libraries using pure OCaml. The primary aim is to make writing C extensions as straightforward= as @@ -5718,12 +5748,12 @@ (define-public ocaml-ctypes without writing or generating any C!") (license license:expat))) =20 -(define-public ocaml5.0-ctypes - ;; Contains fix to support OCaml 5.0 +(define-public ocaml5.1-ctypes + ;; Contains fix to support OCaml 5.1 ;; (https://github.com/ocamllabs/ocaml-ctypes/pull/709) (let ((commit "52ff621f47dbc1ee5a90c30af0ae0474549946b4") (revision "0")) - (package-with-ocaml5.0 + (package-with-ocaml5.1 (package (inherit ocaml-ctypes) (name "ocaml-ctypes") @@ -6098,7 +6128,7 @@ (define-public ocaml-merlin-lib (arguments '(#:package "merlin-lib" #:tests? #f)) ; no tests (propagated-inputs (list ocaml-csexp ocaml-menhir)) - (properties `((ocaml5.0-variant . ,(delay ocaml5.0-merlin-lib)))) + (properties `((ocaml5.1-variant . ,(delay ocaml5.1-merlin-lib)))) (home-page "https://ocaml.github.io/merlin/") (synopsis "Merlin libraries") (description "These libraries provides access to low-level compiler @@ -6110,7 +6140,7 @@ (define ocaml-merlin-lib-500 (package (inherit ocaml-merlin-lib) (name "ocaml-merlin-lib") - (version "4.7.1-500") + (version "4.13.1-501") (source (origin (method git-fetch) @@ -6120,11 +6150,11 @@ (define ocaml-merlin-lib-500 (file-name (git-file-name name version)) (sha256 (base32 - "05a87i2dkzv800nwb6y7b2j45avg8gs3gzb5a98wrj1i5zjqwh01")))) + "05k07hfxxdcfzis7n2fsa2a2kd1f06dharkyyv8vixmrgzffn2c3")))) (properties '()))) =20 -(define-public ocaml5.0-merlin-lib - (package-with-ocaml5.0 ocaml-merlin-lib-500)) +(define-public ocaml5.1-merlin-lib + (package-with-ocaml5.1 ocaml-merlin-lib-500)) =20 (define-public ocaml-dot-merlin-reader (package @@ -6133,19 +6163,19 @@ (define-public ocaml-dot-merlin-reader (arguments '(#:package "dot-merlin-reader" #:tests? #f)) ; no tests (propagated-inputs (list ocaml-merlin-lib)) - (properties `((ocaml5.0-variant . ,(delay ocaml5.0-dot-merlin-reader))= )) + (properties `((ocaml5.1-variant . ,(delay ocaml5.1-dot-merlin-reader))= )) (synopsis "Reads config files for @code{ocaml-merlin}") (description "@code{ocaml-dot-merlin-reader} is an external reader for @code{ocaml-merlin} configurations."))) =20 -(define-public ocaml5.0-dot-merlin-reader - (package-with-ocaml5.0 +(define-public ocaml5.1-dot-merlin-reader + (package-with-ocaml5.1 (package (inherit ocaml-merlin-lib-500) (name "ocaml-dot-merlin-reader") (arguments '(#:package "dot-merlin-reader" #:tests? #f)) ; no tests - (propagated-inputs (list ocaml5.0-merlin-lib)) + (propagated-inputs (list ocaml5.1-merlin-lib)) (synopsis "Reads config files for @code{ocaml-merlin}") (description "@code{ocaml-dot-merlin-reader} is an external reader for @code{ocaml-merlin} configurations.")))) @@ -6163,7 +6193,7 @@ (define-public ocaml-merlin (when tests? (invoke "dune" "runtest" "-p" "merlin,dot-merlin-reader")))= )))) (propagated-inputs (list ocaml-merlin-lib ocaml-yojson)) - (properties `((ocaml5.0-variant . ,(delay ocaml5.0-merlin)))) + (properties `((ocaml5.1-variant . ,(delay ocaml5.1-merlin)))) (native-inputs (list ocaml-dot-merlin-reader ; required for tests ocaml-ppxlib @@ -6176,8 +6206,8 @@ (define-public ocaml-merlin Atom.") (license license:expat))) =20 -(define-public ocaml5.0-merlin - (package-with-ocaml5.0 +(define-public ocaml5.1-merlin + (package-with-ocaml5.1 (package (inherit ocaml-merlin-lib-500) (name "ocaml-merlin") @@ -6431,7 +6461,7 @@ (define-public ocaml-base (build-system dune-build-system) (propagated-inputs (list ocaml-sexplib0)) - (properties `((ocaml5.0-variant . ,(delay ocaml5.0-base)))) + (properties `((ocaml5.1-variant . ,(delay ocaml5.1-base)))) (synopsis "Full standard library replacement for OCaml") (description @@ -6446,12 +6476,12 @@ (define-public ocaml-base @url{https://github.com/janestreet/stdio, ocaml-stdio}.") (license license:expat))) =20 -(define-public ocaml5.0-base +(define-public ocaml5.1-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-with-ocaml5.1 (package (inherit ocaml-base) (name "ocaml-base") @@ -6462,7 +6492,7 @@ (define-public ocaml5.0-base (uri (git-reference (url "https://github.com/kit-ty-kate/base") (commit commit))) - (file-name (git-file-name "ocaml5.0-base" version)) + (file-name (git-file-name "ocaml5.1-base" version)) (sha256 (base32 "15vsiv3q53l1bzrvqgspf3lp2104s9dzw62z3nl75f53jvjvsyf6")))) @@ -7369,7 +7399,7 @@ (define-public ocaml-ppx-expect ocaml-migrate-parsetree ocaml-re)) (properties `((upstream-name . "ppx_expect") - (ocaml5.0-variant . ,(delay ocaml5.0-ppx-expect)))) + (ocaml5.1-variant . ,(delay ocaml5.1-ppx-expect)))) (home-page "https://github.com/janestreet/ppx_expect") (synopsis "Cram like framework for OCaml") (description "Expect-test is a framework for writing tests in OCaml, s= imilar @@ -7379,12 +7409,12 @@ (define-public ocaml-ppx-expect to denote the expected output.") (license license:asl2.0))) =20 -(define-public ocaml5.0-ppx-expect +(define-public ocaml5.1-ppx-expect ;; Contains fixes for OCaml 5.0 ;; (https://github.com/janestreet/ppx_expect/pull/39/). (let ((commit "83edfc1ee779e8dcdd975e26715c2e688326befa") (revision "0")) - (package-with-ocaml5.0 + (package-with-ocaml5.1 (package (inherit ocaml-ppx-expect) (name "ocaml-ppx-expect") @@ -9235,15 +9265,15 @@ (define-public ocaml-crowbar ocaml-uunf ocaml-uutf ocaml-pprint)) - (properties `((ocaml5.0-variant . ,(delay ocaml5.0-crowbar)))) + (properties `((ocaml5.1-variant . ,(delay ocaml5.1-crowbar)))) (synopsis "Ocaml library for tests, let a fuzzer find failing cases") (description "Crowbar is a library for testing code, combining QuickCheck-style property-based testing and the magical bug-finding powers= of @uref{http://lcamtuf.coredump.cx/afl/, afl-fuzz}.") (license license:expat))) =20 -(define-public ocaml5.0-crowbar - (package-with-ocaml5.0 +(define-public ocaml5.1-crowbar + (package-with-ocaml5.1 (package (inherit ocaml-crowbar) ;; Tests require ocaml-calendar which does not work with OCaml 5.0 diff --git a/guix/build-system/ocaml.scm b/guix/build-system/ocaml.scm index 582d00b4cd..607e6dca60 100644 --- a/guix/build-system/ocaml.scm +++ b/guix/build-system/ocaml.scm @@ -31,8 +31,8 @@ (define-module (guix build-system ocaml) strip-ocaml4.07-variant package-with-ocaml4.09 strip-ocaml4.09-variant - package-with-ocaml5.0 - strip-ocaml5.0-variant + package-with-ocaml5.1 + strip-ocaml5.1-variant default-findlib default-ocaml lower @@ -112,17 +112,17 @@ (define (default-ocaml4.09-dune) (let ((module (resolve-interface '(gnu packages ocaml)))) (module-ref module 'ocaml4.09-dune))) =20 -(define (default-ocaml5.0) +(define (default-ocaml5.1) (let ((ocaml (resolve-interface '(gnu packages ocaml)))) - (module-ref ocaml 'ocaml-5.0))) + (module-ref ocaml 'ocaml-5.1))) =20 -(define (default-ocaml5.0-findlib) +(define (default-ocaml5.1-findlib) (let ((module (resolve-interface '(gnu packages ocaml)))) - (module-ref module 'ocaml5.0-findlib))) + (module-ref module 'ocaml5.1-findlib))) =20 -(define (default-ocaml5.0-dune) +(define (default-ocaml5.1-dune) (let ((module (resolve-interface '(gnu packages ocaml)))) - (module-ref module 'ocaml5.0-dune))) + (module-ref module 'ocaml5.1-dune))) =20 (define* (package-with-explicit-ocaml ocaml findlib dune old-prefix new-pr= efix #:key variant-property) @@ -212,18 +212,18 @@ (define (strip-ocaml4.09-variant p) (inherit p) (properties (alist-delete 'ocaml4.09-variant (package-properties p))))) =20 -(define package-with-ocaml5.0 - (package-with-explicit-ocaml (delay (default-ocaml5.0)) - (delay (default-ocaml5.0-findlib)) - (delay (default-ocaml5.0-dune)) - "ocaml-" "ocaml5.0-" - #:variant-property 'ocaml5.0-variant)) +(define package-with-ocaml5.1 + (package-with-explicit-ocaml (delay (default-ocaml5.1)) + (delay (default-ocaml5.1-findlib)) + (delay (default-ocaml5.1-dune)) + "ocaml-" "ocaml5.1-" + #:variant-property 'ocaml5.1-variant)) =20 -(define (strip-ocaml5.0-variant p) - "Remove the 'ocaml5.0-variant' property from P." +(define (strip-ocaml5.1-variant p) + "Remove the 'ocaml5.1-variant' property from P." (package (inherit p) - (properties (alist-delete 'ocaml5.0-variant (package-properties p))))) + (properties (alist-delete 'ocaml5.1-variant (package-properties p))))) =20 (define* (lower name #:key source inputs native-inputs outputs system target Marc Coquand writes: > Hey! > > I'll have a look at this when I have time, hopefully tomorrow or end of > the week. :) > > Sincerely, > Marc > > Ludovic Court=C3=A8s writes: > >> Hello, >> >> pukkamustard skribis: >> >>> I would suggest adding a package-with-ocaml5.1 transformation to this >>> patch series (as dependencies probably ocaml5.1-findlib and >>> ocaml5.1-dune). This would make the new compiler more directly usable >>> and would help in testing the new compiler for OCaml packages already in >>> Guix. >> >> Marc, could you look into adding this? >> >> (I=E2=80=99m not on the OCaml team but I Cc=E2=80=99d Julien who=E2=80= =99s one of them. If >> Julien is unavailable and pukkamustard gives a green light, I can apply >> the revised patch on their behalf.) >> >> Ludo=E2=80=99.