Subject: [bug#61903] [PATCH] Update fish to 3.6.0

From: Adriel Dumas--Jondeau <[email-masked]>
Date: Thu, 02 Mar 2023 01:01:31 +0100

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

From c05adaddb14064f0d2817e331fe5d0618f218bb9 Mon Sep 17 00:00:00 2001
Message-Id: <[email-masked]>
From: Andy Tai <[email-masked]>
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 <[email-masked]>
---
 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

-- 
Adriel