From patchwork Sat Mar 23 23:35:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin X-Patchwork-Id: 2396 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9B42B27BBE9; Sat, 23 Mar 2024 23:36:40 +0000 (GMT) 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 2F93227BBE2 for ; Sat, 23 Mar 2024 23:36:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1roAuX-0002IQ-92; Sat, 23 Mar 2024 19:36:25 -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 1roAuU-0002I2-Uq for guix-patches@gnu.org; Sat, 23 Mar 2024 19:36:22 -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 1roAuU-0002gR-MH for guix-patches@gnu.org; Sat, 23 Mar 2024 19:36:22 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1roAv8-0001zM-Cv; Sat, 23 Mar 2024 19:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64209] [PATCH v4 00/11] Update with rebase on master 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: Sat, 23 Mar 2024 23:37:02 +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.17112370147622 (code B ref 64209); Sat, 23 Mar 2024 23:37:02 +0000 Received: (at 64209) by debbugs.gnu.org; 23 Mar 2024 23:36:54 +0000 Received: from localhost ([127.0.0.1]:33313 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roAv0-0001ys-00 for submit@debbugs.gnu.org; Sat, 23 Mar 2024 19:36:54 -0400 Received: from mail.uvy.fr ([146.59.197.40]:32806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roAuy-0001yX-3U for 64209@debbugs.gnu.org; Sat, 23 Mar 2024 19:36:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=uvy.fr; s=202105; t=1711236934; bh=WrVM/7wzJXW+02PUzareyxfCo3jTwhMP6iQMgiD9Gj4=; h=From:To:Cc:Subject:Date; b=UZQ2SH4RtwZpsBA31M24mvefMYWLjaA9LmLjnW1fbUaMAC3xV+wG1BuSm4dkc4FGy EFkCdcgHUT58Ronr8GgFzrIVSWzzKWlknNDlOxotwhvAboRYABwonItBfOinCHGAsH ansivCdqH5Qss2v2nZjPkOZwhBG6fAm/LNlYfG4HE/Iy5p/5X3/JLcamadIy0KHx8V X4G3AMlDsL9n0CBjMj3SGst8r91GZXyO5migAMJ1FHXIxRBs1r4zCLhkfK8hiXSd4l 1TFzyPxdHl1ryM66GHivnm1YvYufQPaWO3bEnSfwkvBZKEFRBM3QaHa/3xpjpKFcel x5Kje+DnbN0Uw== Date: Sun, 24 Mar 2024 00:35:10 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 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: , Reply-to: Benjamin X-ACL-Warn: , Benjamin via Guix-patches X-Patchwork-Original-From: Benjamin via Guix-patches via From: Benjamin 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 4th patch with a rebase on master. This simplifies a bit the series as there were some dependencies that have been added like ocaml-dyn or ocaml-stdune. I fixed dune-ordering so that package-with-ocaml5.0 can work. This is because it inherits from dune with some properties. cf issue [1] that can also be closed. I updated ocaml-dune-build-info following what has been done for other libraries of dune repositories. I updated merlin-lib to latest because lsp-server was requiring higher version. Running ./pre-inst-env guix build ocaml-merlin ocaml5.0-merlin ocaml-lsp-server ocaml5.0-lsp-server could build merlin and ocaml-lsp-server so I guess it should be fine. Tell me if anything needs to be changed for this patch to be merged in master. Best [1] https://issues.guix.gnu.org/63947 Benjamin (11): gnu: Fix dune-ordering gnu: Add ocaml-ppx-yojson-conv-lib. gnu: Fix ocaml-dune-build-info gnu: Add ocaml-xdg. gnu: Add dune-rpc. gnu: Add ocamlc-loc. gnu: Add ocaml-chrome-trace. gnu: Add ocaml-fiber. gnu: Add ocamlformat-rpc-lib. gnu: ocaml-merlin-lib: Update to 4.14. gnu: Add ocaml-lsp-server. gnu/packages/ocaml.scm | 179 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 174 insertions(+), 5 deletions(-) base-commit: bf530017f0e847ae895919b32ef37d79fa636a1e