antioxidant-packages.scm

@@ -5250,7 +5250,12 @@ RFC-compliant `EmailAddress` newtype. ")
     ("rust-gimli" ,(p rust-gimli-0.26))
     ;; rust-pkcs5@0.5.0-pre.1 requires new_unwrap
     ("rust-const-oid" ,rust-const-oid)
-    ("rust-aes" ,rust-aes)
+    ("rust-aes" ,rust-aes
+     #:for-dependent
+     ,(lambda (p)
+	(not (equal? (list (package-name p)
+			   (package-version p))
+		     '("rust-block-modes" "0.8.1")))))
     ("rust-des" ,rust-des)
     ("rust-pkcs8" ,rust-pkcs8)
     ("rust-pkcs5" ,rust-pkcs5)
@@ -5279,14 +5284,31 @@ RFC-compliant `EmailAddress` newtype. ")
     ("rust-phf-shared" ,(p rust-phf-shared-0.10)) ; avoid multiple conflicting versions
     ("rust-phf-generator" ,(p rust-phf-generator-0.10)) ; avoid multiple conflicting versions
     ("rust-phf-codegen" ,(p rust-phf-codegen-0.10)) ; avoid build failure in dependency
-    ("rust-block-modes" ,rust-block-modes)
+    ("rust-block-modes" ,rust-block-modes
+     #:for-dependent
+     ,(lambda (p)
+	(not (string=? (package-name p) "rbw"))))
     ("rust-ctr" ,rust-ctr)
     ("rust-salsa20" ,rust-salsa20)
-    ("rust-cipher" ,rust-cipher)
-    ("rust-block-padding" ,rust-block-padding)
+    ("rust-cipher" ,rust-cipher
+     #:for-dependent
+     ,(lambda (p)
+	;; Incompatible with new rust-cipher.
+	(not (member (list (package-name p) (package-version p))
+		     '(("rust-block-modes" "0.8.1")
+		       ("rust-aes" "0.7.5"))))))
+    ("rust-block-padding" ,rust-block-padding
+     #:for-dependent
+     ,(lambda (p)
+	;; Incompatible with new rust-cipher.
+	(not (equal? (list (package-name p) (package-version p))
+		     '("rust-block-modes" "0.8.1")))))
     ("rust-streebog" ,(p rust-streebog-0.10))
     ("rust-pbkdf2" ,rust-pbkdf2)
-    ("rust-hmac" ,(p rust-hmac-0.12))
+    ("rust-hmac" ,(p rust-hmac-0.12)
+     #:for-dependent
+     ,(lambda (p)
+	(not (equal? (package-name p) "rbw"))))
     ; ("rust-boxxy" ,rust-boxxy) ; TODO: currently useless because in %removed-dependencies, revisit when tests are supported
     ("rust-block-buffer" ,rust-block-buffer)
     ("rust-enum-as-inner" ,rust-enum-as-inner)
@@ -5296,7 +5318,12 @@ RFC-compliant `EmailAddress` newtype. ")
     ("rust-object" ,(p rust-object-0.29))
     ("rust-addr2line" ,(p rust-addr2line-0.17))
     ("rust-generic-array" ,(p rust-generic-array-0.14))
-    ("rust-digest" ,rust-digest)
+    ("rust-digest" ,rust-digest
+     #:for-dependent
+     ;; Incompatible with new rust-digest.
+     ,(lambda (p)
+	(not (equal? (list (package-name p) (package-version p))
+		     '("rust-hmac" "0.11.0")))))
     ("rust-crypto-common" ,rust-crypto-common)
     ("rust-rustyline" ,(p rust-rustyline-9))
     ("rust-base64" ,(p rust-base64-0.13))
@@ -7106,7 +7133,12 @@ RFC-compliant `EmailAddress` newtype. ")
 	 (define i
  	   (append-filter-map
 	    fix-input
-	    (append (match (assoc-ref %extra-inputs (package-name pack))
+	    (append (if (equal? (list (package-name pack)
+				      (package-version pack))
+				'("rust-block-modes" "0.8.1"))
+			(list (list "rust-aes" (p rust-aes-0.7)))
+			'())
+	            (match (assoc-ref %extra-inputs (package-name pack))
 		      ((association-list) association-list)
 		      (#false '())) ; no extra inputs
 		    cargo-inputs
@@ -7458,7 +7490,11 @@ RFC-compliant `EmailAddress` newtype. ")
 			     ((_ value) value)
 			     (#false #~#false)) ; use Cargo.toml
 			   #:tests?
-			   (not (assoc-ref %disable-tests (package-name pack)))
+			   (and (not (assoc-ref %disable-tests (package-name pack)))
+				;; Tests don't compile against new dependencies.
+				(not (equal? (list (package-name pack)
+						   (package-version pack))
+					     '("rust-hmac" "0.11.0"))))
 			   #:skipped-integration-tests
 			   (match (package-name pack)
 			     ("bat" #~'("snapshot_tests")) ; TODO: can't find some file (maybe sample.rs?)