unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / Atom feed
* [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0
@ 2020-11-21 23:12 Hartmut Goebel
  2020-11-21 23:13 ` [bug#44785] [PATCH 01/22] gnu: Add rust-rpassword-5 Hartmut Goebel
                   ` (22 more replies)
  0 siblings, 23 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-21 23:12 UTC (permalink / raw)
  To: 44785

Hartmut Goebel (22):
  gnu: Add rust-rpassword-5.
  gnu: Add rust-win-crypto-ng-0.2.
  gnu: Add rust-num-bigint-dig-0.6.
  gnu: Add rust-memsec-0.6.
  gnu: Add rust-ena-0.14:
  gnu: Add rust-lalrpop-util-0.19.
  gnu: Add rust-lalrpop-0.19.
  gnu: Add rust-keccak-0.1.
  gnu: Add rust-merlin-2.
  gnu: Add rust-signature-derive-1.
  gnu: Add rust-signature-1.
  gnu: Add rust-ed25519-1.
  gnu: Add rust-curve25519-dalek-3.
  gnu: Add rust-ed25519-dalek-1.
  gnu: Add rust-dyn-clone-1.
  gnu: Add rust-bzip2-0.3.
  gnu: Add rust-base64-0.13.
  gnu: Add rust-hashlink-0.6.
  gnu: Add rust-hashbrown-0.9.
  gnu: Add rust-libsqlite3-sys-0.20.
  gnu: Add rust-rusqlite: Update to 0.24.
  gnu: sequoia: Update to 0.20.0.

 gnu/packages/crates-io.scm | 586 +++++++++++++++++++++++++++++++++----
 gnu/packages/sequoia.scm   |  64 ++--
 2 files changed, 580 insertions(+), 70 deletions(-)

-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH 01/22] gnu: Add rust-rpassword-5.
  2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
@ 2020-11-21 23:13 ` Hartmut Goebel
  2020-11-21 23:13 ` [bug#44785] [PATCH 02/22] gnu: Add rust-win-crypto-ng-0.2 Hartmut Goebel
                   ` (21 subsequent siblings)
  22 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-21 23:13 UTC (permalink / raw)
  To: 44785

* gnu/packages/crates-io.scm (rust-rpassword-5): New variable.
  (rust-rpassword-4): Inherit from rust-rpassword-5.
---
 gnu/packages/crates-io.scm | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f485142383..85183512f9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22096,17 +22096,17 @@ Rust Language Server.")
 rust.")
     (license license:mpl2.0)))
 
-(define-public rust-rpassword-4
+(define-public rust-rpassword-5
   (package
     (name "rust-rpassword")
-    (version "4.0.5")
+    (version "5.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rpassword" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "17z99xazhhbaczw0ib1vnnq450j0zacdn8b2zcbdir68sdbicdwr"))))
+        (base32 "1j96nc3dmqhxwb4ql50r5xjs0imwr2x6mrj02mj9i7grq1zj6mfp"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -22118,6 +22118,19 @@ rust.")
 console applications.")
   (license license:asl2.0)))
 
+(define-public rust-rpassword-4
+  (package
+    (inherit rust-rpassword-5)
+    (name "rust-rpassword")
+    (version "4.0.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rpassword" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "17z99xazhhbaczw0ib1vnnq450j0zacdn8b2zcbdir68sdbicdwr"))))))
+
 (define-public rust-rusqlite-0.19
   (package
     (name "rust-rusqlite")
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH 02/22] gnu: Add rust-win-crypto-ng-0.2.
  2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
  2020-11-21 23:13 ` [bug#44785] [PATCH 01/22] gnu: Add rust-rpassword-5 Hartmut Goebel
@ 2020-11-21 23:13 ` Hartmut Goebel
  2020-11-21 23:13 ` [bug#44785] [PATCH 03/22] gnu: Add rust-num-bigint-dig-0.6 Hartmut Goebel
                   ` (20 subsequent siblings)
  22 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-21 23:13 UTC (permalink / raw)
  To: 44785

* gnu/packages/crates-io.scm (rust-win-crypto-ng-0.2): New variable.
---
 gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 85183512f9..76d74c8b59 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32285,6 +32285,41 @@ color in a Windows console.")
     (license (list license:unlicense
                    license:expat))))
 
+(define-public rust-win-crypto-ng-0.2
+  (package
+    (name "rust-win-crypto-ng")
+    (version "0.2.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "win-crypto-ng" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "0ab0iwl4bmqvysypyn6xgax7rlh3w524jji2y1zfwfpdr7wwyv23"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-doc-comment" ,rust-doc-comment-0.3)
+         ("rust-rand-core" ,rust-rand-core-0.5)
+         ("rust-winapi" ,rust-winapi-0.3)
+         ("rust-zeroize" ,rust-zeroize-1))))
+    (home-page "https://crates.io/crates/win-crypto-ng")
+    (synopsis "Safe bindings to MS Windows Cryptography API Next
+Generation")
+    (description
+      "Cryptography API Next Generation (CNG) are cryptographic
+primitives and utilities provided by the operating system and/or
+hardware. It is available since Windows Vista and replaces the now
+deprecated CryptoAPI.
+
+The primitives do not depend on OpenSSL or other libraries of the
+sort, they are provided by Microsoft and/or by the hardware
+manufacturer. They are the primitives used in kernel space programs.
+Therefore, if you are using Microsoft Windows, you already accepted to
+trust these primitives.")
+    (license license:bsd-3)))
+
 (define-public rust-winpty-sys-0.4
   (package
     (name "rust-winpty-sys")
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH 03/22] gnu: Add rust-num-bigint-dig-0.6.
  2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
  2020-11-21 23:13 ` [bug#44785] [PATCH 01/22] gnu: Add rust-rpassword-5 Hartmut Goebel
  2020-11-21 23:13 ` [bug#44785] [PATCH 02/22] gnu: Add rust-win-crypto-ng-0.2 Hartmut Goebel
@ 2020-11-21 23:13 ` Hartmut Goebel
  2020-11-21 23:13 ` [bug#44785] [PATCH 04/22] gnu: Add rust-memsec-0.6 Hartmut Goebel
                   ` (19 subsequent siblings)
  22 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-21 23:13 UTC (permalink / raw)
  To: 44785

* gnu/packages/crates-io.scm (rust-num-bigint-dig-0.6): New variable.
---
 gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 76d74c8b59..6ee1aec0ba 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -16361,6 +16361,39 @@ including bigint, complex, rational, range iterators, generic integers, and more
        #:cargo-development-inputs
        (("rust-rand" ,rust-rand-0.4))))))
 
