From 06e394bbb451d7cd35dd3576216a8f2fb5cfdbf4 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 10 May 2018 14:09:15 +0800
Subject: ansible: update point releases and unify build

1) We had lots of copy paste - instead use a generic builder for the various reasons.

2) Default version changed to latest (2.5 instead of 2.4)

3) Point release updates to all
---
 pkgs/top-level/all-packages.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'pkgs/top-level')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 567167fc4605..36532e55f938 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7518,13 +7518,14 @@ with pkgs;
 
   augeas = callPackage ../tools/system/augeas { };
 
-  ansible_2_1 = callPackage ../tools/admin/ansible/2.1.nix {};
-  ansible_2_2 = callPackage ../tools/admin/ansible/2.2.nix {};
-  ansible_2_3 = callPackage ../tools/admin/ansible/2.3.nix {};
-  ansible_2_4 = callPackage ../tools/admin/ansible/2.4.nix {};
-  ansible_2_5 = callPackage ../tools/admin/ansible/2.5.nix {};
-  ansible  = ansible_2_4;
-  ansible2 = ansible_2_4;
+  inherit (callPackages ../tools/admin/ansible {})
+    ansible_2_1
+    ansible_2_2
+    ansible_2_3
+    ansible_2_4
+    ansible_2_5
+    ansible2
+    ansible;
 
   ansible-lint = callPackage ../development/tools/ansible-lint {};
 
-- 
cgit 1.4.1


From efbeca76fe7845d7f2d9c2be7a611f1475bf64a2 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 10 May 2018 23:10:02 +0800
Subject: ansible: drop 2.1, 2.2 and 2.3 as they are EOL

---
 pkgs/tools/admin/ansible/default.nix | 17 -----------------
 pkgs/top-level/all-packages.nix      |  3 ---
 2 files changed, 20 deletions(-)

(limited to 'pkgs/top-level')

diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
index 4d9eff899b92..11ab58bc62f8 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -50,23 +50,6 @@ let
 in rec {
   # We will carry all the supported versions
 
-  ansible_2_1 = generic {
-    version = "2.1.6.0";
-    sha256  = "0fhsmarjl9h401pm0gmcy68q80fiq544cxzcxyjzbnxr2a2cimz5";
-    py      = oldJinja;
-  };
-
-  ansible_2_2 = generic {
-    version = "2.2.3.0";
-    sha256  = "141aa76qy9hsc3h02yipyxg39maqq2r2c4nx53lm48kiy0fan66y";
-    py      = oldJinja;
-  };
-
-  ansible_2_3 = generic {
-    version = "2.3.3.0";
-    sha256  = "1yhaqgbx4zlwvi3cklnsqarjhhq28hgbvx603h07cjm1digp2ans";
-  };
-
   ansible_2_4 = generic {
     version = "2.4.4.0";
     sha256  = "0n1k6h0h6av74nw8vq98fmh6q4pq6brpwmx45282vh3bkdmpa0ib";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 36532e55f938..3f3ef87b65d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7519,9 +7519,6 @@ with pkgs;
   augeas = callPackage ../tools/system/augeas { };
 
   inherit (callPackages ../tools/admin/ansible {})
-    ansible_2_1
-    ansible_2_2
-    ansible_2_3
     ansible_2_4
     ansible_2_5
     ansible2
-- 
cgit 1.4.1