From patchwork Sat Mar 9 09:46:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 61576 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 2E64B27BBE9; Sat, 9 Mar 2024 12:23:59 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,PP_MIME_FAKE_ASCII_TEXT,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 8FECF27BBE2 for ; Sat, 9 Mar 2024 12:23:58 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rivji-0001Mh-Gg; Sat, 09 Mar 2024 07:23:34 -0500 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 1rivje-0001M5-5m for guix-patches@gnu.org; Sat, 09 Mar 2024 07:23:30 -0500 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 1rivjd-0007Am-Tc for guix-patches@gnu.org; Sat, 09 Mar 2024 07:23:29 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rivkA-0001g0-GM for guix-patches@gnu.org; Sat, 09 Mar 2024 07:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69677] [PATCH gnome-team 1/1] gnu: opam: Fix build. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Mar 2024 12:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69677@debbugs.gnu.org Cc: rg@raghavgururajan.name, vivien@planete-kraus.eu, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 69677-submit@debbugs.gnu.org id=B69677.17099870336422 (code B ref 69677); Sat, 09 Mar 2024 12:24:02 +0000 Received: (at 69677) by debbugs.gnu.org; 9 Mar 2024 12:23:53 +0000 Received: from localhost ([127.0.0.1]:60899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rivk1-0001fV-E4 for submit@debbugs.gnu.org; Sat, 09 Mar 2024 07:23:53 -0500 Received: from planete-kraus.eu ([89.234.140.182]:35060) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rivjz-0001fE-T4 for 69677@debbugs.gnu.org; Sat, 09 Mar 2024 07:23:52 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id e339bad4; Sat, 9 Mar 2024 12:23:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniA; bh=qp7ShPXa7G/H4rdTV1YODVYp6jw=; b=e K5D0IHM5q6pp+Zviz8m2cPwZ+XEPJFWxBjg9M+HaWF8d3F3W0ooGDt/GBgFVZkl1 2eJ7HRw2a8x8G6rDi1ktTzDEvWK84ivaOj2MIDsylWmgLkEryTpOQr7cukky/94e OHZNnaWgHYDjrgmTdX4e5F+wSCrgglvZDdvUIhOOYaTTzJjZU6gw7wFQxebU1LOU 0vp2ecZzZQ5ay5tplSYhJnovHPo7FpgAyzseMHKpej3ApvPysiNUT1C8AMvKG2bA vwYP0gD0nbFJIZwNDHy37ICnewZDv4JqKjQVvnPzMQFmB4H/OZ6xQ8ImSeuEcfr2 P/dr/NE0r6f+8cQQPQ0/A== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 3d4bee13 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 9 Mar 2024 12:23:13 +0000 (UTC) Message-ID: <3a4e1befc3e3da925fccec1d88f53fff1ffff83b.1709986125.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Sat, 9 Mar 2024 10:46:18 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.48.4 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: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus 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 * gnu/packages/ocaml.scm (ocaml-opam-core) [#:phases]: Add 'always-use-base64-compat-5'. Change-Id: I8d9aec14ca2af92b9a4ac346ac57c22e6b76c716 --- Sorry, I messed up my cover letter, so it was not delivered to you. Here it is: Dear Guix, For some unknown reason, opam on master decides that the ocaml base64 library is not installed well enough to use it, but on gnome-team, it seems that it does. Opam can adapt to both cases, by using a different compatibility layer in each. On master, it uses the compatibility layer version 5, and on gnome-team, the compatibility layer version 6. However, the compatibility layer version 6 does not work. An easy fix is to force opam to use compatibility layer version 5 every time. I am not proud of my regular expressions, but I couldn’t find a way to factorize the optional `i` so that it matches either .ml or .mli. Best regards, Vivien gnu/packages/ocaml.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0f4c351141..5051524a53 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -854,6 +854,26 @@ (define ocaml-opam-core #:tests? #f #:phases (modify-phases %standard-phases + (add-after 'unpack 'always-use-base64-compat-5 + (lambda _ + (call-with-input-file "src/client/dune" + (lambda (port) + (display "ok") + (newline))) + ;; By default, the opamBase64Compat module will be + ;; compatibility version 6, which is just an empty + ;; file. Opam-client cannot build with an empty file. + (substitute* "src/client/dune" + (("opamBase64Compat\\.ml\\.6") + "opamBase64Compat.ml.5") + (("opamBase64Compat\\.mli\\.6") + "opamBase64Compat.mli.5") + ;; Undo the change in the rule to generate the .6 + ;; files + (("with-stdout-to opamBase64Compat\\.ml\\.5") + "with-stdout-to opamBase64Compat.ml.6") + (("with-stdout-to opamBase64Compat\\.mli\\.5") + "with-stdout-to opamBase64Compat.mli.6")))) (add-before 'build 'pre-build (lambda* (#:key inputs make-flags #:allow-other-keys) (let ((bash (assoc-ref inputs "bash"))