From a6dccff3506680db87d10e1f337f40b40ff4ca56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Fri, 15 Nov 2024 19:57:12 +0100
Subject: [PATCH 1/4] cargo-gra: 0.6.0 -> 0.6.2

---
 pkgs/by-name/ca/cargo-gra/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-gra/package.nix b/pkgs/by-name/ca/cargo-gra/package.nix
index 88e5646e5d61..3dd0a3b7293f 100644
--- a/pkgs/by-name/ca/cargo-gra/package.nix
+++ b/pkgs/by-name/ca/cargo-gra/package.nix
@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-gra";
-  version = "0.6.0";
+  version = "0.6.2";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-cli7qaIVYvoZpDml/QAxm2vjvh/g28zlDSpU9IIUBfw=";
+    hash = "sha256-JbBcpp/E3WlQrwdxMsbSdmIEnDTQj/1XDwAWJsniRu0=";
   };
 
-  cargoHash = "sha256-xsaavcpDaiDDbL3Dl+7NLcfB5U6vuYsVPoIuA/KXCvI=";
+  cargoHash = "sha256-wfMiqWcEsL6/d6XFnEFm/lCbelU7BHC7JKdHREnynAU=";
 
   meta = {
     license = lib.licenses.gpl3Plus;

From 41dbbf460b4257c6cd20a3770dc38dca3b258f79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Fri, 15 Nov 2024 19:57:30 +0100
Subject: [PATCH 2/4] cargo-gra: order `meta` attrs

---
 pkgs/by-name/ca/cargo-gra/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-gra/package.nix b/pkgs/by-name/ca/cargo-gra/package.nix
index 3dd0a3b7293f..631d8ea7c97c 100644
--- a/pkgs/by-name/ca/cargo-gra/package.nix
+++ b/pkgs/by-name/ca/cargo-gra/package.nix
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-wfMiqWcEsL6/d6XFnEFm/lCbelU7BHC7JKdHREnynAU=";
 
   meta = {
-    license = lib.licenses.gpl3Plus;
+    description = "gtk-rust-app cli for building flatpak apps with ease";
     homepage = "https://gitlab.com/floers/gtk-stuff/cargo-gra/";
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ bot-wxt1221 ];
     platforms = lib.platforms.unix;
-    description = "gtk-rust-app cli for building flatpak apps with ease";
   };
 }

From 1e19adc0f4ceb96b79766a0502778a24f8cfe22d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Fri, 15 Nov 2024 19:58:49 +0100
Subject: [PATCH 3/4] karlender: 0.10.4 -> 0.10.11

---
 pkgs/by-name/ka/karlender/package.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ka/karlender/package.nix b/pkgs/by-name/ka/karlender/package.nix
index f908979a7023..68786944b386 100644
--- a/pkgs/by-name/ka/karlender/package.nix
+++ b/pkgs/by-name/ka/karlender/package.nix
@@ -11,30 +11,20 @@
   nix-update-script,
   dbus,
   cargo-gra,
-  fetchpatch,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "karlender";
-  version = "0.10.4";
+  version = "0.10.11";
 
   src = fetchFromGitLab {
     owner = "floers";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-W+s1RCPwy7ZiK514AaQLwV9y+VJ58oMGlrS5cdoFKIg=";
+    hash = "sha256-PwXSJq4uBtgIA2aQ5AZawEMmHoVS2Z9haVHyJ2oyXUs=";
   };
 
-  cargoPatches = [
-    # https://gitlab.com/floers/calendar-stuff/karlender/-/merge_requests/43
-    # Remove it when it is merged and released.
-    (fetchpatch {
-      url = "https://gitlab.com/floers/calendar-stuff/karlender/-/commit/ce50c68323a834a0ee2cbff88ed285a971dfd91e.patch";
-      hash = "sha256-0hGgJPwnSNGTO/eiooQkQlBJ4brbaWVKRY6MT1PZApg=";
-    })
-  ];
-
-  cargoHash = "sha256-CeHIx6oUtAcr6tBdqmIDTLuYcesaA6G72L3HwHDLY7Y=";
+  cargoHash = "sha256-R/oQvyZCcTImOA8FB5bECTj5VGFElImoQwIRX75PtOs=";
 
   nativeBuildInputs = [
     pkg-config

From 94acb3a3d2b50bcace02b9cd09faec6dc1ae230c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Fri, 15 Nov 2024 19:59:13 +0100
Subject: [PATCH 4/4] karlender: order `meta` attrs

---
 pkgs/by-name/ka/karlender/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ka/karlender/package.nix b/pkgs/by-name/ka/karlender/package.nix
index 68786944b386..57330777073a 100644
--- a/pkgs/by-name/ka/karlender/package.nix
+++ b/pkgs/by-name/ka/karlender/package.nix
@@ -69,9 +69,9 @@ rustPlatform.buildRustPackage rec {
 
   meta = {
     description = "Mobile-friendly GTK calendar application";
-    mainProgram = "karlender";
     homepage = "https://gitlab.com/floers/karlender";
     license = lib.licenses.gpl3Plus;
+    mainProgram = "karlender";
     maintainers = with lib.maintainers; [
       chuangzhu
       bot-wxt1221