From d61099a535386c389dc78b2944758e5a1b2d629c Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Mon, 2 Jun 2025 10:46:52 +0200 Subject: [PATCH] mempool: minor refactorings - Use `sourceRoot` - Allow `generate.sh` to directly trigger the build of `nodeModules`. Needed by mempool 3.2.1, where `mempool-backend` has multiple fixed output derivation dependencies, which can only be updated if they can be built directly. --- pkgs/mempool/default.nix | 10 +++++++--- pkgs/mempool/generate.sh | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/mempool/default.nix b/pkgs/mempool/default.nix index 8270b85..f46aeb2 100644 --- a/pkgs/mempool/default.nix +++ b/pkgs/mempool/default.nix @@ -26,12 +26,12 @@ rec { nodeModules = { frontend = fetchNodeModules { inherit src nodejs; - preBuild = "cd frontend"; + sourceRoot = "source/frontend"; hash = "sha256-/Z0xNvob7eMGpzdUWolr47vljpFiIutZpGwd0uYhPWI="; }; backend = fetchNodeModules { inherit src nodejs; - preBuild = "cd backend"; + sourceRoot = "source/backend"; hash = "sha256-HpzzSTuSRWDWGbctVhTcUA01if/7OTI4xN3DAbAAX+U="; }; }; @@ -67,6 +67,7 @@ rec { passthru = { inherit nodejs nodejsRuntime; + nodeModules = nodeModules.backend; }; }; @@ -99,7 +100,10 @@ rec { runHook postInstall ''; - passthru = { assets = frontendAssets; }; + passthru = { + assets = frontendAssets; + nodeModules = nodeModules.frontend; + }; }; mempool-nginx-conf = runCommand "mempool-nginx-conf" {} '' diff --git a/pkgs/mempool/generate.sh b/pkgs/mempool/generate.sh index 7fce668..a70a592 100755 --- a/pkgs/mempool/generate.sh +++ b/pkgs/mempool/generate.sh @@ -50,7 +50,7 @@ updateNodeModulesHash() { component=$1 echo echo "Fetching node modules for mempool-$component" - ../../helper/update-fixed-output-derivation.sh ./default.nix mempool-"$component" "cd $component" + ../../helper/update-fixed-output-derivation.sh ./default.nix mempool-"$component".nodeModules "sourceRoot.*$component" } updateFrontendAssets() {