From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:700:3204::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 3tMKBGa2k2XfoQAAkFu2QA (envelope-from ) for ; Tue, 02 Jan 2024 08:08:22 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 8OQqN2W2k2WVMgEAe85BDQ (envelope-from ) for ; Tue, 02 Jan 2024 08:08:21 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop.in header.s=key1 header.b=na070BEc; 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=1704179301; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc: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=LAKN6gzfAwNfCPd3x8X2dipuYqdbcq1MrElORk9JucM=; b=koWMP1J1BMpauSjFkX6HYboUHiEDa3wpEj82iwkCkxBTrsQl5ug6tbY6giO/10aXPA258+ XFUT+hScTRksR08A58AaDHI1KG3zxTDf2hbJ7Xz4359939CGf6g87MwZhR018BM+4KTa0h 74EYCFXOmFTgmHh3eEnPootOG4HoEz1qId0C9BqmDojwnliR4YkhSWDn6rVS47mJwS8o7P Tb8VDBxDnwcnnM3t5p8SOK67osWZveYcrxkOwwZD5KJOfrcd1IiJvcv0nKgS/Cph2Zfv78 nmaZei0bs2Mpd7/1D2lgputkwJfxwHi/wNE2fML0E9r1K8GLXNatPyHVc4rO+w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704179301; a=rsa-sha256; cv=none; b=eYk7c3anC5URv9s0z+oMcQvyknbMxGOv3WTrqiIiaq1u7rUJJnxWjWefGQ+bUzUHMaz8YF hC19+dmKLLG3BJax08JW7yjVEI0EUv6UR/nZm6b71eX/5FD18docIii5q/xJZu33GAZ02P RDbNhY1TiwYSTmNtagtFxqbN8kIGJpdM86+T2dJqwnSNZRab+dz/tEpm9okYCa891uEG+g KRVV6embNk7ABcfOo+UgZZJBInKq50aaaI63KpfGWnNMYQDmIdeoRrNArEiLSQkbWxztyE PNxoR4gN+dpEeID71S/C1fMnPnXQwSZ6k0V3puhI83HdwQM+kYlp27jkhG5Mkw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop.in header.s=key1 header.b=na070BEc; 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 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 452BA63A11 for ; Tue, 2 Jan 2024 08:08:21 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rKYsf-0003uX-Jf; Tue, 02 Jan 2024 02:08:05 -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 1rKYsZ-0003uB-PS for guix-patches@gnu.org; Tue, 02 Jan 2024 02:08:00 -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 1rKYsZ-0001jI-EA for guix-patches@gnu.org; Tue, 02 Jan 2024 02:07:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rKYsb-0003TB-KY for guix-patches@gnu.org; Tue, 02 Jan 2024 02:08:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68180] [PATCH v2 1/4] gnu: emacs: Patch awk, find, sed and sh commands. Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 Jan 2024 07:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68180 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer , 68180@debbugs.gnu.org Cc: Katherine Cox-Buday , Liliana Marie Prikler , Maxim Cournoyer Received: via spool by 68180-submit@debbugs.gnu.org id=B68180.170417923913277 (code B ref 68180); Tue, 02 Jan 2024 07:08:01 +0000 Received: (at 68180) by debbugs.gnu.org; 2 Jan 2024 07:07:19 +0000 Received: from localhost ([127.0.0.1]:49241 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKYru-0003S4-Aj for submit@debbugs.gnu.org; Tue, 02 Jan 2024 02:07:18 -0500 Received: from out-175.mta0.migadu.com ([2001:41d0:1004:224b::af]:44871) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKYrr-0003Rv-SM for 68180@debbugs.gnu.org; Tue, 02 Jan 2024 02:07:16 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=key1; t=1704179232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=LAKN6gzfAwNfCPd3x8X2dipuYqdbcq1MrElORk9JucM=; b=na070BEcw3heCDorsSMnM1tpiZIIYAF4nRj6B51Sn54RaHfAH2q8kE0arwIMhKuAG2zViA aD4P41mKqLAQtRA/jncZa8V//cL1a08cyWgAkgIxR1BJBSzt8AfdeyVFOTPPfeD8dp1QBK XyMoVn5XHWAng1oX8zAN1/MRL0q60EQRNTpzKroUPCr4HaQvb8UnEG+DLbCybmef/L79MO qWjNDy8LGs673fxpALENo9uhqB1bjsUEuK/ZrXypJftN9qEs1AQ8Y86QSS02eJvs0wjABm PrEJ2nX9s02ilVvECBI1ZuIHR71K83L1qm840NkZaXTTzaOI18gyzmIy2CoApg== In-Reply-To: <5de95e91832b56eb05175e9022c77b57a266b373.1704160706.git.maxim.cournoyer@gmail.com> References: <5de95e91832b56eb05175e9022c77b57a266b373.1704160706.git.maxim.cournoyer@gmail.com> Date: Tue, 02 Jan 2024 10:07:07 +0300 Message-ID: <877cksfc2s.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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: Andrew Tropin X-ACL-Warn: , Andrew Tropin via Guix-patches From: Andrew Tropin via Guix-patches via 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-Spam-Score: -8.88 X-Spam-Score: -8.88 X-Migadu-Queue-Id: 452BA63A11 X-Migadu-Scanner: mx12.migadu.com X-TUID: cinZyRer7Aeh --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2024-01-01 20:58, Maxim Cournoyer wrote: > Before this change, using Emacs in a pure environment, e.g. 'guix shell -= -pure > emacs', would cause problems such as: > > jka-compr-insert-file-contents: Uncompression program =E2=80=98sh=E2=80= =99 not found > > And other problems were found requiring the other tools. > > * gnu/packages/emacs.scm (emacs-minimal) [arguments]: Extend the > patch-program-file-names phase. > [inputs]: Add findutils, gawk and sed. > > Change-Id: Ifb4fe2fc12ddc9eae387adb3da3f7821fab78e65 > --- > > Changes in v2: > - Patch references in place instead of wrapping via PATH Yep, I think this is a right way. Thank you very much for working on it! > > gnu/packages/emacs.scm | 56 +++++++++++++++++++++++++++++++++++++++--- > 1 file changed, 52 insertions(+), 4 deletions(-) > > diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm > index b9d9e2b891..3e8de3c2e0 100644 > --- a/gnu/packages/emacs.scm > +++ b/gnu/packages/emacs.scm > @@ -9,7 +9,7 @@ > ;;; Copyright =C2=A9 2016 David Thompson > ;;; Copyright =C2=A9 2016 Nikita > ;;; Copyright =C2=A9 2017 Marius Bakke > -;;; Copyright =C2=A9 2017, 2019, 2020 Maxim Cournoyer > +;;; Copyright =C2=A9 2017, 2019, 2020, 2023, 2024 Maxim Cournoyer > ;;; Copyright =C2=A9 2017 Alex Vong > ;;; Copyright =C2=A9 2017, 2018 Ricardo Wurmus > ;;; Copyright =C2=A9 2017, 2023 Janneke Nieuwenhuizen > @@ -59,6 +59,7 @@ (define-module (gnu packages emacs) > #:use-module (gnu packages fontutils) > #:use-module (gnu packages freedesktop) > #:use-module (gnu packages fribidi) > + #:use-module (gnu packages gawk) > #:use-module (gnu packages gcc) > #:use-module (gnu packages gd) > #:use-module (gnu packages gettext) > @@ -157,13 +158,60 @@ (define-public emacs-minimal > (delete-file "configure")))) > (add-after 'unpack 'patch-program-file-names > (lambda* (#:key inputs #:allow-other-keys) > + ;; Substitute "sh" command. > (substitute* '("src/callproc.c" > "lisp/term.el" > "lisp/htmlfontify.el" > + "lisp/mail/feedmail.el" > + "lisp/obsolete/pgg-pgp.el" > + "lisp/obsolete/pgg-pgp5.el" > + "lisp/obsolete/terminal.el" > + "lisp/org/ob-eval.el" > "lisp/textmodes/artist.el" > - "lisp/progmodes/sh-script.el") > + "lisp/progmodes/sh-script.el" > + "lisp/textmodes/artist.el" > + "lisp/htmlfontify.el" > + "lisp/term.el") > (("\"/bin/sh\"") > - (format #f "~s" (search-input-file inputs "/bin/sh")))) > + (format #f "~s" (search-input-file inputs "bin/sh")))) > + (substitute* '("lisp/gnus/mm-uu.el" > + "lisp/gnus/nnrss.el" > + "lisp/mail/blessmail.el") > + (("\"#!/bin/sh\\\n\"") > + (format #f "\"#!~a~%\"" (search-input-file inputs "bin/= sh")))) > + (substitute* '("lisp/jka-compr.el" > + "lisp/man.el") > + (("\"sh\"") > + (format #f "~s" (search-input-file inputs "bin/sh")))) > + > + ;; Substitute "awk" command. > + (substitute* '("lisp/gnus/nnspool.el" > + "lisp/org/ob-awk.el" > + "lisp/man.el") > + (("\"awk\"") > + (format #f "~s" (search-input-file inputs "bin/awk")))) > + > + ;; Substitute "find" command. > + (substitute* '("lisp/gnus/gnus-search.el" > + "lisp/obsolete/nnir.el" > + "lisp/progmodes/executable.el" > + "lisp/progmodes/grep.el" > + "lisp/filecache.el" > + "lisp/ldefs-boot.el" > + "lisp/mpc.el") > + (("\"find\"") > + (format #f "~s" (search-input-file inputs "bin/find")))) > + > + ;; Substitute "sed" command. > + (substitute* "lisp/org/ob-sed.el" > + (("org-babel-sed-command \"sed\"") > + (format #f "org-babel-sed-command ~s" > + (search-input-file inputs "bin/sed")))) > + (substitute* "lisp/man.el" > + (("Man-sed-command \"sed\"") > + (format #f "Man-sed-command ~s" > + (search-input-file inputs "bin/sed")))) > + > (substitute* "lisp/doc-view.el" > (("\"(gs|dvipdf|ps2pdf|pdftotext)\"" all what) > (let ((replacement (false-if-exception > @@ -254,7 +302,7 @@ (define-public emacs-minimal > (copy-file > (car (find-files "bin" "^emacs-([0-9]+\\.)+[0-9]+$")) > "bin/emacs"))))))) > - (inputs (list bash-minimal coreutils gzip ncurses)) > + (inputs (list bash-minimal coreutils findutils gawk gzip ncurses sed= )) > (native-inputs (list autoconf pkg-config texinfo)) > (home-page "https://www.gnu.org/software/emacs/") > (synopsis "The extensible text editor (minimal build for byte-compil= ation)") =2D-=20 Best regards, Andrew Tropin --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmWTthwACgkQIgjSCVjB 3rBz+g//fKY7nyX5IuM+A4jRzImeHJIjFp0XHlv7w6s53W7cJYV7cvNxAFj7lMFG Q2jN/DffIRBS+0kGOApPRpEqTGCx5cJni7z0b4XLuFSqDhWHI2gXp+6TioEaW7nY sZjmYqnRGbR+Rrji9KHdFArAGEbiyaCnrw0m7o7uOYq7kiyrltUa78jC5uflXETE 9WJYc5eKbFpdWCFJVk0KZkVjwYecmxuEYcy1paVq6AIeynHh0QMf8M5AAfHFuYgs 1RXHkBwo0PDMYBmh4NUvS+k8tNWO958uBaH+SF4u5nEb3N56L3kUPLBMs7i/pZ88 cFDjVuxS4xN7zcPocUutBaLjm2nx/CDtees2RUqIUWHrUaMHfmym+MgN5OrpohoV PlDxZ6igvg0EerF16Ys4dSS1Rh0/ZrUhvWgEFqYUrX9gnJv38rzVRuSnoOgez+JJ BItplzOBoeWyzBusOsvXtumvcvqTzixD3A8XxpSxyAHVPgpzgBmzdcAUqZMmeskh ulMousOfE4RdTkjkltCdo7DF1R+yNR4uv3S8vl+qPHggx7bZefUKoWja5qRb2r0h PqeE9QuTaxB4cmIcxlV4NGEfbV4/sn2BTu0hoaR6blbtD4XZKTN8cQbcZyt/0QSY YbNjYmXpqf3ogJ0ugdkJWJ3v4cBNR3kTkpkUBC6RX5Ye/wTFe5w= =ZQHS -----END PGP SIGNATURE----- --=-=-=--