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

gnu: Don't use python-enum34 when building with python-3.4. 

* gnu/packages/docker.scm (docker-compose)[inputs]: Remove python-enum34.
* gnu/packages/python.scm (python-parse-type)[inputs]: Likewise.
(behave)[inputs]: Likewise.
(python-cryptography)[propagated-inputs]: Likewise.
(python2-cryptography)[propagated-inputs]: Add python2-enum34.
This commit is contained in:
Leo Famulari 2016-02-18 12:59:18 -05:00
parent 820acd1bc3
commit 68f1cdecf1
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu/packages/docker.scm
View File

@ -90,7 +90,6 @@ client.")
`(("python-docker-py" ,python-docker-py) `(("python-docker-py" ,python-docker-py)
("python-dockerpty" ,python-dockerpty) ("python-dockerpty" ,python-dockerpty)
("python-docopt" ,python-docopt) ("python-docopt" ,python-docopt)
("python-enum34" ,python-enum34)
("python-jsonschema" ,python-jsonschema) ("python-jsonschema" ,python-jsonschema)
("python-pyyaml" ,python-pyyaml) ("python-pyyaml" ,python-pyyaml)
("python-requests" ,python-requests-2.7) ("python-requests" ,python-requests-2.7)

6
gnu/packages/python.scm
View File

@ -1354,8 +1354,7 @@ backported for previous versions of Python from 2.4 to 3.3.")
(inputs (inputs
`(("python-setuptools" ,python-setuptools) `(("python-setuptools" ,python-setuptools)
("python-six" ,python-six) ("python-six" ,python-six)
("python-parse" ,python-parse) ("python-parse" ,python-parse)))
("python-enum34" ,python-enum34))) ;required for python<3.4
(arguments '(#:tests? #f)) ;TODO: tests require pytest (arguments '(#:tests? #f)) ;TODO: tests require pytest
(home-page "https://github.com/jenisys/parse_type") (home-page "https://github.com/jenisys/parse_type")
(synopsis "Extended parse module") (synopsis "Extended parse module")
@ -2005,7 +2004,6 @@ backported from Python 2.7 for Python 2.4+.")
(inputs (inputs
`(("python-setuptools" ,python-setuptools) `(("python-setuptools" ,python-setuptools)
("python-six" ,python-six) ("python-six" ,python-six)
("python-enum43" ,python-enum34)
("python-parse" ,python-parse) ("python-parse" ,python-parse)
("python-parse-type" ,python-parse-type))) ("python-parse-type" ,python-parse-type)))
(arguments `(#:tests? #f)) ;TODO: tests require nose>=1.3 and (arguments `(#:tests? #f)) ;TODO: tests require nose>=1.3 and
@ -5792,7 +5790,6 @@ responses, rather than doing any computation.")
`(("python-cffi" ,python-cffi) `(("python-cffi" ,python-cffi)
("python-six" ,python-six) ("python-six" ,python-six)
("python-pyasn1" ,python-pyasn1) ("python-pyasn1" ,python-pyasn1)
("python-enum34" ,python-enum34)
("python-idna" ,python-idna) ("python-idna" ,python-idna)
("python-iso8601" ,python-iso8601))) ("python-iso8601" ,python-iso8601)))
(native-inputs (native-inputs
@ -5823,6 +5820,7 @@ message digests and key derivation functions.")
`(("python2-ipaddress" ,python2-ipaddress) `(("python2-ipaddress" ,python2-ipaddress)
("python2-backport-ssl-match-hostname" ("python2-backport-ssl-match-hostname"
,python2-backport-ssl-match-hostname) ,python2-backport-ssl-match-hostname)
("python2-enum34" ,python2-enum34)
,@(package-propagated-inputs crypto)))))) ,@(package-propagated-inputs crypto))))))
(define-public python-pyopenssl (define-public python-pyopenssl