gnu: Split acme into python-acme and python2-acme.

* gnu/packages/tls.scm (acme): Split variable into...
(python-acme, python2-acme): ...both Python variants.
(letsencrypt)[propagated-inputs]: Update user of renamed variable.
This commit is contained in:
Leo Famulari 2016-02-09 01:49:08 -05:00
parent 8ad4ae204f
commit 6cefd53d3e
1 changed files with 18 additions and 16 deletions

View File

@ -318,9 +318,9 @@ security, and applying best practice development processes.")
"file://COPYING" "file://COPYING"
"See COPYING in the distribution."))))) "See COPYING in the distribution.")))))
(define-public acme (define-public python-acme
(package (package
(name "acme") (name "python-acme")
(version "0.3.0") (version "0.3.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -330,8 +330,7 @@ security, and applying best practice development processes.")
"1x6fd3cw9pq45k71rgmxi91hmdmnbf1xxvlfwv31fmzs5255dlbw")))) "1x6fd3cw9pq45k71rgmxi91hmdmnbf1xxvlfwv31fmzs5255dlbw"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:python ,python-2 `(#:phases
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'install 'disable-egg-compression (add-before 'install 'disable-egg-compression
(lambda _ (lambda _
@ -344,23 +343,26 @@ security, and applying best practice development processes.")
#t)))))) #t))))))
;; TODO: Add optional inputs for testing and building documentation. ;; TODO: Add optional inputs for testing and building documentation.
(native-inputs (native-inputs
`(("python2-mock" ,python2-mock) `(("python-mock" ,python-mock)
("python2-setuptools" ,python2-setuptools))) ("python-setuptools" ,python-setuptools)))
(propagated-inputs (propagated-inputs
`(("python2-ndg-httpsclient" ,python2-ndg-httpsclient) `(("python-ndg-httpsclient" ,python-ndg-httpsclient)
("python2-werkzeug" ,python2-werkzeug) ("python-werkzeug" ,python-werkzeug)
("python2-six" ,python2-six) ("python-six" ,python-six)
("python2-requests" ,python2-requests) ("python-requests" ,python-requests)
("python2-pytz" ,python2-pytz) ("python-pytz" ,python-pytz)
("python2-pyrfc3339" ,python2-pyrfc3339) ("python-pyrfc3339" ,python-pyrfc3339)
("python2-pyasn1" ,python2-pyasn1) ("python-pyasn1" ,python-pyasn1)
("python2-cryptography" ,python2-cryptography) ("python-cryptography" ,python-cryptography)
("python2-pyopenssl" ,python2-pyopenssl))) ("python-pyopenssl" ,python-pyopenssl)))
(home-page "https://github.com/letsencrypt/letsencrypt") (home-page "https://github.com/letsencrypt/letsencrypt")
(synopsis "ACME protocol implementation in Python") (synopsis "ACME protocol implementation in Python")
(description "ACME protocol implementation in Python") (description "ACME protocol implementation in Python")
(license license:asl2.0))) (license license:asl2.0)))
(define-public python2-acme
(package-with-python2 python-acme))
(define-public letsencrypt (define-public letsencrypt
(package (package
(name "letsencrypt") (name "letsencrypt")
@ -379,7 +381,7 @@ security, and applying best practice development processes.")
`(("python2-nose" ,python2-nose) `(("python2-nose" ,python2-nose)
("python2-mock" ,python2-mock))) ("python2-mock" ,python2-mock)))
(propagated-inputs (propagated-inputs
`(("acme" ,acme) `(("python2-acme" ,python2-acme)
("python2-zope-interface" ,python2-zope-interface) ("python2-zope-interface" ,python2-zope-interface)
("python2-pythondialog" ,python2-pythondialog) ("python2-pythondialog" ,python2-pythondialog)
("python2-pyrfc3339" ,python2-pyrfc3339) ("python2-pyrfc3339" ,python2-pyrfc3339)