From 24d56afa7b281db85f94dba3451040cb377a6ae5 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Wed, 24 Dec 2025 13:07:22 +0100 Subject: [PATCH 1/5] kitsas: 5.9 -> 5.11.1 --- .../ki/kitsas/fix-qt610-euro-arg.patch | 23 ------------------- pkgs/by-name/ki/kitsas/package.nix | 9 ++------ 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 pkgs/by-name/ki/kitsas/fix-qt610-euro-arg.patch diff --git a/pkgs/by-name/ki/kitsas/fix-qt610-euro-arg.patch b/pkgs/by-name/ki/kitsas/fix-qt610-euro-arg.patch deleted file mode 100644 index e271649ae8f2..000000000000 --- a/pkgs/by-name/ki/kitsas/fix-qt610-euro-arg.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/kitsas/kirjaus/kirjauswg.cpp b/kitsas/kirjaus/kirjauswg.cpp ---- a/kitsas/kirjaus/kirjauswg.cpp -+++ b/kitsas/kirjaus/kirjauswg.cpp -@@ -499,7 +499,7 @@ void KirjausWg::paivita(bool muokattu, int virheet, const Euro &debet, const Eu - } else if( virheet & Tosite::EITASMAAPVM) { - ui->varoTeksti->setText( tr("Debet ja kredit eivät täsmää jokaisella päivämäärällä.")); - } else if( debet ) { -- ui->varoTeksti->setText( tr("Summa %L1 €").arg(debet,0,'f',2) ); -+ ui->varoTeksti->setText( tr("Summa %L1 €").arg(debet.toDouble(),0,'f',2) ); - } - - -diff --git a/kitsas/selaus/tositeselausmodel.cpp b/kitsas/selaus/tositeselausmodel.cpp ---- a/kitsas/selaus/tositeselausmodel.cpp -+++ b/kitsas/selaus/tositeselausmodel.cpp -@@ -18,6 +18,7 @@ - #include - - #include -+#include - #include - - #include "db/yhteysmodel.h" diff --git a/pkgs/by-name/ki/kitsas/package.nix b/pkgs/by-name/ki/kitsas/package.nix index 5dbe1106eee9..caae2094cce0 100644 --- a/pkgs/by-name/ki/kitsas/package.nix +++ b/pkgs/by-name/ki/kitsas/package.nix @@ -10,20 +10,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "kitsas"; - version = "5.9"; + version = "5.11.1"; src = fetchFromGitHub { owner = "artoh"; repo = "kitupiikki"; rev = "v${finalAttrs.version}"; - hash = "sha256-4FCfpUFfi+N207SEAKz8nLpVS8MxfmDwM6r6i5pyqEM="; + hash = "sha256-ZU6b7Yl/dE0vk8UfyEVXtpt4ANnuKInvJ/RZYbIZj+Y="; }; - patches = [ - # Fix Qt 6.10 compatibility: QString::arg() no longer accepts Euro type directly - ./fix-qt610-euro-arg.patch - ]; - nativeBuildInputs = [ pkg-config qt6.qmake From c79dc4af55933a16a637b3c2342ae5fdfb529e04 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Thu, 1 Jan 2026 16:40:42 +0100 Subject: [PATCH 2/5] kitsas: reorder meta attributes --- pkgs/by-name/ki/kitsas/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ki/kitsas/package.nix b/pkgs/by-name/ki/kitsas/package.nix index caae2094cce0..5c78377fdd3a 100644 --- a/pkgs/by-name/ki/kitsas/package.nix +++ b/pkgs/by-name/ki/kitsas/package.nix @@ -57,11 +57,11 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - homepage = "https://github.com/artoh/kitupiikki"; description = "Accounting tool suitable for Finnish associations and small business"; + homepage = "https://github.com/artoh/kitupiikki"; + license = lib.licenses.gpl3Plus; mainProgram = "kitsas"; maintainers = [ ]; - license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; }; }) From b3d3c272a119499c389138416c80ad325eac5b26 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Thu, 1 Jan 2026 16:41:24 +0100 Subject: [PATCH 3/5] kitsas: add changelog meta attribute --- pkgs/by-name/ki/kitsas/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ki/kitsas/package.nix b/pkgs/by-name/ki/kitsas/package.nix index 5c78377fdd3a..be9988d60a45 100644 --- a/pkgs/by-name/ki/kitsas/package.nix +++ b/pkgs/by-name/ki/kitsas/package.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { + changelog = "https://github.com/artoh/kitupiikki/releases/tag/v.${finalAttrs.version}"; description = "Accounting tool suitable for Finnish associations and small business"; homepage = "https://github.com/artoh/kitupiikki"; license = lib.licenses.gpl3Plus; From 1477fb725343db5d67316abfda90eae9218b3ad5 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Thu, 1 Jan 2026 16:42:38 +0100 Subject: [PATCH 4/5] kitsas: reorder inputs --- pkgs/by-name/ki/kitsas/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ki/kitsas/package.nix b/pkgs/by-name/ki/kitsas/package.nix index be9988d60a45..8642e41db09c 100644 --- a/pkgs/by-name/ki/kitsas/package.nix +++ b/pkgs/by-name/ki/kitsas/package.nix @@ -2,10 +2,10 @@ lib, stdenv, fetchFromGitHub, - qt6, - poppler, libzip, pkg-config, + poppler, + qt6, }: stdenv.mkDerivation (finalAttrs: { From 21131714b142e86b5fab72d4cd061d29fd3489b2 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Thu, 1 Jan 2026 16:42:56 +0100 Subject: [PATCH 5/5] kitsas: use tag instead of rev --- pkgs/by-name/ki/kitsas/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ki/kitsas/package.nix b/pkgs/by-name/ki/kitsas/package.nix index 8642e41db09c..bd7436c32c5c 100644 --- a/pkgs/by-name/ki/kitsas/package.nix +++ b/pkgs/by-name/ki/kitsas/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "artoh"; repo = "kitupiikki"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ZU6b7Yl/dE0vk8UfyEVXtpt4ANnuKInvJ/RZYbIZj+Y="; }; @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - changelog = "https://github.com/artoh/kitupiikki/releases/tag/v.${finalAttrs.version}"; + changelog = "https://github.com/artoh/kitupiikki/releases/tag/v${finalAttrs.version}"; description = "Accounting tool suitable for Finnish associations and small business"; homepage = "https://github.com/artoh/kitupiikki"; license = lib.licenses.gpl3Plus;