GNU bug report logs - #69185
[PATCH master] gnu: ocaml: Update to 5.1.1

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Package: guix-patches; Reported by: Marc Coquand <marc@HIDDEN>; Keywords: patch moreinfo; dated Sun, 18 Feb 2024 18:16:02 UTC; Maintainer for guix-patches is guix-patches@HIDDEN.
Added tag(s) moreinfo. Request was from Ludovic Courtès <ludo@HIDDEN> to control <at> debbugs.gnu.org. Full text available.

Message received at 69185 <at> debbugs.gnu.org:


Received: (at 69185) by debbugs.gnu.org; 29 Mar 2024 22:19:13 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Mar 29 18:19:13 2024
Received: from localhost ([127.0.0.1]:43567 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rqKZ6-0003VJ-Nr
	for submit <at> 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 <ludo@HIDDEN>) id 1rqKZ5-0003V2-4n
 for 69185 <at> 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 <ludo@HIDDEN>)
 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?= <ludo@HIDDEN>
To: pukkamustard <pukkamustard@HIDDEN>
Subject: Re: bug#69185: [PATCH master] gnu: ocaml: Update to 5.1.1
In-Reply-To: <86zfukofrg.fsf@HIDDEN> (pukkamustard@HIDDEN's message of
 "Tue, 26 Mar 2024 21:03:49 +0000")
References: <f12147e60124381318d6f422628c669c081da36d.1708191568.git.marc@HIDDEN>
 <861q806r8g.fsf@HIDDEN> <87edby3uac.fsf@HIDDEN>
 <86zfukofrg.fsf@HIDDEN>
Date: Fri, 29 Mar 2024 23:19:02 +0100
Message-ID: <87r0fsfzqh.fsf_-_@HIDDEN>
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 <at> debbugs.gnu.org, Marc Coquand <marc@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

Hello pukkamustard,

pukkamustard <pukkamustard@HIDDEN> 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.
Information forwarded to guix-patches@HIDDEN:
bug#69185; Package guix-patches. Full text available.

Message received at 69185 <at> debbugs.gnu.org:


Received: (at 69185) by debbugs.gnu.org; 26 Mar 2024 21:17:59 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 26 17:17:59 2024
Received: from localhost ([127.0.0.1]:35279 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rpEBC-0008U7-DO
	for submit <at> 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 <pukkamustard@HIDDEN>) id 1rpEB9-0008Tc-Pl
 for 69185 <at> 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 <at> 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: <f12147e60124381318d6f422628c669c081da36d.1708191568.git.marc@HIDDEN>
 <861q806r8g.fsf@HIDDEN> <87edby3uac.fsf@HIDDEN>
From: pukkamustard <pukkamustard@HIDDEN>
To: Marc Coquand <marc@HIDDEN>
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@HIDDEN>
Message-ID: <86zfukofrg.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 69185
Cc: 69185 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)


Marc Coquand <marc@HIDDEN> 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 <pukkamustard@HIDDEN> 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 <marc@HIDDEN> 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
Information forwarded to guix-patches@HIDDEN:
bug#69185; Package guix-patches. Full text available.

Message received at 69185 <at> debbugs.gnu.org:


Received: (at 69185) by debbugs.gnu.org; 24 Mar 2024 07:10:12 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Mar 24 03:10:12 2024
Received: from localhost ([127.0.0.1]:35075 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1roHzf-00072n-MN
	for submit <at> 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 <pukkamustard@HIDDEN>) id 1roHzd-00072E-Fe
 for 69185 <at> 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 <at> 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: <f12147e60124381318d6f422628c669c081da36d.1708191568.git.marc@HIDDEN>
From: pukkamustard <pukkamustard@HIDDEN>
To: Marc Coquand <marc@HIDDEN>
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: <f12147e60124381318d6f422628c669c081da36d.1708191568.git.marc@HIDDEN>
Message-ID: <861q806r8g.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 69185
Cc: 69185 <at> debbugs.gnu.org, Julien Lepiller <julien@HIDDEN>,
 debbugs-submit <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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 <marc@HIDDEN> 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
Information forwarded to guix-patches@HIDDEN:
bug#69185; Package guix-patches. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 18 Feb 2024 18:15:50 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Feb 18 13:15:50 2024
Received: from localhost ([127.0.0.1]:36897 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rblhd-0002R8-Jv
	for submit <at> 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 <marc@HIDDEN>) id 1rblQS-0001mW-Cl
 for submit <at> 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 <marc@HIDDEN>) id 1rbOf0-0003kj-ND
 for guix-patches@HIDDEN; 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 <marc@HIDDEN>) id 1rbOey-0003CX-Sz
 for guix-patches@HIDDEN; 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: <xms:UO_QZZbLlU94JRmHk5enntV-D1E1ii4jIBjwNAdzUBZZy1eg48kVEA>
 <xme:UO_QZQaP7oEGKj7WTQJBOgyZgn-zUhLiJYhbzG4g_uwzba64nN2rjYBZcRbI9DLr4
 bxgtv_hSQ33j4sz4uo>
X-ME-Received: <xmr:UO_QZb-h-qs7vMK66AS9Fj0FrN_QXXNfLSnFp_WCDTKDhv9MmOvoylC7z0ijv3hCeO_VSXTBmQ>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdeggddutdegucetufdoteggodetrfdotf
 fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
 uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertd
 ertddtnecuhfhrohhmpeforghrtgcuvehoqhhurghnugcuoehmrghrtgesmhgttggurdhs
 phgrtggvqeenucggtffrrghtthgvrhhnpefgvdetvdffiefgvdfhhfejvedujeeutddvje
 ffgefhudehveehlefgveduuedvvdenucffohhmrghinhepghhithhhuhgsrdgtohhmpdho
 tggrmhhlrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh
 hfrhhomhepmhgrrhgtsehmtggtugdrshhprggtvg
X-ME-Proxy: <xmx:UO_QZXrk_2kiwZN307ZiVK9ij09OrJa4pcjJKoV0KjAU4DlR7wcoNw>
 <xmx:UO_QZUqo9bGyh4O_GtQjRmXP2_ZTZJjdPSjWR78yOSHMOY151mhdQA>
 <xmx:UO_QZdS_6UtxyJ89hQddZAY5zep9zEn4zJNUGFNCWaL4H-vWzG7oxQ>
 <xmx:Ue_QZRBF3X-gKrxGY43IZfc5MwxQ-fW_sRI3CYhDZpX8vY_rqBVfGA>
Feedback-ID: ia2d149fd:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat,
 17 Feb 2024 12:39:28 -0500 (EST)
From: Marc Coquand <marc@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH master] gnu: ocaml: Update to 5.1.1
Date: Sat, 17 Feb 2024 11:39:29 -0600
Message-ID: <f12147e60124381318d6f422628c669c081da36d.1708191568.git.marc@HIDDEN>
X-Mailer: git-send-email 2.43.2
MIME-Version: 1.0
X-Debbugs-Cc: Julien Lepiller <julien@HIDDEN>,
 pukkamustard <pukkamustard@HIDDEN>
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=64.147.123.21; envelope-from=marc@HIDDEN;
 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 <marc@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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
Acknowledgement sent to Marc Coquand <marc@HIDDEN>:
New bug report received and forwarded. Copy sent to julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN. Full text available.
Report forwarded to julien@HIDDEN, pukkamustard@HIDDEN, guix-patches@HIDDEN:
bug#69185; Package guix-patches. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Fri, 29 Mar 2024 22:30:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.