From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: [PATCH 1/1] gnu: Split acme into python-acme and python2-acme. Date: Mon, 21 Dec 2015 14:32:39 -0500 Message-ID: References: Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:35482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aB6CN-0005NX-9h for guix-devel@gnu.org; Mon, 21 Dec 2015 14:32:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aB6CJ-00022l-5c for guix-devel@gnu.org; Mon, 21 Dec 2015 14:32:47 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:56217) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aB6CJ-00022R-2U for guix-devel@gnu.org; Mon, 21 Dec 2015 14:32:43 -0500 Received: from jasmine.lan (c-69-249-5-231.hsd1.pa.comcast.net [69.249.5.231]) by mail.messagingengine.com (Postfix) with ESMTPA id 1F8CA68013B for ; Mon, 21 Dec 2015 14:32:41 -0500 (EST) In-Reply-To: In-Reply-To: References: List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org * gnu/packages/tls.scm (acme): Split variable into... * gnu/packages/tls.scm (python-acme, python2-acme): ...both Python variants. * gnu/packages/tls.scm (letsencrypt)[propagated-inputs]: Update user of renamed variable. --- gnu/packages/tls.scm | 82 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 33 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 5789534..68d27a1 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -348,38 +348,6 @@ security, and applying best practice development processes.") "file://COPYING" "See COPYING in the distribution."))))) -(define-public acme - (package - (name "acme") - (version "0.1.1") - (source (origin - (method url-fetch) - (uri (pypi-uri "acme" version)) - (sha256 - (base32 - "1yv0gy8akaqp5p2wjpfj8r5i0da04a9qdmlh06rczdkrmk6q680w")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2)) - ;; TODO: Add optional inputs for testing and building documentation. - (native-inputs - `(("python2-mock" ,python2-mock) - ("python2-setuptools" ,python2-setuptools))) - (propagated-inputs - `(("python2-ndg-httpsclient" ,python2-ndg-httpsclient) - ("python2-werkzeug" ,python2-werkzeug) - ("python2-six" ,python2-six) - ("python2-requests" ,python2-requests) - ("python2-pytz" ,python2-pytz) - ("python2-pyrfc3339" ,python2-pyrfc3339) - ("python2-pyasn1" ,python2-pyasn1) - ("python2-cryptography" ,python2-cryptography) - ("python2-pyopenssl" ,python2-pyopenssl))) - (home-page "https://github.com/letsencrypt/letsencrypt") - (synopsis "ACME protocol implementation in Python") - (description "ACME protocol implementation in Python") - (license license:asl2.0))) - (define-public letsencrypt (package (name "letsencrypt") @@ -398,7 +366,7 @@ security, and applying best practice development processes.") `(("python2-nose" ,python2-nose) ("python2-mock" ,python2-mock))) (propagated-inputs - `(("acme" ,acme) + `(("python2-acme" ,python2-acme) ("python2-zope-interface" ,python2-zope-interface) ("python2-pythondialog" ,python2-pythondialog) ("python2-pyrfc3339" ,python2-pyrfc3339) @@ -461,3 +429,51 @@ finally access to the SSL api of the SSLeay/OpenSSL package so you can write servers or clients for more complicated applications.") (license (package-license perl)) (home-page "http://search.cpan.org/~mikem/Net-SSLeay-1.66/"))) + +(define-public python-acme + (package + (name "python-acme") + (version "0.1.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "acme" version)) + (sha256 + (base32 + "1yv0gy8akaqp5p2wjpfj8r5i0da04a9qdmlh06rczdkrmk6q680w")))) + (build-system python-build-system) + ;; TODO: Add optional inputs for testing and building documentation. + (native-inputs + `(("python-mock" ,python-mock) + ("python-setuptools" ,python-setuptools))) + (propagated-inputs + `(("python-ndg-httpsclient" ,python-ndg-httpsclient) + ("python-werkzeug" ,python-werkzeug) + ("python-six" ,python-six) + ("python-requests" ,python-requests) + ("python-pytz" ,python-pytz) + ("python-pyrfc3339" ,python-pyrfc3339) + ("python-pyasn1" ,python-pyasn1) + ("python-cryptography" ,python-cryptography) + ("python-pyopenssl" ,python-pyopenssl))) + (home-page "https://github.com/letsencrypt/letsencrypt") + (synopsis "ACME protocol implementation in Python") + (description "ACME protocol implementation in Python") + (license license:asl2.0))) + +(define-public python2-acme + (package (inherit python-acme) + (name "python2-acme") + (arguments `(#:python ,python-2)) + (native-inputs + `(("python2-mock" ,python2-mock) + ("python2-setuptools" ,python2-setuptools))) + (propagated-inputs + `(("python2-cryptography" ,python2-cryptography) + ("python2-ndg-httpsclient" ,python2-ndg-httpsclient) + ("python2-werkzeug" ,python2-werkzeug) + ("python2-six" ,python2-six) + ("python2-requests" ,python2-requests) + ("python2-pytz" ,python2-pytz) + ("python2-pyrfc3339" ,python2-pyrfc3339) + ("python2-pyasn1" ,python2-pyasn1) + ("python2-pyopenssl" ,python2-pyopenssl))))) -- 2.6.2