summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2019-12-15 22:47:28 +0000
committerGitHub <noreply@github.com>2019-12-15 22:47:28 +0000
commit05c6009f5640cf99caa75d6fa4cdf48704a3e19d (patch)
tree294abc3fa6217580089eb499a2ac907718591dac /pkgs
parentf98af3b8db0f5b1e12f34d94626b9a6186a3c3f0 (diff)
parentb21b92947e931bd40a5144c686510320fba6c88d (diff)
downloadnixpkgs-05c6009f5640cf99caa75d6fa4cdf48704a3e19d.tar
nixpkgs-05c6009f5640cf99caa75d6fa4cdf48704a3e19d.tar.gz
nixpkgs-05c6009f5640cf99caa75d6fa4cdf48704a3e19d.tar.bz2
nixpkgs-05c6009f5640cf99caa75d6fa4cdf48704a3e19d.tar.lz
nixpkgs-05c6009f5640cf99caa75d6fa4cdf48704a3e19d.tar.xz
nixpkgs-05c6009f5640cf99caa75d6fa4cdf48704a3e19d.tar.zst
nixpkgs-05c6009f5640cf99caa75d6fa4cdf48704a3e19d.zip
Merge pull request #75715 from andir/ansible
ansible fixes for CVE-2019-10156 CVE-2019-10206 CVE-2019-14846 CVE-2019-14856 CVE-2019-14858 CVE-2019-14864
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/ansible/default.nix4
-rw-r--r--pkgs/tools/admin/ansible/default.nix8
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix
index 74775cf756f..96be51e82f0 100644
--- a/pkgs/development/python-modules/ansible/default.nix
+++ b/pkgs/development/python-modules/ansible/default.nix
@@ -18,13 +18,13 @@
 
 buildPythonPackage rec {
   pname = "ansible";
-  version = "2.8.4";
+  version = "2.8.7";
 
   src = fetchFromGitHub {
     owner = "ansible";
     repo = "ansible";
     rev = "v${version}";
-    sha256 = "1fp7zz8awfv70nn8i6x0ggx4472377hm7787x16qv2kz4nb069ki";
+    sha256 = "08vqjk85j0g1x0iad03d7ysws433dikii8j2lr3a1mlx6d186vv8";
   };
 
   prePatch = ''
diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
index eaba5225150..5b724fb0bf9 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -7,21 +7,21 @@
 
   ansible_2_7 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec {
     pname = "ansible";
-    version = "2.7.11";
+    version = "2.7.15";
 
     src = fetchurl {
       url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
-      sha256 = "0zipzm9al6k74h88b6zkddpcbxqs4cms7lidid6wn1vx3d3dxrp7";
+      sha256 = "1kjqr35c11njyi3f2rjab6821bhqcrdykv4285q76gwv0qynigwr";
     };
   }));
 
   ansible_2_6 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec {
     pname = "ansible";
-    version = "2.6.17";
+    version = "2.6.20";
 
     src = fetchurl {
       url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
-      sha256 = "0ixr3g1nb02xblqyk87bzag8sj8phy37m24xflabfl1k2zfh0313";
+      sha256 = "02ra9q2mifyawn0719y78wrbqzik73aymlzwi90fq71jgyfvkkqn";
     };
   }));
 }