Merge branch 'master' into core-updates

This commit is contained in:
Marius Bakke 2017-06-10 02:57:50 +02:00
commit ea45e2c500
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
38 changed files with 1102 additions and 378 deletions

View file

@ -533,26 +533,24 @@ John the Ripper).")
(define-public python-paramiko
(package
(name "python-paramiko")
(version "1.17.4")
(version "2.1.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "paramiko" version))
(sha256
(base32
"1rs2qcmskcmq66q6g5al08wa41l9am0fad5r719m8wf91msyylqw"))))
"04734n0wy3hxk6rij4fr29in5jmr70nxpc7pqi2ksbjysfz4kbjz"))))
(build-system python-build-system)
(arguments
'(;; FIXME: One test fails with "EOFError not raised by connect".
#:tests? #f))
;; #:phases
;; (modify-phases %standard-phases
;; (replace 'check
;; (lambda _
;; (zero? (system* "python" "test.py")))))))
'(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
(zero? (system* "python" "test.py")))))))
(propagated-inputs
`(("python-pycrypto" ,python-pycrypto)
("python-ecdsa" ,python-ecdsa)))
`(("python-pyasn1" ,python-pyasn1)
("python-cryptography" ,python-cryptography)))
(home-page "http://www.paramiko.org/")
(synopsis "SSHv2 protocol library")
(description "Paramiko is a python implementation of the SSHv2 protocol,