summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2020-12-05 16:09:52 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2020-12-05 17:39:27 +0100
commit733c489bbdee6aa566aa644eab96767cc286d1ce (patch)
tree86ec144629f00916d4ea2aca0c64b487e8bed8fe
parente0c28005c32f8d8b7e67fa49a74d72db9cdeeb97 (diff)
downloadguix-733c489bbdee6aa566aa644eab96767cc286d1ce.tar.gz
gnu: Add rust-onig-6.
* gnu/packages/crates-io.scm (rust-onig-6): New variable.
(rust-onig-5.0): Inherit from above.
-rw-r--r--gnu/packages/crates-io.scm50
1 files 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")