Skip to content

Commit b467e92

Browse files
authored
siyuan: 3.1.13 -> 3.1.16; improve updateScript (#362889)
2 parents 7dd2a13 + 9d6d8ec commit b467e92

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

pkgs/by-name/si/siyuan/package.nix

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,20 @@ let
3535
in
3636
stdenv.mkDerivation (finalAttrs: {
3737
pname = "siyuan";
38-
version = "3.1.13";
38+
version = "3.1.16";
3939

4040
src = fetchFromGitHub {
4141
owner = "siyuan-note";
4242
repo = "siyuan";
4343
rev = "v${finalAttrs.version}";
44-
hash = "sha256-+jlJTsGvElumUV1NdYed0XthmY1MFNqWMgDmTQObIA4=";
44+
hash = "sha256-8+Gz9AuxmK2hOApRZ2b1+rROOG94EBJR3pyp8YwtgiA=";
4545
};
4646

4747
kernel = buildGo123Module {
4848
name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
4949
inherit (finalAttrs) src;
5050
sourceRoot = "${finalAttrs.src.name}/kernel";
51-
vendorHash = "sha256-uK++FoWCoeb05TyUhh0PK+wkTmzTko0K7oLodoGAWt8=";
51+
vendorHash = "sha256-B2pGXs0IN5WhNHoFgTufd46q60RNvWzNdwoCxpayYC8=";
5252

5353
patches = [
5454
(replaceVars ./set-pandoc-path.patch {
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
8989
src
9090
sourceRoot
9191
;
92-
hash = "sha256-uv3gahbSW81gHMx0sQoUbW4Oyzvo6iD5u1izX8vXkwA=";
92+
hash = "sha256-LlQdfRGsBn3IZWKSUqH5tAljXnWanuFXO2x+Wi3on7E=";
9393
};
9494

9595
sourceRoot = "${finalAttrs.src.name}/app";
@@ -141,15 +141,23 @@ stdenv.mkDerivation (finalAttrs: {
141141

142142
passthru = {
143143
inherit (finalAttrs.kernel) goModules; # this tricks nix-update into also updating the kernel goModules FOD
144-
updateScript = nix-update-script { };
144+
updateScript = nix-update-script {
145+
extraArgs = [
146+
"--version-regex"
147+
"^v(\\d+\\.\\d+\\.\\d+)$"
148+
];
149+
};
145150
};
146151

147152
meta = {
148153
description = "Privacy-first personal knowledge management system that supports complete offline usage, as well as end-to-end encrypted data sync";
149154
homepage = "https://b3log.org/siyuan/";
150155
license = lib.licenses.agpl3Plus;
151156
mainProgram = "siyuan";
152-
maintainers = with lib.maintainers; [ tomasajt ];
157+
maintainers = with lib.maintainers; [
158+
tomasajt
159+
ltrump
160+
];
153161
platforms = lib.attrNames platformIds;
154162
};
155163
})

0 commit comments

Comments
 (0)