diff mbox series

[bug#75677,rust-team,v2,10/81] gnu: rust-derive-more-1: New variable.

Message ID 20250308033446.2101481-11-aaron.covrig.us@ieee.org
State New
Headers
Series Assorted package updates for rust-team |

Commit Message

Aaron Covrig March 8, 2025, 3:33 a.m. UTC 
  * gnu/packages/crates-io.scm (rust-derive-more-1): New variable.
---
 gnu/packages/crates-io.scm | 55 +++++++++++++++++++++++++++++++-------
 1 file changed, 45 insertions(+), 10 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3d71fe7337..6b318e7fe5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -20265,10 +20265,10 @@  (define-public rust-derive-error-chain-0.10
 error-chain.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-derive-more-0.99
+(define-public rust-derive-more-1
   (package
     (name "rust-derive-more")
-    (version "0.99.18")
+    (version "1.0.0")
     (source
      (origin
        (method url-fetch)
@@ -20276,16 +20276,29 @@  (define-public rust-derive-more-0.99
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1kmz7bsjn9jh04nplqdr6bjyi90qkqjlxb8lm5zzvnp46y0qfcsz"))))
+         "01cd8pskdjg10dvfchi6b8a9pa1ja1ic0kbn45dl8jdyrfwrk6sa"))
+       (modules '((guix build utils)))
+       ;; Remove broken test files (they are supposed to fail)
+       (snippet '(begin
+                   (delete-file-recursively "tests/compile_fail/as_mut")
+                   (delete-file-recursively "tests/compile_fail/as_ref")
+                   (delete-file-recursively "tests/compile_fail/debug")
+                   (delete-file-recursively "tests/compile_fail/display")
+                   (delete-file-recursively "tests/compile_fail/from")
+                   (delete-file-recursively "tests/compile_fail/into")
+                   (delete-file-recursively "tests/compile_fail/is_variant")
+                   (delete-file-recursively "tests/compile_fail/try_from")))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-convert-case" ,rust-convert-case-0.4)
-        ("rust-peg" ,rust-peg-0.5)
-        ("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-rustc-version" ,rust-rustc-version-0.4)
-        ("rust-syn" ,rust-syn-2))))
+     `(#:cargo-build-flags '("--all-features")
+       #:cargo-test-flags '("--all-features")
+       #:cargo-inputs
+       (("rust-derive-more-impl" ,rust-derive-more-impl-1))
+       #:cargo-development-inputs
+       (("rust-rustc-version" ,rust-rustc-version-0.4)
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-static-assertions" ,rust-static-assertions-1)
+        ("rust-trybuild" ,rust-trybuild-1))))
     (home-page "https://github.com/JelteF/derive_more")
     (synopsis "Adds derive macros for more traits")
     (description
@@ -20301,6 +20314,28 @@  (define-public rust-derive-more-0.99
 traits for both structs and enums.")
     (license license:expat)))
 
+(define-public rust-derive-more-0.99
+  (package
+    (inherit rust-derive-more-1)
+    (name "rust-derive-more")
+    (version "0.99.18")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "derive_more" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1kmz7bsjn9jh04nplqdr6bjyi90qkqjlxb8lm5zzvnp46y0qfcsz"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-convert-case" ,rust-convert-case-0.4)
+        ("rust-peg" ,rust-peg-0.5)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-rustc-version" ,rust-rustc-version-0.4)
+        ("rust-syn" ,rust-syn-2))))))
+
 (define-public rust-derive-more-0.15
   (package
     (inherit rust-derive-more-0.99)