[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/08: gnu: rust-pcre2-sys-0.2: Delete vendored code.
From: |
guix-commits |
Subject: |
07/08: gnu: rust-pcre2-sys-0.2: Delete vendored code. |
Date: |
Mon, 27 Jan 2020 12:47:27 -0500 (EST) |
efraim pushed a commit to branch master
in repository guix.
commit d0c4d1abfe54c12a0dfa467267859802f65c3bbc
Author: Efraim Flashner <address@hidden>
AuthorDate: Sat Jan 25 21:57:31 2020 +0200
gnu: rust-pcre2-sys-0.2: Delete vendored code.
* gnu/packages/crates-io.scm (rust-pcre2-sys-0.2)[source]: Delete
vendored code.
[arguments]: Remove custom phase.
(rust-pcre2-0.2, rust-grep-pcre2-0.1)[arguments]: Enable build.
[native-inputs]: Add pkg-config, pcre2.
---
gnu/packages/crates-io.scm | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 278b14e..1099a25 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4408,10 +4408,12 @@ the regex engine it uses pluggable.")
"1wjc3gsan20gapga8nji6jcrmwn9n85q5zf2yfq6g50c7abkc2ql"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-grep-matcher" ,rust-grep-matcher-0.1)
("rust-pcre2" ,rust-pcre2-0.2))))
+ (native-inputs
+ `(("pcre2" ,pcre2)
+ ("pkg-config" ,pkg-config)))
(home-page
"https://github.com/BurntSushi/ripgrep")
(synopsis "Use PCRE2 with the grep crate")
@@ -7490,12 +7492,14 @@ deserialization, and interpreter in Rust.")
"103i66a998g1fjrqf9sdyvi8qi83hwglz3pjdcq9n2r207hsagb0"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-libc" ,rust-libc-0.2)
("rust-log" ,rust-log-0.4)
("rust-pcre2-sys" ,rust-pcre2-sys-0.2)
("rust-thread-local" ,rust-thread-local-0.3))))
+ (native-inputs
+ `(("pcre2" ,pcre2)
+ ("pkg-config" ,pkg-config)))
(home-page "https://github.com/BurntSushi/rust-pcre2")
(synopsis "High level wrapper library for PCRE2")
(description
@@ -7514,23 +7518,16 @@ deserialization, and interpreter in Rust.")
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0nwdvc43dkb89qmm5q8gw1zyll0wsfqw7kczpn23mljra3874v47"))))
+ "0nwdvc43dkb89qmm5q8gw1zyll0wsfqw7kczpn23mljra3874v47"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin (delete-file-recursively "pcre2") #t))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-libc" ,rust-libc-0.2)
("rust-pkg-config" ,rust-pkg-config-0.3)
- ("rust-cc" ,rust-cc-1.0))
- #:phases
- (modify-phases %standard-phases
- (add-after 'configure 'unbundle-sources
- (lambda _
- (delete-file-recursively "pcre2")
- (delete-file-recursively
- (string-append "guix-vendor/rust-pcre2-sys-"
- ,(package-version rust-pcre2-sys-0.2)
- ".tar.gz/pcre2"))
- #t)))))
+ ("rust-cc" ,rust-cc-1.0))))
(native-inputs
`(("pcre2" ,pcre2)
("pkg-config" ,pkg-config)))
- branch master updated (2afae7f -> 61b95c1), guix-commits, 2020/01/27
- 01/08: build: cargo-build-system: Allow patched crates., guix-commits, 2020/01/27
- 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 <=
- 08/08: build: cargo-build-system: Add pkg-config environment variables., guix-commits, 2020/01/27