From 7343c157c1862fb8449b1d9123d71eae71bb6f76 Mon Sep 17 00:00:00 2001
From: Chuang Zhu <chuang@melty.land>
Date: Sun, 28 Nov 2021 22:44:04 +0800
Subject: [PATCH 1/2] maintainers: add chuangzhu

---
 maintainers/maintainer-list.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3fac740a11e..418c07977df 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2092,6 +2092,17 @@
     githubId = 12386805;
     name = "Chua Hou";
   };
+  chuangzhu = {
+    name = "Chuang Zhu";
+    email = "chuang@melty.land";
+    matrix = "@chuangzhu:matrix.org";
+    github = "chuangzhu";
+    githubId = 31200881;
+    keys = [{
+      longkeyid = "rsa4096/E838CED81CFFD3F9";
+      fingerprint = "5D03 A5E6 0754 A3E3 CA57 5037 E838 CED8 1CFF D3F9";
+    }];
+  };
   chvp = {
     email = "nixpkgs@cvpetegem.be";
     matrix = "@charlotte:vanpetegem.me";

From f469351a3d1b9ba88b78d37f640467bdd8d9b940 Mon Sep 17 00:00:00 2001
From: Chuang Zhu <chuang@melty.land>
Date: Fri, 3 Dec 2021 02:15:18 +0800
Subject: [PATCH 2/2] kalendar: init at 0.3.1

---
 pkgs/applications/office/kalendar/default.nix | 94 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 96 insertions(+)
 create mode 100644 pkgs/applications/office/kalendar/default.nix

diff --git a/pkgs/applications/office/kalendar/default.nix b/pkgs/applications/office/kalendar/default.nix
new file mode 100644
index 00000000000..b941553cba3
--- /dev/null
+++ b/pkgs/applications/office/kalendar/default.nix
@@ -0,0 +1,94 @@
+{ lib
+, mkDerivation
+, fetchFromGitLab
+, cmake
+, extra-cmake-modules
+, makeWrapper
+
+, qtbase
+, qtquickcontrols2
+, qtsvg
+, qtlocation
+, qtdeclarative
+
+, kirigami2
+, kdbusaddons
+, ki18n
+, kcalendarcore
+, kconfigwidgets
+, kwindowsystem
+, kcoreaddons
+, kcontacts
+, kitemmodels
+, kxmlgui
+, knotifications
+, kiconthemes
+, kservice
+, kmime
+, kpackage
+, eventviews
+, calendarsupport
+
+, akonadi
+, akonadi-contacts
+, akonadi-calendar-tools
+, kdepim-runtime
+}:
+
+mkDerivation rec {
+  pname = "kalendar";
+  version = "0.3.1";
+
+  src = fetchFromGitLab {
+    domain = "invent.kde.org";
+    owner = "pim";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-foG8j/MRbDZyzM9KmxEARfWUQXMz8ylQgersE1/gtnQ=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+    makeWrapper
+  ];
+
+  buildInputs = [
+    qtbase
+    qtquickcontrols2
+    qtsvg
+    qtlocation
+    qtdeclarative
+
+    kirigami2
+    kdbusaddons
+    ki18n
+    kcalendarcore
+    kconfigwidgets
+    kwindowsystem
+    kcoreaddons
+    kcontacts
+    kitemmodels
+    kxmlgui
+    knotifications
+    kiconthemes
+    kservice
+    kmime
+    kpackage
+    eventviews
+    calendarsupport
+
+    akonadi-contacts
+    akonadi-calendar-tools
+  ];
+
+  propagatedUserEnvPkgs = [ akonadi kdepim-runtime ];
+
+  meta = with lib; {
+    description = "A calendar application using Akonadi to sync with external services (Nextcloud, GMail, ...)";
+    homepage = "https://invent.kde.org/pim/kalendar/";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ chuangzhu ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc81aeb9e78..eac49780d61 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24928,6 +24928,8 @@ with pkgs;
 
   icesl = callPackage ../applications/misc/icesl { };
 
+  kalendar = libsForQt5.callPackage ../applications/office/kalendar { };
+
   keepassx = callPackage ../applications/misc/keepassx { };
   keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { };
   keepassxc = libsForQt5.callPackage ../applications/misc/keepassx/community.nix { };