commit 2ef9f291ef9021f85b68d3ebfc7a1feafdc35cb3 · pyrox.dev/nixpkgs

+1 -1

nixos/tests/canaille.nix

···

       56
       56
        
               server.succeed("sudo -iu canaille -- canaille create user --user-name admin --password adminpass --emails admin@${domain}")

     

       57
       57
        
               json_str = server.succeed("sudo -iu canaille -- canaille get user")

     

       58
       58
        
               assert json.loads(json_str)[0]["user_name"] == "admin"

     

       59
       59
       -
               server.succeed("sudo -iu canaille -- canaille check")

     

       59
       59
       +
               server.succeed("sudo -iu canaille -- canaille config check")

     

       60
       60
        
             '';

     

       61
       61
        
         }

     

       62
       62
        
       )

+26 -16

pkgs/by-name/ca/canaille/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         python3,

     

       4
       4
        
         fetchFromGitLab,

     

       5
       5
       +
         fetchpatch,

     

       5
       6
        
         openldap,

     

       6
       7
        
         nixosTests,

     

       7
       8
        
       }:

     
···

       11
       12
        
       in

     

       12
       13
        
       python.pkgs.buildPythonApplication rec {

     

       13
       14
        
         pname = "canaille";

     

       14
       14
       -
         version = "0.0.57";

     

       15
       15
       +
         version = "0.0.74";

     

       15
       16
        
         pyproject = true;

     

       16
       17
        
       

     

       17
       18
        
         disabled = python.pythonOlder "3.10";

     
···

       20
       21
        
           owner = "yaal";

     

       21
       22
        
           repo = "canaille";

     

       22
       23
        
           rev = "refs/tags/${version}";

     

       23
       23
       -
           hash = "sha256-pesN7k5kGHi3dqTMaXWdCsNsnaJxXv/Ku1wVC9N9a3k=";

     

       24
       24
       +
           hash = "sha256-FL02ADM7rUU43XR71UWr4FLr/NeUau7zRwTMOSFm1T4=";

     

       24
       25
        
         };

     

       25
       26
        
       

     

       27
       27
       +
         patches = [

     

       28
       28
       +
           # https://gitlab.com/yaal/canaille/-/merge_requests/275

     

       29
       29
       +
           (fetchpatch {

     

       30
       30
       +
             url = "https://gitlab.com/yaal/canaille/-/commit/1c7fc8b1034a4423f7f46ad8adeced854910b702.patch";

     

       31
       31
       +
             hash = "sha256-fu7D010NG7yUChOve7HY3e7mm2c/UGpfcTAiTU8BnGg=";

     

       32
       32
       +
           })

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       26
       35
        
         build-system = with python.pkgs; [

     

       27
       36
        
           hatchling

     

       28
       37
        
           babel

     
···

       32
       41
        
         dependencies =

     

       33
       42
        
           with python.pkgs;

     

       34
       43
        
           [

     

       44
       44
       +
             blinker

     

       35
       45
        
             flask

     

       46
       46
       +
             flask-caching

     

       36
       47
        
             flask-wtf

     

       37
       48
        
             pydantic-settings

     

       38
       38
       -
             requests

     

       49
       49
       +
             httpx

     

       39
       50
        
             wtforms

     

       40
       51
        
           ]

     

       41
       52
        
           ++ sentry-sdk.optional-dependencies.flask;

     
···

       57
       68
        
             toml

     

       58
       69
        
             faker

     

       59
       70
        
             time-machine

     

       71
       71
       +
             pytest-scim2-server

     

       60
       72
        
           ]

     

       61
       73
        
           ++ optional-dependencies.front

     

       62
       74
        
           ++ optional-dependencies.oidc

     
···

       79
       91
        
           export SCHEMA="${openldap}/etc/schema"

     

       80
       92
        
       

     

       81
       93
        
           # Just use their example config for testing

     

       82
       82
       -
           export CONFIG=canaille/config.sample.toml

     

       94
       94
       +
           export CONFIG=tests/app/fixtures/default-config.toml

     

       83
       95
        
         '';

     

       84
       96
        
       

     

       85
       97
        
         optional-dependencies = with python.pkgs; {

     

       86
       98
        
           front = [

     

       87
       99
        
             email-validator

     

       88
       100
        
             flask-babel

     

       101
       101
       +
             flask-talisman

     

       89
       102
        
             flask-themer

     

       90
       103
        
             pycountry

     

       91
       104
        
             pytz

     

       92
       92
       -
             toml

     

       105
       105
       +
             tomlkit

     

       93
       106
        
             zxcvbn-rs-py

     

       94
       107
        
           ];

     

       95
       95
       -
           oidc = [ authlib ];

     

       108
       108
       +
           oidc = [

     

       109
       109
       +
             authlib

     

       110
       110
       +
             joserfc

     

       111
       111
       +
           ];

     

       96
       112
        
           scim = [

     

       113
       113
       +
             httpx

     

       97
       114
        
             scim2-models

     

       98
       115
        
             authlib

     

       116
       116
       +
             scim2-client

     

       99
       117
        
           ];

     

       100
       118
        
           ldap = [ python-ldap ];

     

       101
       119
        
           sentry = [ sentry-sdk ];

     

       102
       120
        
           postgresql = [

     

       121
       121
       +
             flask-alembic

     

       103
       122
        
             passlib

     

       104
       123
        
             sqlalchemy

     

       105
       124
        
             sqlalchemy-json

     
···

       111
       130
        
             qrcode

     

       112
       131
        
           ];

     

       113
       132
        
           sms = [ smpplib ];

     

       133
       133
       +
           server = [ hypercorn ];

     

       114
       134
        
         };

     

       115
       135
        
       

     

       116
       136
        
         passthru = {

     
···

       119
       139
        
             inherit (nixosTests) canaille;

     

       120
       140
        
           };

     

       121
       141
        
         };

     

       122
       122
       -
       

     

       123
       123
       -
         disabledTests = [

     

       124
       124
       -
           # cause by authlib being too up-to-date for this version of canaille

     

       125
       125
       -
           # see: https://github.com/NixOS/nixpkgs/issues/389861#issuecomment-2726361949

     

       126
       126
       -
           # FIX: update and see if this is fixed

     

       127
       127
       -
           "test_invalid_client[ldap_backend]"

     

       128
       128
       -
           "test_invalid_client[memory_backend]"

     

       129
       129
       -
           "test_invalid_client[sql_backend]"

     

       130
       130
       -
           "test_password_reset[sql_backend]"

     

       131
       131
       -
         ];

     

       132
       142
        
       

     

       133
       143
        
         meta = with lib; {

     

       134
       144
        
           description = "Lightweight Identity and Authorization Management";

+2 -2

pkgs/by-name/fi/fittrackee/package.nix

···

       8
       8
        
       }:

     

       9
       9
        
       python3Packages.buildPythonApplication rec {

     

       10
       10
        
         pname = "fittrackee";

     

       11
       11
       -
         version = "0.9.4";

     

       11
       11
       +
         version = "0.9.8";

     

       12
       12
        
         pyproject = true;

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "SamR1";

     

       16
       16
        
           repo = "FitTrackee";

     

       17
       17
        
           tag = "v${version}";

     

       18
       18
       -
           hash = "sha256-01lkPboF4KaCPnZHYVXUdIhXpJYGwcRPubnbjMm3mLY=";

     

       18
       18
       +
           hash = "sha256-WwyDDH/ucXyYF0uCaDPdb32Fof+UlM9eBNk11cyhH90=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         build-system = [

+10

pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       +
         fetchpatch,

     

       5
       6
        
         python3,

     

       6
       7
        
         openssl,

     

       7
       8
        
         libiconv,

     
···

       32
       33
        
           name = "${pname}-${version}";

     

       33
       34
        
           hash = "sha256-PdAyEGLYmMLgcPQjzjuwvQo55olKgr079gsgQnUoKTM=";

     

       34
       35
        
         };

     

       36
       36
       +
       

     

       37
       37
       +
         patches = [

     

       38
       38
       +
           # fix compatibility with authlib 1.5.2

     

       39
       39
       +
           # https://github.com/element-hq/synapse/pull/18390

     

       40
       40
       +
           (fetchpatch {

     

       41
       41
       +
             url = "https://github.com/element-hq/synapse/commit/c9adbc6a1ce6039b1c04ae3298e463a3e3b25c38.patch";

     

       42
       42
       +
             hash = "sha256-0EZL0esZ6IEjmBV1whSpfZoFsMJ2yZQPi1GjW7NQ484=";

     

       43
       43
       +
           })

     

       44
       44
       +
         ];

     

       35
       45
        
       

     

       36
       46
        
         postPatch = ''

     

       37
       47
        
           # Remove setuptools_rust from runtime dependencies

