1
0

add n0emis, some packages and pre-yate-n0emis

This commit is contained in:
Ember 'n0emis' Keske
2022-07-07 19:46:59 +02:00
parent b9a581c63f
commit 97ebfe5ad2
21 changed files with 511 additions and 184 deletions

View File

@@ -0,0 +1,4 @@
self: super: {
python-yate = self.callPackage ./python-yate { };
ywsd = self.callPackage ./ywsd { };
}

View File

@@ -0,0 +1,15 @@
{ lib, buildPythonPackage, fetchPypi, async-timeout }:
buildPythonPackage rec {
pname = "python-yate";
version = "0.3.1";
src = fetchPypi {
inherit pname version;
sha256 = "5e806802dc47a35c855b60cd459a2c98fb0109c7fc099f3e9f83a1a38abf9f90";
};
propagatedBuildInputs = [ async-timeout ];
pythonImportsCheck = [ "yate" ];
}

View File

@@ -0,0 +1,14 @@
diff --git a/ywsd/objects.py b/ywsd/objects.py
index 4ce29fb..a535e76 100644
--- a/ywsd/objects.py
+++ b/ywsd/objects.py
@@ -178,7 +178,8 @@ class ActiveCall:
async def is_active_call(cls, username, x_eventphone_id, db_connection):
return (
await db_connection.scalar(
- cls.table.count()
+ sa.select(sa.func.count('*'))
+ .select_from(cls.table)
.where(cls.table.c.username == username)
.where(cls.table.c.x_eventphone_id == x_eventphone_id)
)

View File

@@ -0,0 +1,20 @@
{ lib, buildPythonApplication, fetchFromGitHub, aiopg, aiohttp, python-yate
, pyyaml, sqlalchemy }:
buildPythonApplication rec {
pname = "ywsd";
version = "0.11.0";
src = fetchFromGitHub {
owner = "eventphone";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9DloJSKR3Ck4Bsc0ICcAAD6LHIMeOHTe2rCx6nPINT4=";
};
patches = [ ./count.patch ];
propagatedBuildInputs = [ aiopg aiohttp python-yate pyyaml sqlalchemy ];
doCheck = false;
}