Merge branch 'master' into core-updates-frozen

Conflicts:
	gnu/packages/algebra.scm
	gnu/packages/games.scm
	gnu/packages/golang.scm
	gnu/packages/kerberos.scm
	gnu/packages/mail.scm
	gnu/packages/python.scm
	gnu/packages/ruby.scm
	gnu/packages/scheme.scm
	gnu/packages/tex.scm
	gnu/packages/tls.scm
	gnu/packages/version-control.scm
This commit is contained in:
Marius Bakke 2021-08-12 00:30:27 +02:00
commit c4133c43c7
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
181 changed files with 256111 additions and 218870 deletions

View file

@ -138,9 +138,6 @@ on the Blowfish password hashing algorithm, as described in
Password Scheme\"} by Niels Provos and David Mazieres.")
(license license:asl2.0)))
(define-public python2-bcrypt
(package-with-python2 python-bcrypt))
(define-public python-passlib
(package
(name "python-passlib")
@ -260,9 +257,6 @@ extension for low level cryptography (PyCrypto), Paramiko itself is a pure
Python interface around SSH networking concepts.")
(license license:lgpl2.1+)))
(define-public python2-paramiko
(package-with-python2 python-paramiko))
(define-public python-ecdsa
(package
(name "python-ecdsa")
@ -839,9 +833,6 @@ Networking and Cryptography library. These libraries have a stated goal
of improving usability, security and speed.")
(license license:asl2.0)))
(define-public python2-pynacl
(package-with-python2 python-pynacl))
(define-public python-blurhash
(package
(name "python-blurhash")