GNU bug report logs - #71914
[PATCH 00/10] gnu: Add python-nh3.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 71914 in the body.
You can then email your comments to 71914 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
To: guix-patches <at> gnu.org
Cc: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
Subject: [PATCH 00/10] gnu: Add python-nh3.
Date: Wed,  3 Jul 2024 16:54:58 +0900

nh3 is a HTML sanitization library for Python,
generally a replacement for the now-deprecated bleach.

I use nh3 for a tool rendering mail threads into HTML,
but that's to be packaged later since I also want to upgrade
its other dependency, mistune.

Dependency tree among patches:
* Add Python nh3
  * Add Rust ammonia
    * Add Rust html5ever 0.27
      * Add Rust markup5ever 0.12
      * Update Rust typed-arena 2 to 2.0.2
  * Add Rust pyo3* 0.21 (also update pyo3* 0.20 to 0.20.3)

Nguyễn Gia Phong (10):
  gnu: rust-typed-arena-2: Update to 2.0.2.
  gnu: Add rust-markup5ever-0.12.
  gnu: Add rust-html5ever-0.27.
  gnu: Add rust-ammonia-4.
  gnu: Add rust-pyo3-build-config-0.21.
  gnu: Add rust-pyo3-ffi-0.21.
  gnu: Add rust-pyo3-macros-backend-0.21.
  gnu: Add rust-pyo3-macros-0.21.
  gnu: Add rust-pyo3-0.21.
  gnu: Add python-nh3.

 gnu/packages/crates-io.scm  | 240 ++++++++++++++++++++++++++++++------
 gnu/packages/crates-web.scm |  29 +++++
 gnu/packages/python-web.scm |  45 +++++++
 3 files changed, 277 insertions(+), 37 deletions(-)


base-commit: 4b3a553ca5ba5ac190739309eb5f7aa8170cf2a8
-- 
2.45.2

Message #8 received at 71914 <at> debbugs.gnu.org (full text, mbox):

From: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
To: 71914 <at> debbugs.gnu.org
Cc: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
Subject: [PATCH 01/10] gnu: rust-typed-arena-2: Update to 2.0.2.
Date: Wed,  3 Jul 2024 16:57:52 +0900

* gnu/packages/crates-io.scm (rust-typed-arena-2): Update to 2.0.2.

Change-Id: I75b3c9ba624a9d53b2e920bb61cc54bfa4d19bb7
---
 gnu/packages/crates-io.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9fbe0e2a6ac5..eec488b63c0e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -42,6 +42,7 @@
 ;;; Copyright © 2024 Herman Rimm <herman <at> rimm.ee>
 ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
 ;;; Copyright © 2024 Suhail Singh <suhail <at> bayesians.ca>
