diff options
| author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2024-04-19 01:23:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-19 01:23:06 +0200 |
| commit | 48dcfa145f7ccf8ad3b829d45c2bd2defe6f64db (patch) | |
| tree | 73fc3dac213496336f1ae41a885bf46584370551 | |
| parent | 101f07032dceefcc98d78f12a054b85dbe27b75f (diff) | |
| parent | 84871db15f87707aa564b458bd4099f38f9987ed (diff) | |
Merge pull request #305012 from pbsds/fix-consonance-1713429691
python312Packages.{consonance,yowsup}: unbreak
| -rw-r--r-- | pkgs/development/python-modules/consonance/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/python-modules/yowsup/default.nix | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/consonance/default.nix b/pkgs/development/python-modules/consonance/default.nix index b14d965e5629..e13665cd5dc3 100644 --- a/pkgs/development/python-modules/consonance/default.nix +++ b/pkgs/development/python-modules/consonance/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , dissononce , python-axolotl-curve25519 , transitions @@ -23,6 +24,15 @@ buildPythonPackage rec { hash = "sha256-BhgxLxjKZ4dSL7DqkaoS+wBPCd1SYZomRKrtDLdGmYQ="; }; + patches = [ + # https://github.com/tgalal/consonance/pull/9 + (fetchpatch { + name = "fix-type-error.patch"; + url = "https://github.com/tgalal/consonance/pull/9/commits/92fb78af98a18f0533ec8a286136968174fb0baf.patch"; + hash = "sha256-wVUGxZ4W2zPyrcQPQTc85LcRUtsLbTBVzS10NEolpQY="; + }) + ]; + propagatedBuildInputs = [ dissononce python-axolotl-curve25519 diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix index bc79ff51823f..a88a296944a5 100644 --- a/pkgs/development/python-modules/yowsup/default.nix +++ b/pkgs/development/python-modules/yowsup/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonOlder , isPy3k , fetchFromGitHub , appdirs @@ -7,6 +8,7 @@ , protobuf , python-axolotl , six +, pyasyncore , pytestCheckHook }: @@ -42,6 +44,9 @@ buildPythonPackage rec { protobuf python-axolotl six + ] + ++ lib.optionals (!pythonOlder "3.12") [ + pyasyncore ]; meta = with lib; { |