~ruther/guix-local

68f1cdecf17ae0b285910f7bdea4e9e3284b34da — Leo Famulari 10 years ago 820acd1
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.
2 files changed, 2 insertions(+), 5 deletions(-)

M gnu/packages/docker.scm
M gnu/packages/python.scm
M gnu/packages/docker.scm => gnu/packages/docker.scm +0 -1
@@ 90,7 90,6 @@ client.")
     `(("python-docker-py" ,python-docker-py)
       ("python-dockerpty" ,python-dockerpty)
       ("python-docopt" ,python-docopt)
       ("python-enum34" ,python-enum34)
       ("python-jsonschema" ,python-jsonschema)
       ("python-pyyaml" ,python-pyyaml)
       ("python-requests" ,python-requests-2.7)

M gnu/packages/python.scm => gnu/packages/python.scm +2 -4
@@ 1354,8 1354,7 @@ backported for previous versions of Python from 2.4 to 3.3.")
    (inputs
     `(("python-setuptools" ,python-setuptools)
       ("python-six" ,python-six)
       ("python-parse" ,python-parse)
       ("python-enum34" ,python-enum34))) ;required for python<3.4
       ("python-parse" ,python-parse)))
    (arguments '(#:tests? #f))            ;TODO: tests require pytest
    (home-page "https://github.com/jenisys/parse_type")
    (synopsis "Extended parse module")


@@ 2005,7 2004,6 @@ backported from Python 2.7 for Python 2.4+.")
    (inputs
     `(("python-setuptools" ,python-setuptools)
       ("python-six" ,python-six)
       ("python-enum43" ,python-enum34)
       ("python-parse" ,python-parse)
       ("python-parse-type" ,python-parse-type)))
    (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-six" ,python-six)
       ("python-pyasn1" ,python-pyasn1)
       ("python-enum34" ,python-enum34)
       ("python-idna" ,python-idna)
       ("python-iso8601" ,python-iso8601)))
    (native-inputs


@@ 5823,6 5820,7 @@ message digests and key derivation functions.")
       `(("python2-ipaddress" ,python2-ipaddress)
         ("python2-backport-ssl-match-hostname"
          ,python2-backport-ssl-match-hostname)
         ("python2-enum34" ,python2-enum34)
         ,@(package-propagated-inputs crypto))))))

(define-public python-pyopenssl