From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id kFFQD3hQ42WniAAAe85BDQ:P1 (envelope-from ) for ; Sat, 02 Mar 2024 17:14:48 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id kFFQD3hQ42WniAAAe85BDQ (envelope-from ) for ; Sat, 02 Mar 2024 17:14:48 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=f8zpGZ6g; 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=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1709396088; 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-to: 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=VxrjPpv9J7nEvyaZoVEiHzJPc+T9XqWrEzVqrtHI5dg=; b=bPpfHVaiFHrUNRScU0jiNWAlMEUUc/XAsvWQX0DAC6dfrR5i/p/0/pMsQ086flyq5b7Zfs CQ314DQcwpj2e1hi7q6hlWP2QPszGGnxzcmZ02floKRTxwgWDSCE39E4ZgQ5RqQdXh+fL6 MOoaiJ1fXUowo5WCzEvkGjyEflUtZH2Hw/CEgeqxjyaiyrXXHg2eJnr28gkitLELnX7I1v fomuomn7LcqTt6r+YlAhUkPGQqBOYGJnq5MkTGrNvxV/HncNl2y80E5FYWBZMOMYJlH66s dd6LHGN9DXIVc+kvM3wAuvXQv8p+qfLki3TwGZp2O71p3QzCRSNeHomuKcuVYA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=f8zpGZ6g; 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=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1709396088; a=rsa-sha256; cv=none; b=tSEG1nXyQRZM7YlM/Tf1qp3E5eBWr6B1o70Ms+I9Rcv/PowURLpI7Oy4HyL7SZwAEXM/I+ IGcD7Y7LfITRcmBFrgDBtE8K99rSe55NRotBdLsuwlFTSwsJeCws15Y+2x3rxmqg9vz+5k 4ADafH5supZUdrHBprWVKWmRcUSZuq+fmpxrP8G1aNJur4TPjYwjxIt2j/WiTe0KWRYuU9 Dd/bOaKqhdrLLQV+0YRwP7mhC/oMr4EtIBNxkaoYHA1uxTXHAXSN9koPIwI7nQTz+yWOKZ HhQH9aiaCqD1mL9B5SGa95nf/K8Qz1pYB6IyW7bz2l7u353cFwIuRaI7N7pilA== 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 1500597A1 for ; Sat, 2 Mar 2024 17:14:47 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rgS0R-0001sh-OJ; Sat, 02 Mar 2024 11:14:35 -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 1rgS0Q-0001sJ-8m for guix-patches@gnu.org; Sat, 02 Mar 2024 11:14:34 -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 1rgS0P-0007Hb-Vv for guix-patches@gnu.org; Sat, 02 Mar 2024 11:14:34 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rgS0s-0005VG-D7 for guix-patches@gnu.org; Sat, 02 Mar 2024 11:15:02 -0500 Subject: bug#69380: [PATCH] gnu: guile-irregex: Update to 0.9.11. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sat, 02 Mar 2024 16:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 69380 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Tomas Volf <~@wolfsden.cz> Cc: 69380-done@debbugs.gnu.org Mail-Followup-To: 69380@debbugs.gnu.org, ludo@gnu.org, ~@wolfsden.cz Received: via spool by 69380-done@debbugs.gnu.org id=D69380.170939604921044 (code D ref 69380); Sat, 02 Mar 2024 16:15:02 +0000 Received: (at 69380-done) by debbugs.gnu.org; 2 Mar 2024 16:14:09 +0000 Received: from localhost ([127.0.0.1]:39217 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgS00-0005TK-48 for submit@debbugs.gnu.org; Sat, 02 Mar 2024 11:14:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34912) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgRzj-0005SB-HF for 69380-done@debbugs.gnu.org; Sat, 02 Mar 2024 11:14:06 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rgRzB-00077M-0X; Sat, 02 Mar 2024 11:13:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=VxrjPpv9J7nEvyaZoVEiHzJPc+T9XqWrEzVqrtHI5dg=; b=f8zpGZ6gGuNnhnSvbhlo YISf9cd1x+9p4ZeFdetixSnpUtZ62mVDkh78MEGPqeDd11PQuMHMf7LTwM+flfV7DkKJy9NXTktO3 4UwV2sg+btVuUwE5LfrV1BZuuRuMvTWqLGlOf7JWtySndN6mgzyjW9yB3L/YvUcYQXe5gCZtdKiJc nz4Y2F9S8JU4edjuhUKtl2Aqi6FYPm5+/h7cIWOLLkVeW3AYGiVP5xBfnlGdEjWU/JqWHyAAj5Uhy Tjwynrxm3vAIbH3fNNvATChMyPRd2WVVAXjvPA0R0VUsIYdYGZPcQKxW9LlcaUlURa/srwOdJWQTL eWhh41YMOvMp1g==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <3ad16a6c2b1f0a7213c491570f438db81f3fe863.1708867568.git.~@wolfsden.cz> (Tomas Volf's message of "Sun, 25 Feb 2024 14:26:08 +0100") References: <3ad16a6c2b1f0a7213c491570f438db81f3fe863.1708867568.git.~@wolfsden.cz> Date: Sat, 02 Mar 2024 17:13:13 +0100 Message-ID: <87o7bwd33a.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -5.31 X-Spam-Score: -5.31 X-Migadu-Queue-Id: 1500597A1 X-TUID: La2iS77wAWaR Hi, Tomas Volf <~@wolfsden.cz> skribis: > Since upstream now provides tests for guile, they are executed, both befo= re > install (testing the internals) and after install (making sure the guile > module and everything works well). > > Guile 2.0 for some reason cannot load "foo.scm" using (load-from-path "fo= o"), > so symlinks are created to work around that. > > * gnu/packages/guile-xyz.scm (guile-irregex)[version]: Update to 0.9.11. > [arguments]: Convert to gexp. > <#:phases>{'move-files-around}: Copy files instead of moving. > {'check, 'check-installed}: New phases. > (guile2.0-irregex)[arguments]: Add 'create-symlinks phase. > > Change-Id: Ib9d4e9c24475aa8e7fc1e70b868b690eaf6ad42e Applied, thanks! > + (substitute-keyword-arguments (package-arguments guile-irregex) > + ((#:phases phases) > + #~(modify-phases #$phases > + ;; For some reason guile 2.0 cannot load foo.scm using > + ;; (load-from-path "foo"). So create symlinks to work aroun= d it. > + (add-before 'check 'create-symlinks > + (lambda _ > + (use-modules (ice-9 regex)) As a rule of thumb, only write =E2=80=98use-modules=E2=80=99 at the top lev= el. Use #:modules here. I left it here because it doesn=E2=80=99t matter all that much, and because= we could/should probably remove =E2=80=98guile2.0-irregex=E2=80=99 anyway. > + (for-each > + (lambda (f) > + (symlink (regexp-substitute #f (string-match "/([^/]+= )$" f) > + 1 ".scm") > + f)) I would avoid using regexps for such things: it=E2=80=99s heavyweight, hard= to read, and error-prone. Looks like you could do away with just =E2=80=98basename=E2=80=99 and the likes, no? Thanks, Ludo=E2=80=99.