From patchwork Wed Jun 18 14:26:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43120 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 AFE7F27BC4A; Wed, 18 Jun 2025 15:30:16 +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 55D7427BC49 for ; Wed, 18 Jun 2025 15:30:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRtnn-0006RH-S9; Wed, 18 Jun 2025 10:30:12 -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 1uRtni-0006Q0-A2 for guix-patches@gnu.org; Wed, 18 Jun 2025 10:30:06 -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 1uRtnh-0004Fq-RT for guix-patches@gnu.org; Wed, 18 Jun 2025 10:30: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:Date:From:To:In-Reply-To:References:Subject; bh=9QArbXTIPB9Ii9pg07Yr+/dWsWxjN3GHSTc3460FErs=; b=BkzqVbQXkiMqQqySa/Dg6FTYFtWhOwmR6W4Z51ZkMaPHKYnwnzNDExWzUTNSqpyQRktUvxIz3Jp0Oo79wxIMuXA92Sm/xcnCr3MkQAiJAqHUesbnlZnvoWlX5O/qS0uxTYCECSpNEb6wQguwanMtqEp5bGjqsS9rrLA7kBBOgpgBVGaxgM905kzwX5KmDgQxBw2PClpQHDDhvtrJrKFOMuWHXCqbZgn9EieIzTU8n/Lo9/Y1OKMbne8bHMFP07opgBtSXueE5NdRjhqCUbcVxyNQh6424MkI23mZWyXAG7U4/KoavdaCGZhDrap81odsM4lYRUibvhs7UB9E2V80PQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uRtnh-0006xP-06 for guix-patches@gnu.org; Wed, 18 Jun 2025 10:30:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78826] [PATCH 01/88] gnu: epic5: Improve style. References: <20250618142025.11284-1-ngraves@ngraves.fr> In-Reply-To: <20250618142025.11284-1-ngraves@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Jun 2025 14:30:04 +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.175025696326306 (code B ref 78826); Wed, 18 Jun 2025 14:30:04 +0000 Received: (at 78826) by debbugs.gnu.org; 18 Jun 2025 14:29:23 +0000 Received: from localhost ([127.0.0.1]:51495 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRtmz-0006pw-Q6 for submit@debbugs.gnu.org; Wed, 18 Jun 2025 10:29:22 -0400 Received: from 3.mo562.mail-out.ovh.net ([46.105.33.63]:53449) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uRtm9-0006dq-Rx for 78826@debbugs.gnu.org; Wed, 18 Jun 2025 10:28:37 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4bMmLf4Th0z1fDg; Wed, 18 Jun 2025 14:28:26 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78826@debbugs.gnu.org>; Wed, 18 Jun 2025 14:28:26 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.96.178]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bMmLf1c83z1xwx; Wed, 18 Jun 2025 14:28:26 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.0]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id D380AD4409A; Wed, 18 Jun 2025 14:28:25 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-114S0089117167e-ef1c-4e5d-9a0a-1818488f0726, 6FDBBA6AF074F8A8A1368D92F187C7EF72285467) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Wed, 18 Jun 2025 16:26:48 +0200 Message-ID: <20250618142822.27945-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 14774621527958414050 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtddvgddvkeekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnheptdeugefghefhgefggeejhfdujeetieegffegvdelveekfeeggfeludefkeeukeegnecuffhomhgrihhnpegvphhitghsohhlrdhorhhgnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkeekvdeiseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=9QArbXTIPB9Ii9pg07Yr+/dWsWxjN3GHSTc3460FErs=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1750256906; v=1; b=o/feOY34zhvmK8AixfKAZpzcPK4heVPtHUviz3P/TWxgrntwqrQAxAlz8YVtApGHFsK0i4Kq a7iHA0uvIYLIzprG69Ro94cCFbPNkl7TFKCcX3hkI2igcCX8dXHOH/Ju0sYuUl6k2hFc+qECl7Y EfA0P00XlB5njzR/WLB5NBhNv+Kbv4H6SQc1pwGpSTLTvxPToUWKoMgGO6CHm9PZ5X9CBtCIe0E kRLHErbdcRfNi8PTfdbNxje/JCqAxj32PwMDQqndkJZIrOQyfCOmPfg9x4OKzOAgrlTF2t4iN8d qF7nnppSnud+/XPaoSt0atC0HggIpGsPhpKwlUcGLsYuQ== 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): Run guix style. --- gnu/packages/irc.scm | 145 +++++++++++++++++++++++-------------------- 1 file changed, 79 insertions(+), 66 deletions(-) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 79039c6c58..d4f8491767 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -735,74 +735,87 @@ (define-public epic5 (package (name "epic5") (version "2.0.1") - (source (origin - (method url-fetch) - (uri (string-append "http://ftp.epicsol.org/pub/" - "epic/EPIC5-PRODUCTION/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1ap73d5f4vccxjaaq249zh981z85106vvqmxfm4plvy76b40y9jm")))) + (source + (origin + (method url-fetch) + (uri (string-append "http://ftp.epicsol.org/pub/" + "epic/EPIC5-PRODUCTION/" + name + "-" + version + ".tar.xz")) + (sha256 + (base32 "1ap73d5f4vccxjaaq249zh981z85106vvqmxfm4plvy76b40y9jm")))) (build-system gnu-build-system) (arguments - `(#:test-target "test" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-perl - (lambda _ - (substitute* "regress/crash-irc" - (("perl5") (which "perl"))) - #t)) - (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") - (("/etc/") "")) - #t)) - (replace 'configure - (lambda* (#:key outputs #: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")))))))) - (inputs - (list libressl - ncurses - libarchive ; CHANGELOG: "Support for loading zip files" - perl - tcl - ruby)) - (native-inputs - (list pkg-config)) + (list + #:test-target "test" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-perl + (lambda _ + (substitute* "regress/crash-irc" + (("perl5") + (which "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") + (("/etc/") + "")))) + (replace 'configure + (lambda* (#:key outputs #: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")))))))) + (inputs (list libressl + ncurses + libarchive ;CHANGELOG: "Support for loading zip files" + perl + tcl + ruby)) + (native-inputs (list pkg-config)) (home-page "http://epicsol.org") (synopsis "IRC Client") (description