futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: rust: Build more tools.

Browse Source 
* gnu/packages/rust.scm (rust)[outputs]: Rename 'rustfmt' output to
'tools'.
[arguments]: Adjust 'build, 'check and 'install phases to also provide
clippy and rust-analyzer.
This commit is contained in:
Efraim Flashner 2023-10-01 10:49:07 +03:00
parent 868d17acf7
commit df93d8a9f8
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnu/packages/rust.scm
View File

@ -760,7 +760,7 @@ safety and thread safety guarantees.")
(let ((base-rust rust-1.70)) (let ((base-rust rust-1.70))
(package (package
(inherit base-rust) (inherit base-rust)
(outputs (cons "rustfmt" (package-outputs base-rust))) (outputs (cons "tools" (package-outputs base-rust)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments base-rust) (substitute-keyword-arguments (package-arguments base-rust)
((#:tests? _ #f) ((#:tests? _ #f)
@ -878,18 +878,20 @@ safety and thread safety guarantees.")
(string-append all (string-append all
"gdb = \"" gdb "/bin/gdb\"\n")))))) "gdb = \"" gdb "/bin/gdb\"\n"))))))
(replace 'build (replace 'build
;; Phase overridden to also build rustfmt. ;; Phase overridden to also build more tools.
(lambda* (#:key parallel-build? #:allow-other-keys) (lambda* (#:key parallel-build? #:allow-other-keys)
(let ((job-spec (string-append (let ((job-spec (string-append
"-j" (if parallel-build? "-j" (if parallel-build?
(number->string (parallel-job-count)) (number->string (parallel-job-count))
"1")))) "1"))))
(invoke "./x.py" job-spec "build" (invoke "./x.py" job-spec "build"
"library/std" ;rustc "library/std" ;rustc
"src/tools/cargo" "src/tools/cargo"
"src/tools/clippy"
"src/tools/rust-analyzer"
"src/tools/rustfmt")))) "src/tools/rustfmt"))))
(replace 'check (replace 'check
;; Phase overridden to also test rustfmt. ;; Phase overridden to also test more tools.
(lambda* (#:key tests? parallel-build? #:allow-other-keys) (lambda* (#:key tests? parallel-build? #:allow-other-keys)
(when tests? (when tests?
(let ((job-spec (string-append (let ((job-spec (string-append
@ -899,9 +901,11 @@ safety and thread safety guarantees.")
(invoke "./x.py" job-spec "test" "-vv" (invoke "./x.py" job-spec "test" "-vv"
"library/std" "library/std"
"src/tools/cargo" "src/tools/cargo"
"src/tools/clippy"
"src/tools/rust-analyzer"
"src/tools/rustfmt"))))) "src/tools/rustfmt")))))
(replace 'install (replace 'install
;; Phase overridden to also install rustfmt. ;; Phase overridden to also install more tools.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(invoke "./x.py" "install") (invoke "./x.py" "install")
(substitute* "config.toml" (substitute* "config.toml"
@ -910,9 +914,11 @@ safety and thread safety guarantees.")
(format #f "prefix = ~s" (assoc-ref outputs "cargo")))) (format #f "prefix = ~s" (assoc-ref outputs "cargo"))))
(invoke "./x.py" "install" "cargo") (invoke "./x.py" "install" "cargo")
(substitute* "config.toml" (substitute* "config.toml"
;; Adjust the prefix to the 'rustfmt' output. ;; Adjust the prefix to the 'tools' output.
(("prefix = \"[^\"]*\"") (("prefix = \"[^\"]*\"")
(format #f "prefix = ~s" (assoc-ref outputs "rustfmt")))) (format #f "prefix = ~s" (assoc-ref outputs "tools"))))
(invoke "./x.py" "install" "clippy")
(invoke "./x.py" "install" "rust-analyzer")
(invoke "./x.py" "install" "rustfmt"))))))) (invoke "./x.py" "install" "rustfmt")))))))
;; Add test inputs. ;; Add test inputs.
(native-inputs (cons* `("gdb" ,gdb/pinned) (native-inputs (cons* `("gdb" ,gdb/pinned)