From: Julien Lepiller <julien@lepiller.eu>
To: pukkamustard <pukkamustard@posteo.net>
Cc: 45498@debbugs.gnu.org
Subject: [bug#45498] [PATCH 09/12] gnu: Add ocaml-odoc.
Date: Mon, 28 Dec 2020 15:02:05 +0100 [thread overview]
Message-ID: <20201228150205.27644e52@tachikoma.lepiller.eu> (raw)
In-Reply-To: <20201228124718.24736-9-pukkamustard@posteo.net>
Le Mon, 28 Dec 2020 13:47:15 +0100,
pukkamustard <pukkamustard@posteo.net> a écrit :
> * gnu/packages/ocaml.scm (ocaml-odoc): New variable.
> (ocaml4.07-odoc): Inherit from ocaml-odoc and update to 1.5.1.
> ---
> gnu/packages/ocaml.scm | 70
> ++++++++++++++++++++++++++++++------------ 1 file changed, 50
> insertions(+), 20 deletions(-)
>
> diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
> index 6714c266d1..3d94f7c221 100644
> --- a/gnu/packages/ocaml.scm
> +++ b/gnu/packages/ocaml.scm
> @@ -71,6 +71,7 @@
> #:use-module (gnu packages time)
> #:use-module (gnu packages tls)
> #:use-module (gnu packages virtualization)
> + #:use-module (gnu packages web)
> #:use-module (gnu packages web-browsers)
> #:use-module (gnu packages xml)
> #:use-module (gnu packages xorg)
> @@ -5691,10 +5692,10 @@ Usage is simple - add package bisect_ppx when
> building tests, run your tests, then run the Bisect_ppx report tool
> on the generated visitation files.") (license license:mpl2.0)))
>
> -(define-public ocaml4.07-odoc
> +(define-public ocaml-odoc
> (package
> - (name "ocaml4.07-odoc")
> - (version "1.4.2")
> + (name "ocaml-odoc")
> + (version "1.5.2")
> (source
> (origin
> (method git-fetch)
> @@ -5703,26 +5704,23 @@ then run the Bisect_ppx report tool on the
> generated visitation files.") (commit version)))
> (file-name (git-file-name name version))
> (sha256
> - (base32
> "0rvhx139jx6wmlfz355mja6mk03x4swq1xxvk5ky6jzhalq3cf5i"))))
> + (base32
> "0fqfyz48q7ss5bc4c5phmp4s3ka3vc08b8gfk8fvyryvb4bq27jm"))))
> (build-system dune-build-system)
> - (arguments
> - `(#:ocaml ,ocaml-4.07
> - #:findlib ,ocaml4.07-findlib
> - #:dune ,ocaml4.07-dune))
> (inputs
> - `(("ocaml-alcotest" ,(package-with-ocaml4.07 ocaml-alcotest))
> - ("ocaml-markup" ,(package-with-ocaml4.07 ocaml-markup0.8.0))
> - ("ocaml-sexplib" ,ocaml4.07-sexplib)
> - ("ocaml-re" ,(package-with-ocaml4.07 ocaml-re))
> - ("ocaml-uutf" ,(package-with-ocaml4.07 ocaml-uutf))))
> + `(("ocaml-alcotest" ,ocaml-alcotest)
> + ("ocaml-markup" ,ocaml-markup)
> + ("ocaml-sexplib" ,ocaml-sexplib)
> + ("ocaml-re" ,ocaml-re)
> + ("ocaml-uutf" ,ocaml-uutf)))
> (native-inputs
> - `(("ocaml-astring" ,(package-with-ocaml4.07 ocaml-astring))
> - ("ocaml-cmdliner" ,(package-with-ocaml4.07 ocaml-cmdliner))
> - ("ocaml-cppo" ,(package-with-ocaml4.07 ocaml-cppo))
> - ("ocaml-fpath" ,(package-with-ocaml4.07 ocaml-fpath))
> - ("ocaml-result" ,(package-with-ocaml4.07 ocaml-result))
> - ("ocaml-tyxml" ,ocaml4.07-tyxml)
> - ("ocaml-bisect-ppx" ,(package-with-ocaml4.07
> ocaml-bisect-ppx))))
> + `(("ocaml-astring" ,ocaml-astring)
> + ("ocaml-cmdliner" ,ocaml-cmdliner)
> + ("ocaml-cppo" ,ocaml-cppo)
> + ("ocaml-fpath" ,ocaml-fpath)
> + ("ocaml-result" ,ocaml-result)
> + ("ocaml-tyxml" ,ocaml-tyxml)
> + ("ocaml-bisect-ppx" ,ocaml-bisect-ppx)
> + ("tidy-html" ,tidy-html)))
> (home-page "https://github.com/ocaml/odoc")
> (synopsis "OCaml documentation generator")
> (description "Odoc is a documentation generator for OCaml. It
> reads @@ -5734,6 +5732,38 @@ advantage over ocamldoc is an accurate
> cross-referencer, which handles the complexity of the OCaml module
> system.") (license license:isc)))
Similarly, I would add a property to the previous package, so
package-with-ocaml4.07 works properly.
> +(define-public ocaml4.07-odoc
> + (package-with-ocaml4.07
> + (package
> + (inherit ocaml-odoc)
> + (name "ocaml-odoc")
> + ;; version 1.5.2 requires ocaml-markdown 1.0.0 which does not
> compile
> + ;; with old version of dune used in package-with-ocaml4.07
> + (version "1.5.1")
> + (source
> + (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/ocaml/odoc")
> + (commit version)))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32
> "0z2nisg1vb5xlk41hqw8drvj90v52wli7zvnih6a844cg6xsvvj2"))))
> + (inputs
> + `(("ocaml-alcotest" ,ocaml-alcotest)
> + ("ocaml-markup" ,ocaml-markup0.8.0)
> + ("ocaml-sexplib" ,ocaml4.07-sexplib)
> + ("ocaml-re" ,ocaml-re)
> + ("ocaml-uutf" ,ocaml-uutf)))
> + (native-inputs
> + `(("ocaml-astring" ,ocaml-astring)
> + ("ocaml-cmdliner" ,ocaml-cmdliner)
> + ("ocaml-cppo" ,ocaml-cppo)
> + ("ocaml-fpath" ,ocaml-fpath)
> + ("ocaml-result" ,ocaml-result)
> + ("ocaml-tyxml" ,ocaml4.07-tyxml)
> + ("ocaml-bisect-ppx" ,ocaml-bisect-ppx))))))
> +
> (define-public ocaml4.07-fftw3
> (package
> (name "ocaml4.07-fftw3")
next prev parent reply other threads:[~2020-12-28 14:03 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-28 12:40 [bug#45498] [PATCH 00/12] Add ocaml-merlin pukkamustard
2020-12-28 12:47 ` [bug#45498] [PATCH 01/12] gnu: Remove ocaml-js-build-tools pukkamustard
2020-12-28 12:47 ` [bug#45498] [PATCH 02/12] gnu: Add ocaml-sexplib pukkamustard
2020-12-28 12:47 ` [bug#45498] [PATCH 03/12] gnu: Add ocaml-base pukkamustard
2020-12-28 12:47 ` [bug#45498] [PATCH 04/12] gnu: Add ocaml-parsexp pukkamustard
2020-12-28 12:47 ` [bug#45498] [PATCH 05/12] gnu: Add ocaml-sexplib pukkamustard
2020-12-28 12:47 ` [bug#45498] [PATCH 06/12] gnu: Add ocaml-ounit2 pukkamustard
2020-12-28 12:47 ` [bug#45498] [PATCH 07/12] gnu: ocaml-tyxml: Update to 4.4.0 pukkamustard
2020-12-28 12:47 ` [bug#45498] [PATCH 08/12] gnu: ocaml-markup: Update to 1.0.0 pukkamustard
2020-12-28 13:58 ` Julien Lepiller
2020-12-28 12:47 ` [bug#45498] [PATCH 09/12] gnu: Add ocaml-odoc pukkamustard
2020-12-28 14:02 ` Julien Lepiller [this message]
2020-12-28 12:47 ` [bug#45498] [PATCH 10/12] gnu: Add ocaml-version pukkamustard
2020-12-28 12:47 ` [bug#45498] [PATCH 11/12] gnu: Add ocaml-mdx pukkamustard
2020-12-28 12:47 ` [bug#45498] [PATCH 12/12] gnu: Add ocaml-merlin pukkamustard
2020-12-28 14:06 ` [bug#34412] [bug#45498] [PATCH 00/12] " Julien Lepiller
2020-12-28 18:10 ` pukkamustard
2020-12-28 18:14 ` [bug#45498] [PATCH v2 01/13] gnu: Remove ocaml-js-build-tools pukkamustard
2020-12-28 18:14 ` [bug#45498] [PATCH v2 02/13] gnu: Add ocaml-sexplib0 pukkamustard
2020-12-28 18:14 ` [bug#45498] [PATCH v2 03/13] gnu: Add ocaml-base pukkamustard
2020-12-28 18:14 ` [bug#45498] [PATCH v2 04/13] gnu: Add ocaml-parsexp pukkamustard
2020-12-28 18:14 ` [bug#45498] [PATCH v2 05/13] gnu: Add ocaml-sexplib pukkamustard
2020-12-28 18:14 ` [bug#45498] [PATCH v2 06/13] gnu: Add ocaml-ounit2 pukkamustard
2020-12-28 18:14 ` [bug#45498] [PATCH v2 07/13] gnu: ocaml-tyxml: Update to 4.4.0 pukkamustard
2020-12-28 18:14 ` [bug#45498] [PATCH v2 08/13] gnu: ocaml-markup: Update to 1.0.0 pukkamustard
2020-12-28 18:14 ` [bug#45498] [PATCH v2 09/13] gnu: Add ocaml-odoc pukkamustard
2020-12-28 18:14 ` [bug#45498] [PATCH v2 10/13] gnu: Add ocaml-version pukkamustard
2020-12-28 18:14 ` [bug#45498] [PATCH v2 11/13] gnu: Add ocaml-mdx pukkamustard
2020-12-28 18:14 ` [bug#45498] [PATCH v2 12/13] gnu: Add ocaml-merlin pukkamustard
2020-12-28 18:14 ` [bug#45498] [PATCH v2 13/13] gnu: ocaml-yojson: Make dependencies propagated-inputs pukkamustard
2020-12-28 20:00 ` [bug#45498] [PATCH 00/12] Add ocaml-merlin Julien Lepiller
2020-12-28 21:09 ` pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 01/14] gnu: Remove ocaml-js-build-tools pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 02/14] gnu: Add ocaml-sexplib0 pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 03/14] gnu: Add ocaml-base pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 04/14] gnu: Add ocaml-parsexp pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 05/14] gnu: Add ocaml-sexplib pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 06/14] gnu: Add ocaml-ounit2 pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 07/14] gnu: ocaml-tyxml: Update to 4.4.0 pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 08/14] gnu: ocaml-markup: Update to 1.0.0 pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 09/14] gnu: Add ocaml-odoc pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 10/14] gnu: Add ocaml-version pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 11/14] gnu: Add ocaml-mdx pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 12/14] gnu: ocaml-yojson: Make dependencies propagated-inputs pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 13/14] gnu: Add ocaml-dot-merlin-reader pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 14/14] gnu: Add ocaml-merlin pukkamustard
2020-12-30 13:29 ` bug#45498: [PATCH 00/12] " Julien Lepiller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201228150205.27644e52@tachikoma.lepiller.eu \
--to=julien@lepiller.eu \
--cc=45498@debbugs.gnu.org \
--cc=pukkamustard@posteo.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).