diff --git a/pkgs/by-name/ti/tiny-rdm/package.nix b/pkgs/by-name/ti/tiny-rdm/package.nix index 115e24975243..3c6287432e7e 100644 --- a/pkgs/by-name/ti/tiny-rdm/package.nix +++ b/pkgs/by-name/ti/tiny-rdm/package.nix @@ -6,24 +6,23 @@ npmHooks, nodejs, wails, - webkitgtk_4_0, + webkitgtk_4_1, pkg-config, - libsoup_3, copyDesktopItems, makeDesktopItem, autoPatchelfHook, - nix-update-script, + writeScript, }: buildGoModule (finalAttrs: { pname = "tiny-rdm"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "tiny-craft"; repo = "tiny-rdm"; tag = "v${finalAttrs.version}"; - hash = "sha256-wSTC9Ne/Q9LLZL2+8ObMFCXrf4VSI0LkZhHHbAiXCYE="; + hash = "sha256-LzZsnO14cyYzmEas23Mrf0I+ZZa7y4ZfLg/gPBLcNc8="; }; postPatch = '' @@ -31,13 +30,13 @@ buildGoModule (finalAttrs: { --replace-fail "prefStore.autoCheckUpdate" "false" ''; - vendorHash = "sha256-Hh/qudoCZtIHJLsI6GQ814W4nC/uRd4gQd0PobzMlnQ="; + vendorHash = "sha256-dv+1yRl0UUo6lkLjfYAgRDR8pMfuh4lM6JapIXNQG9Q="; env = { CGO_ENABLED = 1; npmDeps = fetchNpmDeps { src = "${finalAttrs.src}/frontend"; - hash = "sha256-dcoTwfRocVjpBzqS9f2MkXjzcCI5sLjRZ3UC/Ml+7T0="; + hash = "sha256-0QMakUr2QBDYb/BRMALOACsfknrzimgaNkdFMjg73og="; }; npmRoot = "frontend"; }; @@ -51,15 +50,12 @@ buildGoModule (finalAttrs: { copyDesktopItems ]; - buildInputs = [ - webkitgtk_4_0 - libsoup_3 - ]; + buildInputs = [ webkitgtk_4_1 ]; buildPhase = '' runHook preBuild - wails build -m -trimpath -devtools -tags webkit2_40 -o tiny-rdm + wails build -m -trimpath -devtools -tags webkit2_41 -o tiny-rdm runHook postBuild ''; @@ -88,7 +84,22 @@ buildGoModule (finalAttrs: { runHook postInstall ''; - passthru.updateScript = nix-update-script { }; + passthru = { + inherit (finalAttrs.env) npmDeps; + updateScript = writeScript "update-tiny-rdm" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p bash nix nix-update common-updater-scripts + set -eou pipefail + version=$(nix eval --log-format raw --raw --file default.nix tiny-rdm.version) + nix-update tiny-rdm || true + latestVersion=$(nix eval --log-format raw --raw --file default.nix tiny-rdm.version) + if [[ "$latestVersion" == "$version" ]]; then + exit 0 + fi + update-source-version tiny-rdm "$latestVersion" --source-key=npmDeps --ignore-same-version + nix-update tiny-rdm --version skip + ''; + }; meta = { description = "Modern, colorful, super lightweight Redis GUI client";