From 88ff06415c060a35e65539b71f439a8dd45224ee Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Tue, 16 Jun 2020 12:48:34 +0300
Subject: gnu: Add rust-nom-5.

* gnu/packages/crates-io.scm (rust-nom-5): New variable.
(rust-nom-4.2): Inherit from rust-nom-5.
---
 gnu/packages/crates-io.scm | 49 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 43 insertions(+), 6 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2f81d35d88..4da1087671 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -13448,10 +13448,10 @@ (define-public rust-nodrop-union-0.1
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-nom-4.2
+(define-public rust-nom-5
   (package
     (name "rust-nom")
-    (version "4.2.3")
+    (version "5.1.2")
     (source
      (origin
        (method url-fetch)
@@ -13460,18 +13460,30 @@ (define-public rust-nom-4.2
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1mkvby8b4m61p4g1px0pwr58yfkphyp1jcfbp4qfp7l6iqdaklia"))))
+         "1br74rwdp3c2ddga03bphnf355spn4mzwf1slg0a30zd4qnjdd7z"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(#: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.2)
         ("rust-regex" ,rust-regex-1.1)
-        ("rust-version-check" ,rust-version-check-0.1))
+        ("rust-version-check" ,rust-version-check-0.9))
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.2)
-        ("rust-jemallocator" ,rust-jemallocator-0.1))))
+        ("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)))))
+    (native-inputs
+     `(("jemalloc" ,jemalloc)))
     (home-page "https://github.com/Geal/nom")
     (synopsis
      "Byte-oriented, zero-copy, parser combinators library")
@@ -13480,6 +13492,31 @@ (define-public rust-nom-4.2
 combinators library.")
     (license license:expat)))
 
+(define-public rust-nom-4.2
+  (package
+    (inherit rust-nom-5)
+    (name "rust-nom")
+    (version "4.2.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "nom" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1mkvby8b4m61p4g1px0pwr58yfkphyp1jcfbp4qfp7l6iqdaklia"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-memchr" ,rust-memchr-2.2)
+        ("rust-regex" ,rust-regex-1.1)
+        ("rust-version-check" ,rust-version-check-0.1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.2)
+        ("rust-jemallocator" ,rust-jemallocator-0.1))))))
+
 (define-public rust-nom-3
   (package
     (inherit rust-nom-4.2)
-- 
cgit v1.2.3