bug#61834: closed ([PATCH] gnu: fish: Update to 3.6.0.)

[GNU bug Tracking System]

Your message dated Fri, 03 Mar 2023 00:57:25 +0100
with message-id <87pm9qso0l.fsf@nckx>
and subject line Re: [bug#61834] [PATCH] gnu: fish: Update to 3.6.0.
has caused the debbugs.gnu.org bug report #61834,
regarding [PATCH] gnu: fish: Update to 3.6.0.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
61834: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=61834
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: fish: Update to 3.6.0.
>
>
>
>
> Date: 
>
> Sun, 26 Feb 2023 22:22:33 -0500
>
>
>
>
> * 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(-)
>
> 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
>
>
>
>
> --- End Message ---

--- Begin Message --- Subject: Re: [bug#61834] [PATCH] gnu: fish: Update to 3.6.0. Date: Fri, 03 Mar 2023 00:57:25 +0100

Winter,

Winter via Guix-patches via 写道：

* gnu/packages/shells.scm (fish): Update to 3.6.0.

Thanks! Pushed as ea870a70e93e7ea93e35fa8e0afc3cfdb1b66ba2, with only slight edits:

[source]: Remove snippet, as the vendored PCRE2 sources have been

I boldly s/vendored/bundled/ :-)

removed (see upstream changelog).

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

+       (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

signature.asc
Description: PGP signature

--- End Message ---