+;;; Copyright © 2024 Nguyễn Gia Phong <mcsinyx <at> disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -74665,7 +74666,7 @@ (define-public rust-typeable-0.1
 (define-public rust-typed-arena-2
   (package
     (name "rust-typed-arena")
-    (version "2.0.1")
+    (version "2.0.2")
     (source
      (origin
        (method url-fetch)
@@ -74674,7 +74675,7 @@ (define-public rust-typed-arena-2
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1bnhphrksp9krxhsfhfimrxvkbah2pa6rf9ygmpw5lalbm6wi186"))))
+         "0shj0jpmglhgw2f1i4b33ycdzwd1z205pbs1rd5wx7ks2qhaxxka"))))
     (build-system cargo-build-system)
     (arguments `(#:skip-build? #t))
     (home-page "https://github.com/SimonSapin/rust-typed-arena")
-- 
2.45.2

Message #11 received at 71914 <at> debbugs.gnu.org (full text, mbox):

From: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
To: 71914 <at> debbugs.gnu.org
Cc: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
Subject: [PATCH 02/10] gnu: Add rust-markup5ever-0.12.
Date: Wed,  3 Jul 2024 16:57:53 +0900

* gnu/packages/crates-io.scm (rust-markup5ever-0.12): New variable.
(rust-markup5ever-0.11): Inherit from rust-markup5ever-0.12.

Change-Id: Ieb3cd806b1155e169314e2bf3b05adbdad95079a
---
 gnu/packages/crates-io.scm | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index eec488b63c0e..b78a80fc0a02 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36726,23 +36726,23 @@ (define-public rust-markup-0.13
      "This package provides a fast, type-safe template engine for Rust.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-markup5ever-0.11
+(define-public rust-markup5ever-0.12
   (package
     (name "rust-markup5ever")
-    (version "0.11.0")
+    (version "0.12.1")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "markup5ever" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "05mhzsp6lfxla1fgd0ac283b405s6kyj27wj5r6d7wq42jxjj9ks"))))
+                "0idy4vjihg2dw73j2vkb5kdghvga3bwnw0qx8jwci4m6xfxkmkhn"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-log" ,rust-log-0.4)
-        ("rust-phf" ,rust-phf-0.10)
-        ("rust-phf-codegen" ,rust-phf-codegen-0.10)
+        ("rust-phf" ,rust-phf-0.11)
+        ("rust-phf-codegen" ,rust-phf-codegen-0.11)
         ("rust-string-cache" ,rust-string-cache-0.8)
         ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.5)
         ("rust-tendril" ,rust-tendril-0.4))))
@@ -36752,6 +36752,27 @@ (define-public rust-markup5ever-0.11
      "Common code for xml5ever and html5ever.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-markup5ever-0.11
+  (package
+    (inherit rust-markup5ever-0.12)
+    (name "rust-markup5ever")
+    (version "0.11.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "markup5ever" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "05mhzsp6lfxla1fgd0ac283b405s6kyj27wj5r6d7wq42jxjj9ks"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-log" ,rust-log-0.4)
+        ("rust-phf" ,rust-phf-0.10)
+        ("rust-phf-codegen" ,rust-phf-codegen-0.10)
+        ("rust-string-cache" ,rust-string-cache-0.8)
+        ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.5)
+        ("rust-tendril" ,rust-tendril-0.4))))))
+
 (define-public rust-markup5ever-0.10
   (package
     (inherit rust-markup5ever-0.11)
-- 
2.45.2

Message #14 received at 71914 <at> debbugs.gnu.org (full text, mbox):

From: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
To: 71914 <at> debbugs.gnu.org
Cc: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
Subject: [PATCH 03/10] gnu: Add rust-html5ever-0.27.
Date: Wed,  3 Jul 2024 16:57:54 +0900

* gnu/packages/crates-io.scm (rust-html5ever-0.27): New variable.
(rust-html5ever-0.26): Inherit from rust-html5ever-0.27.

Change-Id: Ifdcd7fb83fede8dc0af68af0e7f96e6b06a027db
---
 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 b78a80fc0a02..85b87e39f8c1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -28893,35 +28893,60 @@ (define-public rust-hound-3
     (description "This package provides a wav encoding and decoding library.")
     (license license:asl2.0)))
 
-(define-public rust-html5ever-0.26
+(define-public rust-html5ever-0.27
   (package
     (name "rust-html5ever")
-    (version "0.26.0")
+    (version "0.27.0")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "html5ever" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1dx3lhfwngi21wa79cpjv5rd4wn5vmklr50wrwbryidq92mqr9my"))))
+                "1m24sbpk572f5qhhkj4kkxvsd64rn968s0vxwvqlds76w2pp2dy1"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-log" ,rust-log-0.4)
         ("rust-mac" ,rust-mac-0.1)
-        ("rust-markup5ever" ,rust-markup5ever-0.11)
+        ("rust-markup5ever" ,rust-markup5ever-0.12)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))
+        ("rust-syn" ,rust-syn-2))
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.3)
-        ("rust-typed-arena" ,rust-typed-arena-1))))
+        ("rust-typed-arena" ,rust-typed-arena-2))))
     (home-page "https://github.com/servo/html5ever")
     (synopsis "High-performance browser-grade HTML5 parser")
     (description
      "This package provides a high-performance browser-grade HTML5 parser.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-html5ever-0.26
+  (package
+    (inherit rust-html5ever-0.27)
+    (name "rust-html5ever")
+    (version "0.26.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "html5ever" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1dx3lhfwngi21wa79cpjv5rd4wn5vmklr50wrwbryidq92mqr9my"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-log" ,rust-log-0.4)
+        ("rust-mac" ,rust-mac-0.1)
+        ("rust-markup5ever" ,rust-markup5ever-0.11)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-typed-arena" ,rust-typed-arena-1))))))
+
 (define-public rust-html5ever-0.25
   (package
     (inherit rust-html5ever-0.26)
-- 
2.45.2

Message #17 received at 71914 <at> debbugs.gnu.org (full text, mbox):

From: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
To: 71914 <at> debbugs.gnu.org
Cc: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
Subject: [PATCH 04/10] gnu: Add rust-ammonia-4.
Date: Wed,  3 Jul 2024 16:57:55 +0900

* gnu/packages/crates-web.scm (rust-ammonia-4): New variable.

Change-Id: Ibe8921d7119c5c75959f50c427d2d11024f30b88
---
 gnu/packages/crates-web.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index 60c735efa76b..2d5a4a56e59f 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2023 VÖRÖSKŐI András <voroskoi <at> gmail.com>
 ;;; Copyright © 2024 Wilko Meyer <w <at> wmeyer.eu>
 ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
+;;; Copyright © 2024 Nguyễn Gia Phong <mcsinyx <at> disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1490,6 +1491,34 @@ (define-public rust-actix-web-codegen-0.1
     (inputs
      (list openssl))))
 
+(define-public rust-ammonia-4
+  (package
+    (name "rust-ammonia")
+    (version "4.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ammonia" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0nd432yg1cl9kj4i9c37a9hvwffayqh6zsvb4fmh31g5bsp9xf8s"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("html5ever" ,rust-html5ever-0.27)
+                       ("maplit" ,rust-maplit-1)
+                       ("tendril" ,rust-tendril-0.4)
+                       ("url" ,rust-url-2)
+                       ("once_cell" ,rust-once-cell-1))
+       #:cargo-development-inputs (("version-sync" ,rust-version-sync-0.9)
+                                   ("env_logger" ,rust-env-logger-0.10))))
+    (home-page "https://github.com/rust-ammonia/ammonia")
+    (synopsis "Repair and secure untrusted HTML")
+    (description "Ammonia is a whitelist-based HTML sanitization library.
+It is designed to prevent cross-site scripting, layout breaking,
+and clickjacking caused by untrusted user-provided HTML
+being mixed into a larger web page.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-async-h1-2
   (package
     (name "rust-async-h1")
-- 
2.45.2

Message #20 received at 71914 <at> debbugs.gnu.org (full text, mbox):

From: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
To: 71914 <at> debbugs.gnu.org
Cc: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
Subject: [PATCH 05/10] gnu: Add rust-pyo3-build-config-0.21.
Date: Wed,  3 Jul 2024 16:57:56 +0900

* gnu/packages/crates-io.scm (rust-pyo3-build-config-0.21): New variable.
(rust-pyo3-build-config-0.20): Inherit from rust-pyo3-build-config-0.21.
Update to 0.20.3.

Change-Id: I7ee7893dd414c5a12e6b085c32500d234fc24b41
---
 gnu/packages/crates-io.scm | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 85b87e39f8c1..043a75cbc1e7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -51206,17 +51206,17 @@ (define-public rust-pure-rust-locales-0.7
     (arguments
      (list #:tests? #f))))  ; Not all files included.
 
-(define-public rust-pyo3-build-config-0.20
+(define-public rust-pyo3-build-config-0.21
   (package
     (name "rust-pyo3-build-config")
-    (version "0.20.2")
+    (version "0.21.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "pyo3-build-config" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1gk3a4y8jc2z1j3hb9xjg1gfvcd7s6ph1wwkcbr039p5iw6nyhh7"))))
+        (base32 "0l0vxvnqsbjrpdmysnwaljf4q3zcr1kb526qq23svzgs6mcdz0vq"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1)
@@ -51232,6 +51232,25 @@ (define-public rust-pyo3-build-config-0.20
 ecosystem.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-pyo3-build-config-0.20
+  (package
+    (inherit rust-pyo3-build-config-0.21)
+    (name "rust-pyo3-build-config")
+    (version "0.20.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pyo3-build-config" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1ms83n1qa81989c6pakpznifalvxv5fiyyji23732lizvr2mgany"))))
+    (arguments
+     `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-python3-dll-a" ,rust-python3-dll-a-0.2)
+                       ("rust-python3-dll-a" ,rust-python3-dll-a-0.2)
+                       ("rust-target-lexicon" ,rust-target-lexicon-0.12)
+                       ("rust-target-lexicon" ,rust-target-lexicon-0.12))))))
+
 (define-public rust-pyo3-build-config-0.19
   (package
     (inherit rust-pyo3-build-config-0.20)
-- 
2.45.2

Message #23 received at 71914 <at> debbugs.gnu.org (full text, mbox):

From: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
To: 71914 <at> debbugs.gnu.org
Cc: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
Subject: [PATCH 06/10] gnu: Add rust-pyo3-ffi-0.21.
Date: Wed,  3 Jul 2024 16:57:57 +0900

* gnu/packages/crates-io.scm (rust-pyo3-ffi-0.21): New variable.
(rust-pyo3-ffi-0.20): Inherit from rust-pyo3-ffi-0.21.
Update to 0.20.3.

Change-Id: I5ef7bcc0855952dcd4d47254ed4dd338076f67b3
---
 gnu/packages/crates-io.scm | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 043a75cbc1e7..c7a955a2d7fd 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -51328,21 +51328,22 @@ (define-public rust-pyo3-build-config-0.15
      `(#:cargo-inputs
        (("rust-once-cell" ,rust-once-cell-1))))))
 
-(define-public rust-pyo3-ffi-0.20
+(define-public rust-pyo3-ffi-0.21
   (package
     (name "rust-pyo3-ffi")
-    (version "0.20.2")
+    (version "0.21.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "pyo3-ffi" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1wbcv9cd0bandh3j5qfd5r66n045b8hs9wd4pi36nxhpgv0xxdyv"))))
+        (base32 "00vlp4gmzn76gz250pz1r3fydd5r41nwl7dd9nmidfb0vi1migh1"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)
-                       ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.20))))
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.21))))
     (native-inputs (list python))
     (home-page "https://github.com/pyo3/pyo3")
     (synopsis "Python API bindings for the PyO3 ecosystem")
@@ -51350,6 +51351,23 @@ (define-public rust-pyo3-ffi-0.20
      "This crate provides Rust FFI declarations for Python 3.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-pyo3-ffi-0.20
+  (package
+    (inherit rust-pyo3-ffi-0.21)
+    (name "rust-pyo3-ffi")
+    (version "0.20.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pyo3-ffi" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1yja1npmzh4i73jn5dv2rnw7idif8bns51bf3zpx821ys0qjbd32"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.20))))))
+
 (define-public rust-pyo3-ffi-0.19
   (package
     (inherit rust-pyo3-ffi-0.20)
-- 
2.45.2

Message #26 received at 71914 <at> debbugs.gnu.org (full text, mbox):

From: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
To: 71914 <at> debbugs.gnu.org
Cc: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
Subject: [PATCH 07/10] gnu: Add rust-pyo3-macros-backend-0.21.
Date: Wed,  3 Jul 2024 16:57:58 +0900

* gnu/packages/crates-io.scm (rust-pyo3-macros-backend-0.21): New variable.
(rust-pyo3-macros-backend-0.20): Inherit from rust-pyo3-macros-backend-0.21.
Update to 0.20.3.

Change-Id: Ia3a833ffc0a4107ae995754f13887103f5243402
---
 gnu/packages/crates-io.scm | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c7a955a2d7fd..acf1fc8f83ea 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -51447,17 +51447,17 @@ (define-public rust-pyo3-log-0.8
 extension to python.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-pyo3-macros-backend-0.20
+(define-public rust-pyo3-macros-backend-0.21
   (package
     (name "rust-pyo3-macros-backend")
-    (version "0.20.2")
+    (version "0.21.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "pyo3-macros-backend" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "07w8x1wxm1ksx72jb0w1p2ssmg9zh95dsv4xmxyq4iqqhpa11j8g"))))
+        (base32 "0p58yp8ajlc8bq56wghw1syrjszmadasasdfpsjy3d9dychhf9h8"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-heck" ,rust-heck-0.4)
@@ -51470,6 +51470,24 @@ (define-public rust-pyo3-macros-backend-0.20
      "This package provides code generation backends for PyO3.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-pyo3-macros-backend-0.20
+  (package
+    (inherit rust-pyo3-macros-backend-0.21)
+    (name "rust-pyo3-macros-backend")
+    (version "0.20.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pyo3-macros-backend" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "11b1z7qnbdnd9hy74ds3xcjx3mjkz43mvpnan32ljccwpdl9nzkw"))))
+    (arguments
+     `(#:cargo-inputs (("rust-heck" ,rust-heck-0.4)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))))
+
 (define-public rust-pyo3-macros-backend-0.19
   (package
     (inherit rust-pyo3-macros-backend-0.20)
-- 
2.45.2

Message #29 received at 71914 <at> debbugs.gnu.org (full text, mbox):

From: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
To: 71914 <at> debbugs.gnu.org
Cc: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
Subject: [PATCH 08/10] gnu: Add rust-pyo3-macros-0.21.
Date: Wed,  3 Jul 2024 16:57:59 +0900

* gnu/packages/crates-io.scm (rust-pyo3-macros-0.21): New variable.
(rust-pyo3-macros-0.20): Inherit from rust-pyo3-macros-0.21.
Update to 0.20.3.

Change-Id: I90c07ee66aff098250345d11d120e1c62203b7e0
---
 gnu/packages/crates-io.scm | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index acf1fc8f83ea..a0e99340ccd9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -51564,29 +51564,49 @@ (define-public rust-pyo3-macros-backend-0.15
         ("rust-syn" ,rust-syn-1))))
     (native-inputs (list python))))
 
-(define-public rust-pyo3-macros-0.20
+(define-public rust-pyo3-macros-0.21
   (package
     (name "rust-pyo3-macros")
-    (version "0.20.2")
+    (version "0.21.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "pyo3-macros" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1lsfyx1shdyi7zybs3maakh2h3zsij3l5wap35qval0dwjs3ixq5"))))
+        (base32 "0g65z9yj2iffjrkrkzan9hwhhj7rrchh7lfv64dy30h6zill1cvp"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
-                       ("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.20)
-                       ("rust-quote" ,rust-quote-1)
-                       ("rust-syn" ,rust-syn-2))))
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.21)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-2))))
     (home-page "https://github.com/pyo3/pyo3")
     (synopsis "Proc macros for PyO3")
     (description
      "This package provides compiler macros for use with PyO3.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-pyo3-macros-0.20
+  (package
+    (inherit rust-pyo3-macros-0.21)
+    (name "rust-pyo3-macros")
+    (version "0.20.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pyo3-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0n61s98qb2qc1wlda3bz4r0wi0vsr9p4lj2yr5g0bf01z8hcf1bk"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.20)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-2))))))
+
 (define-public rust-pyo3-macros-0.19
   (package
     (inherit rust-pyo3-macros-0.20)
-- 
2.45.2

Message #32 received at 71914 <at> debbugs.gnu.org (full text, mbox):

From: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
To: 71914 <at> debbugs.gnu.org
Cc: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
Subject: [PATCH 09/10] gnu: Add rust-pyo3-0.21.
Date: Wed,  3 Jul 2024 16:58:00 +0900

* gnu/packages/crates-io.scm (rust-pyo3-0.21): New variable.
(rust-pyo3-0.20): Inherit from rust-pyo3-0.21.
Update to 0.20.3.

Change-Id: Icfabbd32c1c673cd3459122cd5d5388e6dcb4137
---
 gnu/packages/crates-io.scm | 56 ++++++++++++++++++++++++++++++++++----
 1 file changed, 50 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a0e99340ccd9..457065276be5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -51702,17 +51702,17 @@ (define-public rust-pyo3-macros-0.15
         ("rust-syn" ,rust-syn-1))))
     (native-inputs (list python))))
 
-(define-public rust-pyo3-0.20
+(define-public rust-pyo3-0.21
   (package
     (name "rust-pyo3")
-    (version "0.20.2")
+    (version "0.21.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "pyo3" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1q3g7ppg2qskigbgqg3w9280klkil5is9hhyps1ykl2hb1xdr2cs"))))
+        (base32 "1n39y183jfqbyvimscqr0ysxxa6804pn46ivw048ww91lnb0pq55"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
@@ -51729,9 +51729,9 @@ (define-public rust-pyo3-0.20
                        ("rust-num-bigint" ,rust-num-bigint-0.4)
                        ("rust-num-complex" ,rust-num-complex-0.4)
                        ("rust-parking-lot" ,rust-parking-lot-0.12)
-                       ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.20)
-                       ("rust-pyo3-ffi" ,rust-pyo3-ffi-0.20)
-                       ("rust-pyo3-macros" ,rust-pyo3-macros-0.20)
+                       ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.21)
+                       ("rust-pyo3-ffi" ,rust-pyo3-ffi-0.21)
+                       ("rust-pyo3-macros" ,rust-pyo3-macros-0.21)
                        ("rust-rust-decimal" ,rust-rust-decimal-1)
                        ("rust-serde" ,rust-serde-1)
                        ("rust-smallvec" ,rust-smallvec-1)
@@ -51754,6 +51754,50 @@ (define-public rust-pyo3-0.20
 Python code from a Rust binary is also supported.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-pyo3-0.20
+  (package
+    (inherit rust-pyo3-0.21)
+    (name "rust-pyo3")
+    (version "0.20.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pyo3" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0cw2pgab0pq5gd98nhv18xgxvyigygspla6c8mfycmwisjbbpgak"))))
+    (arguments
+     `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-either" ,rust-either-1)
+                       ("rust-eyre" ,rust-eyre-0.6)
+                       ("rust-hashbrown" ,rust-hashbrown-0.14)
+                       ("rust-indexmap" ,rust-indexmap-2)
+                       ("rust-indoc" ,rust-indoc-2)
+                       ("rust-inventory" ,rust-inventory-0.3)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-memoffset" ,rust-memoffset-0.9)
+                       ("rust-num-bigint" ,rust-num-bigint-0.4)
+                       ("rust-num-complex" ,rust-num-complex-0.4)
+                       ("rust-parking-lot" ,rust-parking-lot-0.12)
+                       ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.20)
+                       ("rust-pyo3-ffi" ,rust-pyo3-ffi-0.20)
+                       ("rust-pyo3-macros" ,rust-pyo3-macros-0.20)
+                       ("rust-rust-decimal" ,rust-rust-decimal-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-unindent" ,rust-unindent-0.2))
+       #:cargo-development-inputs (("rust-assert-approx-eq" ,rust-assert-approx-eq-1)
+                                   ("rust-chrono" ,rust-chrono-0.4)
+                                   ("rust-proptest" ,rust-proptest-1)
+                                   ("rust-rayon" ,rust-rayon-1)
+                                   ("rust-send-wrapper" ,rust-send-wrapper-0.6)
+                                   ("rust-serde" ,rust-serde-1)
+                                   ("rust-serde-json" ,rust-serde-json-1)
+                                   ("rust-trybuild" ,rust-trybuild-1)
+                                   ("rust-widestring" ,rust-widestring-0.5))))))
+
 (define-public rust-pyo3-0.19
   (package
     (inherit rust-pyo3-0.20)
-- 
2.45.2

Message #35 received at 71914 <at> debbugs.gnu.org (full text, mbox):

From: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
To: 71914 <at> debbugs.gnu.org
Cc: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
Subject: [PATCH 10/10] gnu: Add python-nh3.
Date: Wed,  3 Jul 2024 16:58:01 +0900

* gnu/packages/python-web.scm (python-nh3): New variable.

Change-Id: I21877b895467c290e07d11697a384c18a9c53113
---
 gnu/packages/python-web.scm | 45 +++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 1363e6ccdf11..b8e74694011c 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -65,6 +65,7 @@
 ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus <at> gmail.com>
 ;;; Copyright © 2024 normally_js <normally_js <at> posteo.net>
 ;;; Copyright © 2024 Markku Korkeala <markku.korkeala <at> iki.fi>
+;;; Copyright © 2024 Nguyễn Gia Phong <mcsinyx <at> disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -83,6 +84,7 @@
 
 (define-module (gnu packages python-web)
   #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system cargo)
   #:use-module (guix build-system copy)
   #:use-module (guix build-system pyproject)
   #:use-module (guix build-system python)
@@ -96,6 +98,8 @@ (define-module (gnu packages python-web)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages crates-io)
+  #:use-module (gnu packages crates-web)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages django)
@@ -122,6 +126,7 @@ (define-module (gnu packages python-web)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages rdf)
   #:use-module (gnu packages rpc)
+  #:use-module (gnu packages rust-apps)
   #:use-module (gnu packages serialization)
   #:use-module (gnu packages sphinx)
   #:use-module (gnu packages texinfo)
@@ -3442,6 +3447,46 @@ (define-public python-ndg-httpsclient
     (home-page "https://github.com/cedadev/ndg_httpsclient/")
     (license license:bsd-3)))
 
+(define-public python-nh3
+  (package
+    (name "python-nh3")
+    (version "0.2.17")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "nh3" version))
+       (sha256
+        (base32 "0a7hrca5bbbrz20cbqy16n8vaxf4v2q1r9zv9vjlbmn334d79l20"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list
+      #:imported-modules `(,@%cargo-build-system-modules
+                           ,@%pyproject-build-system-modules)
+      #:modules '((guix build cargo-build-system)
+                  ((guix build pyproject-build-system) #:prefix py:)
+                  (guix build utils))
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'build (assoc-ref py:%standard-phases 'build))
+          (replace 'install (assoc-ref py:%standard-phases 'install))
+          ;; cargo-build-system's %standard-phases has 'check before 'install.
+          (delete 'check)
+          (add-after 'install 'check
+            (lambda* (#:key tests? inputs outputs #:allow-other-keys)
+              (when tests?
+                (py:add-installed-pythonpath inputs outputs)
+                (invoke "pytest" "-vv" "tests")))))
+      #:cargo-inputs
+      `(("rust-ammonia" ,rust-ammonia-4)
+        ("rust-pyo3" ,rust-pyo3-0.21))
+      #:install-source? #false))
+    (native-inputs (list maturin python-pytest python-wrapper))
+    (home-page "https://nh3.readthedocs.io")
+    (synopsis "Python bindings to Ammonia HTML sanitization library")
+    (description "This package provides Python bindings
+to Ammonia HTML sanitizer Rust crate.")
+    (license license:expat)))
+
 (define-public python-noiseprotocol
   (package
     (name "python-noiseprotocol")
-- 
2.45.2

Message #38 received at 71914 <at> debbugs.gnu.org (full text, mbox):

From: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
To: <71914 <at> debbugs.gnu.org>
Subject: Re: [PATCH 08/10] gnu: Add rust-pyo3-macros-0.21.
Date: Wed, 03 Jul 2024 17:11:43 +0900

[Message part 1 (text/plain, inline)]

On 2024-07-03 at 16:57+09:00, Nguyễn Gia Phong wrote:
> * gnu/packages/crates-io.scm (rust-pyo3-macros-0.20):
> Inherit from rust-pyo3-macros-0.21.
> Update to 0.20.3.
> ---
> +(define-public rust-pyo3-macros-0.20
> +  (package
> +    (inherit rust-pyo3-macros-0.21)
[snip]
> +    (arguments
> +     `(#:cargo-inputs
> +       (("rust-proc-macro2" ,rust-proc-macro2-1)
> +        ("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.20)
> +        ("rust-quote" ,rust-quote-1)
> +        ("rust-syn" ,rust-syn-2))))))

