summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorRenaud <c0bw3b@users.noreply.github.com>2018-11-03 16:13:50 +0100
committerGitHub <noreply@github.com>2018-11-03 16:13:50 +0100
commit78a6ee6cfc59a3626cfb44c16891aac9ce9d10b5 (patch)
treeeb08a54efd63f3815049ecc598a5d045ea22b843 /pkgs
parent4d510022166f9649bb26ee61af63bdd56c0be17c (diff)
parenta3739a908ce4c2e6dfe1fe08d537867825d84d5e (diff)
downloadnixlib-78a6ee6cfc59a3626cfb44c16891aac9ce9d10b5.tar
nixlib-78a6ee6cfc59a3626cfb44c16891aac9ce9d10b5.tar.gz
nixlib-78a6ee6cfc59a3626cfb44c16891aac9ce9d10b5.tar.bz2
nixlib-78a6ee6cfc59a3626cfb44c16891aac9ce9d10b5.tar.lz
nixlib-78a6ee6cfc59a3626cfb44c16891aac9ce9d10b5.tar.xz
nixlib-78a6ee6cfc59a3626cfb44c16891aac9ce9d10b5.tar.zst
nixlib-78a6ee6cfc59a3626cfb44c16891aac9ce9d10b5.zip
Merge pull request #48082 from sengaya/ansible-2.7
ansible: Update to latest supported releases
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/tools/ansible-lint/default.nix4
-rw-r--r--pkgs/tools/admin/ansible/default.nix15
-rw-r--r--pkgs/top-level/all-packages.nix1
3 files changed, 15 insertions, 5 deletions
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
   '';
diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
index 2b6877cb25f5..c86a108fc425 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -53,15 +53,20 @@ in rec {
   };
 
   ansible_2_5 = generic {
-    version = "2.5.2";
-    sha256  = "1r9sq30xz3jrvx6yqssj5wmkml1f75rx1amd7g89f3ryngrq6m59";
+    version = "2.5.11";
+    sha256  = "07rhgkl3a2ba59rqh9pyz1p661gc389shlwa2sw1m6wwifg4lm24";
   };
 
   ansible_2_6 = generic {
-    version = "2.6.2";
-    sha256  = "1y5gd9h641p6pphwd7j99yyqglyj23rkmid7wgzk62611754qzkl";
+    version = "2.6.7";
+    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 38f3264838cf..fdf6b93539cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8061,6 +8061,7 @@ with pkgs;
     ansible_2_4
     ansible_2_5
     ansible_2_6
+    ansible_2_7
     ansible2
     ansible;