GNU logs - #68201, boring messages

Message sent to guix-patches@HIDDEN:

Subject: [bug#68201] [PATCH 0/2] gnu: fish: Update to 3.7.0.
Resent-From: "Paul A. Patience" <paul@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 02 Jan 2024 05:29:01 +0000
Resent-Message-ID: <handler.68201.B.170417331930188 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 68201 <at> debbugs.gnu.org
Cc: "Paul A. Patience" <paul@HIDDEN>
Date: Tue, 02 Jan 2024 05:28:09 +0000
From: "Paul A. Patience" <paul@HIDDEN>
Message-ID: <cover.1704173186.git.paul@HIDDEN>
Feedback-ID: 19227857:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass client-ip=185.70.43.23; envelope-from=paul@HIDDEN;
 helo=mail-4323.proton.ch
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
 RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001,
 SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.0 (+)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.0 (/)

Paul A. Patience (2):
  gnu: fish: Update to 3.7.0.
  gnu: fish: Improve package style.

 gnu/packages/shells.scm | 252 ++++++++++++++++++++--------------------
 1 file changed, 124 insertions(+), 128 deletions(-)

base-commit: d4cef7edffe0283949fc0f06d7796cea3543b92f
--=20
2.41.0

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: "Paul A. Patience" <paul@HIDDEN>
Subject: bug#68201: Acknowledgement ([PATCH 0/2] gnu: fish: Update to 3.7.0.)
Message-ID: <handler.68201.B.170417331930188.ack <at> debbugs.gnu.org>
References: <cover.1704173186.git.paul@HIDDEN>
X-Gnu-PR-Message: ack 68201
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 68201 <at> debbugs.gnu.org
Date: Tue, 02 Jan 2024 05:29:01 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 guix-patches@HIDDEN

If you wish to submit further information on this problem, please
send it to 68201 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
68201: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D68201
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to guix-patches@HIDDEN:

Subject: [bug#68201] [PATCH 1/2] gnu: fish: Update to 3.7.0.
Resent-From: "Paul A. Patience" <paul@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 02 Jan 2024 05:31:02 +0000
Resent-Message-ID: <handler.68201.B68201.17041734181200 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 68201 <at> debbugs.gnu.org
Cc: "Paul A. Patience" <paul@HIDDEN>
Date: Tue, 02 Jan 2024 05:29:53 +0000
From: "Paul A. Patience" <paul@HIDDEN>
Message-ID: <875afacb4d9f86d9da32e7469f7e0b8125b153ce.1704173186.git.paul@HIDDEN>
In-Reply-To: <cover.1704173186.git.paul@HIDDEN>
References: <cover.1704173186.git.paul@HIDDEN>
Feedback-ID: 19227857:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

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

Change-Id: I662d85f4f4af3d7ad4f3d8997678f4acfef6fee0
---
 gnu/packages/shells.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 8d2aadc0aa..798dba1d7c 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -120,7 +120,7 @@ (define-public dash
 (define-public fish
   (package
     (name "fish")
-    (version "3.6.1")
+    (version "3.7.0")
     (source
      (origin
        (method url-fetch)
@@ -128,7 +128,7 @@ (define-public fish
                            "releases/download/" version "/"
                            "fish-" version ".tar.xz"))
        (sha256
-        (base32 "1cj91fyba259vhbxvq55w2yf2p2vj201gr15pa59swx6gjs2nh2m"))))
+        (base32 "1c9slg6azhc9jn1sb75wip4hl9zyibjy9nay505nkw0lnxw766yz"))))
     (build-system cmake-build-system)
     (inputs
      (list fish-foreign-env ncurses pcre2
--=20
2.41.0

Message sent to guix-patches@HIDDEN:

Subject: [bug#68201] [PATCH 2/2] gnu: fish: Improve package style.
Resent-From: "Paul A. Patience" <paul@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 02 Jan 2024 05:31:02 +0000
Resent-Message-ID: <handler.68201.B68201.17041734373521 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 68201 <at> debbugs.gnu.org
Cc: "Paul A. Patience" <paul@HIDDEN>
Date: Tue, 02 Jan 2024 05:30:00 +0000
From: "Paul A. Patience" <paul@HIDDEN>
Message-ID: <dace4125b3ed4e7f69ae1de09af9640e1ddd18c0.1704173186.git.paul@HIDDEN>
In-Reply-To: <cover.1704173186.git.paul@HIDDEN>
References: <cover.1704173186.git.paul@HIDDEN>
Feedback-ID: 19227857:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

* gnu/packages/shells.scm (fish)[arguments]: Use G-expressions.
Drop trailing #t in phases. Move above native-inputs.
[native-inputs]: Add bash and coreutils. Move above inputs.
[home-page]: Move above synopsis.

Change-Id: I964b15f47629fa01d649e586f81eb5ae8e7046e3
---
 gnu/packages/shells.scm | 248 ++++++++++++++++++++--------------------
 1 file changed, 122 insertions(+), 126 deletions(-)

diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 798dba1d7c..bfa32ee0ee 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -22,6 +22,7 @@
 ;;; Copyright =C2=A9 2022 Andrew Tropin <andrew@HIDDEN>
 ;;; Copyright =C2=A9 2023 Zheng Junjie <873216071@HIDDEN>
 ;;; Copyright =C2=A9 2023 David Pflug <david@HIDDEN>
+;;; Copyright =C2=A9 2024 Paul A. Patience <paul@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -130,133 +131,129 @@ (define-public fish
        (sha256
         (base32 "1c9slg6azhc9jn1sb75wip4hl9zyibjy9nay505nkw0lnxw766yz"))))
     (build-system cmake-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'set-env
+            (lambda _
+              ;; some tests write to $HOME
+              (setenv "HOME" (getcwd))))
+          (add-after 'unpack 'patch-tests
+            (lambda _
+              (let ((coreutils #$(this-package-native-input "coreutils"))
+                    (bash #$(this-package-native-input "bash")))
+                ;; This test sporadically fails in the build container
+                ;; because of leftover zombie processes, which are not
+                ;; reaped automatically:
+                ;; "Found existing zombie processes. Clean up zombies befo=
re running this test."
+                ;; Disabling parallel tests does not reliably prevent it.
+                (delete-file "tests/checks/jobs.fish")
+                ;; This test fails.
+                (delete-file "tests/checks/pipeline-pgroup.fish")
+                ;; This one tries to open a terminal & can't simply be del=
eted.
+                (substitute* "cmake/Tests.cmake"
+                  ((".* interactive\\.fish.*") ""))
+                ;; This one needs to chdir successfully.
+                (substitute* "tests/checks/vars_as_commands.fish"
+                  (("/usr/bin") "/tmp"))
+                ;; These contain absolute path references.
+                (substitute* "src/fish_tests.cpp"
+                  (("/bin/echo" echo) (string-append coreutils echo))
+                  (("/bin/ca" ca) (string-append coreutils ca))
+                  (("\"(/bin/c)\"" _ c) (string-append "\"" coreutils c "\=
""))
+                  (("/bin/ls_not_a_path" ls-not-a-path)
+                   (string-append coreutils ls-not-a-path))
+                  (("/bin/ls" ls) (string-append coreutils ls))
+                  (("(/bin/)\"" _ bin) (string-append coreutils bin "\""))
+                  (("/bin -" bin) (string-append coreutils bin))
+                  (((string-append
+                     "do_test\\(is_potential_path\\("
+                     "L\"/usr\", wds, vars, PATH_REQUIRE_DIR\\)\\);"))
+                   "")
+                  ;; Not all mentions of /usr... need to exist, but these =
do.
+                  (("\"/usr(|/lib)\"" _ subdirectory)
+                   (string-append "\"/tmp" subdirectory "\"")))
+                (substitute*
+                    (append (find-files "tests" ".*\\.(in|out|err)$")
+                            (find-files "tests/checks" ".*\\.fish"))
+                  (("/bin/pwd" pwd) (string-append coreutils pwd))
+                  (("/bin/echo" echo) (string-append coreutils echo))
+                  (("/bin/sh" sh) (string-append bash sh))
+                  (("/bin/ls" ls) (string-append coreutils ls)))
+                (substitute* (find-files "tests" ".*\\.(in|out|err)$")
+                  (("/usr/bin") (string-append coreutils "/bin"))))))
+          ;; Source /etc/fish/config.fish from $__fish_sysconf_dir/config.=
fish.
+          (add-after 'patch-tests 'patch-fish-config
+            (lambda _
+              (let ((port (open-file "etc/config.fish" "a")))
+                (display (string-append
+                          "\n\n"
+                          "# Patched by Guix.\n"
+                          "# Source /etc/fish/config.fish.\n"
+                          "if test -f /etc/fish/config.fish\n"
+                          "    source /etc/fish/config.fish\n"
+                          "end\n")
+                         port)
+                (close-port port))))
+          ;; Embed absolute paths.
+          (add-before 'install 'embed-absolute-paths
+            (lambda _
+              (substitute* "share/functions/__fish_print_help.fish"
+                (("nroff") (which "nroff")))))
+          ;; Enable completions, functions and configurations in user's an=
d
+          ;; system's guix profiles by adding them to __extra_* variables.
+          (add-before 'install 'patch-fish-extra-paths
+            (lambda _
+              (let ((port (open-file "share/__fish_build_paths.fish" "a"))=
)
+                (display
+                 (string-append
+                  "\n\n"
+                  "# Patched by Guix.\n"
+                  "# Enable completions, functions and configurations in u=
ser's"
+                  " and system's guix profiles by adding them to __extra_*=
"
+                  " variables.\n"
+                  "set -l __guix_profile_paths ~/.guix-profile"
+                  " /run/current-system/profile\n"
+                  "set __extra_completionsdir"
+                  " $__guix_profile_paths\"/etc/fish/completions\""
+                  " $__guix_profile_paths\"/share/fish/vendor_completions.=
d\""
+                  " $__extra_completionsdir\n"
+                  "set __extra_functionsdir"
+                  " $__guix_profile_paths\"/etc/fish/functions\""
+                  " $__guix_profile_paths\"/share/fish/vendor_functions.d\=
""
+                  " $__extra_functionsdir\n"
+                  "set __extra_confdir"
+                  " $__guix_profile_paths\"/etc/fish/conf.d\""
+                  " $__guix_profile_paths\"/share/fish/vendor_conf.d\""
+                  " $__extra_confdir\n")
+                 port)
+                (close-port port))))
+          ;; Use fish-foreign-env to source /etc/profile.
+          (add-before 'install 'source-etc-profile
+            (lambda _
+              (let ((port (open-file "share/__fish_build_paths.fish" "a"))=
)
+                (display
+                 (string-append
+                  "\n\n"
+                  "# Patched by Guix.\n"
+                  "# Use fish-foreign-env to source /etc/profile.\n"
+                  "if status is-login\n"
+                  "    set fish_function_path "
+                  #$(this-package-input "fish-foreign-env") "/share/fish/f=
unctions"
+                  " $__fish_datadir/functions\n"
+                  "    fenv source /etc/profile\n"
+                  "    set -e fish_function_path\n"
+                  "end\n")
+                 port)
+                (close-port port)))))))
+    (native-inputs
+     (list doxygen groff                ; for 'fish --help'
+           bash coreutils procps))      ; for the test suite
     (inputs
      (list fish-foreign-env ncurses pcre2
-           python))  ; for fish_config and manpage completions
-    (native-inputs
-     (list doxygen groff ; for 'fish --help'
-           procps))             ; for the test suite
-    (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'set-env
-           (lambda _
-             ;; some tests write to $HOME
-             (setenv "HOME" (getcwd))
-             #t))
-         (add-after 'unpack 'patch-tests
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((coreutils (assoc-ref inputs "coreutils"))
-                   (bash (assoc-ref inputs "bash")))
-               ;; This test sporadically fails in the build container
-               ;; because of leftover zombie processes, which are not
-               ;; reaped automatically:
-;; "Found existing zombie processes. Clean up zombies before running this =
test."
-               ;; Disabling parallel tests does not reliably prevent it.
-               (delete-file "tests/checks/jobs.fish")
-               ;; This test fails.
-               (delete-file "tests/checks/pipeline-pgroup.fish")
-               ;; This one tries to open a terminal & can't simply be dele=
ted.
-               (substitute* "cmake/Tests.cmake"
-                 ((".* interactive\\.fish.*") ""))
-               ;; This one needs to chdir successfully.
-               (substitute* "tests/checks/vars_as_commands.fish"
-                 (("/usr/bin") "/tmp"))
-               ;; These contain absolute path references.
-               (substitute* "src/fish_tests.cpp"
-                 (("/bin/echo" echo) (string-append coreutils echo))
-                 (("/bin/ca" ca) (string-append coreutils ca))
-                 (("\"(/bin/c)\"" _ c) (string-append "\"" coreutils c "\"=
"))
-                 (("/bin/ls_not_a_path" ls-not-a-path)
-                  (string-append coreutils ls-not-a-path))
-                 (("/bin/ls" ls) (string-append coreutils ls))
-                 (("(/bin/)\"" _ bin) (string-append coreutils bin "\""))
-                 (("/bin -" bin) (string-append coreutils bin))
-                 (((string-append
-                    "do_test\\(is_potential_path\\("
-                    "L\"/usr\", wds, vars, PATH_REQUIRE_DIR\\)\\);"))
-                  "")
-                 ;; Not all mentions of /usr... need to exist, but these d=
o.
-                 (("\"/usr(|/lib)\"" _ subdirectory)
-                  (string-append "\"/tmp" subdirectory "\"")))
-               (substitute*
-                 (append (find-files "tests" ".*\\.(in|out|err)$")
-                         (find-files "tests/checks" ".*\\.fish"))
-                 (("/bin/pwd" pwd) (string-append coreutils pwd))
-                 (("/bin/echo" echo) (string-append coreutils echo))
-                 (("/bin/sh" sh) (string-append bash sh))
-                 (("/bin/ls" ls) (string-append coreutils ls)))
-               (substitute* (find-files "tests" ".*\\.(in|out|err)$")
-                 (("/usr/bin") (string-append coreutils "/bin")))
-               #t)))
-         ;; Source /etc/fish/config.fish from $__fish_sysconf_dir/config.f=
ish.
-         (add-after 'patch-tests 'patch-fish-config
-           (lambda _
-             (let ((port (open-file "etc/config.fish" "a")))
-               (display (string-append
-                         "\n\n"
-                         "# Patched by Guix.\n"
-                         "# Source /etc/fish/config.fish.\n"
-                         "if test -f /etc/fish/config.fish\n"
-                         "    source /etc/fish/config.fish\n"
-                         "end\n")
-                        port)
-               (close-port port))
-             #t))
-         ;; Embed absolute paths.
-         (add-before 'install 'embed-absolute-paths
-           (lambda _
-             (substitute* "share/functions/__fish_print_help.fish"
-               (("nroff") (which "nroff")))
-             #t))
-         ;; Enable completions, functions and configurations in user's and
-         ;; system's guix profiles by adding them to __extra_* variables.
-         (add-before 'install 'patch-fish-extra-paths
-           (lambda _
-             (let ((port (open-file "share/__fish_build_paths.fish" "a")))
-               (display
-                (string-append
-                 "\n\n"
-                 "# Patched by Guix.\n"
-                 "# Enable completions, functions and configurations in us=
er's"
-                 " and system's guix profiles by adding them to __extra_*"
-                 " variables.\n"
-                 "set -l __guix_profile_paths ~/.guix-profile"
-                 " /run/current-system/profile\n"
-                 "set __extra_completionsdir"
-                 " $__guix_profile_paths\"/etc/fish/completions\""
-                 " $__guix_profile_paths\"/share/fish/vendor_completions.d=
\""
-                 " $__extra_completionsdir\n"
-                 "set __extra_functionsdir"
-                 " $__guix_profile_paths\"/etc/fish/functions\""
-                 " $__guix_profile_paths\"/share/fish/vendor_functions.d\"=
"
-                 " $__extra_functionsdir\n"
-                 "set __extra_confdir"
-                 " $__guix_profile_paths\"/etc/fish/conf.d\""
-                 " $__guix_profile_paths\"/share/fish/vendor_conf.d\""
-                 " $__extra_confdir\n")
-                port)
-               (close-port port))
-             #t))
-         ;; Use fish-foreign-env to source /etc/profile.
-         (add-before 'install 'source-etc-profile
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((port (open-file "share/__fish_build_paths.fish" "a")))
-               (display
-                (string-append
-                 "\n\n"
-                 "# Patched by Guix.\n"
-                 "# Use fish-foreign-env to source /etc/profile.\n"
-                 "if status is-login\n"
-                 "    set fish_function_path "
-                 (assoc-ref inputs "fish-foreign-env") "/share/fish/functi=
ons"
-                 " $__fish_datadir/functions\n"
-                 "    fenv source /etc/profile\n"
-                 "    set -e fish_function_path\n"
-                 "end\n")
-                port)
-               (close-port port))
-             #t)))))
+           python))                  ; for fish_config and manpage complet=
ions
+    (home-page "https://fishshell.com/")
     (synopsis "The friendly interactive shell")
     (description
      "Fish (friendly interactive shell) is a shell focused on interactive =
use,
@@ -267,7 +264,6 @@ (define-public fish
 access to all the fish documentation in your web browser.  Other features
 include smart terminal handling based on terminfo, an easy to search histo=
ry,
 and syntax highlighting.")
-    (home-page "https://fishshell.com/")
     (license license:gpl2)))
=20
 (define-public fish-foreign-env
--=20
2.41.0

Last modified: Sat, 20 Jan 2024 12:30:02 UTC

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