public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #88037 from mweinelt/ansible

Browse Source 
ansible: v2.9.7 → v2.9.9, v2.8.11 → v2.8.12, v2.7.17 → v2.7.18, drop v2.6.x
This commit is contained in:
Florian Klink 2020-05-18 11:57:49 +02:00 committed by GitHub
commit 33b2ebba2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/python-modules/ansible/default.nix
View File

@ -18,13 +18,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ansible"; pname = "ansible";
version = "2.9.7"; version = "2.9.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ansible"; owner = "ansible";
repo = "ansible"; repo = "ansible";
rev = "v${version}"; rev = "v${version}";
sha256 = "0miid7h720i630qljcjdmgdblflhrl2pwqjgiq5wm8jr61c3ld6s"; sha256 = "06a9iq7w2cm0hsxaw5irsja8w44gffiw09ly27jxklpa8gv57rml";
}; };
prePatch = '' prePatch = ''
@ -51,7 +51,7 @@ buildPythonPackage rec {
homepage = "http://www.ansible.com"; homepage = "http://www.ansible.com";
description = "Radically simple IT automation"; description = "Radically simple IT automation";
license = [ licenses.gpl3 ] ; license = [ licenses.gpl3 ] ;
maintainers = with maintainers; [ joamaki costrouc ]; maintainers = with maintainers; [ joamaki costrouc hexa ];
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
}; };
} }

20
pkgs/tools/admin/ansible/default.nix
View File

@ -1,37 +1,27 @@
{ python3Packages, fetchurl }: { python3Packages, fetchurl }:
rec { rec {
ansible = ansible_2_8; ansible = ansible_2_9;
ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible; ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible;
ansible_2_8 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { ansible_2_8 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec {
pname = "ansible"; pname = "ansible";
version = "2.8.11"; version = "2.8.12";
src = fetchurl { src = fetchurl {
url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
sha256 = "14f1m4jjkicadaz4d1dm8xhj53kdwksf0znmqzaz1fb0dj5slv0m"; sha256 = "091id1da3hlnmf0hwvrhv2r0mnyna3mc6s7rwdg5kll7yfiy4k1a";
}; };
})); }));
ansible_2_7 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { ansible_2_7 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec {
pname = "ansible"; pname = "ansible";
version = "2.7.17"; version = "2.7.18";
src = fetchurl { src = fetchurl {
url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
sha256 = "1k2cz4w3r3an37305f40vi93wqixapls9y6ggkf75nbs7z27knwz"; sha256 = "0sgshaaqyjq3i035yi5hivmrrwrq05hxrbjrv1w3hfzmvljn41d1";
};
}));
ansible_2_6 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec {
pname = "ansible";
version = "2.6.20";
src = fetchurl {
url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
sha256 = "02ra9q2mifyawn0719y78wrbqzik73aymlzwi90fq71jgyfvkkqn";
}; };
})); }));
} }

1
pkgs/top-level/all-packages.nix
View File

@ -9895,7 +9895,6 @@ in
inherit (callPackage ../tools/admin/ansible { }) inherit (callPackage ../tools/admin/ansible { })
ansible ansible
ansible_2_6
ansible_2_7 ansible_2_7
ansible_2_8 ansible_2_8
ansible_2_9; ansible_2_9;