From 20e067c7f86e860a54d3e4ee5bb307376e6e0fe9 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 12 May 2024 09:59:26 +0200 Subject: [PATCH 1/2] python3Packages.woob: Fix missing pkg_resources with upstream patch --- pkgs/development/python-modules/woob/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix index abc876b388a8b..4667cbffe6725 100644 --- a/pkgs/development/python-modules/woob/default.nix +++ b/pkgs/development/python-modules/woob/default.nix @@ -2,6 +2,7 @@ , babel , buildPythonPackage , fetchFromGitLab +, fetchpatch , pythonRelaxDepsHook , html2text , lxml @@ -35,6 +36,14 @@ buildPythonPackage rec { hash = "sha256-M9AjV954H1w64YGCVxDEGGSnoEbmocG3zwltob6IW04="; }; + patches = [ + (fetchpatch { + name = "no-deprecated-pkg_resources.patch"; + url = "https://gitlab.com/woob/woob/-/commit/3283c4c1a935cc71acea98b2d8c88bc4bf28f643.patch"; + hash = "sha256-3bRuv93ivKRxbGr52coO023DlxHZWwUeInXTPqQAeL8="; + }) + ]; + nativeBuildInputs = [ setuptools pythonRelaxDepsHook From b91b9f636685fe6e92c6b602ef9ff675a7def789 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 12 May 2024 10:02:10 +0200 Subject: [PATCH 2/2] python3Packages.woob: Add missing python-jose This is used by some modules. --- pkgs/development/python-modules/woob/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix index 4667cbffe6725..96a3f5ebc9c04 100644 --- a/pkgs/development/python-modules/woob/default.nix +++ b/pkgs/development/python-modules/woob/default.nix @@ -12,6 +12,7 @@ , pycountry , pytestCheckHook , python-dateutil +, python-jose , pythonOlder , pyyaml , requests @@ -56,6 +57,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ babel python-dateutil + python-jose html2text lxml packaging