+(define-public rust-num-bigint-dig-0.6
+  (package
+    (name "rust-num-bigint-dig")
+    (version "0.6.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "num-bigint-dig" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "1aljx3bxfnzq35i9pkbqkj0d0hc1wjc2dd60wccjqylz1wrkrl5k"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-autocfg" ,rust-autocfg-0.1)
+         ("rust-byteorder" ,rust-byteorder-1)
+         ("rust-lazy-static" ,rust-lazy-static-1)
+         ("rust-libm" ,rust-libm-0.2)
+         ("rust-num-integer" ,rust-num-integer-0.1)
+         ("rust-num-iter" ,rust-num-iter-0.1)
+         ("rust-num-traits" ,rust-num-traits-0.2)
+         ("rust-rand" ,rust-rand-0.7)
+         ("rust-serde" ,rust-serde-1)
+         ("rust-smallvec" ,rust-smallvec-1)
+         ("rust-zeroize" ,rust-zeroize-1))))
+    (home-page
+      "https://github.com/dignifiedquire/num-bigint")
+    (synopsis "Big integer implementation for Rust")
+    (description "This package provides a big integer implementation
+for Rust")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-num-complex-0.3
   (package
     (name "rust-num-complex")
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH 04/22] gnu: Add rust-memsec-0.6.
  2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
                   ` (2 preceding siblings ...)
  2020-11-21 23:13 ` [bug#44785] [PATCH 03/22] gnu: Add rust-num-bigint-dig-0.6 Hartmut Goebel
@ 2020-11-21 23:13 ` Hartmut Goebel
  2020-11-21 23:13 ` [bug#44785] [PATCH 05/22] gnu: Add rust-ena-0.14: Hartmut Goebel
                   ` (18 subsequent siblings)
  22 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-21 23:13 UTC (permalink / raw)
  To: 44785

* gnu/packages/crates-io.scm (rust-memsec-0.6): New variable.
  (rust-memsec-0.5): Inherit from rust-memsec-0.6.
---
 gnu/packages/crates-io.scm | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6ee1aec0ba..ebeca3fba9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -14774,17 +14774,17 @@ for Rust structs.")
          "1cvm2z7dy138s302ii7wlzcxbka5a8yfl5pl5di7lbdnw9hw578g"))))
     (arguments `(#:skip-build? #t))))
 
-(define-public rust-memsec-0.5
+(define-public rust-memsec-0.6
   (package
     (name "rust-memsec")
-    (version "0.5.7")
+    (version "0.6.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "memsec" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "13ir50j549gdz94pds1i7ljnk14d66q5x91s11hncm1pih7jif8c"))))
+        (base32 "1pfbpl75586bjdkphnaa4j58d668rl1wgcqzpnpzzx1phxfzkx1a"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -14798,6 +14798,19 @@ for Rust structs.")
 @code{libsodium/utils}.")
     (license license:expat)))
 
+(define-public rust-memsec-0.5
+  (package
+    (inherit rust-memsec-0.6)
+    (name "rust-memsec")
+    (version "0.5.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "memsec" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "13ir50j549gdz94pds1i7ljnk14d66q5x91s11hncm1pih7jif8c"))))))
+
 (define-public rust-metadeps-1.1
   (package
     (name "rust-metadeps")
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH 05/22] gnu: Add rust-ena-0.14:
  2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
                   ` (3 preceding siblings ...)
  2020-11-21 23:13 ` [bug#44785] [PATCH 04/22] gnu: Add rust-memsec-0.6 Hartmut Goebel
@ 2020-11-21 23:13 ` Hartmut Goebel
  2020-11-21 23:13 ` [bug#44785] [PATCH 06/22] gnu: Add rust-lalrpop-util-0.19 Hartmut Goebel
                   ` (17 subsequent siblings)
  22 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-21 23:13 UTC (permalink / raw)
  To: 44785

* gnu/packages/crates-io.scm (rust-ena-0.14): New variable.
  (rust-ena-0.13): Inherit from rust-ena-0.14.
---
 gnu/packages/crates-io.scm | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ebeca3fba9..06bd77c39e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -7267,17 +7267,17 @@ floating-point primitives to an @code{io::Write}.")
 inclusion of Windows resources in the most resilient fashion imaginable.")
     (license license:expat)))
 
-(define-public rust-ena-0.13
+(define-public rust-ena-0.14
   (package
     (name "rust-ena")
-    (version "0.13.1")
+    (version "0.14.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "ena" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0dkggq0qwv140y2kjfd4spp77zi3v7vnpm4bfy7s7r4cla7xqi49"))))
+        (base32 "1hrnkx2swbczn0jzpscxxipx7jcxhg6sf9vk911ff91wm6a2nh6p"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -7291,6 +7291,19 @@ congruence-closure in Rust.  It was extracted from rustc for independent
 experimentation.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-ena-0.13
+  (package
+    (inherit rust-ena-0.14)
+    (name "rust-ena")
+    (version "0.13.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ena" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0dkggq0qwv140y2kjfd4spp77zi3v7vnpm4bfy7s7r4cla7xqi49"))))))
+
 (define-public rust-encode-unicode-0.3
   (package
     (name "rust-encode-unicode")
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH 06/22] gnu: Add rust-lalrpop-util-0.19.
  2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
                   ` (4 preceding siblings ...)
  2020-11-21 23:13 ` [bug#44785] [PATCH 05/22] gnu: Add rust-ena-0.14: Hartmut Goebel
@ 2020-11-21 23:13 ` Hartmut Goebel
  2020-11-21 23:13 ` [bug#44785] [PATCH 07/22] gnu: Add rust-lalrpop-0.19 Hartmut Goebel
                   ` (16 subsequent siblings)
  22 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-21 23:13 UTC (permalink / raw)
  To: 44785

* gnu/packages/crates-io.scm (rust-lalrpop-util-0.19): New variable.
  (rust-lalrpop-util-0.17): Inherit from rust-lalrpop-util-0.19.
---
 gnu/packages/crates-io.scm | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 06bd77c39e..84c47e72a6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -13005,17 +13005,17 @@ as its primary goal.  You should be able to write compact, DRY, readable
 grammars.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-lalrpop-util-0.17
+(define-public rust-lalrpop-util-0.19
   (package
     (name "rust-lalrpop-util")
-    (version "0.17.2")
+    (version "0.19.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "lalrpop-util" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0z4bjn3g9232n1im5p6mn9mwlvw5aj5iac6hbjmljqxkhf3d2xy2"))))
+        (base32 "0224r8gsbk8and96nhwgzdj4hc1c01g78zmvv3x4f5jnzwg1cwb7"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -13026,6 +13026,19 @@ grammars.")
 generated by LALRPOP.")
   (license (list license:asl2.0 license:expat))))
 
+(define-public rust-lalrpop-util-0.17
+  (package
+    (inherit rust-lalrpop-util-0.19)
+    (name "rust-lalrpop-util")
+    (version "0.17.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "lalrpop-util" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0z4bjn3g9232n1im5p6mn9mwlvw5aj5iac6hbjmljqxkhf3d2xy2"))))))
+
 (define-public rust-lazy-static-1.4
   (package
     (name "rust-lazy-static")
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH 07/22] gnu: Add rust-lalrpop-0.19.
  2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
                   ` (5 preceding siblings ...)
  2020-11-21 23:13 ` [bug#44785] [PATCH 06/22] gnu: Add rust-lalrpop-util-0.19 Hartmut Goebel
@ 2020-11-21 23:13 ` Hartmut Goebel
  2020-11-21 23:13 ` [bug#44785] [PATCH 08/22] gnu: Add rust-keccak-0.1 Hartmut Goebel
                   ` (15 subsequent siblings)
  22 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-21 23:13 UTC (permalink / raw)
  To: 44785

* gnu/packages/crates-io.scm (rust-lalrpop-0.19): New variable.
  (rust-lalrpop-0.17): Inherit from rust-lalrpop-0.19.
---
 gnu/packages/crates-io.scm | 49 ++++++++++++++++++++++++++++++++------
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 84c47e72a6..0c50bfaafb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12965,8 +12965,49 @@ space, and comparing differences in color.")
      `(#:cargo-development-inputs
        (("rust-rand" ,rust-rand-0.3))))))
 
+(define-public rust-lalrpop-0.19
+  (package
+    (name "rust-lalrpop")
+    (version "0.19.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "lalrpop" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1j52sybjhn82ydgsmnw7nkywjyb7pvg50mvyb48m7vdq3wcmdyv0"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+      (("rust-ascii-canvas" ,rust-ascii-canvas-2)
+       ("rust-atty" ,rust-atty-0.2)
+       ("rust-bit-set" ,rust-bit-set-0.5)
+       ("rust-diff" ,rust-diff-0.1)
+       ("rust-docopt" ,rust-docopt-1.1)
+       ("rust-ena" ,rust-ena-0.14)
+       ("rust-itertools" ,rust-itertools-0.9)
+       ("rust-lalrpop-util" ,rust-lalrpop-util-0.19)
+       ("rust-petgraph" ,rust-petgraph-0.5)
+       ("rust-regex" ,rust-regex-1)
+       ("rust-regex-syntax" ,rust-regex-syntax-0.6)
+       ("rust-serde" ,rust-serde-1)
+       ("rust-serde-derive" ,rust-serde-derive-1)
+       ("rust-sha2" ,rust-sha2-0.8)
+       ("rust-string-cache" ,rust-string-cache-0.8)
+       ("rust-term" ,rust-term-0.5)
+       ("rust-unicode-xid" ,rust-unicode-xid-0.2))
+      #:cargo-development-inputs
+      (("rust-rand" ,rust-rand-0.7))))
+    (home-page "https://github.com/lalrpop/lalrpop")
+    (synopsis "Convenient LR(1) parser generator for Rust")
+    (description "LALRPOP is a Rust parser generator framework with usability
+as its primary goal.  You should be able to write compact, DRY, readable
+grammars.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-lalrpop-0.17
   (package
+    (inherit rust-lalrpop-0.19)
     (name "rust-lalrpop")
     (version "0.17.2")
     (source
@@ -12997,13 +13038,7 @@ space, and comparing differences in color.")
        ("rust-term" ,rust-term-0.5)
        ("rust-unicode-xid" ,rust-unicode-xid-0.2))
       #:cargo-development-inputs
-      (("rust-rand" ,rust-rand-0.6))))
-    (home-page "https://github.com/lalrpop/lalrpop")
-    (synopsis "Convenient LR(1) parser generator for Rust")
-    (description "LALRPOP is a Rust parser generator framework with usability
-as its primary goal.  You should be able to write compact, DRY, readable
-grammars.")
-    (license (list license:asl2.0 license:expat))))
+      (("rust-rand" ,rust-rand-0.6))))))
 
 (define-public rust-lalrpop-util-0.19
   (package
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH 08/22] gnu: Add rust-keccak-0.1.
  2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
                   ` (6 preceding siblings ...)
  2020-11-21 23:13 ` [bug#44785] [PATCH 07/22] gnu: Add rust-lalrpop-0.19 Hartmut Goebel
@ 2020-11-21 23:13 ` Hartmut Goebel
  2020-11-21 23:13 ` [bug#44785] [PATCH 09/22] gnu: Add rust-merlin-2 Hartmut Goebel
                   ` (14 subsequent siblings)
  22 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-21 23:13 UTC (permalink / raw)
  To: 44785

* gnu/packages/crates-io.scm (rust-keccak-0.1): New variable.
---
 gnu/packages/crates-io.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0c50bfaafb..63ba1b916b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12825,6 +12825,24 @@ friction with idiomatic Rust structs to ease interopability.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-keccak-0.1
+  (package
+    (name "rust-keccak")
+    (version "0.1.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "keccak" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "19ybbvxrdk9yy65rk7f5ad0hcxszkjwph68yzkj3954lnir1bhk7"))))
+    (build-system cargo-build-system)
+    (arguments `(#:skip-build? #t))
+    (home-page "https://crates.io/crates/keccak")
+    (synopsis "Keccak-f sponge function for Rust")
+    (description "This package provides a keccak-f sponge function")
+    (license license:cc0)))
+
 (define-public rust-kernel32-sys-0.2
   (package
     (name "rust-kernel32-sys")
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH 09/22] gnu: Add rust-merlin-2.
  2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
                   ` (7 preceding siblings ...)
  2020-11-21 23:13 ` [bug#44785] [PATCH 08/22] gnu: Add rust-keccak-0.1 Hartmut Goebel
@ 2020-11-21 23:13 ` Hartmut Goebel
  2020-11-21 23:13 ` [bug#44785] [PATCH 10/22] gnu: Add rust-signature-derive-1 Hartmut Goebel
                   ` (13 subsequent siblings)
  22 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-21 23:13 UTC (permalink / raw)
  To: 44785

* gnu/packages/crates-io.scm (rust-merlin-2): New variable.
---
 gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 63ba1b916b..dbcbe02cd4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -14890,6 +14890,35 @@ for Rust structs.")
        (sha256
         (base32 "13ir50j549gdz94pds1i7ljnk14d66q5x91s11hncm1pih7jif8c"))))))
 
+(define-public rust-merlin-2
+  (package
+    (name "rust-merlin")
+    (version "2.0.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "merlin" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "0y5vd610q7x82vf54pmnzlh0mh8hgxr6imv92yh46d7syi3cmzn6"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-byteorder" ,rust-byteorder-1)
+         ("rust-hex" ,rust-hex-0.3)
+         ("rust-keccak" ,rust-keccak-0.1)
+         ("rust-rand-core" ,rust-rand-core-0.5)
+         ("rust-zeroize" ,rust-zeroize-1))))
+    (home-page "https://docs.rs/merlin")
+    (synopsis "Composable proof transcripts for public-coin arguments of
+knowledge")
+    (description
+     "Merlin is a STROBE-based transcript construction for zero-knowledge
+proofs.  It automates the Fiat-Shamir transform, so that by using Merlin,
+non-interactive protocols can be implemented as if they were interactive.")
+    (license license:expat)))
+
 (define-public rust-metadeps-1.1
   (package
     (name "rust-metadeps")
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH 10/22] gnu: Add rust-signature-derive-1.
  2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
                   ` (8 preceding siblings ...)
  2020-11-21 23:13 ` [bug#44785] [PATCH 09/22] gnu: Add rust-merlin-2 Hartmut Goebel
@ 2020-11-21 23:13 ` Hartmut Goebel
  2020-11-21 23:13 ` [bug#44785] [PATCH 11/22] gnu: Add rust-signature-1 Hartmut Goebel
                   ` (12 subsequent siblings)
  22 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-21 23:13 UTC (permalink / raw)
  To: 44785

* gnu/packages/crates-io.scm (rust-signature-derive-1): New variable.
---
 gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index dbcbe02cd4..640ec0bfa8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -25437,6 +25437,34 @@ words, like Python's shlex.")
     (description "Backend crate for signal-hook.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-signature-derive-1
+  (package
+    (name "rust-signature-derive")
+    (version "1.0.0-pre.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "signature_derive" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "0wp8b8ald7qixrcvvclhdcpmn8hkx049jlc29g57ql0304c6qrdh"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-proc-macro2" ,rust-proc-macro2-1)
+         ("rust-quote" ,rust-quote-1)
+         ("rust-syn" ,rust-syn-1)
+         ("rust-synstructure" ,rust-synstructure-0.12))))
+    (home-page "signature_derive")
+    (synopsis "Custom derive support for the 'signature' crate")
+    (description
+      "This package provides proc macros used by the signature crate.
+
+It's not intended to be used directly. See the signature crate's documentation
+for additional details:")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-simba-0.1
   (package
     (name "rust-simba")
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH 11/22] gnu: Add rust-signature-1.
  2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
                   ` (9 preceding siblings ...)
  2020-11-21 23:13 ` [bug#44785] [PATCH 10/22] gnu: Add rust-signature-derive-1 Hartmut Goebel
@ 2020-11-21 23:13 ` Hartmut Goebel
  2020-11-21 23:13 ` [bug#44785] [PATCH 12/22] gnu: Add rust-ed25519-1 Hartmut Goebel
                   ` (11 subsequent siblings)
  22 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-21 23:13 UTC (permalink / raw)
  To: 44785

* gnu/packages/crates-io.scm (rust-signature-1): New variable.
---
 gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 640ec0bfa8..aa6b822db8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -25437,6 +25437,33 @@ words, like Python's shlex.")
     (description "Backend crate for signal-hook.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-signature-1
+  (package
+    (name "rust-signature")
+    (version "1.2.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "signature" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "04325sgl06mksq21a95sbdadg3r3jn3l3nhhxj839qs7s6kn1w19"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-digest" ,rust-digest-0.9)
+         ("rust-rand-core" ,rust-rand-core-0.5)
+         ("rust-signature-derive"
+          ,rust-signature-derive-1))))
+    (home-page "")
+    (synopsis "Traits for cryptographic signature algorithms (e.g. ECDSA,
+Ed25519)")
+    (description
+      "This package contains traits which provide generic, object-safe APIs
+for generating and verifying digital signatures.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-signature-derive-1
   (package
     (name "rust-signature-derive")
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH 12/22] gnu: Add rust-ed25519-1.
  2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
                   ` (10 preceding siblings ...)
  2020-11-21 23:13 ` [bug#44785] [PATCH 11/22] gnu: Add rust-signature-1 Hartmut Goebel
@ 2020-11-21 23:13 ` Hartmut Goebel
  2020-11-21 23:13 ` [bug#44785] [PATCH 13/22] gnu: Add rust-curve25519-dalek-3 Hartmut Goebel
                   ` (10 subsequent siblings)
  22 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-21 23:13 UTC (permalink / raw)
  To: 44785

* gnu/packages/crates-io.scm (rust-ed25519-1): New variable.
---
 gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index aa6b822db8..8bf7875698 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -7193,6 +7193,37 @@ floating-point primitives to an @code{io::Write}.")
      "This package provides lightweight binding to DirectWrite.")
     (license license:mpl2.0)))
 
+(define-public rust-ed25519-1
+  (package
+    (name "rust-ed25519")
+    (version "1.0.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "ed25519" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "1vxn7x1xinbv1cl31015m0fw08jwkphylxrll17animv9i9nmiip"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-serde" ,rust-serde-1)
+         ("rust-signature" ,rust-signature-1))))
+    (home-page "")
+    (synopsis "Edwards Digital Signature Algorithm (EdDSA) over Curve25519")
+    (description
+      "EdDSA over Curve25519 is specified in RFC 8032.  This package contains
+an ed25519::Signature type which other packages can use in conjunction with
+the signature::Signer and signature::Verifier traits It doesn't contain an
+implementation of Ed25519.
+
+These traits allow packages which produce and consume Ed25519 signatures to be
+written abstractly in such a way that different signer/verifier providers can
+be plugged in, enabling support for using different Ed25519 implementations,
+including HSMs or Cloud KMS services.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-edit-distance-2.1
   (package
     (name "rust-edit-distance")
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH 13/22] gnu: Add rust-curve25519-dalek-3.
  2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
                   ` (11 preceding siblings ...)
  2020-11-21 23:13 ` [bug#44785] [PATCH 12/22] gnu: Add rust-ed25519-1 Hartmut Goebel
@ 2020-11-21 23:13 ` Hartmut Goebel
  2020-11-21 23:13 ` [bug#44785] [PATCH 14/22] gnu: Add rust-ed25519-dalek-1 Hartmut Goebel
                   ` (9 subsequent siblings)
  22 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-21 23:13 UTC (permalink / raw)
  To: 44785

* gnu/packages/crates-io.scm (rust-curve25519-dalek-3): New variable.
---
 gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8bf7875698..6d0e72cebb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5759,6 +5759,35 @@ use with bindgen.")
      "This package provides native bindings to the @code{libcurl} library.")
     (license license:expat)))
 
+(define-public rust-curve25519-dalek-3
+  (package
+    (name "rust-curve25519-dalek")
+    (version "3.0.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "curve25519-dalek" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "01xknhlwagv601k6125372vr0lw2j6xjsvnnl74hprp943j2sjf8"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-byteorder" ,rust-byteorder-1)
+         ("rust-digest" ,rust-digest-0.9)
+         ("rust-packed-simd" ,rust-packed-simd-0.3)
+         ("rust-rand-core" ,rust-rand-core-0.5)
+         ("rust-serde" ,rust-serde-1)
+         ("rust-subtle" ,rust-subtle-2)
+         ("rust-zeroize" ,rust-zeroize-1))))
+    (home-page "https://dalek.rs/curve25519-dalek")
+    (synopsis "Group operations on ristretto255 and Curve25519")
+    (description
+      "This package provides a pure-Rust implementation of group operations on
+ristretto255 and Curve25519")
+    (license license:bsd-3)))
+
 (define-public rust-custom-derive-0.1
   (package
     (name "rust-custom-derive")
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH 14/22] gnu: Add rust-ed25519-dalek-1.
  2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
                   ` (12 preceding siblings ...)
  2020-11-21 23:13 ` [bug#44785] [PATCH 13/22] gnu: Add rust-curve25519-dalek-3 Hartmut Goebel
@ 2020-11-21 23:13 ` Hartmut Goebel
  2020-11-21 23:14 ` [bug#44785] [PATCH 15/22] gnu: Add rust-dyn-clone-1 Hartmut Goebel
                   ` (8 subsequent siblings)
  22 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-21 23:13 UTC (permalink / raw)
  To: 44785

* gnu/packages/crates-io.scm (rust-ed25519-dalek-1): New variable.
---
 gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6d0e72cebb..e837b7232a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -7253,6 +7253,37 @@ be plugged in, enabling support for using different Ed25519 implementations,
 including HSMs or Cloud KMS services.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-ed25519-dalek-1
+  (package
+    (name "rust-ed25519-dalek")
+    (version "1.0.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "ed25519-dalek" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "17bsriciv93nkm39z22w7mr0h2a3hnbmgf378v4c895gvkkblqn7"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-curve25519-dalek" ,rust-curve25519-dalek-3)
+         ("rust-ed25519" ,rust-ed25519-1)
+         ("rust-merlin" ,rust-merlin-2)
+         ("rust-rand" ,rust-rand-0.7)
+         ("rust-rand-core" ,rust-rand-core-0.5)
+         ("rust-serde" ,rust-serde-1)
+         ("rust-serde-bytes" ,rust-serde-bytes-0.11)
+         ("rust-sha2" ,rust-sha2-0.9)
+         ("rust-zeroize" ,rust-zeroize-1))))
+    (home-page "https://dalek.rs")
+    (synopsis "Ed25519 EdDSA key generations, signing, and verification")
+    (description
+      "This package provides fast and efficient ed25519 EdDSA key generations,
+signing, and verification in pure Rust.")
+    (license license:bsd-3)))
+
 (define-public rust-edit-distance-2.1
   (package
     (name "rust-edit-distance")
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH 15/22] gnu: Add rust-dyn-clone-1.
  2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
                   ` (13 preceding siblings ...)
  2020-11-21 23:13 ` [bug#44785] [PATCH 14/22] gnu: Add rust-ed25519-dalek-1 Hartmut Goebel
@ 2020-11-21 23:14 ` Hartmut Goebel
  2020-11-21 23:14 ` [bug#44785] [PATCH 16/22] gnu: Add rust-bzip2-0.3 Hartmut Goebel
                   ` (7 subsequent siblings)
  22 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-21 23:14 UTC (permalink / raw)
  To: 44785

* gnu/packages/crates-io.scm (rust-dyn-clone-1): New variable.
---
 gnu/packages/crates-io.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e837b7232a..24d7051db5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -7193,6 +7193,23 @@ floating-point primitives to an @code{io::Write}.")
      "A library for running child processes.")
     (license license:expat)))
 
+(define-public rust-dyn-clone-1
+  (package
+    (name "rust-dyn-clone")
+    (version "1.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "dyn-clone" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "10idzzq2sad7dhrfhrhcx7yckzj8il2bzr16204683ryclxdqlsc"))))
+    (build-system cargo-build-system)
+    (home-page "https://crates.io/crates/dyn-clone")
+    (synopsis "Clone trait that is object-safe")
+    (description "Clone trait that is object-safe")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-dwrote-0.9
   (package
     (name "rust-dwrote")
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH 16/22] gnu: Add rust-bzip2-0.3.
  2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
                   ` (14 preceding siblings ...)
  2020-11-21 23:14 ` [bug#44785] [PATCH 15/22] gnu: Add rust-dyn-clone-1 Hartmut Goebel
@ 2020-11-21 23:14 ` Hartmut Goebel
  2020-11-21 23:14 ` [bug#44785] [PATCH 17/22] gnu: Add rust-base64-0.13 Hartmut Goebel
                   ` (6 subsequent siblings)
  22 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-21 23:14 UTC (permalink / raw)
  To: 44785

* gnu/packages/crates-io.scm(rust-bzip2-0.4): New variable.
  (rust-bzip2-0.3): Inherit from rust-bzip2-0.4.
---
 gnu/packages/crates-io.scm | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 24d7051db5..06a4bf8a63 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3015,10 +3015,10 @@ little-endian.")
        #:cargo-development-inputs
        (("rust-rand" ,rust-rand-0.3))))))
 
-(define-public rust-bzip2-0.3
+(define-public rust-bzip2-0.4
   (package
     (name "rust-bzip2")
-    (version "0.3.3")
+    (version "0.4.1")
     (source
      (origin
        (method url-fetch)
@@ -3026,8 +3026,7 @@ little-endian.")
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "0fvfwanp42j1zpig880jhb5mc0na50bijmwd6211p77sy35w7ds2"))))
+        (base32 "1gpwm7qj8adi0zffm8r17vkv6f98d1q9glvpjk28v0wb6kz88p97"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -3036,8 +3035,8 @@ little-endian.")
         ("rust-libc" ,rust-libc-0.2)
         ("rust-tokio-io" ,rust-tokio-io-0.1))
        #:cargo-development-inputs
-       (("rust-partial-io" ,rust-partial-io-0.2)
-        ("rust-quickcheck" ,rust-quickcheck-0.4)
+       (("rust-partial-io" ,rust-partial-io-0.3)
+        ("rust-quickcheck" ,rust-quickcheck-0.9)
         ("rust-rand" ,rust-rand-0.3)
         ("rust-tokio-core" ,rust-tokio-core-0.1))))
     (home-page "https://github.com/alexcrichton/bzip2-rs")
@@ -3048,6 +3047,32 @@ little-endian.")
 exposed as Reader/Writer streams.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-bzip2-0.3
+  (package
+    (inherit rust-bzip2-0.4)
+    (name "rust-bzip2")
+    (version "0.3.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "bzip2" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0fvfwanp42j1zpig880jhb5mc0na50bijmwd6211p77sy35w7ds2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bzip2-sys" ,rust-bzip2-sys-0.1)
+        ("rust-futures" ,rust-futures-0.1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-tokio-io" ,rust-tokio-io-0.1))
+       #:cargo-development-inputs
+       (("rust-partial-io" ,rust-partial-io-0.2)
+        ("rust-quickcheck" ,rust-quickcheck-0.4)
+        ("rust-rand" ,rust-rand-0.3)
+        ("rust-tokio-core" ,rust-tokio-core-0.1))))))
+
 (define-public rust-bzip2-sys-0.1
   (package
     (name "rust-bzip2-sys")
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH 17/22] gnu: Add rust-base64-0.13.
  2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
                   ` (15 preceding siblings ...)
  2020-11-21 23:14 ` [bug#44785] [PATCH 16/22] gnu: Add rust-bzip2-0.3 Hartmut Goebel
@ 2020-11-21 23:14 ` Hartmut Goebel
  2020-11-21 23:14 ` [bug#44785] [PATCH 18/22] gnu: Add rust-hashlink-0.6 Hartmut Goebel
                   ` (5 subsequent siblings)
  22 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-21 23:14 UTC (permalink / raw)
  To: 44785

* gnu/packages/crates-io.scm (rust-base64-0.13): New variable.
  (rust-base64-0.12): Inherit from rust-base64-0.13.
---
 gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 06a4bf8a63..ade3c73426 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1470,8 +1470,33 @@ trace (backtrace) at runtime in a Rust program.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-base64-0.13
+  (package
+    (name "rust-base64")
+    (version "0.13.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "base64" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1z82g23mbzjgijkpcrilc7nljpxpvpf7zxf6iyiapkgka2ngwkch"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-rand" ,rust-rand-0.6)
+        ("rust-structopt" ,rust-structopt-0.3))))
+    (home-page "https://github.com/marshallpierce/rust-base64")
+    (synopsis "Encodes and decodes base64 as bytes or utf8")
+    (description
+     "This package encodes and decodes base64 as bytes or utf8.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-base64-0.12
   (package
+    (inherit rust-base64-0.13)
     (name "rust-base64")
     (version "0.12.3")
     (source
@@ -1490,17 +1515,11 @@ trace (backtrace) at runtime in a Rust program.")
            (substitute* "src/lib.rs"
              (("\\(doctest") "(test"))
            #t))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.3)
         ("rust-doc-comment" ,rust-doc-comment-0.3)
-        ("rust-rand" ,rust-rand-0.6))))
-    (home-page "https://github.com/marshallpierce/rust-base64")
-    (synopsis "Encodes and decodes base64 as bytes or utf8")
-    (description
-     "This package encodes and decodes base64 as bytes or utf8.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-rand" ,rust-rand-0.6))))))
 
 (define-public rust-base64-0.11
   (package
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH 18/22] gnu: Add rust-hashlink-0.6.
  2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
                   ` (16 preceding siblings ...)
  2020-11-21 23:14 ` [bug#44785] [PATCH 17/22] gnu: Add rust-base64-0.13 Hartmut Goebel
@ 2020-11-21 23:14 ` Hartmut Goebel
  2020-11-21 23:14 ` [bug#44785] [PATCH 19/22] gnu: Add rust-hashbrown-0.9 Hartmut Goebel
                   ` (4 subsequent siblings)
  22 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-21 23:14 UTC (permalink / raw)
  To: 44785

* gnu/packages/crates-io.scm (rust-hashlink-0.6): New variable.
---
 gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ade3c73426..5e870624ee 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11065,6 +11065,30 @@ hash map.")
         ("rust-rustc-hash" ,rust-rustc-hash-1)
         ("rust-serde-test" ,rust-serde-test-1))))))
 
+(define-public rust-hashlink-0.6
+  (package
+    (name "rust-hashlink")
+    (version "0.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "hashlink" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1a2gi4737lmqq1i48b9w13gvbkh4g3gc7gj6d3974hywy21gg76r"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-hashbrown" ,rust-hashbrown-0.9)
+        ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs
+       (("rust-serde-test" ,rust-serde-test-1))))
+    (home-page "https://crates.io/crates/hashlink")
+    (synopsis "HashMap-like containers with user controllable order")
+    (description "This package provides HashMap-like containers that hold
+their key-value pairs in a user controllable order.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-heapless-0.5
   (package
     (name "rust-heapless")
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH 19/22] gnu: Add rust-hashbrown-0.9.
  2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
                   ` (17 preceding siblings ...)
  2020-11-21 23:14 ` [bug#44785] [PATCH 18/22] gnu: Add rust-hashlink-0.6 Hartmut Goebel
@ 2020-11-21 23:14 ` Hartmut Goebel
  2020-11-21 23:14 ` [bug#44785] [PATCH 20/22] gnu: Add rust-libsqlite3-sys-0.20 Hartmut Goebel
                   ` (3 subsequent siblings)
  22 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-21 23:14 UTC (permalink / raw)
  To: 44785

* gnu/packages/crates-io.scm (rust-hashbrown-0.9): New variable.
  (rust-hashbrown-0.8): Inherit from rust-hashbrown-0.9.
---
 gnu/packages/crates-io.scm | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5e870624ee..ea0255c2e2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11002,10 +11002,10 @@ the template engine that renders the official Rust website")
 @code{#[derive(Hash32)]}.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-hashbrown-0.8
+(define-public rust-hashbrown-0.9
   (package
     (name "rust-hashbrown")
-    (version "0.8.0")
+    (version "0.9.1")
     (source
      (origin
        (method url-fetch)
@@ -11013,11 +11013,11 @@ the template engine that renders the official Rust website")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "09y86zmf59n6ys9yf2bvg9ckwwa1ijv2i3flkz45iqkwfmh7i6xb"))))
+         "016dsm9s4xmxlkw2jfikm54qlz6vyk0qr280gab7kzp342jf9byp"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-ahash" ,rust-ahash-0.3)
+       (("rust-ahash" ,rust-ahash-0.4)
         ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
         ("rust-rayon" ,rust-rayon-1)
         ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
@@ -11036,6 +11036,35 @@ the template engine that renders the official Rust website")
 hash map.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-hashbrown-0.8
+  (package
+    (inherit rust-hashbrown-0.9)
+    (name "rust-hashbrown")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "hashbrown" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "09y86zmf59n6ys9yf2bvg9ckwwa1ijv2i3flkz45iqkwfmh7i6xb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-ahash" ,rust-ahash-0.3)
+        ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
+        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
+        ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs
+       (("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-rand" ,rust-rand-0.7)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-rustc-hash" ,rust-rustc-hash-1.0)
+        ("rust-serde-test" ,rust-serde-test-1))))))
+
 (define-public rust-hashbrown-0.5
   (package
     (inherit rust-hashbrown-0.8)
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH 20/22] gnu: Add rust-libsqlite3-sys-0.20.
  2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
                   ` (18 preceding siblings ...)
  2020-11-21 23:14 ` [bug#44785] [PATCH 19/22] gnu: Add rust-hashbrown-0.9 Hartmut Goebel
@ 2020-11-21 23:14 ` Hartmut Goebel
  2020-11-21 23:14 ` [bug#44785] [PATCH 21/22] gnu: Add rust-rusqlite: Update to 0.24 Hartmut Goebel
                   ` (2 subsequent siblings)
  22 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-21 23:14 UTC (permalink / raw)
  To: 44785

* gnu/packages/crates-io.scm (rust-libsqlite3-sys-0.20): New variable.
  (rust-libsqlite3-sys-0.15): Inherit from rust-libsqlite3-sys-0.20.
---
 gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ea0255c2e2..c877e82de5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -13861,24 +13861,24 @@ allocator.")
     (license (list license:asl2.0
                    license:expat))))
 
-(define-public rust-libsqlite3-sys-0.15
+(define-public rust-libsqlite3-sys-0.20
   (package
     (name "rust-libsqlite3-sys")
-    (version "0.15.0")
+    (version "0.20.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "libsqlite3-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "104n0s4f46zprppjq6y82y0wjh1r2cgwzw26w914yj30rizy1cbj"))))
+        (base32 "1g9gbjjpm9phhs991abkzmacszibp94m5nrh331ycd99y9ci1lv4"))))
     (build-system cargo-build-system)
     (inputs
      `(("sqlite" ,sqlite)))
     (arguments
      `(#:cargo-inputs
        ;; build dependencies
-       (("rust-bindgen" ,rust-bindgen-0.49)
+       (("rust-bindgen" ,rust-bindgen-0.55)
         ("rust-cc" ,rust-cc-1)
         ("rust-pkg-config" ,rust-pkg-config-0.3)
         ("rust-vcpkg" ,rust-vcpkg-0.2))))
@@ -13887,6 +13887,29 @@ allocator.")
     (description "Native bindings to the libsqlite3 library")
     (license license:expat)))
 
