gnu: alfis: Update to 0.8.5.

* gnu/packages/rust-apps.scm (alfis): Update to 0.8.5.
[source]: Add more substitutions to the snippet.
[cargo-inputs]: Add rust-ecies-ed25519-ng-0.5, rust-windows-service-0.7.
Replace rust-toml-0.7 with 0.8, rust-ed25519-dalek-1 with 2,
rust-x25519-dalek-1 with 2, rust-chacha20poly1305-0.9 with 0.10,
rust-base64-0.21 with 0.22, rust-sqlite-0.30 with 0.36, rust-mio-0.8
with 1, rust-lru-0.9 with 0.12, rust-open-3 with 5,
rust-thread-priority-0.7 with 0.10.  Remove rust-ecies-ed25519-0.5,
rust-rand-0.7.
[inputs]: Add rust-ecies-ed25519-ng-0.5.

Change-Id: I89de18727e515e6ba1a9079903c3bdcf70e6019e

1 files changed, 21 insertions, 16 deletions

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 5b32dfdaa3..68327a7670 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -200,7 +200,7 @@ low-end hardware and serving many concurrent requests.")
 (define-public alfis
   (package
     (name "alfis")
-    (version "0.8.4")
+    (version "0.8.5")
     (source
      (origin
        (method git-fetch)
@@ -209,12 +209,14 @@ low-end hardware and serving many concurrent requests.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1zqszjyiab0b76m2b8zfzpndg393hn311whq1fs9syfn53hp7nh4"))
+        (base32 "189dqgcnl11fdmd6242h1pbawlq7jdm22zykc1kkcj1dv6s55nvs"))
        (snippet
         #~(begin (use-modules (guix build utils))
                  ;; Use a packaged version of web-view.
                  (substitute* "Cargo.toml"
-                   (("git = .*,") "version = \"0.7.3\","))))))
+                   (("git = .*web-view\",") "version = \"0.7.3\",")
+                   ((", git = .*ureq\"") "")
+                   (("git = .*ecies-ed25519-ng.*version") "version"))))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags
@@ -225,13 +227,13 @@ low-end hardware and serving many concurrent requests.")
        (("rust-getopts" ,rust-getopts-0.2)
         ("rust-log" ,rust-log-0.4)
         ("rust-simplelog" ,rust-simplelog-0.12)
-        ("rust-toml" ,rust-toml-0.7)
+        ("rust-toml" ,rust-toml-0.8)
         ("rust-digest" ,rust-digest-0.10)
         ("rust-sha2" ,rust-sha2-0.10)
-        ("rust-ed25519-dalek" ,rust-ed25519-dalek-1)
-        ("rust-x25519-dalek" ,rust-x25519-dalek-1)
-        ("rust-ecies-ed25519" ,rust-ecies-ed25519-0.5)
-        ("rust-chacha20poly1305" ,rust-chacha20poly1305-0.9)
+        ("rust-ed25519-dalek" ,rust-ed25519-dalek-2)
+        ("rust-x25519-dalek" ,rust-x25519-dalek-2)
+        ("rust-ecies-ed25519-ng" ,rust-ecies-ed25519-ng-0.5)
+        ("rust-chacha20poly1305" ,rust-chacha20poly1305-0.10)
         ("rust-signature" ,rust-signature-2)
         ("rust-blakeout" ,rust-blakeout-0.3)
         ("rust-num-cpus" ,rust-num-cpus-1)
@@ -240,25 +242,25 @@ low-end hardware and serving many concurrent requests.")
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-bincode" ,rust-bincode-1)
         ("rust-serde-cbor" ,rust-serde-cbor-0.11)
-        ("rust-base64" ,rust-base64-0.21)
+        ("rust-base64" ,rust-base64-0.22)
         ("rust-num-bigint" ,rust-num-bigint-0.4)
         ("rust-num-traits" ,rust-num-traits-0.2)
         ("rust-chrono" ,rust-chrono-0.4)
         ("rust-rand" ,rust-rand-0.8)
-        ("rust-rand-0.7" ,rust-rand-0.7) ;For ed25519-dalek
-        ("rust-sqlite" ,rust-sqlite-0.30)
+        ("rust-sqlite" ,rust-sqlite-0.36)
         ("rust-uuid" ,rust-uuid-1)
-        ("rust-mio" ,rust-mio-0.8)
+        ("rust-mio" ,rust-mio-1)
         ("rust-ureq" ,rust-ureq-2)
-        ("rust-lru" ,rust-lru-0.9)
+        ("rust-lru" ,rust-lru-0.12)
         ("rust-derive-more" ,rust-derive-more-0.99)
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-spmc" ,rust-spmc-0.3)
         ("rust-tinyfiledialogs" ,rust-tinyfiledialogs-3)
         ("rust-web-view" ,rust-web-view-0.7)
-        ("rust-open" ,rust-open-3)
+        ("rust-open" ,rust-open-5)
         ("rust-winapi" ,rust-winapi-0.3)
-        ("rust-thread-priority" ,rust-thread-priority-0.10)
+        ("rust-windows-service" ,rust-windows-service-0.7)
+        ("rust-thread-priority" ,rust-thread-priority-1)
         ("rust-winres" ,rust-winres-0.1))
        #:cargo-development-inputs
        (("rust-serde-bytes" ,rust-serde-bytes-0.11)
@@ -271,7 +273,10 @@ low-end hardware and serving many concurrent requests.")
            glib
            pango
            sqlite
-           webkitgtk-with-libsoup2))
+           webkitgtk-with-libsoup2
+           ;; Packaged from a git checkout, so add it here so we can grab the
+           ;; sources from the cargo tarball we create while building it.
+           rust-ecies-ed25519-ng-0.5))
     (home-page "https://github.com/Revertron/Alfis")
     (synopsis "Alternative Free Identity System")
     (description