From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 01 19:16:29 2023 Received: (at submit) by debbugs.gnu.org; 2 Mar 2023 00:16:29 +0000 Received: from localhost ([127.0.0.1]:55271 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXWcX-00087X-0Y for submit@debbugs.gnu.org; Wed, 01 Mar 2023 19:16:29 -0500 Received: from lists.gnu.org ([209.51.188.17]:45626) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXWcU-00087O-Vc for submit@debbugs.gnu.org; Wed, 01 Mar 2023 19:16:28 -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 1pXWcU-0007gC-EB for guix-patches@gnu.org; Wed, 01 Mar 2023 19:16:26 -0500 Received: from knopi.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXWcR-0007FF-Uz for guix-patches@gnu.org; Wed, 01 Mar 2023 19:16:26 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id D0F684155E for ; Thu, 2 Mar 2023 01:16:18 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id flNmxLLrfNp1 for ; Thu, 2 Mar 2023 01:16:17 +0100 (CET) From: Adriel Dumas--Jondeau DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1677716177; bh=uXXNxz2kIH1UHJjRyvl7i2vN0stSCRQRVp3TmzZlvjo=; h=From:To:Subject:Date; b=htb4ft54JKFjtPKpb4IejJgPIhg8jQmOVi9xRvrsuHYCCLMC5zKCCXnjAkFth+Of9 bwVPLuNWttN785vm1yPPicalSr2sbToxtj3D1uX3bIl4cRr/jzW/DOzBRxquNNr8LH MdN9Nt54kbzYLHmP/4VPDr00UqTGEF8isD/GFKKDCf8dty8zayQKx7XHmFsEL6w/69 BJtQox51FOQ64xk0NPqsBDb/iXQxweMlRztDXY2hN/+AM3i5q1AEWyOxDcSg2MCjXq qJF0EgTtY5r8G3g1pgblUBgmyWiX1/SYqSKY7LA/4M2qwbNaCVf9R3pywkaEdd+RJs dY7Bo+pHPeBpA== To: guix-patches@gnu.org Subject: [PATCH] Update fish to 3.6.0 Date: Thu, 02 Mar 2023 01:01:31 +0100 Message-ID: <87356oj9dk.fsf@disroot.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Received-SPF: pass client-ip=178.21.23.139; envelope-from=leirda@disroot.org; helo=knopi.disroot.org 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello, This patch updates fish to the latest released version (2023-01-07) as it seems to work well (it's my main shell and I have been testing this version on Guix on a daily basis this week). The update was made with guix refresh and then tested on a daily basis during this week (only on x86_64 architecture though, as I wanted to make a first patch before struggling with virtualisation). We have to remove PCRE2 related snippets as upstream removed the bundled copy from its source[1] (see =E2=80=9CFor Distributors=E2=80=9D header). In the near future, we'll probably need to change the build system and the package definition a lot, as Fish is being rewritten in rust[2]. Given the nature of this patch, I don't care being credited in the copyright notice. PS: This is my first patch, I hope I'm properly following the conventions, please tell me if I can do anything better next times :) [1] https://github.com/fish-shell/fish-shell/releases/tag/3.6.0 [2] https://github.com/fish-shell/fish-shell/pull/9512 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-Add-emacs-motif.patch Content-Transfer-Encoding: quoted-printable Content-Description: Update fish to 3.6.0 From=20c05adaddb14064f0d2817e331fe5d0618f218bb9 Mon Sep 17 00:00:00 2001 Message-Id: From: Andy Tai Date: Sun, 12 Feb 2023 15:54:49 -0800 Subject: [PATCH] gnu: Add emacs-motif. * gnu/packages/text-editors.scm (emacs-motif): New variable. Signed-off-by: Christopher Baines =2D-- gnu/packages/emacs.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 51ce4e481b..94d08244d1 100644 =2D-- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -66,6 +66,7 @@ (define-module (gnu packages emacs) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages image) + #:use-module (gnu packages lesstif) ; motif #:use-module (gnu packages linux) ; alsa-lib, gpm #:use-module (gnu packages mail) ; for mailutils #:use-module (gnu packages multiprecision) @@ -512,6 +513,30 @@ (define-public emacs-xwidgets (modify-inputs (package-inputs emacs) (prepend webkitgtk-with-libsoup2 libxcomposite))))) =20 +(define-public emacs-motif + (package/inherit emacs + (name "emacs-motif") + (synopsis + "The extensible, customizable, self-documenting text editor (with Mot= if +toolkit)") + (build-system gnu-build-system) + (inputs (modify-inputs (package-inputs emacs) + (delete "gtk+") + (prepend inotify-tools motif))) + (arguments + (substitute-keyword-arguments + (package-arguments + emacs) + ((#:configure-flags flags #~'()) + #~(cons "--with-x-toolkit=3Dmotif" + #$flags)) + ((#:modules _) + (%emacs-modules build-system)) + ((#:phases phases) + #~(modify-phases #$phases + (delete 'restore-emacs-pdmp) + (delete 'strip-double-wrap))))))) + (define-public emacs-no-x (package/inherit emacs (name "emacs-no-x") =2D-=20 2.39.1 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable =2D-=20 Adriel --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHHBAEBCAAxFiEEdTo3gYfn+XlCL0s3vM4s3nSoxFIFAmP/6scTHGxlaXJkYUBk aXNyb290Lm9yZwAKCRC8zizedKjEUs66DACzk4yEuFmo2QKGfKrflsyoc1UxlXCC Spk3fVaM/JMlLn0xWId5r+z74ubfyE9qLZrUs+ItexcYNPczx6UenUiCXSvbDRY4 Qf3cIUS6SPZuLgt/UEex1i5khzWcEoND4xrZiXuZSYUQkqI6CgGW/Iiu0+85gLTY Xf2GXWHcJPoaVni00LUmusBvujKW29dCIaF5A35t9rQkSm/yHQlWlcDxiXUE5N7O DTPxriOx7zhbZGOGYb4V6ObzsSxsQ5CcEYhkOL9DseQ0wqF/jfMnPWtulrzixwms LxLOELgIBPUCWAP7gEM23mbi3sqOtJcOh+SOL18dj/bHQYmvglDvoFbyzxZAvM6R bi+krqrp1AR+2KJivv4QDluVVCtEf6wA/mjO5yQ6hiC0FPqffNuBAe/VFSy49Ku2 iKtt9Acd1FRCuVOGSCNtLSrMSog0to0o3OFS7xW222vZ4XvwBCJ94+MR+W71bw2r 0CVfj6q3p1W0H6mYz1trU6++jPMBGZLaZe4= =XhG4 -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 02 04:24:55 2023 Received: (at 61903) by debbugs.gnu.org; 2 Mar 2023 09:24:55 +0000 Received: from localhost ([127.0.0.1]:55772 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXfBH-0007Z1-4d for submit@debbugs.gnu.org; Thu, 02 Mar 2023 04:24:55 -0500 Received: from knopi.disroot.org ([178.21.23.139]:48256) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXfBE-0007Ys-W8 for 61903@debbugs.gnu.org; Thu, 02 Mar 2023 04:24:53 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 4ABB341446 for <61903@debbugs.gnu.org>; Thu, 2 Mar 2023 10:24:51 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Rt5hjGsg4Zo9 for <61903@debbugs.gnu.org>; Thu, 2 Mar 2023 10:24:50 +0100 (CET) References: <87y1oghukf.fsf@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1677749090; bh=I8lgKg7/basoDCB+NGV+5cO9RVQr3hl9T+iIwZsYx8I=; h=References:From:To:Subject:Date; b=dihD8iD7FlSvLN5rlSQKSA7ySIBnrAbfVF/0tObm7gjjOva+3EExZeV3yGSY2TJuh BoNpaMKLPRFMSeazCCc/XLi20jQA2tfUZFw6mkFIdeF+QdikLBQpNQ9VbhbecGfGdz Fa95z3j7QOuMYAh8twKji7F/C5u8S/jw/lsZRlQIqgJLDZ8j/IKrHzittI5e3i5+dj lhTL8tW9rsIdBcR7LeP5KQ4zqP8l6r3cALghVuEtDaTauHfBFGsIUmPj+5q1pno0xx gvACZ883URPtkbCoy+9Bg81qXnpWCWeinW0sb/qNXM/I8C2rpCNpHFjtbwftGIaFS5 9dpf0qye3dWgQ== From: Adriel Dumas--Jondeau To: 61903@debbugs.gnu.org Subject: Fwd: Re: [PATCH] Update fish to 3.6.0 Date: Thu, 02 Mar 2023 10:21:03 +0100 Message-ID: <87ttz3ijz3.fsf@disroot.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61903 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain And of course I also created a new patch request instead of commenting on the other one. I think we can close 61904, and I'm really sorry about that :( Adriel Dumas--Jondeau writes: > Aye, > > I sent the wrong patch (I formatted the latest retrieved commit on > origin instead of my local branch). > > Here's the right one, I'm sorry for the noise. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-Update-fish-to-3.6.0.patch Content-Description: Update fish to 3.6.0 diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 0c8cbf3f4c..f550a2c943 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -118,7 +118,7 @@ (define-public dash (define-public fish (package (name "fish") - (version "3.5.1") + (version "3.6.0") (source (origin (method url-fetch) @@ -126,15 +126,11 @@ (define-public fish "releases/download/" version "/" "fish-" version ".tar.xz")) (sha256 - (base32 "0a39vf0wqq6asw5xcrwgdsc67h5bxkgxzy77f8bx6pd4qlympm56")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Remove bundled software. - (delete-file-recursively "pcre2"))))) + (base32 "10b1xa1hpmi62rzh3qgxlw7xrhyigs8kssagccawmrryfxbls14p")) + (modules '((guix build utils))))) (build-system cmake-build-system) (inputs - (list fish-foreign-env ncurses pcre2 ; don't use the bundled PCRE2 + (list fish-foreign-env ncurses pcre2 python)) ; for fish_config and manpage completions (native-inputs (list doxygen groff ; for 'fish --help' --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable =2D-=20 Adriel --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHHBAEBCAAxFiEEdTo3gYfn+XlCL0s3vM4s3nSoxFIFAmQAa2ATHGxlaXJkYUBk aXNyb290Lm9yZwAKCRC8zizedKjEUn8HDACWZNfzk2YS7UD3pZT113QkuxXNtGTf 7yMuEps+P9tgq3xnbknjGaG8yzDvCJd3NH02ksyu5brWlovBGS2+ub0xRIVATGTz n0fH+7xxzuGN9039FXv3EM0IPb11RGYC7NavBvjJGWXFcthI8c1AvXiA867/sOrm AvUIXsrvD5kLOWtNVGRVJoUKdClNam2kcFJ/lfaWioH9WaJSXjVOyTCwLzmKJftv y2QiX3oEnVw1PekEamHU1S7Z6pCcutlvV39Di3vpJcOzGi52MA9kPes+dAamap8+ c8BpSh7yif/isO3LeiiGFZdZteynIdQ0eb9YhNomkvvpfDw2ykwoJrsEGjEAv8VF SnsrfoOUB2u2KAnOd8EyLvlBGONeoJuKmNk9aKc5JjCzskjXVD8B/gMLTH78H6ux c3kXMKZS5mQiKqD9SBx6KSb175qcOoWMNIie3xiTlv3lmFaMYI0bJJKUFrikQXOt q9JViX52zR5VcdMbJIdJn4iWaVdnxVhxck0= =j01g -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 02 07:58:59 2023 Received: (at control) by debbugs.gnu.org; 2 Mar 2023 12:58:59 +0000 Received: from localhost ([127.0.0.1]:56107 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXiWQ-0007ID-RM for submit@debbugs.gnu.org; Thu, 02 Mar 2023 07:58:59 -0500 Received: from out-52.mta0.migadu.com ([91.218.175.52]:53056) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXiWO-0007I4-Mk for control@debbugs.gnu.org; Thu, 02 Mar 2023 07:58:58 -0500 Content-Type: multipart/alternative; boundary=Apple-Mail-4974DD72-405E-480E-9527-0C62D3155FBF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=winter.cafe; s=key1; t=1677761932; 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: content-transfer-encoding:content-transfer-encoding; bh=QYLg7srK9yt4hAlr6GJ3D0LRBJAkltzKWf/1IliYcgI=; b=PDwRWuAGe9hvPiLcfbAJks8jwymKckVKahNuurrYkmVByoPsmRhLOHOwEHHf7tiguxwCl4 Mahz9jjZOb6/WSU45JfDQ2KTQvdhgxRNw9IqIxu8nqeO90DSW7SsxfvQ/qIz358dV9hZ04 sopVEXVn/oLmrqpBEgr+TYjlqdTnFBKk1B6gHA9nBIJhdNFrzh61t9ioZ2WoDUYwhoiXLG sNi8xj6mjylYSOlSBnsCJ7OvzDmB9Z2WwkUmMAn8sQBzAxhcxGwzPexM1BPwpJAfjEb50D 9vIYy3nTut/xwdE1uzOsBs+tJIkIjOKXoyLLLIMfuYWFYdw6rTkDQtApFR9gIg== Content-Transfer-Encoding: 7bit X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Winter MIME-Version: 1.0 Date: Thu, 2 Mar 2023 07:58:40 -0500 Subject: [PATCH] Update fish to 3.6.0 Message-Id: <94889429-E33D-422F-9553-AD0ED0DFADF1@winter.cafe> To: control@debbugs.gnu.org X-Migadu-Flow: FLOW_OUT X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control Cc: leirda@disroot.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --Apple-Mail-4974DD72-405E-480E-9527-0C62D3155FBF Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable close 61903 close 61904 thanks Hi, Thanks for the patch! However, this is a duplicate of https://issues.guix.gnu.org/61834. As our di= ffs are identical, I think it would make sense to close yours in favor of mi= ne. (I presume the control server will reject my commands, but let's see.) (I'm also closing the issue with the wrong patch.) Thanks, Winter= --Apple-Mail-4974DD72-405E-480E-9527-0C62D3155FBF Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: 7bit close 61903
close 61904
thanks

Hi,

Thanks for the patch!

However, this is a duplicate of https://issues.guix.gnu.org/61834. As our diffs are identical, I think it would make sense to close yours in favor of mine. (I presume the control server will reject my commands, but let's see.)

(I'm also closing the issue with the wrong patch.)

Thanks,
Winter
--Apple-Mail-4974DD72-405E-480E-9527-0C62D3155FBF-- From unknown Sat Jun 14 03:55:05 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 31 Mar 2023 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator