Subject: bug#69624: closed (Re: [bug#69624] [PATCH v2 1/8] gnu: Add rust-proc-macro2-diagnostics-0.9.)

From: [email-masked] (GNU bug Tracking System)
Date: Sun, 07 Apr 2024 12:28:02 +0000

Your bug report

#69624: [PATCH rust-team] gnu: rust-devise: Added v0.3 and building v0.2

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
69624: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=69624
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#69624] [PATCH v2 1/8] gnu: Add rust-proc-macro2-diagnostics-0.9.
From: Efraim Flashner <[email-masked]>
To: Aaron Covrig <[email-masked]>
Cc: [email-masked]
Date: Sun, 7 Apr 2024 15:27:44 +0300
List-Id: <debbugs-submit.debbugs.gnu.org>

Thanks. Patches pushed!

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

Subject: [PATCH rust-team] gnu: rust-devise: Added v0.3 and building v0.2
From: Aaron Covrig <[email-masked]>
To: [email-masked]
Cc: Aaron Covrig <[email-masked]>
Date: Thu, 7 Mar 2024 22:21:50 -0500
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/crates-io.scm (rust-devise): Added v0.3
* gnu/packages/crates-io.scm (rust-devise-codegen): Added v0.3
* gnu/packages/crates-io.scm (rust-devise-core): Added v0.3
* gnu/packages/crates-io.scm (rust-devise): Enabled building v0.2
* gnu/packages/crates-io.scm (rust-devise-codegen): Enabled building v0.2
* gnu/packages/crates-io.scm (rust-devise-core): Enabled building v0.2
* gnu/packages/crates-io.scm (rust-proc-macro2-diagnostics-0.10): Enabled testing
* gnu/packages/crates-io.scm (rust-proc-macro2-diagnostics-0.9): Added for rust-devise
---
 gnu/packages/crates-io.scm | 129 ++++++++++++++++++++++++++++++-------
 1 file changed, 106 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1a08748392..e20adec251 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -18934,10 +18934,26 @@ (define-public rust-devise-0.4
 procedural macros.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-devise-0.2
+(define-public rust-devise-0.3
   (package
     (inherit rust-devise-0.4)
     (name "rust-devise")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "devise" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "15dmibnykic2a1ndi66shyvxmpfysnhf05lg2iv8871g0w5miish"))))
