summaryrefslogtreecommitdiff
path: root/guix/build
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2023-02-20 17:48:11 +0200
committerEfraim Flashner <efraim@flashner.co.il>2023-05-07 19:28:57 +0300
commitf4c3f2be941160814aa9d3faf01aa0fb9bc7c54e (patch)
treed76ebd5ae8ca681920971867085d838fa89a7ca5 /guix/build
parent1963daf94c529e0ae5e5e2e7c738ffbae94dab4e (diff)
gnu: rust: Update to 1.67.
* gnu/packages/rust.scm (rust): Update to 1.67. [arguments]: Add a phase to skip tests requiring mercurial. Extend the custom 'patch-process-tests phase. (rust-1.64)[arguments]: Adjust 'patch-cargo-checksums phase to patch another file. * guix/build/cargo-build-system.scm (package): Adjust to remove Cargo.toml.orig file if it exists.
Diffstat (limited to 'guix/build')
-rw-r--r--guix/build/cargo-build-system.scm8
1 files changed, 6 insertions, 2 deletions
diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm
index 5d7bfc8eb3..fbba554e9b 100644
--- a/guix/build/cargo-build-system.scm
+++ b/guix/build/cargo-build-system.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
-;;; Copyright © 2019-2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2019-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;;
@@ -231,7 +231,11 @@ directory = '" port)
(string-length ".tar.gz"))
".crate")))
(find-files "." "\\.tar\\.gz$"))))
- (apply invoke `("cargo" "package" ,@cargo-package-flags)))
+ (begin
+ ;;error: invalid inclusion of reserved file name Cargo.toml.orig in package source
+ (when (file-exists? "Cargo.toml.orig")
+ (delete-file "Cargo.toml.orig"))
+ (apply invoke `("cargo" "package" ,@cargo-package-flags))))
(format #t "Not installing cargo sources, skipping `cargo package`.~%"))
#t)