summary refs log tree commit diff
diff options
context:
space:
mode:
authorJonathan Ringer <jonringer117@gmail.com>2019-11-06 07:42:55 -0800
committerJon <jonringer@users.noreply.github.com>2020-01-22 01:12:28 -0800
commit99eb9231d4d97c561cca7a5ca7617531eac6c92d (patch)
treef42f2dc07381ef7a04227833aa9b11c87b1cad34
parent5bd4028bdcfadd480a667b352c8273be9a86ba05 (diff)
downloadnixpkgs-99eb9231d4d97c561cca7a5ca7617531eac6c92d.tar
nixpkgs-99eb9231d4d97c561cca7a5ca7617531eac6c92d.tar.gz
nixpkgs-99eb9231d4d97c561cca7a5ca7617531eac6c92d.tar.bz2
nixpkgs-99eb9231d4d97c561cca7a5ca7617531eac6c92d.tar.lz
nixpkgs-99eb9231d4d97c561cca7a5ca7617531eac6c92d.tar.xz
nixpkgs-99eb9231d4d97c561cca7a5ca7617531eac6c92d.tar.zst
nixpkgs-99eb9231d4d97c561cca7a5ca7617531eac6c92d.zip
ansible_2_9: init at 2.9.2
-rw-r--r--pkgs/development/python-modules/ansible/default.nix4
-rw-r--r--pkgs/tools/admin/ansible/default.nix16
-rw-r--r--pkgs/top-level/all-packages.nix4
3 files changed, 18 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix
index 96be51e82f0..df9c5e82cd1 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.7";
+  version = "2.9.2";
 
   src = fetchFromGitHub {
     owner = "ansible";
     repo = "ansible";
     rev = "v${version}";
-    sha256 = "08vqjk85j0g1x0iad03d7ysws433dikii8j2lr3a1mlx6d186vv8";
+    sha256 = "06vxvn5q13rxzndwzq3g6yxiqm361ma9zcvwbrfn630xkmsg4pd8";
   };
 
   prePatch = ''
diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
index 5b724fb0bf9..197543945c2 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -1,9 +1,19 @@
 { python3Packages, fetchurl }:
 
-{
-  ansible = with python3Packages; toPythonApplication ansible;
+rec {
+  ansible = ansible_2_8;
 
-  ansible_2_8 = with python3Packages; toPythonApplication ansible;
+  ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible;
+
+  ansible_2_8 = with python3Packages; toPythonApplication (python3Packages.ansible.overrideAttrs(old: rec {
+    pname = "ansible";
+    version = "2.8.6";
+
+    src = fetchurl {
+      url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
+      sha256 = "0mg3pj9bs9xg3sks2mbdyba9x191d88vavkbr3l264fnr4kkn81i";
+    };
+  }));
 
   ansible_2_7 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec {
     pname = "ansible";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b0f055a3d91..efefe5d6ca3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9653,7 +9653,9 @@ in
   inherit (callPackage ../tools/admin/ansible { })
     ansible
     ansible_2_6
-    ansible_2_7;
+    ansible_2_7
+    ansible_2_8
+    ansible_2_9;
 
   ansible-lint = with python3.pkgs; toPythonApplication ansible-lint;