From 86215e47846ca9050710a83b9d292da947071c57 Mon Sep 17 00:00:00 2001 From: aleksana Date: Thu, 8 Jan 2026 04:30:17 +0800 Subject: [PATCH 1/2] karere: 1.1.0 -> 2.0.9 --- pkgs/by-name/ka/karere/package.nix | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ka/karere/package.nix b/pkgs/by-name/ka/karere/package.nix index 8fbcf36a4e29..1461ec740954 100644 --- a/pkgs/by-name/ka/karere/package.nix +++ b/pkgs/by-name/ka/karere/package.nix @@ -2,10 +2,12 @@ lib, stdenv, fetchFromGitHub, - vala, + rustPlatform, meson, ninja, pkg-config, + cargo, + rustc, wrapGAppsHook4, blueprint-compiler, desktop-file-utils, @@ -13,26 +15,32 @@ gtk4, libadwaita, webkitgtk_6_0, - json-glib, - libgee, + glib-networking, }: stdenv.mkDerivation (finalAttrs: { pname = "karere"; - version = "1.1.0"; + version = "2.0.9"; src = fetchFromGitHub { owner = "tobagin"; repo = "karere"; - rev = "v${finalAttrs.version}"; - hash = "sha256-4jV2vE7KtdpA9qjKR4xj/w6g1WZD/l8ezRtuFyzJtZ8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-roxynxGiM43VHl+ngo/EMKEJ56XaYA6qaok/SzppFlY="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-BYG1TgCbkaQlquFy/tmjzdfypc8yno7w7SdBsgqOxkU="; }; nativeBuildInputs = [ - vala meson ninja pkg-config + cargo + rustc + rustPlatform.cargoSetupHook wrapGAppsHook4 blueprint-compiler desktop-file-utils @@ -43,8 +51,7 @@ stdenv.mkDerivation (finalAttrs: { gtk4 libadwaita webkitgtk_6_0 - json-glib - libgee + glib-networking ]; meta = { From 81fe7cf7fa93bb87500cc4a73c25c808ff7e3930 Mon Sep 17 00:00:00 2001 From: aleksana Date: Thu, 8 Jan 2026 22:42:18 +0800 Subject: [PATCH 2/2] karere: add aleksana to maintainers --- pkgs/by-name/ka/karere/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ka/karere/package.nix b/pkgs/by-name/ka/karere/package.nix index 1461ec740954..2365d3b0fbc2 100644 --- a/pkgs/by-name/ka/karere/package.nix +++ b/pkgs/by-name/ka/karere/package.nix @@ -59,7 +59,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/tobagin/karere"; changelog = "https://github.com/tobagin/karere/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ marcel ]; + maintainers = with lib.maintainers; [ + marcel + aleksana + ]; mainProgram = "karere"; }; })