Merge pull request #67477 from jonringer/update-ansible
ansible: 2.8.2 -> 2.8.4
This commit is contained in:
commit
8386da8d6b
@ -1,5 +1,5 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, fetchurl
|
, fetchFromGitHub
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, pycrypto
|
, pycrypto
|
||||||
, paramiko
|
, paramiko
|
||||||
@ -18,11 +18,13 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "ansible";
|
pname = "ansible";
|
||||||
version = "2.8.2";
|
version = "2.8.4";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchFromGitHub {
|
||||||
url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
|
owner = "ansible";
|
||||||
sha256 = "1e5ba829ca0602c55b33da399b06f99b135a34014b661d1c36d8892a1e2d3730";
|
repo = "ansible";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "1fp7zz8awfv70nn8i6x0ggx4472377hm7787x16qv2kz4nb069ki";
|
||||||
};
|
};
|
||||||
|
|
||||||
prePatch = ''
|
prePatch = ''
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{ stdenv
|
{ stdenv
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchPypi
|
, fetchFromGitHub
|
||||||
, ansible
|
, ansible
|
||||||
, pytest
|
, pytest
|
||||||
, mock
|
, mock
|
||||||
@ -8,11 +8,13 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pytest-ansible";
|
pname = "pytest-ansible";
|
||||||
version = "2.0.2";
|
version = "2.1.1";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchFromGitHub {
|
||||||
inherit pname version;
|
owner = "ansible";
|
||||||
sha256 = "d69d89cbcf29e587cbe6ec4b229346edbf027d3c04944dd7bcbf3d7bba46348f";
|
repo = "pytest-ansible";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "0v97sqk3q2vkmwnjlnncz8ss8086x9jg3cz0g2nzlngs4ql1gdb0";
|
||||||
};
|
};
|
||||||
|
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
@ -24,11 +26,11 @@ buildPythonPackage rec {
|
|||||||
checkInputs = [ mock ];
|
checkInputs = [ mock ];
|
||||||
propagatedBuildInputs = [ ansible pytest ];
|
propagatedBuildInputs = [ ansible pytest ];
|
||||||
|
|
||||||
# tests not included with release
|
# tests not included with release, even on github
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
pytest
|
HOME=$TMPDIR pytest tests/
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
Loading…
Reference in New Issue
Block a user