diff --git a/pkgs/by-name/la/lasuite-meet/frontend.nix b/pkgs/by-name/la/lasuite-meet/frontend.nix index a6ff5debfd6e..4afde016f643 100644 --- a/pkgs/by-name/la/lasuite-meet/frontend.nix +++ b/pkgs/by-name/la/lasuite-meet/frontend.nix @@ -3,17 +3,37 @@ version, meta, fetchNpmDeps, + fetchpatch, buildNpmPackage, }: buildNpmPackage (finalAttrs: { pname = "lasuite-meet-frontend"; inherit src version; + patches = [ + # backport build fix + # FIXME: remove in next release + (fetchpatch { + url = "https://github.com/suitenumerique/meet/commit/df1495c97bc913866169ee8875a9a3169fcfc87e.diff"; + stripLen = 2; + includes = [ + "package.json" + "package-lock.json" + ]; + hash = "sha256-1A26T6LtFlOiJNVGD/fZs562feoQXY37A2ecUfvDGpk="; + }) + ]; + sourceRoot = "${finalAttrs.src.name}/src/frontend"; npmDeps = fetchNpmDeps { - inherit (finalAttrs) version src sourceRoot; - hash = "sha256-YnHjuwDp293KVNTYTd4KcZqMamZNeccOdpSGgJ9a3G8="; + inherit (finalAttrs) + version + src + patches + sourceRoot + ; + hash = "sha256-uiD5pcpmka43uraMFo7lRuQFx/4aq1BEhQvyCAzo8fg="; }; npmBuildScript = "build"; diff --git a/pkgs/by-name/la/lasuite-meet/mail.nix b/pkgs/by-name/la/lasuite-meet/mail.nix index 128b5f6e8dee..9cdc0bbc74e3 100644 --- a/pkgs/by-name/la/lasuite-meet/mail.nix +++ b/pkgs/by-name/la/lasuite-meet/mail.nix @@ -22,7 +22,7 @@ buildNpmPackage (finalAttrs: { pname = "${finalAttrs.pname}-npm-deps"; inherit version src; inherit (finalAttrs) sourceRoot; - hash = "sha256-yq88kbrKn9HMwvxcWNXm7zonAqTs8T2i7iQAsD0TtnU="; + hash = "sha256-EPVkSzhecDZpvz+uOW0GZnmWl9KfE3UpkTCnhVnJ7dg="; }; npmBuildScript = "build"; diff --git a/pkgs/by-name/la/lasuite-meet/package.nix b/pkgs/by-name/la/lasuite-meet/package.nix index ee61defe5c5e..efb0ab1e6b5e 100644 --- a/pkgs/by-name/la/lasuite-meet/package.nix +++ b/pkgs/by-name/la/lasuite-meet/package.nix @@ -6,13 +6,13 @@ python3, }: let - version = "1.21.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "meet"; tag = "v${version}"; - hash = "sha256-pUCSdnTBj/qwc0cya3P96r89r2K1GNSGg4DeIhxUKwI="; + hash = "sha256-w2Lw5K62Iaqzqa/ckxK36o5ZHFLXUpHnGGGl5PYGjaI="; }; meta = { @@ -86,6 +86,7 @@ python.pkgs.buildPythonApplication (finalAttrs: { mozilla-django-oidc nested-multipart-parser phonenumbers + posthog psycopg pydantic pyjwt