From a9a64375ae32bd7fd08bff9b5bd2af52281188e9 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 25 Jul 2020 20:58:53 +0200
Subject: [PATCH 01/24] kbounce: init at 20.04.3

---
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/kbounce.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 +-
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/kbounce.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index ea2e37224194..24ff40e947b9 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -94,6 +94,7 @@ let
       kalarmcal = callPackage ./kalarmcal.nix {};
       kapptemplate = callPackage ./kapptemplate.nix { };
       kate = callPackage ./kate.nix {};
+      kbounce = callPackage ./kbounce.nix {};
       kbreakout = callPackage ./kbreakout.nix {};
       kcachegrind = callPackage ./kcachegrind.nix {};
       kcalc = callPackage ./kcalc.nix {};
diff --git a/pkgs/applications/kde/kbounce.nix b/pkgs/applications/kde/kbounce.nix
new file mode 100644
index 000000000000..a24d21551807
--- /dev/null
+++ b/pkgs/applications/kde/kbounce.nix
@@ -0,0 +1,22 @@
+{ mkDerivation, lib, extra-cmake-modules, libkdegames, kconfig, kcrash, kio, ki18n }:
+
+mkDerivation {
+  name = "kbounce";
+  meta = with lib; {
+    homepage = "https://kde.org/applications/en/games/org.kde.kbounce";
+    description = "KBounce is a single player arcade game with the elements of puzzle";
+    maintainers = with maintainers; [ freezeboy ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    libkdegames
+    kconfig
+    kcrash
+    kio
+    ki18n
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9380fa235d9a..592b0fa3cec7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21052,7 +21052,7 @@ in
 
   inherit (kdeApplications)
     akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
-    kaddressbook kapptemplate kate kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
+    kaddressbook kapptemplate kate kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
     keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake
     kpkpass kitinerary kontact korganizer krdc krfb ksquares ksystemlog ktouch kwalletmanager marble minuet okular picmi spectacle;
 

From 231a2b776d006d2d13471c1f778a6f1784eccad3 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 25 Jul 2020 21:06:42 +0200
Subject: [PATCH 02/24] kigo: init at 20.04.3

---
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/kigo.nix    | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 +-
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/kigo.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 24ff40e947b9..096a901c038c 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -121,6 +121,7 @@ let
       khelpcenter = callPackage ./khelpcenter.nix {};
       kidentitymanagement = callPackage ./kidentitymanagement.nix {};
       kig = callPackage ./kig.nix {};
+      kigo = callPackage ./kigo.nix {};
       kimap = callPackage ./kimap.nix {};
       kipi-plugins = callPackage ./kipi-plugins.nix {};
       kitinerary = callPackage ./kitinerary.nix {};
diff --git a/pkgs/applications/kde/kigo.nix b/pkgs/applications/kde/kigo.nix
new file mode 100644
index 000000000000..24ce5cfbb52d
--- /dev/null
+++ b/pkgs/applications/kde/kigo.nix
@@ -0,0 +1,22 @@
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, knewstuff }:
+
+mkDerivation {
+  name = "kigo";
+  meta = with lib; {
+    homepage = "https://kde.org/applications/en/games/org/kde.kigo";
+    description = "Kigo est une implémentation libre du jeu de Go";
+    maintainers = with maintainers; [ freezeboy ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    libkdegames
+    knewstuff
+    kdoctools
+    ki18n
+    kio
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 592b0fa3cec7..d211e7ae138a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21053,7 +21053,7 @@ in
   inherit (kdeApplications)
     akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
     kaddressbook kapptemplate kate kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
-    keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake
+    keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake
     kpkpass kitinerary kontact korganizer krdc krfb ksquares ksystemlog ktouch kwalletmanager marble minuet okular picmi spectacle;
 
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };

From 7e0095d2ee1548059a98ea7fb0630acce0b3808d Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sun, 26 Jul 2020 12:58:11 +0200
Subject: [PATCH 03/24] kwave: init at 20.04.3

---
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/kwave.nix   | 37 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 +-
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/kwave.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 096a901c038c..b1aeee03ce27 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -161,6 +161,7 @@ let
       ktnef = callPackage ./ktnef.nix {};
       ktouch = callPackage ./ktouch.nix {};
       kwalletmanager = callPackage ./kwalletmanager.nix {};
+      kwave = callPackage ./kwave.nix {};
       libgravatar = callPackage ./libgravatar.nix {};
       libkcddb = callPackage ./libkcddb.nix {};
       libkdcraw = callPackage ./libkdcraw.nix {};
diff --git a/pkgs/applications/kde/kwave.nix b/pkgs/applications/kde/kwave.nix
new file mode 100644
index 000000000000..349787d000b5
--- /dev/null
+++ b/pkgs/applications/kde/kwave.nix
@@ -0,0 +1,37 @@
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, qtmultimedia, kcompletion, kconfig, kcrash, kiconthemes, kio, audiofile, libsamplerate
+, alsaLib, libpulseaudio, flac, id3lib, libogg, libmad, libopus, libvorbis, fftw, librsvg }:
+
+mkDerivation {
+  name = "kwave";
+  meta = with lib; {
+    homepage = "https://kde.org/applications/en/multimedia/org.kde.kwave";
+    description = "KWave is a simple media player";
+    maintainers = with maintainers; [ freezeboy ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    alsaLib
+    audiofile
+    kcrash
+    kdoctools
+    qtmultimedia
+    kcompletion
+    kconfig
+    kiconthemes
+    kio
+    libpulseaudio
+    libsamplerate
+    flac
+    fftw
+    id3lib
+    libogg
+    libmad
+    libopus
+    libvorbis
+    librsvg
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d211e7ae138a..d660133cf39c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21054,7 +21054,7 @@ in
     akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
     kaddressbook kapptemplate kate kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
     keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake
-    kpkpass kitinerary kontact korganizer krdc krfb ksquares ksystemlog ktouch kwalletmanager marble minuet okular picmi spectacle;
+    kpkpass kitinerary kontact korganizer krdc krfb ksquares ksystemlog ktouch kwalletmanager kwave marble minuet okular picmi spectacle;
 
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };
 

From 918550582154d7a018335fb3a9758d74ea1c4a9d Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sun, 26 Jul 2020 01:05:51 +0200
Subject: [PATCH 04/24] kmag: init at 20.04.3

---
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/kmag.nix    | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/kmag.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index b1aeee03ce27..bfd6bcb478a0 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -128,6 +128,7 @@ let
       kio-extras = callPackage ./kio-extras.nix {};
       kldap = callPackage ./kldap.nix {};
       kleopatra = callPackage ./kleopatra.nix {};
+      kmag = callPackage ./kmag.nix {};
       kmahjongg = callPackage ./kmahjongg.nix {};
       kmail = callPackage ./kmail.nix {};
       kmail-account-wizard = callPackage ./kmail-account-wizard.nix {};
diff --git a/pkgs/applications/kde/kmag.nix b/pkgs/applications/kde/kmag.nix
new file mode 100644
index 000000000000..701d8dbf130a
--- /dev/null
+++ b/pkgs/applications/kde/kmag.nix
@@ -0,0 +1,20 @@
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio }:
+
+mkDerivation {
+  name = "kmag";
+  meta = with lib; {
+    homepage = "https://kde.org/applications/en/utilities/org.kde.kmag";
+    description = "KMag is a small utility for Linux to magnify a part of the screen";
+    maintainers = with maintainers; [ freezeboy ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    kdoctools
+    ki18n
+    kio
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d660133cf39c..4437ad6fa1e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21053,7 +21053,7 @@ in
   inherit (kdeApplications)
     akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
     kaddressbook kapptemplate kate kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
-    keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake
+    keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo kleopatra kmag kmail kmix kmplot kolourpaint kompare konsole yakuake
     kpkpass kitinerary kontact korganizer krdc krfb ksquares ksystemlog ktouch kwalletmanager kwave marble minuet okular picmi spectacle;
 
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };

From 308354570445315c2a56168821528b2cacca45bb Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sun, 26 Jul 2020 01:12:33 +0200
Subject: [PATCH 05/24] katomic: init at 20.04.3

---
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/katomic.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 +-
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/katomic.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index bfd6bcb478a0..567f5f8f37b1 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -94,6 +94,7 @@ let
       kalarmcal = callPackage ./kalarmcal.nix {};
       kapptemplate = callPackage ./kapptemplate.nix { };
       kate = callPackage ./kate.nix {};
+      katomic = callPackage ./katomic.nix {};
       kbounce = callPackage ./kbounce.nix {};
       kbreakout = callPackage ./kbreakout.nix {};
       kcachegrind = callPackage ./kcachegrind.nix {};
diff --git a/pkgs/applications/kde/katomic.nix b/pkgs/applications/kde/katomic.nix
new file mode 100644
index 000000000000..a1d0f12b6a1d
--- /dev/null
+++ b/pkgs/applications/kde/katomic.nix
@@ -0,0 +1,22 @@
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, knewstuff }:
+
+mkDerivation {
+  name = "katomic";
+  meta = with lib; {
+    homepage = "https://kde.org/applications/en/games/org.kde.katomic";
+    description = "KAtomic is a fun educational game built around molecular geometry";
+    maintainers = with maintainers; [ freezeboy ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    knewstuff
+    libkdegames
+    kdoctools
+    ki18n
+    kio
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4437ad6fa1e6..f17677957e4b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21052,7 +21052,7 @@ in
 
   inherit (kdeApplications)
     akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
-    kaddressbook kapptemplate kate kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
+    kaddressbook kapptemplate kate katomic kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
     keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo kleopatra kmag kmail kmix kmplot kolourpaint kompare konsole yakuake
     kpkpass kitinerary kontact korganizer krdc krfb ksquares ksystemlog ktouch kwalletmanager kwave marble minuet okular picmi spectacle;
 

From 3be794aef3ca1c779aec6473354c8a0e8f6e7d93 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sun, 26 Jul 2020 01:03:51 +0200
Subject: [PATCH 06/24] kmines: init at 20.04.3

---
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/kmines.nix  | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 +-
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/kmines.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 567f5f8f37b1..3be43f0cbef4 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -136,6 +136,7 @@ let
       kmailtransport = callPackage ./kmailtransport.nix {};
       kmbox = callPackage ./kmbox.nix {};
       kmime = callPackage ./kmime.nix {};
+      kmines = callPackage ./kmines.nix {};
       kmix = callPackage ./kmix.nix {};
       kmplot = callPackage ./kmplot.nix {};
       knotes = callPackage ./knotes.nix {};
diff --git a/pkgs/applications/kde/kmines.nix b/pkgs/applications/kde/kmines.nix
new file mode 100644
index 000000000000..9314cca4a23f
--- /dev/null
+++ b/pkgs/applications/kde/kmines.nix
@@ -0,0 +1,23 @@
+{ mkDerivation, lib, extra-cmake-modules, libkdegames, kconfig, kcrash, kdoctools, ki18n, kio }:
+
+mkDerivation {
+  name = "kmines";
+  meta = with lib; {
+    homepage = "https://kde.org/applications/en/games/org.kde.kmines";
+    description = "KMines is a classic Minesweeper game";
+    maintainers = with maintainers; [ freezeboy ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    libkdegames
+    kconfig
+    kcrash
+    kio
+    kdoctools
+    ki18n
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f17677957e4b..5f627c2d7eab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21053,7 +21053,7 @@ in
   inherit (kdeApplications)
     akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
     kaddressbook kapptemplate kate katomic kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
-    keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo kleopatra kmag kmail kmix kmplot kolourpaint kompare konsole yakuake
+    keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo kleopatra kmag kmail kmines kmix kmplot kolourpaint kompare konsole yakuake
     kpkpass kitinerary kontact korganizer krdc krfb ksquares ksystemlog ktouch kwalletmanager kwave marble minuet okular picmi spectacle;
 
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };

From ef279759b6fc2c139bbe65c8d7925afd58485198 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sun, 26 Jul 2020 01:20:08 +0200
Subject: [PATCH 07/24] kalzium: init at 20.04.3

---
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/kalzium.nix | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 +-
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/kalzium.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 3be43f0cbef4..89bb96901ea8 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -92,6 +92,7 @@ let
       kaddressbook = callPackage ./kaddressbook.nix {};
       kalarm = callPackage ./kalarm.nix {};
       kalarmcal = callPackage ./kalarmcal.nix {};
+      kalzium = callPackage ./kalzium.nix {};
       kapptemplate = callPackage ./kapptemplate.nix { };
       kate = callPackage ./kate.nix {};
       katomic = callPackage ./katomic.nix {};
diff --git a/pkgs/applications/kde/kalzium.nix b/pkgs/applications/kde/kalzium.nix
new file mode 100644
index 000000000000..5bb51a6b4e1d
--- /dev/null
+++ b/pkgs/applications/kde/kalzium.nix
@@ -0,0 +1,26 @@
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, openbabel, avogadro, qtscript, kparts, kplotting, kunitconversion }:
+
+mkDerivation {
+  name = "kalzium";
+  meta = with lib; {
+    homepage = "https://kde.org/applications/en/utilities/org.kde.kalzium";
+    description = "Kalzium is a program that shows you the Periodic Table of Elements";
+    maintainers = with maintainers; [ freezeboy ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    qtscript
+    #avogadro
+    kdoctools
+    ki18n
+    kio
+    openbabel
+    kparts
+    kplotting
+    kunitconversion
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f627c2d7eab..7f64e002fbe7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21052,7 +21052,7 @@ in
 
   inherit (kdeApplications)
     akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
-    kaddressbook kapptemplate kate katomic kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
+    kaddressbook kalzium kapptemplate kate katomic kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
     keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo kleopatra kmag kmail kmines kmix kmplot kolourpaint kompare konsole yakuake
     kpkpass kitinerary kontact korganizer krdc krfb ksquares ksystemlog ktouch kwalletmanager kwave marble minuet okular picmi spectacle;
 

From 547625170c5100edb90d2134efcf5cb4cdd970ea Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sun, 26 Jul 2020 01:27:57 +0200
Subject: [PATCH 08/24] klettres: init at 20.04.3

---
 pkgs/applications/kde/default.nix  |  1 +
 pkgs/applications/kde/klettres.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 +-
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/klettres.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 89bb96901ea8..4aee77b47311 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -130,6 +130,7 @@ let
       kio-extras = callPackage ./kio-extras.nix {};
       kldap = callPackage ./kldap.nix {};
       kleopatra = callPackage ./kleopatra.nix {};
+      klettres = callPackage ./klettres.nix {};
       kmag = callPackage ./kmag.nix {};
       kmahjongg = callPackage ./kmahjongg.nix {};
       kmail = callPackage ./kmail.nix {};
diff --git a/pkgs/applications/kde/klettres.nix b/pkgs/applications/kde/klettres.nix
new file mode 100644
index 000000000000..e8e0a0aa59ab
--- /dev/null
+++ b/pkgs/applications/kde/klettres.nix
@@ -0,0 +1,22 @@
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, phonon, knewstuff }:
+
+mkDerivation {
+  name = "klettres";
+  meta = with lib; {
+    homepage = "https://kde.org/applications/en/utilities/org.kde.klettres";
+    description = "KLettres is an application specially designed to help the user to learn an alphabet";
+    maintainers = with maintainers; [ freezeboy ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    phonon
+    knewstuff
+    kdoctools
+    ki18n
+    kio
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7f64e002fbe7..28cb8cfe2b80 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21053,7 +21053,7 @@ in
   inherit (kdeApplications)
     akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
     kaddressbook kalzium kapptemplate kate katomic kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
-    keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo kleopatra kmag kmail kmines kmix kmplot kolourpaint kompare konsole yakuake
+    keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo kleopatra klettres kmag kmail kmines kmix kmplot kolourpaint kompare konsole yakuake
     kpkpass kitinerary kontact korganizer krdc krfb ksquares ksystemlog ktouch kwalletmanager kwave marble minuet okular picmi spectacle;
 
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };

From 18d5a170f498d802d6dd9ed487610c507bdadc13 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sun, 26 Jul 2020 00:53:37 +0200
Subject: [PATCH 09/24] klines: init at 20.04.3

---
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/klines.nix  | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/klines.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 4aee77b47311..826d3281efe2 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -131,6 +131,7 @@ let
       kldap = callPackage ./kldap.nix {};
       kleopatra = callPackage ./kleopatra.nix {};
       klettres = callPackage ./klettres.nix {};
+      klines = callPackage ./klines.nix {};
       kmag = callPackage ./kmag.nix {};
       kmahjongg = callPackage ./kmahjongg.nix {};
       kmail = callPackage ./kmail.nix {};
diff --git a/pkgs/applications/kde/klines.nix b/pkgs/applications/kde/klines.nix
new file mode 100644
index 000000000000..c6ad883dd63d
--- /dev/null
+++ b/pkgs/applications/kde/klines.nix
@@ -0,0 +1,21 @@
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:
+
+mkDerivation {
+  name = "klines";
+  meta = with lib; {
+    homepage = "https://kde.org/applications/en/games/org.kde.klines";
+    description = "KLines is a simple but highly addictive one player game";
+    maintainers = with maintainers; [ freezeboy ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    libkdegames
+    kdoctools
+    ki18n
+    kio
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28cb8cfe2b80..2bb1369e654c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21053,7 +21053,7 @@ in
   inherit (kdeApplications)
     akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
     kaddressbook kalzium kapptemplate kate katomic kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
-    keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo kleopatra klettres kmag kmail kmines kmix kmplot kolourpaint kompare konsole yakuake
+    keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo kleopatra klettres klines kmag kmail kmines kmix kmplot kolourpaint kompare konsole yakuake
     kpkpass kitinerary kontact korganizer krdc krfb ksquares ksystemlog ktouch kwalletmanager kwave marble minuet okular picmi spectacle;
 
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };

From 4919f3c33b829bacea0510c5cc0cd82091762a83 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sun, 26 Jul 2020 00:18:49 +0200
Subject: [PATCH 10/24] knetwalk: init at 20.04.3

---
 pkgs/applications/kde/default.nix  |  1 +
 pkgs/applications/kde/knetwalk.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/knetwalk.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 826d3281efe2..40c77ab89b3b 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -142,6 +142,7 @@ let
       kmines = callPackage ./kmines.nix {};
       kmix = callPackage ./kmix.nix {};
       kmplot = callPackage ./kmplot.nix {};
+      knetwalk = callPackage ./knetwalk.nix {};
       knotes = callPackage ./knotes.nix {};
       kolf = callPackage ./kolf.nix {};
       kolourpaint = callPackage ./kolourpaint.nix {};
diff --git a/pkgs/applications/kde/knetwalk.nix b/pkgs/applications/kde/knetwalk.nix
new file mode 100644
index 000000000000..88d08b56bb1d
--- /dev/null
+++ b/pkgs/applications/kde/knetwalk.nix
@@ -0,0 +1,21 @@
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:
+
+mkDerivation {
+  name = "knetwalk";
+  meta = with lib; {
+    homepage = "https://kde.org/applications/en/games/org.kde.knetwalk";
+    description = "KNetWalk is a single player logic game";
+    maintainers = with maintainers; [ freezeboy ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    libkdegames
+    kdoctools
+    ki18n
+    kio
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2bb1369e654c..76c0bc55a746 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21053,7 +21053,7 @@ in
   inherit (kdeApplications)
     akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
     kaddressbook kalzium kapptemplate kate katomic kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
-    keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo kleopatra klettres klines kmag kmail kmines kmix kmplot kolourpaint kompare konsole yakuake
+    keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo kleopatra klettres klines kmag kmail kmines kmix kmplot knetwalk kolourpaint kompare konsole yakuake
     kpkpass kitinerary kontact korganizer krdc krfb ksquares ksystemlog ktouch kwalletmanager kwave marble minuet okular picmi spectacle;
 
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };

From 71830f462cba405befd028ca909739b36c0399df Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sun, 26 Jul 2020 01:23:51 +0200
Subject: [PATCH 11/24] kturtle: init at 20.04.3

---
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/kturtle.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/kturtle.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 40c77ab89b3b..84798a2f5cdf 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -167,6 +167,7 @@ let
       ksystemlog = callPackage ./ksystemlog.nix {};
       ktnef = callPackage ./ktnef.nix {};
       ktouch = callPackage ./ktouch.nix {};
+      kturtle = callPackage ./kturtle.nix {};
       kwalletmanager = callPackage ./kwalletmanager.nix {};
       kwave = callPackage ./kwave.nix {};
       libgravatar = callPackage ./libgravatar.nix {};
diff --git a/pkgs/applications/kde/kturtle.nix b/pkgs/applications/kde/kturtle.nix
new file mode 100644
index 000000000000..e16c86dc1362
--- /dev/null
+++ b/pkgs/applications/kde/kturtle.nix
@@ -0,0 +1,21 @@
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, knewstuff }:
+
+mkDerivation {
+  name = "kturtle";
+  meta = with lib; {
+    homepage = "https://kde.org/applications/en/utilities/org.kde.kturtle";
+    description = "KTurtle is an educational programming environment for learning how to program";
+    maintainers = with maintainers; [ freezeboy ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    kdoctools
+    ki18n
+    kio
+    knewstuff
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 76c0bc55a746..b507a0cdda0c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21054,7 +21054,7 @@ in
     akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
     kaddressbook kalzium kapptemplate kate katomic kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
     keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo kleopatra klettres klines kmag kmail kmines kmix kmplot knetwalk kolourpaint kompare konsole yakuake
-    kpkpass kitinerary kontact korganizer krdc krfb ksquares ksystemlog ktouch kwalletmanager kwave marble minuet okular picmi spectacle;
+    kpkpass kitinerary kontact korganizer krdc krfb ksquares ksystemlog ktouch kturtle kwalletmanager kwave marble minuet okular picmi spectacle;
 
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };
 

From 48c5f496e59f8424138d4c674a4d0e275f029fa5 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 25 Jul 2020 21:26:15 +0200
Subject: [PATCH 12/24] kapman: init at 20.04.3

---
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/kapman.nix  | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/kapman.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 84798a2f5cdf..b9c3a4d50e9b 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -93,6 +93,7 @@ let
       kalarm = callPackage ./kalarm.nix {};
       kalarmcal = callPackage ./kalarmcal.nix {};
       kalzium = callPackage ./kalzium.nix {};
+      kapman = callPackage ./kapman.nix {};
       kapptemplate = callPackage ./kapptemplate.nix { };
       kate = callPackage ./kate.nix {};
       katomic = callPackage ./katomic.nix {};
diff --git a/pkgs/applications/kde/kapman.nix b/pkgs/applications/kde/kapman.nix
new file mode 100644
index 000000000000..68af796dda4b
--- /dev/null
+++ b/pkgs/applications/kde/kapman.nix
@@ -0,0 +1,21 @@
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:
+
+mkDerivation {
+  name = "kapman";
+  meta = with lib; {
+    homepage = "https://kde.org/applications/en/games/org.kde.kapman";
+    description = "Kapman is a clone of the well known game Pac-Man";
+    maintainers = with maintainers; [ freezeboy ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    libkdegames
+    kdoctools
+    ki18n
+    kio
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b507a0cdda0c..bb227e821ee3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21052,7 +21052,7 @@ in
 
   inherit (kdeApplications)
     akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
-    kaddressbook kalzium kapptemplate kate katomic kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
+    kaddressbook kalzium kapptemplate kapman kate katomic kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
     keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo kleopatra klettres klines kmag kmail kmines kmix kmplot knetwalk kolourpaint kompare konsole yakuake
     kpkpass kitinerary kontact korganizer krdc krfb ksquares ksystemlog ktouch kturtle kwalletmanager kwave marble minuet okular picmi spectacle;
 

From 214647d544f82380a5db7c5f357fcf1f3a2f0ffb Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sun, 26 Jul 2020 01:15:28 +0200
Subject: [PATCH 13/24] kblocks: init at 20.04.3

---
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/kblocks.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/kblocks.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index b9c3a4d50e9b..b36acede6d0f 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -97,6 +97,7 @@ let
       kapptemplate = callPackage ./kapptemplate.nix { };
       kate = callPackage ./kate.nix {};
       katomic = callPackage ./katomic.nix {};
+      kblocks = callPackage ./kblocks.nix {};
       kbounce = callPackage ./kbounce.nix {};
       kbreakout = callPackage ./kbreakout.nix {};
       kcachegrind = callPackage ./kcachegrind.nix {};
diff --git a/pkgs/applications/kde/kblocks.nix b/pkgs/applications/kde/kblocks.nix
new file mode 100644
index 000000000000..1dedabb2a082
--- /dev/null
+++ b/pkgs/applications/kde/kblocks.nix
@@ -0,0 +1,21 @@
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:
+
+mkDerivation {
+  name = "kblocks";
+  meta = with lib; {
+    homepage = "https://kde.org/applications/en/games/org.kde.kblocks";
+    description = "KBlocks is the classic falling blocks game";
+    maintainers = with maintainers; [ freezeboy ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    libkdegames
+    kdoctools
+    ki18n
+    kio
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb227e821ee3..6e60f9594c39 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21052,7 +21052,7 @@ in
 
   inherit (kdeApplications)
     akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
-    kaddressbook kalzium kapptemplate kapman kate katomic kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
+    kaddressbook kalzium kapptemplate kapman kate katomic kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
     keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo kleopatra klettres klines kmag kmail kmines kmix kmplot knetwalk kolourpaint kompare konsole yakuake
     kpkpass kitinerary kontact korganizer krdc krfb ksquares ksystemlog ktouch kturtle kwalletmanager kwave marble minuet okular picmi spectacle;
 

From 05ec46b114f789500feb8b730246fc44a9ef44e1 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 25 Jul 2020 21:11:44 +0200
Subject: [PATCH 14/24] killbots: init at 20.04.3

---
 pkgs/applications/kde/default.nix  |  1 +
 pkgs/applications/kde/killbots.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/killbots.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index b36acede6d0f..ddb1f2f33a80 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -126,6 +126,7 @@ let
       kidentitymanagement = callPackage ./kidentitymanagement.nix {};
       kig = callPackage ./kig.nix {};
       kigo = callPackage ./kigo.nix {};
+      killbots = callPackage ./killbots.nix {};
       kimap = callPackage ./kimap.nix {};
       kipi-plugins = callPackage ./kipi-plugins.nix {};
       kitinerary = callPackage ./kitinerary.nix {};
diff --git a/pkgs/applications/kde/killbots.nix b/pkgs/applications/kde/killbots.nix
new file mode 100644
index 000000000000..ec9b6de82c90
--- /dev/null
+++ b/pkgs/applications/kde/killbots.nix
@@ -0,0 +1,21 @@
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:
+
+mkDerivation {
+  name = "killbots";
+  meta = with lib; {
+    homepage = "https://kde.org/applications/en/games/org.kde.killbots";
+    description = "A game where you avoid robots";
+    maintainers = with maintainers; [ freezeboy ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    libkdegames
+    kdoctools
+    ki18n
+    kio
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e60f9594c39..49348eb144a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21053,7 +21053,7 @@ in
   inherit (kdeApplications)
     akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
     kaddressbook kalzium kapptemplate kapman kate katomic kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
-    keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo kleopatra klettres klines kmag kmail kmines kmix kmplot knetwalk kolourpaint kompare konsole yakuake
+    keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo killbots kleopatra klettres klines kmag kmail kmines kmix kmplot knetwalk kolourpaint kompare konsole yakuake
     kpkpass kitinerary kontact korganizer krdc krfb ksquares ksystemlog ktouch kturtle kwalletmanager kwave marble minuet okular picmi spectacle;
 
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };

From d166d7bc6fc0b91030898283415c9d8bcff64909 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sun, 26 Jul 2020 01:09:14 +0200
Subject: [PATCH 15/24] kreversi: init at 20.04.3

---
 pkgs/applications/kde/default.nix  |  1 +
 pkgs/applications/kde/kreversi.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/kreversi.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index ddb1f2f33a80..6b37d6f45dfe 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -162,6 +162,7 @@ let
       ksquares = callPackage ./ksquares.nix {};
       kqtquickcharts = callPackage ./kqtquickcharts.nix {};
       kpkpass = callPackage ./kpkpass.nix {};
+      kreversi = callPackage ./kreversi.nix {};
       krdc = callPackage ./krdc.nix {};
       krfb = callPackage ./krfb.nix {};
       kruler = callPackage ./kruler.nix {};
diff --git a/pkgs/applications/kde/kreversi.nix b/pkgs/applications/kde/kreversi.nix
new file mode 100644
index 000000000000..77ac4f05c8a8
--- /dev/null
+++ b/pkgs/applications/kde/kreversi.nix
@@ -0,0 +1,19 @@
+{ mkDerivation, lib, extra-cmake-modules, libkdegames, kdeclarative }:
+
+mkDerivation {
+  name = "kreversi";
+  meta = with lib; {
+    homepage = "https://kde.org/applications/en/games/org.kde.kreversi";
+    description = "KReversi is a simple one player strategy game played against the computer";
+    maintainers = with maintainers; [ freezeboy ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    kdeclarative
+    libkdegames
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 49348eb144a6..dec8eb29697e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21054,7 +21054,7 @@ in
     akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
     kaddressbook kalzium kapptemplate kapman kate katomic kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
     keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo killbots kleopatra klettres klines kmag kmail kmines kmix kmplot knetwalk kolourpaint kompare konsole yakuake
-    kpkpass kitinerary kontact korganizer krdc krfb ksquares ksystemlog ktouch kturtle kwalletmanager kwave marble minuet okular picmi spectacle;
+    kpkpass kitinerary kontact korganizer krdc kreversi krfb ksquares ksystemlog ktouch kturtle kwalletmanager kwave marble minuet okular picmi spectacle;
 
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };
 

From 4331654628f090c5af2af8b8f3269e0ffcae7909 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 21 Aug 2020 10:13:02 +0200
Subject: [PATCH 16/24] kdiamond: init at 20.04.3

---
 pkgs/applications/kde/default.nix  |  1 +
 pkgs/applications/kde/kdiamond.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 +-
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/kdiamond.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 6b37d6f45dfe..fcfd0e39d42a 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -116,6 +116,7 @@ let
       kdepim-apps-libs = callPackage ./kdepim-apps-libs {};
       kdf = callPackage ./kdf.nix {};
       kdialog = callPackage ./kdialog.nix {};
+      kdiamond = callPackage ./kdiamond.nix {};
       keditbookmarks = callPackage ./keditbookmarks.nix {};
       kfind = callPackage ./kfind.nix {};
       kfloppy = callPackage ./kfloppy.nix {};
diff --git a/pkgs/applications/kde/kdiamond.nix b/pkgs/applications/kde/kdiamond.nix
new file mode 100644
index 000000000000..26cd731beaf5
--- /dev/null
+++ b/pkgs/applications/kde/kdiamond.nix
@@ -0,0 +1,23 @@
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, kconfig, knotifyconfig }:
+
+mkDerivation {
+  name = "kdiamond";
+  meta = with lib; {
+    homepage = "https://kde.org/applications/en/games/org.kde.kdiamond";
+    description = "KDiamond is a single player puzzle game";
+    maintainers = with maintainers; [ freezeboy ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    libkdegames
+    knotifyconfig
+    kconfig
+    kdoctools
+    ki18n
+    kio
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dec8eb29697e..d32f9c0e1357 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21052,7 +21052,7 @@ in
 
   inherit (kdeApplications)
     akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
-    kaddressbook kalzium kapptemplate kapman kate katomic kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
+    kaddressbook kalzium kapptemplate kapman kate katomic kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog kdiamond
     keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo killbots kleopatra klettres klines kmag kmail kmines kmix kmplot knetwalk kolourpaint kompare konsole yakuake
     kpkpass kitinerary kontact korganizer krdc kreversi krfb ksquares ksystemlog ktouch kturtle kwalletmanager kwave marble minuet okular picmi spectacle;
 

From 5344891159ba3fe1f580483c17c5ba687f882196 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 21 Aug 2020 10:20:26 +0200
Subject: [PATCH 17/24] kblackbox: init at 20.04.3

---
 pkgs/applications/kde/default.nix   |  1 +
 pkgs/applications/kde/kblackbox.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/kblackbox.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index fcfd0e39d42a..67bdbe0170c6 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -97,6 +97,7 @@ let
       kapptemplate = callPackage ./kapptemplate.nix { };
       kate = callPackage ./kate.nix {};
       katomic = callPackage ./katomic.nix {};
+      kblackbox = callPackage ./kblackbox.nix {};
       kblocks = callPackage ./kblocks.nix {};
       kbounce = callPackage ./kbounce.nix {};
       kbreakout = callPackage ./kbreakout.nix {};
diff --git a/pkgs/applications/kde/kblackbox.nix b/pkgs/applications/kde/kblackbox.nix
new file mode 100644
index 000000000000..669c089df809
--- /dev/null
+++ b/pkgs/applications/kde/kblackbox.nix
@@ -0,0 +1,21 @@
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:
+
+mkDerivation {
+  name = "kblackbox";
+  meta = with lib; {
+    homepage = "https://kde.org/applications/en/games/org.kde.kblackbox";
+    description = "KBlackbox is a game of hide and seek played on a grid of boxes";
+    maintainers = with maintainers; [ freezeboy ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    libkdegames
+    kdoctools
+    ki18n
+    kio
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d32f9c0e1357..63b0fedfbf3b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21052,7 +21052,7 @@ in
 
   inherit (kdeApplications)
     akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
-    kaddressbook kalzium kapptemplate kapman kate katomic kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog kdiamond
+    kaddressbook kalzium kapptemplate kapman kate katomic kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog kdiamond
     keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo killbots kleopatra klettres klines kmag kmail kmines kmix kmplot knetwalk kolourpaint kompare konsole yakuake
     kpkpass kitinerary kontact korganizer krdc kreversi krfb ksquares ksystemlog ktouch kturtle kwalletmanager kwave marble minuet okular picmi spectacle;
 

From 62772e6b03dcb9267cf1b77f374adad655627527 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 21 Aug 2020 10:25:06 +0200
Subject: [PATCH 18/24] knavalbattle: init at 20.04.3

---
 pkgs/applications/kde/default.nix      |  1 +
 pkgs/applications/kde/knavalbattle.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 +-
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/knavalbattle.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 67bdbe0170c6..46e79f0ba1e3 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -147,6 +147,7 @@ let
       kmines = callPackage ./kmines.nix {};
       kmix = callPackage ./kmix.nix {};
       kmplot = callPackage ./kmplot.nix {};
+      knavalbattle = callPackage ./knavalbattle.nix {};
       knetwalk = callPackage ./knetwalk.nix {};
       knotes = callPackage ./knotes.nix {};
       kolf = callPackage ./kolf.nix {};
diff --git a/pkgs/applications/kde/knavalbattle.nix b/pkgs/applications/kde/knavalbattle.nix
new file mode 100644
index 000000000000..669f9961a497
--- /dev/null
+++ b/pkgs/applications/kde/knavalbattle.nix
@@ -0,0 +1,22 @@
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, kdnssd }:
+
+mkDerivation {
+  name = "knavalbattle";
+  meta = with lib; {
+    homepage = "https://kde.org/applications/en/games/org.kde.knavalbattle";
+    description = "Naval Battle is a ship sinking game";
+    maintainers = with maintainers; [ freezeboy ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    libkdegames
+    kdoctools
+    ki18n
+    kio
+    kdnssd
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 63b0fedfbf3b..944dc127da16 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21053,7 +21053,7 @@ in
   inherit (kdeApplications)
     akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
     kaddressbook kalzium kapptemplate kapman kate katomic kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog kdiamond
-    keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo killbots kleopatra klettres klines kmag kmail kmines kmix kmplot knetwalk kolourpaint kompare konsole yakuake
+    keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo killbots kleopatra klettres klines kmag kmail kmines kmix kmplot knavalbattle knetwalk kolourpaint kompare konsole yakuake
     kpkpass kitinerary kontact korganizer krdc kreversi krfb ksquares ksystemlog ktouch kturtle kwalletmanager kwave marble minuet okular picmi spectacle;
 
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };

From 7e69895f379af0f76225927475b5e5e8e5aeadcd Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 21 Aug 2020 10:29:47 +0200
Subject: [PATCH 19/24] knights: init at 20.04.3

---
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/knights.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 +-
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/knights.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 46e79f0ba1e3..fd4a6453924c 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -149,6 +149,7 @@ let
       kmplot = callPackage ./kmplot.nix {};
       knavalbattle = callPackage ./knavalbattle.nix {};
       knetwalk = callPackage ./knetwalk.nix {};
+      knights = callPackage ./knights.nix {};
       knotes = callPackage ./knotes.nix {};
       kolf = callPackage ./kolf.nix {};
       kolourpaint = callPackage ./kolourpaint.nix {};
diff --git a/pkgs/applications/kde/knights.nix b/pkgs/applications/kde/knights.nix
new file mode 100644
index 000000000000..ee5c37e2e948
--- /dev/null
+++ b/pkgs/applications/kde/knights.nix
@@ -0,0 +1,23 @@
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, kplotting, plasma-framework, libkdegames }:
+
+mkDerivation {
+  name = "knights";
+  meta = with lib; {
+    homepage = "https://kde.org/applications/en/games/org.kde.knights";
+    description = "KNights is a chess game";
+    maintainers = with maintainers; [ freezeboy ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    libkdegames
+    plasma-framework
+    kplotting
+    kdoctools
+    ki18n
+    kio
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 944dc127da16..94406b91bde3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21053,7 +21053,7 @@ in
   inherit (kdeApplications)
     akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
     kaddressbook kalzium kapptemplate kapman kate katomic kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog kdiamond
-    keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo killbots kleopatra klettres klines kmag kmail kmines kmix kmplot knavalbattle knetwalk kolourpaint kompare konsole yakuake
+    keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo killbots kleopatra klettres klines kmag kmail kmines kmix kmplot knavalbattle knetwalk knights kolourpaint kompare konsole yakuake
     kpkpass kitinerary kontact korganizer krdc kreversi krfb ksquares ksystemlog ktouch kturtle kwalletmanager kwave marble minuet okular picmi spectacle;
 
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };

From 2a5afc55b52b9a3ec6d4a5a134ddb79c72d9c5b0 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 21 Aug 2020 10:34:35 +0200
Subject: [PATCH 20/24] kollision: init at 20.04.3

---
 pkgs/applications/kde/default.nix   |  1 +
 pkgs/applications/kde/kollision.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/kollision.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index fd4a6453924c..b30b15c4ad8f 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -152,6 +152,7 @@ let
       knights = callPackage ./knights.nix {};
       knotes = callPackage ./knotes.nix {};
       kolf = callPackage ./kolf.nix {};
+      kollision = callPackage ./kollision.nix {};
       kolourpaint = callPackage ./kolourpaint.nix {};
       kompare = callPackage ./kompare.nix {};
       konsole = callPackage ./konsole.nix {};
diff --git a/pkgs/applications/kde/kollision.nix b/pkgs/applications/kde/kollision.nix
new file mode 100644
index 000000000000..3c0c814cd15a
--- /dev/null
+++ b/pkgs/applications/kde/kollision.nix
@@ -0,0 +1,21 @@
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:
+
+mkDerivation {
+  name = "kollision";
+  meta = with lib; {
+    homepage = "https://kde.org/applications/en/games/org.kde.kollision";
+    description = "Kollision is a casual game";
+    maintainers = with maintainers; [ freezeboy ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    libkdegames
+    kdoctools
+    ki18n
+    kio
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94406b91bde3..3c494a87355b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21053,7 +21053,7 @@ in
   inherit (kdeApplications)
     akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
     kaddressbook kalzium kapptemplate kapman kate katomic kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog kdiamond
-    keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo killbots kleopatra klettres klines kmag kmail kmines kmix kmplot knavalbattle knetwalk knights kolourpaint kompare konsole yakuake
+    keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo killbots kleopatra klettres klines kmag kmail kmines kmix kmplot kollision knavalbattle knetwalk knights kolourpaint kompare konsole yakuake
     kpkpass kitinerary kontact korganizer krdc kreversi krfb ksquares ksystemlog ktouch kturtle kwalletmanager kwave marble minuet okular picmi spectacle;
 
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };

From f33b52669ee1df9edb3ea2e08879040de9b4a455 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 21 Aug 2020 10:39:04 +0200
Subject: [PATCH 21/24] ktimer: init at 20.04.3

---
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/ktimer.nix  | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/ktimer.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index b30b15c4ad8f..041108a9c5d7 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -174,6 +174,7 @@ let
       kspaceduel = callPackage ./kspaceduel.nix {};
       ksudoku = callPackage ./ksudoku.nix {};
       ksystemlog = callPackage ./ksystemlog.nix {};
+      ktimer = callPackage ./ktimer.nix {};
       ktnef = callPackage ./ktnef.nix {};
       ktouch = callPackage ./ktouch.nix {};
       kturtle = callPackage ./kturtle.nix {};
diff --git a/pkgs/applications/kde/ktimer.nix b/pkgs/applications/kde/ktimer.nix
new file mode 100644
index 000000000000..aa755f35ce43
--- /dev/null
+++ b/pkgs/applications/kde/ktimer.nix
@@ -0,0 +1,20 @@
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio }:
+
+mkDerivation {
+  name = "ktimer";
+  meta = with lib; {
+    homepage = "https://kde.org/applications/en/utilities/org.kde.ktimer";
+    description = "KTimer is a little tool to execute programs after some time";
+    maintainers = with maintainers; [ freezeboy ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    kdoctools
+    ki18n
+    kio
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c494a87355b..edd5e29b280b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21054,7 +21054,7 @@ in
     akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
     kaddressbook kalzium kapptemplate kapman kate katomic kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog kdiamond
     keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo killbots kleopatra klettres klines kmag kmail kmines kmix kmplot kollision knavalbattle knetwalk knights kolourpaint kompare konsole yakuake
-    kpkpass kitinerary kontact korganizer krdc kreversi krfb ksquares ksystemlog ktouch kturtle kwalletmanager kwave marble minuet okular picmi spectacle;
+    kpkpass kitinerary kontact korganizer krdc kreversi krfb ksquares ksystemlog ktimer ktouch kturtle kwalletmanager kwave marble minuet okular picmi spectacle;
 
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };
 

From cd235e3a1591cf3048f600f70b5673ebc6c534ec Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 21 Aug 2020 10:41:47 +0200
Subject: [PATCH 22/24] kshisen: init at 20.04.3

---
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/kshisen.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 +-
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/kshisen.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 041108a9c5d7..bf11cfabcf09 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -171,6 +171,7 @@ let
       krdc = callPackage ./krdc.nix {};
       krfb = callPackage ./krfb.nix {};
       kruler = callPackage ./kruler.nix {};
+      kshisen = callPackage ./kshisen.nix {};
       kspaceduel = callPackage ./kspaceduel.nix {};
       ksudoku = callPackage ./ksudoku.nix {};
       ksystemlog = callPackage ./ksystemlog.nix {};
diff --git a/pkgs/applications/kde/kshisen.nix b/pkgs/applications/kde/kshisen.nix
new file mode 100644
index 000000000000..7909ed8b2a38
--- /dev/null
+++ b/pkgs/applications/kde/kshisen.nix
@@ -0,0 +1,22 @@
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, libkmahjongg }:
+
+mkDerivation {
+  name = "kshisen";
+  meta = with lib; {
+    homepage = "https://kde.org/applications/en/games/org.kde.kshisen";
+    description = "KShisen is a solitaire-like game played using the standard set of Mahjong tiles";
+    maintainers = with maintainers; [ freezeboy ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    libkdegames
+    libkmahjongg
+    kdoctools
+    ki18n
+    kio
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index edd5e29b280b..f12d23b64220 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21054,7 +21054,7 @@ in
     akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
     kaddressbook kalzium kapptemplate kapman kate katomic kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog kdiamond
     keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo killbots kleopatra klettres klines kmag kmail kmines kmix kmplot kollision knavalbattle knetwalk knights kolourpaint kompare konsole yakuake
-    kpkpass kitinerary kontact korganizer krdc kreversi krfb ksquares ksystemlog ktimer ktouch kturtle kwalletmanager kwave marble minuet okular picmi spectacle;
+    kpkpass kitinerary kontact korganizer krdc kreversi krfb kshisen ksquares ksystemlog ktimer ktouch kturtle kwalletmanager kwave marble minuet okular picmi spectacle;
 
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };
 

From c561811dbddebb3bda4b53421f8904d2d80b5428 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 21 Aug 2020 10:43:53 +0200
Subject: [PATCH 23/24] kteatime: init at 20.04.3

---
 pkgs/applications/kde/default.nix  |  1 +
 pkgs/applications/kde/kteatime.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 +-
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/kteatime.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index bf11cfabcf09..78e9a4fac02e 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -175,6 +175,7 @@ let
       kspaceduel = callPackage ./kspaceduel.nix {};
       ksudoku = callPackage ./ksudoku.nix {};
       ksystemlog = callPackage ./ksystemlog.nix {};
+      kteatime = callPackage ./kteatime.nix {};
       ktimer = callPackage ./ktimer.nix {};
       ktnef = callPackage ./ktnef.nix {};
       ktouch = callPackage ./ktouch.nix {};
diff --git a/pkgs/applications/kde/kteatime.nix b/pkgs/applications/kde/kteatime.nix
new file mode 100644
index 000000000000..a69cb991acc0
--- /dev/null
+++ b/pkgs/applications/kde/kteatime.nix
@@ -0,0 +1,23 @@
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kconfig, kcrash, kiconthemes, knotifyconfig }:
+
+mkDerivation {
+  name = "kteatime";
+  meta = with lib; {
+    homepage = "https://kde.org/applications/en/utilities/org.kde.kteatime";
+    description = "KTeaTime is a handy timer for steeping tea";
+    maintainers = with maintainers; [ freezeboy ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    kdoctools
+    ki18n
+    kconfig
+    kcrash
+    kiconthemes
+    knotifyconfig
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f12d23b64220..5ae10c901983 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21054,7 +21054,7 @@ in
     akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
     kaddressbook kalzium kapptemplate kapman kate katomic kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog kdiamond
     keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo killbots kleopatra klettres klines kmag kmail kmines kmix kmplot kollision knavalbattle knetwalk knights kolourpaint kompare konsole yakuake
-    kpkpass kitinerary kontact korganizer krdc kreversi krfb kshisen ksquares ksystemlog ktimer ktouch kturtle kwalletmanager kwave marble minuet okular picmi spectacle;
+    kpkpass kitinerary kontact korganizer krdc kreversi krfb kshisen ksquares ksystemlog kteatime ktimer ktouch kturtle kwalletmanager kwave marble minuet okular picmi spectacle;
 
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };
 

From 8962e59910c6863f2114b3873e9ac69e60fb2ea2 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 21 Aug 2020 10:48:08 +0200
Subject: [PATCH 24/24] kdeApplications reorder to avoid too much conflicts

---
 pkgs/top-level/all-packages.nix | 34 +++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ae10c901983..001ebf10750e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21051,10 +21051,36 @@ in
       recurseIntoAttrs (makeOverridable mkApplications attrs);
 
   inherit (kdeApplications)
-    akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
-    kaddressbook kalzium kapptemplate kapman kate katomic kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog kdiamond
-    keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo killbots kleopatra klettres klines kmag kmail kmines kmix kmplot kollision knavalbattle knetwalk knights kolourpaint kompare konsole yakuake
-    kpkpass kitinerary kontact korganizer krdc kreversi krfb kshisen ksquares ksystemlog kteatime ktimer ktouch kturtle kwalletmanager kwave marble minuet okular picmi spectacle;
+    akonadi akregator ark
+    bomber bovo
+    dolphin dragon
+    elisa
+    ffmpegthumbs filelight
+    granatier gwenview
+    k3b
+    kaddressbook kalzium kapptemplate kapman kate katomic
+    kblackbox kblocks kbounce
+    kcachegrind kcalc kcharselect kcolorchooser
+    kdenlive kdf kdialog kdiamond
+    keditbookmarks
+    kfind kfloppy
+    kget kgpg
+    khelpcenter
+    kig kigo killbots kitinerary
+    kleopatra klettres klines
+    kmag kmail kmines kmix kmplot
+    knavalbattle knetwalk knights
+    kollision kolourpaint kompare konsole kontact korganizer
+    kpkpass
+    krdc kreversi krfb
+    kshisen ksquares ksystemlog
+    kteatime ktimer ktouch kturtle
+    kwalletmanager kwave
+    marble minuet
+    okular
+    picmi
+    spectacle
+    yakuake;
 
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };