[bug#66953] Working towards rust-rbw update

[bug#66953] Working towards rust-rbw update

[VÖRÖSKŐI András]

Hi,

I have a couple of questions regarding this one:

1. I did not dare to update rust-libc because `guix refresh` shows a lot of reverse
dependencies and I have no idea what is the common way of mass rebuilding those.
2. Because of this I had to edit rust-cpufeatures Cargo.toml to use the already
package rust-libc.
3. Doing so means we have to use `substitute*` every time we use the vendored
rust-cpufeatures. I am not sure if this is acceptable or not.

As far as I can tell rust libraries tend to pin patchver in Cargo.toml, but packaging
every patchver seems to be unsustainable to me. But this way the only option is
rewriting the Cargo.toml files everywhere, isn't it?

Thanks,

PS: I had to disable teams.scm becuase it fails with there patches.

[bug#66953] Working towards rust-rbw update

[András Vöröskői]

I am sorry, this should be connected with #66954 and #66955.
I have created it with git send-email --compose, but there must be
some other option to connect these together, which I am not aware of.

[bug#66953] Working towards rust-rbw update

[Efraim Flashner]

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

On Sun, Nov 05, 2023 at 05:25:32PM +0100, VÖRÖSKŐI András wrote:
> 
> Hi,
> 
> I have a couple of questions regarding this one:
> 
> 1. I did not dare to update rust-libc because `guix refresh` shows a lot of reverse
> dependencies and I have no idea what is the common way of mass rebuilding those.
> 2. Because of this I had to edit rust-cpufeatures Cargo.toml to use the already
> package rust-libc.

What I do is I update the crates as needed, and then I'll see if it
something that can actually be applied to the master branch or if it
needs to go to the rust-team branch.  Generally, if changing a rust
crate involves rebuilding librsvg or python-cryptography then it needs
to go to the rust-team branch.

If there's only one or two patches which cause those packages to be
rebuilt then I'll see if it's possible to not change them and still make
whatever change I'm trying to do.

> 3. Doing so means we have to use `substitute*` every time we use the vendored
> rust-cpufeatures. I am not sure if this is acceptable or not.
> 
> As far as I can tell rust libraries tend to pin patchver in Cargo.toml, but packaging
> every patchver seems to be unsustainable to me. But this way the only option is
> rewriting the Cargo.toml files everywhere, isn't it?

If you put the substitute* in a snippet then the change will be brought
forward to all the packages which use that crate, and then you won't
need to change each crate individually.

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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

[bug#66953] [PATCH v2 1/2] gnu: rust-cpufeatures-0.2: Update to 0.2.11.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-cpufeatures-0.2): Update to 0.2.11.

Change-Id: I628535e34bb2c05cefafc6993683318875bb9117
---
 gnu/packages/crates-io.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d42ff60a20..119a59d24f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -16273,14 +16273,18 @@ (define-public rust-cpp-demangle-0.3
 (define-public rust-cpufeatures-0.2
   (package
     (name "rust-cpufeatures")
-    (version "0.2.1")
+    (version "0.2.11")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "cpufeatures" version))
        (file-name (string-append name "-" version ".tar.gz"))
+       (snippet
+        #~(begin
+            (use-modules (guix build utils))
+            (substitute* "Cargo.toml" (("0.2.149") "^0.2.148"))))
        (sha256
-        (base32 "0sgllzsvs8hinylaiigmd9c908gd8wclxnqz8dinpxbdyql981cm"))))
+        (base32 "1l0gzsyy576n017g9bf0vkv5hhg9cpz1h1libxyfdlzcgbh0yhnf"))))
     (build-system cargo-build-system)
     (arguments `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2))))
     (home-page "https://github.com/RustCrypto/utils")

base-commit: 19fe24c5b978a16cbca3cddbfa3ab9d1ee2c68f2
-- 
2.41.0

[bug#66953] [PATCH v2 2/2] gnu: Add rust-argon2-0.5.

[VÖRÖSKŐI András]

* gnu/packages/crates-io.scm (rust-argon2-0.5): New variable.

Change-Id: I15970bb5338c19f524f82f39ec53a7b91c71bc3e
---
 gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 119a59d24f..75fed87989 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4021,6 +4021,36 @@ (define-public rust-argmax-0.3
 too long errors.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-argon2-0.5
+  (package
+    (name "rust-argon2")
+    (version "0.5.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "argon2" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1y820hkza66lfliaxg49zskz7agj8wf7aak528livg261an4rfhp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-base64ct" ,rust-base64ct-1)
+        ("rust-blake2" ,rust-blake2-0.10)
+        ("rust-cpufeatures" ,rust-cpufeatures-0.2)
+        ("rust-password-hash" ,rust-password-hash-0.5)
+        ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-hex-literal" ,rust-hex-literal-0.4)
+        ("rust-password-hash" ,rust-password-hash-0.5))))
+    (home-page
+     "https://github.com/RustCrypto/password-hashes/tree/master/argon2")
+    (synopsis "Rust argon2 library")
+    (description
+     "Pure Rust implementation of the Argon2 password hashing function with support
+for the Argon2d, Argon2i, and Argon2id algorithmic variants.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-ariadne-0.1
   (package
     (name "rust-ariadne")
-- 
2.41.0