nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: python-tornado: Rearrange inputs. 

* gnu/packages/python.scm (python-tornado)[properties]: Define
python2-variant.
[inputs]: Remove python-certifi, move python-backports-abc here from
native-inputs.
[native-inputs]: Remove python-setuptools.
(python2-tornado): Build with 'strip-python2-variant'.
[native-inputs]: Add python2-setuptools.
This commit is contained in:
Efraim Flashner 2016-04-25 15:48:12 +03:00
parent fc899d4f73
commit b455439bcd
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gnu/packages/python.scm
View File

@ -4910,11 +4910,10 @@ It is written entirely in Python.")
(sha256 (sha256
(base32 "1gzgwayl6hmc9jfcl88bni4jcsk2jcca9dn1rvrfsvnijcjx7hn9")))) (base32 "1gzgwayl6hmc9jfcl88bni4jcsk2jcca9dn1rvrfsvnijcjx7hn9"))))
(build-system python-build-system) (build-system python-build-system)
(inputs
`(("python-certifi" ,python-certifi)))
(native-inputs (native-inputs
`(("python-backports-abc" ,python-backports-abc) `(("python-certifi" ,python-certifi)))
("python-setuptools" ,python-setuptools))) (inputs
`(("python-backports-abc" ,python-backports-abc)))
(home-page "http://www.tornadoweb.org/") (home-page "http://www.tornadoweb.org/")
(synopsis "Python web framework and asynchronous networking library") (synopsis "Python web framework and asynchronous networking library")
(description (description
@ -4923,16 +4922,20 @@ originally developed at FriendFeed. By using non-blocking network I/O,
Tornado can scale to tens of thousands of open connections, making it ideal Tornado can scale to tens of thousands of open connections, making it ideal
for long polling, WebSockets, and other applications that require a long-lived for long polling, WebSockets, and other applications that require a long-lived
connection to each user.") connection to each user.")
(license asl2.0))) (license asl2.0)
(properties `((python2-variant . ,(delay python2-tornado))))))
(define-public python2-tornado (define-public python2-tornado
(let ((tornado (package-with-python2 python-tornado))) (let ((tornado (package-with-python2 (strip-python2-variant python-tornado))))
(package (inherit tornado) (package (inherit tornado)
(inputs (inputs
`(("python2-backport-ssl-match-hostname" `(("python2-backport-ssl-match-hostname"
,python2-backport-ssl-match-hostname) ,python2-backport-ssl-match-hostname)
("python2-singledispatch", python2-singledispatch) ("python2-singledispatch" ,python2-singledispatch)
,@(package-inputs tornado)))))) ,@(package-inputs tornado)))
(native-inputs
`(("python2-setuptools" ,python2-setuptools)
,@(package-native-inputs tornado))))))
;; the python- version can be removed with python-3.5 ;; the python- version can be removed with python-3.5
(define-public python-backports-abc (define-public python-backports-abc