ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-13 14:40:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: python-cryptography: Update to 37.0.4.

Browse source 
* gnu/packages/python-crypto.scm (python-cryptography-vectors-next): Update to
37.0.4.
(python-cryptography-next): Likewise.
[arguments]: Add phase to adjust pyo3 requirement.  Don't adjust ouroboros
version.
[inputs]: Change from RUST-OUROBOROS-0.14 and RUST-OUROBOROS-MACRO-0.14 to
RUST-OUROBOROS-0.15 and RUST-OUROBOROS-MACRO-0.15.
[native-inputs]: Add PYTHON-PYTEST-BENCHMARK.
This commit is contained in:
Marius Bakke 2022-08-24 19:22:52 +02:00
parent 1a38540d8d
commit 40c28fa322
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gnu/packages/python-crypto.scm
View file

@ -441,14 +441,14 @@ (define-public python-certifi
(define-public python-cryptography-vectors-next
(package
(name "python-cryptography-vectors")
(version "36.0.1")
(version "37.0.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "cryptography_vectors" version))
(sha256
(base32
"166mvhhmgglqai1sjkkb76mpdkad2yykam11d2w44hs2snpr117w"))))
"1a1yi37ygw0jp72q280cmxd3qn9y9vmcch2bcnjkg2g2202l0qas"))))
(build-system python-build-system)
(home-page "https://github.com/pyca/cryptography")
(synopsis "Test vectors for the cryptography package")
@ -470,14 +470,14 @@ (define-public python-cryptography-vectors
(define-public python-cryptography-next
(package
(name "python-cryptography")
(version "36.0.1")
(version "37.0.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "cryptography" version))
(sha256
(base32
"0f1n8bvngarhsssm60xc59xfzkh7yqpyyyypaph3v5bs7pfc3rak"))))
"10haq7sn8mrdlhcfs791rczknnxm0wpww0lkpjzcqx141ryc3yb3"))))
(build-system python-build-system)
(arguments
(list
@ -489,11 +489,13 @@ (define-public python-cryptography-next
(ice-9 match))
#:phases
#~(modify-phases (@ (guix build python-build-system) %standard-phases)
(add-after 'unpack 'loosen-ouroboros-version
(add-after 'unpack 'adjust-pyo3-requirement
(lambda _
;; The package depends on 0.15.2, which is not on crates.io(!?).
;; Downgrade to 0.15.1...
(substitute* "src/rust/Cargo.toml"
(("ouroboros = \"0\\.13\"")
"ouroboros = \"0.14\""))))
(("pyo3 = \\{ version = \"0\\.15\\.2\"")
"pyo3 = { version = \"0.15.1\""))))
(add-before 'build 'configure-cargo
(lambda* (#:key inputs #:allow-other-keys)
;; Hide irrelevant inputs from cargo-build-system so it does
@ -518,6 +520,9 @@ (define-public python-cryptography-next
(invoke "pytest" "-vv" "tests")))))))
(inputs
(list openssl
;; TODO: Most of these inputs are transitive dependencies of
;; the Rust requirements (see src/rust/cargo.toml). Surely
;; there is a better way than manually listing everything..?
rust-aliasable-0.1
rust-asn1-0.8
rust-asn1-derive-0.8
@ -538,8 +543,8 @@ (define-public python-cryptography-next
rust-num-integer-0.1
rust-num-traits-0.2
rust-once-cell-1
rust-ouroboros-0.14
rust-ouroboros-macro-0.14
rust-ouroboros-0.15
rust-ouroboros-macro-0.15
rust-parking-lot-0.11
rust-parking-lot-core-0.8
rust-paste-0.1
@ -572,6 +577,7 @@ (define-public python-cryptography-next
python-pretend
python-pytz
python-pytest
python-pytest-benchmark
python-pytest-subtests
python-setuptools-rust
rust