From cbe665aafeb2219bc7dc1334949720b6d397d696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 5 Feb 2026 14:49:07 +0100 Subject: [PATCH] kdePackages.kajongg: remove broken package kajongg has been marked broken since NixOS 24.05 and remains unfixed. The package is actually a Python app that needs significant work to fix properly. Per RFC 180, packages broken for a full release cycle are subject to removal. https://github.com/NixOS/rfcs/pull/180 --- pkgs/kde/default.nix | 6 +++++- pkgs/kde/gear/default.nix | 11 +++++++++-- pkgs/kde/gear/kajongg/default.nix | 16 ---------------- 3 files changed, 14 insertions(+), 19 deletions(-) delete mode 100644 pkgs/kde/gear/kajongg/default.nix diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index cbb0d5fff6cfb..08e68aa6a9a8c 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -1,5 +1,6 @@ { lib, + config, generateSplicesForMkScope, makeScopeWithSplicing', fetchurl, @@ -16,7 +17,10 @@ let self: let frameworks = import ./frameworks { inherit (self) callPackage; }; - gear = import ./gear { inherit (self) callPackage; }; + gear = import ./gear { + inherit lib config; + inherit (self) callPackage; + }; plasma = import ./plasma { inherit (self) callPackage; }; sets = [ diff --git a/pkgs/kde/gear/default.nix b/pkgs/kde/gear/default.nix index b15d0b0ec644b..9be13f335b6c5 100644 --- a/pkgs/kde/gear/default.nix +++ b/pkgs/kde/gear/default.nix @@ -1,4 +1,8 @@ -{ callPackage }: +{ + callPackage, + lib, + config, +}: { accessibility-inspector = callPackage ./accessibility-inspector { }; akonadi = callPackage ./akonadi { }; @@ -50,7 +54,7 @@ kaccounts-integration = callPackage ./kaccounts-integration { }; kaccounts-providers = callPackage ./kaccounts-providers { }; kaddressbook = callPackage ./kaddressbook { }; - kajongg = callPackage ./kajongg { }; + kalarm = callPackage ./kalarm { }; kalgebra = callPackage ./kalgebra { }; kalk = callPackage ./kalk { }; @@ -250,3 +254,6 @@ yakuake = callPackage ./yakuake { }; zanshin = callPackage ./zanshin { }; } +// lib.optionalAttrs config.allowAliases { + kajongg = throw "kdePackages.kajongg has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05 +} diff --git a/pkgs/kde/gear/kajongg/default.nix b/pkgs/kde/gear/kajongg/default.nix deleted file mode 100644 index 555c384b60814..0000000000000 --- a/pkgs/kde/gear/kajongg/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - mkKdeDerivation, - qtsvg, - python3, -}: -mkKdeDerivation { - pname = "kajongg"; - - extraBuildInputs = [ - qtsvg - python3 - python3.pkgs.twisted - ]; - # FIXME: completely horked, is actually a Python app, needs a lot of fixing - meta.broken = true; -}