[bug#49203] [PATCH 0/2] Add ocaml-cohttp and dependencies

[bug#49203] [PATCH 0/2] Add ocaml-cohttp and dependencies

[Xinglu Chen]

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

This series adds ‘ocaml-cohttp’, an OCaml library HTTP clients and
servers.

Xinglu Chen (2):
  gnu: Add ocaml-uri-sexp.
  gnu: Add ocaml-cohttp.

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


base-commit: 3c86372e36cecaed1ad55675ce32a14b972406bf
-- 
2.32.0



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

[bug#49203] [PATCH 1/2] gnu: Add ocaml-uri-sexp.

[Xinglu Chen]

* gnu/packages/ocaml.scm (ocaml-uri-sexp): 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 1262c0e303..681d77dd81 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -7071,6 +7071,34 @@ Graphics.open_graph is called.  This library used to be distributed with OCaml
 up to OCaml 4.08.")
     (license license:lgpl2.1+)))
 
+(define-public ocaml-uri-sexp
+  (package
+    (name "ocaml-uri-sexp")
+    (version "4.2.0")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+              (url "https://github.com/mirage/ocaml-uri")
+              (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32
+            "1bgkc66cq00mgnkz3i535srwzwc4cpdsv0mly5dzvvq33451xwf0"))))
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "uri-sexp"
+       #:test-target "."))
+    (propagated-inputs
+      `(("ocaml-uri" ,ocaml-uri)
+        ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv)
+        ("ocaml-sexplib0" ,ocaml-sexplib0)))
+    (native-inputs `(("ocaml-ounit" ,ocaml-ounit)))
+    (home-page "https://github.com/mirage/ocaml-uri")
+    (synopsis "RFC3986 URI/URL parsing library")
+    (description "This package adds S-exp support to @code{ocaml-uri}.")
+    (license license:isc)))
+
 (define-public js-of-ocaml
   (package
     (name "js-of-ocaml")
-- 
2.32.0

[bug#49203] [PATCH 1/2] gnu: Add ocaml-uri-sexp.

[Adu O'Hara]

Thanks for the patches!

There is already an `ocaml-uri`. How about updating that to 4.2.0 
(currently at 4.1.0) and let `ocaml-uri-sexp` inherit from 
ocaml-uri with #:package set to "uri-sexp"?

Another alternatively: remove the #:package argument from 
`ocaml-uri` so that all packages are built (`uri`, `uri-sexp` and 
`uri-re`).

Xinglu Chen <public@yoctocell.xyz> writes:

> * gnu/packages/ocaml.scm (ocaml-uri-sexp): 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 1262c0e303..681d77dd81 100644
> --- a/gnu/packages/ocaml.scm
> +++ b/gnu/packages/ocaml.scm
> @@ -7071,6 +7071,34 @@ Graphics.open_graph is called.  This 
> library used to be distributed with OCaml
>  up to OCaml 4.08.")
>      (license license:lgpl2.1+)))
>  
> +(define-public ocaml-uri-sexp
> +  (package
> +    (name "ocaml-uri-sexp")
> +    (version "4.2.0")
> +    (source
> +      (origin
> +        (method git-fetch)
> +        (uri (git-reference
> +              (url "https://github.com/mirage/ocaml-uri")
> +              (commit (string-append "v" version))))
> +        (file-name (git-file-name name version))
> +        (sha256
> +          (base32
> + 
> "1bgkc66cq00mgnkz3i535srwzwc4cpdsv0mly5dzvvq33451xwf0"))))
> +    (build-system dune-build-system)
> +    (arguments
> +     '(#:package "uri-sexp"
> +       #:test-target "."))
> +    (propagated-inputs
> +      `(("ocaml-uri" ,ocaml-uri)
> +        ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv)
> +        ("ocaml-sexplib0" ,ocaml-sexplib0)))
> +    (native-inputs `(("ocaml-ounit" ,ocaml-ounit)))
> +    (home-page "https://github.com/mirage/ocaml-uri")
> +    (synopsis "RFC3986 URI/URL parsing library")
> +    (description "This package adds S-exp support to 
> @code{ocaml-uri}.")
> +    (license license:isc)))
> +
>  (define-public js-of-ocaml
>    (package
>      (name "js-of-ocaml")

[bug#49203] [PATCH 1/2] gnu: Add ocaml-uri-sexp.

[Xinglu Chen]

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

On Thu, Jun 24 2021, Adu O'Hara wrote:

> Thanks for the patches!
>
> There is already an `ocaml-uri`. How about updating that to 4.2.0 
> (currently at 4.1.0) and let `ocaml-uri-sexp` inherit from 
> ocaml-uri with #:package set to "uri-sexp"?

That could probably be done in a separate patch series; this series is
about adding ‘ocaml-cohttp’.

> Another alternatively: remove the #:package argument from 
> `ocaml-uri` so that all packages are built (`uri`, `uri-sexp` and 
> `uri-re`).

Those are three separate packages on Opam, so I don’t think it makes
sense for us to merge them into one.  Not everyone who installs
‘ocaml-uri’ is going to want ‘ocaml-uri-sexp’ and ‘ocaml-uri-re’.

WDYT?


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

[bug#49203] [PATCH 1/2] gnu: Add ocaml-uri-sexp.

[Adu O'Hara]

Xinglu Chen <public@yoctocell.xyz> writes:

> On Thu, Jun 24 2021, Adu O'Hara wrote:
>
>> Thanks for the patches!
>>
>> There is already an `ocaml-uri`. How about updating that to 
>> 4.2.0 
>> (currently at 4.1.0) and let `ocaml-uri-sexp` inherit from 
>> ocaml-uri with #:package set to "uri-sexp"?
>
> That could probably be done in a separate patch series; this 
> series is
> about adding ‘ocaml-cohttp’.

True, what I was suggesting would add another patch to the series 
and mix up intentions of the series. Still, I'd suggest for 
ocaml-uri-sexp to inherit from ocaml-uri. Otherwise we have them 
at two different versions.

wdyt?

>
>> Another alternatively: remove the #:package argument from 
>> `ocaml-uri` so that all packages are built (`uri`, `uri-sexp` 
>> and 
>> `uri-re`).
>
> Those are three separate packages on Opam, so I don’t think it 
> makes
> sense for us to merge them into one.  Not everyone who installs
> ‘ocaml-uri’ is going to want ‘ocaml-uri-sexp’ and 
> ‘ocaml-uri-re’.
>
> WDYT?

Yeah, that make sense. Keeping them separate sounds good.

[bug#49203] [PATCH 1/2] gnu: Add ocaml-uri-sexp.

[Xinglu Chen]

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

On Thu, Jun 24 2021, Adu O'Hara wrote:

> Xinglu Chen <public@yoctocell.xyz> writes:
>
>> On Thu, Jun 24 2021, Adu O'Hara wrote:
>>
>>> Thanks for the patches!
>>>
>>> There is already an `ocaml-uri`. How about updating that to 
>>> 4.2.0 
>>> (currently at 4.1.0) and let `ocaml-uri-sexp` inherit from 
>>> ocaml-uri with #:package set to "uri-sexp"?
>>
>> That could probably be done in a separate patch series; this 
>> series is
>> about adding ‘ocaml-cohttp’.
>
> True, what I was suggesting would add another patch to the series 
> and mix up intentions of the series.

Sorry, I don’t get what you are trying to say here.

> Still, I'd suggest for ocaml-uri-sexp to inherit from
> ocaml-uri. Otherwise we have them at two different versions.

I think it makes more sense to do that in a separate series since
updating ‘ocaml-uri’ isn’t really related to adding ‘ocaml-cohttp’.


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

[bug#49203] [PATCH 1/2] gnu: Add ocaml-uri-sexp.

[Adu O'Hara]

Xinglu Chen <public@yoctocell.xyz> writes:

>> True, what I was suggesting would add another patch to the 
>> series 
>> and mix up intentions of the series.
>
> Sorry, I don’t get what you are trying to say here.
>
>> Still, I'd suggest for ocaml-uri-sexp to inherit from
>> ocaml-uri. Otherwise we have them at two different versions.
>
> I think it makes more sense to do that in a separate series 
> since
> updating ‘ocaml-uri’ isn’t really related to adding 
> ‘ocaml-cohttp’.

Sorry for being unclear. Here's what I mean:

(define-public ocaml-uri-sexp
  (package
    (inherit ocaml-uri)
    (name "ocaml-uri-sexp")
    (arguments
     `(#:package "uri-sexp"
       #:test-target "."))
    (propagated-inputs
      `(("ocaml-uri" ,ocaml-uri)
        ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv)
        ("ocaml-sexplib0" ,ocaml-sexplib0)))
    (native-inputs `(("ocaml-ounit" ,ocaml-ounit)))))

Then when `ocaml-uri` eventually gets updated `ocaml-uri` and 
`ocaml-uri-sexp` will be at same version.

[bug#49203] [PATCH 1/2] gnu: Add ocaml-uri-sexp.

[Xinglu Chen]

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

On Fri, Jun 25 2021, Adu O'Hara wrote:

> Xinglu Chen <public@yoctocell.xyz> writes:
>
>>> True, what I was suggesting would add another patch to the 
>>> series 
>>> and mix up intentions of the series.
>>
>> Sorry, I don’t get what you are trying to say here.
>>
>>> Still, I'd suggest for ocaml-uri-sexp to inherit from
>>> ocaml-uri. Otherwise we have them at two different versions.
>>
>> I think it makes more sense to do that in a separate series 
>> since
>> updating ‘ocaml-uri’ isn’t really related to adding 
>> ‘ocaml-cohttp’.
>
> Sorry for being unclear. Here's what I mean:
>
> (define-public ocaml-uri-sexp
>   (package
>     (inherit ocaml-uri)
>     (name "ocaml-uri-sexp")
>     (arguments
>      `(#:package "uri-sexp"
>        #:test-target "."))
>     (propagated-inputs
>       `(("ocaml-uri" ,ocaml-uri)
>         ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv)
>         ("ocaml-sexplib0" ,ocaml-sexplib0)))
>     (native-inputs `(("ocaml-ounit" ,ocaml-ounit)))))
>
> Then when `ocaml-uri` eventually gets updated `ocaml-uri` and 
> `ocaml-uri-sexp` will be at same version.

But ‘ocaml-uri’ would first have to be updated to the latest version,
which I think is out of scope of this series.

Once this series gets merged, I think it would be great to update
‘ocaml-uri’, and then make ‘ocaml-uri-sexp’ inherit from it.

WDYT?

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

[bug#49203] [PATCH 1/2] gnu: Add ocaml-uri-sexp.

[Julien Lepiller]

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

Hi, what matters is that patches focus on one thing, and one one. I agree with Adu here, we should make sure uri anl uri-sexp are the same version. If you really don't want to do that in this series, send it as another series, and make it blocking for this one. I'll try to merge your work this week-end.

Le 25 juin 2021 06:58:06 GMT-04:00, Xinglu Chen <public@yoctocell.xyz> a écrit :
>On Fri, Jun 25 2021, Adu O'Hara wrote:
>
>> Xinglu Chen <public@yoctocell.xyz> writes:
>>
>>>> True, what I was suggesting would add another patch to the 
>>>> series 
>>>> and mix up intentions of the series.
>>>
>>> Sorry, I don’t get what you are trying to say here.
>>>
>>>> Still, I'd suggest for ocaml-uri-sexp to inherit from
>>>> ocaml-uri. Otherwise we have them at two different versions.
>>>
>>> I think it makes more sense to do that in a separate series 
>>> since
>>> updating ‘ocaml-uri’ isn’t really related to adding 
>>> ‘ocaml-cohttp’.
>>
>> Sorry for being unclear. Here's what I mean:
>>
>> (define-public ocaml-uri-sexp
>>   (package
>>     (inherit ocaml-uri)
>>     (name "ocaml-uri-sexp")
>>     (arguments
>>      `(#:package "uri-sexp"
>>        #:test-target "."))
>>     (propagated-inputs
>>       `(("ocaml-uri" ,ocaml-uri)
>>         ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv)
>>         ("ocaml-sexplib0" ,ocaml-sexplib0)))
>>     (native-inputs `(("ocaml-ounit" ,ocaml-ounit)))))
>>
>> Then when `ocaml-uri` eventually gets updated `ocaml-uri` and 
>> `ocaml-uri-sexp` will be at same version.
>
>But ‘ocaml-uri’ would first have to be updated to the latest version,
>which I think is out of scope of this series.
>
>Once this series gets merged, I think it would be great to update
>‘ocaml-uri’, and then make ‘ocaml-uri-sexp’ inherit from it.
>
>WDYT?

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

[bug#49203] [PATCH 1/2] gnu: Add ocaml-uri-sexp.

[Xinglu Chen]

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

On Fri, Jun 25 2021, Julien Lepiller wrote:

> Hi, what matters is that patches focus on one thing, and one one. I
> agree with Adu here, we should make sure uri anl uri-sexp are the same
> version. If you really don't want to do that in this series, send it
> as another series, and make it blocking for this one. I'll try to
> merge your work this week-end.

Cool, I will send another series that updates ‘ocaml-uri’.

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

[bug#49203] [PATCH 2/2] gnu: Add ocaml-cohttp.

[Xinglu Chen]

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

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 681d77dd81..5e9883d604 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -7099,6 +7099,44 @@ up to OCaml 4.08.")
     (description "This package adds S-exp support to @code{ocaml-uri}.")
     (license license:isc)))
 
+(define-public ocaml-cohttp
+  (package
+    (name "ocaml-cohttp")
+    (version "4.0.0")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+              (url "https://github.com/mirage/ocaml-cohttp")
+              (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32
+            "02d7417yy1i62by368w3wyw3756047pbrw69spcvz3cd1z7vqaci"))))
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "cohttp"
+       #:test-target "cohttp_test/src"))
+    (propagated-inputs
+      `(("ocaml-re" ,ocaml-re)
+        ("ocaml-uri" ,ocaml-uri)
+        ("ocaml-uri-sexp" ,ocaml-uri-sexp)
+        ("ocaml-sexplib0" ,ocaml-sexplib0)
+        ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv)
+        ("ocaml-stringext" ,ocaml-stringext)
+        ("ocaml-base64" ,ocaml-base64)))
+    (native-inputs
+      `(("ocaml-fmt" ,ocaml-fmt)
+        ("ocaml-jsonm" ,ocaml-jsonm)
+        ("ocaml-alcotest" ,ocaml-alcotest)))
+    (home-page "https://github.com/mirage/ocaml-cohttp")
+    (synopsis "OCaml library for HTTP clients and servers")
+    (description
+      "Cohttp is an OCaml library for creating HTTP daemons.  It has a portable
+HTTP parser, and implementations using various asynchronous programming
+libraries.")
+    (license license:isc)))
+
 (define-public js-of-ocaml
   (package
     (name "js-of-ocaml")
-- 
2.32.0

[bug#49203] [PATCH v2 0/2] Add ocaml-cohttp and dependencies

[Xinglu Chen]

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

Changes since v1:

* Make ‘ocaml-uri-sexp’ inherit from ‘ocaml-uri’ which has been updated
  to version 4.2.0 once <https://issues.guix.gnu.org/49222> has been
  merged.

Xinglu Chen (2):
  gnu: Add ocaml-uri-sexp.
  gnu: Add ocaml-cohttp.

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


base-commit: c2f71356a7996cc68c2f387d9d8f18ad85caa0c2
-- 
2.32.0




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

[bug#49203] [PATCH v2 1/2] gnu: Add ocaml-uri-sexp.

[Xinglu Chen]

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

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 0eb63b94d4..60a14ce87c 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -7071,6 +7071,20 @@ Graphics.open_graph is called.  This library used to be distributed with OCaml
 up to OCaml 4.08.")
     (license license:lgpl2.1+)))
 
+(define-public ocaml-uri-sexp
+  (package
+    (inherit ocaml-uri)
+    (arguments
+     '(#:package "uri-sexp"
+       #:test-target "."))
+    (propagated-inputs
+      `(("ocaml-uri" ,ocaml-uri)
+        ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv)
+        ("ocaml-sexplib0" ,ocaml-sexplib0)))
+    (native-inputs `(("ocaml-ounit" ,ocaml-ounit)))
+    (synopsis "RFC3986 URI/URL parsing library")
+    (description "This package adds S-exp support to @code{ocaml-uri}.")))
+
 (define-public js-of-ocaml
   (package
     (name "js-of-ocaml")
-- 
2.32.0

[bug#49203] [PATCH v2 2/2] gnu: Add ocaml-cohttp.

[Xinglu Chen]

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

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 60a14ce87c..6d90044f4d 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -7085,6 +7085,44 @@ up to OCaml 4.08.")
     (synopsis "RFC3986 URI/URL parsing library")
     (description "This package adds S-exp support to @code{ocaml-uri}.")))
 
+(define-public ocaml-cohttp
+  (package
+    (name "ocaml-cohttp")
+    (version "4.0.0")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+              (url "https://github.com/mirage/ocaml-cohttp")
+              (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32
+            "02d7417yy1i62by368w3wyw3756047pbrw69spcvz3cd1z7vqaci"))))
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "cohttp"
+       #:test-target "cohttp_test/src"))
+    (propagated-inputs
+      `(("ocaml-re" ,ocaml-re)
+        ("ocaml-uri" ,ocaml-uri)
+        ("ocaml-uri-sexp" ,ocaml-uri-sexp)
+        ("ocaml-sexplib0" ,ocaml-sexplib0)
+        ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv)
+        ("ocaml-stringext" ,ocaml-stringext)
+        ("ocaml-base64" ,ocaml-base64)))
+    (native-inputs
+      `(("ocaml-fmt" ,ocaml-fmt)
+        ("ocaml-jsonm" ,ocaml-jsonm)
+        ("ocaml-alcotest" ,ocaml-alcotest)))
+    (home-page "https://github.com/mirage/ocaml-cohttp")
+    (synopsis "OCaml library for HTTP clients and servers")
+    (description
+      "Cohttp is an OCaml library for creating HTTP daemons.  It has a portable
+HTTP parser, and implementations using various asynchronous programming
+libraries.")
+    (license license:isc)))
+
 (define-public js-of-ocaml
   (package
     (name "js-of-ocaml")
-- 
2.32.0

bug#49203: [PATCH v2 0/2] Add ocaml-cohttp and dependencies

[Julien Lepiller]

Pushed as
e366b94f9fd1338a94e80e83d0b060fac65ad2f4
and 364b56124b88398c199aacbfd4fdfc9a1583e634, thank you!

Note that in ocaml-uri-sexp, I added a name to the package, so it can
be built from the CLI :)

[bug#49203] [PATCH v2 0/2] Add ocaml-cohttp and dependencies

[Xinglu Chen]

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

On Sun, Jun 27 2021, Julien Lepiller wrote:

> Pushed as
> e366b94f9fd1338a94e80e83d0b060fac65ad2f4
> and 364b56124b88398c199aacbfd4fdfc9a1583e634, thank you!
>
> Note that in ocaml-uri-sexp, I added a name to the package, so it can
> be built from the CLI :)

Oh, good catch! :)

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