mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-01 17:53:14 +00:00
Merge pull request #173324 from mweinelt/ansible
This commit is contained in:
commit
e43d82b19c
@ -24,11 +24,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-core";
|
||||
version = "2.12.5";
|
||||
version = "2.13.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-HMyZRPEBMxra0e1A1axmqBSRMwUq402wJnp0qnO+67M=";
|
||||
sha256 = "sha256-COD7SnGNlnplTnDNpXz5MgGGkyndHPW4pCZ8V8XEyNM=";
|
||||
};
|
||||
|
||||
# ansible_connection is already wrapped, so don't pass it through
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
let
|
||||
pname = "ansible";
|
||||
version = "5.7.1";
|
||||
version = "5.8.0";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
@ -30,7 +30,7 @@ buildPythonPackage {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-kKCaNFENGU1jVWiVoiWonkqLdIua4hW1XlF6N94GOmE=";
|
||||
sha256 = "sha256-+gVkdiAfQGJfs22VxQQe9GOIC+GL5cc7mYtXtAGWeGM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -14788,7 +14788,14 @@ with pkgs;
|
||||
autoadb = callPackage ../misc/autoadb { };
|
||||
|
||||
ansible = ansible_2_12;
|
||||
ansible_2_12 = python3Packages.toPythonApplication python3Packages.ansible-core;
|
||||
ansible_2_13 = python3Packages.toPythonApplication python3Packages.ansible-core;
|
||||
ansible_2_12 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.12.5";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
hash = "sha256-HMyZRPEBMxra0e1A1axmqBSRMwUq402wJnp0qnO+67M=";
|
||||
};
|
||||
}));
|
||||
|
||||
ansible-doctor = with python3.pkgs; toPythonApplication ansible-doctor;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user