gnu: tealdeer: Update to 1.6.1.

* gnu/packages/rust-apps.scm (tealdeer): Update to 1.6.1.
[source]: Download using git-fetch.
[arguments]: Adjust 'install-completions phase to install zsh
completions also. Skip 2 more tests.
[cargo-inputs]: Add rust-anyhow-1, rust-clap-3, rust-yansi-0.5,
rust-zip-0.6.  Remove rust-ansi-term-0.12, rust-docopt-1, rust-flate-2,
rust-tar-0.4, rust-xdg-2.  Replace rust-env-logger-0.7 with 0.9,
rust-pager-0.15 with 0.16, rust-reqwest-0.10 with 0.11.
[cargo-development-inputs]: Remove rust-remove-dir-all-0.5.2. Replace
rust-assert-cmd-1 with 2, rust-predicates-1 with 2.
* gnu/packages/crates-io.scm (rust-remove-dir-all-0.5.2): Remove
variable.

2 files changed, 27 insertions, 47 deletions

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 949421eaf0..90a1346e86 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -48530,29 +48530,6 @@ uses finite automata and guarantees linear time matching on all inputs.")
     (license (list license:asl2.0
                    license:expat))))
 
-;; rust-remove-dir-all-0.5.2 is only needed for tealdeer at 1.4.1
-;; Remove rust-remove-dir-all-0.5.2 when tealdeer is updated
-(define-public rust-remove-dir-all-0.5.2
-  (package
-    (inherit rust-remove-dir-all-0.5)
-    (name "rust-remove-dir-all")
-    (version "0.5.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "remove_dir_all" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0bkrlyg26mgizpiy1yb2hhpgscxcag8r5fnckqsvk25608vzm0sa"))))
-    (arguments
-     `(#:tests? #f  ; README.md is missing.
-       #:cargo-inputs
-       (("rust-winapi" ,rust-winapi-0.3))
-       #:cargo-development-inputs
-       (("rust-doc-comment" ,rust-doc-comment-0.3))))))
-
 (define-public rust-rend-0.3
   (package
     (name "rust-rend")
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index ab2a0d0d80..7a6e8e367f 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -2125,16 +2125,18 @@ daemon which executes them.")
 (define-public tealdeer
   (package
     (name "tealdeer")
-    (version "1.4.1")
+    (version "1.6.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (crate-uri "tealdeer" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       ;; Completions aren't in the release tarball.
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/dbrgn/tealdeer")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
         (base32
-         "0cwf46k2rszcpydrqajnm4dvhggr3ms7sjma0jx02ch4fjicxch7"))))
+         "0ipd23b30pqvyh20mxfd13ps0rnvg7zfpysv7wambfbb92xdh36d"))))
     (build-system cargo-build-system)
     (arguments
      `(#:phases
@@ -2143,13 +2145,17 @@ daemon which executes them.")
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out  (assoc-ref outputs "out"))
                     (bash (string-append out "/etc/bash_completion.d/"))
-                    (fish (string-append out "/share/fish/vendor_completions.d/")))
+                    (fish (string-append out "/share/fish/vendor_completions.d/"))
+                    (zsh  (string-append out "/share/zsh/site-functions/")))
                (mkdir-p bash)
                (mkdir-p fish)
-               (copy-file "bash_tealdeer"
+               (mkdir-p zsh)
+               (copy-file "completion/bash_tealdeer"
                           (string-append bash "tealdeer"))
-               (copy-file "fish_tealdeer"
-                          (string-append fish "tealdeer.fish"))))))
+               (copy-file "completion/fish_tealdeer"
+                          (string-append fish "tealdeer.fish"))
+               (copy-file "completion/zsh_tealdeer"
+                          (string-append zsh "_tealdeer"))))))
        #:install-source? #f
        #:cargo-test-flags
        '("--release" "--"
@@ -2161,31 +2167,28 @@ daemon which executes them.")
          "--skip=test_markdown_rendering"
          "--skip=test_spaces_find_command"
          "--skip=test_autoupdate_cache"
-         "--skip=test_update_cache")
+         "--skip=test_update_cache"
+         "--skip=test_create_cache_directory_path")
        #:cargo-inputs
-       (("rust-ansi-term" ,rust-ansi-term-0.12)
+       (("rust-anyhow" ,rust-anyhow-1)
         ("rust-app-dirs2" ,rust-app-dirs2-2)
         ("rust-atty" ,rust-atty-0.2)
-        ("rust-docopt" ,rust-docopt-1)
-        ("rust-env-logger" ,rust-env-logger-0.7)
-        ("rust-flate2" ,rust-flate2-1)
+        ("rust-clap" ,rust-clap-3)
+        ("rust-env-logger" ,rust-env-logger-0.9)
         ("rust-log" ,rust-log-0.4)
-        ("rust-pager" ,rust-pager-0.15)
-        ("rust-reqwest" ,rust-reqwest-0.10)
+        ("rust-pager" ,rust-pager-0.16)
+        ("rust-reqwest" ,rust-reqwest-0.11)
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-derive" ,rust-serde-derive-1)
-        ("rust-tar" ,rust-tar-0.4)
         ("rust-toml" ,rust-toml-0.5)
         ("rust-walkdir" ,rust-walkdir-2)
-        ("rust-xdg" ,rust-xdg-2))
+        ("rust-yansi" ,rust-yansi-0.5)
+        ("rust-zip" ,rust-zip-0.6))
        #:cargo-development-inputs
-       (("rust-assert-cmd" ,rust-assert-cmd-1)
+       (("rust-assert-cmd" ,rust-assert-cmd-2)
         ("rust-escargot" ,rust-escargot-0.5)
         ("rust-filetime" ,rust-filetime-0.2)
-        ("rust-predicates" ,rust-predicates-1)
-        ;; This earlier version is required to fix a bug.
-        ;; Remove rust-remove-dir-all-0.5.2 when tealdeer gets upgraded
-        ("rust-remove-dir-all" ,rust-remove-dir-all-0.5.2)
+        ("rust-predicates" ,rust-predicates-2)
         ("rust-tempfile" ,rust-tempfile-3))))
     (native-inputs
      (list pkg-config))