From 3adc16211c77a4a53d65ef1170dcfeda6e0c408a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 19 Dec 2024 07:48:47 +0100
Subject: [PATCH 1/2] magic-enum: 0.9.6 -> 0.9.7

Diff: https://github.com/Neargye/magic_enum/compare/refs/tags/v0.9.6...v0.9.7

Changelog: https://github.com/Neargye/magic_enum/releases/tag/v0.9.7
---
 pkgs/by-name/ma/magic-enum/package.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ma/magic-enum/package.nix b/pkgs/by-name/ma/magic-enum/package.nix
index 0b9ffcd9dae5..c4bae5ef975f 100644
--- a/pkgs/by-name/ma/magic-enum/package.nix
+++ b/pkgs/by-name/ma/magic-enum/package.nix
@@ -4,17 +4,16 @@
   stdenv,
   cmake,
   nix-update-script,
-  testers,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "magic-enum";
-  version = "0.9.6";
+  version = "0.9.7";
 
   src = fetchFromGitHub {
     owner = "Neargye";
     repo = "magic_enum";
-    tag = "v${version}";
-    hash = "sha256-1pO9FWd0InXqg8+lwRF3YNFTAeVLjqoI9v15LjWxnZY=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-P6fl/dcGOSE1lTJwZlimbvsTPelHwdQdZr18H4Zji20=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -23,8 +22,8 @@ stdenv.mkDerivation rec {
     # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly
     # (setting it to an absolute path causes include files to go to $out/$out/include,
     #  because the absolute path is interpreted with root at $out).
-    "-DCMAKE_INSTALL_INCLUDEDIR=include"
-    "-DCMAKE_INSTALL_LIBDIR=lib"
+    (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include")
+    (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
   ];
 
   passthru = {
@@ -34,8 +33,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Static reflection for enums (to string, from string, iteration) for modern C++";
     homepage = "https://github.com/Neargye/magic_enum";
-    changelog = "https://github.com/Neargye/magic_enum/releases/tag/v${version}";
+    changelog = "https://github.com/Neargye/magic_enum/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ Alper-Celik ];
   };
-}
+})

From 4250864535296148bc93c8637761ac7721014119 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 19 Dec 2024 07:53:42 +0100
Subject: [PATCH 2/2] kemai: 0.10.0 -> 0.11.1

Diff: https://github.com/AlexandrePTJ/kemai/compare/0.10.0...0.11.1
---
 pkgs/applications/misc/kemai/default.nix | 70 +++++++++++++-----------
 1 file changed, 39 insertions(+), 31 deletions(-)

diff --git a/pkgs/applications/misc/kemai/default.nix b/pkgs/applications/misc/kemai/default.nix
index 3c80d820a129..4a26b3b8a74c 100644
--- a/pkgs/applications/misc/kemai/default.nix
+++ b/pkgs/applications/misc/kemai/default.nix
@@ -2,55 +2,62 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
-  cmake,
+
+  # buildInputs
+  libXScrnSaver,
   magic-enum,
-  range-v3,
-  spdlog,
+
+  # nativeBuildInputs
   qtbase,
   qtconnectivity,
-  qttools,
   qtlanguageserver,
+  qttools,
+  range-v3,
+  spdlog,
   qtwayland,
+
+  # nativeBuildInputs
+  cmake,
   wrapQtAppsHook,
-  libXScrnSaver,
+
+  # passthru
   nix-update-script,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "kemai";
-  version = "0.10.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "AlexandrePTJ";
     repo = "kemai";
-    rev = version;
-    hash = "sha256-wclBAgeDyAIw/nGF6lzIwbwdoZMBTu+tjxsnIxIkODM=";
+    tag = finalAttrs.version;
+    hash = "sha256-2Cyrd0fKaEHkDaKF8lFwuoLvl6553rp3ET2xLUUrTnk=";
   };
 
-  patches = [
-    # Backport the fix for an issue where LICENSE.txt ends up in /bin
-    # Remove in next release
-    (fetchpatch {
-      url = "https://github.com/AlexandrePTJ/kemai/commit/e279679dd7308efebe004252d168d7308f3b99ce.patch";
-      hash = "sha256-5cmRRMVATf4ul4HhaQKiE0yTN2qd+MfNFQzGTLLpOyg=";
-    })
-  ];
+  postPatch = ''
+    substituteInPlace \
+      src/client/parser.cpp \
+      src/client/kimaiCache.cpp \
+      --replace-fail \
+        "#include <magic_enum.hpp>" \
+        "#include <magic_enum/magic_enum.hpp>"
+  '';
 
   buildInputs = [
-    qtbase
-    qtconnectivity
-    qttools
-    qtlanguageserver
     libXScrnSaver
     magic-enum
+    qtbase
+    qtconnectivity
+    qtlanguageserver
+    qttools
     range-v3
     spdlog
   ] ++ lib.optional stdenv.hostPlatform.isLinux qtwayland;
+
   cmakeFlags = [
-    "-DFETCHCONTENT_FULLY_DISCONNECTED=ON"
-    "-DFETCHCONTENT_QUIET=OFF"
-    "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS"
+    (lib.cmakeBool "KEMAI_ENABLE_UPDATE_CHECK" false)
+    (lib.cmakeBool "KEMAI_BUILD_LOCAL_DEPENDENCIES" false)
   ];
 
   nativeBuildInputs = [
@@ -62,13 +69,14 @@ stdenv.mkDerivation rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Kimai desktop client written in QT6";
     homepage = "https://github.com/AlexandrePTJ/kemai";
-    license = licenses.mit;
-    maintainers = with maintainers; [ poelzi ];
-    platforms = platforms.unix;
-    broken = stdenv.hostPlatform.isDarwin;
+    changelog = "https://github.com/AlexandrePTJ/kemai/blob/${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ poelzi ];
+    platforms = lib.platforms.unix;
+    badPlatforms = [ lib.systems.inspect.patterns.isDarwin ];
     mainProgram = "Kemai";
   };
-}
+})