From bda2d99e912cf6c25748703e2336a4454940da19 Mon Sep 17 00:00:00 2001 From: Aaron Bull Schaefer Date: Fri, 27 May 2016 14:26:56 -0700 Subject: [PATCH 1/3] ansible2: 2.0.0.2 -> 2.1.0.0 --- pkgs/top-level/python-packages.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e575fcba2cbe..f7766ae41e91 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -829,12 +829,12 @@ in modules // { }; ansible2 = buildPythonPackage rec { - version = "v2.0.0.2"; - name = "ansible-${version}"; + version = "2.1.0.0"; + name = "ansible-${version}"; src = pkgs.fetchurl { - url = "http://releases.ansible.com/ansible/ansible-2.0.0.2.tar.gz"; - sha256 = "0a2qgshbpbg2c8rz36jcc5f7zam0j1viqdhc8fqqbarz26chpnr7"; + url = "http://releases.ansible.com/ansible/${name}.tar.gz"; + sha256 = "1bfc2xiplpad6f2nwi48y0kps7xqnsll85dlz63cy8k5bysl6d20"; }; prePatch = '' @@ -852,11 +852,11 @@ in modules // { ] ++ optional windowsSupport pywinrm; meta = with stdenv.lib; { - homepage = "http://www.ansible.com"; + homepage = "http://www.ansible.com"; description = "A simple automation tool"; - license = with licenses; [ gpl3 ]; + license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ copumpkin ]; - platforms = with platforms; linux ++ darwin; + platforms = with platforms; linux ++ darwin; }; }; From f669509e0540cf560f321b026d62ca6805461289 Mon Sep 17 00:00:00 2001 From: Aaron Bull Schaefer Date: Fri, 27 May 2016 15:28:43 -0700 Subject: [PATCH 2/3] ansible: disable python 3 support Python 3 is not supported by Ansible upstream, and trying to run `nox-review` will not succeed if we don't explicitly disable it. --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f7766ae41e91..f75f4f541819 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -799,6 +799,7 @@ in modules // { ansible = buildPythonPackage rec { version = "1.9.4"; name = "ansible-${version}"; + disabled = isPy3k; src = pkgs.fetchurl { url = "https://releases.ansible.com/ansible/${name}.tar.gz"; @@ -831,6 +832,7 @@ in modules // { ansible2 = buildPythonPackage rec { version = "2.1.0.0"; name = "ansible-${version}"; + disabled = isPy3k; src = pkgs.fetchurl { url = "http://releases.ansible.com/ansible/${name}.tar.gz"; From 980805c486117db25b30399666138a17aa558dc3 Mon Sep 17 00:00:00 2001 From: Aaron Bull Schaefer Date: Fri, 27 May 2016 15:47:10 -0700 Subject: [PATCH 3/3] ansible2: add readline lib as dependency This is required for the `ansible-console` command to work (which was added in Ansible v2.1.0.0). --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f75f4f541819..cff0be59fe19 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -850,7 +850,7 @@ in modules // { windowsSupport = true; propagatedBuildInputs = with self; [ - paramiko jinja2 pyyaml httplib2 boto six + paramiko jinja2 pyyaml httplib2 boto six readline ] ++ optional windowsSupport pywinrm; meta = with stdenv.lib; {