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

Merge pull request #67477 from jonringer/update-ansible

Browse Source 
ansible: 2.8.2 -> 2.8.4
This commit is contained in:
Marek Mahut 2019-08-26 13:49:47 +02:00 committed by GitHub
commit 8386da8d6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ lib
, fetchurl
, fetchFromGitHub
, buildPythonPackage
, pycrypto
, paramiko
@ -18,11 +18,13 @@
buildPythonPackage rec {
pname = "ansible";
version = "2.8.2";
version = "2.8.4";
src = fetchurl {
url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
sha256 = "1e5ba829ca0602c55b33da399b06f99b135a34014b661d1c36d8892a1e2d3730";
src = fetchFromGitHub {
owner = "ansible";
repo = "ansible";
rev = "v${version}";
sha256 = "1fp7zz8awfv70nn8i6x0ggx4472377hm7787x16qv2kz4nb069ki";
};
prePatch = ''

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

@ -1,6 +1,6 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, ansible
, pytest
, mock
@ -8,11 +8,13 @@
buildPythonPackage rec {
pname = "pytest-ansible";
version = "2.0.2";
version = "2.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "d69d89cbcf29e587cbe6ec4b229346edbf027d3c04944dd7bcbf3d7bba46348f";
src = fetchFromGitHub {
owner = "ansible";
repo = "pytest-ansible";
rev = "v${version}";
sha256 = "0v97sqk3q2vkmwnjlnncz8ss8086x9jg3cz0g2nzlngs4ql1gdb0";
};
patchPhase = ''
@ -24,11 +26,11 @@ buildPythonPackage rec {
checkInputs = [ mock ];
propagatedBuildInputs = [ ansible pytest ];
# tests not included with release
# tests not included with release, even on github
doCheck = false;
checkPhase = ''
pytest
HOME=$TMPDIR pytest tests/
'';
meta = with stdenv.lib; {