From 5f3ef370507c79d67d8d91a24eb1a7e16c8a83f2 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Mon, 4 Mar 2024 08:57:52 +0000
Subject: [PATCH] cozy: 1.2.1 -> 1.3.0

---
 nixpatches/list.nix           |  6 ++++++
 pkgs/patched/cozy/default.nix | 10 ----------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/nixpatches/list.nix b/nixpatches/list.nix
index d7ee94d97..cf27df50f 100644
--- a/nixpatches/list.nix
+++ b/nixpatches/list.nix
@@ -32,6 +32,12 @@ in [
   # etc, where "date" is like "20240228181608"
   # and can be found with `nix-repl  > :lf .  > lastModifiedDate`
 
+  (fetchpatch' {
+    prUrl = "https://github.com/NixOS/nixpkgs/pull/291400";
+    title = "cozy: 1.2.1 -> 1.3.0";
+    hash = "sha256-gu1Ni7orOFfZNwqA41Uq5gCC/2TdiUB8YeSLsZYn4H4=";
+  })
+
   (fetchpatch' {
     prUrl = "https://github.com/NixOS/nixpkgs/pull/292868";
     saneCommit = "f090c1cd6bb5bbb14a86ec90ced78ca1a165a4fe";
diff --git a/pkgs/patched/cozy/default.nix b/pkgs/patched/cozy/default.nix
index 4794322dc..bd527f128 100644
--- a/pkgs/patched/cozy/default.nix
+++ b/pkgs/patched/cozy/default.nix
@@ -1,14 +1,4 @@
 { cozy, fetchpatch }: cozy.overrideAttrs (upstream: {
-  patches = upstream.patches or [] ++ [
-    (fetchpatch {
-      # 2023/03/29: Fix "invalid version" crash on startup
-      # - 2023/09/15: still not merged upstream
-      # - 2023/12/11: merged; remove on next release?
-      # - 2024/03/03: available in 1.3.0 release
-      url = "https://github.com/geigi/cozy/pull/762.diff";
-      hash = "sha256-Wk03NGVU7OsQu3AGILtRsQX2r+wPOt5U85cOWu4q6Uo=";
-    })
-  ];
   postPatch = (upstream.postPatch or "") + ''
     # disable all reporting.
     # this can be done via the settings, but that's troublesome and easy to forget.