From eb70fb9dc072cf9d630856f78d9e3e649201451a Mon Sep 17 00:00:00 2001 From: Scandiravian Date: Sun, 2 Mar 2025 10:36:40 +0100 Subject: [PATCH] actual-server: 25.1.0 -> 25.3.1 Co-authored-by: Ratchanan Srirattanamet --- pkgs/by-name/ac/actual-server/package.nix | 25 ++++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ac/actual-server/package.nix b/pkgs/by-name/ac/actual-server/package.nix index 673fcad10583..73a9e3c0a21d 100644 --- a/pkgs/by-name/ac/actual-server/package.nix +++ b/pkgs/by-name/ac/actual-server/package.nix @@ -12,12 +12,12 @@ nix-update-script, }: let - version = "25.1.0"; + version = "25.3.1"; src = fetchFromGitHub { owner = "actualbudget"; - repo = "actual-server"; + repo = "actual"; tag = "v${version}"; - hash = "sha256-zpZNITXd9QOJNRz8RbAuHH1hrrWPEGsrROGWJuYXqrc="; + hash = "sha256-UZ2Z1tkMbGJwka//cIC0aG1KCcTSxUPLzctEaOhnKQA="; }; yarn_20 = yarn.override { nodejs = nodejs_20; }; @@ -58,7 +58,8 @@ let yarn config set enableTelemetry 0 yarn config set cacheFolder $out yarn config set --json supportedArchitectures "$SUPPORTED_ARCHITECTURES" - yarn + + yarn workspaces focus @actual-app/sync-server --production runHook postBuild ''; @@ -77,10 +78,10 @@ let outputHashMode = "recursive"; outputHash = { - x86_64-linux = "sha256-N31aAAkznncKlygyeH5A3TrnOinXVz7CTQ8/G4QX6hY="; - aarch64-linux = "sha256-j7BFAKXi+TKIlmHBjbx6rwaKuAo6gnOlv6FV8rnlld0="; - aarch64-darwin = "sha256-YpUQYOLJHYxWuE6ToLFkXWEloAau9bLBvdbpNh8jRZQ="; - x86_64-darwin = "sha256-AioO82Y6mK0blSQRhhZZtWmduUcYwyVAewcXEVClJUg="; + aarch64-darwin = "sha256-IJBfBA71PZeE/Zlu2kzQw8l/D4lVAV5I5loRyRfncKA="; + aarch64-linux = "sha256-djE2lt/o/7kd7ci2TW3mhjSptD3etChbvtdbiWqp/wo="; + x86_64-darwin = "sha256-AShd87VFwqDbJZoFJPg6HsdhTx7XMVdZ5sRWLXU8ldM="; + x86_64-linux = "sha256-me0v+RuoleOKFRyJ7iyLTKRnV2Cz2Q1MLc/SE2sSSH8="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; @@ -97,13 +98,13 @@ stdenv.mkDerivation { installPhase = '' runHook preInstall - mkdir -p $out/{bin,lib,lib/actual} + mkdir -p $out/{bin,lib,lib/actual/packages/sync-server} cp -r ${offlineCache}/node_modules/ $out/lib/actual - cp -r ./ $out/lib/actual + cp -r ./packages/sync-server/{app.js,src,migrations,package.json} $out/lib/actual/packages/sync-server makeWrapper ${lib.getExe nodejs_20} "$out/bin/actual-server" \ - --add-flags "$out/lib/actual/app.js" \ - --set NODE_PATH "$out/node_modules" + --add-flags "$out/lib/actual/packages/sync-server/app.js" \ + --set NODE_PATH "$out/actual/lib/node_modules" runHook postInstall '';