From de8a3e3125baddc22ef0472ca941b49acf5ca8fd Mon Sep 17 00:00:00 2001 From: Thilo Uttendorfer Date: Fri, 2 Nov 2018 23:16:07 +0100 Subject: [PATCH 1/4] ansible_2_5: 2.5.2 -> 2.5.11 --- pkgs/tools/admin/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 2b6877cb25f5..b3abd230b74a 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -53,8 +53,8 @@ in rec { }; ansible_2_5 = generic { - version = "2.5.2"; - sha256 = "1r9sq30xz3jrvx6yqssj5wmkml1f75rx1amd7g89f3ryngrq6m59"; + version = "2.5.11"; + sha256 = "07rhgkl3a2ba59rqh9pyz1p661gc389shlwa2sw1m6wwifg4lm24"; }; ansible_2_6 = generic { From e63509a651d1ecac2ab712cbc9b7e7c00ed96cbd Mon Sep 17 00:00:00 2001 From: Thilo Uttendorfer Date: Fri, 2 Nov 2018 23:18:57 +0100 Subject: [PATCH 2/4] ansible_2_6: 2.6.2 -> 2.6.7 --- pkgs/tools/admin/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index b3abd230b74a..9ed4b36f20b8 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -58,8 +58,8 @@ in rec { }; ansible_2_6 = generic { - version = "2.6.2"; - sha256 = "1y5gd9h641p6pphwd7j99yyqglyj23rkmid7wgzk62611754qzkl"; + version = "2.6.7"; + sha256 = "10pakw9k9wd3cy1qk3ah2253ph7c7h3qzpal4k0s5lschzgy2fh0"; }; ansible2 = ansible_2_6; From c0d30e5f034cbc72dae15a8986b0a9d70fbe7540 Mon Sep 17 00:00:00 2001 From: Thilo Uttendorfer Date: Fri, 2 Nov 2018 23:21:53 +0100 Subject: [PATCH 3/4] ansible_2_7: init at 2.7.1 --- pkgs/tools/admin/ansible/default.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 9ed4b36f20b8..c86a108fc425 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -62,6 +62,11 @@ in rec { sha256 = "10pakw9k9wd3cy1qk3ah2253ph7c7h3qzpal4k0s5lschzgy2fh0"; }; - ansible2 = ansible_2_6; + ansible_2_7 = generic { + version = "2.7.1"; + sha256 = "0fg95x2nr3j4rwnlyd2n03h91xx9fssi34c32356vk3z6ir395g7"; + }; + + ansible2 = ansible_2_7; ansible = ansible2; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62cef2d50689..aa2ed6d2c592 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8059,6 +8059,7 @@ with pkgs; ansible_2_4 ansible_2_5 ansible_2_6 + ansible_2_7 ansible2 ansible; From a3739a908ce4c2e6dfe1fe08d537867825d84d5e Mon Sep 17 00:00:00 2001 From: Thilo Uttendorfer Date: Fri, 2 Nov 2018 23:46:13 +0100 Subject: [PATCH 4/4] ansible-lint: fix install tests --- pkgs/development/tools/ansible-lint/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/ansible-lint/default.nix b/pkgs/development/tools/ansible-lint/default.nix index c460662f4f88..5433725b3050 100644 --- a/pkgs/development/tools/ansible-lint/default.nix +++ b/pkgs/development/tools/ansible-lint/default.nix @@ -19,6 +19,10 @@ pythonPackages.buildPythonPackage rec { patchShebangs bin/ansible-lint ''; + preBuild = '' + export HOME="$TMP" + ''; + checkPhase = '' nosetests test '';