From d18c82bc1c6d61f6b121ad24fccecfb855b89df9 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Thu, 16 Jan 2025 03:02:06 +0800 Subject: [PATCH 1/2] daed: add update script --- pkgs/by-name/da/daed/package.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/da/daed/package.nix b/pkgs/by-name/da/daed/package.nix index 3143b3c33a76..abb62cfaf989 100644 --- a/pkgs/by-name/da/daed/package.nix +++ b/pkgs/by-name/da/daed/package.nix @@ -6,6 +6,8 @@ buildGoModule, fetchFromGitHub, lib, + _experimental-update-script-combinators, + nix-update-script, }: let @@ -47,7 +49,12 @@ let }; in buildGoModule rec { - inherit pname version src; + inherit + pname + version + src + web + ; sourceRoot = "${src.name}/wing"; vendorHash = "sha256-TBR3MmpTdwIwyekU+nrHhzsN31E30+Rqd3FoBL3dl4U="; @@ -81,6 +88,15 @@ buildGoModule rec { runHook postBuild ''; + passthru.updateScript = _experimental-update-script-combinators.sequence [ + (nix-update-script { + attrPath = "daed.web"; + }) + (nix-update-script { + extraArgs = [ "--version=skip" ]; + }) + ]; + meta = { description = "Modern dashboard with dae"; homepage = "https://github.com/daeuniverse/daed"; From 5289e5c486f12660c3f13373dcced04775f42aa4 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Thu, 16 Jan 2025 03:03:50 +0800 Subject: [PATCH 2/2] daed: 0.8.0 -> 0.9.0 --- pkgs/by-name/da/daed/package.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/da/daed/package.nix b/pkgs/by-name/da/daed/package.nix index abb62cfaf989..dc8c0331a5b0 100644 --- a/pkgs/by-name/da/daed/package.nix +++ b/pkgs/by-name/da/daed/package.nix @@ -12,12 +12,13 @@ let pname = "daed"; - version = "0.8.0"; + version = "0.9.0"; + src = fetchFromGitHub { owner = "daeuniverse"; repo = "daed"; tag = "v${version}"; - hash = "sha256-h1j91XIumuzuJnMxgkCjhuXYPLXoDuFFsfmDwmzlTEI="; + hash = "sha256-5olEPaS/6ag69KUwBG8qXpyr1B2qrLK+vf13ZljHH+c="; fetchSubmodules = true; }; @@ -26,7 +27,7 @@ let pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; - hash = "sha256-vqkiZzd5WOeJem0zUyMsJd6/aHHAjlsIQMkNf+SUvHY="; + hash = "sha256-+yLpSbDzr1OV/bmUUg6drOvK1ok3cBd+RRV7Qrrlp+Q="; }; nativeBuildInputs = [ @@ -36,18 +37,22 @@ let buildPhase = '' runHook preBuild + pnpm build + runHook postBuild ''; installPhase = '' runHook preInstall - mkdir -p $out - cp -R dist/* $out/ + + cp -R dist $out + runHook postInstall ''; }; in + buildGoModule rec { inherit pname @@ -55,9 +60,11 @@ buildGoModule rec { src web ; + sourceRoot = "${src.name}/wing"; - vendorHash = "sha256-TBR3MmpTdwIwyekU+nrHhzsN31E30+Rqd3FoBL3dl4U="; + vendorHash = "sha256-qB2qcJ82mFcVvjlYp/N9sqzwPotTROgymSX5NfEQMuY="; + proxyVendor = true; nativeBuildInputs = [ clang ];