From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id aBgGFQBC0mRN+QAASxT56A (envelope-from ) for ; Tue, 08 Aug 2023 15:24:16 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id iArCFABC0mRqJAAAauVa8A (envelope-from ) for ; Tue, 08 Aug 2023 15:24:16 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0909F5CCFD for ; Tue, 8 Aug 2023 15:24:16 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=uvy.fr header.s=202105 header.b=vv2hPoJz; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=uvy.fr (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1691501056; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=BP7JLpZwBzIbzeMEkrAeG5Ys4G40rP+ixqyv50WtsrY=; b=n2F163NHB4724YlU84Owe38GIE+2naOuh71hBJct6EqcarQPb9lzymjiRLw84NK91ItvFo TLwXEHU7r9GnAnMUqe2yGiiFZncG++rMm4Hd/TSDd2fAVeQAMkKTmQ7hb6TZW3vkczEg8M z1Vl6EKfI4KmByRLklg+8zMh/KKX+8toPvrlGUiA4JKWDfZiA4v6bmvHbJjt5PwML1F66F FHSTYcpOKmgQH9JWqsfxBieaQG6dFlMUnwHR8y6kVRjI6lOMLBOB9i1YIL/y8ns0IhonXS HDpVAeQlPtOT5s+S+MF0IAdYjLC705G5uRHVYJp4MnSTkjHqiu3nrhUF9g+VeA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=uvy.fr header.s=202105 header.b=vv2hPoJz; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=uvy.fr (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1691501056; a=rsa-sha256; cv=none; b=j5H+fVcMIIiepppafA//IbYcrVh1i+IN9MrVmN9lhAjJJvNqtIGmp8+ve9dbCW7koOJt5N dRrDW73obkSh48XYPQ/ft9aIj83AFUxH2foRzxvatn7ijcJ0dJKiUOriBZ9kR6jL9YxasI Lk2jcfj2QgIT3OipvjoO8ZjcZ9boX+X315GrLOz8+5nkg/NBVzSe+YusdnW7MTk1e0DVZT l4xC7W98Cb9kllZP3CgZucYWYN+cw5U2Zws8HuwpNJWeWw2lX6So3ubsmOfbzsHY07hhVO kBhQd+s/iWjUQWlPHPO1PC/jFyOQFKlyyZ5KBvFmObPLxhRjQcmhBy5aZW9E5Q== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) 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 ) 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 ) 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 ) 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: In-Reply-To: Resent-From: Benjamin Original-Sender: "Debbugs-submit" 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: 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 , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard 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 ) 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 ) 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 Date: Tue, 8 Aug 2023 15:22:57 +0200 Message-ID: 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 0909F5CCFD X-Migadu-Scanner: mx1.migadu.com X-Spam-Score: 3.83 X-Migadu-Spam-Score: 3.83 X-TUID: BOIwBFuhzcoq 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