colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #305012 from pbsds/fix-consonance-1713429691 

python312Packages.{consonance,yowsup}: unbreak
This commit is contained in:
Peder Bergebakken Sundt 2024-04-19 01:23:06 +02:00 committed by GitHub
parent 101f07032d 84871db15f
commit 48dcfa145f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/python-modules/consonance/default.nix
View File

@ -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

5
pkgs/development/python-modules/yowsup/default.nix
View File

@ -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; {