From 69834c39c1aa3e8c4cb5d9b3d3c63d5fc4f39c74 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 17 Jan 2024 08:53:04 +0100
Subject: vimPlugins.sniprun: 1.3.10 -> 1.3.11

---
 .../applications/editors/vim/plugins/overrides.nix |  6 ++--
 .../vim/plugins/patches/sniprun/fix-paths.patch    | 41 +---------------------
 2 files changed, 4 insertions(+), 43 deletions(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 73fdb754bb391..3856efd0187da 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1136,12 +1136,12 @@
 
   sniprun =
     let
-      version = "1.3.10";
+      version = "1.3.11";
       src = fetchFromGitHub {
         owner = "michaelb";
         repo = "sniprun";
         rev = "refs/tags/v${version}";
-        hash = "sha256-7tDREZ8ZXYySHrXVOh+ANT23CknJQvZJ8WtU5r0pOOQ=";
+        hash = "sha256-f/EifFvlHr41wP0FfkwSGVdXLyz739st/XtnsSbzNT4=";
       };
       sniprun-bin = rustPlatform.buildRustPackage {
         pname = "sniprun-bin";
@@ -1151,7 +1151,7 @@
           darwin.apple_sdk.frameworks.Security
         ];
 
-        cargoHash = "sha256-n/HW+q4Xrme/ssS9Th5uFEUsDgkxRxKt2wSR8k08uHY=";
+        cargoHash = "sha256-SmhfjOnw89n/ATGvmyvd5clQSucIh7ky3v9JsSjtyfI=";
 
         nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch b/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch
index 85a6daceefa07..97f1824ea623b 100644
--- a/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch
+++ b/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch
@@ -1,5 +1,5 @@
 diff --git a/lua/sniprun.lua b/lua/sniprun.lua
-index c9b811f..459cf07 100644
+index fe29d1e..92d4729 100644
 --- a/lua/sniprun.lua
 +++ b/lua/sniprun.lua
 @@ -4,9 +4,7 @@ M.custom_highlight=false
@@ -13,42 +13,3 @@ index c9b811f..459cf07 100644
  
  local sniprun_path = vim.fn.fnamemodify( vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":p:h") .. "/.."
  
-@@ -145,7 +143,7 @@ function M.setup_highlights()
-       highlight(group, styles)
-     end
-     vim.cmd('augroup END')
--  else 
-+  else
-     for group, styles in pairs(colors_table) do
-       local gui = styles.gui and 'gui='..styles.gui or 'gui=NONE'
-       local sp = styles.sp and 'guisp='..styles.sp or 'guisp=NONE'
-@@ -354,7 +352,7 @@ function M.health()
-   -- check if the log is recreated
-   if pcall(M.ping) then health_ok("Sent a ping to the sniprun binary")
-   else health_warn("Could not send a ping to the sniprun binary - is it present, executable and compatible with your CPU architecture?") end
--    
-+
- 
-   os.execute("sleep 0.2")
-   if not M.file_exists(path_log_file) and not M.file_exists(path_log_file_mac)  then health_error("sniprun binary incompatible or crash at start", {"Compile sniprun locally, with a clean reinstall and 'bash ./install.sh 1' as post-install command."})
-diff --git a/ressources/init_repl.sh b/ressources/init_repl.sh
-index eb51dbe..1382b5c 100755
---- a/ressources/init_repl.sh
-+++ b/ressources/init_repl.sh
-@@ -35,7 +35,7 @@ mkfifo $working_dir/$pipe
- touch $working_dir/$out
- sleep 36000 > $working_dir/$pipe &
- 
--echo "/bin/cat " $working_dir/$pipe " | " $repl  > $working_dir/real_launcher.sh
-+echo "cat " $working_dir/$pipe " | " $repl  > $working_dir/real_launcher.sh
- chmod +x $working_dir/real_launcher.sh
- 
- echo $repl " process started at $(date +"%F %T")." >> $log
-diff --git a/ressources/launcher_repl.sh b/ressources/launcher_repl.sh
-index feaa91e..749c55e 100755
---- a/ressources/launcher_repl.sh
-+++ b/ressources/launcher_repl.sh
-@@ -1,2 +1,2 @@
- #!/bin/bash
--/bin/cat $1 > $2
-+cat $1 > $2
-- 
cgit 1.4.1