From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: [PATCH 5/5] gnu: Split acme into python-acme and python2-acme. Date: Tue, 9 Feb 2016 03:11:03 -0500 Message-ID: References: Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT3OK-0002Wo-Dn for guix-devel@gnu.org; Tue, 09 Feb 2016 03:11:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aT3OH-0001c3-8c for guix-devel@gnu.org; Tue, 09 Feb 2016 03:11:20 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:37979) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT3OH-0001bl-5N for guix-devel@gnu.org; Tue, 09 Feb 2016 03:11:17 -0500 Received: from jasmine.lan (mf54636d0.tmodns.net [208.54.70.245]) by mail.messagingengine.com (Postfix) with ESMTPA id 216996801B2 for ; Tue, 9 Feb 2016 03:11:15 -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... (python-acme, python2-acme): ...both Python variants. (letsencrypt)[propagated-inputs]: Update user of renamed variable. --- gnu/packages/tls.scm | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f79db32..a7945ba 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -318,9 +318,9 @@ security, and applying best practice development processes.") "file://COPYING" "See COPYING in the distribution."))))) -(define-public acme +(define-public python-acme (package - (name "acme") + (name "python-acme") (version "0.3.0") (source (origin (method url-fetch) @@ -330,8 +330,7 @@ security, and applying best practice development processes.") "1x6fd3cw9pq45k71rgmxi91hmdmnbf1xxvlfwv31fmzs5255dlbw")))) (build-system python-build-system) (arguments - `(#:python ,python-2 - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'install 'disable-egg-compression (lambda _ @@ -344,23 +343,26 @@ security, and applying best practice development processes.") #t)))))) ;; TODO: Add optional inputs for testing and building documentation. (native-inputs - `(("python2-mock" ,python2-mock) - ("python2-setuptools" ,python2-setuptools))) + `(("python-mock" ,python-mock) + ("python-setuptools" ,python-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))) + `(("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-with-python2 python-acme)) + (define-public letsencrypt (package (name "letsencrypt") @@ -379,7 +381,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) -- 2.6.3