[PATCH] gnu: fish: Update to 3.6.0.

  • Done
  • quality assurance status badge
Details
3 participants
  • Liliana Marie Prikler
  • Tobias Geerinckx-Rice
  • Winter
Owner
unassigned
Submitted by
Winter
Severity
normal
Merged with
W
W
Winter wrote on 27 Feb 2023 04:22
(address . guix-patches@gnu.org)(name . Winter)(address . winter@winter.cafe)
20230227032233.2733-2-winter@winter.cafe
* gnu/packages/shells.scm (fish): Update to 3.6.0.
[source]: Remove snippet, as the vendored PCRE2 sources have been
removed (see upstream changelog).
---
gnu/packages/shells.scm | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)

Toggle diff (36 lines)
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'

base-commit: 81fbf5d71fb95367a0a93e45a86de5e930589a05
--
2.39.1
L
L
Liliana Marie Prikler wrote on 27 Feb 2023 06:24
(address . control@debbugs.gnu.org)(name . Winter)(address . winter@winter.cafe)
9f58c6bf80b8b0eac4fec565af6859ebe5028dfb.camel@gmail.com
merge 61833 61834
thanks

Re guix style: The tool often produces wrong results, so don't take it
as gospel (despite the manual advocating its use). The actual gold
standard is indenting your code with Emacs and a little aid of .dir-
locals.el

Cheers
T
T
Tobias Geerinckx-Rice wrote on 3 Mar 2023 00:57
(name . Winter)(address . winter@winter.cafe)
87pm9qso0l.fsf@nckx
Winter,

Winter via Guix-patches via ???
Toggle quote (2 lines)
> * gnu/packages/shells.scm (fish): Update to 3.6.0.

Thanks! Pushed as ea870a70e93e7ea93e35fa8e0afc3cfdb1b66ba2, with
only slight edits:

Toggle quote (3 lines)
> [source]: Remove snippet, as the vendored PCRE2 sources have
> been

I boldly s/vendored/bundled/ :-)

Toggle quote (2 lines)
> removed (see upstream changelog).

I wrote ‘CHANGELOG.rst’ here to make it (more) clear that it's a
file in the sourceball.

Toggle quote (2 lines)
> + (modules '((guix build utils)))))

The only purpose of this source field is to make modules available
to snippets, so it can go too.

Kind regards,

T G-R
-----BEGIN PGP SIGNATURE-----

iIMEARYKACsWIQT12iAyS4c9C3o4dnINsP+IT1VteQUCZAE4aw0cbWVAdG9iaWFz
LmdyAAoJEA2w/4hPVW154fYBAOfnGEMfP/SncWrk0He/pwTKcq6nU1v9jDzwKLFs
aPU3AP45Aslq51U/Rb+MpxoTouIypTwHzMIz0SApDheld/AYCg==
=0u8F
-----END PGP SIGNATURE-----

?