diff --git a/pkgs/by-name/me/memos/package.nix b/pkgs/by-name/me/memos/package.nix index bd2ee2ad634d..6ad36eb53454 100644 --- a/pkgs/by-name/me/memos/package.nix +++ b/pkgs/by-name/me/memos/package.nix @@ -11,24 +11,26 @@ }: let pnpm = pnpm_10; - - version = "0.25.3"; +in +buildGoModule (finalAttrs: { + pname = "memos"; + version = "0.29.0"; src = fetchFromGitHub { owner = "usememos"; repo = "memos"; - rev = "v${version}"; - hash = "sha256-lAKzPteGjGa7fnbB0Pm3oWId5DJekbVWI9dnPEGbiBo="; + rev = "v${finalAttrs.version}"; + hash = "sha256-l9jyByfVCx+z41H+RVgkggjkVSoleHq+mR6nhgk9Pj8="; }; - memos-web = stdenvNoCC.mkDerivation (finalAttrs: { + memos-web = stdenvNoCC.mkDerivation (finalWebAttrs: { pname = "memos-web"; - inherit version src; + inherit (finalAttrs) version src; pnpmDeps = fetchPnpmDeps { - inherit (finalAttrs) pname version src; + inherit (finalWebAttrs) pname version src; inherit pnpm; - sourceRoot = "${finalAttrs.src.name}/web"; + sourceRoot = "${finalWebAttrs.src.name}/web"; fetcherVersion = 3; - hash = "sha256-xEOnxCgBD4uLypcZzCO+31S4r0sSfz8PpgEmZASeRZ4="; + hash = "sha256-Ki9rC1i0gvz+4La0GZIF40mZPwv/EwzhHUaealSpU40="; }; pnpmRoot = "web"; nativeBuildInputs = [ @@ -47,20 +49,12 @@ let runHook postInstall ''; }); -in -buildGoModule { - pname = "memos"; - inherit - version - src - memos-web - ; - vendorHash = "sha256-BoJxFpfKS/LByvK4AlTNc4gA/aNIvgLzoFOgyal+aF8="; + vendorHash = "sha256-6oJgxhGS7aD3I0umTQuVMLzcOhzf53g4TZcCtkKrrc8="; preBuild = '' rm -rf server/router/frontend/dist - cp -r ${memos-web} server/router/frontend/dist + cp -r ${finalAttrs.memos-web} server/router/frontend/dist ''; passthru.updateScript = nix-update-script { @@ -73,7 +67,7 @@ buildGoModule { meta = { homepage = "https://usememos.com"; description = "Lightweight, self-hosted memo hub"; - changelog = "https://github.com/usememos/memos/releases/tag/${src.rev}"; + changelog = "https://github.com/usememos/memos/releases/tag/${finalAttrs.src.rev}"; maintainers = with lib.maintainers; [ indexyz kuflierl @@ -81,4 +75,4 @@ buildGoModule { license = lib.licenses.mit; mainProgram = "memos"; }; -} +})