From 88de31f9e6a071d24f5373a3a1ab5cb87cf4e446 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 10 Feb 2025 12:08:54 -0600 Subject: [PATCH] vimPlugins.vim-clap: 0.54-unstable-2024-08-11 -> 0.54 We can pin to release and just patch in the rust 1.80 support so that updates happen as we'd like. --- .../plugins/non-generated/vim-clap/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix index d450e197fc0f..1f19020e5b1e 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix @@ -2,6 +2,7 @@ lib, rustPlatform, fetchFromGitHub, + fetchpatch, pkg-config, libgit2, zlib, @@ -12,13 +13,13 @@ }: 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; { @@ -41,6 +42,15 @@ let 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