From 1c8b80283e7ba027c219f88c2489ecc35483528f Mon Sep 17 00:00:00 2001 From: matt1432 Date: Sat, 15 Feb 2025 11:55:05 -0500 Subject: [PATCH] fix(update): get latest tag instead of release for grosshack --- apps/update-sources/default.nix | 4 ++++ apps/update-sources/src/app.ts | 19 ++++++++++++------- apps/update-sources/src/misc.ts | 5 +++-- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/apps/update-sources/default.nix b/apps/update-sources/default.nix index bb70d3de..27443354 100644 --- a/apps/update-sources/default.nix +++ b/apps/update-sources/default.nix @@ -1,8 +1,10 @@ { buildApp, callPackage, + curl, findutils, go, + jq, nix-update, nodejs_latest, prefetch-npm-deps, @@ -13,8 +15,10 @@ buildApp { npmDepsHash = "sha256-2cWxVTCOEJOg2eBv+xX/mvr6MUX+UJQ8JlkoObD6+Uc="; runtimeInputs = [ + curl findutils go + jq nix-update nodejs_latest prefetch-npm-deps diff --git a/apps/update-sources/src/app.ts b/apps/update-sources/src/app.ts index 60fce184..bfae6379 100644 --- a/apps/update-sources/src/app.ts +++ b/apps/update-sources/src/app.ts @@ -67,10 +67,12 @@ const main = async() => { console.log(await updateNodeModules()); } - // TODO: get latest tag instead of release - // if (args['p'] || args['pam-fprint-grosshack']) { - // console.log(runNixUpdate('pam-fprint-grosshack')); - // } + if (args['p'] || args['pam-fprint-grosshack']) { + console.log(runNixUpdate( + 'pam-fprint-grosshack', + ['--version="$(curl -s https://gitlab.com/api/v4/projects/mishakmak%2Fpam-fprint-grosshack/repository/tags | jq -r .[0].name)"'], + )); + } if (args['ph'] || args['protonhax']) { console.log(runNixUpdate('protonhax')); @@ -129,8 +131,8 @@ const main = async() => { // nix-update executions let nixUpdateOutputs = ''; - const updatePackage = (pkg: string): void => { - const execution = runNixUpdate(pkg); + const updatePackage = (pkg: string, opts: string[] = []): void => { + const execution = runNixUpdate(pkg, opts); nixUpdateOutputs += execution.stdout; console.log(execution.stderr); @@ -139,7 +141,10 @@ const main = async() => { updatePackage('homepage'); updatePackage('jmusicbot'); - // updatePackage('pam-fprint-grosshack'); + updatePackage( + 'pam-fprint-grosshack', + ['--version="$(curl -s https://gitlab.com/api/v4/projects/mishakmak%2Fpam-fprint-grosshack/repository/tags | jq -r .[0].name)"'], + ); updatePackage('protonhax'); updatePackage('trash-d'); updatePackage( diff --git a/apps/update-sources/src/misc.ts b/apps/update-sources/src/misc.ts index 893e3f29..c448dc24 100644 --- a/apps/update-sources/src/misc.ts +++ b/apps/update-sources/src/misc.ts @@ -59,8 +59,9 @@ export const runNixUpdate = ( const OLD_VERSION = getAttrVersion(attr); const execution = spawnSync( - `nix-update --flake ${attr} --write-commit-message >(head -n 1 -) > /dev/null`, - options, + `nix-update --flake ${attr} ${options + .join(' ')} --write-commit-message >(head -n 1 -) > /dev/null`, + [], { shell: true, cwd: FLAKE }, );