From 733c489bbdee6aa566aa644eab96767cc286d1ce Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 5 Dec 2020 16:09:52 +0100 Subject: gnu: Add rust-onig-6. * gnu/packages/crates-io.scm (rust-onig-6): New variable. (rust-onig-5.0): Inherit from above. --- gnu/packages/crates-io.scm | 50 ++++++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ea6057482b..319d0b9a18 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17802,36 +17802,52 @@ Things in odds may move to more appropriate crates if we find them.") ("rust-memchr" ,rust-memchr-2) ("rust-quickcheck" ,rust-quickcheck-0.4)))))) -(define-public rust-onig-5.0 +(define-public rust-onig-6 (package (name "rust-onig") - (version "5.0.0") + (version "6.1.1") (source - (origin - (method url-fetch) - (uri (crate-uri "onig" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0ivr0wq1zlyjhhkxpsnmpncg92sjx3rha8pnp3m1mzvgk7y27rz4")))) + (origin + (method url-fetch) + (uri (crate-uri "onig" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1mcx125hh22kx2d0676hkk2gli6v8r6c4rp3wh5qy0dwxpcnzd1h")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-libc" ,rust-libc-0.2) - ("rust-bitflags" ,rust-bitflags-1) + (("rust-bitflags" ,rust-bitflags-1) ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-onig-sys" ,rust-onig-sys-69.2)))) + ("rust-libc" ,rust-libc-0.2) + ("rust-onig-sys" ,rust-onig-sys-69.6)))) (home-page "https://github.com/rust-onig/rust-onig") - (synopsis - "Rust bindings for the Oniguruma regular expression library") + (synopsis "Rust bindings for the Oniguruma regular expression library") (description "Rust-Onig is a set of Rust bindings for the Oniguruma regular expression -library. Oniguruma is a modern regex library with support for multiple -character encodings and regex syntaxes.") +library.") (license license:expat))) +(define-public rust-onig-5.0 + (package + (inherit rust-onig-6) + (name "rust-onig") + (version "5.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "onig" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ivr0wq1zlyjhhkxpsnmpncg92sjx3rha8pnp3m1mzvgk7y27rz4")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-onig-sys" ,rust-onig-sys-69.2)))))) + (define-public rust-onig-sys-69.6 (package (name "rust-onig-sys") -- cgit 1.4.1