Archived
1
0
Fork 0

gnu: python-cryptography: Update to 42.0.5.

* gnu/packages/python-crypto.scm (python-cryptography-vectors): Update
to 42.0.5.
[native-inputs]: Add python-flit-core.
(python-cryptography): Update to 42.0.5.
[arguments]: Adjust 'disable-rust-extension-build phase.
[native-inputs]: Add python-certifi.  Remove python-hypothesis,
python-subtests.
(python-cryptography-rust)[cargo-inputs]: Add rust-cfg-if-1,
rust-self-cell-1.  Replace rust-pem-1 with 3, rust-pyo3-0.18 with 0.20.
Remove rust-ouroboros-0.15.

Change-Id: I1d17ee8ca60eaa65a86b2f6f8054391dda4201c8
This commit is contained in:
Efraim Flashner 2024-03-28 17:42:18 +02:00
parent 906f8f5d81
commit da4c49e45c
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351

View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
;;; Copyright © 2015-2021, 2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015-2021, 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017, 2020, 2022, 2023 Marius Bakke <marius@gnu.org> ;;; Copyright © 2016, 2017, 2020, 2022, 2023 Marius Bakke <marius@gnu.org>
;;; Copyright © 2017 Ben Sturmfels <ben@sturm.com.au> ;;; Copyright © 2017 Ben Sturmfels <ben@sturm.com.au>
@ -523,16 +523,18 @@ def contents() -> str:
(define-public python-cryptography-vectors (define-public python-cryptography-vectors
(package (package
(name "python-cryptography-vectors") (name "python-cryptography-vectors")
(version "41.0.4") (version "42.0.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "cryptography_vectors" version)) (uri (pypi-uri "cryptography_vectors" version))
(sha256 (sha256
(base32 (base32
"17m1azxfc3w0390jp9mkx1v0k3xfv4v1lrgch4hvbbm77s0z42j4")))) "1lcflcvv0xjz5cyvf33iav1vd91qzjvl4w7h4qaxlcnbn3ixap2h"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (list #:tests? #f)) ; No tests included. (arguments (list #:tests? #f)) ; No tests included.
(native-inputs
(list python-flit-core))
(home-page "https://github.com/pyca/cryptography") (home-page "https://github.com/pyca/cryptography")
(synopsis "Test vectors for the cryptography package") (synopsis "Test vectors for the cryptography package")
(description (description
@ -543,14 +545,14 @@ def contents() -> str:
(define-public python-cryptography (define-public python-cryptography
(package (package
(name "python-cryptography") (name "python-cryptography")
(version "41.0.4") (version "42.0.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "cryptography" version)) (uri (pypi-uri "cryptography" version))
(sha256 (sha256
(base32 (base32
"06pm952pr6f31pzwh5fb68zryqyss0hg9cbggxm15z15844w7svz")))) "1qdz0yk5smi0dnywbxmanccwizilmnzgbbihjpmpgm6zjpn7xq3g"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list (list
@ -561,8 +563,7 @@ def contents() -> str:
;; 'python-cryptography-rust', so there's no need ;; 'python-cryptography-rust', so there's no need
;; to build it here. ;; to build it here.
(substitute* "pyproject.toml" (substitute* "pyproject.toml"
((".*setuptools-rust.*") "")) (("\\s+\\\"setuptools-rust.*") ""))))
(delete-file "setup.py")))
(add-before 'check 'symlink-rust-library (add-before 'check 'symlink-rust-library
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(symlink (search-input-file (symlink (search-input-file
@ -572,13 +573,12 @@ def contents() -> str:
"_rust.abi3.so"))))))) "_rust.abi3.so")))))))
(native-inputs (native-inputs
(list python-cryptography-vectors (list python-certifi
python-hypothesis python-cryptography-vectors
python-iso8601 python-iso8601
python-pretend python-pretend
python-pytest ;for subtests python-pytest ;for subtests
python-pytest-benchmark python-pytest-benchmark))
python-pytest-subtests))
(inputs (list python-cryptography-rust)) (inputs (list python-cryptography-rust))
(propagated-inputs (list python-cffi)) (propagated-inputs (list python-cffi))
(home-page "https://github.com/pyca/cryptography") (home-page "https://github.com/pyca/cryptography")
@ -632,14 +632,15 @@ ciphers, message digests and key derivation functions.")
#:cargo-inputs #:cargo-inputs
`(("rust-asn1" ,rust-asn1-0.15) `(("rust-asn1" ,rust-asn1-0.15)
("rust-cc" ,rust-cc-1) ("rust-cc" ,rust-cc-1)
("rust-cfg-if" ,rust-cfg-if-1)
("rust-foreign-types" ,rust-foreign-types-0.3) ("rust-foreign-types" ,rust-foreign-types-0.3)
("rust-foreign-types-shared" ,rust-foreign-types-shared-0.1) ("rust-foreign-types-shared" ,rust-foreign-types-shared-0.1)
("rust-once-cell" ,rust-once-cell-1) ("rust-once-cell" ,rust-once-cell-1)
("rust-openssl" ,rust-openssl-0.10) ("rust-openssl" ,rust-openssl-0.10)
("rust-openssl-sys" ,rust-openssl-sys-0.9) ("rust-openssl-sys" ,rust-openssl-sys-0.9)
("rust-ouroboros" ,rust-ouroboros-0.15) ("rust-pem" ,rust-pem-3)
("rust-pem" ,rust-pem-1) ("rust-pyo3" ,rust-pyo3-0.20)
("rust-pyo3" ,rust-pyo3-0.18)))) ("rust-self-cell" ,rust-self-cell-1))))
(native-inputs (list pkg-config python python-cffi)) (native-inputs (list pkg-config python python-cffi))
;; XXX: Adding rust-openssl-sys-0.9 is needed because #:cargo-inputs ;; XXX: Adding rust-openssl-sys-0.9 is needed because #:cargo-inputs
;; doesn't honor propagated-inputs. ;; doesn't honor propagated-inputs.