From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59925) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9DOm-0006tz-B2 for guix-patches@gnu.org; Thu, 19 Apr 2018 13:31:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f9DOg-000582-KQ for guix-patches@gnu.org; Thu, 19 Apr 2018 13:31:08 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:53485) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f9DOg-00057c-Ex for guix-patches@gnu.org; Thu, 19 Apr 2018 13:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1f9DOg-000668-7d for guix-patches@gnu.org; Thu, 19 Apr 2018 13:31:02 -0400 Subject: [bug#31219] Fix build for ansible. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9DNq-00064s-AB for guix-patches@gnu.org; Thu, 19 Apr 2018 13:30:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f9DNm-0002ca-8v for guix-patches@gnu.org; Thu, 19 Apr 2018 13:30:10 -0400 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:40985) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9DNm-0002bk-4I for guix-patches@gnu.org; Thu, 19 Apr 2018 13:30:06 -0400 Received: from ip112-245-209-87.adsl2.static.versatel.nl ([87.209.245.112]:56371 helo=yellowstone) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1f9DNl-00052J-Hf for guix-patches@gnu.org; Thu, 19 Apr 2018 13:30:05 -0400 From: Roel Janssen Date: Thu, 19 Apr 2018 19:30:02 +0200 Message-ID: <87k1t3w1d1.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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: 31219@debbugs.gnu.org --=-=-= Content-Type: text/plain Dear Guix, The following two patches fix the build for Ansible: https://hydra.gnu.org/build/2642846 Kind regards, Roel Janssen --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-Add-python2-pynacl.patch >From f3eab21e245f804c8e5c5411720d21b8698cfb1d Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Thu, 19 Apr 2018 19:27:05 +0200 Subject: [PATCH 1/2] gnu: Add python2-pynacl. * gnu/packages/python-crypto.scm (python2-pynacl): New variable. --- gnu/packages/python-crypto.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index bf868b14d..9d1c19744 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -618,6 +618,9 @@ Networking and Cryptography library. These libraries have a stated goal of improving usability, security and speed.") (license license:asl2.0))) +(define-public python2-pynacl + (package-with-python2 python-pynacl)) + (define-public python2-pgpdump (package (name "python2-pgpdump") -- 2.17.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-ansible-Add-python2-bcrypt-and-python2-pynacl-fo.patch >From d9b75fe1b3977ee304921dbaa71c6ac3cde3de95 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Thu, 19 Apr 2018 19:27:29 +0200 Subject: [PATCH 2/2] gnu: ansible: Add python2-bcrypt and python2-pynacl for running tests. * gnu/packages/admin.scm (ansible): Add python2-bcrypt and python2-pynacl. --- gnu/packages/admin.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 5b47d5fae..161295758 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1526,11 +1526,13 @@ of supported upstream metrics systems simultaneously.") (patches (search-patches "ansible-wrap-program-hack.patch")))) (build-system python-build-system) (native-inputs - `(("python2-pycrypto" ,python2-pycrypto) + `(("python2-bcrypt" ,python2-bcrypt) + ("python2-pycrypto" ,python2-pycrypto) ("python2-httplib2" ,python2-httplib2) ("python2-passlib" ,python2-passlib) ("python2-nose" ,python2-nose) ("python2-mock" ,python2-mock) + ("python2-pynacl" ,python2-pynacl) ("python2-jinja2" ,python2-jinja2) ("python2-pyyaml" ,python2-pyyaml) ("python2-paramiko" ,python2-paramiko))) -- 2.17.0 --=-=-=--