summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorxeji <36407913+xeji@users.noreply.github.com>2018-05-12 17:49:00 +0200
committerGitHub <noreply@github.com>2018-05-12 17:49:00 +0200
commit8f259f3e322bb76f4792a058f863e64bd4d8bac5 (patch)
tree633135016b928d410120da6e63c7d5f299bc6e90 /pkgs/top-level
parent7f79a4fe118943b0d8dcc3aa475079ad3cfd7986 (diff)
parentefbeca76fe7845d7f2d9c2be7a611f1475bf64a2 (diff)
downloadnixlib-8f259f3e322bb76f4792a058f863e64bd4d8bac5.tar
nixlib-8f259f3e322bb76f4792a058f863e64bd4d8bac5.tar.gz
nixlib-8f259f3e322bb76f4792a058f863e64bd4d8bac5.tar.bz2
nixlib-8f259f3e322bb76f4792a058f863e64bd4d8bac5.tar.lz
nixlib-8f259f3e322bb76f4792a058f863e64bd4d8bac5.tar.xz
nixlib-8f259f3e322bb76f4792a058f863e64bd4d8bac5.tar.zst
nixlib-8f259f3e322bb76f4792a058f863e64bd4d8bac5.zip
Merge pull request #40277 from peterhoeg/f/ansible
ansible: update point releases and unify build
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix12
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5497a0356e08..cf74ff364253 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7524,13 +7524,11 @@ 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_4
+    ansible_2_5
+    ansible2
+    ansible;
 
   ansible-lint = callPackage ../development/tools/ansible-lint {};