Received: (at 69677) by debbugs.gnu.org; 9 Mar 2024 12:23:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Mar 09 07:23:53 2024
Received: from localhost ([127.0.0.1]:60899 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rivk1-0001fV-E4
for submit <at> 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 <vivien@HIDDEN>) id 1rivjz-0001fE-T4
for 69677 <at> 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@HIDDEN>
In-Reply-To: <cover.1709986125.git.vivien@HIDDEN>
References: <cover.1709986125.git.vivien@HIDDEN>
From: Vivien Kraus <vivien@HIDDEN>
Date: Sat, 9 Mar 2024 10:46:18 +0100
Subject: [PATCH gnome-team 1/1] gnu: opam: Fix build.
To: 69677 <at> debbugs.gnu.org
MIME-Version: 1.0
User-Agent: Evolution 3.48.4
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 69677
Cc: rg@HIDDEN, vivien@HIDDEN, liliana.prikler@HIDDEN,
maxim.cournoyer@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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"))
--
2.41.0
guix-patches@HIDDEN:bug#69677; Package guix-patches.
Full text available.Received: (at submit) by debbugs.gnu.org; 9 Mar 2024 12:19:07 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Mar 09 07:19:07 2024 Received: from localhost ([127.0.0.1]:60893 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rivfO-0001XO-L5 for submit <at> debbugs.gnu.org; Sat, 09 Mar 2024 07:19:06 -0500 Received: from lists.gnu.org ([209.51.188.17]:36014) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <vivien@HIDDEN>) id 1rivfK-0001XC-QG for submit <at> debbugs.gnu.org; Sat, 09 Mar 2024 07:19:04 -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 <vivien@HIDDEN>) id 1rivem-0000l4-Ky for guix-patches@HIDDEN; Sat, 09 Mar 2024 07:18:28 -0500 Received: from planete-kraus.eu ([89.234.140.182]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from <vivien@HIDDEN>) id 1rivek-0006Di-UI for guix-patches@HIDDEN; Sat, 09 Mar 2024 07:18:28 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id e6766430 for <guix-patches@HIDDEN>; Sat, 9 Mar 2024 12:18:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:from:date:subject:to:mime-version; s=albinoniA; bh=Kt 25arwAM/yBxPtdKeqJ4D52ylI=; b=flHRgV6+gNLLpO5lYzvEKt6Z0qmoZWl0JK RAVEHMg9DAsEWHEs3vUiqQ4PcA0h9bFh6ZeJiliD1PCPKNQ2QZDy26QXTq9T0tH6 MMZOUBKLNmVjBUROStHSrEP0QM3oZp7xwO46tgTdDIsCb8SVqipdS+Spia9w6P1G sjBqep+OxXD2cqLnxbehCNboXxZc9kPHY1SLxySAtodwqiemfdhvL2R9DLNXa8oA 1v72zxihN9qFRzVekz5VzE+wPAZ4aHmrQLO4yclHvp9/IvWRFsYd7X4ovO+eXyHP 1bpIDbl/QsT5UuWlPe5sfqal4NQoP1rlUNepWpZkA3mQU6CF79eg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 62c7c22a (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <guix-patches@HIDDEN>; Sat, 9 Mar 2024 12:18:23 +0000 (UTC) Message-ID: <cover.1709986125.git.vivien@HIDDEN> From: Vivien Kraus <vivien@HIDDEN> Date: Sat, 9 Mar 2024 13:08:45 +0100 Subject: [PATCH gnome-team 0/1] Fix opam on gnome-team To: guix-patches@HIDDEN X-DebbugsCc: liliana.prikler@HIDDEN, maxim.cournoyer@HIDDEN, rg@HIDDEN,vivien@HIDDEN MIME-Version: 1.0 User-Agent: Evolution 3.48.4 Received-SPF: pass client-ip=89.234.140.182; envelope-from=vivien@HIDDEN; helo=planete-kraus.eu X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.4 (--) 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 Vivien Kraus (1): gnu: opam: Fix build. gnu/packages/ocaml.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) base-commit: 25c14c893f05019d746321285acf55d1aa65b943 -- 2.41.0
Vivien Kraus <vivien@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#69677; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.