diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 549d20e288c5..5ad2a85fc372 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, buildGoModule, + go_1_23, substituteAll, pandoc, nodejs, @@ -11,6 +12,7 @@ makeWrapper, makeDesktopItem, copyDesktopItems, + nix-update-script, }: let @@ -34,20 +36,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.1.0"; + version = "3.1.6"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-UIPASTSW7YGpxJJHfCq28M/U6CzyqaJiISZGtE0aDPw="; + hash = "sha256-xGxZ6xu8R/JoW4X+drEv943y1jah4ZijHB+RNN6hxig="; }; - kernel = buildGoModule { + kernel = buildGoModule.override { go = go_1_23; } { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-s4dW43Qy3Lrc5WPpugQpN6BDEFVxqnorXpp40SGFk7I="; + vendorHash = "sha256-I57T4/J0pL8/GISi22H1lpE1gkduNXdINvuo+F3YnAs="; patches = [ (substituteAll { @@ -89,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { src sourceRoot ; - hash = "sha256-QSaBNs0m13Pfrvl8uUVqRpP3m8PoOBIY5VU5Cg/G2jY="; + hash = "sha256-3PdmCbaZZjnTCSpBcvG7nP+zTGamoY/ZXjay7c8Zx5w="; }; sourceRoot = "${finalAttrs.src.name}/app"; @@ -139,6 +141,11 @@ stdenv.mkDerivation (finalAttrs: { desktopItems = [ desktopEntry ]; + passthru = { + inherit (finalAttrs.kernel) goModules; # this tricks nix-update into also updating the kernel goModules FOD + updateScript = nix-update-script { }; + }; + meta = { description = "Privacy-first personal knowledge management system that supports complete offline usage, as well as end-to-end encrypted data sync"; homepage = "https://b3log.org/siyuan/";