Subject: [bug#49101] [PATCH v2 2/5] gnu: ocaml4.07-expect: Switch to default OCaml compiler.

From: Julien Lepiller <[email-masked]>
Date: Sat, 19 Jun 2021 13:05:28 +0200

Le Sat, 19 Jun 2021 11:03:41 +0200,
Xinglu Chen <[email-masked]> a écrit :

> * gnu/packages/ocaml.scm (ocaml4.07-expect): Rename to ‘ocaml-expect’.
> [arguments]: Use default OCaml compiler.
> [native-inputs]: Use ‘ocaml-*’ packages instead of ‘ocaml4.07-*’.
> [propagated-inputs]: Likewise.
> [description]: Make it a full sentence.
> ---
>  gnu/packages/ocaml.scm | 23 +++++++++++------------
>  1 file changed, 11 insertions(+), 12 deletions(-)
> 
> diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
> index e02684fefd..c89908a1b2 100644
> --- a/gnu/packages/ocaml.scm
> +++ b/gnu/packages/ocaml.scm
> @@ -3118,9 +3118,9 @@ offered by the Perl language.")
>      ;; With static linking exception
>      (license license:lgpl2.1+)))
>  
> -(define-public ocaml4.07-expect
> +(define-public ocaml-expect
>    (package
> -    (name "ocaml4.07-expect")
> +    (name "ocaml-expect")
>      (version "0.0.6")
>      (source (origin
>                (method url-fetch)
> @@ -3129,21 +3129,20 @@ offered by the Perl language.")
>                 (base32
>                  "098qvg9d4yrqzr5ax291y3whrpax0m3sx4gi6is0mblc96r9yqk0"))))
>      (arguments
> -     `(#:tests? #f
> -       #:ocaml ,ocaml-4.07
> -       #:findlib ,ocaml4.07-findlib))
> +     `(#:tests? #f))
>      (build-system ocaml-build-system)
>      (native-inputs
> -     `(("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild))
> -       ("ocaml-num" ,(package-with-ocaml4.07 ocaml-num))
> -       ("ocaml-pcre" ,ocaml4.07-pcre)
> -       ("ounit" ,(package-with-ocaml4.07 ocaml-ounit))))
> +     `(("ocamlbuild" ,ocamlbuild)
> +       ("ocaml-num" ,ocaml-num)
> +       ("ocaml-pcre" ,ocaml-pcre)
> +       ("ounit" ,ocaml-ounit)))
>      (propagated-inputs
> -     `(("batteries" ,(package-with-ocaml4.07 ocaml-batteries))))
> +     `(("batteries" ,ocaml-batteries)))
>      (home-page "https://forge.ocamlcore.org/projects/ocaml-expect/")
>      (synopsis "Simple implementation of expect")
> -    (description "Help building unitary testing of interactive
> program.  You -can match the question using a regular expression or a
> timeout.")
> +    (description "This package provides utilities for building
> unitary testing +of interactive program.  You can match the question
> using a regular expression +or a timeout.")
>      (license license:lgpl2.1+))) ; with the OCaml static compilation
> exception 
>  (define-public ocaml-stdlib-shims

This patch looks good, but I think it needs to be merged with the
previous one, because after the first patch and before this one,
ocaml4.07-pcre doesn't exist. Remember that we want to make sure we can
build guix at every point in time.

The rest of the series is good. I'm looking forward to v3 :)