From 8c168ae5568e2d2dde78d639a3ac40270a3ca42c Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 25 May 2024 16:08:26 +0200
Subject: [PATCH] felix-fm: 2.12.1 -> 2.13.0

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 .../fe/felix-fm/package.nix}                     | 16 +++++++++++++---
 pkgs/top-level/all-packages.nix                  |  2 --
 2 files changed, 13 insertions(+), 5 deletions(-)
 rename pkgs/{applications/file-managers/felix-fm/default.nix => by-name/fe/felix-fm/package.nix} (68%)

diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/by-name/fe/felix-fm/package.nix
similarity index 68%
rename from pkgs/applications/file-managers/felix-fm/default.nix
rename to pkgs/by-name/fe/felix-fm/package.nix
index 37f03349a47e..728b3aba99a2 100644
--- a/pkgs/applications/file-managers/felix-fm/default.nix
+++ b/pkgs/by-name/fe/felix-fm/package.nix
@@ -1,6 +1,7 @@
 { lib
 , rustPlatform
 , fetchFromGitHub
+, fetchpatch2
 , pkg-config
 , bzip2
 , libgit2
@@ -12,16 +13,25 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "felix";
-  version = "2.12.1";
+  version = "2.13.0";
 
   src = fetchFromGitHub {
     owner = "kyoheiu";
     repo = "felix";
     rev = "v${version}";
-    hash = "sha256-M+auLJeD5rDk5LJfTBg9asZ3J4DHsZG4UGRhXdZZVkc=";
+    hash = "sha256-7KuL3YkKhjcZSMSipbNITaA9/MGo54f3lz3fVOgy52s=";
   };
 
-  cargoHash = "sha256-GzaBaaGjBCz+xd1bpU2cebQvg5DO0qipHwhOerbq+ow=";
+  cargoPatches = [
+    # https://github.com/kyoheiu/felix/pull/292
+    (fetchpatch2 {
+      name = "update-cargo.lock-for-2.13.0.patch";
+      url = "https://github.com/kyoheiu/felix/commit/5085b147103878ee8138d4fcf7b204223ba2c3eb.patch";
+      hash = "sha256-7Bga9hcJCXExA/jnrR/HuZgOOVBbWs1tdTwxldcvdU8=";
+    })
+  ];
+
+  cargoHash = "sha256-FX3AsahU5ZLMuylwo1jihP9G4Dw1SFv1oMXcuOqDTF8=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b7444e309a67..efefc4419105 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2897,8 +2897,6 @@ with pkgs;
     inherit (qt5) wrapQtAppsHook;
   };
 
-  felix-fm = callPackage ../applications/file-managers/felix-fm { };
-
   krusader = libsForQt5.callPackage ../applications/file-managers/krusader { };
 
   lesscpy = callPackage ../development/compilers/lesscpy { };