From c64fabcdeff2be1b952ca53c171b9b9c34d85129 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 5 Jul 2021 08:52:43 +0200 Subject: [PATCH] gnu: Add rust-predicates-2. * gnu/packages/crates-io.scm (rust-predicates-2): New variable. (rust-predicates-1): Inherit from above. --- gnu/packages/crates-io.scm | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 85c06114b0..c99218148a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -32642,27 +32642,27 @@ libpq.") dependency to expose a precomputed hash.") (license license:expat))) -(define-public rust-predicates-1 +(define-public rust-predicates-2 (package (name "rust-predicates") - (version "1.0.7") + (version "2.0.0") (source (origin (method url-fetch) (uri (crate-uri "predicates" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ai5qdqym11x1x55via1gq2w86ac1gj3rsjdan9wqmqsdi2k7d7f")))) + (base32 "0xma6v1qnfjxr4hmby5b6a9vc2i5f4638c24q4p1xqmlksknrr66")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-difference" ,rust-difference-2) + `(#:skip-build? #t + #:cargo-inputs + (("rust-difflib" ,rust-difflib-0.4) ("rust-float-cmp" ,rust-float-cmp-0.8) + ("rust-itertools" ,rust-itertools-0.10) ("rust-normalize-line-endings" ,rust-normalize-line-endings-0.3) ("rust-predicates-core" ,rust-predicates-core-1) - ("rust-regex" ,rust-regex-1)) - #:cargo-development-inputs - (("rust-predicates-tree" ,rust-predicates-tree-1)))) + ("rust-regex" ,rust-regex-1)))) (home-page "https://github.com/assert-rs/predicates-rs") (synopsis "Implementation of boolean-valued predicate functions") (description @@ -32670,6 +32670,28 @@ dependency to expose a precomputed hash.") functions.") (license (list license:expat license:asl2.0)))) +(define-public rust-predicates-1 + (package + (inherit rust-predicates-2) + (name "rust-predicates") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "predicates" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ai5qdqym11x1x55via1gq2w86ac1gj3rsjdan9wqmqsdi2k7d7f")))) + (arguments + `(#:cargo-inputs + (("rust-difference" ,rust-difference-2) + ("rust-float-cmp" ,rust-float-cmp-0.8) + ("rust-normalize-line-endings" ,rust-normalize-line-endings-0.3) + ("rust-predicates-core" ,rust-predicates-core-1) + ("rust-regex" ,rust-regex-1)) + #:cargo-development-inputs + (("rust-predicates-tree" ,rust-predicates-tree-1)))))) + (define-public rust-predicates-0.9 (package (inherit rust-predicates-1) -- 2.20.1