ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-25 12:09:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: python-wheel: Define 'python2-variant'.

Browse source 
* gnu/packages/python.scm (python-wheel)[properties]: New field.
(python2-wheel): Use 'strip-python2-variant'.
(python2-requests): Take the result of 'package-with-python2' directly.
* gnu/packages/openstack.scm (python2-requests-mock): Likewise.
(python2-oslosphinx): Likewise.
This commit is contained in:
Leo Famulari 2016-02-12 01:06:23 -05:00
parent a14600ecfa
commit 8ad4ae204f
2 changed files with 10 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/openstack.scm
View file

@ -304,12 +304,7 @@ (define-public python-requests-mock
(license asl2.0))) (license asl2.0)))
(define-public python2-requests-mock (define-public python2-requests-mock
(let ((requests-mock (package-with-python2 python-requests-mock))) (package-with-python2 python-requests-mock))
(package (inherit requests-mock)
(propagated-inputs
`(("python2-requests" ,python2-requests)
,@(alist-delete "python-requests"
(package-propagated-inputs requests-mock)))))))
(define-public python-stevedore (define-public python-stevedore
(package (package
@ -601,9 +596,7 @@ (define-public python-oslosphinx
(license asl2.0))) (license asl2.0)))
(define-public python2-oslosphinx (define-public python2-oslosphinx
(let ((oslosphinx (package-with-python2 python-oslosphinx))) (package-with-python2 python-oslosphinx))
(package (inherit oslosphinx)
(propagated-inputs `(("python2-requests" ,python2-requests))))))
(define-public python-oslotest (define-public python-oslotest
(package (package

21
gnu/packages/python.scm
View file

@ -2140,16 +2140,16 @@ (define-public python-wheel
unpacked archive preserves enough information to @code{Spread} (copy data and unpacked archive preserves enough information to @code{Spread} (copy data and
scripts to their final locations) at any later time. Wheel files can be scripts to their final locations) at any later time. Wheel files can be
installed with a newer @code{pip} or with wheel's own command line utility.") installed with a newer @code{pip} or with wheel's own command line utility.")
(license license:expat))) (license license:expat)
(properties `((python2-variant . ,(delay python2-wheel))))))
(define-public python2-wheel (define-public python2-wheel
(let ((wheel (package-with-python2 python-wheel))) (let ((wheel (package-with-python2
(strip-python2-variant python-wheel))))
(package (inherit wheel) (package (inherit wheel)
(native-inputs (native-inputs `(("python2-functools32" ,python2-functools32)
`(("python2-functools32" ,python2-functools32) ,@(package-native-inputs wheel))))))
("python2-jsonschema" ,python2-jsonschema)
,@(alist-delete "python-jsonschema"
(package-native-inputs wheel)))))))
(define-public python-requests (define-public python-requests
(package (package
@ -2189,12 +2189,7 @@ (define-public python-requests-2.7
"0gdr9dxm24amxpbyqpbh3lbwxc2i42hnqv50sigx568qssv3v2ir")))))) "0gdr9dxm24amxpbyqpbh3lbwxc2i42hnqv50sigx568qssv3v2ir"))))))
(define-public python2-requests (define-public python2-requests
(let ((requests (package-with-python2 python-requests))) (package-with-python2 python-requests))
(package (inherit requests)
(propagated-inputs
`(("python2-wheel" ,python2-wheel)
,@(alist-delete "python-wheel"
(package-propagated-inputs requests)))))))
(define-public python-vcversioner (define-public python-vcversioner
(package (package