From f30714a30e7dd0ab53f0735c82a316fa3355f979 Mon Sep 17 00:00:00 2001
From: Shiphan <140245703+Shiphan@users.noreply.github.com>
Date: Tue, 15 Oct 2024 15:01:08 +0800
Subject: [PATCH 1/2] maintainers: add shiphan

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 723f7611268b..086e8672d416 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -19569,6 +19569,12 @@
     github = "shikanime";
     githubId = 22115108;
   };
+  shiphan = {
+    email = "timlin940511@gmail.com";
+    name = "Shiphan";
+    github = "Shiphan";
+    githubId = 140245703;
+  };
   shiryel = {
     email = "contact@shiryel.com";
     name = "Shiryel";

From 9f766d186d83d390acc1eaf8d9685143588362bf Mon Sep 17 00:00:00 2001
From: Shiphan <140245703+Shiphan@users.noreply.github.com>
Date: Tue, 15 Oct 2024 15:03:40 +0800
Subject: [PATCH 2/2] fcitx5-mcbopomofo: init at 2.7

https://github.com/openvanilla/fcitx5-mcbopomofo/releases/tag/2.7
---
 pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix

diff --git a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix
new file mode 100644
index 000000000000..59df795afaf8
--- /dev/null
+++ b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  extra-cmake-modules,
+  gettext,
+  json_c,
+  icu,
+  fmt,
+  gtest,
+  fcitx5,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "fcitx5-mcbopomofo";
+  version = "2.7";
+
+  src = fetchFromGitHub {
+    owner = "openvanilla";
+    repo = "fcitx5-mcbopomofo";
+    rev = version;
+    hash = "sha256-7AuH/Ns5syMmcGeIPxi0KepMn2VzOnqopqKuQ2zxucc=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+    gettext
+    json_c
+    icu
+    fmt
+    gtest
+  ];
+
+  buildInputs = [
+    fcitx5
+  ];
+
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=Release"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "McBopomofo for fcitx5";
+    homepage = "https://github.com/openvanilla/fcitx5-mcbopomofo";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ shiphan ];
+    platforms = lib.platforms.linux;
+  };
+}