From 0db12f62d09370274d4b8efa0b4448373da89759 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 14 May 2026 17:23:09 +0200 Subject: [PATCH] lasuite-docs{,-frontend,-collaboration-server}: 5.0.0 -> 5.1.0 ChangeLog: https://github.com/suitenumerique/docs/releases/tag/v5.1.0 --- .../package.nix | 6 +++--- .../la/lasuite-docs-frontend/package.nix | 6 +++--- pkgs/by-name/la/lasuite-docs/package.nix | 15 +++++++++++---- pkgs/by-name/la/lasuite-docs/uv.patch | 19 +++++++++++++++++++ 4 files changed, 36 insertions(+), 10 deletions(-) create mode 100644 pkgs/by-name/la/lasuite-docs/uv.patch diff --git a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix index f73ca50ace2d..2cfc05c5b251 100644 --- a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix +++ b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix @@ -13,20 +13,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "lasuite-docs-collaboration-server"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${finalAttrs.version}"; - hash = "sha256-yjcnXC46C2Z453oN4/fJc2q+B0yQKL3jKaIIpRlzu5s="; + hash = "sha256-Ptg3C+5DbUiWVS8nMCmqmSFMmNI4NW8NYBF+G5xOqSg="; }; sourceRoot = "${finalAttrs.src.name}/src/frontend"; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock"; - hash = "sha256-K7AvCt2GMwo+mtTqa3c0OGUGM3Whfo/WfeYG/Vjxhtg="; + hash = "sha256-GW60XK+iOM4A/Pyvh120MnNde8dPiZu46aOTfHOczZg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lasuite-docs-frontend/package.nix b/pkgs/by-name/la/lasuite-docs-frontend/package.nix index 42acd81d8442..f4559db67265 100644 --- a/pkgs/by-name/la/lasuite-docs-frontend/package.nix +++ b/pkgs/by-name/la/lasuite-docs-frontend/package.nix @@ -12,20 +12,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "lasuite-docs-frontend"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${finalAttrs.version}"; - hash = "sha256-yjcnXC46C2Z453oN4/fJc2q+B0yQKL3jKaIIpRlzu5s="; + hash = "sha256-Ptg3C+5DbUiWVS8nMCmqmSFMmNI4NW8NYBF+G5xOqSg="; }; sourceRoot = "${finalAttrs.src.name}/src/frontend"; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock"; - hash = "sha256-K7AvCt2GMwo+mtTqa3c0OGUGM3Whfo/WfeYG/Vjxhtg="; + hash = "sha256-GW60XK+iOM4A/Pyvh120MnNde8dPiZu46aOTfHOczZg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lasuite-docs/package.nix b/pkgs/by-name/la/lasuite-docs/package.nix index 050a4a3f797f..024b16dd7fb0 100644 --- a/pkgs/by-name/la/lasuite-docs/package.nix +++ b/pkgs/by-name/la/lasuite-docs/package.nix @@ -11,12 +11,12 @@ yarnConfigHook, }: let - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${version}"; - hash = "sha256-yjcnXC46C2Z453oN4/fJc2q+B0yQKL3jKaIIpRlzu5s="; + hash = "sha256-Ptg3C+5DbUiWVS8nMCmqmSFMmNI4NW8NYBF+G5xOqSg="; }; mail-templates = stdenv.mkDerivation { @@ -29,7 +29,7 @@ let offlineCache = fetchYarnDeps { yarnLock = "${src}/src/mail/yarn.lock"; - hash = "sha256-g5MYtHvs0i0AOAydMxJNx1xTwbZtXS0CYDNQC+cnIOM="; + hash = "sha256-CKKGY87C5ifv0sHm9ExCzaGM3mV4C0NsWLCbw+ALqGc="; }; nativeBuildInputs = [ @@ -55,6 +55,10 @@ python3Packages.buildPythonApplication (finalAttrs: { # Fix creation of unsafe C function in postgresql migrations ./postgresql_fix.patch + + # Fix installing all modules with uv_build + # https://github.com/suitenumerique/docs/pull/2295 + ./uv.patch ]; # They use a old version of mistralai which exported a class @@ -64,6 +68,9 @@ python3Packages.buildPythonApplication (finalAttrs: { --replace-fail \ "from mistralai import Mistral" \ "from mistralai.client import Mistral" + + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.11.9,<0.12" "uv_build" '' # Otherwise fails with: # socket.gaierror: [Errno 8] nodename nor servname provided, or not known @@ -75,7 +82,7 @@ python3Packages.buildPythonApplication (finalAttrs: { ''; __darwinAllowLocalNetworking = true; - build-system = with python3Packages; [ setuptools ]; + build-system = with python3Packages; [ uv-build ]; dependencies = with python3Packages; diff --git a/pkgs/by-name/la/lasuite-docs/uv.patch b/pkgs/by-name/la/lasuite-docs/uv.patch new file mode 100644 index 000000000000..7afa3ffe0bf8 --- /dev/null +++ b/pkgs/by-name/la/lasuite-docs/uv.patch @@ -0,0 +1,19 @@ +diff --git a/__init__.py b/__init__.py +deleted file mode 100644 +index e69de29b..00000000 +diff --git a/pyproject.toml b/pyproject.toml +index eb8ef0a0..dbb9f619 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -97,6 +97,11 @@ dev = [ + ] + + [tool.uv.build-backend] ++module-name = [ ++ "core", ++ "demo", ++ "impress" ++] + module-root = "" + source-exclude = [ + "**/tests/**",