Unverified Commit 2ef9f291 authored by Florian Klink's avatar Florian Klink Committed by GitHub
Browse files

canaille: 0.0.57 -> 0.0.74 (#402797)

parents d16f2e15 fb8b2a0e

nixos/tests/canaille.nix

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ import ./make-test-python.nix ( 
        server.succeed("sudo -iu canaille -- canaille create user --user-name admin --password adminpass --emails admin@${domain}")

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

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

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

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

      '';

  }

)

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

+26 −16
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  python3,

  fetchFromGitLab,

  fetchpatch,

  openldap,

  nixosTests,

}:
@@ -11,7 +12,7 @@ let 
in

python.pkgs.buildPythonApplication rec {

  pname = "canaille";

  version = "0.0.57";

  version = "0.0.74";

  pyproject = true;



  disabled = python.pythonOlder "3.10";
@@ -20,9 +21,17 @@ python.pkgs.buildPythonApplication rec { 
    owner = "yaal";

    repo = "canaille";

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

    hash = "sha256-pesN7k5kGHi3dqTMaXWdCsNsnaJxXv/Ku1wVC9N9a3k=";

    hash = "sha256-FL02ADM7rUU43XR71UWr4FLr/NeUau7zRwTMOSFm1T4=";

  };



  patches = [

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

    (fetchpatch {

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

      hash = "sha256-fu7D010NG7yUChOve7HY3e7mm2c/UGpfcTAiTU8BnGg=";

    })

  ];



  build-system = with python.pkgs; [

    hatchling

    babel
@@ -32,10 +41,12 @@ python.pkgs.buildPythonApplication rec { 
  dependencies =

    with python.pkgs;

    [

      blinker

      flask

      flask-caching

      flask-wtf

      pydantic-settings

      requests

      httpx

      wtforms

    ]

    ++ sentry-sdk.optional-dependencies.flask;
@@ -57,6 +68,7 @@ python.pkgs.buildPythonApplication rec { 
      toml

      faker

      time-machine

      pytest-scim2-server

    ]

    ++ optional-dependencies.front

    ++ optional-dependencies.oidc
@@ -79,27 +91,34 @@ python.pkgs.buildPythonApplication rec { 
    export SCHEMA="${openldap}/etc/schema"



    # Just use their example config for testing

    export CONFIG=canaille/config.sample.toml

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

  '';



  optional-dependencies = with python.pkgs; {

    front = [

      email-validator

      flask-babel

      flask-talisman

      flask-themer

      pycountry

      pytz

      toml

      tomlkit

      zxcvbn-rs-py

    ];

    oidc = [ authlib ];

    oidc = [

      authlib

      joserfc

    ];

    scim = [

      httpx

      scim2-models

      authlib

      scim2-client

    ];

    ldap = [ python-ldap ];

    sentry = [ sentry-sdk ];

    postgresql = [

      flask-alembic

      passlib

      sqlalchemy

      sqlalchemy-json
@@ -111,6 +130,7 @@ python.pkgs.buildPythonApplication rec { 
      qrcode

    ];

    sms = [ smpplib ];

    server = [ hypercorn ];

  };



  passthru = {
@@ -120,16 +140,6 @@ python.pkgs.buildPythonApplication rec { 
    };

  };



  disabledTests = [

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

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

    # FIX: update and see if this is fixed

    "test_invalid_client[ldap_backend]"

    "test_invalid_client[memory_backend]"

    "test_invalid_client[sql_backend]"

    "test_password_reset[sql_backend]"

  ];



  meta = with lib; {

    description = "Lightweight Identity and Authorization Management";

    homepage = "https://canaille.readthedocs.io/en/latest/index.html";

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

+2 −2
Original line number Diff line number Diff line
@@ -8,14 +8,14 @@ 
}:

python3Packages.buildPythonApplication rec {

  pname = "fittrackee";

  version = "0.9.4";

  version = "0.9.8";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "SamR1";

    repo = "FitTrackee";

    tag = "v${version}";

    hash = "sha256-01lkPboF4KaCPnZHYVXUdIhXpJYGwcRPubnbjMm3mLY=";

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

  };



  build-system = [

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

+10 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  fetchpatch,

  python3,

  openssl,

  libiconv,
@@ -33,6 +34,15 @@ python3.pkgs.buildPythonApplication rec { 
    hash = "sha256-PdAyEGLYmMLgcPQjzjuwvQo55olKgr079gsgQnUoKTM=";

  };



  patches = [

    # fix compatibility with authlib 1.5.2

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

    (fetchpatch {

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

      hash = "sha256-0EZL0esZ6IEjmBV1whSpfZoFsMJ2yZQPi1GjW7NQ484=";

    })

  ];



  postPatch = ''

    # Remove setuptools_rust from runtime dependencies

    # https://github.com/element-hq/synapse/blob/v1.69.0/pyproject.toml#L177-L185

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

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


buildPythonPackage rec {

  pname = "authlib";

  version = "1.5.1";

  version = "1.5.2";

  pyproject = true;



  disabled = pythonOlder "3.8";
@@ -29,7 +29,7 @@ buildPythonPackage rec { 
    owner = "lepture";

    repo = "authlib";

    tag = "v${version}";

    hash = "sha256-VMihaWqR4FbnTJ50fVf5e5B9GfVwRguq5UAC+D4bpxs=";

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

  };



  build-system = [ setuptools ];