From c9d0bdb9ca0943462a7ed0ae3bf2f47fc5b8c7be Mon Sep 17 00:00:00 2001 From: Ali Rizvi Date: Wed, 16 Oct 2024 22:43:04 -0400 Subject: [PATCH 1/2] python3Packages.taskw: fix failing build --- pkgs/development/python-modules/taskw/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix index 9e4ad7c8bbcc..8e3e33cac1ed 100644 --- a/pkgs/development/python-modules/taskw/default.nix +++ b/pkgs/development/python-modules/taskw/default.nix @@ -2,13 +2,13 @@ lib, buildPythonPackage, fetchPypi, - pythonAtLeast, # build-system setuptools, # native dependencies taskwarrior2, + distutils, # dependencies kitchen, @@ -24,9 +24,6 @@ buildPythonPackage rec { version = "2.0.0"; pyproject = true; - # ModuleNotFoundError: No module named 'distutils' - disabled = pythonAtLeast "3.12"; - src = fetchPypi { inherit pname version; hash = "sha256-EQm9+b3nqbMqUAejAsh4MD/2UYi2QiWsdKMomkxUi90="; @@ -44,7 +41,10 @@ buildPythonPackage rec { build-system = [ setuptools ]; - buildInputs = [ taskwarrior2 ]; + buildInputs = [ + taskwarrior2 + distutils + ]; dependencies = [ kitchen From 778ade01d99365ef2123f30c742b41e1d181b036 Mon Sep 17 00:00:00 2001 From: Ali Rizvi Date: Wed, 16 Oct 2024 23:17:53 -0400 Subject: [PATCH 2/2] python3Packages.bugzilla: update 3.2.0 -> 3.3.0 --- pkgs/development/python-modules/bugzilla/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bugzilla/default.nix b/pkgs/development/python-modules/bugzilla/default.nix index 3125ed30624f..4ddc77de4c47 100644 --- a/pkgs/development/python-modules/bugzilla/default.nix +++ b/pkgs/development/python-modules/bugzilla/default.nix @@ -3,19 +3,20 @@ buildPythonPackage, fetchPypi, requests, + responses, pytestCheckHook, glibcLocalesUtf8, }: buildPythonPackage rec { pname = "bugzilla"; - version = "3.2.0"; + version = "3.3.0"; format = "setuptools"; src = fetchPypi { - pname = "python-${pname}"; + pname = "python_${pname}"; inherit version; - sha256 = "TvyM+il4N8nk6rIg4ZcXZxW9Ye4zzsLBsPJ5DweGA4c="; + sha256 = "sha256-4YIgFx4DPrO6YAxNE5NZ0BqhrOwdrrxDCJEORQdj3kc="; }; propagatedBuildInputs = [ requests ]; @@ -23,6 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook glibcLocalesUtf8 + responses ]; preCheck = ''