[bug#49101] [PATCH 0/4] Add ocaml-mparser & friends

[bug#49101] [PATCH 0/4] Add ocaml-mparser & friends

[Xinglu Chen]

[-- Attachment #1: Type: text/plain, Size: 627 bytes --]

This series adds ‘ocaml-mparser’, a monad parser combinator library,
plus two extensions for it --- ‘ocaml-mparser-re’ and
‘ocaml-mparser-pcre’.

I noticed that there already exists an ‘ocaml4.07-pcre’ package, what is
the policy regarding ‘ocaml4.07-*’ and ‘ocaml-*’ packages?

Xinglu Chen (4):
  gnu: Add ocaml-mparser.
  gnu: Add ocaml-mparser-re.
  gnu: Add ocaml-mparser-pcre.
  gnu: Add ocaml-pcre.

 gnu/packages/ocaml.scm | 88 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)


base-commit: caf4a7a2770ef4d05a6e18f40d602e51da749ddc
-- 
2.32.0



[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 861 bytes --]

[bug#49101] [PATCH 1/4] gnu: Add ocaml-mparser.

[Xinglu Chen]

* gnu/packages/ocaml.scm (ocaml-mparser): New variable.
---
 gnu/packages/ocaml.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 7dd9338458..e90ed8f4e4 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6741,6 +6741,33 @@ in the documentation always stays up-to-date.
 compatibility.")
     (license license:isc)))
 
+(define-public ocaml-mparser
+  (package
+    (name "ocaml-mparser")
+    (version "1.3")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+              (url "https://github.com/murmour/mparser")
+              (commit version)))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32
+            "16j19v16r42gcsii6a337zrs5cxnf12ig0vaysxyr7sq5lplqhkx"))))
+    (build-system dune-build-system)
+    (arguments
+     ;; No tests.
+     '(#:package "mparser"
+       #:tests? #f))
+    (home-page "https://github.com/murmour/mparser")
+    (synopsis "Simple monadic parser combinator library")
+    (description
+      "This library implements a rather complete and efficient monadic parser
+combinator library similar to the Parsec library for Haskell by Daan Leijen and
+the FParsec library for FSharp by Stephan Tolksdorf.")
+    ;; With static linking exception.
+    (license license:lgpl2.1+)))
 (define-public lablgtk3
   (package
     (name "lablgtk")
-- 
2.32.0

[bug#49101] [PATCH 3/4] gnu: Add ocaml-mparser-pcre.

[Xinglu Chen]

* gnu/packages/ocaml.scm (ocaml-mparser-pcre): New variable.
---
 gnu/packages/ocaml.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index eebca5da18..afdce121bd 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6784,6 +6784,21 @@ the FParsec library for FSharp by Stephan Tolksdorf.")
     (description "This package provides RE-based regular expressions
 support for Mparser.")))
 
+(define-public ocaml-mparser-pcre
+  (package
+    (inherit ocaml-mparser)
+    (name "ocaml-mparser-pcre")
+    (arguments
+     ;; No tests.
+     '(#:package "mparser-pcre"
+       #:tests? #f))
+    (propagated-inputs
+     `(("ocaml-mparser" ,ocaml-mparser)
+       ("ocaml-pcre" ,ocaml-pcre)))
+    (synopsis "MParser plugin for PCRE-based regular expressions")
+    (description "This package provides PCRE-based regular expressions
+support for Mparser.")))
+
 (define-public lablgtk3
   (package
     (name "lablgtk")
-- 
2.32.0

[bug#49101] [PATCH 4/4] gnu: Add ocaml-pcre.

[Xinglu Chen]

* gnu/packages/ocaml.scm (ocaml-pcre): New variable.
---
 gnu/packages/ocaml.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index afdce121bd..3d27f91e0e 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6799,6 +6799,36 @@ support for Mparser.")))
     (description "This package provides PCRE-based regular expressions
 support for Mparser.")))
 
+(define-public ocaml-pcre
+  (package
+    (name "ocaml-pcre")
+    (version "7.4.6")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+              (url "https://github.com/mmottl/pcre-ocaml")
+              (commit version)))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32
+            "11mck879p5zvkghps4ky8yslm0isgz52d84adl0dmcfxv2ibvcym"))))
+    (build-system dune-build-system)
+    (arguments
+     ;; No tests.
+     '(#:tests? #f))
+    (propagated-inputs
+     `(("dune-configurator" ,dune-configurator)))
+    (native-inputs `(("pcre" ,pcre)))
+    (home-page "https://mmottl.github.io/pcre-ocaml")
+    (synopsis
+      "Bindings to the Perl Compatibility Regular Expressions library")
+    (description "pcre-ocaml offers library functions for string
+pattern matching and substitution, similar to the functionality
+offered by the Perl language.")
+    ;; With static linking exception
+    (license license:lgpl2.1+)))
+
 (define-public lablgtk3
   (package
     (name "lablgtk")
-- 
2.32.0

[bug#49101] [PATCH 2/4] gnu: Add ocaml-mparser-re.

[Xinglu Chen]

* gnu/packages/ocaml.scm (ocaml-mparser-re): New variable.
---
 gnu/packages/ocaml.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index e90ed8f4e4..eebca5da18 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6768,6 +6768,22 @@ combinator library similar to the Parsec library for Haskell by Daan Leijen and
 the FParsec library for FSharp by Stephan Tolksdorf.")
     ;; With static linking exception.
     (license license:lgpl2.1+)))
+
+(define-public ocaml-mparser-re
+  (package
+    (inherit ocaml-mparser)
+    (name "ocaml-mparser-re")
+    (arguments
+     ;; No tests.
+     '(#:package "mparser-re"
+       #:tests? #f))
+    (propagated-inputs
+     `(("ocaml-mparser" ,ocaml-mparser)
+       ("ocaml-re" ,ocaml-re)))
+    (synopsis "MParser plugin for RE-based regular expressions")
+    (description "This package provides RE-based regular expressions
+support for Mparser.")))
+
 (define-public lablgtk3
   (package
     (name "lablgtk")
-- 
2.32.0

[bug#49101] [PATCH 0/4] Add ocaml-mparser & friends

[Julien Lepiller]

Le Fri, 18 Jun 2021 21:00:51 +0200,
Xinglu Chen <public@yoctocell.xyz> a écrit :

> This series adds ‘ocaml-mparser’, a monad parser combinator library,
> plus two extensions for it --- ‘ocaml-mparser-re’ and
> ‘ocaml-mparser-pcre’.
> 
> I noticed that there already exists an ‘ocaml4.07-pcre’ package, what
> is the policy regarding ‘ocaml4.07-*’ and ‘ocaml-*’ packages?
> 
> Xinglu Chen (4):
>   gnu: Add ocaml-mparser.
>   gnu: Add ocaml-mparser-re.
>   gnu: Add ocaml-mparser-pcre.
>   gnu: Add ocaml-pcre.
> 
>  gnu/packages/ocaml.scm | 88
> ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88
> insertions(+)
> 
> 
> base-commit: caf4a7a2770ef4d05a6e18f40d602e51da749ddc

Hi Xinglu,

thank you for the patches! First, you should reorder your patches: we
try to make sure every revision of guix is correct, but after the third
patch, ocaml-pcre is missing. I would simply put pcre first :).

To answer your question, we try to avoid having both the ocaml and
ocaml4.07 around if possible. It seems that ocaml4.07-pcre is only
required for ocaml4.07-expect. Could you check if it is possible to
build expect with our latest ocaml package?

If so, please have a patch that builds pcre and expect with the latest
ocaml, then another patch for updating pcre to the latest version, then
your three patches to add mparser.

If not, then we have to keep ocaml4.07-pcre around, so here is how we
do it, in a single patch:

Replace ocaml4.07-pcre with ocaml-pcre (remove the arguments that use
ocaml-4.07) and create a new ocaml4.07-pcre that inherits from it. It
would look like this:

(define-public ocaml-pcre
  (package
    (name "ocaml-pcre")
    ...
    (properties `((ocaml4.07-variant ,(delay ocaml4.07-pcre))))
    ...))

(define-public ocaml4.07-pcre
  (package-with-ocaml4.07
    (package
      (inherit ocaml-pcre)
      ...
      (properties '()))))

If the latest version of pcre cannot be built with ocaml 4.07, you can
specify a different source, like we do for ocaml4.07-parsexp for
instance.

I'm looking forward to v2 of this series :)

[bug#49101] [PATCH 0/4] Add ocaml-mparser & friends

[Xinglu Chen]

[-- Attachment #1: Type: text/plain, Size: 2487 bytes --]

On Sat, Jun 19 2021, Julien Lepiller wrote:

> Le Fri, 18 Jun 2021 21:00:51 +0200,
> Xinglu Chen <public@yoctocell.xyz> a écrit :
>
>> This series adds ‘ocaml-mparser’, a monad parser combinator library,
>> plus two extensions for it --- ‘ocaml-mparser-re’ and
>> ‘ocaml-mparser-pcre’.
>> 
>> I noticed that there already exists an ‘ocaml4.07-pcre’ package, what
>> is the policy regarding ‘ocaml4.07-*’ and ‘ocaml-*’ packages?
>> 
>> Xinglu Chen (4):
>>   gnu: Add ocaml-mparser.
>>   gnu: Add ocaml-mparser-re.
>>   gnu: Add ocaml-mparser-pcre.
>>   gnu: Add ocaml-pcre.
>> 
>>  gnu/packages/ocaml.scm | 88
>> ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88
>> insertions(+)
>> 
>> 
>> base-commit: caf4a7a2770ef4d05a6e18f40d602e51da749ddc
>
> Hi Xinglu,
>
> thank you for the patches! First, you should reorder your patches: we
> try to make sure every revision of guix is correct, but after the third
> patch, ocaml-pcre is missing. I would simply put pcre first :).

Yeah, I think I messed something up when sending them.

> To answer your question, we try to avoid having both the ocaml and
> ocaml4.07 around if possible. It seems that ocaml4.07-pcre is only
> required for ocaml4.07-expect. Could you check if it is possible to
> build expect with our latest ocaml package?
>
> If so, please have a patch that builds pcre and expect with the latest
> ocaml, then another patch for updating pcre to the latest version, then
> your three patches to add mparser.
>
> If not, then we have to keep ocaml4.07-pcre around, so here is how we
> do it, in a single patch:
>
> Replace ocaml4.07-pcre with ocaml-pcre (remove the arguments that use
> ocaml-4.07) and create a new ocaml4.07-pcre that inherits from it. It
> would look like this:
>
> (define-public ocaml-pcre
>   (package
>     (name "ocaml-pcre")
>     ...
>     (properties `((ocaml4.07-variant ,(delay ocaml4.07-pcre))))
>     ...))
>
> (define-public ocaml4.07-pcre
>   (package-with-ocaml4.07
>     (package
>       (inherit ocaml-pcre)
>       ...
>       (properties '()))))
>
> If the latest version of pcre cannot be built with ocaml 4.07, you can
> specify a different source, like we do for ocaml4.07-parsexp for
> instance.

Thanks for the detailed answer!  I think it would be great to have
something like this in the manual :)

> I'm looking forward to v2 of this series :)

Should be coming soon :)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 861 bytes --]

[bug#49101] [PATCH v2 0/5] Add ocaml-mparser & firends

[Xinglu Chen]

Changes since v1:

* Make ‘ocaml4.07-pcre’ and ‘ocaml4.07-expect’ use the default OCaml
  compiler and reorder the commits.

Xinglu Chen (5):
  gnu: ocaml4.07-pcre: Switch to default ‘ocaml’ compiler.
  gnu: ocaml4.07-expect: Switch to default ‘ocaml’ compiler.
  gnu: Add ocaml-mparser.
  gnu: Add ocaml-mparser-re.
  gnu: Add ocaml-mparser-pcre.

 gnu/packages/ocaml.scm | 131 ++++++++++++++++++++++++++++++-----------
 1 file changed, 95 insertions(+), 36 deletions(-)


base-commit: dee608a1bb09e691e32203f2493975d71318c296
-- 
2.32.0

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

[Xinglu Chen]

* gnu/packages/ocaml.scm (ocaml4.07-pcre): Rename to ‘ocaml-pcre’.
[version]: Update to latest version.
[arguments]: Use default OCaml compiler.
[native-inputs]: Adjust accordingly.
[propagated-inputs]: Likewise.
---
 gnu/packages/ocaml.scm | 50 ++++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index a8432ebbfe..e02684fefd 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -3086,35 +3086,37 @@ every compliant installation of OCaml and organize these libraries into a
 hierarchy of modules.")
     (license license:lgpl2.1+)))
 
-(define-public ocaml4.07-pcre
+(define-public ocaml-pcre
   (package
-    (name "ocaml4.07-pcre")
-    (version "7.4.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/mmottl/pcre-ocaml")
-                     (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "11sd8g668h48790lamz0riw9jgnfkaif5qdfa0akcndwa6aj07jf"))))
+    (name "ocaml-pcre")
+    (version "7.4.6")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+              (url "https://github.com/mmottl/pcre-ocaml")
+              (commit version)))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32
+            "11mck879p5zvkghps4ky8yslm0isgz52d84adl0dmcfxv2ibvcym"))))
     (build-system dune-build-system)
     (arguments
-     `(#:test-target "."
-       #:ocaml ,ocaml-4.07
-       #:findlib ,ocaml4.07-findlib
-       #:dune ,ocaml4.07-dune))
+     ;; No tests.
+     '(#:tests? #f))
+    (propagated-inputs
+     `(("dune-configurator" ,dune-configurator)
+       ("pcre" ,pcre)))
     (native-inputs
-     `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))
-       ("pcre:bin" ,pcre "bin")))
-    (propagated-inputs `(("pcre" ,pcre)))
+     `(("pcre:bin" ,pcre "bin")))
     (home-page "https://mmottl.github.io/pcre-ocaml")
-    (synopsis "Bindings to the Perl Compatibility Regular Expressions library")
-    (description "Pcre-ocaml offers library functions for string pattern
-matching and substitution, similar to the functionality offered by the Perl
-language.")
-    (license license:lgpl2.1+))); with the OCaml link exception
+    (synopsis
+      "Bindings to the Perl Compatibility Regular Expressions library")
+    (description "pcre-ocaml offers library functions for string
+pattern matching and substitution, similar to the functionality
+offered by the Perl language.")
+    ;; With static linking exception
+    (license license:lgpl2.1+)))
 
 (define-public ocaml4.07-expect
   (package
-- 
2.32.0

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

[Julien Lepiller]

Le Sat, 19 Jun 2021 11:03:39 +0200,
Xinglu Chen <public@yoctocell.xyz> a écrit :

> * gnu/packages/ocaml.scm (ocaml4.07-pcre): Rename to ‘ocaml-pcre’.
> [version]: Update to latest version.
> [arguments]: Use default OCaml compiler.
> [native-inputs]: Adjust accordingly.
> [propagated-inputs]: Likewise.

Great!

> ---
>  gnu/packages/ocaml.scm | 50
> ++++++++++++++++++++++-------------------- 1 file changed, 26
> insertions(+), 24 deletions(-)
> 
> diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
> index a8432ebbfe..e02684fefd 100644
> --- a/gnu/packages/ocaml.scm
> +++ b/gnu/packages/ocaml.scm
> @@ -3086,35 +3086,37 @@ every compliant installation of OCaml and
> organize these libraries into a hierarchy of modules.")
>      (license license:lgpl2.1+)))
>  
> -(define-public ocaml4.07-pcre
> +(define-public ocaml-pcre
>    (package
> -    (name "ocaml4.07-pcre")
> -    (version "7.4.1")
> -    (source (origin
> -              (method git-fetch)
> -              (uri (git-reference
> -                     (url "https://github.com/mmottl/pcre-ocaml")
> -                     (commit version)))
> -              (file-name (git-file-name name version))
> -              (sha256
> -               (base32
> -
> "11sd8g668h48790lamz0riw9jgnfkaif5qdfa0akcndwa6aj07jf"))))
> +    (name "ocaml-pcre")
> +    (version "7.4.6")

If possible, it would be best not to update pcre at the same time. You
can try updating first, then switch to the latest ocaml, or the other
way around. If it's really not possible, please add the version number
to the commit message.

> +    (source
> +      (origin
> +        (method git-fetch)
> +        (uri (git-reference
> +              (url "https://github.com/mmottl/pcre-ocaml")
> +              (commit version)))
> +        (file-name (git-file-name name version))
> +        (sha256
> +          (base32
> +
> "11mck879p5zvkghps4ky8yslm0isgz52d84adl0dmcfxv2ibvcym"))))
> (build-system dune-build-system) (arguments
> -     `(#:test-target "."
> -       #:ocaml ,ocaml-4.07
> -       #:findlib ,ocaml4.07-findlib
> -       #:dune ,ocaml4.07-dune))
> +     ;; No tests.
> +     '(#:tests? #f))

Are you sure there are no tests? There used to be tests that could be
found at the top-level directory (#:test-target "."). Doesn't that work
anymore?

> +    (propagated-inputs
> +     `(("dune-configurator" ,dune-configurator)
> +       ("pcre" ,pcre)))
>      (native-inputs
> -     `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))
> -       ("pcre:bin" ,pcre "bin")))
> -    (propagated-inputs `(("pcre" ,pcre)))
> +     `(("pcre:bin" ,pcre "bin")))
>      (home-page "https://mmottl.github.io/pcre-ocaml")
> -    (synopsis "Bindings to the Perl Compatibility Regular
> Expressions library")
> -    (description "Pcre-ocaml offers library functions for string
> pattern -matching and substitution, similar to the functionality
> offered by the Perl -language.")
> -    (license license:lgpl2.1+))); with the OCaml link exception
> +    (synopsis
> +      "Bindings to the Perl Compatibility Regular Expressions
> library")
> +    (description "pcre-ocaml offers library functions for string
> +pattern matching and substitution, similar to the functionality
> +offered by the Perl language.")
> +    ;; With static linking exception
> +    (license license:lgpl2.1+)))

Otherwise, looks good.

>  
>  (define-public ocaml4.07-expect
>    (package

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

[Xinglu Chen]

[-- Attachment #1: Type: text/plain, Size: 1933 bytes --]

On Sat, Jun 19 2021, Julien Lepiller wrote:

>> -(define-public ocaml4.07-pcre
>> +(define-public ocaml-pcre
>>    (package
>> -    (name "ocaml4.07-pcre")
>> -    (version "7.4.1")
>> -    (source (origin
>> -              (method git-fetch)
>> -              (uri (git-reference
>> -                     (url "https://github.com/mmottl/pcre-ocaml")
>> -                     (commit version)))
>> -              (file-name (git-file-name name version))
>> -              (sha256
>> -               (base32
>> -
>> "11sd8g668h48790lamz0riw9jgnfkaif5qdfa0akcndwa6aj07jf"))))
>> +    (name "ocaml-pcre")
>> +    (version "7.4.6")
>
> If possible, it would be best not to update pcre at the same time. You
> can try updating first, then switch to the latest ocaml, or the other
> way around. If it's really not possible, please add the version number
> to the commit message.

OK, will keep this in mind.

>> +    (source
>> +      (origin
>> +        (method git-fetch)
>> +        (uri (git-reference
>> +              (url "https://github.com/mmottl/pcre-ocaml")
>> +              (commit version)))
>> +        (file-name (git-file-name name version))
>> +        (sha256
>> +          (base32
>> +
>> "11mck879p5zvkghps4ky8yslm0isgz52d84adl0dmcfxv2ibvcym"))))
>> (build-system dune-build-system) (arguments
>> -     `(#:test-target "."
>> -       #:ocaml ,ocaml-4.07
>> -       #:findlib ,ocaml4.07-findlib
>> -       #:dune ,ocaml4.07-dune))
>> +     ;; No tests.
>> +     '(#:tests? #f))
>
> Are you sure there are no tests? There used to be tests that could be
> found at the top-level directory (#:test-target "."). Doesn't that work
> anymore?

Looking at the Git repo[1], I don’t see any files that would indicate
that there are tests.  Maybe I missed something, but I will see if
(#:test-target ".") does anything useful.

[1]: https://github.com/mmottl/pcre-ocaml


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 861 bytes --]

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

[Xinglu Chen]

* 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
-- 
2.32.0

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

[Julien Lepiller]

Le Sat, 19 Jun 2021 11:03:41 +0200,
Xinglu Chen <public@yoctocell.xyz> 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 :)

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

[Xinglu Chen]

[-- Attachment #1: Type: text/plain, Size: 743 bytes --]

On Sat, Jun 19 2021, Julien Lepiller wrote:

> 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.

Do you mean that I, if possible, should do bump the version of
‘ocaml4.07-pcre’ in one commit, and then switch ‘ocaml4.07-pcre’ and
‘ocaml4.07-expect’ to using the default compiler in the next commit,
like this?

  gnu: ocaml4.07-pcre: Update to 7.46.
  gnu: ocaml4.07-{pcre,expect}: Switch to default OCaml compiler.
  ...
  
> The rest of the series is good. I'm looking forward to v3 :)

Cool, thanks for the review!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 861 bytes --]

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

[Xinglu Chen]

[-- Attachment #1: Type: text/plain, Size: 1104 bytes --]

On Sat, Jun 19 2021, Xinglu Chen wrote:

> On Sat, Jun 19 2021, Julien Lepiller wrote:
>
>> 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.
>
> Do you mean that I, if possible, should do bump the version of
> ‘ocaml4.07-pcre’ in one commit, and then switch ‘ocaml4.07-pcre’ and
> ‘ocaml4.07-expect’ to using the default compiler in the next commit,
> like this?
>
>   gnu: ocaml4.07-pcre: Update to 7.46.
>   gnu: ocaml4.07-{pcre,expect}: Switch to default OCaml compiler.
>   ...

Looks like ‘ocaml4.07-pcre’ doesn’t build on the latest version, so I
guess I would add an ‘ocaml-pcre’ in one commit, switch
‘ocaml4.07-expect’ to use the default compiler in another commit, and
then remove ‘ocaml4.07-pcre’ in one commit?

  gnu: Add ocaml-pcre.
  gnu: ocaml4.07-expect: Switch to default compiler.
  gnu: ocaml4.07-pcre: Remove package.
  ...



[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 861 bytes --]

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

[Julien Lepiller]

[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]

Sounds reasonnable, thanks :)

Le 19 juin 2021 10:06:06 GMT-04:00, Xinglu Chen <public@yoctocell.xyz> a écrit :
>On Sat, Jun 19 2021, Xinglu Chen wrote:
>
>> On Sat, Jun 19 2021, Julien Lepiller wrote:
>>
>>> 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.
>>
>> Do you mean that I, if possible, should do bump the version of
>> ‘ocaml4.07-pcre’ in one commit, and then switch ‘ocaml4.07-pcre’ and
>> ‘ocaml4.07-expect’ to using the default compiler in the next commit,
>> like this?
>>
>>   gnu: ocaml4.07-pcre: Update to 7.46.
>>   gnu: ocaml4.07-{pcre,expect}: Switch to default OCaml compiler.
>>   ...
>
>Looks like ‘ocaml4.07-pcre’ doesn’t build on the latest version, so I
>guess I would add an ‘ocaml-pcre’ in one commit, switch
>‘ocaml4.07-expect’ to use the default compiler in another commit, and
>then remove ‘ocaml4.07-pcre’ in one commit?
>
>  gnu: Add ocaml-pcre.
>  gnu: ocaml4.07-expect: Switch to default compiler.
>  gnu: ocaml4.07-pcre: Remove package.
>  ...

[-- Attachment #2: Type: text/html, Size: 1765 bytes --]

[bug#49101] [PATCH v2 3/5] gnu: Add ocaml-mparser.

[Xinglu Chen]

* gnu/packages/ocaml.scm (ocaml-mparser): New variable.
---
 gnu/packages/ocaml.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index c89908a1b2..ac0de20457 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6792,6 +6792,33 @@ in the documentation always stays up-to-date.
 compatibility.")
     (license license:isc)))
 
+(define-public ocaml-mparser
+  (package
+    (name "ocaml-mparser")
+    (version "1.3")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+              (url "https://github.com/murmour/mparser")
+              (commit version)))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32
+            "16j19v16r42gcsii6a337zrs5cxnf12ig0vaysxyr7sq5lplqhkx"))))
+    (build-system dune-build-system)
+    (arguments
+     ;; No tests.
+     '(#:package "mparser"
+       #:tests? #f))
+    (home-page "https://github.com/murmour/mparser")
+    (synopsis "Simple monadic parser combinator library")
+    (description
+      "This library implements a rather complete and efficient monadic parser
+combinator library similar to the Parsec library for Haskell by Daan Leijen and
+the FParsec library for FSharp by Stephan Tolksdorf.")
+    ;; With static linking exception.
+    (license license:lgpl2.1+)))
 (define-public lablgtk3
   (package
     (name "lablgtk")
-- 
2.32.0

[bug#49101] [PATCH v2 4/5] gnu: Add ocaml-mparser-re.

[Xinglu Chen]

* gnu/packages/ocaml.scm (ocaml-mparser-re): New variable.
---
 gnu/packages/ocaml.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index ac0de20457..3455161553 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6819,6 +6819,22 @@ combinator library similar to the Parsec library for Haskell by Daan Leijen and
 the FParsec library for FSharp by Stephan Tolksdorf.")
     ;; With static linking exception.
     (license license:lgpl2.1+)))
+
+(define-public ocaml-mparser-re
+  (package
+    (inherit ocaml-mparser)
+    (name "ocaml-mparser-re")
+    (arguments
+     ;; No tests.
+     '(#:package "mparser-re"
+       #:tests? #f))
+    (propagated-inputs
+     `(("ocaml-mparser" ,ocaml-mparser)
+       ("ocaml-re" ,ocaml-re)))
+    (synopsis "MParser plugin for RE-based regular expressions")
+    (description "This package provides RE-based regular expressions
+support for Mparser.")))
+
 (define-public lablgtk3
   (package
     (name "lablgtk")
-- 
2.32.0

[bug#49101] [PATCH v2 5/5] gnu: Add ocaml-mparser-pcre.

[Xinglu Chen]

* gnu/packages/ocaml.scm (ocaml-mparser-pcre): New variable.
---
 gnu/packages/ocaml.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 3455161553..1c7f4db18f 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6835,6 +6835,21 @@ the FParsec library for FSharp by Stephan Tolksdorf.")
     (description "This package provides RE-based regular expressions
 support for Mparser.")))
 
+(define-public ocaml-mparser-pcre
+  (package
+    (inherit ocaml-mparser)
+    (name "ocaml-mparser-pcre")
+    (arguments
+     ;; No tests.
+     '(#:package "mparser-pcre"
+       #:tests? #f))
+    (propagated-inputs
+     `(("ocaml-mparser" ,ocaml-mparser)
+       ("ocaml-pcre" ,ocaml-pcre)))
+    (synopsis "MParser plugin for PCRE-based regular expressions")
+    (description "This package provides PCRE-based regular expressions
+support for Mparser.")))
+
 (define-public lablgtk3
   (package
     (name "lablgtk")
-- 
2.32.0

[bug#49101] [PATCH v3 0/6] Add ocaml-mparser & friends

[Xinglu Chen]

[-- Attachment #1: Type: text/plain, Size: 805 bytes --]

Changes since v2:

* Split the previous [1/5] patch (gnu: ocaml4.07-pcre: Switch to default
  OCaml compiler.) into two patches.

* Make ‘ocaml4.07-expect’ use the default compiler before removing
  ‘ocaml4.07-pcre’.

I tried setting (#:tests-target ".") in ‘ocaml-pcre’, but nothing was
outputted during the check phase, so I think it’s safe to say that it
doesn’t actually do anything useful.  :)

Xinglu Chen (6):
  gnu: Add ocaml-pcre.
  gnu: ocaml4.07-expect: Switch to default OCaml compiler.
  gnu: ocaml4.07-pcre: Remove package.
  gnu: Add ocaml-mparser.
  gnu: Add ocaml-mparser-re.
  gnu: Add ocaml-mparser-pcre.

 gnu/packages/ocaml.scm | 131 ++++++++++++++++++++++++++++++-----------
 1 file changed, 95 insertions(+), 36 deletions(-)

-- 
2.32.0



[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 861 bytes --]

[bug#49101] [PATCH v3 1/6] gnu: Add ocaml-pcre.

[Xinglu Chen]

* gnu/packages/ocaml.scm (ocaml-pcre): New variable.
---
 gnu/packages/ocaml.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index a8432ebbfe..542730699e 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -3086,6 +3086,38 @@ every compliant installation of OCaml and organize these libraries into a
 hierarchy of modules.")
     (license license:lgpl2.1+)))
 
+(define-public ocaml-pcre
+  (package
+    (name "ocaml-pcre")
+    (version "7.4.6")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+              (url "https://github.com/mmottl/pcre-ocaml")
+              (commit version)))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32
+            "11mck879p5zvkghps4ky8yslm0isgz52d84adl0dmcfxv2ibvcym"))))
+    (build-system dune-build-system)
+    (arguments
+     ;; No tests.
+     '(#:tests? #f))
+    (propagated-inputs
+     `(("dune-configurator" ,dune-configurator)
+       ("pcre" ,pcre)))
+    (native-inputs
+     `(("pcre:bin" ,pcre "bin")))
+    (home-page "https://mmottl.github.io/pcre-ocaml")
+    (synopsis
+      "Bindings to the Perl Compatibility Regular Expressions library")
+    (description "pcre-ocaml offers library functions for string
+pattern matching and substitution, similar to the functionality
+offered by the Perl language.")
+    ;; With static linking exception
+    (license license:lgpl2.1+)))
+
 (define-public ocaml4.07-pcre
   (package
     (name "ocaml4.07-pcre")
-- 
2.32.0

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

[Xinglu Chen]

* 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 542730699e..d3674ccba8 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -3148,9 +3148,9 @@ matching and substitution, similar to the functionality offered by the Perl
 language.")
     (license license:lgpl2.1+))); with the OCaml link exception
 
-(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)
@@ -3159,21 +3159,20 @@ 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
-- 
2.32.0

[bug#49101] [PATCH v3 3/6] gnu: ocaml4.07-pcre: Remove package.

[Xinglu Chen]

* gnu/packages/ocaml.scm (ocaml4.07-pcre): Remove package.  It has been
superseded by ‘ocaml-pcre’.
---
 gnu/packages/ocaml.scm | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index d3674ccba8..c89908a1b2 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -3118,36 +3118,6 @@ offered by the Perl language.")
     ;; With static linking exception
     (license license:lgpl2.1+)))
 
-(define-public ocaml4.07-pcre
-  (package
-    (name "ocaml4.07-pcre")
-    (version "7.4.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/mmottl/pcre-ocaml")
-                     (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "11sd8g668h48790lamz0riw9jgnfkaif5qdfa0akcndwa6aj07jf"))))
-    (build-system dune-build-system)
-    (arguments
-     `(#:test-target "."
-       #:ocaml ,ocaml-4.07
-       #:findlib ,ocaml4.07-findlib
-       #:dune ,ocaml4.07-dune))
-    (native-inputs
-     `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))
-       ("pcre:bin" ,pcre "bin")))
-    (propagated-inputs `(("pcre" ,pcre)))
-    (home-page "https://mmottl.github.io/pcre-ocaml")
-    (synopsis "Bindings to the Perl Compatibility Regular Expressions library")
-    (description "Pcre-ocaml offers library functions for string pattern
-matching and substitution, similar to the functionality offered by the Perl
-language.")
-    (license license:lgpl2.1+))); with the OCaml link exception
-
 (define-public ocaml-expect
   (package
     (name "ocaml-expect")
-- 
2.32.0

[bug#49101] [PATCH v3 4/6] gnu: Add ocaml-mparser.

[Xinglu Chen]

* gnu/packages/ocaml.scm (ocaml-mparser): New variable.
---
 gnu/packages/ocaml.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index c89908a1b2..af8790aca6 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6792,6 +6792,34 @@ in the documentation always stays up-to-date.
 compatibility.")
     (license license:isc)))
 
+(define-public ocaml-mparser
+  (package
+    (name "ocaml-mparser")
+    (version "1.3")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+              (url "https://github.com/murmour/mparser")
+              (commit version)))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32
+            "16j19v16r42gcsii6a337zrs5cxnf12ig0vaysxyr7sq5lplqhkx"))))
+    (build-system dune-build-system)
+    (arguments
+     ;; No tests.
+     '(#:package "mparser"
+       #:tests? #f))
+    (home-page "https://github.com/murmour/mparser")
+    (synopsis "Simple monadic parser combinator library")
+    (description
+      "This library implements a rather complete and efficient monadic parser
+combinator library similar to the Parsec library for Haskell by Daan Leijen and
+the FParsec library for FSharp by Stephan Tolksdorf.")
+    ;; With static linking exception.
+    (license license:lgpl2.1+)))
+
 (define-public lablgtk3
   (package
     (name "lablgtk")
-- 
2.32.0

[bug#49101] [PATCH v3 5/6] gnu: Add ocaml-mparser-re.

[Xinglu Chen]

* gnu/packages/ocaml.scm (ocaml-mparser-re): New variable.
---
 gnu/packages/ocaml.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index af8790aca6..3455161553 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6820,6 +6820,21 @@ the FParsec library for FSharp by Stephan Tolksdorf.")
     ;; With static linking exception.
     (license license:lgpl2.1+)))
 
+(define-public ocaml-mparser-re
+  (package
+    (inherit ocaml-mparser)
+    (name "ocaml-mparser-re")
+    (arguments
+     ;; No tests.
+     '(#:package "mparser-re"
+       #:tests? #f))
+    (propagated-inputs
+     `(("ocaml-mparser" ,ocaml-mparser)
+       ("ocaml-re" ,ocaml-re)))
+    (synopsis "MParser plugin for RE-based regular expressions")
+    (description "This package provides RE-based regular expressions
+support for Mparser.")))
+
 (define-public lablgtk3
   (package
     (name "lablgtk")
-- 
2.32.0

[bug#49101] [PATCH v3 6/6] gnu: Add ocaml-mparser-pcre.

[Xinglu Chen]

* gnu/packages/ocaml.scm (ocaml-mparser-pcre): New variable.
---
 gnu/packages/ocaml.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 3455161553..1c7f4db18f 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6835,6 +6835,21 @@ the FParsec library for FSharp by Stephan Tolksdorf.")
     (description "This package provides RE-based regular expressions
 support for Mparser.")))
 
+(define-public ocaml-mparser-pcre
+  (package
+    (inherit ocaml-mparser)
+    (name "ocaml-mparser-pcre")
+    (arguments
+     ;; No tests.
+     '(#:package "mparser-pcre"
+       #:tests? #f))
+    (propagated-inputs
+     `(("ocaml-mparser" ,ocaml-mparser)
+       ("ocaml-pcre" ,ocaml-pcre)))
+    (synopsis "MParser plugin for PCRE-based regular expressions")
+    (description "This package provides PCRE-based regular expressions
+support for Mparser.")))
+
 (define-public lablgtk3
   (package
     (name "lablgtk")
-- 
2.32.0

bug#49101: [PATCH v3 0/6] Add ocaml-mparser & friends

[Julien Lepiller]

Pushed to master as 376b16e9a180ddef1aca795a3acf2512561976ef to
dcd94ee855fa03596a8e84b7cffe1344bb6206ef, thank you!