From: Benjamin <benjamin@uvy.fr>
To: 64209@debbugs.gnu.org
Cc: Benjamin <benjamin@uvy.fr>, Julien Lepiller <julien@lepiller.eu>,
pukkamustard <pukkamustard@posteo.net>
Subject: [bug#64209] [PATCH v2 00/14] Reorder commits and better descriptions
Date: Tue, 8 Aug 2023 15:22:57 +0200 [thread overview]
Message-ID: <cover.1691500834.git.benjamin@uvy.fr> (raw)
In-Reply-To: <cover.1687361650.git.benjamin@uvy.fr>
Hi
I’am updating, my first series of patches.
I bumped ocaml-lsp-server to latest patch
> There seems to be an issue with the ordering of the patches. I can not
> build ocaml-dune-rpc, as it requires ocaml-ordering which is only
> available a couple of commits later.
I reordered commits so that each package can be built for each commit
> Could you explain why the 'remove-vendor phase is needed? It seems like
> if code is vendored it should maybe also be removed in the `dune`
> package?
I did this because I saw that opam build is doing this way :
https://github.com/ocaml/dune/blob/main/dyn.opam#L21-L22
If those vendor files are not remove, there was some errors when
building ocaml-stdune
```
File "otherlibs/stdune/path.mli", line 1:
Error: The files otherlibs/stdune/.stdune.objs/byte/stdune__Path_intf.cmi
and /gnu/store/wig75gdqm284z6y89dcd75fmxzim307a-ocaml5.0-pp-1.1.2/lib/ocaml/site-lib/pp/pp.cmi
make inconsistent assumptions over interface Pp
error: in phase 'build': uncaught exception:
%exception #<&invoke-error program: "dune" arguments: ("build" "@install" "-p" "stdune") exit-status: 1 term-signal: #f stop-signal: #f>
phase `build' failed after 1.8 seconds
command "dune" "build" "@install" "-p" "stdune" failed with status 1
builder for `/gnu/store/cb2n85al5bqn6q3pcaiil01p9wvfbpvw-ocaml5.0-stdune-3.6.1.drv' failed with exit code 1
build of /gnu/store/cb2n85al5bqn6q3pcaiil01p9wvfbpvw-ocaml5.0-stdune-3.6.1.drv failed
```
Because it has been repeated for each dune sublibraries, it probably
make sense to share this part of the code.
Though I don't know if we can directly do that for dune as those
vendoring are not removed here https://github.com/ocaml/dune/blob/main/dune.opam
> We need a more descriptive description.
> I guess the descriptions come from OPAM. Unfortunately Guix has stricter
> requirements than OPAM...:)
You are right, I just took descriptions from opam and did not edit them
I updated some of the description and synopsis. Tell if it is enough.
As I don't exactly know what packages are doing, I just picked up descriptions
from source files comments
Tell me if you have other comments on those patches
Best
Benjamin
Benjamin (14):
gnu: Fix ocaml-dune-build-info
gnu: Add ocaml-pp.
gnu: Add ocamlformat-rpc-lib.
gnu: Add ocaml-ppx-yojson-conv-lib.
gnu: Add ocaml-ordering.
gnu: Add ocaml-dyn.
gnu: Add ocaml-stdune.
gnu: Add ocaml-chrome-trace.
gnu: Add ocaml-xdg.
gnu: Add ocamlc-loc.
gnu: Add ocaml-fiber.
gnu: Add ocaml-dune-rpc.
gnu: Add ocaml-merlin-lib-4.9.
gnu: Add ocaml-lsp-server.
gnu/packages/ocaml.scm | 295 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 294 insertions(+), 1 deletion(-)
base-commit: b20e5bcafd9654a767ffb78eefd7494f73ca67c8
--
2.41.0
next prev parent reply other threads:[~2023-08-08 13:24 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-21 15:45 [bug#64209] [PATCH 00/14] Add ocaml-lsp-server and its dependencies Benjamin
2023-06-21 15:48 ` [bug#64209] [PATCH 01/14] gnu: Fix ocaml-dune-build-info Benjamin
2023-06-21 15:48 ` [bug#64209] [PATCH 02/14] gnu: Add ocaml-dune-rpc Benjamin
2023-06-21 15:48 ` [bug#64209] [PATCH 03/14] gnu: Add ocaml-chrome-trace Benjamin
2023-06-21 15:48 ` [bug#64209] [PATCH 04/14] gnu: Add ocaml-dyn Benjamin
2023-06-21 15:48 ` [bug#64209] [PATCH 05/14] gnu: Add ocaml-stdune Benjamin
2023-06-21 15:48 ` [bug#64209] [PATCH 06/14] gnu: Add ocaml-fiber Benjamin
2023-06-21 15:48 ` [bug#64209] [PATCH 07/14] gnu: Add ocaml-xdg Benjamin
2023-06-21 15:48 ` [bug#64209] [PATCH 08/14] gnu: Add ocaml-ordering Benjamin
2023-06-21 15:48 ` [bug#64209] [PATCH 09/14] gnu: Add ocamlc-loc Benjamin
2023-06-21 15:48 ` [bug#64209] [PATCH 10/14] gnu: Add ocamlformat-rpc-lib Benjamin
2023-06-21 15:48 ` [bug#64209] [PATCH 11/14] gnu: Add ocaml-pp Benjamin
2023-06-21 15:48 ` [bug#64209] [PATCH 12/14] gnu: Add ocaml-ppx-yojson-conv-lib Benjamin
2023-06-21 15:48 ` [bug#64209] [PATCH 13/14] gnu: Add ocaml-merlin-lib-4.9 Benjamin
2023-06-21 15:48 ` [bug#64209] [PATCH 14/14] gnu: Add ocaml-lsp-server Benjamin
2023-07-18 11:52 ` [bug#64209] [PATCH 00/14] Add ocaml-lsp-server and its dependencies Ludovic Courtès
2023-08-06 20:25 ` pukkamustard
2023-08-08 13:22 ` Benjamin [this message]
2023-08-08 13:22 ` [bug#64209] [PATCH v2 01/14] gnu: Fix ocaml-dune-build-info Benjamin
2023-08-08 13:22 ` [bug#64209] [PATCH v2 02/14] gnu: Add ocaml-pp Benjamin
2023-08-08 13:23 ` [bug#64209] [PATCH v2 03/14] gnu: Add ocamlformat-rpc-lib Benjamin
2023-08-08 13:23 ` [bug#64209] [PATCH v2 04/14] gnu: Add ocaml-ppx-yojson-conv-lib Benjamin
2023-08-08 13:23 ` [bug#64209] [PATCH v2 05/14] gnu: Add ocaml-ordering Benjamin
2023-08-08 13:23 ` [bug#64209] [PATCH v2 06/14] gnu: Add ocaml-dyn Benjamin
2023-08-08 13:23 ` [bug#64209] [PATCH v2 07/14] gnu: Add ocaml-stdune Benjamin
2023-08-08 13:23 ` [bug#64209] [PATCH v2 08/14] gnu: Add ocaml-chrome-trace Benjamin
2023-08-08 13:23 ` [bug#64209] [PATCH v2 09/14] gnu: Add ocaml-xdg Benjamin
2023-08-08 13:23 ` [bug#64209] [PATCH v2 10/14] gnu: Add ocamlc-loc Benjamin
2023-08-08 13:23 ` [bug#64209] [PATCH v2 11/14] gnu: Add ocaml-fiber Benjamin
2023-08-08 13:23 ` [bug#64209] [PATCH v2 12/14] gnu: Add ocaml-dune-rpc Benjamin
2023-08-08 13:23 ` [bug#64209] [PATCH v2 13/14] gnu: Add ocaml-merlin-lib-4.9 Benjamin
2023-08-08 13:23 ` [bug#64209] [PATCH v2 14/14] gnu: Add ocaml-lsp-server Benjamin
2023-10-14 9:37 ` [bug#64209] [PATCH v2 00/14] Reorder commits and better descriptions pukkamustard
2023-11-10 15:46 ` [bug#64209] [PATCH v3 00/14] improve synopsies and descriptions Benjamin
2023-11-10 15:46 ` [bug#64209] [PATCH v3 01/14] gnu: Fix ocaml-dune-build-info Benjamin
2023-11-10 15:46 ` [bug#64209] [PATCH v3 02/14] gnu: Add ocaml-pp Benjamin
2023-11-10 15:46 ` [bug#64209] [PATCH v3 03/14] gnu: Add ocamlformat-rpc-lib Benjamin
2023-11-10 15:46 ` [bug#64209] [PATCH v3 04/14] gnu: Add ocaml-ppx-yojson-conv-lib Benjamin
2023-11-10 15:46 ` [bug#64209] [PATCH v3 05/14] gnu: Add ocaml-ordering Benjamin
2023-11-10 15:46 ` [bug#64209] [PATCH v3 06/14] gnu: Add ocaml-dyn Benjamin
2023-11-10 15:46 ` [bug#64209] [PATCH v3 07/14] gnu: Add ocaml-stdune Benjamin
2023-11-10 15:46 ` [bug#64209] [PATCH v3 08/14] gnu: Add ocaml-chrome-trace Benjamin
2023-11-10 15:46 ` [bug#64209] [PATCH v3 09/14] gnu: Add ocaml-xdg Benjamin
2023-11-10 15:46 ` [bug#64209] [PATCH v3 10/14] gnu: Add ocamlc-loc Benjamin
2023-11-10 15:46 ` [bug#64209] [PATCH v3 11/14] gnu: Add ocaml-fiber Benjamin
2023-11-10 15:46 ` [bug#64209] [PATCH v3 12/14] gnu: Add ocaml-dune-rpc Benjamin
2023-11-10 15:46 ` [bug#64209] [PATCH v3 13/14] gnu: Add ocaml-merlin-lib-4.9 Benjamin
2023-11-10 15:46 ` [bug#64209] [PATCH v3 14/14] gnu: Add ocaml-lsp-server Benjamin
2024-03-23 23:35 ` [bug#64209] [PATCH v4 00/11] Update with rebase on master Benjamin via Guix-patches via
2024-03-23 23:35 ` [bug#64209] [PATCH v4 01/11] gnu: Fix dune-ordering Benjamin via Guix-patches via
2024-03-23 23:35 ` [bug#64209] [PATCH v4 02/11] gnu: Add ocaml-ppx-yojson-conv-lib Benjamin via Guix-patches via
2024-03-23 23:35 ` [bug#64209] [PATCH v4 03/11] gnu: Fix ocaml-dune-build-info Benjamin via Guix-patches via
2024-03-23 23:35 ` [bug#64209] [PATCH v4 04/11] gnu: Add ocaml-xdg Benjamin via Guix-patches via
2024-03-23 23:35 ` [bug#64209] [PATCH v4 05/11] gnu: Add dune-rpc Benjamin via Guix-patches via
2024-03-23 23:35 ` [bug#64209] [PATCH v4 06/11] gnu: Add ocamlc-loc Benjamin via Guix-patches via
2024-03-23 23:35 ` [bug#64209] [PATCH v4 07/11] gnu: Add ocaml-chrome-trace Benjamin via Guix-patches via
2024-03-23 23:35 ` [bug#64209] [PATCH v4 08/11] gnu: Add ocaml-fiber Benjamin via Guix-patches via
2024-03-23 23:35 ` [bug#64209] [PATCH v4 09/11] gnu: Add ocamlformat-rpc-lib Benjamin via Guix-patches via
2024-03-23 23:35 ` [bug#64209] [PATCH v4 10/11] gnu: ocaml-merlin-lib: Update to 4.14 Benjamin via Guix-patches via
2024-03-23 23:35 ` [bug#64209] [PATCH v4 11/11] gnu: Add ocaml-lsp-server Benjamin via Guix-patches via
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=cover.1691500834.git.benjamin@uvy.fr \
--to=benjamin@uvy.fr \
--cc=64209@debbugs.gnu.org \
--cc=julien@lepiller.eu \
--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).