+2 -2

pkgs/development/python-modules/authlib/default.nix

···

       20
       20
        
       

     

       21
       21
        
       buildPythonPackage rec {

     

       22
       22
        
         pname = "authlib";

     

       23
       23
       -
         version = "1.5.1";

     

       23
       23
       +
         version = "1.5.2";

     

       24
       24
        
         pyproject = true;

     

       25
       25
        
       

     

       26
       26
        
         disabled = pythonOlder "3.8";

     
···

       29
       29
        
           owner = "lepture";

     

       30
       30
        
           repo = "authlib";

     

       31
       31
        
           tag = "v${version}";

     

       32
       32
       -
           hash = "sha256-VMihaWqR4FbnTJ50fVf5e5B9GfVwRguq5UAC+D4bpxs=";

     

       32
       32
       +
           hash = "sha256-ra1RKprUAqhax0z1osl0lFgFENQZuSW/5FxSmsCdKNY=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         build-system = [ setuptools ];

+52

pkgs/development/python-modules/flask-alembic/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildPythonPackage,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         pythonAtLeast,

     

       6
       6
       +
         flit-core,

     

       7
       7
       +
         alembic,

     

       8
       8
       +
         flask,

     

       9
       9
       +
         sqlalchemy,

     

       10
       10
       +
         pytestCheckHook,

     

       11
       11
       +
         flask-sqlalchemy,

     

       12
       12
       +
         flask-sqlalchemy-lite,

     

       13
       13
       +
       }:

     

       14
       14
       +
       

     

       15
       15
       +
       buildPythonPackage rec {

     

       16
       16
       +
         pname = "flask-alembic";

     

       17
       17
       +
         version = "3.1.1";

     

       18
       18
       +
       

     

       19
       19
       +
         pyproject = true;

     

       20
       20
       +
       

     

       21
       21
       +
         src = fetchFromGitHub {

     

       22
       22
       +
           owner = "pallets-eco";

     

       23
       23
       +
           repo = "flask-alembic";

     

       24
       24
       +
           tag = version;

     

       25
       25
       +
           hash = "sha256-iHJr9l3w1WwZXDl573IV7+A7RDcawGL20sxxhAQQ628=";

     

       26
       26
       +
         };

     

       27
       27
       +
       

     

       28
       28
       +
         build-system = [ flit-core ];

     

       29
       29
       +
       

     

       30
       30
       +
         dependencies = [

     

       31
       31
       +
           alembic

     

       32
       32
       +
           flask

     

       33
       33
       +
           sqlalchemy

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       36
       36
       +
         nativeCheckInputs = [

     

       37
       37
       +
           pytestCheckHook

     

       38
       38
       +
           flask-sqlalchemy

     

       39
       39
       +
           flask-sqlalchemy-lite

     

       40
       40
       +
         ];

     

       41
       41
       +
       

     

       42
       42
       +
         pythonImportChecks = [ "flask_alembic" ];

     

       43
       43
       +
       

     

       44
       44
       +
         meta = with lib; {

     

       45
       45
       +
           # https://github.com/pallets-eco/flask-alembic/issues/47

     

       46
       46
       +
           broken = pythonAtLeast "3.13";

     

       47
       47
       +
           homepage = "https://github.com/pallets-eco/flask-alembic";

     

       48
       48
       +
           changelog = "https://github.com/pallets-eco/flask-alembic/blob/${src.tag}/CHANGES.md";

     

       49
       49
       +
           license = licenses.mit;

     

       50
       50
       +
           maintainers = with maintainers; [ erictapen ];

     

       51
       51
       +
         };

     

       52
       52
       +
       }

+49

pkgs/development/python-modules/pytest-scim2-server/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildPythonPackage,

     

       4
       4
       +
         fetchPypi,

     

       5
       5
       +
         hatchling,

     

       6
       6
       +
         portpicker,

     

       7
       7
       +
         pytest,

     

       8
       8
       +
         scim2-server,

     

       9
       9
       +
         pytestCheckHook,

     

       10
       10
       +
         scim2-client,

     

       11
       11
       +
         cacert,

     

       12
       12
       +
       }:

     

       13
       13
       +
       

     

       14
       14
       +
       buildPythonPackage rec {

     

       15
       15
       +
         pname = "pytest-scim2-server";

     

       16
       16
       +
         version = "0.1.2";

     

       17
       17
       +
       

     

       18
       18
       +
         pyproject = true;

     

       19
       19
       +
       

     

       20
       20
       +
         # Pypi doesn't link a VCS repository

     

       21
       21
       +
         src = fetchPypi {

     

       22
       22
       +
           pname = "pytest_scim2_server";

     

       23
       23
       +
           inherit version;

     

       24
       24
       +
           hash = "sha256-uWWFqkloTkvtIfpBNy93fa+c+b/FATjwytLKRde4bHg=";

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
         build-system = [ hatchling ];

     

       28
       28
       +
       

     

       29
       29
       +
         dependencies = [

     

       30
       30
       +
           portpicker

     

       31
       31
       +
           pytest

     

       32
       32
       +
           scim2-server

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         nativeCheckInputs = [

     

       36
       36
       +
           pytestCheckHook

     

       37
       37
       +
           scim2-client

     

       38
       38
       +
         ] ++ scim2-client.optional-dependencies.httpx;

     

       39
       39
       +
       

     

       40
       40
       +
         env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";

     

       41
       41
       +
       

     

       42
       42
       +
         pythonImportsCheck = [ "pytest_scim2_server" ];

     

       43
       43
       +
       

     

       44
       44
       +
         meta = {

     

       45
       45
       +
           homepage = "https://pypi.org/project/pytest-scim2-server";

     

       46
       46
       +
           license = lib.licenses.mit;

     

       47
       47
       +
           maintainers = with lib.maintainers; [ erictapen ];

     

       48
       48
       +
         };

     

       49
       49
       +
       }

+4

pkgs/top-level/python-packages.nix

···

       4981
       4981
        
       

     

       4982
       4982
        
         flask-admin = callPackage ../development/python-modules/flask-admin { };

     

       4983
       4983
        
       

     

       4984
       4984
       +
         flask-alembic = callPackage ../development/python-modules/flask-alembic { };

     

       4985
       4985
       +
       

     

       4984
       4986
        
         flask-allowed-hosts = callPackage ../development/python-modules/flask-allowed-hosts { };

     

       4985
       4987
        
       

     

       4986
       4988
        
         flask-api = callPackage ../development/python-modules/flask-api { };

     
···

       13783
       13785
        
         pytest-run-parallel = callPackage ../development/python-modules/pytest-run-parallel { };

     

       13784
       13786
        
       

     

       13785
       13787
        
         pytest-ruff = callPackage ../development/python-modules/pytest-ruff { };

     

       13788
       13788
       +
       

     

       13789
       13789
       +
         pytest-scim2-server = callPackage ../development/python-modules/pytest-scim2-server { };

     

       13786
       13790
        
       

     

       13787
       13791
        
         pytest-selenium = callPackage ../development/python-modules/pytest-selenium { };

     

       13788
       13792