vimPlugins.vim-clap: useFetchCargoVendor; 0.54-unstable-2024-08-11 -> 0.54 (#380965)

pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix

@@ -1,23 +1,23 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, pkg-config
-, libgit2
-, zlib
-, stdenv
-, darwin
-, vimUtils
-, nix-update-script
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  fetchpatch,
+  pkg-config,
+  libgit2,
+  zlib,
+  vimUtils,
+  nix-update-script,
 }:
 
 let
-  version = "0.54-unstable-2024-08-11";
+  version = "0.54";
 
   src = fetchFromGitHub {
     owner = "liuchengxu";
     repo = "vim-clap";
-    rev = "3e8d001f5c9be10e4bb680a1d409326902c96c10";
-    hash = "sha256-7bgbKYjJX2Tfprb69/imyvhsCsurrmPWBXVVLX+ZMnM=";
+    tag = "v${version}";
+    hash = "sha256-rhCum59GCIAwdi5QgSaPfrALelAIMncNetu81i53Q8c=";
   };
 
   meta = with lib; {
@@ -33,26 +33,25 @@ let
     pname = "maple";
     inherit version src meta;
 
-    cargoLock = {
-      lockFile = ./Cargo.lock;
-      outputHashes = {
-        "subprocess-0.2.10" = "sha256-WcGrJ103ofGlQwi32kRGM3Z+uvKSCFBmFZbZXAtuWwM=";
-        "tree-sitter-dockerfile-0.1.0" = "sha256-K+duK3HcxlVgbLXBos3MUxyfnTywcHX6JM4Do0qAJO0=";
-        "tree-sitter-vim-0.3.1-dev.0" = "sha256-CWxZ28LdptiMNO2VIk+Ny/DhQXdN604EuqRIb9oaCmI=";
-      };
-    };
+    useFetchCargoVendor = true;
+    cargoHash = "sha256-FEeSwa8KmIyfhWAU9Dpric6uB2e0yK+Tig/k2zwq2Rg=";
 
     nativeBuildInputs = [
       pkg-config
     ];
 
+    # Remove after next release
+    cargoPatches = [
+      (fetchpatch {
+        name = "rust-1.80";
+        url = "https://github.com/liuchengxu/vim-clap/commit/3e8d001f5c9be10e4bb680a1d409326902c96c10.patch";
+        hash = "sha256-qMflfQEssH4OGXmLFUcQwzbYWgPD0S/pClb35ZRUaPM=";
+      })
+    ];
+
     buildInputs = [
       libgit2
       zlib
-    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.apple_sdk.frameworks.AppKit
-      darwin.apple_sdk.frameworks.CoreServices
-      darwin.apple_sdk.frameworks.SystemConfiguration
     ];
   };
 in