From a65145ffcd5d322ff5c6eaba28c3099d5b5d308d Mon Sep 17 00:00:00 2001 From: L-Trump Date: Mon, 23 Dec 2024 01:29:25 +0800 Subject: [PATCH 1/2] siyuan: 3.1.13 -> 3.1.16 --- pkgs/by-name/si/siyuan/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 544de347498c..f7621695041f 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -35,20 +35,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.1.13"; + version = "3.1.16"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-+jlJTsGvElumUV1NdYed0XthmY1MFNqWMgDmTQObIA4="; + hash = "sha256-8+Gz9AuxmK2hOApRZ2b1+rROOG94EBJR3pyp8YwtgiA="; }; kernel = buildGo123Module { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-uK++FoWCoeb05TyUhh0PK+wkTmzTko0K7oLodoGAWt8="; + vendorHash = "sha256-B2pGXs0IN5WhNHoFgTufd46q60RNvWzNdwoCxpayYC8="; patches = [ (substituteAll { @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { src sourceRoot ; - hash = "sha256-uv3gahbSW81gHMx0sQoUbW4Oyzvo6iD5u1izX8vXkwA="; + hash = "sha256-LlQdfRGsBn3IZWKSUqH5tAljXnWanuFXO2x+Wi3on7E="; }; sourceRoot = "${finalAttrs.src.name}/app"; From 9d6d8ec7d6bc56ff69a25bdf6c532fd30fa0afc1 Mon Sep 17 00:00:00 2001 From: L-Trump Date: Mon, 23 Dec 2024 01:30:13 +0800 Subject: [PATCH 2/2] siyuan: improve updateScript; add maintainer --- pkgs/by-name/si/siyuan/package.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index f7621695041f..e8a6a98ebab6 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -142,7 +142,12 @@ stdenv.mkDerivation (finalAttrs: { passthru = { inherit (finalAttrs.kernel) goModules; # this tricks nix-update into also updating the kernel goModules FOD - updateScript = nix-update-script { }; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^v(\\d+\\.\\d+\\.\\d+)$" + ]; + }; }; meta = { @@ -150,7 +155,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://b3log.org/siyuan/"; license = lib.licenses.agpl3Plus; mainProgram = "siyuan"; - maintainers = with lib.maintainers; [ tomasajt ]; + maintainers = with lib.maintainers; [ + tomasajt + ltrump + ]; platforms = lib.attrNames platformIds; }; })