From 2f81118f6ad0084bba53e5721db04d09d204ff63 Mon Sep 17 00:00:00 2001 From: Adam0 Date: Wed, 1 Jul 2026 01:01:43 +0200 Subject: [PATCH] revert gotify --- pkgs/gotify-server/default.nix | 7 ++++--- updater/package_backend.py | 8 ++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/gotify-server/default.nix b/pkgs/gotify-server/default.nix index 253f789..513f00b 100644 --- a/pkgs/gotify-server/default.nix +++ b/pkgs/gotify-server/default.nix @@ -11,14 +11,14 @@ yarnConfigHook, # keep-sorted end }: let - version = "2.9.1-unstable-2026-06-29"; - rev = "e4018b44e2a6122ddeed85e72e1ad3496b12df1f"; + version = "2.9.1-unstable-2026-06-28"; + rev = "ad977d3d9c53910f2ea485abf2b295281d705f9a"; src = fetchFromGitHub { owner = "gotify"; repo = "server"; inherit rev; - hash = "sha256-j1Ubb96cGfAiNtEAnORuB2zJt+oQtGx7RV9Q0CLyKdI="; + hash = "sha256-rPzcrTmD8yQqxrSlYWdXnpove28x01XAGtAKQXdVz74="; }; ui = stdenvNoCC.mkDerivation { @@ -89,5 +89,6 @@ in passthru = { inherit rev; + updateScript = null; }; } diff --git a/updater/package_backend.py b/updater/package_backend.py index 9b727a1..ade9e9e 100644 --- a/updater/package_backend.py +++ b/updater/package_backend.py @@ -20,6 +20,10 @@ def update_package( ref: PackageRef, *, dry_run: bool = False, timeout: str | None = None ) -> UpdateResult: logger.info("updating %s from %s", ref.attr_path, ref.file_path) + if package_update_disabled(ref.file_path): + logger.info("skipping %s: package disables updater", ref.attr_path) + return UpdateResult(ref.attr_path, "skipped", "package disables updater") + manifest = package_has_manifest_updater(ref.file_path) if manifest: logger.info("skipping %s: manifest updater owns %s", ref.attr_path, manifest) @@ -98,6 +102,10 @@ def package_owned_roots(file_path: Path) -> list[Path]: return roots +def package_update_disabled(file_path: Path) -> bool: + return bool(re.search(r"\bupdateScript\s*=\s*null\s*;", file_path.read_text())) + + def _preserve_unproven_branch_prefix( file_path: Path, before: PackageState, -- 2.51.2