I just realized that all pyo3-* 0.20 use the same cargo-inputs as 0.21.
Should I send v2 for all patches or just 05 to 08?

[signature.asc (application/pgp-signature, inline)]

Message #41 received at 71914 <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
Cc: 71914 <at> debbugs.gnu.org
Subject: Re: [bug#71914] [PATCH 08/10] gnu: Add rust-pyo3-macros-0.21.
Date: Wed, 3 Jul 2024 12:00:39 +0300

[Message part 1 (text/plain, inline)]

On Wed, Jul 03, 2024 at 05:11:43PM +0900, guix-patches--- via wrote:
> On 2024-07-03 at 16:57+09:00, Nguyễn Gia Phong wrote:
> > * gnu/packages/crates-io.scm (rust-pyo3-macros-0.20):
> > Inherit from rust-pyo3-macros-0.21.
> > Update to 0.20.3.
> > ---
> > +(define-public rust-pyo3-macros-0.20
> > +  (package
> > +    (inherit rust-pyo3-macros-0.21)
> [snip]
> > +    (arguments
> > +     `(#:cargo-inputs
> > +       (("rust-proc-macro2" ,rust-proc-macro2-1)
> > +        ("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.20)
> > +        ("rust-quote" ,rust-quote-1)
> > +        ("rust-syn" ,rust-syn-2))))))
> 
> I just realized that all pyo3-* 0.20 use the same cargo-inputs as 0.21.
> Should I send v2 for all patches or just 05 to 08?

They use the 0.20 version of the inputs, not the 0.21 version of the
inputs, so they have different cargo-inputs.


-- 
Efraim Flashner   <efraim <at> 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

[signature.asc (application/pgp-signature, inline)]

Message #46 received at 71914-done <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
Cc: Sharlatan Hellseher <sharlatanus <at> gmail.com>,
 Munyoki Kilyungi <me <at> bonfacemunyoki.com>, Lars-Dominik Braun <lars <at> 6xq.net>,
 71914-done <at> debbugs.gnu.org, jgart <jgart <at> dismail.de>,
 Marius Bakke <marius <at> gnu.org>, Tanguy Le Carrour <tanguy <at> bioneland.org>
Subject: Re: [bug#71914] [PATCH 00/10] gnu: Add python-nh3.
Date: Wed, 3 Jul 2024 12:07:55 +0300

[Message part 1 (text/plain, inline)]

On Wed, Jul 03, 2024 at 04:54:58PM +0900, guix-patches--- via wrote:
> nh3 is a HTML sanitization library for Python,
> generally a replacement for the now-deprecated bleach.
> 
> I use nh3 for a tool rendering mail threads into HTML,
> but that's to be packaged later since I also want to upgrade
> its other dependency, mistune.
> 
> Dependency tree among patches:
> * Add Python nh3
>   * Add Rust ammonia
>     * Add Rust html5ever 0.27
>       * Add Rust markup5ever 0.12
>       * Update Rust typed-arena 2 to 2.0.2
>   * Add Rust pyo3* 0.21 (also update pyo3* 0.20 to 0.20.3)
> 
> Nguyễn Gia Phong (10):
>   gnu: rust-typed-arena-2: Update to 2.0.2.
>   gnu: Add rust-markup5ever-0.12.
>   gnu: Add rust-html5ever-0.27.
>   gnu: Add rust-ammonia-4.
>   gnu: Add rust-pyo3-build-config-0.21.
>   gnu: Add rust-pyo3-ffi-0.21.
>   gnu: Add rust-pyo3-macros-backend-0.21.
>   gnu: Add rust-pyo3-macros-0.21.
>   gnu: Add rust-pyo3-0.21.
>   gnu: Add python-nh3.
> 
>  gnu/packages/crates-io.scm  | 240 ++++++++++++++++++++++++++++++------
>  gnu/packages/crates-web.scm |  29 +++++
>  gnu/packages/python-web.scm |  45 +++++++
>  3 files changed, 277 insertions(+), 37 deletions(-)
> 
> 
> base-commit: 4b3a553ca5ba5ac190739309eb5f7aa8170cf2a8

Since it wasn't only new packages I applied this to the rust-team
branch, which should be merged soon-ish.

There were a couple of missing bits, which I found while building all
the packages affected:
rust-pyo3-macros-0.21, rust-pyo3-macros-0.20:
Needs python-minimal as a native-input
rust-pyo3-macros-backend-0.21, rust-pyo3-macros-backend-0.20:
Needs rust-pyo3-build-config-0.2X as a cargo-input and python-minimal as
a native-input
rust-pyo3-0.21:
[cargo-inputs]: Added rust-chrono-tz-0.6, rust-portable-atomic-1.
[cargo-development-inputs]: Added rust-chrono-tz-0.6, rust-futures-0.3.
Removed rust-widestring-0.5.

I used the following command to build all the packages:
./pre-inst-env guix build --no-grafts --fallback --max-jobs=3 rust-typed-arena <at> 2 rust-markup5ever <at> 0.12 rust-html5ever <at> 0.27 rust-ammonia <at> 4 rust-pyo3{,-{build-config,ffi,macros-backend,macros}}@0.{20,21} python-nh3


-- 
Efraim Flashner   <efraim <at> 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

[signature.asc (application/pgp-signature, inline)]

Message #49 received at 71914 <at> debbugs.gnu.org (full text, mbox):

From: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
To: "Efraim Flashner" <efraim <at> flashner.co.il>
Cc: 71914 <at> debbugs.gnu.org
Subject: Re: [bug#71914] [PATCH 08/10] gnu: Add rust-pyo3-macros-0.21.
Date: Wed, 03 Jul 2024 18:12:51 +0900

[Message part 1 (text/plain, inline)]

On 2024-07-03 at 12:00+03:00, Efraim Flashner wrote:
> On Wed, Jul 03, 2024 at 05:11:43PM +0900, Nguyễn Gia Phong wrote:
> > On 2024-07-03 at 16:57+09:00, Nguyễn Gia Phong wrote:
> > I just realized that all pyo3-* 0.20 use the same cargo-inputs
> > as 0.21.  Should I send v2 for all patches or just 05 to 08?
>
> They use the 0.20 version of the inputs, not the 0.21 version of the
> inputs, so they have different cargo-inputs.

Sorry, my bad, that only applies for the 3 other pyo3-*
(I removed their arguments and rust-pyo3 <at> 0.20 built w/o any error).

Either way, what's the general etiquette for sending revisions
of a subset of the patch series?

[signature.asc (application/pgp-signature, inline)]

Message #52 received at 71914 <at> debbugs.gnu.org (full text, mbox):

From: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
To: "Efraim Flashner" <efraim <at> flashner.co.il>
Cc: 71914 <at> debbugs.gnu.org
Subject: Re: [bug#71914] [PATCH 00/10] gnu: Add python-nh3.
Date: Wed, 03 Jul 2024 18:20:03 +0900

[Message part 1 (text/plain, inline)]

On 2024-07-03 at 12:07+03:00, Efraim Flashner wrote:
> On Wed, Jul 03, 2024 at 04:54:58PM +0900, Nguyễn Gia Phong wrote:
> > Nguyễn Gia Phong (10):
> >   gnu: rust-typed-arena-2: Update to 2.0.2.
> >   gnu: Add rust-markup5ever-0.12.
> >   gnu: Add rust-html5ever-0.27.
> >   gnu: Add rust-ammonia-4.
> >   gnu: Add rust-pyo3-build-config-0.21.
> >   gnu: Add rust-pyo3-ffi-0.21.
> >   gnu: Add rust-pyo3-macros-backend-0.21.
> >   gnu: Add rust-pyo3-macros-0.21.
> >   gnu: Add rust-pyo3-0.21.
> >   gnu: Add python-nh3.
>
> Since it wasn't only new packages I applied this to the rust-team
> branch, which should be merged soon-ish.
>
> There were a couple of missing bits, which I found while building all
> the packages affected:
> rust-pyo3-macros-0.21, rust-pyo3-macros-0.20:
> Needs python-minimal as a native-input
> rust-pyo3-macros-backend-0.21, rust-pyo3-macros-backend-0.20:
> Needs rust-pyo3-build-config-0.2X as a cargo-input and python-minimal as
> a native-input
> rust-pyo3-0.21:
> [cargo-inputs]: Added rust-chrono-tz-0.6, rust-portable-atomic-1.
> [cargo-development-inputs]: Added rust-chrono-tz-0.6, rust-futures-0.3.
> Removed rust-widestring-0.5.
>
> I used the following command to build all the packages:
> ./pre-inst-env guix build --no-grafts --fallback --max-jobs=3 rust-typed-arena <at> 2 rust-markup5ever <at> 0.12 rust-html5ever <at> 0.27 rust-ammonia <at> 4 rust-pyo3{,-{build-config,ffi,macros-backend,macros}}@0.{20,21} python-nh3

Thank you very much!  So because Rust is statically compiled,
each package needs to be (built and) tested individually?

[signature.asc (application/pgp-signature, inline)]

Message #55 received at 71914-done <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
Cc: 71914-done <at> debbugs.gnu.org
Subject: Re: [bug#71914] [PATCH 00/10] gnu: Add python-nh3.
Date: Wed, 3 Jul 2024 12:24:03 +0300

[Message part 1 (text/plain, inline)]

On Wed, Jul 03, 2024 at 06:20:03PM +0900, Nguyễn Gia Phong wrote:
> On 2024-07-03 at 12:07+03:00, Efraim Flashner wrote:
> > On Wed, Jul 03, 2024 at 04:54:58PM +0900, Nguyễn Gia Phong wrote:
> > > Nguyễn Gia Phong (10):
> > >   gnu: rust-typed-arena-2: Update to 2.0.2.
> > >   gnu: Add rust-markup5ever-0.12.
> > >   gnu: Add rust-html5ever-0.27.
> > >   gnu: Add rust-ammonia-4.
> > >   gnu: Add rust-pyo3-build-config-0.21.
> > >   gnu: Add rust-pyo3-ffi-0.21.
> > >   gnu: Add rust-pyo3-macros-backend-0.21.
> > >   gnu: Add rust-pyo3-macros-0.21.
> > >   gnu: Add rust-pyo3-0.21.
> > >   gnu: Add python-nh3.
> >
> > Since it wasn't only new packages I applied this to the rust-team
> > branch, which should be merged soon-ish.
> >
> > There were a couple of missing bits, which I found while building all
> > the packages affected:
> > rust-pyo3-macros-0.21, rust-pyo3-macros-0.20:
> > Needs python-minimal as a native-input
> > rust-pyo3-macros-backend-0.21, rust-pyo3-macros-backend-0.20:
> > Needs rust-pyo3-build-config-0.2X as a cargo-input and python-minimal as
> > a native-input
> > rust-pyo3-0.21:
> > [cargo-inputs]: Added rust-chrono-tz-0.6, rust-portable-atomic-1.
> > [cargo-development-inputs]: Added rust-chrono-tz-0.6, rust-futures-0.3.
> > Removed rust-widestring-0.5.
> >
> > I used the following command to build all the packages:
> > ./pre-inst-env guix build --no-grafts --fallback --max-jobs=3 rust-typed-arena <at> 2 rust-markup5ever <at> 0.12 rust-html5ever <at> 0.27 rust-ammonia <at> 4 rust-pyo3{,-{build-config,ffi,macros-backend,macros}}@0.{20,21} python-nh3
> 
> Thank you very much!  So because Rust is statically compiled,
> each package needs to be (built and) tested individually?

Yeah, its an unfortunate side effect of using the sources of the
packages instead of an output. There has been talk in the upstream rust
community about providing a stable-ish interface so that we can reuse
build artifacts from one build to another.

-- 
Efraim Flashner   <efraim <at> 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

[signature.asc (application/pgp-signature, inline)]

Message #58 received at 71914 <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
Cc: 71914 <at> debbugs.gnu.org
Subject: Re: [bug#71914] [PATCH 08/10] gnu: Add rust-pyo3-macros-0.21.
Date: Wed, 3 Jul 2024 12:27:00 +0300

[Message part 1 (text/plain, inline)]

On Wed, Jul 03, 2024 at 06:12:51PM +0900, Nguyễn Gia Phong wrote:
> On 2024-07-03 at 12:00+03:00, Efraim Flashner wrote:
> > On Wed, Jul 03, 2024 at 05:11:43PM +0900, Nguyễn Gia Phong wrote:
> > > On 2024-07-03 at 16:57+09:00, Nguyễn Gia Phong wrote:
> > > I just realized that all pyo3-* 0.20 use the same cargo-inputs
> > > as 0.21.  Should I send v2 for all patches or just 05 to 08?
> >
> > They use the 0.20 version of the inputs, not the 0.21 version of the
> > inputs, so they have different cargo-inputs.
> 
> Sorry, my bad, that only applies for the 3 other pyo3-*
> (I removed their arguments and rust-pyo3 <at> 0.20 built w/o any error).
> 
> Either way, what's the general etiquette for sending revisions
> of a subset of the patch series?

I don't think we have a consensus. On one hand re-sending unchanged
patches is "wasteful", on the other hand it makes it easier to work on a
set of patches (or a revision of patches) in one go.

I think I normally end up with a single updated patch if there's a
change to only one patch, but otherwise I normally send out a whole new
set and then in 0000-v2 I mention what changes there are compared to the
previous version.

-- 
Efraim Flashner   <efraim <at> 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

[signature.asc (application/pgp-signature, inline)]

Message #61 received at 71914 <at> debbugs.gnu.org (full text, mbox):

From: Nguyễn Gia Phong <mcsinyx <at> disroot.org>
To: "Efraim Flashner" <efraim <at> flashner.co.il>
Cc: 71914 <at> debbugs.gnu.org
Subject: Re: [bug#71914] [PATCH 00/10] gnu: Add python-nh3.
Date: Wed, 03 Jul 2024 18:44:43 +0900

[Message part 1 (text/plain, inline)]

On 2024-07-03 at 12:24+03:00, Efraim Flashner wrote:
> On Wed, Jul 03, 2024 at 06:20:03PM +0900, Nguyễn Gia Phong wrote:
> > On 2024-07-03 at 12:07+03:00, Efraim Flashner wrote:
> > > There were a couple of missing bits, which I found
> > > while building all the packages affected:
> > > rust-pyo3-macros-0.21, rust-pyo3-macros-0.20:
> > > Needs python-minimal as a native-input [...]
> > >
> > > I used the following command to build all the packages:
> > > ./pre-inst-env guix build --no-grafts --fallback --max-jobs=3 rust-typed-arena <at> 2 rust-markup5ever <at> 0.12 rust-html5ever <at> 0.27 rust-ammonia <at> 4 rust-pyo3{,-{build-config,ffi,macros-backend,macros}}@0.{20,21} python-nh3
> > 
> > So because Rust is statically compiled,
> > each package needs to be (built and) tested individually?
>
> Yeah, its an unfortunate side effect of using the sources of the
> packages instead of an output. There has been talk in the upstream
> rust community about providing a stable-ish interface
> so that we can reuse build artifacts from one build to another.

Thank you, that's good to know.

On 2024-07-03 at 12:27+03:00, Efraim Flashner wrote:
> On Wed, Jul 03, 2024 at 06:12:51PM +0900, Nguyễn Gia Phong wrote:
> > what's the general etiquette for sending revisions
> > of a subset of the patch series?
>
> I don't think we have a consensus. On one hand re-sending unchanged
> patches is "wasteful", on the other hand it makes it easier to work
> on a set of patches (or a revision of patches) in one go.
>
> I think I normally end up with a single updated patch if there's
> a change to only one patch, but otherwise I normally send out
> a whole new set and then in 0000-v2 I mention what changes
> there are compared to the previous version.

Thanks, guess that'd be best for compatibility with everyone's tooling.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.