From a1052422c5e42a7d8b47a8c2c949bc6ec37682ee Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 16 Sep 2024 21:17:00 +0400 Subject: [PATCH 1/2] workout-tracker: add assets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From server log: ```sh 12:58PM WRN Not Found app=workout-tracker version=local sha=local module=webserver request.time="2024-09-15 12:58:39.875195 +0400 +04" request.method=GET request.host=localhost:8080 request.path=/assets/dist/htmx.min.js request.query="" request.params=map[*:/dist/htmx.min.js] request.route=/assets* request.ip=127.0.0.1 request.referer=http://localhost:8080/user/signin request.length=0 response.time="2024-09-15 12:58:39.875636 +0400 +04" response.latency=441.574µs response.status=404 response.length=0 error="map[code:404 internal: message:Not Found]" ``` (cherry picked from commit 47d2cf0c885b141cafa9027de969784b7f2decd4) --- pkgs/by-name/wo/workout-tracker/package.nix | 27 +++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wo/workout-tracker/package.nix b/pkgs/by-name/wo/workout-tracker/package.nix index ab15fced522c598..66a975f72e2e1db 100644 --- a/pkgs/by-name/wo/workout-tracker/package.nix +++ b/pkgs/by-name/wo/workout-tracker/package.nix @@ -1,12 +1,12 @@ { lib, buildGoModule, + buildNpmPackage, fetchFromGitHub, nix-update-script, ... }: - -buildGoModule rec { +let pname = "workout-tracker"; version = "0.14.3"; @@ -17,8 +17,31 @@ buildGoModule rec { hash = "sha256-NGj3W6SYZauaAhMinPzsSXM8Dqy+B+am985JJjh6xTs="; }; + assets = buildNpmPackage { + pname = "${pname}-assets"; + inherit version src; + npmDepsHash = "sha256-jHpvCMgjGvaAOfbslaIKfIRiPafScpn3WLnYamm+lbs="; + dontNpmBuild = true; + postPatch = '' + rm Makefile + ''; + installPhase = '' + runHook preInstall + cp -r . "$out" + runHook postInstall + ''; + }; +in +buildGoModule rec { + inherit pname version src; + vendorHash = null; + postPatch = '' + ln -s ${assets}/node_modules ./node_modules + make build-dist + ''; + passthru.updateScript = nix-update-script { }; meta = { From 051e9caadf9894ce3b894f308f3851eb9e479330 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 17 Sep 2024 19:01:19 +0400 Subject: [PATCH 2/2] workout-tracker: fix npmDepsHash --- pkgs/by-name/wo/workout-tracker/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/wo/workout-tracker/package.nix b/pkgs/by-name/wo/workout-tracker/package.nix index 66a975f72e2e1db..92c822f0a95d157 100644 --- a/pkgs/by-name/wo/workout-tracker/package.nix +++ b/pkgs/by-name/wo/workout-tracker/package.nix @@ -20,7 +20,7 @@ let assets = buildNpmPackage { pname = "${pname}-assets"; inherit version src; - npmDepsHash = "sha256-jHpvCMgjGvaAOfbslaIKfIRiPafScpn3WLnYamm+lbs="; + npmDepsHash = "sha256-YdgivSanl5IGspzPasHBMkDdaumwji/EfiwIrEbVO1E="; dontNpmBuild = true; postPatch = '' rm Makefile