Merge pull request #133064 from austinbutler/resolvelib-5x

This commit is contained in:
Martin Weinelt 2021-08-08 14:55:13 +02:00 committed by GitHub
commit 5fcac7220c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions

View file

@ -42,9 +42,6 @@ buildPythonPackage rec {
postPatch = '' postPatch = ''
substituteInPlace lib/ansible/executor/task_executor.py \ substituteInPlace lib/ansible/executor/task_executor.py \
--replace "[python," "[" --replace "[python," "["
substituteInPlace requirements.txt \
--replace "resolvelib >= 0.5.3, < 0.6.0" "resolvelib"
''; '';
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -7,13 +7,18 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "resolvelib"; pname = "resolvelib";
version = "0.7.1"; # Currently this package is only used by Ansible and breaking changes
# are frequently introduced, so when upgrading ensure the new version
# is compatible with Ansible
# https://github.com/NixOS/nixpkgs/pull/128636
# https://github.com/ansible/ansible/blob/devel/requirements.txt
version = "0.5.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sarugaku"; owner = "sarugaku";
repo = "resolvelib"; repo = "resolvelib";
rev = version; rev = version;
sha256 = "1fqz75riagizihvf4j7wc3zjw6kmg1dd8sf49aszyml105kb33n8"; sha256 = "198vfv78hilpg0d0mjzchzp9zk6239wnra61vlsgwpcgz66d2bgv";
}; };
checkInputs = [ checkInputs = [