antioxidant-packages.scm

@@ -686,6 +686,12 @@ fn _find_target_dir_unused(out_dir: &Path) -> TargetDir {"
 	     ;; Required for old version 0.3.2.
 	     (substitute* (find-files "." "\\.rs$")
 	       (("ObjectIdentifier::new") "ObjectIdentifier::new_unwrap"))))))
+    ("rust-pkcs8"
+     ,#~((add-after 'unpack 'fix-typing
+	   (lambda _
+	     ;; Required for old version 0.7.6.
+	     (substitute* (find-files "." "\\.rs$")
+	       (("ObjectIdentifier::new") "ObjectIdentifier::new_unwrap"))))))
     ("rust-markup5ever" ; for rust-markup5ever@0.9, not needed by newever versions
      ,#~((add-after 'unpack 'new-phf-compatibility
 	   (lambda _
@@ -4318,8 +4324,12 @@ RFC-compliant `EmailAddress` newtype. ")
     ("rust-diesel-derives" -> "rust-diesel")
     ("rust-diesel" -> "sqlite") ; should be handled by the rust-libsqlclient3-sys dependency
     ("rust-colored" -> "rust-rspec")
-    ;; Not a dependency anymore, resolve cycle.
-    ("rust-pkcs8" -> "rust-pkcs1")
+    ;; Not a dependency anymore (except for an old version), resolve cycle.
+    ("rust-pkcs1"
+     #:for-dependent
+     ,(lambda (p)
+	(and (equal? (package-name p) "rust-pkcs8")
+	     (not (equal? (package-version p) "0.7.6")))))
     ;; Break cycle (test or something like that?)
     ("rust-quote" -> "rust-rustversion")
     ("rust-multipart" -> "rust-hyper") ; incompatible with hyper>0.10
@@ -4789,6 +4799,8 @@ RFC-compliant `EmailAddress` newtype. ")
 			     "csv-file" "rolling_window" "round_series" "rank")); required for tests
     ("rust-phf-shared" ,#~'("default" "uncased")) ; uncased required by rust-phf's uncased feature
     ("rust-phf" ,#~'("default" "macros" "uncased")) ; "macros" is required by rust-cssparser@0.28, "uncased" is required by a dependency of "tokei"
+    ("rust-pkcs8" ,#~'("default"
+		       "pkcs1")) ; required by rbw
     ;; Required by 'sniffglue'
     ("rust-pktparse" ,#~'("serde"))
     ("rust-plotters-svg" ,#~'()) ; "debug" feature causes a build failure
@@ -5263,7 +5275,8 @@ RFC-compliant `EmailAddress` newtype. ")
      ,(lambda (p)
 	(not (member (list (package-name p)
 			   (package-version p))
-		     '(("rust-block-modes" "0.8.1")
+		     '(("rbw" "1.4.1")
+		       ("rust-block-modes" "0.8.1")
 		       ("rust-pkcs5" "0.3.2"))))))
     ("rust-des" ,rust-des
      #:for-dependent
@@ -5313,13 +5326,15 @@ RFC-compliant `EmailAddress` newtype. ")
      #:for-dependent
      ,(lambda (p)
 	(not (member (list (package-name p) (package-version p))
-		     '(("rust-pkcs5" "0.3.2"))))))
+		     '(("rbw" "1.4.1")
+		       ("rust-pkcs5" "0.3.2"))))))
     ("rust-sha2" ,(p rust-sha2-0.10)
      #:for-dependent
      ;; Doesn't compile against new rust-sha2.
      ,(lambda (p)
 	(not (member (list (package-name p) (package-version p))
-		     '(("rust-pkcs5" "0.3.2")
+		     '(("rbw" "1.4.1")
+		       ("rust-pkcs5" "0.3.2")
 		       ("rust-pbkdf2" "0.9.0"))))))
     ("rust-string-cache-codegen" ,(p rust-string-cache-codegen-0.5)) ; @0.4 doesn't build against new rust-phf-... crates.
     ("rust-string-cache" ,(p rust-string-cache-0.8)) ; old version doesn't build against new rust-string-cache-codegen
@@ -5368,7 +5383,8 @@ RFC-compliant `EmailAddress` newtype. ")
      ,(lambda (p)
 	;; Incompatible with new rust-cipher.
 	(not (member (list (package-name p) (package-version p))
-		     '(("rust-block-modes" "0.8.1")
+		     '(("rbw" "1.4.1")
+		       ("rust-block-modes" "0.8.1")
 		       ("rust-block-buffer" "0.9.0"))))))
     ("rust-streebog" ,(p rust-streebog-0.10)
      #:for-dependent
@@ -5380,8 +5396,9 @@ RFC-compliant `EmailAddress` newtype. ")
      #:for-dependent
      ,(lambda (p)
 	;; Incompatible with new rust-pbkdf2.
-	(not (equal? (list (package-name p) (package-version p))
-		     '("rust-pkcs5" "0.3.2")))))
+	(not (or (equal? (package-name p) "rbw")
+		 (equal? (list (package-name p) (package-version p))
+			 '("rust-pkcs5" "0.3.2"))))))
     ("rust-hmac" ,(p rust-hmac-0.12)
      #:for-dependent
      ,(lambda (p)