diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 7ecb20ca15..8ef7cdfe80 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -3594,40 +3594,55 @@ consecutive lines and since program start.") (define-public skim (package (name "skim") - (version "0.10.4") + (version "0.15.7") (source (origin - (method url-fetch) - (uri (crate-uri "skim" version)) - ;; Keep the same file name as the crate in crates-io - (file-name (string-append "rust-skim-" version ".tar.gz")) + ;; crates.io doesn't have everything needed. + (method git-fetch) + (uri (git-reference + (url "https://github.com/lotabout/skim") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0chgv9nr8cmlf2mg2k94igh3m5svjsfxxwbnl21xsb6blvh8vlp5")))) + (base32 "05j775mgx5a00k2p6nwlgxsdizjlw2380ai5rr5d86n2pg58fhmx")))) (build-system cargo-build-system) (arguments `(#:install-source? #f - #:cargo-inputs (("rust-atty" ,rust-atty-0.2) - ("rust-beef" ,rust-beef-0.5) + #:cargo-inputs (("rust-beef" ,rust-beef-0.5) ("rust-bitflags" ,rust-bitflags-1) ("rust-chrono" ,rust-chrono-0.4) - ("rust-clap" ,rust-clap-3) - ("rust-crossbeam" ,rust-crossbeam-0.8) + ("rust-clap" ,rust-clap-4) + ("rust-clap-complete" ,rust-clap-complete-4) + ("rust-clap-complete-fig" ,rust-clap-complete-fig-4) + ("rust-clap-complete-nushell" ,rust-clap-complete-nushell-4) + ("rust-clap-mangen" ,rust-clap-mangen-0.2) ("rust-defer-drop" ,rust-defer-drop-1) - ("rust-derive-builder" ,rust-derive-builder-0.11) - ("rust-env-logger" ,rust-env-logger-0.9) + ("rust-derive-builder" ,rust-derive-builder-0.20) + ("rust-env-logger" ,rust-env-logger-0.11) ("rust-fuzzy-matcher" ,rust-fuzzy-matcher-0.3) + ("rust-indexmap" ,rust-indexmap-2) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) - ("rust-nix" ,rust-nix-0.25) + ("rust-nix" ,rust-nix-0.29) + ("rust-rand" ,rust-rand-0.8) ("rust-rayon" ,rust-rayon-1) ("rust-regex" ,rust-regex-1) + ("rust-shell-quote" ,rust-shell-quote-0.7) ("rust-shlex" ,rust-shlex-1) + ("rust-tempfile" ,rust-tempfile-3) ("rust-time" ,rust-time-0.3) ("rust-timer" ,rust-timer-0.2) ("rust-tuikit" ,rust-tuikit-0.5) - ("rust-unicode-width" ,rust-unicode-width-0.1) - ("rust-vte" ,rust-vte-0.11)) + ("rust-unicode-width" ,rust-unicode-width-0.2) + ("rust-vte" ,rust-vte-0.13) + ("rust-which" ,rust-which-7)) #:phases (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (sk (car (find-files "target" "^sk$")))) + (install-file sk bin)))) (add-after 'install 'install-extras (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -3636,8 +3651,8 @@ consecutive lines and since program start.") (man (string-append out "/share/man")) (vimfiles (string-append share "/vim/vimfiles/pack/guix/start/skim/plugin")) - (bash-completion (string-append share - "/bash-completions/completions")) + (bash-completion (string-append out + "/etc/bash_completion.d")) (zsh-site (string-append share "/zsh/site-functions")) (fish-vendor (string-append share