summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2021-01-03 11:11:45 +0200
committerEfraim Flashner <efraim@flashner.co.il>2021-01-03 12:49:34 +0200
commite6e350e6e3f3f2ca45c2f4e8fcff8f8bc05deaa3 (patch)
treede0055e980717c1e8851631704ede7078291e534
parent8b9cb0b381cc2eb555dff0cb54453b82cb64f0ca (diff)
downloadguix-patches-e6e350e6e3f3f2ca45c2f4e8fcff8f8bc05deaa3.tar
guix-patches-e6e350e6e3f3f2ca45c2f4e8fcff8f8bc05deaa3.tar.gz
gnu: Add rust-nom-6.
* gnu/packages/crates-io.scm (rust-nom-6): New variable. (rust-nom-5): Inherit from rust-nom-6.
-rw-r--r--gnu/packages/crates-io.scm48
1 files changed, 42 insertions, 6 deletions
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 92a49bc050..d7be42d7d6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -17741,10 +17741,10 @@ implementation (which is unstable / requires nightly).")
(license (list license:asl2.0
license:expat))))
-(define-public rust-nom-5
+(define-public rust-nom-6
(package
(name "rust-nom")
- (version "5.1.2")
+ (version "6.0.1")
(source
(origin
(method url-fetch)
@@ -17753,20 +17753,21 @@ implementation (which is unstable / requires nightly).")
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1br74rwdp3c2ddga03bphnf355spn4mzwf1slg0a30zd4qnjdd7z"))))
+ "1w0ppq112myzwk23c8m0wmq0nv73xvn0g9gl2kfm83aadgylq0w8"))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f ; Tests require example directory, not included in tarball.
#:cargo-inputs
- (("rust-lazy-static" ,rust-lazy-static-1)
+ (("rust-bitvec" ,rust-bitvec-0.19)
+ ("rust-lazy-static" ,rust-lazy-static-1)
("rust-lexical-core" ,rust-lexical-core-0.7)
("rust-memchr" ,rust-memchr-2)
("rust-regex" ,rust-regex-1)
("rust-version-check" ,rust-version-check-0.9))
#:cargo-development-inputs
- (("rust-criterion" ,rust-criterion-0.2)
+ (("rust-criterion" ,rust-criterion-0.3)
("rust-doc-comment" ,rust-doc-comment-0.3)
- ("rust-jemallocator" ,rust-jemallocator-0.1))
+ ("rust-jemallocator" ,rust-jemallocator-0.3))
#:phases
(modify-phases %standard-phases
(add-after 'configure 'override-jemalloc
@@ -17785,6 +17786,41 @@ implementation (which is unstable / requires nightly).")
combinators library.")
(license license:expat)))
+(define-public rust-nom-5
+ (package
+ (inherit rust-nom-6)
+ (name "rust-nom")
+ (version "5.1.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "nom" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1br74rwdp3c2ddga03bphnf355spn4mzwf1slg0a30zd4qnjdd7z"))))
+ (arguments
+ `(#:tests? #f ; Tests require example directory, not included in tarball.
+ #:cargo-inputs
+ (("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-lexical-core" ,rust-lexical-core-0.7)
+ ("rust-memchr" ,rust-memchr-2)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-version-check" ,rust-version-check-0.9))
+ #:cargo-development-inputs
+ (("rust-criterion" ,rust-criterion-0.2)
+ ("rust-doc-comment" ,rust-doc-comment-0.3)
+ ("rust-jemallocator" ,rust-jemallocator-0.1))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'configure 'override-jemalloc
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((jemalloc (assoc-ref inputs "jemalloc")))
+ (setenv "JEMALLOC_OVERRIDE"
+ (string-append jemalloc "/lib/libjemalloc_pic.a")))
+ #t)))))))
+
(define-public rust-nom-4.2
(package
(inherit rust-nom-5)