From 231881e440ec35728f3dd513dc8ce2a51ef8cd1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 23 May 2021 18:24:10 +0200 Subject: [PATCH 01/23] python3Packages.commentjson: init at 0.9.0 (cherry picked from commit b36764fcbe644bf1aedd3857db0e940d2a8503e5) --- .../python-modules/commentjson/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/commentjson/default.nix diff --git a/pkgs/development/python-modules/commentjson/default.nix b/pkgs/development/python-modules/commentjson/default.nix new file mode 100644 index 00000000000..2aefb51d481 --- /dev/null +++ b/pkgs/development/python-modules/commentjson/default.nix @@ -0,0 +1,34 @@ +{ lib, buildPythonPackage, fetchFromGitHub, six, lark-parser, pytestCheckHook }: + +buildPythonPackage rec { + pname = "commentjson"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "vaidik"; + repo = "commentjson"; + rev = "v${version}"; + sha256 = "sha256-dPnIcv7TIeyG7rU938w7FrDklmaGuPpXz34uw/JjOgY="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "lark-parser>=0.7.1,<0.8.0" "lark-parser" + + # NixOS is missing test.test_json module + rm -r commentjson/tests/test_json + ''; + + propagatedBuildInputs = [ lark-parser six ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "commentjson" ]; + + meta = with lib; { + description = "Add JavaScript or Python style comments in JSON"; + homepage = "https://github.com/vaidik/commentjson/"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e9e9d9de945..5d174057691 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1523,6 +1523,8 @@ in { commandparse = callPackage ../development/python-modules/commandparse { }; + commentjson = callPackage ../development/python-modules/commentjson { }; + commoncode = callPackage ../development/python-modules/commoncode { }; CommonMark = callPackage ../development/python-modules/commonmark { }; From 658b63c41ba909779ae93b3cdcb1155cd881d59e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 May 2021 23:01:26 +0200 Subject: [PATCH 02/23] python3Packages.resolvelib: init at 0.7.0 (cherry picked from commit 23414c5026bd1a2c612786053aa7c5a21b26378f) --- .../python-modules/resolvelib/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/resolvelib/default.nix diff --git a/pkgs/development/python-modules/resolvelib/default.nix b/pkgs/development/python-modules/resolvelib/default.nix new file mode 100644 index 00000000000..db3ecbcc86e --- /dev/null +++ b/pkgs/development/python-modules/resolvelib/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, commentjson +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "resolvelib"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "sarugaku"; + repo = "resolvelib"; + rev = version; + sha256 = "0r7cxwrfvpqz4kd7pdf8fsynzlmi6c754jd5hzd6vssc1zlyvvhx"; + }; + + checkInputs = [ + commentjson + pytestCheckHook + ]; + + meta = with lib; { + description = "Resolve abstract dependencies into concrete ones"; + homepage = "https://github.com/sarugaku/resolvelib"; + license = licenses.isc; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5d174057691..f5bb3fbc4b3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7208,6 +7208,8 @@ in { resampy = callPackage ../development/python-modules/resampy { }; + resolvelib = callPackage ../development/python-modules/resolvelib { }; + responses = callPackage ../development/python-modules/responses { }; respx = callPackage ../development/python-modules/respx { }; From 6a7d63f3d6ad3d55dc219de281daf230095606b4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 May 2021 23:01:41 +0200 Subject: [PATCH 03/23] python3Packages.ansible-core: init at 2.11.0 (cherry picked from commit 8e390750e320741c54aeb41aa239ae5ac108687f) --- .../python-modules/ansible/core.nix | 83 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 85 insertions(+) create mode 100644 pkgs/development/python-modules/ansible/core.nix diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix new file mode 100644 index 00000000000..690d5a1725d --- /dev/null +++ b/pkgs/development/python-modules/ansible/core.nix @@ -0,0 +1,83 @@ +{ lib +, buildPythonPackage +, fetchPypi +, installShellFiles +, ansible-collections +, cryptography +, jinja2 +, junit-xml +, lxml +, ncclient +, packaging +, paramiko +, pexpect +, psutil +, pycrypto +, pyyaml +, requests +, resolvelib +, scp +, windowsSupport ? false, pywinrm +, xmltodict +}: + +buildPythonPackage rec { + pname = "ansible-core"; + version = "2.11.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1if9cybdicjhrfzi6nndqakb4sh3mw1fijhvbzbsq7ki22vwww4l"; + }; + + # ansible_connection is already wrapped, so don't pass it through + # the python interpreter again, as it would break execution of + # connection plugins. + postPatch = '' + substituteInPlace lib/ansible/executor/task_executor.py \ + --replace "[python," "[" + + substituteInPlace requirements.txt \ + --replace "resolvelib >= 0.5.3, < 0.6.0" "resolvelib" + ''; + + nativeBuildInputs = [ + installShellFiles + ]; + + propagatedBuildInputs = [ + # depend on ansible-collections instead of the other way around + ansible-collections + # from requirements.txt + cryptography + jinja2 + packaging + pyyaml + resolvelib + # optional dependencies + junit-xml + lxml + ncclient + paramiko + pexpect + psutil + pycrypto + requests + scp + xmltodict + ] ++ lib.optional windowsSupport pywinrm; + + postInstall = '' + installManPage docs/man/man1/*.1 + ''; + + # internal import errors, missing dependencies + doCheck = false; + + meta = with lib; { + description = "Radically simple IT automation"; + homepage = "https://www.ansible.com"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f5bb3fbc4b3..5b189058c73 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -417,6 +417,8 @@ in { ansible-collections = callPackage ../development/python-modules/ansible/collections.nix { }; + ansible-core = callPackage ../development/python-modules/ansible/core.nix { }; + ansible-kernel = callPackage ../development/python-modules/ansible-kernel { }; ansible-lint = callPackage ../development/python-modules/ansible-lint { }; From e3bd81828be7003d8f9bc7f6ffe3cb67131b56b9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 18 Sep 2021 03:40:00 +0200 Subject: [PATCH 04/23] ansible_2_11: init --- pkgs/tools/admin/ansible/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 63ef7646959..f2a56a8ab3b 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -3,6 +3,8 @@ rec { ansible = ansible_2_10; + ansible_2_11 = python3Packages.toPythonApplication python3Packages.ansible-core; + ansible_2_10 = python3Packages.toPythonApplication python3Packages.ansible-base; # End of support 2021/10/02, End of life 2021/12/31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9d2809ba21..376dbd1de67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12623,7 +12623,8 @@ in ansible ansible_2_8 ansible_2_9 - ansible_2_10; + ansible_2_10 + ansible_2_11; ansible-lint = with python3.pkgs; toPythonApplication ansible-lint; From 6ae0a35f2c019f32844ae920920fa63d73bfbe61 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 Jun 2021 17:06:15 +0000 Subject: [PATCH 05/23] ansible: 2.11.0 -> 2.11.1 (cherry picked from commit 41f507b1ef4175ec6a26b5e19c1118dbda983a42) --- pkgs/development/python-modules/ansible/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 690d5a1725d..b300771b346 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.11.0"; + version = "2.11.1"; src = fetchPypi { inherit pname version; - sha256 = "1if9cybdicjhrfzi6nndqakb4sh3mw1fijhvbzbsq7ki22vwww4l"; + sha256 = "sha256-fnWCepTUfRw+GTDXCPDvY3o6uaIfdXqvVd6rbp9HxoI="; }; # ansible_connection is already wrapped, so don't pass it through From 10f8ee55fe40a423890e39a724dedda43dc3fce9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Jun 2021 14:23:29 +0200 Subject: [PATCH 06/23] ansible: 2.11.1 -> 2.11.2 (cherry picked from commit bedf7abd6a1ceb3ebd15e26aabbd769c8620fd10) --- pkgs/development/python-modules/ansible/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index b300771b346..45ce2b8778a 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.11.1"; + version = "2.11.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fnWCepTUfRw+GTDXCPDvY3o6uaIfdXqvVd6rbp9HxoI="; + sha256 = "1syadgzn5ww5bhq9s2py4h1hkh11h7aac5b37zi8rw2xfvdc7r2s"; }; # ansible_connection is already wrapped, so don't pass it through From ba21a7bc10cf99c9f6f8fd3c9b6aa4291bd0ef1b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Jun 2021 16:14:07 +0200 Subject: [PATCH 07/23] ansible, ansible_2_10: internalize collections package This drops the python3Packages.ansible-collections attribute in favor of a local callPackage that overwrites the collections package per ansible version. (cherry picked from commit ca618d6401631cf2c82c81220c54e774b514297f) --- pkgs/development/python-modules/ansible/base.nix | 12 +++++++++++- .../python-modules/ansible/collections.nix | 10 ++++++---- pkgs/development/python-modules/ansible/core.nix | 12 +++++++++++- pkgs/top-level/python-packages.nix | 2 -- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/ansible/base.nix b/pkgs/development/python-modules/ansible/base.nix index 06f53423219..0a5cc01d929 100644 --- a/pkgs/development/python-modules/ansible/base.nix +++ b/pkgs/development/python-modules/ansible/base.nix @@ -1,8 +1,8 @@ { lib +, callPackage , buildPythonPackage , fetchPypi , installShellFiles -, ansible-collections , cryptography , jinja2 , junit-xml @@ -20,6 +20,12 @@ , xmltodict }: +let + ansible-collections = callPackage ./collections.nix { + version = "3.4.0"; # must be < 4.0 + sha256 = "096rbgz730njk0pg8qnc27mmz110wqrw354ca9gasb7rqg0f4d6a"; + }; +in buildPythonPackage rec { pname = "ansible-base"; version = "2.10.11"; @@ -69,6 +75,10 @@ buildPythonPackage rec { # internal import errors, missing dependencies doCheck = false; + passthru = { + collections = ansible-collections; + }; + meta = with lib; { description = "Radically simple IT automation"; homepage = "https://www.ansible.com"; diff --git a/pkgs/development/python-modules/ansible/collections.nix b/pkgs/development/python-modules/ansible/collections.nix index 9547b9a0918..05aa0b2b294 100644 --- a/pkgs/development/python-modules/ansible/collections.nix +++ b/pkgs/development/python-modules/ansible/collections.nix @@ -14,21 +14,23 @@ , xmltodict , withJunos ? false , withNetbox ? false + +, version +, sha256 }: buildPythonPackage rec { pname = "ansible"; - version = "3.4.0"; + inherit version; format = "setuptools"; src = fetchPypi { - inherit pname version; - sha256 = "096rbgz730njk0pg8qnc27mmz110wqrw354ca9gasb7rqg0f4d6a"; + inherit pname version sha256; }; postPatch = '' # make ansible-base depend on ansible-collection, not the other way around - sed -i '/ansible-base/d' setup.py + sed -Ei '/ansible-(base|core)/d' setup.py ''; propagatedBuildInputs = lib.unique ([ diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 45ce2b8778a..4dd606c9adb 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -1,8 +1,8 @@ { lib +, callPackage , buildPythonPackage , fetchPypi , installShellFiles -, ansible-collections , cryptography , jinja2 , junit-xml @@ -21,6 +21,12 @@ , xmltodict }: +let + ansible-collections = callPackage ./collections.nix { + version = "4.1.0"; + sha256 = "0rrivq1g0vizah8zmf012lzig2xxfk5x1371k16s3nn4zfkwqqgm"; + }; +in buildPythonPackage rec { pname = "ansible-core"; version = "2.11.2"; @@ -74,6 +80,10 @@ buildPythonPackage rec { # internal import errors, missing dependencies doCheck = false; + passthru = { + collections = ansible-collections; + }; + meta = with lib; { description = "Radically simple IT automation"; homepage = "https://www.ansible.com"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5b189058c73..6b9878b363d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -415,8 +415,6 @@ in { ansible-base = callPackage ../development/python-modules/ansible/base.nix { }; - ansible-collections = callPackage ../development/python-modules/ansible/collections.nix { }; - ansible-core = callPackage ../development/python-modules/ansible/core.nix { }; ansible-kernel = callPackage ../development/python-modules/ansible-kernel { }; From 0c9daa6b7a360c05cd5e265c8f8a2d22a98a0ecf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 20 Jul 2021 03:23:47 +0200 Subject: [PATCH 08/23] python3Packages.ansible-core: 2.11.2 -> 2.11.3 (cherry picked from commit 1e462be4ebd7317e5343f77049625ed09f7aade8) --- pkgs/development/python-modules/ansible/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 4dd606c9adb..ba29b0fb092 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -29,11 +29,11 @@ let in buildPythonPackage rec { pname = "ansible-core"; - version = "2.11.2"; + version = "2.11.3"; src = fetchPypi { inherit pname version; - sha256 = "1syadgzn5ww5bhq9s2py4h1hkh11h7aac5b37zi8rw2xfvdc7r2s"; + sha256 = "sha256-DO0bT2cZftsntQk0yV1MtkTG1jXXLH+CbEQl3+RTdnQ="; }; # ansible_connection is already wrapped, so don't pass it through From 98f655786aa7bb322fbff1a50bb420571954d0e4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 20 Jul 2021 03:24:51 +0200 Subject: [PATCH 09/23] python3Packages.ansible-base: 2.10.11 -> 2.10.12 (cherry picked from commit 32d56411205ba845946d94f68528ddc1c631d337) --- pkgs/development/python-modules/ansible/base.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/base.nix b/pkgs/development/python-modules/ansible/base.nix index 0a5cc01d929..0c88c378516 100644 --- a/pkgs/development/python-modules/ansible/base.nix +++ b/pkgs/development/python-modules/ansible/base.nix @@ -28,11 +28,11 @@ let in buildPythonPackage rec { pname = "ansible-base"; - version = "2.10.11"; + version = "2.10.12"; src = fetchPypi { inherit pname version; - sha256 = "0jr3cxqiami9k07g2kmvfp54iafbcnd1d66l8fdnaqka5bc19wdw"; + sha256 = "sha256-qWVW4tI5+Sg+FWVNQMGqhmgqTntD9Qtf8CK8jkK2mHg="; }; # ansible_connection is already wrapped, so don't pass it through From 94bdd1f98c7268f8ef3bac9dc8ed754b19334475 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 20 Jul 2021 03:33:37 +0200 Subject: [PATCH 10/23] python3Packages.ansible-core.collections: 4.1.0 -> 4.2.0 (cherry picked from commit dc1137bc98695e2ac2ae71bec57593d801481fdc) --- pkgs/development/python-modules/ansible/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index ba29b0fb092..8584ba7166a 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -23,8 +23,8 @@ let ansible-collections = callPackage ./collections.nix { - version = "4.1.0"; - sha256 = "0rrivq1g0vizah8zmf012lzig2xxfk5x1371k16s3nn4zfkwqqgm"; + version = "4.2.0"; + sha256 = "1l30j97q24klylchvbskdmp1xllswn9xskjvg4l0ra6pzfgq2zbk"; }; in buildPythonPackage rec { From c2a0f606fc2a4ee65266af2c688fcaa08c9976e7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 20 Jul 2021 03:38:55 +0200 Subject: [PATCH 11/23] python3Packages.ansible: 2.9.23 -> 2.9.24 (cherry picked from commit a9206d8c4c85ca6387129753f8a3877bc8a5321f) --- pkgs/development/python-modules/ansible/legacy.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/ansible/legacy.nix b/pkgs/development/python-modules/ansible/legacy.nix index 12eed6bdb29..95b127a0db3 100644 --- a/pkgs/development/python-modules/ansible/legacy.nix +++ b/pkgs/development/python-modules/ansible/legacy.nix @@ -1,5 +1,5 @@ { lib -, fetchFromGitHub +, fetchPypi , buildPythonPackage , pycrypto , paramiko @@ -18,13 +18,11 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.23"; + version = "2.9.24"; - src = fetchFromGitHub { - owner = "ansible"; - repo = "ansible"; - rev = "v${version}"; - sha256 = "0mikykpzyqpmaiczz53f71mcyc4qvahi9ckn7wgfx7sw7s2z3skk"; + src = fetchPypi { + inherit pname version; + sha256 = "sha256-DC9Tt75z3cNCPZZY/NGQeYl9Wx/FM8StVQ21ixea64o="; }; prePatch = '' From a7635ed014293127ee13df1a30ce6dfe0c937d74 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Jun 2021 20:06:11 +0200 Subject: [PATCH 12/23] python3Packages.resolvelib: 0.7.0 -> 0.7.1 (cherry picked from commit 50140f70d5cbb9d388df345c0eaf693c128f6487) --- pkgs/development/python-modules/resolvelib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/resolvelib/default.nix b/pkgs/development/python-modules/resolvelib/default.nix index db3ecbcc86e..a146cac392f 100644 --- a/pkgs/development/python-modules/resolvelib/default.nix +++ b/pkgs/development/python-modules/resolvelib/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "resolvelib"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "sarugaku"; repo = "resolvelib"; rev = version; - sha256 = "0r7cxwrfvpqz4kd7pdf8fsynzlmi6c754jd5hzd6vssc1zlyvvhx"; + sha256 = "1fqz75riagizihvf4j7wc3zjw6kmg1dd8sf49aszyml105kb33n8"; }; checkInputs = [ From 8fa3d05020e3cc8b1904b112b79734b5d46cc4a0 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Sat, 7 Aug 2021 16:27:54 -0700 Subject: [PATCH 13/23] pythonPackages.resolvelib: 0.7.1 -> 0.5.5 (cherry picked from commit c070b9e4f55bf474241359621bbb564fc00a39bc) --- pkgs/development/python-modules/ansible/core.nix | 3 --- pkgs/development/python-modules/resolvelib/default.nix | 9 +++++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 8584ba7166a..25b36e6985c 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -42,9 +42,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace lib/ansible/executor/task_executor.py \ --replace "[python," "[" - - substituteInPlace requirements.txt \ - --replace "resolvelib >= 0.5.3, < 0.6.0" "resolvelib" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/resolvelib/default.nix b/pkgs/development/python-modules/resolvelib/default.nix index a146cac392f..f5c1f435726 100644 --- a/pkgs/development/python-modules/resolvelib/default.nix +++ b/pkgs/development/python-modules/resolvelib/default.nix @@ -7,13 +7,18 @@ buildPythonPackage rec { 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 { owner = "sarugaku"; repo = "resolvelib"; rev = version; - sha256 = "1fqz75riagizihvf4j7wc3zjw6kmg1dd8sf49aszyml105kb33n8"; + sha256 = "198vfv78hilpg0d0mjzchzp9zk6239wnra61vlsgwpcgz66d2bgv"; }; checkInputs = [ From b72e5dddca0b8816f0ebd4569dedb7fbfcb1b6f7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 18 Aug 2021 02:30:24 +0200 Subject: [PATCH 14/23] python3Packages.ansible-base: 2.10.12 -> 2.10.13 (cherry picked from commit a02ec1002d077cda0ffb3b063d9ff8e9046c9738) --- pkgs/development/python-modules/ansible/base.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/base.nix b/pkgs/development/python-modules/ansible/base.nix index 0c88c378516..68063f0d778 100644 --- a/pkgs/development/python-modules/ansible/base.nix +++ b/pkgs/development/python-modules/ansible/base.nix @@ -28,11 +28,11 @@ let in buildPythonPackage rec { pname = "ansible-base"; - version = "2.10.12"; + version = "2.10.13"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qWVW4tI5+Sg+FWVNQMGqhmgqTntD9Qtf8CK8jkK2mHg="; + sha256 = "sha256-0sKbGUblrgh4SgdiuMSMMvg15GSNb5l6bCqBt4/0860="; }; # ansible_connection is already wrapped, so don't pass it through From 47a272011818197d9a5f322e8dc1d4a28da7397c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 18 Aug 2021 02:31:19 +0200 Subject: [PATCH 15/23] python3Packages.ansible-core: 2.11.3 -> 2.11.4 (cherry picked from commit aed6574b7e673cb2c9ff672b559c1bf101809524) --- pkgs/development/python-modules/ansible/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 25b36e6985c..9da18ecde0a 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -29,11 +29,11 @@ let in buildPythonPackage rec { pname = "ansible-core"; - version = "2.11.3"; + version = "2.11.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DO0bT2cZftsntQk0yV1MtkTG1jXXLH+CbEQl3+RTdnQ="; + sha256 = "sha256-Iuqnwt/myHXprjgDI/HLpiWcYFCl5MiBn4X5KzaD6kk="; }; # ansible_connection is already wrapped, so don't pass it through From 27a85d3fb681bee0c7e83843a1c3c5b131b2d59f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 18 Aug 2021 02:37:55 +0200 Subject: [PATCH 16/23] python3Packages.ansible-core.collections: 4.2.0 -> 4.4.0 (cherry picked from commit 9dd696bebb51fd6b29cc4d6062912306aa5ad669) --- pkgs/development/python-modules/ansible/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 9da18ecde0a..0e2d705cc88 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -23,8 +23,8 @@ let ansible-collections = callPackage ./collections.nix { - version = "4.2.0"; - sha256 = "1l30j97q24klylchvbskdmp1xllswn9xskjvg4l0ra6pzfgq2zbk"; + version = "4.4.0"; + sha256 = "031n22j0lsmh69x6i6gkva81j68b4yzh1pbg3q2h4bknl85q46ag"; }; in buildPythonPackage rec { From 8fef5752e47de7b585a8e4fc941875a00757ae35 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 18 Aug 2021 02:41:41 +0200 Subject: [PATCH 17/23] python3Packages.ansible: 2.9.24 -> 2.9.25 (cherry picked from commit 351eacd7b91c79774b4647e6bbb8aa179eb6e94e) --- pkgs/development/python-modules/ansible/legacy.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/legacy.nix b/pkgs/development/python-modules/ansible/legacy.nix index 95b127a0db3..7eb0f3f9404 100644 --- a/pkgs/development/python-modules/ansible/legacy.nix +++ b/pkgs/development/python-modules/ansible/legacy.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.24"; + version = "2.9.25"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DC9Tt75z3cNCPZZY/NGQeYl9Wx/FM8StVQ21ixea64o="; + sha256 = "sha256-i88sL1xgnluREUyosOQibWA7h/K+cdyzOOi30626oo8="; }; prePatch = '' From 248a53d37abca949ab16ae662d0b98bc411a07a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 22 Aug 2021 15:24:18 +0200 Subject: [PATCH 18/23] ansible: fix https url (cherry picked from commit b113d0c2039ab55212638dcd1a6d0de44ce321f6) --- pkgs/development/python-modules/ansible/collections.nix | 2 +- pkgs/development/python-modules/ansible/legacy.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/collections.nix b/pkgs/development/python-modules/ansible/collections.nix index 05aa0b2b294..0c58defb583 100644 --- a/pkgs/development/python-modules/ansible/collections.nix +++ b/pkgs/development/python-modules/ansible/collections.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { meta = with lib; { description = "Radically simple IT automation"; - homepage = "http://www.ansible.com"; + homepage = "https://www.ansible.com"; license = licenses.gpl3Plus; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/ansible/legacy.nix b/pkgs/development/python-modules/ansible/legacy.nix index 7eb0f3f9404..e7687f9b99d 100644 --- a/pkgs/development/python-modules/ansible/legacy.nix +++ b/pkgs/development/python-modules/ansible/legacy.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = "http://www.ansible.com"; + homepage = "https://www.ansible.com"; description = "Radically simple IT automation"; license = [ licenses.gpl3 ] ; maintainers = with maintainers; [ joamaki costrouc hexa ]; From c1aea1347e28cc0c715f0a47a55c540235925e10 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 Sep 2021 19:44:11 +0200 Subject: [PATCH 19/23] ansible_2_11.collections: 4.4.0 -> 4.5.0 (cherry picked from commit 6cb6e67ba1133bbf4ce05d1b550dbc8c7140c0ae) --- pkgs/development/python-modules/ansible/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 0e2d705cc88..9b81a3e3375 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -23,8 +23,8 @@ let ansible-collections = callPackage ./collections.nix { - version = "4.4.0"; - sha256 = "031n22j0lsmh69x6i6gkva81j68b4yzh1pbg3q2h4bknl85q46ag"; + version = "4.5.0"; + sha256 = "1c8dspqy4in7sgz10y1pggwnh1hv79wap7p7xhai0f0s6nr54lyc"; }; in buildPythonPackage rec { From 68ba4fd43ca450a0a37aa26cf6384236a927ce70 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 Sep 2021 19:44:59 +0200 Subject: [PATCH 20/23] ansible_2_11: 2.11.4 -> 2.11.5 (cherry picked from commit 31f932af46864ad5b18d8837586b9e6b9e5f89a8) --- pkgs/development/python-modules/ansible/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 9b81a3e3375..b64942b1078 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -29,11 +29,11 @@ let in buildPythonPackage rec { pname = "ansible-core"; - version = "2.11.4"; + version = "2.11.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Iuqnwt/myHXprjgDI/HLpiWcYFCl5MiBn4X5KzaD6kk="; + sha256 = "sha256-fTzkcBQSKQdFRwQ2NIXkhRP4rQ8AE4uIhw622IlT0SE="; }; # ansible_connection is already wrapped, so don't pass it through From e651e0ed60cb57ac27b340c4f8de22281e76544b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 Sep 2021 19:46:03 +0200 Subject: [PATCH 21/23] ansible_2_10: 2.10.13 -> 2.10.14 (cherry picked from commit 4156a5516dd2b8ca19b5ecbf307a6024e8f4861b) --- pkgs/development/python-modules/ansible/base.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/base.nix b/pkgs/development/python-modules/ansible/base.nix index 68063f0d778..3156ba18e10 100644 --- a/pkgs/development/python-modules/ansible/base.nix +++ b/pkgs/development/python-modules/ansible/base.nix @@ -28,11 +28,11 @@ let in buildPythonPackage rec { pname = "ansible-base"; - version = "2.10.13"; + version = "2.10.14"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0sKbGUblrgh4SgdiuMSMMvg15GSNb5l6bCqBt4/0860="; + sha256 = "sha256-gAxGRsWKWJf3HyIwFn21YmoZbeuiCPDvRWChg//Z39o="; }; # ansible_connection is already wrapped, so don't pass it through From 5db0a5d9a8654a34e72d06669a0aad69c0ac81c1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 Sep 2021 19:48:53 +0200 Subject: [PATCH 22/23] ansible_2_9: 2.9.25 -> 2.9.26 (cherry picked from commit 662df6f4ab97ca3fd81822448def9d13e349076e) --- pkgs/development/python-modules/ansible/legacy.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/legacy.nix b/pkgs/development/python-modules/ansible/legacy.nix index e7687f9b99d..3957e109c7c 100644 --- a/pkgs/development/python-modules/ansible/legacy.nix +++ b/pkgs/development/python-modules/ansible/legacy.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.25"; + version = "2.9.26"; src = fetchPypi { inherit pname version; - sha256 = "sha256-i88sL1xgnluREUyosOQibWA7h/K+cdyzOOi30626oo8="; + sha256 = "sha256-OuAqrSu+3PtBnOdevSpkjp3rc+ni2N6GyC1gR7G962M="; }; prePatch = '' From 8f5774b774e44bb01d342f69965432b3ec263dc1 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 19 Sep 2021 18:22:02 +0200 Subject: [PATCH 23/23] cawbird: 1.4.1 -> 1.4.2 maintenance and bugfix release, see upstream changelog https://github.com/IBBoard/cawbird/releases/tag/v1.4.2 (cherry picked from commit 1e7edcb21f13bfb959cf7fd0d41d52fdb9931164) --- pkgs/applications/networking/cawbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cawbird/default.nix b/pkgs/applications/networking/cawbird/default.nix index 517bd1e01cc..08f55450374 100644 --- a/pkgs/applications/networking/cawbird/default.nix +++ b/pkgs/applications/networking/cawbird/default.nix @@ -23,14 +23,14 @@ }: stdenv.mkDerivation rec { - version = "1.4.1"; + version = "1.4.2"; pname = "cawbird"; src = fetchFromGitHub { owner = "IBBoard"; repo = "cawbird"; rev = "v${version}"; - sha256 = "0lmrgcj1ky1vhzynl36k6ba3ws089x4qdrnkjk3lbr334kicx9na"; + sha256 = "17575cp5qcgsqf37y3xqg3vr6l2j8bbbkmy2c1l185rxghfacida"; }; nativeBuildInputs = [