Message ID | cover.1691500834.git.benjamin@uvy.fr |
---|---|
Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4344927BBE2; Tue, 8 Aug 2023 14:24:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 61B0827BBE9 for <patchwork@mira.cbaines.net>; Tue, 8 Aug 2023 14:24:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1qTMgw-0001cb-Dm; Tue, 08 Aug 2023 09:24:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1qTMgu-0001bs-CD for guix-patches@gnu.org; Tue, 08 Aug 2023 09:24:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1qTMgt-00008s-QI for guix-patches@gnu.org; Tue, 08 Aug 2023 09:24:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1qTMgt-0002jN-Cr; Tue, 08 Aug 2023 09:24:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64209] [PATCH v2 00/14] Reorder commits and better descriptions References: <cover.1687361650.git.benjamin@uvy.fr> In-Reply-To: <cover.1687361650.git.benjamin@uvy.fr> Resent-From: Benjamin <benjamin@uvy.fr> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Tue, 08 Aug 2023 13:24:03 +0000 Resent-Message-ID: <handler.64209.B64209.169150104110467@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64209 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64209@debbugs.gnu.org Cc: Benjamin <benjamin@uvy.fr>, Julien Lepiller <julien@lepiller.eu>, pukkamustard <pukkamustard@posteo.net> X-Debbugs-Original-Xcc: Julien Lepiller <julien@lepiller.eu>, pukkamustard <pukkamustard@posteo.net> Received: via spool by 64209-submit@debbugs.gnu.org id=B64209.169150104110467 (code B ref 64209); Tue, 08 Aug 2023 13:24:03 +0000 Received: (at 64209) by debbugs.gnu.org; 8 Aug 2023 13:24:01 +0000 Received: from localhost ([127.0.0.1]:35579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1qTMgr-0002ia-4D for submit@debbugs.gnu.org; Tue, 08 Aug 2023 09:24:01 -0400 Received: from mail.uvy.fr ([146.59.197.40]:56308) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <benjamin@uvy.fr>) id 1qTMgn-0002hZ-MW for 64209@debbugs.gnu.org; Tue, 08 Aug 2023 09:23:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=uvy.fr; s=202105; t=1691501030; bh=vax80WVkbb7EOfGFZTAl7Lujr8wkPRUcGlNRol9z5no=; h=From:To:Cc:Subject:Date; b=vv2hPoJzJeaN3g44ePR+XSAARyI0OQfa4IgEjjoednZI4wWndbMklLqiIVRzVTKSD tveNNDVzrff0GdgI67PCi6hojgfqqtEm2AXRauiMUuXkcJgWR1AWKrI4z/6Xt/+pKn 00+z2kGen50PFwwxfXywe6sFItgBv7KoAW80KMfmBpTm6X5V0m+T0US4KX4rmGdsGi CZM7hbCEsJsWmyTzjq58jj97Y/hOU6FULbQN/d558MSCNkmU6E32gzINytIi3Rli/t h8kcZiGeSMlKT74r3Sn/f6DhjHFR3QvxeA4x/7HIkivLNmDZTtq4WgfCol064ry3Qd F6tiVUaqTONhg== From: Benjamin <benjamin@uvy.fr> Date: Tue, 8 Aug 2023 15:22:57 +0200 Message-ID: <cover.1691500834.git.benjamin@uvy.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches |
Series |
Reorder commits and better descriptions
|
|
Message
Benjamin
Aug. 8, 2023, 1:22 p.m. UTC
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
Comments
Hi, Thanks for the update. I haven't been able to check it thoroughly yet. Unfortunately the synopsis/descriptions still need a bit of polish. For example (non-exhaustive): - ocaml-pp: The synopsis should indicate that it is an OCaml library. For markup (in this case hyerplinks) you must use the Texinfo markup (see https://guix.gnu.org/manual/en/guix.html#Synopses-and-Descriptions). - ocamlformat-rpc-lib: Final sentence is missing a punctuation. - ocaml-ppx-yojson-conv-lib: See ocaml-ppx-fields-conv for an example of a better description/synopsis. - ocaml-dyn: Missing punctiation mark. - ocaml-stdune: Not sure about the description. - ocaml-xdg: Description should be more than just a link. Also maybe we first re-solve #63947 (https://issues.guix.gnu.org/63947; friendly ping to Julien) instead of re-fixining it in this series. Cheers, pukkamustard