gnu: python-terminado: Update to 0.6.

* gnu/packages/python.scm (python-terminado): Update to 0.6.
[inputs]: Remove python-setuptools. Move python-nose ...
[native-inputs]: ... to here.
[properties]: Define python2-variant.
(python2-terminado): Build with 'strip-python2-variant'.
[native-inputs]: Add python2-setuptools.
This commit is contained in:
Efraim Flashner 2016-04-25 17:19:54 +03:00
parent bdb67d846c
commit 783fb0a3a2
1 changed files with 15 additions and 16 deletions

View File

@ -5304,23 +5304,20 @@ pseudo terminal (pty), and interact with both the process and its pty.")
(define-public python-terminado (define-public python-terminado
(package (package
(name "python-terminado") (name "python-terminado")
(version "0.5") (version "0.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (pypi-uri "terminado" version))
"https://pypi.python.org/packages/source/t/terminado/terminado-"
version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1dkmp1n8dj5v1jl9mfrq8lwyc7dsfrvcmz2bgkpg315sy7pr7s33")))) "09h1kwi86g5mrk14s4pgbhshd602zry29lnpxamcqz864kva22rc"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-tornado" ,python-tornado) `(("python-tornado" ,python-tornado)
("python-ptyprocess" ,python-ptyprocess))) ("python-ptyprocess" ,python-ptyprocess)))
(inputs (native-inputs
`(("python-setuptools" ,python-setuptools) `(("python-nose" ,python-nose)))
("python-nose" ,python-nose)))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -5331,17 +5328,19 @@ pseudo terminal (pty), and interact with both the process and its pty.")
(synopsis "Terminals served to term.js using Tornado websockets") (synopsis "Terminals served to term.js using Tornado websockets")
(description "This package provides a Tornado websocket backend for the (description "This package provides a Tornado websocket backend for the
term.js Javascript terminal emulator library.") term.js Javascript terminal emulator library.")
(license bsd-2))) (license bsd-2)
(properties `((python2-variant . ,(delay python2-terminado))))))
(define-public python2-terminado (define-public python2-terminado
(let ((terminado (package-with-python2 python-terminado))) (let ((terminado (package-with-python2 (strip-python2-variant python-terminado))))
(package (inherit terminado) (package (inherit terminado)
(propagated-inputs (propagated-inputs
`(("python2-tornado" ,python2-tornado) `(("python2-backport-ssl-match-hostname"
("python2-backport-ssl-match-hostname" ,python2-backport-ssl-match-hostname)
,python2-backport-ssl-match-hostname) ,@(package-propagated-inputs terminado)))
,@(alist-delete "python-tornado" (native-inputs
(package-propagated-inputs terminado))))))) `(("python2-setuptools" ,python2-setuptools)
,@(package-native-inputs terminado))))))
(define-public python-fonttools (define-public python-fonttools
(package (package