GNU bug report logs - #61903
[PATCH] Update fish to 3.6.0

Previous Next

Package: guix-patches;

Reported by: Adriel Dumas--Jondeau <leirda <at> disroot.org>

Date: Thu, 2 Mar 2023 00:17:01 UTC

Severity: normal

Tags: patch

Done: Winter <winter <at> winter.cafe>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 61903 in the body.
You can then email your comments to 61903 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#61903; Package guix-patches. (Thu, 02 Mar 2023 00:17:01 GMT) Full text and rfc822 format available.

Acknowledgement sent to Adriel Dumas--Jondeau <leirda <at> disroot.org>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Thu, 02 Mar 2023 00:17:01 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Adriel Dumas--Jondeau <leirda <at> disroot.org>
To: guix-patches <at> gnu.org
Subject: [PATCH] Update fish to 3.6.0
Date: Thu, 02 Mar 2023 01:01:31 +0100
[Message part 1 (text/plain, inline)]
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 “For Distributors” 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

[0001-gnu-Add-emacs-motif.patch (text/x-patch, inline)]
From c05adaddb14064f0d2817e331fe5d0618f218bb9 Mon Sep 17 00:00:00 2001
Message-Id: <c05adaddb14064f0d2817e331fe5d0618f218bb9.1677701063.git.leirda <at> disroot.org>
From: Andy Tai <atai <at> atai.org>
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 <mail <at> cbaines.net>
---
 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
--- 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)))))
 
+(define-public emacs-motif
+  (package/inherit emacs
+    (name "emacs-motif")
+    (synopsis
+     "The extensible, customizable, self-documenting text editor (with Motif
+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=motif"
+                #$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")
-- 
2.39.1

[Message part 3 (text/plain, inline)]
-- 
Adriel
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#61903; Package guix-patches. (Thu, 02 Mar 2023 09:25:02 GMT) Full text and rfc822 format available.

Message #8 received at 61903 <at> debbugs.gnu.org (full text, mbox):

From: Adriel Dumas--Jondeau <leirda <at> disroot.org>
To: 61903 <at> debbugs.gnu.org
Subject: Fwd: Re: [PATCH] Update fish to 3.6.0
Date: Thu, 02 Mar 2023 10:21:03 +0100
[Message part 1 (text/plain, inline)]
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 <leirda <at> disroot.org> 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.

[0001-gnu-Update-fish-to-3.6.0.patch (text/x-patch, inline)]
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'
[Message part 3 (text/plain, inline)]

-- 
Adriel
[signature.asc (application/pgp-signature, inline)]

bug closed, send any further explanations to 61903 <at> debbugs.gnu.org and Adriel Dumas--Jondeau <leirda <at> disroot.org> Request was from Winter <winter <at> winter.cafe> to control <at> debbugs.gnu.org. (Thu, 02 Mar 2023 12:59:02 GMT) Full text and rfc822 format available.

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Fri, 31 Mar 2023 11:24:04 GMT) Full text and rfc822 format available.

This bug report was last modified 363 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.