diff --git a/pkgs/by-name/la/lasuite-meet-frontend/package.nix b/pkgs/by-name/la/lasuite-meet-frontend/package.nix index f6a1d8c581be..11b12b988244 100644 --- a/pkgs/by-name/la/lasuite-meet-frontend/package.nix +++ b/pkgs/by-name/la/lasuite-meet-frontend/package.nix @@ -7,13 +7,13 @@ buildNpmPackage rec { pname = "lasuite-meet-frontend"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "meet"; tag = "v${version}"; - hash = "sha256-RmMFN1hDSU6q0ZROopsIDJ2nbmvdwW29YywX7rAbgP4="; + hash = "sha256-CvpGDfdK1+EJ+Tj9NLrfRfK4VpJVcDqezVJL6ZVdOQ8="; }; sourceRoot = "source/src/frontend"; @@ -21,7 +21,7 @@ buildNpmPackage rec { npmDeps = fetchNpmDeps { inherit version src; sourceRoot = "source/src/frontend"; - hash = "sha256-W7X5nDtQYxzFZAhei+EXx+j6THTDwz4gTR/wxfB+GI4="; + hash = "sha256-/JvAnfqaWHc91T5NhqEJGcqLMbSJmnGmReGjrqc+Chw="; }; buildPhase = '' diff --git a/pkgs/by-name/la/lasuite-meet/gh1199.patch b/pkgs/by-name/la/lasuite-meet/gh1199.patch new file mode 100644 index 000000000000..8545a1f6d108 --- /dev/null +++ b/pkgs/by-name/la/lasuite-meet/gh1199.patch @@ -0,0 +1,32 @@ +From cacd75fc0aeba7cf1733193c28c6118e2c249999 Mon Sep 17 00:00:00 2001 +From: Martin Weinelt +Date: Tue, 24 Mar 2026 16:07:00 +0100 +Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B(backend):=20fix=20module=20inclusi?= + =?UTF-8?q?on=20with=20uv-build?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +After migrating to uv-build only the module matching the project name was +included in sdist/wheel packages. Without a src layout additional modules +need to be tracked manually to ship them in built packages. +--- + pyproject.toml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/pyproject.toml b/pyproject.toml +index 1f7757146..4a04e995d 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -90,6 +90,11 @@ dev = [ + ] + + [tool.uv.build-backend] ++module-name = [ ++ "core", ++ "demo", ++ "meet" ++] + module-root = "" + source-exclude = [ + "**/tests/**", diff --git a/pkgs/by-name/la/lasuite-meet/package.nix b/pkgs/by-name/la/lasuite-meet/package.nix index 3b3831673775..3dc1aa9547ee 100644 --- a/pkgs/by-name/la/lasuite-meet/package.nix +++ b/pkgs/by-name/la/lasuite-meet/package.nix @@ -13,14 +13,14 @@ in python.pkgs.buildPythonApplication rec { pname = "lasuite-meet"; - version = "1.10.0"; + version = "1.11.0"; pyproject = true; src = fetchFromGitHub { owner = "suitenumerique"; repo = "meet"; tag = "v${version}"; - hash = "sha256-RmMFN1hDSU6q0ZROopsIDJ2nbmvdwW29YywX7rAbgP4="; + hash = "sha256-CvpGDfdK1+EJ+Tj9NLrfRfK4VpJVcDqezVJL6ZVdOQ8="; }; sourceRoot = "source/src/backend"; @@ -28,9 +28,18 @@ python.pkgs.buildPythonApplication rec { patches = [ # Support configuration throught environment variables for SECURE_* ./secure_settings.patch + # Fix module inclusion after switching to uv-build + # https://github.com/suitenumerique/meet/pull/1199 + ./gh1199.patch + ]; - build-system = with python.pkgs; [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.10.9,<0.11.0" "uv_build" + ''; + + build-system = with python.pkgs; [ uv-build ]; dependencies = with python.pkgs; @@ -46,6 +55,7 @@ python.pkgs.buildPythonApplication rec { django-cors-headers django-countries django-extensions + django-filter django-lasuite django-parler django-pydantic-field @@ -70,6 +80,7 @@ python.pkgs.buildPythonApplication rec { pyjwt pyopenssl python-frontmatter + python-magic redis requests sentry-sdk