From patchwork Wed Jun 18 14:26:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43118 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 666FA27BC4A; Wed, 18 Jun 2025 15:29:46 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 7845027BC49 for ; Wed, 18 Jun 2025 15:29:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRtmr-00067y-31; Wed, 18 Jun 2025 10:29:13 -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 1uRtml-00066r-2J for guix-patches@gnu.org; Wed, 18 Jun 2025 10:29:09 -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 1uRtmk-0003hm-E1 for guix-patches@gnu.org; Wed, 18 Jun 2025 10:29:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=AFSEmNIxiysN3shCnOtfCZIKWtLUVfPLLQNABMT4M3k=; b=iO+zuTFoQJ0IU8yxr7eG96Flc8axyzmehn7aoY3YZwo7FK4+i1P8TMTR1dBJhqWA1gxuvq58D132SPp3hSqUui/eDaecj3yjy33hi43FmhFK3pOxZwlT5+Y7ion9yL4HuAiqxfbnVVu9SDoEUuRl2ezmDTO1l/LYaKkyNLZZP+LbpDyOoAg3ViPFlT49+YVCb4JRlDZYsgHx65Z342f4bjNkJzd/U7142EUDdXOR0sKnEujoW8DwspH8ZxtpuBPjz+Fp/NIb+mdAJRDH309HIU0HI+4uOkMzuobFchx001+gDxdFTDxtoJHmBUdPKXqzcsjN5x+Q1WcQgvcSR5ijgw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uRtmj-0006mG-UM for guix-patches@gnu.org; Wed, 18 Jun 2025 10:29:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78826] [PATCH 02/88] gnu: epic5: Improve style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Jun 2025 14:29:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78826 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78826@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78826-submit@debbugs.gnu.org id=B78826.175025692025684 (code B ref 78826); Wed, 18 Jun 2025 14:29:05 +0000 Received: (at 78826) by debbugs.gnu.org; 18 Jun 2025 14:28:40 +0000 Received: from localhost ([127.0.0.1]:51375 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRtmG-0006fI-47 for submit@debbugs.gnu.org; Wed, 18 Jun 2025 10:28:39 -0400 Received: from 5.mo563.mail-out.ovh.net ([46.105.53.64]:57329) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uRtmA-0006e1-8x for 78826@debbugs.gnu.org; Wed, 18 Jun 2025 10:28:33 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4bMmLg5xy0z1gSX; Wed, 18 Jun 2025 14:28:27 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78826@debbugs.gnu.org>; Wed, 18 Jun 2025 14:28:27 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.108.25.204]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bMmLg2jvjz5wGx; Wed, 18 Jun 2025 14:28:27 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.2]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id E58BBC3CA2; Wed, 18 Jun 2025 14:28:26 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-107S001f0c9dea9-20a8-41c5-94b7-66979acd1264, 6FDBBA6AF074F8A8A1368D92F187C7EF72285467) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Wed, 18 Jun 2025 16:26:49 +0200 Message-ID: <20250618142822.27945-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250618142822.27945-1-ngraves@ngraves.fr> References: <20250618142822.27945-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 14774903003652678370 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtddvgddvkeejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkeekvdeiseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=AFSEmNIxiysN3shCnOtfCZIKWtLUVfPLLQNABMT4M3k=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1750256908; v=1; b=JCwSpWvfhUgxqYWeAHfzVmGo2KxOFe1E1YzDg7WoxtPODGW0cooXKiOonFmeXFqzvhESN0/x 97ygE3CNsYR31/aKSoAsgLg+z+SBMZdFoUcNEUVvv/J5t8uzHmegC/rQ90zAlFqikppRA/n6GCr FUFQsv2E1EN1X6NM7nuetEp9mb7S2/d4QhTccdc4gBG8UsQISaQ9ll2m6/eMRqa5MhLxqdpWv1N YG0b9i553usmouQVdbx+pZUSkAuaQF0zw+QmxYO566c56K7aRoJYIhyj4IjiNSLHBUXgzjDjNFj RKRdT4axJRW/Pe8IKjp5jy+5qreQokN8dXff+g4i2GNIQ== 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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/irc.scm (epic5)[arguments]{phases}: Partial rewrite to use modern style and Gexps. Replace which by search-input-file. Use substitute regexp capabilities. --- gnu/packages/irc.scm | 72 ++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 42 deletions(-) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index d4f8491767..b5df78e209 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -753,62 +753,50 @@ (define-public epic5 #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-perl - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (substitute* "regress/crash-irc" (("perl5") - (which "perl"))))) + (search-input-file inputs "bin/perl"))))) (add-after 'unpack 'patch-bsdinstall ;; If we just remove /bin/ some part of the bsdinstall breaks. ;; Furthermore bsdinstalls has a reference to /etc/chmod here, which ;; means if we leave /etc/ in, install fails. (lambda _ (substitute* "bsdinstall" - (("/bin/strip") - "strip") - (("/bin/cp") - "cp") - (("/bin/chmod") - "chmod") - (("/bin/chgrp") - "chgrp") - (("/bin/mkdir") - "mkdir") - (("/bin/rm") - "rm") - (("/bin/mv") - "mv") + (("/bin/(chgrp|chmod|cp|mkdir|mv|rm|strip)" all bin) + bin) (("/etc/") "")))) (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs #:allow-other-keys) ;; The tarball uses a very old version of autconf. It does not ;; understand extra flags like `--enable-fast-install', so ;; we need to invoke it with just what it understands. - (let ((out (assoc-ref outputs "out"))) - ;; 'configure' doesn't understand '--host'. - #$@(if (%current-target-system) - `((setenv "CHOST" - ,(%current-target-system))) - '()) - (setenv "CONFIG_SHELL" - (which "bash")) - (setenv "SHELL" - (which "bash")) - (invoke "./configure" - (string-append "--prefix=" out) - "--with-ipv6" - "--with-libarchive" - ;; We use libressl because openssl does not come - ;; with the lib/libssl.a which is needed for epic5. - ;; XXX: No matter which implementation is chosen, - ;; epic5 fails to connect to tls ports of roundrobin - ;; irc networks. This however is believed to be an - ;; protocol issue at epic5 related to ircd. - (string-append "--with-ssl=" - (assoc-ref %build-inputs "libressl")) - (string-append "--with-tcl=" - (assoc-ref %build-inputs "tcl") - "/lib/tclConfig.sh")))))))) + ;; 'configure' doesn't understand '--host'. + #$@(if (%current-target-system) + `((setenv "CHOST" + ,(%current-target-system))) + '()) + (setenv "CONFIG_SHELL" + (search-input-file inputs "bin/bash")) + (setenv "SHELL" + (search-input-file inputs "bin/bash")) + (invoke "./configure" + (string-append "--prefix=" + #$output) + "--with-ipv6" + "--with-libarchive" + ;; We use libressl because openssl does not come + ;; with the lib/libssl.a which is needed for epic5. + ;; XXX: No matter which implementation is chosen, + ;; epic5 fails to connect to tls ports of roundrobin + ;; irc networks. This however is believed to be an + ;; protocol issue at epic5 related to ircd. + (string-append "--with-ssl=" + #$(this-package-input "libressl")) + (string-append "--with-tcl=" + (search-input-file inputs + "/lib/tclConfig.sh")))))))) (inputs (list libressl ncurses libarchive ;CHANGELOG: "Support for loading zip files"