Re: rav1e AV1 encoder

[Leo Famulari <leo@famulari.name>]

On Sat, Feb 22, 2020 at 06:09:33AM -0500, Martin Becze wrote:
> You need to remove the "(use-modules ..." from rav1e-sorted.scm, it should
> only have package definitions into.

Ah, I see! After removing that, the merge.scm script does run.

However, it does not successfully handle inherited packages, doing
things like removing rust-aho-corasick-0.7 even though
rust-aho-corasick-0.6 inherits from it.

Additionally, the commit diffs it creates are a little suspicious, for
example see below, which seems malformed.

From 4ef6c77b8e9171df6393a2ae17e4fca07724f068 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Sat, 22 Feb 2020 16:48:51 -0500
Subject: [PATCH] gnu: rust-wasm-bindgen-macro-0.2: Upgrade to 0.2.58

* gnu/packages/gnu/packages/crates-io.scm (rust-wasm-bindgen-macro-0.2): Upgrade to 0.2.58
---
 gnu/packages/crates-io.scm | 113 +++++++++++++++++++------------------
 1 file changed, 59 insertions(+), 54 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 85a4a375cb..d82be97766 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -9488,67 +9488,35 @@ facilitate deserializing and serializing Rust structures.
 ")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-wasm-bindgen-futures-0.3
-  (package
-    (name "rust-wasm-bindgen-futures")
-    (version "0.3.24")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "wasm-bindgen-futures" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0bf9x6qfjczspc4zs605z1n4j15cdd8kk2z7rah0yggw8b6zl5nc"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-futures" ,rust-futures-0.1)
-        ("rust-futures-channel-preview"
-         ,rust-futures-channel-preview-0.3)
-        ("rust-futures-util-preview" ,rust-futures-util-preview-0.3)
-        ("rust-js-sys" ,rust-js-sys-0.3)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2))
-       #:cargo-development-inputs
-       (("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2))))
-    (home-page "https://rustwasm.github.io/wasm-bindgen/")
-    (synopsis
-     "Bridging the gap between Rust Futures and JavaScript Promises")
-    (description
-     "Bridging the gap between Rust Futures and JavaScript Promises.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-wasm-bindgen-macro-0.2
   (package
     (name "rust-wasm-bindgen-macro")
-    (version "0.2.48")
+    (version "0.2.58")
     (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "wasm-bindgen-macro" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "07fqzzlbncccmnxbbkg9v4n53qc1lps5g0bb9wq3i9zp9gvm0zgh"))))
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "wasm-bindgen-macro" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1hwxw0nhi2n4izhjn2fvnrrn59xqjxs3ybkgzdv1b4p65ivr8h2p"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-quote" ,rust-quote-1.0)
-        ("rust-wasm-bindgen-macro-support"
-         ,rust-wasm-bindgen-macro-support-0.2))
-       #:cargo-development-inputs
-       (("rust-trybuild" ,rust-trybuild-1.0)
-        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2))))
-    (home-page "https://rustwasm.github.io/wasm-bindgen/")
-    (synopsis "Definition of the @code{#[wasm_bindgen]} attribute")
+      `(#:skip-build?
+        #t
+        #:cargo-inputs
+        (("rust-wasm-bindgen-macro-support"
+          ,rust-wasm-bindgen-macro-support-0.2)
+         ("rust-quote" ,rust-quote-1.0))))
+    (home-page
+      "https://rustwasm.github.io/wasm-bindgen/")
+    (synopsis
+      "Definition of the `#[wasm_bindgen]` attribute, an internal dependency
+")
     (description
-     "Definition of the @code{#[wasm_bindgen]} attribute, an internal
-dependency.")
+      "Definition of the `#[wasm_bindgen]` attribute, an internal dependency
+")
     (license (list license:expat license:asl2.0))))
 
 (define-public rust-wasm-bindgen-macro-support-0.2
@@ -10130,6 +10098,43 @@ to XDG Base Directory specification")
      "The missing YAML 1.2 parser for rust.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-zoneinfo-compiled-0.4
+  (package
+    (name "rust-zoneinfo-compiled")
+    (version "0.4.8")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "zoneinfo_compiled" version))
+        (file-name
+         (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0bnm19w791q6kp79s0zl1cj9w51bw5xrifrxfy3g1p05i676y4vf"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-byteorder" ,rust-byteorder-1.3)
+        ("rust-datetime" ,rust-datetime-0.4))))
+    (home-page "https://github.com/rust-datetime/zoneinfo-compiled/")
+    (synopsis "Library for parsing compiled zoneinfo files")
+    (description
+     "This package provides a library for parsing compiled zoneinfo files.")
+    (license license:expat)))
+4k5"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-linked-hash-map" ,rust-linked-hash-map-0.5))
+       #:cargo-development-inputs
+       (("rust-quickcheck" ,rust-quickcheck-0.8))))
+    (home-page "https://chyh1990.github.io/yaml-rust/")
+    (synopsis "The missing YAML 1.2 parser for rust")
+    (description
+     "The missing YAML 1.2 parser for rust.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-zoneinfo-compiled-0.4
   (package
     (name "rust-zoneinfo-compiled")
-- 
2.25.1