talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

canaille: 0.0.56 -> 0.0.57

Browse Source 
https://gitlab.com/yaal/canaille/-/blob/0.0.57/CHANGES.rst
This commit is contained in:
Kerstin Humm 2025-01-03 14:19:36 +01:00 committed by Valentin Gagarin
parent b850c06e7b
commit f4a5e968bc
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/security/canaille.nix
View File

@ -33,9 +33,12 @@ let
old.dependencies old.dependencies
++ old.optional-dependencies.front ++ old.optional-dependencies.front
++ old.optional-dependencies.oidc ++ old.optional-dependencies.oidc
++ old.optional-dependencies.scim
++ old.optional-dependencies.ldap ++ old.optional-dependencies.ldap
++ old.optional-dependencies.sentry ++ old.optional-dependencies.sentry
++ old.optional-dependencies.postgresql; ++ old.optional-dependencies.postgresql
++ old.optional-dependencies.otp
++ old.optional-dependencies.sms;
makeWrapperArgs = (old.makeWrapperArgs or [ ]) ++ [ makeWrapperArgs = (old.makeWrapperArgs or [ ]) ++ [
"--set CONFIG /etc/canaille/config.toml" "--set CONFIG /etc/canaille/config.toml"
"--set SECRETS_DIR \"${secretsDir}\"" "--set SECRETS_DIR \"${secretsDir}\""

23
pkgs/by-name/ca/canaille/package.nix
View File

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