+(define-public rust-libsqlite3-sys-0.15
+  (package
+    (inherit rust-libsqlite3-sys-0.20)
+    (name "rust-libsqlite3-sys")
+    (version "0.15.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "libsqlite3-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "104n0s4f46zprppjq6y82y0wjh1r2cgwzw26w914yj30rizy1cbj"))))
+    (build-system cargo-build-system)
+    (inputs
+     `(("sqlite" ,sqlite)))
+    (arguments
+     `(#:cargo-inputs
+       ;; build dependencies
+       (("rust-bindgen" ,rust-bindgen-0.49)
+        ("rust-cc" ,rust-cc-1)
+        ("rust-pkg-config" ,rust-pkg-config-0.3)
+        ("rust-vcpkg" ,rust-vcpkg-0.2))))))
+
 (define-public rust-libz-sys-1
   (package
     (name "rust-libz-sys")
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH 21/22] gnu: Add rust-rusqlite: Update to 0.24.
  2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
                   ` (19 preceding siblings ...)
  2020-11-21 23:14 ` [bug#44785] [PATCH 20/22] gnu: Add rust-libsqlite3-sys-0.20 Hartmut Goebel
@ 2020-11-21 23:14 ` Hartmut Goebel
  2020-11-21 23:14 ` [bug#44785] [PATCH 22/22] gnu: sequoia: Update to 0.20.0 Hartmut Goebel
  2020-11-23  8:50 ` [bug#44785] [PATCH 00/22] Update sequoia " Christopher Baines
  22 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-21 23:14 UTC (permalink / raw)
  To: 44785

* gnu/packages/crates-io.scm (rust-rusqlite): Update to 0.24.
---
 gnu/packages/crates-io.scm | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c877e82de5..f92202dfbb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22513,17 +22513,17 @@ console applications.")
        (sha256
         (base32 "17z99xazhhbaczw0ib1vnnq450j0zacdn8b2zcbdir68sdbicdwr"))))))
 
-(define-public rust-rusqlite-0.19
+(define-public rust-rusqlite-0.24
   (package
     (name "rust-rusqlite")
-    (version "0.19.0")
+    (version "0.24.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rusqlite" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "19xq7s0kzhlljm3hqx0vidr91ia8hl49r4m5gwdj9dyywgks5g3f"))))
+        (base32 "0s5svm32zl1qqmln8ww8g6ziwg5mi2k88si1a5zj25smmf8lfgby"))))
     (build-system cargo-build-system)
     (inputs
      `(("sqlite" ,sqlite)))
@@ -22536,18 +22536,21 @@ console applications.")
         ("rust-fallible-iterator" ,rust-fallible-iterator-0.2)
         ("rust-fallible-streaming-iterator"
          ,rust-fallible-streaming-iterator-0.1)
+        ("rust-hashlink" ,rust-hashlink-0.6)
         ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-libsqlite3-sys" ,rust-libsqlite3-sys-0.15)
-        ("rust-lru-cache" ,rust-lru-cache-0.1)
+        ("rust-libsqlite3-sys" ,rust-libsqlite3-sys-0.20)
+        ;;("rust-lru-cache" ,rust-lru-cache-0.1)
         ("rust-memchr" ,rust-memchr-2)
         ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-time" ,rust-time-0.1)
-        ("rust-url" ,rust-url-1)
+        ("rust-time" ,rust-time-0.2)
+        ("rust-url" ,rust-url-2)
         ("rust-uuid" ,rust-uuid-0.7))
        #:cargo-development-inputs
-       (("rust-lazy-static" ,rust-lazy-static-1)
+       (("rust-bencher" ,rust-bencher-0.1)
+        ("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-regex" ,rust-regex-1)
-        ("rust-tempdir" ,rust-tempdir-0.3)
+        ("rust-tempfile" ,rust-tempfile-3)
         ("rust-unicase" ,rust-unicase-2)
         ("rust-uuid" ,rust-uuid-0.7))))
     (home-page "https://github.com/rusqlite/rusqlite")
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH 22/22] gnu: sequoia: Update to 0.20.0.
  2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
                   ` (20 preceding siblings ...)
  2020-11-21 23:14 ` [bug#44785] [PATCH 21/22] gnu: Add rust-rusqlite: Update to 0.24 Hartmut Goebel
@ 2020-11-21 23:14 ` Hartmut Goebel
  2020-11-23  8:50 ` [bug#44785] [PATCH 00/22] Update sequoia " Christopher Baines
  22 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-21 23:14 UTC (permalink / raw)
  To: 44785

* gnu/packages/sequoia.scm (sequoia): Update to 0.20.0. [cargo-inputs] Update
  dependencies. [phases]{unpin-deps}: Adjust path of file to substitute.
---
 gnu/packages/sequoia.scm | 64 +++++++++++++++++++++++++++-------------
 1 file changed, 43 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm
index 8f2b351031..6550a71a1a 100644
--- a/gnu/packages/sequoia.scm
+++ b/gnu/packages/sequoia.scm
@@ -32,6 +32,7 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-xyz) ;; python-setuptools
+  #:use-module (gnu packages rust)
   #:use-module (gnu packages serialization)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages tls))
@@ -39,7 +40,7 @@
 (define-public sequoia
   (package
     (name "sequoia")
-    (version "0.17.0")
+    (version "0.20.0")
     (source
      (origin
        (method git-fetch)
@@ -47,7 +48,7 @@
              (url "https://gitlab.com/sequoia-pgp/sequoia.git")
              (commit (string-append "v" version))))
        (sha256
-        (base32 "1rf9q67qmjfkgy6r3mz1h9ibfmc04r4j8nzacqv2l75x4mwvf6xb"))
+        (base32 "1c76sz4y0n4jhf1gq4b87v5c07i09mmd3i6sqki09bd96m3ldgkf"))
        (file-name (git-file-name name version))))
     (build-system cargo-build-system)
     (outputs '("out" "python"))
@@ -55,7 +56,8 @@
      `(("clang" ,clang)
        ("pkg-config" ,pkg-config)
        ("python-pytest" ,python-pytest)
-       ("python-pytest-runner" ,python-pytest-runner)))
+       ("python-pytest-runner" ,python-pytest-runner)
+       ("python-wrapper" ,python-wrapper)))
     (inputs
      `(("capnproto" ,capnproto)
        ("gmp" ,gmp)
@@ -66,21 +68,24 @@
        ("sqlite" ,sqlite)))
     (arguments
      `(#:tests? #f ;; building the tests requires 9.7GB total
+       #:rust ,rust-1.46
        #:cargo-inputs
-       (("rust-assert-cli" ,rust-assert-cli-0.6)
-        ("rust-anyhow" ,rust-anyhow-1.0)
-        ("rust-base64" ,rust-base64-0.11)
+       (("rust-anyhow" ,rust-anyhow-1.0)
+        ("rust-backtrace" ,rust-backtrace-0.3)
+        ("rust-base64" ,rust-base64-0.13)
         ;;("rust-buffered-reader" included
-        ("rust-bzip2" ,rust-bzip2-0.3)
+        ("rust-bzip2" ,rust-bzip2-0.4)
         ("rust-capnp" ,rust-capnp-0.10)
         ("rust-capnp-rpc" ,rust-capnp-rpc-0.10)
         ("rust-capnpc" ,rust-capnpc-0.10)
-        ("rust-chrono" ,rust-chrono-0.4)
-        ("rust-clap" ,rust-clap-2)
+        ("rust-chrono" ,rust-chrono-0.4)  ;; for sqv, sop
+        ("rust-clap" ,rust-clap-2)        ;; for sqv
         ("rust-colored" ,rust-colored-1.9.1)
         ("rust-crossterm" ,rust-crossterm-0.13)
         ("rust-ctor" ,rust-ctor-0.1)
         ("rust-dirs" ,rust-dirs-2.0)
+        ("rust-dyn-clone" ,rust-dyn-clone-1)
+        ("rust-ed25519-dalek" ,rust-ed25519-dalek-1)
         ;;("rust-failure" included
         ("rust-filetime" ,rust-filetime-0.2)
         ("rust-flate2" ,rust-flate2-1)
@@ -90,33 +95,40 @@
         ("rust-hyper" ,rust-hyper-0.12)
         ("rust-hyper-tls" ,rust-hyper-tls-0.3)
         ("rust-idna" ,rust-idna-0.2)
-        ("rust-itertools" ,rust-itertools-0.8)
-        ("rust-lalrpop-util" ,rust-lalrpop-util-0.17)
+        ("rust-itertools" ,rust-itertools-0.9) ;; for sq
+        ("rust-lalrpop" ,rust-lalrpop-0.19)
+        ("rust-lalrpop-util" ,rust-lalrpop-util-0.19)
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-libc" ,rust-libc-0.2)
-        ("rust-memsec" ,rust-memsec-0.5)
+        ("rust-memsec" ,rust-memsec-0.6)
         ("rust-native-tls" ,rust-native-tls-0.2)
         ("rust-nettle" ,rust-nettle-7)
+        ("rust-num-bigint-dig" ,rust-num-bigint-dig-0.6)
         ("rust-parity-tokio-ipc" ,rust-parity-tokio-ipc-0.4)
         ("rust-percent-encoding" ,rust-percent-encoding-2)
-        ("rust-prettytable-rs" ,rust-prettytable-rs-0.8)
+        ("rust-prettytable-rs" ,rust-prettytable-rs-0.8)  ;; for sq
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quickcheck" ,rust-quickcheck-0.9)
         ("rust-rand" ,rust-rand-0.7)
         ("rust-regex" ,rust-regex-1)
-        ("rust-rusqlite" ,rust-rusqlite-0.19)
-        ("rust-structopt" ,rust-structopt-0.3)
-        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-rusqlite" ,rust-rusqlite-0.24)
+        ("rust-structopt" ,rust-structopt-0.3) ;; for sop
+        ("rust-tempfile" ,rust-tempfile-3) ;; for sq
         ("rust-thiserror" ,rust-thiserror-1)
         ("rust-tokio" ,rust-tokio-0.1)
         ("rust-tokio-core" ,rust-tokio-core-0.1)
         ("rust-unicode-normalization" ,rust-unicode-normalization-0.1)
         ("rust-url" ,rust-url-2)
+        ("rust-win-crypto-ng" ,rust-win-crypto-ng-0.2)
+        ("rust-winapi" ,rust-winapi-0.3)
         ("rust-zbase32" ,rust-zbase32-0.1))
        #:cargo-development-inputs
-       (("rust-bindgen" ,rust-bindgen-0.51) ;; FIXME for nettle-sys and rusqlite
-        ("rust-lalrpop" ,rust-lalrpop-0.17)
-        ("rust-rpassword" ,rust-rpassword-4))
+       (("rust-assert-cli" ,rust-assert-cli-0.6) ;; dev-dep for for sq, sqv
+        ("rust-bindgen" ,rust-bindgen-0.51) ;; FIXME for nettle-sys and rusqlite
+        ;;("rust-lalrpop" ,rust-lalrpop-0.19)
+        ("rust-quickcheck" ,rust-quickcheck-0.9)
+        ("rust-rand" ,rust-rand-0.7)
+        ("rust-rpassword" ,rust-rpassword-5))
        #:phases
        (modify-phases %standard-phases
          ;; Run make instead of using the rust build system, as
@@ -128,9 +140,12 @@
                  (invoke "make" "check")
                  #t)))
          (replace 'install (lambda _ (invoke "make" "install") #t))
-         (add-after 'unpack 'adjust-prefix
+         (add-after 'unpack 'fix-environment
            (lambda* (#:key outputs #:allow-other-keys)
+             ;; adjust prefix
              (setenv "PREFIX" (assoc-ref outputs "out"))
+             ;; fix install script detection
+             (setenv "INSTALL" "install")
              #t))
          (add-after 'unpack 'fix-fo-python-output
            (lambda* (#:key outputs #:allow-other-keys)
@@ -157,6 +172,13 @@
                (substitute* "openpgp-ffi/sequoia-openpgp.pc.in"
                  (("PREFIX") out))
                #t)))
+         (add-after 'unpack 'keep-SOURCE_DATE_EPOCH
+           (lambda _
+               ;; preempt Makefiles replacing SOURCE_DATE_EPOCH
+               (substitute* "Makefile"
+                 (("SOURCE_DATE_EPOCH\\s=" line)
+                  (string-append "#" line)))
+             #t))
          (add-after 'unpack 'set-missing-env-vars
            (lambda* (#:key inputs #:allow-other-keys)
              ;; FIXME: why do we need to set this here?
@@ -168,7 +190,7 @@
              ;; As the comment in that file explains, upstream encourages
              ;; unpinning, as the pinned version is only to make sure the crate
              ;; compiles on older versions of rustc
-             (substitute* '("openpgp/Cargo.toml" "tool/Cargo.toml")
+             (substitute* '("openpgp/Cargo.toml" "sq/Cargo.toml")
                (("= \"=") "= \""))
              #t)))))
     (home-page "https://sequoia-pgp.org")
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0
  2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
                   ` (21 preceding siblings ...)
  2020-11-21 23:14 ` [bug#44785] [PATCH 22/22] gnu: sequoia: Update to 0.20.0 Hartmut Goebel
@ 2020-11-23  8:50 ` Christopher Baines
  2020-11-23 12:27   ` [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2 Hartmut Goebel
  22 siblings, 1 reply; 32+ messages in thread
From: Christopher Baines @ 2020-11-23  8:50 UTC (permalink / raw)
  To: Hartmut Goebel; +Cc: 44785

[-- Attachment #1: Type: text/plain, Size: 1907 bytes --]


Hartmut Goebel <h.goebel@crazy-compilers.com> writes:

> Hartmut Goebel (22):
>   gnu: Add rust-rpassword-5.
>   gnu: Add rust-win-crypto-ng-0.2.
>   gnu: Add rust-num-bigint-dig-0.6.
>   gnu: Add rust-memsec-0.6.
>   gnu: Add rust-ena-0.14:
>   gnu: Add rust-lalrpop-util-0.19.
>   gnu: Add rust-lalrpop-0.19.
>   gnu: Add rust-keccak-0.1.
>   gnu: Add rust-merlin-2.
>   gnu: Add rust-signature-derive-1.
>   gnu: Add rust-signature-1.
>   gnu: Add rust-ed25519-1.
>   gnu: Add rust-curve25519-dalek-3.
>   gnu: Add rust-ed25519-dalek-1.
>   gnu: Add rust-dyn-clone-1.
>   gnu: Add rust-bzip2-0.3.
>   gnu: Add rust-base64-0.13.
>   gnu: Add rust-hashlink-0.6.
>   gnu: Add rust-hashbrown-0.9.
>   gnu: Add rust-libsqlite3-sys-0.20.
>   gnu: Add rust-rusqlite: Update to 0.24.
>   gnu: sequoia: Update to 0.20.0.
>
>  gnu/packages/crates-io.scm | 586 +++++++++++++++++++++++++++++++++----
>  gnu/packages/sequoia.scm   |  64 ++--
>  2 files changed, 580 insertions(+), 70 deletions(-)

Hey,

From the automated patch review stuff I've been working on, there's some
data about these changes available here [1].

1: https://data.guix-patches.cbaines.net/compare?base_commit=234558f4a324efc1ec1d3cd6b8da83551563dada&target_commit=32a8f9707f832b7e819089b3f874c95260ac63ed

There's a couple of new lint warnings (at least with the non-network
ones) for rust-signature-derive and rust-win-crypto-ng.

Also, it's not easy to tell, but there are some new packages that fail
to build:

 - rust-base64
 - rust-lalrpop
 - rust-libsqlite3-sys
 - rust-rusqlite

They're listed on the "Compare package derivations" page, linked to from
[1], with a red 3 on the right hand side of the page, that means 3
failed builds.

I haven't looked at these patches in more detail, but I thought I'd let
you know about the lint warnings and failed builds.

Thanks,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH v2 15/22] gnu: Add rust-dyn-clone-1.
  2020-11-23 12:27   ` [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2 Hartmut Goebel
@ 2020-11-23 12:27     ` Hartmut Goebel
  2020-11-23 12:27     ` [bug#44785] [PATCH v2 16/22] gnu: Add rust-bzip2-0.4 Hartmut Goebel
                       ` (3 subsequent siblings)
  4 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-23 12:27 UTC (permalink / raw)
  To: 44785

* gnu/packages/crates-io.scm (rust-dyn-clone-1): New variable.
---
 gnu/packages/crates-io.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 18923cf1a2..9679efcbbc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -7193,6 +7193,25 @@ floating-point primitives to an @code{io::Write}.")
      "A library for running child processes.")
     (license license:expat)))
 
+(define-public rust-dyn-clone-1
+  (package
+    (name "rust-dyn-clone")
+    (version "1.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "dyn-clone" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "10idzzq2sad7dhrfhrhcx7yckzj8il2bzr16204683ryclxdqlsc"))))
+    (arguments
+     `(#:skip-build? #t))
+    (build-system cargo-build-system)
+    (home-page "https://crates.io/crates/dyn-clone")
+    (synopsis "Clone trait that is object-safe")
+    (description "Clone trait that is object-safe")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-dwrote-0.9
   (package
     (name "rust-dwrote")
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH v2 16/22] gnu: Add rust-bzip2-0.4.
  2020-11-23 12:27   ` [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2 Hartmut Goebel
  2020-11-23 12:27     ` [bug#44785] [PATCH v2 15/22] gnu: Add rust-dyn-clone-1 Hartmut Goebel
@ 2020-11-23 12:27     ` Hartmut Goebel
  2020-11-23 12:27     ` [bug#44785] [PATCH v2 19/22] gnu: Add rust-hashbrown-0.9 Hartmut Goebel
                       ` (2 subsequent siblings)
  4 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-23 12:27 UTC (permalink / raw)
  To: 44785

* gnu/packages/crates-io.scm(rust-bzip2-0.4): New variable, skipping
  build.  (rust-bzip2-0.3): Inherit from rust-bzip2-0.4.
---
 gnu/packages/crates-io.scm | 41 +++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9679efcbbc..dd5ec03ec7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3015,10 +3015,10 @@ little-endian.")
        #:cargo-development-inputs
        (("rust-rand" ,rust-rand-0.3))))))
 
-(define-public rust-bzip2-0.3
+(define-public rust-bzip2-0.4
   (package
     (name "rust-bzip2")
-    (version "0.3.3")
+    (version "0.4.1")
     (source
      (origin
        (method url-fetch)
@@ -3026,18 +3026,18 @@ little-endian.")
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "0fvfwanp42j1zpig880jhb5mc0na50bijmwd6211p77sy35w7ds2"))))
+        (base32 "1gpwm7qj8adi0zffm8r17vkv6f98d1q9glvpjk28v0wb6kz88p97"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
+     `(#:skip-build? #t
+       #:cargo-inputs
        (("rust-bzip2-sys" ,rust-bzip2-sys-0.1)
         ("rust-futures" ,rust-futures-0.1)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-tokio-io" ,rust-tokio-io-0.1))
        #:cargo-development-inputs
-       (("rust-partial-io" ,rust-partial-io-0.2)
-        ("rust-quickcheck" ,rust-quickcheck-0.4)
+       (("rust-partial-io" ,rust-partial-io-0.3)
+        ("rust-quickcheck" ,rust-quickcheck-0.9)
         ("rust-rand" ,rust-rand-0.3)
         ("rust-tokio-core" ,rust-tokio-core-0.1))))
     (home-page "https://github.com/alexcrichton/bzip2-rs")
@@ -3048,6 +3048,33 @@ little-endian.")
 exposed as Reader/Writer streams.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-bzip2-0.3
+  (package
+    (inherit rust-bzip2-0.4)
+    (name "rust-bzip2")
+    (version "0.3.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "bzip2" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0fvfwanp42j1zpig880jhb5mc0na50bijmwd6211p77sy35w7ds2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-bzip2-sys" ,rust-bzip2-sys-0.1)
+        ("rust-futures" ,rust-futures-0.1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-tokio-io" ,rust-tokio-io-0.1))
+       #:cargo-development-inputs
+       (("rust-partial-io" ,rust-partial-io-0.2)
+        ("rust-quickcheck" ,rust-quickcheck-0.4)
+        ("rust-rand" ,rust-rand-0.3)
+        ("rust-tokio-core" ,rust-tokio-core-0.1))))))
+
 (define-public rust-bzip2-sys-0.1
   (package
     (name "rust-bzip2-sys")
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH v2 19/22] gnu: Add rust-hashbrown-0.9.
  2020-11-23 12:27   ` [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2 Hartmut Goebel
  2020-11-23 12:27     ` [bug#44785] [PATCH v2 15/22] gnu: Add rust-dyn-clone-1 Hartmut Goebel
  2020-11-23 12:27     ` [bug#44785] [PATCH v2 16/22] gnu: Add rust-bzip2-0.4 Hartmut Goebel
@ 2020-11-23 12:27     ` Hartmut Goebel
  2020-11-23 12:27     ` [bug#44785] [PATCH v2 22/22] gnu: sequoia: Update to 0.20.0 Hartmut Goebel
  2020-11-28 12:31     ` [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2 Christopher Baines
  4 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-23 12:27 UTC (permalink / raw)
  To: 44785

* gnu/packages/crates-io.scm (rust-hashbrown-0.9): New variable, skipping
  build.  (rust-hashbrown-0.8): Inherit from rust-hashbrown-0.9.
---
 gnu/packages/crates-io.scm | 40 +++++++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 20d11066d8..3b6039c63b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11008,10 +11008,10 @@ the template engine that renders the official Rust website")
 @code{#[derive(Hash32)]}.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-hashbrown-0.8
+(define-public rust-hashbrown-0.9
   (package
     (name "rust-hashbrown")
-    (version "0.8.0")
+    (version "0.9.1")
     (source
      (origin
        (method url-fetch)
@@ -11019,11 +11019,12 @@ the template engine that renders the official Rust website")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "09y86zmf59n6ys9yf2bvg9ckwwa1ijv2i3flkz45iqkwfmh7i6xb"))))
+         "016dsm9s4xmxlkw2jfikm54qlz6vyk0qr280gab7kzp342jf9byp"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-ahash" ,rust-ahash-0.3)
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-ahash" ,rust-ahash-0.4)
         ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
         ("rust-rayon" ,rust-rayon-1)
         ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
@@ -11042,6 +11043,35 @@ the template engine that renders the official Rust website")
 hash map.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-hashbrown-0.8
+  (package
+    (inherit rust-hashbrown-0.9)
+    (name "rust-hashbrown")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "hashbrown" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "09y86zmf59n6ys9yf2bvg9ckwwa1ijv2i3flkz45iqkwfmh7i6xb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-ahash" ,rust-ahash-0.3)
+        ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
+        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
+        ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs
+       (("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-rand" ,rust-rand-0.7)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-rustc-hash" ,rust-rustc-hash-1.0)
+        ("rust-serde-test" ,rust-serde-test-1))))))
+
 (define-public rust-hashbrown-0.5
   (package
     (inherit rust-hashbrown-0.8)
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH v2 22/22] gnu: sequoia: Update to 0.20.0.
  2020-11-23 12:27   ` [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2 Hartmut Goebel
                       ` (2 preceding siblings ...)
  2020-11-23 12:27     ` [bug#44785] [PATCH v2 19/22] gnu: Add rust-hashbrown-0.9 Hartmut Goebel
@ 2020-11-23 12:27     ` Hartmut Goebel
  2020-11-28 12:31     ` [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2 Christopher Baines
  4 siblings, 0 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-23 12:27 UTC (permalink / raw)
  To: 44785

* gnu/packages/sequoia.scm (sequoia): Update to 0.20.0. [cargo-inputs,
  cargo-development-inputs] Update dependencies. [phases]{unpin-deps}: Adjust
  path of file to substitute.  {adjust-prefix} Rename to {fix-environment} and
  set another envormnet variable. {keep-SOURCE_DATE_EPOCH}: New phase.
---
 gnu/packages/sequoia.scm | 64 +++++++++++++++++++++++++++-------------
 1 file changed, 43 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm
index 8f2b351031..6550a71a1a 100644
--- a/gnu/packages/sequoia.scm
+++ b/gnu/packages/sequoia.scm
@@ -32,6 +32,7 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-xyz) ;; python-setuptools
+  #:use-module (gnu packages rust)
   #:use-module (gnu packages serialization)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages tls))
@@ -39,7 +40,7 @@
 (define-public sequoia
   (package
     (name "sequoia")
-    (version "0.17.0")
+    (version "0.20.0")
     (source
      (origin
        (method git-fetch)
@@ -47,7 +48,7 @@
              (url "https://gitlab.com/sequoia-pgp/sequoia.git")
              (commit (string-append "v" version))))
        (sha256
-        (base32 "1rf9q67qmjfkgy6r3mz1h9ibfmc04r4j8nzacqv2l75x4mwvf6xb"))
+        (base32 "1c76sz4y0n4jhf1gq4b87v5c07i09mmd3i6sqki09bd96m3ldgkf"))
        (file-name (git-file-name name version))))
     (build-system cargo-build-system)
     (outputs '("out" "python"))
@@ -55,7 +56,8 @@
      `(("clang" ,clang)
        ("pkg-config" ,pkg-config)
        ("python-pytest" ,python-pytest)
-       ("python-pytest-runner" ,python-pytest-runner)))
+       ("python-pytest-runner" ,python-pytest-runner)
+       ("python-wrapper" ,python-wrapper)))
     (inputs
      `(("capnproto" ,capnproto)
        ("gmp" ,gmp)
@@ -66,21 +68,24 @@
        ("sqlite" ,sqlite)))
     (arguments
      `(#:tests? #f ;; building the tests requires 9.7GB total
+       #:rust ,rust-1.46
        #:cargo-inputs
-       (("rust-assert-cli" ,rust-assert-cli-0.6)
-        ("rust-anyhow" ,rust-anyhow-1.0)
-        ("rust-base64" ,rust-base64-0.11)
+       (("rust-anyhow" ,rust-anyhow-1.0)
+        ("rust-backtrace" ,rust-backtrace-0.3)
+        ("rust-base64" ,rust-base64-0.13)
         ;;("rust-buffered-reader" included
-        ("rust-bzip2" ,rust-bzip2-0.3)
+        ("rust-bzip2" ,rust-bzip2-0.4)
         ("rust-capnp" ,rust-capnp-0.10)
         ("rust-capnp-rpc" ,rust-capnp-rpc-0.10)
         ("rust-capnpc" ,rust-capnpc-0.10)
-        ("rust-chrono" ,rust-chrono-0.4)
-        ("rust-clap" ,rust-clap-2)
+        ("rust-chrono" ,rust-chrono-0.4)  ;; for sqv, sop
+        ("rust-clap" ,rust-clap-2)        ;; for sqv
         ("rust-colored" ,rust-colored-1.9.1)
         ("rust-crossterm" ,rust-crossterm-0.13)
         ("rust-ctor" ,rust-ctor-0.1)
         ("rust-dirs" ,rust-dirs-2.0)
+        ("rust-dyn-clone" ,rust-dyn-clone-1)
+        ("rust-ed25519-dalek" ,rust-ed25519-dalek-1)
         ;;("rust-failure" included
         ("rust-filetime" ,rust-filetime-0.2)
         ("rust-flate2" ,rust-flate2-1)
@@ -90,33 +95,40 @@
         ("rust-hyper" ,rust-hyper-0.12)
         ("rust-hyper-tls" ,rust-hyper-tls-0.3)
         ("rust-idna" ,rust-idna-0.2)
-        ("rust-itertools" ,rust-itertools-0.8)
-        ("rust-lalrpop-util" ,rust-lalrpop-util-0.17)
+        ("rust-itertools" ,rust-itertools-0.9) ;; for sq
+        ("rust-lalrpop" ,rust-lalrpop-0.19)
+        ("rust-lalrpop-util" ,rust-lalrpop-util-0.19)
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-libc" ,rust-libc-0.2)
-        ("rust-memsec" ,rust-memsec-0.5)
+        ("rust-memsec" ,rust-memsec-0.6)
         ("rust-native-tls" ,rust-native-tls-0.2)
         ("rust-nettle" ,rust-nettle-7)
+        ("rust-num-bigint-dig" ,rust-num-bigint-dig-0.6)
         ("rust-parity-tokio-ipc" ,rust-parity-tokio-ipc-0.4)
         ("rust-percent-encoding" ,rust-percent-encoding-2)
-        ("rust-prettytable-rs" ,rust-prettytable-rs-0.8)
+        ("rust-prettytable-rs" ,rust-prettytable-rs-0.8)  ;; for sq
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quickcheck" ,rust-quickcheck-0.9)
         ("rust-rand" ,rust-rand-0.7)
         ("rust-regex" ,rust-regex-1)
-        ("rust-rusqlite" ,rust-rusqlite-0.19)
-        ("rust-structopt" ,rust-structopt-0.3)
-        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-rusqlite" ,rust-rusqlite-0.24)
+        ("rust-structopt" ,rust-structopt-0.3) ;; for sop
+        ("rust-tempfile" ,rust-tempfile-3) ;; for sq
         ("rust-thiserror" ,rust-thiserror-1)
         ("rust-tokio" ,rust-tokio-0.1)
         ("rust-tokio-core" ,rust-tokio-core-0.1)
         ("rust-unicode-normalization" ,rust-unicode-normalization-0.1)
         ("rust-url" ,rust-url-2)
+        ("rust-win-crypto-ng" ,rust-win-crypto-ng-0.2)
+        ("rust-winapi" ,rust-winapi-0.3)
         ("rust-zbase32" ,rust-zbase32-0.1))
        #:cargo-development-inputs
-       (("rust-bindgen" ,rust-bindgen-0.51) ;; FIXME for nettle-sys and rusqlite
-        ("rust-lalrpop" ,rust-lalrpop-0.17)
-        ("rust-rpassword" ,rust-rpassword-4))
+       (("rust-assert-cli" ,rust-assert-cli-0.6) ;; dev-dep for for sq, sqv
+        ("rust-bindgen" ,rust-bindgen-0.51) ;; FIXME for nettle-sys and rusqlite
+        ;;("rust-lalrpop" ,rust-lalrpop-0.19)
+        ("rust-quickcheck" ,rust-quickcheck-0.9)
+        ("rust-rand" ,rust-rand-0.7)
+        ("rust-rpassword" ,rust-rpassword-5))
        #:phases
        (modify-phases %standard-phases
          ;; Run make instead of using the rust build system, as
@@ -128,9 +140,12 @@
                  (invoke "make" "check")
                  #t)))
          (replace 'install (lambda _ (invoke "make" "install") #t))
-         (add-after 'unpack 'adjust-prefix
+         (add-after 'unpack 'fix-environment
            (lambda* (#:key outputs #:allow-other-keys)
+             ;; adjust prefix
              (setenv "PREFIX" (assoc-ref outputs "out"))
+             ;; fix install script detection
+             (setenv "INSTALL" "install")
              #t))
          (add-after 'unpack 'fix-fo-python-output
            (lambda* (#:key outputs #:allow-other-keys)
@@ -157,6 +172,13 @@
                (substitute* "openpgp-ffi/sequoia-openpgp.pc.in"
                  (("PREFIX") out))
                #t)))
+         (add-after 'unpack 'keep-SOURCE_DATE_EPOCH
+           (lambda _
+               ;; preempt Makefiles replacing SOURCE_DATE_EPOCH
+               (substitute* "Makefile"
+                 (("SOURCE_DATE_EPOCH\\s=" line)
+                  (string-append "#" line)))
+             #t))
          (add-after 'unpack 'set-missing-env-vars
            (lambda* (#:key inputs #:allow-other-keys)
              ;; FIXME: why do we need to set this here?
@@ -168,7 +190,7 @@
              ;; As the comment in that file explains, upstream encourages
              ;; unpinning, as the pinned version is only to make sure the crate
              ;; compiles on older versions of rustc
-             (substitute* '("openpgp/Cargo.toml" "tool/Cargo.toml")
+             (substitute* '("openpgp/Cargo.toml" "sq/Cargo.toml")
                (("= \"=") "= \""))
              #t)))))
     (home-page "https://sequoia-pgp.org")
-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2
  2020-11-23  8:50 ` [bug#44785] [PATCH 00/22] Update sequoia " Christopher Baines
@ 2020-11-23 12:27   ` Hartmut Goebel
  2020-11-23 12:27     ` [bug#44785] [PATCH v2 15/22] gnu: Add rust-dyn-clone-1 Hartmut Goebel
                       ` (4 more replies)
  0 siblings, 5 replies; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-23 12:27 UTC (permalink / raw)
  To: 44785, Christopher Baines

Hi Chris,

thanks for sending the results of the data service.

I adjusted the lint-errors.

Regarding the failing builds: I had added these manually before the new
importer (see 38408) as ready. So I added "#:skip-build #t" for all new
crates, like the ne importer does.

Hartmut Goebel (22):
  gnu: Add rust-rpassword-5.
  gnu: Add rust-win-crypto-ng-0.2.
  gnu: Add rust-num-bigint-dig-0.6.
  gnu: Add rust-memsec-0.6.
  gnu: Add rust-ena-0.14:
  gnu: Add rust-lalrpop-util-0.19.
  gnu: Add rust-lalrpop-0.19.
  gnu: Add rust-keccak-0.1.
  gnu: Add rust-merlin-2.
  gnu: Add rust-signature-derive-1.
  gnu: Add rust-signature-1.
  gnu: Add rust-ed25519-1.
  gnu: Add rust-curve25519-dalek-3.
  gnu: Add rust-ed25519-dalek-1.
  gnu: Add rust-dyn-clone-1.
  gnu: Add rust-bzip2-0.4.
  gnu: Add rust-base64-0.13.
  gnu: Add rust-hashlink-0.6.
  gnu: Add rust-hashbrown-0.9.
  gnu: Add rust-libsqlite3-sys-0.20.
  gnu: rust-rusqlite: Update to 0.24.
  gnu: sequoia: Update to 0.20.0.

 gnu/packages/crates-io.scm | 616 +++++++++++++++++++++++++++++++++----
 gnu/packages/sequoia.scm   |  64 ++--
 2 files changed, 602 insertions(+), 78 deletions(-)

-- 
2.21.3





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2
  2020-11-23 12:27   ` [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2 Hartmut Goebel
                       ` (3 preceding siblings ...)
  2020-11-23 12:27     ` [bug#44785] [PATCH v2 22/22] gnu: sequoia: Update to 0.20.0 Hartmut Goebel
@ 2020-11-28 12:31     ` Christopher Baines
  2020-11-28 12:51       ` Hartmut Goebel
  4 siblings, 1 reply; 32+ messages in thread
From: Christopher Baines @ 2020-11-28 12:31 UTC (permalink / raw)
  To: Hartmut Goebel; +Cc: 44785

[-- Attachment #1: Type: text/plain, Size: 743 bytes --]


Hartmut Goebel <h.goebel@crazy-compilers.com> writes:

> Hi Chris,
>
> thanks for sending the results of the data service.
>
> I adjusted the lint-errors.
>
> Regarding the failing builds: I had added these manually before the new
> importer (see 38408) as ready. So I added "#:skip-build #t" for all new
> crates, like the ne importer does.

Thanks Hartmut. I haven't been following the Rust packaging very well,
but my interpretation of #:skip-build would be that's it's like #:tests?
#f, so if it's present, ideally there should be a comment there with
some information about why this package isn't being built.

Also, I think there could be some conflicts with a few of the patches
you sent, the addition of rust-base64-0.13 for example.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2
  2020-11-28 12:31     ` [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2 Christopher Baines
@ 2020-11-28 12:51       ` Hartmut Goebel
  2020-11-28 13:26         ` Christopher Baines
  0 siblings, 1 reply; 32+ messages in thread
From: Hartmut Goebel @ 2020-11-28 12:51 UTC (permalink / raw)
  To: Christopher Baines; +Cc: 44785

Hi Christopher,
> Thanks Hartmut. I haven't been following the Rust packaging very well,
> but my interpretation of #:skip-build would be that's it's like #:tests?
> #f, so if it's present, ideally there should be a comment there with
> some information about why this package isn't being built.

For those rust packages (aka creates) which are "libraries" it does not 
make sense at all to build the packages, since rust has no means of 
sharing pre-compiled objectfiles. Each and every program using a library 
builds it from source. This is why the new importer sets "#:skip-build 
#t" for all crates except of the ones listed on the command line.

I'm not the one who came up with this idea, but, after being skeptical 
first, I fully agree to this decision.

The only reason for *not* setting "#:skip-build #t" for these packages 
would be to have the tests run. But here again rust performs badly - 
adding a lot of overhead: Each package would be build *twice*: once for 
"release" (which then will just be dropped) and once for "test". And 
this will be repeated for every package on every system if substitutes 
are not available.

> Also, I think there could be some conflicts with a few of the patches
> you sent, the addition of rust-base64-0.13 for example.

Sorry, I don't understand this remark. Why should adding a package cause 
any conflict?

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |





^ permalink raw reply	[flat|nested] 32+ messages in thread

* [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2
  2020-11-28 12:51       ` Hartmut Goebel
@ 2020-11-28 13:26         ` Christopher Baines
  0 siblings, 0 replies; 32+ messages in thread
From: Christopher Baines @ 2020-11-28 13:26 UTC (permalink / raw)
  To: Hartmut Goebel; +Cc: 44785

[-- Attachment #1: Type: text/plain, Size: 767 bytes --]


Hartmut Goebel <h.goebel@crazy-compilers.com> writes:

>> Also, I think there could be some conflicts with a few of the patches
>> you sent, the addition of rust-base64-0.13 for example.
>
> Sorry, I don't understand this remark. Why should adding a package
> cause any conflict?

It won't. However, if two commits change the same place in a file, Git
can't always work out what to do. For example, two packages get added in
roughly the same spot.

The conflict I'm referecning for rust-base64-0.13 is because
rust-base58-0.1 has now been added in the same place (above
rust-base64-0.12) [1].

1: https://git.savannah.gnu.org/cgit/guix.git/commit/?id=e94e86c92eddad0abfde00470c0269b4ddb0946e

It's just unluckiy that this happened right after you sent your patches.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

^ permalink raw reply	[flat|nested] 32+ messages in thread

end of thread, other threads:[~2020-11-28 13:27 UTC | newest]

Thread overview: 32+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 01/22] gnu: Add rust-rpassword-5 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 02/22] gnu: Add rust-win-crypto-ng-0.2 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 03/22] gnu: Add rust-num-bigint-dig-0.6 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 04/22] gnu: Add rust-memsec-0.6 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 05/22] gnu: Add rust-ena-0.14: Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 06/22] gnu: Add rust-lalrpop-util-0.19 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 07/22] gnu: Add rust-lalrpop-0.19 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 08/22] gnu: Add rust-keccak-0.1 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 09/22] gnu: Add rust-merlin-2 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 10/22] gnu: Add rust-signature-derive-1 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 11/22] gnu: Add rust-signature-1 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 12/22] gnu: Add rust-ed25519-1 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 13/22] gnu: Add rust-curve25519-dalek-3 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 14/22] gnu: Add rust-ed25519-dalek-1 Hartmut Goebel
2020-11-21 23:14 ` [bug#44785] [PATCH 15/22] gnu: Add rust-dyn-clone-1 Hartmut Goebel
2020-11-21 23:14 ` [bug#44785] [PATCH 16/22] gnu: Add rust-bzip2-0.3 Hartmut Goebel
2020-11-21 23:14 ` [bug#44785] [PATCH 17/22] gnu: Add rust-base64-0.13 Hartmut Goebel
2020-11-21 23:14 ` [bug#44785] [PATCH 18/22] gnu: Add rust-hashlink-0.6 Hartmut Goebel
2020-11-21 23:14 ` [bug#44785] [PATCH 19/22] gnu: Add rust-hashbrown-0.9 Hartmut Goebel
2020-11-21 23:14 ` [bug#44785] [PATCH 20/22] gnu: Add rust-libsqlite3-sys-0.20 Hartmut Goebel
2020-11-21 23:14 ` [bug#44785] [PATCH 21/22] gnu: Add rust-rusqlite: Update to 0.24 Hartmut Goebel
2020-11-21 23:14 ` [bug#44785] [PATCH 22/22] gnu: sequoia: Update to 0.20.0 Hartmut Goebel
2020-11-23  8:50 ` [bug#44785] [PATCH 00/22] Update sequoia " Christopher Baines
2020-11-23 12:27   ` [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2 Hartmut Goebel
2020-11-23 12:27     ` [bug#44785] [PATCH v2 15/22] gnu: Add rust-dyn-clone-1 Hartmut Goebel
2020-11-23 12:27     ` [bug#44785] [PATCH v2 16/22] gnu: Add rust-bzip2-0.4 Hartmut Goebel
2020-11-23 12:27     ` [bug#44785] [PATCH v2 19/22] gnu: Add rust-hashbrown-0.9 Hartmut Goebel
2020-11-23 12:27     ` [bug#44785] [PATCH v2 22/22] gnu: sequoia: Update to 0.20.0 Hartmut Goebel
2020-11-28 12:31     ` [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2 Christopher Baines
2020-11-28 12:51       ` Hartmut Goebel
2020-11-28 13:26         ` Christopher Baines

unofficial mirror of guix-patches@gnu.org 

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://yhetil.org/guix-patches/1 guix-patches/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 guix-patches guix-patches/ https://yhetil.org/guix-patches \
		guix-patches@gnu.org
	public-inbox-index guix-patches

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://news.yhetil.org/yhetil.gnu.guix.patches


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git