+    (arguments
+     `(#:cargo-inputs (("rust-devise-codegen" ,rust-devise-codegen-0.3)
+                       ("rust-devise-core" ,rust-devise-core-0.3))))))
+
+(define-public rust-devise-0.2
+  (package
+    (inherit rust-devise-0.3)
+    (name "rust-devise")
     (version "0.2.1")
     (source
      (origin
@@ -18947,10 +18963,13 @@ (define-public rust-devise-0.2
        (sha256
         (base32 "09p52f54givb0g9l7clj11z755vldk8758y2lwm5mp3sa156qwfx"))))
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-devise-codegen" ,rust-devise-codegen-0.2)
-        ("rust-devise-core" ,rust-devise-core-0.2))))))
+     `(#:cargo-inputs (("rust-devise-codegen" ,rust-devise-codegen-0.2)
+                       ("rust-devise-core" ,rust-devise-core-0.2))
+       #:phases (modify-phases %standard-phases
+                  ;; Enable using nightly/dev features
+                  (add-after 'unpack 'enable-unstable-features
+                    (lambda _
+                      (setenv "RUSTC_BOOTSTRAP" "1"))))))))
 
 (define-public rust-devise-codegen-0.4
   (package
@@ -18974,10 +18993,25 @@ (define-public rust-devise-codegen-0.4
 procedural macros.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-devise-codegen-0.3
+  (package
+    (inherit rust-devise-codegen-0.4)
+    (name "rust-devise-codegen")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "devise_codegen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1cp7nnfwvjp6wfq11n0ffjjrwfa1wbsb58g1bz3ha6z5lvkp6g0j"))))
+    (arguments
+     `(#:cargo-inputs (("rust-devise-core" ,rust-devise-core-0.3)
+                       ("rust-quote" ,rust-quote-1))))))
 
 (define-public rust-devise-codegen-0.2
   (package
-    (inherit rust-devise-codegen-0.4)
+    (inherit rust-devise-codegen-0.3)
     (name "rust-devise-codegen")
     (version "0.2.1")
     (source
@@ -18988,10 +19022,13 @@ (define-public rust-devise-codegen-0.2
        (sha256
         (base32 "0lxbixni2v6snx2mkgi0kyq5dv8v6c5s57b6wc47q4hqs6884yza"))))
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-devise-core" ,rust-devise-core-0.2)
-        ("rust-quote" ,rust-quote-0.6))))))
+     `(#:cargo-inputs (("rust-devise-core" ,rust-devise-core-0.2)
+                       ("rust-quote" ,rust-quote-0.6))
+       #:phases (modify-phases %standard-phases
+                  ;; Enable using nightly/dev features
+                  (add-after 'unpack 'enable-unstable-features
+                    (lambda _
+                      (setenv "RUSTC_BOOTSTRAP" "1"))))))))
 
 (define-public rust-devise-core-0.4
   (package
@@ -19019,10 +19056,29 @@ (define-public rust-devise-core-0.4
 procedural macros.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-devise-core-0.2
+(define-public rust-devise-core-0.3
   (package
     (inherit rust-devise-core-0.4)
     (name "rust-devise-core")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "devise_core" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1l00qiih4z14ai0c3s16nlvw0kv4p07ygi6a0ms0knc78xpz87l4"))))
+    (arguments
+     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-proc-macro2-diagnostics" ,rust-proc-macro2-diagnostics-0.9)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1))))))
+
+(define-public rust-devise-core-0.2
+  (package
+    (inherit rust-devise-core-0.3)
+    (name "rust-devise-core")
     (version "0.2.1")
     (source
      (origin
@@ -19032,12 +19088,15 @@ (define-public rust-devise-core-0.2
        (sha256
         (base32 "0wr3jdzzibpafz73hcca83wnzdgjinvm7axmxnyfkbasbnfkw1fi"))))
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1)
-        ("rust-proc-macro2" ,rust-proc-macro2-0.4)
-        ("rust-quote" ,rust-quote-0.6)
-        ("rust-syn" ,rust-syn-0.15))))))
+     `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-0.4)
+                       ("rust-quote" ,rust-quote-0.6)
+                       ("rust-syn" ,rust-syn-0.15))
+       #:phases (modify-phases %standard-phases
+                  ;; Enable using nightly/dev features
+                  (add-after 'unpack 'enable-unstable-features
+                    (lambda _
+                      (setenv "RUSTC_BOOTSTRAP" "1"))))))))
 
 (define-public rust-dhcproto-0.9
   (package
@@ -49710,17 +49769,41 @@ (define-public rust-proc-macro2-diagnostics-0.10
         (base32 "1j48ipc80pykvhx6yhndfa774s58ax1h6sm6mlhf09ls76f6l1mg"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f  ; cannot determine resolution for the macro `diagnostic_item`
+     `(#:cargo-test-flags '("--" "--skip=main")
        #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
                        ("rust-quote" ,rust-quote-1)
                        ("rust-syn" ,rust-syn-2)
-                       ("rust-version-check" ,rust-version-check-0.9)
-                       ("rust-yansi" ,rust-yansi-1))
-       #:cargo-development-inputs (("rust-trybuild" ,rust-trybuild-1))))
+                       ("rust-yansi" ,rust-yansi-1)
+                       ("rust-version-check" ,rust-version-check-0.9))
+       #:cargo-development-inputs (("rust-trybuild" ,rust-trybuild-1)
+                                   ("rust-version-check" ,rust-version-check-0.9))))
     (home-page "https://github.com/SergioBenitez/proc-macro2-diagnostics")
     (synopsis "Diagnostics for proc-macro2")
-    (description "Diagnostics for proc-macro2.")
-    (license (list license:expat license:asl2.0))))
+    (description "Diagnostics for stable and nightly proc-macros!")
+    (license (list license:asl2.0 license:expat))))
+
+(define-public rust-proc-macro2-diagnostics-0.9
+  (package
+    (inherit rust-proc-macro2-diagnostics-0.10)
+    (name "rust-proc-macro2-diagnostics")
+    (version "0.9.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "proc-macro2-diagnostics" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1nmazlb1dkznjds7qwms7yxhi33ajc3isji2lsgx8r3lsqk9gwjb"))))
+    (arguments
+     `(#:cargo-test-flags '("--" "--skip=main")
+       #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1)
+                       ("rust-yansi" ,rust-yansi-0.5)
+                       ;; Add missing dependency
+                       ("rust-version-check" ,rust-version-check-0.9))
+       #:cargo-development-inputs (("rust-trybuild" ,rust-trybuild-1)
+                                   ("rust-version-check" ,rust-version-check-0.9))))))
 
 (define-public rust-proc-mounts-0.3
   (package

base-commit: d29e5a83e887cd2f4f459a12cbbfc40c77e55ce2
-- 
2.41.0