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

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

[Adriel Dumas--Jondeau via Guix-patches via]

[-- Attachment #1.1: Type: text/plain, Size: 1038 bytes --]


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


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: Update fish to 3.6.0 --]
[-- Type: text/x-patch, Size: 2087 bytes --]

From c05adaddb14064f0d2817e331fe5d0618f218bb9 Mon Sep 17 00:00:00 2001
Message-Id: <c05adaddb14064f0d2817e331fe5d0618f218bb9.1677701063.git.leirda@disroot.org>
From: Andy Tai <atai@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@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


[-- Attachment #1.3: Type: text/plain, Size: 15 bytes --]


-- 
Adriel

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 686 bytes --]

[bug#61904] [PATCH] Update fish to 3.6.0

[Adriel Dumas--Jondeau via Guix-patches via]

[-- Attachment #1.1: Type: text/plain, Size: 159 bytes --]


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.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: gnu: Update fish to 3.6.0 --]
[-- Type: text/x-patch, Size: 1442 bytes --]

From 65ffabb46942ed2439a203862ce64867b3bb75d1 Mon Sep 17 00:00:00 2001
Message-Id: <65ffabb46942ed2439a203862ce64867b3bb75d1.1677716351.git.leirda@disroot.org>
From: Adriel Dumas--Jondeau <leirda@disroot.org>
Date: Wed, 1 Mar 2023 18:11:19 +0100
Subject: [PATCH] gnu: Update fish to 3.6.0

---
 gnu/packages/shells.scm | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 0c8cbf3f4c..f74d2f8ade 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,12 +126,8 @@ (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
-- 
2.39.1


[-- Attachment #1.3: Type: text/plain, Size: 15 bytes --]


-- 
Adriel

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 686 bytes --]

[bug#61903] Fwd: Re: [PATCH] Update fish to 3.6.0

[Adriel Dumas--Jondeau via Guix-patches via]

[-- Attachment #1.1: Type: text/plain, Size: 375 bytes --]


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@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.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: Update fish to 3.6.0 --]
[-- Type: text/x-patch, Size: 1178 bytes --]

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'

[-- Attachment #1.3: Type: text/plain, Size: 17 bytes --]



-- 
Adriel

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 686 bytes --]