[bug#68665] [PATCH 00/12 rust-team] gnu: Add Rust dependencies of python-cramjam.

[bug#68665] [PATCH 00/12 rust-team] gnu: Add Rust dependencies of python-cramjam.

[Troy Figiel]

This patch series adds the necessary Rust dependencies for python-cramjam.

Although I already have a working implementation of python-cramjam in my own channel, I have decided to split the Rust and Python parts into separate issues to allow for easier reviews.

Troy Figiel (12):
  gnu: rust-lz4-sys-1: Update to 1.9.4.
  gnu: rust-lz4-sys-1: Don't skip the build.
  gnu: rust-lz4-1: Update to 1.24.0.
  gnu: rust-lz4-1: Don't skip the build.
  gnu: rust-cbindgen-0.24: Update to 0.24.5.
  gnu: Add rust-target-lexicon-0.11.
  gnu: Add rust-libdeflate-sys-1.
  gnu: rust-libdeflate-sys-0.11: Inherit from rust-libdeflate-sys-1.
  gnu: Add rust-libdeflater-1.
  gnu: rust-libdeflater-0.11: Inherit from rust-libdeflater-1.
  gnu: Add rust-inline-c-macro-0.1.
  gnu: Add rust-inline-c-0.1.

 gnu/packages/crates-io.scm | 139 ++++++++++++++++++++++++++++++++-----
 gnu/packages/rust-apps.scm |   4 +-
 2 files changed, 124 insertions(+), 19 deletions(-)


base-commit: 23a985d6061adf30a660c281fdb32d2e5cdec269
-- 
2.42.0

[bug#68665] [PATCH 03/12] gnu: rust-lz4-1: Update to 1.24.0.

[Troy Figiel]

* gnu/packages/crates-io.scm (rust-lz4-1): Update to 1.24.0.
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 708932752f..bb8d72b4be 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -34749,7 +34749,7 @@ (define-public rust-lsp-types-0.80
 (define-public rust-lz4-1
   (package
     (name "rust-lz4")
-    (version "1.23.2")
+    (version "1.24.0")
     (source
      (origin
        (method url-fetch)
@@ -34757,7 +34757,7 @@ (define-public rust-lz4-1
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0k3j1wsgn4c5ys4vma326r00g5rq5ggp7k385rmby08yk7b0xhma"))))
+        (base32 "1wad97k0asgvaj16ydd09gqs2yvgaanzcvqglrhffv7kdpc2v7ky"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-- 
2.42.0

[bug#68665] [PATCH 01/12] gnu: rust-lz4-sys-1: Update to 1.9.4.

[Troy Figiel]

* gnu/packages/crates-io.scm (rust-lz4-sys-1): Update to 1.9.4.
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2288cc6c4b..b4ecf625b8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -34818,7 +34818,7 @@ (define-public rust-lz4-flex-0.11
 (define-public rust-lz4-sys-1
   (package
     (name "rust-lz4-sys")
-    (version "1.9.2")
+    (version "1.9.4")
     (source
      (origin
        (method url-fetch)
@@ -34826,7 +34826,7 @@ (define-public rust-lz4-sys-1
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1bmc82bddx2lm0r9bn422cxbwlwq6qld6m6l78hjcclbbnlrm9yw"))))
+        (base32 "0059ik4xlvnss5qfh6l691psk4g3350ljxaykzv10yr0gqqppljp"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-- 
2.42.0

[bug#68665] [PATCH 02/12] gnu: rust-lz4-sys-1: Don't skip the build.

[Troy Figiel]

* gnu/packages/crates-io.scm (rust-lz4-sys-1): Don't skip the build.
---
 gnu/packages/crates-io.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b4ecf625b8..708932752f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -34829,8 +34829,7 @@ (define-public rust-lz4-sys-1
         (base32 "0059ik4xlvnss5qfh6l691psk4g3350ljxaykzv10yr0gqqppljp"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-cc" ,rust-cc-1)
         ("rust-libc" ,rust-libc-0.2))))
     (home-page "https://github.com/bozaro/lz4-rs")
-- 
2.42.0

[bug#68665] [PATCH 04/12] gnu: rust-lz4-1: Don't skip the build.

[Troy Figiel]

* gnu/packages/crates-io.scm (rust-lz4-1)[arguments]: Don't skip the build.
[cargo-development-inputs]: Add rust-docmatic-0.1, rust-rand-0.8.
---
 gnu/packages/crates-io.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bb8d72b4be..5a2b985da3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -34760,10 +34760,12 @@ (define-public rust-lz4-1
         (base32 "1wad97k0asgvaj16ydd09gqs2yvgaanzcvqglrhffv7kdpc2v7ky"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-libc" ,rust-libc-0.2)
-        ("rust-lz4-sys" ,rust-lz4-sys-1))))
+        ("rust-lz4-sys" ,rust-lz4-sys-1))
+       #:cargo-development-inputs
+       (("rust-docmatic" ,rust-docmatic-0.1)
+        ("rust-rand" ,rust-rand-0.8))))
     (home-page "https://github.com/10xGenomics/lz4-rs")
     (synopsis "Rust LZ4 bindings library")
     (description "This crate provides Rust LZ4 bindings.")
-- 
2.42.0

[bug#68665] [PATCH 05/12] gnu: rust-cbindgen-0.24: Update to 0.24.5.

[Troy Figiel]

* gnu/packages/rust-apps.scm (rust-cbindgen-0.24): Update to 0.24.5.
---
 gnu/packages/rust-apps.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index f50b1fee75..208ddd4b78 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -1592,14 +1592,14 @@ (define-public rust-cbindgen-0.24
   (package
     (inherit rust-cbindgen-0.26)
     (name "rust-cbindgen")
-    (version "0.24.3")
+    (version "0.24.5")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "cbindgen" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1yqxqsz2d0cppd8zwihk2139g5gy38wqgl9snj6rnk8gyvnqsdd6"))))))
+                "13g1k2zljdp326b0cv1nhyh7jsacd364fh0cr2g828hiyfm2z4jb"))))))
 
 (define-public rust-cbindgen-0.23
   (package
-- 
2.42.0

[bug#68665] [PATCH 06/12] gnu: Add rust-target-lexicon-0.11.

[Troy Figiel]

* gnu/packages/crates-io.scm (rust-target-lexicon-0.11): New variable.
---
 gnu/packages/crates-io.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5a2b985da3..67b2352089 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -65847,6 +65847,20 @@ (define-public rust-target-lexicon-0.12
 tools.")
     (license license:asl2.0)))
 
+(define-public rust-target-lexicon-0.11
+  (package
+    (inherit rust-target-lexicon-0.12)
+    (name "rust-target-lexicon")
+    (version "0.11.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "target-lexicon" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "15gax4765vm2inh45m7cvaf4mgd2mb2mn0i87np0i1d95qhla822"))))
+    (arguments '())))
+
 (define-public rust-tectonic-bridge-core-0.3
   (package
     (name "rust-tectonic-bridge-core")
-- 
2.42.0

[bug#68665] [PATCH 07/12] gnu: Add rust-libdeflate-sys-1.

[Troy Figiel]

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 67b2352089..01bef32389 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32361,6 +32361,27 @@ (define-public rust-libdbus-sys-0.2
     (license (list license:asl2.0 license:expat))))
 
 ;; TODO: Unbundle libdeflate
+(define-public rust-libdeflate-sys-1
+  (package
+    (name "rust-libdeflate-sys")
+    (version "1.19.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "libdeflate-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "1hhwgzlpbw2nafylnjrhbyh7s6q9fb2cglf3xxcia30hhmzim4k7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cc" ,rust-cc-1))))
+    (home-page "https://github.com/adamkewley/libdeflater")
+    (synopsis "Bindings to libdeflate")
+    (description
+     "This package provides bindings to libdeflate for DEFLATE (de)compression
+exposed as non-streaming buffer operations.  It contains bindings for raw
+deflate, zlib, and gzip data.")
+    (license license:asl2.0)))
+
 (define-public rust-libdeflate-sys-0.11
   (package
     (name "rust-libdeflate-sys")
-- 
2.42.0

[bug#68665] [PATCH 08/12] gnu: rust-libdeflate-sys-0.11: Inherit from rust-libdeflate-sys-1.

[Troy Figiel]

* gnu/packages/crates-io.scm (rust-libdeflate-sys-0.11)[inherit]: New field.
---
 gnu/packages/crates-io.scm | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 01bef32389..a25e3baa51 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32384,6 +32384,7 @@ (define-public rust-libdeflate-sys-1
 
 (define-public rust-libdeflate-sys-0.11
   (package
+    (inherit rust-libdeflate-sys-1)
     (name "rust-libdeflate-sys")
     (version "0.11.0")
     (source (origin
@@ -32391,17 +32392,7 @@ (define-public rust-libdeflate-sys-0.11
               (uri (crate-uri "libdeflate-sys" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
-               (base32 "0xs2wdly73ar7r9qyrbwnkwjjz4wd92kv5h78cdxfrsbp2v88ryb"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-cc" ,rust-cc-1))))
-    (home-page "https://github.com/adamkewley/libdeflater")
-    (synopsis "Bindings to libdeflate")
-    (description
-     "This package provides bindings to libdeflate for DEFLATE (de)compression
-exposed as non-streaming buffer operations.  It contains bindings for raw
-deflate, zlib, and gzip data.")
-    (license license:asl2.0)))
+               (base32 "0xs2wdly73ar7r9qyrbwnkwjjz4wd92kv5h78cdxfrsbp2v88ryb"))))))
 
 (define-public rust-libdeflate-sys-0.7
   (package
-- 
2.42.0

[bug#68665] [PATCH 09/12] gnu: Add rust-libdeflater-1.

[Troy Figiel]

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a25e3baa51..2ee1c2fec3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32409,6 +32409,31 @@ (define-public rust-libdeflate-sys-0.7
     (arguments
      `(#:cargo-inputs (("rust-cc" ,rust-cc-1))))))
 
+(define-public rust-libdeflater-1
+  (package
+    (name "rust-libdeflater")
+    (version "1.19.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "libdeflater" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "0zdbiqq2fmjakwk7d1xwnakjnxzaba9rz18k9clyql13cqpv4c9s"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libdeflate-sys" ,rust-libdeflate-sys-1))
+       #:cargo-development-inputs
+       (("rust-adler32" ,rust-adler32-1)
+        ("rust-criterion" ,rust-criterion-0.3)
+        ("rust-flate2" ,rust-flate2-1))))
+    (home-page "https://github.com/adamkewley/libdeflater")
+    (synopsis "Bindings to libdeflate for DEFLATE")
+    (description "This package provides bindings to libdeflate for DEFLATE
+(de)compression exposed as non-streaming buffer operations.  Contains bindings
+for raw deflate, zlib, and gzip data.")
+    (license license:asl2.0)))
+
 (define-public rust-libdeflater-0.11
   (package
     (name "rust-libdeflater")
-- 
2.42.0

[bug#68665] [PATCH 10/12] gnu: rust-libdeflater-0.11: Inherit from rust-libdeflater-1.

[Troy Figiel]

* gnu/packages/crates-io.scm (rust-libdeflater-0.11)[inherit]: New field.
---
 gnu/packages/crates-io.scm | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2ee1c2fec3..4751a6a3b2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32436,6 +32436,7 @@ (define-public rust-libdeflater-1
 
 (define-public rust-libdeflater-0.11
   (package
+    (inherit rust-libdeflater-1)
     (name "rust-libdeflater")
     (version "0.11.0")
     (source (origin
@@ -32444,19 +32445,12 @@ (define-public rust-libdeflater-0.11
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32 "0385hpai7fsnpfvxd3hki43v1cj8w6z1cb2rn8wd6vq4dam8bqnq"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-libdeflate-sys" ,rust-libdeflate-sys-0.11))
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.3)
-        ("rust-flate2" ,rust-flate2-1))))
-    (home-page "https://github.com/adamkewley/libdeflater")
-    (synopsis "Bindings to libdeflate for DEFLATE")
-    (description "This package provides bindings to libdeflate for DEFLATE
-(de)compression exposed as non-streaming buffer operations.  Contains bindings
-for raw deflate, zlib, and gzip data.")
-    (license license:asl2.0)))
+        ("rust-flate2" ,rust-flate2-1))))))
 
 (define-public rust-libflate-1
   (package
-- 
2.42.0

[bug#68665] [PATCH 11/12] gnu: Add rust-inline-c-macro-0.1.

[Troy Figiel]

* gnu/packages/crates-io.scm (rust-inline-c-macro-0.1): 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 4751a6a3b2..8f38c3233b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -29397,6 +29397,30 @@ (define-public rust-inflector-0.11
 as both traits and pure functions acting on String types.")
     (license license:bsd-2)))
 
+(define-public rust-inline-c-macro-0.1
+  (package
+    (name "rust-inline-c-macro")
+    (version "0.1.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "inline-c-macro" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "05dfhfjmid31vybkycs4zmr9rhpmck02ca3w3n4dmb5dqwg65x8p"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-rustc-version" ,rust-rustc-version-0.3))))
+    (home-page "https://github.com/Hywan/inline-c-rs")
+    (synopsis "Macros used by @code{inline-c} to handle C code inside Rust")
+    (description
+     "This library contains the macros needed in @code{inline-c}, that allow
+writing and executing C code inside Rust.")
+    (license license:bsd-3)))
+
 (define-public rust-inotify-0.10
   (package
     (name "rust-inotify")
-- 
2.42.0

[bug#68665] [PATCH 12/12] gnu: Add rust-inline-c-0.1.

[Troy Figiel]

* gnu/packages/crates-io.scm (rust-inline-c-0.1): 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 8f38c3233b..eea169d0b3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -29397,6 +29397,41 @@ (define-public rust-inflector-0.11
 as both traits and pure functions acting on String types.")
     (license license:bsd-2)))
 
+(define-public rust-inline-c-0.1
+  (package
+    (name "rust-inline-c")
+    (version "0.1.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "inline-c" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1mcd7jcfwhkplgz1xb4iqrpc6m29v2k28w4q42yika9g23bd639l"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-assert-cmd" ,rust-assert-cmd-1)
+        ("rust-cc" ,rust-cc-1)
+        ("rust-inline-c-macro" ,rust-inline-c-macro-0.1)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-predicates" ,rust-predicates-2)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-rustc-version" ,rust-rustc-version-0.3)
+        ("rust-target-lexicon" ,rust-target-lexicon-0.11)
+        ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/Hywan/inline-c-rs")
+    (synopsis "Write and execute C code inside Rust")
+    (description
+     "@code{inline-c} is a small crate that allows a user to write
+C (including C++) code inside Rust.  Both environments are strictly sandboxed.
+The C code is transformed into a string which is written to a temporary file.
+This file is then compiled into an object file, that is finally executed.
+
+The primary goal of @code{inline-c} is to ease the testing of a C API of a
+Rust program (generated with @code{cbindgen} for example).")
+    (license license:bsd-3)))
+
 (define-public rust-inline-c-macro-0.1
   (package
     (name "rust-inline-c-macro")
-- 
2.42.0

[bug#68665] [PATCH 00/12 rust-team] gnu: Add Rust dependencies of python-cramjam.

[Troy Figiel]

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

Two short points:

1. It seems I forgot to add my copyright. In the past I added it to
crates-graphics.scm and not to crates-io.scm as I thought. I could add
an additional 13th patch, or maybe it would be easier to include it in
one of the other patches.

2. How is the cross-build-system depedency best handled? In the git logs
I have found two merges of the rust branch into master (1 month and 9
months ago), so if the merge happens once every ~6 months, it could be a
long wait. I am not in any rush, but in the meantime it does block me
from upstreaming other Python patches that depend on python-cramjam. If
there is a better way to handle this, I would love to know.

Best wishes,

Troy

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

bug#68665: [PATCH 00/12 rust-team] gnu: Add Rust dependencies of python-cramjam.

[Efraim Flashner]

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

On Tue, Jan 23, 2024 at 12:02:21PM +0100, Troy Figiel wrote:
> Two short points:
> 
> 1. It seems I forgot to add my copyright. In the past I added it to
> crates-graphics.scm and not to crates-io.scm as I thought. I could add
> an additional 13th patch, or maybe it would be easier to include it in
> one of the other patches.

I've added it for you to crates-io, and also to rust-apps.

> 2. How is the cross-build-system depedency best handled? In the git logs
> I have found two merges of the rust branch into master (1 month and 9
> months ago), so if the merge happens once every ~6 months, it could be a
> long wait. I am not in any rush, but in the meantime it does block me
> from upstreaming other Python patches that depend on python-cramjam. If
> there is a better way to handle this, I would love to know.

We don't really have a target.  I figured every 3 months or so, enough
time to cover 2 rounds of rust version bumps, would probably be a good
cadence.  Checking qa.guix.gnu.org I don't see that anyone has asked for
a merge currently, which is about when I'd plan on jumping in.

In terms of goals for the branch currently, I'd like to make sure that
it re-adds support for riscv64 (up to 1.75 locally!) and try to figure
out the issue I'm having on ppc64le with building rust-1.73.  And also
move more packages out of crates-io to other modules, it's still over
3000.

Also, patches pushed.

-- 
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 --]