summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2018-05-10 14:09:15 +0800
committerPeter Hoeg <peter@hoeg.com>2018-05-10 23:11:37 +0800
commit06e394bbb451d7cd35dd3576216a8f2fb5cfdbf4 (patch)
tree8ed5878520b34e7521f2270079dd27317b9ea6c3 /pkgs/top-level/all-packages.nix
parent1d9330d63a5a30f4eb578eda7840be7b11ec6277 (diff)
downloadnixlib-06e394bbb451d7cd35dd3576216a8f2fb5cfdbf4.tar
nixlib-06e394bbb451d7cd35dd3576216a8f2fb5cfdbf4.tar.gz
nixlib-06e394bbb451d7cd35dd3576216a8f2fb5cfdbf4.tar.bz2
nixlib-06e394bbb451d7cd35dd3576216a8f2fb5cfdbf4.tar.lz
nixlib-06e394bbb451d7cd35dd3576216a8f2fb5cfdbf4.tar.xz
nixlib-06e394bbb451d7cd35dd3576216a8f2fb5cfdbf4.tar.zst
nixlib-06e394bbb451d7cd35dd3576216a8f2fb5cfdbf4.zip
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
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix15
1 files changed, 8 insertions, 7 deletions
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 {};