papra: 26.4.0 -> 26.5.0

This commit is contained in:
Fabian Haas
2026-07-02 02:33:21 +02:00
parent b7066f59d2
commit 288e0e1738
2 changed files with 18 additions and 16 deletions
+2 -2
View File
@@ -80,8 +80,8 @@ in
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Restart = "on-failure";
ExecStartPre = "${lib.getExe pkgs.tsx} ${cfg.package}/lib/src/scripts/migrate-up.script.ts";
ExecStart = "${cfg.package}/bin/papra";
ExecStartPre = "${lib.getExe' cfg.package "papra-migrate-up"}";
ExecStart = "${lib.getExe' cfg.package "papra"}";
User = cfg.user;
Group = cfg.group;
StateDirectory = "papra";
+16 -14
View File
@@ -1,10 +1,11 @@
{
makeBinaryWrapper,
nodejs,
nodejs_26,
nodejs-slim_26,
node-gyp,
fetchPnpmDeps,
fetchFromGitHub,
pnpm_10,
pnpm_11,
pnpmConfigHook,
stdenv,
lib,
@@ -12,26 +13,29 @@
pkg-config,
python3,
nix-update-script,
tsx,
}:
let
pnpm = pnpm_10;
pnpm = pnpm_11.override { nodejs-slim = nodejs-slim_26; };
nodejs = nodejs_26;
tsx' = tsx.override { nodejs-slim_24 = nodejs-slim_26; };
in
stdenv.mkDerivation (finalAttrs: {
pname = "papra";
version = "26.4.0";
version = "26.5.0";
src = fetchFromGitHub {
owner = "papra-hq";
repo = "papra";
tag = "@papra/app@${finalAttrs.version}";
hash = "sha256-wQdDBS+QRarZhEIRmLQ4VRtq73I5YFIN2P3ZtAZWvxw=";
hash = "sha256-BOeApLfB1NR07izBM3ChHqzgGx3xf1NkAXqKVeMzqx4=";
};
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm;
fetcherVersion = 3;
hash = "sha256-8k8hzpyOQuHAPF+zzIhW+5vo6lHSyZeKAY+tYIf6jKU=";
fetcherVersion = 4;
hash = "sha256-J1syB5X+sI40iPlqDVABqeWDiBjKGP3qQRIh5w3GRUU=";
pnpmWorkspaces = [
"@papra/app-client..."
"@papra/app-server..."
@@ -64,12 +68,6 @@ stdenv.mkDerivation (finalAttrs: {
buildPhase = ''
runHook preBuild
pnpm config set inject-workspace-packages true
pushd node_modules/sharp
pnpm run install
popd
pnpm --filter "@papra/app-client..." run build
pnpm --filter "@papra/app-server..." run build
@@ -81,7 +79,8 @@ stdenv.mkDerivation (finalAttrs: {
mkdir -p $out/{bin,lib}
pnpm deploy --filter=@papra/app-server --prod $out/lib/
pnpm config set --location=project injectWorkspacePackages true
pnpm deploy --ignore-script --filter=@papra/app-server --prod $out/lib/
mkdir -p $out/lib/public
cp -r apps/papra-client/dist/* $out/lib/public/
@@ -90,6 +89,9 @@ stdenv.mkDerivation (finalAttrs: {
--add-flags "$out/lib/dist/index.js" \
--set "NODE_PATH" $out/lib/node_modules
makeWrapper "${lib.getExe tsx'}" $out/bin/papra-migrate-up \
--add-flags "$out/lib/src/scripts/migrate-up.script.ts"
runHook postInstall
'';