Archived
1
0
Fork 0

gnu: fd: Update to 9.0.0.

* gnu/packages/rust-apps.scm (fd): Update to 9.0.0.
[arguments]: Use gexps.  Remove phase adjusting the feature-flags for
rust-clap-4.
[cargo-inputs]: Add rust-aho-corasick-1, rust-etcetera-0.8.  Replace
rust-lscolors-0.13 with 0.16, rust-nix-0.26 with 0.27, rust-normpath-0.3
with 1, rust-nu-ansi-term-0.46 with 0.49, rust-regex-syntax-0.6 with
0.8.  Remove rust-atty-0.2, rust-dirs-next-2, rust-num-cpus-1,
rust-once-cell-1, rust-users-0.11.
[cargo-development-inputs]: Replace rust-test-case-2 with 3.

Change-Id: I8ce2d61e668cceafc49c9aa29c00703344f6b0b0
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
Jaeme Sifat 2024-01-20 12:55:31 -05:00 committed by Efraim Flashner
parent 676b5dbe6e
commit 4dbb0bb1f2
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351

View file

@ -525,7 +525,7 @@ This package is the community maintained fork of @code{exa}.")
(define-public fd (define-public fd
(package (package
(name "fd") (name "fd")
(version "8.7.0") (version "9.0.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -534,85 +534,77 @@ This package is the community maintained fork of @code{exa}.")
(string-append name "-" version ".tar.gz")) (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"186217yyb0znfn4jcc9l3i51fhfyb23lhbm3gg084sdrbj6bdnbg")))) "1is6xrsnbiy4la3lrmxzl3pzzkygnx9mp8h5k8gfrc29bq8m7891"))))
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(#:cargo-test-flags (list
'("--release" #:cargo-test-flags
"--" ;; No user 'root' in the build environment.
;; No user 'root' in the build environment. '(list "--release" "--"
"--skip=test_owner_root") "--skip=test_owner_root")
#:install-source? #f #:install-source? #f
#:cargo-inputs #:cargo-inputs
(("rust-anyhow" ,rust-anyhow-1) `(("rust-aho-corasick" ,rust-aho-corasick-1)
("rust-anyhow" ,rust-anyhow-1)
("rust-argmax" ,rust-argmax-0.3) ("rust-argmax" ,rust-argmax-0.3)
("rust-atty" ,rust-atty-0.2)
("rust-chrono" ,rust-chrono-0.4) ("rust-chrono" ,rust-chrono-0.4)
("rust-clap" ,rust-clap-4) ("rust-clap" ,rust-clap-4)
("rust-clap-complete" ,rust-clap-complete-4) ("rust-clap-complete" ,rust-clap-complete-4)
("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
("rust-ctrlc" ,rust-ctrlc-3) ("rust-ctrlc" ,rust-ctrlc-3)
("rust-dirs-next" ,rust-dirs-next-2) ("rust-etcetera" ,rust-etcetera-0.8)
("rust-faccess" ,rust-faccess-0.2) ("rust-faccess" ,rust-faccess-0.2)
("rust-globset" ,rust-globset-0.4) ("rust-globset" ,rust-globset-0.4)
("rust-humantime" ,rust-humantime-2) ("rust-humantime" ,rust-humantime-2)
("rust-ignore" ,rust-ignore-0.4) ("rust-ignore" ,rust-ignore-0.4)
("rust-jemallocator" ,rust-jemallocator-0.5) ("rust-jemallocator" ,rust-jemallocator-0.5)
("rust-libc" ,rust-libc-0.2) ("rust-libc" ,rust-libc-0.2)
("rust-lscolors" ,rust-lscolors-0.13) ("rust-lscolors" ,rust-lscolors-0.16)
("rust-nix" ,rust-nix-0.26) ("rust-nix" ,rust-nix-0.27)
("rust-normpath" ,rust-normpath-0.3) ("rust-normpath" ,rust-normpath-1)
("rust-nu-ansi-term" ,rust-nu-ansi-term-0.46) ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.49)
("rust-num-cpus" ,rust-num-cpus-1)
("rust-once-cell" ,rust-once-cell-1)
("rust-regex" ,rust-regex-1) ("rust-regex" ,rust-regex-1)
("rust-regex-syntax" ,rust-regex-syntax-0.6) ("rust-regex-syntax" ,rust-regex-syntax-0.8)
("rust-users" ,rust-users-0.11)
("rust-version-check" ,rust-version-check-0.9)) ("rust-version-check" ,rust-version-check-0.9))
#:cargo-development-inputs #:cargo-development-inputs
(("rust-diff" ,rust-diff-0.1) `(("rust-diff" ,rust-diff-0.1)
("rust-filetime" ,rust-filetime-0.2) ("rust-filetime" ,rust-filetime-0.2)
("rust-tempfile" ,rust-tempfile-3) ("rust-tempfile" ,rust-tempfile-3)
("rust-test-case" ,rust-test-case-2)) ("rust-test-case" ,rust-test-case-3))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'override-jemalloc (add-after 'unpack 'override-jemalloc
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((jemalloc (assoc-ref inputs "jemalloc"))) (let ((jemalloc (assoc-ref inputs "jemalloc")))
;; This flag is needed when not using the bundled jemalloc. ;; This flag is needed when not using the bundled jemalloc.
;; https://github.com/tikv/jemallocator/issues/19 ;; https://github.com/tikv/jemallocator/issues/19
(setenv "CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS" "1") (setenv "CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS" "1")
(setenv "JEMALLOC_OVERRIDE" (setenv "JEMALLOC_OVERRIDE"
(string-append jemalloc "/lib/libjemalloc.so"))))) (string-append jemalloc "/lib/libjemalloc.so")))))
(add-after 'unpack 'adjust-feature-flags (add-after 'install 'install-extras
(lambda _ (lambda* (#:key outputs #:allow-other-keys)
;; unstable-grouped was stablized in rust-clap 4.2.0 (let ((out (assoc-ref outputs "out")))
(substitute* "Cargo.toml" ;; Manpages
((".*unstable-grouped.*") "")))) (install-file "doc/fd.1" (string-append out "/share/man/man1"))
(add-after 'install 'install-extra ;; Completions require running the built binary.
(lambda* (#:key outputs #:allow-other-keys) (unless #$(%current-target-system)
(let ((out (assoc-ref outputs "out"))) (invoke "make" "completions")
;; Manpages (install-file "autocomplete/fd.bash"
(install-file "doc/fd.1" (string-append out "/share/man/man1")) (string-append out "/etc/bash_completion.d"))
;; Completions require running the built binary. (install-file "autocomplete/fd.fish"
(unless ,(%current-target-system) (string-append out "/share/fish/vendor_completions.d"))
(invoke "make" "completions") (install-file "autocomplete/_fd"
(install-file "autocomplete/fd.bash" (string-append out "/share/zsh/site-functions"))
(string-append out "/etc/bash_completion.d")) (rename-file (string-append out "/etc/bash_completion.d/fd.bash")
(install-file "autocomplete/fd.fish" (string-append out "/etc/bash_completion.d/fd")))))))))
(string-append out "/share/fish/vendor_completions.d")) (inputs (list jemalloc))
(install-file "autocomplete/_fd" (home-page "https://github.com/sharkdp/fd")
(string-append out "/share/zsh/site-functions")) (synopsis "Simple, fast and user-friendly alternative to find")
(rename-file (string-append out "/etc/bash_completion.d/fd.bash") (description
(string-append out "/etc/bash_completion.d/fd"))))))))) "@code{fd} is a simple, fast and user-friendly alternative to @code{find}.
(inputs (list jemalloc)) While it does not seek to mirror all of find's powerful functionality, it provides
(home-page "https://github.com/sharkdp/fd") defaults for 80% of the use cases.")
(synopsis "Simple, fast and user-friendly alternative to find") (license (list license:expat license:asl2.0))))
(description
"@code{fd} is a simple, fast and user-friendly alternative to @code{find}.
While it does not seek to mirror all of find's powerful functionality, it
provides defaults for 80% of the use cases.")
(license (list license:expat license:asl2.0))))
(define-public hexyl (define-public hexyl
(package (package