From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36827) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1E3h-00010t-9Z for guix-patches@gnu.org; Sun, 08 Oct 2017 12:04:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1E3f-00079N-SF for guix-patches@gnu.org; Sun, 08 Oct 2017 12:04:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:47887) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e1E3f-00079G-Pv for guix-patches@gnu.org; Sun, 08 Oct 2017 12:04:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1e1E3f-0005mi-Ii for guix-patches@gnu.org; Sun, 08 Oct 2017 12:04:03 -0400 Subject: [bug#28726] [PATCH 6/6] gnu: mail: Remove python-django-mailman3. Resent-Message-ID: From: Christopher Baines Date: Sun, 8 Oct 2017 17:03:52 +0100 Message-Id: <20171008160352.10325-6-mail@cbaines.net> In-Reply-To: <20171008160352.10325-1-mail@cbaines.net> References: <20171008160352.10325-1-mail@cbaines.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 28726@debbugs.gnu.org This package fails to build, as django-mailman3 currently only works with Python 2. * gnu/packages/mail.scm (python-django-mailman3): Removed variable. (python2-django-mailman3): Inline the use of python-django-mailman3, and remove the use of package-with-python2. --- gnu/packages/mail.scm | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 4d0e177e5..dfa78da26 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2079,9 +2079,9 @@ installation on systems where resources are limited. Its features include: @end enumerate\n") (license license:expat))) -(define-public python-django-mailman3 +(define-public python2-django-mailman3 (package - (name "python-django-mailman3") + (name "python2-django-mailman3") (version "1.0.1") (source (origin @@ -2092,7 +2092,7 @@ installation on systems where resources are limited. Its features include: "1adxyh8knw9knjlh73xq0jpn5adml0ck4alsv0swakm95wfyx46z")))) (build-system python-build-system) (arguments - '(#:phases + `(#:phases (modify-phases %standard-phases (replace 'check (lambda _ @@ -2101,17 +2101,18 @@ installation on systems where resources are limited. Its features include: "django-admin" "test" "--settings=django_mailman3.tests.settings_test" - "django_mailman3"))))))) + "django_mailman3"))))) + #:python ,python-2)) (inputs - `(("python-django" ,python-django))) + `(("python2-django" ,python2-django))) (propagated-inputs - `(("python-requests" ,python-requests) - ("python-requests-oauthlib" ,python-requests-oauthlib) - ("python-openid" ,python-openid) - ("python-mailmanclient" ,python-mailmanclient) - ("python-django-allauth" ,python-django-allauth) - ("python-django-gravatar2" ,python-django-gravatar2) - ("python-pytz" ,python-pytz))) + `(("python2-requests" ,python2-requests) + ("python2-requests-oauthlib" ,python2-requests-oauthlib) + ("python2-openid" ,python2-openid) + ("python2-mailmanclient" ,python2-mailmanclient) + ("python2-django-allauth" ,python2-django-allauth) + ("python2-django-gravatar2" ,python2-django-gravatar2) + ("python2-pytz" ,python2-pytz))) (home-page "https://gitlab.com/mailman/django-mailman3") (synopsis "Django library for Mailman UIs") (description @@ -2119,15 +2120,6 @@ installation on systems where resources are limited. Its features include: interacting with Mailman.") (license gpl3+))) -(define-public python2-django-mailman3 - (let ((base (package-with-python2 - python-django-mailman3))) - (package - (inherit base) - (propagated-inputs - `(("python2-openid" ,python2-openid) - ,@(package-propagated-inputs base)))))) - (define-public postorius (package (name "postorius") -- 2.14.2