From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id gLhiD/HR/2W9NQEAe85BDQ:P1 (envelope-from ) for ; Sun, 24 Mar 2024 08:10:41 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id gLhiD/HR/2W9NQEAe85BDQ (envelope-from ) for ; Sun, 24 Mar 2024 08:10:41 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=mY7cfuod; 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"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1711264241; 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: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=zn94bV86K/2sUnB0CpwVdybgFLP1DNxWG2++J0a3gPk=; b=mPNe1Rxm1YlhG+LT87fEf94evR0l9Wq28XNNlWx+QYYs7qEihpyvZgvIUaxwf+0SV9FeUB Vkus6UZ4gJAawLoC+vl7FHj1OZMv3g6igMxDT+FvqYNrB70G7jBn6tyhTNZ7W3jcQTp4In roBX4p113SQhFUFi/6kJMChDhyLVmEYhbfX9QWVUN5/g3Yv6l7QnjtYmnigluJCIIo0Tss cRH8wxE/AK+LCEMaS2/TSounjnejbaw0AweI7m+BxeGDs+Nk4tZ8OOERhQeFNpP6tOEw6K IIrCLCP6QrzIsLHRBb/46QUTBCHLec9jql15X+VI71c6DDaN/mjTu/6ur6T/0Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=mY7cfuod; 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"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1711264241; a=rsa-sha256; cv=none; b=YlenraJd9p+B4WeLQRyo5o8EUDnmdxqJIAYzlCfendsESpMoLrb1lcGVk9PjPDT7sril28 KF31IQjklcYUWQcJPiCnT128fBIqA4k4J4vGk8gAMtUKEvMXEaVOXl6Em1k9PP74uU+GOI ji1JHHWb3SmYmHtx9iaGSRAdmrJ1WjgVLyBP1RxFO15B1wT5UPLfYRHA1xZE/w2VbFTVpy Pp1yaHJTFJNgx2j9NuL7x1oYyCswKi49qljGNAtJgYvAm2OsRU79BFSnFO8SAdToVdMg3t /xB5eqTioaSiX4OoTtyzOTc33R406F6Xh/zGiRE4D+YxCyxJpRtyZxtzBQgkNw== 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 9123F716E0 for ; Sun, 24 Mar 2024 08:10:40 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1roHzq-0007r2-Cf; Sun, 24 Mar 2024 03:10:22 -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 1roHzo-0007qZ-Or for guix-patches@gnu.org; Sun, 24 Mar 2024 03:10:20 -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 1roHzo-0007pr-Ga for guix-patches@gnu.org; Sun, 24 Mar 2024 03:10:20 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1roI0U-00075P-3I for guix-patches@gnu.org; Sun, 24 Mar 2024 03:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69185] [PATCH master] gnu: ocaml: Update to 5.1.1 Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Mar 2024 07:11:02 +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 To: Marc Coquand Cc: 69185@debbugs.gnu.org, julien@lepiller.eu X-Debbugs-Original-Cc: 69185@debbugs.gnu.org, Julien Lepiller , debbugs-submit@debbugs.gnu.org Received: via spool by 69185-submit@debbugs.gnu.org id=B69185.171126421227087 (code B ref 69185); Sun, 24 Mar 2024 07:11:02 +0000 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 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-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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 9123F716E0 X-Spam-Score: -5.43 X-Migadu-Spam-Score: -5.43 X-Migadu-Scanner: mx10.migadu.com X-TUID: s1+sb4YVZ+3B 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