alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #145187 from mweinelt/ansible

Browse source
This commit is contained in:
Sandro 2021-11-10 01:29:54 +01:00 committed by GitHub
parent c69e5daff3 ab8c049e63
commit 634f792cd7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/python-modules/ansible/core.nix
View file

@ -23,17 +23,17 @@
let
ansible-collections = callPackage ./collections.nix {
version = "4.7.0";
sha256 = "0aab9id6dqfw2111r731c7y1p77dpzczynmgl4d989p3a7n54z0b";
version = "4.8.0";
sha256 = "0dlfmvh7jqna6rig39wrnxhklc3k5a3ky3bfq73dqbmcr5hzli8k";
};
in
buildPythonPackage rec {
pname = "ansible-core";
version = "2.11.6";
version = "2.12.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-k9UCg8fFtHbev4PcCJs/Z5uTmouae11ijSjar7s9MDo=";
sha256 = "sha256-DpBJoauLjFTdyAc43AqytXhwvm/kzU5VhdRxVHq3SxM=";
};
# ansible_connection is already wrapped, so don't pass it through

16
pkgs/tools/admin/ansible/default.nix
View file

@ -1,9 +1,19 @@
{ python3Packages, fetchurl, fetchFromGitHub }:
{ python3Packages, fetchFromGitHub }:
rec {
ansible = ansible_2_11;
ansible = ansible_2_12;
ansible_2_11 = python3Packages.toPythonApplication python3Packages.ansible-core;
ansible_2_12 = python3Packages.toPythonApplication python3Packages.ansible-core;
ansible_2_11 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (old: rec {
pname = "ansible-core";
version = "2.11.6";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "sha256-k9UCg8fFtHbev4PcCJs/Z5uTmouae11ijSjar7s9MDo=";
};
}));
ansible_2_10 = python3Packages.toPythonApplication python3Packages.ansible-base;