[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/08: build: cargo-build-system: Allow patched crates.
From: |
guix-commits |
Subject: |
01/08: build: cargo-build-system: Allow patched crates. |
Date: |
Mon, 27 Jan 2020 12:47:25 -0500 (EST) |
efraim pushed a commit to branch master
in repository guix.
commit a13db7e2ab05ee3ab9a42dd6a101130b8896fee0
Author: Efraim Flashner <address@hidden>
AuthorDate: Sat Jan 25 21:39:04 2020 +0200
build: cargo-build-system: Allow patched crates.
* guix/build/cargo-build-system.scm (crate-src?): Don't check for a
gzipped tarball, just make sure it's not a directory.
---
guix/build/cargo-build-system.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/guix/build/cargo-build-system.scm
b/guix/build/cargo-build-system.scm
index 8a8d74e..78c27a2 100644
--- a/guix/build/cargo-build-system.scm
+++ b/guix/build/cargo-build-system.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2016 David Craven <address@hidden>
;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
;;; Copyright © 2019 Ivan Petkov <address@hidden>
-;;; Copyright © 2019 Efraim Flashner <address@hidden>
+;;; Copyright © 2019, 2020 Efraim Flashner <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -58,7 +58,7 @@
(define (crate-src? path)
"Check if PATH refers to a crate source, namely a gzipped tarball with a
Cargo.toml file present at its root."
- (and (gzip-file? path)
+ (and (not (directory-exists? path)) ; not a tarball
;; First we print out all file names within the tarball to see if it
;; looks like the source of a crate. However, the tarball will include
;; an extra path component which we would like to ignore (since we're
- branch master updated (2afae7f -> 61b95c1), guix-commits, 2020/01/27
- 01/08: build: cargo-build-system: Allow patched crates.,
guix-commits <=
- 02/08: gnu: rust-libgit2-sys-0.10: Remove vendored code., guix-commits, 2020/01/27
- 03/08: gnu: rust-jemalloc-sys-0.3: Remove vendored code., guix-commits, 2020/01/27
- 05/08: gnu: rust-lzma-sys-0.1: Remove vendored code., guix-commits, 2020/01/27
- 06/08: gnu: rust-libz-sys-1.0: Remove vendored code., guix-commits, 2020/01/27
- 04/08: gnu: rust-libssh2-sys-0.2: Remove vendored code., guix-commits, 2020/01/27
- 07/08: gnu: rust-pcre2-sys-0.2: Delete vendored code., guix-commits, 2020/01/27
- 08/08: build: cargo-build-system: Add pkg-config environment variables., guix-commits, 2020/01/27