diff --git a/gnu/packages/rust-crates.scm b/gnu/packages/rust-crates.scm
index 1e19dc23484..eee0822cdae 100644
--- a/gnu/packages/rust-crates.scm
+++ b/gnu/packages/rust-crates.scm
@@ -50857,7 +50857,6 @@
                                  rust-errno-0.3.14
                                  rust-fastrand-2.3.0
                                  rust-find-msvc-tools-0.1.9
-                                 rust-fnv-1.0.7
                                  rust-foldhash-0.2.0
                                  rust-generic-array-0.14.7
                                  rust-getrandom-0.2.17
@@ -50876,9 +50875,7 @@
                                  rust-macro-rules-attribute-0.2.2
                                  rust-macro-rules-attribute-proc-macro-0.2.2
                                  rust-memchr-2.7.6
-                                 rust-minimal-lexical-0.2.1
                                  rust-nix-0.31.1
-                                 rust-nom-7.1.3
                                  rust-num-traits-0.2.19
                                  rust-once-cell-1.21.3
                                  rust-once-cell-polyfill-1.70.2
@@ -50888,13 +50885,9 @@
                                  rust-paste-1.0.15
                                  rust-pcre2-0.2.9.85b7afb
                                  rust-pcre2-sys-0.2.9.85b7afb
-                                 rust-phf-0.11.3
                                  rust-phf-0.13.1
-                                 rust-phf-codegen-0.11.3
                                  rust-phf-codegen-0.13.1
-                                 rust-phf-generator-0.11.3
                                  rust-phf-generator-0.13.1
-                                 rust-phf-shared-0.11.3
                                  rust-phf-shared-0.13.1
                                  rust-pkg-config-0.3.32
                                  rust-portable-atomic-1.13.1
@@ -50902,10 +50895,8 @@
                                  rust-proc-macro2-1.0.106
                                  rust-quote-1.0.44
                                  rust-r-efi-5.3.0
-                                 rust-rand-0.8.5
                                  rust-rand-0.9.2
                                  rust-rand-chacha-0.9.0
-                                 rust-rand-core-0.6.4
                                  rust-rand-core-0.9.5
                                  rust-redox-syscall-0.5.18
                                  rust-redox-users-0.5.2
@@ -50925,13 +50916,12 @@
                                  rust-serial-test-3.3.1
                                  rust-serial-test-derive-3.3.1
                                  rust-sha2-0.10.9
-                                 rust-shellexpand-3.1.1
+                                 rust-shellexpand-3.1.2
                                  rust-shlex-1.3.0
                                  rust-siphasher-1.0.2
                                  rust-smallvec-1.15.1
                                  rust-strsim-0.11.1
                                  rust-syn-2.0.114
-                                 rust-terminfo-0.9.0
                                  rust-thiserror-2.0.18
                                  rust-thiserror-impl-2.0.18
                                  rust-typenum-1.19.0
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index e500c156c9b..2eb07b4200e 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -133,7 +133,7 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).")
 (define-public fish
   (package
     (name "fish")
-    (version "4.5.0")
+    (version "4.6.0")
     (source
      (origin
        (method url-fetch)
@@ -141,7 +141,7 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).")
                            "releases/download/" version "/"
                            "fish-" version ".tar.xz"))
        (sha256
-        (base32 "1vb45i480723lin9jabnqx9x3m77kipnkzi60844wqsby661y5c9"))
+        (base32 "1ak12wpjllckv566k9jjy59si25whsib3j8ip8yqmqm06gvnb4gw"))
        ;; TODO: Unbundle corrosion.
        (patches (search-patches "corrosion-honor-CARGO_BUILD_TARGET.patch"))))
     (build-system cmake-build-system)
@@ -230,13 +230,9 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).")
                                    "src/highlight/file_tester.rs"
                                    "src/highlight/highlight.rs"
                                    (find-files "tests"))
-                 (("/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))
-                 (("/test/root/bin") "")
-                 (("/bin/ca\"" ca) (string-append coreutils ca))
-                 (("/bin/c\"" ca) (string-append coreutils ca))
+                 (("/usr/bin/en\"") (string-append coreutils "/bin/en\""))
+                 (("/usr/bin/e\"") (string-append coreutils "/bin/e\""))
                  (("\"/bin") "\"/tmp")
                  (("\"/usr") "\"/tmp"))
                (substitute* "tests/test_driver.py"