gnu: python-cryptography: Remove 3.3.1.
* gnu/packages/python-crypto.scm (python-cryptography-vectors-next, python-cryptography-next): Merge with ... (python-cryptography-vectors, python-cryptography): ... these variables. (python2-cryptography-vectors, python2-cryptography): Stick with version 3.3.1. Remove labels while at it.master
Marius Bakke
parent
55d5368b4f
commit
6ec96228ba
|
|
@ -481,14 +481,14 @@ is used by the Requests library to verify HTTPS requests.")
|
|||
(define-public python-cryptography-vectors
|
||||
(package
|
||||
(name "python-cryptography-vectors")
|
||||
(version "3.3.1")
|
||||
(version "36.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "cryptography_vectors" version))
|
||||
(sha256
|
||||
(base32
|
||||
"192wix3sr678x21brav5hgc6j93l7ab1kh69p2scr3fsblq9qy03"))))
|
||||
"166mvhhmgglqai1sjkkb76mpdkad2yykam11d2w44hs2snpr117w"))))
|
||||
(build-system python-build-system)
|
||||
(home-page "https://github.com/pyca/cryptography")
|
||||
(synopsis "Test vectors for the cryptography package")
|
||||
|
|
@ -497,75 +497,9 @@ is used by the Requests library to verify HTTPS requests.")
|
|||
;; Distributed under either BSD-3 or ASL2.0
|
||||
(license (list license:bsd-3 license:asl2.0))))
|
||||
|
||||
(define-public python2-cryptography-vectors
|
||||
(package-with-python2 python-cryptography-vectors))
|
||||
|
||||
(define-public python-cryptography
|
||||
(package
|
||||
(name "python-cryptography")
|
||||
(version "3.3.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "cryptography" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1ribd1vxq9wwz564mg60dzcy699gng54admihjjkgs9dx95pw5vy"))))
|
||||
(build-system python-build-system)
|
||||
(inputs
|
||||
(list openssl))
|
||||
(propagated-inputs
|
||||
(list python-asn1crypto python-cffi python-six python-idna
|
||||
python-iso8601))
|
||||
(native-inputs
|
||||
(list python-cryptography-vectors python-hypothesis python-pretend
|
||||
python-pytz python-pytest))
|
||||
(home-page "https://github.com/pyca/cryptography")
|
||||
(synopsis "Cryptographic recipes and primitives for Python")
|
||||
(description
|
||||
"cryptography is a package which provides cryptographic recipes and
|
||||
primitives to Python developers. It aims to be the “cryptographic standard
|
||||
library” for Python. The package includes both high level recipes, and low
|
||||
level interfaces to common cryptographic algorithms such as symmetric ciphers,
|
||||
message digests and key derivation functions.")
|
||||
;; Distributed under either BSD-3 or ASL2.0
|
||||
(license (list license:bsd-3 license:asl2.0))
|
||||
(properties `((python2-variant . ,(delay python2-cryptography))))))
|
||||
|
||||
(define-public python2-cryptography
|
||||
(let ((crypto (package-with-python2
|
||||
(strip-python2-variant python-cryptography))))
|
||||
(package/inherit crypto
|
||||
(arguments
|
||||
`(#:python ,python-2
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; The sanity-check attempts attempts to import the non-existent
|
||||
;; modules "_openssl" and "_padding".
|
||||
(delete 'sanity-check))))
|
||||
(propagated-inputs
|
||||
`(("python2-ipaddress" ,python2-ipaddress)
|
||||
("python2-backport-ssl-match-hostname"
|
||||
,python2-backport-ssl-match-hostname)
|
||||
("python2-enum34" ,python2-enum34)
|
||||
,@(package-propagated-inputs crypto))))))
|
||||
|
||||
;; TODO: Make this the default in the next staging cycle.
|
||||
(define-public python-cryptography-vectors-next
|
||||
(package
|
||||
(inherit python-cryptography-vectors)
|
||||
(version "36.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "cryptography_vectors" version))
|
||||
(sha256
|
||||
(base32
|
||||
"166mvhhmgglqai1sjkkb76mpdkad2yykam11d2w44hs2snpr117w"))))))
|
||||
|
||||
(define-public python-cryptography-next
|
||||
(package
|
||||
(inherit python-cryptography)
|
||||
(version "36.0.1")
|
||||
(source
|
||||
(origin
|
||||
|
|
@ -663,15 +597,68 @@ message digests and key derivation functions.")
|
|||
(list python-asn1crypto python-cffi python-six python-idna
|
||||
python-iso8601))
|
||||
(native-inputs
|
||||
(list python-cryptography-vectors-next
|
||||
(list python-cryptography-vectors
|
||||
python-hypothesis
|
||||
python-pretend
|
||||
python-pytz
|
||||
python-pytest
|
||||
python-pytest-subtests
|
||||
python-setuptools-rust
|
||||
rust `(,rust "cargo")))
|
||||
(properties '())))
|
||||
rust
|
||||
`(,rust "cargo")))
|
||||
(home-page "https://github.com/pyca/cryptography")
|
||||
(synopsis "Cryptographic recipes and primitives for Python")
|
||||
(description
|
||||
"cryptography is a package which provides cryptographic recipes and
|
||||
primitives to Python developers. It aims to be the “cryptographic standard
|
||||
library” for Python. The package includes both high level recipes, and low
|
||||
level interfaces to common cryptographic algorithms such as symmetric ciphers,
|
||||
message digests and key derivation functions.")
|
||||
;; Distributed under either BSD-3 or ASL2.0
|
||||
(license (list license:bsd-3 license:asl2.0))
|
||||
(properties `((python2-variant . ,(delay python2-cryptography))))))
|
||||
|
||||
(define-public python2-cryptography-vectors
|
||||
(package
|
||||
(inherit python-cryptography-vectors)
|
||||
(version "3.3.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "cryptography_vectors" version))
|
||||
(sha256
|
||||
(base32
|
||||
"192wix3sr678x21brav5hgc6j93l7ab1kh69p2scr3fsblq9qy03"))))
|
||||
(arguments
|
||||
(list #:python python-2))))
|
||||
|
||||
(define-public python2-cryptography
|
||||
(let ((crypto (package-with-python2
|
||||
(strip-python2-variant python-cryptography))))
|
||||
(package
|
||||
(inherit crypto)
|
||||
(version "3.3.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "cryptography" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1ribd1vxq9wwz564mg60dzcy699gng54admihjjkgs9dx95pw5vy"))))
|
||||
(arguments
|
||||
`(#:python ,python-2
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; The sanity-check attempts attempts to import the non-existent
|
||||
;; modules "_openssl" and "_padding".
|
||||
(delete 'sanity-check))))
|
||||
(native-inputs
|
||||
(list python2-cryptography-vectors python2-hypothesis python2-pretend
|
||||
python2-pytz python2-pytest))
|
||||
(inputs (list openssl))
|
||||
(propagated-inputs
|
||||
(modify-inputs (package-propagated-inputs crypto)
|
||||
(prepend python2-ipaddress
|
||||
python2-backport-ssl-match-hostname
|
||||
python2-enum34))))))
|
||||
|
||||
(define-public python-pyopenssl
|
||||
(package
|
||||
|
|
|
|||
Reference in New Issue