diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2024-01-08 09:07:50 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2024-02-20 13:57:34 +0200 |
| commit | d172b50eee379ad9c971174bec61734638c8fcee (patch) | |
| tree | b5d87fac50c1a6dfef478730a5d4b90105b1be9b | |
| parent | 3dd877869482422988b1157bddab15a3ff575f7e (diff) | |
gnu: rust-webpki-0.18: Don't skip build.
* gnu/packages/crates-web.scm (rust-webpki-0.18)[source]: Add snippet to
fix doctests.
[arguments]: Don't skip the build. Remove phase generating curve25519
tables.
Change-Id: If7265d52cb0a427f8066d017ef3479782cef3c4f
| -rw-r--r-- | gnu/packages/crates-web.scm | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm index e25abcb085..408b04abf9 100644 --- a/gnu/packages/crates-web.scm +++ b/gnu/packages/crates-web.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2020 John Soo <jsoo1@asu.edu> -;;; Copyright © 2020, 2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2020, 2023, 2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2020-2022 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org> ;;; Copyright © 2023 Steve George <steve@futurile.net> @@ -29,6 +29,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (gnu packages) #:use-module (gnu packages crates-io) #:use-module (gnu packages crates-gtk) @@ -3596,24 +3597,20 @@ Verification.") (uri (crate-uri "webpki" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0zx1v8afa4ig97dyqfrnlj5i7pib6dnfw88qn2iiqhfq2rrrdmqp")))) + (base32 "0zx1v8afa4ig97dyqfrnlj5i7pib6dnfw88qn2iiqhfq2rrrdmqp")) + (snippet + #~(begin (use-modules (guix build utils)) + ;; Fix doctest errors + ;; `...` range patterns are deprecated + (substitute* "src/name.rs" + (("'\\.\\.\\.") "'..=")))))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t ; TODO: Fix building rust-ring-0.13 - #:cargo-inputs + `(#:cargo-inputs (("rust-ring" ,rust-ring-0.13) ("rust-untrusted" ,rust-untrusted-0.6)) #:cargo-development-inputs - (("rust-base64" ,rust-base64-0.9)) - #:phases - (modify-phases %standard-phases - (add-before 'build 'build-curve25519-tables - (lambda* (#:key vendor-dir #:allow-other-keys) - (with-directory-excursion - (dirname (car (find-files vendor-dir "make_curve25519_tables.py"))) - (with-output-to-file "curve25519_tables.h" - (lambda _ - (invoke "python" "make_curve25519_tables.py"))))))))))) + (("rust-base64" ,rust-base64-0.9)))))) (define-public rust-webpki-roots-0.25 (package |