[bug#54596] [PATCH 0/1] Fix ocaml-odoc by updating to 2.2.0-alpha

[bug#54596] [PATCH 0/1] Fix ocaml-odoc by updating to 2.2.0-alpha

[pukkamustard]

Hello Guix,

ocaml-odoc (2.1.0) does not seem to pass tests with recently updated dune
(3.0.3).

This has been fixed upstream:

https://github.com/ocaml/odoc/commit/6ac97f3148f7791ec7451785ef4dbd9ca0daf2d1

and pre-released with a 2.2.0-alpha tag:

https://github.com/ocaml/odoc/releases/tag/2.2.0-alpha

Following patch updates ocaml-odoc to 2.2.0-alpha and fixes the build.

Updating to 2.2.0-alpha seems like a slightly better hack than adding a patch
with the upstream fix. 

Regards,
pukkamustard

pukkamustard (1):
  gnu: ocaml-odoc: Update to 2.2.0-alpha.

 gnu/packages/ocaml.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

-- 
2.34.0

[bug#54596] [PATCH 1/1] gnu: ocaml-odoc: Update to 2.2.0-alpha.

[pukkamustard]

* gnu/packages/ocaml.scm (ocaml-odoc): Update to 2.2.0-alpha.
---
 gnu/packages/ocaml.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 78eab203de..cb461bf257 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6766,7 +6766,9 @@ (define-public ocaml4.07-bisect-ppx
 (define-public ocaml-odoc
   (package
     (name "ocaml-odoc")
-    (version "2.1.0")
+    ;; 2.2.0-alpha contains fixes for Dune 3.0 compatibility
+    ;; (https://github.com/ocaml/odoc/commit/6ac97f3148f7791ec7451785ef4dbd9ca0daf2d1)
+    (version "2.2.0-alpha")
     (source
      (origin
        (method git-fetch)
@@ -6775,7 +6777,7 @@ (define-public ocaml-odoc
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1ycb468pc6vsvqj176j99bmbkrr9saxvyn9qhpazi01abbcq5d90"))))
+        (base32 "07zjkk455l51i29lcayzrc1q8j5bvbv97sscv8yhcj7x6h6q2nag"))))
     (build-system dune-build-system)
     (arguments
      `(#:phases
-- 
2.34.0

[bug#54596] [PATCH 0/1] Fix ocaml-odoc by updating to 2.2.0-alpha

[zimoun]

Hi,

On Sun, 27 Mar 2022 at 13:39, pukkamustard <pukkamustard@posteo.net> wrote:

> pukkamustard (1):
>   gnu: ocaml-odoc: Update to 2.2.0-alpha.
>
>  gnu/packages/ocaml.scm | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)

I propose to include this patch in the series #53882 and close this
submission.  WDYT?


Cheers,
simon

bug#54596: [PATCH 0/1] Fix ocaml-odoc by updating to 2.2.0-alpha

[pukkamustard]

Hi,

zimoun <zimon.toutoune@gmail.com> writes:

> I propose to include this patch in the series #53882 and close this
> submission.  WDYT?

Ok for me. Closing this issue.

Cheers,
pukkamustard