[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
14/475: build: cargo-build-system: Don't try to package when skipping bu
From: |
guix-commits |
Subject: |
14/475: build: cargo-build-system: Don't try to package when skipping build. |
Date: |
Sun, 7 May 2023 12:45:43 -0400 (EDT) |
efraim pushed a commit to branch rust-team
in repository guix.
commit 1963daf94c529e0ae5e5e2e7c738ffbae94dab4e
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Wed Nov 10 19:48:12 2021 +0200
build: cargo-build-system: Don't try to package when skipping build.
* guix/build/cargo-build-system.scm (package): If the package isn't
going to be built then use the source instead.
---
guix/build/cargo-build-system.scm | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/guix/build/cargo-build-system.scm
b/guix/build/cargo-build-system.scm
index 41766228c2..5d7bfc8eb3 100644
--- a/guix/build/cargo-build-system.scm
+++ b/guix/build/cargo-build-system.scm
@@ -210,12 +210,28 @@ directory = '" port)
#t))
(define* (package #:key
+ source
+ skip-build?
install-source?
(cargo-package-flags '("--no-metadata" "--no-verify"))
#:allow-other-keys)
"Run 'cargo-package' for a given Cargo package."
(if install-source?
- (apply invoke `("cargo" "package" ,@cargo-package-flags))
+ (if skip-build?
+ (begin
+ (install-file source "target/package")
+ (with-directory-excursion "target/package"
+ (for-each
+ (lambda (file)
+ (make-file-writable file)
+ ;; Strip the hash and replace '.tar.gz' with '.crate'.
+ (rename-file file
+ (string-append (string-drop-right
+ (string-drop file 35)
+ (string-length ".tar.gz"))
+ ".crate")))
+ (find-files "." "\\.tar\\.gz$"))))
+ (apply invoke `("cargo" "package" ,@cargo-package-flags)))
(format #t "Not installing cargo sources, skipping `cargo package`.~%"))
#t)
- 01/475: gnu: rust: Remove bundled compiled libraries., (continued)
- 01/475: gnu: rust: Remove bundled compiled libraries., guix-commits, 2023/05/07
- 06/475: gnu: rust-windows-x86-64-gnu: Remove bundled library., guix-commits, 2023/05/07
- 08/475: gnu: rust-windows-x86-64-msvc: Remove bundled library., guix-commits, 2023/05/07
- 04/475: gnu: rust-windows-i686-gnu: Remove bundled library., guix-commits, 2023/05/07
- 21/475: gnu: Add rust-aes-0.8., guix-commits, 2023/05/07
- 20/475: gnu: Add rust-aead-0.5., guix-commits, 2023/05/07
- 22/475: gnu: Add rust-aes-gcm-0.10., guix-commits, 2023/05/07
- 25/475: gnu: Add rust-botan-src-0.21703., guix-commits, 2023/05/07
- 34/475: gnu: rust-crates-io: Update to 0.35., guix-commits, 2023/05/07
- 37/475: gnu: rust-curl-sys-0.4: Update to 0.4.59., guix-commits, 2023/05/07
- 14/475: build: cargo-build-system: Don't try to package when skipping build.,
guix-commits <=
- 24/475: gnu: Add rust-block-padding-0.3., guix-commits, 2023/05/07
- 27/475: gnu: rust-cargo: Update to 0.68., guix-commits, 2023/05/07
- 38/475: gnu: rust-digest-0.10: Add missing input., guix-commits, 2023/05/07
- 41/475: gnu: Add rust-env-logger-0.10., guix-commits, 2023/05/07
- 43/475: gnu: Add rust-git2-0.16., guix-commits, 2023/05/07
- 44/475: gnu: Add rust-git2-curl-0.17., guix-commits, 2023/05/07
- 46/475: gnu: Add rust-hkdf-0.12., guix-commits, 2023/05/07
- 03/475: gnu: rust-windows-aarch64-msvc: Remove bundled library., guix-commits, 2023/05/07
- 05/475: gnu: rust-windows-i686-msvc: Remove bundled library., guix-commits, 2023/05/07
- 12/475: gnu: librsvg: Adjust test suite., guix-commits, 2023/05/07