Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
6 changes: 3 additions & 3 deletions pkgs/by-name/la/lasuite-docs-frontend/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
15 changes: 11 additions & 4 deletions pkgs/by-name/la/lasuite-docs/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -29,7 +29,7 @@ let

offlineCache = fetchYarnDeps {
yarnLock = "${src}/src/mail/yarn.lock";
hash = "sha256-g5MYtHvs0i0AOAydMxJNx1xTwbZtXS0CYDNQC+cnIOM=";
hash = "sha256-CKKGY87C5ifv0sHm9ExCzaGM3mV4C0NsWLCbw+ALqGc=";
};

nativeBuildInputs = [
Expand All @@ -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
Expand All @@ -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
Expand All @@ -75,7 +82,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
'';
__darwinAllowLocalNetworking = true;

build-system = with python3Packages; [ setuptools ];
build-system = with python3Packages; [ uv-build ];

dependencies =
with python3Packages;
Expand Down
19 changes: 19 additions & 0 deletions pkgs/by-name/la/lasuite-docs/uv.patch
Comment thread
Ma27 marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -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/**",
Loading