From 1aa66fb76a521127646e43fd329f7faf43fdd4c7 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 11 Mar 2025 16:18:28 +0100
Subject: [PATCH 1/2] libical: 3.0.19 -> 3.0.20

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/li/libical/fix-cmake.patch | 30 -------------------------
 pkgs/by-name/li/libical/package.nix     |  9 ++------
 2 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/by-name/li/libical/fix-cmake.patch

diff --git a/pkgs/by-name/li/libical/fix-cmake.patch b/pkgs/by-name/li/libical/fix-cmake.patch
deleted file mode 100644
index f0e3d002feb7..000000000000
--- a/pkgs/by-name/li/libical/fix-cmake.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/test/libical-glib/CMakeLists.txt b/src/test/libical-glib/CMakeLists.txt
-index 01a0894a1..d7d2af5bb 100644
---- a/src/test/libical-glib/CMakeLists.txt
-+++ b/src/test/libical-glib/CMakeLists.txt
-@@ -36,19 +36,19 @@ list(
- 
- if(PYTHON3)
-   set(GI_TYPELIB_PATH_STR "${PROJECT_BINARY_DIR}/src/libical-glib")
--  if(DEFINED GI_TYPELIB_PATH)
--    if($ENV{GI_TYPELIB_PATH})
-+  if(DEFINED ENV{GI_TYPELIB_PATH})
-+    if(NOT ENV{GI_TYPELIB_PATH} STREQUAL "")
-       set(GI_TYPELIB_PATH_STR "${GI_TYPELIB_PATH_STR}:$ENV{GI_TYPELIB_PATH}")
-     endif()
-   endif()
-   set(LIBRARY_PATH_STR "${LIBRARY_OUTPUT_PATH}")
--  if(DEFINED LD_LIBRARY_PATH)
--    if($ENV{LD_LIBRARY_PATH})
-+  if(DEFINED ENV{LD_LIBRARY_PATH})
-+    if(NOT ENV{LD_LIBRARY_PATH} STREQUAL "")
-       set(LIBRARY_PATH_STR "${LIBRARY_PATH_STR}:$ENV{LD_LIBRARY_PATH}")
-     endif()
-   endif()
--  if(DEFINED DYLD_LIBRARY_PATH)
--    if($ENV{DYLD_LIBRARY_PATH})
-+  if(DEFINED ENV{DYLD_LIBRARY_PATH})
-+    if(NOT ENV{DYLD_LIBRARY_PATH} STREQUAL "")
-       set(LIBRARY_PATH_STR "${LIBRARY_PATH_STR}:$ENV{DYLD_LIBRARY_PATH}")
-     endif()
-   endif()
diff --git a/pkgs/by-name/li/libical/package.nix b/pkgs/by-name/li/libical/package.nix
index b3f5a63ab6f1..840a62670c93 100644
--- a/pkgs/by-name/li/libical/package.nix
+++ b/pkgs/by-name/li/libical/package.nix
@@ -22,7 +22,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libical";
-  version = "3.0.19";
+  version = "3.0.20";
 
   outputs = [
     "out"
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     owner = "libical";
     repo = "libical";
     rev = "v${version}";
-    sha256 = "sha256-ZJXxi1LOZyEpgdcmoK0pe5IA3+l9WY0zLu6Ttzy1QSc=";
+    sha256 = "sha256-KIMqZ6QAh+fTcKEYrcLlxgip91CLAwL9rwjUdKzBsQk=";
   };
 
   strictDeps = true;
@@ -91,11 +91,6 @@ stdenv.mkDerivation rec {
     # Will appear in 3.1.0
     # https://github.com/libical/libical/issues/350
     ./respect-env-tzdir.patch
-
-    # CMake setup fix for tests
-    # Submitted upstream: https://github.com/libical/libical/pull/885
-    # FIXME: remove when merged
-    ./fix-cmake.patch
   ];
 
   # Using install check so we do not have to manually set GI_TYPELIB_PATH

From 8c3a3572c338f83630d1e5ae425c78579e9bb528 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 25 Mar 2025 09:23:32 +0100
Subject: [PATCH 2/2] libical: Transform to use finalAttrs

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/li/libical/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libical/package.nix b/pkgs/by-name/li/libical/package.nix
index 840a62670c93..b774a2207631 100644
--- a/pkgs/by-name/li/libical/package.nix
+++ b/pkgs/by-name/li/libical/package.nix
@@ -20,7 +20,7 @@
   vala,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libical";
   version = "3.0.20";
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libical";
     repo = "libical";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-KIMqZ6QAh+fTcKEYrcLlxgip91CLAwL9rwjUdKzBsQk=";
   };
 
@@ -124,4 +124,4 @@ stdenv.mkDerivation rec {
     license = licenses.mpl20;
     platforms = platforms.unix;
   };
-}
+})