unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#31219] Fix build for ansible.
@ 2018-04-19 17:30 Roel Janssen
  2018-04-23 20:32 ` Efraim Flashner
  0 siblings, 1 reply; 2+ messages in thread
From: Roel Janssen @ 2018-04-19 17:30 UTC (permalink / raw)
  To: 31219

[-- Attachment #1: Type: text/plain, Size: 130 bytes --]

Dear Guix,

The following two patches fix the build for Ansible:
https://hydra.gnu.org/build/2642846

Kind regards,
Roel Janssen


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-python2-pynacl.patch --]
[-- Type: text/x-patch, Size: 852 bytes --]

From f3eab21e245f804c8e5c5411720d21b8698cfb1d Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
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


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-ansible-Add-python2-bcrypt-and-python2-pynacl-fo.patch --]
[-- Type: text/x-patch, Size: 1259 bytes --]

From d9b75fe1b3977ee304921dbaa71c6ac3cde3de95 Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-04-23 20:33 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-19 17:30 [bug#31219] Fix build for ansible Roel Janssen
2018-04-23 20:32 ` Efraim Flashner

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).