From 8ec7e1de69a8683a0d1611cac1059cae4592ba03 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:37:14 -0400 Subject: gnu: Remove python2-service-identity. * gnu/packages/python-crypto.scm (python2-service-identity): Delete variable. --- gnu/packages/python-crypto.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 0bdcc693ac..201d5d8a53 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1320,9 +1320,6 @@ service_identity implements RFC 6125 fully and plans to add other relevant RFCs too.") (license license:expat))) -(define-public python2-service-identity - (package-with-python2 python-service-identity)) - (define-public python-hkdf (package (name "python-hkdf") -- cgit v1.2.3 From a7b67fdb0f83411e72d86d61a6b54dcfdf189b92 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:37:23 -0400 Subject: gnu: Remove python2-ed25519. * gnu/packages/python-crypto.scm (python2-ed25519): Delete variable. --- gnu/packages/python-crypto.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 201d5d8a53..208a749c09 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -714,9 +714,6 @@ library.") (description "Ed25519 public-key signatures") (license license:expat))) -(define-public python2-ed25519 - (package-with-python2 python-ed25519)) - (define-public python-axolotl-curve25519 (package (name "python-axolotl-curve25519") -- cgit v1.2.3 From d76568317653a2ad05818d6095735e10153b0880 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:37:26 -0400 Subject: gnu: Remove python2-pycrypto. * gnu/packages/python-crypto.scm (python2-pycrypto): Delete variable. --- gnu/packages/python-crypto.scm | 9 --------- 1 file changed, 9 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 208a749c09..4d148fd3d7 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -299,15 +299,6 @@ and RIPEMD160), and various encryption algorithms (AES, DES, RSA, ElGamal, etc.). The package is structured to make adding new modules easy.") (license license:public-domain))) -(define-public python2-pycrypto - (let ((pycrypto (package-with-python2 python-pycrypto))) - (package/inherit pycrypto - (inputs - `(("python" ,python-2) - ,@(alist-delete - "python" - (package-inputs pycrypto))))))) - (define-public python-kerberos (package (name "python-kerberos") -- cgit v1.2.3 From dad4d46545919b1815a511d8c071e78029227aa0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:37:35 -0400 Subject: gnu: Remove python2-axolotl-curve25519. * gnu/packages/python-crypto.scm (python2-axolotl-curve25519): Delete variable. --- gnu/packages/python-crypto.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 4d148fd3d7..0a2686b9c9 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -726,9 +726,6 @@ python-axolotl.") (license (list license:gpl3 ; Most files license:bsd-3)))) ; curve/curve25519-donna.c -(define-public python2-axolotl-curve25519 - (package-with-python2 python-axolotl-curve25519)) - (define-public python-axolotl (package (name "python-axolotl") -- cgit v1.2.3 From d0d5f8fc09335898a840da3d47acbeb7c0da921c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:37:38 -0400 Subject: gnu: Remove python2-pyaes. * gnu/packages/python-crypto.scm (python2-pyaes): Delete variable. --- gnu/packages/python-crypto.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 0a2686b9c9..9867f6842b 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -799,9 +799,6 @@ AES block cipher algorithm and the common modes of operation (CBC, CFB, CTR, ECB and OFB).") (license license:expat))) -(define-public python2-pyaes - (package-with-python2 python-pyaes)) - (define-public python-asn1crypto (package (name "python-asn1crypto") -- cgit v1.2.3 From 522b18630dc4d25098d75eca9b5e2163a9541f40 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:37:45 -0400 Subject: gnu: Remove python2-slowaes. * gnu/packages/python-crypto.scm (python2-slowaes): Delete variable. --- gnu/packages/python-crypto.scm | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 9867f6842b..0028b65f8b 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -759,26 +759,6 @@ asynchronous messaging environments.") (define-public python2-axolotl (package-with-python2 python-axolotl)) -;; SlowAES isn't compatible with Python 3. -(define-public python2-slowaes - (package - (name "python2-slowaes") - (version "0.1a1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "slowaes" version)) - (sha256 - (base32 - "02dzajm83a7lqgxf6r3hgj64wfmcxz8gs4nvgxpvj5n19kjqlrc3")))) - (build-system python-build-system) - (arguments `(#:python ,python-2)) - (home-page "http://code.google.com/p/slowaes/") - (synopsis "Implementation of AES in Python") - (description "This package contains an implementation of AES in Python. -This implementation is slow (hence the project name) but still useful when -faster ones are not available.") - (license license:asl2.0))) (define-public python-pyaes (package -- cgit v1.2.3 From 08d11c8aee556e1bac6c32982aabc8711c11c3ca Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:37:48 -0400 Subject: gnu: Remove python2-josepy. * gnu/packages/python-crypto.scm (python2-josepy): Delete variable. --- gnu/packages/python-crypto.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 0028b65f8b..80e37aa13c 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -938,9 +938,6 @@ Python.") protocol (Javascript Object Signing and Encryption).") (license license:asl2.0))) -(define-public python2-josepy - (package-with-python2 python-josepy)) - (define pycryptodome-unbundle-tomcrypt-snippet #~(begin ;; Unbundle libtomcrypt. -- cgit v1.2.3 From 56cfb65eb5acc3a87236344a24baaaad130e390d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:37:51 -0400 Subject: gnu: Remove python2-m2crypto. * gnu/packages/python-crypto.scm (python2-m2crypto): Delete variable. --- gnu/packages/python-crypto.scm | 8 -------- 1 file changed, 8 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 80e37aa13c..3aa7327b0b 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1087,16 +1087,8 @@ extensions to Python's httplib, urllib, and xmlrpclib; unforgeable HMAC'ing AuthCookies for web session management; FTP/TLS client and server; S/MIME; M2Crypto can also be used to provide TLS for Twisted. Smartcards supported through the Engine interface.") - (properties `((python2-variant . ,(delay python2-m2crypto)))) (license license:expat))) -(define-public python2-m2crypto - (let ((m2crypto (package-with-python2 - (strip-python2-variant python-m2crypto)))) - (package/inherit m2crypto - (propagated-inputs - `(("python2-typing" ,python2-typing)))))) - (define-public python-pykeepass (package (name "python-pykeepass") -- cgit v1.2.3 From 385fa1a3ed155591b07978c577ed55547319ba37 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:38:12 -0400 Subject: gnu: Remove python2-pycryptodome. * gnu/packages/python-crypto.scm (python2-pycryptodome): Delete variable. --- gnu/packages/python-crypto.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 3aa7327b0b..502a809d29 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1010,9 +1010,6 @@ PyCryptodome variants, the other being python-pycryptodomex.") (license (list license:bsd-2 license:public-domain)))) ; code inherited from PyCrypto -(define-public python2-pycryptodome - (package-with-python2 python-pycryptodome)) - (define-public python-pycryptodomex (package (inherit python-pycryptodome) (name "python-pycryptodomex") -- cgit v1.2.3 From 446e3b0ac0e64a1ee302e2767f61cccf7241d720 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:20:00 -0400 Subject: gnu: Remove python2-axolotl. * gnu/packages/python-crypto.scm (python2-axolotl): Delete variable. --- gnu/packages/python-crypto.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 502a809d29..089dfdec38 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -756,9 +756,6 @@ is a ratcheting forward secrecy protocol that works in synchronous and asynchronous messaging environments.") (license license:gpl3))) -(define-public python2-axolotl - (package-with-python2 python-axolotl)) - (define-public python-pyaes (package -- cgit v1.2.3 From 7e27e99ea8a7b402591d741c430fdfc342eddef6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:20:16 -0400 Subject: gnu: Remove python2-ecpy. * gnu/packages/python-crypto.scm (python2-ecpy): Delete variable. --- gnu/packages/python-crypto.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 089dfdec38..1eea11da98 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -900,9 +900,6 @@ of improving usability, security and speed.") Python.") (license license:asl2.0))) -(define-public python2-ecpy - (package-with-python2 python-ecpy)) - (define-public python-josepy (package (name "python-josepy") -- cgit v1.2.3 From 000663e05fad86ef4c94c7434d5e438ea3e05c0d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:20:20 -0400 Subject: gnu: Remove python2-ecdsa. * gnu/packages/python-crypto.scm (python2-ecdsa): Delete variable. --- gnu/packages/python-crypto.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 1eea11da98..a270d0f78f 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -261,9 +261,6 @@ messages, and verify the signatures. The keys and signatures are very short, making them easy to handle and incorporate into other protocols.") (license license:expat))) -(define-public python2-ecdsa - (package-with-python2 python-ecdsa)) - ;;; Pycrypto is abandoned upstream: ;;; ;;; https://github.com/dlitz/pycrypto/issues/173 -- cgit v1.2.3 From bf4cddbf6abd6f13c7dbfd89f8509f24ae2f8cae Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 03:07:18 -0400 Subject: gnu: Remove python2-certifi. * gnu/packages/python-crypto.scm (python2-certifi): Delete variable. --- gnu/packages/python-crypto.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index a270d0f78f..5938ff7e03 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -437,9 +437,6 @@ for example, for recording or replaying web content.") is used by the Requests library to verify HTTPS requests.") (license license:asl2.0))) -(define-public python2-certifi - (package-with-python2 python-certifi)) - (define-public python-cryptography-vectors (package (name "python-cryptography-vectors") -- cgit v1.2.3 From 843904d6430c0b1e5a5a863cd0bd5e836cf8f73c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 03:07:25 -0400 Subject: gnu: Remove python2-pyopenssl. * gnu/packages/python-crypto.scm (python2-pyopenssl): Delete variable. --- gnu/packages/python-crypto.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 5938ff7e03..406e5b685a 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -679,9 +679,6 @@ message digests and key derivation functions.") library.") (license license:asl2.0))) -(define-public python2-pyopenssl - (package-with-python2 python-pyopenssl)) - (define-public python-ed25519 (package (name "python-ed25519") -- cgit v1.2.3 From 9c74e5d566e52d5271d7bdcf7d31ed46df5e944a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 03:14:50 -0400 Subject: gnu: Remove python2-cryptography. * gnu/packages/python-crypto.scm (python2-cryptography): Delete variable. (python-cryptography)[properties]: Delete field. --- gnu/packages/python-crypto.scm | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 406e5b685a..c91a247c09 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -488,26 +488,7 @@ 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)))))) + (license (list license:bsd-3 license:asl2.0)))) ;; TODO: Make this the default in the next staging cycle. (define-public python-cryptography-vectors-next -- cgit v1.2.3 From 6efcb2463f3a4efded106b81e4a70efc9e8a958b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 03:19:45 -0400 Subject: gnu: Remove python2-cryptography-vectors. * gnu/packages/python-crypto.scm (python2-cryptography-vectors): Delete variable. --- gnu/packages/python-crypto.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index c91a247c09..18b55ba403 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -456,9 +456,6 @@ 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") -- cgit v1.2.3 From dcf62928b7608d28d699e523696e70b1da73a0fc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 03:19:49 -0400 Subject: gnu: Remove python2-asn1crypto. * gnu/packages/python-crypto.scm (python2-asn1crypto): Delete variable. --- gnu/packages/python-crypto.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 18b55ba403..753f6bb503 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -772,9 +772,6 @@ for private keys, public keys, certificates, CRL, OCSP, CMS, PKCS#3, PKCS#7, PKCS#8, PKCS#12, PKCS#5, X.509 and TSP.") (license license:expat))) -(define-public python2-asn1crypto - (package-with-python2 python-asn1crypto)) - (define-public python-pynacl (package (name "python-pynacl") -- cgit v1.2.3