4 Коміти 52de548dc0 ... 1d5f997876

Автор SHA1 Опис Дата
  Maxime Devos 1d5f997876 libsequoia: Build against compatible rust-sha2. 2 роки тому
  Maxime Devos 5de0bf8733 libsequoia: Add various missing inputs. 2 роки тому
  Maxime Devos e38865d8c3 libsequoia: Replace unantioxidated version. 2 роки тому
  Maxime Devos 2c61a122a5 libsequoia: Avoid rust-subplot-build dependency. 2 роки тому
1 змінених файлів з 46 додано та 1 видалено
  1. 46 1
      antioxidant-packages.scm

+ 46 - 1
antioxidant-packages.scm

@@ -170,6 +170,12 @@
              (let* ((out   (assoc-ref outputs "out"))
                     (man   (string-append out "/share/man/man1")))
                (install-file "Documentation/git-absorb.1" man))))))
+    ("libsequoia"
+     ;; Not packaged, and test-only.
+     ,#~((add-after 'unpack 'avoid-subplot-build
+	   (lambda _
+	     (substitute* "sq/build.rs"
+	       (("^(.*)[Ss]ubplot(.*)$") ""))))))
     ("python-blake3"
      ,#~((add-after 'build 'reduce-closure
 	   (lambda* (#:key outputs #:allow-other-keys)
@@ -5346,6 +5352,7 @@ RFC-compliant `EmailAddress` newtype. ")
      ,(lambda (p)
 	(not (member (list (package-name p) (package-version p))
 		     '(("rbw" "1.4.1")
+		       ("libsequoia" "0.22.0")
 		       ("rust-curve25519-dalek" "3.2.0")
 		       ("rust-ed25519-dalek" "1.0.1")
 		       ("rust-pkcs5" "0.3.2")
@@ -5401,7 +5408,8 @@ RFC-compliant `EmailAddress` newtype. ")
 	(not (member (list (package-name p) (package-version p))
 		     '(("rbw" "1.4.1")
 		       ("rust-block-modes" "0.8.1")
-		       ("rust-block-buffer" "0.9.0"))))))
+		       ("rust-block-buffer" "0.9.0")
+		       ("rust-block-buffer" "0.7.3"))))))
     ("rust-streebog" ,(p rust-streebog-0.10)
      #:for-dependent
      ,(lambda (p)
@@ -5431,6 +5439,7 @@ RFC-compliant `EmailAddress` newtype. ")
 	(not (member (list (package-name p) (package-version p))
 		     '(("rust-sha-1" "0.9.8")
 		       ("rust-sha2" "0.9.5")
+		       ("rust-sha2" "0.8.2")
 		       ("rust-streebog" "0.9.2"))))))
     ("rust-enum-as-inner" ,rust-enum-as-inner)
     ("rust-md-5" ,rust-md-5)
@@ -5454,6 +5463,7 @@ RFC-compliant `EmailAddress` newtype. ")
 		       ("rust-sha-1" "0.9.8")
 		       ("rust-sha1" "0.10.1")
 		       ("rust-sha2" "0.9.5")
+		       ("rust-sha2" "0.8.2")
 		       ("rust-streebog" "0.9.2"))))))
     ("rust-crypto-common" ,rust-crypto-common)
     ("rust-rustyline" ,(p rust-rustyline-9))
@@ -5678,6 +5688,35 @@ RFC-compliant `EmailAddress` newtype. ")
       ("automake" ,(@ (gnu packages autotools) automake)) ; TODO: really a native-input
       ("libtool" ,(@ (gnu packages autotools) libtool)) ; TODO: really a native-input
       ("rust-system-deps" ,rust-system-deps)))
+    ;; TODO: rust-sequoia-... are workspace members, remove.
+    ("libsequoia" ; add required inputs for members (some of them are optional though)
+     (("rust-base64" ,(p rust-base64-0.13))
+      ("rust-bzip2" ,(p rust-bzip2-0.4))
+      ("rust-chrono" ,(p rust-chrono-0.4))
+      ("rust-clap" ,(p rust-clap-2))
+      ("rust-dyn-clone" ,(p rust-dyn-clone-1))
+      ("rust-flate2" ,(p rust-flate2-1))
+      ("rust-futures-util" ,(p rust-futures-util-0.3))
+      ("rust-http" ,(p rust-http-0.2))
+      ("rust-hyper" ,(p rust-hyper-0.14))
+      ("rust-hyper-tls" ,(p rust-hyper-tls-0.5))
+      ("rust-idna" ,(p rust-idna-0.2))
+      ("rust-itertools" ,(p rust-itertools-0.10))
+      ("rust-lalrop" ,(p rust-lalrpop-0.19))
+      ("rust-lalrop" ,(p rust-lalrpop-util-0.19))
+      ("rust-nettle" ,(p rust-nettle-7))
+      ("rust-percent-encoding" ,(p rust-percent-encoding-2))
+      ("rust-regex" ,(p rust-regex-1))
+      ("rust-regex-syntax" ,(p rust-regex-syntax-0.6))
+      ("rust-rpassword" ,(p rust-rpassword-5))
+      ("rust-sha1collisiondetection" ,(p rust-sha1collisiondetection-0.2))
+      ("rust-syn" ,(p rust-syn-1))
+      ("rust-tempfile" ,(p rust-tempfile-3))
+      ("rust-term-size" ,(p rust-term-size-1))
+      ("rust-thiserror" ,(p rust-thiserror-1))
+      ("rust-url" ,(p rust-url-2))
+      ("rust-xxhash-rust" ,(p rust-xxhash-rust-0.8))
+      ("rust-zbase32" ,(p rust-zbase32-0.1))))
     ("nushell"
      (("bat" ,(@ (gnu packages rust-apps) bat))
       ("rust-atty" ,(p rust-atty-0.2))
@@ -7859,6 +7898,12 @@ RFC-compliant `EmailAddress` newtype. ")
 (let ((new (vitaminate/auto (@ (gnu packages gnome) librsvg))))
   (set! (@ (gnu packages gnome) librsvg) new))
 
+;; Likewise.
+(let ((new (package
+	    (inherit (vitaminate/auto (@ (gnu packages sequoia) libsequoia)))
+	    (build-system antioxidant-workspace-build-system))))
+  (set! (@ (gnu packages sequoia) libsequoia) new))
+
 ;; todo: cycle between rust-demo-hack and rust-demo-hack-impl
 
 ;; Make some functioning packages available to "guix install ANTIOXIDATED-FOO"