From unknown Sun Jun 22 11:34:46 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#69185 <69185@debbugs.gnu.org> To: bug#69185 <69185@debbugs.gnu.org> Subject: Status: [PATCH master] gnu: ocaml: Update to 5.1.1 Reply-To: bug#69185 <69185@debbugs.gnu.org> Date: Sun, 22 Jun 2025 18:34:46 +0000 retitle 69185 [PATCH master] gnu: ocaml: Update to 5.1.1 reassign 69185 guix-patches submitter 69185 Marc Coquand severity 69185 normal tag 69185 patch moreinfo thanks From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 18 13:15:50 2024 Received: (at submit) by debbugs.gnu.org; 18 Feb 2024 18:15:50 +0000 Received: from localhost ([127.0.0.1]:36897 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rblhd-0002R8-Jv for submit@debbugs.gnu.org; Sun, 18 Feb 2024 13:15:50 -0500 Received: from lists.gnu.org ([209.51.188.17]:53956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rblQS-0001mW-Cl for submit@debbugs.gnu.org; Sun, 18 Feb 2024 12:58:05 -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 1rbOf0-0003kj-ND for guix-patches@gnu.org; Sat, 17 Feb 2024 12:39:34 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rbOey-0003CX-Sz for guix-patches@gnu.org; Sat, 17 Feb 2024 12:39:34 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id A828A32002E8; Sat, 17 Feb 2024 12:39:29 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sat, 17 Feb 2024 12:39:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mccd.space; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to; s=fm3; t=1708191569; x=1708277969; bh=eG97m8YnvgRTspWryuBmS 7yaN2Ia7p5G/KeiHS43zM4=; b=wBcK+uxdGDHYMRI//TMO0WB2ww1iP+xX3ZDaO TzmmCqMq9+9/LfpQmPk67+iy9g3wrznjSRMyvLLCbWZwE8j5qbGOvXgsgpxUaC+V O1hmLzG1A/cfltLWHdelj2NZNO/O0S6CnACm+EGU7eGVvU58coz4S1j4nm9PCr8A k+itdi9NsHzIhxr5p2ISAl3LeZl0lKQZ+xKULHOFPP5abN8D3UUTRLJqMiQX6dx6 CUeyFFhZHxB0LiSUlNrcNA2X3tMwKzLkpQxkDggNe4Of1thkR68F7temLiCJ5kxO C5KaNWKcdVKBXjhpdheyQzFxtIk6xH1sU06M31/kcqM7b3axA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1708191569; x=1708277969; bh=eG97m8YnvgRTspWryuBmS7yaN2Ia 7p5G/KeiHS43zM4=; b=hbNpEgT1sWNUirSXezBDd77FbQ5ak6v/6RklOJX5sAxM ognkkzhj/2gciwKSY8lIwBs/ThAXm3GOE9i0bw22h34GdDBiadnkpbHtY0vIqXhB frpTobpWmEP8FmHYdLkRwzNNNM+InofYJqQoTBv4zkfLRWYWxXFp02ZU1YmTRFyx bxBgt9hvIuXrb8piq5a3XMVOid7CB2/HrBoorDPF6BlIRm8QFlm5KYSivSfo4vXz YvD7Hga3VaZCUBYzXrk5iYifPdj+RwBdS8omYMB0KVSnfaFwwAQa9A0vUg+J3e9c KRpWybBLpDdbJg4dOGX0PvIp2DNZWQfNfvQHC/0cSg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdeggddutdegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpeforghrtgcuvehoqhhurghnugcuoehmrghrtgesmhgttggurdhs phgrtggvqeenucggtffrrghtthgvrhhnpefgvdetvdffiefgvdfhhfejvedujeeutddvje ffgefhudehveehlefgveduuedvvdenucffohhmrghinhepghhithhhuhgsrdgtohhmpdho tggrmhhlrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomhepmhgrrhgtsehmtggtugdrshhprggtvg X-ME-Proxy: Feedback-ID: ia2d149fd:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 17 Feb 2024 12:39:28 -0500 (EST) From: Marc Coquand To: guix-patches@gnu.org Subject: [PATCH master] gnu: ocaml: Update to 5.1.1 Date: Sat, 17 Feb 2024 11:39:29 -0600 Message-ID: X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=64.147.123.21; envelope-from=marc@mccd.space; helo=wout5-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -3.4 (---) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Sun, 18 Feb 2024 13:15:48 -0500 Cc: Marc Coquand X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.4 (----) * gnu/packages/ocaml.scm (ocaml): Update to 5.1.1 Change-Id: Ie95f2e31185a5f5ef345839d357d5768e4299fcc --- gnu/packages/ocaml.scm | 56 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0f4c351141..f7b9f9b81a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -191,6 +191,62 @@ (define-public camlboot This package produces a native @command{ocamlc} and a bytecode @command{ocamllex}.") (license license:expat)))) +(define-public ocaml-5.1 + (package + (name "ocaml") + (version "5.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml/ocaml") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "19sjc8r2c78y7g47jjxb1c30zzvkdhgy8yp3i1kkz1hm6nj96adr")))) + (build-system gnu-build-system) + (native-search-paths + (list (search-path-specification + (variable "OCAMLPATH") + (files (list "lib/ocaml" "lib/ocaml/site-lib"))) + (search-path-specification + (variable "CAML_LD_LIBRARY_PATH") + (files (list "lib/ocaml/site-lib/stubslibs" + "lib/ocaml/site-lib/stublibs"))))) + (native-inputs (list perl pkg-config)) + (inputs (list libx11 libiberty ;needed for objdump support + zlib)) ;also needed for objdump support + (arguments + `(#:configure-flags '("--enable-ocamltest") + #:test-target "tests" + #:make-flags '("defaultentry") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-/bin/sh-references + (lambda* (#:key inputs #:allow-other-keys) + (let* ((sh (search-input-file inputs "/bin/sh")) + (quoted-sh (string-append "\"" sh "\""))) + (with-fluids ((%default-port-encoding #f)) + (for-each (lambda (file) + (substitute* file + (("\"/bin/sh\"") + (begin + (format (current-error-port) + "patch-/bin/sh-references: ~a: changing `\"/bin/sh\"' to `~a'~%" + file quoted-sh) + quoted-sh)))) + (find-files "." "\\.ml$"))))))))) + (home-page "https://ocaml.org/") + (synopsis "The OCaml programming language") + (description + "OCaml is a general purpose industrial-strength programming language with +an emphasis on expressiveness and safety. Developed for more than 20 years at +Inria it benefits from one of the most advanced type systems and supports +functional, imperative and object-oriented styles of programming.") + ;; The compiler is distributed under qpl1.0 with a change to choice of + ;; law: the license is governed by the laws of France. The library is + ;; distributed under lgpl2.0. + (license (list license:qpl license:lgpl2.0)))) + (define-public ocaml-5.0 (package (name "ocaml") base-commit: 3cf199dbcf85a44fa8370e786e568fc3feb7067c -- 2.43.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 24 03:10:12 2024 Received: (at 69185) by debbugs.gnu.org; 24 Mar 2024 07:10:12 +0000 Received: from localhost ([127.0.0.1]:35075 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roHzf-00072n-MN for submit@debbugs.gnu.org; Sun, 24 Mar 2024 03:10:12 -0400 Received: from mout01.posteo.de ([185.67.36.65]:57657) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roHzd-00072E-Fe for 69185@debbugs.gnu.org; Sun, 24 Mar 2024 03:10:10 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 5CABB240027 for <69185@debbugs.gnu.org>; Sun, 24 Mar 2024 08:09:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711264161; bh=l5q95DThemHKSXJOwTeVb+T4jjDAfBhiTeOm2L4r2yk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: From; b=mY7cfuodurJLDKw2clfCMxzn2QmrCxbU62X4fedeJETuzmuKfOHARKk7secAM6Szd x5snRGv80X9cbyk3o3D/ykfLQEsDDPL+vYx+dNGDddkjInM0p56JQHN5d5nfjk7UKt 0GPTJtIjXGYOrqBjg2vaElMaBypD/vVYaN3Txk+6TpDIUfO2NDQm8RZit9cnYbepLM /dqOehdm7USTW6q+B/JTwhkaSWPkeMBwtJexfOGLYvvXx1r6sRXT8EhR+pWuIUgti4 vhJ1sfOxWwjrtbTRZM+E+Mwrp5MeJic3AVd4PYRdSla440n6E0cryLAQwWF7xt+uCI I7oEF9qF8XbUw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V2Ry80KX2z6twV; Sun, 24 Mar 2024 08:09:19 +0100 (CET) References: From: pukkamustard To: Marc Coquand Subject: Re: [bug#69185] [PATCH master] gnu: ocaml: Update to 5.1.1 Date: Sun, 24 Mar 2024 06:57:12 +0000 In-reply-to: Message-ID: <861q806r8g.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 69185 Cc: 69185@debbugs.gnu.org, Julien Lepiller , debbugs-submit@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Thanks! I wonder how useful the OCaml compiler itself is without a `package-with-ocaml5.1` transformation? The `ocaml` package itself just provides the compiler but no nice way (afaik) of using the compiler with dependencies and all. Do you think it would make sense to add a `package-with-ocaml5.1` transformation in `(guix build-system ocaml)`? Maybe even better we can replace the OCaml 5.0 compiler with a newer version. The only packages depending on ocaml-5.0 are ocaml5.0-merlin and ocaml5.0-eio. They could be updated to use a newer OCaml version. Maybe no point in keeping OCaml 5.0 around. What do you think? -pukkamustard Marc Coquand writes: > * gnu/packages/ocaml.scm (ocaml): Update to 5.1.1 > > Change-Id: Ie95f2e31185a5f5ef345839d357d5768e4299fcc > --- > gnu/packages/ocaml.scm | 56 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 56 insertions(+) > > diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm > index 0f4c351141..f7b9f9b81a 100644 > --- a/gnu/packages/ocaml.scm > +++ b/gnu/packages/ocaml.scm > @@ -191,6 +191,62 @@ (define-public camlboot > This package produces a native @command{ocamlc} and a bytecode @command{ocamllex}.") > (license license:expat)))) > > +(define-public ocaml-5.1 > + (package > + (name "ocaml") > + (version "5.1.1") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/ocaml/ocaml") > + (commit version))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "19sjc8r2c78y7g47jjxb1c30zzvkdhgy8yp3i1kkz1hm6nj96adr")))) > + (build-system gnu-build-system) > + (native-search-paths > + (list (search-path-specification > + (variable "OCAMLPATH") > + (files (list "lib/ocaml" "lib/ocaml/site-lib"))) > + (search-path-specification > + (variable "CAML_LD_LIBRARY_PATH") > + (files (list "lib/ocaml/site-lib/stubslibs" > + "lib/ocaml/site-lib/stublibs"))))) > + (native-inputs (list perl pkg-config)) > + (inputs (list libx11 libiberty ;needed for objdump support > + zlib)) ;also needed for objdump support > + (arguments > + `(#:configure-flags '("--enable-ocamltest") > + #:test-target "tests" > + #:make-flags '("defaultentry") > + #:phases (modify-phases %standard-phases > + (add-after 'unpack 'patch-/bin/sh-references > + (lambda* (#:key inputs #:allow-other-keys) > + (let* ((sh (search-input-file inputs "/bin/sh")) > + (quoted-sh (string-append "\"" sh "\""))) > + (with-fluids ((%default-port-encoding #f)) > + (for-each (lambda (file) > + (substitute* file > + (("\"/bin/sh\"") > + (begin > + (format (current-error-port) > + "patch-/bin/sh-references: ~a: changing `\"/bin/sh\"' to `~a'~%" > + file quoted-sh) > + quoted-sh)))) > + (find-files "." "\\.ml$"))))))))) > + (home-page "https://ocaml.org/") > + (synopsis "The OCaml programming language") > + (description > + "OCaml is a general purpose industrial-strength programming language with > +an emphasis on expressiveness and safety. Developed for more than 20 years at > +Inria it benefits from one of the most advanced type systems and supports > +functional, imperative and object-oriented styles of programming.") > + ;; The compiler is distributed under qpl1.0 with a change to choice of > + ;; law: the license is governed by the laws of France. The library is > + ;; distributed under lgpl2.0. > + (license (list license:qpl license:lgpl2.0)))) > + > (define-public ocaml-5.0 > (package > (name "ocaml") > > base-commit: 3cf199dbcf85a44fa8370e786e568fc3feb7067c From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 26 17:17:59 2024 Received: (at 69185) by debbugs.gnu.org; 26 Mar 2024 21:17:59 +0000 Received: from localhost ([127.0.0.1]:35279 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpEBC-0008U7-DO for submit@debbugs.gnu.org; Tue, 26 Mar 2024 17:17:59 -0400 Received: from mout02.posteo.de ([185.67.36.66]:50573) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpEB9-0008Tc-Pl for 69185@debbugs.gnu.org; Tue, 26 Mar 2024 17:17:57 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 4C791240101 for <69185@debbugs.gnu.org>; Tue, 26 Mar 2024 22:17:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711487869; bh=IYzpRHNX/diJIjV5XvrLi5gva+CVvZS9MN6yTFU2OKE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: From; b=HOkaWGoVknew4lvpUO+Nb8DQ5DtG8FCR5CPZ5fsyiw7ZutsgIVNS/5yDGKgivov0a jGSJhG6Cjw/FSB/GvUvXU84wVPtubg/KkN9fzvD72I5+KJzwMtN99eu/PMWhthle73 X0LJBSaVFeClSGU8Z8X+2sqCIhykQAfG+w3TRM23Vq8k25hBFwICYLYKgL2H5aOj33 GkTXQNm5X205qU6k5X6moxwTiQ0Pv5U8epxxlBSE6EuBsPdyiVKmQ1PA2a6QfxeKYQ D6Ktv1/NmKozAIh1gQbdKZ1S22uWEuPdJaAt3jc/7XGfNA0CEVuUwrSXret4R28fv+ +8EKqlWVBAyFg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V42hD2QLtz6txd; Tue, 26 Mar 2024 22:17:48 +0100 (CET) References: <861q806r8g.fsf@posteo.net> <87edby3uac.fsf@mccd.space> From: pukkamustard To: Marc Coquand Subject: Re: [bug#69185] [PATCH master] gnu: ocaml: Update to 5.1.1 Date: Tue, 26 Mar 2024 21:03:49 +0000 In-reply-to: <87edby3uac.fsf@mccd.space> Message-ID: <86zfukofrg.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 69185 Cc: 69185@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Marc Coquand writes: >> Do you think it would make sense to add a >> `package-with-ocaml5.1` transformation in `(guix build-system ocaml)`? > > Absolutely, or replace the ocaml5.0 one. > >> Maybe even better we can replace the OCaml 5.0 compiler with a newer >> version. The only packages depending on ocaml-5.0 are ocaml5.0-merlin >> and ocaml5.0-eio. They could be updated to use a newer OCaml >> version. Maybe no point in keeping OCaml 5.0 around. What do you think? > > I see there is also in packages/ocaml.scm: > > - ocaml5.0-merlin-reader > - ocaml5.0-ppx-expect > - ocaml5.0-dune-bootstrap > - ocaml5.0-crowbar > - ocaml5.0-findlib > > I assume that if we replace the old 5.0 version, we would need to bump > these packages as well, since they use Ocaml 5.0? Yes. > I am relatively new to software packaging, so I do not know what best > practice is here: if it is best to replace the old version or create an > entry for the new version. Hm, I'd say it's good to keep versions around that are being used by other packages in Guix or it is a version where we can assume that significant amount of people are using it from Guix for things outside of Guix. I think OCaml 5.0 is neither: - The ocaml5.0-* packages are mostly to get a working development environment (ocaml5.0-merlin and dependencies). - Our ocaml5.0-eio is outdated and the recently released Eio 1.0.0 only supports OCaml 5.1.1 or later. - There's not much reason to use OCaml 5.0 when OCaml 5.1 is available. I'd suggest replacing OCaml 5.0 with OCaml 5.1 in Guix. Happy hacking! -pukkamustard > pukkamustard writes: > >> Thanks! >> >> I wonder how useful the OCaml compiler itself is without a >> `package-with-ocaml5.1` transformation? The `ocaml` package itself just >> provides the compiler but no nice way (afaik) of using the compiler with >> dependencies and all. Do you think it would make sense to add a >> `package-with-ocaml5.1` transformation in `(guix build-system ocaml)`? >> >> Maybe even better we can replace the OCaml 5.0 compiler with a newer >> version. The only packages depending on ocaml-5.0 are ocaml5.0-merlin >> and ocaml5.0-eio. They could be updated to use a newer OCaml >> version. Maybe no point in keeping OCaml 5.0 around. What do you think? >> >> -pukkamustard >> >> >> Marc Coquand writes: >> >>> * gnu/packages/ocaml.scm (ocaml): Update to 5.1.1 >>> >>> Change-Id: Ie95f2e31185a5f5ef345839d357d5768e4299fcc >>> --- >>> gnu/packages/ocaml.scm | 56 ++++++++++++++++++++++++++++++++++++++++++ >>> 1 file changed, 56 insertions(+) >>> >>> diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm >>> index 0f4c351141..f7b9f9b81a 100644 >>> --- a/gnu/packages/ocaml.scm >>> +++ b/gnu/packages/ocaml.scm >>> @@ -191,6 +191,62 @@ (define-public camlboot >>> This package produces a native @command{ocamlc} and a bytecode @command{ocamllex}.") >>> (license license:expat)))) >>> >>> +(define-public ocaml-5.1 >>> + (package >>> + (name "ocaml") >>> + (version "5.1.1") >>> + (source >>> + (origin >>> + (method git-fetch) >>> + (uri (git-reference >>> + (url "https://github.com/ocaml/ocaml") >>> + (commit version))) >>> + (file-name (git-file-name name version)) >>> + (sha256 >>> + (base32 "19sjc8r2c78y7g47jjxb1c30zzvkdhgy8yp3i1kkz1hm6nj96adr")))) >>> + (build-system gnu-build-system) >>> + (native-search-paths >>> + (list (search-path-specification >>> + (variable "OCAMLPATH") >>> + (files (list "lib/ocaml" "lib/ocaml/site-lib"))) >>> + (search-path-specification >>> + (variable "CAML_LD_LIBRARY_PATH") >>> + (files (list "lib/ocaml/site-lib/stubslibs" >>> + "lib/ocaml/site-lib/stublibs"))))) >>> + (native-inputs (list perl pkg-config)) >>> + (inputs (list libx11 libiberty ;needed for objdump support >>> + zlib)) ;also needed for objdump support >>> + (arguments >>> + `(#:configure-flags '("--enable-ocamltest") >>> + #:test-target "tests" >>> + #:make-flags '("defaultentry") >>> + #:phases (modify-phases %standard-phases >>> + (add-after 'unpack 'patch-/bin/sh-references >>> + (lambda* (#:key inputs #:allow-other-keys) >>> + (let* ((sh (search-input-file inputs "/bin/sh")) >>> + (quoted-sh (string-append "\"" sh "\""))) >>> + (with-fluids ((%default-port-encoding #f)) >>> + (for-each (lambda (file) >>> + (substitute* file >>> + (("\"/bin/sh\"") >>> + (begin >>> + (format (current-error-port) >>> + "patch-/bin/sh-references: ~a: changing `\"/bin/sh\"' to `~a'~%" >>> + file quoted-sh) >>> + quoted-sh)))) >>> + (find-files "." "\\.ml$"))))))))) >>> + (home-page "https://ocaml.org/") >>> + (synopsis "The OCaml programming language") >>> + (description >>> + "OCaml is a general purpose industrial-strength programming language with >>> +an emphasis on expressiveness and safety. Developed for more than 20 years at >>> +Inria it benefits from one of the most advanced type systems and supports >>> +functional, imperative and object-oriented styles of programming.") >>> + ;; The compiler is distributed under qpl1.0 with a change to choice of >>> + ;; law: the license is governed by the laws of France. The library is >>> + ;; distributed under lgpl2.0. >>> + (license (list license:qpl license:lgpl2.0)))) >>> + >>> (define-public ocaml-5.0 >>> (package >>> (name "ocaml") >>> >>> base-commit: 3cf199dbcf85a44fa8370e786e568fc3feb7067c From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 29 18:19:13 2024 Received: (at 69185) by debbugs.gnu.org; 29 Mar 2024 22:19:13 +0000 Received: from localhost ([127.0.0.1]:43567 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqKZ6-0003VJ-Nr for submit@debbugs.gnu.org; Fri, 29 Mar 2024 18:19:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34046) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqKZ5-0003V2-4n for 69185@debbugs.gnu.org; Fri, 29 Mar 2024 18:19:11 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rqKYy-0001Dv-6M; Fri, 29 Mar 2024 18:19:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=NjAfHLn3jn2RtTm/Uzs9G4DU6wmCZmE/sbl8kYqsec8=; b=OGON/t77Hui33/vgpKS8 wt6xNLyv9dQ22BysNyd4zY2KXG86z/e17GKnGPDwESBvy81ksCyR8a1/HE+pJccfiz5D4QtZRdjsb pG5hQaJNWl/m2rUlw7v6A0tJMfsbE97qbw9Bj5/NdLc9gYy3A42T/2kXmaYv+AKY+xeuXne2mvoX9 0ibY0eBYMykAIRuCxJnefjywT2qKPcO8ZFAI4KpIxdS3sdF3rx8AsCwcGXiCnGFlctKSvoT170V6B MMgLtEJj5jaAKQYnBRQKaTfuSmz3WK5JVmAD3UnI8zwTNb3DBM0rw1bJt4SOzHOpuOgrvxZyU/5qp GBhOAyUyKeS0lA==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: pukkamustard Subject: Re: bug#69185: [PATCH master] gnu: ocaml: Update to 5.1.1 In-Reply-To: <86zfukofrg.fsf@posteo.net> (pukkamustard@posteo.net's message of "Tue, 26 Mar 2024 21:03:49 +0000") References: <861q806r8g.fsf@posteo.net> <87edby3uac.fsf@mccd.space> <86zfukofrg.fsf@posteo.net> Date: Fri, 29 Mar 2024 23:19:02 +0100 Message-ID: <87r0fsfzqh.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 69185 Cc: 69185@debbugs.gnu.org, Marc Coquand X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello pukkamustard, pukkamustard skribis: > Hm, I'd say it's good to keep versions around that are being used by > other packages in Guix or it is a version where we can assume that > significant amount of people are using it from Guix for things outside > of Guix. > > I think OCaml 5.0 is neither: > > - The ocaml5.0-* packages are mostly to get a working development > environment (ocaml5.0-merlin and dependencies). > - Our ocaml5.0-eio is outdated and the recently released Eio 1.0.0 only > supports OCaml 5.1.1 or later. > - There's not much reason to use OCaml 5.0 when OCaml 5.1 is available. > > I'd suggest replacing OCaml 5.0 with OCaml 5.1 in Guix. Can removing 5.0 be done in a followup patch? Should we apply this patch in this meantime, or would you suggest adjusting it beforehand? Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 29 18:19:22 2024 Received: (at control) by debbugs.gnu.org; 29 Mar 2024 22:19:22 +0000 Received: from localhost ([127.0.0.1]:43571 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqKZG-0003WU-50 for submit@debbugs.gnu.org; Fri, 29 Mar 2024 18:19:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39056) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqKZE-0003Vh-Au for control@debbugs.gnu.org; Fri, 29 Mar 2024 18:19:20 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rqKZ7-0001Hb-Gd for control@debbugs.gnu.org; Fri, 29 Mar 2024 18:19:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:Subject:From:To:Date:in-reply-to: references; bh=870Tb0syUfGnMFEAXWbtv2NVvz/SEhCKB3cMt3e2wPY=; b=sOjx+tSovt4nCa fyQXBPcsBhhQq17RSTBNizYIoqJVWcPgUNnRWb2+pJohevC3iAJmsn2DHfwdGEBg+k/xUOqUClml3 bFGvP1pT4R6qGZTq8LsNugwtIutMGn65l4P/jV4O+36nDAzdKd/Q460yQp74MzTEsllYERSNlS06m Y6lEu8I/QqNtlnT055vPEhT4QcSHY5AUCvPlVaxROqdi5Yh8uXEiMe3qL4Qo+sExlzgwhsuQtbynh o8FqahyKzMF2HMlqe+L2+ZrJ3KvF5FOWA0jK4HFZqjJLm79inprT6ADgPUb5smZkYkoPGfcHfzY+v xMMWqIIiEptBUCs/q6rg==; Date: Fri, 29 Mar 2024 23:19:11 +0100 Message-Id: <87plvcfzq8.fsf@gnu.org> To: control@debbugs.gnu.org From: =?utf-8?Q?Ludovic_Court=C3=A8s?= Subject: control message for bug #69185 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) tags 69185 + moreinfo quit From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 01 02:27:53 2024 Received: (at 69185) by debbugs.gnu.org; 1 Apr 2024 06:27:53 +0000 Received: from localhost ([127.0.0.1]:49325 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrB97-0002J7-Cx for submit@debbugs.gnu.org; Mon, 01 Apr 2024 02:27:53 -0400 Received: from mout01.posteo.de ([185.67.36.65]:56287) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrB95-0002IZ-8I for 69185@debbugs.gnu.org; Mon, 01 Apr 2024 02:27:52 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id C281F240028 for <69185@debbugs.gnu.org>; Mon, 1 Apr 2024 08:27:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711952861; bh=TC8kqK8Yp5mSfIE3qQ9YAyH5QEx2ra1YEGvuK9E4uj0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=LVYXFHMfIVdOC+ordmO/LkcF7s1HhW520pv5APhqqEc7tBgIsEzdZCYpxmq7LDtr+ vPlV2LwxIMb+ge5mX7lNZKs9LctXmtv2xQnAv3NG9VxdJ/jmvUtd0sVKlwStcbX/ud N8HEIs6UaXCJ6tsRGouq5QwkSdcPHJl9k6LkfEWAcNXwvMOxup1YwXTQ6tKXXXIj33 y/VMs5FuyaKCv3Jy0x1IXKN5/zhtKZtZDo4y2ZuziZat292vUROW+IDEBNHw/8wUws 5OorUwnj66nMW2+9EW4YYVd0DBsD9rQ/wnc6Cmxe/GR2i4uDYBAfEBaxSj3Zsb9mcs WpKU3w9JmvbiQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V7LfN6hzdz6tmv; Mon, 1 Apr 2024 08:27:40 +0200 (CEST) References: <861q806r8g.fsf@posteo.net> <87edby3uac.fsf@mccd.space> <86zfukofrg.fsf@posteo.net> <87r0fsfzqh.fsf_-_@gnu.org> From: pukkamustard To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#69185: [PATCH master] gnu: ocaml: Update to 5.1.1 Date: Mon, 01 Apr 2024 06:19:18 +0000 In-reply-to: <87r0fsfzqh.fsf_-_@gnu.org> Message-ID: <8634s5a97o.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 69185 Cc: 69185@debbugs.gnu.org, Marc Coquand X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Ludo`, Ludovic Court=C3=A8s writes: > > Can removing 5.0 be done in a followup patch? Should we apply this > patch in this meantime, or would you suggest adjusting it beforehand? > Yes, that can be done. Might even be good to keep the update to 5.1.1 in two smaller patche sets (one to add 5.1.1, one to remove 5.0.0). 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. -pukkamustard From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 02 11:50:30 2024 Received: (at 69185) by debbugs.gnu.org; 2 Apr 2024 15:50:30 +0000 Received: from localhost ([127.0.0.1]:55036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrgP8-0004ri-54 for submit@debbugs.gnu.org; Tue, 02 Apr 2024 11:50:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52286) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrgP5-0004qv-7O for 69185@debbugs.gnu.org; Tue, 02 Apr 2024 11:50:28 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rrgOt-0002cb-Pf; Tue, 02 Apr 2024 11:50:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=L2CBT3DbjCAEBUYYv+76aLFfUIb0RwAoNklD1q29tYQ=; b=eBtykkCmj8ocLwJoy4QH hY4pDMVgCqfhur3XfJzbfYrDiXNjeK441s2v76GcubUxZu4UiAYFNOVN3s+yz32KkQhVSm7Qy/cAh RhQHvdz8L+9pVxTNENvdFFUNSOC/4dj8dq1Bss7SEjuQq88q4g3M+RdUCNjOOGhBXcvQDqsN2I5TC Mk4borApVPs3lC6i9ZU42SGCvTOUv/J+Tj9Y/+b07RDJVDt0y8Hk+t5dmJp4HOZOwQ3Ek+3J87aGm Pt8ROB5fk5+8q2pkPpp3vCJ2nlxqNj/hRKpb1FUV32UnIs+Bvg0BTyxLcnSLr9l9eImb7ORbG1yZV C3yfNCcJylwunA==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: pukkamustard Subject: Re: bug#69185: [PATCH master] gnu: ocaml: Update to 5.1.1 In-Reply-To: <8634s5a97o.fsf@posteo.net> (pukkamustard@posteo.net's message of "Mon, 01 Apr 2024 06:19:18 +0000") References: <861q806r8g.fsf@posteo.net> <87edby3uac.fsf@mccd.space> <86zfukofrg.fsf@posteo.net> <87r0fsfzqh.fsf_-_@gnu.org> <8634s5a97o.fsf@posteo.net> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Quartidi 14 Germinal an 232 de la =?utf-8?Q?R=C3=A9v?= =?utf-8?Q?olution=2C?= jour du =?utf-8?Q?H=C3=AAtre?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Tue, 02 Apr 2024 17:50:13 +0200 Message-ID: <87h6gj3gsq.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 69185 Cc: 69185@debbugs.gnu.org, Julien Lepiller , Marc Coquand X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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. From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 02 13:45:34 2024 Received: (at 69185) by debbugs.gnu.org; 2 Apr 2024 17:45:34 +0000 Received: from localhost ([127.0.0.1]:56167 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rriCT-0000t6-D5 for submit@debbugs.gnu.org; Tue, 02 Apr 2024 13:45:33 -0400 Received: from fhigh1-smtp.messagingengine.com ([103.168.172.152]:49987) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rriCQ-0000sX-LL for 69185@debbugs.gnu.org; Tue, 02 Apr 2024 13:45:31 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 7554D11400A7; Tue, 2 Apr 2024 13:45:21 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 02 Apr 2024 13:45:21 -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=1712079921; x=1712166321; bh=txxb+HpauKMWpWMwrwr8kQHZecZ/VqEBsREhbjQp3GU=; b= s+a1mf6o8fuY90XK+dJWaxoxfdViEI1QJ+PrTjyLEQedAHmayAj0QoJuMUMrdHhw 0zQ1d34h3DqAEcubyl4hWhxk3HNQGJA1Js1ZIQ9cYctxM/xAkLA+TwfqP7bdDss7 1MVLApiQHS1vIYfXr2J2R2u89ptrkHNYpc6seaAdjcHHalULJRsk21PWP2Umq4/+ TtVgylv/aQ59Txa2T6gac+2WOfyoZfNGV803JGururni+x9KYa6Pm0PLPl4JyRlr DHa8GOclKnxyAYyQVpp7BjEzuK3mO94YvwLJf4nqz10xA2W6vbXngJAixVnW7SJJ F4Hjbo2qZH35lztbU8DGTw== 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=1712079921; x= 1712166321; bh=txxb+HpauKMWpWMwrwr8kQHZecZ/VqEBsREhbjQp3GU=; b=q r4PPnIMH4AyIrQBa9Ipdv/umsp98OfWz0rHaL2oPnD0bGfgmzVI5UFG+llnyGszQ AgwtQQRBUFU8OdH6XCrdkW1B+ad1seTxZPRtn9CWdzW099xzk8GdnJiZXFB1Ft9L dRhaU8+upYAYJrJQpCx34HDN1Vl7UIuMTm89m/e2RFOZhg+xsPwk9ezL/G4rb7S0 zNVcdTUXr3a+dbz7N91uScZI/3S+kS4QuKZ0mBO2oV/k0Jp6GoRp/YR84L1G7Oge vZOBEwyjEbV5GrB2DbhLvuScBDnCwaDa/YcKBJwbHkLiUxOau5YjDNZYaVZtzi4g S6C3Yv9I/QV9ykvNnEjbw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrudefvddguddujecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpehffgfhvfevufffjgfkgggtgfesthhqredttderjeenucfhrhhomhepofgr rhgtucevohhquhgrnhguuceomhgrrhgtsehmtggtugdrshhprggtvgeqnecuggftrfgrth htvghrnhepgffgheetgeefiedvhfejleelieegueffteduieffleefffffueffheevffeg feejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmh grrhgtsehmtggtugdrshhprggtvg X-ME-Proxy: Feedback-ID: ia2d149fd:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 2 Apr 2024 13:45:19 -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> User-agent: mu4e 1.10.8; emacs 29.2 From: Marc Coquand To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#69185: [PATCH master] gnu: ocaml: Update to 5.1.1 Date: Tue, 02 Apr 2024 11:42:57 -0600 In-reply-to: <87h6gj3gsq.fsf@gnu.org> Message-ID: <878r1v1wwj.fsf@mccd.space> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69185 Cc: pukkamustard , 69185@debbugs.gnu.org, Julien Lepiller , Marc Coquand X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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=99= s 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. From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 07 18:04:44 2024 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 To: Marc Coquand Subject: Re: bug#69185: [PATCH master] gnu: ocaml: Update to 5.1.1 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-Spam-Score: 1.7 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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. Content analysis details: (1.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [64.147.123.145 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 URIBL_SBL_A Contains URL's A record listed in the Spamhaus SBL blocklist [URIs: ocaml.github.io] 0.6 URIBL_SBL Contains an URL's NS IP listed in the Spamhaus SBL blocklist [URIs: ocaml.github.io] 1.7 URIBL_BLACK Contains an URL listed in the URIBL blacklist [URIs: github.io] X-Debbugs-Envelope-To: 69185 Cc: pukkamustard , Julien Lepiller , Ludovic =?utf-8?Q?Court=C3=A8s?= , 69185@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.7 (/) 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.