canaille: 0.0.56 -> 0.0.57

https://gitlab.com/yaal/canaille/-/blob/0.0.57/CHANGES.rst
NixOS · Jan 3, 2025 · 4a621a7 · 4a621a7
1 parent 41b0fca
commit 4a621a7
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/nixos/modules/services/security/canaille.nix b/nixos/modules/services/security/canaille.nix
@@ -33,9 +33,12 @@ let
       old.dependencies
       ++ old.optional-dependencies.front
       ++ old.optional-dependencies.oidc
+      ++ old.optional-dependencies.scim
       ++ old.optional-dependencies.ldap
       ++ old.optional-dependencies.sentry
-      ++ old.optional-dependencies.postgresql;
+      ++ old.optional-dependencies.postgresql
+      ++ old.optional-dependencies.otp
+      ++ old.optional-dependencies.sms;
     makeWrapperArgs = (old.makeWrapperArgs or [ ]) ++ [
       "--set CONFIG /etc/canaille/config.toml"
       "--set SECRETS_DIR \"${secretsDir}\""

diff --git a/pkgs/by-name/ca/canaille/package.nix b/pkgs/by-name/ca/canaille/package.nix
@@ -11,7 +11,7 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "canaille";
-  version = "0.0.56";
+  version = "0.0.57";
   pyproject = true;
 
   disabled = python.pythonOlder "3.10";
@@ -20,7 +20,7 @@ python.pkgs.buildPythonApplication rec {
     owner = "yaal";
     repo = "canaille";
     rev = "refs/tags/${version}";
-    hash = "sha256-cLsLwttUDxMKVqtVDCY5A22m1YY1UezeZQh1j74WzgU=";
+    hash = "sha256-pesN7k5kGHi3dqTMaXWdCsNsnaJxXv/Ku1wVC9N9a3k=";
   };
 
   build-system = with python.pkgs; [
@@ -35,6 +35,7 @@ python.pkgs.buildPythonApplication rec {
       flask
       flask-wtf
       pydantic-settings
+      requests
       wtforms
     ]
     ++ sentry-sdk.optional-dependencies.flask;
@@ -51,15 +52,19 @@ python.pkgs.buildPythonApplication rec {
       pytest-lazy-fixtures
       pytest-smtpd
       pytest-xdist
+      scim2-tester
       slapd
       toml
       faker
       time-machine
     ]
     ++ optional-dependencies.front
     ++ optional-dependencies.oidc
+    ++ optional-dependencies.scim
     ++ optional-dependencies.ldap
-    ++ optional-dependencies.postgresql;
+    ++ optional-dependencies.postgresql
+    ++ optional-dependencies.otp
+    ++ optional-dependencies.sms;
 
   postInstall = ''
     mkdir -p $out/etc/schema
@@ -88,14 +93,24 @@ python.pkgs.buildPythonApplication rec {
       zxcvbn-rs-py
     ];
     oidc = [ authlib ];
+    scim = [
+      scim2-models
+      authlib
+    ];
     ldap = [ python-ldap ];
     sentry = [ sentry-sdk ];
     postgresql = [
       passlib
       sqlalchemy
       sqlalchemy-json
       sqlalchemy-utils
-    ] ++ sqlalchemy.optional-dependencies.postgresql;
+    ] ++ sqlalchemy.optional-dependencies.postgresql_psycopg2binary;
+    otp = [
+      otpauth
+      pillow
+      qrcode
+    ];
+    sms = [ smpplib ];
   };
 
   passthru = {